From 87bd23b8e99eaabd98d7ec624ad779c4c00d74e0 Mon Sep 17 00:00:00 2001
From: David Edelsohn <edelsohn@gnu.org>
Date: Tue, 8 Jul 2008 19:13:29 +0000
Subject: [PATCH] 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
---
 libgomp/ChangeLog                             | 8 ++++++++
 libgomp/testsuite/lib/libgomp.exp             | 4 ++++
 libgomp/testsuite/libgomp.c++/c++.exp         | 1 +
 libgomp/testsuite/libgomp.c/c.exp             | 1 +
 libgomp/testsuite/libgomp.fortran/fortran.exp | 1 +
 5 files changed, 15 insertions(+)

diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 2d7516b528ca..671b48bde762 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 274ee17f0a7e..9aa891f202d6 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 f3f42de66193..d9872cc1ef34 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 9eaab6252c35..4085d0c07e0b 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 b7d6b1072e7a..293ccbc65313 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.