From 0b6fd29c9f166fce4cdb45e26e5f2bb9255e5df1 Mon Sep 17 00:00:00 2001 From: Naveen Saini Date: Fri, 7 Feb 2020 16:46:14 +0800 Subject: 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 Signed-off-by: Anuj Mittal --- .../0001-dont-export-targets-for-binaries.patch | 68 ---------------------- .../clang/llvm-project-source.bbappend | 1 - 2 files changed, 69 deletions(-) delete mode 100644 dynamic-layers/clang-layer/recipes-devtools/clang/files/0001-dont-export-targets-for-binaries.patch (limited to 'dynamic-layers') 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 @@ -From 559fb8f82295ec4dc64a132b6566939b85c1b6fe Mon Sep 17 00:00:00 2001 -From: Anuj Mittal -Date: Thu, 15 Aug 2019 22:34:31 +0800 -Subject: [PATCH] dont export targets for binaries - -The projects using LLVM cmake modules look for target binaries in -sysroot as a result which isn't desirable in this case and isn't needed -either. - -Upstream-Status: Inappropriate [cross-compile specific] - -Signed-off-by: Anuj Mittal -Signed-off-by: Naveen Saini ---- - llvm/cmake/modules/AddLLVM.cmake | 9 --------- - llvm/cmake/modules/TableGen.cmake | 6 ------ - 2 files changed, 15 deletions(-) - -diff --git a/llvm/cmake/modules/AddLLVM.cmake b/llvm/cmake/modules/AddLLVM.cmake -index 619e986b8aa..d2bc1a25dd9 100644 ---- a/llvm/cmake/modules/AddLLVM.cmake -+++ b/llvm/cmake/modules/AddLLVM.cmake -@@ -898,12 +898,6 @@ macro(add_llvm_tool name) - - if ( ${name} IN_LIST LLVM_TOOLCHAIN_TOOLS OR NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - if( LLVM_BUILD_TOOLS ) -- set(export_to_llvmexports) -- if(${name} IN_LIST LLVM_DISTRIBUTION_COMPONENTS OR -- NOT LLVM_DISTRIBUTION_COMPONENTS) -- set(export_to_llvmexports EXPORT LLVMExports) -- set_property(GLOBAL PROPERTY LLVM_HAS_EXPORTS True) -- endif() - - install(TARGETS ${name} - ${export_to_llvmexports} -@@ -917,9 +911,6 @@ macro(add_llvm_tool name) - endif() - endif() - endif() -- if( LLVM_BUILD_TOOLS ) -- set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS ${name}) -- endif() - set_target_properties(${name} PROPERTIES FOLDER "Tools") - endmacro(add_llvm_tool name) - -diff --git a/llvm/cmake/modules/TableGen.cmake b/llvm/cmake/modules/TableGen.cmake -index 36c026b5c0f..537acd696d8 100644 ---- a/llvm/cmake/modules/TableGen.cmake -+++ b/llvm/cmake/modules/TableGen.cmake -@@ -148,15 +148,9 @@ macro(add_tablegen target project) - endif() - - if (${project} STREQUAL LLVM AND NOT LLVM_INSTALL_TOOLCHAIN_ONLY AND LLVM_BUILD_UTILS) -- set(export_to_llvmexports) -- if(${target} IN_LIST LLVM_DISTRIBUTION_COMPONENTS OR -- NOT LLVM_DISTRIBUTION_COMPONENTS) -- set(export_to_llvmexports EXPORT LLVMExports) -- endif() - - install(TARGETS ${target} - ${export_to_llvmexports} - RUNTIME DESTINATION ${LLVM_TOOLS_INSTALL_DIR}) - endif() -- set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS ${target}) - endmacro() --- -2.17.1 - 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 @@ FILESEXTRAPATHS_prepend_intel-x86-common := "${THISDIR}/files:" SRC_URI_append_intel-x86-common = " \ - file://0001-dont-export-targets-for-binaries.patch \ file://BasicBlockUtils-Add-metadata-fixing-in-SplitBlockPre.patch;patchdir=llvm \ file://IndVarSimplify-Do-not-use-SCEV-expander-for-IVCount-.patch;patchdir=llvm \ git://github.com/KhronosGroup/SPIRV-LLVM-Translator.git;protocol=https;branch=llvm_release_90;destsuffix=git/llvm/projects/llvm-spirv;name=spirv \ -- cgit v1.2.3-54-g00ecf