Commit 87bd23b8 by David Edelsohn Committed by David Edelsohn

c++.exp: Append multilib library path.

	* 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.

From-SVN: r137638
parent ff7437d0
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> 2008-06-29 Krister Walfridsson <krister.walfridsson@gmail.com>
* env.c (parse_stacksize): Add cast to avoid warning. * env.c (parse_stacksize): Add cast to avoid warning.
......
...@@ -96,6 +96,10 @@ proc libgomp_init { args } { ...@@ -96,6 +96,10 @@ proc libgomp_init { args } {
# Compute what needs to be added to the existing LD_LIBRARY_PATH. # Compute what needs to be added to the existing LD_LIBRARY_PATH.
if {$gccdir != ""} { 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}" append always_ld_library_path ":${gccdir}"
set compiler [lindex $GCC_UNDER_TEST 0] set compiler [lindex $GCC_UNDER_TEST 0]
......
...@@ -29,6 +29,7 @@ if { $lang_test_file_found } { ...@@ -29,6 +29,7 @@ if { $lang_test_file_found } {
set tests [lsort [glob -nocomplain $srcdir/$subdir/*.C]] set tests [lsort [glob -nocomplain $srcdir/$subdir/*.C]]
set ld_library_path "$always_ld_library_path:${blddir}/${lang_library_path}" 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_ld_library_path_env_vars
set flags_file "${blddir}/../libstdc++-v3/scripts/testsuite_flags" set flags_file "${blddir}/../libstdc++-v3/scripts/testsuite_flags"
......
...@@ -18,6 +18,7 @@ dg-init ...@@ -18,6 +18,7 @@ dg-init
set tests [lsort [find $srcdir/$subdir *.c]] set tests [lsort [find $srcdir/$subdir *.c]]
set ld_library_path $always_ld_library_path 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 set_ld_library_path_env_vars
# Main loop. # Main loop.
......
...@@ -13,6 +13,7 @@ if [file exists "${blddir}/${lang_test_file}"] { ...@@ -13,6 +13,7 @@ if [file exists "${blddir}/${lang_test_file}"] {
set tests [lsort [find $srcdir/$subdir *.\[fF\]{,90,95,03,08}]] set tests [lsort [find $srcdir/$subdir *.\[fF\]{,90,95,03,08}]]
set ld_library_path "$always_ld_library_path:${blddir}/${lang_library_path}" 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_ld_library_path_env_vars
# Main loop. # Main loop.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment