commit 7a34f188b84523d21cd78288cb430e9fd0a71b61
author Louis Dionne <ldionne@apple.com> Tue Aug 04 15:09:05 2020 -0400
committer Copybara-Service <copybara-worker@google.com> Fri Aug 28 01:07:45 2020 -0700
tree 011d9950c0b88599b8907a5e99e1b533ec1f25a4
parent a018f33114d794992a1f1a9973f095229fbc376c

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

GitOrigin-RevId: d0ad9e93ce546eb3d372f1b815b164ba137fd701

include/__cxxabi_config.h

diff --git a/include/__cxxabi_config.h b/include/__cxxabi_config.h
index b5444d6..98f55b2 100644
--- a/include/__cxxabi_config.h
+++ b/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