diff options
Diffstat (limited to 'libgomp')
-rw-r--r-- | libgomp/ChangeLog | 11 | ||||
-rw-r--r-- | libgomp/testsuite/lib/libgomp.exp | 35 | ||||
-rw-r--r-- | libgomp/testsuite/libgomp.c++/c++.exp | 6 | ||||
-rw-r--r-- | libgomp/testsuite/libgomp.c/c.exp | 1 | ||||
-rw-r--r-- | libgomp/testsuite/libgomp.fortran/fortran.exp | 6 |
5 files changed, 17 insertions, 42 deletions
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index 63295bf..98a3794 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,14 @@ +2009-06-30 Richard Sandiford <r.sandiford@uk.ibm.com> + + * testsuite/lib/libgomp.exp (libgomp_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. + * testsuite/libgomp.c/c.exp (ld_library_path): Don't call + gcc-set-multilib-library-path; rely on $always_ld_library_path instead. + * testsuite/libgomp.c++/c++.exp (ld_library_path): Likewise. + Use add_path. + * testsuite/libgomp.fortran/fortran.exp (ld_library_path): Likewise. + 2009-06-09 Nathan Froyd <froydnj@codesourcery.com> * Makefile.am (LTLDFLAGS): Define. diff --git a/libgomp/testsuite/lib/libgomp.exp b/libgomp/testsuite/lib/libgomp.exp index 972d4a1..5a7ec5f 100644 --- a/libgomp/testsuite/lib/libgomp.exp +++ b/libgomp/testsuite/lib/libgomp.exp @@ -86,39 +86,8 @@ proc libgomp_init { args } { set CFLAGS "" } - # Locate libgcc.a so we don't need to account for different values of - # SHLIB_EXT on different platforms - set gccdir [lookfor_file $tool_root_dir gcc/libgcc.a] - if {$gccdir != ""} { - set gccdir [file dirname $gccdir] - } - - # Compute what needs to be put into LD_LIBRARY_PATH - set always_ld_library_path ".:${blddir}/.libs" - - # Compute what needs to be added to the existing LD_LIBRARY_PATH. - if {$gccdir != ""} { - # Add AIX pthread directory first. - if { [llength [glob -nocomplain ${gccdir}/pthread/libgcc_s*.a]] >= 1 } { - append always_ld_library_path ":${gccdir}/pthread" - } - append always_ld_library_path ":${gccdir}" - set compiler [lindex $GCC_UNDER_TEST 0] - - 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 always_ld_library_path ":${gccdir}/${mldir}" - } - } - } - } + set always_ld_library_path "${blddir}/.libs" + add_path always_ld_library_path [find_libgcc_s $GCC_UNDER_TEST] set ALWAYS_CFLAGS "" if { $blddir != "" } { diff --git a/libgomp/testsuite/libgomp.c++/c++.exp b/libgomp/testsuite/libgomp.c++/c++.exp index decda3d..92b8146 100644 --- a/libgomp/testsuite/libgomp.c++/c++.exp +++ b/libgomp/testsuite/libgomp.c++/c++.exp @@ -37,12 +37,10 @@ if { $lang_test_file_found } { # Gather a list of all tests. set tests [lsort [glob -nocomplain $srcdir/$subdir/*.C]] + set ld_library_path $always_ld_library_path if { $blddir != "" } { - set ld_library_path "$always_ld_library_path:${blddir}/${lang_library_path}" - } else { - set ld_library_path "$always_ld_library_path" + add_path ld_library_path "${blddir}/${lang_library_path}" } - append ld_library_path [gcc-set-multilib-library-path $GCC_UNDER_TEST] set_ld_library_path_env_vars set flags_file "${blddir}/../libstdc++-v3/scripts/testsuite_flags" diff --git a/libgomp/testsuite/libgomp.c/c.exp b/libgomp/testsuite/libgomp.c/c.exp index 980bb52..e304f56 100644 --- a/libgomp/testsuite/libgomp.c/c.exp +++ b/libgomp/testsuite/libgomp.c/c.exp @@ -20,7 +20,6 @@ dg-init set tests [lsort [find $srcdir/$subdir *.c]] set ld_library_path $always_ld_library_path -append ld_library_path [gcc-set-multilib-library-path $GCC_UNDER_TEST] set_ld_library_path_env_vars # Main loop. diff --git a/libgomp/testsuite/libgomp.fortran/fortran.exp b/libgomp/testsuite/libgomp.fortran/fortran.exp index 3d6615f..a1042d1 100644 --- a/libgomp/testsuite/libgomp.fortran/fortran.exp +++ b/libgomp/testsuite/libgomp.fortran/fortran.exp @@ -26,12 +26,10 @@ if { $lang_test_file_found } { # Gather a list of all tests. set tests [lsort [find $srcdir/$subdir *.\[fF\]{,90,95,03,08}]] + set ld_library_path $always_ld_library_path if { $blddir != "" } { - set ld_library_path "$always_ld_library_path:${blddir}/${lang_library_path}" - } else { - set ld_library_path "$always_ld_library_path" + add_path ld_library_path "${blddir}/${lang_library_path}" } - append ld_library_path [gcc-set-multilib-library-path $GCC_UNDER_TEST] set_ld_library_path_env_vars # Main loop. |