diff options
| author | Gaius Mulley <gaiusmod2@gmail.com> | 2023-07-19 21:01:53 +0100 |
|---|---|---|
| committer | Gaius Mulley <gaiusmod2@gmail.com> | 2023-07-19 21:01:53 +0100 |
| commit | 01f6e8b013237041adeac370f8d229aea6304591 (patch) | |
| tree | c2542690f17647fa6d5d3b7057b055ee996d8661 | |
| parent | 2971ff7b1d564ac04b537d907c70e6093af70832 (diff) | |
| download | gcc-01f6e8b013237041adeac370f8d229aea6304591.zip gcc-01f6e8b013237041adeac370f8d229aea6304591.tar.gz gcc-01f6e8b013237041adeac370f8d229aea6304591.tar.bz2 | |
PR modula2/110284 Make-lang-in m2flex.o and m2pp.o
This patch moves the rule c-family/m2pp.o from Make-lang.in into
Make-maintainer.in. It also adds m2/gm2-gcc/rtegraph.o and
m2/gm2-compiler-boot/m2flex.o to m2_OBJS. The object
m2/gm2-compiler-boot/m2flex.o is needed by cc1gm2 whereas
m2/gm2-compiler/m2flex.o is required by m2/stage2/cc1gm2
(which is only built in maintainer to allow debugging via m2
sources rather than the translated to C++ sources).
PR modula2/110284
* Make-lang.in (m2_OBJS): Add m2/gm2-gcc/rtegraph.o and
m2/gm2-compiler-boot/m2flex.o.
(c-family/m2pp.o): Remove.
* Make-maintainer.in (c-family/m2pp.o): Add.
Signed-off-by: Gaius Mulley <gaiusmod2@gmail.com>
| -rw-r--r-- | gcc/m2/Make-lang.in | 7 | ||||
| -rw-r--r-- | gcc/m2/Make-maintainer.in | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/gcc/m2/Make-lang.in b/gcc/m2/Make-lang.in index ab82113..23632c2 100644 --- a/gcc/m2/Make-lang.in +++ b/gcc/m2/Make-lang.in @@ -516,7 +516,8 @@ GM2_LIBS_BOOT = m2/gm2-compiler-boot/gm2.a \ m2/gm2-libs-boot/libgm2.a \ $(GM2-BOOT-O) -m2_OBJS = $(GM2_C_OBJS) +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 $< $@ @@ -586,10 +587,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 363e6ed..c94d15b 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 |