about summary refs log tree commit diff
path: root/sysdeps/ieee754
diff options
context:
space:
mode:
authorWilco Dijkstra <wdijkstr@arm.com>2015-06-03 15:36:34 +0100
committerWilco Dijkstra <wdijkstr@arm.com>2015-06-03 15:41:36 +0100
commitd81f90ccd0109de9ed78aeeb8d86e2c6d4600690 (patch)
tree6dfdc3458a8684e3633e20b8cf37385ee7082840 /sysdeps/ieee754
parentf014e87eff1c9935a8bd9f7b7ab66ff5ef562ee9 (diff)
downloadglibc-d81f90ccd0109de9ed78aeeb8d86e2c6d4600690.tar.gz
glibc-d81f90ccd0109de9ed78aeeb8d86e2c6d4600690.tar.xz
glibc-d81f90ccd0109de9ed78aeeb8d86e2c6d4600690.zip
This patch renames all uses of __isinf*, __isnan*, __finite* and __signbit* to use standard C99 macros. This has no effect on generated code.
Diffstat (limited to 'sysdeps/ieee754')
-rw-r--r--sysdeps/ieee754/dbl-64/e_exp.c2
-rw-r--r--sysdeps/ieee754/dbl-64/e_exp10.c2
-rw-r--r--sysdeps/ieee754/dbl-64/e_exp2.c2
-rw-r--r--sysdeps/ieee754/dbl-64/e_j1.c2
-rw-r--r--sysdeps/ieee754/dbl-64/e_jn.c4
-rw-r--r--sysdeps/ieee754/dbl-64/e_pow.c4
-rw-r--r--sysdeps/ieee754/dbl-64/w_exp.c6
-rw-r--r--sysdeps/ieee754/flt-32/e_expf.c2
-rw-r--r--sysdeps/ieee754/flt-32/e_j1f.c2
-rw-r--r--sysdeps/ieee754/flt-32/e_jnf.c4
-rw-r--r--sysdeps/ieee754/flt-32/w_expf.c6
-rw-r--r--sysdeps/ieee754/ldbl-128/e_exp10l.c2
-rw-r--r--sysdeps/ieee754/ldbl-128/e_expl.c2
-rw-r--r--sysdeps/ieee754/ldbl-128/e_j0l.c4
-rw-r--r--sysdeps/ieee754/ldbl-128/e_j1l.c6
-rw-r--r--sysdeps/ieee754/ldbl-128/e_jnl.c4
-rw-r--r--sysdeps/ieee754/ldbl-128/e_lgammal_r.c4
-rw-r--r--sysdeps/ieee754/ldbl-128/s_cbrtl.c2
-rw-r--r--sysdeps/ieee754/ldbl-128/w_expl.c6
-rw-r--r--sysdeps/ieee754/ldbl-128ibm/e_acosl.c2
-rw-r--r--sysdeps/ieee754/ldbl-128ibm/e_asinl.c2
-rw-r--r--sysdeps/ieee754/ldbl-128ibm/e_exp10l.c2
-rw-r--r--sysdeps/ieee754/ldbl-128ibm/e_expl.c2
-rw-r--r--sysdeps/ieee754/ldbl-128ibm/e_jnl.c4
-rw-r--r--sysdeps/ieee754/ldbl-128ibm/s_ctanhl.c4
-rw-r--r--sysdeps/ieee754/ldbl-128ibm/s_ctanl.c2
-rw-r--r--sysdeps/ieee754/ldbl-128ibm/w_expl.c2
-rw-r--r--sysdeps/ieee754/ldbl-96/e_j1l.c2
-rw-r--r--sysdeps/ieee754/ldbl-96/e_jnl.c4
-rw-r--r--sysdeps/ieee754/ldbl-96/w_expl.c6
-rw-r--r--sysdeps/ieee754/ldbl-opt/nldbl-finite.c2
-rw-r--r--sysdeps/ieee754/ldbl-opt/nldbl-isinf.c2
-rw-r--r--sysdeps/ieee754/ldbl-opt/nldbl-isnan.c2
-rw-r--r--sysdeps/ieee754/ldbl-opt/nldbl-signbit.c2
34 files changed, 53 insertions, 53 deletions
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;
 }
diff --git a/sysdeps/ieee754/flt-32/e_expf.c b/sysdeps/ieee754/flt-32/e_expf.c
index 96704ab65b..abf9111a74 100644
--- a/sysdeps/ieee754/flt-32/e_expf.c
+++ b/sysdeps/ieee754/flt-32/e_expf.c
@@ -119,7 +119,7 @@ __ieee754_expf (float x)
   /* Exceptional cases:  */
   else if (isless (x, himark))
     {
-      if (__isinff (x))
+      if (isinf (x))
 	/* e^-inf == 0, with no error.  */
 	return 0;
       else
diff --git a/sysdeps/ieee754/flt-32/e_j1f.c b/sysdeps/ieee754/flt-32/e_j1f.c
index a67da3275d..7ffb57e806 100644
--- a/sysdeps/ieee754/flt-32/e_j1f.c
+++ b/sysdeps/ieee754/flt-32/e_j1f.c
@@ -137,7 +137,7 @@ __ieee754_y1f(float x)
 	}
 	if(__builtin_expect(ix<=0x33000000, 0)) {    /* x < 2**-25 */
 	    z = -tpi / x;
-	    if (__isinff (z))
+	    if (isinf (z))
 		__set_errno (ERANGE);
 	    return z;
 	}
diff --git a/sysdeps/ieee754/flt-32/e_jnf.c b/sysdeps/ieee754/flt-32/e_jnf.c
index 86085cc635..dc4b371bc1 100644
--- a/sysdeps/ieee754/flt-32/e_jnf.c
+++ b/sysdeps/ieee754/flt-32/e_jnf.c
@@ -208,12 +208,12 @@ __ieee754_ynf(int n, float x)
 	    a = temp;
 	}
 	/* If B is +-Inf, set up errno accordingly.  */
-	if (! __finitef (b))
+	if (! isfinite (b))
 	  __set_errno (ERANGE);
 	if(sign>0) ret = b; else ret = -b;
     }
  out:
-    if (__isinff (ret))
+    if (isinf (ret))
 	ret = __copysignf (FLT_MAX, ret) * FLT_MAX;
     return ret;
 }
diff --git a/sysdeps/ieee754/flt-32/w_expf.c b/sysdeps/ieee754/flt-32/w_expf.c
index 01fbac91bb..cc5ff76421 100644
--- a/sysdeps/ieee754/flt-32/w_expf.c
+++ b/sysdeps/ieee754/flt-32/w_expf.c
@@ -24,9 +24,9 @@ float
 __expf (float x)
 {
   float z = __ieee754_expf (x);
-  if (__builtin_expect (!__finitef (z) || z == 0, 0)
-      && __finitef (x) && _LIB_VERSION != _IEEE_)
-    return __kernel_standard_f (x, x, 106 + !!__signbitf (x));
+  if (__builtin_expect (!isfinite (z) || z == 0, 0)
+      && isfinite (x) && _LIB_VERSION != _IEEE_)
+    return __kernel_standard_f (x, x, 106 + !!signbit (x));
 
   return z;
 }
diff --git a/sysdeps/ieee754/ldbl-128/e_exp10l.c b/sysdeps/ieee754/ldbl-128/e_exp10l.c
index d3120ad841..c5b5cb7505 100644
--- a/sysdeps/ieee754/ldbl-128/e_exp10l.c
+++ b/sysdeps/ieee754/ldbl-128/e_exp10l.c
@@ -29,7 +29,7 @@ __ieee754_exp10l (long double arg)
   long double arg_high, arg_low;
   long double exp_high, exp_low;
 
-  if (!__finitel (arg))
+  if (!isfinite (arg))
     return __ieee754_expl (arg);
   if (arg < LDBL_MIN_10_EXP - LDBL_DIG - 10)
     return LDBL_MIN * LDBL_MIN;
diff --git a/sysdeps/ieee754/ldbl-128/e_expl.c b/sysdeps/ieee754/ldbl-128/e_expl.c
index 315666ce5f..b4b789658a 100644
--- a/sysdeps/ieee754/ldbl-128/e_expl.c
+++ b/sysdeps/ieee754/ldbl-128/e_expl.c
@@ -235,7 +235,7 @@ __ieee754_expl (long double x)
   /* Exceptional cases:  */
   else if (isless (x, himark))
     {
-      if (__isinfl (x))
+      if (isinf (x))
 	/* e^-inf == 0, with no error.  */
 	return 0;
       else
diff --git a/sysdeps/ieee754/ldbl-128/e_j0l.c b/sysdeps/ieee754/ldbl-128/e_j0l.c
index 108eff4435..1320de7044 100644
--- a/sysdeps/ieee754/ldbl-128/e_j0l.c
+++ b/sysdeps/ieee754/ldbl-128/e_j0l.c
@@ -680,7 +680,7 @@ __ieee754_j0l (long double x)
 {
   long double xx, xinv, z, p, q, c, s, cc, ss;
 
-  if (! __finitel (x))
+  if (! isfinite (x))
     {
       if (x != x)
 	return x;
@@ -826,7 +826,7 @@ long double
 {
   long double xx, xinv, z, p, q, c, s, cc, ss;
 
-  if (! __finitel (x))
+  if (! isfinite (x))
     {
       if (x != x)
 	return x;
diff --git a/sysdeps/ieee754/ldbl-128/e_j1l.c b/sysdeps/ieee754/ldbl-128/e_j1l.c
index f24dfa9f8b..958077d927 100644
--- a/sysdeps/ieee754/ldbl-128/e_j1l.c
+++ b/sysdeps/ieee754/ldbl-128/e_j1l.c
@@ -687,7 +687,7 @@ __ieee754_j1l (long double x)
 {
   long double xx, xinv, z, p, q, c, s, cc, ss;
 
-  if (! __finitel (x))
+  if (! isfinite (x))
     {
       if (x != x)
 	return x;
@@ -838,7 +838,7 @@ __ieee754_y1l (long double x)
 {
   long double xx, xinv, z, p, q, c, s, cc, ss;
 
-  if (! __finitel (x))
+  if (! isfinite (x))
     {
       if (x != x)
 	return x;
@@ -855,7 +855,7 @@ __ieee754_y1l (long double x)
   if (xx <= 0x1p-114)
     {
       z = -TWOOPI / x;
-      if (__isinfl (z))
+      if (isinf (z))
 	__set_errno (ERANGE);
       return z;
     }
diff --git a/sysdeps/ieee754/ldbl-128/e_jnl.c b/sysdeps/ieee754/ldbl-128/e_jnl.c
index 4e32d38581..422623f0dc 100644
--- a/sysdeps/ieee754/ldbl-128/e_jnl.c
+++ b/sysdeps/ieee754/ldbl-128/e_jnl.c
@@ -393,7 +393,7 @@ __ieee754_ynl (int n, long double x)
 	  }
       }
     /* If B is +-Inf, set up errno accordingly.  */
-    if (! __finitel (b))
+    if (! isfinite (b))
       __set_errno (ERANGE);
     if (sign > 0)
       ret = b;
@@ -401,7 +401,7 @@ __ieee754_ynl (int n, long double x)
       ret = -b;
   }
  out:
-  if (__isinfl (ret))
+  if (isinf (ret))
     ret = __copysignl (LDBL_MAX, ret) * LDBL_MAX;
   return ret;
 }
diff --git a/sysdeps/ieee754/ldbl-128/e_lgammal_r.c b/sysdeps/ieee754/ldbl-128/e_lgammal_r.c
index 35d4a663ff..d8a5e5b9ec 100644
--- a/sysdeps/ieee754/ldbl-128/e_lgammal_r.c
+++ b/sysdeps/ieee754/ldbl-128/e_lgammal_r.c
@@ -770,12 +770,12 @@ __ieee754_lgammal_r (long double x, int *signgamp)
 
   *signgamp = 1;
 
-  if (! __finitel (x))
+  if (! isfinite (x))
     return x * x;
 
   if (x == 0.0L)
     {
-      if (__signbitl (x))
+      if (signbit (x))
 	*signgamp = -1;
     }
 
diff --git a/sysdeps/ieee754/ldbl-128/s_cbrtl.c b/sysdeps/ieee754/ldbl-128/s_cbrtl.c
index 07ed567e4d..c3ae96830e 100644
--- a/sysdeps/ieee754/ldbl-128/s_cbrtl.c
+++ b/sysdeps/ieee754/ldbl-128/s_cbrtl.c
@@ -69,7 +69,7 @@ __cbrtl (long double x)
   int e, rem, sign;
   long double z;
 
-  if (!__finitel (x))
+  if (!isfinite (x))
     return x + x;
 
   if (x == 0)
diff --git a/sysdeps/ieee754/ldbl-128/w_expl.c b/sysdeps/ieee754/ldbl-128/w_expl.c
index f0b1f8e55f..c32616e504 100644
--- a/sysdeps/ieee754/ldbl-128/w_expl.c
+++ b/sysdeps/ieee754/ldbl-128/w_expl.c
@@ -31,9 +31,9 @@ long double __expl(long double x)	/* wrapper exp */
 	return __ieee754_expl(x);
 #else
 	long double z = __ieee754_expl (x);
-	if (__glibc_unlikely (!__finitel (z) || z == 0)
-	    && __finitel (x) && _LIB_VERSION != _IEEE_)
-	  return __kernel_standard_l (x, x, 206 + !!__signbitl (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
diff --git a/sysdeps/ieee754/ldbl-128ibm/e_acosl.c b/sysdeps/ieee754/ldbl-128ibm/e_acosl.c
index e5030f1b52..5974ee1338 100644
--- a/sysdeps/ieee754/ldbl-128ibm/e_acosl.c
+++ b/sysdeps/ieee754/ldbl-128ibm/e_acosl.c
@@ -153,7 +153,7 @@ __ieee754_acosl (long double x)
 {
   long double a, z, r, w, p, q, s, t, f2;
 
-  if (__glibc_unlikely (__isnanl (x)))
+  if (__glibc_unlikely (isnan (x)))
     return x + x;
   a = __builtin_fabsl (x);
   if (a == 1.0L)
diff --git a/sysdeps/ieee754/ldbl-128ibm/e_asinl.c b/sysdeps/ieee754/ldbl-128ibm/e_asinl.c
index 5bc847ad26..57c3ac09c8 100644
--- a/sysdeps/ieee754/ldbl-128ibm/e_asinl.c
+++ b/sysdeps/ieee754/ldbl-128ibm/e_asinl.c
@@ -135,7 +135,7 @@ __ieee754_asinl (long double x)
   long double a, t, w, p, q, c, r, s;
   int flag;
 
-  if (__glibc_unlikely (__isnanl (x)))
+  if (__glibc_unlikely (isnan (x)))
     return x + x;
   flag = 0;
   a = __builtin_fabsl (x);
diff --git a/sysdeps/ieee754/ldbl-128ibm/e_exp10l.c b/sysdeps/ieee754/ldbl-128ibm/e_exp10l.c
index dca207c1f9..deefe7f54f 100644
--- a/sysdeps/ieee754/ldbl-128ibm/e_exp10l.c
+++ b/sysdeps/ieee754/ldbl-128ibm/e_exp10l.c
@@ -29,7 +29,7 @@ __ieee754_exp10l (long double arg)
   long double arg_high, arg_low;
   long double exp_high, exp_low;
 
-  if (!__finitel (arg))
+  if (!isfinite (arg))
     return __ieee754_expl (arg);
   if (arg < LDBL_MIN_10_EXP - LDBL_DIG - 10)
     return LDBL_MIN * LDBL_MIN;
diff --git a/sysdeps/ieee754/ldbl-128ibm/e_expl.c b/sysdeps/ieee754/ldbl-128ibm/e_expl.c
index 812aa89e44..15ccc454e1 100644
--- a/sysdeps/ieee754/ldbl-128ibm/e_expl.c
+++ b/sysdeps/ieee754/ldbl-128ibm/e_expl.c
@@ -233,7 +233,7 @@ __ieee754_expl (long double x)
   /* Exceptional cases:  */
   else if (isless (x, himark))
     {
-      if (__isinfl (x))
+      if (isinf (x))
 	/* e^-inf == 0, with no error.  */
 	return 0;
       else
diff --git a/sysdeps/ieee754/ldbl-128ibm/e_jnl.c b/sysdeps/ieee754/ldbl-128ibm/e_jnl.c
index 589f1f822a..d2b9318327 100644
--- a/sysdeps/ieee754/ldbl-128ibm/e_jnl.c
+++ b/sysdeps/ieee754/ldbl-128ibm/e_jnl.c
@@ -395,7 +395,7 @@ __ieee754_ynl (int n, long double x)
 	  }
       }
     /* If B is +-Inf, set up errno accordingly.  */
-    if (! __finitel (b))
+    if (! isfinite (b))
       __set_errno (ERANGE);
     if (sign > 0)
       ret = b;
@@ -403,7 +403,7 @@ __ieee754_ynl (int n, long double x)
       ret = -b;
   }
  out:
-  if (__isinfl (ret))
+  if (isinf (ret))
     ret = __copysignl (LDBL_MAX, ret) * LDBL_MAX;
   return ret;
 }
diff --git a/sysdeps/ieee754/ldbl-128ibm/s_ctanhl.c b/sysdeps/ieee754/ldbl-128ibm/s_ctanhl.c
index 76b4b56510..96bdccd9f8 100644
--- a/sysdeps/ieee754/ldbl-128ibm/s_ctanhl.c
+++ b/sysdeps/ieee754/ldbl-128ibm/s_ctanhl.c
@@ -35,7 +35,7 @@ __ctanhl (__complex__ long double x)
 
   if (!isfinite (__real__ x) || !isfinite (__imag__ x))
     {
-      if (__isinfl (__real__ x))
+      if (isinf (__real__ x))
 	{
 	  __real__ res = __copysignl (1.0L, __real__ x);
 	  __imag__ res = __copysignl (0.0L, __imag__ x);
@@ -50,7 +50,7 @@ __ctanhl (__complex__ long double x)
 	  __imag__ res = __nanl ("");
 
 #ifdef FE_INVALID
-	  if (__isinfl (__imag__ x))
+	  if (isinf (__imag__ x))
 	    feraiseexcept (FE_INVALID);
 #endif
 	}
diff --git a/sysdeps/ieee754/ldbl-128ibm/s_ctanl.c b/sysdeps/ieee754/ldbl-128ibm/s_ctanl.c
index e2fde7db4b..fc44378e5c 100644
--- a/sysdeps/ieee754/ldbl-128ibm/s_ctanl.c
+++ b/sysdeps/ieee754/ldbl-128ibm/s_ctanl.c
@@ -35,7 +35,7 @@ __ctanl (__complex__ long double x)
 
   if (!isfinite (__real__ x) || !isfinite (__imag__ x))
     {
-      if (__isinfl (__imag__ x))
+      if (isinf (__imag__ x))
 	{
 	  __real__ res = __copysignl (0.0, __real__ x);
 	  __imag__ res = __copysignl (1.0, __imag__ x);
diff --git a/sysdeps/ieee754/ldbl-128ibm/w_expl.c b/sysdeps/ieee754/ldbl-128ibm/w_expl.c
index 70fe5f693e..fb5c8d3629 100644
--- a/sysdeps/ieee754/ldbl-128ibm/w_expl.c
+++ b/sysdeps/ieee754/ldbl-128ibm/w_expl.c
@@ -11,7 +11,7 @@ long double __expl(long double x)	/* wrapper exp  */
   z = __ieee754_expl(x);
   if (_LIB_VERSION == _IEEE_)
     return z;
-  if (__finitel(x))
+  if (isfinite(x))
     {
       if (x >= o_thres)
 	return __kernel_standard_l(x,x,206); /* exp overflow  */
diff --git a/sysdeps/ieee754/ldbl-96/e_j1l.c b/sysdeps/ieee754/ldbl-96/e_j1l.c
index 1adc8f669f..1bd54995a8 100644
--- a/sysdeps/ieee754/ldbl-96/e_j1l.c
+++ b/sysdeps/ieee754/ldbl-96/e_j1l.c
@@ -236,7 +236,7 @@ __ieee754_y1l (long double x)
   if (__glibc_unlikely (ix <= 0x3fbe))
     {				/* x < 2**-65 */
       z = -tpi / x;
-      if (__isinfl (z))
+      if (isinf (z))
 	__set_errno (ERANGE);
       return z;
     }
diff --git a/sysdeps/ieee754/ldbl-96/e_jnl.c b/sysdeps/ieee754/ldbl-96/e_jnl.c
index 95ff24201b..a6668089dd 100644
--- a/sysdeps/ieee754/ldbl-96/e_jnl.c
+++ b/sysdeps/ieee754/ldbl-96/e_jnl.c
@@ -378,7 +378,7 @@ __ieee754_ynl (int n, long double x)
 	  }
       }
     /* If B is +-Inf, set up errno accordingly.  */
-    if (! __finitel (b))
+    if (! isfinite (b))
       __set_errno (ERANGE);
     if (sign > 0)
       ret = b;
@@ -386,7 +386,7 @@ __ieee754_ynl (int n, long double x)
       ret = -b;
   }
  out:
-  if (__isinfl (ret))
+  if (isinf (ret))
     ret = __copysignl (LDBL_MAX, ret) * LDBL_MAX;
   return ret;
 }
diff --git a/sysdeps/ieee754/ldbl-96/w_expl.c b/sysdeps/ieee754/ldbl-96/w_expl.c
index 0965e6236d..3cc165b39d 100644
--- a/sysdeps/ieee754/ldbl-96/w_expl.c
+++ b/sysdeps/ieee754/ldbl-96/w_expl.c
@@ -24,9 +24,9 @@ long double
 __expl (long double x)
 {
   long double z = __ieee754_expl (x);
-  if (__builtin_expect (!__finitel (z) || z == 0, 0)
-      && __finitel (x) && _LIB_VERSION != _IEEE_)
-    return __kernel_standard_l (x, x, 206 + !!__signbitl (x));
+  if (__builtin_expect (!isfinite (z) || z == 0, 0)
+      && isfinite (x) && _LIB_VERSION != _IEEE_)
+    return __kernel_standard_l (x, x, 206 + !!signbit (x));
 
   return z;
 }
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-finite.c b/sysdeps/ieee754/ldbl-opt/nldbl-finite.c
index 000adfb8aa..af962386c1 100644
--- a/sysdeps/ieee754/ldbl-opt/nldbl-finite.c
+++ b/sysdeps/ieee754/ldbl-opt/nldbl-finite.c
@@ -4,7 +4,7 @@ int
 attribute_hidden
 __finitel (double x)
 {
-  return __finite (x);
+  return finite (x);
 }
 extern __typeof (__finitel) finitel attribute_hidden;
 weak_alias (__finitel, finitel)
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-isinf.c b/sysdeps/ieee754/ldbl-opt/nldbl-isinf.c
index 340d2418c0..577ab2db28 100644
--- a/sysdeps/ieee754/ldbl-opt/nldbl-isinf.c
+++ b/sysdeps/ieee754/ldbl-opt/nldbl-isinf.c
@@ -4,7 +4,7 @@ int
 attribute_hidden
 __isinfl (double x)
 {
-  return __isinf (x);
+  return isinf (x);
 }
 extern __typeof (__isinfl) isinfl attribute_hidden;
 weak_alias (__isinfl, isinfl)
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-isnan.c b/sysdeps/ieee754/ldbl-opt/nldbl-isnan.c
index e5f0f1b394..2d87bf85fb 100644
--- a/sysdeps/ieee754/ldbl-opt/nldbl-isnan.c
+++ b/sysdeps/ieee754/ldbl-opt/nldbl-isnan.c
@@ -4,7 +4,7 @@ int
 attribute_hidden
 __isnanl (double x)
 {
-  return __isnan (x);
+  return isnan (x);
 }
 extern __typeof (__isnanl) isnanl attribute_hidden;
 weak_alias (__isnanl, isnanl)
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-signbit.c b/sysdeps/ieee754/ldbl-opt/nldbl-signbit.c
index b62d0ed7fe..2e98c07396 100644
--- a/sysdeps/ieee754/ldbl-opt/nldbl-signbit.c
+++ b/sysdeps/ieee754/ldbl-opt/nldbl-signbit.c
@@ -6,5 +6,5 @@ int
 attribute_hidden
 __signbitl (double x)
 {
-  return __signbit (x);
+  return signbit (x);
 }