[compiler-rt] 37432c1 - Revert "[compiler-rt] Allow Fuchsia to use 64-bit allocator for RISCV (#68343)"

[Leonard Chan via llvm-commits]

Author: Leonard Chan
Date: 2023-10-09T20:21:05Z
New Revision: 37432c154fee24f8c3da1e680bdefa9bc073ab6f

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

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

This reverts commit a4d51e5bf0513eef77ec4c00aaae329ab9c20dd4.

Reverting since this breaks the lsan-test on fuchsia riscv builders. I
had adjusted settings for the 64-bit allocator for asan, but forgot
about standalone lsan and need to do that also.

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