From: Joseph Myers <joseph@codesourcery.com>
Date: Tue, 4 Sep 2018 19:52:06 +0000 (+0000)
Subject: Move fenv.h soft-float inlines from fenv_private.h to include/fenv.h.
X-Git-Tag: glibc-2.29~477
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=418d99e622be036f44980854d585531905abae21;p=thirdparty%2Fglibc.git

Move fenv.h soft-float inlines from fenv_private.h to include/fenv.h.

<fenv_private.h> has inline versions of various <fenv.h> functions,
and their __fe* variants, for systems (generally soft-float) without
support for floating-point exceptions, rounding modes or both.

Having these inlines in a separate header introduces a risk of a
source file including <fenv.h> and compiling OK on x86_64, but failing
to compile (because the feraiseexcept inline is actually a macro that
discards its argument, to avoid the need for #ifdef FE_INVALID
conditionals), or not being properly optimized, on systems without the
exceptions and rounding modes support (when these inlines were in
math_private.h, we had a few cases where this broke the build because
there was no obvious reason for a file to need math_private.h and it
didn't need that header on x86_64).  By moving those inlines to
include/fenv.h, this risk can be avoided, and fenv_private.h becomes
more clearly defined as specifically the header for the internal
libc_fe* and SET_RESTORE_ROUND* interfaces.

This patch makes that move, removing fenv_private.h includes that are
no longer needed (or replacing them by fenv.h includes in a few cases
that didn't already have such an include).

Tested for x86_64 and x86, and tested with build-many-glibcs.py that
installed stripped shared libraries are unchanged by the patch.

	* sysdeps/generic/fenv_private.h [FE_ALL_EXCEPT == 0]: Move this
	code ....
	[!FE_HAVE_ROUNDING_MODES]: And this code ....
	* include/fenv.h [!_ISOMAC]: ... to here.
	* math/fraiseexcpt.c (__feraiseexcept): Undefine as macro.
	(feraiseexcept): Likewise.
	* math/fromfp.h: Do not include <fenv_private.h>.
	* math/s_cexp_template.c: Likewise.
	* math/s_csin_template.c: Likewise.
	* math/s_csinh_template.c: Likewise.
	* math/s_ctan_template.c: Likewise.
	* math/s_ctanh_template.c: Likewise.
	* math/s_iseqsig_template.c: Likewise.
	* math/w_acos_compat.c: Likewise.
	* math/w_acosf_compat.c: Likewise.
	* math/w_acosl_compat.c: Likewise.
	* math/w_asin_compat.c: Likewise.
	* math/w_asinf_compat.c: Likewise.
	* math/w_asinl_compat.c: Likewise.
	* math/w_j0_compat.c: Likewise.
	* math/w_j0f_compat.c: Likewise.
	* math/w_j0l_compat.c: Likewise.
	* math/w_j1_compat.c: Likewise.
	* math/w_j1f_compat.c: Likewise.
	* math/w_j1l_compat.c: Likewise.
	* math/w_jn_compat.c: Likewise.
	* math/w_jnf_compat.c: Likewise.
	* math/w_log10_compat.c: Likewise.
	* math/w_log10f_compat.c: Likewise.
	* math/w_log10l_compat.c: Likewise.
	* math/w_log2_compat.c: Likewise.
	* math/w_log2f_compat.c: Likewise.
	* math/w_log2l_compat.c: Likewise.
	* math/w_log_compat.c: Likewise.
	* math/w_logf_compat.c: Likewise.
	* math/w_logl_compat.c: Likewise.
	* sysdeps/ieee754/dbl-64/s_llrint.c: Likewise.
	* sysdeps/ieee754/dbl-64/s_llround.c: Likewise.
	* sysdeps/ieee754/dbl-64/s_lrint.c: Likewise.
	* sysdeps/ieee754/dbl-64/s_lround.c: Likewise.
	* sysdeps/ieee754/dbl-64/wordsize-64/s_lround.c: Likewise.
	* sysdeps/ieee754/flt-32/s_llrintf.c: Likewise.
	* sysdeps/ieee754/flt-32/s_llroundf.c: Likewise.
	* sysdeps/ieee754/flt-32/s_lrintf.c: Likewise.
	* sysdeps/ieee754/flt-32/s_lroundf.c: Likewise.
	* sysdeps/ieee754/k_standardl.c: Likewise.
	* sysdeps/ieee754/ldbl-128/e_expl.c: Likewise.
	* sysdeps/ieee754/ldbl-128/s_fmal.c: Likewise.
	* sysdeps/ieee754/ldbl-128/s_llrintl.c: Likewise.
	* sysdeps/ieee754/ldbl-128/s_llroundl.c: Likewise.
	* sysdeps/ieee754/ldbl-128/s_lrintl.c: Likewise.
	* sysdeps/ieee754/ldbl-128/s_lroundl.c: Likewise.
	* sysdeps/ieee754/ldbl-128/s_nearbyintl.c: Likewise.
	* sysdeps/ieee754/ldbl-128ibm/s_llrintl.c: Likewise.
	* sysdeps/ieee754/ldbl-128ibm/s_llroundl.c: Likewise.
	* sysdeps/ieee754/ldbl-128ibm/s_lrintl.c: Likewise.
	* sysdeps/ieee754/ldbl-128ibm/s_lroundl.c: Likewise.
	* sysdeps/ieee754/ldbl-96/s_fma.c: Likewise.
	* sysdeps/ieee754/ldbl-96/s_fmal.c: Likewise.
	* sysdeps/ieee754/ldbl-96/s_llrintl.c: Likewise.
	* sysdeps/ieee754/ldbl-96/s_llroundl.c: Likewise.
	* sysdeps/ieee754/ldbl-96/s_lrintl.c: Likewise.
	* sysdeps/ieee754/ldbl-96/s_lroundl.c: Likewise.
	* math/w_ilogb_template.c: Include <fenv.h> instead of
	<fenv_private.h>.
	* math/w_llogb_template.c: Likewise.
	* sysdeps/powerpc/fpu/e_sqrt.c: Likewise.
	* sysdeps/powerpc/fpu/e_sqrtf.c: Likewise.
---

diff --git a/ChangeLog b/ChangeLog
index 5ac0551145f..70ebfcea18a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,74 @@
+2018-09-04  Joseph Myers  <joseph@codesourcery.com>
+
+	* sysdeps/generic/fenv_private.h [FE_ALL_EXCEPT == 0]: Move this
+	code ....
+	[!FE_HAVE_ROUNDING_MODES]: And this code ....
+	* include/fenv.h [!_ISOMAC]: ... to here.
+	* math/fraiseexcpt.c (__feraiseexcept): Undefine as macro.
+	(feraiseexcept): Likewise.
+	* math/fromfp.h: Do not include <fenv_private.h>.
+	* math/s_cexp_template.c: Likewise.
+	* math/s_csin_template.c: Likewise.
+	* math/s_csinh_template.c: Likewise.
+	* math/s_ctan_template.c: Likewise.
+	* math/s_ctanh_template.c: Likewise.
+	* math/s_iseqsig_template.c: Likewise.
+	* math/w_acos_compat.c: Likewise.
+	* math/w_acosf_compat.c: Likewise.
+	* math/w_acosl_compat.c: Likewise.
+	* math/w_asin_compat.c: Likewise.
+	* math/w_asinf_compat.c: Likewise.
+	* math/w_asinl_compat.c: Likewise.
+	* math/w_j0_compat.c: Likewise.
+	* math/w_j0f_compat.c: Likewise.
+	* math/w_j0l_compat.c: Likewise.
+	* math/w_j1_compat.c: Likewise.
+	* math/w_j1f_compat.c: Likewise.
+	* math/w_j1l_compat.c: Likewise.
+	* math/w_jn_compat.c: Likewise.
+	* math/w_jnf_compat.c: Likewise.
+	* math/w_log10_compat.c: Likewise.
+	* math/w_log10f_compat.c: Likewise.
+	* math/w_log10l_compat.c: Likewise.
+	* math/w_log2_compat.c: Likewise.
+	* math/w_log2f_compat.c: Likewise.
+	* math/w_log2l_compat.c: Likewise.
+	* math/w_log_compat.c: Likewise.
+	* math/w_logf_compat.c: Likewise.
+	* math/w_logl_compat.c: Likewise.
+	* sysdeps/ieee754/dbl-64/s_llrint.c: Likewise.
+	* sysdeps/ieee754/dbl-64/s_llround.c: Likewise.
+	* sysdeps/ieee754/dbl-64/s_lrint.c: Likewise.
+	* sysdeps/ieee754/dbl-64/s_lround.c: Likewise.
+	* sysdeps/ieee754/dbl-64/wordsize-64/s_lround.c: Likewise.
+	* sysdeps/ieee754/flt-32/s_llrintf.c: Likewise.
+	* sysdeps/ieee754/flt-32/s_llroundf.c: Likewise.
+	* sysdeps/ieee754/flt-32/s_lrintf.c: Likewise.
+	* sysdeps/ieee754/flt-32/s_lroundf.c: Likewise.
+	* sysdeps/ieee754/k_standardl.c: Likewise.
+	* sysdeps/ieee754/ldbl-128/e_expl.c: Likewise.
+	* sysdeps/ieee754/ldbl-128/s_fmal.c: Likewise.
+	* sysdeps/ieee754/ldbl-128/s_llrintl.c: Likewise.
+	* sysdeps/ieee754/ldbl-128/s_llroundl.c: Likewise.
+	* sysdeps/ieee754/ldbl-128/s_lrintl.c: Likewise.
+	* sysdeps/ieee754/ldbl-128/s_lroundl.c: Likewise.
+	* sysdeps/ieee754/ldbl-128/s_nearbyintl.c: Likewise.
+	* sysdeps/ieee754/ldbl-128ibm/s_llrintl.c: Likewise.
+	* sysdeps/ieee754/ldbl-128ibm/s_llroundl.c: Likewise.
+	* sysdeps/ieee754/ldbl-128ibm/s_lrintl.c: Likewise.
+	* sysdeps/ieee754/ldbl-128ibm/s_lroundl.c: Likewise.
+	* sysdeps/ieee754/ldbl-96/s_fma.c: Likewise.
+	* sysdeps/ieee754/ldbl-96/s_fmal.c: Likewise.
+	* sysdeps/ieee754/ldbl-96/s_llrintl.c: Likewise.
+	* sysdeps/ieee754/ldbl-96/s_llroundl.c: Likewise.
+	* sysdeps/ieee754/ldbl-96/s_lrintl.c: Likewise.
+	* sysdeps/ieee754/ldbl-96/s_lroundl.c: Likewise.
+	* math/w_ilogb_template.c: Include <fenv.h> instead of
+	<fenv_private.h>.
+	* math/w_llogb_template.c: Likewise.
+	* sysdeps/powerpc/fpu/e_sqrt.c: Likewise.
+	* sysdeps/powerpc/fpu/e_sqrtf.c: Likewise.
+
 2018-09-03  Joseph Myers  <joseph@codesourcery.com>
 
 	* sysdeps/generic/math_private.h: Do not include <fenv_private.h>.
diff --git a/include/fenv.h b/include/fenv.h
index 76679e1e183..0b32f80964c 100644
--- a/include/fenv.h
+++ b/include/fenv.h
@@ -57,6 +57,96 @@ struct rm_ctx
 #  define FE_HAVE_ROUNDING_MODES 0
 # endif
 
+/* When no floating-point exceptions are defined in <fenv.h>, make
+   feraiseexcept ignore its argument so that unconditional
+   feraiseexcept calls do not cause errors for undefined exceptions.
+   Define it to expand to a void expression so that any calls testing
+   the result of feraiseexcept do produce errors.  */
+# if FE_ALL_EXCEPT == 0
+#  define feraiseexcept(excepts) ((void) 0)
+#  define __feraiseexcept(excepts) ((void) 0)
+# endif
+
+/* Similarly, most <fenv.h> functions have trivial implementations in
+   the absence of support for floating-point exceptions and rounding
+   modes.  */
+
+# if !FE_HAVE_ROUNDING_MODES
+#  if FE_ALL_EXCEPT == 0
+extern inline int
+fegetenv (fenv_t *__e)
+{
+  return 0;
+}
+
+extern inline int
+__fegetenv (fenv_t *__e)
+{
+  return 0;
+}
+
+extern inline int
+feholdexcept (fenv_t *__e)
+{
+  return 0;
+}
+
+extern inline int
+__feholdexcept (fenv_t *__e)
+{
+  return 0;
+}
+
+extern inline int
+fesetenv (const fenv_t *__e)
+{
+  return 0;
+}
+
+extern inline int
+__fesetenv (const fenv_t *__e)
+{
+  return 0;
+}
+
+extern inline int
+feupdateenv (const fenv_t *__e)
+{
+  return 0;
+}
+
+extern inline int
+__feupdateenv (const fenv_t *__e)
+{
+  return 0;
+}
+#  endif
+
+extern inline int
+fegetround (void)
+{
+  return FE_TONEAREST;
+}
+
+extern inline int
+__fegetround (void)
+{
+  return FE_TONEAREST;
+}
+
+extern inline int
+fesetround (int __d)
+{
+  return 0;
+}
+
+extern inline int
+__fesetround (int __d)
+{
+  return 0;
+}
+# endif
+
 #endif
 
 #endif
diff --git a/math/fraiseexcpt.c b/math/fraiseexcpt.c
index de968d42113..c3b4a07731a 100644
--- a/math/fraiseexcpt.c
+++ b/math/fraiseexcpt.c
@@ -20,6 +20,9 @@
 #include <fenv.h>
 #include <shlib-compat.h>
 
+#undef __feraiseexcept
+#undef feraiseexcept
+
 int
 __feraiseexcept (int excepts)
 {
diff --git a/math/fromfp.h b/math/fromfp.h
index 718a5120d8e..9d102a635f4 100644
--- a/math/fromfp.h
+++ b/math/fromfp.h
@@ -22,7 +22,6 @@
 #include <math.h>
 #include <math-barriers.h>
 #include <math_private.h>
-#include <fenv_private.h>
 #include <stdbool.h>
 #include <stdint.h>
 
diff --git a/math/s_cexp_template.c b/math/s_cexp_template.c
index 766681a2bbc..5fdab1e5ac3 100644
--- a/math/s_cexp_template.c
+++ b/math/s_cexp_template.c
@@ -21,7 +21,6 @@
 #include <fenv.h>
 #include <math.h>
 #include <math_private.h>
-#include <fenv_private.h>
 #include <math-underflow.h>
 #include <float.h>
 
diff --git a/math/s_csin_template.c b/math/s_csin_template.c
index 4581852b176..5f95e92ee00 100644
--- a/math/s_csin_template.c
+++ b/math/s_csin_template.c
@@ -21,7 +21,6 @@
 #include <fenv.h>
 #include <math.h>
 #include <math_private.h>
-#include <fenv_private.h>
 #include <math-underflow.h>
 #include <float.h>
 
diff --git a/math/s_csinh_template.c b/math/s_csinh_template.c
index ad599d67eab..95f28c2b669 100644
--- a/math/s_csinh_template.c
+++ b/math/s_csinh_template.c
@@ -21,7 +21,6 @@
 #include <fenv.h>
 #include <math.h>
 #include <math_private.h>
-#include <fenv_private.h>
 #include <math-underflow.h>
 #include <float.h>
 
diff --git a/math/s_ctan_template.c b/math/s_ctan_template.c
index bd9247c98d6..ab11c252990 100644
--- a/math/s_ctan_template.c
+++ b/math/s_ctan_template.c
@@ -21,7 +21,6 @@
 #include <fenv.h>
 #include <math.h>
 #include <math_private.h>
-#include <fenv_private.h>
 #include <math-underflow.h>
 #include <float.h>
 
diff --git a/math/s_ctanh_template.c b/math/s_ctanh_template.c
index 7b1dd9aa677..bd1292239fe 100644
--- a/math/s_ctanh_template.c
+++ b/math/s_ctanh_template.c
@@ -21,7 +21,6 @@
 #include <fenv.h>
 #include <math.h>
 #include <math_private.h>
-#include <fenv_private.h>
 #include <math-underflow.h>
 #include <float.h>
 
diff --git a/math/s_iseqsig_template.c b/math/s_iseqsig_template.c
index b3a86aea506..a4d28d778d7 100644
--- a/math/s_iseqsig_template.c
+++ b/math/s_iseqsig_template.c
@@ -20,7 +20,6 @@
 #include <fenv.h>
 #include <math.h>
 #include <math_private.h>
-#include <fenv_private.h>
 #include <stdbool.h>
 #include <fix-fp-int-compare-invalid.h>
 
diff --git a/math/w_acos_compat.c b/math/w_acos_compat.c
index ff6d163c203..079fdb271f9 100644
--- a/math/w_acos_compat.c
+++ b/math/w_acos_compat.c
@@ -19,7 +19,6 @@
 #include <fenv.h>
 #include <math.h>
 #include <math_private.h>
-#include <fenv_private.h>
 #include <math-svid-compat.h>
 #include <libm-alias-double.h>
 
diff --git a/math/w_acosf_compat.c b/math/w_acosf_compat.c
index 0f38a20564f..efc09edb2a9 100644
--- a/math/w_acosf_compat.c
+++ b/math/w_acosf_compat.c
@@ -19,7 +19,6 @@
 #include <fenv.h>
 #include <math.h>
 #include <math_private.h>
-#include <fenv_private.h>
 #include <math-svid-compat.h>
 #include <libm-alias-float.h>
 
diff --git a/math/w_acosl_compat.c b/math/w_acosl_compat.c
index e24fb03b5f2..d630a10a40e 100644
--- a/math/w_acosl_compat.c
+++ b/math/w_acosl_compat.c
@@ -19,7 +19,6 @@
 #include <fenv.h>
 #include <math.h>
 #include <math_private.h>
-#include <fenv_private.h>
 #include <math-svid-compat.h>
 #include <libm-alias-ldouble.h>
 
diff --git a/math/w_asin_compat.c b/math/w_asin_compat.c
index 43ea34a7dc8..c55913d3047 100644
--- a/math/w_asin_compat.c
+++ b/math/w_asin_compat.c
@@ -19,7 +19,6 @@
 #include <fenv.h>
 #include <math.h>
 #include <math_private.h>
-#include <fenv_private.h>
 #include <math-svid-compat.h>
 #include <libm-alias-double.h>
 
diff --git a/math/w_asinf_compat.c b/math/w_asinf_compat.c
index 58c6dcaf27d..1fc18c2e919 100644
--- a/math/w_asinf_compat.c
+++ b/math/w_asinf_compat.c
@@ -19,7 +19,6 @@
 #include <fenv.h>
 #include <math.h>
 #include <math_private.h>
-#include <fenv_private.h>
 #include <math-svid-compat.h>
 #include <libm-alias-float.h>
 
diff --git a/math/w_asinl_compat.c b/math/w_asinl_compat.c
index c7ea8358af8..6741138f74b 100644
--- a/math/w_asinl_compat.c
+++ b/math/w_asinl_compat.c
@@ -19,7 +19,6 @@
 #include <fenv.h>
 #include <math.h>
 #include <math_private.h>
-#include <fenv_private.h>
 #include <math-svid-compat.h>
 #include <libm-alias-ldouble.h>
 
diff --git a/math/w_ilogb_template.c b/math/w_ilogb_template.c
index fd41dc26273..ac80d7f41fe 100644
--- a/math/w_ilogb_template.c
+++ b/math/w_ilogb_template.c
@@ -20,7 +20,7 @@
 #include <errno.h>
 #include <limits.h>
 #include <math_private.h>
-#include <fenv_private.h>
+#include <fenv.h>
 
 /* wrapper ilogb */
 int
diff --git a/math/w_j0_compat.c b/math/w_j0_compat.c
index f8ce3f8d3c3..a298353ac4f 100644
--- a/math/w_j0_compat.c
+++ b/math/w_j0_compat.c
@@ -19,7 +19,6 @@
 #include <fenv.h>
 #include <math.h>
 #include <math_private.h>
-#include <fenv_private.h>
 #include <math-svid-compat.h>
 #include <libm-alias-double.h>
 
diff --git a/math/w_j0f_compat.c b/math/w_j0f_compat.c
index 0bee2fb011e..41d3a101471 100644
--- a/math/w_j0f_compat.c
+++ b/math/w_j0f_compat.c
@@ -19,7 +19,6 @@
 #include <fenv.h>
 #include <math.h>
 #include <math_private.h>
-#include <fenv_private.h>
 #include <math-svid-compat.h>
 #include <libm-alias-float.h>
 
diff --git a/math/w_j0l_compat.c b/math/w_j0l_compat.c
index 9d2c5d46a43..e436cb278b3 100644
--- a/math/w_j0l_compat.c
+++ b/math/w_j0l_compat.c
@@ -19,7 +19,6 @@
 #include <fenv.h>
 #include <math.h>
 #include <math_private.h>
-#include <fenv_private.h>
 #include <math-svid-compat.h>
 #include <libm-alias-ldouble.h>
 
diff --git a/math/w_j1_compat.c b/math/w_j1_compat.c
index 11a56889f1b..3b014b8cfa9 100644
--- a/math/w_j1_compat.c
+++ b/math/w_j1_compat.c
@@ -19,7 +19,6 @@
 #include <fenv.h>
 #include <math.h>
 #include <math_private.h>
-#include <fenv_private.h>
 #include <math-svid-compat.h>
 #include <libm-alias-double.h>
 
diff --git a/math/w_j1f_compat.c b/math/w_j1f_compat.c
index e59d954626b..5cfb6b9cd59 100644
--- a/math/w_j1f_compat.c
+++ b/math/w_j1f_compat.c
@@ -19,7 +19,6 @@
 #include <fenv.h>
 #include <math.h>
 #include <math_private.h>
-#include <fenv_private.h>
 #include <math-svid-compat.h>
 #include <libm-alias-float.h>
 
diff --git a/math/w_j1l_compat.c b/math/w_j1l_compat.c
index 400040a0a03..fb0adc68cbc 100644
--- a/math/w_j1l_compat.c
+++ b/math/w_j1l_compat.c
@@ -19,7 +19,6 @@
 #include <fenv.h>
 #include <math.h>
 #include <math_private.h>
-#include <fenv_private.h>
 #include <math-svid-compat.h>
 #include <libm-alias-ldouble.h>
 
diff --git a/math/w_jn_compat.c b/math/w_jn_compat.c
index a169c7b2108..8b546ba4a26 100644
--- a/math/w_jn_compat.c
+++ b/math/w_jn_compat.c
@@ -19,7 +19,6 @@
 #include <fenv.h>
 #include <math.h>
 #include <math_private.h>
-#include <fenv_private.h>
 #include <math-svid-compat.h>
 #include <libm-alias-double.h>
 
diff --git a/math/w_jnf_compat.c b/math/w_jnf_compat.c
index 11769e2e266..86386700dee 100644
--- a/math/w_jnf_compat.c
+++ b/math/w_jnf_compat.c
@@ -19,7 +19,6 @@
 #include <fenv.h>
 #include <math.h>
 #include <math_private.h>
-#include <fenv_private.h>
 #include <math-svid-compat.h>
 #include <libm-alias-float.h>
 
diff --git a/math/w_llogb_template.c b/math/w_llogb_template.c
index 76f2557677d..562d97be6d8 100644
--- a/math/w_llogb_template.c
+++ b/math/w_llogb_template.c
@@ -20,7 +20,7 @@
 #include <errno.h>
 #include <limits.h>
 #include <math_private.h>
-#include <fenv_private.h>
+#include <fenv.h>
 
 long int
 M_DECL_FUNC (__llogb) (FLOAT x)
diff --git a/math/w_log10_compat.c b/math/w_log10_compat.c
index 996139dc7c7..87c155d2565 100644
--- a/math/w_log10_compat.c
+++ b/math/w_log10_compat.c
@@ -19,7 +19,6 @@
 #include <fenv.h>
 #include <math.h>
 #include <math_private.h>
-#include <fenv_private.h>
 #include <math-svid-compat.h>
 #include <libm-alias-double.h>
 
diff --git a/math/w_log10f_compat.c b/math/w_log10f_compat.c
index 9cee2185d2a..fd1861a6ab5 100644
--- a/math/w_log10f_compat.c
+++ b/math/w_log10f_compat.c
@@ -19,7 +19,6 @@
 #include <fenv.h>
 #include <math.h>
 #include <math_private.h>
-#include <fenv_private.h>
 #include <math-svid-compat.h>
 #include <libm-alias-float.h>
 
diff --git a/math/w_log10l_compat.c b/math/w_log10l_compat.c
index b4b404822e5..d2387c225a3 100644
--- a/math/w_log10l_compat.c
+++ b/math/w_log10l_compat.c
@@ -19,7 +19,6 @@
 #include <fenv.h>
 #include <math.h>
 #include <math_private.h>
-#include <fenv_private.h>
 #include <math-svid-compat.h>
 #include <libm-alias-ldouble.h>
 
diff --git a/math/w_log2_compat.c b/math/w_log2_compat.c
index 7b34a991e63..61e7170ae19 100644
--- a/math/w_log2_compat.c
+++ b/math/w_log2_compat.c
@@ -19,7 +19,6 @@
 #include <fenv.h>
 #include <math.h>
 #include <math_private.h>
-#include <fenv_private.h>
 #include <math-svid-compat.h>
 #include <libm-alias-double.h>
 
diff --git a/math/w_log2f_compat.c b/math/w_log2f_compat.c
index c9d99be07a5..7b4b545c818 100644
--- a/math/w_log2f_compat.c
+++ b/math/w_log2f_compat.c
@@ -19,7 +19,6 @@
 #include <fenv.h>
 #include <math.h>
 #include <math_private.h>
-#include <fenv_private.h>
 #include <math-svid-compat.h>
 #include <libm-alias-float.h>
 
diff --git a/math/w_log2l_compat.c b/math/w_log2l_compat.c
index c40016532d5..ba74ed2576a 100644
--- a/math/w_log2l_compat.c
+++ b/math/w_log2l_compat.c
@@ -19,7 +19,6 @@
 #include <fenv.h>
 #include <math.h>
 #include <math_private.h>
-#include <fenv_private.h>
 #include <math-svid-compat.h>
 #include <libm-alias-ldouble.h>
 
diff --git a/math/w_log_compat.c b/math/w_log_compat.c
index 4ed4eea6e8f..5413b8e8dfd 100644
--- a/math/w_log_compat.c
+++ b/math/w_log_compat.c
@@ -19,7 +19,6 @@
 #include <fenv.h>
 #include <math.h>
 #include <math_private.h>
-#include <fenv_private.h>
 #include <math-svid-compat.h>
 #include <libm-alias-double.h>
 
diff --git a/math/w_logf_compat.c b/math/w_logf_compat.c
index 7e8c124c4d1..9810d30c522 100644
--- a/math/w_logf_compat.c
+++ b/math/w_logf_compat.c
@@ -19,7 +19,6 @@
 #include <fenv.h>
 #include <math.h>
 #include <math_private.h>
-#include <fenv_private.h>
 #include <math-svid-compat.h>
 #include <libm-alias-float.h>
 
diff --git a/math/w_logl_compat.c b/math/w_logl_compat.c
index f47d792a169..991251a7c54 100644
--- a/math/w_logl_compat.c
+++ b/math/w_logl_compat.c
@@ -19,7 +19,6 @@
 #include <fenv.h>
 #include <math.h>
 #include <math_private.h>
-#include <fenv_private.h>
 #include <math-svid-compat.h>
 #include <libm-alias-ldouble.h>
 
diff --git a/sysdeps/generic/fenv_private.h b/sysdeps/generic/fenv_private.h
index 912d23108f5..562c95a0d20 100644
--- a/sysdeps/generic/fenv_private.h
+++ b/sysdeps/generic/fenv_private.h
@@ -324,94 +324,4 @@ default_libc_feresetround_noex_ctx (struct rm_ctx *ctx)
   SET_RESTORE_ROUND_GENERIC (RM, libc_feholdsetround_53bit,	      \
 			     libc_feresetround_53bit)
 
-/* When no floating-point exceptions are defined in <fenv.h>, make
-   feraiseexcept ignore its argument so that unconditional
-   feraiseexcept calls do not cause errors for undefined exceptions.
-   Define it to expand to a void expression so that any calls testing
-   the result of feraiseexcept do produce errors.  */
-#if FE_ALL_EXCEPT == 0
-# define feraiseexcept(excepts) ((void) 0)
-# define __feraiseexcept(excepts) ((void) 0)
-#endif
-
-/* Similarly, most <fenv.h> functions have trivial implementations in
-   the absence of support for floating-point exceptions and rounding
-   modes.  */
-
-#if !FE_HAVE_ROUNDING_MODES
-# if FE_ALL_EXCEPT == 0
-extern inline int
-fegetenv (fenv_t *__e)
-{
-  return 0;
-}
-
-extern inline int
-__fegetenv (fenv_t *__e)
-{
-  return 0;
-}
-
-extern inline int
-feholdexcept (fenv_t *__e)
-{
-  return 0;
-}
-
-extern inline int
-__feholdexcept (fenv_t *__e)
-{
-  return 0;
-}
-
-extern inline int
-fesetenv (const fenv_t *__e)
-{
-  return 0;
-}
-
-extern inline int
-__fesetenv (const fenv_t *__e)
-{
-  return 0;
-}
-
-extern inline int
-feupdateenv (const fenv_t *__e)
-{
-  return 0;
-}
-
-extern inline int
-__feupdateenv (const fenv_t *__e)
-{
-  return 0;
-}
-# endif
-
-extern inline int
-fegetround (void)
-{
-  return FE_TONEAREST;
-}
-
-extern inline int
-__fegetround (void)
-{
-  return FE_TONEAREST;
-}
-
-extern inline int
-fesetround (int __d)
-{
-  return 0;
-}
-
-extern inline int
-__fesetround (int __d)
-{
-  return 0;
-}
-#endif
-
 #endif /* fenv_private.h.  */
diff --git a/sysdeps/ieee754/dbl-64/s_llrint.c b/sysdeps/ieee754/dbl-64/s_llrint.c
index 1c5f17a21af..8159706f901 100644
--- a/sysdeps/ieee754/dbl-64/s_llrint.c
+++ b/sysdeps/ieee754/dbl-64/s_llrint.c
@@ -24,7 +24,6 @@
 
 #include <math-narrow-eval.h>
 #include <math_private.h>
-#include <fenv_private.h>
 #include <libm-alias-double.h>
 #include <fix-fp-int-convert-overflow.h>
 
diff --git a/sysdeps/ieee754/dbl-64/s_llround.c b/sysdeps/ieee754/dbl-64/s_llround.c
index 6cb03a0d20c..1067d19859e 100644
--- a/sysdeps/ieee754/dbl-64/s_llround.c
+++ b/sysdeps/ieee754/dbl-64/s_llround.c
@@ -22,7 +22,6 @@
 #include <math.h>
 
 #include <math_private.h>
-#include <fenv_private.h>
 #include <libm-alias-double.h>
 #include <fix-fp-int-convert-overflow.h>
 
diff --git a/sysdeps/ieee754/dbl-64/s_lrint.c b/sysdeps/ieee754/dbl-64/s_lrint.c
index 9b774030636..0e64ae1260d 100644
--- a/sysdeps/ieee754/dbl-64/s_lrint.c
+++ b/sysdeps/ieee754/dbl-64/s_lrint.c
@@ -24,7 +24,6 @@
 
 #include <math-narrow-eval.h>
 #include <math_private.h>
-#include <fenv_private.h>
 #include <libm-alias-double.h>
 #include <fix-fp-int-convert-overflow.h>
 
diff --git a/sysdeps/ieee754/dbl-64/s_lround.c b/sysdeps/ieee754/dbl-64/s_lround.c
index 44de8df9521..70f624eea1f 100644
--- a/sysdeps/ieee754/dbl-64/s_lround.c
+++ b/sysdeps/ieee754/dbl-64/s_lround.c
@@ -22,7 +22,6 @@
 #include <math.h>
 
 #include <math_private.h>
-#include <fenv_private.h>
 #include <libm-alias-double.h>
 #include <fix-fp-int-convert-overflow.h>
 
diff --git a/sysdeps/ieee754/dbl-64/wordsize-64/s_lround.c b/sysdeps/ieee754/dbl-64/wordsize-64/s_lround.c
index 5e77af309e6..a88c6c87889 100644
--- a/sysdeps/ieee754/dbl-64/wordsize-64/s_lround.c
+++ b/sysdeps/ieee754/dbl-64/wordsize-64/s_lround.c
@@ -21,7 +21,6 @@
 #include <math.h>
 
 #include <math_private.h>
-#include <fenv_private.h>
 #include <libm-alias-double.h>
 
 /* For LP64, lround is an alias for llround.  */
diff --git a/sysdeps/ieee754/flt-32/s_llrintf.c b/sysdeps/ieee754/flt-32/s_llrintf.c
index c6b39b64dfc..7c64bb2db4e 100644
--- a/sysdeps/ieee754/flt-32/s_llrintf.c
+++ b/sysdeps/ieee754/flt-32/s_llrintf.c
@@ -24,7 +24,6 @@
 
 #include <math-narrow-eval.h>
 #include <math_private.h>
-#include <fenv_private.h>
 #include <libm-alias-float.h>
 #include <fix-fp-int-convert-overflow.h>
 
diff --git a/sysdeps/ieee754/flt-32/s_llroundf.c b/sysdeps/ieee754/flt-32/s_llroundf.c
index abbdafbc1d9..5457f9fa889 100644
--- a/sysdeps/ieee754/flt-32/s_llroundf.c
+++ b/sysdeps/ieee754/flt-32/s_llroundf.c
@@ -22,7 +22,6 @@
 #include <math.h>
 
 #include <math_private.h>
-#include <fenv_private.h>
 #include <libm-alias-float.h>
 #include <fix-fp-int-convert-overflow.h>
 
diff --git a/sysdeps/ieee754/flt-32/s_lrintf.c b/sysdeps/ieee754/flt-32/s_lrintf.c
index c45bdc18581..5171377a4eb 100644
--- a/sysdeps/ieee754/flt-32/s_lrintf.c
+++ b/sysdeps/ieee754/flt-32/s_lrintf.c
@@ -24,7 +24,6 @@
 
 #include <math-narrow-eval.h>
 #include <math_private.h>
-#include <fenv_private.h>
 #include <libm-alias-float.h>
 #include <fix-fp-int-convert-overflow.h>
 
diff --git a/sysdeps/ieee754/flt-32/s_lroundf.c b/sysdeps/ieee754/flt-32/s_lroundf.c
index 7f18239376a..20e7216640d 100644
--- a/sysdeps/ieee754/flt-32/s_lroundf.c
+++ b/sysdeps/ieee754/flt-32/s_lroundf.c
@@ -22,7 +22,6 @@
 #include <math.h>
 
 #include <math_private.h>
-#include <fenv_private.h>
 #include <libm-alias-float.h>
 #include <fix-fp-int-convert-overflow.h>
 
diff --git a/sysdeps/ieee754/k_standardl.c b/sysdeps/ieee754/k_standardl.c
index 1368553bf19..58abc22b6ef 100644
--- a/sysdeps/ieee754/k_standardl.c
+++ b/sysdeps/ieee754/k_standardl.c
@@ -33,7 +33,6 @@
 #include <math.h>
 #include <math-barriers.h>
 #include <math_private.h>
-#include <fenv_private.h>
 #include <math-svid-compat.h>
 #include <fenv.h>
 #include <float.h>
diff --git a/sysdeps/ieee754/ldbl-128/e_expl.c b/sysdeps/ieee754/ldbl-128/e_expl.c
index 237622d9a89..b4b21c4957b 100644
--- a/sysdeps/ieee754/ldbl-128/e_expl.c
+++ b/sysdeps/ieee754/ldbl-128/e_expl.c
@@ -66,7 +66,6 @@
 #include <inttypes.h>
 #include <math-barriers.h>
 #include <math_private.h>
-#include <fenv_private.h>
 #include <math-underflow.h>
 #include <stdlib.h>
 #include "t_expl.h"
diff --git a/sysdeps/ieee754/ldbl-128/s_fmal.c b/sysdeps/ieee754/ldbl-128/s_fmal.c
index 8b4875b25df..4eba9253df3 100644
--- a/sysdeps/ieee754/ldbl-128/s_fmal.c
+++ b/sysdeps/ieee754/ldbl-128/s_fmal.c
@@ -23,7 +23,6 @@
 #include <ieee754.h>
 #include <math-barriers.h>
 #include <math_private.h>
-#include <fenv_private.h>
 #include <libm-alias-ldouble.h>
 #include <tininess.h>
 
diff --git a/sysdeps/ieee754/ldbl-128/s_llrintl.c b/sysdeps/ieee754/ldbl-128/s_llrintl.c
index 3ea7bcff8ab..ce17cf962ac 100644
--- a/sysdeps/ieee754/ldbl-128/s_llrintl.c
+++ b/sysdeps/ieee754/ldbl-128/s_llrintl.c
@@ -24,7 +24,6 @@
 #include <math.h>
 
 #include <math_private.h>
-#include <fenv_private.h>
 #include <libm-alias-ldouble.h>
 #include <fix-fp-int-convert-overflow.h>
 
diff --git a/sysdeps/ieee754/ldbl-128/s_llroundl.c b/sysdeps/ieee754/ldbl-128/s_llroundl.c
index 5ab774b3752..1973e1bffd4 100644
--- a/sysdeps/ieee754/ldbl-128/s_llroundl.c
+++ b/sysdeps/ieee754/ldbl-128/s_llroundl.c
@@ -23,7 +23,6 @@
 #include <math.h>
 
 #include <math_private.h>
-#include <fenv_private.h>
 #include <libm-alias-ldouble.h>
 #include <fix-fp-int-convert-overflow.h>
 
diff --git a/sysdeps/ieee754/ldbl-128/s_lrintl.c b/sysdeps/ieee754/ldbl-128/s_lrintl.c
index 7d5a5ecc518..c1233a45dc4 100644
--- a/sysdeps/ieee754/ldbl-128/s_lrintl.c
+++ b/sysdeps/ieee754/ldbl-128/s_lrintl.c
@@ -24,7 +24,6 @@
 #include <math.h>
 
 #include <math_private.h>
-#include <fenv_private.h>
 #include <libm-alias-ldouble.h>
 #include <fix-fp-int-convert-overflow.h>
 
diff --git a/sysdeps/ieee754/ldbl-128/s_lroundl.c b/sysdeps/ieee754/ldbl-128/s_lroundl.c
index 9aafbea32aa..f109157d674 100644
--- a/sysdeps/ieee754/ldbl-128/s_lroundl.c
+++ b/sysdeps/ieee754/ldbl-128/s_lroundl.c
@@ -23,7 +23,6 @@
 #include <math.h>
 
 #include <math_private.h>
-#include <fenv_private.h>
 #include <libm-alias-ldouble.h>
 #include <fix-fp-int-convert-overflow.h>
 
diff --git a/sysdeps/ieee754/ldbl-128/s_nearbyintl.c b/sysdeps/ieee754/ldbl-128/s_nearbyintl.c
index 44bd6e1340d..f044cb4334e 100644
--- a/sysdeps/ieee754/ldbl-128/s_nearbyintl.c
+++ b/sysdeps/ieee754/ldbl-128/s_nearbyintl.c
@@ -27,7 +27,6 @@
 #include <math.h>
 #include <math-barriers.h>
 #include <math_private.h>
-#include <fenv_private.h>
 #include <libm-alias-ldouble.h>
 
 static const _Float128
diff --git a/sysdeps/ieee754/ldbl-128ibm/s_llrintl.c b/sysdeps/ieee754/ldbl-128ibm/s_llrintl.c
index 174b6db5518..9d4535103e8 100644
--- a/sysdeps/ieee754/ldbl-128ibm/s_llrintl.c
+++ b/sysdeps/ieee754/ldbl-128ibm/s_llrintl.c
@@ -20,7 +20,6 @@
 #include <math.h>
 #include <fenv.h>
 #include <math_private.h>
-#include <fenv_private.h>
 #include <math_ldbl_opt.h>
 #include <float.h>
 #include <ieee754.h>
diff --git a/sysdeps/ieee754/ldbl-128ibm/s_llroundl.c b/sysdeps/ieee754/ldbl-128ibm/s_llroundl.c
index c99caec8170..de6a7b5be22 100644
--- a/sysdeps/ieee754/ldbl-128ibm/s_llroundl.c
+++ b/sysdeps/ieee754/ldbl-128ibm/s_llroundl.c
@@ -20,7 +20,6 @@
 #include <math.h>
 #include <fenv.h>
 #include <math_private.h>
-#include <fenv_private.h>
 #include <math_ldbl_opt.h>
 #include <float.h>
 #include <ieee754.h>
diff --git a/sysdeps/ieee754/ldbl-128ibm/s_lrintl.c b/sysdeps/ieee754/ldbl-128ibm/s_lrintl.c
index 7990cbfa173..05fe7fefdfe 100644
--- a/sysdeps/ieee754/ldbl-128ibm/s_lrintl.c
+++ b/sysdeps/ieee754/ldbl-128ibm/s_lrintl.c
@@ -20,7 +20,6 @@
 #include <math.h>
 #include <fenv.h>
 #include <math_private.h>
-#include <fenv_private.h>
 #include <math_ldbl_opt.h>
 #include <float.h>
 #include <ieee754.h>
diff --git a/sysdeps/ieee754/ldbl-128ibm/s_lroundl.c b/sysdeps/ieee754/ldbl-128ibm/s_lroundl.c
index 44dc6cf4d15..bc8dda4c1d9 100644
--- a/sysdeps/ieee754/ldbl-128ibm/s_lroundl.c
+++ b/sysdeps/ieee754/ldbl-128ibm/s_lroundl.c
@@ -20,7 +20,6 @@
 #include <math.h>
 #include <fenv.h>
 #include <math_private.h>
-#include <fenv_private.h>
 #include <math_ldbl_opt.h>
 #include <float.h>
 #include <ieee754.h>
diff --git a/sysdeps/ieee754/ldbl-96/s_fma.c b/sysdeps/ieee754/ldbl-96/s_fma.c
index 736db65d100..986879cda58 100644
--- a/sysdeps/ieee754/ldbl-96/s_fma.c
+++ b/sysdeps/ieee754/ldbl-96/s_fma.c
@@ -23,7 +23,6 @@
 #include <ieee754.h>
 #include <math-barriers.h>
 #include <math_private.h>
-#include <fenv_private.h>
 #include <libm-alias-double.h>
 
 /* This implementation uses rounding to odd to avoid problems with
diff --git a/sysdeps/ieee754/ldbl-96/s_fmal.c b/sysdeps/ieee754/ldbl-96/s_fmal.c
index 5129e849540..0b261fd17ac 100644
--- a/sysdeps/ieee754/ldbl-96/s_fmal.c
+++ b/sysdeps/ieee754/ldbl-96/s_fmal.c
@@ -23,7 +23,6 @@
 #include <ieee754.h>
 #include <math-barriers.h>
 #include <math_private.h>
-#include <fenv_private.h>
 #include <libm-alias-ldouble.h>
 #include <tininess.h>
 
diff --git a/sysdeps/ieee754/ldbl-96/s_llrintl.c b/sysdeps/ieee754/ldbl-96/s_llrintl.c
index 58571e973e2..d45a69a1f76 100644
--- a/sysdeps/ieee754/ldbl-96/s_llrintl.c
+++ b/sysdeps/ieee754/ldbl-96/s_llrintl.c
@@ -23,7 +23,6 @@
 #include <math.h>
 
 #include <math_private.h>
-#include <fenv_private.h>
 #include <libm-alias-ldouble.h>
 
 static const long double two63[2] =
diff --git a/sysdeps/ieee754/ldbl-96/s_llroundl.c b/sysdeps/ieee754/ldbl-96/s_llroundl.c
index 3c4597f8ee4..601fd0e6443 100644
--- a/sysdeps/ieee754/ldbl-96/s_llroundl.c
+++ b/sysdeps/ieee754/ldbl-96/s_llroundl.c
@@ -22,7 +22,6 @@
 #include <math.h>
 
 #include <math_private.h>
-#include <fenv_private.h>
 #include <libm-alias-ldouble.h>
 
 
diff --git a/sysdeps/ieee754/ldbl-96/s_lrintl.c b/sysdeps/ieee754/ldbl-96/s_lrintl.c
index 42b9303b3db..df3222c7f2a 100644
--- a/sysdeps/ieee754/ldbl-96/s_lrintl.c
+++ b/sysdeps/ieee754/ldbl-96/s_lrintl.c
@@ -23,7 +23,6 @@
 #include <math.h>
 
 #include <math_private.h>
-#include <fenv_private.h>
 #include <libm-alias-ldouble.h>
 
 static const long double two63[2] =
diff --git a/sysdeps/ieee754/ldbl-96/s_lroundl.c b/sysdeps/ieee754/ldbl-96/s_lroundl.c
index aead3aadb7a..0cc9f9c5d6b 100644
--- a/sysdeps/ieee754/ldbl-96/s_lroundl.c
+++ b/sysdeps/ieee754/ldbl-96/s_lroundl.c
@@ -22,7 +22,6 @@
 #include <math.h>
 
 #include <math_private.h>
-#include <fenv_private.h>
 #include <libm-alias-ldouble.h>
 
 
diff --git a/sysdeps/powerpc/fpu/e_sqrt.c b/sysdeps/powerpc/fpu/e_sqrt.c
index a8bf2001a69..98f17fb2483 100644
--- a/sysdeps/powerpc/fpu/e_sqrt.c
+++ b/sysdeps/powerpc/fpu/e_sqrt.c
@@ -18,7 +18,7 @@
 
 #include <math.h>
 #include <math_private.h>
-#include <fenv_private.h>
+#include <fenv.h>
 #include <fenv_libc.h>
 #include <inttypes.h>
 #include <stdint.h>
diff --git a/sysdeps/powerpc/fpu/e_sqrtf.c b/sysdeps/powerpc/fpu/e_sqrtf.c
index c12b15b3cc2..58125f5cfc3 100644
--- a/sysdeps/powerpc/fpu/e_sqrtf.c
+++ b/sysdeps/powerpc/fpu/e_sqrtf.c
@@ -18,7 +18,7 @@
 
 #include <math.h>
 #include <math_private.h>
-#include <fenv_private.h>
+#include <fenv.h>
 #include <fenv_libc.h>
 #include <inttypes.h>
 #include <stdint.h>