[libcxx-commits] [libcxxabi] r368783 - [libcxxabi] Define _LIBCXXABI_GUARD_ABI_ARM on WebAssembly

[Sam Clegg via libcxx-commits]

Author: sbc
Date: Tue Aug 13 18:30:48 2019
New Revision: 368783

URL: http://llvm.org/viewvc/llvm-project?rev=368783&view=rev
Log:
[libcxxabi] Define _LIBCXXABI_GUARD_ABI_ARM on WebAssembly

This matches ItaniumCXXABI.cpp.

Fixes PR42680

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

Modified:
    libcxxabi/trunk/include/__cxxabi_config.h

Modified: libcxxabi/trunk/include/__cxxabi_config.h
URL: http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/include/__cxxabi_config.h?rev=368783&r1=368782&r2=368783&view=diff
==============================================================================
--- libcxxabi/trunk/include/__cxxabi_config.h (original)
+++ libcxxabi/trunk/include/__cxxabi_config.h Tue Aug 13 18:30:48 2019
@@ -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