[llvm-commits] [compiler-rt] r173013 - /compiler-rt/trunk/lib/asan/CMakeLists.txt

[Alexey Samsonov]

Author: samsonov
Date: Mon Jan 21 02:24:19 2013
New Revision: 173013

URL: http://llvm.org/viewvc/llvm-project?rev=173013&view=rev
Log:
ASan: build runtime library with ASAN_FLEXIBLE_MAPPING_AND_OFFSET=1 as shadow mapping/offset are always emitted by the LLVM backend now

Modified:
    compiler-rt/trunk/lib/asan/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=173013&r1=173012&r2=173013&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/CMakeLists.txt (original)
+++ compiler-rt/trunk/lib/asan/CMakeLists.txt Mon Jan 21 02:24:19 2013
@@ -32,25 +32,22 @@
 
 set(ASAN_CFLAGS ${SANITIZER_COMMON_CFLAGS})
 
+set(ASAN_COMMON_DEFINITIONS
+  ASAN_HAS_EXCEPTIONS=1
+  ASAN_FLEXIBLE_MAPPING_AND_OFFSET=1)
+
 if(ANDROID)
-  set(ASAN_COMMON_DEFINITIONS
-    ASAN_HAS_EXCEPTIONS=1
-    ASAN_FLEXIBLE_MAPPING_AND_OFFSET=0
+  list(APPEND ASAN_COMMON_DEFINITIONS
     ASAN_NEEDS_SEGV=0
-    ASAN_LOW_MEMORY=1
-    )
+    ASAN_LOW_MEMORY=1)
 else()
-  set(ASAN_COMMON_DEFINITIONS
-    ASAN_HAS_EXCEPTIONS=1
-    ASAN_FLEXIBLE_MAPPING_AND_OFFSET=0
-    ASAN_NEEDS_SEGV=1
-    )
+  list(APPEND ASAN_COMMON_DEFINITIONS
+    ASAN_NEEDS_SEGV=1)
 endif()
 
 set(ASAN_DYLIB_DEFINITIONS
   ${ASAN_COMMON_DEFINITIONS}
-  MAC_INTERPOSE_FUNCTIONS=1
-  )
+  MAC_INTERPOSE_FUNCTIONS=1)
 
 # Architectures supported by ASan.
 filter_available_targets(ASAN_SUPPORTED_ARCH