diff options
| author | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2013-03-01 09:33:05 +0000 |
|---|---|---|
| committer | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2013-03-01 09:33:05 +0000 |
| commit | f5d8c90f57f7cca81fd35bb961c7f4df6370a344 (patch) | |
| tree | 62ca1667252c9f348a1fe03362db223cf79f7b58 /compiler-rt/lib/asan/asan_allocator.h | |
| parent | 80c93a0793c4c2afab4e5b4155d91f573fe7bd1c (diff) | |
| download | bcm5719-llvm-f5d8c90f57f7cca81fd35bb961c7f4df6370a344.tar.gz bcm5719-llvm-f5d8c90f57f7cca81fd35bb961c7f4df6370a344.zip | |
[asan] Revert r176255, r176264.
New allocator has 1.5x memory overhead of the old one.
llvm-svn: 176340
Diffstat (limited to 'compiler-rt/lib/asan/asan_allocator.h')
| -rw-r--r-- | compiler-rt/lib/asan/asan_allocator.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler-rt/lib/asan/asan_allocator.h b/compiler-rt/lib/asan/asan_allocator.h index 9c548232f5f..9ba25424505 100644 --- a/compiler-rt/lib/asan/asan_allocator.h +++ b/compiler-rt/lib/asan/asan_allocator.h @@ -24,7 +24,7 @@ // will co-exist in the source base for a while. The actual allocator is chosen // at build time by redefining this macro. #ifndef ASAN_ALLOCATOR_VERSION -# if ASAN_LINUX || ASAN_MAC || ASAN_WINDOWS +# if (ASAN_LINUX && !ASAN_ANDROID) || ASAN_MAC || ASAN_WINDOWS # define ASAN_ALLOCATOR_VERSION 2 # else # define ASAN_ALLOCATOR_VERSION 1 |
