diff options
Diffstat (limited to 'dynamic-layers/clang-layer/recipes-opencl')
-rw-r--r-- | dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/0001-don-t-redefine-LLVM_TABLEGEN_EXE.patch | 32 | ||||
-rw-r--r-- | dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/link-with-all-libs.patch | 32 | ||||
-rw-r--r-- | dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/point-to-correct-llvm-tblgen.patch | 43 | ||||
-rw-r--r-- | dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_10.0.0.bb (renamed from dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_9.0.0.bb) | 8 |
4 files changed, 68 insertions, 47 deletions
diff --git a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/0001-don-t-redefine-LLVM_TABLEGEN_EXE.patch b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/0001-don-t-redefine-LLVM_TABLEGEN_EXE.patch new file mode 100644 index 00000000..8df7e3ab --- /dev/null +++ b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/0001-don-t-redefine-LLVM_TABLEGEN_EXE.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | From f3ef79a6301bab0b3a447f07ceb94c39a95009df Mon Sep 17 00:00:00 2001 | ||
2 | From: Anuj Mittal <anuj.mittal@intel.com> | ||
3 | Date: Thu, 2 Apr 2020 08:59:20 +0800 | ||
4 | Subject: [PATCH] don't redefine LLVM_TABLEGEN_EXE | ||
5 | |||
6 | Use the value that has been passed by the user. | ||
7 | |||
8 | Upstream-Status: Submitted | ||
9 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
10 | --- | ||
11 | CMakeLists.txt | 5 ++++- | ||
12 | 1 file changed, 4 insertions(+), 1 deletion(-) | ||
13 | |||
14 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
15 | index 6893e97..941b0ae 100644 | ||
16 | --- a/CMakeLists.txt | ||
17 | +++ b/CMakeLists.txt | ||
18 | @@ -137,7 +137,10 @@ endif(NOT USE_PREBUILT_LLVM) | ||
19 | set (COMPILE_OPTIONS_TD opencl_clang_options.td) | ||
20 | set (COMPILE_OPTIONS_INC opencl_clang_options.inc) | ||
21 | |||
22 | -set(LLVM_TABLEGEN_EXE "llvm-tblgen") | ||
23 | +if(NOT DEFINED LLVM_TABLEGEN_EXE) | ||
24 | + set(LLVM_TABLEGEN_EXE "llvm-tblgen") | ||
25 | +endif() | ||
26 | + | ||
27 | set(LLVM_TARGET_DEFINITIONS ${COMPILE_OPTIONS_TD}) | ||
28 | if(USE_PREBUILT_LLVM) | ||
29 | set(TABLEGEN_ADDITIONAL -I ${LLVM_INCLUDE_DIRS}) | ||
30 | -- | ||
31 | 2.25.1 | ||
32 | |||
diff --git a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/link-with-all-libs.patch b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/link-with-all-libs.patch new file mode 100644 index 00000000..bd6c9676 --- /dev/null +++ b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/link-with-all-libs.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | From cc0769fb72561f82976e40c5b7ea8bf07069c87a Mon Sep 17 00:00:00 2001 | ||
2 | From: Anuj Mittal <anuj.mittal@intel.com> | ||
3 | Date: Thu, 19 Mar 2020 16:30:07 +0800 | ||
4 | Subject: [PATCH] link to all libs | ||
5 | |||
6 | LINK_COMPONENTS=all isn't working for static libs for out of tree builds. Use | ||
7 | LLVM_AVAILABLE_LIBS instead. Reported: | ||
8 | |||
9 | https://github.com/intel/opencl-clang/issues/114 | ||
10 | |||
11 | Upstream-Status: Pending | ||
12 | |||
13 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
14 | --- | ||
15 | CMakeLists.txt | 1 + | ||
16 | 1 file changed, 1 insertion(+) | ||
17 | |||
18 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
19 | index 4590a11..2ff9901 100644 | ||
20 | --- a/CMakeLists.txt | ||
21 | +++ b/CMakeLists.txt | ||
22 | @@ -261,6 +261,7 @@ add_llvm_library(${TARGET_NAME} SHARED | ||
23 | clangLex | ||
24 | clangBasic | ||
25 | ${ADDITIONAL_LIBS} | ||
26 | + ${LLVM_AVAILABLE_LIBS} | ||
27 | ) | ||
28 | |||
29 | # Configure resource file on Windows | ||
30 | -- | ||
31 | 2.25.1 | ||
32 | |||
diff --git a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/point-to-correct-llvm-tblgen.patch b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/point-to-correct-llvm-tblgen.patch deleted file mode 100644 index 417e0221..00000000 --- a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/point-to-correct-llvm-tblgen.patch +++ /dev/null | |||
@@ -1,43 +0,0 @@ | |||
1 | From 2ce2619b544678541e0cc56494e2927086718613 Mon Sep 17 00:00:00 2001 | ||
2 | From: Anuj Mittal <anuj.mittal@intel.com> | ||
3 | Date: Tue, 26 Mar 2019 14:11:29 +0800 | ||
4 | Subject: [PATCH] point to correct llvm-tblgen | ||
5 | |||
6 | Let llvm-tblgen path be passed from recipe itself. | ||
7 | |||
8 | Also since we're going to do the patching ourselves, no need to look for | ||
9 | git through cmake. | ||
10 | |||
11 | Upstream-Status: Inappropriate [OE specific] | ||
12 | |||
13 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
14 | Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> | ||
15 | --- | ||
16 | CMakeLists.txt | 4 ++-- | ||
17 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
18 | |||
19 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
20 | index 1371a67..f83ffcc 100644 | ||
21 | --- a/CMakeLists.txt | ||
22 | +++ b/CMakeLists.txt | ||
23 | @@ -53,7 +53,7 @@ endif(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) | ||
24 | include(AddLLVM) | ||
25 | include(TableGen) | ||
26 | |||
27 | -find_package(Git REQUIRED) | ||
28 | +#find_package(Git REQUIRED) | ||
29 | |||
30 | if (NOT WIN32) | ||
31 | add_subdirectory( linux_linker ) | ||
32 | @@ -138,7 +138,7 @@ endif(NOT USE_PREBUILT_LLVM) | ||
33 | set (COMPILE_OPTIONS_TD opencl_clang_options.td) | ||
34 | set (COMPILE_OPTIONS_INC opencl_clang_options.inc) | ||
35 | |||
36 | -set(LLVM_TABLEGEN_EXE "llvm-tblgen") | ||
37 | +#set(LLVM_TABLEGEN_EXE "llvm-tblgen") | ||
38 | set(LLVM_TARGET_DEFINITIONS ${COMPILE_OPTIONS_TD}) | ||
39 | if(USE_PREBUILT_LLVM) | ||
40 | set(TABLEGEN_ADDITIONAL -I ${LLVM_INCLUDE_DIRS}) | ||
41 | -- | ||
42 | 2.17.1 | ||
43 | |||
diff --git a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_9.0.0.bb b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_10.0.0.bb index 695749cc..cc897c64 100644 --- a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_9.0.0.bb +++ b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_10.0.0.bb | |||
@@ -5,17 +5,17 @@ DESCRIPTION = "Common clang has OpenCL-oriented API and is capable \ | |||
5 | LICENSE = "NCSA" | 5 | LICENSE = "NCSA" |
6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=e8a15bf1416762a09ece07e44c79118c" | 6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=e8a15bf1416762a09ece07e44c79118c" |
7 | 7 | ||
8 | SRC_URI = "git://github.com/intel/opencl-clang.git;branch=ocl-open-90;protocol=https \ | 8 | SRC_URI = "git://github.com/intel/opencl-clang.git;branch=ocl-open-100;protocol=https \ |
9 | file://point-to-correct-llvm-tblgen.patch \ | 9 | file://0001-don-t-redefine-LLVM_TABLEGEN_EXE.patch \ |
10 | file://link-with-all-libs.patch \ | ||
10 | " | 11 | " |
11 | 12 | ||
12 | SRCREV = "e6049638474112ad26db13eb167a16b2d497b841" | 13 | SRCREV = "0a5a9f67b56431ef7b9436d1af812df6dfb44975" |
13 | 14 | ||
14 | S = "${WORKDIR}/git" | 15 | S = "${WORKDIR}/git" |
15 | 16 | ||
16 | inherit cmake | 17 | inherit cmake |
17 | DEPENDS += "clang" | 18 | DEPENDS += "clang" |
18 | |||
19 | DEPENDS_append_class-target = " opencl-clang-native" | 19 | DEPENDS_append_class-target = " opencl-clang-native" |
20 | 20 | ||
21 | COMPATIBLE_HOST = '(x86_64).*-linux' | 21 | COMPATIBLE_HOST = '(x86_64).*-linux' |