public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc(refs/users/segher/heads/gm2)] Build fix from Matthias
@ 2021-06-19 13:47 Segher Boessenkool
0 siblings, 0 replies; only message in thread
From: Segher Boessenkool @ 2021-06-19 13:47 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:7bad0726434765997e05eaa5ec83f47dc5aceae5
commit 7bad0726434765997e05eaa5ec83f47dc5aceae5
Author: Matthias Klose <doko@ubuntu.com>
Date: Fri Jun 18 12:19:32 2021 +0200
Build fix from Matthias
2021-06-18 Matthias Klose <doko@ubuntu.com>
* Make-lang.in (m2.serial): New target.
(cc1gm2): Depend on $(m2.prev).
(stageN/m2/cc1gm2): Call LLINKER, also call LINK_PROGRESS.
Diff:
---
gcc/m2/Make-lang.in | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/gcc/m2/Make-lang.in b/gcc/m2/Make-lang.in
index 80a5d866e26..989bd3f8461 100644
--- a/gcc/m2/Make-lang.in
+++ b/gcc/m2/Make-lang.in
@@ -79,6 +79,7 @@ TEXISRC = $(objdir)/m2/images/gnu.eps \
# Define the names for selecting GNU Modula-2 in LANGUAGES.
m2 modula-2 modula2: gm2$(exeext) xgcc$(exeext) cc1gm2$(exeext) \
$(GCC_TOOLS_FOR_GM2)
+m2.serial = cc1gm2$(exeext)
# Tell GNU make to ignore these if they exist.
.PHONY: m2 modula-2 modula2
@@ -531,7 +532,7 @@ GM2_LIBS_PARANOID = m2/gm2-compiler-paranoid/gm2.a \
gm2.paranoid: stage3/m2/cc1gm2$(exeext) gm2.verifyparanoid
-cc1gm2$(exeext): stage1/m2/cc1gm2$(exeext)
+cc1gm2$(exeext): stage1/m2/cc1gm2$(exeext) $(m2.prev)
cp -p $< $@
gm2lcc$(exeext): stage1/m2/gm2lcc$(exeext)
@@ -552,29 +553,35 @@ gm2m$(exeext): stage1/m2/gm2m$(exeext)
stage3/m2/cc1gm2$(exeext): stage2/m2/cc1gm2$(exeext) m2/gm2-compiler-paranoid/m2flex.o \
$(P) $(GM2_C_OBJS) $(BACKEND) $(LIBDEPS) $(GM2_LIBS_PARANOID) \
m2/gm2-gcc/rtegraph.o plugin/m2rte$(exeext).so
- $(LINKER) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(GM2_C_OBJS) m2/gm2-compiler-paranoid/m2flex.o \
+ @$(call LINK_PROGRESS,$(INDEX.m2),start)
+ +$(LLINKER) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(GM2_C_OBJS) m2/gm2-compiler-paranoid/m2flex.o \
attribs.o \
$(GM2_LIBS_PARANOID) \
$(BACKEND) $(LIBS) m2/gm2-gcc/rtegraph.o \
$(BACKENDLIBS) $(LIBSTDCXX) -lm
+ @$(call LINK_PROGRESS,$(INDEX.m2),end)
stage2/m2/cc1gm2$(exeext): stage1/m2/cc1gm2$(exeext) m2/gm2-compiler/m2flex.o $(P) \
$(GM2_C_OBJS) $(BACKEND) $(LIBDEPS) $(GM2_LIBS) \
m2/gm2-gcc/rtegraph.o plugin/m2rte$(exeext).so
- $(LINKER) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(GM2_C_OBJS) m2/gm2-compiler/m2flex.o \
+ @$(call LINK_PROGRESS,$(INDEX.m2),start)
+ +$(LLINKER) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(GM2_C_OBJS) m2/gm2-compiler/m2flex.o \
attribs.o \
$(GM2_LIBS) \
$(BACKEND) $(LIBS) m2/gm2-gcc/rtegraph.o \
$(BACKENDLIBS) $(LIBSTDCXX) -lm
+ @$(call LINK_PROGRESS,$(INDEX.m2),end)
stage1/m2/cc1gm2$(exeext): gm2$(exeext) m2/gm2-compiler-boot/m2flex.o \
$(P) $(GM2_C_OBJS) $(BACKEND) $(LIBDEPS) \
$(GM2_LIBS_BOOT) $(MC_LIBS) \
- m2/gm2-gcc/rtegraph.o plugin/m2rte$(exeext).so
- $(LINKER) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(GM2_C_OBJS) m2/gm2-compiler-boot/m2flex.o \
+ m2/gm2-gcc/rtegraph.o plugin/m2rte$(exeext).so $(m2.prev)
+ @$(call LINK_PROGRESS,$(INDEX.m2),start)
+ +$(LLINKER) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(GM2_C_OBJS) m2/gm2-compiler-boot/m2flex.o \
attribs.o \
$(GM2_LIBS_BOOT) $(MC_LIBS) m2/gm2-gcc/rtegraph.o \
$(BACKEND) $(LIBS) $(BACKENDLIBS)
+ @$(call LINK_PROGRESS,$(INDEX.m2),end)
# Compiling object files from source files.
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-06-19 13:47 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-19 13:47 [gcc(refs/users/segher/heads/gm2)] Build fix from Matthias Segher Boessenkool
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).