summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libstdc++-v3/ChangeLog28
-rw-r--r--libstdc++-v3/include/c_compatibility/math.h72
-rw-r--r--libstdc++-v3/testsuite/special_functions/01_assoc_laguerre/compile_2.cc3
-rw-r--r--libstdc++-v3/testsuite/special_functions/02_assoc_legendre/compile_2.cc3
-rw-r--r--libstdc++-v3/testsuite/special_functions/03_beta/compile_2.cc3
-rw-r--r--libstdc++-v3/testsuite/special_functions/04_comp_ellint_1/compile_2.cc3
-rw-r--r--libstdc++-v3/testsuite/special_functions/05_comp_ellint_2/compile_2.cc3
-rw-r--r--libstdc++-v3/testsuite/special_functions/06_comp_ellint_3/compile_2.cc3
-rw-r--r--libstdc++-v3/testsuite/special_functions/07_cyl_bessel_i/compile_2.cc3
-rw-r--r--libstdc++-v3/testsuite/special_functions/08_cyl_bessel_j/compile_2.cc3
-rw-r--r--libstdc++-v3/testsuite/special_functions/09_cyl_bessel_k/compile_2.cc3
-rw-r--r--libstdc++-v3/testsuite/special_functions/10_cyl_neumann/compile_2.cc3
-rw-r--r--libstdc++-v3/testsuite/special_functions/11_ellint_1/compile_2.cc3
-rw-r--r--libstdc++-v3/testsuite/special_functions/12_ellint_2/compile_2.cc3
-rw-r--r--libstdc++-v3/testsuite/special_functions/13_ellint_3/compile_2.cc3
-rw-r--r--libstdc++-v3/testsuite/special_functions/14_expint/compile_2.cc3
-rw-r--r--libstdc++-v3/testsuite/special_functions/15_hermite/compile_2.cc3
-rw-r--r--libstdc++-v3/testsuite/special_functions/16_laguerre/compile_2.cc3
-rw-r--r--libstdc++-v3/testsuite/special_functions/17_legendre/compile_2.cc3
-rw-r--r--libstdc++-v3/testsuite/special_functions/18_riemann_zeta/compile_2.cc3
-rw-r--r--libstdc++-v3/testsuite/special_functions/19_sph_bessel/compile_2.cc3
-rw-r--r--libstdc++-v3/testsuite/special_functions/20_sph_legendre/compile_2.cc3
-rw-r--r--libstdc++-v3/testsuite/special_functions/21_sph_neumann/compile_2.cc3
23 files changed, 119 insertions, 44 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index f7e4ea0224b..b1244875e54 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,31 @@
+2016-01-22 Edward Smith-Rowland <3dw4rd@verizon.net>
+
+ TR29124 C++ Special Math - <math.h> pulls funcs into global namespace.
+ * include/c_compatibility/math.h: Import the TR29124 functions
+ into the global namespace.
+ * testsuite/special_functions/01_assoc_laguerre/compile_2.cc: Remove
+ xfail and make compile-only.
+ * testsuite/special_functions/02_assoc_legendre/compile_2.cc: Ditto.
+ * testsuite/special_functions/03_beta/compile_2.cc: Ditto.
+ * testsuite/special_functions/04_comp_ellint_1/compile_2.cc: Ditto.
+ * testsuite/special_functions/05_comp_ellint_2/compile_2.cc: Ditto.
+ * testsuite/special_functions/06_comp_ellint_3/compile_2.cc: Ditto.
+ * testsuite/special_functions/07_cyl_bessel_i/compile_2.cc: Ditto.
+ * testsuite/special_functions/08_cyl_bessel_j/compile_2.cc: Ditto.
+ * testsuite/special_functions/09_cyl_bessel_k/compile_2.cc: Ditto.
+ * testsuite/special_functions/10_cyl_neumann/compile_2.cc: Ditto.
+ * testsuite/special_functions/11_ellint_1/compile_2.cc: Ditto.
+ * testsuite/special_functions/12_ellint_2/compile_2.cc: Ditto.
+ * testsuite/special_functions/13_ellint_3/compile_2.cc: Ditto.
+ * testsuite/special_functions/14_expint/compile_2.cc: Ditto.
+ * testsuite/special_functions/15_hermite/compile_2.cc: Ditto.
+ * testsuite/special_functions/16_laguerre/compile_2.cc: Ditto.
+ * testsuite/special_functions/17_legendre/compile_2.cc: Ditto.
+ * testsuite/special_functions/18_riemann_zeta/compile_2.cc: Ditto.
+ * testsuite/special_functions/19_sph_bessel/compile_2.cc: Ditto.
+ * testsuite/special_functions/20_sph_legendre/compile_2.cc: Ditto.
+ * testsuite/special_functions/21_sph_neumann/compile_2.cc: Ditto.
+
2016-01-22 Jonathan Wakely <jwakely@redhat.com>
PR libstdc++/69116
diff --git a/libstdc++-v3/include/c_compatibility/math.h b/libstdc++-v3/include/c_compatibility/math.h
index d1fe75d78c6..243e631a32a 100644
--- a/libstdc++-v3/include/c_compatibility/math.h
+++ b/libstdc++-v3/include/c_compatibility/math.h
@@ -111,5 +111,73 @@ using std::tgamma;
using std::trunc;
#endif // C++11 && _GLIBCXX_USE_C99_MATH_TR1
-#endif
-#endif
+#if __STDCPP_WANT_MATH_SPEC_FUNCS__ == 1
+using std::assoc_laguerref;
+using std::assoc_laguerrel;
+using std::assoc_laguerre;
+using std::assoc_legendref;
+using std::assoc_legendrel;
+using std::assoc_legendre;
+using std::betaf;
+using std::betal;
+using std::beta;
+using std::comp_ellint_1f;
+using std::comp_ellint_1l;
+using std::comp_ellint_1;
+using std::comp_ellint_2f;
+using std::comp_ellint_2l;
+using std::comp_ellint_2;
+using std::comp_ellint_3f;
+using std::comp_ellint_3l;
+using std::comp_ellint_3;
+using std::cyl_bessel_if;
+using std::cyl_bessel_il;
+using std::cyl_bessel_i;
+using std::cyl_bessel_jf;
+using std::cyl_bessel_jl;
+using std::cyl_bessel_j;
+using std::cyl_bessel_kf;
+using std::cyl_bessel_kl;
+using std::cyl_bessel_k;
+using std::cyl_neumannf;
+using std::cyl_neumannl;
+using std::cyl_neumann;
+using std::ellint_1f;
+using std::ellint_1l;
+using std::ellint_1;
+using std::ellint_2f;
+using std::ellint_2l;
+using std::ellint_2;
+using std::ellint_3f;
+using std::ellint_3l;
+using std::ellint_3;
+using std::expintf;
+using std::expintl;
+using std::expint;
+using std::hermitef;
+using std::hermitel;
+using std::hermite;
+using std::laguerref;
+using std::laguerrel;
+using std::laguerre;
+using std::legendref;
+using std::legendrel;
+using std::legendre;
+using std::riemann_zetaf;
+using std::riemann_zetal;
+using std::riemann_zeta;
+using std::sph_besself;
+using std::sph_bessell;
+using std::sph_bessel;
+using std::sph_legendref;
+using std::sph_legendrel;
+using std::sph_legendre;
+using std::sph_neumannf;
+using std::sph_neumannl;
+using std::sph_neumann;
+#endif // __STDCPP_WANT_MATH_SPEC_FUNCS__
+
+#endif // __cplusplus
+
+#endif // _GLIBCXX_MATH_H
+
diff --git a/libstdc++-v3/testsuite/special_functions/01_assoc_laguerre/compile_2.cc b/libstdc++-v3/testsuite/special_functions/01_assoc_laguerre/compile_2.cc
index b76090895ec..71af880c60d 100644
--- a/libstdc++-v3/testsuite/special_functions/01_assoc_laguerre/compile_2.cc
+++ b/libstdc++-v3/testsuite/special_functions/01_assoc_laguerre/compile_2.cc
@@ -1,5 +1,4 @@
-// { dg-do compile { xfail *-*-* } }
-// { dg-excess-errors "" }
+// { dg-do compile }
// { dg-options "-D__STDCPP_WANT_MATH_SPEC_FUNCS__" }
// Copyright (C) 2016 Free Software Foundation, Inc.
diff --git a/libstdc++-v3/testsuite/special_functions/02_assoc_legendre/compile_2.cc b/libstdc++-v3/testsuite/special_functions/02_assoc_legendre/compile_2.cc
index 7561952e660..9641f3aab5a 100644
--- a/libstdc++-v3/testsuite/special_functions/02_assoc_legendre/compile_2.cc
+++ b/libstdc++-v3/testsuite/special_functions/02_assoc_legendre/compile_2.cc
@@ -1,5 +1,4 @@
-// { dg-do compile { xfail *-*-* } }
-// { dg-excess-errors "" }
+// { dg-do compile }
// { dg-options "-D__STDCPP_WANT_MATH_SPEC_FUNCS__" }
// Copyright (C) 2016 Free Software Foundation, Inc.
diff --git a/libstdc++-v3/testsuite/special_functions/03_beta/compile_2.cc b/libstdc++-v3/testsuite/special_functions/03_beta/compile_2.cc
index c614e4933b4..a6eb6acad1a 100644
--- a/libstdc++-v3/testsuite/special_functions/03_beta/compile_2.cc
+++ b/libstdc++-v3/testsuite/special_functions/03_beta/compile_2.cc
@@ -1,5 +1,4 @@
-// { dg-do compile { xfail *-*-* } }
-// { dg-excess-errors "" }
+// { dg-do compile }
// { dg-options "-D__STDCPP_WANT_MATH_SPEC_FUNCS__" }
// Copyright (C) 2016 Free Software Foundation, Inc.
diff --git a/libstdc++-v3/testsuite/special_functions/04_comp_ellint_1/compile_2.cc b/libstdc++-v3/testsuite/special_functions/04_comp_ellint_1/compile_2.cc
index 08528af471f..de4ef4b95b5 100644
--- a/libstdc++-v3/testsuite/special_functions/04_comp_ellint_1/compile_2.cc
+++ b/libstdc++-v3/testsuite/special_functions/04_comp_ellint_1/compile_2.cc
@@ -1,5 +1,4 @@
-// { dg-do compile { xfail *-*-* } }
-// { dg-excess-errors "" }
+// { dg-do compile }
// { dg-options "-D__STDCPP_WANT_MATH_SPEC_FUNCS__" }
// Copyright (C) 2016 Free Software Foundation, Inc.
diff --git a/libstdc++-v3/testsuite/special_functions/05_comp_ellint_2/compile_2.cc b/libstdc++-v3/testsuite/special_functions/05_comp_ellint_2/compile_2.cc
index 6cbe32d2c9a..4707bab5e9f 100644
--- a/libstdc++-v3/testsuite/special_functions/05_comp_ellint_2/compile_2.cc
+++ b/libstdc++-v3/testsuite/special_functions/05_comp_ellint_2/compile_2.cc
@@ -1,5 +1,4 @@
-// { dg-do compile { xfail *-*-* } }
-// { dg-excess-errors "" }
+// { dg-do compile }
// { dg-options "-D__STDCPP_WANT_MATH_SPEC_FUNCS__" }
// Copyright (C) 2016 Free Software Foundation, Inc.
diff --git a/libstdc++-v3/testsuite/special_functions/06_comp_ellint_3/compile_2.cc b/libstdc++-v3/testsuite/special_functions/06_comp_ellint_3/compile_2.cc
index 97c4c4c9c75..76da042fd32 100644
--- a/libstdc++-v3/testsuite/special_functions/06_comp_ellint_3/compile_2.cc
+++ b/libstdc++-v3/testsuite/special_functions/06_comp_ellint_3/compile_2.cc
@@ -1,5 +1,4 @@
-// { dg-do compile { xfail *-*-* } }
-// { dg-excess-errors "" }
+// { dg-do compile }
// { dg-options "-D__STDCPP_WANT_MATH_SPEC_FUNCS__" }
// Copyright (C) 2016 Free Software Foundation, Inc.
diff --git a/libstdc++-v3/testsuite/special_functions/07_cyl_bessel_i/compile_2.cc b/libstdc++-v3/testsuite/special_functions/07_cyl_bessel_i/compile_2.cc
index 6ba5307e958..33d3fe3bbb5 100644
--- a/libstdc++-v3/testsuite/special_functions/07_cyl_bessel_i/compile_2.cc
+++ b/libstdc++-v3/testsuite/special_functions/07_cyl_bessel_i/compile_2.cc
@@ -1,5 +1,4 @@
-// { dg-do compile { xfail *-*-* } }
-// { dg-excess-errors "" }
+// { dg-do compile }
// { dg-options "-D__STDCPP_WANT_MATH_SPEC_FUNCS__" }
// Copyright (C) 2016 Free Software Foundation, Inc.
diff --git a/libstdc++-v3/testsuite/special_functions/08_cyl_bessel_j/compile_2.cc b/libstdc++-v3/testsuite/special_functions/08_cyl_bessel_j/compile_2.cc
index a2298dae9b7..8b25dd0a69e 100644
--- a/libstdc++-v3/testsuite/special_functions/08_cyl_bessel_j/compile_2.cc
+++ b/libstdc++-v3/testsuite/special_functions/08_cyl_bessel_j/compile_2.cc
@@ -1,5 +1,4 @@
-// { dg-do compile { xfail *-*-* } }
-// { dg-excess-errors "" }
+// { dg-do compile }
// { dg-options "-D__STDCPP_WANT_MATH_SPEC_FUNCS__" }
// Copyright (C) 2016 Free Software Foundation, Inc.
diff --git a/libstdc++-v3/testsuite/special_functions/09_cyl_bessel_k/compile_2.cc b/libstdc++-v3/testsuite/special_functions/09_cyl_bessel_k/compile_2.cc
index c32b4df02bf..4726e67050d 100644
--- a/libstdc++-v3/testsuite/special_functions/09_cyl_bessel_k/compile_2.cc
+++ b/libstdc++-v3/testsuite/special_functions/09_cyl_bessel_k/compile_2.cc
@@ -1,5 +1,4 @@
-// { dg-do compile { xfail *-*-* } }
-// { dg-excess-errors "" }
+// { dg-do compile }
// { dg-options "-D__STDCPP_WANT_MATH_SPEC_FUNCS__" }
// Copyright (C) 2016 Free Software Foundation, Inc.
diff --git a/libstdc++-v3/testsuite/special_functions/10_cyl_neumann/compile_2.cc b/libstdc++-v3/testsuite/special_functions/10_cyl_neumann/compile_2.cc
index 4356ca980f3..4cf86309a0f 100644
--- a/libstdc++-v3/testsuite/special_functions/10_cyl_neumann/compile_2.cc
+++ b/libstdc++-v3/testsuite/special_functions/10_cyl_neumann/compile_2.cc
@@ -1,5 +1,4 @@
-// { dg-do compile { xfail *-*-* } }
-// { dg-excess-errors "" }
+// { dg-do compile }
// { dg-options "-D__STDCPP_WANT_MATH_SPEC_FUNCS__" }
// Copyright (C) 2016 Free Software Foundation, Inc.
diff --git a/libstdc++-v3/testsuite/special_functions/11_ellint_1/compile_2.cc b/libstdc++-v3/testsuite/special_functions/11_ellint_1/compile_2.cc
index 2421c9a8692..0effa24003c 100644
--- a/libstdc++-v3/testsuite/special_functions/11_ellint_1/compile_2.cc
+++ b/libstdc++-v3/testsuite/special_functions/11_ellint_1/compile_2.cc
@@ -1,5 +1,4 @@
-// { dg-do compile { xfail *-*-* } }
-// { dg-excess-errors "" }
+// { dg-do compile }
// { dg-options "-D__STDCPP_WANT_MATH_SPEC_FUNCS__" }
// Copyright (C) 2016 Free Software Foundation, Inc.
diff --git a/libstdc++-v3/testsuite/special_functions/12_ellint_2/compile_2.cc b/libstdc++-v3/testsuite/special_functions/12_ellint_2/compile_2.cc
index d3385ad4a85..098f301fca7 100644
--- a/libstdc++-v3/testsuite/special_functions/12_ellint_2/compile_2.cc
+++ b/libstdc++-v3/testsuite/special_functions/12_ellint_2/compile_2.cc
@@ -1,5 +1,4 @@
-// { dg-do compile { xfail *-*-* } }
-// { dg-excess-errors "" }
+// { dg-do compile }
// { dg-options "-D__STDCPP_WANT_MATH_SPEC_FUNCS__" }
// Copyright (C) 2016 Free Software Foundation, Inc.
diff --git a/libstdc++-v3/testsuite/special_functions/13_ellint_3/compile_2.cc b/libstdc++-v3/testsuite/special_functions/13_ellint_3/compile_2.cc
index 61d1ea6e58b..6e8f2fd019d 100644
--- a/libstdc++-v3/testsuite/special_functions/13_ellint_3/compile_2.cc
+++ b/libstdc++-v3/testsuite/special_functions/13_ellint_3/compile_2.cc
@@ -1,5 +1,4 @@
-// { dg-do compile { xfail *-*-* } }
-// { dg-excess-errors "" }
+// { dg-do compile }
// { dg-options "-D__STDCPP_WANT_MATH_SPEC_FUNCS__" }
// Copyright (C) 2016 Free Software Foundation, Inc.
diff --git a/libstdc++-v3/testsuite/special_functions/14_expint/compile_2.cc b/libstdc++-v3/testsuite/special_functions/14_expint/compile_2.cc
index 6b73aadfe35..c501bfd2f0b 100644
--- a/libstdc++-v3/testsuite/special_functions/14_expint/compile_2.cc
+++ b/libstdc++-v3/testsuite/special_functions/14_expint/compile_2.cc
@@ -1,5 +1,4 @@
-// { dg-do compile { xfail *-*-* } }
-// { dg-excess-errors "" }
+// { dg-do compile }
// { dg-options "-D__STDCPP_WANT_MATH_SPEC_FUNCS__" }
// Copyright (C) 2016 Free Software Foundation, Inc.
diff --git a/libstdc++-v3/testsuite/special_functions/15_hermite/compile_2.cc b/libstdc++-v3/testsuite/special_functions/15_hermite/compile_2.cc
index bf6935ea3a9..f792e1740ab 100644
--- a/libstdc++-v3/testsuite/special_functions/15_hermite/compile_2.cc
+++ b/libstdc++-v3/testsuite/special_functions/15_hermite/compile_2.cc
@@ -1,5 +1,4 @@
-// { dg-do compile { xfail *-*-* } }
-// { dg-excess-errors "" }
+// { dg-do compile }
// { dg-options "-D__STDCPP_WANT_MATH_SPEC_FUNCS__" }
// Copyright (C) 2016 Free Software Foundation, Inc.
diff --git a/libstdc++-v3/testsuite/special_functions/16_laguerre/compile_2.cc b/libstdc++-v3/testsuite/special_functions/16_laguerre/compile_2.cc
index 62f1464684f..70c85ccf498 100644
--- a/libstdc++-v3/testsuite/special_functions/16_laguerre/compile_2.cc
+++ b/libstdc++-v3/testsuite/special_functions/16_laguerre/compile_2.cc
@@ -1,5 +1,4 @@
-// { dg-do compile { xfail *-*-* } }
-// { dg-excess-errors "" }
+// { dg-do compile }
// { dg-options "-D__STDCPP_WANT_MATH_SPEC_FUNCS__" }
// Copyright (C) 2016 Free Software Foundation, Inc.
diff --git a/libstdc++-v3/testsuite/special_functions/17_legendre/compile_2.cc b/libstdc++-v3/testsuite/special_functions/17_legendre/compile_2.cc
index 4c69f9ae07a..00458b190cb 100644
--- a/libstdc++-v3/testsuite/special_functions/17_legendre/compile_2.cc
+++ b/libstdc++-v3/testsuite/special_functions/17_legendre/compile_2.cc
@@ -1,5 +1,4 @@
-// { dg-do compile { xfail *-*-* } }
-// { dg-excess-errors "" }
+// { dg-do compile }
// { dg-options "-D__STDCPP_WANT_MATH_SPEC_FUNCS__" }
// Copyright (C) 2016 Free Software Foundation, Inc.
diff --git a/libstdc++-v3/testsuite/special_functions/18_riemann_zeta/compile_2.cc b/libstdc++-v3/testsuite/special_functions/18_riemann_zeta/compile_2.cc
index 2034c411a7f..e6e3cd989c9 100644
--- a/libstdc++-v3/testsuite/special_functions/18_riemann_zeta/compile_2.cc
+++ b/libstdc++-v3/testsuite/special_functions/18_riemann_zeta/compile_2.cc
@@ -1,5 +1,4 @@
-// { dg-do compile { xfail *-*-* } }
-// { dg-excess-errors "" }
+// { dg-do compile }
// { dg-options "-D__STDCPP_WANT_MATH_SPEC_FUNCS__" }
// Copyright (C) 2016 Free Software Foundation, Inc.
diff --git a/libstdc++-v3/testsuite/special_functions/19_sph_bessel/compile_2.cc b/libstdc++-v3/testsuite/special_functions/19_sph_bessel/compile_2.cc
index 86a5d76ea3c..1fb7c2dedb3 100644
--- a/libstdc++-v3/testsuite/special_functions/19_sph_bessel/compile_2.cc
+++ b/libstdc++-v3/testsuite/special_functions/19_sph_bessel/compile_2.cc
@@ -1,5 +1,4 @@
-// { dg-do compile { xfail *-*-* } }
-// { dg-excess-errors "" }
+// { dg-do compile }
// { dg-options "-D__STDCPP_WANT_MATH_SPEC_FUNCS__" }
// Copyright (C) 2016 Free Software Foundation, Inc.
diff --git a/libstdc++-v3/testsuite/special_functions/20_sph_legendre/compile_2.cc b/libstdc++-v3/testsuite/special_functions/20_sph_legendre/compile_2.cc
index c82b29e4f4e..81cc52516fa 100644
--- a/libstdc++-v3/testsuite/special_functions/20_sph_legendre/compile_2.cc
+++ b/libstdc++-v3/testsuite/special_functions/20_sph_legendre/compile_2.cc
@@ -1,5 +1,4 @@
-// { dg-do compile { xfail *-*-* } }
-// { dg-excess-errors "" }
+// { dg-do compile }
// { dg-options "-D__STDCPP_WANT_MATH_SPEC_FUNCS__" }
// Copyright (C) 2016 Free Software Foundation, Inc.
diff --git a/libstdc++-v3/testsuite/special_functions/21_sph_neumann/compile_2.cc b/libstdc++-v3/testsuite/special_functions/21_sph_neumann/compile_2.cc
index 88182199afc..b9d83862244 100644
--- a/libstdc++-v3/testsuite/special_functions/21_sph_neumann/compile_2.cc
+++ b/libstdc++-v3/testsuite/special_functions/21_sph_neumann/compile_2.cc
@@ -1,5 +1,4 @@
-// { dg-do compile { xfail *-*-* } }
-// { dg-excess-errors "" }
+// { dg-do compile }
// { dg-options "-D__STDCPP_WANT_MATH_SPEC_FUNCS__" }
// Copyright (C) 2016 Free Software Foundation, Inc.