re PR libfortran/24313 (complex sqrt function does not return principal value)

 PR libgfortran/24313
* c99_functions.c (csqrtf, csqrt): Fix choice of branch cut.  Note
  csqrt{f} were imported from glibc, and this bug is still present
  there. glibc PR is 1146.

From-SVN: r105274

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 39ea01a5e9c315031cc61ceca9f8392e25d9cfd7..d21780a7726399a8bc424ac7d34c88f8d9805d5b 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-11  Steven G. Kargl  <kargls@comcast.net>
+
+       PR libgfortran/24313
+       gfortran.dg/csqrt.f: New test.
+
 2005-10-11  Ian Lance Taylor  <ian@airs.com>
 
        PR c++/8057

diff --git a/gcc/testsuite/gfortran.dg/csqrt_2.f b/gcc/testsuite/gfortran.dg/csqrt_2.f
new file mode 100644 (file)
index 0000000..66e0842
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/csqrt_2.f
@@ -0,0 +1,19 @@
+c { dg-do run { xfail *-*-linux-gnu } }
+c Fix PR libgfortran/24313
+      complex x, y
+      complex z
+      z = cmplx(0.707106, -0.707106)
+      x = cmplx(0.0,-1.0)
+      y = sqrt(x)
+      if (abs(y - z) / abs(z) > 1.e-4) call abort
+
+      x = cmplx(tiny(1.),-1.0)
+      y = sqrt(x)
+      if (abs(y - z) / abs(z) > 1.e-4) call abort
+
+      x = cmplx(-tiny(1.),-1.0)
+      y = sqrt(x)
+      if (abs(y - z) / abs(z) > 1.e-4) call abort
+
+      end
+

diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index d5df1d33a4416223320cd8bc9bc3102cfd91b825..cca3bbe90807bef629b53a3dcdf6c58576458033 100644 (file)
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,10 @@
+2005-10-11  Steven G. Kargl  <kargls@comcast.net>
+
+       PR libgfortran/24313
+       *  c99_functions.c (csqrtf, csqrt): Fix choice of branch cut.  Note
+       csqrt{f} were imported from glibc, and this bug is still present 
+       there. glibc PR is 1146.
+
 2005-10-07  Janne Blomqvist <jblomqvi@cc.hut.fi>
 
        PR fortran/16339

diff --git a/libgfortran/intrinsics/c99_functions.c b/libgfortran/intrinsics/c99_functions.c
index 2417e69cbed5ab372a0600b534ec592a0ccd5290..906a85abfef023184b62ee5197763526384a6382 100644 (file)
--- a/libgfortran/intrinsics/c99_functions.c
+++ b/libgfortran/intrinsics/c99_functions.c
@@ -669,7 +669,7 @@ csqrtf (float complex z)
 
       r = sqrtf (0.5 * fabsf (im));
 
-      COMPLEX_ASSIGN (v, copysignf (r, im), r);
+      COMPLEX_ASSIGN (v, r, copysignf (r, im));
     }
   else
     {
@@ -722,7 +722,7 @@ csqrt (double complex z)
 
       r = sqrt (0.5 * fabs (im));
 
-      COMPLEX_ASSIGN (v, copysign (r, im), r);
+      COMPLEX_ASSIGN (v, r, copysign (r, im));
     }
   else
     {