[compiler-rt] e02110e - Revert "[Sanitizers] Modified __aarch64__ to use the 64 bit version of the allocator."

[Vitaly Buka via llvm-commits]

Author: Vitaly Buka
Date: 2022-11-01T17:04:10-07:00
New Revision: e02110e2ab4dd71b276e887483f0e6e286d243ed

URL: https://github.com/llvm/llvm-project/commit/e02110e2ab4dd71b276e887483f0e6e286d243ed
DIFF: https://github.com/llvm/llvm-project/commit/e02110e2ab4dd71b276e887483f0e6e286d243ed.diff

LOG: Revert "[Sanitizers] Modified __aarch64__ to use the 64 bit version of the allocator."

We need to land asan_allocator.h patches first.

This reverts commit 75a8cdbc0659dc20746f31721cc48ef00c49f746.

Added: 
    

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

Removed: 
    


################################################################################
diff  --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform.h b/compiler-rt/lib/sanitizer_common/sanitizer_platform.h
index 7ecc465bea97a..32005eef08cd5 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform.h
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform.h
@@ -286,8 +286,8 @@
 #ifndef SANITIZER_CAN_USE_ALLOCATOR64
 #  if (SANITIZER_ANDROID && defined(__aarch64__)) || SANITIZER_FUCHSIA
 #    define SANITIZER_CAN_USE_ALLOCATOR64 1
-#  elif defined(__mips64) || defined(__arm__) || defined(__i386__) || \
-      SANITIZER_RISCV64 || defined(__hexagon__)
+#  elif defined(__mips64) || defined(__aarch64__) || defined(__i386__) || \
+      defined(__arm__) || SANITIZER_RISCV64 || defined(__hexagon__)
 #    define SANITIZER_CAN_USE_ALLOCATOR64 0
 #  else
 #    define SANITIZER_CAN_USE_ALLOCATOR64 (SANITIZER_WORDSIZE == 64)