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

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index cd404d13a1c93932691c7a5455e1523f954acf69..f6de047b011971865d0adb57116ce10126217d3c 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2004-10-25  Eric Botcazou  <ebotcazou@libertysurf.fr>
+
+       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  <bje@au.ibm.com>
 
        * 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 b863785ee38effc1f3f424e4f4c4b543aac79951..22fb5d7608c58335db79dde1387a865b56594104 100644 (file)
--- 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 ca2812d499c460b5e128ecc0831161810ed224cf..be9169d50c1d6b27e21666d027e79d7b15ac25fa 100644 (file)
--- 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 07787cc5bcced7cf2fa4262eccabe8c8297d9c86..805b61960ce23bd4480f1162916664ef7c5cb108 100644 (file)
--- 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 d75cf1aaf8bbc63fe44e28d40f075df95583cb20..e4d10e04cd24a396bdc50c2139fbfd648aa8d8bb 100644 (file)
--- 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 94bb8a0b115bbd0d1c6f7cbb68113bd9d93d32d0..57ea992d2f0835891247dd623d65ada587ed8eba 100644 (file)
--- 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 7bc5760e052ebc9b5f9af61e1ff643c5df3a04cb..ea883fc4c0b26d789927ce7999c06b66545d663f 100644 (file)
--- a/libffi/ChangeLog
+++ b/libffi/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-25  Eric Botcazou  <ebotcazou@libertysurf.fr>
+
+       PR other/18138
+       * testsuite/lib/libffi-dg.exp: Accept more than one multilib libgcc.
+
 2004-10-25  Kazuhiro Inaoka <inaoka.kazuhiro@renesas.com>
 
        * 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 abeb47676b829446a5cb0d72aa45c7e3bc5e5cef..b8ada00cc294a2ac15e465ee201bd73e5cedb5e2 100644 (file)
--- 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 f3b1283c620a2dca873911e016934373c81b24ce..00a4953c30bc1c92d0ab50640c0f89ca948bb549 100644 (file)
--- 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 c28addf9944aa5a36cbe9fd5ccff353a5a09ce0c..bc46ecf4f24d830d1f454d0a6861982de2cb63e0 100644 (file)
--- 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 ee4feac614e73699750544faa63a868a69a3ca0a..ffb681ec8cf247698fdde05729840d6820fb90e1 100644 (file)
--- a/libmudflap/ChangeLog
+++ b/libmudflap/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-25  Eric Botcazou  <ebotcazou@libertysurf.fr>
+
+       PR other/18138
+       * testsuite/lib/libmudflap.exp: Accept more than one multilib libgcc.
+
 2004-10-12  Frank Ch. Eigler  <fche@redhat.com>
 
        * configure.ac: Check for more headers, functions.

diff --git a/libmudflap/testsuite/lib/libmudflap.exp b/libmudflap/testsuite/lib/libmudflap.exp
index 04a17209fd76d1ced64781e89949a35a6d6a453b..83544bb1aac0a69b307a225bae8df5c1e65dbda9 100644 (file)
--- 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 9d8d3f2c0f62bb8e2727d645b23891c5d9f0c7f5..46311ca507db41dff041cf5ac324b81f92ed2714 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-25  Eric Botcazou  <ebotcazou@libertysurf.fr>
+
+       PR other/18138
+       * testsuite/lib/libstdc++.exp: Accept more than one multilib libgcc.
+
 2004-10-25  Paolo Carlini  <pcarlini@suse.de>
 
        * 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 29ae62ed00cbaaae30ff0ee43ed2f06c91ec1236..b126ef3107a507d928fabbcd1d6d492f7391a44c 100644 (file)
--- 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}"
         }
       }