summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAsiri Rathnayake <asiri.rathnayake@arm.com>2017-02-15 13:43:05 +0000
committerAsiri Rathnayake <asiri.rathnayake@arm.com>2017-02-15 13:43:05 +0000
commita3b0b11e68329c57be7059f61a4f3f52302e9bd0 (patch)
treec4b496a379ec29882e19fbc527bfcff1c73c6902 /src
parenta6871004e8a85322672c54604aec9dec263b85a0 (diff)
Fix couple of test failures when using the LIBCXXABI_SILENT_TERMINATE mode.
When libcxxabi is built in LIBCXXABI_SILENT_TERMINATE mode, libcxx test suite reports two failures: std/depr/exception.unexpected/set.unexpected/get_unexpected.pass.cpp std/depr/exception.unexpected/set.unexpected/set_unexpected.pass.cpp This is because the default unexpected handler is set to std::abort instead of std::terminate which these tests expect. git-svn-id: https://llvm.org/svn/llvm-project/libcxxabi/trunk@295175 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'src')
-rw-r--r--src/cxa_default_handlers.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cxa_default_handlers.cpp b/src/cxa_default_handlers.cpp
index a1ea296..40bf0bf 100644
--- a/src/cxa_default_handlers.cpp
+++ b/src/cxa_default_handlers.cpp
@@ -90,7 +90,7 @@ static std::terminate_handler default_terminate_handler = demangling_terminate_h
static std::terminate_handler default_unexpected_handler = demangling_unexpected_handler;
#else
static std::terminate_handler default_terminate_handler = std::abort;
-static std::terminate_handler default_unexpected_handler = std::abort;
+static std::terminate_handler default_unexpected_handler = std::terminate;
#endif
//