From 1e02510f051fc8451d2d92628f27ae8332849748 Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Mon, 25 Oct 2004 11:01:15 +0200 Subject: [PATCH] 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 --- gcc/testsuite/ChangeLog | 9 +++++++++ gcc/testsuite/lib/g++.exp | 2 +- gcc/testsuite/lib/gcc-dg.exp | 2 +- gcc/testsuite/lib/gfortran.exp | 2 +- gcc/testsuite/lib/objc.exp | 2 +- gcc/testsuite/lib/treelang.exp | 2 +- libffi/ChangeLog | 5 +++++ libffi/testsuite/lib/libffi-dg.exp | 2 +- libjava/ChangeLog | 5 +++++ libjava/testsuite/lib/libjava.exp | 2 +- libmudflap/ChangeLog | 5 +++++ libmudflap/testsuite/lib/libmudflap.exp | 2 +- libstdc++-v3/ChangeLog | 5 +++++ libstdc++-v3/testsuite/lib/libstdc++.exp | 2 +- 14 files changed, 38 insertions(+), 9 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index cd404d13a1c..f6de047b011 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,12 @@ +2004-10-25 Eric Botcazou + + 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. + 2004-10-24 Ben Elliston * gcc.dg/c90-const-expr-3.c: Reference the ISO C standard. diff --git a/gcc/testsuite/lib/g++.exp b/gcc/testsuite/lib/g++.exp index b863785ee38..22fb5d7608c 100644 --- a/gcc/testsuite/lib/g++.exp +++ b/gcc/testsuite/lib/g++.exp @@ -138,7 +138,7 @@ proc g++_link_flags { paths } { if { "$mldir" == "." } { continue } - if { [llength [glob -nocomplain ${rootme}/${mldir}/libgcc_s*.so.*]] == 1 } { + if { [llength [glob -nocomplain ${rootme}/${mldir}/libgcc_s*.so.*]] >= 1 } { append ld_library_path ":${rootme}/${mldir}" } } diff --git a/gcc/testsuite/lib/gcc-dg.exp b/gcc/testsuite/lib/gcc-dg.exp index ca2812d499c..be9169d50c1 100644 --- a/gcc/testsuite/lib/gcc-dg.exp +++ b/gcc/testsuite/lib/gcc-dg.exp @@ -57,7 +57,7 @@ if { [is_remote host] == 0 && [which $compiler] != 0 } { if { "$mldir" == "." } { continue } - if { [llength [glob -nocomplain ${rootme}/${mldir}/libgcc_s*.so.*]] == 1 } { + if { [llength [glob -nocomplain ${rootme}/${mldir}/libgcc_s*.so.*]] >= 1 } { append libgcc_s_path ":${rootme}/${mldir}" } } diff --git a/gcc/testsuite/lib/gfortran.exp b/gcc/testsuite/lib/gfortran.exp index 07787cc5bcc..805b61960ce 100644 --- a/gcc/testsuite/lib/gfortran.exp +++ b/gcc/testsuite/lib/gfortran.exp @@ -103,7 +103,7 @@ proc gfortran_link_flags { paths } { if { "$mldir" == "." } { continue } - if { [llength [glob -nocomplain ${rootme}/${mldir}/libgcc_s*.so.*]] == 1 } { + if { [llength [glob -nocomplain ${rootme}/${mldir}/libgcc_s*.so.*]] >= 1 } { append ld_library_path ":${rootme}/${mldir}" } } diff --git a/gcc/testsuite/lib/objc.exp b/gcc/testsuite/lib/objc.exp index d75cf1aaf8b..e4d10e04cd2 100644 --- a/gcc/testsuite/lib/objc.exp +++ b/gcc/testsuite/lib/objc.exp @@ -120,7 +120,7 @@ proc objc_init { args } { if { "$mldir" == "." } { continue } - if { [llength [glob -nocomplain ${rootme}/${mldir}/libgcc_s*.so.*]] == 1 } { + if { [llength [glob -nocomplain ${rootme}/${mldir}/libgcc_s*.so.*]] >= 1 } { append objc_libgcc_s_path ":${rootme}/${mldir}" } } diff --git a/gcc/testsuite/lib/treelang.exp b/gcc/testsuite/lib/treelang.exp index 94bb8a0b115..57ea992d2f0 100644 --- a/gcc/testsuite/lib/treelang.exp +++ b/gcc/testsuite/lib/treelang.exp @@ -117,7 +117,7 @@ proc treelang_init { args } { if { "$mldir" == "." } { continue } - if { [llength [glob -nocomplain ${rootme}/${mldir}/libgcc_s*.so.*]] == 1 } { + if { [llength [glob -nocomplain ${rootme}/${mldir}/libgcc_s*.so.*]] >= 1 } { append treelang_libgcc_s_path ":${rootme}/${mldir}" } } diff --git a/libffi/ChangeLog b/libffi/ChangeLog index 7bc5760e052..ea883fc4c0b 100644 --- a/libffi/ChangeLog +++ b/libffi/ChangeLog @@ -1,3 +1,8 @@ +2004-10-25 Eric Botcazou + + PR other/18138 + * testsuite/lib/libffi-dg.exp: Accept more than one multilib libgcc. + 2004-10-25 Kazuhiro Inaoka * src/m32r/libffitarget.h (FFI_CLOSURES): Set to 0. diff --git a/libffi/testsuite/lib/libffi-dg.exp b/libffi/testsuite/lib/libffi-dg.exp index abeb47676b8..b8ada00cc29 100644 --- a/libffi/testsuite/lib/libffi-dg.exp +++ b/libffi/testsuite/lib/libffi-dg.exp @@ -101,7 +101,7 @@ proc libffi-init { args } { if { "$mldir" == "." } { continue } - if { [llength [glob -nocomplain ${gccdir}/${mldir}/libgcc_s*.so.*]] == 1 } { + if { [llength [glob -nocomplain ${gccdir}/${mldir}/libgcc_s*.so.*]] >= 1 } { append ld_library_path ":${gccdir}/${mldir}" } } diff --git a/libjava/ChangeLog b/libjava/ChangeLog index f3b1283c620..00a4953c30b 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2004-10-25 Eric Botcazou + + PR other/18138 + * testsuite/lib/libjava.exp: Accept more than one multilib libgcc. + 2004-10-23 Michael Koch * javax/print/DocFlavor.java, diff --git a/libjava/testsuite/lib/libjava.exp b/libjava/testsuite/lib/libjava.exp index c28addf9944..bc46ecf4f24 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}" } } diff --git a/libmudflap/ChangeLog b/libmudflap/ChangeLog index ee4feac614e..ffb681ec8cf 100644 --- a/libmudflap/ChangeLog +++ b/libmudflap/ChangeLog @@ -1,3 +1,8 @@ +2004-10-25 Eric Botcazou + + PR other/18138 + * testsuite/lib/libmudflap.exp: Accept more than one multilib libgcc. + 2004-10-12 Frank Ch. Eigler * configure.ac: Check for more headers, functions. diff --git a/libmudflap/testsuite/lib/libmudflap.exp b/libmudflap/testsuite/lib/libmudflap.exp index 04a17209fd7..83544bb1aac 100644 --- a/libmudflap/testsuite/lib/libmudflap.exp +++ b/libmudflap/testsuite/lib/libmudflap.exp @@ -69,7 +69,7 @@ proc libmudflap-init { language } { if { "$mldir" == "." } { continue } - if { [llength [glob -nocomplain ${gccdir}/${mldir}/libgcc_s*.so.*]] == 1 } { + if { [llength [glob -nocomplain ${gccdir}/${mldir}/libgcc_s*.so.*]] >= 1 } { append ld_library_path ":${gccdir}/${mldir}" } } diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 9d8d3f2c0f6..46311ca507d 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2004-10-25 Eric Botcazou + + PR other/18138 + * testsuite/lib/libstdc++.exp: Accept more than one multilib libgcc. + 2004-10-25 Paolo Carlini * include/bits/basic_string.h (_Rep::_M_is_safe, _M_check_length, diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp index 29ae62ed00c..b126ef3107a 100644 --- a/libstdc++-v3/testsuite/lib/libstdc++.exp +++ b/libstdc++-v3/testsuite/lib/libstdc++.exp @@ -159,7 +159,7 @@ proc libstdc++_init { testfile } { if { "$mldir" == "." } { continue } - if { [llength [glob -nocomplain ${gccdir}/${mldir}/libgcc_s*.so.*]] == 1 } { + if { [llength [glob -nocomplain ${gccdir}/${mldir}/libgcc_s*.so.*]] >= 1 } { append ld_library_path ":${gccdir}/${mldir}" } }