]> git.ipfire.org Git - thirdparty/glibc.git/commitdiff
Prefer new libm function wrappers for !LIBM_SVID_COMPAT.
authorJoseph Myers <joseph@codesourcery.com>
Tue, 5 Sep 2017 23:35:55 +0000 (23:35 +0000)
committerJoseph Myers <joseph@codesourcery.com>
Tue, 5 Sep 2017 23:35:55 +0000 (23:35 +0000)
The initial obsoletion of SVID libm error handling left the old
wrappers and __kernel_standard still being used for new ports and
static linking, just with macro definitions of _LIB_VERSION and
matherr that meant symbols with those names were never actually used
and the code for different error handling variants could be optimized
out.

This patch cleans things up further by eliminating the
__kernel_standard use for new ports and static linking.  Now, the old
wrappers no longer generate any code in the !LIBM_SVID_COMPAT case,
while the new errno-only wrappers that were added for float128 support
are now also used for float, double and long double in that case.

The changes are generally straightforward.  The w_scalb*_compat
wrappers continue to be used (scalb is obsolescent in the sense of not
being supported for float128, but is present in supported standards -
the 2001 edition of POSIX and earlier XSI versions - so remains
supported for static linking and new ports, as do the float and long
double variants that are existing GNU extensions).  Those wrappers
would only call __kernel_standard in the _LIB_VERSION == _SVID_ case.
Since we would like to be able to compile most of glibc without
optimization, relying on a static function whose only use is under an
if (0) condition being optimized away to avoid an undefined
__kernel_standard reference may not be a good idea.  Thus, the
relevant code in the scalb wrappers has LIBM_SVID_COMPAT conditionals
added to guarantee it's not built at all in the case where
__kernel_standard does not exist.

Just as i386 has its own w_sqrt_compat.c, so w_sqrt.c is also added.
ia64 gets dummy w_*.c to prevent those files being built where they
would conflict with the ia64 libm, as with its existing w_*_compat.c.

Conditions disabling code for !LIBM_SVID_COMPAT are needed in both the
math/ wrappers and in the long double wrappers in ldbl-opt (to avoid
them setting up aliases and symbol versions for undefined symbols).  I
hope that future cleanups to how libm function aliases and symbol
versioning are done will eliminate the need for most of the ldbl-opt
wrappers.

Tested for x86_64 and x86, and with build-many-glibcs.py.

* sysdeps/generic/math-type-macros-double.h: Include
<math-svid-compat.h>.
(__USE_WRAPPER_TEMPLATE): Define to !LIBM_SVID_COMPAT.
* sysdeps/generic/math-type-macros-float.h: Include
<math-svid-compat.h>.
(__USE_WRAPPER_TEMPLATE): Define to !LIBM_SVID_COMPAT.
* sysdeps/generic/math-type-macros-ldouble.h: Include
<math-svid-compat.h>.
(__USE_WRAPPER_TEMPLATE): Define to !LIBM_SVID_COMPAT.
* math/lgamma-compat.h (BUILD_LGAMMA): Include LIBM_SVID_COMPAT
condition.
* math/w_acos_compat.c: Condition contents on [LIBM_SVID_COMPAT].
* math/w_acosf_compat.c: Likewise.
* math/w_acosh_compat.c: Likewise.
* math/w_acoshf_compat.c: Likewise.
* math/w_acoshl_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_atan2_compat.c: Likewise.
* math/w_atan2f_compat.c: Likewise.
* math/w_atan2l_compat.c: Likewise.
* math/w_atanh_compat.c: Likewise.
* math/w_atanhf_compat.c: Likewise.
* math/w_atanhl_compat.c: Likewise.
* math/w_cosh_compat.c: Likewise.
* math/w_coshf_compat.c: Likewise.
* math/w_coshl_compat.c: Likewise.
* math/w_exp10_compat.c: Likewise.
* math/w_exp10f_compat.c: Likewise.
* math/w_exp10l_compat.c: Likewise.
* math/w_exp2_compat.c: Likewise.
* math/w_exp2f_compat.c: Likewise.
* math/w_exp2l_compat.c: Likewise.
* math/w_fmod_compat.c: Likewise.
* math/w_fmodf_compat.c: Likewise.
* math/w_fmodl_compat.c: Likewise.
* math/w_hypot_compat.c: Likewise.
* math/w_hypotf_compat.c: Likewise.
* math/w_hypotl_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_jnl_compat.c: Likewise.
* math/w_lgamma_r_compat.c: Likewise.
* math/w_lgammaf_r_compat.c: Likewise.
* math/w_lgammal_r_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.
* math/w_pow_compat.c: Likewise.
* math/w_powf_compat.c: Likewise.
* math/w_powl_compat.c: Likewise.
* math/w_remainder_compat.c: Likewise.
* math/w_remainderf_compat.c: Likewise.
* math/w_remainderl_compat.c: Likewise.
* math/w_sinh_compat.c: Likewise.
* math/w_sinhf_compat.c: Likewise.
* math/w_sinhl_compat.c: Likewise.
* math/w_sqrt_compat.c: Likewise.
* math/w_sqrtf_compat.c: Likewise.
* math/w_sqrtl_compat.c: Likewise.
* math/w_tgamma_compat.c: Likewise.
* math/w_tgammaf_compat.c: Likewise.
* math/w_tgammal_compat.c: Likewise.
* math/w_scalb_compat.c (sysv_scalb): Condition definition on
[LIBM_SVID_COMPAT].
(__scalb): Condition call to sysv_scalb on [LIBM_SVID_COMPAT].
* math/w_scalbf_compat.c (sysv_scalbf): Condition definition on
[LIBM_SVID_COMPAT].
(__scalbf): Condition call to sysv_scalbf on [LIBM_SVID_COMPAT].
* math/w_scalbl_compat.c (sysv_scalbl): Condition definition on
[LIBM_SVID_COMPAT].
(__scalbl): Condition call to sysv_scalbl on [LIBM_SVID_COMPAT].
* sysdeps/i386/fpu/w_sqrt.c: New file.
* sysdeps/ia64/fpu/w_acos.c: Likewise.
* sysdeps/ia64/fpu/w_acosf.c: Likewise.
* sysdeps/ia64/fpu/w_acosh.c: Likewise.
* sysdeps/ia64/fpu/w_acoshf.c: Likewise.
* sysdeps/ia64/fpu/w_acoshl.c: Likewise.
* sysdeps/ia64/fpu/w_acosl.c: Likewise.
* sysdeps/ia64/fpu/w_asin.c: Likewise.
* sysdeps/ia64/fpu/w_asinf.c: Likewise.
* sysdeps/ia64/fpu/w_asinl.c: Likewise.
* sysdeps/ia64/fpu/w_atan2.c: Likewise.
* sysdeps/ia64/fpu/w_atan2f.c: Likewise.
* sysdeps/ia64/fpu/w_atan2l.c: Likewise.
* sysdeps/ia64/fpu/w_atanh.c: Likewise.
* sysdeps/ia64/fpu/w_atanhf.c: Likewise.
* sysdeps/ia64/fpu/w_atanhl.c: Likewise.
* sysdeps/ia64/fpu/w_cosh.c: Likewise.
* sysdeps/ia64/fpu/w_coshf.c: Likewise.
* sysdeps/ia64/fpu/w_coshl.c: Likewise.
* sysdeps/ia64/fpu/w_exp.c: Likewise.
* sysdeps/ia64/fpu/w_exp10.c: Likewise.
* sysdeps/ia64/fpu/w_exp10f.c: Likewise.
* sysdeps/ia64/fpu/w_exp10l.c: Likewise.
* sysdeps/ia64/fpu/w_exp2.c: Likewise.
* sysdeps/ia64/fpu/w_exp2f.c: Likewise.
* sysdeps/ia64/fpu/w_exp2l.c: Likewise.
* sysdeps/ia64/fpu/w_expf.c: Likewise.
* sysdeps/ia64/fpu/w_expl.c: Likewise.
* sysdeps/ia64/fpu/w_fmod.c: Likewise.
* sysdeps/ia64/fpu/w_fmodf.c: Likewise.
* sysdeps/ia64/fpu/w_fmodl.c: Likewise.
* sysdeps/ia64/fpu/w_hypot.c: Likewise.
* sysdeps/ia64/fpu/w_hypotf.c: Likewise.
* sysdeps/ia64/fpu/w_hypotl.c: Likewise.
* sysdeps/ia64/fpu/w_lgamma_r.c: Likewise.
* sysdeps/ia64/fpu/w_lgammaf_r.c: Likewise.
* sysdeps/ia64/fpu/w_lgammal_r.c: Likewise.
* sysdeps/ia64/fpu/w_log.c: Likewise.
* sysdeps/ia64/fpu/w_log10.c: Likewise.
* sysdeps/ia64/fpu/w_log10f.c: Likewise.
* sysdeps/ia64/fpu/w_log10l.c: Likewise.
* sysdeps/ia64/fpu/w_log2.c: Likewise.
* sysdeps/ia64/fpu/w_log2f.c: Likewise.
* sysdeps/ia64/fpu/w_log2l.c: Likewise.
* sysdeps/ia64/fpu/w_logf.c: Likewise.
* sysdeps/ia64/fpu/w_logl.c: Likewise.
* sysdeps/ia64/fpu/w_pow.c: Likewise.
* sysdeps/ia64/fpu/w_powf.c: Likewise.
* sysdeps/ia64/fpu/w_powl.c: Likewise.
* sysdeps/ia64/fpu/w_remainder.c: Likewise.
* sysdeps/ia64/fpu/w_remainderf.c: Likewise.
* sysdeps/ia64/fpu/w_remainderl.c: Likewise.
* sysdeps/ia64/fpu/w_sinh.c: Likewise.
* sysdeps/ia64/fpu/w_sinhf.c: Likewise.
* sysdeps/ia64/fpu/w_sinhl.c: Likewise.
* sysdeps/ia64/fpu/w_sqrt.c: Likewise.
* sysdeps/ia64/fpu/w_sqrtf.c: Likewise.
* sysdeps/ia64/fpu/w_sqrtl.c: Likewise.
* sysdeps/ia64/fpu/w_tgamma.c: Likewise.
* sysdeps/ia64/fpu/w_tgammaf.c: Likewise.
* sysdeps/ia64/fpu/w_tgammal.c: Likewise.
* sysdeps/ieee754/dbl-64/w_exp_compat.c: Condition contents on
[LIBM_SVID_COMPAT].
* sysdeps/ieee754/flt-32/w_expf_compat.c: Likewise.
* sysdeps/ieee754/k_standard.c: Likewise.
* sysdeps/ieee754/k_standardf.c: Likewise.
* sysdeps/ieee754/k_standardl.c: Likewise.
* sysdeps/ieee754/ldbl-128/w_expl_compat.c: Likewise.
* sysdeps/ieee754/ldbl-128ibm/w_expl_compat.c: Likewise.
* sysdeps/ieee754/ldbl-96/w_expl_compat.c: Likewise.
* sysdeps/ieee754/ldbl-64-128/w_expl_compat.c: Condition
long_double_symbol call on [LIBM_SVID_COMPAT].
* sysdeps/ieee754/ldbl-opt/w_acoshl_compat.c: Likewise.
* sysdeps/ieee754/ldbl-opt/w_acosl_compat.c: Likewise.
* sysdeps/ieee754/ldbl-opt/w_asinl_compat.c: Likewise.
* sysdeps/ieee754/ldbl-opt/w_atan2l_compat.c: Likewise.
* sysdeps/ieee754/ldbl-opt/w_atanhl_compat.c: Likewise.
* sysdeps/ieee754/ldbl-opt/w_coshl_compat.c: Likewise.
* sysdeps/ieee754/ldbl-opt/w_fmodl_compat.c: Likewise.
* sysdeps/ieee754/ldbl-opt/w_hypotl_compat.c: Likewise.
* sysdeps/ieee754/ldbl-opt/w_j0l_compat.c: Likewise.
* sysdeps/ieee754/ldbl-opt/w_j1l_compat.c: Likewise.
* sysdeps/ieee754/ldbl-opt/w_jnl_compat.c: Likewise.
* sysdeps/ieee754/ldbl-opt/w_lgammal_r_compat.c: Likewise.
* sysdeps/ieee754/ldbl-opt/w_log10l_compat.c: Likewise.
* sysdeps/ieee754/ldbl-opt/w_log2l_compat.c: Likewise.
* sysdeps/ieee754/ldbl-opt/w_logl_compat.c: Likewise.
* sysdeps/ieee754/ldbl-opt/w_powl_compat.c: Likewise.
* sysdeps/ieee754/ldbl-opt/w_remainderl_compat.c: Likewise.
* sysdeps/ieee754/ldbl-opt/w_sinhl_compat.c: Likewise.
* sysdeps/ieee754/ldbl-opt/w_sqrtl_compat.c: Likewise.
* sysdeps/ieee754/ldbl-opt/w_tgammal_compat.c: Likewise.
* sysdeps/ieee754/ldbl-opt/w_exp10l_compat.c: Condition
long_double_symbol and compat_symbol calls on [LIBM_SVID_COMPAT].

165 files changed:
ChangeLog
math/lgamma-compat.h
math/w_acos_compat.c
math/w_acosf_compat.c
math/w_acosh_compat.c
math/w_acoshf_compat.c
math/w_acoshl_compat.c
math/w_acosl_compat.c
math/w_asin_compat.c
math/w_asinf_compat.c
math/w_asinl_compat.c
math/w_atan2_compat.c
math/w_atan2f_compat.c
math/w_atan2l_compat.c
math/w_atanh_compat.c
math/w_atanhf_compat.c
math/w_atanhl_compat.c
math/w_cosh_compat.c
math/w_coshf_compat.c
math/w_coshl_compat.c
math/w_exp10_compat.c
math/w_exp10f_compat.c
math/w_exp10l_compat.c
math/w_exp2_compat.c
math/w_exp2f_compat.c
math/w_exp2l_compat.c
math/w_fmod_compat.c
math/w_fmodf_compat.c
math/w_fmodl_compat.c
math/w_hypot_compat.c
math/w_hypotf_compat.c
math/w_hypotl_compat.c
math/w_j0_compat.c
math/w_j0f_compat.c
math/w_j0l_compat.c
math/w_j1_compat.c
math/w_j1f_compat.c
math/w_j1l_compat.c
math/w_jn_compat.c
math/w_jnf_compat.c
math/w_jnl_compat.c
math/w_lgamma_r_compat.c
math/w_lgammaf_r_compat.c
math/w_lgammal_r_compat.c
math/w_log10_compat.c
math/w_log10f_compat.c
math/w_log10l_compat.c
math/w_log2_compat.c
math/w_log2f_compat.c
math/w_log2l_compat.c
math/w_log_compat.c
math/w_logf_compat.c
math/w_logl_compat.c
math/w_pow_compat.c
math/w_powf_compat.c
math/w_powl_compat.c
math/w_remainder_compat.c
math/w_remainderf_compat.c
math/w_remainderl_compat.c
math/w_scalb_compat.c
math/w_scalbf_compat.c
math/w_scalbl_compat.c
math/w_sinh_compat.c
math/w_sinhf_compat.c
math/w_sinhl_compat.c
math/w_sqrt_compat.c
math/w_sqrtf_compat.c
math/w_sqrtl_compat.c
math/w_tgamma_compat.c
math/w_tgammaf_compat.c
math/w_tgammal_compat.c
sysdeps/generic/math-type-macros-double.h
sysdeps/generic/math-type-macros-float.h
sysdeps/generic/math-type-macros-ldouble.h
sysdeps/i386/fpu/w_sqrt.c [new file with mode: 0644]
sysdeps/ia64/fpu/w_acos.c [new file with mode: 0644]
sysdeps/ia64/fpu/w_acosf.c [new file with mode: 0644]
sysdeps/ia64/fpu/w_acosh.c [new file with mode: 0644]
sysdeps/ia64/fpu/w_acoshf.c [new file with mode: 0644]
sysdeps/ia64/fpu/w_acoshl.c [new file with mode: 0644]
sysdeps/ia64/fpu/w_acosl.c [new file with mode: 0644]
sysdeps/ia64/fpu/w_asin.c [new file with mode: 0644]
sysdeps/ia64/fpu/w_asinf.c [new file with mode: 0644]
sysdeps/ia64/fpu/w_asinl.c [new file with mode: 0644]
sysdeps/ia64/fpu/w_atan2.c [new file with mode: 0644]
sysdeps/ia64/fpu/w_atan2f.c [new file with mode: 0644]
sysdeps/ia64/fpu/w_atan2l.c [new file with mode: 0644]
sysdeps/ia64/fpu/w_atanh.c [new file with mode: 0644]
sysdeps/ia64/fpu/w_atanhf.c [new file with mode: 0644]
sysdeps/ia64/fpu/w_atanhl.c [new file with mode: 0644]
sysdeps/ia64/fpu/w_cosh.c [new file with mode: 0644]
sysdeps/ia64/fpu/w_coshf.c [new file with mode: 0644]
sysdeps/ia64/fpu/w_coshl.c [new file with mode: 0644]
sysdeps/ia64/fpu/w_exp.c [new file with mode: 0644]
sysdeps/ia64/fpu/w_exp10.c [new file with mode: 0644]
sysdeps/ia64/fpu/w_exp10f.c [new file with mode: 0644]
sysdeps/ia64/fpu/w_exp10l.c [new file with mode: 0644]
sysdeps/ia64/fpu/w_exp2.c [new file with mode: 0644]
sysdeps/ia64/fpu/w_exp2f.c [new file with mode: 0644]
sysdeps/ia64/fpu/w_exp2l.c [new file with mode: 0644]
sysdeps/ia64/fpu/w_expf.c [new file with mode: 0644]
sysdeps/ia64/fpu/w_expl.c [new file with mode: 0644]
sysdeps/ia64/fpu/w_fmod.c [new file with mode: 0644]
sysdeps/ia64/fpu/w_fmodf.c [new file with mode: 0644]
sysdeps/ia64/fpu/w_fmodl.c [new file with mode: 0644]
sysdeps/ia64/fpu/w_hypot.c [new file with mode: 0644]
sysdeps/ia64/fpu/w_hypotf.c [new file with mode: 0644]
sysdeps/ia64/fpu/w_hypotl.c [new file with mode: 0644]
sysdeps/ia64/fpu/w_lgamma_r.c [new file with mode: 0644]
sysdeps/ia64/fpu/w_lgammaf_r.c [new file with mode: 0644]
sysdeps/ia64/fpu/w_lgammal_r.c [new file with mode: 0644]
sysdeps/ia64/fpu/w_log.c [new file with mode: 0644]
sysdeps/ia64/fpu/w_log10.c [new file with mode: 0644]
sysdeps/ia64/fpu/w_log10f.c [new file with mode: 0644]
sysdeps/ia64/fpu/w_log10l.c [new file with mode: 0644]
sysdeps/ia64/fpu/w_log2.c [new file with mode: 0644]
sysdeps/ia64/fpu/w_log2f.c [new file with mode: 0644]
sysdeps/ia64/fpu/w_log2l.c [new file with mode: 0644]
sysdeps/ia64/fpu/w_logf.c [new file with mode: 0644]
sysdeps/ia64/fpu/w_logl.c [new file with mode: 0644]
sysdeps/ia64/fpu/w_pow.c [new file with mode: 0644]
sysdeps/ia64/fpu/w_powf.c [new file with mode: 0644]
sysdeps/ia64/fpu/w_powl.c [new file with mode: 0644]
sysdeps/ia64/fpu/w_remainder.c [new file with mode: 0644]
sysdeps/ia64/fpu/w_remainderf.c [new file with mode: 0644]
sysdeps/ia64/fpu/w_remainderl.c [new file with mode: 0644]
sysdeps/ia64/fpu/w_sinh.c [new file with mode: 0644]
sysdeps/ia64/fpu/w_sinhf.c [new file with mode: 0644]
sysdeps/ia64/fpu/w_sinhl.c [new file with mode: 0644]
sysdeps/ia64/fpu/w_sqrt.c [new file with mode: 0644]
sysdeps/ia64/fpu/w_sqrtf.c [new file with mode: 0644]
sysdeps/ia64/fpu/w_sqrtl.c [new file with mode: 0644]
sysdeps/ia64/fpu/w_tgamma.c [new file with mode: 0644]
sysdeps/ia64/fpu/w_tgammaf.c [new file with mode: 0644]
sysdeps/ia64/fpu/w_tgammal.c [new file with mode: 0644]
sysdeps/ieee754/dbl-64/w_exp_compat.c
sysdeps/ieee754/flt-32/w_expf_compat.c
sysdeps/ieee754/k_standard.c
sysdeps/ieee754/k_standardf.c
sysdeps/ieee754/k_standardl.c
sysdeps/ieee754/ldbl-128/w_expl_compat.c
sysdeps/ieee754/ldbl-128ibm/w_expl_compat.c
sysdeps/ieee754/ldbl-64-128/w_expl_compat.c
sysdeps/ieee754/ldbl-96/w_expl_compat.c
sysdeps/ieee754/ldbl-opt/w_acoshl_compat.c
sysdeps/ieee754/ldbl-opt/w_acosl_compat.c
sysdeps/ieee754/ldbl-opt/w_asinl_compat.c
sysdeps/ieee754/ldbl-opt/w_atan2l_compat.c
sysdeps/ieee754/ldbl-opt/w_atanhl_compat.c
sysdeps/ieee754/ldbl-opt/w_coshl_compat.c
sysdeps/ieee754/ldbl-opt/w_exp10l_compat.c
sysdeps/ieee754/ldbl-opt/w_fmodl_compat.c
sysdeps/ieee754/ldbl-opt/w_hypotl_compat.c
sysdeps/ieee754/ldbl-opt/w_j0l_compat.c
sysdeps/ieee754/ldbl-opt/w_j1l_compat.c
sysdeps/ieee754/ldbl-opt/w_jnl_compat.c
sysdeps/ieee754/ldbl-opt/w_lgammal_r_compat.c
sysdeps/ieee754/ldbl-opt/w_log10l_compat.c
sysdeps/ieee754/ldbl-opt/w_log2l_compat.c
sysdeps/ieee754/ldbl-opt/w_logl_compat.c
sysdeps/ieee754/ldbl-opt/w_powl_compat.c
sysdeps/ieee754/ldbl-opt/w_remainderl_compat.c
sysdeps/ieee754/ldbl-opt/w_sinhl_compat.c
sysdeps/ieee754/ldbl-opt/w_sqrtl_compat.c
sysdeps/ieee754/ldbl-opt/w_tgammal_compat.c

index 92110bd67182e044e94c8dda2659f7dc3536c7bc..5e3bc26421620e24d7fa03e71669469e18b3a33f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,186 @@
+2017-09-05  Joseph Myers  <joseph@codesourcery.com>
+
+       * sysdeps/generic/math-type-macros-double.h: Include
+       <math-svid-compat.h>.
+       (__USE_WRAPPER_TEMPLATE): Define to !LIBM_SVID_COMPAT.
+       * sysdeps/generic/math-type-macros-float.h: Include
+       <math-svid-compat.h>.
+       (__USE_WRAPPER_TEMPLATE): Define to !LIBM_SVID_COMPAT.
+       * sysdeps/generic/math-type-macros-ldouble.h: Include
+       <math-svid-compat.h>.
+       (__USE_WRAPPER_TEMPLATE): Define to !LIBM_SVID_COMPAT.
+       * math/lgamma-compat.h (BUILD_LGAMMA): Include LIBM_SVID_COMPAT
+       condition.
+       * math/w_acos_compat.c: Condition contents on [LIBM_SVID_COMPAT].
+       * math/w_acosf_compat.c: Likewise.
+       * math/w_acosh_compat.c: Likewise.
+       * math/w_acoshf_compat.c: Likewise.
+       * math/w_acoshl_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_atan2_compat.c: Likewise.
+       * math/w_atan2f_compat.c: Likewise.
+       * math/w_atan2l_compat.c: Likewise.
+       * math/w_atanh_compat.c: Likewise.
+       * math/w_atanhf_compat.c: Likewise.
+       * math/w_atanhl_compat.c: Likewise.
+       * math/w_cosh_compat.c: Likewise.
+       * math/w_coshf_compat.c: Likewise.
+       * math/w_coshl_compat.c: Likewise.
+       * math/w_exp10_compat.c: Likewise.
+       * math/w_exp10f_compat.c: Likewise.
+       * math/w_exp10l_compat.c: Likewise.
+       * math/w_exp2_compat.c: Likewise.
+       * math/w_exp2f_compat.c: Likewise.
+       * math/w_exp2l_compat.c: Likewise.
+       * math/w_fmod_compat.c: Likewise.
+       * math/w_fmodf_compat.c: Likewise.
+       * math/w_fmodl_compat.c: Likewise.
+       * math/w_hypot_compat.c: Likewise.
+       * math/w_hypotf_compat.c: Likewise.
+       * math/w_hypotl_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_jnl_compat.c: Likewise.
+       * math/w_lgamma_r_compat.c: Likewise.
+       * math/w_lgammaf_r_compat.c: Likewise.
+       * math/w_lgammal_r_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.
+       * math/w_pow_compat.c: Likewise.
+       * math/w_powf_compat.c: Likewise.
+       * math/w_powl_compat.c: Likewise.
+       * math/w_remainder_compat.c: Likewise.
+       * math/w_remainderf_compat.c: Likewise.
+       * math/w_remainderl_compat.c: Likewise.
+       * math/w_sinh_compat.c: Likewise.
+       * math/w_sinhf_compat.c: Likewise.
+       * math/w_sinhl_compat.c: Likewise.
+       * math/w_sqrt_compat.c: Likewise.
+       * math/w_sqrtf_compat.c: Likewise.
+       * math/w_sqrtl_compat.c: Likewise.
+       * math/w_tgamma_compat.c: Likewise.
+       * math/w_tgammaf_compat.c: Likewise.
+       * math/w_tgammal_compat.c: Likewise.
+       * math/w_scalb_compat.c (sysv_scalb): Condition definition on
+       [LIBM_SVID_COMPAT].
+       (__scalb): Condition call to sysv_scalb on [LIBM_SVID_COMPAT].
+       * math/w_scalbf_compat.c (sysv_scalbf): Condition definition on
+       [LIBM_SVID_COMPAT].
+       (__scalbf): Condition call to sysv_scalbf on [LIBM_SVID_COMPAT].
+       * math/w_scalbl_compat.c (sysv_scalbl): Condition definition on
+       [LIBM_SVID_COMPAT].
+       (__scalbl): Condition call to sysv_scalbl on [LIBM_SVID_COMPAT].
+       * sysdeps/i386/fpu/w_sqrt.c: New file.
+       * sysdeps/ia64/fpu/w_acos.c: Likewise.
+       * sysdeps/ia64/fpu/w_acosf.c: Likewise.
+       * sysdeps/ia64/fpu/w_acosh.c: Likewise.
+       * sysdeps/ia64/fpu/w_acoshf.c: Likewise.
+       * sysdeps/ia64/fpu/w_acoshl.c: Likewise.
+       * sysdeps/ia64/fpu/w_acosl.c: Likewise.
+       * sysdeps/ia64/fpu/w_asin.c: Likewise.
+       * sysdeps/ia64/fpu/w_asinf.c: Likewise.
+       * sysdeps/ia64/fpu/w_asinl.c: Likewise.
+       * sysdeps/ia64/fpu/w_atan2.c: Likewise.
+       * sysdeps/ia64/fpu/w_atan2f.c: Likewise.
+       * sysdeps/ia64/fpu/w_atan2l.c: Likewise.
+       * sysdeps/ia64/fpu/w_atanh.c: Likewise.
+       * sysdeps/ia64/fpu/w_atanhf.c: Likewise.
+       * sysdeps/ia64/fpu/w_atanhl.c: Likewise.
+       * sysdeps/ia64/fpu/w_cosh.c: Likewise.
+       * sysdeps/ia64/fpu/w_coshf.c: Likewise.
+       * sysdeps/ia64/fpu/w_coshl.c: Likewise.
+       * sysdeps/ia64/fpu/w_exp.c: Likewise.
+       * sysdeps/ia64/fpu/w_exp10.c: Likewise.
+       * sysdeps/ia64/fpu/w_exp10f.c: Likewise.
+       * sysdeps/ia64/fpu/w_exp10l.c: Likewise.
+       * sysdeps/ia64/fpu/w_exp2.c: Likewise.
+       * sysdeps/ia64/fpu/w_exp2f.c: Likewise.
+       * sysdeps/ia64/fpu/w_exp2l.c: Likewise.
+       * sysdeps/ia64/fpu/w_expf.c: Likewise.
+       * sysdeps/ia64/fpu/w_expl.c: Likewise.
+       * sysdeps/ia64/fpu/w_fmod.c: Likewise.
+       * sysdeps/ia64/fpu/w_fmodf.c: Likewise.
+       * sysdeps/ia64/fpu/w_fmodl.c: Likewise.
+       * sysdeps/ia64/fpu/w_hypot.c: Likewise.
+       * sysdeps/ia64/fpu/w_hypotf.c: Likewise.
+       * sysdeps/ia64/fpu/w_hypotl.c: Likewise.
+       * sysdeps/ia64/fpu/w_lgamma_r.c: Likewise.
+       * sysdeps/ia64/fpu/w_lgammaf_r.c: Likewise.
+       * sysdeps/ia64/fpu/w_lgammal_r.c: Likewise.
+       * sysdeps/ia64/fpu/w_log.c: Likewise.
+       * sysdeps/ia64/fpu/w_log10.c: Likewise.
+       * sysdeps/ia64/fpu/w_log10f.c: Likewise.
+       * sysdeps/ia64/fpu/w_log10l.c: Likewise.
+       * sysdeps/ia64/fpu/w_log2.c: Likewise.
+       * sysdeps/ia64/fpu/w_log2f.c: Likewise.
+       * sysdeps/ia64/fpu/w_log2l.c: Likewise.
+       * sysdeps/ia64/fpu/w_logf.c: Likewise.
+       * sysdeps/ia64/fpu/w_logl.c: Likewise.
+       * sysdeps/ia64/fpu/w_pow.c: Likewise.
+       * sysdeps/ia64/fpu/w_powf.c: Likewise.
+       * sysdeps/ia64/fpu/w_powl.c: Likewise.
+       * sysdeps/ia64/fpu/w_remainder.c: Likewise.
+       * sysdeps/ia64/fpu/w_remainderf.c: Likewise.
+       * sysdeps/ia64/fpu/w_remainderl.c: Likewise.
+       * sysdeps/ia64/fpu/w_sinh.c: Likewise.
+       * sysdeps/ia64/fpu/w_sinhf.c: Likewise.
+       * sysdeps/ia64/fpu/w_sinhl.c: Likewise.
+       * sysdeps/ia64/fpu/w_sqrt.c: Likewise.
+       * sysdeps/ia64/fpu/w_sqrtf.c: Likewise.
+       * sysdeps/ia64/fpu/w_sqrtl.c: Likewise.
+       * sysdeps/ia64/fpu/w_tgamma.c: Likewise.
+       * sysdeps/ia64/fpu/w_tgammaf.c: Likewise.
+       * sysdeps/ia64/fpu/w_tgammal.c: Likewise.
+       * sysdeps/ieee754/dbl-64/w_exp_compat.c: Condition contents on
+       [LIBM_SVID_COMPAT].
+       * sysdeps/ieee754/flt-32/w_expf_compat.c: Likewise.
+       * sysdeps/ieee754/k_standard.c: Likewise.
+       * sysdeps/ieee754/k_standardf.c: Likewise.
+       * sysdeps/ieee754/k_standardl.c: Likewise.
+       * sysdeps/ieee754/ldbl-128/w_expl_compat.c: Likewise.
+       * sysdeps/ieee754/ldbl-128ibm/w_expl_compat.c: Likewise.
+       * sysdeps/ieee754/ldbl-96/w_expl_compat.c: Likewise.
+       * sysdeps/ieee754/ldbl-64-128/w_expl_compat.c: Condition
+       long_double_symbol call on [LIBM_SVID_COMPAT].
+       * sysdeps/ieee754/ldbl-opt/w_acoshl_compat.c: Likewise.
+       * sysdeps/ieee754/ldbl-opt/w_acosl_compat.c: Likewise.
+       * sysdeps/ieee754/ldbl-opt/w_asinl_compat.c: Likewise.
+       * sysdeps/ieee754/ldbl-opt/w_atan2l_compat.c: Likewise.
+       * sysdeps/ieee754/ldbl-opt/w_atanhl_compat.c: Likewise.
+       * sysdeps/ieee754/ldbl-opt/w_coshl_compat.c: Likewise.
+       * sysdeps/ieee754/ldbl-opt/w_fmodl_compat.c: Likewise.
+       * sysdeps/ieee754/ldbl-opt/w_hypotl_compat.c: Likewise.
+       * sysdeps/ieee754/ldbl-opt/w_j0l_compat.c: Likewise.
+       * sysdeps/ieee754/ldbl-opt/w_j1l_compat.c: Likewise.
+       * sysdeps/ieee754/ldbl-opt/w_jnl_compat.c: Likewise.
+       * sysdeps/ieee754/ldbl-opt/w_lgammal_r_compat.c: Likewise.
+       * sysdeps/ieee754/ldbl-opt/w_log10l_compat.c: Likewise.
+       * sysdeps/ieee754/ldbl-opt/w_log2l_compat.c: Likewise.
+       * sysdeps/ieee754/ldbl-opt/w_logl_compat.c: Likewise.
+       * sysdeps/ieee754/ldbl-opt/w_powl_compat.c: Likewise.
+       * sysdeps/ieee754/ldbl-opt/w_remainderl_compat.c: Likewise.
+       * sysdeps/ieee754/ldbl-opt/w_sinhl_compat.c: Likewise.
+       * sysdeps/ieee754/ldbl-opt/w_sqrtl_compat.c: Likewise.
+       * sysdeps/ieee754/ldbl-opt/w_tgammal_compat.c: Likewise.
+       * sysdeps/ieee754/ldbl-opt/w_exp10l_compat.c: Condition
+       long_double_symbol and compat_symbol calls on [LIBM_SVID_COMPAT].
+
 2017-09-05  Steve Ellcey  <sellcey@cavium.com>
 
        * include/shlib-compat.h (TEST_COMPAT): New Macro.
index 189d12688271eefd9ff56456e6c823dd2fcdb895..b7b6b36d1673eea80f1cfb8716f77ccef2e0759f 100644 (file)
@@ -41,7 +41,8 @@
 #define HAVE_LGAMMA_COMPAT SHLIB_COMPAT (libm, LGAMMA_OLD_VER, LGAMMA_NEW_VER)
 
 /* Whether to build this version at all.  */
-#define BUILD_LGAMMA (HAVE_LGAMMA_COMPAT || !USE_AS_COMPAT)
+#define BUILD_LGAMMA \
+  (LIBM_SVID_COMPAT && (HAVE_LGAMMA_COMPAT || !USE_AS_COMPAT))
 
 /* The name to use for this version.  */
 #if USE_AS_COMPAT
index 5115732a83786cb48b587ee46854cdb48d2f9723..1930105153e48b2fc7093a07ab68dd7acb5076cd 100644 (file)
@@ -22,6 +22,7 @@
 #include <math-svid-compat.h>
 
 
+#if LIBM_SVID_COMPAT
 /* wrapper acos */
 double
 __acos (double x)
@@ -37,7 +38,8 @@ __acos (double x)
   return __ieee754_acos (x);
 }
 weak_alias (__acos, acos)
-#ifdef NO_LONG_DOUBLE
+# ifdef NO_LONG_DOUBLE
 strong_alias (__acos, __acosl)
 weak_alias (__acos, acosl)
+# endif
 #endif
index 0bf557c9c59c51ebe2954cdd041d1d1ac6c8198a..97cac13cd6aebc26b7d86026c2c950dfacf4a17d 100644 (file)
@@ -22,6 +22,7 @@
 #include <math-svid-compat.h>
 
 
+#if LIBM_SVID_COMPAT
 /* wrapper acosf */
 float
 __acosf (float x)
@@ -37,3 +38,4 @@ __acosf (float x)
   return __ieee754_acosf (x);
 }
 weak_alias (__acosf, acosf)
+#endif
index 31251ce760b3a69449b0ee6ae7b3c4890b97dfeb..f6d298e17be544240eda44030a740dd556b095c0 100644 (file)
@@ -21,6 +21,7 @@
 #include <math-svid-compat.h>
 
 
+#if LIBM_SVID_COMPAT
 /* wrapper acosh */
 double
 __acosh (double x)
@@ -32,7 +33,8 @@ __acosh (double x)
   return __ieee754_acosh (x);
 }
 weak_alias (__acosh, acosh)
-#ifdef NO_LONG_DOUBLE
+# ifdef NO_LONG_DOUBLE
 strong_alias (__acosh, __acoshl)
 weak_alias (__acosh, acoshl)
+# endif
 #endif
index 6a4482e5340cc4ce7479715487552014ff31e087..7a8c87bf4f2503837ad664447c6bef57f2b038b9 100644 (file)
@@ -21,6 +21,7 @@
 #include <math-svid-compat.h>
 
 
+#if LIBM_SVID_COMPAT
 /* wrapper acoshf */
 float
 __acoshf (float x)
@@ -32,3 +33,4 @@ __acoshf (float x)
   return __ieee754_acoshf (x);
 }
 weak_alias (__acoshf, acoshf)
+#endif
index b9f66c53efb1ff49940c04a0038608b3d134266a..79d0370eb33cb5d826e0e3710557eb1a648c9610 100644 (file)
@@ -21,6 +21,7 @@
 #include <math-svid-compat.h>
 
 
+#if LIBM_SVID_COMPAT
 /* wrapper acosl */
 long double
 __acoshl (long double x)
@@ -32,3 +33,4 @@ __acoshl (long double x)
   return __ieee754_acoshl (x);
 }
 weak_alias (__acoshl, acoshl)
+#endif
index 66600b5d38eb93af2e96bfdbad43b74663c662c2..7d2f1835ae7f90dea9f25bf30f60411684821b07 100644 (file)
@@ -22,6 +22,7 @@
 #include <math-svid-compat.h>
 
 
+#if LIBM_SVID_COMPAT
 /* wrapper acosl */
 long double
 __acosl (long double x)
@@ -37,3 +38,4 @@ __acosl (long double x)
   return __ieee754_acosl (x);
 }
 weak_alias (__acosl, acosl)
+#endif
index 59beea817d7051779cab7166ee109cff8afc7c2a..7780f858831a46d2b70206f1a57fe0db13a7332c 100644 (file)
@@ -22,6 +22,7 @@
 #include <math-svid-compat.h>
 
 
+#if LIBM_SVID_COMPAT
 /* wrapper asin */
 double
 __asin (double x)
@@ -37,7 +38,8 @@ __asin (double x)
   return __ieee754_asin (x);
 }
 weak_alias (__asin, asin)
-#ifdef NO_LONG_DOUBLE
+# ifdef NO_LONG_DOUBLE
 strong_alias (__asin, __asinl)
 weak_alias (__asin, asinl)
+# endif
 #endif
index 0eb20b10b5379525d31ff2c7d4d9cc95ad89f725..10ee32328e298a97de617fee1da90be0eb49faf8 100644 (file)
@@ -22,6 +22,7 @@
 #include <math-svid-compat.h>
 
 
+#if LIBM_SVID_COMPAT
 /* wrapper asinf */
 float
 __asinf (float x)
@@ -37,3 +38,4 @@ __asinf (float x)
   return __ieee754_asinf (x);
 }
 weak_alias (__asinf, asinf)
+#endif
index c8f4d150c67b9c3d1c131be4b462b2dee0c700c5..c9e1a340cc940de8a2a9267b5eae5adedefb6ffc 100644 (file)
@@ -22,6 +22,7 @@
 #include <math-svid-compat.h>
 
 
+#if LIBM_SVID_COMPAT
 /* wrapper asinl */
 long double
 __asinl (long double x)
@@ -37,3 +38,4 @@ __asinl (long double x)
   return __ieee754_asinl (x);
 }
 weak_alias (__asinl, asinl)
+#endif
index fa098ffeb77c6af54b3ba48142a91ae12c61e0aa..1ca33492070cab3ad97b0603b069a4c4b4c804ff 100644 (file)
@@ -26,6 +26,7 @@
 #include <math-svid-compat.h>
 
 
+#if LIBM_SVID_COMPAT
 double
 __atan2 (double y, double x)
 {
@@ -40,7 +41,8 @@ __atan2 (double y, double x)
   return z;
 }
 weak_alias (__atan2, atan2)
-#ifdef NO_LONG_DOUBLE
+# ifdef NO_LONG_DOUBLE
 strong_alias (__atan2, __atan2l)
 weak_alias (__atan2, atan2l)
+# endif
 #endif
index 15e05d825367bd839e5af5915db5c0851e045a2e..8d7ad71b70666d278244ddf4cbce60a53fa49d85 100644 (file)
@@ -26,6 +26,7 @@
 #include <math-svid-compat.h>
 
 
+#if LIBM_SVID_COMPAT
 float
 __atan2f (float y, float x)
 {
@@ -40,3 +41,4 @@ __atan2f (float y, float x)
   return z;
 }
 weak_alias (__atan2f, atan2f)
+#endif
index 87b73948dae4dedce946d3f059e67c03799d3d36..9dc2b144ea6c5d6875e8d68e504c6c03a7e405a4 100644 (file)
@@ -26,6 +26,7 @@
 #include <math-svid-compat.h>
 
 
+#if LIBM_SVID_COMPAT
 long double
 __atan2l (long double y, long double x)
 {
@@ -40,3 +41,4 @@ __atan2l (long double y, long double x)
   return z;
 }
 weak_alias (__atan2l, atan2l)
+#endif
index f7a43beb0905dce7c07a16e73024d8b2778881d9..c2cbb2ee5f725f3f5936e4f0649735f99b82c900 100644 (file)
@@ -21,6 +21,7 @@
 #include <math-svid-compat.h>
 
 
+#if LIBM_SVID_COMPAT
 /* wrapper atanh */
 double
 __atanh (double x)
@@ -35,7 +36,8 @@ __atanh (double x)
   return __ieee754_atanh (x);
 }
 weak_alias (__atanh, atanh)
-#ifdef NO_LONG_DOUBLE
+# ifdef NO_LONG_DOUBLE
 strong_alias (__atanh, __atanhl)
 weak_alias (__atanh, atanhl)
+# endif
 #endif
index c9d2c3a3aeb174f07c1506d131f4e4962bd59c6d..6045188bd82fb87937d82caa82af645f5404087d 100644 (file)
@@ -21,6 +21,7 @@
 #include <math-svid-compat.h>
 
 
+#if LIBM_SVID_COMPAT
 /* wrapper atanhf */
 float
 __atanhf (float x)
@@ -35,3 +36,4 @@ __atanhf (float x)
   return __ieee754_atanhf (x);
 }
 weak_alias (__atanhf, atanhf)
+#endif
index 56f9f1ed613eb28dd9412b82c0552fca5b607009..837a6652b84e8597a4d82be5c698ee74de7ff7a3 100644 (file)
@@ -21,6 +21,7 @@
 #include <math-svid-compat.h>
 
 
+#if LIBM_SVID_COMPAT
 /* wrapper atanhl */
 long double
 __atanhl (long double x)
@@ -35,3 +36,4 @@ __atanhl (long double x)
   return __ieee754_atanhl (x);
 }
 weak_alias (__atanhl, atanhl)
+#endif
index fd16436520451443504c374830968718520fce29..d0cb6b165fb3626b2a4bc82dff756c10b3d1c42b 100644 (file)
@@ -18,6 +18,7 @@
 #include <math_private.h>
 #include <math-svid-compat.h>
 
+#if LIBM_SVID_COMPAT
 double
 __cosh (double x)
 {
@@ -29,7 +30,8 @@ __cosh (double x)
        return z;
 }
 weak_alias (__cosh, cosh)
-#ifdef NO_LONG_DOUBLE
+# ifdef NO_LONG_DOUBLE
 strong_alias (__cosh, __coshl)
 weak_alias (__cosh, coshl)
+# endif
 #endif
index dd622816936fd0ff8d13d23579867cdd2521301c..b5d53168f23af40d2a361fb2789c172d21a01df1 100644 (file)
@@ -22,6 +22,7 @@
 #include <math_private.h>
 #include <math-svid-compat.h>
 
+#if LIBM_SVID_COMPAT
 float
 __coshf (float x)
 {
@@ -33,3 +34,4 @@ __coshf (float x)
        return z;
 }
 weak_alias (__coshf, coshf)
+#endif
index 5fa32bea880eac8655eef082ac010399e4d9df23..4dab6eff67939a8d30bc79598c7b6f83a292d42f 100644 (file)
@@ -23,6 +23,7 @@
 #include <math_private.h>
 #include <math-svid-compat.h>
 
+#if LIBM_SVID_COMPAT
 long double
 __coshl (long double x)
 {
@@ -34,3 +35,4 @@ __coshl (long double x)
        return z;
 }
 weak_alias (__coshl, coshl)
+#endif
index 5256f5b06f08e64417461a1ed612e311a50b05b2..42dc312ee8834db6a73aab60de8e5e8d9fe3f991 100644 (file)
@@ -25,6 +25,7 @@
 #include <math_private.h>
 #include <math-svid-compat.h>
 
+#if LIBM_SVID_COMPAT
 double
 __exp10 (double x)
 {
@@ -37,15 +38,16 @@ __exp10 (double x)
   return z;
 }
 weak_alias (__exp10, exp10)
-#if SHLIB_COMPAT (libm, GLIBC_2_1, GLIBC_2_27)
+# if SHLIB_COMPAT (libm, GLIBC_2_1, GLIBC_2_27)
 strong_alias (__exp10, __pow10)
 compat_symbol (libm, __pow10, pow10, GLIBC_2_1);
-#endif
-#ifdef NO_LONG_DOUBLE
+# endif
+# ifdef NO_LONG_DOUBLE
 strong_alias (__exp10, __exp10l)
 weak_alias (__exp10, exp10l)
-# if SHLIB_COMPAT (libm, GLIBC_2_1, GLIBC_2_27)
+#  if SHLIB_COMPAT (libm, GLIBC_2_1, GLIBC_2_27)
 strong_alias (__exp10l, __pow10l)
 compat_symbol (libm, __pow10l, pow10l, GLIBC_2_1);
+#  endif
 # endif
 #endif
index c559e6a6295c0afa0d2835dd277c1754a97fadca..bacf2eb9d2d83f2c97fd5368f0098a26504ca7a4 100644 (file)
@@ -25,6 +25,7 @@
 #include <math_private.h>
 #include <math-svid-compat.h>
 
+#if LIBM_SVID_COMPAT
 float
 __exp10f (float x)
 {
@@ -37,7 +38,8 @@ __exp10f (float x)
   return z;
 }
 weak_alias (__exp10f, exp10f)
-#if SHLIB_COMPAT (libm, GLIBC_2_1, GLIBC_2_27)
+# if SHLIB_COMPAT (libm, GLIBC_2_1, GLIBC_2_27)
 strong_alias (__exp10f, __pow10f)
 compat_symbol (libm, __pow10f, pow10f, GLIBC_2_1);
+# endif
 #endif
index 03b7ce9b6bd914f99cb7086c8f200217c2ef5fb8..3d7d66d5af1308e2f6366bf9f02282dd1c81c12c 100644 (file)
@@ -25,6 +25,7 @@
 #include <math_private.h>
 #include <math-svid-compat.h>
 
+#if LIBM_SVID_COMPAT
 long double
 __exp10l (long double x)
 {
@@ -37,7 +38,8 @@ __exp10l (long double x)
   return z;
 }
 weak_alias (__exp10l, exp10l)
-#if SHLIB_COMPAT (libm, GLIBC_2_1, GLIBC_2_27)
+# if SHLIB_COMPAT (libm, GLIBC_2_1, GLIBC_2_27)
 strong_alias (__exp10l, __pow10l)
 compat_symbol (libm, __pow10l, pow10l, GLIBC_2_1);
+# endif
 #endif
index a4d46537085640ed3f8cd9d1b7af109afff97d60..573954785940a73e67d6e67096d7c23a71d23c22 100644 (file)
@@ -6,6 +6,7 @@
 #include <math_private.h>
 #include <math-svid-compat.h>
 
+#if LIBM_SVID_COMPAT
 double
 __exp2 (double x)
 {
@@ -18,7 +19,8 @@ __exp2 (double x)
   return z;
 }
 weak_alias (__exp2, exp2)
-#ifdef NO_LONG_DOUBLE
+# ifdef NO_LONG_DOUBLE
 strong_alias (__exp2, __exp2l)
 weak_alias (__exp2, exp2l)
+# endif
 #endif
index b21fe36903a875b6a5e3cd56a02e40948fc1a427..b058daed305cbf59fe7d881a3754820724e6b4eb 100644 (file)
@@ -6,6 +6,7 @@
 #include <math_private.h>
 #include <math-svid-compat.h>
 
+#if LIBM_SVID_COMPAT
 float
 __exp2f (float x)
 {
@@ -18,3 +19,4 @@ __exp2f (float x)
   return z;
 }
 weak_alias (__exp2f, exp2f)
+#endif
index 04cd666b68448b6e10d2debaa51d9a5a21f77e52..96d4b96c111bc8cbea631cbf8aafedac1536ecd8 100644 (file)
@@ -6,6 +6,7 @@
 #include <math_private.h>
 #include <math-svid-compat.h>
 
+#if LIBM_SVID_COMPAT
 long double
 __exp2l (long double x)
 {
@@ -18,3 +19,4 @@ __exp2l (long double x)
   return z;
 }
 weak_alias (__exp2l, exp2l)
+#endif
index 1079d3a6035748ee67cc405a5dd55ed7fa26edbe..f75b8615d09e9ed49286c6df54024583c66c92fc 100644 (file)
@@ -20,6 +20,7 @@
 #include <math_private.h>
 #include <math-svid-compat.h>
 
+#if LIBM_SVID_COMPAT
 /* wrapper fmod */
 double
 __fmod (double x, double y)
@@ -32,7 +33,8 @@ __fmod (double x, double y)
   return __ieee754_fmod (x, y);
 }
 weak_alias (__fmod, fmod)
-#ifdef NO_LONG_DOUBLE
+# ifdef NO_LONG_DOUBLE
 strong_alias (__fmod, __fmodl)
 weak_alias (__fmod, fmodl)
+# endif
 #endif
index 88b64a24bd5882ed61c9ca82a31156632e1f1c0e..a2739d856ac92f1f0763f9f7b2945ae7dadf1b95 100644 (file)
@@ -20,6 +20,7 @@
 #include <math_private.h>
 #include <math-svid-compat.h>
 
+#if LIBM_SVID_COMPAT
 /* wrapper fmodf */
 float
 __fmodf (float x, float y)
@@ -32,3 +33,4 @@ __fmodf (float x, float y)
   return __ieee754_fmodf (x, y);
 }
 weak_alias (__fmodf, fmodf)
+#endif
index 23422fa6525aafc5475a4fc90c2b7d73f7605399..3136e82d65393e9384fcb9ac151eb18ef70a837d 100644 (file)
@@ -20,6 +20,7 @@
 #include <math_private.h>
 #include <math-svid-compat.h>
 
+#if LIBM_SVID_COMPAT
 /* wrapper fmodl */
 long double
 __fmodl (long double x, long double y)
@@ -32,3 +33,4 @@ __fmodl (long double x, long double y)
   return __ieee754_fmodl (x, y);
 }
 weak_alias (__fmodl, fmodl)
+#endif
index ff3774cf62e23acecb501b62640f25e040ec3406..21c7e65c5e073932fa5aa4611225ce7d1fbc6bf7 100644 (file)
@@ -19,6 +19,7 @@
 #include <math-svid-compat.h>
 
 
+#if LIBM_SVID_COMPAT
 double
 __hypot (double x, double y)
 {
@@ -30,7 +31,8 @@ __hypot (double x, double y)
        return z;
 }
 weak_alias (__hypot, hypot)
-#ifdef NO_LONG_DOUBLE
+# ifdef NO_LONG_DOUBLE
 strong_alias (__hypot, __hypotl)
 weak_alias (__hypot, hypotl)
+# endif
 #endif
index 0a43d90a00778b5e664ad74d95f0466e265bb992..8e6d2343eb8d0aeab9a661f0d4b67adc1e71cf93 100644 (file)
@@ -22,6 +22,7 @@
 #include <math-svid-compat.h>
 
 
+#if LIBM_SVID_COMPAT
 float
 __hypotf(float x, float y)
 {
@@ -34,3 +35,4 @@ __hypotf(float x, float y)
        return z;
 }
 weak_alias (__hypotf, hypotf)
+#endif
index 13060f74a78a452f579d4e411de1f1ed79331242..bc56d29a04c7907a4c28ca39d65da8bda60e7979 100644 (file)
@@ -23,6 +23,7 @@
 #include <math-svid-compat.h>
 
 
+#if LIBM_SVID_COMPAT
 long double
 __hypotl(long double x, long double y)
 {
@@ -35,3 +36,4 @@ __hypotl(long double x, long double y)
        return z;
 }
 weak_alias (__hypotl, hypotl)
+#endif
index 80d21acde1d0c94d9d59f7a7ffd4b8f4761470ff..3df71e0b7ba8fc4accd06beba6ff0c99ca6cad9a 100644 (file)
@@ -22,6 +22,7 @@
 #include <math-svid-compat.h>
 
 
+#if LIBM_SVID_COMPAT
 /* wrapper j0 */
 double
 j0 (double x)
@@ -33,9 +34,9 @@ j0 (double x)
 
   return __ieee754_j0 (x);
 }
-#ifdef NO_LONG_DOUBLE
+# ifdef NO_LONG_DOUBLE
 weak_alias (j0, j0l)
-#endif
+# endif
 
 
 /* wrapper y0 */
@@ -64,6 +65,7 @@ y0 (double x)
 
   return __ieee754_y0 (x);
 }
-#ifdef NO_LONG_DOUBLE
+# ifdef NO_LONG_DOUBLE
 weak_alias (y0, y0l)
+# endif
 #endif
index 36fc4f944329941a3b7bafee515d69ba74503126..e9ac74f23aa06c5e0424f863e4aec1c78bf5a74b 100644 (file)
@@ -22,6 +22,7 @@
 #include <math-svid-compat.h>
 
 
+#if LIBM_SVID_COMPAT
 /* wrapper j0f */
 float
 j0f (float x)
@@ -62,3 +63,4 @@ y0f (float x)
 
   return __ieee754_y0f (x);
 }
+#endif
index ff7e1b145677f7f5c36b06ee760c02e6172126ac..76ec812729ce9ff2c466913d81e9971920f3e623 100644 (file)
@@ -22,6 +22,7 @@
 #include <math-svid-compat.h>
 
 
+#if LIBM_SVID_COMPAT
 /* wrapper j0l */
 long double
 __j0l (long double x)
@@ -63,3 +64,4 @@ __y0l (long double x)
   return __ieee754_y0l (x);
 }
 weak_alias (__y0l, y0l)
+#endif
index f7a76c10d5e6fddc8a0fd5a1cd6c526bfa3b53f1..be788f98648d47c2d92cba33cddc99705949a32f 100644 (file)
@@ -22,6 +22,7 @@
 #include <math-svid-compat.h>
 
 
+#if LIBM_SVID_COMPAT
 /* wrapper j1 */
 double
 j1 (double x)
@@ -33,9 +34,9 @@ j1 (double x)
 
   return __ieee754_j1 (x);
 }
-#ifdef NO_LONG_DOUBLE
+# ifdef NO_LONG_DOUBLE
 weak_alias (j1, j1l)
-#endif
+# endif
 
 
 /* wrapper y1 */
@@ -64,6 +65,7 @@ y1 (double x)
 
   return __ieee754_y1 (x);
 }
-#ifdef NO_LONG_DOUBLE
+# ifdef NO_LONG_DOUBLE
 weak_alias (y1, y1l)
+# endif
 #endif
index 9aa5c8c4fdaf45d2b81cab124d98d53dd7e96be8..c3222bbc8d45eca13aba834a27dcae69d2760614 100644 (file)
@@ -22,6 +22,7 @@
 #include <math-svid-compat.h>
 
 
+#if LIBM_SVID_COMPAT
 /* wrapper j1f */
 float
 j1f (float x)
@@ -62,3 +63,4 @@ y1f (float x)
 
   return __ieee754_y1f (x);
 }
+#endif
index 7e6d9f57f2693f1f35ee067a01b819b9a1f46014..c3acfdfe76c3721812ea87d1ce13a88a68abf51b 100644 (file)
@@ -22,6 +22,7 @@
 #include <math-svid-compat.h>
 
 
+#if LIBM_SVID_COMPAT
 /* wrapper j1l */
 long double
 __j1l (long double x)
@@ -63,3 +64,4 @@ __y1l (long double x)
   return __ieee754_y1l (x);
 }
 weak_alias (__y1l, y1l)
+#endif
index 7c49992cf4cb9aa3f5b40d4900f06c742f4a04cb..496c779e8cf90df680ba6e79ff3781bed32458b1 100644 (file)
@@ -22,6 +22,7 @@
 #include <math-svid-compat.h>
 
 
+#if LIBM_SVID_COMPAT
 /* wrapper jn */
 double
 jn (int n, double x)
@@ -33,9 +34,9 @@ jn (int n, double x)
 
   return __ieee754_jn (n, x);
 }
-#ifdef NO_LONG_DOUBLE
+# ifdef NO_LONG_DOUBLE
 weak_alias (jn, jnl)
-#endif
+# endif
 
 
 /* wrapper yn */
@@ -64,6 +65,7 @@ yn (int n, double x)
 
   return __ieee754_yn (n, x);
 }
-#ifdef NO_LONG_DOUBLE
+# ifdef NO_LONG_DOUBLE
 weak_alias (yn, ynl)
+# endif
 #endif
index ead40e7a606dd8312128b685a91b89bc95e68fc9..440d53d13e62ed9b0e33505a38315493b492e101 100644 (file)
@@ -22,6 +22,7 @@
 #include <math-svid-compat.h>
 
 
+#if LIBM_SVID_COMPAT
 /* wrapper jnf */
 float
 jnf (int n, float x)
@@ -62,3 +63,4 @@ ynf (int n, float x)
 
   return __ieee754_ynf (n, x);
 }
+#endif
index bc416359c281b1518f8b751c13fc6b61e7743a58..7298c73a3b787029551d313bfb937ae64ab31498 100644 (file)
@@ -48,11 +48,12 @@ static char rcsid[] = "$NetBSD: $";
 #include <math_private.h>
 #include <math-svid-compat.h>
 
+#if LIBM_SVID_COMPAT
 long double __jnl(int n, long double x)        /* wrapper jnl */
 {
-#ifdef _IEEE_LIBM
+# ifdef _IEEE_LIBM
        return __ieee754_jnl(n,x);
-#else
+# else
        long double z;
        z = __ieee754_jnl(n,x);
        if (_LIB_VERSION == _IEEE_
@@ -63,15 +64,15 @@ long double __jnl(int n, long double x)     /* wrapper jnl */
            return __kernel_standard_l((double)n,x,238); /* jn(|x|>X_TLOSS,n) */
        } else
            return z;
-#endif
+# endif
 }
 weak_alias (__jnl, jnl)
 
 long double __ynl(int n, long double x)        /* wrapper ynl */
 {
-#ifdef _IEEE_LIBM
+# ifdef _IEEE_LIBM
        return __ieee754_ynl(n,x);
-#else
+# else
        long double z;
        z = __ieee754_ynl(n,x);
        if(_LIB_VERSION == _IEEE_ || isnan(x) ) return z;
@@ -87,6 +88,7 @@ long double __ynl(int n, long double x)       /* wrapper ynl */
            return __kernel_standard_l((double)n,x,239); /* yn(x>X_TLOSS,n) */
        } else
            return z;
-#endif
+# endif
 }
 weak_alias (__ynl, ynl)
+#endif
index 3f7fbce62bee3930540f365507bde8b797827d9b..f88a5df6a5115263c2ea53ab869941b39bd2cfd2 100644 (file)
@@ -19,6 +19,7 @@
 #include <math-svid-compat.h>
 
 
+#if LIBM_SVID_COMPAT
 double
 __lgamma_r(double x, int *signgamp)
 {
@@ -33,7 +34,8 @@ __lgamma_r(double x, int *signgamp)
        return y;
 }
 weak_alias (__lgamma_r, lgamma_r)
-#ifdef NO_LONG_DOUBLE
+# ifdef NO_LONG_DOUBLE
 strong_alias (__lgamma_r, __lgammal_r)
 weak_alias (__lgamma_r, lgammal_r)
+# endif
 #endif
index d9601f45d7f03ea543e6ecc9cd944a5f340a5466..86003de59aef7313a241b6c5709aecdf4a839d3a 100644 (file)
@@ -22,6 +22,7 @@
 #include <math-svid-compat.h>
 
 
+#if LIBM_SVID_COMPAT
 float
 __lgammaf_r(float x, int *signgamp)
 {
@@ -36,3 +37,4 @@ __lgammaf_r(float x, int *signgamp)
        return y;
 }
 weak_alias (__lgammaf_r, lgammaf_r)
+#endif
index d1b58e42ddf50ddbe3bc81ee5ce52df8ac63e14d..781bfa45e78c98352a020b0a80844a945f4422f6 100644 (file)
@@ -23,6 +23,7 @@
 #include <math-svid-compat.h>
 
 
+#if LIBM_SVID_COMPAT
 long double
 __lgammal_r(long double x, int *signgamp)
 {
@@ -37,3 +38,4 @@ __lgammal_r(long double x, int *signgamp)
        return y;
 }
 weak_alias (__lgammal_r, lgammal_r)
+#endif
index 6f3eb3408c5c02c0674871bf08610ad95823c0b4..b8247aa8861285bd2ed3485d546c177cf107b311 100644 (file)
@@ -22,6 +22,7 @@
 #include <math-svid-compat.h>
 
 
+#if LIBM_SVID_COMPAT
 /* wrapper log10(x) */
 double
 __log10 (double x)
@@ -43,7 +44,8 @@ __log10 (double x)
   return  __ieee754_log10 (x);
 }
 weak_alias (__log10, log10)
-#ifdef NO_LONG_DOUBLE
+# ifdef NO_LONG_DOUBLE
 strong_alias (__log10, __log10l)
 weak_alias (__log10, log10l)
+# endif
 #endif
index 2cb5c9a1bb0dd39bb963c375e9368575b9808e87..151c94b4dcaeb1a635f326e44fe498c30e32e709 100644 (file)
@@ -22,6 +22,7 @@
 #include <math-svid-compat.h>
 
 
+#if LIBM_SVID_COMPAT
 /* wrapper log10f(x) */
 float
 __log10f (float x)
@@ -43,3 +44,4 @@ __log10f (float x)
   return  __ieee754_log10f (x);
 }
 weak_alias (__log10f, log10f)
+#endif
index 0063c50778829506fdf1b7353dd84246b4308529..88d9c403543ba2eb323792d88480bd3cb08bdfa9 100644 (file)
@@ -22,6 +22,7 @@
 #include <math-svid-compat.h>
 
 
+#if LIBM_SVID_COMPAT
 /* wrapper log10l(x) */
 long double
 __log10l (long double x)
@@ -43,3 +44,4 @@ __log10l (long double x)
   return  __ieee754_log10l (x);
 }
 weak_alias (__log10l, log10l)
+#endif
index 252fc0d86a1d1e47066a165369f2c1ffcf632950..6d1f9f2159bf3ca1426b6858a07a3c5145434790 100644 (file)
@@ -22,6 +22,7 @@
 #include <math-svid-compat.h>
 
 
+#if LIBM_SVID_COMPAT
 /* wrapper log2(x) */
 double
 __log2 (double x)
@@ -43,7 +44,8 @@ __log2 (double x)
   return  __ieee754_log2 (x);
 }
 weak_alias (__log2, log2)
-#ifdef NO_LONG_DOUBLE
+# ifdef NO_LONG_DOUBLE
 strong_alias (__log2, __log2l)
 weak_alias (__log2, log2l)
+# endif
 #endif
index 6adaff6c7247eb1a9d879805d0b2d467cf0b80b6..82085d5222e87ced0ae80a2d7237db49af06a2a2 100644 (file)
@@ -22,6 +22,7 @@
 #include <math-svid-compat.h>
 
 
+#if LIBM_SVID_COMPAT
 /* wrapper log2f(x) */
 float
 __log2f (float x)
@@ -43,3 +44,4 @@ __log2f (float x)
   return  __ieee754_log2f (x);
 }
 weak_alias (__log2f, log2f)
+#endif
index f496c3630ee2ceb5b39f759b5c68b33233425c10..cd367f2f51f0524c8c29d8e713ac918c847e57b7 100644 (file)
@@ -22,6 +22,7 @@
 #include <math-svid-compat.h>
 
 
+#if LIBM_SVID_COMPAT
 /* wrapper log2l(x) */
 long double
 __log2l (long double x)
@@ -43,3 +44,4 @@ __log2l (long double x)
   return  __ieee754_log2l (x);
 }
 weak_alias (__log2l, log2l)
+#endif
index 82f3ff4eec93a0585f941f3eebb9977edbe909d3..80750b437106d819cb2525926752f8dfdec867b2 100644 (file)
@@ -22,6 +22,7 @@
 #include <math-svid-compat.h>
 
 
+#if LIBM_SVID_COMPAT
 /* wrapper log(x) */
 double
 __log (double x)
@@ -43,7 +44,8 @@ __log (double x)
   return  __ieee754_log (x);
 }
 weak_alias (__log, log)
-#ifdef NO_LONG_DOUBLE
+# ifdef NO_LONG_DOUBLE
 strong_alias (__log, __logl)
 weak_alias (__log, logl)
+# endif
 #endif
index ac18b65c5e92198ffd1aa207999e886918fbb7c6..4423bd527aaa85889c26ff2e9724015c40519301 100644 (file)
@@ -22,6 +22,7 @@
 #include <math-svid-compat.h>
 
 
+#if LIBM_SVID_COMPAT
 /* wrapper logf(x) */
 float
 __logf (float x)
@@ -43,3 +44,4 @@ __logf (float x)
   return  __ieee754_logf (x);
 }
 weak_alias (__logf, logf)
+#endif
index ba65830b6754fb37dfa0917f55e0369e43240040..e37a17475e17911fb4bdad2a7d8aac12aae37c3c 100644 (file)
@@ -22,6 +22,7 @@
 #include <math-svid-compat.h>
 
 
+#if LIBM_SVID_COMPAT
 /* wrapper logl(x) */
 long double
 __logl (long double x)
@@ -43,3 +44,4 @@ __logl (long double x)
   return  __ieee754_logl (x);
 }
 weak_alias (__logl, logl)
+#endif
index 367f609dc28beeaa525375f0f01b786b8125aa3a..4865f4d0d6d6be8d3c804cb881fdc9bb79ea6e29 100644 (file)
@@ -21,6 +21,7 @@
 #include <math-svid-compat.h>
 
 
+#if LIBM_SVID_COMPAT
 /* wrapper pow */
 double
 __pow (double x, double y)
@@ -59,7 +60,8 @@ __pow (double x, double y)
   return z;
 }
 weak_alias (__pow, pow)
-#ifdef NO_LONG_DOUBLE
+# ifdef NO_LONG_DOUBLE
 strong_alias (__pow, __powl)
 weak_alias (__pow, powl)
+# endif
 #endif
index afc3fced8045d4d50dc205f99bddcacd0515ec6b..ce1235baeec27804b979e8fa7719741c155f050e 100644 (file)
@@ -21,6 +21,7 @@
 #include <math-svid-compat.h>
 
 
+#if LIBM_SVID_COMPAT
 /* wrapper powf */
 float
 __powf (float x, float y)
@@ -59,3 +60,4 @@ __powf (float x, float y)
   return z;
 }
 weak_alias (__powf, powf)
+#endif
index b25dad870d334ac6c761eda552dc0fd8470cb960..9159f610d29dea1c16ac94b0de6534d4746415d2 100644 (file)
@@ -21,6 +21,7 @@
 #include <math-svid-compat.h>
 
 
+#if LIBM_SVID_COMPAT
 /* wrapper powl */
 long double
 __powl (long double x, long double y)
@@ -59,3 +60,4 @@ __powl (long double x, long double y)
   return z;
 }
 weak_alias (__powl, powl)
+#endif
index 6bf5d1ff2e7898e8d8a9b95632aa61e3a3ed3d91..68e322efdc87b8dcbfdaa92202def482c8c8b9a2 100644 (file)
@@ -21,6 +21,7 @@
 #include <math-svid-compat.h>
 
 
+#if LIBM_SVID_COMPAT
 /* wrapper remainder */
 double
 __remainder (double x, double y)
@@ -34,8 +35,9 @@ __remainder (double x, double y)
 }
 weak_alias (__remainder, remainder)
 weak_alias (__remainder, drem)
-#ifdef NO_LONG_DOUBLE
+# ifdef NO_LONG_DOUBLE
 strong_alias (__remainder, __remainderl)
 weak_alias (__remainder, remainderl)
 weak_alias (__remainder, dreml)
+# endif
 #endif
index 3ffefde83d5b5fbe2e5f7c777f505e4d275c244b..39ff3b44689d9d9e24024bd0bc073a0ad38a848c 100644 (file)
@@ -21,6 +21,7 @@
 #include <math-svid-compat.h>
 
 
+#if LIBM_SVID_COMPAT
 /* wrapper remainderf */
 float
 __remainderf (float x, float y)
@@ -34,3 +35,4 @@ __remainderf (float x, float y)
 }
 weak_alias (__remainderf, remainderf)
 weak_alias (__remainderf, dremf)
+#endif
index b01b0b1365301c7dea65f8376fa36a3de7ebc818..c11ba24a8ab0f407efc20c1da74d45fde7ff78bd 100644 (file)
@@ -21,6 +21,7 @@
 #include <math-svid-compat.h>
 
 
+#if LIBM_SVID_COMPAT
 /* wrapper remainderl */
 long double
 __remainderl (long double x, long double y)
@@ -34,3 +35,4 @@ __remainderl (long double x, long double y)
 }
 weak_alias (__remainderl, remainderl)
 weak_alias (__remainderl, dreml)
+#endif
index a31e54dd78e7e715614d5f97e59806ce88b235af..277e72441530171a44993f5d54bd0325e9df7e34 100644 (file)
@@ -22,6 +22,7 @@
 #include <math-svid-compat.h>
 
 
+#if LIBM_SVID_COMPAT
 static double
 __attribute__ ((noinline))
 sysv_scalb (double x, double fn)
@@ -40,15 +41,18 @@ sysv_scalb (double x, double fn)
 
   return z;
 }
+#endif
 
 
 /* Wrapper scalb */
 double
 __scalb (double x, double fn)
 {
+#if LIBM_SVID_COMPAT
   if (__glibc_unlikely (_LIB_VERSION == _SVID_))
     return sysv_scalb (x, fn);
   else
+#endif
     {
       double z = __ieee754_scalb (x, fn);
 
index 2b96df0cbfb3d414ff38a11db410aa6036033ca8..79798aef1e4aa8aeb1436e9f727a00d0c1e57dac 100644 (file)
@@ -22,6 +22,7 @@
 #include <math-svid-compat.h>
 
 
+#if LIBM_SVID_COMPAT
 static float
 __attribute__ ((noinline))
 sysv_scalbf (float x, float fn)
@@ -40,15 +41,18 @@ sysv_scalbf (float x, float fn)
 
   return z;
 }
+#endif
 
 
 /* Wrapper scalbf */
 float
 __scalbf (float x, float fn)
 {
+#if LIBM_SVID_COMPAT
   if (__glibc_unlikely (_LIB_VERSION == _SVID_))
     return sysv_scalbf (x, fn);
   else
+#endif
     {
       float z = __ieee754_scalbf (x, fn);
 
index a4a0f8e942ed2694bafe7e3c6c2d171c9a1e30e3..4c73e6b180df4b7e68d4edbd2b2d012f3439fd87 100644 (file)
@@ -22,6 +22,7 @@
 #include <math-svid-compat.h>
 
 
+#if LIBM_SVID_COMPAT
 static long double
 __attribute__ ((noinline))
 sysv_scalbl (long double x, long double fn)
@@ -40,15 +41,18 @@ sysv_scalbl (long double x, long double fn)
 
   return z;
 }
+#endif
 
 
 /* Wrapper scalbl */
 long double
 __scalbl (long double x, long double fn)
 {
+#if LIBM_SVID_COMPAT
   if (__glibc_unlikely (_LIB_VERSION == _SVID_))
     return sysv_scalbl (x, fn);
   else
+#endif
     {
       long double z = __ieee754_scalbl (x, fn);
 
index 121edfc8924a3c8e8e551be2788fd444c897bcec..e5c3724763d725943862ddbe5d0ef6965e1e9e81 100644 (file)
@@ -18,6 +18,7 @@
 #include <math_private.h>
 #include <math-svid-compat.h>
 
+#if LIBM_SVID_COMPAT
 double
 __sinh (double x)
 {
@@ -29,7 +30,8 @@ __sinh (double x)
        return z;
 }
 weak_alias (__sinh, sinh)
-#ifdef NO_LONG_DOUBLE
+# ifdef NO_LONG_DOUBLE
 strong_alias (__sinh, __sinhl)
 weak_alias (__sinh, sinhl)
+# endif
 #endif
index 2103b06253b8287ee87e33f7ec0f046903b9020a..1310ccf93bbdbca92fba19e8c20ec22dd74a49cf 100644 (file)
@@ -21,6 +21,7 @@
 #include <math_private.h>
 #include <math-svid-compat.h>
 
+#if LIBM_SVID_COMPAT
 float
 __sinhf (float x)
 {
@@ -32,3 +33,4 @@ __sinhf (float x)
        return z;
 }
 weak_alias (__sinhf, sinhf)
+#endif
index 57f08e7ecc7f5715285e0293cf81ff2852efdf21..348209860a62152d9bee967cd9d7440efe2021ac 100644 (file)
@@ -22,6 +22,7 @@
 #include <math_private.h>
 #include <math-svid-compat.h>
 
+#if LIBM_SVID_COMPAT
 long double
 __sinhl (long double x)
 {
@@ -33,3 +34,4 @@ __sinhl (long double x)
        return z;
 }
 weak_alias (__sinhl, sinhl)
+#endif
index 743df321d5d19011ffc6a2b9509de6eb0d50187d..aeead2e49c2bad906017412e2a4538c8e8f51f34 100644 (file)
@@ -21,6 +21,7 @@
 #include <math-svid-compat.h>
 
 
+#if LIBM_SVID_COMPAT
 /* wrapper sqrt */
 double
 __sqrt (double x)
@@ -31,7 +32,8 @@ __sqrt (double x)
   return __ieee754_sqrt (x);
 }
 weak_alias (__sqrt, sqrt)
-#ifdef NO_LONG_DOUBLE
+# ifdef NO_LONG_DOUBLE
 strong_alias (__sqrt, __sqrtl)
 weak_alias (__sqrt, sqrtl)
+# endif
 #endif
index 0689b4bb1a530b394fd7f75bdba0b72c05e053d7..bd3d5048fc45a6b1a1189b0f2ef9fd5bc84e2776 100644 (file)
@@ -21,6 +21,7 @@
 #include <math-svid-compat.h>
 
 
+#if LIBM_SVID_COMPAT
 /* wrapper sqrtf */
 float
 __sqrtf (float x)
@@ -31,3 +32,4 @@ __sqrtf (float x)
   return __ieee754_sqrtf (x);
 }
 weak_alias (__sqrtf, sqrtf)
+#endif
index 43e81acf0a9322b2462389dfe94a47b4ac7ec8b0..b0afd1171cf13db20b3db451ab70a9688dd50abb 100644 (file)
@@ -21,6 +21,7 @@
 #include <math-svid-compat.h>
 
 
+#if LIBM_SVID_COMPAT
 /* wrapper sqrtl */
 long double
 __sqrtl (long double x)
@@ -31,3 +32,4 @@ __sqrtl (long double x)
   return __ieee754_sqrtl (x);
 }
 weak_alias (__sqrtl, sqrtl)
+#endif
index 93bd48fd3ffceb3da865fa5b36203a4d149977cf..f843475f107859ca56e2df9ebbb91530001e536a 100644 (file)
@@ -20,6 +20,7 @@
 #include <math_private.h>
 #include <math-svid-compat.h>
 
+#if LIBM_SVID_COMPAT
 double
 __tgamma(double x)
 {
@@ -41,7 +42,8 @@ __tgamma(double x)
        return local_signgam < 0 ? -y : y;
 }
 weak_alias (__tgamma, tgamma)
-#ifdef NO_LONG_DOUBLE
+# ifdef NO_LONG_DOUBLE
 strong_alias (__tgamma, __tgammal)
 weak_alias (__tgamma, tgammal)
+# endif
 #endif
index e6ae48c1f5ab7843784d17cfb8bdf58d86e74656..796850b4d94f86311273d001e4c19f4baeae54fc 100644 (file)
@@ -18,6 +18,7 @@
 #include <math_private.h>
 #include <math-svid-compat.h>
 
+#if LIBM_SVID_COMPAT
 float
 __tgammaf(float x)
 {
@@ -43,3 +44,4 @@ __tgammaf(float x)
        return local_signgam < 0 ? - y : y;
 }
 weak_alias (__tgammaf, tgammaf)
+#endif
index 306f672077ab03c30e09dfe0a148339ef6c40f22..c0e442955bfbc2b92c3745ff895d9e2a308967be 100644 (file)
@@ -23,6 +23,7 @@
 #include <math_private.h>
 #include <math-svid-compat.h>
 
+#if LIBM_SVID_COMPAT
 long double
 __tgammal(long double x)
 {
@@ -44,3 +45,4 @@ __tgammal(long double x)
        return local_signgam < 0 ? - y : y;
 }
 weak_alias (__tgammal, tgammal)
+#endif
index 6116f7f32f0bbc47b50600f432e43b4daf621423..a75569919042b5d775f0627a9cfc80d2090289ea 100644 (file)
@@ -47,7 +47,9 @@
 /* Supply the generic macros.  */
 #include <math-type-macros.h>
 
-/* Do not use the type-generic wrapper templates.  */
-#define __USE_WRAPPER_TEMPLATE 0
+/* Do not use the type-generic wrapper templates if compatibility with
+   SVID error handling is needed.  */
+#include <math-svid-compat.h>
+#define __USE_WRAPPER_TEMPLATE !LIBM_SVID_COMPAT
 
 #endif
index 712e517a8112407745c614298e306acd8714c825..cc8c4b0bcdfd5afb2db88cec03065a01ca216506 100644 (file)
@@ -33,7 +33,9 @@
 /* Supply the generic macros.  */
 #include <math-type-macros.h>
 
-/* Do not use the type-generic wrapper templates.  */
-#define __USE_WRAPPER_TEMPLATE 0
+/* Do not use the type-generic wrapper templates if compatibility with
+   SVID error handling is needed.  */
+#include <math-svid-compat.h>
+#define __USE_WRAPPER_TEMPLATE !LIBM_SVID_COMPAT
 
 #endif
index 4e02e53f70d121e10e62b09834e2f9d6b73b6132..7dbd55924961d494712eba599deef7bd56cbdbd3 100644 (file)
@@ -30,7 +30,9 @@
 /* Supply the generic macros.  */
 #include <math-type-macros.h>
 
-/* Do not use the type-generic wrapper templates.  */
-#define __USE_WRAPPER_TEMPLATE 0
+/* Do not use the type-generic wrapper templates if compatibility with
+   SVID error handling is needed.  */
+#include <math-svid-compat.h>
+#define __USE_WRAPPER_TEMPLATE !LIBM_SVID_COMPAT
 
 #endif
diff --git a/sysdeps/i386/fpu/w_sqrt.c b/sysdeps/i386/fpu/w_sqrt.c
new file mode 100644 (file)
index 0000000..d37a5d5
--- /dev/null
@@ -0,0 +1,9 @@
+/* The inline __ieee754_sqrt is not correctly rounding; it's OK for
+   most internal uses in glibc, but not for sqrt itself.  */
+#define __ieee754_sqrt __avoid_ieee754_sqrt
+#include <math.h>
+#include <math_private.h>
+#undef __ieee754_sqrt
+extern double __ieee754_sqrt (double);
+#include <math-type-macros-double.h>
+#include <w_sqrt_template.c>
diff --git a/sysdeps/ia64/fpu/w_acos.c b/sysdeps/ia64/fpu/w_acos.c
new file mode 100644 (file)
index 0000000..1cc8931
--- /dev/null
@@ -0,0 +1 @@
+/* Not needed.  */
diff --git a/sysdeps/ia64/fpu/w_acosf.c b/sysdeps/ia64/fpu/w_acosf.c
new file mode 100644 (file)
index 0000000..1cc8931
--- /dev/null
@@ -0,0 +1 @@
+/* Not needed.  */
diff --git a/sysdeps/ia64/fpu/w_acosh.c b/sysdeps/ia64/fpu/w_acosh.c
new file mode 100644 (file)
index 0000000..1cc8931
--- /dev/null
@@ -0,0 +1 @@
+/* Not needed.  */
diff --git a/sysdeps/ia64/fpu/w_acoshf.c b/sysdeps/ia64/fpu/w_acoshf.c
new file mode 100644 (file)
index 0000000..1cc8931
--- /dev/null
@@ -0,0 +1 @@
+/* Not needed.  */
diff --git a/sysdeps/ia64/fpu/w_acoshl.c b/sysdeps/ia64/fpu/w_acoshl.c
new file mode 100644 (file)
index 0000000..1cc8931
--- /dev/null
@@ -0,0 +1 @@
+/* Not needed.  */
diff --git a/sysdeps/ia64/fpu/w_acosl.c b/sysdeps/ia64/fpu/w_acosl.c
new file mode 100644 (file)
index 0000000..1cc8931
--- /dev/null
@@ -0,0 +1 @@
+/* Not needed.  */
diff --git a/sysdeps/ia64/fpu/w_asin.c b/sysdeps/ia64/fpu/w_asin.c
new file mode 100644 (file)
index 0000000..1cc8931
--- /dev/null
@@ -0,0 +1 @@
+/* Not needed.  */
diff --git a/sysdeps/ia64/fpu/w_asinf.c b/sysdeps/ia64/fpu/w_asinf.c
new file mode 100644 (file)
index 0000000..1cc8931
--- /dev/null
@@ -0,0 +1 @@
+/* Not needed.  */
diff --git a/sysdeps/ia64/fpu/w_asinl.c b/sysdeps/ia64/fpu/w_asinl.c
new file mode 100644 (file)
index 0000000..1cc8931
--- /dev/null
@@ -0,0 +1 @@
+/* Not needed.  */
diff --git a/sysdeps/ia64/fpu/w_atan2.c b/sysdeps/ia64/fpu/w_atan2.c
new file mode 100644 (file)
index 0000000..1cc8931
--- /dev/null
@@ -0,0 +1 @@
+/* Not needed.  */
diff --git a/sysdeps/ia64/fpu/w_atan2f.c b/sysdeps/ia64/fpu/w_atan2f.c
new file mode 100644 (file)
index 0000000..1cc8931
--- /dev/null
@@ -0,0 +1 @@
+/* Not needed.  */
diff --git a/sysdeps/ia64/fpu/w_atan2l.c b/sysdeps/ia64/fpu/w_atan2l.c
new file mode 100644 (file)
index 0000000..1cc8931
--- /dev/null
@@ -0,0 +1 @@
+/* Not needed.  */
diff --git a/sysdeps/ia64/fpu/w_atanh.c b/sysdeps/ia64/fpu/w_atanh.c
new file mode 100644 (file)
index 0000000..1cc8931
--- /dev/null
@@ -0,0 +1 @@
+/* Not needed.  */
diff --git a/sysdeps/ia64/fpu/w_atanhf.c b/sysdeps/ia64/fpu/w_atanhf.c
new file mode 100644 (file)
index 0000000..1cc8931
--- /dev/null
@@ -0,0 +1 @@
+/* Not needed.  */
diff --git a/sysdeps/ia64/fpu/w_atanhl.c b/sysdeps/ia64/fpu/w_atanhl.c
new file mode 100644 (file)
index 0000000..1cc8931
--- /dev/null
@@ -0,0 +1 @@
+/* Not needed.  */
diff --git a/sysdeps/ia64/fpu/w_cosh.c b/sysdeps/ia64/fpu/w_cosh.c
new file mode 100644 (file)
index 0000000..1cc8931
--- /dev/null
@@ -0,0 +1 @@
+/* Not needed.  */
diff --git a/sysdeps/ia64/fpu/w_coshf.c b/sysdeps/ia64/fpu/w_coshf.c
new file mode 100644 (file)
index 0000000..1cc8931
--- /dev/null
@@ -0,0 +1 @@
+/* Not needed.  */
diff --git a/sysdeps/ia64/fpu/w_coshl.c b/sysdeps/ia64/fpu/w_coshl.c
new file mode 100644 (file)
index 0000000..1cc8931
--- /dev/null
@@ -0,0 +1 @@
+/* Not needed.  */
diff --git a/sysdeps/ia64/fpu/w_exp.c b/sysdeps/ia64/fpu/w_exp.c
new file mode 100644 (file)
index 0000000..1cc8931
--- /dev/null
@@ -0,0 +1 @@
+/* Not needed.  */
diff --git a/sysdeps/ia64/fpu/w_exp10.c b/sysdeps/ia64/fpu/w_exp10.c
new file mode 100644 (file)
index 0000000..1cc8931
--- /dev/null
@@ -0,0 +1 @@
+/* Not needed.  */
diff --git a/sysdeps/ia64/fpu/w_exp10f.c b/sysdeps/ia64/fpu/w_exp10f.c
new file mode 100644 (file)
index 0000000..1cc8931
--- /dev/null
@@ -0,0 +1 @@
+/* Not needed.  */
diff --git a/sysdeps/ia64/fpu/w_exp10l.c b/sysdeps/ia64/fpu/w_exp10l.c
new file mode 100644 (file)
index 0000000..1cc8931
--- /dev/null
@@ -0,0 +1 @@
+/* Not needed.  */
diff --git a/sysdeps/ia64/fpu/w_exp2.c b/sysdeps/ia64/fpu/w_exp2.c
new file mode 100644 (file)
index 0000000..1cc8931
--- /dev/null
@@ -0,0 +1 @@
+/* Not needed.  */
diff --git a/sysdeps/ia64/fpu/w_exp2f.c b/sysdeps/ia64/fpu/w_exp2f.c
new file mode 100644 (file)
index 0000000..1cc8931
--- /dev/null
@@ -0,0 +1 @@
+/* Not needed.  */
diff --git a/sysdeps/ia64/fpu/w_exp2l.c b/sysdeps/ia64/fpu/w_exp2l.c
new file mode 100644 (file)
index 0000000..1cc8931
--- /dev/null
@@ -0,0 +1 @@
+/* Not needed.  */
diff --git a/sysdeps/ia64/fpu/w_expf.c b/sysdeps/ia64/fpu/w_expf.c
new file mode 100644 (file)
index 0000000..1cc8931
--- /dev/null
@@ -0,0 +1 @@
+/* Not needed.  */
diff --git a/sysdeps/ia64/fpu/w_expl.c b/sysdeps/ia64/fpu/w_expl.c
new file mode 100644 (file)
index 0000000..1cc8931
--- /dev/null
@@ -0,0 +1 @@
+/* Not needed.  */
diff --git a/sysdeps/ia64/fpu/w_fmod.c b/sysdeps/ia64/fpu/w_fmod.c
new file mode 100644 (file)
index 0000000..1cc8931
--- /dev/null
@@ -0,0 +1 @@
+/* Not needed.  */
diff --git a/sysdeps/ia64/fpu/w_fmodf.c b/sysdeps/ia64/fpu/w_fmodf.c
new file mode 100644 (file)
index 0000000..1cc8931
--- /dev/null
@@ -0,0 +1 @@
+/* Not needed.  */
diff --git a/sysdeps/ia64/fpu/w_fmodl.c b/sysdeps/ia64/fpu/w_fmodl.c
new file mode 100644 (file)
index 0000000..1cc8931
--- /dev/null
@@ -0,0 +1 @@
+/* Not needed.  */
diff --git a/sysdeps/ia64/fpu/w_hypot.c b/sysdeps/ia64/fpu/w_hypot.c
new file mode 100644 (file)
index 0000000..1cc8931
--- /dev/null
@@ -0,0 +1 @@
+/* Not needed.  */
diff --git a/sysdeps/ia64/fpu/w_hypotf.c b/sysdeps/ia64/fpu/w_hypotf.c
new file mode 100644 (file)
index 0000000..1cc8931
--- /dev/null
@@ -0,0 +1 @@
+/* Not needed.  */
diff --git a/sysdeps/ia64/fpu/w_hypotl.c b/sysdeps/ia64/fpu/w_hypotl.c
new file mode 100644 (file)
index 0000000..1cc8931
--- /dev/null
@@ -0,0 +1 @@
+/* Not needed.  */
diff --git a/sysdeps/ia64/fpu/w_lgamma_r.c b/sysdeps/ia64/fpu/w_lgamma_r.c
new file mode 100644 (file)
index 0000000..1cc8931
--- /dev/null
@@ -0,0 +1 @@
+/* Not needed.  */
diff --git a/sysdeps/ia64/fpu/w_lgammaf_r.c b/sysdeps/ia64/fpu/w_lgammaf_r.c
new file mode 100644 (file)
index 0000000..1cc8931
--- /dev/null
@@ -0,0 +1 @@
+/* Not needed.  */
diff --git a/sysdeps/ia64/fpu/w_lgammal_r.c b/sysdeps/ia64/fpu/w_lgammal_r.c
new file mode 100644 (file)
index 0000000..1cc8931
--- /dev/null
@@ -0,0 +1 @@
+/* Not needed.  */
diff --git a/sysdeps/ia64/fpu/w_log.c b/sysdeps/ia64/fpu/w_log.c
new file mode 100644 (file)
index 0000000..1cc8931
--- /dev/null
@@ -0,0 +1 @@
+/* Not needed.  */
diff --git a/sysdeps/ia64/fpu/w_log10.c b/sysdeps/ia64/fpu/w_log10.c
new file mode 100644 (file)
index 0000000..1cc8931
--- /dev/null
@@ -0,0 +1 @@
+/* Not needed.  */
diff --git a/sysdeps/ia64/fpu/w_log10f.c b/sysdeps/ia64/fpu/w_log10f.c
new file mode 100644 (file)
index 0000000..1cc8931
--- /dev/null
@@ -0,0 +1 @@
+/* Not needed.  */
diff --git a/sysdeps/ia64/fpu/w_log10l.c b/sysdeps/ia64/fpu/w_log10l.c
new file mode 100644 (file)
index 0000000..1cc8931
--- /dev/null
@@ -0,0 +1 @@
+/* Not needed.  */
diff --git a/sysdeps/ia64/fpu/w_log2.c b/sysdeps/ia64/fpu/w_log2.c
new file mode 100644 (file)
index 0000000..1cc8931
--- /dev/null
@@ -0,0 +1 @@
+/* Not needed.  */
diff --git a/sysdeps/ia64/fpu/w_log2f.c b/sysdeps/ia64/fpu/w_log2f.c
new file mode 100644 (file)
index 0000000..1cc8931
--- /dev/null
@@ -0,0 +1 @@
+/* Not needed.  */
diff --git a/sysdeps/ia64/fpu/w_log2l.c b/sysdeps/ia64/fpu/w_log2l.c
new file mode 100644 (file)
index 0000000..1cc8931
--- /dev/null
@@ -0,0 +1 @@
+/* Not needed.  */
diff --git a/sysdeps/ia64/fpu/w_logf.c b/sysdeps/ia64/fpu/w_logf.c
new file mode 100644 (file)
index 0000000..1cc8931
--- /dev/null
@@ -0,0 +1 @@
+/* Not needed.  */
diff --git a/sysdeps/ia64/fpu/w_logl.c b/sysdeps/ia64/fpu/w_logl.c
new file mode 100644 (file)
index 0000000..1cc8931
--- /dev/null
@@ -0,0 +1 @@
+/* Not needed.  */
diff --git a/sysdeps/ia64/fpu/w_pow.c b/sysdeps/ia64/fpu/w_pow.c
new file mode 100644 (file)
index 0000000..1cc8931
--- /dev/null
@@ -0,0 +1 @@
+/* Not needed.  */
diff --git a/sysdeps/ia64/fpu/w_powf.c b/sysdeps/ia64/fpu/w_powf.c
new file mode 100644 (file)
index 0000000..1cc8931
--- /dev/null
@@ -0,0 +1 @@
+/* Not needed.  */
diff --git a/sysdeps/ia64/fpu/w_powl.c b/sysdeps/ia64/fpu/w_powl.c
new file mode 100644 (file)
index 0000000..1cc8931
--- /dev/null
@@ -0,0 +1 @@
+/* Not needed.  */
diff --git a/sysdeps/ia64/fpu/w_remainder.c b/sysdeps/ia64/fpu/w_remainder.c
new file mode 100644 (file)
index 0000000..1cc8931
--- /dev/null
@@ -0,0 +1 @@
+/* Not needed.  */
diff --git a/sysdeps/ia64/fpu/w_remainderf.c b/sysdeps/ia64/fpu/w_remainderf.c
new file mode 100644 (file)
index 0000000..1cc8931
--- /dev/null
@@ -0,0 +1 @@
+/* Not needed.  */
diff --git a/sysdeps/ia64/fpu/w_remainderl.c b/sysdeps/ia64/fpu/w_remainderl.c
new file mode 100644 (file)
index 0000000..1cc8931
--- /dev/null
@@ -0,0 +1 @@
+/* Not needed.  */
diff --git a/sysdeps/ia64/fpu/w_sinh.c b/sysdeps/ia64/fpu/w_sinh.c
new file mode 100644 (file)
index 0000000..1cc8931
--- /dev/null
@@ -0,0 +1 @@
+/* Not needed.  */
diff --git a/sysdeps/ia64/fpu/w_sinhf.c b/sysdeps/ia64/fpu/w_sinhf.c
new file mode 100644 (file)
index 0000000..1cc8931
--- /dev/null
@@ -0,0 +1 @@
+/* Not needed.  */
diff --git a/sysdeps/ia64/fpu/w_sinhl.c b/sysdeps/ia64/fpu/w_sinhl.c
new file mode 100644 (file)
index 0000000..1cc8931
--- /dev/null
@@ -0,0 +1 @@
+/* Not needed.  */
diff --git a/sysdeps/ia64/fpu/w_sqrt.c b/sysdeps/ia64/fpu/w_sqrt.c
new file mode 100644 (file)
index 0000000..1cc8931
--- /dev/null
@@ -0,0 +1 @@
+/* Not needed.  */
diff --git a/sysdeps/ia64/fpu/w_sqrtf.c b/sysdeps/ia64/fpu/w_sqrtf.c
new file mode 100644 (file)
index 0000000..1cc8931
--- /dev/null
@@ -0,0 +1 @@
+/* Not needed.  */
diff --git a/sysdeps/ia64/fpu/w_sqrtl.c b/sysdeps/ia64/fpu/w_sqrtl.c
new file mode 100644 (file)
index 0000000..1cc8931
--- /dev/null
@@ -0,0 +1 @@
+/* Not needed.  */
diff --git a/sysdeps/ia64/fpu/w_tgamma.c b/sysdeps/ia64/fpu/w_tgamma.c
new file mode 100644 (file)
index 0000000..1cc8931
--- /dev/null
@@ -0,0 +1 @@
+/* Not needed.  */
diff --git a/sysdeps/ia64/fpu/w_tgammaf.c b/sysdeps/ia64/fpu/w_tgammaf.c
new file mode 100644 (file)
index 0000000..1cc8931
--- /dev/null
@@ -0,0 +1 @@
+/* Not needed.  */
diff --git a/sysdeps/ia64/fpu/w_tgammal.c b/sysdeps/ia64/fpu/w_tgammal.c
new file mode 100644 (file)
index 0000000..1cc8931
--- /dev/null
@@ -0,0 +1 @@
+/* Not needed.  */
index 69ec0a1ebc3169972b77cc44b67b334904d443a6..98aa5b76a01dd8f9d8c7e38c8ff82694608a6f3e 100644 (file)
@@ -20,6 +20,7 @@
 #include <math_private.h>
 #include <math-svid-compat.h>
 
+#if LIBM_SVID_COMPAT
 /* wrapper exp */
 double
 __exp (double x)
@@ -33,7 +34,8 @@ __exp (double x)
 }
 hidden_def (__exp)
 weak_alias (__exp, exp)
-#ifdef NO_LONG_DOUBLE
+# ifdef NO_LONG_DOUBLE
 strong_alias (__exp, __expl)
 weak_alias (__exp, expl)
+# endif
 #endif
index 8a1fa51e46e923c0e1e79648d9264e8caa4efc52..a38ff4082dc5c8e1b19dcf237baec521510b84ce 100644 (file)
@@ -20,6 +20,7 @@
 #include <math_private.h>
 #include <math-svid-compat.h>
 
+#if LIBM_SVID_COMPAT
 /* wrapper expf */
 float
 __expf (float x)
@@ -33,3 +34,4 @@ __expf (float x)
 }
 hidden_def (__expf)
 weak_alias (__expf, expf)
+#endif
index 8f906bd604dd1030b03a2b56e27d2e1a1d1d0955..f74f9c712e92e45c9b7fdfa592c6f13f55fc4605 100644 (file)
@@ -21,23 +21,25 @@ static char rcsid[] = "$NetBSD: k_standard.c,v 1.6 1995/05/10 20:46:35 jtc Exp $
 
 #include <assert.h>
 
-#ifndef _USE_WRITE
-#include <stdio.h>                     /* fputs(), stderr */
-#define        WRITE2(u,v)     fputs(u, stderr)
-#else  /* !defined(_USE_WRITE) */
-#include <unistd.h>                    /* write */
-#define        WRITE2(u,v)     write(2, u, v)
-#undef fflush
-#endif /* !defined(_USE_WRITE) */
+#if LIBM_SVID_COMPAT
+
+# ifndef _USE_WRITE
+#  include <stdio.h>                   /* fputs(), stderr */
+#  define      WRITE2(u,v)     fputs(u, stderr)
+# else /* !defined(_USE_WRITE) */
+#  include <unistd.h>                  /* write */
+#  define      WRITE2(u,v)     write(2, u, v)
+#  undef fflush
+# endif        /* !defined(_USE_WRITE) */
 
 /* XXX gcc versions until now don't delay the 0.0/0.0 division until
    runtime but produce NaN at compile time.  This is wrong since the
    exceptions are not set correctly.  */
-#if 0
+# if 0
 static const double zero = 0.0;        /* used as const */
-#else
+# else
 static double zero = 0.0;      /* used as const */
-#endif
+# endif
 
 /*
  * Standard conformance (non-IEEE) on exception cases.
@@ -97,21 +99,21 @@ double
 __kernel_standard(double x, double y, int type)
 {
        struct exception exc;
-#ifndef HUGE_VAL       /* this is the only routine that uses HUGE_VAL */
-#define HUGE_VAL inf
+# ifndef HUGE_VAL      /* this is the only routine that uses HUGE_VAL */
+# define HUGE_VAL inf
        double inf = 0.0;
 
        SET_HIGH_WORD(inf,0x7ff00000);  /* set inf to infinite */
-#endif
+# endif
 
        /* The SVID struct exception uses a field "char *name;".  */
-#define CSTR(func) ((char *) (type < 100                               \
+# define CSTR(func) ((char *) (type < 100                              \
                              ? func                                    \
                              : (type < 200 ? func "f" : func "l")))
 
-#ifdef _USE_WRITE
+# ifdef _USE_WRITE
        (void) fflush(stdout);
-#endif
+# endif
        exc.arg1 = x;
        exc.arg2 = y;
        switch(type) {
@@ -945,3 +947,4 @@ __kernel_standard(double x, double y, int type)
        }
        return exc.retval;
 }
+#endif
index 85b2003daff20ec41fa105a64d66bd0a93209dfc..62d25d22dbb873891ac162329b8c5f0de8ff5c73 100644 (file)
@@ -21,6 +21,7 @@
 #include <math-svid-compat.h>
 
 
+#if LIBM_SVID_COMPAT
 /* Handle errors for a libm function as specified by TYPE (see
    comments in k_standard.c for details), with arguments X and Y,
    returning the appropriate return value for that function.  */
@@ -30,3 +31,4 @@ __kernel_standard_f (float x, float y, int type)
 {
   return __kernel_standard (x, y, type);
 }
+#endif
index 783fd0b87dff5df4246860f6de6d7d2a46d6bdbb..484ec913544c0eaea8dbf39c432ed088547b6240 100644 (file)
@@ -38,6 +38,8 @@
 #include <errno.h>
 
 
+#if LIBM_SVID_COMPAT
+
 static double zero = 0.0;
 
 /* Handle errors for a libm function as specified by TYPE (see
@@ -106,3 +108,4 @@ __kernel_standard_l (long double x, long double y, int type)
       return __kernel_standard (dx, dy, type);
     }
 }
+#endif
index e0fa9e350182ea48cc8376c68e8b7d4ecb714703..ec076deaad4c356d2a5ec8d545917462c1f0e823 100644 (file)
@@ -26,18 +26,20 @@ static char rcsid[] = "$NetBSD: $";
 #include <math_private.h>
 #include <math-svid-compat.h>
 
+#if LIBM_SVID_COMPAT
 long double __expl(long double x)      /* wrapper exp */
 {
-#ifdef _IEEE_LIBM
+# ifdef _IEEE_LIBM
        return __ieee754_expl(x);
-#else
+# else
        long double z = __ieee754_expl (x);
        if (__glibc_unlikely (!isfinite (z) || z == 0)
            && isfinite (x) && _LIB_VERSION != _IEEE_)
          return __kernel_standard_l (x, x, 206 + !!signbit (x));
 
        return z;
-#endif
+# endif
 }
 hidden_def (__expl)
 weak_alias (__expl, expl)
+#endif
index 019a48fb0d5133a39a6cde07397a7cf8b1cb220b..53948a96e62750295667b9acea2332fb04c4f22b 100644 (file)
@@ -3,6 +3,7 @@
 #include <math-svid-compat.h>
 #include <math_ldbl_opt.h>
 
+#if LIBM_SVID_COMPAT
 long double __expl(long double x)      /* wrapper exp  */
 {
   long double z;
@@ -20,3 +21,4 @@ long double __expl(long double x)     /* wrapper exp  */
 }
 hidden_def (__expl)
 long_double_symbol (libm, __expl, expl);
+#endif
index 37c153e2a42dc4cae7345c6f141972e6067bea1f..037e8bf348c77ec01c07cbab1ab7e8af4db8230e 100644 (file)
@@ -2,4 +2,6 @@
 #undef weak_alias
 #define weak_alias(n,a)
 #include <sysdeps/ieee754/ldbl-128/w_expl_compat.c>
+#if LIBM_SVID_COMPAT
 long_double_symbol (libm, __expl, expl);
+#endif
index c9e6003a43096e12956b34c0e4a297d1f5a265e4..ae9ab586cbd9e882bc5d7373430c3b323ba6c3f9 100644 (file)
@@ -20,6 +20,7 @@
 #include <math_private.h>
 #include <math-svid-compat.h>
 
+#if LIBM_SVID_COMPAT
 /* wrapper expl */
 long double
 __expl (long double x)
@@ -33,3 +34,4 @@ __expl (long double x)
 }
 hidden_def (__expl)
 weak_alias (__expl, expl)
+#endif
index df4338d9fa2ca6fda37cba4ebe3007d3f7feadb4..f66964a138b58ea639cc62dbab7d0c39905ca96e 100644 (file)
@@ -2,4 +2,6 @@
 #undef weak_alias
 #define weak_alias(n,a)
 #include <math/w_acoshl_compat.c>
+#if LIBM_SVID_COMPAT
 long_double_symbol (libm, __acoshl, acoshl);
+#endif
index 5efc99024c684747c57b5da4582079b9f9b52433..ff33e9a9edf182ff028faa147b957e2c6bb8bbb7 100644 (file)
@@ -2,4 +2,6 @@
 #undef weak_alias
 #define weak_alias(n,a)
 #include <math/w_acosl_compat.c>
+#if LIBM_SVID_COMPAT
 long_double_symbol (libm, __acosl, acosl);
+#endif
index 087fab25bbbc99ec1d4425a140dd8878b0a59d4f..a53f1cb1f50a460d7cc0f2ff7fbdbaaa3367dec0 100644 (file)
@@ -2,4 +2,6 @@
 #undef weak_alias
 #define weak_alias(n,a)
 #include <math/w_asinl_compat.c>
+#if LIBM_SVID_COMPAT
 long_double_symbol (libm, __asinl, asinl);
+#endif
index 6b12209625e3571163800a68d5a3ea073b285d26..c70f77e4c44c85929c1e1096ac4c6fd9e5846d22 100644 (file)
@@ -2,4 +2,6 @@
 #undef weak_alias
 #define weak_alias(n,a)
 #include <math/w_atan2l_compat.c>
+#if LIBM_SVID_COMPAT
 long_double_symbol (libm, __atan2l, atan2l);
+#endif
index 49bae1ee8f7cabe67ca70d4df09e0b0e46ddb8b4..67450c58591895f756af2bfe17d33ab1e2412af0 100644 (file)
@@ -2,4 +2,6 @@
 #undef weak_alias
 #define weak_alias(n,a)
 #include <math/w_atanhl_compat.c>
+#if LIBM_SVID_COMPAT
 long_double_symbol (libm, __atanhl, atanhl);
+#endif
index a8808778ba4f5a9ff691a35906e81b21a722d464..392511bab6b976a23fed5571f4e352b1e36c6472 100644 (file)
@@ -2,4 +2,6 @@
 #undef weak_alias
 #define weak_alias(n,a)
 #include <math/w_coshl_compat.c>
+#if LIBM_SVID_COMPAT
 long_double_symbol (libm, __coshl, coshl);
+#endif
index cf154882fee6dd62ad115679e931fe137193c56c..5a52a75ba580c9d041b4b990247020ce798e639b 100644 (file)
@@ -4,15 +4,17 @@
 #undef compat_symbol
 #define compat_symbol(l,n,a,v)
 #include <math/w_exp10l_compat.c>
+#if LIBM_SVID_COMPAT
 long_double_symbol (libm, __exp10l, exp10l);
-#if SHLIB_COMPAT (libm, GLIBC_2_1, GLIBC_2_27)
+# if SHLIB_COMPAT (libm, GLIBC_2_1, GLIBC_2_27)
 /* compat_symbol was undefined and redefined above to avoid the
    default pow10l compat symbol at version GLIBC_2_1 (as for ldbl-opt
    configurations, that version should have the alias to exp10).  So
    it now needs to be redefined to define the compat symbol at version
    LONG_DOUBLE_COMPAT_VERSION.  */
-# undef compat_symbol
-# define compat_symbol(lib, local, symbol, version)    \
+#  undef compat_symbol
+#  define compat_symbol(lib, local, symbol, version)   \
   compat_symbol_reference (lib, local, symbol, version)
 compat_symbol (libm, __pow10l, pow10l, LONG_DOUBLE_COMPAT_VERSION);
+# endif
 #endif
index 88fe0ac4d273d9b109e88c5aea110a4a500ee2f9..12419e30605577b960a95f3588fbc601ee1fbefb 100644 (file)
@@ -2,4 +2,6 @@
 #undef weak_alias
 #define weak_alias(n,a)
 #include <math/w_fmodl_compat.c>
+#if LIBM_SVID_COMPAT
 long_double_symbol (libm, __fmodl, fmodl);
+#endif
index 68e399748987c475216590842967dd2732f56226..b87bac7ce8f1d8e4367efed97aa42b474db229c5 100644 (file)
@@ -2,4 +2,6 @@
 #undef weak_alias
 #define weak_alias(n,a)
 #include <math/w_hypotl_compat.c>
+#if LIBM_SVID_COMPAT
 long_double_symbol (libm, __hypotl, hypotl);
+#endif
index 9050657e03f32d97e469c359b2dbe955073d77c6..8fc865128d744dd606a080f8213e204a9fe3d07f 100644 (file)
@@ -2,5 +2,7 @@
 #undef weak_alias
 #define weak_alias(n,a)
 #include <math/w_j0l_compat.c>
+#if LIBM_SVID_COMPAT
 long_double_symbol (libm, __j0l, j0l);
 long_double_symbol (libm, __y0l, y0l);
+#endif
index 4ed9e2dd12e7b7194929c5f9c0be2f95a3c89770..85b3feed9fa39f3ff01b7c7baad48214fe44f258 100644 (file)
@@ -2,5 +2,7 @@
 #undef weak_alias
 #define weak_alias(n,a)
 #include <math/w_j1l_compat.c>
+#if LIBM_SVID_COMPAT
 long_double_symbol (libm, __j1l, j1l);
 long_double_symbol (libm, __y1l, y1l);
+#endif
index d22ee549974a2f0d2d892812055e2d6933efa21d..9b2c9985360f9aa6c6700f374018f1a535180b82 100644 (file)
@@ -2,5 +2,7 @@
 #undef weak_alias
 #define weak_alias(n,a)
 #include <math/w_jnl_compat.c>
+#if LIBM_SVID_COMPAT
 long_double_symbol (libm, __jnl, jnl);
 long_double_symbol (libm, __ynl, ynl);
+#endif
index 6fdf2bba87aade38ad855215f039084c36f2630b..431aa5d15c0d22203b7220022e63b2d444befff4 100644 (file)
@@ -2,4 +2,6 @@
 #undef weak_alias
 #define weak_alias(n,a)
 #include <math/w_lgammal_r_compat.c>
+#if LIBM_SVID_COMPAT
 long_double_symbol (libm, __lgammal_r, lgammal_r);
+#endif
index 17de3e78561b27be2995e4d4f60d4f47709f7a36..6eb9ea7928b4dc07dd6052c605a17df84958310d 100644 (file)
@@ -2,4 +2,6 @@
 #undef weak_alias
 #define weak_alias(n,a)
 #include <math/w_log10l_compat.c>
+#if LIBM_SVID_COMPAT
 long_double_symbol (libm, __log10l, log10l);
+#endif
index 3c5e73457309330532bf45cfc33f20e2df5a0cf5..1507e937b81d645b32605ba9d215aec575915380 100644 (file)
@@ -2,4 +2,6 @@
 #undef weak_alias
 #define weak_alias(n,a)
 #include <math/w_log2l_compat.c>
+#if LIBM_SVID_COMPAT
 long_double_symbol (libm, __log2l, log2l);
+#endif
index 2b5584213934cbc6d66b49196452a975651f0acc..6b71ef26591d930607117259f4b571701d834b40 100644 (file)
@@ -2,4 +2,6 @@
 #undef weak_alias
 #define weak_alias(n,a)
 #include <math/w_logl_compat.c>
+#if LIBM_SVID_COMPAT
 long_double_symbol (libm, __logl, logl);
+#endif
index 1897cf1c632f22476f5273f171cfb9b3327b2efd..c6f8d859be2ae475c5d475ce8a8479e8993f7b41 100644 (file)
@@ -2,4 +2,6 @@
 #undef weak_alias
 #define weak_alias(n,a)
 #include <math/w_powl_compat.c>
+#if LIBM_SVID_COMPAT
 long_double_symbol (libm, __powl, powl);
+#endif
index b2ce5c9563736ff13cd758db7c1066a9a648e938..849d2db425efdf547fbbed5bb2a60468a3cae79d 100644 (file)
@@ -2,6 +2,8 @@
 #undef weak_alias
 #define weak_alias(n,a)
 #include <math/w_remainderl_compat.c>
+#if LIBM_SVID_COMPAT
 long_double_symbol (libm, __remainderl, remainderl);
 strong_alias (__remainderl, __dreml)
 long_double_symbol (libm, __dreml, dreml);
+#endif
index 305ed823571d337cf919f14ddb28818c18245f3b..8fce55c74f97a8dd0a7b6a06659a77cbd740ba1a 100644 (file)
@@ -2,4 +2,6 @@
 #undef weak_alias
 #define weak_alias(n,a)
 #include <math/w_sinhl_compat.c>
+#if LIBM_SVID_COMPAT
 long_double_symbol (libm, __sinhl, sinhl);
+#endif
index 1e4526f2c6660e83c8b44185acddec46b7520495..05be9177723d868f95a4f3894efaea727282035e 100644 (file)
@@ -2,4 +2,6 @@
 #undef weak_alias
 #define weak_alias(n,a)
 #include <math/w_sqrtl_compat.c>
+#if LIBM_SVID_COMPAT
 long_double_symbol (libm, __sqrtl, sqrtl);
+#endif
index aaf5403522173fc9e4e1a74770fab0a32b940fb7..8c201ca8e2a4a33de3477dc9d8073a49913dfc6c 100644 (file)
@@ -2,4 +2,6 @@
 #undef weak_alias
 #define weak_alias(n,a)
 #include <math/w_tgammal_compat.c>
+#if LIBM_SVID_COMPAT
 long_double_symbol (libm, __tgammal, tgammal);
+#endif