diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-07-15 08:52:53 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-07-15 08:52:53 +0000 |
| commit | e05ef402a2ebebf3461227723eca43cf692f9feb (patch) | |
| tree | cc579327961d3afb754162e12de142a15a075e67 /libgomp/testsuite | |
| parent | d33dc667ca63584d1369f1dd80ba2a112218b2c0 (diff) | |
| download | gcc-e05ef402a2ebebf3461227723eca43cf692f9feb.tar.gz | |
2008-07-15 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk r137813
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@137817 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgomp/testsuite')
| -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 |
4 files changed, 7 insertions, 0 deletions
diff --git a/libgomp/testsuite/lib/libgomp.exp b/libgomp/testsuite/lib/libgomp.exp index 274ee17f0a7..9aa891f202d 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 f3f42de6619..d9872cc1ef3 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 9eaab6252c3..4085d0c07e0 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 b7d6b1072e7..293ccbc6531 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. |