From 418d99e622be036f44980854d585531905abae21 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Tue, 4 Sep 2018 19:52:06 +0000 Subject: Move fenv.h soft-float inlines from fenv_private.h to include/fenv.h. has inline versions of various 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 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 . * 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 instead of . * math/w_llogb_template.c: Likewise. * sysdeps/powerpc/fpu/e_sqrt.c: Likewise. * sysdeps/powerpc/fpu/e_sqrtf.c: Likewise. --- sysdeps/generic/fenv_private.h | 90 ------------------------------------------ 1 file changed, 90 deletions(-) (limited to 'sysdeps/generic') 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 , 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 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. */ -- cgit v1.1