[asan] Enable SEGV handler on Android by default.

Seems stable enough.
Fixes null_deref.cc test.

llvm-svn: 201326

diff --git a/compiler-rt/lib/asan/tests/CMakeLists.txt b/compiler-rt/lib/asan/tests/CMakeLists.txt
index 0c890f9..b0363f3 100644 (file)
--- a/compiler-rt/lib/asan/tests/CMakeLists.txt
+++ b/compiler-rt/lib/asan/tests/CMakeLists.txt
@@ -40,14 +40,8 @@ endif()
 list(APPEND ASAN_UNITTEST_COMMON_CFLAGS
   -DASAN_HAS_BLACKLIST=1
   -DASAN_HAS_EXCEPTIONS=1
+  -DASAN_NEEDS_SEGV=1
   -DASAN_UAR=0)
-if(ANDROID)
-  list(APPEND ASAN_UNITTEST_COMMON_CFLAGS
-    -DASAN_NEEDS_SEGV=0)
-else()
-  list(APPEND ASAN_UNITTEST_COMMON_CFLAGS
-    -DASAN_NEEDS_SEGV=1)
-endif()
 
 set(ASAN_BLACKLIST_FILE "${CMAKE_CURRENT_SOURCE_DIR}/asan_test.ignore")
 set(ASAN_UNITTEST_INSTRUMENTED_CFLAGS

diff --git a/compiler-rt/lib/sanitizer_common/CMakeLists.txt b/compiler-rt/lib/sanitizer_common/CMakeLists.txt
index 2077228..83464d9 100644 (file)
--- a/compiler-rt/lib/sanitizer_common/CMakeLists.txt
+++ b/compiler-rt/lib/sanitizer_common/CMakeLists.txt
@@ -80,10 +80,7 @@ set(SANITIZER_HEADERS
 
 set(SANITIZER_COMMON_DEFINITIONS)
 
-if(ANDROID)
-  list(APPEND SANITIZER_COMMON_DEFINITIONS
-    SANITIZER_NEEDS_SEGV=0)
-elseif(MSVC)
+if(MSVC)
   list(APPEND SANITIZER_COMMON_DEFINITIONS
     SANITIZER_NEEDS_SEGV=0)
 else()