diff options
| author | Howard Hinnant <hhinnant@apple.com> | 2013-03-29 18:27:28 +0000 |
|---|---|---|
| committer | Howard Hinnant <hhinnant@apple.com> | 2013-03-29 18:27:28 +0000 |
| commit | 9cb970074fb76f3507b0b97ef371308f3c384042 (patch) | |
| tree | c9fe9bdbf49452fa2e4a35e96d58e69923e2790b /libcxx/src/exception.cpp | |
| parent | 4b7cf64f66fe02b4dc4bbb3cf8cbed5d12df8cbe (diff) | |
| download | bcm5719-llvm-9cb970074fb76f3507b0b97ef371308f3c384042.tar.gz bcm5719-llvm-9cb970074fb76f3507b0b97ef371308f3c384042.zip | |
Bruce Mitchener, Jr.: Port to emscripten. Fixes http://llvm.org/bugs/show_bug.cgi?id=15624.
llvm-svn: 178354
Diffstat (limited to 'libcxx/src/exception.cpp')
| -rw-r--r-- | libcxx/src/exception.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libcxx/src/exception.cpp b/libcxx/src/exception.cpp index 7db304d8c31..1d2f6b25979 100644 --- a/libcxx/src/exception.cpp +++ b/libcxx/src/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) |
