diff options
| author | Richard Sandiford <r.sandiford@uk.ibm.com> | 2009-07-02 20:55:23 +0000 |
|---|---|---|
| committer | Richard Sandiford <rsandifo@gcc.gnu.org> | 2009-07-02 20:55:23 +0000 |
| commit | bc21bfa5e3bc9f06ac92b2b9b43ae55116850f1b (patch) | |
| tree | f47e5ffb873cb827107ad3df7d662381607ab1e9 | |
| parent | ef3ddd4fa3d29318b5e05886382375712b9c1411 (diff) | |
| download | gcc-bc21bfa5e3bc9f06ac92b2b9b43ae55116850f1b.zip gcc-bc21bfa5e3bc9f06ac92b2b9b43ae55116850f1b.tar.gz gcc-bc21bfa5e3bc9f06ac92b2b9b43ae55116850f1b.tar.bz2 | |
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
| -rw-r--r-- | libgomp/ChangeLog | 5 | ||||
| -rw-r--r-- | libgomp/testsuite/lib/libgomp.exp | 13 |
2 files changed, 15 insertions, 3 deletions
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index 98a3794..6d36e30 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,8 @@ +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 diff --git a/libgomp/testsuite/lib/libgomp.exp b/libgomp/testsuite/lib/libgomp.exp index 5a7ec5f..4712de2 100644 --- a/libgomp/testsuite/lib/libgomp.exp +++ b/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] } # |