[compiler-rt] r201326 - [asan] Enable SEGV handler on Android by default.

[Evgeniy Stepanov]

Author: eugenis
Date: Thu Feb 13 07:43:47 2014
New Revision: 201326

URL: http://llvm.org/viewvc/llvm-project?rev=201326&view=rev
Log:
[asan] Enable SEGV handler on Android by default.

Seems stable enough.
Fixes null_deref.cc test.

Modified:
    compiler-rt/trunk/lib/asan/tests/CMakeLists.txt
    compiler-rt/trunk/lib/sanitizer_common/CMakeLists.txt

Modified: compiler-rt/trunk/lib/asan/tests/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/tests/CMakeLists.txt?rev=201326&r1=201325&r2=201326&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/tests/CMakeLists.txt (original)
+++ compiler-rt/trunk/lib/asan/tests/CMakeLists.txt Thu Feb 13 07:43:47 2014
@@ -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

Modified: compiler-rt/trunk/lib/sanitizer_common/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/CMakeLists.txt?rev=201326&r1=201325&r2=201326&view=diff
==============================================================================
--- compiler-rt/trunk/lib/sanitizer_common/CMakeLists.txt (original)
+++ compiler-rt/trunk/lib/sanitizer_common/CMakeLists.txt Thu Feb 13 07:43:47 2014
@@ -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()