diff options
| author | John Baldwin <jhb@FreeBSD.org> | 2024-08-21 17:37:48 +0000 |
|---|---|---|
| committer | John Baldwin <jhb@FreeBSD.org> | 2024-08-21 17:37:48 +0000 |
| commit | 297a9e552b9a5adf07d195eae9649b0758f395af (patch) | |
| tree | 9b1561dfe751ed803edb821c84135a33cf806253 | |
| parent | 47656cc1ef1cac307f24de88a4fe23a1389af44e (diff) | |
| -rw-r--r-- | contrib/libcxxrt/exception.cc | 13 | ||||
| -rw-r--r-- | lib/libcxxrt/Version.map | 4 | ||||
| -rw-r--r-- | lib/libcxxrt/Version.map.arm | 4 |
3 files changed, 21 insertions, 0 deletions
diff --git a/contrib/libcxxrt/exception.cc b/contrib/libcxxrt/exception.cc index 35ff997dd445..b56333e979a2 100644 --- a/contrib/libcxxrt/exception.cc +++ b/contrib/libcxxrt/exception.cc @@ -1434,6 +1434,19 @@ extern "C" void __cxa_call_unexpected(void*exception) } /** + * ABI function, called when an object destructor exits due to an + * exception during stack unwinding. + * + * This function does not return. + */ +extern "C" void __cxa_call_terminate(void *exception) throw() +{ + std::terminate(); + // Should not be reached. + abort(); +} + +/** * ABI function, returns the adjusted pointer to the exception object. */ extern "C" void *__cxa_get_exception_ptr(void *exceptionObject) diff --git a/lib/libcxxrt/Version.map b/lib/libcxxrt/Version.map index 012026079e33..02cce34c234f 100644 --- a/lib/libcxxrt/Version.map +++ b/lib/libcxxrt/Version.map @@ -253,6 +253,10 @@ CXXABI_1.3.11 { __cxa_init_primary_exception; } CXXABI_1.3.9; +CXXABI_1.3.15 { + __cxa_call_terminate; +} CXXABI_1.3.11; + CXXRT_1.0 { extern "C++" { diff --git a/lib/libcxxrt/Version.map.arm b/lib/libcxxrt/Version.map.arm index bc4cf68a3654..aef918149b79 100644 --- a/lib/libcxxrt/Version.map.arm +++ b/lib/libcxxrt/Version.map.arm @@ -254,6 +254,10 @@ CXXABI_1.3.11 { __cxa_init_primary_exception; } CXXABI_1.3.9; +CXXABI_1.3.15 { + __cxa_call_terminate; +} CXXABI_1.3.11; + CXXRT_1.0 { extern "C++" { |