From d81f90ccd0109de9ed78aeeb8d86e2c6d4600690 Mon Sep 17 00:00:00 2001 From: Wilco Dijkstra Date: Wed, 3 Jun 2015 15:36:34 +0100 Subject: This patch renames all uses of __isinf*, __isnan*, __finite* and __signbit* to use standard C99 macros. This has no effect on generated code. --- sysdeps/ieee754/dbl-64/e_exp.c | 2 +- sysdeps/ieee754/dbl-64/e_exp10.c | 2 +- sysdeps/ieee754/dbl-64/e_exp2.c | 2 +- sysdeps/ieee754/dbl-64/e_j1.c | 2 +- sysdeps/ieee754/dbl-64/e_jn.c | 4 ++-- sysdeps/ieee754/dbl-64/e_pow.c | 4 ++-- sysdeps/ieee754/dbl-64/w_exp.c | 6 +++--- 7 files changed, 11 insertions(+), 11 deletions(-) (limited to 'sysdeps/ieee754/dbl-64') diff --git a/sysdeps/ieee754/dbl-64/e_exp.c b/sysdeps/ieee754/dbl-64/e_exp.c index 4eb1bdc657..bb76907f74 100644 --- a/sysdeps/ieee754/dbl-64/e_exp.c +++ b/sysdeps/ieee754/dbl-64/e_exp.c @@ -217,7 +217,7 @@ __ieee754_exp (double x) retval = res * binexp.x * t256.x; else retval = __slowexp (x); - if (__isinf (retval)) + if (isinf (retval)) goto ret_huge; else goto ret; diff --git a/sysdeps/ieee754/dbl-64/e_exp10.c b/sysdeps/ieee754/dbl-64/e_exp10.c index 5cbf62640d..b14eaa9833 100644 --- a/sysdeps/ieee754/dbl-64/e_exp10.c +++ b/sysdeps/ieee754/dbl-64/e_exp10.c @@ -29,7 +29,7 @@ __ieee754_exp10 (double arg) double arg_high, arg_low; double exp_high, exp_low; - if (!__finite (arg)) + if (!isfinite (arg)) return __ieee754_exp (arg); if (arg < DBL_MIN_10_EXP - DBL_DIG - 10) return DBL_MIN * DBL_MIN; diff --git a/sysdeps/ieee754/dbl-64/e_exp2.c b/sysdeps/ieee754/dbl-64/e_exp2.c index f964a5ae38..948a756df7 100644 --- a/sysdeps/ieee754/dbl-64/e_exp2.c +++ b/sysdeps/ieee754/dbl-64/e_exp2.c @@ -48,7 +48,7 @@ __ieee754_exp2 (double x) /* Exceptional cases: */ if (__glibc_unlikely (!isgreaterequal (x, lomark))) { - if (__isinf (x)) + if (isinf (x)) /* e^-inf == 0, with no error. */ return 0; else diff --git a/sysdeps/ieee754/dbl-64/e_j1.c b/sysdeps/ieee754/dbl-64/e_j1.c index d61cff434a..653f33abe1 100644 --- a/sysdeps/ieee754/dbl-64/e_j1.c +++ b/sysdeps/ieee754/dbl-64/e_j1.c @@ -207,7 +207,7 @@ __ieee754_y1 (double x) if (__glibc_unlikely (ix <= 0x3c900000)) /* x < 2**-54 */ { z = -tpi / x; - if (__isinf (z)) + if (isinf (z)) __set_errno (ERANGE); return z; } diff --git a/sysdeps/ieee754/dbl-64/e_jn.c b/sysdeps/ieee754/dbl-64/e_jn.c index bbe04260b8..900737c401 100644 --- a/sysdeps/ieee754/dbl-64/e_jn.c +++ b/sysdeps/ieee754/dbl-64/e_jn.c @@ -319,7 +319,7 @@ __ieee754_yn (int n, double x) a = temp; } /* If B is +-Inf, set up errno accordingly. */ - if (!__finite (b)) + if (!isfinite (b)) __set_errno (ERANGE); } if (sign > 0) @@ -328,7 +328,7 @@ __ieee754_yn (int n, double x) ret = -b; } out: - if (__isinf (ret)) + if (isinf (ret)) ret = __copysign (DBL_MAX, ret) * DBL_MAX; return ret; } diff --git a/sysdeps/ieee754/dbl-64/e_pow.c b/sysdeps/ieee754/dbl-64/e_pow.c index 8a1f72f1fa..3c027fe7f5 100644 --- a/sysdeps/ieee754/dbl-64/e_pow.c +++ b/sysdeps/ieee754/dbl-64/e_pow.c @@ -115,7 +115,7 @@ __ieee754_pow (double x, double y) retval = (t > 0) ? t : power1 (x, y); } - if (__isinf (retval)) + if (isinf (retval)) retval = huge * huge; else if (retval == 0) retval = tiny * tiny; @@ -180,7 +180,7 @@ __ieee754_pow (double x, double y) SET_RESTORE_ROUND (FE_TONEAREST); retval = -__ieee754_pow (-x, y); } - if (__isinf (retval)) + if (isinf (retval)) retval = -huge * huge; else if (retval == 0) retval = -tiny * tiny; diff --git a/sysdeps/ieee754/dbl-64/w_exp.c b/sysdeps/ieee754/dbl-64/w_exp.c index cef5b77170..61b2dbbd0f 100644 --- a/sysdeps/ieee754/dbl-64/w_exp.c +++ b/sysdeps/ieee754/dbl-64/w_exp.c @@ -24,9 +24,9 @@ double __exp (double x) { double z = __ieee754_exp (x); - if (__builtin_expect (!__finite (z) || z == 0, 0) - && __finite (x) && _LIB_VERSION != _IEEE_) - return __kernel_standard (x, x, 6 + !!__signbit (x)); + if (__builtin_expect (!isfinite (z) || z == 0, 0) + && isfinite (x) && _LIB_VERSION != _IEEE_) + return __kernel_standard (x, x, 6 + !!signbit (x)); return z; } -- cgit 1.4.1