Commit 1e02510f by Eric Botcazou Committed by Eric Botcazou

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
parent d9a193b2
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> 2004-10-24 Ben Elliston <bje@au.ibm.com>
* gcc.dg/c90-const-expr-3.c: Reference the ISO C standard. * gcc.dg/c90-const-expr-3.c: Reference the ISO C standard.
......
...@@ -138,7 +138,7 @@ proc g++_link_flags { paths } { ...@@ -138,7 +138,7 @@ proc g++_link_flags { paths } {
if { "$mldir" == "." } { if { "$mldir" == "." } {
continue 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}"
} }
} }
......
...@@ -57,7 +57,7 @@ if { [is_remote host] == 0 && [which $compiler] != 0 } { ...@@ -57,7 +57,7 @@ if { [is_remote host] == 0 && [which $compiler] != 0 } {
if { "$mldir" == "." } { if { "$mldir" == "." } {
continue 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}"
} }
} }
......
...@@ -103,7 +103,7 @@ proc gfortran_link_flags { paths } { ...@@ -103,7 +103,7 @@ proc gfortran_link_flags { paths } {
if { "$mldir" == "." } { if { "$mldir" == "." } {
continue 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}"
} }
} }
......
...@@ -120,7 +120,7 @@ proc objc_init { args } { ...@@ -120,7 +120,7 @@ proc objc_init { args } {
if { "$mldir" == "." } { if { "$mldir" == "." } {
continue 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}"
} }
} }
......
...@@ -117,7 +117,7 @@ proc treelang_init { args } { ...@@ -117,7 +117,7 @@ proc treelang_init { args } {
if { "$mldir" == "." } { if { "$mldir" == "." } {
continue 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}"
} }
} }
......
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> 2004-10-25 Kazuhiro Inaoka <inaoka.kazuhiro@renesas.com>
* src/m32r/libffitarget.h (FFI_CLOSURES): Set to 0. * src/m32r/libffitarget.h (FFI_CLOSURES): Set to 0.
......
...@@ -101,7 +101,7 @@ proc libffi-init { args } { ...@@ -101,7 +101,7 @@ proc libffi-init { args } {
if { "$mldir" == "." } { if { "$mldir" == "." } {
continue 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}"
} }
} }
......
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> 2004-10-23 Michael Koch <konqueror@gmx.de>
* javax/print/DocFlavor.java, * javax/print/DocFlavor.java,
......
...@@ -226,7 +226,7 @@ proc libjava_init { args } { ...@@ -226,7 +226,7 @@ proc libjava_init { args } {
if { "$mldir" == "." } { if { "$mldir" == "." } {
continue 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}"
} }
} }
......
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> 2004-10-12 Frank Ch. Eigler <fche@redhat.com>
* configure.ac: Check for more headers, functions. * configure.ac: Check for more headers, functions.
......
...@@ -69,7 +69,7 @@ proc libmudflap-init { language } { ...@@ -69,7 +69,7 @@ proc libmudflap-init { language } {
if { "$mldir" == "." } { if { "$mldir" == "." } {
continue 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}"
} }
} }
......
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> 2004-10-25 Paolo Carlini <pcarlini@suse.de>
* include/bits/basic_string.h (_Rep::_M_is_safe, _M_check_length, * include/bits/basic_string.h (_Rep::_M_is_safe, _M_check_length,
......
...@@ -159,7 +159,7 @@ proc libstdc++_init { testfile } { ...@@ -159,7 +159,7 @@ proc libstdc++_init { testfile } {
if { "$mldir" == "." } { if { "$mldir" == "." } {
continue 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}"
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment