diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2002-05-09 23:01:55 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2002-05-09 23:01:55 +0200 |
| commit | 2937267b6a53ca3c5e1aa45339634c2901f844cb (patch) | |
| tree | 90b85aa28a1ca0a270f78459d62ab64da5663ee3 /libstdc++-v3 | |
| parent | 086c0f96be83e383209026548c6929be7e160f1c (diff) | |
| download | gcc-2937267b6a53ca3c5e1aa45339634c2901f844cb.zip gcc-2937267b6a53ca3c5e1aa45339634c2901f844cb.tar.gz gcc-2937267b6a53ca3c5e1aa45339634c2901f844cb.tar.bz2 | |
re PR target/6429 (libgcc_s problem on dual 32/64-bit arches)
PR target/6429
* Makefile.in (libgcc.mk): Pass SHLIB_SLIBDIR_SUFFIXES to mklibgcc.
* mklibgcc.in: If SHLIB_SLIBDIR_SUFFIXES is defined, put libgcc_s
shared libraries into multilib dirs, with SONAME libgcc_s.so.1 for
base multilibs.
* config/t-slibgcc-elf-ver (SHLIB_LINK): Adjust for the above.
* config/t-slibgcc-sld (SHLIB_LINK): Likewise.
* config/i386/t-linux64 (SHLIB_SLIBDIR_SUFFIXES): Define.
* config/sparc/t-linux64 (SHLIB_SLIBDIR_SUFFIXES): Define.
* config/sparc/t-sol2-64 (SHLIB_SLIBDIR_SUFFIXES): Define.
* lib/g77.exp (g77_link_flags): Append all multilib dirs containing
libgcc_s*.so.1 below gcc object dir to LD_LIBRARY_PATH.
* lib/g++.exp (g++_link_flags): Likewise.
* lib/objc.exp (objc_target_compile): Likewise.
* testsuite/lib/libstdc++-v3-dg.exp (libstdc++-v3-init): Append all
multilib dirs containing libgcc_s*.so.1 below gcc object dir to
LD_LIBRARY_PATH.
* testsuite/lib/libjava.exp (libjava_arguments): Append all
multilib dirs containing libgcc_s*.so.1 below gcc object dir to
LD_LIBRARY_PATH.
From-SVN: r53345
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/lib/libstdc++-v3-dg.exp | 14 |
2 files changed, 20 insertions, 0 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index ceb0547..1d9d900 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2002-05-09 Jakub Jelinek <jakub@redhat.com> + + * testsuite/lib/libstdc++-v3-dg.exp (libstdc++-v3-init): Append all + multilib dirs containing libgcc_s*.so.1 below gcc object dir to + LD_LIBRARY_PATH. + 2002-05-08 Alexandre Oliva <aoliva@redhat.com> * configure.in (ORIGINAL_LD_FOR_MULTILIBS): Preserve LD at diff --git a/libstdc++-v3/testsuite/lib/libstdc++-v3-dg.exp b/libstdc++-v3/testsuite/lib/libstdc++-v3-dg.exp index 08fb58e..adbd148 100644 --- a/libstdc++-v3/testsuite/lib/libstdc++-v3-dg.exp +++ b/libstdc++-v3/testsuite/lib/libstdc++-v3-dg.exp @@ -67,6 +67,20 @@ proc libstdc++-v3-init { args } { set ld_library_path "." append ld_library_path ":${gccdir}" + set compiler ${gccdir}/g++ + if { [is_remote host] == 0 && [which $compiler] != 0 } { + foreach i "[exec $compiler --print-multi-lib]" { + set mldir "" + regexp -- "\[a-z0-9=/\.-\]*;" $i mldir + set mldir [string trimright $mldir "\;@"] + if { "$mldir" == "." } { + continue + } + if { [llength [glob -nocomplain ${gccdir}/${mldir}/libgcc_s*.so.*]] == 1 } { + append ld_library_path ":${gccdir}/${mldir}" + } + } + } append ld_library_path ":${blddir}/src/.libs" # On IRIX 6, we have to set variables akin to LD_LIBRARY_PATH, but |