diff options
| author | Bruce Mitchener <bruce.mitchener@gmail.com> | 2013-03-29 16:32:07 +0700 |
|---|---|---|
| committer | Bruce Mitchener <bruce.mitchener@gmail.com> | 2013-03-29 16:37:19 +0700 |
| commit | fe73520cbf5993812ae40e970a5603c8cafbe5fb (patch) | |
| tree | 465f01ab9384e029d0321134de75c7ae066d8aeb /system/lib/libcxx/exception.cpp | |
| parent | aa0108c75e4177b6db0705ce42998e92c6ac734f (diff) | |
Update libcxx to work with emscripten.
Diffstat (limited to 'system/lib/libcxx/exception.cpp')
| -rw-r--r-- | system/lib/libcxx/exception.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/system/lib/libcxx/exception.cpp b/system/lib/libcxx/exception.cpp index 7db304d8..1d2f6b25 100644 --- a/system/lib/libcxx/exception.cpp +++ b/system/lib/libcxx/exception.cpp @@ -77,6 +77,7 @@ get_terminate() _NOEXCEPT return __sync_fetch_and_add(&__terminate_handler, (terminate_handler)0); } +#ifndef EMSCRIPTEN // We provide this in JS _LIBCPP_NORETURN void terminate() _NOEXCEPT @@ -97,9 +98,10 @@ terminate() _NOEXCEPT } #endif // _LIBCPP_NO_EXCEPTIONS } +#endif // !EMSCRIPTEN #endif // !defined(LIBCXXRT) && !defined(_LIBCPPABI_VERSION) -#if !defined(LIBCXXRT) && !defined(__GLIBCXX__) +#if !defined(LIBCXXRT) && !defined(__GLIBCXX__) && !defined(EMSCRIPTEN) bool uncaught_exception() _NOEXCEPT { #if defined(__APPLE__) || defined(_LIBCPPABI_VERSION) |