[libcxx-commits] [libcxxabi] d0ad9e9 - [libc++abi] Make sure we use a 32 bit guard on 32 bit Aarch64

[Louis Dionne via libcxx-commits]

Author: Louis Dionne
Date: 2020-08-04T15:12:03-04:00
New Revision: d0ad9e93ce546eb3d372f1b815b164ba137fd701

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

LOG: [libc++abi] Make sure we use a 32 bit guard on 32 bit Aarch64

Added: 
    

Modified: 
    libcxxabi/include/__cxxabi_config.h

Removed: 
    


################################################################################
diff  --git a/libcxxabi/include/__cxxabi_config.h b/libcxxabi/include/__cxxabi_config.h
index b5444d67ee44..98f55b2a256d 100644
--- a/libcxxabi/include/__cxxabi_config.h
+++ b/libcxxabi/include/__cxxabi_config.h
@@ -72,7 +72,7 @@
 #endif
 
 // wasm32 follows the arm32 ABI convention of using 32-bit guard.
-#if defined(__arm__) || defined(__wasm32__)
+#if defined(__arm__) || defined(__wasm32__) || defined(__ARM64_ARCH_8_32__)
 #  define _LIBCXXABI_GUARD_ABI_ARM
 #endif