diff options
| author | Alexey Samsonov <samsonov@google.com> | 2013-01-22 07:21:24 +0000 |
|---|---|---|
| committer | Alexey Samsonov <samsonov@google.com> | 2013-01-22 07:21:24 +0000 |
| commit | 2f20275730b33a35c837dc574e606a171c0072e3 (patch) | |
| tree | e15af1594a91301b2203e1cccb3ca4ca2c007de4 | |
| parent | 56fc958506dc6a6e225b540482670d0d8443d8ce (diff) | |
| download | bcm5719-llvm-2f20275730b33a35c837dc574e606a171c0072e3.tar.gz bcm5719-llvm-2f20275730b33a35c837dc574e606a171c0072e3.zip | |
ASan: disable flexible mapping and offset on Android. It doesn't work for dynamic ASan runtime there
llvm-svn: 173132
| -rw-r--r-- | compiler-rt/lib/asan/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | compiler-rt/lib/asan/tests/CMakeLists.txt | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/compiler-rt/lib/asan/CMakeLists.txt b/compiler-rt/lib/asan/CMakeLists.txt index 372df7cfc31..696801f5ae6 100644 --- 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 4b4f4e3579e..c55cbfb770f 100644 --- 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() |
