From 85c1247d641e8f3286151cf77c8a888955a4fbb1 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 21 May 2021 08:21:09 -0700 Subject: compiler-rt-sanitizers: Fix build on mips Signed-off-by: Khem Raj --- ...-Link-scudo-standalone-with-libatomic-on-.patch | 29 ++++++++++++++++++++++ recipes-devtools/clang/common.inc | 1 + 2 files changed, 30 insertions(+) create mode 100644 recipes-devtools/clang/clang/0032-compiler-rt-Link-scudo-standalone-with-libatomic-on-.patch (limited to 'recipes-devtools/clang') diff --git a/recipes-devtools/clang/clang/0032-compiler-rt-Link-scudo-standalone-with-libatomic-on-.patch b/recipes-devtools/clang/clang/0032-compiler-rt-Link-scudo-standalone-with-libatomic-on-.patch new file mode 100644 index 0000000..6289e8b --- /dev/null +++ b/recipes-devtools/clang/clang/0032-compiler-rt-Link-scudo-standalone-with-libatomic-on-.patch @@ -0,0 +1,29 @@ +From b7247e617cef1ed277c17bf0970104ccf55c5d92 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 21 May 2021 08:14:29 -0700 +Subject: [PATCH] compiler-rt: Link scudo standalone with libatomic on mips + +clang on mips generate atomic built-ins which should be provided by +libatomic + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + compiler-rt/lib/scudo/standalone/CMakeLists.txt | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/compiler-rt/lib/scudo/standalone/CMakeLists.txt b/compiler-rt/lib/scudo/standalone/CMakeLists.txt +index 572ad078423f..8e5c0eaad211 100644 +--- a/compiler-rt/lib/scudo/standalone/CMakeLists.txt ++++ b/compiler-rt/lib/scudo/standalone/CMakeLists.txt +@@ -131,6 +131,10 @@ append_list_if(COMPILER_RT_HAS_LIBPTHREAD -pthread SCUDO_LINK_FLAGS) + + append_list_if(FUCHSIA zircon SCUDO_LINK_LIBS) + ++if (CMAKE_SYSTEM_PROCESSOR MATCHES "mips" AND CMAKE_SYSTEM_NAME MATCHES "Linux") ++ list(APPEND SCUDO_LINK_LIBS atomic) ++endif() ++ + if(COMPILER_RT_HAS_SCUDO_STANDALONE) + add_compiler_rt_object_libraries(RTScudoStandalone + ARCHS ${SCUDO_STANDALONE_SUPPORTED_ARCH} diff --git a/recipes-devtools/clang/common.inc b/recipes-devtools/clang/common.inc index 35553a1..d529c0d 100644 --- a/recipes-devtools/clang/common.inc +++ b/recipes-devtools/clang/common.inc @@ -40,6 +40,7 @@ SRC_URI = "\ file://0029-compiler-rt-Do-not-use-backtrace-APIs-on-non-glibc-l.patch \ file://0030-clang-Fix-x86-triple-for-non-debian-multiarch-linux-.patch \ file://0031-compiler-rt-Link-scudo-with-SANITIZER_CXX_ABI_LIBRAR.patch \ + file://0032-compiler-rt-Link-scudo-standalone-with-libatomic-on-.patch \ " # Fallback to no-PIE if not set GCCPIE ??= "" -- cgit v1.2.3-54-g00ecf