f2c_specifics.F90: Special-case conjg functions so that their suffices are _4 and...

	* intrinsics/f2c_specifics.F90: Special-case conjg functions so
	that their suffices are _4 and _8 instead of _c4 and _c8.

From-SVN: r117335

diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 8b51599..ed23b40 100644 (file)
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,5 +1,22 @@
+2006-09-29  Francois-Xavier Coudert  <coudert@clipper.ens.fr>
+
+       PR libfortran/18791
+       * m4/specific.m4: Special-case cabs so that its return type is
+       real. Special-case conjg so that their suffices are _4, _8, _10 and
+       _16 instead of _c4, _c8, _c10 and _c16.
+       * intrinsics/f2c_specifics.F90: Special-case conjg functions so
+       that their suffices are _4 and _8 instead of _c4 and _c8.
+       * generated/_conjg_c4.F90: Regenerate.
+       * generated/_conjg_c8.F90: Regenerate.
+       * generated/_conjg_c10.F90: Regenerate.
+       * generated/_conjg_c16.F90: Regenerate.
+       * generated/_abs_c4.F90: Regenerate.
+       * generated/_abs_c8.F90: Regenerate.
+       * generated/_abs_c10.F90: Regenerate.
+       * generated/_abs_c16.F90: Regenerate.
+
 2006-09-29  Steven G. Kargl  <kargl@gcc.gnu.org>
- 
+
        * intrinsics/cpu_time.c:  Add cpu_time_10 and cpu_time_16 routines.
 
 2006-09-28  Francois-Xavier Coudert  <coudert@clipper.ens.fr>

diff --git a/libgfortran/intrinsics/f2c_specifics.F90 b/libgfortran/intrinsics/f2c_specifics.F90
index 04c0e37..6fdcfe9 100644 (file)
--- a/libgfortran/intrinsics/f2c_specifics.F90
+++ b/libgfortran/intrinsics/f2c_specifics.F90
@@ -135,11 +135,6 @@ REAL_BODY(cosh)
 REAL_HEAD(tanh)
 REAL_BODY(tanh)
 
-COMPLEX_HEAD(conjg)
-COMPLEX_BODY(conjg)
-DCOMPLEX_HEAD(conjg)
-DCOMPLEX_BODY(conjg)
-
 REAL_HEAD(aint)
 REAL_BODY(aint)
 
@@ -167,3 +162,16 @@ REAL2_BODY(atan2)
 
 REAL2_HEAD(mod)
 REAL2_BODY(mod)
+
+! conjg is special-cased because it is not suffixed _c4 but _4
+subroutine f2c_specific__conjg_4 (res, parm)
+  COMPLEX, intent (in) :: parm
+  COMPLEX, intent (out) :: res
+  res = conjg (parm)
+end subroutine
+subroutine f2c_specific__conjg_8 (res, parm)
+  DOUBLE COMPLEX, intent (in) :: parm
+  DOUBLE COMPLEX, intent (out) :: res
+  res = conjg (parm)
+end subroutine
+