aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Clegg <sbc@chromium.org>2019-08-14 01:30:48 +0000
committerSam Clegg <sbc@chromium.org>2019-08-14 01:30:48 +0000
commitcee41ce223c7e5bd1a52a74e37d79bbbc785cf0a (patch)
tree1a821e9f3d6fad585dd1ca67acdde6f073d977c7
parentb6946a2d1209cdf04b919d177a3c1ffd5b9fa589 (diff)
downloadllvm-cee41ce223c7e5bd1a52a74e37d79bbbc785cf0a.zip
llvm-cee41ce223c7e5bd1a52a74e37d79bbbc785cf0a.tar.gz
llvm-cee41ce223c7e5bd1a52a74e37d79bbbc785cf0a.tar.bz2
[libcxxabi] Define _LIBCXXABI_GUARD_ABI_ARM on WebAssembly
This matches ItaniumCXXABI.cpp. Fixes PR42680 Differential Revision: https://reviews.llvm.org/D64961 llvm-svn: 368783
-rw-r--r--libcxxabi/include/__cxxabi_config.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/libcxxabi/include/__cxxabi_config.h b/libcxxabi/include/__cxxabi_config.h
index 1e0edca..cbbb1c1 100644
--- a/libcxxabi/include/__cxxabi_config.h
+++ b/libcxxabi/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