diff options
author | Asiri Rathnayake <asiri.rathnayake@arm.com> | 2017-02-15 13:43:05 +0000 |
---|---|---|
committer | Asiri Rathnayake <asiri.rathnayake@arm.com> | 2017-02-15 13:43:05 +0000 |
commit | d717ce580b2c95951a812eff13ce1d3aebc2ee35 (patch) | |
tree | 53a4e1c29a8b2266590373cc9be8a9e2c9dc5b62 /libcxxabi/src/cxa_default_handlers.cpp | |
parent | 5c8e5f37229ec59aa6340337595a13f36f958e16 (diff) | |
download | bcm5719-llvm-d717ce580b2c95951a812eff13ce1d3aebc2ee35.tar.gz bcm5719-llvm-d717ce580b2c95951a812eff13ce1d3aebc2ee35.zip |
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.
llvm-svn: 295175
Diffstat (limited to 'libcxxabi/src/cxa_default_handlers.cpp')
-rw-r--r-- | libcxxabi/src/cxa_default_handlers.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libcxxabi/src/cxa_default_handlers.cpp b/libcxxabi/src/cxa_default_handlers.cpp index a1ea2961655..40bf0bfa66b 100644 --- a/libcxxabi/src/cxa_default_handlers.cpp +++ b/libcxxabi/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 // |