[compiler-rt] 5abef0b - Revert "[compiler-rt] Fix scudo build on ARM"

[Leandro Lupori via llvm-commits]

Author: Leandro Lupori
Date: 2023-04-04T14:26:13-03:00
New Revision: 5abef0bdbe9237b5728215bb7cd915ffb960e5c3

URL: https://github.com/llvm/llvm-project/commit/5abef0bdbe9237b5728215bb7cd915ffb960e5c3
DIFF: https://github.com/llvm/llvm-project/commit/5abef0bdbe9237b5728215bb7cd915ffb960e5c3.diff

LOG: Revert "[compiler-rt] Fix scudo build on ARM"

This broke fuchsia cross-compile.

This reverts commit f1f3dd64bfd2af94f9cccd01cf9e213fe3e69707.

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 1626aaab7e1b3..86d4a47a391bc 100644
--- a/compiler-rt/lib/scudo/standalone/CMakeLists.txt
+++ b/compiler-rt/lib/scudo/standalone/CMakeLists.txt
@@ -138,19 +138,8 @@ set(SCUDO_SOURCES_CXX_WRAPPERS
   )
 
 set(SCUDO_OBJECT_LIBS)
-set(SCUDO_LINK_LIBS)
 
 if (COMPILER_RT_HAS_GWP_ASAN)
-  if(COMPILER_RT_USE_LLVM_UNWINDER)
-    list(APPEND SCUDO_LINK_LIBS ${COMPILER_RT_UNWINDER_LINK_LIBS} dl)
-  elseif (COMPILER_RT_HAS_GCC_S_LIB)
-    list(APPEND SCUDO_LINK_LIBS gcc_s)
-  elseif (COMPILER_RT_HAS_GCC_LIB)
-    list(APPEND SCUDO_LINK_LIBS gcc)
-  else()
-    message(FATAL_ERROR "No suitable unwinder library")
-  endif()
-
   add_dependencies(scudo_standalone gwp_asan)
   list(APPEND SCUDO_OBJECT_LIBS
        RTGwpAsan RTGwpAsanBacktraceLibc RTGwpAsanSegvHandler
@@ -163,6 +152,8 @@ if (COMPILER_RT_HAS_GWP_ASAN)
 
 endif()
 
+set(SCUDO_LINK_LIBS ${COMPILER_RT_UNWINDER_LINK_LIBS})
+
 if(COMPILER_RT_BUILD_SCUDO_STANDALONE_WITH_LLVM_LIBC)
   include_directories(${COMPILER_RT_BINARY_DIR}/../libc/include/)