NPTL is no longer an add-on!

[platform/upstream/glibc.git] / math / s_catanhf.c

diff --git a/math/s_catanhf.c b/math/s_catanhf.c
index 6376a2c..0e55aff 100644 (file)
--- a/math/s_catanhf.c
+++ b/math/s_catanhf.c
@@ -1,5 +1,5 @@
 /* Return arc hyperbole tangent for float value.
-   Copyright (C) 1997-2013 Free Software Foundation, Inc.
+   Copyright (C) 1997-2014 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -29,7 +29,7 @@ __catanhf (__complex__ float x)
   int rcls = fpclassify (__real__ x);
   int icls = fpclassify (__imag__ x);
 
-  if (__builtin_expect (rcls <= FP_INFINITE || icls <= FP_INFINITE, 0))
+  if (__glibc_unlikely (rcls <= FP_INFINITE || icls <= FP_INFINITE))
     {
       if (icls == FP_INFINITE)
        {
@@ -50,32 +50,82 @@ __catanhf (__complex__ float x)
          __imag__ res = __nanf ("");
        }
     }
-  else if (__builtin_expect (rcls == FP_ZERO && icls == FP_ZERO, 0))
+  else if (__glibc_unlikely (rcls == FP_ZERO && icls == FP_ZERO))
     {
       res = x;
     }
   else
     {
-      float i2 = __imag__ x * __imag__ x;
+      if (fabsf (__real__ x) >= 16.0f / FLT_EPSILON
+         || fabsf (__imag__ x) >= 16.0f / FLT_EPSILON)
+       {
+         __imag__ res = __copysignf ((float) M_PI_2, __imag__ x);
+         if (fabsf (__imag__ x) <= 1.0f)
+           __real__ res = 1.0f / __real__ x;
+         else if (fabsf (__real__ x) <= 1.0f)
+           __real__ res = __real__ x / __imag__ x / __imag__ x;
+         else
+           {
+             float h = __ieee754_hypotf (__real__ x / 2.0f,
+                                         __imag__ x / 2.0f);
+             __real__ res = __real__ x / h / h / 4.0f;
+           }
+       }
+      else
+       {
+         if (fabsf (__real__ x) == 1.0f
+             && fabsf (__imag__ x) < FLT_EPSILON * FLT_EPSILON)
+           __real__ res = (__copysignf (0.5f, __real__ x)
+                           * ((float) M_LN2
+                              - __ieee754_logf (fabsf (__imag__ x))));
+         else
+           {
+             float i2 = 0.0f;
+             if (fabsf (__imag__ x) >= FLT_EPSILON * FLT_EPSILON)
+               i2 = __imag__ x * __imag__ x;
 
-      float num = 1.0f + __real__ x;
-      num = i2 + num * num;
+             float num = 1.0f + __real__ x;
+             num = i2 + num * num;
 
-      float den = 1.0f - __real__ x;
-      den = i2 + den * den;
+             float den = 1.0f - __real__ x;
+             den = i2 + den * den;
 
-      float f = num / den;
-      if (f < 0.5f)
-       __real__ res = 0.25f * __ieee754_logf (f);
-      else
-       {
-         num = 4.0f * __real__ x;
-         __real__ res = 0.25f * __log1pf (num / den);
-       }
+             float f = num / den;
+             if (f < 0.5f)
+               __real__ res = 0.25f * __ieee754_logf (f);
+             else
+               {
+                 num = 4.0f * __real__ x;
+                 __real__ res = 0.25f * __log1pf (num / den);
+               }
+           }
+
+         float absx, absy, den;
 
-      den = 1 - __real__ x * __real__ x - i2;
+         absx = fabsf (__real__ x);
+         absy = fabsf (__imag__ x);
+         if (absx < absy)
+           {
+             float t = absx;
+             absx = absy;
+             absy = t;
+           }
 
-      __imag__ res = 0.5f * __ieee754_atan2f (2.0f * __imag__ x, den);
+         if (absy < FLT_EPSILON / 2.0f)
+           {
+             den = (1.0f - absx) * (1.0f + absx);
+             if (den == -0.0f)
+               den = 0.0f;
+           }
+         else if (absx >= 1.0f)
+           den = (1.0f - absx) * (1.0f + absx) - absy * absy;
+         else if (absx >= 0.75f || absy >= 0.5f)
+           den = -__x2y2m1f (absx, absy);
+         else
+           den = (1.0f - absx) * (1.0f + absx) - absy * absy;
+
+         __imag__ res = 0.5f * __ieee754_atan2f (2.0f * __imag__ x, den);
+       }
 
       if (fabsf (__real__ res) < FLT_MIN)
        {