[compiler-rt] fcbca19 - [scudo] Disable memory tagging on arm64_32

[Dominic Chen via llvm-commits]

Author: Dominic Chen
Date: 2022-04-21T17:22:10-07:00
New Revision: fcbca197f2e6e9e13c447ede77f6341721e6c7f7

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

LOG: [scudo] Disable memory tagging on arm64_32

arm64_32 is an ILP32 platform

Differential Revision: https://reviews.llvm.org/D124135

Added: 
    

Modified: 
    compiler-rt/lib/scudo/standalone/memtag.h

Removed: 
    


################################################################################
diff  --git a/compiler-rt/lib/scudo/standalone/memtag.h b/compiler-rt/lib/scudo/standalone/memtag.h
index 7578aff17be45..7f14a30fee12b 100644
--- a/compiler-rt/lib/scudo/standalone/memtag.h
+++ b/compiler-rt/lib/scudo/standalone/memtag.h
@@ -18,7 +18,8 @@
 
 namespace scudo {
 
-#if (__clang_major__ >= 12 && defined(__aarch64__)) || defined(SCUDO_FUZZ)
+#if (__clang_major__ >= 12 && defined(__aarch64__) && !defined(__ILP32__)) ||  \
+    defined(SCUDO_FUZZ)
 
 // We assume that Top-Byte Ignore is enabled if the architecture supports memory
 // tagging. Not all operating systems enable TBI, so we only claim architectural
@@ -57,7 +58,7 @@ inline NORETURN uint8_t extractTag(uptr Ptr) {
 
 #endif
 
-#if __clang_major__ >= 12 && defined(__aarch64__)
+#if __clang_major__ >= 12 && defined(__aarch64__) && !defined(__ILP32__)
 
 #if SCUDO_LINUX