From 548b6b22e5f05b7a00ffb5af63b3cae82eb634d2 Mon Sep 17 00:00:00 2001
From: rth <>
Date: Fri, 20 May 2005 00:28:35 +0000
Subject:         * exception.cc: Revert 05-17 gcc_unreachable change.

---
 libjava/exception.cc | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'libjava/exception.cc')

diff --git a/libjava/exception.cc b/libjava/exception.cc
index 4bab412d5ba..367df3618b9 100644
--- 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
-- 
cgit v1.2.3