PATCH: GCC 3.2 suddenly fails every java test, CLASSPATH wrong

Fri Aug 16 10:42:00 GMT 2002

H.J.> http://gcc.gnu.org/ml/gcc/2002-08/msg00901.html
Thanks. Try the appended patch. I think it will work (I did some
testing in tclsh). If it works for you I will check it in.
Tom
Index: ChangeLog
from Tom Tromey <tromey@redhat.com>
	* lib/libjava.exp (libjava_init): Handle case where gcc has a
	release version number.
Index: lib/libjava.exp
===================================================================
RCS file: /cvs/gcc/gcc/libjava/testsuite/lib/libjava.exp,v
retrieving revision 1.43
diff -u -r1.43 libjava.exp

--- lib/libjava.exp 24 Jun 2002 04:44:53 -0000 1.43
+++ lib/libjava.exp 16 Aug 2002 17:41:01 -0000
@@ -132,7 +132,9 @@
 
 # Determine the version so we can find the libgcj jar file.
 set text [eval exec "$GCJ_UNDER_TEST --version 2>@ stdout"]
- regexp -- "gcj \[^ \]+ (\[^ \]+) .*" $text ignore gcc_version
+ # Extract the first line and operate on that.
+ set text [lindex [split $text \n] 0]
+ regexp -- "gcj \[^ \]+ (\[^ \]+)( .*|)$" $text ignore gcc_version
 verbose "jar file is libgcj-$gcc_version.jar"
 
 # FIXME: This finds libgcj.spec for the default multilib.
