diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 2d7516b528ca2e6af97d7b904c785df147e3f858..671b48bde762e4823d2d0024690f78d15ad41726 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 274ee17f0a7e3cacf70a430297fb9a1d58ad887a..9aa891f202d6b2a48750b6828e65b93c41f56225 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 f3f42de66193c9ae8aadf40639e5ef9a1b07d4f2..d9872cc1ef34cab9433f41d607d78cdaaaa6cd38 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 9eaab6252c35893a0ca47d1458656db0d4d802ad..4085d0c07e0b35c936195f276a19f4ee623c32d8 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 b7d6b1072e7a12c927b25d2e7c6f63b650d0158e..293ccbc653133799179126a6bec618c758376141 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.