@@ -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
@@ -20,6 +20,9 @@
#include <fenv.h>
#include <shlib-compat.h>
+#undef __feraiseexcept
+#undef feraiseexcept
+
int
__feraiseexcept (int excepts)
{
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -20,7 +20,7 @@
#include <errno.h>
#include <limits.h>
#include <math_private.h>
-#include <fenv_private.h>
+#include <fenv.h>
/* wrapper ilogb */
int
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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)
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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. */
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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. */
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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"
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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
@@ -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>
@@ -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] =
@@ -22,7 +22,6 @@
#include <math.h>
#include <math_private.h>
-#include <fenv_private.h>
#include <libm-alias-ldouble.h>
@@ -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] =
@@ -22,7 +22,6 @@
#include <math.h>
#include <math_private.h>
-#include <fenv_private.h>
#include <libm-alias-ldouble.h>
@@ -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>
@@ -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>