aboutsummaryrefslogtreecommitdiff
path: root/libjava
diff options
context:
space:
mode:
authorEric Botcazou <ebotcazou@libertysurf.fr>2004-10-25 11:01:15 +0200
committerEric Botcazou <ebotcazou@gcc.gnu.org>2004-10-25 09:01:15 +0000
commit1e02510f051fc8451d2d92628f27ae8332849748 (patch)
tree1be9f49be13b95a08437c9e2aba08b29e42e2660 /libjava
parentd9a193b251e4b83c0d48bdee8f781ac3d9a9b7b2 (diff)
downloadgcc-1e02510f051fc8451d2d92628f27ae8332849748.zip
gcc-1e02510f051fc8451d2d92628f27ae8332849748.tar.gz
gcc-1e02510f051fc8451d2d92628f27ae8332849748.tar.bz2
re PR other/18138 (libgcc_s.so.1 not found by 64-bit testsuite)
gcc/testsuite: PR other/18138 * lib/g++.exp: Accept more than one multilib libgcc. * lib/gcc-dg.exp: Likewise. * lib/objc.exp: Likewise. * lib/treelang.exp: Likewise. * lib/gfortran.exp: Likewise. libffi: PR other/18138 * testsuite/lib/libffi-dg.exp: Accept more than one multilib libgcc. libjava: PR other/18138 * testsuite/lib/libjava.exp: Accept more than one multilib libgcc. libmudflap!: PR other/18138 * testsuite/lib/libmudflap.exp: Accept more than one multilib libgcc. libstdc++-v3: PR other/18138 * testsuite/lib/libstdc++.exp: Accept more than one multilib libgcc. From-SVN: r89528
Diffstat (limited to 'libjava')
-rw-r--r--libjava/ChangeLog5
-rw-r--r--libjava/testsuite/lib/libjava.exp2
2 files changed, 6 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index f3b1283..00a4953 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-25 Eric Botcazou <ebotcazou@libertysurf.fr>
+
+ PR other/18138
+ * testsuite/lib/libjava.exp: Accept more than one multilib libgcc.
+
2004-10-23 Michael Koch <konqueror@gmx.de>
* javax/print/DocFlavor.java,
diff --git a/libjava/testsuite/lib/libjava.exp b/libjava/testsuite/lib/libjava.exp
index c28addf..bc46ecf 100644
--- a/libjava/testsuite/lib/libjava.exp
+++ b/libjava/testsuite/lib/libjava.exp
@@ -226,7 +226,7 @@ proc libjava_init { args } {
if { "$mldir" == "." } {
continue
}
- if { [llength [glob -nocomplain ${gccdir}/${mldir}/libgcc_s*.${so_extension}.*]] == 1 } {
+ if { [llength [glob -nocomplain ${gccdir}/${mldir}/libgcc_s*.${so_extension}.*]] >= 1 } {
lappend libjava_libgcc_s_path "${gccdir}/${mldir}"
}
}