diff options
Diffstat (limited to 'gcc/testsuite/lib/gfortran.exp')
| -rw-r--r-- | gcc/testsuite/lib/gfortran.exp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/gcc/testsuite/lib/gfortran.exp b/gcc/testsuite/lib/gfortran.exp index 95af06a..8762c90 100644 --- a/gcc/testsuite/lib/gfortran.exp +++ b/gcc/testsuite/lib/gfortran.exp @@ -49,8 +49,8 @@ proc gfortran_version { } { # verify that the compiler exists if { [is_remote host] || [which $compiler] != 0 } then { set tmp [remote_exec host "$compiler -v"] - set status [lindex $tmp 0]; - set output [lindex $tmp 1]; + set status [lindex $tmp 0] + set output [lindex $tmp 1] regexp " version \[^\n\r\]*" $output version if { $status == 0 && [info exists version] } then { if [is_remote host] { @@ -126,7 +126,7 @@ proc gfortran_init { args } { global base_dir global tmpdir global libdir - global gluefile wrap_flags; + global gluefile wrap_flags global objdir srcdir global ALWAYS_GFORTRANFLAGS global TOOL_EXECUTABLE TOOL_OPTIONS @@ -139,7 +139,7 @@ proc gfortran_init { args } { if ![info exists GFORTRAN_UNDER_TEST] then { if [info exists TOOL_EXECUTABLE] { - set GFORTRAN_UNDER_TEST $TOOL_EXECUTABLE; + set GFORTRAN_UNDER_TEST $TOOL_EXECUTABLE } else { if { [is_remote host] || ! [info exists TESTING_IN_BUILD_TREE] } { set GFORTRAN_UNDER_TEST [transform gfortran] @@ -169,14 +169,14 @@ proc gfortran_init { args } { if ![is_remote host] { if [info exists TOOL_OPTIONS] { - lappend ALWAYS_GFORTRANFLAGS "ldflags=[gfortran_link_flags [get_multilibs ${TOOL_OPTIONS}] ]"; + lappend ALWAYS_GFORTRANFLAGS "ldflags=[gfortran_link_flags [get_multilibs ${TOOL_OPTIONS}] ]" } else { - lappend ALWAYS_GFORTRANFLAGS "ldflags=[gfortran_link_flags [get_multilibs] ]"; + lappend ALWAYS_GFORTRANFLAGS "ldflags=[gfortran_link_flags [get_multilibs] ]" } } if [info exists TOOL_OPTIONS] { - lappend ALWAYS_GFORTRANFLAGS "additional_flags=$TOOL_OPTIONS"; + lappend ALWAYS_GFORTRANFLAGS "additional_flags=$TOOL_OPTIONS" } verbose -log "ALWAYS_GFORTRANFLAGS set to $ALWAYS_GFORTRANFLAGS" @@ -189,19 +189,19 @@ proc gfortran_init { args } { # proc gfortran_target_compile { source dest type options } { - global tmpdir; + global tmpdir global gluefile wrap_flags - global ALWAYS_GFORTRANFLAGS; - global GFORTRAN_UNDER_TEST; + global ALWAYS_GFORTRANFLAGS + global GFORTRAN_UNDER_TEST if { [target_info needs_status_wrapper] != "" && [info exists gluefile] } { lappend options "libs=${gluefile}" lappend options "ldflags=${wrap_flags}" } - lappend options "compiler=$GFORTRAN_UNDER_TEST"; + lappend options "compiler=$GFORTRAN_UNDER_TEST" - set options [concat "$ALWAYS_GFORTRANFLAGS" $options]; + set options [concat "$ALWAYS_GFORTRANFLAGS" $options] return [target_compile $source $dest $type $options] } |