diff options
author | Tom Tromey <tromey@redhat.com> | 2008-03-27 19:20:18 +0000 |
---|---|---|
committer | Tom Tromey <tromey@gcc.gnu.org> | 2008-03-27 19:20:18 +0000 |
commit | e980df8e7fd4d13a811de800c7565ac6f43994a4 (patch) | |
tree | dca8bf9f49634b67bd002709d7bfef4b2af1a54e /gcc/java | |
parent | 2bc894d9cff5cee4ae01ed30bae16f179329bc61 (diff) | |
download | gcc-e980df8e7fd4d13a811de800c7565ac6f43994a4.zip gcc-e980df8e7fd4d13a811de800c7565ac6f43994a4.tar.gz gcc-e980df8e7fd4d13a811de800c7565ac6f43994a4.tar.bz2 |
sourcebuild.texi, [...]: Revert automatic dependency patch.
gcc/
* doc/sourcebuild.texi, doc/install.texi, configure, aclocal.m4,
configure.ac, Makefile.in, config/t-darwin, config/m32c/t-m32c,
config/spu/t-spu-elf, config/i386/t-interix,
config/i386/t-cygming, config/i386/x-i386, config/i386/t-cygwin,
config/i386/x-darwin, config/i386/x-mingw32,
config/i386/t-netware, config/i386/x-cygwin, config/i386/t-nwld,
config/sh/t-sh, config/sh/t-symbian, config/x-linux,
config/t-sol2, config/x-hpux, config/x-darwin, config/ia64/t-ia64,
config/x-solaris, config/t-vxworks, config/m68k/t-uclinux,
config/rs6000/x-rs6000, config/rs6000/x-darwin64,
config/rs6000/x-darwin, config/rs6000/t-rs6000,
config/score/t-score-elf, config/arm/t-strongarm-pe,
config/arm/t-pe, config/arm/t-arm, config/arm/t-wince-pe,
config/v850/t-v850, config/v850/t-v850e, config/bfin/t-bfin-linux:
Revert automatic dependency patch.
gcc/java/
* Make-lang.in: Revert automatic dependency patch.
gcc/objc/
* Make-lang.in: Revert automatic dependency patch.
gcc/objcp/
* Make-lang.in: Revert automatic dependency patch.
gcc/cp/
* Make-lang.in: Revert automatic dependency patch.
gcc/fortran/
* Make-lang.in: Revert automatic dependency patch.
From-SVN: r133652
Diffstat (limited to 'gcc/java')
-rw-r--r-- | gcc/java/ChangeLog | 4 | ||||
-rw-r--r-- | gcc/java/Make-lang.in | 107 |
2 files changed, 89 insertions, 22 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index b96dad55..5af91ac 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,7 @@ +2008-03-27 Tom Tromey <tromey@redhat.com> + + * Make-lang.in: Revert automatic dependency patch. + 2008-03-25 Tom Tromey <tromey@redhat.com> * Make-lang.in: Removed most explicit .o targets. diff --git a/gcc/java/Make-lang.in b/gcc/java/Make-lang.in index d114d87..bfb57a3 100644 --- a/gcc/java/Make-lang.in +++ b/gcc/java/Make-lang.in @@ -56,13 +56,16 @@ JAVA_TARGET_INDEPENDENT_BIN_TOOLS = jcf-dump # Tell GNU make to ignore these if they exist. .PHONY: java -java/jvspec.o: \ - ALL_CPPFLAGS := $(ALL_CPPFLAGS) $(DRIVER_DEFINES) +jvspec.o: $(srcdir)/java/jvspec.c $(SYSTEM_H) coretypes.h $(TM_H) \ + $(GCC_H) $(CONFIG_H) + (SHLIB_LINK='$(SHLIB_LINK)'; \ + $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(DRIVER_DEFINES) \ + $(INCLUDES) $(srcdir)/java/jvspec.c $(OUTPUT_OPTION)) # Create the compiler driver for $(GCJ). -$(GCJ)$(exeext): $(GCC_OBJS) java/jvspec.o java/jcf-path.o version.o \ +$(GCJ)$(exeext): $(GCC_OBJS) jvspec.o java/jcf-path.o version.o \ prefix.o intl.o $(LIBDEPS) $(EXTRA_GCC_OBJS) - $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(GCC_OBJS) java/jvspec.o \ + $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(GCC_OBJS) jvspec.o \ java/jcf-path.o prefix.o intl.o \ version.o $(EXTRA_GCC_OBJS) $(LIBS) @@ -74,27 +77,27 @@ $(GCJ)-cross$(exeext): $(GCJ)$(exeext) java.srcextra: # Executables built by this Makefile: -JAVA_OBJS = java/class.o java/decl.o java/expr.o java/constants.o \ - java/lang.o java/typeck.o java/except.o java/verify-glue.o \ - java/verify-impl.o java/zextract.o java/jcf-io.o java/win32-host.o \ - java/jcf-parse.o java/mangle.o java/mangle_name.o java/builtins.o \ - java/resource.o java/jcf-depend.o java/jcf-path.o java/boehm.o \ - java/java-gimplify.o +JAVA_OBJS = java/class.o java/decl.o java/expr.o \ + java/constants.o java/lang.o java/typeck.o java/except.o \ + java/verify-glue.o java/verify-impl.o \ + java/zextract.o java/jcf-io.o java/win32-host.o java/jcf-parse.o java/mangle.o \ + java/mangle_name.o java/builtins.o java/resource.o \ + java/jcf-depend.o \ + java/jcf-path.o java/boehm.o java/java-gimplify.o -JCFDUMP_OBJS = java/jcf-dump.o java/jcf-io.o java/jcf-depend.o \ - java/jcf-path.o java/win32-host.o java/zextract.o errors.o version.o \ - ggc-none.o intl.o +JCFDUMP_OBJS = java/jcf-dump.o java/jcf-io.o java/jcf-depend.o java/jcf-path.o \ + java/win32-host.o java/zextract.o errors.o version.o ggc-none.o intl.o JVGENMAIN_OBJS = java/jvgenmain.o java/mangle_name.o errors.o intl.o -# Used by dependency tracking. Sort makes the list unique. -java_OBJS = $(sort $(JAVA_OBJS) $(JCFDUMP_OBJS) $(JVGENMAIN_OBJS)) java/jvspec.o - # Use strict warnings for this front end. java-warn = $(STRICT_WARN) # String length warnings -java/jvspec.o-warn = -Wno-error +jvspec.o-warn = -Wno-error + +# Bison-1.75 output often yields (harmless) -Wtraditional warnings +java/parse.o-warn = -Wno-error jc1$(exeext): $(JAVA_OBJS) $(BACKEND) $(LIBDEPS) attribs.o rm -f $@ @@ -236,16 +239,76 @@ java.stagefeedback: stageprofile-start -mv java/*$(objext) stagefeedback/java # +# .o:.h dependencies. +JAVA_TREE_H = $(TREE_H) $(HASHTAB_H) java/java-tree.h java/java-tree.def + +java/jcf-dump.o: $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(JAVA_TREE_H) \ + java/jcf-dump.c java/jcf-reader.c java/jcf.h java/javaop.h java/javaop.def \ + version.h $(GGC_H) intl.h java/zipfile.h +java/boehm.o: java/boehm.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \ + $(TREE_H) $(JAVA_TREE_H) java/parse.h toplev.h +java/builtins.o: java/builtins.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \ + $(JAVA_TREE_H) $(GGC_H) $(FLAGS_H) $(OPTABS_H) $(EXPR_H) langhooks.h \ + gt-java-builtins.h +java/class.o: java/class.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \ + $(JAVA_TREE_H) $(RTL_H) java/jcf.h java/parse.h toplev.h output.h $(GGC_H) \ + $(TARGET_H) $(FUNCTION_H) gt-java-class.h $(CGRAPH_H) +java/constants.o: java/constants.c $(CONFIG_H) $(JAVA_TREE_H) java/jcf.h \ + toplev.h $(SYSTEM_H) coretypes.h $(TM_H) $(GGC_H) gt-java-constants.h +java/decl.o: java/decl.c $(CONFIG_H) $(JAVA_TREE_H) $(RTL_H) java/jcf.h \ + toplev.h $(FLAGS_H) $(SYSTEM_H) coretypes.h $(TM_H) $(FUNCTION_H) $(EXPR_H) \ + libfuncs.h except.h java/java-except.h $(GGC_H) $(REAL_H) gt-java-decl.h \ + $(TARGET_H) $(CGRAPH_H) langhooks.h +java/except.o: java/except.c $(CONFIG_H) $(JAVA_TREE_H) java/jcf.h $(REAL_H) \ + $(RTL_H) java/javaop.h java/java-opcodes.h except.h java/java-except.h \ + toplev.h $(SYSTEM_H) coretypes.h $(TM_H) $(FUNCTION_H) +java/expr.o: java/expr.c $(CONFIG_H) $(JAVA_TREE_H) java/jcf.h $(REAL_H) \ + $(RTL_H) $(EXPR_H) java/javaop.h java/java-opcodes.h except.h \ + java/java-except.h java/java-except.h java/parse.h toplev.h \ + $(SYSTEM_H) coretypes.h $(TM_H) $(GGC_H) gt-java-expr.h $(TARGET_H) +java/jcf-depend.o: java/jcf-depend.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \ + $(TM_H) java/jcf.h +java/jcf-parse.o: java/jcf-parse.c $(CONFIG_H) $(JAVA_TREE_H) $(FLAGS_H) \ + input.h java/java-except.h $(SYSTEM_H) coretypes.h $(TM_H) toplev.h \ + java/parse.h $(GGC_H) debug.h $(REAL_H) gt-java-jcf-parse.h $(TM_P_H) \ + java/jcf-reader.c java/zipfile.h java/jcf.h +java/jvgenmain.o: java/jvgenmain.c $(CONFIG_H) $(JAVA_TREE_H) $(SYSTEM_H) \ + coretypes.h $(TM_H) intl.h +java/lang.o: java/lang.c $(CONFIG_H) $(JAVA_TREE_H) java/jcf.h input.h \ + toplev.h $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) $(EXPR_H) $(DIAGNOSTIC_H) \ + langhooks.h $(LANGHOOKS_DEF_H) gt-java-lang.h opts.h options.h +java/mangle.o: java/mangle.c $(CONFIG_H) java/jcf.h $(JAVA_TREE_H) $(SYSTEM_H) \ + coretypes.h $(TM_H) toplev.h $(GGC_H) gt-java-mangle.h $(LANGHOOKS_DEF_H) +java/mangle_name.o: java/mangle_name.c $(CONFIG_H) java/jcf.h $(JAVA_TREE_H) \ + $(SYSTEM_H) coretypes.h $(TM_H) toplev.h $(GGC_H) +java/resource.o: java/resource.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \ + $(JAVA_TREE_H) $(RTL_H) java/jcf.h java/parse.h toplev.h output.h $(GGC_H) \ + $(TARGET_H) $(FUNCTION_H) gt-java-resource.h $(EXPR_H) +java/typeck.o: java/typeck.c $(CONFIG_H) $(JAVA_TREE_H) java/jcf.h \ + toplev.h $(SYSTEM_H) coretypes.h $(TM_H) $(GGC_H) $(REAL_H) +java/win32-host.o: java/win32-host.c $(CONFIG_H) $(SYSTEM_H) coretypes.h java/jcf.h +java/verify-glue.o: java/verify-glue.c $(CONFIG_H) $(SYSTEM_H) $(JAVA_TREE_H) \ + coretypes.h $(TM_H) java/verify.h toplev.h +java/verify-impl.o: java/verify-impl.c $(CONFIG_H) java/verify.h $(SYSTEM_H) \ + coretypes.h java/jcf.h $(JAVA_TREE_H) +java/zextract.o: java/zextract.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \ + java/zipfile.h +java/java-gimplify.o: java/java-gimplify.c $(CONFIG_H) $(SYSTEM_H) \ + coretypes.h $(TM_H) $(JAVA_TREE_H) $(TREE_GIMPLE_H) toplev.h # jcf-io.o needs $(ZLIBINC) added to cflags. -java/jcf-io.o: \ - ALL_CPPFLAGS := $(ALL_CPPFLAGS) $(ZLIBINC) +java/jcf-io.o: java/jcf-io.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \ + $(JAVA_TREE_H) java/zipfile.h + $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) $(ZLIBINC) \ + $(srcdir)/java/jcf-io.c $(OUTPUT_OPTION) # jcf-path.o needs a -D. -java/jcf-path.o: \ - ALL_CPPFLAGS := $(ALL_CPPFLAGS) \ +java/jcf-path.o: java/jcf-path.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \ + java/jcf.h + $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \ -DLIBGCJ_ZIP_FILE='"$(datadir)/java/libgcj-$(version).jar"' \ - -DDEFAULT_TARGET_VERSION=\"$(version)\" + -DDEFAULT_TARGET_VERSION=\"$(version)\" \ + $(srcdir)/java/jcf-path.c $(OUTPUT_OPTION) TEXI_JAVA_FILES = java/gcj.texi $(gcc_docdir)/include/fdl.texi \ $(gcc_docdir)/include/gpl.texi $(gcc_docdir)/include/gcc-common.texi \ |