revert large changes

From-SVN: r16656

diff --git a/gcc/cp/inc/exception b/gcc/cp/inc/exception
index 3e66beed5183f7a72c66352b0fc1caaadeecbf46..d38806b81c459afbb611ec46291794cc846af4d7 100644 (file)
--- a/gcc/cp/inc/exception
+++ b/gcc/cp/inc/exception
@@ -29,9 +29,9 @@ typedef void (*terminate_handler) ();
 typedef void (*unexpected_handler) ();
 
 terminate_handler set_terminate (terminate_handler);
-void terminate (void) __attribute__ ((__noreturn__));
+void terminate (void);
 unexpected_handler set_unexpected (unexpected_handler);
-void unexpected (void) __attribute__ ((__noreturn__));
+void unexpected (void);
 bool uncaught_exception ();
 } // extern "C++"
 

diff --git a/gcc/cp/inc/new b/gcc/cp/inc/new
index 23fe6eb9e6bb796fbbbb218b5e3f1c00ca6ed0dd..f4b0b975cdbbd4899caeda4e1212db1e267fae38 100644 (file)
--- a/gcc/cp/inc/new
+++ b/gcc/cp/inc/new
@@ -22,21 +22,23 @@ namespace std {
   struct nothrow_t {};
   extern const nothrow_t nothrow;
   typedef void (*new_handler)();
-  new_handler set_new_handler (new_handler);
+  extern "C" new_handler set_new_handler (new_handler);
 
 #if 0
 } // namespace std
 #endif
 
+// G++ implementation internals
+extern new_handler __new_handler;
+extern "C" void __default_new_handler (void);
+
 // replaceable signatures
-void *operator new (size_t) throw (std::bad_alloc);
-void *operator new[] (size_t) throw (std::bad_alloc);
-void operator delete (void *) throw();
-void operator delete[] (void *) throw();
+void *operator new (size_t);
 void *operator new (size_t, const nothrow_t&) throw();
+void *operator new[] (size_t);
 void *operator new[] (size_t, const nothrow_t&) throw();
-void operator delete (void *, const nothrow_t&) throw();
-void operator delete[] (void *, const nothrow_t&) throw();
+void operator delete (void *) throw();
+void operator delete[] (void *) throw();
 
 // default placement versions of operator new
 inline void *operator new(size_t, void *place) throw() { return place; }