Index: libcxxabi/trunk/include/__cxxabi_config.h
===================================================================
--- libcxxabi/trunk/include/__cxxabi_config.h
+++ libcxxabi/trunk/include/__cxxabi_config.h
@@ -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