Page MenuHomeFreeBSD
Files F102030144

D46004.diff
No OneTemporary
Actions

D46004.diff
View Options

diff --git a/contrib/libcxxrt/exception.cc b/contrib/libcxxrt/exception.cc
--- a/contrib/libcxxrt/exception.cc
+++ b/contrib/libcxxrt/exception.cc
@@ -1433,6 +1433,19 @@
abort();
}
+/**
+ * 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.
*/
diff --git a/lib/libcxxrt/Version.map b/lib/libcxxrt/Version.map
--- a/lib/libcxxrt/Version.map
+++ b/lib/libcxxrt/Version.map
@@ -253,6 +253,10 @@
__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
--- a/lib/libcxxrt/Version.map.arm
+++ b/lib/libcxxrt/Version.map.arm
@@ -254,6 +254,10 @@
__cxa_init_primary_exception;
} CXXABI_1.3.9;
+CXXABI_1.3.15 {
+ __cxa_call_terminate;
+} CXXABI_1.3.11;
+
CXXRT_1.0 {
extern "C++" {

File Metadata

Mime Type
text/plain
Expires
Thu, Nov 7, 5:39 PM (21 h, 54 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
14517750
Default Alt Text
D46004.diff (1 KB)

Event Timeline