[compiler-rt] r281533 - [asan] Disable 64-bit allocator on android/aarch64.

[Evgeniy Stepanov via llvm-commits]

Author: eugenis
Date: Wed Sep 14 15:25:51 2016
New Revision: 281533

URL: http://llvm.org/viewvc/llvm-project?rev=281533&view=rev
Log:
[asan] Disable 64-bit allocator on android/aarch64.

Makes the device strangely unstable, and fails one sanitizer_common test.

Modified:
    compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform.h

Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform.h
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform.h?rev=281533&r1=281532&r2=281533&view=diff
==============================================================================
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform.h (original)
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform.h Wed Sep 14 15:25:51 2016
@@ -168,9 +168,7 @@
 // For such platforms build this code with -DSANITIZER_CAN_USE_ALLOCATOR64=0 or
 // change the definition of SANITIZER_CAN_USE_ALLOCATOR64 here.
 #ifndef SANITIZER_CAN_USE_ALLOCATOR64
-# if SANITIZER_ANDROID && defined(__aarch64__)
-#  define SANITIZER_CAN_USE_ALLOCATOR64 1
-# elif defined(__mips64) || defined(__aarch64__)
+#if defined(__mips64) || defined(__aarch64__)
 #  define SANITIZER_CAN_USE_ALLOCATOR64 0
 # else
 #  define SANITIZER_CAN_USE_ALLOCATOR64 (SANITIZER_WORDSIZE == 64)