From 32c58bc481ee94e67892cc6a91d0f3bf87d1f47f Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 18 Jul 2016 01:10:50 -0700 Subject: compiler-rt: Fix build for sanitizers on x86_64 Signed-off-by: Khem Raj --- .../0004-Disable-tsan-on-OE-glibc.patch | 29 ++++++++++++++++++++++ recipes-devtools/clang/compiler-rt_git.bb | 1 + 2 files changed, 30 insertions(+) create mode 100644 recipes-devtools/clang/compiler-rt/0004-Disable-tsan-on-OE-glibc.patch diff --git a/recipes-devtools/clang/compiler-rt/0004-Disable-tsan-on-OE-glibc.patch b/recipes-devtools/clang/compiler-rt/0004-Disable-tsan-on-OE-glibc.patch new file mode 100644 index 0000000..01c6caf --- /dev/null +++ b/recipes-devtools/clang/compiler-rt/0004-Disable-tsan-on-OE-glibc.patch @@ -0,0 +1,29 @@ +From a74650380d930a049aeee3c90c70141ad4178d0b Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 18 Jul 2016 08:05:02 +0000 +Subject: [PATCH 4/4] Disable tsan on OE/glibc + +It does not build see +http://lists.llvm.org/pipermail/llvm-dev/2016-July/102235.html + +Signed-off-by: Khem Raj +--- + cmake/config-ix.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake +index ddb0304..4241771 100644 +--- a/cmake/config-ix.cmake ++++ b/cmake/config-ix.cmake +@@ -452,7 +452,7 @@ else() + endif() + + if (COMPILER_RT_HAS_SANITIZER_COMMON AND TSAN_SUPPORTED_ARCH AND +- OS_NAME MATCHES "Darwin|Linux|FreeBSD") ++ OS_NAME MATCHES "Darwin|FreeBSD") + set(COMPILER_RT_HAS_TSAN TRUE) + else() + set(COMPILER_RT_HAS_TSAN FALSE) +-- +2.9.0 + diff --git a/recipes-devtools/clang/compiler-rt_git.bb b/recipes-devtools/clang/compiler-rt_git.bb index 1fde158..6901473 100644 --- a/recipes-devtools/clang/compiler-rt_git.bb +++ b/recipes-devtools/clang/compiler-rt_git.bb @@ -20,6 +20,7 @@ SRC_URI = "${LLVM_GIT}/compiler-rt.git;protocol=${LLVM_GIT_PROTOCOL};branch=${B file://0001-Remove-fatal-check-for-explicit-COMPILER_RT_DEFAULT_.patch \ file://0002-support-a-new-embedded-linux-target.patch \ file://0003-Simplify-cross-compilation.-Don-t-use-native-compile.patch \ + file://0004-Disable-tsan-on-OE-glibc.patch \ " SRCREV_FORMAT = "compiler-rt" -- cgit v1.2.3-54-g00ecf