From e02110e2ab4dd71b276e887483f0e6e286d243ed Mon Sep 17 00:00:00 2001 From: Vitaly Buka Date: Tue, 1 Nov 2022 17:04:10 -0700 Subject: [PATCH] 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. --- compiler-rt/lib/sanitizer_common/sanitizer_platform.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform.h b/compiler-rt/lib/sanitizer_common/sanitizer_platform.h index 7ecc465..32005ee 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) -- 2.7.4