* exception.cc: Revert 05-17 gcc_unreachable change.

From-SVN: r100004

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 738b017e5f0d9d32a3562046d3581fe6c1f31080..f2e1efb64fddbdd98c7c205ed0f6371b23b26541 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-19  Richard Henderson  <rth@redhat.com>
+
+       * exception.cc: Revert 05-17 gcc_unreachable change.
+
 2005-05-19  Bryce McKinlay  <mckinlay@redhat.com>
 
        * java/lang/natClassLoader.cc (_Jv_NewClass): Use

diff --git a/libjava/exception.cc b/libjava/exception.cc
index 4bab412d5baf4081c678440db0fcc6ab74010b6d..367df3618b90f62a119405259add71df898e3d13 100644 (file)
--- a/libjava/exception.cc
+++ b/libjava/exception.cc
@@ -19,9 +19,17 @@ details.  */
 #include <gcj/cni.h>
 #include <jvm.h>
 
-// Sometimes we compile libjava without libstdc++-v3. Therefore make
-// sure we use stdlib.h's abort().
-#define gcc_unreachable() ::abort ()
+// unwind-pe.h uses std::abort(), but sometimes we compile libjava
+// without libstdc++-v3. The following hack forces it to use
+// stdlib.h's abort().
+namespace std
+{
+  static __attribute__ ((__noreturn__)) void
+  abort ()
+  {
+    ::abort ();
+  }
+}
 #include "unwind.h"
 
 struct alignment_test_struct