https://gcc.gnu.org/g:765769dfeb1a3ce85d6f2c2b071dd1d7d6544280
commit r15-7213-g765769dfeb1a3ce85d6f2c2b071dd1d7d6544280
Author: Gaius Mulley <gaiusm...@gmail.com>
Date: Sat Jan 25 20:30:02 2025 +0000
[PR modula2/118010, modula2/118183] Rebuild bootstrap tools with lseek fix
This patch rebuilds the bootstrap tools mc and pge incorporating the fix to
libc.lseek. The tool mc is changed to omit INCLUDE_MEMORY from
checkGccConfigSystem. The pge tool on rebuild now requires
--gcc-config-system to pick up the system.h containing INCLUDE_MEMORY.
After rebuild all local INCLUDE_MEMORY definitions disappear.
gcc/m2/ChangeLog:
PR modula2/117737
PR modula2/118010
* Make-maintainer.in (PGE-MC-OPTIONS): New macro.
(m2/gm2-pge-boot/$(SRC_PREFIX)M2RTS.o): Use $(PGE-MC-OPTIONS).
(m2/gm2-pge-boot/$(SRC_PREFIX)SymbolKey.o): Ditto.
(m2/gm2-pge-boot/$(SRC_PREFIX)NameKey.o): Ditto.
(m2/gm2-pge-boot/$(SRC_PREFIX)Lists.o): Ditto.
(m2/gm2-pge-boot/$(SRC_PREFIX)Output.o): Ditto.
(m2/gm2-pge-boot/$(SRC_PREFIX)bnflex.o): Ditto.
(m2/gm2-pge-boot/$(SRC_PREFIX)RTentity.o): Ditto.
(m2/gm2-pge-boot/$(SRC_PREFIX)%.o): Ditto.
(m2/gm2-pge-boot/$(SRC_PREFIX)pge.o): Ditto.
(m2/gm2-auto/pg.o): Ditto.
(m2/gm2-auto/pge.o): Ditto.
(mc-autogen): Add include directory $(GMPINC) to $(CXX).
* mc/keyc.mod (checkGccConfigSystem): Remove
INCLUDE_MEMORY define.
* mc-boot/GASCII.cc (INCLUDE_MEMORY): Removed during rebuild.
* mc-boot/GASCII.h (INCLUDE_MEMORY): Ditto.
* mc-boot/GArgs.cc (INCLUDE_MEMORY): Ditto.
* mc-boot/GArgs.h (INCLUDE_MEMORY): Ditto.
* mc-boot/GAssertion.cc (INCLUDE_MEMORY): Ditto.
* mc-boot/GAssertion.h (INCLUDE_MEMORY): Ditto.
* mc-boot/GBreak.cc (INCLUDE_MEMORY): Ditto.
* mc-boot/GBreak.h (INCLUDE_MEMORY): Ditto.
* mc-boot/GCOROUTINES.h (INCLUDE_MEMORY): Ditto.
* mc-boot/GCmdArgs.cc (INCLUDE_MEMORY): Ditto.
* mc-boot/GCmdArgs.h (INCLUDE_MEMORY): Ditto.
* mc-boot/GDebug.cc (INCLUDE_MEMORY): Ditto.
* mc-boot/GDebug.h (INCLUDE_MEMORY): Ditto.
* mc-boot/GDynamicStrings.cc (INCLUDE_MEMORY): Ditto.
* mc-boot/GDynamicStrings.h (INCLUDE_MEMORY): Ditto.
* mc-boot/GEnvironment.cc (INCLUDE_MEMORY): Ditto.
* mc-boot/GEnvironment.h (INCLUDE_MEMORY): Ditto.
* mc-boot/GFIO.cc (INCLUDE_MEMORY): Ditto.
* mc-boot/GFIO.h (INCLUDE_MEMORY): Ditto.
* mc-boot/GFormatStrings.cc (INCLUDE_MEMORY): Ditto.
* mc-boot/GFormatStrings.h (INCLUDE_MEMORY): Ditto.
* mc-boot/GFpuIO.cc (INCLUDE_MEMORY): Ditto.
* mc-boot/GFpuIO.h (INCLUDE_MEMORY): Ditto.
* mc-boot/GIO.cc (INCLUDE_MEMORY): Ditto.
* mc-boot/GIO.h (INCLUDE_MEMORY): Ditto.
* mc-boot/GIndexing.cc (INCLUDE_MEMORY): Ditto.
* mc-boot/GIndexing.h (INCLUDE_MEMORY): Ditto.
* mc-boot/GM2Dependent.cc (INCLUDE_MEMORY): Ditto.
* mc-boot/GM2Dependent.h (INCLUDE_MEMORY): Ditto.
* mc-boot/GM2EXCEPTION.cc (INCLUDE_MEMORY): Ditto.
* mc-boot/GM2EXCEPTION.h (INCLUDE_MEMORY): Ditto.
* mc-boot/GM2RTS.cc (INCLUDE_MEMORY): Ditto.
* mc-boot/GM2RTS.h (INCLUDE_MEMORY): Ditto.
* mc-boot/GMemUtils.cc (INCLUDE_MEMORY): Ditto.
* mc-boot/GMemUtils.h (INCLUDE_MEMORY): Ditto.
* mc-boot/GNumberIO.cc (INCLUDE_MEMORY): Ditto.
* mc-boot/GNumberIO.h (INCLUDE_MEMORY): Ditto.
* mc-boot/GPushBackInput.cc (INCLUDE_MEMORY): Ditto.
* mc-boot/GPushBackInput.h (INCLUDE_MEMORY): Ditto.
* mc-boot/GRTExceptions.cc (INCLUDE_MEMORY): Ditto.
* mc-boot/GRTExceptions.h (INCLUDE_MEMORY): Ditto.
* mc-boot/GRTco.h (INCLUDE_MEMORY): Ditto.
* mc-boot/GRTentity.h (INCLUDE_MEMORY): Ditto.
* mc-boot/GRTint.cc (INCLUDE_MEMORY): Ditto.
* mc-boot/GRTint.h (INCLUDE_MEMORY): Ditto.
* mc-boot/GSArgs.cc (INCLUDE_MEMORY): Ditto.
* mc-boot/GSArgs.h (INCLUDE_MEMORY): Ditto.
* mc-boot/GSFIO.cc (INCLUDE_MEMORY): Ditto.
* mc-boot/GSFIO.h (INCLUDE_MEMORY): Ditto.
* mc-boot/GSYSTEM.h (INCLUDE_MEMORY): Ditto.
* mc-boot/GSelective.h (INCLUDE_MEMORY): Ditto.
* mc-boot/GStdIO.cc (INCLUDE_MEMORY): Ditto.
* mc-boot/GStdIO.h (INCLUDE_MEMORY): Ditto.
* mc-boot/GStorage.cc (INCLUDE_MEMORY): Ditto.
* mc-boot/GStorage.h (INCLUDE_MEMORY): Ditto.
* mc-boot/GStrCase.cc (INCLUDE_MEMORY): Ditto.
* mc-boot/GStrCase.h (INCLUDE_MEMORY): Ditto.
* mc-boot/GStrIO.cc (INCLUDE_MEMORY): Ditto.
* mc-boot/GStrIO.h (INCLUDE_MEMORY): Ditto.
* mc-boot/GStrLib.cc (INCLUDE_MEMORY): Ditto.
* mc-boot/GStrLib.h (INCLUDE_MEMORY): Ditto.
* mc-boot/GStringConvert.cc (INCLUDE_MEMORY): Ditto.
* mc-boot/GStringConvert.h (INCLUDE_MEMORY): Ditto.
* mc-boot/GSysExceptions.h (INCLUDE_MEMORY): Ditto.
* mc-boot/GSysStorage.cc (INCLUDE_MEMORY): Ditto.
* mc-boot/GSysStorage.h (INCLUDE_MEMORY): Ditto.
* mc-boot/GTimeString.cc (INCLUDE_MEMORY): Ditto.
* mc-boot/GTimeString.h (INCLUDE_MEMORY): Ditto.
* mc-boot/GUnixArgs.h (INCLUDE_MEMORY): Ditto.
* mc-boot/Galists.cc (INCLUDE_MEMORY): Ditto.
* mc-boot/Galists.h (INCLUDE_MEMORY): Ditto.
* mc-boot/Gdecl.cc (INCLUDE_MEMORY): Ditto.
* mc-boot/Gdecl.h (INCLUDE_MEMORY): Ditto.
* mc-boot/Gdtoa.h (INCLUDE_MEMORY): Ditto.
* mc-boot/Gerrno.h (INCLUDE_MEMORY): Ditto.
* mc-boot/Gkeyc.cc (INCLUDE_MEMORY): Ditto.
* mc-boot/Gkeyc.h (INCLUDE_MEMORY): Ditto.
* mc-boot/Gldtoa.h (INCLUDE_MEMORY): Ditto.
* mc-boot/Glibc.h (INCLUDE_MEMORY): Ditto.
* mc-boot/Glibm.h (INCLUDE_MEMORY): Ditto.
* mc-boot/Glists.cc (INCLUDE_MEMORY): Ditto.
* mc-boot/Glists.h (INCLUDE_MEMORY): Ditto.
* mc-boot/GmcComment.cc (INCLUDE_MEMORY): Ditto.
* mc-boot/GmcComment.h (INCLUDE_MEMORY): Ditto.
* mc-boot/GmcComp.cc (INCLUDE_MEMORY): Ditto.
* mc-boot/GmcComp.h (INCLUDE_MEMORY): Ditto.
* mc-boot/GmcDebug.cc (INCLUDE_MEMORY): Ditto.
* mc-boot/GmcDebug.h (INCLUDE_MEMORY): Ditto.
* mc-boot/GmcError.cc (INCLUDE_MEMORY): Ditto.
* mc-boot/GmcError.h (INCLUDE_MEMORY): Ditto.
* mc-boot/GmcFileName.cc (INCLUDE_MEMORY): Ditto.
* mc-boot/GmcFileName.h (INCLUDE_MEMORY): Ditto.
* mc-boot/GmcLexBuf.cc (INCLUDE_MEMORY): Ditto.
* mc-boot/GmcLexBuf.h (INCLUDE_MEMORY): Ditto.
* mc-boot/GmcMetaError.cc (INCLUDE_MEMORY): Ditto.
* mc-boot/GmcMetaError.h (INCLUDE_MEMORY): Ditto.
* mc-boot/GmcOptions.cc (INCLUDE_MEMORY): Ditto.
* mc-boot/GmcOptions.h (INCLUDE_MEMORY): Ditto.
* mc-boot/GmcPreprocess.cc (INCLUDE_MEMORY): Ditto.
* mc-boot/GmcPreprocess.h (INCLUDE_MEMORY): Ditto.
* mc-boot/GmcPretty.cc (INCLUDE_MEMORY): Ditto.
* mc-boot/GmcPretty.h (INCLUDE_MEMORY): Ditto.
* mc-boot/GmcPrintf.cc (INCLUDE_MEMORY): Ditto.
* mc-boot/GmcPrintf.h (INCLUDE_MEMORY): Ditto.
* mc-boot/GmcQuiet.cc (INCLUDE_MEMORY): Ditto.
* mc-boot/GmcQuiet.h (INCLUDE_MEMORY): Ditto.
* mc-boot/GmcReserved.cc (INCLUDE_MEMORY): Ditto.
* mc-boot/GmcReserved.h (INCLUDE_MEMORY): Ditto.
* mc-boot/GmcSearch.cc (INCLUDE_MEMORY): Ditto.
* mc-boot/GmcSearch.h (INCLUDE_MEMORY): Ditto.
* mc-boot/GmcStack.cc (INCLUDE_MEMORY): Ditto.
* mc-boot/GmcStack.h (INCLUDE_MEMORY): Ditto.
* mc-boot/GmcStream.cc (INCLUDE_MEMORY): Ditto.
* mc-boot/GmcStream.h (INCLUDE_MEMORY): Ditto.
* mc-boot/Gmcflex.h (INCLUDE_MEMORY): Ditto.
* mc-boot/Gmcp1.cc (INCLUDE_MEMORY): Ditto.
* mc-boot/Gmcp1.h (INCLUDE_MEMORY): Ditto.
* mc-boot/Gmcp2.cc (INCLUDE_MEMORY): Ditto.
* mc-boot/Gmcp2.h (INCLUDE_MEMORY): Ditto.
* mc-boot/Gmcp3.cc (INCLUDE_MEMORY): Ditto.
* mc-boot/Gmcp3.h (INCLUDE_MEMORY): Ditto.
* mc-boot/Gmcp4.cc (INCLUDE_MEMORY): Ditto.
* mc-boot/Gmcp4.h (INCLUDE_MEMORY): Ditto.
* mc-boot/Gmcp5.cc (INCLUDE_MEMORY): Ditto.
* mc-boot/Gmcp5.h (INCLUDE_MEMORY): Ditto.
* mc-boot/GnameKey.cc (INCLUDE_MEMORY): Ditto.
* mc-boot/GnameKey.h (INCLUDE_MEMORY): Ditto.
* mc-boot/GsymbolKey.cc (INCLUDE_MEMORY): Ditto.
* mc-boot/GsymbolKey.h (INCLUDE_MEMORY): Ditto.
* mc-boot/Gtermios.h (INCLUDE_MEMORY): Ditto.
* mc-boot/Gtop.cc (INCLUDE_MEMORY): Ditto.
* mc-boot/Gvarargs.cc (INCLUDE_MEMORY): Ditto.
* mc-boot/Gvarargs.h (INCLUDE_MEMORY): Ditto.
* mc-boot/Gwlists.cc (INCLUDE_MEMORY): Ditto.
* mc-boot/Gwlists.h (INCLUDE_MEMORY): Ditto.
* mc-boot/Gwrapc.h (INCLUDE_MEMORY): Ditto.
* pge-boot/GIndexing.h (INCLUDE_MEMORY): Ditto.
* pge-boot/GSEnvironment.h (INCLUDE_MEMORY): Ditto.
* pge-boot/GScan.h (INCLUDE_MEMORY): Ditto.
Signed-off-by: Gaius Mulley <gaiusm...@gmail.com>
Diff:
---
gcc/m2/Make-maintainer.in | 29 +++++++++++++++--------------
gcc/m2/mc-boot/GASCII.cc | 1 -
gcc/m2/mc-boot/GASCII.h | 1 -
gcc/m2/mc-boot/GArgs.cc | 1 -
gcc/m2/mc-boot/GArgs.h | 1 -
gcc/m2/mc-boot/GAssertion.cc | 1 -
gcc/m2/mc-boot/GAssertion.h | 1 -
gcc/m2/mc-boot/GBreak.cc | 1 -
gcc/m2/mc-boot/GBreak.h | 1 -
gcc/m2/mc-boot/GCOROUTINES.h | 1 -
gcc/m2/mc-boot/GCmdArgs.cc | 1 -
gcc/m2/mc-boot/GCmdArgs.h | 1 -
gcc/m2/mc-boot/GDebug.cc | 1 -
gcc/m2/mc-boot/GDebug.h | 1 -
gcc/m2/mc-boot/GDynamicStrings.cc | 1 -
gcc/m2/mc-boot/GDynamicStrings.h | 1 -
gcc/m2/mc-boot/GEnvironment.cc | 1 -
gcc/m2/mc-boot/GEnvironment.h | 1 -
gcc/m2/mc-boot/GFIO.cc | 1 -
gcc/m2/mc-boot/GFIO.h | 1 -
gcc/m2/mc-boot/GFormatStrings.cc | 1 -
gcc/m2/mc-boot/GFormatStrings.h | 1 -
gcc/m2/mc-boot/GFpuIO.cc | 1 -
gcc/m2/mc-boot/GFpuIO.h | 1 -
gcc/m2/mc-boot/GIO.cc | 1 -
gcc/m2/mc-boot/GIO.h | 1 -
gcc/m2/mc-boot/GIndexing.cc | 1 -
gcc/m2/mc-boot/GIndexing.h | 1 -
gcc/m2/mc-boot/GM2Dependent.cc | 1 -
gcc/m2/mc-boot/GM2Dependent.h | 1 -
gcc/m2/mc-boot/GM2EXCEPTION.cc | 1 -
gcc/m2/mc-boot/GM2EXCEPTION.h | 1 -
gcc/m2/mc-boot/GM2RTS.cc | 1 -
gcc/m2/mc-boot/GM2RTS.h | 1 -
gcc/m2/mc-boot/GMemUtils.cc | 1 -
gcc/m2/mc-boot/GMemUtils.h | 1 -
gcc/m2/mc-boot/GNumberIO.cc | 1 -
gcc/m2/mc-boot/GNumberIO.h | 1 -
gcc/m2/mc-boot/GPushBackInput.cc | 1 -
gcc/m2/mc-boot/GPushBackInput.h | 1 -
gcc/m2/mc-boot/GRTExceptions.cc | 1 -
gcc/m2/mc-boot/GRTExceptions.h | 1 -
gcc/m2/mc-boot/GRTco.h | 1 -
gcc/m2/mc-boot/GRTentity.h | 1 -
gcc/m2/mc-boot/GRTint.cc | 1 -
gcc/m2/mc-boot/GRTint.h | 1 -
gcc/m2/mc-boot/GSArgs.cc | 1 -
gcc/m2/mc-boot/GSArgs.h | 1 -
gcc/m2/mc-boot/GSFIO.cc | 1 -
gcc/m2/mc-boot/GSFIO.h | 1 -
gcc/m2/mc-boot/GSYSTEM.h | 1 -
gcc/m2/mc-boot/GSelective.h | 1 -
gcc/m2/mc-boot/GStdIO.cc | 1 -
gcc/m2/mc-boot/GStdIO.h | 1 -
gcc/m2/mc-boot/GStorage.cc | 1 -
gcc/m2/mc-boot/GStorage.h | 1 -
gcc/m2/mc-boot/GStrCase.cc | 1 -
gcc/m2/mc-boot/GStrCase.h | 1 -
gcc/m2/mc-boot/GStrIO.cc | 1 -
gcc/m2/mc-boot/GStrIO.h | 1 -
gcc/m2/mc-boot/GStrLib.cc | 1 -
gcc/m2/mc-boot/GStrLib.h | 1 -
gcc/m2/mc-boot/GStringConvert.cc | 1 -
gcc/m2/mc-boot/GStringConvert.h | 1 -
gcc/m2/mc-boot/GSysExceptions.h | 1 -
gcc/m2/mc-boot/GSysStorage.cc | 1 -
gcc/m2/mc-boot/GSysStorage.h | 1 -
gcc/m2/mc-boot/GTimeString.cc | 1 -
gcc/m2/mc-boot/GTimeString.h | 1 -
gcc/m2/mc-boot/GUnixArgs.h | 1 -
gcc/m2/mc-boot/Galists.cc | 1 -
gcc/m2/mc-boot/Galists.h | 1 -
gcc/m2/mc-boot/Gdecl.cc | 3 +--
gcc/m2/mc-boot/Gdecl.h | 1 -
gcc/m2/mc-boot/Gdtoa.h | 1 -
gcc/m2/mc-boot/Gerrno.h | 1 -
gcc/m2/mc-boot/Gkeyc.cc | 2 --
gcc/m2/mc-boot/Gkeyc.h | 1 -
gcc/m2/mc-boot/Gldtoa.h | 1 -
gcc/m2/mc-boot/Glibc.h | 1 -
gcc/m2/mc-boot/Glibm.h | 1 -
gcc/m2/mc-boot/Glists.cc | 1 -
gcc/m2/mc-boot/Glists.h | 1 -
gcc/m2/mc-boot/GmcComment.cc | 1 -
gcc/m2/mc-boot/GmcComment.h | 1 -
gcc/m2/mc-boot/GmcComp.cc | 1 -
gcc/m2/mc-boot/GmcComp.h | 1 -
gcc/m2/mc-boot/GmcDebug.cc | 1 -
gcc/m2/mc-boot/GmcDebug.h | 1 -
gcc/m2/mc-boot/GmcError.cc | 1 -
gcc/m2/mc-boot/GmcError.h | 1 -
gcc/m2/mc-boot/GmcFileName.cc | 1 -
gcc/m2/mc-boot/GmcFileName.h | 1 -
gcc/m2/mc-boot/GmcLexBuf.cc | 1 -
gcc/m2/mc-boot/GmcLexBuf.h | 1 -
gcc/m2/mc-boot/GmcMetaError.cc | 1 -
gcc/m2/mc-boot/GmcMetaError.h | 1 -
gcc/m2/mc-boot/GmcOptions.cc | 1 -
gcc/m2/mc-boot/GmcOptions.h | 1 -
gcc/m2/mc-boot/GmcPreprocess.cc | 1 -
gcc/m2/mc-boot/GmcPreprocess.h | 1 -
gcc/m2/mc-boot/GmcPretty.cc | 1 -
gcc/m2/mc-boot/GmcPretty.h | 1 -
gcc/m2/mc-boot/GmcPrintf.cc | 1 -
gcc/m2/mc-boot/GmcPrintf.h | 1 -
gcc/m2/mc-boot/GmcQuiet.cc | 1 -
gcc/m2/mc-boot/GmcQuiet.h | 1 -
gcc/m2/mc-boot/GmcReserved.cc | 1 -
gcc/m2/mc-boot/GmcReserved.h | 1 -
gcc/m2/mc-boot/GmcSearch.cc | 1 -
gcc/m2/mc-boot/GmcSearch.h | 1 -
gcc/m2/mc-boot/GmcStack.cc | 1 -
gcc/m2/mc-boot/GmcStack.h | 1 -
gcc/m2/mc-boot/GmcStream.cc | 1 -
gcc/m2/mc-boot/GmcStream.h | 1 -
gcc/m2/mc-boot/Gmcflex.h | 1 -
gcc/m2/mc-boot/Gmcp1.cc | 1 -
gcc/m2/mc-boot/Gmcp1.h | 1 -
gcc/m2/mc-boot/Gmcp2.cc | 1 -
gcc/m2/mc-boot/Gmcp2.h | 1 -
gcc/m2/mc-boot/Gmcp3.cc | 1 -
gcc/m2/mc-boot/Gmcp3.h | 1 -
gcc/m2/mc-boot/Gmcp4.cc | 1 -
gcc/m2/mc-boot/Gmcp4.h | 1 -
gcc/m2/mc-boot/Gmcp5.cc | 1 -
gcc/m2/mc-boot/Gmcp5.h | 1 -
gcc/m2/mc-boot/GnameKey.cc | 1 -
gcc/m2/mc-boot/GnameKey.h | 1 -
gcc/m2/mc-boot/GsymbolKey.cc | 1 -
gcc/m2/mc-boot/GsymbolKey.h | 1 -
gcc/m2/mc-boot/Gtermios.h | 1 -
gcc/m2/mc-boot/Gtop.cc | 1 -
gcc/m2/mc-boot/Gvarargs.cc | 1 -
gcc/m2/mc-boot/Gvarargs.h | 1 -
gcc/m2/mc-boot/Gwlists.cc | 1 -
gcc/m2/mc-boot/Gwlists.h | 1 -
gcc/m2/mc-boot/Gwrapc.h | 1 -
gcc/m2/mc/keyc.mod | 1 -
gcc/m2/pge-boot/GIndexing.h | 1 -
gcc/m2/pge-boot/GSEnvironment.h | 1 -
gcc/m2/pge-boot/GScan.h | 1 -
141 files changed, 16 insertions(+), 156 deletions(-)
diff --git a/gcc/m2/Make-maintainer.in b/gcc/m2/Make-maintainer.in
index dea50004576c..ad89474f3754 100644
--- a/gcc/m2/Make-maintainer.in
+++ b/gcc/m2/Make-maintainer.in
@@ -620,6 +620,7 @@ BUILD-PGE-O =
$(PPG-INTERFACE-C:%.c=m2/gm2-pge-boot/$(SRC_PREFIX)%.o) \
$(PGE-SRC:%.mod=m2/gm2-pge-boot/$(SRC_PREFIX)%.o)
BUILD-BOOT-PGE-H = $(BUILD-BOOT-H)
$(PGE-DEF:%.def=m2/gm2-pge-boot/$(SRC_PREFIX)%.h)
+PGE-MC-OPTIONS = --gcc-config-system
m2/gm2-auto/pge.mod: m2/pg$(exeext)
-test -d m2/gm2-auto || $(mkinstalldirs) m2/gm2-auto
@@ -676,7 +677,7 @@ m2/gm2-pge-boot/$(SRC_PREFIX)errno.o:
$(srcdir)/m2/mc-boot-ch/Gerrno.cc
m2/gm2-pge-boot/$(SRC_PREFIX)M2RTS.o: $(srcdir)/m2/gm2-libs/M2RTS.mod
$(MCDEPS) $(BUILD-BOOT-PGE-H)
-test -d m2/gm2-pge-boot || $(mkinstalldirs) m2/gm2-pge-boot
- $(MCC) --suppress-noreturn -o=m2/gm2-pge-boot/$(SRC_PREFIX)M2RTS.cc
$(srcdir)/m2/gm2-libs/M2RTS.mod
+ $(MCC) $(PGE-MC-OPTIONS) --suppress-noreturn
-o=m2/gm2-pge-boot/$(SRC_PREFIX)M2RTS.cc $(srcdir)/m2/gm2-libs/M2RTS.mod
$(CXX) -I. -I$(srcdir)/../include -I$(srcdir) -I$(srcdir)/m2/pge-boot
-I$(srcdir)/m2/mc-boot \
-I$(srcdir)/m2/mc-boot-ch -Im2/gm2-libs-boot \
$(INCLUDES) -g -c m2/gm2-pge-boot/$(SRC_PREFIX)M2RTS.cc -o $@
@@ -689,7 +690,7 @@ m2/gm2-pge-boot/$(SRC_PREFIX)SymbolKey.o:
$(srcdir)/m2/gm2-compiler/SymbolKey.mo
$(MCDEPS) $(BUILD-BOOT-PGE-H) \
m2/gm2-pge-boot/$(SRC_PREFIX)SymbolKey.h
-test -d m2/gm2-pge-boot || $(mkinstalldirs) m2/gm2-pge-boot
- $(MCC) --suppress-noreturn -o=m2/gm2-pge-boot/$(SRC_PREFIX)SymbolKey.cc
$(srcdir)/m2/gm2-compiler/SymbolKey.mod
+ $(MCC) $(PGE-MC-OPTIONS) --suppress-noreturn
-o=m2/gm2-pge-boot/$(SRC_PREFIX)SymbolKey.cc
$(srcdir)/m2/gm2-compiler/SymbolKey.mod
$(CXX) -I. -I$(srcdir)/../include -I$(srcdir) -I$(srcdir)/m2/pge-boot
-I$(srcdir)/m2/mc-boot \
-I$(srcdir)/m2/mc-boot-ch -Im2/gm2-libs-boot \
$(INCLUDES) -g -c m2/gm2-pge-boot/$(SRC_PREFIX)SymbolKey.cc -o $@
@@ -702,7 +703,7 @@ m2/gm2-pge-boot/$(SRC_PREFIX)NameKey.o:
$(srcdir)/m2/gm2-compiler/NameKey.mod \
$(MCDEPS) $(BUILD-BOOT-PGE-H) \
m2/gm2-pge-boot/$(SRC_PREFIX)NameKey.h
-test -d m2/gm2-pge-boot || $(mkinstalldirs) m2/gm2-pge-boot
- $(MCC) --suppress-noreturn -o=m2/gm2-pge-boot/$(SRC_PREFIX)NameKey.cc
$(srcdir)/m2/gm2-compiler/NameKey.mod
+ $(MCC) $(PGE-MC-OPTIONS) --suppress-noreturn
-o=m2/gm2-pge-boot/$(SRC_PREFIX)NameKey.cc $(srcdir)/m2/gm2-compiler/NameKey.mod
$(CXX) -I. -I$(srcdir)/../include -I$(srcdir) -I$(srcdir)/m2/pge-boot
-I$(srcdir)/m2/mc-boot \
-I$(srcdir)/m2/mc-boot-ch -Im2/gm2-libs-boot \
$(INCLUDES) -g -c m2/gm2-pge-boot/$(SRC_PREFIX)NameKey.cc -o $@
@@ -715,7 +716,7 @@ m2/gm2-pge-boot/$(SRC_PREFIX)Lists.o:
$(srcdir)/m2/gm2-compiler/Lists.mod \
$(MCDEPS) $(BUILD-BOOT-PGE-H) \
m2/gm2-pge-boot/$(SRC_PREFIX)Lists.h
-test -d m2/gm2-pge-boot || $(mkinstalldirs) m2/gm2-pge-boot
- $(MCC) --suppress-noreturn -o=m2/gm2-pge-boot/$(SRC_PREFIX)Lists.cc
$(srcdir)/m2/gm2-compiler/Lists.mod
+ $(MCC) $(PGE-MC-OPTIONS) --suppress-noreturn
-o=m2/gm2-pge-boot/$(SRC_PREFIX)Lists.cc $(srcdir)/m2/gm2-compiler/Lists.mod
$(CXX) -I. -I$(srcdir)/../include -I$(srcdir) -I$(srcdir)/m2/pge-boot
-I$(srcdir)/m2/mc-boot \
-I$(srcdir)/m2/mc-boot-ch -Im2/gm2-libs-boot \
$(INCLUDES) -g -c m2/gm2-pge-boot/$(SRC_PREFIX)Lists.cc -o $@
@@ -728,7 +729,7 @@ m2/gm2-pge-boot/$(SRC_PREFIX)Output.o:
$(srcdir)/m2/gm2-compiler/Output.mod \
$(MCDEPS) $(BUILD-BOOT-PGE-H) \
m2/gm2-pge-boot/$(SRC_PREFIX)Output.h
-test -d m2/gm2-pge-boot || $(mkinstalldirs) m2/gm2-pge-boot
- $(MCC) --suppress-noreturn -o=m2/gm2-pge-boot/$(SRC_PREFIX)Output.cc
$(srcdir)/m2/gm2-compiler/Output.mod
+ $(MCC) $(PGE-MC-OPTIONS) --suppress-noreturn
-o=m2/gm2-pge-boot/$(SRC_PREFIX)Output.cc $(srcdir)/m2/gm2-compiler/Output.mod
$(CXX) -I. -I$(srcdir)/../include -I$(srcdir) -I$(srcdir)/m2/pge-boot
-I$(srcdir)/m2/mc-boot \
-I$(srcdir)/m2/mc-boot-ch -Im2/gm2-libs-boot \
$(INCLUDES) -g -c m2/gm2-pge-boot/$(SRC_PREFIX)Output.cc -o $@
@@ -741,7 +742,7 @@ m2/gm2-pge-boot/$(SRC_PREFIX)bnflex.o:
$(srcdir)/m2/gm2-compiler/bnflex.mod \
$(MCDEPS) $(BUILD-BOOT-PGE-H) \
m2/gm2-pge-boot/$(SRC_PREFIX)bnflex.h
-test -d m2/gm2-pge-boot || $(mkinstalldirs) m2/gm2-pge-boot
- $(MCC) --suppress-noreturn -o=m2/gm2-pge-boot/$(SRC_PREFIX)bnflex.cc
$(srcdir)/m2/gm2-compiler/bnflex.mod
+ $(MCC) $(PGE-MC-OPTIONS) --suppress-noreturn
-o=m2/gm2-pge-boot/$(SRC_PREFIX)bnflex.cc $(srcdir)/m2/gm2-compiler/bnflex.mod
$(CXX) -I. -I$(srcdir)/../include -I$(srcdir) -I$(srcdir)/m2/pge-boot
-I$(srcdir)/m2/mc-boot \
-I$(srcdir)/m2/mc-boot-ch -Im2/gm2-libs-boot \
$(INCLUDES) -g -c m2/gm2-pge-boot/$(SRC_PREFIX)bnflex.cc -o $@
@@ -764,28 +765,28 @@ m2/gm2-pge-boot/$(SRC_PREFIX)RTentity.o:
$(srcdir)/m2/gm2-libs-iso/RTentity.mod
$(MCDEPS) $(BUILD-BOOT-PGE-H) \
m2/gm2-pge-boot/$(SRC_PREFIX)RTentity.h
-test -d m2/gm2-pge-boot || $(mkinstalldirs) m2/gm2-pge-boot
- $(MCC) --suppress-noreturn -o=m2/gm2-pge-boot/$(SRC_PREFIX)RTentity.cc
$(srcdir)/m2/gm2-libs-iso/RTentity.mod
+ $(MCC) $(PGE-MC-OPTIONS) --suppress-noreturn
-o=m2/gm2-pge-boot/$(SRC_PREFIX)RTentity.cc
$(srcdir)/m2/gm2-libs-iso/RTentity.mod
$(CXX) -I. -I$(srcdir)/../include -I$(srcdir) -I$(srcdir)/m2/pge-boot
-I$(srcdir)/m2/mc-boot \
-I$(srcdir)/m2/mc-boot-ch -Im2/gm2-libs-boot \
$(INCLUDES) -g -c m2/gm2-pge-boot/$(SRC_PREFIX)RTentity.cc -o $@
m2/gm2-pge-boot/$(SRC_PREFIX)%.o: $(srcdir)/m2/gm2-libs/%.mod $(MCDEPS)
$(BUILD-BOOT-PGE-H)
-test -d m2/gm2-pge-boot || $(mkinstalldirs) m2/gm2-pge-boot
- $(MCC) -o=m2/gm2-pge-boot/$(SRC_PREFIX)$*.cc
$(srcdir)/m2/gm2-libs/$*.mod
+ $(MCC) $(PGE-MC-OPTIONS) -o=m2/gm2-pge-boot/$(SRC_PREFIX)$*.cc
$(srcdir)/m2/gm2-libs/$*.mod
$(CXX) -I. -I$(srcdir)/../include -I$(srcdir) -I$(srcdir)/m2/pge-boot
-I$(srcdir)/m2/mc-boot \
-I$(srcdir)/m2/mc-boot-ch -Im2/gm2-libs-boot \
$(INCLUDES) -g -c m2/gm2-pge-boot/$(SRC_PREFIX)$*.cc -o $@
m2/gm2-pge-boot/$(SRC_PREFIX)%.o: $(srcdir)/m2/gm2-compiler/%.mod $(MCDEPS)
$(BUILD-BOOT-PGE-H)
-test -d m2/gm2-pge-boot || $(mkinstalldirs) m2/gm2-pge-boot
- $(MCC) -o=m2/gm2-pge-boot/$(SRC_PREFIX)$*.cc
$(srcdir)/m2/gm2-compiler/$*.mod
+ $(MCC) $(PGE-MC-OPTIONS) -o=m2/gm2-pge-boot/$(SRC_PREFIX)$*.cc
$(srcdir)/m2/gm2-compiler/$*.mod
$(CXX) -I. -I$(srcdir)/../include -I$(srcdir) -I$(srcdir)/m2/mc-boot
-Im2/gm2-compiler-boot \
-Im2/gm2-libs-boot -Im2/gm2-pge-boot \
-I$(srcdir)/m2/mc-boot-ch $(INCLUDES) -g -c
m2/gm2-pge-boot/$(SRC_PREFIX)$*.cc -o $@
m2/gm2-pge-boot/$(SRC_PREFIX)pge.o: m2/gm2-auto/pge.mod $(MCDEPS)
$(BUILD-BOOT-PGE-H)
-test -d m2/gm2-pge-boot || $(mkinstalldirs) m2/gm2-pge-boot
- $(MCC) -o=m2/gm2-pge-boot/$(SRC_PREFIX)pge.cc m2/gm2-auto/pge.mod
+ $(MCC) $(PGE-MC-OPTIONS) -o=m2/gm2-pge-boot/$(SRC_PREFIX)pge.cc
m2/gm2-auto/pge.mod
$(CXX) -I. -I$(srcdir)/../include -I$(srcdir) \
-I$(srcdir)/m2/mc-boot -Im2/gm2-compiler-boot -Im2/gm2-libs-boot
\
-I$(srcdir)/m2/mc-boot-ch $(INCLUDES) -g -c
m2/gm2-pge-boot/$(SRC_PREFIX)pge.cc -o $@
@@ -829,12 +830,12 @@ $(objdir)/m2/gm2-pge-boot:
m2/gm2-auto/pg.o: m2/gm2-auto/pg.mod $(MCDEPS)
-test -d m2/gm2-pge-boot || $(mkinstalldirs) m2/gm2-pge-boot
- $(MC) --quiet -o=m2/gm2-auto/pg.c m2/gm2-auto/pg.mod
+ $(MC) $(PGE-MC-OPTIONS) --quiet -o=m2/gm2-auto/pg.c m2/gm2-auto/pg.mod
$(COMPILER) -c $(CFLAGS) -I. -I$(srcdir)/../include -I$(srcdir)
-I$(srcdir)/m2 -Im2/gm2-libs-boot -Im2/gm2-compiler-boot
-I$(srcdir)/m2/mc-boot-ch $(INCLUDES) m2/gm2-auto/pg.c -o $@
m2/gm2-auto/pge.o: m2/gm2-auto/pge.mod $(MCDEPS)
-test -d m2/gm2-auto || $(mkinstalldirs) m2/gm2-auto
- $(MC) --quiet -o=m2/gm2-auto/pge.c m2/gm2-auto/pge.mod
+ $(MC) $(PGE-MC-OPTIONS) --quiet -o=m2/gm2-auto/pge.c m2/gm2-auto/pge.mod
$(COMPILER) -c $(CFLAGS) -I. -I$(srcdir)/../include -I$(srcdir)
-I$(srcdir)/m2 -Im2/gm2-libs-boot -Im2/gm2-compiler-boot
-I$(srcdir)/m2/mc-boot-ch $(INCLUDES) m2/gm2-auto/pge.c -o $@
pge-help: force
@@ -1061,8 +1062,8 @@ mc-autogen: mc-clean mc-devel \
$(BUILD-MC-BOOT-H) $(BUILD-MC-BOOT-CC) \
$(BUILD-MC-BOOT-AUTO-CC)
for i in m2/mc-boot-gen/*.cc ; do \
- echo $(CXX) -g -c -I. -I$(srcdir)/../include -I$(srcdir)
-I$(srcdir)/m2/mc-boot-ch -Im2/mc-boot-gen/ $$i -o m2/mc-boot-gen/`basename $$i
.cc`.o ; \
- $(CXX) -g -c -I. -I$(srcdir)/../include -I$(srcdir)
-I$(srcdir)/m2/mc-boot-ch -Im2/mc-boot-gen/ $$i -o m2/mc-boot-gen/`basename $$i
.cc`.o ; done
+ echo $(CXX) -g -c -I. $(GMPINC) -I$(srcdir)/../include -I$(srcdir)
-I$(srcdir)/m2/mc-boot-ch -Im2/mc-boot-gen/ $$i -o m2/mc-boot-gen/`basename $$i
.cc`.o ; \
+ $(CXX) -g -c -I. $(GMPINC) -I$(srcdir)/../include -I$(srcdir)
-I$(srcdir)/m2/mc-boot-ch -Im2/mc-boot-gen/ $$i -o m2/mc-boot-gen/`basename $$i
.cc`.o ; done
@echo -n "built "
@cd m2/mc-boot-gen ; ls *.o | wc -l
@echo -n "out of "
diff --git a/gcc/m2/mc-boot/GASCII.cc b/gcc/m2/mc-boot/GASCII.cc
index 72cc6b251330..35e77522b701 100644
--- a/gcc/m2/mc-boot/GASCII.cc
+++ b/gcc/m2/mc-boot/GASCII.cc
@@ -25,7 +25,6 @@ a copy of the GCC Runtime Library Exception along with this
program;
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GASCII.h b/gcc/m2/mc-boot/GASCII.h
index c5a38b227c99..18c272505784 100644
--- a/gcc/m2/mc-boot/GASCII.h
+++ b/gcc/m2/mc-boot/GASCII.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If
not, see
#if !defined (_ASCII_H)
# define _ASCII_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GArgs.cc b/gcc/m2/mc-boot/GArgs.cc
index 2aafca77a3b6..c87c35e73b69 100644
--- a/gcc/m2/mc-boot/GArgs.cc
+++ b/gcc/m2/mc-boot/GArgs.cc
@@ -25,7 +25,6 @@ a copy of the GCC Runtime Library Exception along with this
program;
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GArgs.h b/gcc/m2/mc-boot/GArgs.h
index 8de0d0f52f0f..4a7b4f9c886c 100644
--- a/gcc/m2/mc-boot/GArgs.h
+++ b/gcc/m2/mc-boot/GArgs.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If
not, see
#if !defined (_Args_H)
# define _Args_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GAssertion.cc b/gcc/m2/mc-boot/GAssertion.cc
index f4185f91cacc..18d693185f7f 100644
--- a/gcc/m2/mc-boot/GAssertion.cc
+++ b/gcc/m2/mc-boot/GAssertion.cc
@@ -25,7 +25,6 @@ a copy of the GCC Runtime Library Exception along with this
program;
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GAssertion.h b/gcc/m2/mc-boot/GAssertion.h
index 0ea29e4f406f..94ca402a2152 100644
--- a/gcc/m2/mc-boot/GAssertion.h
+++ b/gcc/m2/mc-boot/GAssertion.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If
not, see
#if !defined (_Assertion_H)
# define _Assertion_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GBreak.cc b/gcc/m2/mc-boot/GBreak.cc
index e8b5d053ac69..f31d4a82b5ad 100644
--- a/gcc/m2/mc-boot/GBreak.cc
+++ b/gcc/m2/mc-boot/GBreak.cc
@@ -25,7 +25,6 @@ a copy of the GCC Runtime Library Exception along with this
program;
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GBreak.h b/gcc/m2/mc-boot/GBreak.h
index c29c8b9d3e06..14bd68e1ee90 100644
--- a/gcc/m2/mc-boot/GBreak.h
+++ b/gcc/m2/mc-boot/GBreak.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If
not, see
#if !defined (_Break_H)
# define _Break_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GCOROUTINES.h b/gcc/m2/mc-boot/GCOROUTINES.h
index 678a87422484..7543c7e4969c 100644
--- a/gcc/m2/mc-boot/GCOROUTINES.h
+++ b/gcc/m2/mc-boot/GCOROUTINES.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If
not, see
#if !defined (_COROUTINES_H)
# define _COROUTINES_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GCmdArgs.cc b/gcc/m2/mc-boot/GCmdArgs.cc
index 220fd0c3a8a9..9c0da752714b 100644
--- a/gcc/m2/mc-boot/GCmdArgs.cc
+++ b/gcc/m2/mc-boot/GCmdArgs.cc
@@ -25,7 +25,6 @@ a copy of the GCC Runtime Library Exception along with this
program;
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GCmdArgs.h b/gcc/m2/mc-boot/GCmdArgs.h
index a078d64a06d7..b29a52acc0d0 100644
--- a/gcc/m2/mc-boot/GCmdArgs.h
+++ b/gcc/m2/mc-boot/GCmdArgs.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If
not, see
#if !defined (_CmdArgs_H)
# define _CmdArgs_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GDebug.cc b/gcc/m2/mc-boot/GDebug.cc
index 1aa02a60e591..4e25f7642802 100644
--- a/gcc/m2/mc-boot/GDebug.cc
+++ b/gcc/m2/mc-boot/GDebug.cc
@@ -25,7 +25,6 @@ a copy of the GCC Runtime Library Exception along with this
program;
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GDebug.h b/gcc/m2/mc-boot/GDebug.h
index c43e363fe14e..b7530ea4d988 100644
--- a/gcc/m2/mc-boot/GDebug.h
+++ b/gcc/m2/mc-boot/GDebug.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If
not, see
#if !defined (_Debug_H)
# define _Debug_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GDynamicStrings.cc
b/gcc/m2/mc-boot/GDynamicStrings.cc
index a409ce79b1b4..55d2ae8038bc 100644
--- a/gcc/m2/mc-boot/GDynamicStrings.cc
+++ b/gcc/m2/mc-boot/GDynamicStrings.cc
@@ -25,7 +25,6 @@ a copy of the GCC Runtime Library Exception along with this
program;
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GDynamicStrings.h b/gcc/m2/mc-boot/GDynamicStrings.h
index 1860701b310b..1939b73037ae 100644
--- a/gcc/m2/mc-boot/GDynamicStrings.h
+++ b/gcc/m2/mc-boot/GDynamicStrings.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If
not, see
#if !defined (_DynamicStrings_H)
# define _DynamicStrings_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GEnvironment.cc b/gcc/m2/mc-boot/GEnvironment.cc
index 5a2ad756a053..044fba107975 100644
--- a/gcc/m2/mc-boot/GEnvironment.cc
+++ b/gcc/m2/mc-boot/GEnvironment.cc
@@ -25,7 +25,6 @@ a copy of the GCC Runtime Library Exception along with this
program;
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GEnvironment.h b/gcc/m2/mc-boot/GEnvironment.h
index cf58be08b5fb..3bfadaaebed2 100644
--- a/gcc/m2/mc-boot/GEnvironment.h
+++ b/gcc/m2/mc-boot/GEnvironment.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If
not, see
#if !defined (_Environment_H)
# define _Environment_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GFIO.cc b/gcc/m2/mc-boot/GFIO.cc
index 5d223c941bf3..da373933d093 100644
--- a/gcc/m2/mc-boot/GFIO.cc
+++ b/gcc/m2/mc-boot/GFIO.cc
@@ -25,7 +25,6 @@ a copy of the GCC Runtime Library Exception along with this
program;
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GFIO.h b/gcc/m2/mc-boot/GFIO.h
index 3ab2c518da4a..8b69241f1751 100644
--- a/gcc/m2/mc-boot/GFIO.h
+++ b/gcc/m2/mc-boot/GFIO.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If
not, see
#if !defined (_FIO_H)
# define _FIO_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GFormatStrings.cc b/gcc/m2/mc-boot/GFormatStrings.cc
index e2ea1954d191..f4c4fd6f8c10 100644
--- a/gcc/m2/mc-boot/GFormatStrings.cc
+++ b/gcc/m2/mc-boot/GFormatStrings.cc
@@ -25,7 +25,6 @@ a copy of the GCC Runtime Library Exception along with this
program;
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GFormatStrings.h b/gcc/m2/mc-boot/GFormatStrings.h
index 61e84541e513..6ab12c4ef02b 100644
--- a/gcc/m2/mc-boot/GFormatStrings.h
+++ b/gcc/m2/mc-boot/GFormatStrings.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If
not, see
#if !defined (_FormatStrings_H)
# define _FormatStrings_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GFpuIO.cc b/gcc/m2/mc-boot/GFpuIO.cc
index 3fdd5fd2925d..6bd6a6bc59fd 100644
--- a/gcc/m2/mc-boot/GFpuIO.cc
+++ b/gcc/m2/mc-boot/GFpuIO.cc
@@ -25,7 +25,6 @@ a copy of the GCC Runtime Library Exception along with this
program;
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GFpuIO.h b/gcc/m2/mc-boot/GFpuIO.h
index 1b6f9573ebc1..1c6670d6c82b 100644
--- a/gcc/m2/mc-boot/GFpuIO.h
+++ b/gcc/m2/mc-boot/GFpuIO.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If
not, see
#if !defined (_FpuIO_H)
# define _FpuIO_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GIO.cc b/gcc/m2/mc-boot/GIO.cc
index a64f401a7161..6e0ae3150a34 100644
--- a/gcc/m2/mc-boot/GIO.cc
+++ b/gcc/m2/mc-boot/GIO.cc
@@ -25,7 +25,6 @@ a copy of the GCC Runtime Library Exception along with this
program;
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GIO.h b/gcc/m2/mc-boot/GIO.h
index 4037cfdef4c7..d01d69a65168 100644
--- a/gcc/m2/mc-boot/GIO.h
+++ b/gcc/m2/mc-boot/GIO.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If
not, see
#if !defined (_IO_H)
# define _IO_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GIndexing.cc b/gcc/m2/mc-boot/GIndexing.cc
index a38a4776c8c4..5ab0c4296aaf 100644
--- a/gcc/m2/mc-boot/GIndexing.cc
+++ b/gcc/m2/mc-boot/GIndexing.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public
License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GIndexing.h b/gcc/m2/mc-boot/GIndexing.h
index f6a58cf9b547..e1054b026fd8 100644
--- a/gcc/m2/mc-boot/GIndexing.h
+++ b/gcc/m2/mc-boot/GIndexing.h
@@ -24,7 +24,6 @@ along with GNU Modula-2; see the file COPYING3. If not see
#if !defined (_Indexing_H)
# define _Indexing_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GM2Dependent.cc b/gcc/m2/mc-boot/GM2Dependent.cc
index 32f204fbbbce..e8ade8773a14 100644
--- a/gcc/m2/mc-boot/GM2Dependent.cc
+++ b/gcc/m2/mc-boot/GM2Dependent.cc
@@ -25,7 +25,6 @@ a copy of the GCC Runtime Library Exception along with this
program;
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GM2Dependent.h b/gcc/m2/mc-boot/GM2Dependent.h
index f95d585ed96a..b9ad0c780b8c 100644
--- a/gcc/m2/mc-boot/GM2Dependent.h
+++ b/gcc/m2/mc-boot/GM2Dependent.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If
not, see
#if !defined (_M2Dependent_H)
# define _M2Dependent_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GM2EXCEPTION.cc b/gcc/m2/mc-boot/GM2EXCEPTION.cc
index e2d89e0cb374..62d47f08b5b5 100644
--- a/gcc/m2/mc-boot/GM2EXCEPTION.cc
+++ b/gcc/m2/mc-boot/GM2EXCEPTION.cc
@@ -25,7 +25,6 @@ a copy of the GCC Runtime Library Exception along with this
program;
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GM2EXCEPTION.h b/gcc/m2/mc-boot/GM2EXCEPTION.h
index 66eb23ab12f0..6f6b2f6712b6 100644
--- a/gcc/m2/mc-boot/GM2EXCEPTION.h
+++ b/gcc/m2/mc-boot/GM2EXCEPTION.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If
not, see
#if !defined (_M2EXCEPTION_H)
# define _M2EXCEPTION_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GM2RTS.cc b/gcc/m2/mc-boot/GM2RTS.cc
index 7149c1865dcd..4fbce4468823 100644
--- a/gcc/m2/mc-boot/GM2RTS.cc
+++ b/gcc/m2/mc-boot/GM2RTS.cc
@@ -25,7 +25,6 @@ a copy of the GCC Runtime Library Exception along with this
program;
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GM2RTS.h b/gcc/m2/mc-boot/GM2RTS.h
index a1dbf88e2b63..ea6eabae9714 100644
--- a/gcc/m2/mc-boot/GM2RTS.h
+++ b/gcc/m2/mc-boot/GM2RTS.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If
not, see
#if !defined (_M2RTS_H)
# define _M2RTS_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GMemUtils.cc b/gcc/m2/mc-boot/GMemUtils.cc
index 4bdbe3e83448..828144fb0235 100644
--- a/gcc/m2/mc-boot/GMemUtils.cc
+++ b/gcc/m2/mc-boot/GMemUtils.cc
@@ -25,7 +25,6 @@ a copy of the GCC Runtime Library Exception along with this
program;
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GMemUtils.h b/gcc/m2/mc-boot/GMemUtils.h
index 9fd5e46e7902..38a843417d96 100644
--- a/gcc/m2/mc-boot/GMemUtils.h
+++ b/gcc/m2/mc-boot/GMemUtils.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If
not, see
#if !defined (_MemUtils_H)
# define _MemUtils_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GNumberIO.cc b/gcc/m2/mc-boot/GNumberIO.cc
index 9de7a51353af..8a04cbff7e63 100644
--- a/gcc/m2/mc-boot/GNumberIO.cc
+++ b/gcc/m2/mc-boot/GNumberIO.cc
@@ -25,7 +25,6 @@ a copy of the GCC Runtime Library Exception along with this
program;
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GNumberIO.h b/gcc/m2/mc-boot/GNumberIO.h
index b40c33d0316e..13960e966075 100644
--- a/gcc/m2/mc-boot/GNumberIO.h
+++ b/gcc/m2/mc-boot/GNumberIO.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If
not, see
#if !defined (_NumberIO_H)
# define _NumberIO_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GPushBackInput.cc b/gcc/m2/mc-boot/GPushBackInput.cc
index e526bf7438e5..60fb12ef898e 100644
--- a/gcc/m2/mc-boot/GPushBackInput.cc
+++ b/gcc/m2/mc-boot/GPushBackInput.cc
@@ -25,7 +25,6 @@ a copy of the GCC Runtime Library Exception along with this
program;
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GPushBackInput.h b/gcc/m2/mc-boot/GPushBackInput.h
index b747e50baa4c..c2e034429481 100644
--- a/gcc/m2/mc-boot/GPushBackInput.h
+++ b/gcc/m2/mc-boot/GPushBackInput.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If
not, see
#if !defined (_PushBackInput_H)
# define _PushBackInput_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GRTExceptions.cc b/gcc/m2/mc-boot/GRTExceptions.cc
index 881d97de1ec6..2f84fa638c30 100644
--- a/gcc/m2/mc-boot/GRTExceptions.cc
+++ b/gcc/m2/mc-boot/GRTExceptions.cc
@@ -25,7 +25,6 @@ a copy of the GCC Runtime Library Exception along with this
program;
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GRTExceptions.h b/gcc/m2/mc-boot/GRTExceptions.h
index 3d70cb359467..24f3da38d6c3 100644
--- a/gcc/m2/mc-boot/GRTExceptions.h
+++ b/gcc/m2/mc-boot/GRTExceptions.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If
not, see
#if !defined (_RTExceptions_H)
# define _RTExceptions_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GRTco.h b/gcc/m2/mc-boot/GRTco.h
index aa6e92836354..86c5b0316b17 100644
--- a/gcc/m2/mc-boot/GRTco.h
+++ b/gcc/m2/mc-boot/GRTco.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If
not, see
#if !defined (_RTco_H)
# define _RTco_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GRTentity.h b/gcc/m2/mc-boot/GRTentity.h
index 6f54002aa311..381ba680b634 100644
--- a/gcc/m2/mc-boot/GRTentity.h
+++ b/gcc/m2/mc-boot/GRTentity.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If
not, see
#if !defined (_RTentity_H)
# define _RTentity_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GRTint.cc b/gcc/m2/mc-boot/GRTint.cc
index 8f0f81036c32..188b6e0a9a24 100644
--- a/gcc/m2/mc-boot/GRTint.cc
+++ b/gcc/m2/mc-boot/GRTint.cc
@@ -25,7 +25,6 @@ a copy of the GCC Runtime Library Exception along with this
program;
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GRTint.h b/gcc/m2/mc-boot/GRTint.h
index 703dfb4c04ea..daf64ecaae62 100644
--- a/gcc/m2/mc-boot/GRTint.h
+++ b/gcc/m2/mc-boot/GRTint.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If
not, see
#if !defined (_RTint_H)
# define _RTint_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GSArgs.cc b/gcc/m2/mc-boot/GSArgs.cc
index cd4514ef8ddd..414ea1f004e2 100644
--- a/gcc/m2/mc-boot/GSArgs.cc
+++ b/gcc/m2/mc-boot/GSArgs.cc
@@ -25,7 +25,6 @@ a copy of the GCC Runtime Library Exception along with this
program;
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GSArgs.h b/gcc/m2/mc-boot/GSArgs.h
index 70cab3886989..5164cca0bff8 100644
--- a/gcc/m2/mc-boot/GSArgs.h
+++ b/gcc/m2/mc-boot/GSArgs.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If
not, see
#if !defined (_SArgs_H)
# define _SArgs_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GSFIO.cc b/gcc/m2/mc-boot/GSFIO.cc
index 06fabab34f42..6ae0d5e04855 100644
--- a/gcc/m2/mc-boot/GSFIO.cc
+++ b/gcc/m2/mc-boot/GSFIO.cc
@@ -25,7 +25,6 @@ a copy of the GCC Runtime Library Exception along with this
program;
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GSFIO.h b/gcc/m2/mc-boot/GSFIO.h
index e7fba7ebf7c8..42ffc48782a6 100644
--- a/gcc/m2/mc-boot/GSFIO.h
+++ b/gcc/m2/mc-boot/GSFIO.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If
not, see
#if !defined (_SFIO_H)
# define _SFIO_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GSYSTEM.h b/gcc/m2/mc-boot/GSYSTEM.h
index 125787f008a7..e3d51ab97d58 100644
--- a/gcc/m2/mc-boot/GSYSTEM.h
+++ b/gcc/m2/mc-boot/GSYSTEM.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If
not, see
#if !defined (_SYSTEM_H)
# define _SYSTEM_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GSelective.h b/gcc/m2/mc-boot/GSelective.h
index 31f5932fedbb..af2e9c31feaa 100644
--- a/gcc/m2/mc-boot/GSelective.h
+++ b/gcc/m2/mc-boot/GSelective.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If
not, see
#if !defined (_Selective_H)
# define _Selective_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GStdIO.cc b/gcc/m2/mc-boot/GStdIO.cc
index 85eebf4c8349..e485eeb25752 100644
--- a/gcc/m2/mc-boot/GStdIO.cc
+++ b/gcc/m2/mc-boot/GStdIO.cc
@@ -25,7 +25,6 @@ a copy of the GCC Runtime Library Exception along with this
program;
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GStdIO.h b/gcc/m2/mc-boot/GStdIO.h
index 0418234bbb2f..b01480ac33a9 100644
--- a/gcc/m2/mc-boot/GStdIO.h
+++ b/gcc/m2/mc-boot/GStdIO.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If
not, see
#if !defined (_StdIO_H)
# define _StdIO_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GStorage.cc b/gcc/m2/mc-boot/GStorage.cc
index b19616f4ab55..f668201059f5 100644
--- a/gcc/m2/mc-boot/GStorage.cc
+++ b/gcc/m2/mc-boot/GStorage.cc
@@ -25,7 +25,6 @@ a copy of the GCC Runtime Library Exception along with this
program;
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GStorage.h b/gcc/m2/mc-boot/GStorage.h
index e85fd7aeefa7..f352d19f9644 100644
--- a/gcc/m2/mc-boot/GStorage.h
+++ b/gcc/m2/mc-boot/GStorage.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If
not, see
#if !defined (_Storage_H)
# define _Storage_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GStrCase.cc b/gcc/m2/mc-boot/GStrCase.cc
index f33f5a52ac90..40323ca949f7 100644
--- a/gcc/m2/mc-boot/GStrCase.cc
+++ b/gcc/m2/mc-boot/GStrCase.cc
@@ -25,7 +25,6 @@ a copy of the GCC Runtime Library Exception along with this
program;
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GStrCase.h b/gcc/m2/mc-boot/GStrCase.h
index 66b4f689fd09..3762f57acac0 100644
--- a/gcc/m2/mc-boot/GStrCase.h
+++ b/gcc/m2/mc-boot/GStrCase.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If
not, see
#if !defined (_StrCase_H)
# define _StrCase_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GStrIO.cc b/gcc/m2/mc-boot/GStrIO.cc
index 46c392bb8a26..533460b63f70 100644
--- a/gcc/m2/mc-boot/GStrIO.cc
+++ b/gcc/m2/mc-boot/GStrIO.cc
@@ -25,7 +25,6 @@ a copy of the GCC Runtime Library Exception along with this
program;
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GStrIO.h b/gcc/m2/mc-boot/GStrIO.h
index 66ef3d4331c7..24b31a992d5d 100644
--- a/gcc/m2/mc-boot/GStrIO.h
+++ b/gcc/m2/mc-boot/GStrIO.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If
not, see
#if !defined (_StrIO_H)
# define _StrIO_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GStrLib.cc b/gcc/m2/mc-boot/GStrLib.cc
index bc3c5e8c3881..dbde45c91226 100644
--- a/gcc/m2/mc-boot/GStrLib.cc
+++ b/gcc/m2/mc-boot/GStrLib.cc
@@ -25,7 +25,6 @@ a copy of the GCC Runtime Library Exception along with this
program;
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GStrLib.h b/gcc/m2/mc-boot/GStrLib.h
index 2b11e84ca448..e79eb7098456 100644
--- a/gcc/m2/mc-boot/GStrLib.h
+++ b/gcc/m2/mc-boot/GStrLib.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If
not, see
#if !defined (_StrLib_H)
# define _StrLib_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GStringConvert.cc b/gcc/m2/mc-boot/GStringConvert.cc
index ae50e99c2ab9..e552244fec55 100644
--- a/gcc/m2/mc-boot/GStringConvert.cc
+++ b/gcc/m2/mc-boot/GStringConvert.cc
@@ -25,7 +25,6 @@ a copy of the GCC Runtime Library Exception along with this
program;
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GStringConvert.h b/gcc/m2/mc-boot/GStringConvert.h
index 035ad56a52ad..95f1bc1b5292 100644
--- a/gcc/m2/mc-boot/GStringConvert.h
+++ b/gcc/m2/mc-boot/GStringConvert.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If
not, see
#if !defined (_StringConvert_H)
# define _StringConvert_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GSysExceptions.h b/gcc/m2/mc-boot/GSysExceptions.h
index ef9a6a0f2d9d..928a0c1667de 100644
--- a/gcc/m2/mc-boot/GSysExceptions.h
+++ b/gcc/m2/mc-boot/GSysExceptions.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If
not, see
#if !defined (_SysExceptions_H)
# define _SysExceptions_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GSysStorage.cc b/gcc/m2/mc-boot/GSysStorage.cc
index 906910bf3d8b..1c0cb839ef41 100644
--- a/gcc/m2/mc-boot/GSysStorage.cc
+++ b/gcc/m2/mc-boot/GSysStorage.cc
@@ -25,7 +25,6 @@ a copy of the GCC Runtime Library Exception along with this
program;
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GSysStorage.h b/gcc/m2/mc-boot/GSysStorage.h
index 930b3bae6cc2..3c1f310ff0eb 100644
--- a/gcc/m2/mc-boot/GSysStorage.h
+++ b/gcc/m2/mc-boot/GSysStorage.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If
not, see
#if !defined (_SysStorage_H)
# define _SysStorage_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GTimeString.cc b/gcc/m2/mc-boot/GTimeString.cc
index fc9b8ada831b..b1d6e6e1e508 100644
--- a/gcc/m2/mc-boot/GTimeString.cc
+++ b/gcc/m2/mc-boot/GTimeString.cc
@@ -25,7 +25,6 @@ a copy of the GCC Runtime Library Exception along with this
program;
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GTimeString.h b/gcc/m2/mc-boot/GTimeString.h
index 6323436d70c2..c442abb2c22f 100644
--- a/gcc/m2/mc-boot/GTimeString.h
+++ b/gcc/m2/mc-boot/GTimeString.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If
not, see
#if !defined (_TimeString_H)
# define _TimeString_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GUnixArgs.h b/gcc/m2/mc-boot/GUnixArgs.h
index 79a1ea948d3a..59ba2ac123ec 100644
--- a/gcc/m2/mc-boot/GUnixArgs.h
+++ b/gcc/m2/mc-boot/GUnixArgs.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If
not, see
#if !defined (_UnixArgs_H)
# define _UnixArgs_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/Galists.cc b/gcc/m2/mc-boot/Galists.cc
index 09bfdccc49f8..7c42dd45625f 100644
--- a/gcc/m2/mc-boot/Galists.cc
+++ b/gcc/m2/mc-boot/Galists.cc
@@ -20,7 +20,6 @@ You should have received a copy of the GNU General Public
License
along with GNU Modula-2; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/Galists.h b/gcc/m2/mc-boot/Galists.h
index fdacd985785b..bda3ac6bf1f5 100644
--- a/gcc/m2/mc-boot/Galists.h
+++ b/gcc/m2/mc-boot/Galists.h
@@ -24,7 +24,6 @@ along with GNU Modula-2; see the file COPYING3. If not see
#if !defined (_alists_H)
# define _alists_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/Gdecl.cc b/gcc/m2/mc-boot/Gdecl.cc
index 292c654fa66b..ae0348398501 100644
--- a/gcc/m2/mc-boot/Gdecl.cc
+++ b/gcc/m2/mc-boot/Gdecl.cc
@@ -20,7 +20,6 @@ You should have received a copy of the GNU General Public
License
along with GNU Modula-2; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
@@ -22790,7 +22789,7 @@ static decl_node__opaque doDupExpr (decl_node__opaque n)
break;
case decl_length:
- M2RTS_HALT (-1); /* length should have been converted into unary. */
+ M2RTS_HALT (-1);
__builtin_unreachable ();
break;
diff --git a/gcc/m2/mc-boot/Gdecl.h b/gcc/m2/mc-boot/Gdecl.h
index 30e02f0a1e84..a979c52f0959 100644
--- a/gcc/m2/mc-boot/Gdecl.h
+++ b/gcc/m2/mc-boot/Gdecl.h
@@ -24,7 +24,6 @@ along with GNU Modula-2; see the file COPYING3. If not see
#if !defined (_decl_H)
# define _decl_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/Gdtoa.h b/gcc/m2/mc-boot/Gdtoa.h
index e58489e01e6d..d371aeb78511 100644
--- a/gcc/m2/mc-boot/Gdtoa.h
+++ b/gcc/m2/mc-boot/Gdtoa.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If
not, see
#if !defined (_dtoa_H)
# define _dtoa_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/Gerrno.h b/gcc/m2/mc-boot/Gerrno.h
index 1f8c83a252da..256317afc884 100644
--- a/gcc/m2/mc-boot/Gerrno.h
+++ b/gcc/m2/mc-boot/Gerrno.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If
not, see
#if !defined (_errno_H)
# define _errno_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/Gkeyc.cc b/gcc/m2/mc-boot/Gkeyc.cc
index 9a35e953d18c..132c2fc7283c 100644
--- a/gcc/m2/mc-boot/Gkeyc.cc
+++ b/gcc/m2/mc-boot/Gkeyc.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public
License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
@@ -576,7 +575,6 @@ static void checkGccConfigSystem (mcPretty_pretty p)
if (! initializedGCC)
{
initializedGCC = true;
- mcPretty_print (p, (const char *) "#define INCLUDE_MEMORY\\n", 24);
mcPretty_print (p, (const char *) "#include \"config.h\"\\n", 21);
mcPretty_print (p, (const char *) "#include \"system.h\"\\n", 21);
checkGccTypes (p);
diff --git a/gcc/m2/mc-boot/Gkeyc.h b/gcc/m2/mc-boot/Gkeyc.h
index 8537fbcc86b7..9a15c93d10f0 100644
--- a/gcc/m2/mc-boot/Gkeyc.h
+++ b/gcc/m2/mc-boot/Gkeyc.h
@@ -24,7 +24,6 @@ along with GNU Modula-2; see the file COPYING3. If not see
#if !defined (_keyc_H)
# define _keyc_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/Gldtoa.h b/gcc/m2/mc-boot/Gldtoa.h
index f24ab408bb0c..6ae682ee13c5 100644
--- a/gcc/m2/mc-boot/Gldtoa.h
+++ b/gcc/m2/mc-boot/Gldtoa.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If
not, see
#if !defined (_ldtoa_H)
# define _ldtoa_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/Glibc.h b/gcc/m2/mc-boot/Glibc.h
index af06eda8276c..1519c99db850 100644
--- a/gcc/m2/mc-boot/Glibc.h
+++ b/gcc/m2/mc-boot/Glibc.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If
not, see
#if !defined (_libc_H)
# define _libc_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/Glibm.h b/gcc/m2/mc-boot/Glibm.h
index 2c5a177735f4..344ac623f0ed 100644
--- a/gcc/m2/mc-boot/Glibm.h
+++ b/gcc/m2/mc-boot/Glibm.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If
not, see
#if !defined (_libm_H)
# define _libm_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/Glists.cc b/gcc/m2/mc-boot/Glists.cc
index 2e459ca910df..f29edec1a140 100644
--- a/gcc/m2/mc-boot/Glists.cc
+++ b/gcc/m2/mc-boot/Glists.cc
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public
License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/Glists.h b/gcc/m2/mc-boot/Glists.h
index e89a42a4006f..84537a1ffc57 100644
--- a/gcc/m2/mc-boot/Glists.h
+++ b/gcc/m2/mc-boot/Glists.h
@@ -24,7 +24,6 @@ along with GNU Modula-2; see the file COPYING3. If not see
#if !defined (_lists_H)
# define _lists_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GmcComment.cc b/gcc/m2/mc-boot/GmcComment.cc
index 320c51262890..d5f741e047b7 100644
--- a/gcc/m2/mc-boot/GmcComment.cc
+++ b/gcc/m2/mc-boot/GmcComment.cc
@@ -20,7 +20,6 @@ You should have received a copy of the GNU General Public
License
along with GNU Modula-2; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GmcComment.h b/gcc/m2/mc-boot/GmcComment.h
index bbb7d2fbb726..10dd5c2781c9 100644
--- a/gcc/m2/mc-boot/GmcComment.h
+++ b/gcc/m2/mc-boot/GmcComment.h
@@ -24,7 +24,6 @@ along with GNU Modula-2; see the file COPYING3. If not see
#if !defined (_mcComment_H)
# define _mcComment_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GmcComp.cc b/gcc/m2/mc-boot/GmcComp.cc
index 72c277d203ab..e36fa638c9e7 100644
--- a/gcc/m2/mc-boot/GmcComp.cc
+++ b/gcc/m2/mc-boot/GmcComp.cc
@@ -16,7 +16,6 @@ You should have received a copy of the GNU General Public
License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GmcComp.h b/gcc/m2/mc-boot/GmcComp.h
index a4e302f6af93..17e2080d780d 100644
--- a/gcc/m2/mc-boot/GmcComp.h
+++ b/gcc/m2/mc-boot/GmcComp.h
@@ -24,7 +24,6 @@ along with GNU Modula-2; see the file COPYING3. If not see
#if !defined (_mcComp_H)
# define _mcComp_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GmcDebug.cc b/gcc/m2/mc-boot/GmcDebug.cc
index 7ded4aee139f..0085384f2c98 100644
--- a/gcc/m2/mc-boot/GmcDebug.cc
+++ b/gcc/m2/mc-boot/GmcDebug.cc
@@ -15,7 +15,6 @@ You should have received a copy of the GNU General Public
License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GmcDebug.h b/gcc/m2/mc-boot/GmcDebug.h
index e4ac762d6486..a46fa13eeb0a 100644
--- a/gcc/m2/mc-boot/GmcDebug.h
+++ b/gcc/m2/mc-boot/GmcDebug.h
@@ -24,7 +24,6 @@ along with GNU Modula-2; see the file COPYING3. If not see
#if !defined (_mcDebug_H)
# define _mcDebug_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GmcError.cc b/gcc/m2/mc-boot/GmcError.cc
index 4e2921184559..a3df34e77996 100644
--- a/gcc/m2/mc-boot/GmcError.cc
+++ b/gcc/m2/mc-boot/GmcError.cc
@@ -20,7 +20,6 @@ You should have received a copy of the GNU General Public
License
along with GNU Modula-2; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GmcError.h b/gcc/m2/mc-boot/GmcError.h
index 951f6ae3bbe6..054a4780a728 100644
--- a/gcc/m2/mc-boot/GmcError.h
+++ b/gcc/m2/mc-boot/GmcError.h
@@ -24,7 +24,6 @@ along with GNU Modula-2; see the file COPYING3. If not see
#if !defined (_mcError_H)
# define _mcError_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GmcFileName.cc b/gcc/m2/mc-boot/GmcFileName.cc
index f0f69129e06c..3b516594c595 100644
--- a/gcc/m2/mc-boot/GmcFileName.cc
+++ b/gcc/m2/mc-boot/GmcFileName.cc
@@ -15,7 +15,6 @@ You should have received a copy of the GNU General Public
License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GmcFileName.h b/gcc/m2/mc-boot/GmcFileName.h
index 04e08ec8e9a2..11f1512dbe81 100644
--- a/gcc/m2/mc-boot/GmcFileName.h
+++ b/gcc/m2/mc-boot/GmcFileName.h
@@ -24,7 +24,6 @@ along with GNU Modula-2; see the file COPYING3. If not see
#if !defined (_mcFileName_H)
# define _mcFileName_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GmcLexBuf.cc b/gcc/m2/mc-boot/GmcLexBuf.cc
index dd6b87e5a211..4f2293165aea 100644
--- a/gcc/m2/mc-boot/GmcLexBuf.cc
+++ b/gcc/m2/mc-boot/GmcLexBuf.cc
@@ -20,7 +20,6 @@ You should have received a copy of the GNU General Public
License
along with GNU Modula-2; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GmcLexBuf.h b/gcc/m2/mc-boot/GmcLexBuf.h
index bb552aee3fa6..ca22526c0a43 100644
--- a/gcc/m2/mc-boot/GmcLexBuf.h
+++ b/gcc/m2/mc-boot/GmcLexBuf.h
@@ -24,7 +24,6 @@ along with GNU Modula-2; see the file COPYING3. If not see
#if !defined (_mcLexBuf_H)
# define _mcLexBuf_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GmcMetaError.cc b/gcc/m2/mc-boot/GmcMetaError.cc
index 9298d0e41927..af64604534e2 100644
--- a/gcc/m2/mc-boot/GmcMetaError.cc
+++ b/gcc/m2/mc-boot/GmcMetaError.cc
@@ -15,7 +15,6 @@ You should have received a copy of the GNU General Public
License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GmcMetaError.h b/gcc/m2/mc-boot/GmcMetaError.h
index ce5e8e1b7952..de244c186fff 100644
--- a/gcc/m2/mc-boot/GmcMetaError.h
+++ b/gcc/m2/mc-boot/GmcMetaError.h
@@ -24,7 +24,6 @@ along with GNU Modula-2; see the file COPYING3. If not see
#if !defined (_mcMetaError_H)
# define _mcMetaError_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GmcOptions.cc b/gcc/m2/mc-boot/GmcOptions.cc
index f6e4417b6593..5a0606047092 100644
--- a/gcc/m2/mc-boot/GmcOptions.cc
+++ b/gcc/m2/mc-boot/GmcOptions.cc
@@ -15,7 +15,6 @@ You should have received a copy of the GNU General Public
License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GmcOptions.h b/gcc/m2/mc-boot/GmcOptions.h
index 2db8bcb998a0..aab560038e22 100644
--- a/gcc/m2/mc-boot/GmcOptions.h
+++ b/gcc/m2/mc-boot/GmcOptions.h
@@ -24,7 +24,6 @@ along with GNU Modula-2; see the file COPYING3. If not see
#if !defined (_mcOptions_H)
# define _mcOptions_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GmcPreprocess.cc b/gcc/m2/mc-boot/GmcPreprocess.cc
index 54d89bf33e75..741109ad7fbf 100644
--- a/gcc/m2/mc-boot/GmcPreprocess.cc
+++ b/gcc/m2/mc-boot/GmcPreprocess.cc
@@ -15,7 +15,6 @@ You should have received a copy of the GNU General Public
License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GmcPreprocess.h b/gcc/m2/mc-boot/GmcPreprocess.h
index 05e8122a332a..21b4fd458a4f 100644
--- a/gcc/m2/mc-boot/GmcPreprocess.h
+++ b/gcc/m2/mc-boot/GmcPreprocess.h
@@ -24,7 +24,6 @@ along with GNU Modula-2; see the file COPYING3. If not see
#if !defined (_mcPreprocess_H)
# define _mcPreprocess_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GmcPretty.cc b/gcc/m2/mc-boot/GmcPretty.cc
index c0be8c1e4991..0bffa1ff6feb 100644
--- a/gcc/m2/mc-boot/GmcPretty.cc
+++ b/gcc/m2/mc-boot/GmcPretty.cc
@@ -15,7 +15,6 @@ You should have received a copy of the GNU General Public
License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GmcPretty.h b/gcc/m2/mc-boot/GmcPretty.h
index 95d7a0b13ae2..d6834e2f9004 100644
--- a/gcc/m2/mc-boot/GmcPretty.h
+++ b/gcc/m2/mc-boot/GmcPretty.h
@@ -24,7 +24,6 @@ along with GNU Modula-2; see the file COPYING3. If not see
#if !defined (_mcPretty_H)
# define _mcPretty_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GmcPrintf.cc b/gcc/m2/mc-boot/GmcPrintf.cc
index dafa728437fd..e91e55acc14c 100644
--- a/gcc/m2/mc-boot/GmcPrintf.cc
+++ b/gcc/m2/mc-boot/GmcPrintf.cc
@@ -15,7 +15,6 @@ You should have received a copy of the GNU General Public
License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GmcPrintf.h b/gcc/m2/mc-boot/GmcPrintf.h
index 6d70a6db6a5e..ca1129a26ef7 100644
--- a/gcc/m2/mc-boot/GmcPrintf.h
+++ b/gcc/m2/mc-boot/GmcPrintf.h
@@ -24,7 +24,6 @@ along with GNU Modula-2; see the file COPYING3. If not see
#if !defined (_mcPrintf_H)
# define _mcPrintf_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GmcQuiet.cc b/gcc/m2/mc-boot/GmcQuiet.cc
index 3309f13d736c..d0f2f009b2a8 100644
--- a/gcc/m2/mc-boot/GmcQuiet.cc
+++ b/gcc/m2/mc-boot/GmcQuiet.cc
@@ -15,7 +15,6 @@ You should have received a copy of the GNU General Public
License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GmcQuiet.h b/gcc/m2/mc-boot/GmcQuiet.h
index 6eebb3b69cdb..b84144c9f30b 100644
--- a/gcc/m2/mc-boot/GmcQuiet.h
+++ b/gcc/m2/mc-boot/GmcQuiet.h
@@ -24,7 +24,6 @@ along with GNU Modula-2; see the file COPYING3. If not see
#if !defined (_mcQuiet_H)
# define _mcQuiet_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GmcReserved.cc b/gcc/m2/mc-boot/GmcReserved.cc
index 02132e48b4b8..a42f1b1b0acb 100644
--- a/gcc/m2/mc-boot/GmcReserved.cc
+++ b/gcc/m2/mc-boot/GmcReserved.cc
@@ -15,7 +15,6 @@ You should have received a copy of the GNU General Public
License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GmcReserved.h b/gcc/m2/mc-boot/GmcReserved.h
index 18e15f6247ee..8c5adca465a8 100644
--- a/gcc/m2/mc-boot/GmcReserved.h
+++ b/gcc/m2/mc-boot/GmcReserved.h
@@ -24,7 +24,6 @@ along with GNU Modula-2; see the file COPYING3. If not see
#if !defined (_mcReserved_H)
# define _mcReserved_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GmcSearch.cc b/gcc/m2/mc-boot/GmcSearch.cc
index 14d3e3fe0abd..e1a2aa63e29d 100644
--- a/gcc/m2/mc-boot/GmcSearch.cc
+++ b/gcc/m2/mc-boot/GmcSearch.cc
@@ -15,7 +15,6 @@ You should have received a copy of the GNU General Public
License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GmcSearch.h b/gcc/m2/mc-boot/GmcSearch.h
index 4ea92e0c0fa7..277f55858496 100644
--- a/gcc/m2/mc-boot/GmcSearch.h
+++ b/gcc/m2/mc-boot/GmcSearch.h
@@ -24,7 +24,6 @@ along with GNU Modula-2; see the file COPYING3. If not see
#if !defined (_mcSearch_H)
# define _mcSearch_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GmcStack.cc b/gcc/m2/mc-boot/GmcStack.cc
index 8edae475e6de..70f937b42991 100644
--- a/gcc/m2/mc-boot/GmcStack.cc
+++ b/gcc/m2/mc-boot/GmcStack.cc
@@ -15,7 +15,6 @@ You should have received a copy of the GNU General Public
License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GmcStack.h b/gcc/m2/mc-boot/GmcStack.h
index ee1fad402fc7..fe790ced8933 100644
--- a/gcc/m2/mc-boot/GmcStack.h
+++ b/gcc/m2/mc-boot/GmcStack.h
@@ -24,7 +24,6 @@ along with GNU Modula-2; see the file COPYING3. If not see
#if !defined (_mcStack_H)
# define _mcStack_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GmcStream.cc b/gcc/m2/mc-boot/GmcStream.cc
index a35ee25294f1..f970dd61c2e5 100644
--- a/gcc/m2/mc-boot/GmcStream.cc
+++ b/gcc/m2/mc-boot/GmcStream.cc
@@ -20,7 +20,6 @@ You should have received a copy of the GNU General Public
License
along with GNU Modula-2; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GmcStream.h b/gcc/m2/mc-boot/GmcStream.h
index 0584dd743c3a..6fef979e5fb7 100644
--- a/gcc/m2/mc-boot/GmcStream.h
+++ b/gcc/m2/mc-boot/GmcStream.h
@@ -24,7 +24,6 @@ along with GNU Modula-2; see the file COPYING3. If not see
#if !defined (_mcStream_H)
# define _mcStream_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/Gmcflex.h b/gcc/m2/mc-boot/Gmcflex.h
index 739c99267e93..b6a3d0a03d7a 100644
--- a/gcc/m2/mc-boot/Gmcflex.h
+++ b/gcc/m2/mc-boot/Gmcflex.h
@@ -24,7 +24,6 @@ along with GNU Modula-2; see the file COPYING3. If not see
#if !defined (_mcflex_H)
# define _mcflex_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/Gmcp1.cc b/gcc/m2/mc-boot/Gmcp1.cc
index cb0d1ad1698d..389c1381bf35 100644
--- a/gcc/m2/mc-boot/Gmcp1.cc
+++ b/gcc/m2/mc-boot/Gmcp1.cc
@@ -20,7 +20,6 @@ You should have received a copy of the GNU General Public
License
along with GNU Modula-2; see the file COPYING. If not,
see <https://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/Gmcp1.h b/gcc/m2/mc-boot/Gmcp1.h
index 428f312a6d62..2bc44047820e 100644
--- a/gcc/m2/mc-boot/Gmcp1.h
+++ b/gcc/m2/mc-boot/Gmcp1.h
@@ -24,7 +24,6 @@ along with GNU Modula-2; see the file COPYING3. If not see
#if !defined (_mcp1_H)
# define _mcp1_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/Gmcp2.cc b/gcc/m2/mc-boot/Gmcp2.cc
index bfd3e0c5b62b..88ff478ce70d 100644
--- a/gcc/m2/mc-boot/Gmcp2.cc
+++ b/gcc/m2/mc-boot/Gmcp2.cc
@@ -20,7 +20,6 @@ You should have received a copy of the GNU General Public
License
along with GNU Modula-2; see the file COPYING. If not,
see <https://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/Gmcp2.h b/gcc/m2/mc-boot/Gmcp2.h
index 8fc92ea91122..080c4fae9625 100644
--- a/gcc/m2/mc-boot/Gmcp2.h
+++ b/gcc/m2/mc-boot/Gmcp2.h
@@ -24,7 +24,6 @@ along with GNU Modula-2; see the file COPYING3. If not see
#if !defined (_mcp2_H)
# define _mcp2_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/Gmcp3.cc b/gcc/m2/mc-boot/Gmcp3.cc
index f345cf666fb2..aa8b7338d13a 100644
--- a/gcc/m2/mc-boot/Gmcp3.cc
+++ b/gcc/m2/mc-boot/Gmcp3.cc
@@ -20,7 +20,6 @@ You should have received a copy of the GNU General Public
License
along with GNU Modula-2; see the file COPYING. If not,
see <https://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/Gmcp3.h b/gcc/m2/mc-boot/Gmcp3.h
index d58349f1998d..231e6f0cc7a0 100644
--- a/gcc/m2/mc-boot/Gmcp3.h
+++ b/gcc/m2/mc-boot/Gmcp3.h
@@ -24,7 +24,6 @@ along with GNU Modula-2; see the file COPYING3. If not see
#if !defined (_mcp3_H)
# define _mcp3_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/Gmcp4.cc b/gcc/m2/mc-boot/Gmcp4.cc
index 872b7b102c58..5cf2ec15de3a 100644
--- a/gcc/m2/mc-boot/Gmcp4.cc
+++ b/gcc/m2/mc-boot/Gmcp4.cc
@@ -20,7 +20,6 @@ You should have received a copy of the GNU General Public
License
along with GNU Modula-2; see the file COPYING. If not,
see <https://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/Gmcp4.h b/gcc/m2/mc-boot/Gmcp4.h
index c374b34bf777..826cba6809e5 100644
--- a/gcc/m2/mc-boot/Gmcp4.h
+++ b/gcc/m2/mc-boot/Gmcp4.h
@@ -24,7 +24,6 @@ along with GNU Modula-2; see the file COPYING3. If not see
#if !defined (_mcp4_H)
# define _mcp4_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/Gmcp5.cc b/gcc/m2/mc-boot/Gmcp5.cc
index 0fa727a7fc35..20b006cab71b 100644
--- a/gcc/m2/mc-boot/Gmcp5.cc
+++ b/gcc/m2/mc-boot/Gmcp5.cc
@@ -20,7 +20,6 @@ You should have received a copy of the GNU General Public
License
along with GNU Modula-2; see the file COPYING. If not,
see <https://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/Gmcp5.h b/gcc/m2/mc-boot/Gmcp5.h
index 44cb6ce2b50a..001f08436691 100644
--- a/gcc/m2/mc-boot/Gmcp5.h
+++ b/gcc/m2/mc-boot/Gmcp5.h
@@ -24,7 +24,6 @@ along with GNU Modula-2; see the file COPYING3. If not see
#if !defined (_mcp5_H)
# define _mcp5_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GnameKey.cc b/gcc/m2/mc-boot/GnameKey.cc
index 128ac93c9bcd..ea52ccbc3fe3 100644
--- a/gcc/m2/mc-boot/GnameKey.cc
+++ b/gcc/m2/mc-boot/GnameKey.cc
@@ -20,7 +20,6 @@ You should have received a copy of the GNU General Public
License
along with GNU Modula-2; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GnameKey.h b/gcc/m2/mc-boot/GnameKey.h
index 1ef63030a956..8204133d61f5 100644
--- a/gcc/m2/mc-boot/GnameKey.h
+++ b/gcc/m2/mc-boot/GnameKey.h
@@ -24,7 +24,6 @@ along with GNU Modula-2; see the file COPYING3. If not see
#if !defined (_nameKey_H)
# define _nameKey_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/GsymbolKey.cc b/gcc/m2/mc-boot/GsymbolKey.cc
index c9848d543074..612329751879 100644
--- a/gcc/m2/mc-boot/GsymbolKey.cc
+++ b/gcc/m2/mc-boot/GsymbolKey.cc
@@ -20,7 +20,6 @@ You should have received a copy of the GNU General Public
License
along with GNU Modula-2; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/GsymbolKey.h b/gcc/m2/mc-boot/GsymbolKey.h
index 82c2fe114224..be8d8ed9f764 100644
--- a/gcc/m2/mc-boot/GsymbolKey.h
+++ b/gcc/m2/mc-boot/GsymbolKey.h
@@ -24,7 +24,6 @@ along with GNU Modula-2; see the file COPYING3. If not see
#if !defined (_symbolKey_H)
# define _symbolKey_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/Gtermios.h b/gcc/m2/mc-boot/Gtermios.h
index a95e43fa3373..fc6cf989f7ea 100644
--- a/gcc/m2/mc-boot/Gtermios.h
+++ b/gcc/m2/mc-boot/Gtermios.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If
not, see
#if !defined (_termios_H)
# define _termios_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/Gtop.cc b/gcc/m2/mc-boot/Gtop.cc
index ba492e5acbf5..34c5b27edd2c 100644
--- a/gcc/m2/mc-boot/Gtop.cc
+++ b/gcc/m2/mc-boot/Gtop.cc
@@ -20,7 +20,6 @@ You should have received a copy of the GNU General Public
License
along with GNU Modula-2; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/Gvarargs.cc b/gcc/m2/mc-boot/Gvarargs.cc
index 0f517c4d9d63..c9ba44d3439b 100644
--- a/gcc/m2/mc-boot/Gvarargs.cc
+++ b/gcc/m2/mc-boot/Gvarargs.cc
@@ -20,7 +20,6 @@ You should have received a copy of the GNU General Public
License
along with GNU Modula-2; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/Gvarargs.h b/gcc/m2/mc-boot/Gvarargs.h
index 9ac674ca5d65..b68ca9fad568 100644
--- a/gcc/m2/mc-boot/Gvarargs.h
+++ b/gcc/m2/mc-boot/Gvarargs.h
@@ -24,7 +24,6 @@ along with GNU Modula-2; see the file COPYING3. If not see
#if !defined (_varargs_H)
# define _varargs_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/Gwlists.cc b/gcc/m2/mc-boot/Gwlists.cc
index adf86f80dd83..68482482ae15 100644
--- a/gcc/m2/mc-boot/Gwlists.cc
+++ b/gcc/m2/mc-boot/Gwlists.cc
@@ -20,7 +20,6 @@ You should have received a copy of the GNU General Public
License
along with GNU Modula-2; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
#include <stdbool.h>
diff --git a/gcc/m2/mc-boot/Gwlists.h b/gcc/m2/mc-boot/Gwlists.h
index 424cdfb57ed8..fe07de5e5d96 100644
--- a/gcc/m2/mc-boot/Gwlists.h
+++ b/gcc/m2/mc-boot/Gwlists.h
@@ -24,7 +24,6 @@ along with GNU Modula-2; see the file COPYING3. If not see
#if !defined (_wlists_H)
# define _wlists_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc-boot/Gwrapc.h b/gcc/m2/mc-boot/Gwrapc.h
index d36d74ccd4a9..4d77e274c3c0 100644
--- a/gcc/m2/mc-boot/Gwrapc.h
+++ b/gcc/m2/mc-boot/Gwrapc.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If
not, see
#if !defined (_wrapc_H)
# define _wrapc_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/mc/keyc.mod b/gcc/m2/mc/keyc.mod
index 857dffc6ab0d..907db3daba9c 100644
--- a/gcc/m2/mc/keyc.mod
+++ b/gcc/m2/mc/keyc.mod
@@ -95,7 +95,6 @@ BEGIN
IF NOT initializedGCC
THEN
initializedGCC := TRUE ;
- print (p, '#define INCLUDE_MEMORY\n');
print (p, '#include "config.h"\n');
print (p, '#include "system.h"\n');
checkGccTypes (p)
diff --git a/gcc/m2/pge-boot/GIndexing.h b/gcc/m2/pge-boot/GIndexing.h
index 4227866039a5..bb307ffc860c 100644
--- a/gcc/m2/pge-boot/GIndexing.h
+++ b/gcc/m2/pge-boot/GIndexing.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If
not, see
#if !defined (_Indexing_H)
# define _Indexing_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/pge-boot/GSEnvironment.h b/gcc/m2/pge-boot/GSEnvironment.h
index 8429c3e87d9b..01850abfd0f0 100644
--- a/gcc/m2/pge-boot/GSEnvironment.h
+++ b/gcc/m2/pge-boot/GSEnvironment.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If
not, see
#if !defined (_SEnvironment_H)
# define _SEnvironment_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
diff --git a/gcc/m2/pge-boot/GScan.h b/gcc/m2/pge-boot/GScan.h
index 04b7490476ed..d4b901744f7e 100644
--- a/gcc/m2/pge-boot/GScan.h
+++ b/gcc/m2/pge-boot/GScan.h
@@ -29,7 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If
not, see
#if !defined (_Scan_H)
# define _Scan_H
-#define INCLUDE_MEMORY
#include "config.h"
#include "system.h"
# ifdef __cplusplus
