diff options
author | 2018-09-04 19:52:06 +0000 | |
---|---|---|
committer | 2018-09-04 19:52:06 +0000 | |
commit | 418d99e622be036f44980854d585531905abae21 (patch) | |
tree | b1e51561724fae55e68540ceeb60e8bdaba9ab9d /math | |
parent | Do not include fenv_private.h in math_private.h. (diff) | |
download | glibc-418d99e622be036f44980854d585531905abae21.tar.gz glibc-418d99e622be036f44980854d585531905abae21.tar.bz2 glibc-418d99e622be036f44980854d585531905abae21.zip |
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.
Diffstat (limited to 'math')
33 files changed, 5 insertions, 32 deletions
diff --git a/math/fraiseexcpt.c b/math/fraiseexcpt.c index de968d4211..c3b4a07731 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 718a5120d8..9d102a635f 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 766681a2bb..5fdab1e5ac 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 4581852b17..5f95e92ee0 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 ad599d67ea..95f28c2b66 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 bd9247c98d..ab11c25299 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 7b1dd9aa67..bd1292239f 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 b3a86aea50..a4d28d778d 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 ff6d163c20..079fdb271f 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 0f38a20564..efc09edb2a 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 e24fb03b5f..d630a10a40 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 43ea34a7dc..c55913d304 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 58c6dcaf27..1fc18c2e91 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 c7ea8358af..6741138f74 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 fd41dc2627..ac80d7f41f 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 f8ce3f8d3c..a298353ac4 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 0bee2fb011..41d3a10147 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 9d2c5d46a4..e436cb278b 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 11a56889f1..3b014b8cfa 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 e59d954626..5cfb6b9cd5 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 400040a0a0..fb0adc68cb 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 a169c7b210..8b546ba4a2 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 11769e2e26..86386700de 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 76f2557677..562d97be6d 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 996139dc7c..87c155d256 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 9cee2185d2..fd1861a6ab 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 b4b404822e..d2387c225a 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 7b34a991e6..61e7170ae1 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 c9d99be07a..7b4b545c81 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 c40016532d..ba74ed2576 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 4ed4eea6e8..5413b8e8df 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 7e8c124c4d..9810d30c52 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 f47d792a16..991251a7c5 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> |