diff options
| author | Jan Hubicka <jh@suse.cz> | 2009-07-02 22:25:14 +0000 |
|---|---|---|
| committer | Jan Hubicka <jh@suse.cz> | 2009-07-02 22:25:14 +0000 |
| commit | 81775a6f705cc3bd51eaa4d44361013b624f5384 (patch) | |
| tree | 344c7498ae605a8f447244612bcb1174d8064694 /libstdc++-v3 | |
| parent | 0f5a79bfd9eb2b4c54b511006eab1131896fd8ba (diff) | |
Merge from mainline.
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/pretty-ipa@149198 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/lib/libstdc++.exp | 21 |
2 files changed, 9 insertions, 18 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 963bc23f399..b1269dda782 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2009-06-30 Richard Sandiford <r.sandiford@uk.ibm.com> + + * testsuite/lib/libstdc++.exp (libstdc++_init): Don't add "." + to ld_library_path. Use add_path. Add just find_libgcc_s to + ld_library_path, not every libgcc multilib directory. + 2009-06-30 Paolo Carlini <paolo.carlini@oracle.com> PR libstdc++/40600 diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp index 45e92d756ec..99adce94fa3 100644 --- a/libstdc++-v3/testsuite/lib/libstdc++.exp +++ b/libstdc++-v3/testsuite/lib/libstdc++.exp @@ -132,7 +132,6 @@ proc libstdc++_init { testfile } { set gccdir [lookfor_file $tool_root_dir gcc/libgcc.a] if {$gccdir != ""} { set gccdir [file dirname $gccdir] - append ld_library_path_tmp ":${gccdir}" } v3track gccdir 3 @@ -142,7 +141,7 @@ proc libstdc++_init { testfile } { if {$libgompdir != ""} { set v3-libgomp 1 set libgompdir [file dirname $libgompdir] - append ld_library_path_tmp ":${libgompdir}" + add_path ld_library_path_tmp ${libgompdir} verbose -log "libgomp support detected" } v3track libgompdir 3 @@ -162,22 +161,8 @@ proc libstdc++_init { testfile } { if {$gccdir != ""} { set compiler ${gccdir}/g++ set ld_library_path ${ld_library_path_tmp} - append ld_library_path ":${blddir}/src/.libs" - - 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}" - } - } - } - + add_path ld_library_path "${blddir}/src/.libs" + add_path ld_library_path [find_libgcc_s $compiler] set_ld_library_path_env_vars if [info exists env(LD_LIBRARY_PATH)] { verbose -log "LD_LIBRARY_PATH = $env(LD_LIBRARY_PATH)" |