[llvm-commits] [compiler-rt] r173132 - in /compiler-rt/trunk/lib/asan: CMakeLists.txt tests/CMakeLists.txt

[Alexey Samsonov]

Author: samsonov
Date: Tue Jan 22 01:21:24 2013
New Revision: 173132

URL: http://llvm.org/viewvc/llvm-project?rev=173132&view=rev
Log:
ASan: disable flexible mapping and offset on Android. It doesn't work for dynamic ASan runtime there

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

Modified: compiler-rt/trunk/lib/asan/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/CMakeLists.txt?rev=173132&r1=173131&r2=173132&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/CMakeLists.txt (original)
+++ compiler-rt/trunk/lib/asan/CMakeLists.txt Tue Jan 22 01:21:24 2013
@@ -33,15 +33,16 @@
 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()
 

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=173132&r1=173131&r2=173132&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/tests/CMakeLists.txt (original)
+++ compiler-rt/trunk/lib/asan/tests/CMakeLists.txt Tue Jan 22 01:21:24 2013
@@ -48,16 +48,17 @@
 
 # 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()