aboutsummaryrefslogtreecommitdiff
path: root/math
diff options
context:
space:
mode:
Diffstat (limited to 'math')
-rw-r--r--math/Makefile4
-rw-r--r--math/divtc3.c16
-rw-r--r--math/multc3.c17
-rw-r--r--math/s_casin.c5
-rw-r--r--math/s_casinf.c5
-rw-r--r--math/s_casinl.c5
-rw-r--r--math/s_ccos.c9
-rw-r--r--math/s_ccosf.c9
-rw-r--r--math/s_ccosl.c9
-rw-r--r--math/s_ctan.c6
-rw-r--r--math/s_ctanf.c6
-rw-r--r--math/s_ctanh.c6
-rw-r--r--math/s_ctanhf.c6
-rw-r--r--math/s_ctanhl.c6
-rw-r--r--math/s_ctanl.c6
-rw-r--r--math/w_fmod.c4
-rw-r--r--math/w_fmodf.c4
-rw-r--r--math/w_fmodl.c4
-rw-r--r--math/w_remainder.c2
-rw-r--r--math/w_remainderf.c2
-rw-r--r--math/w_remainderl.c2
21 files changed, 71 insertions, 62 deletions
diff --git a/math/Makefile b/math/Makefile
index 45954e2..25cb5f6 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1996-2001,2002,2003,2004,2005,2006
+# Copyright (C) 1996-2001,2002,2003,2004,2005,2006,2011
# Free Software Foundation, Inc.
# This file is part of the GNU C Library.
@@ -60,7 +60,7 @@ libm-calls = e_acos e_acosh e_asin e_atan2 e_atanh e_cosh e_exp e_fmod \
s_catan s_casin s_ccos s_csin s_ctan s_ctanh s_cacos \
s_casinh s_cacosh s_catanh s_csqrt s_cpow s_cproj s_clog10 \
s_fma s_lrint s_llrint s_lround s_llround e_exp10 w_log2 \
- $(calls:s_%=m_%)
+ s_isinf_ns $(calls:s_%=m_%)
include ../Makeconfig
diff --git a/math/divtc3.c b/math/divtc3.c
index d974ae6..72bca66 100644
--- a/math/divtc3.c
+++ b/math/divtc3.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 2005, 2006, 2011 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson <rth@redhat.com>, 2005.
@@ -55,17 +55,19 @@ __divtc3 (long double a, long double b, long double c, long double d)
x = __copysignl (INFINITY, c) * a;
y = __copysignl (INFINITY, c) * b;
}
- else if ((isinf (a) || isinf (b)) && isfinite (c) && isfinite (d))
+ else if ((__isinf_nsl (a) || __isinf_nsl (b))
+ && isfinite (c) && isfinite (d))
{
- a = __copysignl (isinf (a) ? 1 : 0, a);
- b = __copysignl (isinf (b) ? 1 : 0, b);
+ a = __copysignl (__isinf_nsl (a) ? 1 : 0, a);
+ b = __copysignl (__isinf_nsl (b) ? 1 : 0, b);
x = INFINITY * (a * c + b * d);
y = INFINITY * (b * c - a * d);
}
- else if ((isinf (c) || isinf (d)) && isfinite (a) && isfinite (b))
+ else if ((__isinf_nsl (c) || __isinf_nsl (d))
+ && isfinite (a) && isfinite (b))
{
- c = __copysignl (isinf (c) ? 1 : 0, c);
- d = __copysignl (isinf (d) ? 1 : 0, d);
+ c = __copysignl (__isinf_nsl (c) ? 1 : 0, c);
+ d = __copysignl (__isinf_nsl (d) ? 1 : 0, d);
x = 0.0 * (a * c + b * d);
y = 0.0 * (b * c - a * d);
}
diff --git a/math/multc3.c b/math/multc3.c
index 6369f48..351dccf 100644
--- a/math/multc3.c
+++ b/math/multc3.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 2005, 2006, 2011 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson <rth@redhat.com>, 2005.
@@ -39,28 +39,29 @@ __multc3 (long double a, long double b, long double c, long double d)
{
/* Recover infinities that computed as NaN + iNaN. */
bool recalc = 0;
- if (isinf (a) || isinf (b))
+ if (__isinf_nsl (a) || __isinf_nsl (b))
{
/* z is infinite. "Box" the infinity and change NaNs in
the other factor to 0. */
- a = __copysignl (isinf (a) ? 1 : 0, a);
- b = __copysignl (isinf (b) ? 1 : 0, b);
+ a = __copysignl (__isinf_nsl (a) ? 1 : 0, a);
+ b = __copysignl (__isinf_nsl (b) ? 1 : 0, b);
if (isnan (c)) c = __copysignl (0, c);
if (isnan (d)) d = __copysignl (0, d);
recalc = 1;
}
- if (isinf (c) || isinf (d))
+ if (__isinf_nsl (c) || __isinf_nsl (d))
{
/* w is infinite. "Box" the infinity and change NaNs in
the other factor to 0. */
- c = __copysignl (isinf (c) ? 1 : 0, c);
- d = __copysignl (isinf (d) ? 1 : 0, d);
+ c = __copysignl (__isinf_nsl (c) ? 1 : 0, c);
+ d = __copysignl (__isinf_nsl (d) ? 1 : 0, d);
if (isnan (a)) a = __copysignl (0, a);
if (isnan (b)) b = __copysignl (0, b);
recalc = 1;
}
if (!recalc
- && (isinf (ac) || isinf (bd) || isinf (ad) || isinf (bc)))
+ && (__isinf_nsl (ac) || __isinf_nsl (bd)
+ || __isinf_nsl (ad) || __isinf_nsl (bc)))
{
/* Recover infinities from overflow by changing NaNs to 0. */
if (isnan (a)) a = __copysignl (0, a);
diff --git a/math/s_casin.c b/math/s_casin.c
index 2d5b06c..02a215a 100644
--- a/math/s_casin.c
+++ b/math/s_casin.c
@@ -1,5 +1,5 @@
/* Return arc sine of complex double value.
- Copyright (C) 1997 Free Software Foundation, Inc.
+ Copyright (C) 1997, 2011 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
@@ -20,6 +20,7 @@
#include <complex.h>
#include <math.h>
+#include <math_private.h>
__complex__ double
@@ -33,7 +34,7 @@ __casin (__complex__ double x)
{
res = x;
}
- else if (__isinf (__real__ x) || __isinf (__imag__ x))
+ else if (__isinf_ns (__real__ x) || __isinf_ns (__imag__ x))
{
__real__ res = __nan ("");
__imag__ res = __copysign (HUGE_VAL, __imag__ x);
diff --git a/math/s_casinf.c b/math/s_casinf.c
index 5278dbb..56c618f 100644
--- a/math/s_casinf.c
+++ b/math/s_casinf.c
@@ -1,5 +1,5 @@
/* Return arc sine of complex float value.
- Copyright (C) 1997 Free Software Foundation, Inc.
+ Copyright (C) 1997, 2011 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
@@ -20,6 +20,7 @@
#include <complex.h>
#include <math.h>
+#include <math_private.h>
__complex__ float
@@ -33,7 +34,7 @@ __casinf (__complex__ float x)
{
res = x;
}
- else if (__isinff (__real__ x) || __isinff (__imag__ x))
+ else if (__isinf_nsf (__real__ x) || __isinf_nsf (__imag__ x))
{
__real__ res = __nanf ("");
__imag__ res = __copysignf (HUGE_VALF, __imag__ x);
diff --git a/math/s_casinl.c b/math/s_casinl.c
index f303c05..431e9a2 100644
--- a/math/s_casinl.c
+++ b/math/s_casinl.c
@@ -1,5 +1,5 @@
/* Return arc sine of complex long double value.
- Copyright (C) 1997 Free Software Foundation, Inc.
+ Copyright (C) 1997, 2011 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
@@ -20,6 +20,7 @@
#include <complex.h>
#include <math.h>
+#include <math_private.h>
__complex__ long double
@@ -33,7 +34,7 @@ __casinl (__complex__ long double x)
{
res = x;
}
- else if (__isinfl (__real__ x) || __isinfl (__imag__ x))
+ else if (__isinf_nsl (__real__ x) || __isinf_nsl (__imag__ x))
{
__real__ res = __nanl ("");
__imag__ res = __copysignl (HUGE_VALL, __imag__ x);
diff --git a/math/s_ccos.c b/math/s_ccos.c
index 1b244d7..63851aa 100644
--- a/math/s_ccos.c
+++ b/math/s_ccos.c
@@ -1,5 +1,5 @@
/* Return cosine of complex double value.
- Copyright (C) 1997 Free Software Foundation, Inc.
+ Copyright (C) 1997, 2011 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
@@ -21,6 +21,7 @@
#include <complex.h>
#include <fenv.h>
#include <math.h>
+#include <math_private.h>
__complex__ double
@@ -36,17 +37,17 @@ __ccos (__complex__ double x)
__imag__ res = 0.0;
#ifdef FE_INVALID
- if (__isinf (__real__ x))
+ if (__isinf_ns (__real__ x))
feraiseexcept (FE_INVALID);
#endif
}
- else if (__isinf (__imag__ x))
+ else if (__isinf_ns (__imag__ x))
{
__real__ res = HUGE_VAL;
__imag__ res = __nan ("");
#ifdef FE_INVALID
- if (__isinf (__real__ x))
+ if (__isinf_ns (__real__ x))
feraiseexcept (FE_INVALID);
#endif
}
diff --git a/math/s_ccosf.c b/math/s_ccosf.c
index 4b154de..f0e9c2a 100644
--- a/math/s_ccosf.c
+++ b/math/s_ccosf.c
@@ -1,5 +1,5 @@
/* Return cosine of complex float value.
- Copyright (C) 1997 Free Software Foundation, Inc.
+ Copyright (C) 1997, 2011 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
@@ -21,6 +21,7 @@
#include <complex.h>
#include <fenv.h>
#include <math.h>
+#include <math_private.h>
__complex__ float
@@ -36,17 +37,17 @@ __ccosf (__complex__ float x)
__imag__ res = 0.0;
#ifdef FE_INVALID
- if (__isinff (__real__ x))
+ if (__isinf_nsf (__real__ x))
feraiseexcept (FE_INVALID);
#endif
}
- else if (__isinff (__imag__ x))
+ else if (__isinf_nsf (__imag__ x))
{
__real__ res = HUGE_VALF;
__imag__ res = __nanf ("");
#ifdef FE_INVALID
- if (__isinff (__real__ x))
+ if (__isinf_nsf (__real__ x))
feraiseexcept (FE_INVALID);
#endif
}
diff --git a/math/s_ccosl.c b/math/s_ccosl.c
index 4ebe2c3..9902a02 100644
--- a/math/s_ccosl.c
+++ b/math/s_ccosl.c
@@ -1,5 +1,5 @@
/* Return cosine of complex long double value.
- Copyright (C) 1997 Free Software Foundation, Inc.
+ Copyright (C) 1997, 2011 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
@@ -21,6 +21,7 @@
#include <complex.h>
#include <fenv.h>
#include <math.h>
+#include <math_private.h>
__complex__ long double
@@ -36,17 +37,17 @@ __ccosl (__complex__ long double x)
__imag__ res = 0.0;
#ifdef FE_INVALID
- if (__isinfl (__real__ x))
+ if (__isinf_nsl (__real__ x))
feraiseexcept (FE_INVALID);
#endif
}
- else if (__isinfl (__imag__ x))
+ else if (__isinf_nsl (__imag__ x))
{
__real__ res = HUGE_VALL;
__imag__ res = __nanl ("");
#ifdef FE_INVALID
- if (__isinfl (__real__ x))
+ if (__isinf_nsl (__real__ x))
feraiseexcept (FE_INVALID);
#endif
}
diff --git a/math/s_ctan.c b/math/s_ctan.c
index 4cadad1..0dd211e 100644
--- a/math/s_ctan.c
+++ b/math/s_ctan.c
@@ -1,5 +1,5 @@
/* Complex tangent function for double.
- Copyright (C) 1997, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1997, 2005, 2011 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
@@ -32,7 +32,7 @@ __ctan (__complex__ double x)
if (!isfinite (__real__ x) || !isfinite (__imag__ x))
{
- if (__isinf (__imag__ x))
+ if (__isinf_ns (__imag__ x))
{
__real__ res = __copysign (0.0, __real__ x);
__imag__ res = __copysign (1.0, __imag__ x);
@@ -47,7 +47,7 @@ __ctan (__complex__ double x)
__imag__ res = __nan ("");
#ifdef FE_INVALID
- if (__isinf (__real__ x))
+ if (__isinf_ns (__real__ x))
feraiseexcept (FE_INVALID);
#endif
}
diff --git a/math/s_ctanf.c b/math/s_ctanf.c
index 7fa1620..7236dc3 100644
--- a/math/s_ctanf.c
+++ b/math/s_ctanf.c
@@ -1,5 +1,5 @@
/* Complex tangent function for float.
- Copyright (C) 1997, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1997, 2005, 2011 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
@@ -32,7 +32,7 @@ __ctanf (__complex__ float x)
if (!isfinite (__real__ x) || !isfinite (__imag__ x))
{
- if (__isinff (__imag__ x))
+ if (__isinf_nsf (__imag__ x))
{
__real__ res = __copysignf (0.0, __real__ x);
__imag__ res = __copysignf (1.0, __imag__ x);
@@ -47,7 +47,7 @@ __ctanf (__complex__ float x)
__imag__ res = __nanf ("");
#ifdef FE_INVALID
- if (__isinff (__real__ x))
+ if (__isinf_nsf (__real__ x))
feraiseexcept (FE_INVALID);
#endif
}
diff --git a/math/s_ctanh.c b/math/s_ctanh.c
index 60a52db..f4a1d7e 100644
--- a/math/s_ctanh.c
+++ b/math/s_ctanh.c
@@ -1,5 +1,5 @@
/* Complex hyperbole tangent for double.
- Copyright (C) 1997, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1997, 2005, 2011 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
@@ -32,7 +32,7 @@ __ctanh (__complex__ double x)
if (!isfinite (__real__ x) || !isfinite (__imag__ x))
{
- if (__isinf (__real__ x))
+ if (__isinf_ns (__real__ x))
{
__real__ res = __copysign (1.0, __real__ x);
__imag__ res = __copysign (0.0, __imag__ x);
@@ -47,7 +47,7 @@ __ctanh (__complex__ double x)
__imag__ res = __nan ("");
#ifdef FE_INVALID
- if (__isinf (__imag__ x))
+ if (__isinf_ns (__imag__ x))
feraiseexcept (FE_INVALID);
#endif
}
diff --git a/math/s_ctanhf.c b/math/s_ctanhf.c
index 1d62afc..cb65edb 100644
--- a/math/s_ctanhf.c
+++ b/math/s_ctanhf.c
@@ -1,5 +1,5 @@
/* Complex hyperbole tangent for float.
- Copyright (C) 1997, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1997, 2005, 2011 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
@@ -32,7 +32,7 @@ __ctanhf (__complex__ float x)
if (!isfinite (__real__ x) || !isfinite (__imag__ x))
{
- if (__isinff (__real__ x))
+ if (__isinf_nsf (__real__ x))
{
__real__ res = __copysignf (1.0, __real__ x);
__imag__ res = __copysignf (0.0, __imag__ x);
@@ -47,7 +47,7 @@ __ctanhf (__complex__ float x)
__imag__ res = __nanf ("");
#ifdef FE_INVALID
- if (__isinff (__imag__ x))
+ if (__isinf_nsf (__imag__ x))
feraiseexcept (FE_INVALID);
#endif
}
diff --git a/math/s_ctanhl.c b/math/s_ctanhl.c
index 99df2b0..bee9e76 100644
--- a/math/s_ctanhl.c
+++ b/math/s_ctanhl.c
@@ -1,5 +1,5 @@
/* Complex hyperbole tangent for long double.
- Copyright (C) 1997, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1997, 2005, 2011 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
@@ -32,7 +32,7 @@ __ctanhl (__complex__ long double x)
if (!isfinite (__real__ x) || !isfinite (__imag__ x))
{
- if (__isinfl (__real__ x))
+ if (__isinf_nsl (__real__ x))
{
__real__ res = __copysignl (1.0, __real__ x);
__imag__ res = __copysignl (0.0, __imag__ x);
@@ -47,7 +47,7 @@ __ctanhl (__complex__ long double x)
__imag__ res = __nanl ("");
#ifdef FE_INVALID
- if (__isinfl (__imag__ x))
+ if (__isinf_nsl (__imag__ x))
feraiseexcept (FE_INVALID);
#endif
}
diff --git a/math/s_ctanl.c b/math/s_ctanl.c
index 4a95c1d..fcc0da9 100644
--- a/math/s_ctanl.c
+++ b/math/s_ctanl.c
@@ -1,5 +1,5 @@
/* Complex tangent function for long double.
- Copyright (C) 1997, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1997, 2005, 2011 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
@@ -32,7 +32,7 @@ __ctanl (__complex__ long double x)
if (!isfinite (__real__ x) || !isfinite (__imag__ x))
{
- if (__isinfl (__imag__ x))
+ if (__isinf_nsl (__imag__ x))
{
__real__ res = __copysignl (0.0, __real__ x);
__imag__ res = __copysignl (1.0, __imag__ x);
@@ -47,7 +47,7 @@ __ctanl (__complex__ long double x)
__imag__ res = __nanl ("");
#ifdef FE_INVALID
- if (__isinfl (__real__ x))
+ if (__isinf_nsl (__real__ x))
feraiseexcept (FE_INVALID);
#endif
}
diff --git a/math/w_fmod.c b/math/w_fmod.c
index 69102de..b93ff89 100644
--- a/math/w_fmod.c
+++ b/math/w_fmod.c
@@ -35,9 +35,9 @@ static char rcsid[] = "$NetBSD: w_fmod.c,v 1.6 1995/05/10 20:48:55 jtc Exp $";
double z;
z = __ieee754_fmod(x,y);
if(_LIB_VERSION == _IEEE_ ||__isnan(y)||__isnan(x)) return z;
- if(__isinf(x)||y==0.0) {
+ if(__isinf_ns(x)||y==0.0) {
/* fmod(+-Inf,y) or fmod(x,0) */
- return __kernel_standard(x,y,27);
+ return __kernel_standard(x,y,27);
} else
return z;
#endif
diff --git a/math/w_fmodf.c b/math/w_fmodf.c
index 55ec873..12e2fb3 100644
--- a/math/w_fmodf.c
+++ b/math/w_fmodf.c
@@ -38,9 +38,9 @@ static char rcsid[] = "$NetBSD: w_fmodf.c,v 1.3 1995/05/10 20:48:57 jtc Exp $";
float z;
z = __ieee754_fmodf(x,y);
if(_LIB_VERSION == _IEEE_ ||__isnanf(y)||__isnanf(x)) return z;
- if(__isinff(x)||y==(float)0.0) {
+ if(__isinf_nsf(x)||y==(float)0.0) {
/* fmodf(+-Inf,y) or fmodf(x,0) */
- return (float)__kernel_standard((double)x,(double)y,127);
+ return (float)__kernel_standard((double)x,(double)y,127);
} else
return z;
#endif
diff --git a/math/w_fmodl.c b/math/w_fmodl.c
index c95e232..ffc77ad 100644
--- a/math/w_fmodl.c
+++ b/math/w_fmodl.c
@@ -39,9 +39,9 @@ static char rcsid[] = "$NetBSD: $";
long double z;
z = __ieee754_fmodl(x,y);
if(_LIB_VERSION == _IEEE_ ||__isnanl(y)||__isnanl(x)) return z;
- if(__isinfl(x)||y==0.0) {
+ if(__isinf_nsl(x)||y==0.0) {
/* fmodl(+-Inf,y) or fmodl(x,0) */
- return __kernel_standard(x,y,227);
+ return __kernel_standard(x,y,227);
} else
return z;
#endif
diff --git a/math/w_remainder.c b/math/w_remainder.c
index 087bf23..cf35ee2 100644
--- a/math/w_remainder.c
+++ b/math/w_remainder.c
@@ -34,7 +34,7 @@ static char rcsid[] = "$NetBSD: w_remainder.c,v 1.6 1995/05/10 20:49:44 jtc Exp
double z;
z = __ieee754_remainder(x,y);
if(_LIB_VERSION == _IEEE_ || __isnan(y) || __isnan(x)) return z;
- if(y==0.0 || __isinf(x))
+ if(y==0.0 || __isinf_ns(x))
return __kernel_standard(x,y,28); /* remainder(x,0) */
else
return z;
diff --git a/math/w_remainderf.c b/math/w_remainderf.c
index 95e6d30..39d01b3 100644
--- a/math/w_remainderf.c
+++ b/math/w_remainderf.c
@@ -37,7 +37,7 @@ static char rcsid[] = "$NetBSD: w_remainderf.c,v 1.3 1995/05/10 20:49:46 jtc Exp
float z;
z = __ieee754_remainderf(x,y);
if(_LIB_VERSION == _IEEE_ || __isnanf(y) || __isnanf(x)) return z;
- if(y==(float)0.0 || __isinff(x))
+ if(y==(float)0.0 || __isinf_nsf(x))
/* remainder(x,0) */
return (float)__kernel_standard((double)x,(double)y,128);
else
diff --git a/math/w_remainderl.c b/math/w_remainderl.c
index 36050f0..dec70e5 100644
--- a/math/w_remainderl.c
+++ b/math/w_remainderl.c
@@ -39,7 +39,7 @@ static char rcsid[] = "$NetBSD: $";
long double z;
z = __ieee754_remainderl(x,y);
if(_LIB_VERSION == _IEEE_ || __isnanl(y) || __isnanl(x)) return z;
- if(y==0.0 || __isinfl(x))
+ if(y==0.0 || __isinf_nsl(x))
return __kernel_standard(x,y,228); /* remainder(x,0) */
else
return z;
generated by cgit v1.1 at 2024-11-10 20:01:14 +0000