Commit dae14688 by Doug Evans

Makefile.in (xgcc): Depend on and link in choose-temp.o.

	* Makefile.in (xgcc): Depend on and link in choose-temp.o.
	(collect2): Likewise.
	(choose-temp.o): Add.

From-SVN: r11788
parent ed24b9f2
...@@ -685,8 +685,9 @@ stamp-objlist: Makefile $(OBJS) $(BC_OBJS) ...@@ -685,8 +685,9 @@ stamp-objlist: Makefile $(OBJS) $(BC_OBJS)
# We call this executable `xgcc' rather than `gcc' # We call this executable `xgcc' rather than `gcc'
# to avoid confusion if the current directory is in the path # to avoid confusion if the current directory is in the path
# and CC is `gcc'. It is renamed to `gcc' when it is installed. # and CC is `gcc'. It is renamed to `gcc' when it is installed.
xgcc: gcc.o version.o $(LIBDEPS) $(EXTRA_GCC_OBJS) xgcc: gcc.o version.o choose-temp.o $(LIBDEPS) $(EXTRA_GCC_OBJS)
$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ gcc.o version.o $(EXTRA_GCC_OBJS) $(LIBS) $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ gcc.o version.o choose-temp.o \
$(EXTRA_GCC_OBJS) $(LIBS)
# Dump a specs file to make -B./ read these specs over installed ones. # Dump a specs file to make -B./ read these specs over installed ones.
specs: xgcc specs: xgcc
...@@ -1109,11 +1110,12 @@ ld: collect2 ...@@ -1109,11 +1110,12 @@ ld: collect2
ln collect2$(exeext) ld$(exeext) > /dev/null 2>&1 \ ln collect2$(exeext) ld$(exeext) > /dev/null 2>&1 \
|| cp collect2$(exeext) ld$(exeext) || cp collect2$(exeext) ld$(exeext)
collect2 : collect2.o cplus-dem.o underscore.o version.o $(LIBDEPS) collect2 : collect2.o cplus-dem.o underscore.o version.o \
choose-temp.o $(LIBDEPS)
# Don't try modifying collect2 (aka ld) in place--it might be linking this. # Don't try modifying collect2 (aka ld) in place--it might be linking this.
-rm -f collect2$(exeext) -rm -f collect2$(exeext)
$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ collect2.o \ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ collect2.o \
cplus-dem.o underscore.o version.o $(LIBS) cplus-dem.o underscore.o version.o choose-temp.o $(LIBS)
collect2.o : collect2.c $(CONFIG_H) gstab.h obstack.h demangle.h collect2.o : collect2.c $(CONFIG_H) gstab.h obstack.h demangle.h
$(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \ $(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
...@@ -1174,6 +1176,7 @@ dumpvers: dumpvers.c ...@@ -1174,6 +1176,7 @@ dumpvers: dumpvers.c
version.o: version.c version.o: version.c
obstack.o: obstack.c obstack.o: obstack.c
choose-temp.o: choose-temp.c
convert.o: convert.c $(CONFIG_H) $(TREE_H) flags.h convert.h convert.o: convert.c $(CONFIG_H) $(TREE_H) flags.h convert.h
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment