diff options
author | Naveen Saini <naveen.kumar.saini@intel.com> | 2020-07-21 16:55:25 +0800 |
---|---|---|
committer | Anuj Mittal <anuj.mittal@intel.com> | 2020-07-22 12:32:46 +0800 |
commit | ae7f71a65d1ca3dd9bea3384fec693fc5e70bddf (patch) | |
tree | fc229cc1a4e0fd67a81d34d9123a4b2a1807422a /dynamic-layers/clang-layer/recipes-devtools/clang/files | |
parent | 085ba92a5930e841362b2294f7b6869e21697cd5 (diff) | |
download | meta-intel-ae7f71a65d1ca3dd9bea3384fec693fc5e70bddf.tar.gz |
llvm-project-source: drop llvm9 support
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Diffstat (limited to 'dynamic-layers/clang-layer/recipes-devtools/clang/files')
2 files changed, 0 insertions, 119 deletions
diff --git a/dynamic-layers/clang-layer/recipes-devtools/clang/files/0001-dont-export-targets-for-binaries.patch b/dynamic-layers/clang-layer/recipes-devtools/clang/files/0001-dont-export-targets-for-binaries.patch deleted file mode 100644 index da2475f9..00000000 --- a/dynamic-layers/clang-layer/recipes-devtools/clang/files/0001-dont-export-targets-for-binaries.patch +++ /dev/null | |||
@@ -1,68 +0,0 @@ | |||
1 | From 559fb8f82295ec4dc64a132b6566939b85c1b6fe Mon Sep 17 00:00:00 2001 | ||
2 | From: Anuj Mittal <anuj.mittal@intel.com> | ||
3 | Date: Thu, 15 Aug 2019 22:34:31 +0800 | ||
4 | Subject: [PATCH] dont export targets for binaries | ||
5 | |||
6 | The projects using LLVM cmake modules look for target binaries in | ||
7 | sysroot as a result which isn't desirable in this case and isn't needed | ||
8 | either. | ||
9 | |||
10 | Upstream-Status: Inappropriate [cross-compile specific] | ||
11 | |||
12 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
13 | Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> | ||
14 | --- | ||
15 | llvm/cmake/modules/AddLLVM.cmake | 9 --------- | ||
16 | llvm/cmake/modules/TableGen.cmake | 6 ------ | ||
17 | 2 files changed, 15 deletions(-) | ||
18 | |||
19 | diff --git a/llvm/cmake/modules/AddLLVM.cmake b/llvm/cmake/modules/AddLLVM.cmake | ||
20 | index 619e986b8aa..d2bc1a25dd9 100644 | ||
21 | --- a/llvm/cmake/modules/AddLLVM.cmake | ||
22 | +++ b/llvm/cmake/modules/AddLLVM.cmake | ||
23 | @@ -898,12 +898,6 @@ macro(add_llvm_tool name) | ||
24 | |||
25 | if ( ${name} IN_LIST LLVM_TOOLCHAIN_TOOLS OR NOT LLVM_INSTALL_TOOLCHAIN_ONLY) | ||
26 | if( LLVM_BUILD_TOOLS ) | ||
27 | - set(export_to_llvmexports) | ||
28 | - if(${name} IN_LIST LLVM_DISTRIBUTION_COMPONENTS OR | ||
29 | - NOT LLVM_DISTRIBUTION_COMPONENTS) | ||
30 | - set(export_to_llvmexports EXPORT LLVMExports) | ||
31 | - set_property(GLOBAL PROPERTY LLVM_HAS_EXPORTS True) | ||
32 | - endif() | ||
33 | |||
34 | install(TARGETS ${name} | ||
35 | ${export_to_llvmexports} | ||
36 | @@ -917,9 +911,6 @@ macro(add_llvm_tool name) | ||
37 | endif() | ||
38 | endif() | ||
39 | endif() | ||
40 | - if( LLVM_BUILD_TOOLS ) | ||
41 | - set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS ${name}) | ||
42 | - endif() | ||
43 | set_target_properties(${name} PROPERTIES FOLDER "Tools") | ||
44 | endmacro(add_llvm_tool name) | ||
45 | |||
46 | diff --git a/llvm/cmake/modules/TableGen.cmake b/llvm/cmake/modules/TableGen.cmake | ||
47 | index 36c026b5c0f..537acd696d8 100644 | ||
48 | --- a/llvm/cmake/modules/TableGen.cmake | ||
49 | +++ b/llvm/cmake/modules/TableGen.cmake | ||
50 | @@ -148,15 +148,9 @@ macro(add_tablegen target project) | ||
51 | endif() | ||
52 | |||
53 | if (${project} STREQUAL LLVM AND NOT LLVM_INSTALL_TOOLCHAIN_ONLY AND LLVM_BUILD_UTILS) | ||
54 | - set(export_to_llvmexports) | ||
55 | - if(${target} IN_LIST LLVM_DISTRIBUTION_COMPONENTS OR | ||
56 | - NOT LLVM_DISTRIBUTION_COMPONENTS) | ||
57 | - set(export_to_llvmexports EXPORT LLVMExports) | ||
58 | - endif() | ||
59 | |||
60 | install(TARGETS ${target} | ||
61 | ${export_to_llvmexports} | ||
62 | RUNTIME DESTINATION ${LLVM_TOOLS_INSTALL_DIR}) | ||
63 | endif() | ||
64 | - set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS ${target}) | ||
65 | endmacro() | ||
66 | -- | ||
67 | 2.17.1 | ||
68 | |||
diff --git a/dynamic-layers/clang-layer/recipes-devtools/clang/files/llvm9-skip-building-tests.patch b/dynamic-layers/clang-layer/recipes-devtools/clang/files/llvm9-skip-building-tests.patch deleted file mode 100644 index 9a7b8445..00000000 --- a/dynamic-layers/clang-layer/recipes-devtools/clang/files/llvm9-skip-building-tests.patch +++ /dev/null | |||
@@ -1,51 +0,0 @@ | |||
1 | From 48e50f06b1bbed94cdf5207587161d4bfce7366e Mon Sep 17 00:00:00 2001 | ||
2 | From: Naveen Saini <naveen.kumar.saini@intel.com> | ||
3 | Date: Wed, 21 Aug 2019 14:35:31 +0800 | ||
4 | Subject: [PATCH] llvm-spirv: skip building tests | ||
5 | |||
6 | Some of these need clang to be built and since we're building this in-tree, | ||
7 | that leads to problems when compiling libcxx, compiler-rt which aren't built | ||
8 | in-tree. | ||
9 | |||
10 | Instead of using SPIRV_SKIP_CLANG_BUILD to skip clang build and adding this to | ||
11 | all components, disable the building of tests altogether. | ||
12 | |||
13 | Upstream-Status: Inappropriate | ||
14 | |||
15 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
16 | Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> | ||
17 | --- | ||
18 | CMakeLists.txt | 10 ---------- | ||
19 | 1 file changed, 10 deletions(-) | ||
20 | |||
21 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
22 | index 1208741..20ca3e6 100644 | ||
23 | --- a/CMakeLists.txt | ||
24 | +++ b/CMakeLists.txt | ||
25 | @@ -15,13 +15,6 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) | ||
26 | set(CMAKE_CXX_STANDARD 11) | ||
27 | set(CMAKE_CXX_STANDARD_REQUIRED ON) | ||
28 | |||
29 | - if(LLVM_INCLUDE_TESTS) | ||
30 | - set(LLVM_TEST_COMPONENTS | ||
31 | - llvm-as | ||
32 | - llvm-dis | ||
33 | - ) | ||
34 | - endif(LLVM_INCLUDE_TESTS) | ||
35 | - | ||
36 | find_package(LLVM 9.0.0 REQUIRED | ||
37 | COMPONENTS | ||
38 | Analysis | ||
39 | @@ -56,9 +49,6 @@ set(LLVM_SPIRV_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include) | ||
40 | |||
41 | add_subdirectory(lib/SPIRV) | ||
42 | add_subdirectory(tools/llvm-spirv) | ||
43 | -if(LLVM_INCLUDE_TESTS) | ||
44 | - add_subdirectory(test) | ||
45 | -endif(LLVM_INCLUDE_TESTS) | ||
46 | |||
47 | install( | ||
48 | FILES | ||
49 | -- | ||
50 | 2.17.1 | ||
51 | |||