diff options
Diffstat (limited to 'gcc/java')
-rw-r--r-- | gcc/java/ChangeLog | 19 | ||||
-rw-r--r-- | gcc/java/Make-lang.in | 95 | ||||
-rw-r--r-- | gcc/java/boehm.c | 2 | ||||
-rw-r--r-- | gcc/java/buffer.c | 2 | ||||
-rw-r--r-- | gcc/java/builtins.c | 2 | ||||
-rw-r--r-- | gcc/java/check-init.c | 2 | ||||
-rw-r--r-- | gcc/java/class.c | 2 | ||||
-rw-r--r-- | gcc/java/constants.c | 2 | ||||
-rw-r--r-- | gcc/java/decl.c | 2 | ||||
-rw-r--r-- | gcc/java/except.c | 2 | ||||
-rw-r--r-- | gcc/java/expr.c | 2 | ||||
-rw-r--r-- | gcc/java/gjavah.c | 2 | ||||
-rw-r--r-- | gcc/java/jcf-depend.c | 2 | ||||
-rw-r--r-- | gcc/java/jcf-dump.c | 2 | ||||
-rw-r--r-- | gcc/java/jcf-io.c | 2 | ||||
-rw-r--r-- | gcc/java/jcf-parse.c | 2 | ||||
-rw-r--r-- | gcc/java/jcf-path.c | 2 | ||||
-rw-r--r-- | gcc/java/jcf-write.c | 2 | ||||
-rw-r--r-- | gcc/java/jv-scan.c | 2 | ||||
-rw-r--r-- | gcc/java/jvgenmain.c | 2 | ||||
-rw-r--r-- | gcc/java/jvspec.c | 41 | ||||
-rw-r--r-- | gcc/java/lang.c | 2 | ||||
-rw-r--r-- | gcc/java/mangle.c | 2 | ||||
-rw-r--r-- | gcc/java/mangle_name.c | 2 | ||||
-rw-r--r-- | gcc/java/parse-scan.y | 2 | ||||
-rw-r--r-- | gcc/java/parse.y | 10 | ||||
-rw-r--r-- | gcc/java/typeck.c | 2 | ||||
-rw-r--r-- | gcc/java/verify.c | 2 | ||||
-rw-r--r-- | gcc/java/xref.c | 2 | ||||
-rw-r--r-- | gcc/java/zextract.c | 2 |
30 files changed, 149 insertions, 68 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index c6d0de1..334bfda 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -15,6 +15,16 @@ * parse.y (do_resolve_class): Handle qualified name via recursion. +2002-11-30 Zack Weinberg <zack@codesourcery.com> + + * boehm.c, buffer.c, builtins.c, check-init.c, class.c, + constants.c, decl.c, except.c, expr.c, gjavah.c, jcf-depend.c, + jcf-dump.c, jcf-io.c, jcf-parse.c, jcf-path.c, jcf-write.c, + jv-scan.c, jvgenmain.c, jvspec.c, lang.c, mangle.c, mangle_name.c, + parse-scan.y, parse.y, typeck.c, verify.c, xref.c, zextract.c: + Include coretypes.h and tm.h. + * Make-lang.in: Update dependencies. + 2002-11-27 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> * decl.c (java_init_decl_processing): Use `LL' on 64-bit constant. @@ -24,6 +34,11 @@ * jcf-reader.c: Don't expand JCF_readu4 inside the expansion of JCF_SKIP. +2002-11-25 Diego Novillo <dnovillo@redhat.com> + + * jcf-reader.c: Don't expand JCF_readu4 inside the + expansion of JCF_SKIP. + 2002-11-22 Tom Tromey <tromey@redhat.com> * parse.y (patch_binop): Cast right hand side of shift expression @@ -241,6 +256,10 @@ * lex.c (java_read_unicode_collapsing_terminators): Handle case where \r appears at EOF. Fixes PR java/7950. +2002-09-16 Volker Reichelt <reichelt@igpm.rwth-aachen.de> + + * jvspec.c (lang_specific_driver): Remove unused variable. + 2002-09-16 Geoffrey Keating <geoffk@apple.com> * java-tree.h (union lang_tree_node): Add chain_next option. diff --git a/gcc/java/Make-lang.in b/gcc/java/Make-lang.in index fc0e40b..efc5883 100644 --- a/gcc/java/Make-lang.in +++ b/gcc/java/Make-lang.in @@ -61,7 +61,8 @@ JAVA_TARGET_INDEPENDENT_BIN_TOOLS = gcjh jv-scan jcf-dump # Tell GNU make to ignore these if they exist. .PHONY: java -jvspec.o: $(srcdir)/java/jvspec.c $(SYSTEM_H) $(GCC_H) $(CONFIG_H) +jvspec.o: $(srcdir)/java/jvspec.c $(SYSTEM_H) coretypes.h $(TM_H) \ + $(GCC_H) $(CONFIG_H) (SHLIB_LINK='$(SHLIB_LINK)' \ SHLIB_MULTILIB='$(SHLIB_MULTILIB)'; \ $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(DRIVER_DEFINES) \ @@ -261,74 +262,84 @@ JAVA_TREE_H = $(TREE_H) $(HASHTAB_H) java/java-tree.h java/java-tree.def JAVA_LEX_C = java/lex.c java/keyword.h java/chartables.h java/parse.o: java/parse.c java/jcf-reader.c $(CONFIG_H) $(SYSTEM_H) \ - function.h $(JAVA_TREE_H) $(JAVA_LEX_C) java/parse.h java/lex.h $(GGC_H) \ - debug.h gt-java-parse.h gtype-java.h -java/jcf-dump.o: $(CONFIG_H) $(SYSTEM_H) $(JAVA_TREE_H) java/jcf-dump.c \ - java/jcf-reader.c java/jcf.h java/javaop.h java/javaop.def version.h -java/gjavah.o: $(CONFIG_H) $(SYSTEM_H) $(JAVA_TREE_H) java/gjavah.c \ - java/jcf-reader.c java/jcf.h java/javaop.h version.h -java/boehm.o: java/boehm.c $(CONFIG_H) $(SYSTEM_H) $(TREE_H) $(JAVA_TREE_H) \ - java/parse.h toplev.h -java/buffer.o: java/buffer.c $(CONFIG_H) java/buffer.h $(SYSTEM_H) toplev.h -java/builtins.o: java/builtins.c $(CONFIG_H) $(SYSTEM_H) $(JAVA_TREE_H) \ - $(GGC_H) flags.h builtin-types.def langhooks.h gt-java-builtins.h -java/check-init.o: java/check-init.c $(CONFIG_H) \ - $(JAVA_TREE_H) $(SYSTEM_H) toplev.h -java/class.o: java/class.c $(CONFIG_H) $(JAVA_TREE_H) $(RTL_H) java/jcf.h \ - java/parse.h toplev.h $(SYSTEM_H) output.h $(GGC_H) $(TARGET_H) function.h \ - gt-java-class.h + coretypes.h $(TM_H) function.h $(JAVA_TREE_H) $(JAVA_LEX_C) java/parse.h \ + java/lex.h $(GGC_H) debug.h gt-java-parse.h gtype-java.h +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 +java/gjavah.o: $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(JAVA_TREE_H) \ + java/gjavah.c java/jcf-reader.c java/jcf.h java/javaop.h version.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/buffer.o: java/buffer.c $(CONFIG_H) java/buffer.h $(SYSTEM_H) coretypes.h \ + $(TM_H) toplev.h +java/builtins.o: java/builtins.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \ + $(JAVA_TREE_H) $(GGC_H) flags.h builtin-types.def langhooks.h \ + gt-java-builtins.h +java/check-init.o: java/check-init.c $(CONFIG_H) $(JAVA_TREE_H) $(SYSTEM_H) \ + coretypes.h $(TM_H) toplev.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 java/constants.o: java/constants.c $(CONFIG_H) $(JAVA_TREE_H) java/jcf.h \ - toplev.h $(SYSTEM_H) $(GGC_H) gt-java-constants.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) function.h expr.h libfuncs.h except.h \ - java/java-except.h $(GGC_H) real.h gt-java-decl.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 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) function.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) $(GGC_H) gt-java-expr.h -java/java-tree-inline.o: tree-inline.c $(CONFIG_H) $(SYSTEM_H) \ - $(TREE_H) $(RTL_H) expr.h flags.h params.h input.h insn-config.h \ + $(SYSTEM_H) coretypes.h $(TM_H) $(GGC_H) gt-java-expr.h +java/java-tree-inline.o: tree-inline.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \ + $(TM_H) $(TREE_H) $(RTL_H) expr.h flags.h params.h input.h insn-config.h \ $(INTEGRATE_H) $(VARRAY_H) $(HASHTAB_H) $(SPLAY_TREE_H) toplev.h \ langhooks.h $(C_COMMON_H) $(srcdir)/tree-inline.h $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \ -DINLINER_FOR_JAVA=1 \ $(srcdir)/tree-inline.c -o $@ -java/jcf-depend.o: java/jcf-depend.c $(CONFIG_H) $(SYSTEM_H) java/jcf.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) toplev.h java/parse.h $(GGC_H) \ - debug.h real.h gt-java-jcf-parse.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 java/jcf-write.o: java/jcf-write.c $(CONFIG_H) $(JAVA_TREE_H) java/jcf.h \ $(RTL_H) java/java-opcodes.h java/parse.h java/buffer.h $(SYSTEM_H) \ - toplev.h $(GGC_H) gt-java-jcf-write.h -java/jv-scan.o: java/jv-scan.c $(CONFIG_H) $(SYSTEM_H) version.h -java/jvgenmain.o: java/jvgenmain.c $(CONFIG_H) $(JAVA_TREE_H) $(SYSTEM_H) + coretypes.h $(TM_H) toplev.h $(GGC_H) gt-java-jcf-write.h +java/jv-scan.o: java/jv-scan.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \ + version.h +java/jvgenmain.o: java/jvgenmain.c $(CONFIG_H) $(JAVA_TREE_H) $(SYSTEM_H) \ + coretypes.h $(TM_H) java/lang.o: java/lang.c $(CONFIG_H) $(JAVA_TREE_H) java/jcf.h input.h \ - toplev.h $(SYSTEM_H) $(RTL_H) $(EXPR_H) diagnostic.h langhooks.h \ - $(LANGHOOKS_DEF_H) gt-java-lang.h + toplev.h $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) $(EXPR_H) diagnostic.h \ + langhooks.h $(LANGHOOKS_DEF_H) gt-java-lang.h java/mangle.o: java/mangle.c $(CONFIG_H) java/jcf.h $(JAVA_TREE_H) $(SYSTEM_H) \ - toplev.h $(GGC_H) gt-java-mangle.h + coretypes.h $(TM_H) toplev.h $(GGC_H) gt-java-mangle.h java/mangle_name.o: java/mangle_name.c $(CONFIG_H) java/jcf.h $(JAVA_TREE_H) \ - $(SYSTEM_H) toplev.h $(GGC_H) -java/parse-scan.o: $(CONFIG_H) $(SYSTEM_H) toplev.h $(JAVA_LEX_C) java/parse.h \ - java/lex.h + $(SYSTEM_H) coretypes.h $(TM_H) toplev.h $(GGC_H) +java/parse-scan.o: $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) toplev.h \ + $(JAVA_LEX_C) java/parse.h java/lex.h java/typeck.o: java/typeck.c $(CONFIG_H) $(JAVA_TREE_H) java/jcf.h \ - java/convert.h toplev.h $(SYSTEM_H) $(GGC_H) real.h + java/convert.h toplev.h $(SYSTEM_H) coretypes.h $(TM_H) $(GGC_H) real.h java/verify.o: java/verify.c $(CONFIG_H) $(JAVA_TREE_H) java/jcf.h \ - java/javaop.h java/java-opcodes.h java/java-except.h toplev.h $(SYSTEM_H) + java/javaop.h java/java-opcodes.h java/java-except.h toplev.h $(SYSTEM_H) \ + coretypes.h $(TM_H) java/xref.o: java/xref.c java/xref.h $(CONFIG_H) $(JAVA_TREE_H) toplev.h \ - $(SYSTEM_H) -java/zextract.o: java/zextract.c $(CONFIG_H) $(SYSTEM_H) java/zipfile.h + $(SYSTEM_H) coretypes.h $(TM_H) +java/zextract.o: java/zextract.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \ + java/zipfile.h # jcf-io.o needs $(ZLIBINC) added to cflags. -java/jcf-io.o: java/jcf-io.c $(CONFIG_H) $(SYSTEM_H) $(JAVA_TREE_H) +java/jcf-io.o: java/jcf-io.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \ + $(JAVA_TREE_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: java/jcf-path.c $(CONFIG_H) $(SYSTEM_H) java/jcf.h +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)\" \ diff --git a/gcc/java/boehm.c b/gcc/java/boehm.c index 566655a..d3956e7 100644 --- a/gcc/java/boehm.c +++ b/gcc/java/boehm.c @@ -27,6 +27,8 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ #include <config.h> #include "system.h" +#include "coretypes.h" +#include "tm.h" #include "tree.h" #include "java-tree.h" #include "parse.h" diff --git a/gcc/java/buffer.c b/gcc/java/buffer.c index 170cc04..01a97cb 100644 --- a/gcc/java/buffer.c +++ b/gcc/java/buffer.c @@ -22,6 +22,8 @@ Boston, MA 02111-1307, USA. */ #include "config.h" #include "system.h" +#include "coretypes.h" +#include "tm.h" #include "buffer.h" /* Grow BUFP so there is room for at least SIZE more bytes. */ diff --git a/gcc/java/builtins.c b/gcc/java/builtins.c index eba8416..1c5301e 100644 --- a/gcc/java/builtins.c +++ b/gcc/java/builtins.c @@ -27,6 +27,8 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ #include "config.h" #include "system.h" +#include "coretypes.h" +#include "tm.h" #include "tree.h" #include "ggc.h" #include "flags.h" diff --git a/gcc/java/check-init.c b/gcc/java/check-init.c index 6495a78..1185284 100644 --- a/gcc/java/check-init.c +++ b/gcc/java/check-init.c @@ -24,6 +24,8 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ #include "config.h" #include "system.h" +#include "coretypes.h" +#include "tm.h" #include "tree.h" #include "flags.h" /* Needed for optimize. */ #include "java-tree.h" diff --git a/gcc/java/class.c b/gcc/java/class.c index bec8d0c..f833888 100644 --- a/gcc/java/class.c +++ b/gcc/java/class.c @@ -27,6 +27,8 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ #include "config.h" #include "system.h" +#include "coretypes.h" +#include "tm.h" #include "tree.h" #include "rtl.h" #include "flags.h" diff --git a/gcc/java/constants.c b/gcc/java/constants.c index 23f9957..977a7bd 100644 --- a/gcc/java/constants.c +++ b/gcc/java/constants.c @@ -23,6 +23,8 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ #include "config.h" #include "system.h" +#include "coretypes.h" +#include "tm.h" #include "jcf.h" #include "tree.h" #include "java-tree.h" diff --git a/gcc/java/decl.c b/gcc/java/decl.c index 41aea0c..563bd7a 100644 --- a/gcc/java/decl.c +++ b/gcc/java/decl.c @@ -28,6 +28,8 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ #include "config.h" #include "system.h" +#include "coretypes.h" +#include "tm.h" #include "tree.h" #include "rtl.h" #include "real.h" diff --git a/gcc/java/except.c b/gcc/java/except.c index 0de4c8a..4e662b9 100644 --- a/gcc/java/except.c +++ b/gcc/java/except.c @@ -24,6 +24,8 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ #include "config.h" #include "system.h" +#include "coretypes.h" +#include "tm.h" #include "tree.h" #include "real.h" #include "rtl.h" diff --git a/gcc/java/expr.c b/gcc/java/expr.c index 8db2670..b2f9566 100644 --- a/gcc/java/expr.c +++ b/gcc/java/expr.c @@ -27,6 +27,8 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ #include "config.h" #include "system.h" +#include "coretypes.h" +#include "tm.h" #include "tree.h" #include "real.h" #include "rtl.h" diff --git a/gcc/java/gjavah.c b/gcc/java/gjavah.c index 0c9d249..9dc11ab 100644 --- a/gcc/java/gjavah.c +++ b/gcc/java/gjavah.c @@ -26,6 +26,8 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ #include "config.h" #include "system.h" +#include "coretypes.h" +#include "tm.h" #include <math.h> #include "jcf.h" diff --git a/gcc/java/jcf-depend.c b/gcc/java/jcf-depend.c index c999560..72ad1ed 100644 --- a/gcc/java/jcf-depend.c +++ b/gcc/java/jcf-depend.c @@ -25,6 +25,8 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ #include "config.h" #include "system.h" +#include "coretypes.h" +#include "tm.h" #include "mkdeps.h" #include <assert.h> diff --git a/gcc/java/jcf-dump.c b/gcc/java/jcf-dump.c index 72f1a53..14b93d2 100644 --- a/gcc/java/jcf-dump.c +++ b/gcc/java/jcf-dump.c @@ -48,6 +48,8 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ #include "config.h" #include "system.h" +#include "coretypes.h" +#include "tm.h" #include "jcf.h" #include "tree.h" diff --git a/gcc/java/jcf-io.c b/gcc/java/jcf-io.c index 7b0eaca..e0138f4 100644 --- a/gcc/java/jcf-io.c +++ b/gcc/java/jcf-io.c @@ -24,6 +24,8 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ #include "config.h" #include "system.h" +#include "coretypes.h" +#include "tm.h" #include "jcf.h" #include "tree.h" diff --git a/gcc/java/jcf-parse.c b/gcc/java/jcf-parse.c index eeb262a..4d6b8b7 100644 --- a/gcc/java/jcf-parse.c +++ b/gcc/java/jcf-parse.c @@ -27,6 +27,8 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ #include "config.h" #include "system.h" +#include "coretypes.h" +#include "tm.h" #include "tree.h" #include "real.h" #include "obstack.h" diff --git a/gcc/java/jcf-path.c b/gcc/java/jcf-path.c index c9ed323..8e26644 100644 --- a/gcc/java/jcf-path.c +++ b/gcc/java/jcf-path.c @@ -25,6 +25,8 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ #include "config.h" #include "system.h" +#include "coretypes.h" +#include "tm.h" #include <dirent.h> diff --git a/gcc/java/jcf-write.c b/gcc/java/jcf-write.c index 47cfd11..bfb1bd2 100644 --- a/gcc/java/jcf-write.c +++ b/gcc/java/jcf-write.c @@ -23,6 +23,8 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ #include "config.h" #include "system.h" +#include "coretypes.h" +#include "tm.h" #include "jcf.h" #include "tree.h" #include "real.h" diff --git a/gcc/java/jv-scan.c b/gcc/java/jv-scan.c index f92aceb..74ef533 100644 --- a/gcc/java/jv-scan.c +++ b/gcc/java/jv-scan.c @@ -21,6 +21,8 @@ Boston, MA 02111-1307, USA. */ #include "config.h" #include "system.h" +#include "coretypes.h" +#include "tm.h" #include "obstack.h" /* We use obstacks in lex.c */ diff --git a/gcc/java/jvgenmain.c b/gcc/java/jvgenmain.c index 9a42571..28b42f2 100644 --- a/gcc/java/jvgenmain.c +++ b/gcc/java/jvgenmain.c @@ -26,6 +26,8 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ #include "config.h" #include "system.h" +#include "coretypes.h" +#include "tm.h" #include "obstack.h" #include "jcf.h" #include "tree.h" diff --git a/gcc/java/jvspec.c b/gcc/java/jvspec.c index c3efe58..aee48c8 100644 --- a/gcc/java/jvspec.c +++ b/gcc/java/jvspec.c @@ -25,6 +25,8 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ #include "config.h" #include "system.h" +#include "coretypes.h" +#include "tm.h" #include "gcc.h" /* Name of spec file. */ @@ -55,28 +57,28 @@ int lang_specific_extra_outfiles = 0; int shared_libgcc = 1; static const char jvgenmain_spec[] = - "jvgenmain %{D*} %b %{!pipe:%u.i} |\n\ - cc1 %{!pipe:%U.i} %1 \ + "jvgenmain %{D*} %b %m.i |\n\ + cc1 %m.i %1 \ %{!Q:-quiet} -dumpbase %b.c %{d*} %{m*} %{a*}\ %{g*} %{O*} \ %{v:-version} %{pg:-p} %{p}\ - %{<fbounds-check} %{<fno-bounds-check}\ - %{<fassume-compiled} %{<fno-assume-compiled}\ - %{<fcompile-resource*} %{<fassert} %{<fno-assert} \ - %{<femit-class-file} %{<femit-class-files} %{<fencoding*}\ - %{<fuse-boehm-gc} %{<fhash-synchronization} %{<fjni}\ - %{<findirect-dispatch} \ - %{<fno-store-check} %{<foutput-class-dir}\ - %{<fclasspath*} %{<fCLASSPATH*} %{<fbootclasspath*}\ - %{<fextdirs*}\ - %{<fuse-divide-subroutine} %{<fno-use-divide-subroutine}\ - %{<fcheck-references} %{<fno-check-references}\ - %{<ffilelist-file}\ + %<fbounds-check %<fno-bounds-check\ + %<fassume-compiled %<fno-assume-compiled\ + %<fcompile-resource* %<fassert %<fno-assert \ + %<femit-class-file %<femit-class-files %<fencoding*\ + %<fuse-boehm-gc %<fhash-synchronization %<fjni\ + %<findirect-dispatch \ + %<fno-store-check %<foutput-class-dir\ + %<fclasspath* %<fCLASSPATH* %<fbootclasspath*\ + %<fextdirs*\ + %<fuse-divide-subroutine %<fno-use-divide-subroutine\ + %<fcheck-references %<fno-check-references\ + %<ffilelist-file\ %{f*} -fdollars-in-identifiers\ %{aux-info*}\ %{pg:%{fomit-frame-pointer:%e-pg and -fomit-frame-pointer are incompatible}}\ - %{S:%W{o*}%{!o*:-o %b.s}}%{!S:-o %{|!pipe:%g.s}} |\n\ - %{!S:as %a %Y -o %d%w%u%O %{!pipe:%g.s} %A\n }"; + %{S:%W{o*}%{!o*:-o %b.s}}\ + %(invoke_as)"; /* Return full path name of spec file if it is in DIR, or NULL if not. */ @@ -161,9 +163,6 @@ lang_specific_driver (in_argc, in_argv, in_added_libraries) should be passed to a single jc1 invocation. */ int combine_inputs = 0; - /* Index of last .java or .class argument. */ - int last_input_index; - /* Number of .java and .class source file arguments seen. */ int java_files_count = 0; int class_files_count = 0; @@ -384,7 +383,6 @@ lang_specific_driver (in_argc, in_argv, in_added_libraries) if (saw_resource) { args[i] |= RESOURCE_FILE_ARG; - last_input_index = i; added += 2; /* for -xjava and -xnone */ } @@ -400,13 +398,11 @@ lang_specific_driver (in_argc, in_argv, in_added_libraries) { args[i] |= JAVA_FILE_ARG; java_files_count++; - last_input_index = i; } if (len > 6 && strcmp (argv[i] + len - 6, ".class") == 0) { args[i] |= CLASS_FILE_ARG; class_files_count++; - last_input_index = i; } if (len > 4 && (strcmp (argv[i] + len - 4, ".zip") == 0 @@ -414,7 +410,6 @@ lang_specific_driver (in_argc, in_argv, in_added_libraries) { args[i] |= ZIP_FILE_ARG; zip_files_count++; - last_input_index = i; } } } diff --git a/gcc/java/lang.c b/gcc/java/lang.c index 0d9605c0..b26092e 100644 --- a/gcc/java/lang.c +++ b/gcc/java/lang.c @@ -27,6 +27,8 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ #include "config.h" #include "system.h" +#include "coretypes.h" +#include "tm.h" #include "tree.h" #include "input.h" #include "rtl.h" diff --git a/gcc/java/mangle.c b/gcc/java/mangle.c index 88aec17..41e0423 100644 --- a/gcc/java/mangle.c +++ b/gcc/java/mangle.c @@ -27,6 +27,8 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ #include "config.h" #include "system.h" +#include "coretypes.h" +#include "tm.h" #include "jcf.h" #include "tree.h" #include "java-tree.h" diff --git a/gcc/java/mangle_name.c b/gcc/java/mangle_name.c index d46956c..f38285e 100644 --- a/gcc/java/mangle_name.c +++ b/gcc/java/mangle_name.c @@ -27,6 +27,8 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ #include "config.h" #include "system.h" +#include "coretypes.h" +#include "tm.h" #include "jcf.h" #include "tree.h" #include "java-tree.h" diff --git a/gcc/java/parse-scan.y b/gcc/java/parse-scan.y index 81ce627..00260b0 100644 --- a/gcc/java/parse-scan.y +++ b/gcc/java/parse-scan.y @@ -39,6 +39,8 @@ definitions and other extensions. */ #include "config.h" #include "system.h" +#include "coretypes.h" +#include "tm.h" #include "obstack.h" #include "toplev.h" diff --git a/gcc/java/parse.y b/gcc/java/parse.y index d457f1a..d117368 100644 --- a/gcc/java/parse.y +++ b/gcc/java/parse.y @@ -48,6 +48,8 @@ definitions and other extensions. */ %{ #include "config.h" #include "system.h" +#include "coretypes.h" +#include "tm.h" #include <dirent.h> #include "tree.h" #include "rtl.h" @@ -5195,7 +5197,9 @@ obtain_incomplete_type (type_name) else abort (); + /* Workaround from build_pointer_type for incomplete types. */ BUILD_PTR_FROM_NAME (ptr, name); + TYPE_MODE (ptr) = ptr_mode; layout_type (ptr); return ptr; @@ -7485,7 +7489,7 @@ source_end_java_method () patched. Dump it to a file if the user requested it. */ dump_java_tree (TDI_original, fndecl); - java_optimize_inline (fndecl); + java_optimize_inline (fndecl); /* Generate function's code */ if (BLOCK_EXPR_BODY (DECL_FUNCTION_BODY (fndecl)) @@ -8145,9 +8149,9 @@ java_expand_method_bodies (class) /* Save the function for inlining. */ if (flag_inline_trees) - DECL_SAVED_TREE (decl) = + DECL_SAVED_TREE (decl) = BLOCK_EXPR_BODY (DECL_FUNCTION_BODY (decl)); - + /* It's time to assign the variable flagging static class initialization based on which classes invoked static methods are definitely initializing. This should be flagged. */ diff --git a/gcc/java/typeck.c b/gcc/java/typeck.c index 4a1894f..ea34cc1 100644 --- a/gcc/java/typeck.c +++ b/gcc/java/typeck.c @@ -27,6 +27,8 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ #include "config.h" #include "system.h" +#include "coretypes.h" +#include "tm.h" #include "tree.h" #include "real.h" #include "obstack.h" diff --git a/gcc/java/verify.c b/gcc/java/verify.c index 250e479..184d950 100644 --- a/gcc/java/verify.c +++ b/gcc/java/verify.c @@ -25,6 +25,8 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ #include "config.h" #include "system.h" +#include "coretypes.h" +#include "tm.h" #include "tree.h" #include "java-tree.h" #include "javaop.h" diff --git a/gcc/java/xref.c b/gcc/java/xref.c index ff1da78..0bfa6b4 100644 --- a/gcc/java/xref.c +++ b/gcc/java/xref.c @@ -26,6 +26,8 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ #include "config.h" #include "system.h" +#include "coretypes.h" +#include "tm.h" #include "tree.h" #include "java-tree.h" #include "xref.h" diff --git a/gcc/java/zextract.c b/gcc/java/zextract.c index 3985cd9..cdea0d1 100644 --- a/gcc/java/zextract.c +++ b/gcc/java/zextract.c @@ -27,6 +27,8 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ #include "config.h" #include "system.h" +#include "coretypes.h" +#include "tm.h" #include "zipfile.h" /* This stuff is partly based on the 28 August 1994 public release of the |