This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.28.9000-113-g418d99e
- From: jsm28 at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 4 Sep 2018 19:52:31 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.28.9000-113-g418d99e
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 418d99e622be036f44980854d585531905abae21 (commit)
from 70e2ba332f887760f56700baf7adcf441ff50ba9 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=418d99e622be036f44980854d585531905abae21
commit 418d99e622be036f44980854d585531905abae21
Author: Joseph Myers <joseph@codesourcery.com>
Date: Tue Sep 4 19:52:06 2018 +0000
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 5ac0551..70ebfce 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 76679e1..0b32f80 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 de968d4..c3b4a07 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 718a512..9d102a6 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 766681a..5fdab1e 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 4581852..5f95e92 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 ad599d6..95f28c2 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 bd9247c..ab11c25 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 7b1dd9a..bd12922 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 b3a86ae..a4d28d7 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 ff6d163..079fdb2 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 0f38a20..efc09ed 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 e24fb03..d630a10 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 43ea34a..c55913d 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 58c6dca..1fc18c2 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 c7ea835..6741138 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 fd41dc2..ac80d7f 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 f8ce3f8..a298353 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 0bee2fb..41d3a10 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 9d2c5d4..e436cb2 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 11a5688..3b014b8 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 e59d954..5cfb6b9 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 400040a..fb0adc6 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 a169c7b..8b546ba 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 11769e2..8638670 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 76f2557..562d97b 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 996139d..87c155d 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 9cee218..fd1861a 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 b4b4048..d2387c2 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 7b34a99..61e7170 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 c9d99be..7b4b545 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 c400165..ba74ed2 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 4ed4eea..5413b8e 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 7e8c124..9810d30 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 f47d792..991251a 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 912d231..562c95a 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 1c5f17a..8159706 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 6cb03a0..1067d19 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 9b77403..0e64ae1 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 44de8df..70f624e 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 5e77af3..a88c6c8 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 c6b39b6..7c64bb2 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 abbdafb..5457f9f 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 c45bdc1..5171377 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 7f18239..20e7216 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 1368553..58abc22 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 237622d..b4b21c4 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 8b4875b..4eba925 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 3ea7bcf..ce17cf9 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 5ab774b..1973e1b 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 7d5a5ec..c1233a4 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 9aafbea..f109157 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 44bd6e1..f044cb4 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 174b6db..9d45351 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 c99caec..de6a7b5 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 7990cbf..05fe7fe 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 44dc6cf..bc8dda4 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 736db65..986879c 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 5129e84..0b261fd 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 58571e9..d45a69a 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 3c4597f..601fd0e 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 42b9303..df3222c 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 aead3aa..0cc9f9c 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 a8bf200..98f17fb 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 c12b15b..58125f5 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>
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 71 +++++++++++++++++++
include/fenv.h | 90 +++++++++++++++++++++++++
math/fraiseexcpt.c | 3 +
math/fromfp.h | 1 -
math/s_cexp_template.c | 1 -
math/s_csin_template.c | 1 -
math/s_csinh_template.c | 1 -
math/s_ctan_template.c | 1 -
math/s_ctanh_template.c | 1 -
math/s_iseqsig_template.c | 1 -
math/w_acos_compat.c | 1 -
math/w_acosf_compat.c | 1 -
math/w_acosl_compat.c | 1 -
math/w_asin_compat.c | 1 -
math/w_asinf_compat.c | 1 -
math/w_asinl_compat.c | 1 -
math/w_ilogb_template.c | 2 +-
math/w_j0_compat.c | 1 -
math/w_j0f_compat.c | 1 -
math/w_j0l_compat.c | 1 -
math/w_j1_compat.c | 1 -
math/w_j1f_compat.c | 1 -
math/w_j1l_compat.c | 1 -
math/w_jn_compat.c | 1 -
math/w_jnf_compat.c | 1 -
math/w_llogb_template.c | 2 +-
math/w_log10_compat.c | 1 -
math/w_log10f_compat.c | 1 -
math/w_log10l_compat.c | 1 -
math/w_log2_compat.c | 1 -
math/w_log2f_compat.c | 1 -
math/w_log2l_compat.c | 1 -
math/w_log_compat.c | 1 -
math/w_logf_compat.c | 1 -
math/w_logl_compat.c | 1 -
sysdeps/generic/fenv_private.h | 90 -------------------------
sysdeps/ieee754/dbl-64/s_llrint.c | 1 -
sysdeps/ieee754/dbl-64/s_llround.c | 1 -
sysdeps/ieee754/dbl-64/s_lrint.c | 1 -
sysdeps/ieee754/dbl-64/s_lround.c | 1 -
sysdeps/ieee754/dbl-64/wordsize-64/s_lround.c | 1 -
sysdeps/ieee754/flt-32/s_llrintf.c | 1 -
sysdeps/ieee754/flt-32/s_llroundf.c | 1 -
sysdeps/ieee754/flt-32/s_lrintf.c | 1 -
sysdeps/ieee754/flt-32/s_lroundf.c | 1 -
sysdeps/ieee754/k_standardl.c | 1 -
sysdeps/ieee754/ldbl-128/e_expl.c | 1 -
sysdeps/ieee754/ldbl-128/s_fmal.c | 1 -
sysdeps/ieee754/ldbl-128/s_llrintl.c | 1 -
sysdeps/ieee754/ldbl-128/s_llroundl.c | 1 -
sysdeps/ieee754/ldbl-128/s_lrintl.c | 1 -
sysdeps/ieee754/ldbl-128/s_lroundl.c | 1 -
sysdeps/ieee754/ldbl-128/s_nearbyintl.c | 1 -
sysdeps/ieee754/ldbl-128ibm/s_llrintl.c | 1 -
sysdeps/ieee754/ldbl-128ibm/s_llroundl.c | 1 -
sysdeps/ieee754/ldbl-128ibm/s_lrintl.c | 1 -
sysdeps/ieee754/ldbl-128ibm/s_lroundl.c | 1 -
sysdeps/ieee754/ldbl-96/s_fma.c | 1 -
sysdeps/ieee754/ldbl-96/s_fmal.c | 1 -
sysdeps/ieee754/ldbl-96/s_llrintl.c | 1 -
sysdeps/ieee754/ldbl-96/s_llroundl.c | 1 -
sysdeps/ieee754/ldbl-96/s_lrintl.c | 1 -
sysdeps/ieee754/ldbl-96/s_lroundl.c | 1 -
sysdeps/powerpc/fpu/e_sqrt.c | 2 +-
sysdeps/powerpc/fpu/e_sqrtf.c | 2 +-
65 files changed, 168 insertions(+), 151 deletions(-)
hooks/post-receive
--
GNU C Library master sources