This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
PATCH: libjava: Add multilib support to testsuite/libjava.jni/jni.exp
- From: "H. J. Lu" <hjl at lucon dot org>
- To: gcc-patches at gcc dot gnu dot org
- Cc: java-patches at gcc dot gnu dot org
- Date: Tue, 13 Sep 2005 09:59:41 -0700
- Subject: PATCH: libjava: Add multilib support to testsuite/libjava.jni/jni.exp
testsuite/libjava.jni/jni.exp doesn't support multilib since it uses
-L../.libs -lgcj
for linking with libgcj. PR16923.c always fails to compile when
multilib is used. On Linux/x86-64, I got
Executing on host:
/export/build/gnu/gcc-4.0/build-x86_64-linux/gcc/xgcc
-B/export/build/gnu/gcc-4.0/build-x86_64-linux/gcc/
/export/gnu/src/gcc-4.0/gcc/libjava/testsuite/libjava.jni/invocation/PR16923.c
-I. -I.. -I/export/gnu/src/gcc-4.0/gcc/libjava/testsuite/../include
-L../.libs -lgcj -lm -m32 -o PR16923 (timeout = 300)
/usr/local/bin/ld: skipping incompatible ../.libs/libgcj.so when
searching for -lgcj^M
/usr/local/bin/ld: skipping incompatible ../.libs/libgcj.a when
searching for -lgcj^M output is: /usr/local/bin/ld: skipping
incompatible ../.libs/libgcj.so when searching for -lgcj^M
/usr/local/bin/ld: skipping incompatible ../.libs/libgcj.a when
searching for -lgcj^M
FAIL: PR16923.c compilation
This patch fixes it:
Executing on host: /export/build/gnu/gcc/build-x86_64-linux/gcc/xgcc
-B/export/build/gnu/gcc/build-x86_64-linux/gcc/
/export/gnu/src/gcc/gcc/libjava/testsuite/libjava.jni/invocation/PR16923.c
-I. -I.. -I/export/gnu/src/gcc/gcc/libjava/testsuite/../include
-I/export/gnu/src/gcc/gcc/libjava/testsuite/../classpath/include
-L/export/build/gnu/gcc/build-x86_64-linux/x86_64-unknown-linux-gnu/32/libjava/.libs
-lgcj -lm -m32 -o PR16923 (timeout = 300) PASS: PR16923.c
compilation
H.J.
----
2005-09-13 H.J. Lu <hongjiu.lu@intel.com>
* testsuite/libjava.jni/jni.exp (gcj_jni_invocation_test_one):
Use libjava_find_lib to find the proper libgcj.
--- libjava/testsuite/libjava.jni/jni.exp.multilib 2005-07-16 13:59:29.000000000 -0700
+++ libjava/testsuite/libjava.jni/jni.exp 2005-09-13 09:33:38.000000000 -0700
@@ -248,7 +248,13 @@ proc gcj_jni_invocation_test_one {file}
if { [istarget "*-*-darwin*"] } {
set cxxflags "-L../.libs -lgcc_s -lgcj -liconv"
} else {
- set cxxflags "-L../.libs -lgcj"
+ global LIBJAVA
+ if [info exists LIBJAVA] {
+ set libjava $LIBJAVA;
+ } else {
+ set libjava [libjava_find_lib libjava gcj]
+ }
+ set cxxflags "$libjava -lgcj"
}
if { [istarget "*-*-solaris*"] } {