[gcc r13-7675] modula2: Fix bootstrap

[gcc r13-7675] modula2: Fix bootstrap

[Gaius Mulley]

https://gcc.gnu.org/g:1f0933298c4aa76646b4ea964d6fbc07504526c8

commit r13-7675-g1f0933298c4aa76646b4ea964d6fbc07504526c8
Author: Gaius Mulley <gaiusmod2@gmail.com>
Date:   Mon Jul 31 19:43:02 2023 +0100

    modula2: Fix bootstrap
    
    Combining 3 patches from master for Make-lang.in and header
    file changes to ensure that this sequence does not break git bisect.
    
    gcc/m2/ChangeLog:
    
            PR modula2/110284
            * Make-lang.in: Build $(generated_files) before building
            all $(GM2_C_OBJS).
            (m2_OBJS): Assign $(GM2_C_OBJS).  Add m2/gm2-gcc/rtegraph.o and
            m2/gm2-compiler-boot/m2flex.o.
            (GM2_C_OBJS): Remove m2/stor-layout.o.
            (m2/stor-layout.o): Remove rule.
            * gm2-gcc/gcc-consolidation.h (rtl.h): Remove include.
            (df.h): Remove include.
            (except.h): Remove include.
            (c-family/m2pp.o): Remove.
            * Make-maintainer.in (c-family/m2pp.o): Add.
    
    Signed-off-by: Gaius Mulley <gaiusmod2@gmail.com>

Diff:
---
 gcc/m2/Make-lang.in                | 12 +++---------
 gcc/m2/Make-maintainer.in          |  4 ++++
 gcc/m2/gm2-gcc/gcc-consolidation.h |  4 ----
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/gcc/m2/Make-lang.in b/gcc/m2/Make-lang.in
index 56af973e6f1..70019a0b24b 100644
--- a/gcc/m2/Make-lang.in
+++ b/gcc/m2/Make-lang.in
@@ -486,7 +486,6 @@ SO=-O0 -g -fPIC
 # Language-specific object files for the gm2 compiler.
 
 GM2_C_OBJS        = m2/gm2-lang.o \
-                    m2/stor-layout.o \
                     m2/m2pp.o \
                     m2/gm2-gcc/m2assert.o \
                     m2/gm2-gcc/m2block.o \
@@ -512,6 +511,9 @@ GM2_LIBS_BOOT     = m2/gm2-compiler-boot/gm2.a \
                     m2/gm2-libs-boot/libgm2.a \
                     $(GM2-BOOT-O)
 
+m2_OBJS = $(GM2_C_OBJS) m2/gm2-gcc/rtegraph.o \
+	m2/gm2-compiler-boot/m2flex.o
+
 cc1gm2$(exeext): m2/stage1/cc1gm2$(exeext) $(m2.prev)
 	cp -p $< $@
 
@@ -570,10 +572,6 @@ m2/gm2-lang.o: $(srcdir)/m2/gm2-lang.cc gt-m2-gm2-lang.h $(GCC_HEADER_DEPENDENCI
 	    -DLIBSUBDIR=\"$(libsubdir)\" \
             $(ALL_CPPFLAGS) $(INCLUDES) $< $(OUTPUT_OPTION)
 
-m2/stor-layout.o: $(srcdir)/stor-layout.cc $(GCC_HEADER_DEPENDENCIES_FOR_M2)
-	$(COMPILER) -c -DSET_WORD_SIZE=INT_TYPE_SIZE $(ALL_COMPILERFLAGS) \
-            $(ALL_CPPFLAGS) $(INCLUDES) $< $(OUTPUT_OPTION)
-
 m2/m2pp.o : $(srcdir)/m2/m2pp.cc $(GCC_HEADER_DEPENDENCIES_FOR_M2)
 	$(COMPILER) -c -g -DGM2 $(ALL_COMPILERFLAGS) \
             $(ALL_CPPFLAGS) $(INCLUDES) $< $(OUTPUT_OPTION)
@@ -584,10 +582,6 @@ m2/gm2-gcc/rtegraph.o: $(srcdir)/m2/gm2-gcc/rtegraph.cc $(GCC_HEADER_DEPENDENCIE
 	$(COMPILER) -c -g $(GM2GCC) $(ALL_COMPILERFLAGS) \
             $(ALL_CPPFLAGS) $(INCLUDES) $< $(OUTPUT_OPTION)
 
-c-family/m2pp.o : $(srcdir)/m2/m2pp.cc $(GCC_HEADER_DEPENDENCIES_FOR_M2)
-	$(COMPILER) -c -g $(ALL_COMPILERFLAGS) \
-            $(ALL_CPPFLAGS) $(INCLUDES) $< $(OUTPUT_OPTION)
-
 m2/gm2-gcc/$(SRC_PREFIX)%.h: $(srcdir)/m2/gm2-gcc/%.def $(MCDEPS)
 	-test -d $(@D) || $(mkinstalldirs) $(@D)
 	$(MC) -o=$@ $(srcdir)/m2/gm2-gcc/$*.def
diff --git a/gcc/m2/Make-maintainer.in b/gcc/m2/Make-maintainer.in
index 36a2f0fb8e8..6438da9fd33 100644
--- a/gcc/m2/Make-maintainer.in
+++ b/gcc/m2/Make-maintainer.in
@@ -150,6 +150,10 @@ m2/gm2-ppg-boot/main.o: $(M2LINK) $(srcdir)/m2/init/mcinit
 m2/gm2-auto:
 	-test -d $@ || $(mkinstalldirs) $@
 
+c-family/m2pp.o : $(srcdir)/m2/m2pp.cc $(GCC_HEADER_DEPENDENCIES_FOR_M2)
+	$(COMPILER) -c -g $(ALL_COMPILERFLAGS) \
+            $(ALL_CPPFLAGS) $(INCLUDES) $< $(OUTPUT_OPTION)
+
 # m2/pg$(exext) is the 2nd generation parser generator built from ebnf
 # without error recovery
 
diff --git a/gcc/m2/gm2-gcc/gcc-consolidation.h b/gcc/m2/gm2-gcc/gcc-consolidation.h
index 6abb1825883..3892bddf9eb 100644
--- a/gcc/m2/gm2-gcc/gcc-consolidation.h
+++ b/gcc/m2/gm2-gcc/gcc-consolidation.h
@@ -25,10 +25,8 @@ along with GNU Modula-2; see the file COPYING3.  If not see
 #include "realmpfr.h"
 #include "backend.h"
 #include "stringpool.h"
-#include "rtl.h"
 #include "tree.h"
 #include "predict.h"
-#include "df.h"
 #include "tm.h"
 #include "hash-set.h"
 #include "machmode.h"
@@ -69,7 +67,6 @@ along with GNU Modula-2; see the file COPYING3.  If not see
 #include "cfganal.h"
 #include "predict.h"
 #include "basic-block.h"
-#include "df.h"
 #include "tree-ssa-alias.h"
 #include "internal-fn.h"
 #include "gimple-expr.h"
@@ -80,7 +77,6 @@ along with GNU Modula-2; see the file COPYING3.  If not see
 #include "stringpool.h"
 #include "tree-nested.h"
 #include "print-tree.h"
-#include "except.h"
 #include "toplev.h"
 #include "convert.h"
 #include "tree-dump.h"