gcc/

	* alias.h: Do not include coretypes.h in header files.
	* cppbuiltin.h: Likewise.
	* double-int.h: Likewise.
	* gimple-fold.h: Likewise.
	* flags.h: Likewise.
	* tree-ssa-alias.h: Likewise.
	* gengtype.h (obstack_chunk_alloc, obstack_chunk_free,
	OBSTACK_CHUNK_SIZE): Define here to avoid dependency on coretypes.h.
	* Makefile.in (RTL_BASE_H): Depend on coretypes.h.
	(TREE_H): Likewise.
	(ALIAS_H): Do not depend on coretypes.h.
	(FLAGS_H): Likewise.
	(realmpfr.o): Depend on coretypes.h.

java/
	* verify.h: Do not include system.h and coretypes.h here.
	* verify-impl.c: Include them here instead.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@189358 138bc75d-0d04-0410-961f-82ee72b054a4

12 files changed, 34 insertions, 21 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7341375c32d..e6bbdc3353c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,21 @@
 2012-07-08  Steven Bosscher  <steven@gcc.gnu.org>
 
+	* alias.h: Do not include coretypes.h in header files.
+	* cppbuiltin.h: Likewise.
+	* double-int.h: Likewise.
+	* gimple-fold.h: Likewise.
+	* flags.h: Likewise.
+	* tree-ssa-alias.h: Likewise.
+	* gengtype.h (obstack_chunk_alloc, obstack_chunk_free,
+	OBSTACK_CHUNK_SIZE): Define here to avoid dependency on coretypes.h.
+	* Makefile.in (RTL_BASE_H): Depend on coretypes.h.
+	(TREE_H): Likewise.
+	(ALIAS_H): Do not depend on coretypes.h.
+	(FLAGS_H): Likewise.
+	(realmpfr.o): Depend on coretypes.h.
+
+2012-07-08  Steven Bosscher  <steven@gcc.gnu.org>
+
 	* Makefile.in (gengtype-lex.o, gengtype-parse.o, gengtype-state.o,
 	gengtype.o): Add -DGENERATOR_FILE manually for host gengtype objects.
 
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 237f88d5e3d..deb76282fc7 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -855,9 +855,9 @@ C_TARGET_DEF_H = c-family/c-target-def.h c-family/c-target-hooks-def.h \
   $(TREE_H) $(C_COMMON_H) $(HOOKS_H) common/common-targhooks.h
 COMMON_TARGET_DEF_H = common/common-target-def.h \
   common/common-target-hooks-def.h $(HOOKS_H)
-RTL_BASE_H = rtl.h rtl.def $(MACHMODE_H) reg-notes.def insn-notes.def \
-  $(INPUT_H) $(REAL_H) statistics.h $(VEC_H) $(FIXED_VALUE_H) alias.h \
-  $(HASHTAB_H)
+RTL_BASE_H = coretypes.h rtl.h rtl.def $(MACHMODE_H) reg-notes.def \
+  insn-notes.def $(INPUT_H) $(REAL_H) statistics.h $(VEC_H) \
+  $(FIXED_VALUE_H) alias.h $(HASHTAB_H)
 FIXED_VALUE_H = fixed-value.h $(MACHMODE_H) double-int.h
 RTL_H = $(RTL_BASE_H) genrtl.h vecir.h
 RTL_ERROR_H = rtl-error.h $(RTL_H) $(DIAGNOSTIC_CORE_H)
@@ -867,7 +867,7 @@ BUILTINS_DEF = builtins.def sync-builtins.def omp-builtins.def \
 	gtm-builtins.def
 INTERNAL_FN_DEF = internal-fn.def
 INTERNAL_FN_H = internal-fn.h $(INTERNAL_FN_DEF)
-TREE_H = tree.h all-tree.def tree.def c-family/c-common.def \
+TREE_H = coretypes.h tree.h all-tree.def tree.def c-family/c-common.def \
 	$(lang_tree_files) $(MACHMODE_H) tree-check.h $(BUILTINS_DEF) \
 	$(INPUT_H) statistics.h $(VEC_H) treestruct.def $(HASHTAB_H) \
 	double-int.h alias.h $(SYMTAB_H) $(FLAGS_H) vecir.h \
@@ -882,9 +882,9 @@ GCOV_IO_H = gcov-io.h gcov-iov.h auto-host.h
 COVERAGE_H = coverage.h $(GCOV_IO_H)
 DEMANGLE_H = $(srcdir)/../include/demangle.h
 RECOG_H = recog.h
-ALIAS_H = alias.h coretypes.h
+ALIAS_H = alias.h
 EMIT_RTL_H = emit-rtl.h
-FLAGS_H = flags.h coretypes.h flag-types.h $(OPTIONS_H)
+FLAGS_H = flags.h flag-types.h $(OPTIONS_H)
 OPTIONS_H = options.h flag-types.h $(OPTIONS_H_EXTRA)
 FUNCTION_H = function.h $(TREE_H) $(HASHTAB_H) vecprim.h $(TM_H) hard-reg-set.h
 EXPR_H = expr.h insn-config.h $(FUNCTION_H) $(RTL_H) $(FLAGS_H) $(TREE_H) $(MACHMODE_H) $(EMIT_RTL_H)
@@ -2822,7 +2822,7 @@ emit-rtl.o : emit-rtl.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) \
    $(DF_H) $(PARAMS_H) $(TARGET_H)
 real.o : real.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \
    $(DIAGNOSTIC_CORE_H) $(TM_P_H) $(REAL_H) dfp.h realmpfr.h
-realmpfr.o : realmpfr.c realmpfr.h $(CONFIG_H) $(SYSTEM_H) $(REAL_H) $(TREE_H)
+realmpfr.o : realmpfr.c realmpfr.h $(CONFIG_H) $(SYSTEM_H) coretypes.h $(REAL_H) $(TREE_H)
 dfp.o : dfp.c dfp.h $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H)	$(TREE_H) \
    $(TM_P_H) $(REAL_H) $(DECNUM_H)
 fixed-value.o: fixed-value.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
diff --git a/gcc/alias.h b/gcc/alias.h
index 9e0d1872658..026dbe603cd 100644
--- a/gcc/alias.h
+++ b/gcc/alias.h
@@ -21,8 +21,6 @@ along with GCC; see the file COPYING3.  If not see
 #ifndef GCC_ALIAS_H
 #define GCC_ALIAS_H
 
-#include "coretypes.h"
-
 /* The type of an alias set.  Code currently assumes that variables of
    this type can take the values 0 (the alias set which aliases
    everything) and -1 (sometimes indicating that the alias set is
diff --git a/gcc/cppbuiltin.h b/gcc/cppbuiltin.h
index f8845129492..8e0e5883625 100644
--- a/gcc/cppbuiltin.h
+++ b/gcc/cppbuiltin.h
@@ -21,9 +21,6 @@ along with GCC; see the file COPYING3.  If not see
 #ifndef GCC_CPPBUILTIN_H
 #define GCC_CPPBUILTIN_H
 
-#include "coretypes.h"
-
-
 /* Parse a BASEVER version string of the format "major.minor.patchlevel"
    or "major.minor" to extract its components.  */
 extern void parse_basever (int *, int *, int *);
diff --git a/gcc/double-int.h b/gcc/double-int.h
index ef9a8a9a1b7..50a9bda5d6a 100644
--- a/gcc/double-int.h
+++ b/gcc/double-int.h
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3.  If not see
 #ifndef GENERATOR_FILE
 #include <gmp.h>
 #endif
-#include "coretypes.h"
 
 /* A large integer is currently represented as a pair of HOST_WIDE_INTs.
    It therefore represents a number with precision of
diff --git a/gcc/flags.h b/gcc/flags.h
index 48c20e51bd8..b996c03dd5d 100644
--- a/gcc/flags.h
+++ b/gcc/flags.h
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3.  If not see
 #ifndef GCC_FLAGS_H
 #define GCC_FLAGS_H
 
-#include "coretypes.h"
 #include "flag-types.h"
 #include "options.h"
 
diff --git a/gcc/gengtype.h b/gcc/gengtype.h
index 964cc311917..560f7f3de1b 100644
--- a/gcc/gengtype.h
+++ b/gcc/gengtype.h
@@ -21,6 +21,10 @@
 #ifndef GCC_GENGTYPE_H
 #define GCC_GENGTYPE_H
 
+#define obstack_chunk_alloc    ((void *(*) (long)) xmalloc)
+#define obstack_chunk_free     ((void (*) (void *)) free)
+#define OBSTACK_CHUNK_SIZE     0
+
 /* Sets of accepted source languages like C, C++, Ada... are
    represented by a bitmap.  */
 typedef unsigned lang_bitmap;
diff --git a/gcc/gimple-fold.h b/gcc/gimple-fold.h
index 793d68a8538..e6821a9bd45 100644
--- a/gcc/gimple-fold.h
+++ b/gcc/gimple-fold.h
@@ -22,8 +22,6 @@ along with GCC; see the file COPYING3.  If not see
 #ifndef GCC_GIMPLE_FOLD_H
 #define GCC_GIMPLE_FOLD_H
 
-#include "coretypes.h"
-
 tree fold_const_aggregate_ref_1 (tree, tree (*) (tree));
 tree fold_const_aggregate_ref (tree);
 
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 94edcdfb3f6..5da41f69254 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-08  Steven Bosscher  <steven@gcc.gnu.org>
+
+	* verify.h: Do not include system.h and coretypes.h here.
+	* verify-impl.c: Include them here instead.
+
 2012-07-05  Uros Bizjak  <ubizjak@gmail.com>
 
 	* jcf-io.c (read_zip_member): Initialize d_stream.
diff --git a/gcc/java/verify-impl.c b/gcc/java/verify-impl.c
index 1ca2d9fd66b..8841da1e3c7 100644
--- a/gcc/java/verify-impl.c
+++ b/gcc/java/verify-impl.c
@@ -13,6 +13,8 @@ details.  */
 /* #define VERIFY_DEBUG */
 
 #include "config.h"
+#include "system.h"
+#include "coretypes.h"
 
 #include "verify.h"
 
diff --git a/gcc/java/verify.h b/gcc/java/verify.h
index 8c3184447eb..d7e01ee2916 100644
--- a/gcc/java/verify.h
+++ b/gcc/java/verify.h
@@ -27,8 +27,6 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #ifndef GCC_VERIFY_H
 #define GCC_VERIFY_H
 
-#include "system.h"
-#include "coretypes.h"
 #include "jcf.h"
 #include "tree.h"
 #include "java-tree.h"
diff --git a/gcc/tree-ssa-alias.h b/gcc/tree-ssa-alias.h
index 88f6d86f7e2..f3505432793 100644
--- a/gcc/tree-ssa-alias.h
+++ b/gcc/tree-ssa-alias.h
@@ -21,9 +21,6 @@
 #ifndef TREE_SSA_ALIAS_H
 #define TREE_SSA_ALIAS_H
 
-#include "coretypes.h"
-
-
 /* The points-to solution.
 
    The points-to solution is a union of pt_vars and the abstract