diff options
| author | Bruce Mitchener <bruce.mitchener@gmail.com> | 2013-03-25 11:25:49 +0700 |
|---|---|---|
| committer | Bruce Mitchener <bruce.mitchener@gmail.com> | 2013-03-25 14:14:22 +0700 |
| commit | 09221ebd18ec0074b25d593400f040ee460526aa (patch) | |
| tree | e721b466f79090d78ddca667477ff33b56f083f2 /system/lib/libcxx/exception.cpp | |
| parent | ff1ba5d2339a6e086b812acf96c47f78764b0095 (diff) | |
Get exceptions working as they were before.
This no longer uses headers from libcxxabi and
in fact uses libcxxabi a bit less than before.
This no longer lets some new C++11 stuff such as
exception_ptr work as the support for that relies
upon libcxxabi code.
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 0cd182b7..8d5ded4d 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 __APPLE__ || defined(_LIBCPPABI_VERSION) |