diff options
author | Dave Zarzycki <zarzycki@apple.com> | 2012-03-15 12:58:06 +0400 |
---|---|---|
committer | Dave Zarzycki <zarzycki@apple.com> | 2012-03-15 12:58:06 +0400 |
commit | 13e35c086cc5988a8b5ab26f1ddfe9278783ae12 (patch) | |
tree | f0a6eea6eb5582dccfc2af1683a2443ec2b02a06 /libcxxabi/src/cxa_handlers.cpp | |
parent | 6fd1d32c635bfbf6f5fb53529857f1e43171adf1 (diff) |
Be friendly to when dead_strip doesn't work
Apple Radar: 11053417
llvm-svn: 152785
Diffstat (limited to 'libcxxabi/src/cxa_handlers.cpp')
-rw-r--r-- | libcxxabi/src/cxa_handlers.cpp | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/libcxxabi/src/cxa_handlers.cpp b/libcxxabi/src/cxa_handlers.cpp index 3fae66bc079c..1cfdfe7ae703 100644 --- a/libcxxabi/src/cxa_handlers.cpp +++ b/libcxxabi/src/cxa_handlers.cpp @@ -20,17 +20,10 @@ #include "cxa_default_handlers.hpp" #include "private_typeinfo.h" -namespace std -{ - +std::new_handler __cxa_new_handler = 0; -unexpected_handler -set_unexpected(unexpected_handler func) _NOEXCEPT +namespace std { - if (func == 0) - func = default_unexpected_handler; - return __sync_lock_test_and_set(&__cxxabiapple::__cxa_unexpected_handler, func); -} unexpected_handler get_unexpected() _NOEXCEPT @@ -55,14 +48,6 @@ unexpected() } terminate_handler -set_terminate(terminate_handler func) _NOEXCEPT -{ - if (func == 0) - func = default_terminate_handler; - return __sync_lock_test_and_set(&__cxxabiapple::__cxa_terminate_handler, func); -} - -terminate_handler get_terminate() _NOEXCEPT { return __sync_fetch_and_add(&__cxxabiapple::__cxa_terminate_handler, (terminate_handler)0); |