ASan: disable flexible mapping and offset on Android. It doesn't work for dynamic...

llvm-svn: 173132

diff --git a/compiler-rt/lib/asan/CMakeLists.txt b/compiler-rt/lib/asan/CMakeLists.txt
index 372df7c..696801f 100644 (file)
--- a/compiler-rt/lib/asan/CMakeLists.txt
+++ b/compiler-rt/lib/asan/CMakeLists.txt
@@ -33,15 +33,16 @@ include_directories(..)
 set(ASAN_CFLAGS ${SANITIZER_COMMON_CFLAGS})
 
 set(ASAN_COMMON_DEFINITIONS
-  ASAN_HAS_EXCEPTIONS=1
-  ASAN_FLEXIBLE_MAPPING_AND_OFFSET=1)
+  ASAN_HAS_EXCEPTIONS=1)
 
 if(ANDROID)
   list(APPEND ASAN_COMMON_DEFINITIONS
+    ASAN_FLEXIBLE_MAPPING_AND_OFFSET=0
     ASAN_NEEDS_SEGV=0
     ASAN_LOW_MEMORY=1)
 else()
   list(APPEND ASAN_COMMON_DEFINITIONS
+    ASAN_FLEXIBLE_MAPPING_AND_OFFSET=1
     ASAN_NEEDS_SEGV=1)
 endif()
 

diff --git a/compiler-rt/lib/asan/tests/CMakeLists.txt b/compiler-rt/lib/asan/tests/CMakeLists.txt
index 4b4f4e3..c55cbfb 100644 (file)
--- a/compiler-rt/lib/asan/tests/CMakeLists.txt
+++ b/compiler-rt/lib/asan/tests/CMakeLists.txt
@@ -48,16 +48,17 @@ endif()
 
 # Use -D instead of definitions to please custom compile command.
 list(APPEND ASAN_UNITTEST_COMMON_CFLAGS
-  -DASAN_FLEXIBLE_MAPPING_AND_OFFSET=1
   -DASAN_HAS_BLACKLIST=1
   -DASAN_HAS_EXCEPTIONS=1
   -DASAN_UAR=0)
 if(ANDROID)
   list(APPEND ASAN_UNITTEST_COMMON_CFLAGS
+    -DASAN_FLEXIBLE_MAPPING_AND_OFFSET=0
     -DASAN_LOW_MEMORY=1
     -DASAN_NEEDS_SEGV=0)
 else()
   list(APPEND ASAN_UNITTEST_COMMON_CFLAGS
+    -DASAN_FLEXIBLE_MAPPING_AND_OFFSET=1
     -DASAN_LOW_MEMORY=0
     -DASAN_NEEDS_SEGV=1)
 endif()