Hi!

The r15-4124-gc0002a675a92e76d change seems to have accidentally
dropped 5 sourcefiles from i_maxloc1_c, which resulted in dropping
15 GFORTRAN_8 symbols on x86_64 and 6 on i686.

The following patch adds it back, so that we export those symbols
again, fixing the ABI problem.

Bootstrapped/regtested on x86_64-linux and i686-linux, ok for trunk
and 15.2?

2025-05-07  Jakub Jelinek  <ja...@redhat.com>

        PR libfortran/120152
        * Makefile.am (i_maxloc1_c): Readd generated/maxloc1_4_i8.c,
        generated/maxloc1_8_i8.c, generated/maxloc1_16_i8.c,
        generated/maxloc1_4_i16.c, generated/maxloc1_8_i16.c.  Move
        generated/maxloc1_16_i16.c entry earlier in the list.
        * Makefile.in: Regenerated.

--- libgfortran/Makefile.am.jj  2025-04-08 14:10:04.882256861 +0200
+++ libgfortran/Makefile.am     2025-05-07 10:44:54.534238786 +0200
@@ -400,6 +400,12 @@ generated/maxloc1_16_i2.c \
 generated/maxloc1_4_i4.c \
 generated/maxloc1_8_i4.c \
 generated/maxloc1_16_i4.c \
+generated/maxloc1_4_i8.c \
+generated/maxloc1_8_i8.c \
+generated/maxloc1_16_i8.c \
+generated/maxloc1_4_i16.c \
+generated/maxloc1_8_i16.c \
+generated/maxloc1_16_i16.c \
 generated/maxloc1_4_m1.c \
 generated/maxloc1_8_m1.c \
 generated/maxloc1_16_m1.c \
@@ -414,7 +420,6 @@ generated/maxloc1_8_m8.c \
 generated/maxloc1_16_m8.c \
 generated/maxloc1_4_m16.c \
 generated/maxloc1_8_m16.c \
-generated/maxloc1_16_i16.c \
 generated/maxloc1_4_r4.c \
 generated/maxloc1_8_r4.c \
 generated/maxloc1_16_r4.c \
--- libgfortran/Makefile.in.jj  2025-05-07 10:47:40.361973724 +0200
+++ libgfortran/Makefile.in     2025-05-07 10:46:41.288779475 +0200
@@ -265,22 +265,24 @@ am__objects_8 = generated/maxloc1_4_i1.l
        generated/maxloc1_16_i1.lo generated/maxloc1_4_i2.lo \
        generated/maxloc1_8_i2.lo generated/maxloc1_16_i2.lo \
        generated/maxloc1_4_i4.lo generated/maxloc1_8_i4.lo \
-       generated/maxloc1_16_i4.lo generated/maxloc1_4_m1.lo \
+       generated/maxloc1_16_i4.lo generated/maxloc1_4_i8.lo \
+       generated/maxloc1_8_i8.lo generated/maxloc1_16_i8.lo \
+       generated/maxloc1_4_i16.lo generated/maxloc1_8_i16.lo \
+       generated/maxloc1_16_i16.lo generated/maxloc1_4_m1.lo \
        generated/maxloc1_8_m1.lo generated/maxloc1_16_m1.lo \
        generated/maxloc1_4_m2.lo generated/maxloc1_8_m2.lo \
        generated/maxloc1_16_m2.lo generated/maxloc1_4_m4.lo \
        generated/maxloc1_8_m4.lo generated/maxloc1_16_m4.lo \
        generated/maxloc1_4_m8.lo generated/maxloc1_8_m8.lo \
        generated/maxloc1_16_m8.lo generated/maxloc1_4_m16.lo \
-       generated/maxloc1_8_m16.lo generated/maxloc1_16_i16.lo \
-       generated/maxloc1_4_r4.lo generated/maxloc1_8_r4.lo \
-       generated/maxloc1_16_r4.lo generated/maxloc1_4_r8.lo \
-       generated/maxloc1_8_r8.lo generated/maxloc1_16_r8.lo \
-       generated/maxloc1_4_r10.lo generated/maxloc1_8_r10.lo \
-       generated/maxloc1_16_r10.lo generated/maxloc1_4_r16.lo \
-       generated/maxloc1_8_r16.lo generated/maxloc1_16_r16.lo \
-       generated/maxloc1_4_r17.lo generated/maxloc1_8_r17.lo \
-       generated/maxloc1_16_r17.lo
+       generated/maxloc1_8_m16.lo generated/maxloc1_4_r4.lo \
+       generated/maxloc1_8_r4.lo generated/maxloc1_16_r4.lo \
+       generated/maxloc1_4_r8.lo generated/maxloc1_8_r8.lo \
+       generated/maxloc1_16_r8.lo generated/maxloc1_4_r10.lo \
+       generated/maxloc1_8_r10.lo generated/maxloc1_16_r10.lo \
+       generated/maxloc1_4_r16.lo generated/maxloc1_8_r16.lo \
+       generated/maxloc1_16_r16.lo generated/maxloc1_4_r17.lo \
+       generated/maxloc1_8_r17.lo generated/maxloc1_16_r17.lo
 am__objects_9 = generated/maxval_i1.lo generated/maxval_i2.lo \
        generated/maxval_i4.lo generated/maxval_i8.lo \
        generated/maxval_i16.lo generated/maxval_m1.lo \
@@ -1205,6 +1207,12 @@ generated/maxloc1_16_i2.c \
 generated/maxloc1_4_i4.c \
 generated/maxloc1_8_i4.c \
 generated/maxloc1_16_i4.c \
+generated/maxloc1_4_i8.c \
+generated/maxloc1_8_i8.c \
+generated/maxloc1_16_i8.c \
+generated/maxloc1_4_i16.c \
+generated/maxloc1_8_i16.c \
+generated/maxloc1_16_i16.c \
 generated/maxloc1_4_m1.c \
 generated/maxloc1_8_m1.c \
 generated/maxloc1_16_m1.c \
@@ -1219,7 +1227,6 @@ generated/maxloc1_8_m8.c \
 generated/maxloc1_16_m8.c \
 generated/maxloc1_4_m16.c \
 generated/maxloc1_8_m16.c \
-generated/maxloc1_16_i16.c \
 generated/maxloc1_4_r4.c \
 generated/maxloc1_8_r4.c \
 generated/maxloc1_16_r4.c \
@@ -2311,6 +2318,18 @@ generated/maxloc1_8_i4.lo: generated/$(a
        generated/$(DEPDIR)/$(am__dirstamp)
 generated/maxloc1_16_i4.lo: generated/$(am__dirstamp) \
        generated/$(DEPDIR)/$(am__dirstamp)
+generated/maxloc1_4_i8.lo: generated/$(am__dirstamp) \
+       generated/$(DEPDIR)/$(am__dirstamp)
+generated/maxloc1_8_i8.lo: generated/$(am__dirstamp) \
+       generated/$(DEPDIR)/$(am__dirstamp)
+generated/maxloc1_16_i8.lo: generated/$(am__dirstamp) \
+       generated/$(DEPDIR)/$(am__dirstamp)
+generated/maxloc1_4_i16.lo: generated/$(am__dirstamp) \
+       generated/$(DEPDIR)/$(am__dirstamp)
+generated/maxloc1_8_i16.lo: generated/$(am__dirstamp) \
+       generated/$(DEPDIR)/$(am__dirstamp)
+generated/maxloc1_16_i16.lo: generated/$(am__dirstamp) \
+       generated/$(DEPDIR)/$(am__dirstamp)
 generated/maxloc1_4_m1.lo: generated/$(am__dirstamp) \
        generated/$(DEPDIR)/$(am__dirstamp)
 generated/maxloc1_8_m1.lo: generated/$(am__dirstamp) \
@@ -2339,8 +2358,6 @@ generated/maxloc1_4_m16.lo: generated/$(
        generated/$(DEPDIR)/$(am__dirstamp)
 generated/maxloc1_8_m16.lo: generated/$(am__dirstamp) \
        generated/$(DEPDIR)/$(am__dirstamp)
-generated/maxloc1_16_i16.lo: generated/$(am__dirstamp) \
-       generated/$(DEPDIR)/$(am__dirstamp)
 generated/maxloc1_4_r4.lo: generated/$(am__dirstamp) \
        generated/$(DEPDIR)/$(am__dirstamp)
 generated/maxloc1_8_r4.lo: generated/$(am__dirstamp) \
@@ -4197,6 +4214,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ 
@am__quote@generated/$(DEPDIR)/maxloc1_16_i16.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ 
@am__quote@generated/$(DEPDIR)/maxloc1_16_i2.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ 
@am__quote@generated/$(DEPDIR)/maxloc1_16_i4.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ 
@am__quote@generated/$(DEPDIR)/maxloc1_16_i8.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ 
@am__quote@generated/$(DEPDIR)/maxloc1_16_m1.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ 
@am__quote@generated/$(DEPDIR)/maxloc1_16_m2.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ 
@am__quote@generated/$(DEPDIR)/maxloc1_16_m4.Plo@am__quote@
@@ -4209,8 +4227,10 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ 
@am__quote@generated/$(DEPDIR)/maxloc1_16_s1.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ 
@am__quote@generated/$(DEPDIR)/maxloc1_16_s4.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ 
@am__quote@generated/$(DEPDIR)/maxloc1_4_i1.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ 
@am__quote@generated/$(DEPDIR)/maxloc1_4_i16.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ 
@am__quote@generated/$(DEPDIR)/maxloc1_4_i2.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ 
@am__quote@generated/$(DEPDIR)/maxloc1_4_i4.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ 
@am__quote@generated/$(DEPDIR)/maxloc1_4_i8.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ 
@am__quote@generated/$(DEPDIR)/maxloc1_4_m1.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ 
@am__quote@generated/$(DEPDIR)/maxloc1_4_m16.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ 
@am__quote@generated/$(DEPDIR)/maxloc1_4_m2.Plo@am__quote@
@@ -4224,8 +4244,10 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ 
@am__quote@generated/$(DEPDIR)/maxloc1_4_s1.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ 
@am__quote@generated/$(DEPDIR)/maxloc1_4_s4.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ 
@am__quote@generated/$(DEPDIR)/maxloc1_8_i1.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ 
@am__quote@generated/$(DEPDIR)/maxloc1_8_i16.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ 
@am__quote@generated/$(DEPDIR)/maxloc1_8_i2.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ 
@am__quote@generated/$(DEPDIR)/maxloc1_8_i4.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ 
@am__quote@generated/$(DEPDIR)/maxloc1_8_i8.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ 
@am__quote@generated/$(DEPDIR)/maxloc1_8_m1.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ 
@am__quote@generated/$(DEPDIR)/maxloc1_8_m16.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ 
@am__quote@generated/$(DEPDIR)/maxloc1_8_m2.Plo@am__quote@

        Jakub

Reply via email to