Hi,
While checking dg directives order, I've noticed a few libstdc++ tests
where the current order is:
// { dg-add-options ieee }
// { dg-options "-D__STDCPP_WANT_MATH_SPEC_FUNCS__" }
while dg-add-options should be after dg-options.
The attached patch fixes that, is that OK for stage4?
I've tested on arm/aarch64, where it makes no difference. My reading
of proc add_options_for_ieee
in gcc/testsuite/lib/target-supports.exp tells me that it would only
have an impact on alpha, sh and rx targets.
Christophe
libstdc++-v3/ChangeLog:
2018-01-19 Christophe Lyon <christophe.l...@linaro.org>
* testsuite/ext/special_functions/airy_ai/check_nan.cc: Fix
dg-options and dg-add-options order.
* testsuite/ext/special_functions/airy_bi/check_nan.cc: Likewise.
* testsuite/ext/special_functions/conf_hyperg/check_nan.cc:
Likewise.
* testsuite/ext/special_functions/hyperg/check_nan.cc: Likewise.
* testsuite/special_functions/01_assoc_laguerre/check_nan.cc:
Likewise.
* testsuite/special_functions/02_assoc_legendre/check_nan.cc:
Likewise.
* testsuite/special_functions/03_beta/check_nan.cc: Likewise.
* testsuite/special_functions/04_comp_ellint_1/check_nan.cc:
Likewise.
* testsuite/special_functions/05_comp_ellint_2/check_nan.cc:
Likewise.
* testsuite/special_functions/06_comp_ellint_3/check_nan.cc:
Likewise.
* testsuite/special_functions/06_comp_ellint_3/pr66689.cc:
Likewise.
* testsuite/special_functions/07_cyl_bessel_i/check_nan.cc:
Likewise.
* testsuite/special_functions/08_cyl_bessel_j/check_nan.cc:
Likewise.
* testsuite/special_functions/09_cyl_bessel_k/check_nan.cc:
Likewise.
* testsuite/special_functions/10_cyl_neumann/check_nan.cc:
Likewise.
* testsuite/special_functions/11_ellint_1/check_nan.cc: Likewise.
* testsuite/special_functions/12_ellint_2/check_nan.cc: Likewise.
* testsuite/special_functions/13_ellint_3/check_nan.cc: Likewise.
* testsuite/special_functions/13_ellint_3/pr66689.cc: Likewise.
* testsuite/special_functions/14_expint/check_nan.cc: Likewise.
* testsuite/special_functions/15_hermite/check_nan.cc: Likewise.
* testsuite/special_functions/16_laguerre/check_nan.cc: Likewise.
* testsuite/special_functions/17_legendre/check_nan.cc: Likewise.
* testsuite/special_functions/18_riemann_zeta/check_nan.cc:
Likewise.
* testsuite/special_functions/19_sph_bessel/check_nan.cc:
Likewise.
* testsuite/special_functions/20_sph_legendre/check_nan.cc:
Likewise.
* testsuite/special_functions/21_sph_neumann/check_nan.cc:
Likewise.
diff --git a/libstdc++-v3/testsuite/ext/special_functions/airy_ai/check_nan.cc
b/libstdc++-v3/testsuite/ext/special_functions/airy_ai/check_nan.cc
index eef2f74..c5473a3 100644
--- a/libstdc++-v3/testsuite/ext/special_functions/airy_ai/check_nan.cc
+++ b/libstdc++-v3/testsuite/ext/special_functions/airy_ai/check_nan.cc
@@ -1,7 +1,7 @@
// { dg-do run { target c++11 } }
// { dg-require-c-std "" }
-// { dg-add-options ieee }
// { dg-options "-D__STDCPP_WANT_MATH_SPEC_FUNCS__" }
+// { dg-add-options ieee }
// Copyright (C) 2016-2018 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/ext/special_functions/airy_bi/check_nan.cc
b/libstdc++-v3/testsuite/ext/special_functions/airy_bi/check_nan.cc
index dafa271..4b85288 100644
--- a/libstdc++-v3/testsuite/ext/special_functions/airy_bi/check_nan.cc
+++ b/libstdc++-v3/testsuite/ext/special_functions/airy_bi/check_nan.cc
@@ -1,7 +1,7 @@
// { dg-do run { target c++11 } }
// { dg-require-c-std "" }
-// { dg-add-options ieee }
// { dg-options "-D__STDCPP_WANT_MATH_SPEC_FUNCS__" }
+// { dg-add-options ieee }
// Copyright (C) 2016-2018 Free Software Foundation, Inc.
//
diff --git
a/libstdc++-v3/testsuite/ext/special_functions/conf_hyperg/check_nan.cc
b/libstdc++-v3/testsuite/ext/special_functions/conf_hyperg/check_nan.cc
index 7af46ff..0da38b1 100644
--- a/libstdc++-v3/testsuite/ext/special_functions/conf_hyperg/check_nan.cc
+++ b/libstdc++-v3/testsuite/ext/special_functions/conf_hyperg/check_nan.cc
@@ -1,7 +1,7 @@
// { dg-do run { target c++11 } }
// { dg-require-c-std "" }
-// { dg-add-options ieee }
// { dg-options "-D__STDCPP_WANT_MATH_SPEC_FUNCS__" }
+// { dg-add-options ieee }
// Copyright (C) 2016-2018 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/ext/special_functions/hyperg/check_nan.cc
b/libstdc++-v3/testsuite/ext/special_functions/hyperg/check_nan.cc
index 78ff9e8..ee3b679 100644
--- a/libstdc++-v3/testsuite/ext/special_functions/hyperg/check_nan.cc
+++ b/libstdc++-v3/testsuite/ext/special_functions/hyperg/check_nan.cc
@@ -1,7 +1,7 @@
// { dg-do run { target c++11 } }
// { dg-require-c-std "" }
-// { dg-add-options ieee }
// { dg-options "-D__STDCPP_WANT_MATH_SPEC_FUNCS__" }
+// { dg-add-options ieee }
// Copyright (C) 2016-2018 Free Software Foundation, Inc.
//
diff --git
a/libstdc++-v3/testsuite/special_functions/01_assoc_laguerre/check_nan.cc
b/libstdc++-v3/testsuite/special_functions/01_assoc_laguerre/check_nan.cc
index 6a98ead..7b9e34a 100644
--- a/libstdc++-v3/testsuite/special_functions/01_assoc_laguerre/check_nan.cc
+++ b/libstdc++-v3/testsuite/special_functions/01_assoc_laguerre/check_nan.cc
@@ -1,7 +1,7 @@
// { dg-do run { target c++11 } }
// { dg-require-c-std "" }
-// { dg-add-options ieee }
// { dg-options "-D__STDCPP_WANT_MATH_SPEC_FUNCS__" }
+// { dg-add-options ieee }
// Copyright (C) 2016-2018 Free Software Foundation, Inc.
//
diff --git
a/libstdc++-v3/testsuite/special_functions/02_assoc_legendre/check_nan.cc
b/libstdc++-v3/testsuite/special_functions/02_assoc_legendre/check_nan.cc
index ca4a1e4..0eee957 100644
--- a/libstdc++-v3/testsuite/special_functions/02_assoc_legendre/check_nan.cc
+++ b/libstdc++-v3/testsuite/special_functions/02_assoc_legendre/check_nan.cc
@@ -1,7 +1,7 @@
// { dg-do run { target c++11 } }
// { dg-require-c-std "" }
-// { dg-add-options ieee }
// { dg-options "-D__STDCPP_WANT_MATH_SPEC_FUNCS__" }
+// { dg-add-options ieee }
// Copyright (C) 2016-2018 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/special_functions/03_beta/check_nan.cc
b/libstdc++-v3/testsuite/special_functions/03_beta/check_nan.cc
index 11b48a5..b8dc05a 100644
--- a/libstdc++-v3/testsuite/special_functions/03_beta/check_nan.cc
+++ b/libstdc++-v3/testsuite/special_functions/03_beta/check_nan.cc
@@ -1,7 +1,7 @@
// { dg-do run { target c++11 } }
// { dg-require-c-std "" }
-// { dg-add-options ieee }
// { dg-options "-D__STDCPP_WANT_MATH_SPEC_FUNCS__" }
+// { dg-add-options ieee }
// Copyright (C) 2016-2018 Free Software Foundation, Inc.
//
diff --git
a/libstdc++-v3/testsuite/special_functions/04_comp_ellint_1/check_nan.cc
b/libstdc++-v3/testsuite/special_functions/04_comp_ellint_1/check_nan.cc
index 3d6105f..4a06894 100644
--- a/libstdc++-v3/testsuite/special_functions/04_comp_ellint_1/check_nan.cc
+++ b/libstdc++-v3/testsuite/special_functions/04_comp_ellint_1/check_nan.cc
@@ -1,7 +1,7 @@
// { dg-do run { target c++11 } }
// { dg-require-c-std "" }
-// { dg-add-options ieee }
// { dg-options "-D__STDCPP_WANT_MATH_SPEC_FUNCS__" }
+// { dg-add-options ieee }
// Copyright (C) 2016-2018 Free Software Foundation, Inc.
//
diff --git
a/libstdc++-v3/testsuite/special_functions/05_comp_ellint_2/check_nan.cc
b/libstdc++-v3/testsuite/special_functions/05_comp_ellint_2/check_nan.cc
index fd46299..e45d4bd 100644
--- a/libstdc++-v3/testsuite/special_functions/05_comp_ellint_2/check_nan.cc
+++ b/libstdc++-v3/testsuite/special_functions/05_comp_ellint_2/check_nan.cc
@@ -1,7 +1,7 @@
// { dg-do run { target c++11 } }
// { dg-require-c-std "" }
-// { dg-add-options ieee }
// { dg-options "-D__STDCPP_WANT_MATH_SPEC_FUNCS__" }
+// { dg-add-options ieee }
// Copyright (C) 2016-2018 Free Software Foundation, Inc.
//
diff --git
a/libstdc++-v3/testsuite/special_functions/06_comp_ellint_3/check_nan.cc
b/libstdc++-v3/testsuite/special_functions/06_comp_ellint_3/check_nan.cc
index fb87a15c..c8d85f9 100644
--- a/libstdc++-v3/testsuite/special_functions/06_comp_ellint_3/check_nan.cc
+++ b/libstdc++-v3/testsuite/special_functions/06_comp_ellint_3/check_nan.cc
@@ -1,7 +1,7 @@
// { dg-do run { target c++11 } }
// { dg-require-c-std "" }
-// { dg-add-options ieee }
// { dg-options "-D__STDCPP_WANT_MATH_SPEC_FUNCS__" }
+// { dg-add-options ieee }
// Copyright (C) 2016-2018 Free Software Foundation, Inc.
//
diff --git
a/libstdc++-v3/testsuite/special_functions/06_comp_ellint_3/pr66689.cc
b/libstdc++-v3/testsuite/special_functions/06_comp_ellint_3/pr66689.cc
index a83126f..c500f20 100644
--- a/libstdc++-v3/testsuite/special_functions/06_comp_ellint_3/pr66689.cc
+++ b/libstdc++-v3/testsuite/special_functions/06_comp_ellint_3/pr66689.cc
@@ -1,7 +1,7 @@
// { dg-do run { target c++11 } }
// { dg-require-c-std "" }
-// { dg-add-options ieee }
// { dg-options "-D__STDCPP_WANT_MATH_SPEC_FUNCS__" }
+// { dg-add-options ieee }
#include <cmath>
#include <testsuite_hooks.h>
diff --git
a/libstdc++-v3/testsuite/special_functions/07_cyl_bessel_i/check_nan.cc
b/libstdc++-v3/testsuite/special_functions/07_cyl_bessel_i/check_nan.cc
index f7cfcf2..50d0cc9 100644
--- a/libstdc++-v3/testsuite/special_functions/07_cyl_bessel_i/check_nan.cc
+++ b/libstdc++-v3/testsuite/special_functions/07_cyl_bessel_i/check_nan.cc
@@ -1,7 +1,7 @@
// { dg-do run { target c++11 } }
// { dg-require-c-std "" }
-// { dg-add-options ieee }
// { dg-options "-D__STDCPP_WANT_MATH_SPEC_FUNCS__" }
+// { dg-add-options ieee }
// Copyright (C) 2016-2018 Free Software Foundation, Inc.
//
diff --git
a/libstdc++-v3/testsuite/special_functions/08_cyl_bessel_j/check_nan.cc
b/libstdc++-v3/testsuite/special_functions/08_cyl_bessel_j/check_nan.cc
index 6493673..debf56e 100644
--- a/libstdc++-v3/testsuite/special_functions/08_cyl_bessel_j/check_nan.cc
+++ b/libstdc++-v3/testsuite/special_functions/08_cyl_bessel_j/check_nan.cc
@@ -1,7 +1,7 @@
// { dg-do run { target c++11 } }
// { dg-require-c-std "" }
-// { dg-add-options ieee }
// { dg-options "-D__STDCPP_WANT_MATH_SPEC_FUNCS__" }
+// { dg-add-options ieee }
// Copyright (C) 2016-2018 Free Software Foundation, Inc.
//
diff --git
a/libstdc++-v3/testsuite/special_functions/09_cyl_bessel_k/check_nan.cc
b/libstdc++-v3/testsuite/special_functions/09_cyl_bessel_k/check_nan.cc
index 63f1fe3..044b299 100644
--- a/libstdc++-v3/testsuite/special_functions/09_cyl_bessel_k/check_nan.cc
+++ b/libstdc++-v3/testsuite/special_functions/09_cyl_bessel_k/check_nan.cc
@@ -1,7 +1,7 @@
// { dg-do run { target c++11 } }
// { dg-require-c-std "" }
-// { dg-add-options ieee }
// { dg-options "-D__STDCPP_WANT_MATH_SPEC_FUNCS__" }
+// { dg-add-options ieee }
// Copyright (C) 2016-2018 Free Software Foundation, Inc.
//
diff --git
a/libstdc++-v3/testsuite/special_functions/10_cyl_neumann/check_nan.cc
b/libstdc++-v3/testsuite/special_functions/10_cyl_neumann/check_nan.cc
index 377c5fa..e36f921 100644
--- a/libstdc++-v3/testsuite/special_functions/10_cyl_neumann/check_nan.cc
+++ b/libstdc++-v3/testsuite/special_functions/10_cyl_neumann/check_nan.cc
@@ -1,7 +1,7 @@
// { dg-do run { target c++11 } }
// { dg-require-c-std "" }
-// { dg-add-options ieee }
// { dg-options "-D__STDCPP_WANT_MATH_SPEC_FUNCS__" }
+// { dg-add-options ieee }
// Copyright (C) 2016-2018 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/special_functions/11_ellint_1/check_nan.cc
b/libstdc++-v3/testsuite/special_functions/11_ellint_1/check_nan.cc
index 4db17cd..6b3cd2f 100644
--- a/libstdc++-v3/testsuite/special_functions/11_ellint_1/check_nan.cc
+++ b/libstdc++-v3/testsuite/special_functions/11_ellint_1/check_nan.cc
@@ -1,7 +1,7 @@
// { dg-do run { target c++11 } }
// { dg-require-c-std "" }
-// { dg-add-options ieee }
// { dg-options "-D__STDCPP_WANT_MATH_SPEC_FUNCS__" }
+// { dg-add-options ieee }
// Copyright (C) 2016-2018 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/special_functions/12_ellint_2/check_nan.cc
b/libstdc++-v3/testsuite/special_functions/12_ellint_2/check_nan.cc
index d8b40aa..ec95ded 100644
--- a/libstdc++-v3/testsuite/special_functions/12_ellint_2/check_nan.cc
+++ b/libstdc++-v3/testsuite/special_functions/12_ellint_2/check_nan.cc
@@ -1,7 +1,7 @@
// { dg-do run { target c++11 } }
// { dg-require-c-std "" }
-// { dg-add-options ieee }
// { dg-options "-D__STDCPP_WANT_MATH_SPEC_FUNCS__" }
+// { dg-add-options ieee }
// Copyright (C) 2016-2018 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/special_functions/13_ellint_3/check_nan.cc
b/libstdc++-v3/testsuite/special_functions/13_ellint_3/check_nan.cc
index 4000056..3b3cf89 100644
--- a/libstdc++-v3/testsuite/special_functions/13_ellint_3/check_nan.cc
+++ b/libstdc++-v3/testsuite/special_functions/13_ellint_3/check_nan.cc
@@ -1,7 +1,7 @@
// { dg-do run { target c++11 } }
// { dg-require-c-std "" }
-// { dg-add-options ieee }
// { dg-options "-D__STDCPP_WANT_MATH_SPEC_FUNCS__" }
+// { dg-add-options ieee }
// Copyright (C) 2016-2018 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/special_functions/13_ellint_3/pr66689.cc
b/libstdc++-v3/testsuite/special_functions/13_ellint_3/pr66689.cc
index d1299b2..e261003 100644
--- a/libstdc++-v3/testsuite/special_functions/13_ellint_3/pr66689.cc
+++ b/libstdc++-v3/testsuite/special_functions/13_ellint_3/pr66689.cc
@@ -1,7 +1,7 @@
// { dg-do run { target c++11 } }
// { dg-require-c-std "" }
-// { dg-add-options ieee }
// { dg-options "-D__STDCPP_WANT_MATH_SPEC_FUNCS__" }
+// { dg-add-options ieee }
#include <cmath>
#include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/special_functions/14_expint/check_nan.cc
b/libstdc++-v3/testsuite/special_functions/14_expint/check_nan.cc
index 268d909..e7cb901 100644
--- a/libstdc++-v3/testsuite/special_functions/14_expint/check_nan.cc
+++ b/libstdc++-v3/testsuite/special_functions/14_expint/check_nan.cc
@@ -1,7 +1,7 @@
// { dg-do run { target c++11 } }
// { dg-require-c-std "" }
-// { dg-add-options ieee }
// { dg-options "-D__STDCPP_WANT_MATH_SPEC_FUNCS__" }
+// { dg-add-options ieee }
// Copyright (C) 2016-2018 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/special_functions/15_hermite/check_nan.cc
b/libstdc++-v3/testsuite/special_functions/15_hermite/check_nan.cc
index 9dcbea3..d07f129 100644
--- a/libstdc++-v3/testsuite/special_functions/15_hermite/check_nan.cc
+++ b/libstdc++-v3/testsuite/special_functions/15_hermite/check_nan.cc
@@ -1,7 +1,7 @@
// { dg-do run { target c++11 } }
// { dg-require-c-std "" }
-// { dg-add-options ieee }
// { dg-options "-D__STDCPP_WANT_MATH_SPEC_FUNCS__" }
+// { dg-add-options ieee }
// Copyright (C) 2016-2018 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/special_functions/16_laguerre/check_nan.cc
b/libstdc++-v3/testsuite/special_functions/16_laguerre/check_nan.cc
index 8e5f8d1..709fca8 100644
--- a/libstdc++-v3/testsuite/special_functions/16_laguerre/check_nan.cc
+++ b/libstdc++-v3/testsuite/special_functions/16_laguerre/check_nan.cc
@@ -1,7 +1,7 @@
// { dg-do run { target c++11 } }
// { dg-require-c-std "" }
-// { dg-add-options ieee }
// { dg-options "-D__STDCPP_WANT_MATH_SPEC_FUNCS__" }
+// { dg-add-options ieee }
// Copyright (C) 2016-2018 Free Software Foundation, Inc.
//
diff --git a/libstdc++-v3/testsuite/special_functions/17_legendre/check_nan.cc
b/libstdc++-v3/testsuite/special_functions/17_legendre/check_nan.cc
index 5041444..ccb87b9 100644
--- a/libstdc++-v3/testsuite/special_functions/17_legendre/check_nan.cc
+++ b/libstdc++-v3/testsuite/special_functions/17_legendre/check_nan.cc
@@ -1,7 +1,7 @@
// { dg-do run { target c++11 } }
// { dg-require-c-std "" }
-// { dg-add-options ieee }
// { dg-options "-D__STDCPP_WANT_MATH_SPEC_FUNCS__" }
+// { dg-add-options ieee }
// Copyright (C) 2016-2018 Free Software Foundation, Inc.
//
diff --git
a/libstdc++-v3/testsuite/special_functions/18_riemann_zeta/check_nan.cc
b/libstdc++-v3/testsuite/special_functions/18_riemann_zeta/check_nan.cc
index 00e1f0d..8651748 100644
--- a/libstdc++-v3/testsuite/special_functions/18_riemann_zeta/check_nan.cc
+++ b/libstdc++-v3/testsuite/special_functions/18_riemann_zeta/check_nan.cc
@@ -1,7 +1,7 @@
// { dg-do run { target c++11 } }
// { dg-require-c-std "" }
-// { dg-add-options ieee }
// { dg-options "-D__STDCPP_WANT_MATH_SPEC_FUNCS__" }
+// { dg-add-options ieee }
// Copyright (C) 2016-2018 Free Software Foundation, Inc.
//
diff --git
a/libstdc++-v3/testsuite/special_functions/19_sph_bessel/check_nan.cc
b/libstdc++-v3/testsuite/special_functions/19_sph_bessel/check_nan.cc
index 57794e3..efc1384 100644
--- a/libstdc++-v3/testsuite/special_functions/19_sph_bessel/check_nan.cc
+++ b/libstdc++-v3/testsuite/special_functions/19_sph_bessel/check_nan.cc
@@ -1,7 +1,7 @@
// { dg-do run { target c++11 } }
// { dg-require-c-std "" }
-// { dg-add-options ieee }
// { dg-options "-D__STDCPP_WANT_MATH_SPEC_FUNCS__" }
+// { dg-add-options ieee }
// Copyright (C) 2016-2018 Free Software Foundation, Inc.
//
diff --git
a/libstdc++-v3/testsuite/special_functions/20_sph_legendre/check_nan.cc
b/libstdc++-v3/testsuite/special_functions/20_sph_legendre/check_nan.cc
index d53e030..41d14b8 100644
--- a/libstdc++-v3/testsuite/special_functions/20_sph_legendre/check_nan.cc
+++ b/libstdc++-v3/testsuite/special_functions/20_sph_legendre/check_nan.cc
@@ -1,7 +1,7 @@
// { dg-do run { target c++11 } }
// { dg-require-c-std "" }
-// { dg-add-options ieee }
// { dg-options "-D__STDCPP_WANT_MATH_SPEC_FUNCS__" }
+// { dg-add-options ieee }
// Copyright (C) 2016-2018 Free Software Foundation, Inc.
//
diff --git
a/libstdc++-v3/testsuite/special_functions/21_sph_neumann/check_nan.cc
b/libstdc++-v3/testsuite/special_functions/21_sph_neumann/check_nan.cc
index 0fed6e8..e7f0d7e 100644
--- a/libstdc++-v3/testsuite/special_functions/21_sph_neumann/check_nan.cc
+++ b/libstdc++-v3/testsuite/special_functions/21_sph_neumann/check_nan.cc
@@ -1,7 +1,7 @@
// { dg-do run { target c++11 } }
// { dg-require-c-std "" }
-// { dg-add-options ieee }
// { dg-options "-D__STDCPP_WANT_MATH_SPEC_FUNCS__" }
+// { dg-add-options ieee }
// Copyright (C) 2016-2018 Free Software Foundation, Inc.
//
