diff options
Diffstat (limited to 'math')
70 files changed, 185 insertions, 40 deletions
diff --git a/math/lgamma-compat.h b/math/lgamma-compat.h index 189d126882..b7b6b36d16 100644 --- a/math/lgamma-compat.h +++ b/math/lgamma-compat.h @@ -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 diff --git a/math/w_acos_compat.c b/math/w_acos_compat.c index 5115732a83..1930105153 100644 --- a/math/w_acos_compat.c +++ b/math/w_acos_compat.c @@ -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 diff --git a/math/w_acosf_compat.c b/math/w_acosf_compat.c index 0bf557c9c5..97cac13cd6 100644 --- a/math/w_acosf_compat.c +++ b/math/w_acosf_compat.c @@ -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 diff --git a/math/w_acosh_compat.c b/math/w_acosh_compat.c index 31251ce760..f6d298e17b 100644 --- a/math/w_acosh_compat.c +++ b/math/w_acosh_compat.c @@ -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 diff --git a/math/w_acoshf_compat.c b/math/w_acoshf_compat.c index 6a4482e534..7a8c87bf4f 100644 --- a/math/w_acoshf_compat.c +++ b/math/w_acoshf_compat.c @@ -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 diff --git a/math/w_acoshl_compat.c b/math/w_acoshl_compat.c index b9f66c53ef..79d0370eb3 100644 --- a/math/w_acoshl_compat.c +++ b/math/w_acoshl_compat.c @@ -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 diff --git a/math/w_acosl_compat.c b/math/w_acosl_compat.c index 66600b5d38..7d2f1835ae 100644 --- a/math/w_acosl_compat.c +++ b/math/w_acosl_compat.c @@ -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 diff --git a/math/w_asin_compat.c b/math/w_asin_compat.c index 59beea817d..7780f85883 100644 --- a/math/w_asin_compat.c +++ b/math/w_asin_compat.c @@ -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 diff --git a/math/w_asinf_compat.c b/math/w_asinf_compat.c index 0eb20b10b5..10ee32328e 100644 --- a/math/w_asinf_compat.c +++ b/math/w_asinf_compat.c @@ -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 diff --git a/math/w_asinl_compat.c b/math/w_asinl_compat.c index c8f4d150c6..c9e1a340cc 100644 --- a/math/w_asinl_compat.c +++ b/math/w_asinl_compat.c @@ -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 diff --git a/math/w_atan2_compat.c b/math/w_atan2_compat.c index fa098ffeb7..1ca3349207 100644 --- a/math/w_atan2_compat.c +++ b/math/w_atan2_compat.c @@ -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 diff --git a/math/w_atan2f_compat.c b/math/w_atan2f_compat.c index 15e05d8253..8d7ad71b70 100644 --- a/math/w_atan2f_compat.c +++ b/math/w_atan2f_compat.c @@ -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 diff --git a/math/w_atan2l_compat.c b/math/w_atan2l_compat.c index 87b73948da..9dc2b144ea 100644 --- a/math/w_atan2l_compat.c +++ b/math/w_atan2l_compat.c @@ -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 diff --git a/math/w_atanh_compat.c b/math/w_atanh_compat.c index f7a43beb09..c2cbb2ee5f 100644 --- a/math/w_atanh_compat.c +++ b/math/w_atanh_compat.c @@ -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 diff --git a/math/w_atanhf_compat.c b/math/w_atanhf_compat.c index c9d2c3a3ae..6045188bd8 100644 --- a/math/w_atanhf_compat.c +++ b/math/w_atanhf_compat.c @@ -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 diff --git a/math/w_atanhl_compat.c b/math/w_atanhl_compat.c index 56f9f1ed61..837a6652b8 100644 --- a/math/w_atanhl_compat.c +++ b/math/w_atanhl_compat.c @@ -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 diff --git a/math/w_cosh_compat.c b/math/w_cosh_compat.c index fd16436520..d0cb6b165f 100644 --- a/math/w_cosh_compat.c +++ b/math/w_cosh_compat.c @@ -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 diff --git a/math/w_coshf_compat.c b/math/w_coshf_compat.c index dd62281693..b5d53168f2 100644 --- a/math/w_coshf_compat.c +++ b/math/w_coshf_compat.c @@ -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 diff --git a/math/w_coshl_compat.c b/math/w_coshl_compat.c index 5fa32bea88..4dab6eff67 100644 --- a/math/w_coshl_compat.c +++ b/math/w_coshl_compat.c @@ -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 diff --git a/math/w_exp10_compat.c b/math/w_exp10_compat.c index 5256f5b06f..42dc312ee8 100644 --- a/math/w_exp10_compat.c +++ b/math/w_exp10_compat.c @@ -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 diff --git a/math/w_exp10f_compat.c b/math/w_exp10f_compat.c index c559e6a629..bacf2eb9d2 100644 --- a/math/w_exp10f_compat.c +++ b/math/w_exp10f_compat.c @@ -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 diff --git a/math/w_exp10l_compat.c b/math/w_exp10l_compat.c index 03b7ce9b6b..3d7d66d5af 100644 --- a/math/w_exp10l_compat.c +++ b/math/w_exp10l_compat.c @@ -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 diff --git a/math/w_exp2_compat.c b/math/w_exp2_compat.c index a4d4653708..5739547859 100644 --- a/math/w_exp2_compat.c +++ b/math/w_exp2_compat.c @@ -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 diff --git a/math/w_exp2f_compat.c b/math/w_exp2f_compat.c index b21fe36903..b058daed30 100644 --- a/math/w_exp2f_compat.c +++ b/math/w_exp2f_compat.c @@ -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 diff --git a/math/w_exp2l_compat.c b/math/w_exp2l_compat.c index 04cd666b68..96d4b96c11 100644 --- a/math/w_exp2l_compat.c +++ b/math/w_exp2l_compat.c @@ -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 diff --git a/math/w_fmod_compat.c b/math/w_fmod_compat.c index 1079d3a603..f75b8615d0 100644 --- a/math/w_fmod_compat.c +++ b/math/w_fmod_compat.c @@ -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 diff --git a/math/w_fmodf_compat.c b/math/w_fmodf_compat.c index 88b64a24bd..a2739d856a 100644 --- a/math/w_fmodf_compat.c +++ b/math/w_fmodf_compat.c @@ -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 diff --git a/math/w_fmodl_compat.c b/math/w_fmodl_compat.c index 23422fa652..3136e82d65 100644 --- a/math/w_fmodl_compat.c +++ b/math/w_fmodl_compat.c @@ -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 diff --git a/math/w_hypot_compat.c b/math/w_hypot_compat.c index ff3774cf62..21c7e65c5e 100644 --- a/math/w_hypot_compat.c +++ b/math/w_hypot_compat.c @@ -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 diff --git a/math/w_hypotf_compat.c b/math/w_hypotf_compat.c index 0a43d90a00..8e6d2343eb 100644 --- a/math/w_hypotf_compat.c +++ b/math/w_hypotf_compat.c @@ -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 diff --git a/math/w_hypotl_compat.c b/math/w_hypotl_compat.c index 13060f74a7..bc56d29a04 100644 --- a/math/w_hypotl_compat.c +++ b/math/w_hypotl_compat.c @@ -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 diff --git a/math/w_j0_compat.c b/math/w_j0_compat.c index 80d21acde1..3df71e0b7b 100644 --- a/math/w_j0_compat.c +++ b/math/w_j0_compat.c @@ -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 diff --git a/math/w_j0f_compat.c b/math/w_j0f_compat.c index 36fc4f9443..e9ac74f23a 100644 --- a/math/w_j0f_compat.c +++ b/math/w_j0f_compat.c @@ -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 diff --git a/math/w_j0l_compat.c b/math/w_j0l_compat.c index ff7e1b1456..76ec812729 100644 --- a/math/w_j0l_compat.c +++ b/math/w_j0l_compat.c @@ -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 diff --git a/math/w_j1_compat.c b/math/w_j1_compat.c index f7a76c10d5..be788f9864 100644 --- a/math/w_j1_compat.c +++ b/math/w_j1_compat.c @@ -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 diff --git a/math/w_j1f_compat.c b/math/w_j1f_compat.c index 9aa5c8c4fd..c3222bbc8d 100644 --- a/math/w_j1f_compat.c +++ b/math/w_j1f_compat.c @@ -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 diff --git a/math/w_j1l_compat.c b/math/w_j1l_compat.c index 7e6d9f57f2..c3acfdfe76 100644 --- a/math/w_j1l_compat.c +++ b/math/w_j1l_compat.c @@ -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 diff --git a/math/w_jn_compat.c b/math/w_jn_compat.c index 7c49992cf4..496c779e8c 100644 --- a/math/w_jn_compat.c +++ b/math/w_jn_compat.c @@ -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 diff --git a/math/w_jnf_compat.c b/math/w_jnf_compat.c index ead40e7a60..440d53d13e 100644 --- a/math/w_jnf_compat.c +++ b/math/w_jnf_compat.c @@ -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 diff --git a/math/w_jnl_compat.c b/math/w_jnl_compat.c index bc416359c2..7298c73a3b 100644 --- a/math/w_jnl_compat.c +++ b/math/w_jnl_compat.c @@ -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 diff --git a/math/w_lgamma_r_compat.c b/math/w_lgamma_r_compat.c index 3f7fbce62b..f88a5df6a5 100644 --- a/math/w_lgamma_r_compat.c +++ b/math/w_lgamma_r_compat.c @@ -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 diff --git a/math/w_lgammaf_r_compat.c b/math/w_lgammaf_r_compat.c index d9601f45d7..86003de59a 100644 --- a/math/w_lgammaf_r_compat.c +++ b/math/w_lgammaf_r_compat.c @@ -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 diff --git a/math/w_lgammal_r_compat.c b/math/w_lgammal_r_compat.c index d1b58e42dd..781bfa45e7 100644 --- a/math/w_lgammal_r_compat.c +++ b/math/w_lgammal_r_compat.c @@ -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 diff --git a/math/w_log10_compat.c b/math/w_log10_compat.c index 6f3eb3408c..b8247aa886 100644 --- a/math/w_log10_compat.c +++ b/math/w_log10_compat.c @@ -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 diff --git a/math/w_log10f_compat.c b/math/w_log10f_compat.c index 2cb5c9a1bb..151c94b4dc 100644 --- a/math/w_log10f_compat.c +++ b/math/w_log10f_compat.c @@ -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 diff --git a/math/w_log10l_compat.c b/math/w_log10l_compat.c index 0063c50778..88d9c40354 100644 --- a/math/w_log10l_compat.c +++ b/math/w_log10l_compat.c @@ -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 diff --git a/math/w_log2_compat.c b/math/w_log2_compat.c index 252fc0d86a..6d1f9f2159 100644 --- a/math/w_log2_compat.c +++ b/math/w_log2_compat.c @@ -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 diff --git a/math/w_log2f_compat.c b/math/w_log2f_compat.c index 6adaff6c72..82085d5222 100644 --- a/math/w_log2f_compat.c +++ b/math/w_log2f_compat.c @@ -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 diff --git a/math/w_log2l_compat.c b/math/w_log2l_compat.c index f496c3630e..cd367f2f51 100644 --- a/math/w_log2l_compat.c +++ b/math/w_log2l_compat.c @@ -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 diff --git a/math/w_log_compat.c b/math/w_log_compat.c index 82f3ff4eec..80750b4371 100644 --- a/math/w_log_compat.c +++ b/math/w_log_compat.c @@ -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 diff --git a/math/w_logf_compat.c b/math/w_logf_compat.c index ac18b65c5e..4423bd527a 100644 --- a/math/w_logf_compat.c +++ b/math/w_logf_compat.c @@ -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 diff --git a/math/w_logl_compat.c b/math/w_logl_compat.c index ba65830b67..e37a17475e 100644 --- a/math/w_logl_compat.c +++ b/math/w_logl_compat.c @@ -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 diff --git a/math/w_pow_compat.c b/math/w_pow_compat.c index 367f609dc2..4865f4d0d6 100644 --- a/math/w_pow_compat.c +++ b/math/w_pow_compat.c @@ -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 diff --git a/math/w_powf_compat.c b/math/w_powf_compat.c index afc3fced80..ce1235baee 100644 --- a/math/w_powf_compat.c +++ b/math/w_powf_compat.c @@ -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 diff --git a/math/w_powl_compat.c b/math/w_powl_compat.c index b25dad870d..9159f610d2 100644 --- a/math/w_powl_compat.c +++ b/math/w_powl_compat.c @@ -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 diff --git a/math/w_remainder_compat.c b/math/w_remainder_compat.c index 6bf5d1ff2e..68e322efdc 100644 --- a/math/w_remainder_compat.c +++ b/math/w_remainder_compat.c @@ -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 diff --git a/math/w_remainderf_compat.c b/math/w_remainderf_compat.c index 3ffefde83d..39ff3b4468 100644 --- a/math/w_remainderf_compat.c +++ b/math/w_remainderf_compat.c @@ -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 diff --git a/math/w_remainderl_compat.c b/math/w_remainderl_compat.c index b01b0b1365..c11ba24a8a 100644 --- a/math/w_remainderl_compat.c +++ b/math/w_remainderl_compat.c @@ -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 diff --git a/math/w_scalb_compat.c b/math/w_scalb_compat.c index a31e54dd78..277e724415 100644 --- a/math/w_scalb_compat.c +++ b/math/w_scalb_compat.c @@ -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); diff --git a/math/w_scalbf_compat.c b/math/w_scalbf_compat.c index 2b96df0cbf..79798aef1e 100644 --- a/math/w_scalbf_compat.c +++ b/math/w_scalbf_compat.c @@ -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); diff --git a/math/w_scalbl_compat.c b/math/w_scalbl_compat.c index a4a0f8e942..4c73e6b180 100644 --- a/math/w_scalbl_compat.c +++ b/math/w_scalbl_compat.c @@ -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); diff --git a/math/w_sinh_compat.c b/math/w_sinh_compat.c index 121edfc892..e5c3724763 100644 --- a/math/w_sinh_compat.c +++ b/math/w_sinh_compat.c @@ -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 diff --git a/math/w_sinhf_compat.c b/math/w_sinhf_compat.c index 2103b06253..1310ccf93b 100644 --- a/math/w_sinhf_compat.c +++ b/math/w_sinhf_compat.c @@ -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 diff --git a/math/w_sinhl_compat.c b/math/w_sinhl_compat.c index 57f08e7ecc..348209860a 100644 --- a/math/w_sinhl_compat.c +++ b/math/w_sinhl_compat.c @@ -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 diff --git a/math/w_sqrt_compat.c b/math/w_sqrt_compat.c index 743df321d5..aeead2e49c 100644 --- a/math/w_sqrt_compat.c +++ b/math/w_sqrt_compat.c @@ -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 diff --git a/math/w_sqrtf_compat.c b/math/w_sqrtf_compat.c index 0689b4bb1a..bd3d5048fc 100644 --- a/math/w_sqrtf_compat.c +++ b/math/w_sqrtf_compat.c @@ -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 diff --git a/math/w_sqrtl_compat.c b/math/w_sqrtl_compat.c index 43e81acf0a..b0afd1171c 100644 --- a/math/w_sqrtl_compat.c +++ b/math/w_sqrtl_compat.c @@ -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 diff --git a/math/w_tgamma_compat.c b/math/w_tgamma_compat.c index 93bd48fd3f..f843475f10 100644 --- a/math/w_tgamma_compat.c +++ b/math/w_tgamma_compat.c @@ -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 diff --git a/math/w_tgammaf_compat.c b/math/w_tgammaf_compat.c index e6ae48c1f5..796850b4d9 100644 --- a/math/w_tgammaf_compat.c +++ b/math/w_tgammaf_compat.c @@ -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 diff --git a/math/w_tgammal_compat.c b/math/w_tgammal_compat.c index 306f672077..c0e442955b 100644 --- a/math/w_tgammal_compat.c +++ b/math/w_tgammal_compat.c @@ -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 |