From: Richard Henderson <rth@redhat.com>
Date: Sun, 12 Sep 2004 18:07:28 +0000 (-0700)
Subject: fortran-torture.exp (add-ieee-options): Replace ieee-options; do the uplevel thing... 
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=84d397af344d12c2498b6fda041c203c8513795b;p=gcc.git

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

        * 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 ea6692d8942..6e5781ed653 100644
--- 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 be755d03596..dad399dcb8d 100644
--- 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 be755d03596..dad399dcb8d 100644
--- 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 be755d03596..dad399dcb8d 100644
--- 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 be755d03596..dad399dcb8d 100644
--- 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 dae028139dd..4483dd709ce 100644
--- 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"
     }
 }