diff options
| author | James Norris <jnorris@codesourcery.com> | 2015-10-07 17:09:46 +0000 |
|---|---|---|
| committer | James Norris <jnorris@gcc.gnu.org> | 2015-10-07 17:09:46 +0000 |
| commit | 919e06d3f59f9770be5e3968159a46f6c077c9f8 (patch) | |
| tree | cae9e7c10ad7848db8dd183293d66ecbf2e47cf5 /gcc | |
| parent | 91bf00a903438a1f5937791c2c10460d248eb74a (diff) | |
| download | gcc-919e06d3f59f9770be5e3968159a46f6c077c9f8.zip gcc-919e06d3f59f9770be5e3968159a46f6c077c9f8.tar.gz gcc-919e06d3f59f9770be5e3968159a46f6c077c9f8.tar.bz2 | |
atomic-dg.exp (atomic_link_flags): Move flag setting to atomic_init.
* testsuite/lib/atomic-dg.exp (atomic_link_flags): Move flag setting
to atomic_init. (atomic_init): Restrict flags usage.
From-SVN: r228575
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/lib/atomic-dg.exp | 16 |
2 files changed, 17 insertions, 4 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 2b70946..d06a25f 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2015-10-07 James Norris <jnorris@codesourcery.com> + + * testsuite/lib/atomic-dg.exp (atomic_link_flags): Move flag setting + to atomic_init. (atomic_init): Restrict flags usage. + 2015-10-07 Andre Vehreschild <vehre@gcc.gnu.org> PR fortran/65889 diff --git a/gcc/testsuite/lib/atomic-dg.exp b/gcc/testsuite/lib/atomic-dg.exp index fe24127..0640f3c 100644 --- a/gcc/testsuite/lib/atomic-dg.exp +++ b/gcc/testsuite/lib/atomic-dg.exp @@ -48,7 +48,6 @@ proc atomic_link_flags { paths } { set_ld_library_path_env_vars - append flags " -latomic " return "$flags" } @@ -61,6 +60,7 @@ proc atomic_init { args } { global ALWAYS_CXXFLAGS global TOOL_OPTIONS global atomic_saved_TEST_ALWAYS_FLAGS + global atomic_saved_ALWAYS_CXXFLAGS set link_flags "" if ![is_remote host] { @@ -71,10 +71,13 @@ proc atomic_init { args } { } } + append link_flags " -latomic " + if [info exists TEST_ALWAYS_FLAGS] { set atomic_saved_TEST_ALWAYS_FLAGS $TEST_ALWAYS_FLAGS } if [info exists ALWAYS_CXXFLAGS] { + set atomic_saved_ALWAYS_CXXFLAGS $ALWAYS_CXXFLAGS set ALWAYS_CXXFLAGS [concat "{ldflags=$link_flags}" $ALWAYS_CXXFLAGS] } else { if [info exists TEST_ALWAYS_FLAGS] { @@ -95,11 +98,16 @@ proc atomic_init { args } { proc atomic_finish { args } { global TEST_ALWAYS_FLAGS global atomic_saved_TEST_ALWAYS_FLAGS + global atomic_saved_ALWAYS_CXXFLAGS - if [info exists atomic_saved_TEST_ALWAYS_FLAGS] { - set TEST_ALWAYS_FLAGS $atomic_saved_TEST_ALWAYS_FLAGS + if [info exists atomic_saved_ALWAYS_CXXFLAGS] { + set ALWAYS_CXXFLAGS $atomic_saved_ALWAYS_CXXFLAGS } else { - unset TEST_ALWAYS_FLAGS + if [info exists atomic_saved_TEST_ALWAYS_FLAGS] { + set TEST_ALWAYS_FLAGS $atomic_saved_TEST_ALWAYS_FLAGS + } else { + unset TEST_ALWAYS_FLAGS + } } clear_effective_target_cache } |