[libcxxabi] Define _LIBCXXABI_GUARD_ABI_ARM on WebAssembly
authorSam Clegg <sbc@chromium.org>
Wed, 14 Aug 2019 01:30:48 +0000 (01:30 +0000)
committerSam Clegg <sbc@chromium.org>
Wed, 14 Aug 2019 01:30:48 +0000 (01:30 +0000)
This matches ItaniumCXXABI.cpp.

Fixes PR42680

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

llvm-svn: 368783

libcxxabi/include/__cxxabi_config.h

index 1e0edcab88e25b66d3ce8ab9a40d46f4aab12ebc..cbbb1c10c1a29d133ba7fced4d9565cf5d9d54ec 100644 (file)
@@ -71,7 +71,8 @@
 #define _LIBCXXABI_NO_CFI
 #endif
 
-#if defined(__arm__)
+// wasm32 follows the arm32 ABI convention of using 32-bit guard.
+#if defined(__arm__) || defined(__wasm32__)
 #  define _LIBCXXABI_GUARD_ABI_ARM
 #endif