418d99e622
<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.
153 lines
3.3 KiB
C
153 lines
3.3 KiB
C
#ifndef _FENV_H
|
|
#include <math/fenv.h>
|
|
|
|
#ifndef _ISOMAC
|
|
# include <stdbool.h>
|
|
/* Now define the internal interfaces. */
|
|
|
|
extern int __feclearexcept (int __excepts);
|
|
extern int __fegetexcept (void);
|
|
extern int __fegetexceptflag (fexcept_t *__flagp, int __excepts);
|
|
extern int __feraiseexcept (int __excepts);
|
|
extern int __fesetexceptflag (const fexcept_t *__flagp, int __excepts);
|
|
extern int __fegetenv (fenv_t *__envp);
|
|
extern int __fesetenv (const fenv_t *__envp);
|
|
extern int __feupdateenv (const fenv_t *__envp);
|
|
extern __typeof (fegetround) __fegetround __attribute_pure__;
|
|
extern __typeof (feholdexcept) __feholdexcept;
|
|
extern __typeof (fesetround) __fesetround;
|
|
|
|
libm_hidden_proto (feraiseexcept)
|
|
libm_hidden_proto (__feraiseexcept)
|
|
libm_hidden_proto (fegetenv)
|
|
libm_hidden_proto (__fegetenv)
|
|
libm_hidden_proto (fegetround)
|
|
libm_hidden_proto (__fegetround)
|
|
libm_hidden_proto (fesetenv)
|
|
libm_hidden_proto (__fesetenv)
|
|
libm_hidden_proto (fesetround)
|
|
libm_hidden_proto (__fesetround)
|
|
libm_hidden_proto (feholdexcept)
|
|
libm_hidden_proto (__feholdexcept)
|
|
libm_hidden_proto (feupdateenv)
|
|
libm_hidden_proto (__feupdateenv)
|
|
libm_hidden_proto (fetestexcept)
|
|
libm_hidden_proto (feclearexcept)
|
|
|
|
/* Rounding mode context. This allows functions to set/restore rounding mode
|
|
only when the desired rounding mode is different from the current rounding
|
|
mode. */
|
|
struct rm_ctx
|
|
{
|
|
fenv_t env;
|
|
bool updated_status;
|
|
};
|
|
|
|
/* Track whether rounding mode macros were defined, since
|
|
get-rounding-mode.h may define default versions if they weren't.
|
|
FE_TONEAREST must always be defined (even if no changes of rounding
|
|
mode are supported, glibc requires it to be defined to represent
|
|
the default rounding mode). */
|
|
# ifndef FE_TONEAREST
|
|
# error "FE_TONEAREST not defined"
|
|
# endif
|
|
# if defined FE_DOWNWARD || defined FE_TOWARDZERO || defined FE_UPWARD
|
|
# define FE_HAVE_ROUNDING_MODES 1
|
|
# else
|
|
# 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
|