diff options
Diffstat (limited to 'libgomp')
| -rw-r--r-- | libgomp/ChangeLog | 8 | ||||
| -rw-r--r-- | libgomp/testsuite/lib/libgomp.exp | 4 | ||||
| -rw-r--r-- | libgomp/testsuite/libgomp.c++/c++.exp | 1 | ||||
| -rw-r--r-- | libgomp/testsuite/libgomp.c/c.exp | 1 | ||||
| -rw-r--r-- | libgomp/testsuite/libgomp.fortran/fortran.exp | 1 |
5 files changed, 15 insertions, 0 deletions
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index 2d7516b..671b48b 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,11 @@ +2008-07-08 David Edelsohn <edelsohn@gnu.org> + + * testsuite/libgomp.c++/c++.exp: Append multilib library path. + * testsuite/libgomp.fortran/fortran.exp: Same. + * testsuite/libgomp.c/c.exp: Same. + * testsuite/lib/libgomp.exp: Append AIX libgcc pthread multilib + directory to library path first. + 2008-06-29 Krister Walfridsson <krister.walfridsson@gmail.com> * env.c (parse_stacksize): Add cast to avoid warning. diff --git a/libgomp/testsuite/lib/libgomp.exp b/libgomp/testsuite/lib/libgomp.exp index 274ee17..9aa891f 100644 --- a/libgomp/testsuite/lib/libgomp.exp +++ b/libgomp/testsuite/lib/libgomp.exp @@ -96,6 +96,10 @@ proc libgomp_init { args } { # 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] diff --git a/libgomp/testsuite/libgomp.c++/c++.exp b/libgomp/testsuite/libgomp.c++/c++.exp index f3f42de..d9872cc 100644 --- a/libgomp/testsuite/libgomp.c++/c++.exp +++ b/libgomp/testsuite/libgomp.c++/c++.exp @@ -29,6 +29,7 @@ if { $lang_test_file_found } { set tests [lsort [glob -nocomplain $srcdir/$subdir/*.C]] set ld_library_path "$always_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 9eaab62..4085d0c 100644 --- a/libgomp/testsuite/libgomp.c/c.exp +++ b/libgomp/testsuite/libgomp.c/c.exp @@ -18,6 +18,7 @@ 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 b7d6b10..293ccbc 100644 --- a/libgomp/testsuite/libgomp.fortran/fortran.exp +++ b/libgomp/testsuite/libgomp.fortran/fortran.exp @@ -13,6 +13,7 @@ if [file exists "${blddir}/${lang_test_file}"] { set tests [lsort [find $srcdir/$subdir *.\[fF\]{,90,95,03,08}]] set ld_library_path "$always_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. |