gcc/

	* expr.h (can_move_by_pieces): Move prototype from here ...
	* tree.h (can_move_by_pieces): ... to here.
	* optabs.h (set_widening_optab_handler): Use XCNEW.
	* gimplify.c: Do not include expr.h.

	* toplev.c: Do not include dwarf2out.h.
	* config/ia64/ia64.c: Likewise.
	* config/sparc/sparc.c: Likewise.
	* config/sparc/t-sparc (sparc.o): Fix dependencies.

	* Makefile.in (toplev.o): Fix dependencies
	(c-family/c-gimplify.o): Likewise.
	(c-family/c-common.o): Likewise.

c-family/
	* c-gimplify.c: Do not include basic-block.h.
	* c-common.c: Do not include linfuncs.h.

cp/
	* method.c: Do not include tree-pass.h.

fortran/
	* trans.c: Do not include defaults.h.
	* trans-intrinsic.c: Likewise.

java/
	* decl.c: Do not include libfuncs.h.
	* class.c: Do not include defaults.h.
	* jvgenmain.c: Likewise.
	* magnle.c: Likewise.
	* Make-lang.in (decl.o): Fix dependencies.



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

26 files changed, 55 insertions, 35 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 030fc147194..d3bbb5ab409 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,21 @@
 2012-07-11  Steven Bosscher  <steven@gcc.gnu.org>
 
+	* expr.h (can_move_by_pieces): Move prototype from here ...
+	* tree.h (can_move_by_pieces): ... to here.
+	* optabs.h (set_widening_optab_handler): Use XCNEW.
+	* gimplify.c: Do not include expr.h.
+
+	* toplev.c: Do not include dwarf2out.h.
+	* config/ia64/ia64.c: Likewise.
+	* config/sparc/sparc.c: Likewise.
+	* config/sparc/t-sparc (sparc.o): Fix dependencies.
+
+	* Makefile.in (toplev.o): Fix dependencies
+	(c-family/c-gimplify.o): Likewise.
+	(c-family/c-common.o): Likewise.
+
+2012-07-11  Steven Bosscher  <steven@gcc.gnu.org>
+
 	* basic-block.h (struct edge_def): Use basic_block instead of
 	basic_block_def *.
 	* cfgloop.h (struct loop_exit, struct loop): Likewise.
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index e92ad945527..1d6ded22a21 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -1925,8 +1925,7 @@ c-family/c-common.o : c-family/c-common.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
 	$(DIAGNOSTIC_H) langhooks.h c-family/c-objc.h \
 	$(TARGET_H) tree-iterator.h langhooks.h tree-mudflap.h \
 	intl.h $(OPTS_H) $(CPPLIB_H) $(TREE_INLINE_H) $(HASHTAB_H) \
-	$(BUILTINS_DEF) $(CGRAPH_H) $(BASIC_BLOCK_H) $(TARGET_DEF_H) \
-	$(LIBFUNCS_H) \
+	$(BUILTINS_DEF) $(CGRAPH_H) $(TARGET_DEF_H) \
 	gt-c-family-c-common.h $(COMMON_TARGET_H)
 
 c-family/c-cppbuiltin.o : c-family/c-cppbuiltin.c $(CONFIG_H) $(SYSTEM_H) \
@@ -1945,8 +1944,8 @@ c-family/c-format.o : c-family/c-format.c c-family/c-format.h \
 c-family/c-gimplify.o : c-family/c-gimplify.c $(CONFIG_H) $(SYSTEM_H) $(TREE_H) \
 	$(C_COMMON_H) $(DIAGNOSTIC_CORE_H) $(GIMPLE_H) \
 	$(FLAGS_H) langhooks.h $(LANGHOOKS_DEF_H) \
-	$(TM_H) coretypes.h $(C_PRETTY_PRINT_H) $(CGRAPH_H) $(BASIC_BLOCK_H) \
-	hard-reg-set.h $(TREE_DUMP_H) $(TREE_INLINE_H)
+	$(TM_H) coretypes.h $(C_PRETTY_PRINT_H) $(CGRAPH_H) \
+	$(TREE_DUMP_H) $(TREE_INLINE_H)
 
 c-family/c-lex.o : c-family/c-lex.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
 	$(TM_H) $(TREE_H) $(FIXED_VALUE_H) debug.h $(C_COMMON_H) $(SPLAY_TREE_H) \
@@ -2673,7 +2672,7 @@ CFLAGS-toplev.o += -DTARGET_NAME=\"$(target_noncanonical)\"
 toplev.o : toplev.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \
    version.h $(RTL_H) $(FUNCTION_H) $(FLAGS_H) xcoffout.h $(INPUT_H) \
    $(INSN_ATTR_H) output.h $(DIAGNOSTIC_H) debug.h insn-config.h intl.h \
-   $(RECOG_H) Makefile toplev.h $(DWARF2OUT_H) sdbout.h dbxout.h $(EXPR_H) \
+   $(RECOG_H) Makefile toplev.h sdbout.h dbxout.h $(EXPR_H) \
    hard-reg-set.h $(BASIC_BLOCK_H) graph.h $(EXCEPT_H) $(REGS_H) $(TIMEVAR_H) \
    value-prof.h $(PARAMS_H) $(TM_P_H) reload.h ira.h dwarf2asm.h $(TARGET_H) \
    langhooks.h insn-flags.h $(CFGLOOP_H) hosthooks.h \
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index dde9c936957..c87446b940b 100644
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-11  Steven Bosscher  <steven@gcc.gnu.org>
+
+	* c-gimplify.c: Do not include basic-block.h.
+	* c-common.c: Do not include linfuncs.h.
+
 2012-07-08  Steven Bosscher  <steven@gcc.gnu.org>
 
 	* c-common.h: Include tree.h.
diff --git a/gcc/c-family/c-common.c b/gcc/c-family/c-common.c
index 2a528e22ff9..4a8b56d8f90 100644
--- a/gcc/c-family/c-common.c
+++ b/gcc/c-family/c-common.c
@@ -45,7 +45,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "opts.h"
 #include "cgraph.h"
 #include "target-def.h"
-#include "libfuncs.h"
 
 cpp_reader *parse_in;		/* Declared in c-pragma.h.  */
 
diff --git a/gcc/c-family/c-gimplify.c b/gcc/c-family/c-gimplify.c
index b39201c215d..26703fdd524 100644
--- a/gcc/c-family/c-gimplify.c
+++ b/gcc/c-family/c-gimplify.c
@@ -31,7 +31,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "tree.h"
 #include "c-common.h"
 #include "gimple.h"
-#include "basic-block.h"
 #include "tree-inline.h"
 #include "diagnostic-core.h"
 #include "langhooks.h"
diff --git a/gcc/cgraph.c b/gcc/cgraph.c
index 217644df74a..0f13ae85dc7 100644
--- a/gcc/cgraph.c
+++ b/gcc/cgraph.c
@@ -509,7 +509,7 @@ cgraph_node_for_asm (tree asmname)
   return NULL;
 }
 
-/* Returns a hash value for X (which really is a die_struct).  */
+/* Returns a hash value for X (which really is a cgraph_edge).  */
 
 static hashval_t
 edge_hash (const void *x)
@@ -517,7 +517,7 @@ edge_hash (const void *x)
   return htab_hash_pointer (((const struct cgraph_edge *) x)->call_stmt);
 }
 
-/* Return nonzero if decl_id of die_struct X is the same as UID of decl *Y.  */
+/* Return nonzero if the call_stmt of of cgraph_edge X is stmt *Y.  */
 
 static int
 edge_eq (const void *x, const void *y)
diff --git a/gcc/config/ia64/ia64.c b/gcc/config/ia64/ia64.c
index 0e5b37363cb..57e3970088a 100644
--- a/gcc/config/ia64/ia64.c
+++ b/gcc/config/ia64/ia64.c
@@ -60,7 +60,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "tm-constrs.h"
 #include "sel-sched.h"
 #include "reload.h"
-#include "dwarf2out.h"
 #include "opts.h"
 
 /* This is used for communication between ASM_OUTPUT_LABEL and
diff --git a/gcc/config/sparc/sparc.c b/gcc/config/sparc/sparc.c
index 6835d6914c7..59ce3d014ca 100644
--- a/gcc/config/sparc/sparc.c
+++ b/gcc/config/sparc/sparc.c
@@ -54,7 +54,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "reload.h"
 #include "params.h"
 #include "df.h"
-#include "dwarf2out.h"
 #include "opts.h"
 
 /* Processor costs */
diff --git a/gcc/config/sparc/t-sparc b/gcc/config/sparc/t-sparc
index b7d4dacdcb6..432eb3e0e53 100644
--- a/gcc/config/sparc/t-sparc
+++ b/gcc/config/sparc/t-sparc
@@ -24,7 +24,7 @@ sparc.o: $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
   $(FUNCTION_H) $(EXCEPT_H) $(EXPR_H) $(OPTABS_H) $(RECOG_H) \
   $(DIAGNOSTIC_CORE_H) $(GGC_H) $(TM_P_H) debug.h $(TARGET_H) \
   $(TARGET_DEF_H) $(COMMON_TARGET_H) $(GIMPLE_H) \
-  langhooks.h reload.h $(PARAMS_H) $(DF_H) dwarf2out.h $(OPTS_H) \
+  langhooks.h reload.h $(PARAMS_H) $(DF_H) $(OPTS_H) \
   gt-sparc.h
 
 sparc-c.o: $(srcdir)/config/sparc/sparc-c.c \
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 310b44259b9..a59cefe4e65 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2012-07-11  Steven Bosscher  <steven@gcc.gnu.org>
+
+	* method.c: Do not include tree-pass.h.
+
 2012-07-10  Jason Merrill  <jason@redhat.com>
 
 	DR 1402
diff --git a/gcc/cp/method.c b/gcc/cp/method.c
index 79edf81b24f..9481aa72aca 100644
--- a/gcc/cp/method.c
+++ b/gcc/cp/method.c
@@ -34,7 +34,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "tm_p.h"
 #include "target.h"
 #include "common/common-target.h"
-#include "tree-pass.h"
 #include "diagnostic.h"
 #include "cgraph.h"
 #include "gimple.h"
diff --git a/gcc/expr.h b/gcc/expr.h
index 7444baf166d..68cdb8d9109 100644
--- a/gcc/expr.h
+++ b/gcc/expr.h
@@ -369,11 +369,6 @@ rtx set_storage_via_libcall (rtx, rtx, rtx, bool);
 extern bool set_storage_via_setmem (rtx, rtx, rtx, unsigned int,
 				    unsigned int, HOST_WIDE_INT);
 
-/* Determine whether the LEN bytes can be moved by using several move
-   instructions.  Return nonzero if a call to move_by_pieces should
-   succeed.  */
-extern int can_move_by_pieces (unsigned HOST_WIDE_INT, unsigned int);
-
 extern unsigned HOST_WIDE_INT move_by_pieces_ninsns (unsigned HOST_WIDE_INT,
 						     unsigned int,
 						     unsigned int);
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 8a2a767cb3b..4c25316a305 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-11  Steven Bosscher  <steven@gcc.gnu.org>
+
+	* trans.c: Do not include defaults.h.
+	* trans-intrinsic.c: Likewise.
+
 2012-07-08  Steven Bosscher  <steven@gcc.gnu.org>
 
 	* gfortran.h: Do not include coretypes.h here.
diff --git a/gcc/fortran/trans-intrinsic.c b/gcc/fortran/trans-intrinsic.c
index c74e81a011e..e4905ffba27 100644
--- a/gcc/fortran/trans-intrinsic.c
+++ b/gcc/fortran/trans-intrinsic.c
@@ -39,7 +39,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "trans-const.h"
 #include "trans-types.h"
 #include "trans-array.h"
-#include "defaults.h"
 /* Only for gfc_trans_assign and gfc_trans_pointer_assign.  */
 #include "trans-stmt.h"
 
diff --git a/gcc/fortran/trans.c b/gcc/fortran/trans.c
index 3313be92df8..ff0b243a202 100644
--- a/gcc/fortran/trans.c
+++ b/gcc/fortran/trans.c
@@ -26,7 +26,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "gimple.h"	/* For create_tmp_var_raw.  */
 #include "tree-iterator.h"
 #include "diagnostic-core.h"  /* For internal_error.  */
-#include "defaults.h"
 #include "flags.h"
 #include "gfortran.h"
 #include "trans.h"
diff --git a/gcc/gimplify.c b/gcc/gimplify.c
index bd3642c8c41..c46f149b2a5 100644
--- a/gcc/gimplify.c
+++ b/gcc/gimplify.c
@@ -47,8 +47,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "tree-pass.h"
 
 #include "langhooks-def.h"	/* FIXME: for lhd_set_decl_assembler_name.  */
-#include "expr.h"		/* FIXME: for can_move_by_pieces
-				   and STACK_CHECK_MAX_VAR_SIZE.  */
 
 enum gimplify_omp_var_data
 {
@@ -3971,7 +3969,7 @@ gimplify_init_constructor (tree *expr_p, gimple_seq *pre_p, gimple_seq *post_p,
 	    walk_tree (&DECL_INITIAL (object), force_labels_r, NULL, NULL);
 
 	    /* ??? C++ doesn't automatically append a .<number> to the
-	       assembler name, and even when it does, it looks a FE private
+	       assembler name, and even when it does, it looks at FE private
 	       data structures to figure out what that number should be,
 	       which are not set for this variable.  I suppose this is
 	       important for local statics for inline functions, which aren't
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 5da41f69254..46d90759dc9 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,11 @@
+2012-07-11  Steven Bosscher  <steven@gcc.gnu.org>
+
+	* decl.c: Do not include libfuncs.h.
+	* class.c: Do not include defaults.h.
+	* jvgenmain.c: Likewise.
+	* magnle.c: Likewise.
+	* Make-lang.in (decl.o): Fix dependencies.
+
 2012-07-08  Steven Bosscher  <steven@gcc.gnu.org>
 
 	* verify.h: Do not include system.h and coretypes.h here.
diff --git a/gcc/java/Make-lang.in b/gcc/java/Make-lang.in
index 2339b0d7e6b..d934eb34af9 100644
--- a/gcc/java/Make-lang.in
+++ b/gcc/java/Make-lang.in
@@ -282,7 +282,7 @@ 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) java/jcf.h \
   toplev.h $(FLAGS_H) $(SYSTEM_H) coretypes.h $(TM_H) \
-  libfuncs.h java/java-except.h $(GGC_H) $(REAL_H) gt-java-decl.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) \
   java/javaop.h java/java-opcodes.h java/java-except.h \
diff --git a/gcc/java/class.c b/gcc/java/class.c
index bfc852959a7..40ff26dfe89 100644
--- a/gcc/java/class.c
+++ b/gcc/java/class.c
@@ -41,7 +41,6 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #include "cgraph.h"
 #include "tree-iterator.h"
 #include "vecprim.h"
-#include "tm.h"         /* FIXME: For gcc_obstack_init from defaults.h.  */
 #include "target.h"
 
 static tree make_method_value (tree);
diff --git a/gcc/java/decl.c b/gcc/java/decl.c
index 1e1db76dc3b..e22b0fd52ad 100644
--- a/gcc/java/decl.c
+++ b/gcc/java/decl.c
@@ -34,7 +34,6 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #include "flags.h"
 #include "java-tree.h"
 #include "jcf.h"
-#include "libfuncs.h"
 #include "java-except.h"
 #include "ggc.h"
 #include "cgraph.h"
diff --git a/gcc/java/jvgenmain.c b/gcc/java/jvgenmain.c
index db9b0597714..d6ca8717d70 100644
--- a/gcc/java/jvgenmain.c
+++ b/gcc/java/jvgenmain.c
@@ -33,7 +33,6 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #include "java-tree.h"
 #include "intl.h"
 #include "diagnostic.h"
-#include "tm.h"         /* FIXME: For gcc_obstack_init from defaults.h.  */
 
 static char * do_mangle_classname (const char *string);
 
diff --git a/gcc/java/mangle.c b/gcc/java/mangle.c
index 48caf113e0f..6a74531c2d3 100644
--- a/gcc/java/mangle.c
+++ b/gcc/java/mangle.c
@@ -35,7 +35,6 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #include "diagnostic-core.h"
 #include "ggc.h"
 #include "langhooks-def.h"
-#include "tm.h"         /* FIXME: For gcc_obstack_init from defaults.h.  */
 
 static void mangle_class_field (tree);
 static void mangle_vtable (tree);
diff --git a/gcc/optabs.h b/gcc/optabs.h
index 8b04e17e7b3..816fc296742 100644
--- a/gcc/optabs.h
+++ b/gcc/optabs.h
@@ -1065,8 +1065,7 @@ set_widening_optab_handler (optab op, enum machine_mode to_mode,
   else
     {
       if (op->widening == NULL)
-	op->widening = (struct widening_optab_handlers *)
-	      xcalloc (1, sizeof (struct widening_optab_handlers));
+	op->widening = XCNEW (struct widening_optab_handlers);
 
       op->widening->handlers[(int) to_mode][(int) from_mode].insn_code = code;
     }
diff --git a/gcc/toplev.c b/gcc/toplev.c
index 9776ff5208a..03a91343d9e 100644
--- a/gcc/toplev.c
+++ b/gcc/toplev.c
@@ -76,10 +76,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "tree-ssa-alias.h"
 #include "plugin.h"
 
-#if defined (DWARF2_UNWIND_INFO) || defined (DWARF2_DEBUGGING_INFO)
-#include "dwarf2out.h"
-#endif
-
 #if defined(DBX_DEBUGGING_INFO) || defined(XCOFF_DEBUGGING_INFO)
 #include "dbxout.h"
 #endif
diff --git a/gcc/tree.h b/gcc/tree.h
index 3bbfb86fa57..42d2e66762e 100644
--- a/gcc/tree.h
+++ b/gcc/tree.h
@@ -5887,6 +5887,12 @@ extern void fini_object_sizes (void);
 extern unsigned HOST_WIDE_INT compute_builtin_object_size (tree, int);
 
 /* In expr.c.  */
+
+/* Determine whether the LEN bytes can be moved by using several move
+   instructions.  Return nonzero if a call to move_by_pieces should
+   succeed.  */
+extern int can_move_by_pieces (unsigned HOST_WIDE_INT, unsigned int);
+
 extern unsigned HOST_WIDE_INT highest_pow2_factor (const_tree);
 extern tree build_personality_function (const char *);
 
diff --git a/gcc/value-prof.c b/gcc/value-prof.c
index 80ced304f1d..58ba30a11a5 100644
--- a/gcc/value-prof.c
+++ b/gcc/value-prof.c
@@ -108,7 +108,7 @@ histogram_hash (const void *x)
   return htab_hash_pointer (((const_histogram_value)x)->hvalue.stmt);
 }
 
-/* Return nonzero if decl_id of die_struct X is the same as UID of decl *Y.  */
+/* Return nonzero if statement for histogram_value X is Y.  */
 
 static int
 histogram_eq (const void *x, const void *y)