[compiler-rt] bac3808 - Reapply "[compiler-rt] Allow Fuchsia to use 64-bit allocator for RISCV (#68343)"

[Leonard Chan via llvm-commits]

Author: Leonard Chan
Date: 2023-10-24T20:45:08Z
New Revision: bac3808a12a19b11d57b3c8d6501a50595a70c17

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

LOG: Reapply "[compiler-rt] Allow Fuchsia to use 64-bit allocator for RISCV (#68343)"

This reverts commit 37432c154fee24f8c3da1e680bdefa9bc073ab6f.

The tunings for the lsan allocator for Fuchsia on RISCV should be
adjusted.

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 df446d0659f8ba9..3e1b078a0212f5e 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform.h
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform.h
@@ -284,7 +284,8 @@
 // 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_RISCV64 || SANITIZER_IOS || SANITIZER_DRIVERKIT
+#  if (SANITIZER_RISCV64 && !SANITIZER_FUCHSIA) || SANITIZER_IOS || \
+      SANITIZER_DRIVERKIT
 #    define SANITIZER_CAN_USE_ALLOCATOR64 0
 #  elif defined(__mips64) || defined(__hexagon__)
 #    define SANITIZER_CAN_USE_ALLOCATOR64 0