system.h: Include "safe-ctype.h" instead of <safe-ctype.h>.

	* system.h: Include "safe-ctype.h" instead of <safe-ctype.h>.
	Include <signal.h>, <sys/mman.h>, <sys/resource.h> and
	<sys/times.h>.
	(O_BINARY, SIGCHLD, MAP_FAILED, MAP_ANONYMOUS, kill):
	Conditionally define.
	(GET_ENVIRONMENT): Poison.
	* configure.ac: Don't test for mincore.
	* configure: Regenerate.
	* config.in: Regenerate.
	* collect2-aix.c: Don't include <sys/mman.h>.
	* collect2.c: Don't include <signal.h>.
	(SIGCHLD): Don't define.
	(prefix_from_env): Use getenv instead of GET_ENVIRONMENT.
	* config/alpha/alpha.c: Include "splay-tree.h" instead of
	<splay-tree.h>.
	* config/arm/arm.c (arm_target_help): Use getenv instead of
	GET_ENVIRONMENT.
	* config/avr/driver-avr.c: Don't include <stdlib.h>.
	* config/frv/frv.c: Don't include <ctype.h>.
	* config/host-darwin.c: Don't include <sys/mman.h>.
	* config/host-hpux.c: Don't include <sys/mman.h> or <unistd.h>.
	(MAP_FAILED): Don't define.
	* config/host-linux.c: Don't include <sys/mman.h> or <limits.h>.
	* config/host-solaris.c: Don't include <sys/mman.h>.
	* config/i386/cygming.h: Don't include <stdio.h>.
	* config/i386/driver-i386.c: Don't include <stdlib.h>.
	* config/i386/host-cygwin.c: Don't include <sys/mman.h>.
	* config/iq2000/iq2000.c: Don't include <signal.h>.
	* config/m32c/m32c-pragma.c: Don't include <stdio.h>.
	* config/m68hc11/m68hc11.c: Don't include <stdio.h>.
	* config/mep/mep-pragma.c: Don't include <stdio.h>.
	* config/microblaze/microblaze.c: Don't include <signal.h>.
	* config/mips/mips.c: Don't include <signal.h>.
	* config/rs6000/host-darwin.c: Don't include <signal.h>.
	* cppdefault.c (cpp_relocated): Use getenv instead of
	GET_ENVIRONMENT.
	* defaults.h (GET_ENVIRONMENT): Don't define.
	* et-forest.h: Don't include <ansidecl.h> or <stddef.h>.
	* gcc.c: Don't include <signal.h>, <sys/mman.h> or <sys/types.h>.
	(SIGCHLD, MAP_FAILED, kill): Don't define.
	(process_command): Use getenv instead of GET_ENVIRONMENT.
	* genhooks.c: Don't include <string.h>.
	* ggc-common.c: Don't include <sys/resource.h>, <sys/mman.h> or
	<sys/types.h>.
	(MAP_FAILED): Don't define.
	* ggc-page.c Don't include <sys/mman.h>.
	(MAP_ANONYMOUS, MAP_FAILED): Don't define.
	* ggc-zone.c: Don't include <sys/mman.h>.
	(MAP_ANONYMOUS, MAP_FAILED): Don't define.
	* graph.c: Include "config.h" instead of <config.h>.
	* incpath.c (add_env_var_paths): Use getenv instead of
	GET_ENVIRONMENT.
	* lto-wrapper.c: Don't include <errno.h>, <signal.h> or
	"libiberty.h".
	(SIGCHLD, kill): Don't define.
	* mips-tfile.c: Don't include <signal.h>.
	* opts.c: Don't include <signal.h> or <sys/resource.h>.
	(print_specific_help): Use getenv instead of GET_ENVIRONMENT.
	* passes.c: Don't include <signal.h>, <sys/resource.h> or
	<sys/times.h>.
	* sparseset.h: Don't include <assert.h>.
	* timevar.c: Don't include <sys/times.h> or <sys/resource.h>.
	* tlink.c: Don't include "libiberty.h".
	* toplev.c: Don't include <signal.h> or <sys/times.h>.
	* tree-mudflap.c: Include "demangle.h" instead of <demangle.h>.
	* tree-switch-conversion.c: Don't include <signal.h>.
	* vmsdbgout.c: Don't include <errno.h> or <string.h>.

c-family:
	* c-opts.c (check_deps_environment_vars): Use getenv instead of
	GET_ENVIRONMENT.
	* c-pch.c (O_BINARY): Don't define here.
	* c-pragma.h: Include "cpplib.h" instead of <cpplib.h>.

fortran:
	* gfortran.h (alloca): Don't include definitions.
	(NULL): Don't define.

java:
	* 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>.

lto:
	* lto-endian.h: Delete.
	* lto-object.c: Don't include "libiberty.h".
	(O_BINARY): Don't define.
	* lto.c: Don't include "libiberty.h" or <sys/mman.h>.
	(O_BINARY): Don't define.

From-SVN: r167241

9 files changed, 29 insertions, 38 deletions

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 05cbb03..075d183 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,19 @@
+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/boehm.c b/gcc/java/boehm.c
index 2a0690c..ce0ca2d7 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"
diff --git a/gcc/java/builtins.c b/gcc/java/builtins.c
index fbaaf3e..2100f09 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 a1dc9c0..92091f9 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/jcf-depend.c b/gcc/java/jcf-depend.c
index c93c73b..cde2a8d 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 1c455da..0dc7615 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 04764c3..16ec655 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/resource.c b/gcc/java/resource.c
index f954024..25a9bdd 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/verify-impl.c b/gcc/java/verify-impl.c
index 1286121..1ca2d9f 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)