diff options
| author | Yogesh Tyagi <yogesh.tyagi@intel.com> | 2026-01-07 12:41:48 +0530 |
|---|---|---|
| committer | Yogesh Tyagi <yogesh.tyagi@intel.com> | 2026-01-07 12:41:48 +0530 |
| commit | 6bcc26d094970ebbac48a5091dac7d58dbea2855 (patch) | |
| tree | b5bfd0d2b6b35f2530252e0a9b76d6f946fb7952 /recipes-opencl/opencl-clang/files | |
| parent | 2db3f5c173b8e699173356fa0859cf06acd29555 (diff) | |
| download | meta-intel-6bcc26d094970ebbac48a5091dac7d58dbea2855.tar.gz | |
Revert "Support whinlatter only"
This reverts commit 36e44b684cc74e5d3112f7e430e8ef563d69ee92.
Diffstat (limited to 'recipes-opencl/opencl-clang/files')
2 files changed, 0 insertions, 109 deletions
diff --git a/recipes-opencl/opencl-clang/files/0001-cl_headers-CMakeLists.txt-use-clang-from-native-sysr.patch b/recipes-opencl/opencl-clang/files/0001-cl_headers-CMakeLists.txt-use-clang-from-native-sysr.patch deleted file mode 100644 index 031a77c7..00000000 --- a/recipes-opencl/opencl-clang/files/0001-cl_headers-CMakeLists.txt-use-clang-from-native-sysr.patch +++ /dev/null | |||
| @@ -1,49 +0,0 @@ | |||
| 1 | From 5aea653e611b59c70e529a1bd71885a509831557 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Anuj Mittal <anuj.mittal@intel.com> | ||
| 3 | Date: Tue, 1 Aug 2023 11:15:31 +0800 | ||
| 4 | Subject: [PATCH] cl_headers/CMakeLists.txt: use clang from native sysroot | ||
| 5 | |||
| 6 | Allow clang to be found in target sysroot for target builds and dont try | ||
| 7 | to compile cross binaries, we do that ourselves. | ||
| 8 | |||
| 9 | Upstream-Status: Inappropriate [oe-specific] | ||
| 10 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
| 11 | --- | ||
| 12 | CMakeLists.txt | 8 ++++---- | ||
| 13 | cl_headers/CMakeLists.txt | 2 +- | ||
| 14 | 2 files changed, 5 insertions(+), 5 deletions(-) | ||
| 15 | |||
| 16 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| 17 | index 5864009..60ba39e 100644 | ||
| 18 | --- a/CMakeLists.txt | ||
| 19 | +++ b/CMakeLists.txt | ||
| 20 | @@ -35,10 +35,10 @@ set(CMAKE_MODULE_PATH | ||
| 21 | |||
| 22 | include(CMakeFunctions) | ||
| 23 | |||
| 24 | -if(CMAKE_CROSSCOMPILING AND OPENCL_CLANG_BUILD_EXTERNAL) | ||
| 25 | - include(CrossCompile) | ||
| 26 | - llvm_create_cross_target(${PROJECT_NAME} NATIVE "" Release) | ||
| 27 | -endif() | ||
| 28 | +#if(CMAKE_CROSSCOMPILING AND OPENCL_CLANG_BUILD_EXTERNAL) | ||
| 29 | +# include(CrossCompile) | ||
| 30 | +# llvm_create_cross_target(${PROJECT_NAME} NATIVE "" Release) | ||
| 31 | +#endif() | ||
| 32 | |||
| 33 | if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) | ||
| 34 | set(USE_PREBUILT_LLVM ON) | ||
| 35 | diff --git a/cl_headers/CMakeLists.txt b/cl_headers/CMakeLists.txt | ||
| 36 | index 16cabb7..4423536 100644 | ||
| 37 | --- a/cl_headers/CMakeLists.txt | ||
| 38 | +++ b/cl_headers/CMakeLists.txt | ||
| 39 | @@ -1,6 +1,6 @@ | ||
| 40 | set(CL_HEADERS_LIB cl_headers) | ||
| 41 | if(USE_PREBUILT_LLVM) | ||
| 42 | - find_program(CLANG_COMMAND clang PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) | ||
| 43 | + find_program(CLANG_COMMAND clang PATHS ${LLVM_TOOLS_BINARY_DIR}) | ||
| 44 | else() | ||
| 45 | set(CLANG_COMMAND $<TARGET_FILE:clang>) | ||
| 46 | endif() | ||
| 47 | -- | ||
| 48 | 2.37.3 | ||
| 49 | |||
diff --git a/recipes-opencl/opencl-clang/files/0002-Request-native-clang-only-when-cross-compiling-464.patch b/recipes-opencl/opencl-clang/files/0002-Request-native-clang-only-when-cross-compiling-464.patch deleted file mode 100644 index 2f1814f8..00000000 --- a/recipes-opencl/opencl-clang/files/0002-Request-native-clang-only-when-cross-compiling-464.patch +++ /dev/null | |||
| @@ -1,60 +0,0 @@ | |||
| 1 | From 43c806ef321b1f677a49d28c89fb7ffecf539c2d Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Tim Creech <timothy.m.creech@intel.com> | ||
| 3 | Date: Wed, 28 Jun 2023 03:45:51 -0400 | ||
| 4 | Subject: [PATCH 2/2] Request native clang only when cross-compiling (#464) | ||
| 5 | |||
| 6 | * Request native clang only when cross-compiling | ||
| 7 | |||
| 8 | LLVM_USE_HOST_TOOLS may be set if LLVM is configured with | ||
| 9 | LLVM_OPTIMIZED_TABLEGEN, which does not necessarily indicate | ||
| 10 | cross-compilation or that clang will only execute on the target. | ||
| 11 | |||
| 12 | By checking that CMAKE_CROSSCOMPILING is set, we ensure that we only | ||
| 13 | build/use clang again if necessary for host execution. | ||
| 14 | |||
| 15 | * fixup: CMAKE_CROSSCOMPILING implies LLVM_USE_HOST_TOOLS | ||
| 16 | |||
| 17 | Co-authored-by: Wenju He <wenju.he@intel.com> | ||
| 18 | |||
| 19 | * fixup: also use CMAKE_CROSSCOMPILING in top-level CMakeLists.txt | ||
| 20 | |||
| 21 | --------- | ||
| 22 | |||
| 23 | Co-authored-by: Wenju He <wenju.he@intel.com> | ||
| 24 | |||
| 25 | Upstream-Status: Backport [https://github.com/intel/opencl-clang/commit/53843eee13cfb2357919ee02714a43bef1af0f86] | ||
| 26 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
| 27 | --- | ||
| 28 | CMakeLists.txt | 2 +- | ||
| 29 | cl_headers/CMakeLists.txt | 2 +- | ||
| 30 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
| 31 | |||
| 32 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| 33 | index e772de9..5864009 100644 | ||
| 34 | --- a/CMakeLists.txt | ||
| 35 | +++ b/CMakeLists.txt | ||
| 36 | @@ -35,7 +35,7 @@ set(CMAKE_MODULE_PATH | ||
| 37 | |||
| 38 | include(CMakeFunctions) | ||
| 39 | |||
| 40 | -if(LLVM_USE_HOST_TOOLS AND OPENCL_CLANG_BUILD_EXTERNAL) | ||
| 41 | +if(CMAKE_CROSSCOMPILING AND OPENCL_CLANG_BUILD_EXTERNAL) | ||
| 42 | include(CrossCompile) | ||
| 43 | llvm_create_cross_target(${PROJECT_NAME} NATIVE "" Release) | ||
| 44 | endif() | ||
| 45 | diff --git a/cl_headers/CMakeLists.txt b/cl_headers/CMakeLists.txt | ||
| 46 | index 18296c2..16cabb7 100644 | ||
| 47 | --- a/cl_headers/CMakeLists.txt | ||
| 48 | +++ b/cl_headers/CMakeLists.txt | ||
| 49 | @@ -4,7 +4,7 @@ if(USE_PREBUILT_LLVM) | ||
| 50 | else() | ||
| 51 | set(CLANG_COMMAND $<TARGET_FILE:clang>) | ||
| 52 | endif() | ||
| 53 | -if(LLVM_USE_HOST_TOOLS AND NOT OPENCL_CLANG_BUILD_EXTERNAL) | ||
| 54 | +if(CMAKE_CROSSCOMPILING AND NOT OPENCL_CLANG_BUILD_EXTERNAL) | ||
| 55 | build_native_tool(clang CLANG_COMMAND) | ||
| 56 | endif() | ||
| 57 | |||
| 58 | -- | ||
| 59 | 2.37.3 | ||
| 60 | |||
