New wrapper around the terminate call.

llvm-svn: 8171

4 files changed, 10 insertions, 0 deletions

diff --git a/llvm/runtime/GCCLibraries/crtend/C++-Exception.cpp b/llvm/runtime/GCCLibraries/crtend/C++-Exception.cpp
index 01a72d0e550..5e589301141 100644
--- a/llvm/runtime/GCCLibraries/crtend/C++-Exception.cpp
+++ b/llvm/runtime/GCCLibraries/crtend/C++-Exception.cpp
@@ -214,6 +214,10 @@ void __llvm_cxxeh_end_catch() /* might throw */ {
     E->ExceptionDestructor(E);        // Release memory for the exception
 }
 
+void __llvm_cxxeh_call_terminate() throw() {
+  __terminate(__terminate_handler);
+}
+
 
 // __llvm_cxxeh_rethrow - This function turns the top-level caught exception
 // into an uncaught exception, in preparation for an llvm.unwind, which should
diff --git a/llvm/runtime/GCCLibraries/crtend/C++-Exception.h b/llvm/runtime/GCCLibraries/crtend/C++-Exception.h
index 81a7639d952..30d40aad26b 100644
--- a/llvm/runtime/GCCLibraries/crtend/C++-Exception.h
+++ b/llvm/runtime/GCCLibraries/crtend/C++-Exception.h
@@ -69,6 +69,7 @@ extern "C" {
   void __llvm_cxxeh_throw(void *ObjectPtr, void *TypeInfoPtr,
                           void (*DtorPtr)(void*)) throw();
 
+  void __llvm_cxxeh_call_terminate() throw() __attribute__((noreturn));
   void * __llvm_cxxeh_current_uncaught_exception_isa(void *Ty)
     throw();
   void *__llvm_cxxeh_begin_catch() throw();
diff --git a/llvm/runtime/GCCLibraries/libexception/C++-Exception.cpp b/llvm/runtime/GCCLibraries/libexception/C++-Exception.cpp
index 01a72d0e550..5e589301141 100644
--- a/llvm/runtime/GCCLibraries/libexception/C++-Exception.cpp
+++ b/llvm/runtime/GCCLibraries/libexception/C++-Exception.cpp
@@ -214,6 +214,10 @@ void __llvm_cxxeh_end_catch() /* might throw */ {
     E->ExceptionDestructor(E);        // Release memory for the exception
 }
 
+void __llvm_cxxeh_call_terminate() throw() {
+  __terminate(__terminate_handler);
+}
+
 
 // __llvm_cxxeh_rethrow - This function turns the top-level caught exception
 // into an uncaught exception, in preparation for an llvm.unwind, which should
diff --git a/llvm/runtime/GCCLibraries/libexception/C++-Exception.h b/llvm/runtime/GCCLibraries/libexception/C++-Exception.h
index 81a7639d952..30d40aad26b 100644
--- a/llvm/runtime/GCCLibraries/libexception/C++-Exception.h
+++ b/llvm/runtime/GCCLibraries/libexception/C++-Exception.h
@@ -69,6 +69,7 @@ extern "C" {
   void __llvm_cxxeh_throw(void *ObjectPtr, void *TypeInfoPtr,
                           void (*DtorPtr)(void*)) throw();
 
+  void __llvm_cxxeh_call_terminate() throw() __attribute__((noreturn));
   void * __llvm_cxxeh_current_uncaught_exception_isa(void *Ty)
     throw();
   void *__llvm_cxxeh_begin_catch() throw();