Since we now inline isinf, isnan and isfinite in math.h, replace uses of __isinf_ns(l/f)

with isinf, and remove the unused inlines __isinf_ns(l/f), __isnan(f) and __finite(f).

2015-09-18  Wilco Dijkstra  <wdijkstr@arm.com>

        * include/math.h: Remove __isinf_ns, __isinf_nsf, __isinf_nsl.
        * math/Makefile: Remove isinf_ns.c.
        * math/divtc3.c (__divtc3): Replace __isinf_nsl with isinf.
        * math/multc3.c (__multc3): Likewise.
        * math/s_casin.c (__casin): Likewise.
        * math/s_casinf.c (__casinf): Likewise.
        * math/s_casinl.c (__casinl): Likewise.
        * math/s_cproj.c (__cproj): Likewise.
        * math/s_cprojf.c (__cprojf): Likewise.
        * math/s_cprojl.c (__cprofl): Likewise.
        * math/s_ctan.c (__ctan): Likewise.
        * math/s_ctanf.c (__ctanf): Likewise.
        * math/s_ctanh.c (__ctanh): Likewise.
        * math/s_ctanhf.c (__ctanhf): Likewise.
        * math/s_ctanhl.c (__ctanhl): Likewise.
        * math/s_ctanl.c (__ctanl): Likewise.
        * math/w_fmod.c (__fmod): Likewise.
        * math/w_fmodf.c (__fmodf): Likewise.
        * math/w_fmodl.c (_fmodl): Likewise.
        * math/w_remainder.c (__remainder): Likewise.
        * math/w_remainderf.c (__remainderf): Likewise.
        * math/w_remainderl.c (__remainderl): Likewise.
        * math/w_scalb.c (__scalb): Likewise.
        * math/w_scalbf.c (__scalbf): Likewise.
        * math/w_scalbl.c (__scalbl): Likewise.
        * sysdeps/ieee754/dbl-64/s_isinf_ns.c: Deleted file.
        * sysdeps/ieee754/dbl-64/s_sincos.c (__sincos): Replace __isinf_ns
        with isinf.
        * sysdeps/ieee754/dbl-64/wordsize-64/math_private.h: Deleted file.
        * sysdeps/ieee754/dbl-64/wordsize-64/s_isinf_ns.c: Deleted file.
        * sysdeps/ieee754/flt-32/e_exp2f.c (__ieee754_exp2f): Replace
        __isinf_nsf with isinf.
        * sysdeps/ieee754/flt-32/math_private.h: Deleted file.
        * sysdeps/ieee754/flt-32/s_isinf_nsf.c: Deleted file.
        * sysdeps/ieee754/ldbl-128/s_isinf_nsl.c: Deleted file.
        * sysdeps/ieee754/ldbl-128/s_sincosl.c (__sincosl): Replace __isinf_nsl
        with isinf.
        * sysdeps/ieee754/ldbl-128ibm/s_cprojl.c(__cprojll): Replace
        __isinf_nsl with isinf.
        * sysdeps/ieee754/ldbl-128ibm/s_ctanl.c(__ctanl): Replace __isinf_nsl
        with isinf.
        * sysdeps/ieee754/ldbl-128ibm/s_isinf_nsl.c: Deleted file.
        * sysdeps/ieee754/ldbl-128ibm/s_sincosl.c (__sincosl): Replace
        __isinf_nsl with isinf.
        * sysdeps/ieee754/ldbl-96/s_isinf_nsl.c: Deleted file.
        * sysdeps/ieee754/ldbl-96/s_sincosl.c (__sincosl): Replace __isinf_nsl
        with isinf.

13 files changed, 5 insertions, 196 deletions

diff --git a/sysdeps/ieee754/dbl-64/s_isinf_ns.c b/sysdeps/ieee754/dbl-64/s_isinf_ns.c
deleted file mode 100644
index d8142bcf6e..0000000000
--- a/sysdeps/ieee754/dbl-64/s_isinf_ns.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Written by Ulrich Drepper <drepper@gmail.com>.
- */
-
-/*
- * __isinf_ns(x) returns != 0 if x is ±inf, else 0;
- * no branching!
- */
-
-#include <math.h>
-#include <math_private.h>
-
-#undef __isinf_ns
-int
-__isinf_ns (double x)
-{
-  int32_t hx, lx;
-  EXTRACT_WORDS (hx, lx, x);
-  return !(lx | ((hx & 0x7fffffff) ^ 0x7ff00000));
-}
diff --git a/sysdeps/ieee754/dbl-64/s_sincos.c b/sysdeps/ieee754/dbl-64/s_sincos.c
index c8a99991cc..d7431b7144 100644
--- a/sysdeps/ieee754/dbl-64/s_sincos.c
+++ b/sysdeps/ieee754/dbl-64/s_sincos.c
@@ -37,7 +37,7 @@ __sincos (double x, double *sinx, double *cosx)
     {
       /* sin(Inf or NaN) is NaN */
       *sinx = *cosx = x - x;
-      if (__isinf_ns (x))
+      if (isinf (x))
 	__set_errno (EDOM);
     }
   else
diff --git a/sysdeps/ieee754/dbl-64/wordsize-64/math_private.h b/sysdeps/ieee754/dbl-64/wordsize-64/math_private.h
deleted file mode 100644
index 4f9219934a..0000000000
--- a/sysdeps/ieee754/dbl-64/wordsize-64/math_private.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#ifndef _MATH_PRIVATE_H_
-
-#include_next <math_private.h>
-#include <stdint.h>
-
-#ifndef __isnan
-extern __always_inline int
-__isnan (double d)
-{
-  uint64_t di;
-  EXTRACT_WORDS64 (di, d);
-  return (di & 0x7fffffffffffffffull) > 0x7ff0000000000000ull;
-}
-#endif
-
-#ifndef __isinf_ns
-extern __always_inline int
-__isinf_ns (double d)
-{
-  uint64_t di;
-  EXTRACT_WORDS64 (di, d);
-  return (di & 0x7fffffffffffffffull) == 0x7ff0000000000000ull;
-}
-#endif
-
-#ifndef __finite
-extern __always_inline int
-__finite (double d)
-{
-  uint64_t di;
-  EXTRACT_WORDS64 (di, d);
-  return (di & 0x7fffffffffffffffull) < 0x7ff0000000000000ull;
-}
-#endif
-
-#endif /* _MATH_PRIVATE_H_ */
diff --git a/sysdeps/ieee754/dbl-64/wordsize-64/s_isinf_ns.c b/sysdeps/ieee754/dbl-64/wordsize-64/s_isinf_ns.c
deleted file mode 100644
index 9d78ed13ae..0000000000
--- a/sysdeps/ieee754/dbl-64/wordsize-64/s_isinf_ns.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Written by Ulrich Drepper <drepper@gmail.com>.
- */
-
-/*
- * __isinf_ns(x) returns != 0 if x is ±inf, else 0;
- * no branching!
- */
-
-#include <math.h>
-#include <math_private.h>
-
-#undef __isinf_ns
-int
-__isinf_ns (double x)
-{
-	int64_t ix;
-	EXTRACT_WORDS64(ix,x);
-	return (ix & UINT64_C(0x7fffffffffffffff)) == UINT64_C(0x7ff0000000000000);
-}
diff --git a/sysdeps/ieee754/flt-32/e_exp2f.c b/sysdeps/ieee754/flt-32/e_exp2f.c
index bc62042966..170c565895 100644
--- a/sysdeps/ieee754/flt-32/e_exp2f.c
+++ b/sysdeps/ieee754/flt-32/e_exp2f.c
@@ -122,7 +122,7 @@ __ieee754_exp2f (float x)
   /* Exceptional cases:  */
   else if (isless (x, himark))
     {
-      if (__isinf_nsf (x))
+      if (isinf (x))
 	/* e^-inf == 0, with no error.  */
 	return 0;
       else
diff --git a/sysdeps/ieee754/flt-32/math_private.h b/sysdeps/ieee754/flt-32/math_private.h
deleted file mode 100644
index e33db02b4c..0000000000
--- a/sysdeps/ieee754/flt-32/math_private.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef _MATH_PRIVATE_H_
-
-#include_next <math_private.h>
-
-#ifndef __isnanf
-extern __always_inline int
-__isnanf (float d)
-{
-  u_int32_t di;
-  GET_FLOAT_WORD (di, d);
-  return (di & 0x7fffffff) > 0x7f800000;
-}
-#endif
-
-#ifndef __isinf_nsf
-extern __always_inline int
-__isinf_nsf (float d)
-{
-  u_int32_t di;
-  GET_FLOAT_WORD (di, d);
-  return (di & 0x7fffffff) == 0x7f800000;
-}
-#endif
-
-#ifndef __finitef
-extern __always_inline int
-__finitef (float d)
-{
-  u_int32_t di;
-  GET_FLOAT_WORD (di, d);
-  return (di & 0x7fffffff) < 0x7f800000;
-}
-#endif
-
-#endif /* _MATH_PRIVATE_H_ */
diff --git a/sysdeps/ieee754/flt-32/s_isinf_nsf.c b/sysdeps/ieee754/flt-32/s_isinf_nsf.c
deleted file mode 100644
index 284d61926a..0000000000
--- a/sysdeps/ieee754/flt-32/s_isinf_nsf.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Written by Ulrich Drepper <drepper@gmail.com>.
- */
-
-/*
- * __isinf_nsf(x) returns != 0 if x is ±inf, else 0;
- * no branching!
- */
-
-#include <math.h>
-#include <math_private.h>
-
-#undef __isinf_nsf
-int
-__isinf_nsf (float x)
-{
-	int32_t ix;
-	GET_FLOAT_WORD(ix,x);
-	return (ix & 0x7fffffff) == 0x7f800000;
-}
diff --git a/sysdeps/ieee754/ldbl-128/s_isinf_nsl.c b/sysdeps/ieee754/ldbl-128/s_isinf_nsl.c
deleted file mode 100644
index 7d6cfb9a62..0000000000
--- a/sysdeps/ieee754/ldbl-128/s_isinf_nsl.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Written by Ulrich Drepper <drepper@gmail.com>
- */
-
-/*
- * __isinf_nsl(x) returns != 0 if x is ±inf, else 0;
- * no branching!
- */
-
-#include <math.h>
-#include <math_private.h>
-
-int
-__isinf_nsl (long double x)
-{
-	int64_t hx,lx;
-	GET_LDOUBLE_WORDS64(hx,lx,x);
-	return !(lx | ((hx & 0x7fffffffffffffffLL) ^ 0x7fff000000000000LL));
-}
diff --git a/sysdeps/ieee754/ldbl-128/s_sincosl.c b/sysdeps/ieee754/ldbl-128/s_sincosl.c
index 6c4cbd7237..d4d432ab34 100644
--- a/sysdeps/ieee754/ldbl-128/s_sincosl.c
+++ b/sysdeps/ieee754/ldbl-128/s_sincosl.c
@@ -39,7 +39,7 @@ __sincosl (long double x, long double *sinx, long double *cosx)
     {
       /* sin(Inf or NaN) is NaN */
       *sinx = *cosx = x - x;
-      if (__isinf_nsl (x))
+      if (isinf (x))
 	__set_errno (EDOM);
     }
   else
diff --git a/sysdeps/ieee754/ldbl-128ibm/s_isinf_nsl.c b/sysdeps/ieee754/ldbl-128ibm/s_isinf_nsl.c
deleted file mode 100644
index 54e72c9166..0000000000
--- a/sysdeps/ieee754/ldbl-128ibm/s_isinf_nsl.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * __isinf_nsl(x) returns != 0 if x is ±inf, else 0;
- * no branching!
- * slightly dodgy in relying on signed shift right copying sign bit
- */
-
-#include <math.h>
-#include <math_private.h>
-
-int
-__isinf_nsl (long double x)
-{
-  double xhi;
-  int64_t hx, mask;
-
-  xhi = ldbl_high (x);
-  EXTRACT_WORDS64 (hx, xhi);
-
-  mask = (hx & 0x7fffffffffffffffLL) ^ 0x7ff0000000000000LL;
-  mask |= -mask;
-  mask >>= 63;
-  return ~mask;
-}
diff --git a/sysdeps/ieee754/ldbl-128ibm/s_sincosl.c b/sysdeps/ieee754/ldbl-128ibm/s_sincosl.c
index 8a49c54d6c..b7efd1a835 100644
--- a/sysdeps/ieee754/ldbl-128ibm/s_sincosl.c
+++ b/sysdeps/ieee754/ldbl-128ibm/s_sincosl.c
@@ -42,7 +42,7 @@ __sincosl (long double x, long double *sinx, long double *cosx)
     {
       /* sin(Inf or NaN) is NaN */
       *sinx = *cosx = x - x;
-      if (__isinf_nsl (x))
+      if (isinf (x))
 	__set_errno (EDOM);
     }
   else
diff --git a/sysdeps/ieee754/ldbl-96/s_isinf_nsl.c b/sysdeps/ieee754/ldbl-96/s_isinf_nsl.c
deleted file mode 100644
index 9c7868b490..0000000000
--- a/sysdeps/ieee754/ldbl-96/s_isinf_nsl.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Written by Ulrich Drepper <drepper@gmail.com>.
- */
-
-/*
- * __isinf_nsl(x) returns != 0 if x is ±inf, else 0;
- */
-
-#include <math.h>
-#include <math_private.h>
-
-int
-__isinf_nsl (long double x)
-{
-	int32_t se,hx,lx;
-	GET_LDOUBLE_WORDS(se,hx,lx,x);
-	return !(((se & 0x7fff) ^ 0x7fff) | lx | (hx & 0x7fffffff));
-}
diff --git a/sysdeps/ieee754/ldbl-96/s_sincosl.c b/sysdeps/ieee754/ldbl-96/s_sincosl.c
index 37067bdaeb..86f1d96bde 100644
--- a/sysdeps/ieee754/ldbl-96/s_sincosl.c
+++ b/sysdeps/ieee754/ldbl-96/s_sincosl.c
@@ -42,7 +42,7 @@ __sincosl (long double x, long double *sinx, long double *cosx)
     {
       /* sin(Inf or NaN) is NaN */
       *sinx = *cosx = x - x;
-      if (__isinf_nsl (x))
+      if (isinf (x))
 	__set_errno (EDOM);
     }
   else