patch by Jeffrey Yasskin for porting to Ubuntu Hardy. Everything was accepted except there were some bug fixes needed in <locale> for the __nolocale_* series. For the apple branch I ended up using templates instead of the var_args solution because it seemed both safer and more efficient.

llvm-svn: 104516

1 files changed, 5 insertions, 3 deletions

diff --git a/libcxx/src/exception.cpp b/libcxx/src/exception.cpp
index 336527df275..e48e9c4901e 100644
--- a/libcxx/src/exception.cpp
+++ b/libcxx/src/exception.cpp
@@ -72,8 +72,11 @@ bool std::uncaught_exception() throw()
 	// on Darwin, there is a helper function so __cxa_get_globals is private
     return __cxxabiapple::__cxa_uncaught_exception();
 #else
-    __cxa_eh_globals * globals = __cxa_get_globals();
-    return (globals->uncaughtExceptions != 0);
+    #warning uncaught_exception not yet implemented
+    ::abort();
+    // Not provided by Ubuntu gcc-4.2.4's cxxabi.h.
+    // __cxa_eh_globals * globals = __cxa_get_globals();
+    // return (globals->uncaughtExceptions != 0);
 #endif
 }
 
@@ -168,4 +171,3 @@ void std::rethrow_exception(exception_ptr p)
 	::abort();
 #endif
 }
-