From 24f75498ea59be94ae3eb1b82aa0b9de6ebfa232 Mon Sep 17 00:00:00 2001
From: Gaius Mulley <gaiusmod2@gmail.com>
Date: Sun, 18 Jun 2023 21:07:59 +0100
Subject: [PATCH] PR modula2/110284 Remove stor-layout.o and backend header
 files

This patch removes stor-layout.o from the front end and also removes
back end header files from gcc-consolidation.h.

gcc/m2/ChangeLog:

	PR modula2/110284
	* Make-lang.in (m2_OBJS): Assign $(GM2_C_OBJS).
	(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.

Signed-off-by: Gaius Mulley <gaiusmod2@gmail.com>
---
 gcc/m2/Make-lang.in                | 7 +------
 gcc/m2/gm2-gcc/gcc-consolidation.h | 4 ----
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/gcc/m2/Make-lang.in b/gcc/m2/Make-lang.in
index 15da74a177d..f6f7b487fb0 100644
--- a/gcc/m2/Make-lang.in
+++ b/gcc/m2/Make-lang.in
@@ -490,7 +490,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 \
@@ -516,7 +515,7 @@ GM2_LIBS_BOOT     = m2/gm2-compiler-boot/gm2.a \
                     m2/gm2-libs-boot/libgm2.a \
                     $(GM2-BOOT-O)
 
-$(GM2_C_OBJS) : | $(generated_files)
+m2_OBJS = $(GM2_C_OBJS)
 
 cc1gm2$(exeext): m2/stage1/cc1gm2$(exeext) $(m2.prev)
 	cp -p $< $@
@@ -576,10 +575,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)
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"