From a2694f689cbb6c4780c2aba88c8462c8059cc182 Mon Sep 17 00:00:00 2001 From: "Steven G. Kargl" Date: Tue, 11 Oct 2005 23:35:27 +0000 Subject: [PATCH] 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 --- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gfortran.dg/csqrt_2.f | 19 +++++++++++++++++++ libgfortran/ChangeLog | 7 +++++++ libgfortran/intrinsics/c99_functions.c | 4 ++-- 4 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gfortran.dg/csqrt_2.f diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 39ea01a5e9c3..d21780a77263 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2005-10-11 Steven G. Kargl + + PR libgfortran/24313 + gfortran.dg/csqrt.f: New test. + 2005-10-11 Ian Lance Taylor 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 index 000000000000..66e08424e3ae --- /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 d5df1d33a441..cca3bbe90807 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,10 @@ +2005-10-11 Steven G. Kargl + + 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 PR fortran/16339 diff --git a/libgfortran/intrinsics/c99_functions.c b/libgfortran/intrinsics/c99_functions.c index 2417e69cbed5..906a85abfef0 100644 --- 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 { -- 2.47.2