libgomp.exp (libgomp_init): Use the ALWAYS_CFLAGS options when choosing a multilib.

libgomp/
	* testsuite/lib/libgomp.exp (libgomp_init): Use the ALWAYS_CFLAGS
	options when choosing a multilib.

From-SVN: r149195

libgomp/ChangeLog

+2009-07-02  Richard Sandiford  <r.sandiford@uk.ibm.com>
+
+	* testsuite/lib/libgomp.exp (libgomp_init): Use the ALWAYS_CFLAGS
+	options when choosing a multilib.
+
 2009-06-30  Richard Sandiford  <r.sandiford@uk.ibm.com>
 
 	* testsuite/lib/libgomp.exp (libgomp_init): Don't add "." to

libgomp/testsuite/lib/libgomp.exp

@@ -86,9 +86,6 @@ proc libgomp_init { args } {
 	set CFLAGS ""
     }
 
-    set always_ld_library_path "${blddir}/.libs"
-    add_path always_ld_library_path [find_libgcc_s $GCC_UNDER_TEST]
-
     set ALWAYS_CFLAGS ""
     if { $blddir != "" } {
         lappend ALWAYS_CFLAGS "additional_flags=-B${blddir}/"
@@ -122,6 +119,16 @@ proc libgomp_init { args } {
 
     # And, gee, turn on OpenMP.
     lappend ALWAYS_CFLAGS "additional_flags=-fopenmp"
+
+    set compiler $GCC_UNDER_TEST
+    foreach flag $ALWAYS_CFLAGS {
+	if { [regexp {^(additional_flags|ldflags)=(.*)} $flag d1 d2 option] } {
+	    lappend compiler $option
+	}
+    }
+
+    set always_ld_library_path "${blddir}/.libs"
+    add_path always_ld_library_path [find_libgcc_s $compiler]
 }
 
 #