summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam Clegg <sbc@chromium.org>2017-12-16 18:59:50 +0000
committerSam Clegg <sbc@chromium.org>2017-12-16 18:59:50 +0000
commit5029d676f82782c36b2217a542286eb1773756d5 (patch)
tree0247a70a012ed06085f7893cef8f1d19c4beaca3
parenta42a2ba2217b3d73dfde757ea1152f5c6c165552 (diff)
downloadbcm5719-llvm-5029d676f82782c36b2217a542286eb1773756d5.tar.gz
bcm5719-llvm-5029d676f82782c36b2217a542286eb1773756d5.zip
[libcxx] Add WebAssembly support
It turns out that this is the only change required in libcxx for it to compile with the new `wasm32-unknown-unknown-wasm` target recently added to Clang. Patch by Nicholas Wilson! Differential Revision: https://reviews.llvm.org/D41073 llvm-svn: 320925
-rw-r--r--libcxx/include/__config2
-rw-r--r--libcxx/src/include/config_elast.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/libcxx/include/__config b/libcxx/include/__config
index 0d933f806cf..d0f95ef2834 100644
--- a/libcxx/include/__config
+++ b/libcxx/include/__config
@@ -45,6 +45,8 @@
#define _LIBCPP_OBJECT_FORMAT_MACHO 1
#elif defined(_WIN32)
#define _LIBCPP_OBJECT_FORMAT_COFF 1
+#elif defined(__wasm__)
+#define _LIBCPP_OBJECT_FORMAT_WASM 1
#else
#error Unknown object file format
#endif
diff --git a/libcxx/src/include/config_elast.h b/libcxx/src/include/config_elast.h
index 8328978ef95..4c4d853c2a6 100644
--- a/libcxx/src/include/config_elast.h
+++ b/libcxx/src/include/config_elast.h
@@ -24,7 +24,7 @@
#define _LIBCPP_ELAST __ELASTERROR
#elif defined(__Fuchsia__)
// No _LIBCPP_ELAST needed on Fuchsia
-#elif defined(__linux__)
+#elif defined(__linux__) || defined(_LIBCPP_HAS_MUSL_LIBC)
#define _LIBCPP_ELAST 4095
#elif defined(__APPLE__)
// No _LIBCPP_ELAST needed on Apple
OpenPOWER on IntegriCloud