procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

atomic-dg.exp (atomic_link_flags): Move flag setting to atomic_init.

Browse source 
* testsuite/lib/atomic-dg.exp (atomic_link_flags): Move flag setting
	to atomic_init. (atomic_init): Restrict flags usage.

From-SVN: r228575
This commit is contained in:
James Norris 2015-10-07 17:09:46 +00:00 • committed by James Norris
parent 91bf00a903
commit 919e06d3f5
2 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gcc/testsuite/ChangeLog
View file

@ -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

16
gcc/testsuite/lib/atomic-dg.exp
View file

@ -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
}