From: aph <aph@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 31 Jan 2007 19:04:35 +0000 (+0000)
Subject: 2007-01-31  Andrew Haley  <aph@redhat.com>
X-Git-Tag: upstream/4.9.2~50696
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=62e761afd47d55fb2bcc32a97775e9cdad2ba7f6;p=platform%2Fupstream%2Flinaro-gcc.git

2007-01-31  Andrew Haley  <aph@redhat.com>

        * prims.cc (_Jv_Abort): fflush (stderr).
        * java/lang/natClassLoader.cc (_Jv_CheckABIVersion): Abort.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@121433 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 40ce7ee..8dde1eb 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-31  Andrew Haley  <aph@redhat.com>
+
+	* prims.cc (_Jv_Abort): fflush (stderr).
+	* java/lang/natClassLoader.cc (_Jv_CheckABIVersion): Abort.
+
 2007-01-31  Tom Tromey  <tromey@redhat.com>
 
 	* configure, Makefile.in: Rebuilt.
diff --git a/libjava/java/lang/natClassLoader.cc b/libjava/java/lang/natClassLoader.cc
index 9c1a6a2..e62c6d3 100644
--- a/libjava/java/lang/natClassLoader.cc
+++ b/libjava/java/lang/natClassLoader.cc
@@ -208,6 +208,12 @@ _Jv_CheckABIVersion (unsigned long value)
       // C++ ABI
       if (version == GCJ_CXX_ABI_VERSION)
 	return;
+
+      // If we've loaded a library that uses the C++ ABI, and this
+      // library is an incompatible version, then we're dead.  There's
+      // no point throwing an exception: that will crash.
+      JvFail ("gcj linkage error.\n"
+	      "Incorrect library ABI version detected.  Aborting.\n");
     }
 
   throw new ::java::lang::ClassFormatError
diff --git a/libjava/prims.cc b/libjava/prims.cc
index e205dbb..a419120 100644
--- a/libjava/prims.cc
+++ b/libjava/prims.cc
@@ -458,6 +458,7 @@ _Jv_Abort (const char *, const char *, int, const char *message)
 #else
   fprintf (stderr, "libgcj failure: %s\n", message);
 #endif
+  fflush (stderr);
   abort ();
 }