aboutsummaryrefslogtreecommitdiff
path: root/gcc/f
diff options
context:
space:
mode:
authorZack Weinberg <zack@rabi.columbia.edu>1999-03-25 23:36:47 +0000
committerJeff Law <law@gcc.gnu.org>1999-03-25 16:36:47 -0700
commit08dc830e4f7a946edb34a7ab6582425c1c900194 (patch)
tree82a107672c18cff842e14926be68dcfac406ad19 /gcc/f
parent96e57dac2fe7817096da16ef21b8b86756484705 (diff)
downloadgcc-08dc830e4f7a946edb34a7ab6582425c1c900194.zip
gcc-08dc830e4f7a946edb34a7ab6582425c1c900194.tar.gz
gcc-08dc830e4f7a946edb34a7ab6582425c1c900194.tar.bz2
gcc.c: Compile unconditionally all code formerly dependent on #ifdef LANG_SPECIFIC_DRIVER.
* gcc.c: Compile unconditionally all code formerly dependent on #ifdef LANG_SPECIFIC_DRIVER. * gccspec.c: New file with stub lang_specific_driver, lang_specific_pre_link. * Makefile.in: Link gccspec.o into xgcc. Add rule to compile gccspec.c. * cp/Make-lang.in: Remove all references to g++.o/g++.c. Link g++ from gcc.o. * f/Make-lang.in: Remove all references to g77.o/g77.c. Link g77 from gcc.o. * java/Make-lang.in: Remove all references to gcj.o/gcj.c. Link gcj from gcc.o. From-SVN: r25989
Diffstat (limited to 'gcc/f')
-rw-r--r--gcc/f/ChangeLog5
-rw-r--r--gcc/f/Make-lang.in32
2 files changed, 9 insertions, 28 deletions
diff --git a/gcc/f/ChangeLog b/gcc/f/ChangeLog
index 4332c8b..0137b91 100644
--- a/gcc/f/ChangeLog
+++ b/gcc/f/ChangeLog
@@ -1,3 +1,8 @@
+1999-03-25 Zack Weinberg <zack@rabi.columbia.edu>
+
+ * Make-lang.in: Remove all references to g77.o/g77.c.
+ Link g77 from gcc.o.
+
1999-03-21 Manfred Hollstein <manfred@s-direktnet.de>
* Makefile.in (g77$(exeext)): Depend on intl.o. Link in intl.o.
diff --git a/gcc/f/Make-lang.in b/gcc/f/Make-lang.in
index 75b6a45..c1a2814 100644
--- a/gcc/f/Make-lang.in
+++ b/gcc/f/Make-lang.in
@@ -59,16 +59,6 @@ F77 f77: f771$(exeext)
f77.extraclean f77.maintainer-clean f77.distdir f77.rebuilt \
f77.stage1 f77.stage2 f77.stage3 f77.stage4
-g77.c: $(srcdir)/gcc.c
- case "$(LANGUAGES)" in \
- *[fF]77*) touch lang-f77;; \
- *) rm -f lang-f77;; \
- esac
- if [ -f lang-f77 ]; then \
- rm -f g77.c; \
- $(LN_S) $(srcdir)/gcc.c g77.c; \
- else true; fi
-
g77spec.o: $(srcdir)/f/g77spec.c $(srcdir)/f/version.h
case "$(LANGUAGES)" in \
*[fF]77*) touch lang-f77;; \
@@ -88,25 +78,11 @@ g77version.o: $(srcdir)/f/version.c
$(srcdir)/f/version.c; \
else true; fi
-# N.B.: This is a copy of the gcc.o rule, with -DLANG_SPECIFIC_DRIVER added.
-# It'd be nice if we could find an easier way to do this---rather than have
-# to track changes to the toplevel gcc Makefile as well.
-# We depend on g77.c last, to make it obvious where it came from.
-g77.o: $(CONFIG_H) multilib.h config.status $(lang_specs_files) g77.c prefix.h
- case "$(LANGUAGES)" in \
- *[fF]77*) touch lang-f77;; \
- *) rm -f lang-f77;; \
- esac
- if [ -f lang-f77 ]; then \
- $(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) $(DRIVER_DEFINES) \
- -DLANG_SPECIFIC_DRIVER -c g77.c; \
- else true; fi
-
# Create the compiler driver for g77.
-g77$(exeext): g77.o g77spec.o g77version.o version.o prefix.o intl.o \
+g77$(exeext): gcc.o g77spec.o g77version.o version.o prefix.o intl.o \
$(LIBDEPS) $(EXTRA_GCC_OBJS)
if [ -f lang-f77 ]; then \
- $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ g77.o g77spec.o g77version.o \
+ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ gcc.o g77spec.o g77version.o \
version.o prefix.o intl.o $(EXTRA_GCC_OBJS) $(LIBS); \
else true; fi
@@ -428,7 +404,7 @@ f77.mostlyclean:
-rm -f g77.aux g77.cps g77.ky g77.toc g77.vr g77.fn g77.kys \
g77.pg g77.tp g77.vrs g77.cp g77.fns g77.log g77.pgs g77.tps
f77.clean:
- -rm -f g77.c g77.o g77spec.o g77version.o
+ -rm -f g77spec.o g77version.o
f77.distclean:
-rm -f lang-f77 f/Makefile
f77.extraclean:
@@ -439,7 +415,7 @@ f77.maintainer-clean:
# The main makefile has already created stage?/f.
G77STAGESTUFF = f/*$(objext) f/fini f/stamp-str f/str-*.h f/str-*.j \
- lang-f77 g77.c g77.o g77spec.o g77version.o
+ lang-f77 g77spec.o g77version.o
f77.stage1: stage1-start
-if [ -f lang-f77 ]; then \