[patch] Do not include output.h everywhere

[patch] Do not include output.h everywhere

[Steven Bosscher]

[-- Attachment #1: Type: text/plain, Size: 986 bytes --]

Hello,

Almost all files include output.h because it defines dump_file. IMHO
output.h should only be included in files that actually output
something to asm_out_file. Therefore wanted to I move dump_file to
some other include file. I ended up with system.h because I couldn't
find a more suitable place. Another option is coretypes.h, but no
other file is included everywhere, and system.h also already defines
fancy_abort, which is also for dumping things - sort of... Anyway, the
point is that with dump_file moved out of output.h, ~120 files don't
have to include output.h anymore.

While working on the above, I noticed we can also move all dbxout
prototypes from output.h to dbxout.h, and move some stabs-related
target hooks there also.

Big patch, but IMHO a nice cleanup too :-)

Bootstrapped&tested on x86_64-unknown-linux-gnu and on
powerpc64-unknown-linux-gnu. OK?
(I'll also cleanup the Makefile dependencies, but my Makefile is
currently one big conflict...)

Ciao!
Steven

[-- Attachment #2: cleanup_output_h_includes.diff --]
[-- Type: application/octet-stream, Size: 59275 bytes --]


	* output.h (__gcc_host_wide_int__): Move to hwint.h.
	(decl_default_tls_model): Move to tree.h
	(dump_file): Move to system.h.
	(default_stabs_asm_out_destructor, default_stabs_asm_out_constructor,
	dbxout_int, dbxout_stabd, dbxout_begin_stabn, dbxout_begin_stabn_sline,
	dbxout_begin_empty_stabs, dbxout_begin_simple_stabs,
	dbxout_begin_simple_stabs_desc, dbxout_stab_value_zero,
	dbxout_stab_value_zero, dbxout_stab_value_label_diff,
	dbxout_stab_value_internal_label,
	dbxout_stab_value_internal_label_diff): Move from here ...
	* dbxout.h: ... to here.
	* system.h (dump_file): Moved here from output.h.
	* hwint.h (__gcc_host_wide_int__): Moved here from output.h.
	* tree.h (decl_default_tls_model): Moved here from output.h.
	* varasm.c (default_stabs_asm_out_destructor,
	default_stabs_asm_out_constructor): Move from here ...
	* dbxout.c: ... to here.

	* gcov-dump.c (dump_file): Rename to dump_gcov_file.  Update callers.

	* collect2.h (dump_file): Rename to dump_ld_file.
	* collect2.c: Likewise.
	* tlink.c: Likewise.

	* alias.c: Likewise.
	* auto-inc-dec.c: Likewise.
	* bt-load.c: Likewise.
	* caller-save.c: Likewise.
	* cfg.c: Likewise.
	* cfgbuild.c: Likewise.
	* cfgcleanup.c: Likewise.
	* cfglayout.c: Likewise.
	* cfgloop.c: Likewise.
	* cfgloopanal.c: Likewise.
	* cfgloopmanip.c: Likewise.
	* cfgrtl.c: Likewise.
	* cgraph.c: Likewise.
	* cgraphclones.c: Likewise.
	* combine-stack-adj.c: Likewise.
	* combine.c: Likewise.
	* cprop.c: Likewise.
	* cse.c: Likewise.
	* cselib.c: Likewise.
	* dbgcnt.c: Likewise.
	* dbxout.c: Likewise.
	* dbxout.h: Likewise.
	* df-problems.c: Likewise.
	* df-scan.c: Likewise.
	* dojump.c: Likewise.
	* fwprop.c: Likewise.
	* gcse.c: Likewise.
	* graph.c: Likewise.
	* haifa-sched.c: Likewise.
	* hw-doloop.c: Likewise.
	* hwint.h: Likewise.
	* ipa-inline-transform.c: Likewise.
	* ipa-pure-const.c: Likewise.
	* ipa-reference.c: Likewise.
	* ipa-utils.c: Likewise.
	* ira-build.c: Likewise.
	* ira-emit.c: Likewise.
	* lcm.c: Likewise.
	* loop-doloop.c: Likewise.
	* loop-invariant.c: Likewise.
	* loop-iv.c: Likewise.
	* loop-unroll.c: Likewise.
	* loop-unswitch.c: Likewise.
	* lto-cgraph.c: Likewise.
	* lto-section-in.c: Likewise.
	* lto-streamer-in.c: Likewise.
	* mcf.c: Likewise.
	* mode-switching.c: Likewise.
	* postreload-gcse.c: Likewise.
	* postreload.c: Likewise.
	* predict.c: Likewise.
	* profile.c: Likewise.
	* ree.c: Likewise.
	* reg-stack.c: Likewise.
	* regcprop.c: Likewise.
	* regmove.c: Likewise.
	* regstat.c: Likewise.
	* reload1.c: Likewise.
	* sched-ebb.c: Likewise.
	* sel-sched-dump.c: Likewise.
	* simplify-rtx.c: Likewise.
	* stor-layout.c: Likewise.
	* store-motion.c: Likewise.
	* system.h: Likewise.
	* targhooks.h: Likewise.
	* tracer.c: Likewise.
	* tree-affine.c: Likewise.
	* tree-cfg.c: Likewise.
	* tree-cfgcleanup.c: Likewise.
	* tree-dfa.c: Likewise.
	* tree-into-ssa.c: Likewise.
	* tree-nomudflap.c: Likewise.
	* tree-optimize.c: Likewise.
	* tree-pretty-print.c: Likewise.
	* tree-profile.c: Likewise.
	* tree-ssa-address.c: Likewise.
	* tree-ssa-ccp.c: Likewise.
	* tree-ssa-copy.c: Likewise.
	* tree-ssa-dom.c: Likewise.
	* tree-ssa-loop-ch.c: Likewise.
	* tree-ssa-loop-im.c: Likewise.
	* tree-ssa-loop-manip.c: Likewise.
	* tree-ssa-loop-niter.c: Likewise.
	* tree-ssa-loop-prefetch.c: Likewise.
	* tree-ssa-loop-unswitch.c: Likewise.
	* tree-ssa-loop.c: Likewise.
	* tree-ssa-propagate.c: Likewise.
	* tree-ssa-structalias.c: Likewise.
	* tree-ssa-tail-merge.c: Likewise.
	* tree-ssa-threadedge.c: Likewise.
	* tree-ssa-threadupdate.c: Likewise.
	* tree-ssa-uncprop.c: Likewise.
	* tree-ssa-uninit.c: Likewise.
	* tree-ssa.c: Likewise.
	* tree.h: Likewise.
	* value-prof.c: Likewise.
	* var-tracking.c: Likewise.
	* varasm.c: Likewise.
	* web.c: Likewise.

	* config/m32r/m32r.c: Include dbxout.h.
	* config/pa/pa.c: Likewise.
	* config/rs6000/rs6000.c: Likewise.

c-family/
	* c-ada-spec.c: Do not include output.h.
	* c-semantics.c: Likewise.

cp/
	* call.c: Do not include output.h.
	* class.c: Likewise.
	* except.c: Likewise.
	* friend.c: Likewise.
	* init.c: Likewise.
	* lex.c: Likewise.
	* method.c: Likewise.
	* parser.c: Likewise.
	* pt.c: Likewise.
	* rtti.c: Likewise.
	* search.c: Likewise.

objc/
	* objc-act.c: Do not include output.h.

fortran/
	* trans-common.c: Do not include output.h.
	* trans-decl.c: Likewise.

java/
	* resource.c: Do not include output.h.

Index: output.h
===================================================================
--- output.h	(revision 188024)
+++ output.h	(working copy)
@@ -121,10 +121,6 @@ extern void output_addr_const (FILE *, r
    and fixed syntactic prefixes.  */
 #if GCC_VERSION >= 3004
 #define ATTRIBUTE_ASM_FPRINTF(m, n) __attribute__ ((__format__ (__asm_fprintf__, m, n))) ATTRIBUTE_NONNULL(m)
-/* This is a magic identifier which allows GCC to figure out the type
-   of HOST_WIDE_INT for %wd specifier checks.  You must issue this
-   typedef before using the __asm_fprintf__ format attribute.  */
-typedef HOST_WIDE_INT __gcc_host_wide_int__;
 #else
 #define ATTRIBUTE_ASM_FPRINTF(m, n) ATTRIBUTE_NONNULL(m)
 #endif
@@ -169,9 +165,6 @@ extern void merge_weak (tree, tree);
 /* Emit any pending weak declarations.  */
 extern void weak_finish (void);
 
-/* Return the default TLS model for a given variable.  */
-extern enum tls_model decl_default_tls_model (const_tree);
-
 /* Decode an `asm' spec for a declaration as a register name.
    Return the register number, or -1 if nothing specified,
    or -2 if the ASMSPEC is not `cc' or `memory' and is not recognized,
@@ -384,12 +377,6 @@ extern int current_function_sp_is_unchan
 
 extern int current_function_uses_only_leaf_regs;
 
-/* Default file in which to dump debug output.  */
-
-#ifdef BUFSIZ
-extern FILE *dump_file;
-#endif
-
 /* Nonnull if the insn currently being emitted was a COND_EXEC pattern.  */
 extern rtx current_insn_predicate;
 
@@ -627,10 +614,8 @@ extern enum section_category categorize_
 extern void default_coff_asm_named_section (const char *, unsigned int, tree);
 extern void default_pe_asm_named_section (const char *, unsigned int, tree);
 
-extern void default_stabs_asm_out_destructor (rtx, int);
 extern void default_named_section_asm_out_destructor (rtx, int);
 extern void default_dtor_section_asm_out_destructor (rtx, int);
-extern void default_stabs_asm_out_constructor (rtx, int);
 extern void default_named_section_asm_out_constructor (rtx, int);
 extern void default_ctor_section_asm_out_constructor (rtx, int);
 
@@ -678,24 +663,4 @@ extern int default_address_cost (rtx, bo
 /* Output stack usage information.  */
 extern void output_stack_usage (void);
 
-/* dbxout helper functions */
-#if defined DBX_DEBUGGING_INFO || defined XCOFF_DEBUGGING_INFO
-
-extern void dbxout_int (int);
-extern void dbxout_stabd (int, int);
-extern void dbxout_begin_stabn (int);
-extern void dbxout_begin_stabn_sline (int);
-extern void dbxout_begin_empty_stabs (int);
-extern void dbxout_begin_simple_stabs (const char *, int);
-extern void dbxout_begin_simple_stabs_desc (const char *, int, int);
-
-extern void dbxout_stab_value_zero (void);
-extern void dbxout_stab_value_label (const char *);
-extern void dbxout_stab_value_label_diff (const char *, const char *);
-extern void dbxout_stab_value_internal_label (const char *, int *);
-extern void dbxout_stab_value_internal_label_diff (const char *, int *,
-						   const char *);
-
-#endif
-
 #endif /* ! GCC_OUTPUT_H */
Index: dbxout.h
===================================================================
--- dbxout.h	(revision 188024)
+++ dbxout.h	(working copy)
@@ -26,6 +26,28 @@ extern void dbxout_parms (tree);
 extern void dbxout_reg_parms (tree);
 extern int dbxout_syms (tree);
 
+extern void default_stabs_asm_out_destructor (rtx, int);
+extern void default_stabs_asm_out_constructor (rtx, int);
+
+/* dbxout helper functions */
+#if defined DBX_DEBUGGING_INFO || defined XCOFF_DEBUGGING_INFO
+
+extern void dbxout_int (int);
+extern void dbxout_stabd (int, int);
+extern void dbxout_begin_stabn (int);
+extern void dbxout_begin_stabn_sline (int);
+extern void dbxout_begin_empty_stabs (int);
+extern void dbxout_begin_simple_stabs (const char *, int);
+extern void dbxout_begin_simple_stabs_desc (const char *, int, int);
+
+extern void dbxout_stab_value_zero (void);
+extern void dbxout_stab_value_label (const char *);
+extern void dbxout_stab_value_label_diff (const char *, const char *);
+extern void dbxout_stab_value_internal_label (const char *, int *);
+extern void dbxout_stab_value_internal_label_diff (const char *, int *,
+						   const char *);
+#endif
+
 /* Language description for N_SO stabs.  */
 #define N_SO_AS          1
 #define N_SO_C           2
Index: system.h
===================================================================
--- system.h	(revision 188024)
+++ system.h	(working copy)
@@ -663,6 +663,14 @@ extern int vsnprintf(char *, size_t, con
 #define __builtin_expect(a, b) (a)
 #endif
 
+/* Default file in which to dump debug output.  Here for lack of a better
+   place to put it.  This used to be defined in output.h, but that results
+   in almost all files including output.h, even if they don't output anything
+   except, maybe, something to the dump file.  */
+#ifdef BUFSIZ
+extern FILE *dump_file;
+#endif
+
 /* Redefine abort to report an internal error w/o coredump, and
    reporting the location of the error in the source file.  */
 extern void fancy_abort (const char *, int, const char *) ATTRIBUTE_NORETURN;
Index: hwint.h
===================================================================
--- hwint.h	(revision 188024)
+++ hwint.h	(working copy)
@@ -74,6 +74,11 @@ extern char sizeof_long_long_must_be_8[s
 # endif
 #endif
 
+/* This is a magic identifier which allows GCC to figure out the type
+   of HOST_WIDE_INT for %wd specifier checks.  You must issue this
+   typedef before using the __asm_fprintf__ format attribute.  */
+typedef HOST_WIDE_INT __gcc_host_wide_int__;
+
 /* Various printf format strings for HOST_WIDE_INT.  */
 
 #if HOST_BITS_PER_WIDE_INT == HOST_BITS_PER_LONG
Index: tree.h
===================================================================
--- tree.h	(revision 188024)
+++ tree.h	(working copy)
@@ -5678,6 +5678,8 @@ extern void set_user_assembler_name (tre
 extern void process_pending_assemble_externals (void);
 extern bool decl_replaceable_p (tree);
 extern bool decl_binds_to_current_def_p (tree);
+extern enum tls_model decl_default_tls_model (const_tree);
+
 /* In stmt.c */
 extern void expand_computed_goto (tree);
 extern bool parse_output_constraint (const char **, int, int, int,
Index: varasm.c
===================================================================
--- varasm.c	(revision 188024)
+++ varasm.c	(working copy)
@@ -1374,25 +1374,6 @@ assemble_asm (tree string)
   fprintf (asm_out_file, "\t%s\n", TREE_STRING_POINTER (string));
 }
 
-/* Record an element in the table of global destructors.  SYMBOL is
-   a SYMBOL_REF of the function to be called; PRIORITY is a number
-   between 0 and MAX_INIT_PRIORITY.  */
-
-void
-default_stabs_asm_out_destructor (rtx symbol ATTRIBUTE_UNUSED,
-				  int priority ATTRIBUTE_UNUSED)
-{
-#if defined DBX_DEBUGGING_INFO || defined XCOFF_DEBUGGING_INFO
-  /* Tell GNU LD that this is part of the static destructor set.
-     This will work for any system that uses stabs, most usefully
-     aout systems.  */
-  dbxout_begin_simple_stabs ("___DTOR_LIST__", 22 /* N_SETT */);
-  dbxout_stab_value_label (XSTR (symbol, 0));
-#else
-  sorry ("global destructors not supported on this target");
-#endif
-}
-
 /* Write the address of the entity given by SYMBOL to SEC.  */
 void
 assemble_addr_to_section (rtx symbol, section *sec)
@@ -1442,23 +1423,6 @@ default_dtor_section_asm_out_destructor 
 }
 #endif
 
-/* Likewise for global constructors.  */
-
-void
-default_stabs_asm_out_constructor (rtx symbol ATTRIBUTE_UNUSED,
-				   int priority ATTRIBUTE_UNUSED)
-{
-#if defined DBX_DEBUGGING_INFO || defined XCOFF_DEBUGGING_INFO
-  /* Tell GNU LD that this is part of the static destructor set.
-     This will work for any system that uses stabs, most usefully
-     aout systems.  */
-  dbxout_begin_simple_stabs ("___CTOR_LIST__", 22 /* N_SETT */);
-  dbxout_stab_value_label (XSTR (symbol, 0));
-#else
-  sorry ("global constructors not supported on this target");
-#endif
-}
-
 void
 default_named_section_asm_out_constructor (rtx symbol, int priority)
 {
Index: dbxout.c
===================================================================
--- dbxout.c	(revision 188024)
+++ dbxout.c	(working copy)
@@ -3817,4 +3817,40 @@ dbxout_begin_function (tree decl)
 
 #endif /* DBX_DEBUGGING_INFO || XCOFF_DEBUGGING_INFO */
 
+/* Record an element in the table of global destructors.  SYMBOL is
+   a SYMBOL_REF of the function to be called; PRIORITY is a number
+   between 0 and MAX_INIT_PRIORITY.  */
+
+void
+default_stabs_asm_out_destructor (rtx symbol ATTRIBUTE_UNUSED,
+				  int priority ATTRIBUTE_UNUSED)
+{
+#if defined DBX_DEBUGGING_INFO || defined XCOFF_DEBUGGING_INFO
+  /* Tell GNU LD that this is part of the static destructor set.
+     This will work for any system that uses stabs, most usefully
+     aout systems.  */
+  dbxout_begin_simple_stabs ("___DTOR_LIST__", 22 /* N_SETT */);
+  dbxout_stab_value_label (XSTR (symbol, 0));
+#else
+  sorry ("global destructors not supported on this target");
+#endif
+}
+
+/* Likewise for global constructors.  */
+
+void
+default_stabs_asm_out_constructor (rtx symbol ATTRIBUTE_UNUSED,
+				   int priority ATTRIBUTE_UNUSED)
+{
+#if defined DBX_DEBUGGING_INFO || defined XCOFF_DEBUGGING_INFO
+  /* Tell GNU LD that this is part of the static destructor set.
+     This will work for any system that uses stabs, most usefully
+     aout systems.  */
+  dbxout_begin_simple_stabs ("___CTOR_LIST__", 22 /* N_SETT */);
+  dbxout_stab_value_label (XSTR (symbol, 0));
+#else
+  sorry ("global constructors not supported on this target");
+#endif
+}
+
 #include "gt-dbxout.h"
Index: gcov-dump.c
===================================================================
--- gcov-dump.c	(revision 188024)
+++ gcov-dump.c	(working copy)
@@ -29,7 +29,7 @@ along with Gcov; see the file COPYING3. 
 #include "gcov-io.h"
 #include "gcov-io.c"
 
-static void dump_file (const char *);
+static void dump_gcov_file (const char *);
 static void print_prefix (const char *, unsigned, gcov_position_t);
 static void print_usage (void);
 static void print_version (void);
@@ -116,7 +116,7 @@ main (int argc ATTRIBUTE_UNUSED, char **
     }
 
   while (argv[optind])
-    dump_file (argv[optind++]);
+    dump_gcov_file (argv[optind++]);
   return 0;
 }
 
@@ -153,7 +153,7 @@ print_prefix (const char *filename, unsi
 }
 
 static void
-dump_file (const char *filename)
+dump_gcov_file (const char *filename)
 {
   unsigned tags[4];
   unsigned depth = 0;
Index: collect2.h
===================================================================
--- collect2.h	(revision 188024)
+++ collect2.h	(working copy)
@@ -30,7 +30,7 @@ extern void collect_exit (int) ATTRIBUTE
 
 extern int collect_wait (const char *, struct pex_obj *);
 
-extern void dump_file (const char *, FILE *);
+extern void dump_ld_file (const char *, FILE *);
 
 extern int file_exists (const char *);
 
Index: collect2.c
===================================================================
--- collect2.c	(revision 188024)
+++ collect2.c	(working copy)
@@ -406,13 +406,13 @@ collect_exit (int status)
 
   if (ldout != 0 && ldout[0])
     {
-      dump_file (ldout, stdout);
+      dump_ld_file (ldout, stdout);
       maybe_unlink (ldout);
     }
 
   if (lderrout != 0 && lderrout[0])
     {
-      dump_file (lderrout, stderr);
+      dump_ld_file (lderrout, stderr);
       maybe_unlink (lderrout);
     }
 
@@ -518,7 +518,7 @@ extract_string (const char **pp)
 }
 \f
 void
-dump_file (const char *name, FILE *to)
+dump_ld_file (const char *name, FILE *to)
 {
   FILE *stream = fopen (name, "r");
 
Index: tlink.c
===================================================================
--- tlink.c	(revision 188024)
+++ tlink.c	(working copy)
@@ -835,8 +835,8 @@ do_tlink (char **ld_argv, char **object_
 	  {
 	    if (tlink_verbose >= 3)
 	      {
-		dump_file (ldout, stdout);
-		dump_file (lderrout, stderr);
+		dump_ld_file (ldout, stdout);
+		dump_ld_file (lderrout, stderr);
 	      }
 	    demangle_new_symbols ();
 	    if (! scan_linker_output (ldout)
@@ -850,9 +850,9 @@ do_tlink (char **ld_argv, char **object_
 	  }
     }
 
-  dump_file (ldout, stdout);
+  dump_ld_file (ldout, stdout);
   unlink (ldout);
-  dump_file (lderrout, stderr);
+  dump_ld_file (lderrout, stderr);
   unlink (lderrout);
   if (exit)
     {
Index: loop-unswitch.c
===================================================================
--- loop-unswitch.c	(revision 188024)
+++ loop-unswitch.c	(working copy)
@@ -29,7 +29,6 @@ along with GCC; see the file COPYING3.  
 #include "cfgloop.h"
 #include "cfglayout.h"
 #include "params.h"
-#include "output.h"
 #include "expr.h"
 
 /* This pass moves constant conditions out of loops, duplicating the loop
Index: sched-ebb.c
===================================================================
--- sched-ebb.c	(revision 188024)
+++ sched-ebb.c	(working copy)
@@ -40,7 +40,6 @@ along with GCC; see the file COPYING3.  
 #include "params.h"
 #include "sched-int.h"
 #include "target.h"
-#include "output.h"
 
 \f
 #ifdef INSN_SCHEDULING
Index: fwprop.c
===================================================================
--- fwprop.c	(revision 188024)
+++ fwprop.c	(working copy)
@@ -34,7 +34,6 @@ along with GCC; see the file COPYING3.  
 #include "flags.h"
 #include "obstack.h"
 #include "basic-block.h"
-#include "output.h"
 #include "df.h"
 #include "target.h"
 #include "cfgloop.h"
Index: tree-into-ssa.c
===================================================================
--- tree-into-ssa.c	(revision 188024)
+++ tree-into-ssa.c	(working copy)
@@ -28,7 +28,6 @@ along with GCC; see the file COPYING3.  
 #include "tm_p.h"
 #include "langhooks.h"
 #include "basic-block.h"
-#include "output.h"
 #include "function.h"
 #include "tree-pretty-print.h"
 #include "gimple-pretty-print.h"
Index: tree-ssa-loop-im.c
===================================================================
--- tree-ssa-loop-im.c	(revision 188024)
+++ tree-ssa-loop-im.c	(working copy)
@@ -25,7 +25,6 @@ along with GCC; see the file COPYING3.  
 #include "tree.h"
 #include "tm_p.h"
 #include "basic-block.h"
-#include "output.h"
 #include "tree-pretty-print.h"
 #include "gimple-pretty-print.h"
 #include "tree-flow.h"
Index: tree-ssa-tail-merge.c
===================================================================
--- tree-ssa-tail-merge.c	(revision 188024)
+++ tree-ssa-tail-merge.c	(working copy)
@@ -187,7 +187,6 @@ along with GCC; see the file COPYING3.  
 #include "tree.h"
 #include "tm_p.h"
 #include "basic-block.h"
-#include "output.h"
 #include "flags.h"
 #include "function.h"
 #include "tree-flow.h"
Index: regstat.c
===================================================================
--- regstat.c	(revision 188024)
+++ regstat.c	(working copy)
@@ -28,7 +28,6 @@ along with GCC; see the file COPYING3.  
 #include "tm_p.h"
 #include "flags.h"
 #include "regs.h"
-#include "output.h"
 #include "except.h"
 #include "hard-reg-set.h"
 #include "basic-block.h"
Index: tree-ssa-uninit.c
===================================================================
--- tree-ssa-uninit.c	(revision 188024)
+++ tree-ssa-uninit.c	(working copy)
@@ -28,7 +28,6 @@ along with GCC; see the file COPYING3.  
 #include "tm_p.h"
 #include "langhooks.h"
 #include "basic-block.h"
-#include "output.h"
 #include "function.h"
 #include "gimple-pretty-print.h"
 #include "bitmap.h"
Index: tree-ssa-threadupdate.c
===================================================================
--- tree-ssa-threadupdate.c	(revision 188024)
+++ tree-ssa-threadupdate.c	(working copy)
@@ -26,7 +26,6 @@ along with GCC; see the file COPYING3.  
 #include "flags.h"
 #include "tm_p.h"
 #include "basic-block.h"
-#include "output.h"
 #include "function.h"
 #include "tree-flow.h"
 #include "tree-dump.h"
Index: tree-ssa-loop-niter.c
===================================================================
--- tree-ssa-loop-niter.c	(revision 188024)
+++ tree-ssa-loop-niter.c	(working copy)
@@ -25,7 +25,6 @@ along with GCC; see the file COPYING3.  
 #include "tree.h"
 #include "tm_p.h"
 #include "basic-block.h"
-#include "output.h"
 #include "tree-pretty-print.h"
 #include "gimple-pretty-print.h"
 #include "intl.h"
Index: tree-pretty-print.c
===================================================================
--- tree-pretty-print.c	(revision 188024)
+++ tree-pretty-print.c	(working copy)
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3.  
 #include "coretypes.h"
 #include "tm.h"
 #include "tree.h"
-#include "output.h"
 #include "tree-pretty-print.h"
 #include "hashtab.h"
 #include "tree-flow.h"
Index: tracer.c
===================================================================
--- tracer.c	(revision 188024)
+++ tracer.c	(working copy)
@@ -42,7 +42,6 @@
 #include "rtl.h"
 #include "hard-reg-set.h"
 #include "basic-block.h"
-#include "output.h"
 #include "cfglayout.h"
 #include "fibheap.h"
 #include "flags.h"
Index: tree-ssa-loop-unswitch.c
===================================================================
--- tree-ssa-loop-unswitch.c	(revision 188024)
+++ tree-ssa-loop-unswitch.c	(working copy)
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3.  
 #include "tree.h"
 #include "tm_p.h"
 #include "basic-block.h"
-#include "output.h"
 #include "tree-flow.h"
 #include "tree-dump.h"
 #include "timevar.h"
Index: cgraph.c
===================================================================
--- cgraph.c	(revision 188024)
+++ cgraph.c	(working copy)
@@ -39,7 +39,6 @@ along with GCC; see the file COPYING3.  
 #include "target.h"
 #include "basic-block.h"
 #include "cgraph.h"
-#include "output.h"
 #include "intl.h"
 #include "gimple.h"
 #include "tree-dump.h"
Index: cfgloopmanip.c
===================================================================
--- cfgloopmanip.c	(revision 188024)
+++ cfgloopmanip.c	(working copy)
@@ -29,7 +29,6 @@ along with GCC; see the file COPYING3.  
 #include "cfgloop.h"
 #include "cfglayout.h"
 #include "cfghooks.h"
-#include "output.h"
 #include "tree-flow.h"
 
 static void copy_loops_to (struct loop **, int,
Index: postreload-gcse.c
===================================================================
--- postreload-gcse.c	(revision 188024)
+++ postreload-gcse.c	(working copy)
@@ -33,7 +33,6 @@ along with GCC; see the file COPYING3.  
 #include "insn-config.h"
 #include "recog.h"
 #include "basic-block.h"
-#include "output.h"
 #include "function.h"
 #include "expr.h"
 #include "except.h"
Index: tree-ssa-loop-manip.c
===================================================================
--- tree-ssa-loop-manip.c	(revision 188024)
+++ tree-ssa-loop-manip.c	(working copy)
@@ -25,7 +25,6 @@ along with GCC; see the file COPYING3.  
 #include "tree.h"
 #include "tm_p.h"
 #include "basic-block.h"
-#include "output.h"
 #include "tree-flow.h"
 #include "tree-dump.h"
 #include "timevar.h"
Index: postreload.c
===================================================================
--- postreload.c	(revision 188024)
+++ postreload.c	(working copy)
@@ -38,7 +38,6 @@ along with GCC; see the file COPYING3.  
 #include "basic-block.h"
 #include "reload.h"
 #include "recog.h"
-#include "output.h"
 #include "cselib.h"
 #include "diagnostic-core.h"
 #include "except.h"
Index: value-prof.c
===================================================================
--- value-prof.c	(revision 188024)
+++ value-prof.c	(working copy)
@@ -27,7 +27,6 @@ along with GCC; see the file COPYING3.  
 #include "hard-reg-set.h"
 #include "basic-block.h"
 #include "value-prof.h"
-#include "output.h"
 #include "flags.h"
 #include "insn-config.h"
 #include "recog.h"
Index: tree-ssa-loop-ch.c
===================================================================
--- tree-ssa-loop-ch.c	(revision 188024)
+++ tree-ssa-loop-ch.c	(working copy)
@@ -25,7 +25,6 @@ along with GCC; see the file COPYING3.  
 #include "tree.h"
 #include "tm_p.h"
 #include "basic-block.h"
-#include "output.h"
 #include "tree-flow.h"
 #include "tree-dump.h"
 #include "tree-pass.h"
Index: mcf.c
===================================================================
--- mcf.c	(revision 188024)
+++ mcf.c	(working copy)
@@ -48,7 +48,6 @@ along with GCC; see the file COPYING3.  
 #include "coretypes.h"
 #include "tm.h"
 #include "basic-block.h"
-#include "output.h"
 #include "langhooks.h"
 #include "tree.h"
 #include "gcov-io.h"
Index: cfgloopanal.c
===================================================================
--- cfgloopanal.c	(revision 188024)
+++ cfgloopanal.c	(working copy)
@@ -28,7 +28,6 @@ along with GCC; see the file COPYING3.  
 #include "basic-block.h"
 #include "cfgloop.h"
 #include "expr.h"
-#include "output.h"
 #include "graphds.h"
 #include "params.h"
 
Index: ipa-inline-transform.c
===================================================================
--- ipa-inline-transform.c	(revision 188024)
+++ ipa-inline-transform.c	(working copy)
@@ -37,7 +37,6 @@ along with GCC; see the file COPYING3.  
 #include "langhooks.h"
 #include "cgraph.h"
 #include "timevar.h"
-#include "output.h"
 #include "intl.h"
 #include "coverage.h"
 #include "ggc.h"
Index: cfg.c
===================================================================
--- cfg.c	(revision 188024)
+++ cfg.c	(working copy)
@@ -54,7 +54,6 @@ along with GCC; see the file COPYING3.  
 #include "hard-reg-set.h"
 #include "regs.h"
 #include "flags.h"
-#include "output.h"
 #include "function.h"
 #include "except.h"
 #include "diagnostic-core.h"
Index: ipa-reference.c
===================================================================
--- ipa-reference.c	(revision 188024)
+++ ipa-reference.c	(working copy)
@@ -53,7 +53,6 @@ along with GCC; see the file COPYING3.  
 #include "ipa-reference.h"
 #include "gimple.h"
 #include "cgraph.h"
-#include "output.h"
 #include "flags.h"
 #include "timevar.h"
 #include "diagnostic.h"
Index: tree-ssa-uncprop.c
===================================================================
--- tree-ssa-uncprop.c	(revision 188024)
+++ tree-ssa-uncprop.c	(working copy)
@@ -26,7 +26,6 @@ along with GCC; see the file COPYING3.  
 #include "flags.h"
 #include "tm_p.h"
 #include "basic-block.h"
-#include "output.h"
 #include "function.h"
 #include "timevar.h"
 #include "tree-dump.h"
Index: auto-inc-dec.c
===================================================================
--- auto-inc-dec.c	(revision 188024)
+++ auto-inc-dec.c	(working copy)
@@ -30,7 +30,6 @@ along with GCC; see the file COPYING3.  
 #include "insn-config.h"
 #include "regs.h"
 #include "flags.h"
-#include "output.h"
 #include "function.h"
 #include "except.h"
 #include "diagnostic-core.h"
Index: df-scan.c
===================================================================
--- df-scan.c	(revision 188024)
+++ df-scan.c	(working copy)
@@ -32,7 +32,6 @@ along with GCC; see the file COPYING3.  
 #include "recog.h"
 #include "function.h"
 #include "regs.h"
-#include "output.h"
 #include "alloc-pool.h"
 #include "flags.h"
 #include "hard-reg-set.h"
Index: tree-ssa-ccp.c
===================================================================
--- tree-ssa-ccp.c	(revision 188024)
+++ tree-ssa-ccp.c	(working copy)
@@ -118,7 +118,6 @@ along with GCC; see the file COPYING3.  
 #include "flags.h"
 #include "tm_p.h"
 #include "basic-block.h"
-#include "output.h"
 #include "function.h"
 #include "tree-pretty-print.h"
 #include "gimple-pretty-print.h"
Index: haifa-sched.c
===================================================================
--- haifa-sched.c	(revision 188024)
+++ haifa-sched.c	(working copy)
@@ -142,7 +142,6 @@ along with GCC; see the file COPYING3.  
 #include "sched-int.h"
 #include "target.h"
 #include "common/common-target.h"
-#include "output.h"
 #include "params.h"
 #include "vecprim.h"
 #include "dbgcnt.h"
Index: dojump.c
===================================================================
--- dojump.c	(revision 188024)
+++ dojump.c	(working copy)
@@ -35,7 +35,6 @@ along with GCC; see the file COPYING3.  
 #include "langhooks.h"
 #include "ggc.h"
 #include "basic-block.h"
-#include "output.h"
 #include "tm_p.h"
 
 static bool prefer_and_bit_test (enum machine_mode, int);
Index: lto-cgraph.c
===================================================================
--- lto-cgraph.c	(revision 188024)
+++ lto-cgraph.c	(working copy)
@@ -40,7 +40,6 @@ along with GCC; see the file COPYING3.  
 #include "except.h"
 #include "vec.h"
 #include "timevar.h"
-#include "output.h"
 #include "pointer-set.h"
 #include "lto-streamer.h"
 #include "data-streamer.h"
Index: cgraphclones.c
===================================================================
--- cgraphclones.c	(revision 188024)
+++ cgraphclones.c	(working copy)
@@ -70,7 +70,6 @@ along with GCC; see the file COPYING3.  
 #include "coretypes.h"
 #include "tm.h"
 #include "tree.h"
-#include "output.h"
 #include "rtl.h"
 #include "tree-flow.h"
 #include "tree-inline.h"
Index: mode-switching.c
===================================================================
--- mode-switching.c	(revision 188024)
+++ mode-switching.c	(working copy)
@@ -30,7 +30,6 @@ along with GCC; see the file COPYING3.  
 #include "insn-config.h"
 #include "recog.h"
 #include "basic-block.h"
-#include "output.h"
 #include "tm_p.h"
 #include "function.h"
 #include "tree-pass.h"
Index: tree-nomudflap.c
===================================================================
--- tree-nomudflap.c	(revision 188024)
+++ tree-nomudflap.c	(working copy)
@@ -28,7 +28,6 @@ along with GCC; see the file COPYING3.  
 #include "tree-inline.h"
 #include "gimple.h"
 #include "hashtab.h"
-#include "output.h"
 #include "langhooks.h"
 #include "tree-mudflap.h"
 #include "tree-pass.h"
Index: caller-save.c
===================================================================
--- caller-save.c	(revision 188024)
+++ caller-save.c	(working copy)
@@ -37,7 +37,6 @@ along with GCC; see the file COPYING3.  
 #include "diagnostic-core.h"
 #include "tm_p.h"
 #include "addresses.h"
-#include "output.h"
 #include "ggc.h"
 
 #define MOVE_MAX_WORDS (MOVE_MAX / UNITS_PER_WORD)
Index: graph.c
===================================================================
--- graph.c	(revision 188024)
+++ graph.c	(working copy)
@@ -25,7 +25,6 @@ along with GCC; see the file COPYING3.  
 #include "tm.h"
 #include "rtl.h"
 #include "flags.h"
-#include "output.h"
 #include "function.h"
 #include "hard-reg-set.h"
 #include "obstack.h"
Index: ipa-pure-const.c
===================================================================
--- ipa-pure-const.c	(revision 188024)
+++ ipa-pure-const.c	(working copy)
@@ -46,7 +46,6 @@ along with GCC; see the file COPYING3.  
 #include "ipa-utils.h"
 #include "gimple.h"
 #include "cgraph.h"
-#include "output.h"
 #include "flags.h"
 #include "timevar.h"
 #include "diagnostic.h"
Index: cse.c
===================================================================
--- cse.c	(revision 188024)
+++ cse.c	(working copy)
@@ -35,7 +35,6 @@ along with GCC; see the file COPYING3.  
 #include "expr.h"
 #include "diagnostic-core.h"
 #include "toplev.h"
-#include "output.h"
 #include "ggc.h"
 #include "timevar.h"
 #include "except.h"
Index: web.c
===================================================================
--- web.c	(revision 188024)
+++ web.c	(working copy)
@@ -45,7 +45,6 @@ along with GCC; see the file COPYING3.  
 #include "flags.h"
 #include "obstack.h"
 #include "basic-block.h"
-#include "output.h"
 #include "df.h"
 #include "function.h"
 #include "insn-config.h"
Index: tree-ssa-dom.c
===================================================================
--- tree-ssa-dom.c	(revision 188024)
+++ tree-ssa-dom.c	(working copy)
@@ -28,7 +28,6 @@ along with GCC; see the file COPYING3.  
 #include "tm_p.h"
 #include "basic-block.h"
 #include "cfgloop.h"
-#include "output.h"
 #include "function.h"
 #include "tree-pretty-print.h"
 #include "gimple-pretty-print.h"
Index: tree-ssa-propagate.c
===================================================================
--- tree-ssa-propagate.c	(revision 188024)
+++ tree-ssa-propagate.c	(working copy)
@@ -27,7 +27,6 @@
 #include "flags.h"
 #include "tm_p.h"
 #include "basic-block.h"
-#include "output.h"
 #include "function.h"
 #include "gimple-pretty-print.h"
 #include "timevar.h"
Index: ipa-utils.c
===================================================================
--- ipa-utils.c	(revision 188024)
+++ ipa-utils.c	(working copy)
@@ -34,7 +34,6 @@ along with GCC; see the file COPYING3.  
 #include "ipa-reference.h"
 #include "gimple.h"
 #include "cgraph.h"
-#include "output.h"
 #include "flags.h"
 #include "timevar.h"
 #include "diagnostic.h"
Index: cfgbuild.c
===================================================================
--- cfgbuild.c	(revision 188024)
+++ cfgbuild.c	(working copy)
@@ -30,7 +30,6 @@ along with GCC; see the file COPYING3.  
 #include "basic-block.h"
 #include "regs.h"
 #include "flags.h"
-#include "output.h"
 #include "function.h"
 #include "except.h"
 #include "expr.h"
Index: tree-ssa-loop.c
===================================================================
--- tree-ssa-loop.c	(revision 188024)
+++ tree-ssa-loop.c	(working copy)
@@ -25,7 +25,6 @@ along with GCC; see the file COPYING3.  
 #include "tree.h"
 #include "tm_p.h"
 #include "basic-block.h"
-#include "output.h"
 #include "tree-flow.h"
 #include "tree-dump.h"
 #include "tree-pass.h"
Index: predict.c
===================================================================
--- predict.c	(revision 188024)
+++ predict.c	(working copy)
@@ -40,7 +40,6 @@ along with GCC; see the file COPYING3.  
 #include "insn-config.h"
 #include "regs.h"
 #include "flags.h"
-#include "output.h"
 #include "function.h"
 #include "except.h"
 #include "diagnostic-core.h"
Index: dbgcnt.c
===================================================================
--- dbgcnt.c	(revision 188024)
+++ dbgcnt.c	(working copy)
@@ -25,7 +25,6 @@ See dbgcnt.def for usage information.  *
 #include "diagnostic-core.h"
 #include "tm.h"
 #include "rtl.h"
-#include "output.h"
 
 #include "dbgcnt.h"
 
Index: tree-ssa-address.c
===================================================================
--- tree-ssa-address.c	(revision 188024)
+++ tree-ssa-address.c	(working copy)
@@ -28,7 +28,6 @@ along with GCC; see the file COPYING3.  
 #include "tree.h"
 #include "tm_p.h"
 #include "basic-block.h"
-#include "output.h"
 #include "tree-pretty-print.h"
 #include "tree-flow.h"
 #include "tree-dump.h"
Index: lcm.c
===================================================================
--- lcm.c	(revision 188024)
+++ lcm.c	(working copy)
@@ -60,7 +60,6 @@ along with GCC; see the file COPYING3.  
 #include "insn-config.h"
 #include "recog.h"
 #include "basic-block.h"
-#include "output.h"
 #include "tm_p.h"
 #include "function.h"
 #include "sbitmap.h"
Index: lto-streamer-in.c
===================================================================
--- lto-streamer-in.c	(revision 188024)
+++ lto-streamer-in.c	(working copy)
@@ -43,7 +43,6 @@ along with GCC; see the file COPYING3.  
 #include "debug.h"
 #include "vec.h"
 #include "timevar.h"
-#include "output.h"
 #include "ipa-utils.h"
 #include "data-streamer.h"
 #include "gimple-streamer.h"
Index: regmove.c
===================================================================
--- regmove.c	(revision 188024)
+++ regmove.c	(working copy)
@@ -32,7 +32,6 @@ along with GCC; see the file COPYING3.  
 #include "insn-config.h"
 #include "recog.h"
 #include "target.h"
-#include "output.h"
 #include "regs.h"
 #include "hard-reg-set.h"
 #include "flags.h"
Index: sel-sched-dump.c
===================================================================
--- sel-sched-dump.c	(revision 188024)
+++ sel-sched-dump.c	(working copy)
@@ -31,7 +31,6 @@ along with GCC; see the file COPYING3.  
 #include "insn-config.h"
 #include "insn-attr.h"
 #include "params.h"
-#include "output.h"
 #include "basic-block.h"
 #include "cselib.h"
 #include "target.h"
Index: stor-layout.c
===================================================================
--- stor-layout.c	(revision 188024)
+++ stor-layout.c	(working copy)
@@ -30,7 +30,6 @@ along with GCC; see the file COPYING3.  
 #include "flags.h"
 #include "function.h"
 #include "expr.h"
-#include "output.h"
 #include "diagnostic-core.h"
 #include "ggc.h"
 #include "target.h"
Index: lto-section-in.c
===================================================================
--- lto-section-in.c	(revision 188024)
+++ lto-section-in.c	(working copy)
@@ -38,7 +38,6 @@ along with GCC; see the file COPYING3.  
 #include "except.h"
 #include "vec.h"
 #include "timevar.h"
-#include "output.h"
 #include "lto-streamer.h"
 #include "lto-compress.h"
 #include "ggc.h"
Index: ira-emit.c
===================================================================
--- ira-emit.c	(revision 188024)
+++ ira-emit.c	(working copy)
@@ -84,7 +84,6 @@ along with GCC; see the file COPYING3.  
 #include "params.h"
 #include "timevar.h"
 #include "tree-pass.h"
-#include "output.h"
 #include "reload.h"
 #include "df.h"
 #include "ira-int.h"
Index: hw-doloop.c
===================================================================
--- hw-doloop.c	(revision 188024)
+++ hw-doloop.c	(working copy)
@@ -32,7 +32,6 @@ along with GCC; see the file COPYING3.  
 #include "df.h"
 #include "cfglayout.h"
 #include "cfgloop.h"
-#include "output.h"
 #include "recog.h"
 #include "target.h"
 #include "hw-doloop.h"
Index: gcse.c
===================================================================
--- gcse.c	(revision 188024)
+++ gcse.c	(working copy)
@@ -150,7 +150,6 @@ along with GCC; see the file COPYING3.  
 #include "insn-config.h"
 #include "recog.h"
 #include "basic-block.h"
-#include "output.h"
 #include "function.h"
 #include "expr.h"
 #include "except.h"
Index: alias.c
===================================================================
--- alias.c	(revision 188024)
+++ alias.c	(working copy)
@@ -33,7 +33,6 @@ along with GCC; see the file COPYING3.  
 #include "hard-reg-set.h"
 #include "basic-block.h"
 #include "flags.h"
-#include "output.h"
 #include "diagnostic-core.h"
 #include "cselib.h"
 #include "splay-tree.h"
Index: profile.c
===================================================================
--- profile.c	(revision 188024)
+++ profile.c	(working copy)
@@ -55,7 +55,6 @@ along with GCC; see the file COPYING3.  
 #include "tm.h"
 #include "rtl.h"
 #include "flags.h"
-#include "output.h"
 #include "regs.h"
 #include "expr.h"
 #include "function.h"
Index: ira-build.c
===================================================================
--- ira-build.c	(revision 188024)
+++ ira-build.c	(working copy)
@@ -35,7 +35,6 @@ along with GCC; see the file COPYING3.  
 #include "diagnostic-core.h"
 #include "params.h"
 #include "df.h"
-#include "output.h"
 #include "reload.h"
 #include "sparseset.h"
 #include "ira-int.h"
Index: loop-unroll.c
===================================================================
--- loop-unroll.c	(revision 188024)
+++ loop-unroll.c	(working copy)
@@ -29,7 +29,6 @@ along with GCC; see the file COPYING3.  
 #include "cfgloop.h"
 #include "cfglayout.h"
 #include "params.h"
-#include "output.h"
 #include "expr.h"
 #include "hashtab.h"
 #include "recog.h"
Index: tree-affine.c
===================================================================
--- tree-affine.c	(revision 188024)
+++ tree-affine.c	(working copy)
@@ -21,7 +21,6 @@ along with GCC; see the file COPYING3.  
 #include "system.h"
 #include "coretypes.h"
 #include "tree.h"
-#include "output.h"
 #include "tree-pretty-print.h"
 #include "tree-dump.h"
 #include "pointer-set.h"
Index: loop-doloop.c
===================================================================
--- loop-doloop.c	(revision 188024)
+++ loop-doloop.c	(working copy)
@@ -31,7 +31,6 @@ along with GCC; see the file COPYING3.  
 #include "diagnostic-core.h"
 #include "tm_p.h"
 #include "cfgloop.h"
-#include "output.h"
 #include "params.h"
 #include "target.h"
 
Index: bt-load.c
===================================================================
--- bt-load.c	(revision 188024)
+++ bt-load.c	(working copy)
@@ -26,7 +26,6 @@ along with GCC; see the file COPYING3.  
 #include "hard-reg-set.h"
 #include "regs.h"
 #include "fibheap.h"
-#include "output.h"
 #include "target.h"
 #include "expr.h"
 #include "flags.h"
Index: tree-dfa.c
===================================================================
--- tree-dfa.c	(revision 188024)
+++ tree-dfa.c	(working copy)
@@ -28,7 +28,6 @@ along with GCC; see the file COPYING3.  
 #include "tree.h"
 #include "tm_p.h"
 #include "basic-block.h"
-#include "output.h"
 #include "timevar.h"
 #include "ggc.h"
 #include "langhooks.h"
Index: store-motion.c
===================================================================
--- store-motion.c	(revision 188024)
+++ store-motion.c	(working copy)
@@ -34,7 +34,6 @@ along with GCC; see the file COPYING3.  
 #include "insn-config.h"
 #include "recog.h"
 #include "basic-block.h"
-#include "output.h"
 #include "function.h"
 #include "expr.h"
 #include "except.h"
Index: cselib.c
===================================================================
--- cselib.c	(revision 188024)
+++ cselib.c	(working copy)
@@ -34,7 +34,6 @@ along with GCC; see the file COPYING3.  
 #include "function.h"
 #include "emit-rtl.h"
 #include "diagnostic-core.h"
-#include "output.h"
 #include "ggc.h"
 #include "hashtab.h"
 #include "tree-pass.h"
Index: tree-cfgcleanup.c
===================================================================
--- tree-cfgcleanup.c	(revision 188024)
+++ tree-cfgcleanup.c	(working copy)
@@ -25,7 +25,6 @@ along with GCC; see the file COPYING3.  
 #include "tree.h"
 #include "tm_p.h"
 #include "basic-block.h"
-#include "output.h"
 #include "diagnostic-core.h"
 #include "flags.h"
 #include "function.h"
Index: cfgcleanup.c
===================================================================
--- cfgcleanup.c	(revision 188024)
+++ cfgcleanup.c	(working copy)
@@ -39,7 +39,6 @@ along with GCC; see the file COPYING3.  
 #include "hard-reg-set.h"
 #include "regs.h"
 #include "timevar.h"
-#include "output.h"
 #include "insn-config.h"
 #include "flags.h"
 #include "recog.h"
Index: simplify-rtx.c
===================================================================
--- simplify-rtx.c	(revision 188024)
+++ simplify-rtx.c	(working copy)
@@ -35,7 +35,6 @@ along with GCC; see the file COPYING3.  
 #include "function.h"
 #include "expr.h"
 #include "diagnostic-core.h"
-#include "output.h"
 #include "ggc.h"
 #include "target.h"
 
Index: loop-invariant.c
===================================================================
--- loop-invariant.c	(revision 188024)
+++ loop-invariant.c	(working copy)
@@ -47,7 +47,6 @@ along with GCC; see the file COPYING3.  
 #include "cfgloop.h"
 #include "expr.h"
 #include "recog.h"
-#include "output.h"
 #include "function.h"
 #include "flags.h"
 #include "df.h"
Index: loop-iv.c
===================================================================
--- loop-iv.c	(revision 188024)
+++ loop-iv.c	(working copy)
@@ -59,7 +59,6 @@ along with GCC; see the file COPYING3.  
 #include "cfgloop.h"
 #include "expr.h"
 #include "intl.h"
-#include "output.h"
 #include "diagnostic-core.h"
 #include "df.h"
 #include "hashtab.h"
Index: tree-ssa-copy.c
===================================================================
--- tree-ssa-copy.c	(revision 188024)
+++ tree-ssa-copy.c	(working copy)
@@ -26,7 +26,6 @@ along with GCC; see the file COPYING3.  
 #include "flags.h"
 #include "tm_p.h"
 #include "basic-block.h"
-#include "output.h"
 #include "function.h"
 #include "tree-pretty-print.h"
 #include "gimple-pretty-print.h"
Index: cfglayout.c
===================================================================
--- cfglayout.c	(revision 188024)
+++ cfglayout.c	(working copy)
@@ -28,7 +28,6 @@ along with GCC; see the file COPYING3.  
 #include "obstack.h"
 #include "basic-block.h"
 #include "insn-config.h"
-#include "output.h"
 #include "function.h"
 #include "cfglayout.h"
 #include "cfgloop.h"
Index: tree-ssa.c
===================================================================
--- tree-ssa.c	(revision 188024)
+++ tree-ssa.c	(working copy)
@@ -29,7 +29,6 @@ along with GCC; see the file COPYING3.  
 #include "ggc.h"
 #include "langhooks.h"
 #include "basic-block.h"
-#include "output.h"
 #include "function.h"
 #include "tree-pretty-print.h"
 #include "gimple-pretty-print.h"
Index: tree-ssa-loop-prefetch.c
===================================================================
--- tree-ssa-loop-prefetch.c	(revision 188024)
+++ tree-ssa-loop-prefetch.c	(working copy)
@@ -25,7 +25,6 @@ along with GCC; see the file COPYING3.  
 #include "tree.h"
 #include "tm_p.h"
 #include "basic-block.h"
-#include "output.h"
 #include "tree-pretty-print.h"
 #include "tree-flow.h"
 #include "tree-dump.h"
Index: tree-optimize.c
===================================================================
--- tree-optimize.c	(revision 188024)
+++ tree-optimize.c	(working copy)
@@ -26,7 +26,6 @@ along with GCC; see the file COPYING3.  
 #include "tree.h"
 #include "tm_p.h"
 #include "basic-block.h"
-#include "output.h"
 #include "flags.h"
 #include "tree-flow.h"
 #include "tree-dump.h"
Index: combine.c
===================================================================
--- combine.c	(revision 188024)
+++ combine.c	(working copy)
@@ -97,8 +97,6 @@ along with GCC; see the file COPYING3.  
 #include "optabs.h"
 #include "insn-codes.h"
 #include "rtlhooks-def.h"
-/* Include output.h for dump_file.  */
-#include "output.h"
 #include "params.h"
 #include "timevar.h"
 #include "tree-pass.h"
Index: cprop.c
===================================================================
--- cprop.c	(revision 188024)
+++ cprop.c	(working copy)
@@ -34,7 +34,6 @@ along with GCC; see the file COPYING3.  
 #include "insn-config.h"
 #include "recog.h"
 #include "basic-block.h"
-#include "output.h"
 #include "function.h"
 #include "expr.h"
 #include "except.h"
Index: var-tracking.c
===================================================================
--- var-tracking.c	(revision 188024)
+++ var-tracking.c	(working copy)
@@ -96,7 +96,6 @@
 #include "hard-reg-set.h"
 #include "basic-block.h"
 #include "flags.h"
-#include "output.h"
 #include "insn-config.h"
 #include "reload.h"
 #include "sbitmap.h"
Index: cfgloop.c
===================================================================
--- cfgloop.c	(revision 188024)
+++ cfgloop.c	(working copy)
@@ -33,7 +33,6 @@ along with GCC; see the file COPYING3.  
 #include "tree.h"
 #include "tree-flow.h"
 #include "pointer-set.h"
-#include "output.h"
 #include "ggc.h"
 
 static void flow_loops_cfg_dump (FILE *);
Index: tree-profile.c
===================================================================
--- tree-profile.c	(revision 188024)
+++ tree-profile.c	(working copy)
@@ -45,7 +45,6 @@ along with GCC; see the file COPYING3.  
 #include "cgraph.h"
 #include "profile.h"
 #include "target.h"
-#include "output.h"
 
 static GTY(()) tree gcov_type_node;
 static GTY(()) tree gcov_type_tmp_var;
Index: df-problems.c
===================================================================
--- df-problems.c	(revision 188024)
+++ df-problems.c	(working copy)
@@ -32,7 +32,6 @@ along with GCC; see the file COPYING3.  
 #include "recog.h"
 #include "function.h"
 #include "regs.h"
-#include "output.h"
 #include "alloc-pool.h"
 #include "flags.h"
 #include "hard-reg-set.h"
Index: reg-stack.c
===================================================================
--- reg-stack.c	(revision 188024)
+++ reg-stack.c	(working copy)
@@ -164,7 +164,6 @@
 #include "hard-reg-set.h"
 #include "flags.h"
 #include "recog.h"
-#include "output.h"
 #include "basic-block.h"
 #include "cfglayout.h"
 #include "reload.h"
Index: tree-ssa-structalias.c
===================================================================
--- tree-ssa-structalias.c	(revision 188024)
+++ tree-ssa-structalias.c	(working copy)
@@ -28,7 +28,6 @@
 #include "bitmap.h"
 #include "flags.h"
 #include "basic-block.h"
-#include "output.h"
 #include "tree.h"
 #include "tree-flow.h"
 #include "tree-inline.h"
Index: tree-cfg.c
===================================================================
--- tree-cfg.c	(revision 188024)
+++ tree-cfg.c	(working copy)
@@ -26,7 +26,6 @@ along with GCC; see the file COPYING3.  
 #include "tree.h"
 #include "tm_p.h"
 #include "basic-block.h"
-#include "output.h"
 #include "flags.h"
 #include "function.h"
 #include "ggc.h"
Index: ree.c
===================================================================
--- ree.c	(revision 188024)
+++ ree.c	(working copy)
@@ -237,8 +237,6 @@ along with GCC; see the file COPYING3.  
 #include "optabs.h"
 #include "insn-codes.h"
 #include "rtlhooks-def.h"
-/* Include output.h for dump_file.  */
-#include "output.h"
 #include "params.h"
 #include "timevar.h"
 #include "tree-pass.h"
Index: combine-stack-adj.c
===================================================================
--- combine-stack-adj.c	(revision 188024)
+++ combine-stack-adj.c	(working copy)
@@ -48,7 +48,6 @@ along with GCC; see the file COPYING3.  
 #include "tm_p.h"
 #include "insn-config.h"
 #include "recog.h"
-#include "output.h"
 #include "regs.h"
 #include "hard-reg-set.h"
 #include "flags.h"
Index: cfgrtl.c
===================================================================
--- cfgrtl.c	(revision 188024)
+++ cfgrtl.c	(working copy)
@@ -48,7 +48,6 @@ along with GCC; see the file COPYING3.  
 #include "basic-block.h"
 #include "regs.h"
 #include "flags.h"
-#include "output.h"
 #include "function.h"
 #include "except.h"
 #include "rtl-error.h"
Index: tree-ssa-threadedge.c
===================================================================
--- tree-ssa-threadedge.c	(revision 188024)
+++ tree-ssa-threadedge.c	(working copy)
@@ -28,7 +28,6 @@ along with GCC; see the file COPYING3.  
 #include "tm_p.h"
 #include "basic-block.h"
 #include "cfgloop.h"
-#include "output.h"
 #include "function.h"
 #include "timevar.h"
 #include "tree-dump.h"
Index: regcprop.c
===================================================================
--- regcprop.c	(revision 188024)
+++ regcprop.c	(working copy)
@@ -30,7 +30,6 @@
 #include "hard-reg-set.h"
 #include "basic-block.h"
 #include "reload.h"
-#include "output.h"
 #include "function.h"
 #include "recog.h"
 #include "flags.h"
Index: reload1.c
===================================================================
--- reload1.c	(revision 188024)
+++ reload1.c	(working copy)
@@ -41,7 +41,6 @@ along with GCC; see the file COPYING3.  
 #include "df.h"
 #include "reload.h"
 #include "recog.h"
-#include "output.h"
 #include "except.h"
 #include "tree.h"
 #include "ira.h"
Index: config/m32r/m32r.c
===================================================================
--- config/m32r/m32r.c	(revision 188024)
+++ config/m32r/m32r.c	(working copy)
@@ -29,6 +29,7 @@
 #include "insn-config.h"
 #include "conditions.h"
 #include "output.h"
+#include "dbxout.h"
 #include "insn-attr.h"
 #include "flags.h"
 #include "expr.h"
Index: config/pa/pa.c
===================================================================
--- config/pa/pa.c	(revision 188024)
+++ config/pa/pa.c	(working copy)
@@ -33,6 +33,7 @@ along with GCC; see the file COPYING3.  
 #include "flags.h"
 #include "tree.h"
 #include "output.h"
+#include "dbxout.h"
 #include "except.h"
 #include "expr.h"
 #include "optabs.h"
Index: config/rs6000/rs6000.c
===================================================================
--- config/rs6000/rs6000.c	(revision 188024)
+++ config/rs6000/rs6000.c	(working copy)
@@ -40,6 +40,7 @@
 #include "except.h"
 #include "function.h"
 #include "output.h"
+#include "dbxout.h"
 #include "basic-block.h"
 #include "diagnostic-core.h"
 #include "toplev.h"
Index: c-family/c-ada-spec.c
===================================================================
--- c-family/c-ada-spec.c	(revision 188024)
+++ c-family/c-ada-spec.c	(working copy)
@@ -25,7 +25,6 @@ along with GCC; see the file COPYING3.  
 #include "tm.h"
 #include "tree.h"
 #include "tree-pass.h"	/* For TDI_ada and friends.  */
-#include "output.h"
 #include "c-ada-spec.h"
 #include "cpplib.h"
 #include "c-pragma.h"
Index: c-family/c-semantics.c
===================================================================
--- c-family/c-semantics.c	(revision 188024)
+++ c-family/c-semantics.c	(working copy)
@@ -28,7 +28,6 @@ along with GCC; see the file COPYING3.  
 #include "splay-tree.h"
 #include "c-common.h"
 #include "flags.h"
-#include "output.h"
 #include "tree-iterator.h"
 
 /* Create an empty statement tree rooted at T.  */
Index: c-family/c-pch.c
===================================================================
--- c-family/c-pch.c	(revision 188024)
+++ c-family/c-pch.c	(working copy)
@@ -26,7 +26,7 @@ along with GCC; see the file COPYING3.  
 #include "tree.h"
 #include "flags.h"
 #include "c-common.h"
-#include "output.h"
+#include "output.h" /* for asm_out_file */
 #include "debug.h"
 #include "c-pragma.h"
 #include "ggc.h"
Index: c-family/c-lex.c
===================================================================
--- c-family/c-lex.c	(revision 188024)
+++ c-family/c-lex.c	(working copy)
@@ -26,7 +26,7 @@ along with GCC; see the file COPYING3.  
 
 #include "tree.h"
 #include "input.h"
-#include "output.h"
+#include "output.h" /* for asm_out_file */
 #include "c-common.h"
 #include "flags.h"
 #include "timevar.h"
Index: cp/lex.c
===================================================================
--- cp/lex.c	(revision 188024)
+++ cp/lex.c	(working copy)
@@ -34,7 +34,6 @@ along with GCC; see the file COPYING3.  
 #include "flags.h"
 #include "c-family/c-pragma.h"
 #include "c-family/c-objc.h"
-#include "output.h"
 #include "tm_p.h"
 #include "timevar.h"
 
Index: cp/init.c
===================================================================
--- cp/init.c	(revision 188024)
+++ cp/init.c	(working copy)
@@ -29,7 +29,6 @@ along with GCC; see the file COPYING3.  
 #include "tree.h"
 #include "cp-tree.h"
 #include "flags.h"
-#include "output.h"
 #include "target.h"
 
 static bool begin_init_stmts (tree *, tree *);
Index: cp/class.c
===================================================================
--- cp/class.c	(revision 188024)
+++ cp/class.c	(working copy)
@@ -31,7 +31,6 @@ along with GCC; see the file COPYING3.  
 #include "tree.h"
 #include "cp-tree.h"
 #include "flags.h"
-#include "output.h"
 #include "toplev.h"
 #include "target.h"
 #include "convert.h"
Index: cp/method.c
===================================================================
--- cp/method.c	(revision 188024)
+++ cp/method.c	(working copy)
@@ -29,7 +29,6 @@ along with GCC; see the file COPYING3.  
 #include "tm.h"
 #include "tree.h"
 #include "cp-tree.h"
-#include "output.h"
 #include "flags.h"
 #include "toplev.h"
 #include "tm_p.h"
Index: cp/rtti.c
===================================================================
--- cp/rtti.c	(revision 188024)
+++ cp/rtti.c	(working copy)
@@ -28,7 +28,6 @@ along with GCC; see the file COPYING3.  
 #include "tree.h"
 #include "cp-tree.h"
 #include "flags.h"
-#include "output.h"
 #include "convert.h"
 #include "target.h"
 #include "c-family/c-pragma.h"
Index: cp/except.c
===================================================================
--- cp/except.c	(revision 188024)
+++ cp/except.c	(working copy)
@@ -30,7 +30,6 @@ along with GCC; see the file COPYING3.  
 #include "tree.h"
 #include "cp-tree.h"
 #include "flags.h"
-#include "output.h"
 #include "tree-inline.h"
 #include "tree-iterator.h"
 #include "target.h"
Index: cp/pt.c
===================================================================
--- cp/pt.c	(revision 188024)
+++ cp/pt.c	(working copy)
@@ -40,7 +40,6 @@ along with GCC; see the file COPYING3.  
 #include "cp-objcp-common.h"
 #include "tree-inline.h"
 #include "decl.h"
-#include "output.h"
 #include "toplev.h"
 #include "timevar.h"
 #include "tree-iterator.h"
Index: cp/parser.c
===================================================================
--- cp/parser.c	(revision 188024)
+++ cp/parser.c	(working copy)
@@ -32,7 +32,6 @@ along with GCC; see the file COPYING3.  
 #include "decl.h"
 #include "flags.h"
 #include "diagnostic-core.h"
-#include "output.h"
 #include "target.h"
 #include "cgraph.h"
 #include "c-family/c-common.h"
Index: cp/call.c
===================================================================
--- cp/call.c	(revision 188024)
+++ cp/call.c	(working copy)
@@ -31,7 +31,6 @@ along with GCC; see the file COPYING3.  
 #include "tm.h"
 #include "tree.h"
 #include "cp-tree.h"
-#include "output.h"
 #include "flags.h"
 #include "toplev.h"
 #include "diagnostic-core.h"
Index: cp/search.c
===================================================================
--- cp/search.c	(revision 188024)
+++ cp/search.c	(working copy)
@@ -32,7 +32,6 @@ along with GCC; see the file COPYING3.  
 #include "cp-tree.h"
 #include "intl.h"
 #include "flags.h"
-#include "output.h"
 #include "toplev.h"
 #include "target.h"
 
Index: objc/objc-next-runtime-abi-01.c
===================================================================
--- objc/objc-next-runtime-abi-01.c	(revision 188024)
+++ objc/objc-next-runtime-abi-01.c	(working copy)
@@ -49,7 +49,7 @@ along with GCC; see the file COPYING3.  
 
 #include "ggc.h"
 #include "target.h"
-#include "output.h"
+#include "output.h" /* for asm_out_file */
 #include "tree-iterator.h"
 
 #include "objc-runtime-hooks.h"
Index: objc/objc-act.c
===================================================================
--- objc/objc-act.c	(revision 188024)
+++ objc/objc-act.c	(working copy)
@@ -43,7 +43,6 @@ along with GCC; see the file COPYING3.  
 #include "objc-map.h"
 #include "input.h"
 #include "function.h"
-#include "output.h"
 #include "toplev.h"
 #include "ggc.h"
 #include "debug.h"
Index: fortran/trans-common.c
===================================================================
--- fortran/trans-common.c	(revision 188024)
+++ fortran/trans-common.c	(working copy)
@@ -99,7 +99,6 @@ along with GCC; see the file COPYING3.  
 #include "coretypes.h"
 #include "tm.h"
 #include "tree.h"
-#include "output.h"	/* For decl_default_tls_model.  */
 #include "gfortran.h"
 #include "trans.h"
 #include "trans-types.h"
Index: fortran/trans-decl.c
===================================================================
--- fortran/trans-decl.c	(revision 188024)
+++ fortran/trans-decl.c	(working copy)
@@ -32,7 +32,6 @@ along with GCC; see the file COPYING3.  
 #include "ggc.h"
 #include "diagnostic-core.h"	/* For internal_error.  */
 #include "toplev.h"	/* For announce_function.  */
-#include "output.h"	/* For decl_default_tls_model.  */
 #include "target.h"
 #include "function.h"
 #include "flags.h"
Index: java/resource.c
===================================================================
--- java/resource.c	(revision 188024)
+++ java/resource.c	(working copy)
@@ -30,7 +30,6 @@ The Free Software Foundation is independ
 #include "jcf.h"
 #include "diagnostic-core.h"
 #include "toplev.h"
-#include "output.h"
 #include "parse.h"
 #include "function.h"
 #include "ggc.h"

Re: [patch] Do not include output.h everywhere

[Diego Novillo]

On 12-05-31 14:57 , Steven Bosscher wrote:
> Hello,
>
> Almost all files include output.h because it defines dump_file. IMHO
> output.h should only be included in files that actually output
> something to asm_out_file. Therefore wanted to I move dump_file to
> some other include file. I ended up with system.h because I couldn't
> find a more suitable place. Another option is coretypes.h, but no
> other file is included everywhere, and system.h also already defines
> fancy_abort, which is also for dumping things - sort of... Anyway, the
> point is that with dump_file moved out of output.h, ~120 files don't
> have to include output.h anymore.

What about toplev.h?  dump_file is defined there, after all.  I don't 
mind it in system.h, if that's not a good place for it now.  The patch 
is OK either way.

> While working on the above, I noticed we can also move all dbxout
> prototypes from output.h to dbxout.h, and move some stabs-related
> target hooks there also.

Sounds good.

> Big patch, but IMHO a nice cleanup too :-)

Indeed.

>
> 	* gcov-dump.c (dump_file): Rename to dump_gcov_file.  Update callers.
>
> 	* collect2.h (dump_file): Rename to dump_ld_file.

Thanks.  I've always hated tagging for dump_file and stopping here.


Diego.

Re: [patch] Do not include output.h everywhere

[Richard Guenther]

On Thu, May 31, 2012 at 9:21 PM, Diego Novillo <dnovillo@google.com> wrote:
> On 12-05-31 14:57 , Steven Bosscher wrote:
>>
>> Hello,
>>
>> Almost all files include output.h because it defines dump_file. IMHO
>> output.h should only be included in files that actually output
>> something to asm_out_file. Therefore wanted to I move dump_file to
>> some other include file. I ended up with system.h because I couldn't
>> find a more suitable place. Another option is coretypes.h, but no
>> other file is included everywhere, and system.h also already defines
>> fancy_abort, which is also for dumping things - sort of... Anyway, the
>> point is that with dump_file moved out of output.h, ~120 files don't
>> have to include output.h anymore.
>
>
> What about toplev.h?  dump_file is defined there, after all.  I don't mind
> it in system.h, if that's not a good place for it now.  The patch is OK
> either way.

I'd prefer toplev.h, too.  system.h is supposed to be for system header
inclusion (and related workarounds).

>
>> While working on the above, I noticed we can also move all dbxout
>> prototypes from output.h to dbxout.h, and move some stabs-related
>> target hooks there also.
>
>
> Sounds good.
>
>
>> Big patch, but IMHO a nice cleanup too :-)
>
>
> Indeed.

Thus, ok with moving to toplev.h instead.

>>
>>        * gcov-dump.c (dump_file): Rename to dump_gcov_file.  Update
>> callers.
>>
>>        * collect2.h (dump_file): Rename to dump_ld_file.
>
>
> Thanks.  I've always hated tagging for dump_file and stopping here.
>
>
> Diego.

Re: [patch] Do not include output.h everywhere

[Steven Bosscher]

On Fri, Jun 1, 2012 at 11:19 AM, Richard Guenther
<richard.guenther@gmail.com> wrote:
>> What about toplev.h?  dump_file is defined there, after all.  I don't mind
>> it in system.h, if that's not a good place for it now.  The patch is OK
>> either way.
>
> I'd prefer toplev.h, too.  system.h is supposed to be for system header
> inclusion (and related workarounds).
(..)
> Thus, ok with moving to toplev.h instead.

I had already committed this on Friday.

The problem with toplev.h is that it isn't included in any tree-*.c
file (except tree-dump.c and tree-optimize.c). Also, there is nothing
"top-level" about an RTL or GIMPLE pass. Perhaps I should create a new
header with all the dump and statistics stuff?

Ciao!
Steven

Re: [patch] Do not include output.h everywhere

[Richard Guenther]

On Mon, Jun 4, 2012 at 9:00 AM, Steven Bosscher <stevenb.gcc@gmail.com> wrote:
> On Fri, Jun 1, 2012 at 11:19 AM, Richard Guenther
> <richard.guenther@gmail.com> wrote:
>>> What about toplev.h?  dump_file is defined there, after all.  I don't mind
>>> it in system.h, if that's not a good place for it now.  The patch is OK
>>> either way.
>>
>> I'd prefer toplev.h, too.  system.h is supposed to be for system header
>> inclusion (and related workarounds).
> (..)
>> Thus, ok with moving to toplev.h instead.
>
> I had already committed this on Friday.
>
> The problem with toplev.h is that it isn't included in any tree-*.c
> file (except tree-dump.c and tree-optimize.c). Also, there is nothing
> "top-level" about an RTL or GIMPLE pass. Perhaps I should create a new
> header with all the dump and statistics stuff?

There is already statistics.h and tree-dump.h, why is dump_file not in
tree-dump.h for example?  I admit it's all some of a mess ;)  But system.h
doesn't look right to me.

Richard.

> Ciao!
> Steven

Re: [patch] Do not include output.h everywhere

[Steven Bosscher]

On Mon, Jun 4, 2012 at 11:42 AM, Richard Guenther
<richard.guenther@gmail.com> wrote:
> There is already statistics.h and tree-dump.h, why is dump_file not in
> tree-dump.h for example?  I admit it's all some of a mess ;)

Because tree-dump.h is about tree dumps (and gimple dumps). Yes, it is a mess.

> But system.h
> doesn't look right to me.

Fully agreed there.

I'll see if I can come up with a plan to remove some of this mess.

Ciao!
Steven