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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@89528 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index cd404d1..f6de047 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.
 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 b863785..22fb5d7 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 { "$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}"
          }
        }
            append ld_library_path ":${rootme}/${mldir}"
          }
        }

diff --git a/gcc/testsuite/lib/gcc-dg.exp b/gcc/testsuite/lib/gcc-dg.exp
index ca2812d..be9169d 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 { "$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}"
        }
     }
            append libgcc_s_path ":${rootme}/${mldir}"
        }
     }

diff --git a/gcc/testsuite/lib/gfortran.exp b/gcc/testsuite/lib/gfortran.exp
index 07787cc..805b619 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 { "$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}"
          }
        }
            append ld_library_path ":${rootme}/${mldir}"
          }
        }

diff --git a/gcc/testsuite/lib/objc.exp b/gcc/testsuite/lib/objc.exp
index d75cf1a..e4d10e0 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 { "$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}"
            }
        }
                append objc_libgcc_s_path ":${rootme}/${mldir}"
            }
        }

diff --git a/gcc/testsuite/lib/treelang.exp b/gcc/testsuite/lib/treelang.exp
index 94bb8a0..57ea992 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 { "$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}"
            }
        }
                append treelang_libgcc_s_path ":${rootme}/${mldir}"
            }
        }

diff --git a/libffi/ChangeLog b/libffi/ChangeLog
index 7bc5760..ea883fc 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.
 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 abeb476..b8ada00 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 { "$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}"
            }
        }
                append ld_library_path ":${gccdir}/${mldir}"
            }
        }

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index f3b1283..00a4953 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,
 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 (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 { "$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}"
                }
            }
                    lappend libjava_libgcc_s_path "${gccdir}/${mldir}"
                }
            }

diff --git a/libmudflap/ChangeLog b/libmudflap/ChangeLog
index ee4feac..ffb681e 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.
 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 04a1720..83544bb 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 { "$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}"
            }
        }
                append ld_library_path ":${gccdir}/${mldir}"
            }
        }

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 9d8d3f2..46311ca 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,
 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 29ae62e..b126ef3 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 { "$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}"
         }
       }
           append ld_library_path ":${gccdir}/${mldir}"
         }
       }