From 2fc87a25080a48e582613906aa95010b6b47deb0 Mon Sep 17 00:00:00 2001
From: megacz <megacz@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Mon, 11 Feb 2002 22:28:58 +0000
Subject: 2002-02-11  Adam Megacz <adam@xwt.org>

    * exception.cc (_Jv_Throw, PERSONALITY_FUNCTION): Changed
    std::abort() to simply abort(). Also added "fake" std::abort() so
    we can #include unwind-pe.h without having to link against
    libstdc++-v3.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@49685 138bc75d-0d04-0410-961f-82ee72b054a4
---
 libjava/ChangeLog    |  7 +++++++
 libjava/exception.cc | 17 +++++++++++++----
 2 files changed, 20 insertions(+), 4 deletions(-)

(limited to 'libjava')

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 9087ea6c497..e8ea712cb0f 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,10 @@
+2002-02-11  Adam Megacz <adam@xwt.org>
+
+	* exception.cc (_Jv_Throw, PERSONALITY_FUNCTION): Changed
+	std::abort() to simply abort(). Also added "fake" std::abort() so
+	we can #include unwind-pe.h without having to link against
+	libstdc++-v3.
+
 2002-02-10  Andreas Tobler  <toa@pop.agri.ch>
 
 	* interpret.cc (continue1) [insn_f2l]: Use PUSHL, not PUSHI.
diff --git a/libjava/exception.cc b/libjava/exception.cc
index a8e6ece6e28..5d1f28886d5 100644
--- a/libjava/exception.cc
+++ b/libjava/exception.cc
@@ -11,16 +11,25 @@ details.  */
 #include <config.h>
 
 #include <stddef.h>
-#include <cstdlib>
+#include <stdlib.h>
 
 #include <java/lang/Class.h>
 #include <java/lang/NullPointerException.h>
 #include <gcj/cni.h>
 #include <jvm.h>
 
+// 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
+{
+  void abort ()
+  {
+    ::abort ();
+  }
+}
 #include "unwind.h"
 
-
 struct alignment_test_struct
 {
   char space;
@@ -97,7 +106,7 @@ _Jv_Throw (jthrowable value)
      recover.  As is the way of such things, almost certainly we will have
      crashed before now, rather than actually being able to diagnose the
      problem.  */
-  std::abort ();
+  abort();
 }
 
 
@@ -344,7 +353,7 @@ PERSONALITY_FUNCTION (int version,
 	      // ??? Perhaps better to make them an index into a table
 	      // of null-terminated strings instead of playing games
 	      // with Utf8Const+1 as above.
-	      std::abort ();
+	      abort ();
 	    }
 
 	  if (ar_disp == 0)
-- 
cgit v1.2.3