Hi,

when working on the first unsigned array intrinsics, I noticed
something strange.  With maintainer mode enabled, and the usual-style
patch to include the generated functions (see below), I found that the
files were regenerated in the build dir, under
x86_64-pc-linux-gnu/libgfortran/generated
and not in the source directory, as previously.

Was this change intentional, or is this a bug introduced by some other
change?  I could not see anything along those lines in the
ChangeLog entries.

Best regards

        Thomas


diff --git a/libgfortran/Makefile.am b/libgfortran/Makefile.am
index 8524cc6ed03..5c91e5ceebf 100644
--- a/libgfortran/Makefile.am
+++ b/libgfortran/Makefile.am
@@ -604,6 +604,11 @@ generated/matmul_i2.c \
 generated/matmul_i4.c \
 generated/matmul_i8.c \
 generated/matmul_i16.c \
+generated/matmul_m1.c \
+generated/matmul_m2.c \
+generated/matmul_m4.c \
+generated/matmul_m8.c \
+generated/matmul_m16.c \
 generated/matmul_r4.c \
 generated/matmul_r8.c \
 generated/matmul_r10.c \
diff --git a/libgfortran/Makefile.in b/libgfortran/Makefile.in
index 6c6c89cc14e..dee2f9c2ed1 100644
--- a/libgfortran/Makefile.in
+++ b/libgfortran/Makefile.in
@@ -342,12 +342,14 @@ am__objects_20 = generated/parity_l1.lo generated/parity_l2.lo \
        generated/parity_l16.lo
 am__objects_21 = generated/matmul_i1.lo generated/matmul_i2.lo \
        generated/matmul_i4.lo generated/matmul_i8.lo \
-       generated/matmul_i16.lo generated/matmul_r4.lo \
-       generated/matmul_r8.lo generated/matmul_r10.lo \
-       generated/matmul_r16.lo generated/matmul_r17.lo \
-       generated/matmul_c4.lo generated/matmul_c8.lo \
-       generated/matmul_c10.lo generated/matmul_c16.lo \
-       generated/matmul_c17.lo
+       generated/matmul_i16.lo generated/matmul_m1.lo \
+       generated/matmul_m2.lo generated/matmul_m4.lo \
+       generated/matmul_m8.lo generated/matmul_m16.lo \
+       generated/matmul_r4.lo generated/matmul_r8.lo \
+       generated/matmul_r10.lo generated/matmul_r16.lo \
+       generated/matmul_r17.lo generated/matmul_c4.lo \
+       generated/matmul_c8.lo generated/matmul_c10.lo \
+       generated/matmul_c16.lo generated/matmul_c17.lo
 am__objects_22 = generated/matmul_l4.lo generated/matmul_l8.lo \
        generated/matmul_l16.lo
 am__objects_23 = generated/shape_i1.lo generated/shape_i2.lo \
@@ -1362,6 +1364,11 @@ generated/matmul_i2.c \
 generated/matmul_i4.c \
 generated/matmul_i8.c \
 generated/matmul_i16.c \
+generated/matmul_m1.c \
+generated/matmul_m2.c \
+generated/matmul_m4.c \
+generated/matmul_m8.c \
+generated/matmul_m16.c \
 generated/matmul_r4.c \
 generated/matmul_r8.c \
 generated/matmul_r10.c \
@@ -2474,6 +2481,16 @@ generated/matmul_i8.lo: generated/$(am__dirstamp) \
        generated/$(DEPDIR)/$(am__dirstamp)
 generated/matmul_i16.lo: generated/$(am__dirstamp) \
        generated/$(DEPDIR)/$(am__dirstamp)
+generated/matmul_m1.lo: generated/$(am__dirstamp) \
+       generated/$(DEPDIR)/$(am__dirstamp)
+generated/matmul_m2.lo: generated/$(am__dirstamp) \
+       generated/$(DEPDIR)/$(am__dirstamp)
+generated/matmul_m4.lo: generated/$(am__dirstamp) \
+       generated/$(DEPDIR)/$(am__dirstamp)
+generated/matmul_m8.lo: generated/$(am__dirstamp) \
+       generated/$(DEPDIR)/$(am__dirstamp)
+generated/matmul_m16.lo: generated/$(am__dirstamp) \
+       generated/$(DEPDIR)/$(am__dirstamp)
 generated/matmul_r4.lo: generated/$(am__dirstamp) \
        generated/$(DEPDIR)/$(am__dirstamp)
 generated/matmul_r8.lo: generated/$(am__dirstamp) \
@@ -3803,6 +3820,11 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@generated/$(DEPDIR)/matmul_l16.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@generated/$(DEPDIR)/matmul_l4.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@generated/$(DEPDIR)/matmul_l8.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@generated/$(DEPDIR)/matmul_m1.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@generated/$(DEPDIR)/matmul_m16.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@generated/$(DEPDIR)/matmul_m2.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@generated/$(DEPDIR)/matmul_m4.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@generated/$(DEPDIR)/matmul_m8.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@generated/$(DEPDIR)/matmul_r10.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@generated/$(DEPDIR)/matmul_r16.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@generated/$(DEPDIR)/matmul_r17.Plo@am__quote@
diff --git a/libgfortran/m4/types.m4 b/libgfortran/m4/types.m4
index cb808290c08..ebef54fec54 100644
--- a/libgfortran/m4/types.m4
+++ b/libgfortran/m4/types.m4
@@ -1,4 +1,4 @@
 define(get_typename2, `GFC_$1_$2')dnl
-define(get_typename, `get_typename2(ifelse($1,i,INTEGER,ifelse($1,r,REAL,ifelse($1,l,LOGICAL,ifelse($1,c,COMPLEX,unknown)))),`$2')')dnl +define(get_typename, `get_typename2(ifelse($1,i,INTEGER,ifelse($1,m,UNSIGNED,ifelse($1,r,REAL,ifelse($1,l,LOGICAL,ifelse($1,c,COMPLEX,unknown))))),`$2')')dnl
 define(get_arraytype, `gfc_array_$1$2')dnl
 define(name, regexp(regexp(file, `[^/]*$', `\&'), `^\([^_]*\)_', `\1'))dnl

Reply via email to