There was a recent change which causes ira-int.h to depend on recog.h.. but doesnt include it. Every file which needs it included it before I think, it just required some shuffling of order.

By including recog.h in ira-int.h ordering issues are fixed, and we can simply remove recog.h form every file that includes ira-int.h

Bootstraps on x86_64-pc-linux-gnu with no new regressions.

OK for trunk?

Andrew


	* ira-int.h: Include recog.h.
	* ira-build.c: Don't include recog.h.
	* ira-color.c: Likewise.
	* ira-conflicts.c: Likewise.
	* ira-costs.c: Likewise.
	* ira-emit.c: Likewise.
	* ira-lives.c: Likewise.
	* ira.c: Likewise.
	* sched-deps.c: Likewise.
	* sel-sched.c: Likewise.
	* target-globals.c: Likewise.


Index: ira-int.h
===================================================================
*** ira-int.h	(revision 226807)
--- ira-int.h	(working copy)
*************** along with GCC; see the file COPYING3.
*** 21,26 ****
--- 21,28 ----
  #ifndef GCC_IRA_INT_H
  #define GCC_IRA_INT_H
  
+ #include "recog.h"
+ 
  /* To provide consistency in naming, all IRA external variables,
     functions, common typedefs start with prefix ira_.  */
  
Index: ira-build.c
===================================================================
*** ira-build.c	(revision 226807)
--- ira-build.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 30,36 ****
  #include "regs.h"
  #include "flags.h"
  #include "insn-config.h"
- #include "recog.h"
  #include "diagnostic-core.h"
  #include "params.h"
  #include "reload.h"
--- 30,35 ----
Index: ira-color.c
===================================================================
*** ira-color.c	(revision 226807)
--- ira-color.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 46,52 ****
  #include "cfgloop.h"
  #include "ira.h"
  #include "alloc-pool.h"
- #include "recog.h"
  #include "ira-int.h"
  
  typedef struct allocno_hard_regs *allocno_hard_regs_t;
--- 46,51 ----
Index: ira-conflicts.c
===================================================================
*** ira-conflicts.c	(revision 226807)
--- ira-conflicts.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 30,36 ****
  #include "target.h"
  #include "flags.h"
  #include "insn-config.h"
- #include "recog.h"
  #include "diagnostic-core.h"
  #include "params.h"
  #include "sparseset.h"
--- 30,35 ----
Index: ira-costs.c
===================================================================
*** ira-costs.c	(revision 226807)
--- ira-costs.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 39,45 ****
  #include "tm_p.h"
  #include "regs.h"
  #include "addresses.h"
- #include "recog.h"
  #include "reload.h"
  #include "diagnostic-core.h"
  #include "target.h"
--- 39,44 ----
Index: ira-emit.c
===================================================================
*** ira-emit.c	(revision 226807)
--- ira-emit.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 89,95 ****
  #include "varasm.h"
  #include "stmt.h"
  #include "expr.h"
- #include "recog.h"
  #include "params.h"
  #include "reload.h"
  #include "cfgloop.h"
--- 89,94 ----
Index: ira-lives.c
===================================================================
*** ira-lives.c	(revision 226807)
--- ira-lives.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 31,37 ****
  #include "flags.h"
  #include "except.h"
  #include "insn-config.h"
- #include "recog.h"
  #include "diagnostic-core.h"
  #include "params.h"
  #include "sparseset.h"
--- 31,36 ----
Index: ira.c
===================================================================
*** ira.c	(revision 226807)
--- ira.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 387,393 ****
  #include "varasm.h"
  #include "stmt.h"
  #include "expr.h"
- #include "recog.h"
  #include "params.h"
  #include "tree-pass.h"
  #include "output.h"
--- 387,392 ----
Index: sched-deps.c
===================================================================
*** sched-deps.c	(revision 226807)
--- sched-deps.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 35,41 ****
  #include "insn-config.h"
  #include "insn-attr.h"
  #include "except.h"
- #include "recog.h"
  #include "emit-rtl.h"
  #include "cfgbuild.h"
  #include "sched-int.h"
--- 35,40 ----
Index: sel-sched.c
===================================================================
*** sel-sched.c	(revision 226807)
--- sel-sched.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 32,38 ****
  #include "insn-config.h"
  #include "insn-attr.h"
  #include "except.h"
- #include "recog.h"
  #include "params.h"
  #include "target.h"
  #include "output.h"
--- 32,37 ----
Index: target-globals.c
===================================================================
*** target-globals.c	(revision 226807)
--- target-globals.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 44,56 ****
  #include "cfgloop.h"
  #include "ira.h"
  #include "alloc-pool.h"
- #include "recog.h"
  #include "ira-int.h"
  #include "builtins.h"
  #include "gcse.h"
  #include "bb-reorder.h"
  #include "lower-subreg.h"
- #include "recog.h"
  
  #if SWITCHABLE_TARGET
  struct target_globals default_target_globals = {
--- 44,54 ----

Reply via email to