X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=blobdiff_plain;f=libjava%2Fjava%2Flang%2FnatClassLoader.cc;h=e62c6d392818b702e5b0a23c59af16b62be6b511;hp=9c1a6a258ec952d1205327187ea68600db9c6f82;hb=62e761afd47d55fb2bcc32a97775e9cdad2ba7f6;hpb=f8b619f0a133258cd094e2f5cebb7a5ea35556b6

diff --git a/libjava/java/lang/natClassLoader.cc b/libjava/java/lang/natClassLoader.cc
index 9c1a6a258ec..e62c6d39281 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