diff options
| author | Zack Weinberg <zack@rabi.columbia.edu> | 1999-03-25 23:36:47 +0000 |
|---|---|---|
| committer | Jeff Law <law@gcc.gnu.org> | 1999-03-25 16:36:47 -0700 |
| commit | 08dc830e4f7a946edb34a7ab6582425c1c900194 (patch) | |
| tree | 82a107672c18cff842e14926be68dcfac406ad19 /gcc/java | |
| parent | 96e57dac2fe7817096da16ef21b8b86756484705 (diff) | |
| download | gcc-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/java')
| -rw-r--r-- | gcc/java/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/java/Make-lang.in | 19 |
2 files changed, 7 insertions, 17 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 917b403..d24206b 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,8 @@ +1999-03-25 Zack Weinberg <zack@rabi.columbia.edu> + + * java/Make-lang.in: Remove all references to gcj.o/gcj.c. + Link gcj from gcc.o. + Tue Mar 23 10:48:24 1999 Alexandre Petit-Bianco <apbianco@cygnus.com> * parse.y (find_applicable_accessible_methods_list): When dealing diff --git a/gcc/java/Make-lang.in b/gcc/java/Make-lang.in index 8e06958..787319e 100644 --- a/gcc/java/Make-lang.in +++ b/gcc/java/Make-lang.in @@ -79,30 +79,15 @@ JAVA_SRCS = $(srcdir)/java/parse.y $(srcdir)/java/class.c \ jc1$(exeext): $(P) $(JAVA_SRCS) $(LIBDEPS) stamp-objlist cd java; $(MAKE) $(FLAGS_TO_PASS) $(JAVA_FLAGS_TO_PASS) ../jc1$(exeext) -$(GCJ).c: $(srcdir)/gcc.c - -rm -f $@ - $(LN_S) $(srcdir)/gcc.c $@ - jvspec.o: $(srcdir)/java/jvspec.c $(CC) -c -DWITH_THREAD_$(GCC_THREAD_FILE) -DWITH_GC_$(JAVAGC) \ $(ALL_CFLAGS) $(ALL_CPPFLAGS) \ $(INCLUDES) $(srcdir)/java/jvspec.c -# 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 $(GCJ).c last, to make it obvious where it came from. -$(GCJ).o: $(CONFIG_H) multilib.h config.status $(lang_specs_files) $(GCJ).c \ - system.h prefix.h - $(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \ - $(DRIVER_DEFINES) \ - -DLANG_SPECIFIC_DRIVER \ - -c $(GCJ).c - # Create the compiler driver for $(GCJ). -$(GCJ)$(exeext): $(GCJ).o jvspec.o version.o \ +$(GCJ)$(exeext): gcc.o jvspec.o version.o \ prefix.o intl.o $(LIBDEPS) $(EXTRA_GCC_OBJS) - $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(GCJ).o jvspec.o prefix.o intl.o \ + $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ gcc.o jvspec.o prefix.o intl.o \ version.o $(EXTRA_GCC_OBJS) $(LIBS) # Create a version of the $(GCJ) driver which calls the cross-compiler. |