diff options
| author | Paul E. Murphy <murphyp@linux.vnet.ibm.com> | 2016-07-01 13:17:09 -0500 |
|---|---|---|
| committer | Paul E. Murphy <murphyp@linux.vnet.ibm.com> | 2016-08-03 11:07:04 -0500 |
| commit | f2de695bf6ab3d346bf0ec4e436f124cff8edfd4 (patch) | |
| tree | 323d3c3ad199eeb5d52511243b179d326b67a15b | |
| parent | b9e05ed07a3d805f12effa6b86c41a9d9c13a1f1 (diff) | |
| download | glibc-f2de695bf6ab3d346bf0ec4e436f124cff8edfd4.tar.gz glibc-f2de695bf6ab3d346bf0ec4e436f124cff8edfd4.tar.xz glibc-f2de695bf6ab3d346bf0ec4e436f124cff8edfd4.zip | |
Unify drift between _Complex function type variants
While trying to convert the _Complex function wrappers into a single generic implementation, a few minor variations between identical versions emerged.
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | math/s_ccoshf.c | 4 | ||||
| -rw-r--r-- | math/s_ccoshl.c | 2 | ||||
| -rw-r--r-- | math/s_csinhf.c | 4 | ||||
| -rw-r--r-- | math/s_csinhl.c | 4 |
5 files changed, 15 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog index a8447f0a34..00fd7c107a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,16 @@ 2016-08-03 Paul E. Murphy <murphyp@linux.vnet.ibm.com> + * s_ccoshf.c (__ccoshf): Remove FE_INVALID + check, and remove __glibc_likely hint + from FP_INFINITE check. + * s_csinhf.c (__csinhf): Likewise. + + * s_ccoshl.c (__ccoshl): Remove __glibc_likely + hint from FP_INFINITE check. + * s_csinhl.c (__csinhl): Likewise. + +2016-08-03 Paul E. Murphy <murphyp@linux.vnet.ibm.com> + * math/Makefile (libm-calls): Insert F placeholder into object names. Move w_lgamma_compat* routines into (libm-compat-calls): New variable. diff --git a/math/s_ccoshf.c b/math/s_ccoshf.c index 610a7490ee..d572b76193 100644 --- a/math/s_ccoshf.c +++ b/math/s_ccoshf.c @@ -94,7 +94,7 @@ __ccoshf (__complex__ float x) feraiseexcept (FE_INVALID); } } - else if (__glibc_likely (rcls == FP_INFINITE)) + else if (rcls == FP_INFINITE) { /* Real part is infinite. */ if (__glibc_likely (icls > FP_ZERO)) @@ -128,10 +128,8 @@ __ccoshf (__complex__ float x) __real__ retval = HUGE_VALF; __imag__ retval = __nanf ("") + __nanf (""); -#ifdef FE_INVALID if (icls == FP_INFINITE) feraiseexcept (FE_INVALID); -#endif } } else diff --git a/math/s_ccoshl.c b/math/s_ccoshl.c index 680da3a6f7..d38f0aaff6 100644 --- a/math/s_ccoshl.c +++ b/math/s_ccoshl.c @@ -94,7 +94,7 @@ __ccoshl (__complex__ long double x) feraiseexcept (FE_INVALID); } } - else if (__glibc_likely (rcls == FP_INFINITE)) + else if (rcls == FP_INFINITE) { /* Real part is infinite. */ if (__glibc_likely (icls > FP_ZERO)) diff --git a/math/s_csinhf.c b/math/s_csinhf.c index a0458cfd0a..36b42ca465 100644 --- a/math/s_csinhf.c +++ b/math/s_csinhf.c @@ -111,7 +111,7 @@ __csinhf (__complex__ float x) } } } - else if (__glibc_likely (rcls == FP_INFINITE)) + else if (rcls == FP_INFINITE) { /* Real part is infinite. */ if (__glibc_likely (icls > FP_ZERO)) @@ -147,10 +147,8 @@ __csinhf (__complex__ float x) __real__ retval = HUGE_VALF; __imag__ retval = __nanf ("") + __nanf (""); -#ifdef FE_INVALID if (icls == FP_INFINITE) feraiseexcept (FE_INVALID); -#endif } } else diff --git a/math/s_csinhl.c b/math/s_csinhl.c index d7f03fa441..c231d7b06f 100644 --- a/math/s_csinhl.c +++ b/math/s_csinhl.c @@ -111,7 +111,7 @@ __csinhl (__complex__ long double x) } } } - else if (__glibc_likely (rcls == FP_INFINITE)) + else if (rcls == FP_INFINITE) { /* Real part is infinite. */ if (__glibc_likely (icls > FP_ZERO)) @@ -147,10 +147,8 @@ __csinhl (__complex__ long double x) __real__ retval = HUGE_VALL; __imag__ retval = __nanl ("") + __nanl (""); -#ifdef FE_INVALID if (icls == FP_INFINITE) feraiseexcept (FE_INVALID); -#endif } } else |