* testsuite/18_support/numeric_limits/denorm_min.cc: Use

	dg-add-options ieee.
	* testsuite/18_support/numeric_limits/digits10.cc: Likewise.
	* testsuite/18_support/numeric_limits/epsilon.cc: Likewise.
	* testsuite/18_support/numeric_limits/infinity.cc: Likewise.
	* testsuite/18_support/numeric_limits/is_iec559.cc: Likewise.
	* testsuite/18_support/numeric_limits/is_signed.cc: Likewise.
	* testsuite/18_support/numeric_limits/min_max.cc: Likewise.
	* testsuite/18_support/numeric_limits/quiet_NaN.cc: Likewise.
	* testsuite/18_support/numeric_limits/
	specialization_default_values.cc: Likewise.
	* testsuite/18_support/numeric_limits/traps.cc: Likewise.
	* testsuite/26_numerics/complex/pow.cc: Likewise.
	* testsuite/tr1/5_numerical_facilities/special_functions/
	01_assoc_laguerre/check_nan.cc: Likewise.
	* testsuite/tr1/5_numerical_facilities/special_functions/
	02_assoc_legendre/check_nan.cc: Likewise.
	* testsuite/tr1/5_numerical_facilities/special_functions/
	03_beta/check_nan.cc: Likewise.
	* testsuite/tr1/5_numerical_facilities/special_functions/
	04_comp_ellint_1/check_nan.cc: Likewise.
	* testsuite/tr1/5_numerical_facilities/special_functions/
	05_comp_ellint_2/check_nan.cc: Likewise.
	* testsuite/tr1/5_numerical_facilities/special_functions/
	06_comp_ellint_3/check_nan.cc: Likewise.
	* testsuite/tr1/5_numerical_facilities/special_functions/
	07_conf_hyperg/check_nan.cc: Likewise.
	* testsuite/tr1/5_numerical_facilities/special_functions/
	08_cyl_bessel_i/check_nan.cc: Likewise.
	* testsuite/tr1/5_numerical_facilities/special_functions/
	09_cyl_bessel_j/check_nan.cc: Likewise.
	* testsuite/tr1/5_numerical_facilities/special_functions/
	10_cyl_bessel_k/check_nan.cc: Likewise.
	* testsuite/tr1/5_numerical_facilities/special_functions/
	11_cyl_neumann/check_nan.cc: Likewise.
	* testsuite/tr1/5_numerical_facilities/special_functions/
	12_ellint_1/check_nan.cc: Likewise.
	* testsuite/tr1/5_numerical_facilities/special_functions/
	13_ellint_2/check_nan.cc: Likewise.
	* testsuite/tr1/5_numerical_facilities/special_functions/
	14_ellint_3/check_nan.cc: Likewise.
	* testsuite/tr1/5_numerical_facilities/special_functions/
	15_expint/check_nan.cc: Likewise.
	* testsuite/tr1/5_numerical_facilities/special_functions/
	16_hermite/check_nan.cc: Likewise.
	* testsuite/tr1/5_numerical_facilities/special_functions/
	17_hyperg/check_nan.cc: Likewise.
	* testsuite/tr1/5_numerical_facilities/special_functions/
	18_laguerre/check_nan.cc: Likewise.
	* testsuite/tr1/5_numerical_facilities/special_functions/
	19_legendre/check_nan.cc: Likewise.
	* testsuite/tr1/5_numerical_facilities/special_functions/
	20_riemann_zeta/check_nan.cc: Likewise.
	* testsuite/tr1/5_numerical_facilities/special_functions/
	21_sph_bessel/check_nan.cc: Likewise.
	* testsuite/tr1/5_numerical_facilities/special_functions/
	22_sph_legendre/check_nan.cc: Likewise.
	* testsuite/tr1/5_numerical_facilities/special_functions/
	23_sph_neumann/check_nan.cc: Likewise.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@151251 138bc75d-0d04-0410-961f-82ee72b054a4

35 files changed, 97 insertions, 44 deletions

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 9d9badb0ffc..fb0d38ddeaf 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,66 @@
+2009-08-31  Uros Bizjak  <ubizjak@gmail.com>
+	    Kaz Kojima  <kkojima@gcc.gnu.org>
+
+	* testsuite/18_support/numeric_limits/denorm_min.cc: Use
+	dg-add-options ieee.
+	* testsuite/18_support/numeric_limits/digits10.cc: Likewise.
+	* testsuite/18_support/numeric_limits/epsilon.cc: Likewise.
+	* testsuite/18_support/numeric_limits/infinity.cc: Likewise.
+	* testsuite/18_support/numeric_limits/is_iec559.cc: Likewise.
+	* testsuite/18_support/numeric_limits/is_signed.cc: Likewise.
+	* testsuite/18_support/numeric_limits/min_max.cc: Likewise.
+	* testsuite/18_support/numeric_limits/quiet_NaN.cc: Likewise.
+	* testsuite/18_support/numeric_limits/
+	specialization_default_values.cc: Likewise.
+	* testsuite/18_support/numeric_limits/traps.cc: Likewise.
+	* testsuite/26_numerics/complex/pow.cc: Likewise.
+	* testsuite/tr1/5_numerical_facilities/special_functions/
+	01_assoc_laguerre/check_nan.cc: Likewise.
+	* testsuite/tr1/5_numerical_facilities/special_functions/
+	02_assoc_legendre/check_nan.cc: Likewise.
+	* testsuite/tr1/5_numerical_facilities/special_functions/
+	03_beta/check_nan.cc: Likewise.
+	* testsuite/tr1/5_numerical_facilities/special_functions/
+	04_comp_ellint_1/check_nan.cc: Likewise.
+	* testsuite/tr1/5_numerical_facilities/special_functions/
+	05_comp_ellint_2/check_nan.cc: Likewise.
+	* testsuite/tr1/5_numerical_facilities/special_functions/
+	06_comp_ellint_3/check_nan.cc: Likewise.
+	* testsuite/tr1/5_numerical_facilities/special_functions/
+	07_conf_hyperg/check_nan.cc: Likewise.
+	* testsuite/tr1/5_numerical_facilities/special_functions/
+	08_cyl_bessel_i/check_nan.cc: Likewise.
+	* testsuite/tr1/5_numerical_facilities/special_functions/
+	09_cyl_bessel_j/check_nan.cc: Likewise.
+	* testsuite/tr1/5_numerical_facilities/special_functions/
+	10_cyl_bessel_k/check_nan.cc: Likewise.
+	* testsuite/tr1/5_numerical_facilities/special_functions/
+	11_cyl_neumann/check_nan.cc: Likewise.
+	* testsuite/tr1/5_numerical_facilities/special_functions/
+	12_ellint_1/check_nan.cc: Likewise.
+	* testsuite/tr1/5_numerical_facilities/special_functions/
+	13_ellint_2/check_nan.cc: Likewise.
+	* testsuite/tr1/5_numerical_facilities/special_functions/
+	14_ellint_3/check_nan.cc: Likewise.
+	* testsuite/tr1/5_numerical_facilities/special_functions/
+	15_expint/check_nan.cc: Likewise.
+	* testsuite/tr1/5_numerical_facilities/special_functions/
+	16_hermite/check_nan.cc: Likewise.
+	* testsuite/tr1/5_numerical_facilities/special_functions/
+	17_hyperg/check_nan.cc: Likewise.
+	* testsuite/tr1/5_numerical_facilities/special_functions/
+	18_laguerre/check_nan.cc: Likewise.
+	* testsuite/tr1/5_numerical_facilities/special_functions/
+	19_legendre/check_nan.cc: Likewise.
+	* testsuite/tr1/5_numerical_facilities/special_functions/
+	20_riemann_zeta/check_nan.cc: Likewise.
+	* testsuite/tr1/5_numerical_facilities/special_functions/
+	21_sph_bessel/check_nan.cc: Likewise.
+	* testsuite/tr1/5_numerical_facilities/special_functions/
+	22_sph_legendre/check_nan.cc: Likewise.
+	* testsuite/tr1/5_numerical_facilities/special_functions/
+	23_sph_neumann/check_nan.cc: Likewise.
+
 2009-08-29  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	* include/bits/stl_construct.h: Include <bits/move.h>.
diff --git a/libstdc++-v3/testsuite/18_support/numeric_limits/denorm_min.cc b/libstdc++-v3/testsuite/18_support/numeric_limits/denorm_min.cc
index df95a9376df..b07cd7b063c 100644
--- a/libstdc++-v3/testsuite/18_support/numeric_limits/denorm_min.cc
+++ b/libstdc++-v3/testsuite/18_support/numeric_limits/denorm_min.cc
@@ -1,5 +1,4 @@
-// { dg-options "-mieee" { target alpha*-*-* } }
-// { dg-options "-mieee" { target sh*-*-* } }
+// { dg-add-options ieee }
 
 // 1999-08-23 bkoz
 
diff --git a/libstdc++-v3/testsuite/18_support/numeric_limits/digits10.cc b/libstdc++-v3/testsuite/18_support/numeric_limits/digits10.cc
index abdae04bf06..a8a86593732 100644
--- a/libstdc++-v3/testsuite/18_support/numeric_limits/digits10.cc
+++ b/libstdc++-v3/testsuite/18_support/numeric_limits/digits10.cc
@@ -1,5 +1,4 @@
-// { dg-options "-mieee" { target alpha*-*-* } }
-// { dg-options "-mieee" { target sh*-*-* } }
+// { dg-add-options ieee }
 
 // 1999-08-23 bkoz
 
diff --git a/libstdc++-v3/testsuite/18_support/numeric_limits/epsilon.cc b/libstdc++-v3/testsuite/18_support/numeric_limits/epsilon.cc
index cecc74badee..9ef54640351 100644
--- a/libstdc++-v3/testsuite/18_support/numeric_limits/epsilon.cc
+++ b/libstdc++-v3/testsuite/18_support/numeric_limits/epsilon.cc
@@ -1,5 +1,4 @@
-// { dg-options "-mieee" { target alpha*-*-* } }
-// { dg-options "-mieee" { target sh*-*-* } }
+// { dg-add-options ieee }
 
 // 1999-08-23 bkoz
 
diff --git a/libstdc++-v3/testsuite/18_support/numeric_limits/infinity.cc b/libstdc++-v3/testsuite/18_support/numeric_limits/infinity.cc
index cee2cc69b9f..92744c78130 100644
--- a/libstdc++-v3/testsuite/18_support/numeric_limits/infinity.cc
+++ b/libstdc++-v3/testsuite/18_support/numeric_limits/infinity.cc
@@ -1,5 +1,4 @@
-// { dg-options "-mieee" { target alpha*-*-* } }
-// { dg-options "-mieee" { target sh*-*-* } }
+// { dg-add-options ieee }
 
 // 1999-08-23 bkoz
 
diff --git a/libstdc++-v3/testsuite/18_support/numeric_limits/is_iec559.cc b/libstdc++-v3/testsuite/18_support/numeric_limits/is_iec559.cc
index 0f9ad9473c3..ce1c74d5ed4 100644
--- a/libstdc++-v3/testsuite/18_support/numeric_limits/is_iec559.cc
+++ b/libstdc++-v3/testsuite/18_support/numeric_limits/is_iec559.cc
@@ -1,5 +1,4 @@
-// { dg-options "-mieee" { target alpha*-*-* } }
-// { dg-options "-mieee" { target sh*-*-* } }
+// { dg-add-options ieee }
 
 // 1999-08-23 bkoz
 
diff --git a/libstdc++-v3/testsuite/18_support/numeric_limits/is_signed.cc b/libstdc++-v3/testsuite/18_support/numeric_limits/is_signed.cc
index 964d192d002..299cd571f36 100644
--- a/libstdc++-v3/testsuite/18_support/numeric_limits/is_signed.cc
+++ b/libstdc++-v3/testsuite/18_support/numeric_limits/is_signed.cc
@@ -1,5 +1,4 @@
-// { dg-options "-mieee" { target alpha*-*-* } }
-// { dg-options "-mieee" { target sh*-*-* } }
+// { dg-add-options ieee }
 
 // 1999-08-23 bkoz
 
diff --git a/libstdc++-v3/testsuite/18_support/numeric_limits/min_max.cc b/libstdc++-v3/testsuite/18_support/numeric_limits/min_max.cc
index f8176d4fea7..ba2a9f61e95 100644
--- a/libstdc++-v3/testsuite/18_support/numeric_limits/min_max.cc
+++ b/libstdc++-v3/testsuite/18_support/numeric_limits/min_max.cc
@@ -1,5 +1,4 @@
-// { dg-options "-mieee" { target alpha*-*-* } }
-// { dg-options "-mieee" { target sh*-*-* } }
+// { dg-add-options ieee }
 
 // 1999-08-23 bkoz
 
diff --git a/libstdc++-v3/testsuite/18_support/numeric_limits/quiet_NaN.cc b/libstdc++-v3/testsuite/18_support/numeric_limits/quiet_NaN.cc
index 581ceeaf7ed..7d1db78358b 100644
--- a/libstdc++-v3/testsuite/18_support/numeric_limits/quiet_NaN.cc
+++ b/libstdc++-v3/testsuite/18_support/numeric_limits/quiet_NaN.cc
@@ -1,5 +1,4 @@
-// { dg-options "-mieee" { target alpha*-*-* } }
-// { dg-options "-mieee" { target sh*-*-* } }
+// { dg-add-options ieee }
 
 // 1999-08-23 bkoz
 
diff --git a/libstdc++-v3/testsuite/18_support/numeric_limits/specialization_default_values.cc b/libstdc++-v3/testsuite/18_support/numeric_limits/specialization_default_values.cc
index 1aa1b1c6318..e2036d77d44 100644
--- a/libstdc++-v3/testsuite/18_support/numeric_limits/specialization_default_values.cc
+++ b/libstdc++-v3/testsuite/18_support/numeric_limits/specialization_default_values.cc
@@ -1,5 +1,4 @@
-// { dg-options "-mieee" { target alpha*-*-* } }
-// { dg-options "-mieee" { target sh*-*-* } }
+// { dg-add-options ieee }
 
 // 1999-08-23 bkoz
 
diff --git a/libstdc++-v3/testsuite/18_support/numeric_limits/traps.cc b/libstdc++-v3/testsuite/18_support/numeric_limits/traps.cc
index 6aac433d962..39c5576fa7a 100644
--- a/libstdc++-v3/testsuite/18_support/numeric_limits/traps.cc
+++ b/libstdc++-v3/testsuite/18_support/numeric_limits/traps.cc
@@ -1,5 +1,4 @@
-// { dg-options "-mieee" { target alpha*-*-* } }
-// { dg-options "-mieee" { target sh*-*-* } }
+// { dg-add-options ieee }
 
 // Copyright (C) 2005, 2009 Free Software Foundation
 //
diff --git a/libstdc++-v3/testsuite/26_numerics/complex/pow.cc b/libstdc++-v3/testsuite/26_numerics/complex/pow.cc
index d0b8e901f8c..a43e3c67434 100644
--- a/libstdc++-v3/testsuite/26_numerics/complex/pow.cc
+++ b/libstdc++-v3/testsuite/26_numerics/complex/pow.cc
@@ -1,7 +1,7 @@
 // { dg-do run { xfail broken_cplxf_arg } }
 // PR libstdc++/10689
 // Origin: Daniel.Levine@jhuaph.edu
-// { dg-options "-mieee" { target alpha*-*-* } }
+// { dg-add-options ieee }
 
 #include <complex>
 #include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/01_assoc_laguerre/check_nan.cc b/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/01_assoc_laguerre/check_nan.cc
index c266b2a4527..c1e026a6f16 100644
--- a/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/01_assoc_laguerre/check_nan.cc
+++ b/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/01_assoc_laguerre/check_nan.cc
@@ -1,5 +1,5 @@
 // { dg-require-c-std "" }
-// { dg-options "-mieee" { target sh*-*-* } }
+// { dg-add-options ieee }
 
 // 2006-02-04  Edward Smith-Rowland <3dw4rd@verizon.net>
 //
diff --git a/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/02_assoc_legendre/check_nan.cc b/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/02_assoc_legendre/check_nan.cc
index 7353d7715e7..ced0f907bc7 100644
--- a/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/02_assoc_legendre/check_nan.cc
+++ b/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/02_assoc_legendre/check_nan.cc
@@ -1,5 +1,5 @@
 // { dg-require-c-std "" }
-// { dg-options "-mieee" { target sh*-*-* } }
+// { dg-add-options ieee }
 
 // 2007-01-10  Edward Smith-Rowland <3dw4rd@verizon.net>
 //
diff --git a/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/03_beta/check_nan.cc b/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/03_beta/check_nan.cc
index fb12f1045d0..3585e6a3736 100644
--- a/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/03_beta/check_nan.cc
+++ b/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/03_beta/check_nan.cc
@@ -1,5 +1,5 @@
 // { dg-require-c-std "" }
-// { dg-options "-mieee" { target sh*-*-* } }
+// { dg-add-options ieee }
 
 // 2007-01-10  Edward Smith-Rowland <3dw4rd@verizon.net>
 //
diff --git a/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/04_comp_ellint_1/check_nan.cc b/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/04_comp_ellint_1/check_nan.cc
index 4f2a35770bf..9d899d0d682 100644
--- a/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/04_comp_ellint_1/check_nan.cc
+++ b/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/04_comp_ellint_1/check_nan.cc
@@ -1,5 +1,5 @@
 // { dg-require-c-std "" }
-// { dg-options "-mieee" { target sh*-*-* } }
+// { dg-add-options ieee }
 
 // 2007-01-10  Edward Smith-Rowland <3dw4rd@verizon.net>
 //
diff --git a/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/05_comp_ellint_2/check_nan.cc b/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/05_comp_ellint_2/check_nan.cc
index e9a2e657e47..3862d0c9c3b 100644
--- a/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/05_comp_ellint_2/check_nan.cc
+++ b/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/05_comp_ellint_2/check_nan.cc
@@ -1,5 +1,5 @@
 // { dg-require-c-std "" }
-// { dg-options "-mieee" { target sh*-*-* } }
+// { dg-add-options ieee }
 
 // 2007-01-10  Edward Smith-Rowland <3dw4rd@verizon.net>
 //
diff --git a/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/06_comp_ellint_3/check_nan.cc b/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/06_comp_ellint_3/check_nan.cc
index a4ba17bb568..af84c5a34c2 100644
--- a/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/06_comp_ellint_3/check_nan.cc
+++ b/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/06_comp_ellint_3/check_nan.cc
@@ -1,5 +1,5 @@
 // { dg-require-c-std "" }
-// { dg-options "-mieee" { target sh*-*-* } }
+// { dg-add-options ieee }
 
 // 2007-01-10  Edward Smith-Rowland <3dw4rd@verizon.net>
 //
diff --git a/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/07_conf_hyperg/check_nan.cc b/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/07_conf_hyperg/check_nan.cc
index 315633d9de3..12d5fe850f2 100644
--- a/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/07_conf_hyperg/check_nan.cc
+++ b/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/07_conf_hyperg/check_nan.cc
@@ -1,5 +1,5 @@
 // { dg-require-c-std "" }
-// { dg-options "-mieee" { target sh*-*-* } }
+// { dg-add-options ieee }
 
 // 2007-01-10  Edward Smith-Rowland <3dw4rd@verizon.net>
 //
diff --git a/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/08_cyl_bessel_i/check_nan.cc b/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/08_cyl_bessel_i/check_nan.cc
index 5e66cf9f10a..e57f83d5c0a 100644
--- a/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/08_cyl_bessel_i/check_nan.cc
+++ b/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/08_cyl_bessel_i/check_nan.cc
@@ -1,5 +1,5 @@
 // { dg-require-c-std "" }
-// { dg-options "-mieee" { target sh*-*-* } }
+// { dg-add-options ieee }
 
 // 2007-01-10  Edward Smith-Rowland <3dw4rd@verizon.net>
 //
diff --git a/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/09_cyl_bessel_j/check_nan.cc b/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/09_cyl_bessel_j/check_nan.cc
index c43b3f23497..29e484daa89 100644
--- a/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/09_cyl_bessel_j/check_nan.cc
+++ b/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/09_cyl_bessel_j/check_nan.cc
@@ -1,5 +1,5 @@
 // { dg-require-c-std "" }
-// { dg-options "-mieee" { target sh*-*-* } }
+// { dg-add-options ieee }
 
 // 2007-01-10  Edward Smith-Rowland <3dw4rd@verizon.net>
 //
diff --git a/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/10_cyl_bessel_k/check_nan.cc b/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/10_cyl_bessel_k/check_nan.cc
index d43cc8fc769..7426f251041 100644
--- a/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/10_cyl_bessel_k/check_nan.cc
+++ b/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/10_cyl_bessel_k/check_nan.cc
@@ -1,5 +1,5 @@
 // { dg-require-c-std "" }
-// { dg-options "-mieee" { target sh*-*-* } }
+// { dg-add-options ieee }
 
 // 2007-01-10  Edward Smith-Rowland <3dw4rd@verizon.net>
 //
diff --git a/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/11_cyl_neumann/check_nan.cc b/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/11_cyl_neumann/check_nan.cc
index fb2779d013f..229140723cc 100644
--- a/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/11_cyl_neumann/check_nan.cc
+++ b/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/11_cyl_neumann/check_nan.cc
@@ -1,5 +1,5 @@
 // { dg-require-c-std "" }
-// { dg-options "-mieee" { target sh*-*-* } }
+// { dg-add-options ieee }
 
 // 2007-01-10  Edward Smith-Rowland <3dw4rd@verizon.net>
 //
diff --git a/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/12_ellint_1/check_nan.cc b/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/12_ellint_1/check_nan.cc
index 6fd7381f060..1cb2377d762 100644
--- a/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/12_ellint_1/check_nan.cc
+++ b/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/12_ellint_1/check_nan.cc
@@ -1,5 +1,5 @@
 // { dg-require-c-std "" }
-// { dg-options "-mieee" { target sh*-*-* } }
+// { dg-add-options ieee }
 
 // 2007-01-10  Edward Smith-Rowland <3dw4rd@verizon.net>
 //
diff --git a/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/13_ellint_2/check_nan.cc b/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/13_ellint_2/check_nan.cc
index 7f5d55f1e48..e5e7bbab5d5 100644
--- a/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/13_ellint_2/check_nan.cc
+++ b/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/13_ellint_2/check_nan.cc
@@ -1,5 +1,5 @@
 // { dg-require-c-std "" }
-// { dg-options "-mieee" { target sh*-*-* } }
+// { dg-add-options ieee }
 
 // 2007-01-10  Edward Smith-Rowland <3dw4rd@verizon.net>
 //
diff --git a/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/14_ellint_3/check_nan.cc b/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/14_ellint_3/check_nan.cc
index 34b2ec97411..bff17ae90fc 100644
--- a/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/14_ellint_3/check_nan.cc
+++ b/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/14_ellint_3/check_nan.cc
@@ -1,5 +1,5 @@
 // { dg-require-c-std "" }
-// { dg-options "-mieee" { target sh*-*-* } }
+// { dg-add-options ieee }
 
 // 2007-01-10  Edward Smith-Rowland <3dw4rd@verizon.net>
 //
diff --git a/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/15_expint/check_nan.cc b/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/15_expint/check_nan.cc
index 47d7ea6041a..977f3c55eeb 100644
--- a/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/15_expint/check_nan.cc
+++ b/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/15_expint/check_nan.cc
@@ -1,5 +1,5 @@
 // { dg-require-c-std "" }
-// { dg-options "-mieee" { target sh*-*-* } }
+// { dg-add-options ieee }
 
 // 2007-01-10  Edward Smith-Rowland <3dw4rd@verizon.net>
 //
diff --git a/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/16_hermite/check_nan.cc b/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/16_hermite/check_nan.cc
index 91f8ef2b442..f6a920d7d4e 100644
--- a/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/16_hermite/check_nan.cc
+++ b/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/16_hermite/check_nan.cc
@@ -1,5 +1,5 @@
 // { dg-require-c-std "" }
-// { dg-options "-mieee" { target sh*-*-* } }
+// { dg-add-options ieee }
 
 // 2007-01-10  Edward Smith-Rowland <3dw4rd@verizon.net>
 //
diff --git a/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/17_hyperg/check_nan.cc b/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/17_hyperg/check_nan.cc
index 98eaef83eed..598d9314442 100644
--- a/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/17_hyperg/check_nan.cc
+++ b/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/17_hyperg/check_nan.cc
@@ -1,5 +1,5 @@
 // { dg-require-c-std "" }
-// { dg-options "-mieee" { target sh*-*-* } }
+// { dg-add-options ieee }
 
 // 2007-01-10  Edward Smith-Rowland <3dw4rd@verizon.net>
 //
diff --git a/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/18_laguerre/check_nan.cc b/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/18_laguerre/check_nan.cc
index 2e3cb6be2d5..c892b2a51de 100644
--- a/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/18_laguerre/check_nan.cc
+++ b/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/18_laguerre/check_nan.cc
@@ -1,5 +1,5 @@
 // { dg-require-c-std "" }
-// { dg-options "-mieee" { target sh*-*-* } }
+// { dg-add-options ieee }
 
 // 2007-01-10  Edward Smith-Rowland <3dw4rd@verizon.net>
 //
diff --git a/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/19_legendre/check_nan.cc b/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/19_legendre/check_nan.cc
index 3b30328d49b..ed2881f1c9c 100644
--- a/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/19_legendre/check_nan.cc
+++ b/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/19_legendre/check_nan.cc
@@ -1,5 +1,5 @@
 // { dg-require-c-std "" }
-// { dg-options "-mieee" { target sh*-*-* } }
+// { dg-add-options ieee }
 
 // 2007-01-10  Edward Smith-Rowland <3dw4rd@verizon.net>
 //
diff --git a/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/20_riemann_zeta/check_nan.cc b/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/20_riemann_zeta/check_nan.cc
index 3d930eac777..e28dfb47be9 100644
--- a/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/20_riemann_zeta/check_nan.cc
+++ b/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/20_riemann_zeta/check_nan.cc
@@ -1,5 +1,5 @@
 // { dg-require-c-std "" }
-// { dg-options "-mieee" { target sh*-*-* } }
+// { dg-add-options ieee }
 
 // 2007-01-10  Edward Smith-Rowland <3dw4rd@verizon.net>
 //
diff --git a/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/21_sph_bessel/check_nan.cc b/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/21_sph_bessel/check_nan.cc
index da4c725c3f7..457b49a2e8e 100644
--- a/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/21_sph_bessel/check_nan.cc
+++ b/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/21_sph_bessel/check_nan.cc
@@ -1,5 +1,5 @@
 // { dg-require-c-std "" }
-// { dg-options "-mieee" { target sh*-*-* } }
+// { dg-add-options ieee }
 
 // 2007-01-10  Edward Smith-Rowland <3dw4rd@verizon.net>
 //
diff --git a/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/22_sph_legendre/check_nan.cc b/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/22_sph_legendre/check_nan.cc
index db11dade3d0..fa2069b079b 100644
--- a/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/22_sph_legendre/check_nan.cc
+++ b/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/22_sph_legendre/check_nan.cc
@@ -1,5 +1,5 @@
 // { dg-require-c-std "" }
-// { dg-options "-mieee" { target sh*-*-* } }
+// { dg-add-options ieee }
 
 // 2007-01-10  Edward Smith-Rowland <3dw4rd@verizon.net>
 //
diff --git a/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/23_sph_neumann/check_nan.cc b/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/23_sph_neumann/check_nan.cc
index 306c639186d..ad0c4661d8d 100644
--- a/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/23_sph_neumann/check_nan.cc
+++ b/libstdc++-v3/testsuite/tr1/5_numerical_facilities/special_functions/23_sph_neumann/check_nan.cc
@@ -1,5 +1,5 @@
 // { dg-require-c-std "" }
-// { dg-options "-mieee" { target sh*-*-* } }
+// { dg-add-options ieee }
 
 // 2007-01-10  Edward Smith-Rowland <3dw4rd@verizon.net>
 //