diff options
author | Tom Tromey <tromey@redhat.com> | 2008-03-25 16:56:50 +0000 |
---|---|---|
committer | Tom Tromey <tromey@gcc.gnu.org> | 2008-03-25 16:56:50 +0000 |
commit | 2fe3178b6953ab8c88c75ca321645eaef1523594 (patch) | |
tree | 1423107e10a4210560bcb7444e00e9428aee3d3e /gcc/java | |
parent | 5ade1ed2c08bf2f327ee24afc57bc263fd90e6e1 (diff) | |
download | gcc-2fe3178b6953ab8c88c75ca321645eaef1523594.zip gcc-2fe3178b6953ab8c88c75ca321645eaef1523594.tar.gz gcc-2fe3178b6953ab8c88c75ca321645eaef1523594.tar.bz2 |
x-solaris (host-solaris.o): Update.
gcc
* config/x-solaris (host-solaris.o): Update.
* config/x-linux (host-linux.o): Update.
* config/x-hpux (host-hpux.o): Update.
* config/x-darwin (host-darwin.o): Update.
* config/v850/t-v850e (v850-c.o): Update.
* config/v850/t-v850 (v850-c.o): Update.
* config/t-vxworks (vxworks.o): Update.
* config/t-sol2 (sol2-c.o, sol2.o): Update.
* config/t-darwin (darwin.o, darwin-c.o, darwin-driver.o):
Update.
* config/spu/t-spu-elf (spu-c.o): Update.
(spu.o): Remove.
* config/sh/t-symbian (sh-c.o): Update.
(symbian.o): Update.
* config/sh/t-sh (sh-c.o): Update.
* config/score/t-score-elf (score7.o, score3.o): Update.
* config/rs6000/x-rs6000 (driver-rs6000.o): Update.
* config/rs6000/x-darwin64 (host-ppc64-darwin.o): Update.
* config/rs6000/x-darwin (host-ppc-darwin.o): Update.
* config/rs6000/t-rs6000 (rs6000-c.o): Update.
(rs6000.o): Remove.
* config/m68k/t-uclinux (generated_files): Add sysroot-suffix.h.
* config/m32c/t-m32c (m32c-pragma.o): Update.
* config/ia64/t-ia64 (ia64-c.o): Update.
* config/i386/x-mingw32 (host-mingw32.o): Update.
* config/i386/x-i386 (driver-i386.o): Update.
* config/i386/x-darwin (host-i386-darwin.o): Update.
* config/i386/x-cygwin (host-cygwin.o): Update.
* config/i386/t-nwld (nwld.o): Update.
* config/i386/t-netware (netware.o): Update.
* config/i386/t-interix (winnt.o): Update.
* config/i386/t-cygwin (cygwin1.o, cygwin2.o): Update.
* config/i386/t-cygming (winnt.o, winnt-cxx.o, winnt-stubs.o,
msformat-c.o): Update.
* config/bfin/t-bfin-linux (generated_files): Add
linux-sysroot-suffix.h.
* config/arm/t-wince-pe (pe.o): Update.
* config/arm/t-strongarm-pe (pe.o): Update.
* config/arm/t-pe (pe.o): Update.
* config/arm/t-arm (arm-c.o): Update.
* doc/install.texi (Prerequisites): Require make 3.80.
* Makefile.in: Remove .o targets.
(CCDEPMODE, DEPDIR, depcomp, BUILD_DEPMODE): New variables.
(OBSTACK_H, FIBHEAP_H, PARTITION_H, MD5_H, BCONFIG_H): Remove.
(simple_generated_h, simple_generated_c): Move earlier.
(generated_files): New variable.
(TARGET_H, MACHMODE_H, HOOKS_H, HOSTHOOKS_DEF_H, LANGHOOKS_DEF_H,
TARGET_DEF_H, RTL_BASE_H, RTL_H, PARAMS_H, BUILTINS_DEF, TREE_H,
BASIC_BLOCK_H, GCOV_IO_H, COVERAGE_H, DEMANGLE_H, RECOG_H,
ALIAS_H, EMIT_RTL_H, FLAGS_H, FUNCTION_H, EXPR_H, OPTABS_H,
REGS_H, RA_H, RESOURCE_H, SCHED_INT_H, INTEGRATE_H, CFGLAYOUT_H,
CFGLOOP_H, IPA_UTILS_H, IPA_REFERENCE_H, IPA_TYPE_ESCAPE_H,
CGRAPH_H, DF_H, RESOURCE_H, DDG_H, GCC_H, GGC_H, TIMEVAR_H,
INSN_ATTR_H, C_COMMON_H, C_PRAGMA_H, C_TREE_H, SYSTEM_H,
PREDICT_H, DECNUM_H, MKDEPS_H, SYMTAB_H, TREE_DUMP_H,
TREE_GIMPLE_H, TREE_FLOW_H, TREE_SSA_LIVE_H, PRETTY_PRINT_H,
DIAGNOSTIC_H, C_PRETTY_PRINT_H, SCEV_H, LAMBDA_H, TREE_DATA_REF_H,
VARRAY_H, TREE_INLINE_H, REAL_H, DBGCNT_H, EBIMAP_H): Remove.
(.c.o): Remove.
(COMPILE.base, COMPILE): New variables.
(%.o): New pattern rule.
(ALL_HOST_OBJS): New variable.
(xgcc$(exeext), cpp$(exeext)): Remove extra version.o.
(dummy-checksum.o, cc1-checksum.o): Remove.
(DRIVER_SHLIB): New variable.
(DRIVER_DEFINES): Use it.
(gencondmd.c): Move out of build/.
(s-conditions): Update.
(BUILDCOMPILE.base, BUILDCOMPILE): New variables.
(ALL_BUILD_OBJS): Likewise.
(build/%.o): Use BUILDCOMPILE.
(build/ggc-none.o, build/ggc-none.o, build/min-insn-modes.o,
build/print-rtl.o, build/read-rtl.o, build/rtl.o, build/vec.o,
build/gencondmd.o, build/genattrtab.o, build/genautomata.o,
build/gencheck.o, build/gencodes.o, build/genconditions.o,
build/genconfig.o, build/genconstants.o, build/genemit.o,
build/genextract.o, build/genflags.o, build/genmddeps.o,
build/genopinit.o, build/genoutput.o, build/genpeep.o,
build/genpreds.o, build/genrecog.o, build/gcov-iov.o,
build/gen-protos.o, build/scan.o, build/fix-header.o,
build/scan-decls.o): Simplify.
(collect2.o, c-opts.o, gcc.o, gccspec.o, gcc-options.o,
cppdefault.o, protoize.o, unprotoize.o, intl.o, version.o,
prefix.o, toplev.o): Reduce to variable setting.
(libbackend.o): Use COMPILE. Remove most dependencies. Move
later.
($(out_object_file), gcc-options.o): New targets.
($(ALL_HOST_OBJS)): New target.
Include dependency files.
* configure: Rebuilt.
* configure.ac: Call ZW_CREATE_DEPDIR,
ZW_PROG_COMPILER_DEPENDENCIES.
* doc/sourcebuild.texi (Front End Directory): Document new
variable.
gcc/java
* Make-lang.in: Removed most explicit .o targets.
(java/jvspec.o): Reduce to variable setting. Moved to java/.
($(GCJ)$(exeext)): Update.
(JAVA_OBJS): New variable.
(JCFDUMP_OBJS): Reformat.
(java_OBJS): New variable.
(java/jvspec.o-warn): Update.
(java/parse.o-warn): Remove.
(JAVA_TREE_H): Remove.
(java/jcf-io.o): Reduce to variable setting.
(ALL_CPPFLAGS): Likewise.
gcc/objc
* Make-lang.in (objc_OBJS): New variable.
(cc1obj-checksum.o, objc/objc-lang.o, objc/objc-act.o): Remove.
gcc/objcp
* Make-lang.in (objcp_OBJS): New variable.
(cc1objplus-checksum.o, objcp/objcp-lang.o, objcp/objcp-decl.o,
objcp/objcp-act.o): Remove.
gcc/cp
* Make-lang.in: Remove .o targets.
(cp/g++spec.o): Moved to cp/. Reduce to variable setting.
(GXX_OBJS): Update.
(c++_OBJS): New variable.
(CXX_TREE_H, CXX_PRETTY_PRINT_H): Remove.
gcc/fortran
* Make-lang.in: Remove .o targets.
(fortran_OBJS): New variable.
(fortran/gfortranspec.o): Move to fortran/. Reduce to variable
setting.
(GFORTRAN_D_OBJS): Update.
(GFORTRAN_TRANS_DEPS): Remove.
From-SVN: r133523
Diffstat (limited to 'gcc/java')
-rw-r--r-- | gcc/java/ChangeLog | 14 | ||||
-rw-r--r-- | gcc/java/Make-lang.in | 107 |
2 files changed, 36 insertions, 85 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 7a35a1e..b96dad55 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,17 @@ +2008-03-25 Tom Tromey <tromey@redhat.com> + + * Make-lang.in: Removed most explicit .o targets. + (java/jvspec.o): Reduce to variable setting. Moved to java/. + ($(GCJ)$(exeext)): Update. + (JAVA_OBJS): New variable. + (JCFDUMP_OBJS): Reformat. + (java_OBJS): New variable. + (java/jvspec.o-warn): Update. + (java/parse.o-warn): Remove. + (JAVA_TREE_H): Remove. + (java/jcf-io.o): Reduce to variable setting. + (ALL_CPPFLAGS): Likewise. + 2008-03-12 Paolo Bonzini <bonzini@gnu.org> * mangle.c (java_mangle_decl): Remove dead check. diff --git a/gcc/java/Make-lang.in b/gcc/java/Make-lang.in index bfb57a3..d114d87 100644 --- a/gcc/java/Make-lang.in +++ b/gcc/java/Make-lang.in @@ -56,16 +56,13 @@ JAVA_TARGET_INDEPENDENT_BIN_TOOLS = jcf-dump # Tell GNU make to ignore these if they exist. .PHONY: java -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)) +java/jvspec.o: \ + ALL_CPPFLAGS := $(ALL_CPPFLAGS) $(DRIVER_DEFINES) # Create the compiler driver for $(GCJ). -$(GCJ)$(exeext): $(GCC_OBJS) jvspec.o java/jcf-path.o version.o \ +$(GCJ)$(exeext): $(GCC_OBJS) java/jvspec.o java/jcf-path.o version.o \ prefix.o intl.o $(LIBDEPS) $(EXTRA_GCC_OBJS) - $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(GCC_OBJS) jvspec.o \ + $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(GCC_OBJS) java/jvspec.o \ java/jcf-path.o prefix.o intl.o \ version.o $(EXTRA_GCC_OBJS) $(LIBS) @@ -77,27 +74,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 -jvspec.o-warn = -Wno-error - -# Bison-1.75 output often yields (harmless) -Wtraditional warnings -java/parse.o-warn = -Wno-error +java/jvspec.o-warn = -Wno-error jc1$(exeext): $(JAVA_OBJS) $(BACKEND) $(LIBDEPS) attribs.o rm -f $@ @@ -239,76 +236,16 @@ 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: 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) +java/jcf-io.o: \ + ALL_CPPFLAGS := $(ALL_CPPFLAGS) $(ZLIBINC) # jcf-path.o needs a -D. -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) \ +java/jcf-path.o: \ + ALL_CPPFLAGS := $(ALL_CPPFLAGS) \ -DLIBGCJ_ZIP_FILE='"$(datadir)/java/libgcj-$(version).jar"' \ - -DDEFAULT_TARGET_VERSION=\"$(version)\" \ - $(srcdir)/java/jcf-path.c $(OUTPUT_OPTION) + -DDEFAULT_TARGET_VERSION=\"$(version)\" TEXI_JAVA_FILES = java/gcj.texi $(gcc_docdir)/include/fdl.texi \ $(gcc_docdir)/include/gpl.texi $(gcc_docdir)/include/gcc-common.texi \ |