diff options
Diffstat (limited to 'gcc/java')
| -rw-r--r-- | gcc/java/ChangeLog | 28 | ||||
| -rw-r--r-- | gcc/java/Make-lang.in | 14 | ||||
| -rw-r--r-- | gcc/java/boehm.c | 7 | ||||
| -rw-r--r-- | gcc/java/builtins.c | 1 | ||||
| -rw-r--r-- | gcc/java/class.c | 6 | ||||
| -rw-r--r-- | gcc/java/expr.c | 1 | ||||
| -rw-r--r-- | gcc/java/jcf-depend.c | 10 | ||||
| -rw-r--r-- | gcc/java/jcf-io.c | 7 | ||||
| -rw-r--r-- | gcc/java/jcf-path.c | 7 | ||||
| -rw-r--r-- | gcc/java/lang.c | 1 | ||||
| -rw-r--r-- | gcc/java/mangle.c | 3 | ||||
| -rw-r--r-- | gcc/java/mangle_name.c | 4 | ||||
| -rw-r--r-- | gcc/java/resource.c | 8 | ||||
| -rw-r--r-- | gcc/java/typeck.c | 4 | ||||
| -rw-r--r-- | gcc/java/verify-glue.c | 4 | ||||
| -rw-r--r-- | gcc/java/verify-impl.c | 6 |
16 files changed, 55 insertions, 56 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 05cbb037509..2629d200f2d 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,31 @@ +2010-11-30 Joseph Myers <joseph@codesourcery.com> + + * boehm.c: Don't include toplev.h. + * Make-lang.in (java/boehm.o): Don't depend on toplev.h. + +2010-11-30 Joseph Myers <joseph@codesourcery.com> + + * expr.c, lang.c, mangle.c, mangle_name.c, typeck.c, + verify-glue.c: Don't include toplev.h. + * Make-lang.in: Dependencies for above files changed to remove + toplev.h. + +2010-11-29 Joseph Myers <joseph@codesourcery.com> + + * boehm.c: Include "config.h" instead of <config.h>. + * builtins.c: Don't include <stdarg.h>. + * class.c: Don't include "stdio.h". + (O_BINARY): Don't define here. + * jcf-depend.c: Don't include <assert.h>. + (jcf_dependency_set_dep_file, jcf_dependency_init, + jcf_dependency_write): Use gcc_assert. + * jcf-io.c (O_BINARY): Don't define here. + * jcf-path.c: Don't include "tm.h". + (jcf_path_init): Use getenv instead of GET_ENVIRONMENT. + * resource.c: Don't include "stdio.h". + (O_BINARY): Don't define here. + * verify-impl.c: Don't include <stdio.h>. + 2010-11-17 Joseph Myers <joseph@codesourcery.com> * jcf-parse.c (java_parse_file): Take no arguments. diff --git a/gcc/java/Make-lang.in b/gcc/java/Make-lang.in index beff30c6b70..3e3d2c99317 100644 --- a/gcc/java/Make-lang.in +++ b/gcc/java/Make-lang.in @@ -271,7 +271,7 @@ java/jcf-dump.o: $(CONFIG_H) $(SYSTEM_H) coretypes.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 + $(TREE_H) $(JAVA_TREE_H) java/parse.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 @@ -289,7 +289,7 @@ java/except.o: java/except.c $(CONFIG_H) $(JAVA_TREE_H) java/jcf.h $(REAL_H) \ toplev.h $(SYSTEM_H) coretypes.h java/expr.o: java/expr.c $(CONFIG_H) $(JAVA_TREE_H) java/jcf.h $(REAL_H) \ java/javaop.h java/java-opcodes.h \ - java/java-except.h java/java-except.h java/parse.h toplev.h \ + java/java-except.h java/java-except.h java/parse.h \ $(SYSTEM_H) coretypes.h $(TM_H) $(GGC_H) gt-java-expr.h $(TARGET_H) \ tree-iterator.h java/jcf-depend.o: java/jcf-depend.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \ @@ -301,21 +301,21 @@ java/jcf-parse.o: java/jcf-parse.c $(CONFIG_H) $(JAVA_TREE_H) $(FLAGS_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) $(DIAGNOSTIC_H) \ + $(SYSTEM_H) coretypes.h $(TM_H) $(DIAGNOSTIC_H) \ langhooks.h $(LANGHOOKS_DEF_H) gt-java-lang.h $(OPTS_H) $(OPTIONS_H) \ $(TARGET_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) + coretypes.h $(TM_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 toplev.h $(GGC_H) + $(SYSTEM_H) coretypes.h $(GGC_H) java/resource.o: java/resource.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \ $(JAVA_TREE_H) java/jcf.h java/parse.h toplev.h output.h $(GGC_H) \ $(TARGET_H) $(FUNCTION_H) gt-java-resource.h java/typeck.o: java/typeck.c $(CONFIG_H) $(JAVA_TREE_H) java/jcf.h \ - toplev.h $(SYSTEM_H) coretypes.h $(GGC_H) $(REAL_H) + $(SYSTEM_H) coretypes.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 java/verify.h toplev.h + coretypes.h java/verify.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) \ diff --git a/gcc/java/boehm.c b/gcc/java/boehm.c index 2a0690ce51d..f4a9af61939 100644 --- a/gcc/java/boehm.c +++ b/gcc/java/boehm.c @@ -1,5 +1,6 @@ /* Functions related to the Boehm garbage collector. - Copyright (C) 2000, 2003, 2004, 2006, 2009 Free Software Foundation, Inc. + Copyright (C) 2000, 2003, 2004, 2006, 2009, 2010 + Free Software Foundation, Inc. This file is part of GCC. @@ -23,8 +24,7 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ /* Written by Tom Tromey <tromey@cygnus.com>. */ -#include <config.h> - +#include "config.h" #include "system.h" #include "coretypes.h" #include "double-int.h" @@ -33,7 +33,6 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ #include "java-tree.h" #include "parse.h" #include "diagnostic-core.h" -#include "toplev.h" static void mark_reference_fields (tree, double_int *, unsigned int, int *, int *, int *, HOST_WIDE_INT *); diff --git a/gcc/java/builtins.c b/gcc/java/builtins.c index fbaaf3e9bc7..2100f093a49 100644 --- a/gcc/java/builtins.c +++ b/gcc/java/builtins.c @@ -36,7 +36,6 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ #include "flags.h" #include "langhooks.h" #include "java-tree.h" -#include <stdarg.h> /* FIXME: All these headers are necessary for sync_compare_and_swap. Front ends should never have to look at that. */ diff --git a/gcc/java/class.c b/gcc/java/class.c index a1dc9c08b25..92091f9e9cf 100644 --- a/gcc/java/class.c +++ b/gcc/java/class.c @@ -38,18 +38,12 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ #include "parse.h" #include "function.h" #include "ggc.h" -#include "stdio.h" #include "cgraph.h" #include "tree-iterator.h" #include "vecprim.h" #include "tm.h" /* FIXME: For gcc_obstack_init from defaults.h. */ #include "target.h" -/* DOS brain-damage */ -#ifndef O_BINARY -#define O_BINARY 0 /* MS-DOS brain-damage */ -#endif - static tree make_method_value (tree); static tree build_java_method_type (tree, tree, int); static int32 hashUtf8String (const char *, int); diff --git a/gcc/java/expr.c b/gcc/java/expr.c index f6c6c1bbe0a..53feab5ced3 100644 --- a/gcc/java/expr.c +++ b/gcc/java/expr.c @@ -36,7 +36,6 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ #include "java-except.h" #include "parse.h" #include "diagnostic-core.h" -#include "toplev.h" #include "ggc.h" #include "tree-iterator.h" #include "target.h" diff --git a/gcc/java/jcf-depend.c b/gcc/java/jcf-depend.c index c93c73bf915..cde2a8dc72d 100644 --- a/gcc/java/jcf-depend.c +++ b/gcc/java/jcf-depend.c @@ -1,6 +1,6 @@ /* Functions for handling dependency tracking when reading .class files. - Copyright (C) 1998, 1999, 2000, 2001, 2003, 2006, 2007 + Copyright (C) 1998, 1999, 2000, 2001, 2003, 2006, 2007, 2010 Free Software Foundation, Inc. This file is part of GCC. @@ -30,8 +30,6 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ #include "coretypes.h" #include "mkdeps.h" -#include <assert.h> - #include "jcf.h" @@ -89,7 +87,7 @@ jcf_dependency_add_target (const char *name) void jcf_dependency_set_dep_file (const char *name) { - assert (dep_out != stdout); + gcc_assert (dep_out != stdout); if (dep_out) fclose (dep_out); if (! strcmp (name, "-")) @@ -117,7 +115,7 @@ jcf_dependency_add_file (const char *filename ATTRIBUTE_UNUSED, int system_p) void jcf_dependency_init (int system_p) { - assert (! dependencies); + gcc_assert (! dependencies); system_files = system_p; dependencies = deps_init (); } @@ -134,7 +132,7 @@ jcf_dependency_write (void) if (! dep_out) return; - assert (dependencies); + gcc_assert (dependencies); deps_write (dependencies, dep_out, 72); if (print_dummies) diff --git a/gcc/java/jcf-io.c b/gcc/java/jcf-io.c index 1c455da2101..0dc761534c6 100644 --- a/gcc/java/jcf-io.c +++ b/gcc/java/jcf-io.c @@ -1,6 +1,6 @@ /* Utility routines for finding and reading Java(TM) .class files. Copyright (C) 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004, 2005, - 2006, 2007, 2008, 2009 Free Software Foundation, Inc. + 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. This file is part of GCC. @@ -36,11 +36,6 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ #include "zlib.h" -/* DOS brain-damage */ -#ifndef O_BINARY -#define O_BINARY 0 /* MS-DOS brain-damage */ -#endif - int jcf_unexpected_eof (JCF *jcf, int count ATTRIBUTE_UNUSED) { diff --git a/gcc/java/jcf-path.c b/gcc/java/jcf-path.c index 04764c381d8..16ec65538d0 100644 --- a/gcc/java/jcf-path.c +++ b/gcc/java/jcf-path.c @@ -1,6 +1,6 @@ /* Handle CLASSPATH, -classpath, and path searching. Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2006, - 2007, 2008 Free Software Foundation, Inc. + 2007, 2008, 2010 Free Software Foundation, Inc. This file is part of GCC. @@ -27,7 +27,6 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ #include "config.h" #include "system.h" #include "coretypes.h" -#include "tm.h" /* FIXME: For GET_ENVIRONMENT from defaults.h. */ #include <dirent.h> @@ -224,7 +223,7 @@ jcf_path_init (void) sep[0] = DIR_SEPARATOR; sep[1] = '\0'; - GET_ENVIRONMENT (cp, "GCC_EXEC_PREFIX"); + cp = getenv ("GCC_EXEC_PREFIX"); if (cp) { attempt = (char *) alloca (strlen (cp) + 50); @@ -295,7 +294,7 @@ jcf_path_init (void) jcf_path_extdirs_arg (extdirs); } - GET_ENVIRONMENT (cp, "CLASSPATH"); + cp = getenv ("CLASSPATH"); add_path (&classpath_env, cp, 0); } diff --git a/gcc/java/lang.c b/gcc/java/lang.c index 7a179785f35..5501294ad36 100644 --- a/gcc/java/lang.c +++ b/gcc/java/lang.c @@ -32,7 +32,6 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ #include "input.h" #include "java-tree.h" #include "jcf.h" -#include "toplev.h" #include "langhooks.h" #include "langhooks-def.h" #include "flags.h" diff --git a/gcc/java/mangle.c b/gcc/java/mangle.c index 5df5b4ca1b3..48caf113e0f 100644 --- a/gcc/java/mangle.c +++ b/gcc/java/mangle.c @@ -1,6 +1,6 @@ /* Functions related to mangling class names for the GNU compiler for the Java(TM) language. - Copyright (C) 1998, 1999, 2001, 2002, 2003, 2006, 2007, 2008 + Copyright (C) 1998, 1999, 2001, 2002, 2003, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. This file is part of GCC. @@ -33,7 +33,6 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ #include "java-tree.h" #include "obstack.h" #include "diagnostic-core.h" -#include "toplev.h" #include "ggc.h" #include "langhooks-def.h" #include "tm.h" /* FIXME: For gcc_obstack_init from defaults.h. */ diff --git a/gcc/java/mangle_name.c b/gcc/java/mangle_name.c index 8e37b28426f..658bb2bc4ba 100644 --- a/gcc/java/mangle_name.c +++ b/gcc/java/mangle_name.c @@ -1,6 +1,7 @@ /* Shared functions related to mangling names for the GNU compiler for the Java(TM) language. - Copyright (C) 2001, 2002, 2003, 2007 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2003, 2007, 2009, 2010 + Free Software Foundation, Inc. This file is part of GCC. @@ -32,7 +33,6 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ #include "java-tree.h" #include "obstack.h" #include "diagnostic-core.h" -#include "toplev.h" static void append_unicode_mangled_name (const char *, int); #ifndef HAVE_AS_UTF8 diff --git a/gcc/java/resource.c b/gcc/java/resource.c index f954024fde1..25a9bdd223a 100644 --- a/gcc/java/resource.c +++ b/gcc/java/resource.c @@ -1,6 +1,6 @@ /* Functions related to building resource files. Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, - 2007, 2008 Free Software Foundation, Inc. + 2007, 2008, 2009, 2010 Free Software Foundation, Inc. This file is part of GCC. @@ -34,15 +34,9 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ #include "parse.h" #include "function.h" #include "ggc.h" -#include "stdio.h" #include "tree-iterator.h" #include "cgraph.h" -/* DOS brain-damage */ -#ifndef O_BINARY -#define O_BINARY 0 /* MS-DOS brain-damage */ -#endif - /* A list of all the resources files. */ static GTY(()) VEC(tree,gc) *resources; diff --git a/gcc/java/typeck.c b/gcc/java/typeck.c index dca14ab5f81..67552176bf5 100644 --- a/gcc/java/typeck.c +++ b/gcc/java/typeck.c @@ -1,5 +1,6 @@ /* Handle types for the GNU compiler for the Java(TM) language. - Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2007, 2008 + Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2007, + 2008, 2009, 2010 Free Software Foundation, Inc. This file is part of GCC. @@ -34,7 +35,6 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ #include "jcf.h" #include "convert.h" #include "diagnostic-core.h" -#include "toplev.h" #include "ggc.h" static tree convert_ieee_real_to_integer (tree, tree); diff --git a/gcc/java/verify-glue.c b/gcc/java/verify-glue.c index 78d35495478..c9eee07ff7e 100644 --- a/gcc/java/verify-glue.c +++ b/gcc/java/verify-glue.c @@ -1,5 +1,6 @@ /* Glue to interface gcj with bytecode verifier. - Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. + Copyright (C) 2003, 2004, 2005, 2006, 2007, 2010 + Free Software Foundation, Inc. This file is part of GCC. @@ -34,7 +35,6 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ #include "java-tree.h" #include "java-except.h" #include "diagnostic-core.h" -#include "toplev.h" void * vfy_alloc (size_t bytes) diff --git a/gcc/java/verify-impl.c b/gcc/java/verify-impl.c index 12861214e30..1ca2d9fd66b 100644 --- a/gcc/java/verify-impl.c +++ b/gcc/java/verify-impl.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2009 +/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2009, 2010 Free Software Foundation This file is part of libgcj. @@ -19,10 +19,6 @@ details. */ /* Hack to work around namespace pollution from java-tree.h. */ #undef current_class -#ifdef VERIFY_DEBUG -#include <stdio.h> -#endif /* VERIFY_DEBUG */ - /* This is used to mark states which are not scheduled for verification. */ #define INVALID_STATE ((state *) -1) |