[llvm-branch-commits] [compiler-rt] 40c0ae9 - [scudo] Try to fix standalone build on armv7

[Tobias Hieta via llvm-branch-commits]

Author: Diana Picus
Date: 2022-08-10T10:58:42+02:00
New Revision: 40c0ae95cb571c6e07e9d16fe96002ca622d4c2a

URL: https://github.com/llvm/llvm-project/commit/40c0ae95cb571c6e07e9d16fe96002ca622d4c2a
DIFF: https://github.com/llvm/llvm-project/commit/40c0ae95cb571c6e07e9d16fe96002ca622d4c2a.diff

LOG: [scudo] Try to fix standalone build on armv7

When linking scudo standalone on armv7, it can't find symbols related to
unwinding (e.g. __aeabi_unwind_cpp_pr0). This is because it is passing
--unwindlib=none. This patch hacks around the issue by adding
COMPILER_RT_UNWINDER_LINK_LIBS to the link line.

I don't know anything about scudo, so I'm not sure what the original
intention was.

See also https://github.com/llvm/llvm-project/issues/56900

Differential Revision: https://reviews.llvm.org/D131250

(cherry picked from commit 8342ea6eac85bd20c56be0ab71b4ebbccd134c67)

Added: 
    

Modified: 
    compiler-rt/lib/scudo/standalone/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/compiler-rt/lib/scudo/standalone/CMakeLists.txt b/compiler-rt/lib/scudo/standalone/CMakeLists.txt
index f439f6f9d2d6..4b586bc662b4 100644
--- a/compiler-rt/lib/scudo/standalone/CMakeLists.txt
+++ b/compiler-rt/lib/scudo/standalone/CMakeLists.txt
@@ -135,7 +135,7 @@ if (COMPILER_RT_HAS_GWP_ASAN)
 
 endif()
 
-set(SCUDO_LINK_LIBS)
+set(SCUDO_LINK_LIBS ${COMPILER_RT_UNWINDER_LINK_LIBS})
 
 append_list_if(COMPILER_RT_HAS_LIBPTHREAD -pthread SCUDO_LINK_FLAGS)