diff options
author | Naveen Saini <naveen.kumar.saini@intel.com> | 2020-02-07 16:46:14 +0800 |
---|---|---|
committer | Anuj Mittal <anuj.mittal@intel.com> | 2020-02-11 14:32:30 +0800 |
commit | 0b6fd29c9f166fce4cdb45e26e5f2bb9255e5df1 (patch) | |
tree | 2b11695f461c41e9902111da26ce04be092bdaea /dynamic-layers/clang-layer/recipes-devtools | |
parent | 987cd9b049df167d524495aed328f6ceca146f32 (diff) | |
download | meta-intel-0b6fd29c9f166fce4cdb45e26e5f2bb9255e5df1.tar.gz |
llvm-project-source: drop patch
Patch is already carried by meta-clang layer.
https://github.com/kraj/meta-clang/commit/ab686950af8d7f02e0ca614d277c7c0ca36954ed
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')
2 files changed, 0 insertions, 69 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/llvm-project-source.bbappend b/dynamic-layers/clang-layer/recipes-devtools/clang/llvm-project-source.bbappend index 6a45c944..65115bce 100644 --- a/dynamic-layers/clang-layer/recipes-devtools/clang/llvm-project-source.bbappend +++ b/dynamic-layers/clang-layer/recipes-devtools/clang/llvm-project-source.bbappend | |||
@@ -1,7 +1,6 @@ | |||
1 | FILESEXTRAPATHS_prepend_intel-x86-common := "${THISDIR}/files:" | 1 | FILESEXTRAPATHS_prepend_intel-x86-common := "${THISDIR}/files:" |
2 | 2 | ||
3 | SRC_URI_append_intel-x86-common = " \ | 3 | SRC_URI_append_intel-x86-common = " \ |
4 | file://0001-dont-export-targets-for-binaries.patch \ | ||
5 | file://BasicBlockUtils-Add-metadata-fixing-in-SplitBlockPre.patch;patchdir=llvm \ | 4 | file://BasicBlockUtils-Add-metadata-fixing-in-SplitBlockPre.patch;patchdir=llvm \ |
6 | file://IndVarSimplify-Do-not-use-SCEV-expander-for-IVCount-.patch;patchdir=llvm \ | 5 | file://IndVarSimplify-Do-not-use-SCEV-expander-for-IVCount-.patch;patchdir=llvm \ |
7 | git://github.com/KhronosGroup/SPIRV-LLVM-Translator.git;protocol=https;branch=llvm_release_90;destsuffix=git/llvm/projects/llvm-spirv;name=spirv \ | 6 | git://github.com/KhronosGroup/SPIRV-LLVM-Translator.git;protocol=https;branch=llvm_release_90;destsuffix=git/llvm/projects/llvm-spirv;name=spirv \ |