This is the mail archive of the fortran@gcc.gnu.org mailing list for the GNU Fortran project.

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]

Re: [patch, fortran] Fix PR 34671 - logical kind=1 and kind=2 intrinsics

From: Thomas Koenig <tkoenig at netcologne dot de>
To: Tobias Burnus <burnus at net-b dot de>
Cc: Dominique Dhumieres <dominiq at lps dot ens dot fr>, gcc-patches at gcc dot gnu dot org, fortran at gcc dot gnu dot org
Date: Mon, 14 Jan 2008 21:02:15 +0100
Subject: Re: [patch, fortran] Fix PR 34671 - logical kind=1 and kind=2 intrinsics
References: <20080114094029.D26D15BBAC@mailhost.lps.ens.fr> <478B3117.40501@net-b.de> <20080114100811.341945BBAC@mailhost.lps.ens.fr> <478B36B0.2020500@net-b.de> <20080114193842.8C0B15BBB3@mailhost.lps.ens.fr> <478BBE75.40000@net-b.de>

On Mon, 2008-01-14 at 20:56 +0100, Tobias Burnus wrote:

> I think Thomas missed a patch for gcc/gcc/fortran/iresolve.c's
> gfc_resolve_count.

Ouch, yes.  Mentioned in the changelog, but I forgot the
patch itself.

Here is the complete patch.

	Thomas

Index: libgfortran/gfortran.map
===================================================================
--- libgfortran/gfortran.map	(revision 131492)
+++ libgfortran/gfortran.map	(working copy)
@@ -8,10 +8,14 @@ GFORTRAN_1.0 {
     _gfortran_alarm_sub_i8;
     _gfortran_alarm_sub_int_i4;
     _gfortran_alarm_sub_int_i8;
+    _gfortran_all_l1;
     _gfortran_all_l16;
+    _gfortran_all_l2;
     _gfortran_all_l4;
     _gfortran_all_l8;
+    _gfortran_any_l1;
     _gfortran_any_l16;
+    _gfortran_any_l2;
     _gfortran_any_l4;
     _gfortran_any_l8;
     _gfortran_arandom_r10;
@@ -28,15 +32,11 @@ GFORTRAN_1.0 {
     _gfortran_chmod_i8_sub;
     _gfortran_compare_string;
     _gfortran_concat_string;
-    _gfortran_count_16_l16;
-    _gfortran_count_16_l4;
-    _gfortran_count_16_l8;
-    _gfortran_count_4_l16;
-    _gfortran_count_4_l4;
-    _gfortran_count_4_l8;
-    _gfortran_count_8_l16;
-    _gfortran_count_8_l4;
-    _gfortran_count_8_l8;
+    _gfortran_count_1_l;
+    _gfortran_count_16_l;
+    _gfortran_count_2_l;
+    _gfortran_count_4_l;
+    _gfortran_count_8_l;
     _gfortran_cpu_time_10;
     _gfortran_cpu_time_16;
     _gfortran_cpu_time_4;
Index: libgfortran/Makefile.am
===================================================================
--- libgfortran/Makefile.am	(revision 131492)
+++ libgfortran/Makefile.am	(working copy)
@@ -121,25 +121,25 @@ runtime/string.c \
 runtime/select.c
 
 i_all_c= \
+$(srcdir)/generated/all_l1.c \
+$(srcdir)/generated/all_l2.c \
 $(srcdir)/generated/all_l4.c \
 $(srcdir)/generated/all_l8.c \
 $(srcdir)/generated/all_l16.c
 
 i_any_c= \
+$(srcdir)/generated/any_l1.c \
+$(srcdir)/generated/any_l2.c \
 $(srcdir)/generated/any_l4.c \
 $(srcdir)/generated/any_l8.c \
 $(srcdir)/generated/any_l16.c
 
 i_count_c= \
-$(srcdir)/generated/count_4_l4.c \
-$(srcdir)/generated/count_8_l4.c \
-$(srcdir)/generated/count_16_l4.c \
-$(srcdir)/generated/count_4_l8.c \
-$(srcdir)/generated/count_8_l8.c \
-$(srcdir)/generated/count_16_l8.c \
-$(srcdir)/generated/count_4_l16.c \
-$(srcdir)/generated/count_8_l16.c \
-$(srcdir)/generated/count_16_l16.c
+$(srcdir)/generated/count_1_l.c \
+$(srcdir)/generated/count_2_l.c \
+$(srcdir)/generated/count_4_l.c \
+$(srcdir)/generated/count_8_l.c \
+$(srcdir)/generated/count_16_l.c
 
 i_maxloc0_c= \
 $(srcdir)/generated/maxloc0_4_i1.c \
@@ -463,7 +463,7 @@ $(srcdir)/generated/pow_c16_i16.c
 m4_files= m4/iparm.m4 m4/ifunction.m4 m4/iforeach.m4 m4/all.m4 \
     m4/any.m4 m4/count.m4 m4/maxloc0.m4 m4/maxloc1.m4 m4/maxval.m4 \
     m4/minloc0.m4 m4/minloc1.m4 m4/minval.m4 m4/product.m4 m4/sum.m4 \
-    m4/matmul.m4 m4/matmull.m4 \
+    m4/matmul.m4 m4/matmull.m4 m4/ifunction_logical.m4 \
     m4/ctrig.m4 m4/cexp.m4 m4/chyp.m4 m4/mtype.m4 \
     m4/specific.m4 m4/specific2.m4 m4/head.m4 m4/shape.m4 m4/reshape.m4 \
     m4/transpose.m4 m4/eoshift1.m4 m4/eoshift3.m4 m4/exponent.m4 \
@@ -684,6 +684,7 @@ endif
 I_M4_DEPS=m4/iparm.m4
 I_M4_DEPS0=$(I_M4_DEPS) m4/iforeach.m4
 I_M4_DEPS1=$(I_M4_DEPS) m4/ifunction.m4
+I_M4_DEPS2=$(I_M4_DEPS) m4/ifunction_logical.m4
 
 kinds.h: $(srcdir)/mk-kinds-h.sh
 	$(SHELL) $(srcdir)/mk-kinds-h.sh '$(FCCOMPILE)' > $@ || rm $@
@@ -707,13 +708,13 @@ fpu-target.h: $(srcdir)/$(FPU_HOST_HEADE
 ## so we only include them in maintainer mode
 
 if MAINTAINER_MODE
-$(i_all_c): m4/all.m4 $(I_M4_DEPS1)
+$(i_all_c): m4/all.m4 $(I_M4_DEPS2)
 	$(M4) -Dfile=$@ -I$(srcdir)/m4 all.m4 > $@
 
-$(i_any_c): m4/any.m4 $(I_M4_DEPS1)
+$(i_any_c): m4/any.m4 $(I_M4_DEPS2)
 	$(M4) -Dfile=$@ -I$(srcdir)/m4 any.m4 > $@
 
-$(i_count_c): m4/count.m4 $(I_M4_DEPS1)
+$(i_count_c): m4/count.m4 $(I_M4_DEPS2)
 	$(M4) -Dfile=$@ -I$(srcdir)/m4 count.m4 > $@
 
 $(i_maxloc0_c): m4/maxloc0.m4 $(I_M4_DEPS0)
Index: libgfortran/Makefile.am
===================================================================
--- libgfortran/Makefile.am	(revision 131492)
+++ libgfortran/Makefile.am	(working copy)
@@ -121,25 +121,25 @@ runtime/string.c \
 runtime/select.c
 
 i_all_c= \
+$(srcdir)/generated/all_l1.c \
+$(srcdir)/generated/all_l2.c \
 $(srcdir)/generated/all_l4.c \
 $(srcdir)/generated/all_l8.c \
 $(srcdir)/generated/all_l16.c
 
 i_any_c= \
+$(srcdir)/generated/any_l1.c \
+$(srcdir)/generated/any_l2.c \
 $(srcdir)/generated/any_l4.c \
 $(srcdir)/generated/any_l8.c \
 $(srcdir)/generated/any_l16.c
 
 i_count_c= \
-$(srcdir)/generated/count_4_l4.c \
-$(srcdir)/generated/count_8_l4.c \
-$(srcdir)/generated/count_16_l4.c \
-$(srcdir)/generated/count_4_l8.c \
-$(srcdir)/generated/count_8_l8.c \
-$(srcdir)/generated/count_16_l8.c \
-$(srcdir)/generated/count_4_l16.c \
-$(srcdir)/generated/count_8_l16.c \
-$(srcdir)/generated/count_16_l16.c
+$(srcdir)/generated/count_1_l.c \
+$(srcdir)/generated/count_2_l.c \
+$(srcdir)/generated/count_4_l.c \
+$(srcdir)/generated/count_8_l.c \
+$(srcdir)/generated/count_16_l.c
 
 i_maxloc0_c= \
 $(srcdir)/generated/maxloc0_4_i1.c \
@@ -463,7 +463,7 @@ $(srcdir)/generated/pow_c16_i16.c
 m4_files= m4/iparm.m4 m4/ifunction.m4 m4/iforeach.m4 m4/all.m4 \
     m4/any.m4 m4/count.m4 m4/maxloc0.m4 m4/maxloc1.m4 m4/maxval.m4 \
     m4/minloc0.m4 m4/minloc1.m4 m4/minval.m4 m4/product.m4 m4/sum.m4 \
-    m4/matmul.m4 m4/matmull.m4 \
+    m4/matmul.m4 m4/matmull.m4 m4/ifunction_logical.m4 \
     m4/ctrig.m4 m4/cexp.m4 m4/chyp.m4 m4/mtype.m4 \
     m4/specific.m4 m4/specific2.m4 m4/head.m4 m4/shape.m4 m4/reshape.m4 \
     m4/transpose.m4 m4/eoshift1.m4 m4/eoshift3.m4 m4/exponent.m4 \
@@ -684,6 +684,7 @@ endif
 I_M4_DEPS=m4/iparm.m4
 I_M4_DEPS0=$(I_M4_DEPS) m4/iforeach.m4
 I_M4_DEPS1=$(I_M4_DEPS) m4/ifunction.m4
+I_M4_DEPS2=$(I_M4_DEPS) m4/ifunction_logical.m4
 
 kinds.h: $(srcdir)/mk-kinds-h.sh
 	$(SHELL) $(srcdir)/mk-kinds-h.sh '$(FCCOMPILE)' > $@ || rm $@
@@ -707,13 +708,13 @@ fpu-target.h: $(srcdir)/$(FPU_HOST_HEADE
 ## so we only include them in maintainer mode
 
 if MAINTAINER_MODE
-$(i_all_c): m4/all.m4 $(I_M4_DEPS1)
+$(i_all_c): m4/all.m4 $(I_M4_DEPS2)
 	$(M4) -Dfile=$@ -I$(srcdir)/m4 all.m4 > $@
 
-$(i_any_c): m4/any.m4 $(I_M4_DEPS1)
+$(i_any_c): m4/any.m4 $(I_M4_DEPS2)
 	$(M4) -Dfile=$@ -I$(srcdir)/m4 any.m4 > $@
 
-$(i_count_c): m4/count.m4 $(I_M4_DEPS1)
+$(i_count_c): m4/count.m4 $(I_M4_DEPS2)
 	$(M4) -Dfile=$@ -I$(srcdir)/m4 count.m4 > $@
 
 $(i_maxloc0_c): m4/maxloc0.m4 $(I_M4_DEPS0)
Index: libgfortran/m4/all.m4
===================================================================
--- libgfortran/m4/all.m4	(revision 131492)
+++ libgfortran/m4/all.m4	(working copy)
@@ -33,9 +33,9 @@ Boston, MA 02110-1301, USA.  */
 #include <assert.h>'
 
 include(iparm.m4)dnl
-include(ifunction.m4)dnl
+include(ifunction_logical.m4)dnl
 
-`#if defined (HAVE_'atype_name`) && defined (HAVE_'rtype_name`)'
+`#if defined (HAVE_'rtype_name`)'
 
 ARRAY_FUNCTION(1,
 `  /* Return true only if all the elements are set.  */
Index: libgfortran/m4/count.m4
===================================================================
--- libgfortran/m4/count.m4	(revision 131492)
+++ libgfortran/m4/count.m4	(working copy)
@@ -33,9 +33,9 @@ Boston, MA 02110-1301, USA.  */
 #include <assert.h>'
 
 include(iparm.m4)dnl
-include(ifunction.m4)dnl
+include(ifunction_logical.m4)dnl
 
-`#if defined (HAVE_'atype_name`) && defined (HAVE_'rtype_name`)'
+`#if defined (HAVE_'rtype_name`)'
 
 ARRAY_FUNCTION(0,
 `  result = 0;',
Index: libgfortran/m4/any.m4
===================================================================
--- libgfortran/m4/any.m4	(revision 131492)
+++ libgfortran/m4/any.m4	(working copy)
@@ -33,9 +33,9 @@ Boston, MA 02110-1301, USA.  */
 #include <assert.h>'
 
 include(iparm.m4)dnl
-include(ifunction.m4)dnl
+include(ifunction_logical.m4)dnl
 
-`#if defined (HAVE_'atype_name`) && defined (HAVE_'rtype_name`)'
+`#if defined (HAVE_'rtype_name`)'
 
 ARRAY_FUNCTION(0,
 `  result = 0;',
Index: gcc/fortran/iresolve.c
===================================================================
--- gcc/fortran/iresolve.c	(revision 131492)
+++ gcc/fortran/iresolve.c	(working copy)
@@ -256,6 +256,8 @@ gfc_resolve_all (gfc_expr *f, gfc_expr *
       f->shape = gfc_copy_shape_excluding (mask->shape, mask->rank, dim);
     }
 
+  resolve_mask_arg (mask);
+
   f->value.function.name
     = gfc_get_string (PREFIX ("all_%c%d"), gfc_type_letter (mask->ts.type),
 		      mask->ts.kind);
@@ -304,6 +306,8 @@ gfc_resolve_any (gfc_expr *f, gfc_expr *
       f->shape = gfc_copy_shape_excluding (mask->shape, mask->rank, dim);
     }
 
+  resolve_mask_arg (mask);
+
   f->value.function.name
     = gfc_get_string (PREFIX ("any_%c%d"), gfc_type_letter (mask->ts.type),
 		      mask->ts.kind);
@@ -549,9 +553,11 @@ gfc_resolve_count (gfc_expr *f, gfc_expr
       f->shape = gfc_copy_shape_excluding (mask->shape, mask->rank, dim);
     }
 
+  resolve_mask_arg (mask);
+
   f->value.function.name
-    = gfc_get_string (PREFIX ("count_%d_%c%d"), f->ts.kind,
-		      gfc_type_letter (mask->ts.type), mask->ts.kind);
+    = gfc_get_string (PREFIX ("count_%d_%c"), f->ts.kind,
+		      gfc_type_letter (mask->ts.type));
 }

Follow-Ups:
- Re: [patch, fortran] Fix PR 34671 - logical kind=1 and kind=2 intrinsics
  - From: Dominique Dhumieres
- Re: [patch, fortran] Fix PR 34671 - logical kind=1 and kind=2 intrinsics
  - From: Dominique Dhumieres

References:
- Re: [patch, fortran] Fix PR 34671 - logical kind=1 and kind=2 intrinsics
  - From: Dominique Dhumieres
- Re: [patch, fortran] Fix PR 34671 - logical kind=1 and kind=2 intrinsics
  - From: Tobias Burnus
- Re: [patch, fortran] Fix PR 34671 - logical kind=1 and kind=2 intrinsics
  - From: Dominique Dhumieres
- Re: [patch, fortran] Fix PR 34671 - logical kind=1 and kind=2 intrinsics
  - From: Tobias Burnus
- Re: [patch, fortran] Fix PR 34671 - logical kind=1 and kind=2 intrinsics
  - From: Dominique Dhumieres
- Re: [patch, fortran] Fix PR 34671 - logical kind=1 and kind=2 intrinsics
  - From: Tobias Burnus

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]