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.

diff --git a/ChangeLog b/ChangeLog
index a8447f0a3408436d28ee54316d495fb8266742c8..00fd7c107adf2e9c13c3ee6618f58e783bcc5120 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+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

diff --git a/math/s_ccoshf.c b/math/s_ccoshf.c
index 610a7490ee8e5ebe0ef9f406f3347f8fd94de72b..d572b761930f1a7a9547a591461aed86acfe8211 100644 (file)
--- 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 680da3a6f759d8e23d3477009b4e9b23ce854374..d38f0aaff64232c16d605802281cfc9c2f6d9df2 100644 (file)
--- 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 a0458cfd0a7c99e56460723985fe063964fd38d1..36b42ca465a123f28c652eb2b30bbda7879b60ca 100644 (file)
--- 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 d7f03fa4419fbc4b6e0baaa4dbf58ca1cc95ba9a..c231d7b06f82f37251e429cf23a19ba252db4968 100644 (file)
--- 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