fortran-torture.exp (add-ieee-options): Replace ieee-options; do the uplevel thing...

        * lib/fortran-torture.exp (add-ieee-options): Replace ieee-options;
        do the uplevel thing and update additional_flags directly.
        * gfortran.fortran-torture/execute/intrinsic_fraction_exponent.x,
        gfortran.fortran-torture/execute/intrinsic_nearest.x,
        gfortran.fortran-torture/execute/intrinsic_set_exponent.x,
        gfortran.fortran-torture/execute/nan_inf_fmt.x: Update to match.

From-SVN: r87399

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index ea6692d8942d881db6b4738d2f4a8baef19076e2..6e5781ed653c144a919641a6386e288309be6080 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2004-09-12  Richard Henderson  <rth@redhat.com>
+
+       * lib/fortran-torture.exp (add-ieee-options): Replace ieee-options;
+       do the uplevel thing and update additional_flags directly.
+       * gfortran.fortran-torture/execute/intrinsic_fraction_exponent.x,
+       gfortran.fortran-torture/execute/intrinsic_nearest.x,
+       gfortran.fortran-torture/execute/intrinsic_set_exponent.x,
+       gfortran.fortran-torture/execute/nan_inf_fmt.x: Update to match.
+
 2004-09-11  Steven Bosscher  <stevenb@suse.de>
 
        * g++.dg/parse/break-in-for.C: Fix for -ansi -pedantic-errors.

diff --git a/gcc/testsuite/gfortran.fortran-torture/execute/intrinsic_fraction_exponent.x b/gcc/testsuite/gfortran.fortran-torture/execute/intrinsic_fraction_exponent.x
index be755d0359621d6965bab6bdc84f402c59112c5a..dad399dcb8d84cc7d63f3c5ed478abbdb248f0b4 100644 (file)
--- a/gcc/testsuite/gfortran.fortran-torture/execute/intrinsic_fraction_exponent.x
+++ b/gcc/testsuite/gfortran.fortran-torture/execute/intrinsic_fraction_exponent.x
@@ -1,2 +1,2 @@
-lappend additional_flags [ieee-options]
+add-ieee-options
 return 0

diff --git a/gcc/testsuite/gfortran.fortran-torture/execute/intrinsic_nearest.x b/gcc/testsuite/gfortran.fortran-torture/execute/intrinsic_nearest.x
index be755d0359621d6965bab6bdc84f402c59112c5a..dad399dcb8d84cc7d63f3c5ed478abbdb248f0b4 100644 (file)
--- a/gcc/testsuite/gfortran.fortran-torture/execute/intrinsic_nearest.x
+++ b/gcc/testsuite/gfortran.fortran-torture/execute/intrinsic_nearest.x
@@ -1,2 +1,2 @@
-lappend additional_flags [ieee-options]
+add-ieee-options
 return 0

diff --git a/gcc/testsuite/gfortran.fortran-torture/execute/intrinsic_set_exponent.x b/gcc/testsuite/gfortran.fortran-torture/execute/intrinsic_set_exponent.x
index be755d0359621d6965bab6bdc84f402c59112c5a..dad399dcb8d84cc7d63f3c5ed478abbdb248f0b4 100644 (file)
--- a/gcc/testsuite/gfortran.fortran-torture/execute/intrinsic_set_exponent.x
+++ b/gcc/testsuite/gfortran.fortran-torture/execute/intrinsic_set_exponent.x
@@ -1,2 +1,2 @@
-lappend additional_flags [ieee-options]
+add-ieee-options
 return 0

diff --git a/gcc/testsuite/gfortran.fortran-torture/execute/nan_inf_fmt.x b/gcc/testsuite/gfortran.fortran-torture/execute/nan_inf_fmt.x
index be755d0359621d6965bab6bdc84f402c59112c5a..dad399dcb8d84cc7d63f3c5ed478abbdb248f0b4 100644 (file)
--- a/gcc/testsuite/gfortran.fortran-torture/execute/nan_inf_fmt.x
+++ b/gcc/testsuite/gfortran.fortran-torture/execute/nan_inf_fmt.x
@@ -1,2 +1,2 @@
-lappend additional_flags [ieee-options]
+add-ieee-options
 return 0

diff --git a/gcc/testsuite/lib/fortran-torture.exp b/gcc/testsuite/lib/fortran-torture.exp
index dae028139dd02aaffb0c67329671c70d3c7840a1..4483dd709cea30422085adaf7cffb1319e0b800c 100644 (file)
--- a/gcc/testsuite/lib/fortran-torture.exp
+++ b/gcc/testsuite/lib/fortran-torture.exp
@@ -346,20 +346,18 @@ proc fortran-torture { args } {
 }
 
 #
-# ieee-options -- return options necessary for 100% ieee conformance.
+# add-ieee-options -- add options necessary for 100% ieee conformance.
 #
-proc ieee-options { } {
+proc add-ieee-options { } {
     # Ensure that excess precision does not cause problems.
-    if [istarget "i?86-*-*"] then {
-      return "-ffloat-store"
+    if { [istarget "i?86-*-*"]
+        || [istarget "m68k-*-*"] } then {
+      uplevel 1 lappend additional_flags "-ffloat-store"
     }
-    if [istarget "m68k-*-*"] then {
-      return "-ffloat-store"
-    }
-                                                                                
+
     # Enable full IEEE compliance mode.
     if { [istarget "alpha*-*-*"]
          || [istarget "sh*-*-*"] } then {
-      return "-mieee"
+      uplevel 1 lappend additional_flags "-mieee"
     }
 }