[compiler-rt] cd8bba9 - Revert "[compiler-rt] Improve defaults for Android"

[Shoaib Meenai via llvm-commits]

Author: Shoaib Meenai
Date: 2023-08-29T10:37:49-07:00
New Revision: cd8bba941f06e17cfdab8cb2b31e9171f019fe29

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

LOG: Revert "[compiler-rt] Improve defaults for Android"

This reverts commit cf403c10fba72ddc6a083a0e1603974d0749c6b3.

This is breaking Android sanitizer buildbots (see the discussion on
https://reviews.llvm.org/D158793).

Added: 
    

Modified: 
    compiler-rt/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/compiler-rt/CMakeLists.txt b/compiler-rt/CMakeLists.txt
index d1409318ee0a66..3888995811d894 100644
--- a/compiler-rt/CMakeLists.txt
+++ b/compiler-rt/CMakeLists.txt
@@ -197,7 +197,7 @@ macro(handle_default_cxx_lib var)
     if (APPLE OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
       set(${var}_LIBNAME "libc++")
       set(${var}_SYSTEM 1)
-    elseif (ANDROID OR FUCHSIA)
+    elseif (FUCHSIA)
       set(${var}_LIBNAME "libc++")
       set(${var}_INTREE 1)
     else()
@@ -227,19 +227,13 @@ set(CXXLIBS none default libstdc++ libc++)
 set_property(CACHE SANITIZER_TEST_CXX PROPERTY STRINGS ;${CXXLIBS})
 handle_default_cxx_lib(SANITIZER_TEST_CXX)
 
-set(DEFAULT_COMPILER_RT_USE_LLVM_UNWINDER OFF)
-if (ANDROID)
-  set(DEFAULT_COMPILER_RT_USE_LLVM_UNWINDER ON)
-endif()
-
-option(COMPILER_RT_USE_LLVM_UNWINDER
-  "Use the LLVM unwinder." ${DEFAULT_COMPILER_RT_USE_LLVM_UNWINDER})
+option(COMPILER_RT_USE_LLVM_UNWINDER "Use the LLVM unwinder." OFF)
 cmake_dependent_option(COMPILER_RT_ENABLE_STATIC_UNWINDER
   "Statically link the LLVM unwinder." OFF
   "COMPILER_RT_USE_LLVM_UNWINDER" OFF)
 
 set(DEFAULT_SANITIZER_USE_STATIC_LLVM_UNWINDER OFF)
-if (ANDROID OR FUCHSIA)
+if (FUCHSIA)
   set(DEFAULT_SANITIZER_USE_STATIC_LLVM_UNWINDER ON)
 elseif (DEFINED LIBUNWIND_ENABLE_SHARED AND NOT LIBUNWIND_ENABLE_SHARED)
   set(DEFAULT_SANITIZER_USE_STATIC_LLVM_UNWINDER ON)
@@ -277,7 +271,7 @@ cmake_dependent_option(COMPILER_RT_STATIC_CXX_LIBRARY
   "COMPILER_RT_CXX_LIBRARY" OFF)
 
 set(DEFAULT_COMPILER_RT_USE_BUILTINS_LIBRARY OFF)
-if (ANDROID OR FUCHSIA)
+if (FUCHSIA)
   set(DEFAULT_COMPILER_RT_USE_BUILTINS_LIBRARY ON)
 endif()