diff mbox

flatten/adjust optabs.h

Message ID 54525C7F.8060907@redhat.com
State New
Headers show

Commit Message

Andrew MacLeod Oct. 30, 2014, 3:42 p.m. UTC 
This patch "adjusts" optabs.h.  which was really sub-work of looking at 
expr.h.

I moved the prototypes from expr.h to optabs.h that belong there, and 
realigned the stuff in optabs.h to be in the same order as the .c file.
I also moved gen_move_insn from optabs.c to expr.c... a number of new 
files would have required optabs.h to compile just for that funciton, 
and gen_move_insn primarily calls emit-move_insn_1 which is defined in 
expr.c anyway.. so it makes sense to be there.

the one thing Im on the fence about is insn-opinit.h.   This is *only* 
included from optabs.h, so I am inclined to leave it as an include from 
optabs.h.  We'd likely just be putting it back there later anyway.

I also moved the first section of optabs.h into genopinit.c... that 
contains the parts which define structures, prototypes and a couple of 
small inlines for things in insn-opinit.c.. so I figured we may as well 
may insn-opinit.h follow the same pattern and list the exports and such 
for insn-opinit.c.    Now, ultimately I don't feel strongly about that 
since insn-opinit.h is always included from optabs.h...  if someone 
objects I can move them back out of the generated file.

Other than that, its just more header adjustments.

bootstraps on x86_64-unknown-linux-gnu, testsuite regressions a re 
running (I expect none again) and I'll ruin it through a full set of 
targets from contrib/config-list.mk.
Assuming no issues, ok for trunk?

Andrew

Comments

Jeff Law Oct. 31, 2014, 5:21 p.m. UTC | #1 
On 10/30/14 09:42, Andrew MacLeod wrote:
> This patch "adjusts" optabs.h.  which was really sub-work of looking at
> expr.h.
>
> I moved the prototypes from expr.h to optabs.h that belong there, and
> realigned the stuff in optabs.h to be in the same order as the .c file.
> I also moved gen_move_insn from optabs.c to expr.c... a number of new
> files would have required optabs.h to compile just for that funciton,
> and gen_move_insn primarily calls emit-move_insn_1 which is defined in
> expr.c anyway.. so it makes sense to be there.
>
> the one thing Im on the fence about is insn-opinit.h.   This is *only*
> included from optabs.h, so I am inclined to leave it as an include from
> optabs.h.  We'd likely just be putting it back there later anyway.
>
> I also moved the first section of optabs.h into genopinit.c... that
> contains the parts which define structures, prototypes and a couple of
> small inlines for things in insn-opinit.c.. so I figured we may as well
> may insn-opinit.h follow the same pattern and list the exports and such
> for insn-opinit.c.    Now, ultimately I don't feel strongly about that
> since insn-opinit.h is always included from optabs.h...  if someone
> objects I can move them back out of the generated file.
>
> Other than that, its just more header adjustments.
>
> bootstraps on x86_64-unknown-linux-gnu, testsuite regressions a re
> running (I expect none again) and I'll ruin it through a full set of
> targets from contrib/config-list.mk.
> Assuming no issues, ok for trunk?
>
> Andrew
>
>
> optab1.patch
>
>
> 	* optabs.h: Flatten insn-codes.h to source files.  Move some prototypes
> 	and structs to genopinit.c.  Adjust protyoptypes to match optabs.c.
> 	* genopinit.c (main): Emit prototypes and structs into insn-opinit.h.
> 	* optabs.c: (gen_move_insn): Move to expr.c.
> 	* expr.h: Move protypes and enums to optabs.h.
> 	* expr.c: (gen_move_insn): Relocate from optabs.c.
> 	* genemit.c (main): Include insn-codes.h.
> 	* gengtype.c (open_base_files): Include insn-codes.h.
OK.  No strong feelings on the insn-opinit issue and it'd be easy to 
change it if we want to do something different.

Maybe you've hit on a reasonable exception to the general rule of not 
including other files in a .h file.  I doubt we'd really know until 
we're further along in this process.

Jeff
diff mbox

Patch


	* asan.c: Include insn-codes.h.
	* bb-reorder.c: Ditto.
	* builtins.c: Ditto.
	* calls.c: Ditto.
	* cfgexpand.c: Ditto.
	* cilk-common.c: Ditto.
	* combine.c: Ditto.
	* dojump.c: Ditto.
	* dse.c: Ditto.
	* explow.c: Ditto.
	* expmed.c: Ditto.
	* function.c: Ditto.
	* ifcvt.c: Ditto.
	* internal-fn.c: Ditto.
	* loop-unroll.c: Ditto.
	* lra.c: Ditto.
	* modulo-sched.c: Ditto.
	* omp-low.c: Ditto.
	* postreload.c: Ditto.
	* ree.c: Ditto.
	* reload.c: Ditto.
	* reload1.c: Ditto.
	* shrink-wrap.c: Ditto.
	* simplify-rtx.c: Ditto.
	* stmt.c: Ditto.
	* target-globals.c: Ditto.
	* targhooks.c: Ditto.
	* toplev.c: Ditto.
	* tree-if-conv.c: Ditto.
	* tree-ssa-forwprop.c: Ditto.
	* tree-ssa-loop-prefetch.c: Ditto.
	* tree-ssa-math-opts.c: Ditto.
	* tree-ssa-phiopt.c: Ditto.
	* tree-ssa-reassoc.c: Ditto.
	* tree-switch-conversion.c: Ditto.
	* tree-vect-data-refs.c: Ditto.
	* tree-vect-generic.c: Ditto.
	* tree-vect-loop.c: Ditto.
	* tree-vect-patterns.c: Ditto.
	* tree-vect-slp.c: Ditto.
	* tree-vect-stmts.c: Ditto.
	* tree-vrp.c: Ditto.
	* value-prof.c: Ditto.
	* config/aarch64/aarch64-builtins.c: Ditto.
	* config/alpha/alpha.c: Ditto.
	* config/arm/arm.c: Ditto.
	* config/cris/cris.c: Ditto.
	* config/frv/frv.c: Ditto.
	* config/h8300/h8300.c: Ditto.
	* config/ia64/ia64.c: Ditto.
	* config/iq2000/iq2000.c: Ditto.
	* config/m32c/m32c.c: Ditto.
	* config/mep/mep.c: Ditto.
	* config/microblaze/microblaze.c: Ditto.
	* config/mips/mips.c: Ditto.
	* config/mn10300/mn10300.c: Ditto.
	* config/moxie/moxie.c: Ditto.
	* config/msp430/msp430.c: Ditto.
	* config/nios2/nios2.c: Ditto.
	* config/pa/pa.c: Ditto.
	* config/rl78/rl78.c: Ditto.
	* config/rs6000/rs6000.c: Ditto.
	* config/rx/rx.c: Ditto.
	* config/s390/s390.c: Ditto.
	* config/sh/sh.c: Ditto.
	* config/spu/spu.c: Ditto.
	* config/stormy16/stormy16.c: Ditto.
	* config/tilegx/mul-tables.c: Ditto.
	* config/tilegx/tilegx.c: Ditto.
	* config/tilepro/mul-tables.c: Ditto.
	* config/tilepro/tilepro.c: Ditto.
	* config/vax/vax.c: Ditto.

Index: asan.c
===================================================================
--- asan.c	(revision 216805)
+++ asan.c	(working copy)
@@ -60,6 +60,7 @@ 
 #include "gimple-pretty-print.h"
 #include "target.h"
 #include "expr.h"
+#include "insn-codes.h"
 #include "optabs.h"
 #include "output.h"
 #include "tm_p.h"
Index: bb-reorder.c
===================================================================
--- bb-reorder.c	(revision 216805)
+++ bb-reorder.c	(working copy)
@@ -99,6 +99,7 @@ 
 #include "tm_p.h"
 #include "obstack.h"
 #include "expr.h"
+#include "optabs.h"
 #include "params.h"
 #include "diagnostic-core.h"
 #include "toplev.h" /* user_defined_section_attribute */
Index: builtins.c
===================================================================
--- builtins.c	(revision 216804)
+++ builtins.c	(working copy)
@@ -49,6 +49,7 @@ 
 #include "except.h"
 #include "insn-config.h"
 #include "expr.h"
+#include "insn-codes.h"
 #include "optabs.h"
 #include "libfuncs.h"
 #include "recog.h"
Index: calls.c
===================================================================
--- calls.c	(revision 216805)
+++ calls.c	(working copy)
@@ -43,6 +43,7 @@ 
 #include "gimple.h"
 #include "flags.h"
 #include "expr.h"
+#include "insn-codes.h"
 #include "optabs.h"
 #include "libfuncs.h"
 #include "regs.h"
Index: cfgexpand.c
===================================================================
--- cfgexpand.c	(revision 216805)
+++ cfgexpand.c	(working copy)
@@ -44,6 +44,8 @@ 
 #include "cfgbuild.h"
 #include "cfgcleanup.h"
 #include "basic-block.h"
+#include "insn-codes.h"
+#include "optabs.h"
 #include "expr.h"
 #include "langhooks.h"
 #include "bitmap.h"
Index: cilk-common.c
===================================================================
--- cilk-common.c	(revision 216804)
+++ cilk-common.c	(working copy)
@@ -28,6 +28,7 @@ 
 #include "stor-layout.h"
 #include "langhooks.h"
 #include "expr.h"
+#include "insn-codes.h"
 #include "optabs.h"
 #include "recog.h"
 #include "tree-iterator.h"
Index: combine.c
===================================================================
--- combine.c	(revision 216805)
+++ combine.c	(working copy)
@@ -105,8 +105,8 @@ 
 #include "recog.h"
 #include "diagnostic-core.h"
 #include "target.h"
+#include "insn-codes.h"
 #include "optabs.h"
-#include "insn-codes.h"
 #include "rtlhooks-def.h"
 #include "params.h"
 #include "tree-pass.h"
Index: config/aarch64/aarch64-builtins.c
===================================================================
--- config/aarch64/aarch64-builtins.c	(revision 216804)
+++ config/aarch64/aarch64-builtins.c	(working copy)
@@ -32,6 +32,7 @@ 
 #include "recog.h"
 #include "langhooks.h"
 #include "diagnostic-core.h"
+#include "insn-codes.h"
 #include "optabs.h"
 #include "hash-table.h"
 #include "vec.h"
Index: config/alpha/alpha.c
===================================================================
--- config/alpha/alpha.c	(revision 216804)
+++ config/alpha/alpha.c	(working copy)
@@ -37,6 +37,7 @@ 
 #include "flags.h"
 #include "recog.h"
 #include "expr.h"
+#include "insn-codes.h"
 #include "optabs.h"
 #include "reload.h"
 #include "obstack.h"
Index: config/arm/arm.c
===================================================================
--- config/arm/arm.c	(revision 216805)
+++ config/arm/arm.c	(working copy)
@@ -47,6 +47,7 @@ 
 #include "input.h"
 #include "function.h"
 #include "expr.h"
+#include "insn-codes.h"
 #include "optabs.h"
 #include "diagnostic-core.h"
 #include "recog.h"
Index: config/cris/cris.c
===================================================================
--- config/cris/cris.c	(revision 216805)
+++ config/cris/cris.c	(working copy)
@@ -52,6 +52,7 @@ 
 #include "target.h"
 #include "target-def.h"
 #include "ggc.h"
+#include "insn-codes.h"
 #include "optabs.h"
 #include "dominance.h"
 #include "cfg.h"
Index: config/frv/frv.c
===================================================================
--- config/frv/frv.c	(revision 216804)
+++ config/frv/frv.c	(working copy)
@@ -45,6 +45,7 @@ 
 #include "machmode.h"
 #include "input.h"
 #include "function.h"
+#include "insn-codes.h"
 #include "optabs.h"
 #include "diagnostic-core.h"
 #include "predict.h"
Index: config/h8300/h8300.c
===================================================================
--- config/h8300/h8300.c	(revision 216804)
+++ config/h8300/h8300.c	(working copy)
@@ -44,6 +44,7 @@ 
 #include "machmode.h"
 #include "input.h"
 #include "function.h"
+#include "insn-codes.h"
 #include "optabs.h"
 #include "diagnostic-core.h"
 #include "c-family/c-pragma.h"	/* ??? */
Index: config/ia64/ia64.c
===================================================================
--- config/ia64/ia64.c	(revision 216804)
+++ config/ia64/ia64.c	(working copy)
@@ -38,6 +38,7 @@ 
 #include "flags.h"
 #include "recog.h"
 #include "expr.h"
+#include "insn-codes.h"
 #include "optabs.h"
 #include "except.h"
 #include "hashtab.h"
Index: config/iq2000/iq2000.c
===================================================================
--- config/iq2000/iq2000.c	(revision 216804)
+++ config/iq2000/iq2000.c	(working copy)
@@ -40,6 +40,7 @@ 
 #include "input.h"
 #include "function.h"
 #include "expr.h"
+#include "insn-codes.h"
 #include "optabs.h"
 #include "libfuncs.h"
 #include "recog.h"
Index: config/m32c/m32c.c
===================================================================
--- config/m32c/m32c.c	(revision 216804)
+++ config/m32c/m32c.c	(working copy)
@@ -40,6 +40,7 @@ 
 #include "varasm.h"
 #include "calls.h"
 #include "expr.h"
+#include "insn-codes.h"
 #include "optabs.h"
 #include "except.h"
 #include "hashtab.h"
Index: config/mep/mep.c
===================================================================
--- config/mep/mep.c	(revision 216804)
+++ config/mep/mep.c	(working copy)
@@ -47,6 +47,7 @@ 
 #include "machmode.h"
 #include "input.h"
 #include "function.h"
+#include "insn-codes.h"
 #include "optabs.h"
 #include "reload.h"
 #include "tm_p.h"
Index: config/microblaze/microblaze.c
===================================================================
--- config/microblaze/microblaze.c	(revision 216805)
+++ config/microblaze/microblaze.c	(working copy)
@@ -61,6 +61,7 @@ 
 #include "predict.h"
 #include "basic-block.h"
 #include "df.h"
+#include "insn-codes.h"
 #include "optabs.h"
 #include "diagnostic-core.h"
 #include "hash-map.h"
Index: config/mips/mips.c
===================================================================
--- config/mips/mips.c	(revision 216805)
+++ config/mips/mips.c	(working copy)
@@ -45,6 +45,7 @@ 
 #include "input.h"
 #include "function.h"
 #include "expr.h"
+#include "insn-codes.h"
 #include "optabs.h"
 #include "libfuncs.h"
 #include "flags.h"
Index: config/mn10300/mn10300.c
===================================================================
--- config/mn10300/mn10300.c	(revision 216804)
+++ config/mn10300/mn10300.c	(working copy)
@@ -37,6 +37,7 @@ 
 #include "recog.h"
 #include "reload.h"
 #include "expr.h"
+#include "insn-codes.h"
 #include "optabs.h"
 #include "hashtab.h"
 #include "hash-set.h"
Index: config/moxie/moxie.c
===================================================================
--- config/moxie/moxie.c	(revision 216804)
+++ config/moxie/moxie.c	(working copy)
@@ -40,6 +40,7 @@ 
 #include "varasm.h"
 #include "calls.h"
 #include "expr.h"
+#include "insn-codes.h"
 #include "optabs.h"
 #include "except.h"
 #include "hashtab.h"
Index: config/msp430/msp430.c
===================================================================
--- config/msp430/msp430.c	(revision 216804)
+++ config/msp430/msp430.c	(working copy)
@@ -40,6 +40,7 @@ 
 #include "input.h"
 #include "function.h"
 #include "expr.h"
+#include "insn-codes.h"
 #include "optabs.h"
 #include "libfuncs.h"
 #include "recog.h"
Index: config/nios2/nios2.c
===================================================================
--- config/nios2/nios2.c	(revision 216804)
+++ config/nios2/nios2.c	(working copy)
@@ -35,6 +35,7 @@ 
 #include "flags.h"
 #include "recog.h"
 #include "expr.h"
+#include "insn-codes.h"
 #include "optabs.h"
 #include "hashtab.h"
 #include "hash-set.h"
Index: config/pa/pa.c
===================================================================
--- config/pa/pa.c	(revision 216804)
+++ config/pa/pa.c	(working copy)
@@ -38,6 +38,7 @@ 
 #include "dbxout.h"
 #include "except.h"
 #include "expr.h"
+#include "insn-codes.h"
 #include "optabs.h"
 #include "reload.h"
 #include "hashtab.h"
Index: config/rl78/rl78.c
===================================================================
--- config/rl78/rl78.c	(revision 216804)
+++ config/rl78/rl78.c	(working copy)
@@ -41,6 +41,7 @@ 
 #include "input.h"
 #include "function.h"
 #include "expr.h"
+#include "insn-codes.h"
 #include "optabs.h"
 #include "libfuncs.h"
 #include "recog.h"
Index: config/rs6000/rs6000.c
===================================================================
--- config/rs6000/rs6000.c	(revision 216805)
+++ config/rs6000/rs6000.c	(working copy)
@@ -38,6 +38,7 @@ 
 #include "print-tree.h"
 #include "varasm.h"
 #include "expr.h"
+#include "insn-codes.h"
 #include "optabs.h"
 #include "except.h"
 #include "hashtab.h"
Index: config/rx/rx.c
===================================================================
--- config/rx/rx.c	(revision 216805)
+++ config/rx/rx.c	(working copy)
@@ -45,6 +45,7 @@ 
 #include "input.h"
 #include "function.h"
 #include "expr.h"
+#include "insn-codes.h"
 #include "optabs.h"
 #include "libfuncs.h"
 #include "recog.h"
Index: config/s390/s390.c
===================================================================
--- config/s390/s390.c	(revision 216804)
+++ config/s390/s390.c	(working copy)
@@ -64,6 +64,7 @@ 
 #include "target-def.h"
 #include "debug.h"
 #include "langhooks.h"
+#include "insn-codes.h"
 #include "optabs.h"
 #include "hash-table.h"
 #include "tree-ssa-alias.h"
Index: config/sh/sh.c
===================================================================
--- config/sh/sh.c	(revision 216804)
+++ config/sh/sh.c	(working copy)
@@ -36,6 +36,7 @@ 
 #include "varasm.h"
 #include "flags.h"
 #include "expr.h"
+#include "insn-codes.h"
 #include "optabs.h"
 #include "reload.h"
 #include "hashtab.h"
Index: config/spu/spu.c
===================================================================
--- config/spu/spu.c	(revision 216804)
+++ config/spu/spu.c	(working copy)
@@ -33,6 +33,7 @@ 
 #include "calls.h"
 #include "varasm.h"
 #include "expr.h"
+#include "insn-codes.h"
 #include "optabs.h"
 #include "except.h"
 #include "hashtab.h"
Index: config/stormy16/stormy16.c
===================================================================
--- config/stormy16/stormy16.c	(revision 216804)
+++ config/stormy16/stormy16.c	(working copy)
@@ -40,6 +40,7 @@ 
 #include "varasm.h"
 #include "calls.h"
 #include "expr.h"
+#include "insn-codes.h"
 #include "optabs.h"
 #include "except.h"
 #include "hashtab.h"
Index: config/tilegx/mul-tables.c
===================================================================
--- config/tilegx/mul-tables.c	(revision 216804)
+++ config/tilegx/mul-tables.c	(working copy)
@@ -22,6 +22,7 @@ 
 #include "system.h"
 #include "coretypes.h"
 #include "expr.h"
+#include "insn-codes.h"
 #include "optabs.h"
 #include "tilegx-multiply.h"
 
Index: config/tilegx/tilegx.c
===================================================================
--- config/tilegx/tilegx.c	(revision 216804)
+++ config/tilegx/tilegx.c	(working copy)
@@ -30,6 +30,7 @@ 
 #include "recog.h"
 #include "expr.h"
 #include "langhooks.h"
+#include "insn-codes.h"
 #include "optabs.h"
 #include "dominance.h"
 #include "cfg.h"
Index: config/tilepro/mul-tables.c
===================================================================
--- config/tilepro/mul-tables.c	(revision 216804)
+++ config/tilepro/mul-tables.c	(working copy)
@@ -22,6 +22,7 @@ 
 #include "system.h"
 #include "coretypes.h"
 #include "expr.h"
+#include "insn-codes.h"
 #include "optabs.h"
 #include "tilepro-multiply.h"
 
Index: config/tilepro/tilepro.c
===================================================================
--- config/tilepro/tilepro.c	(revision 216804)
+++ config/tilepro/tilepro.c	(working copy)
@@ -30,6 +30,7 @@ 
 #include "recog.h"
 #include "expr.h"
 #include "langhooks.h"
+#include "insn-codes.h"
 #include "optabs.h"
 #include "dominance.h"
 #include "cfg.h"
Index: config/vax/vax.c
===================================================================
--- config/vax/vax.c	(revision 216804)
+++ config/vax/vax.c	(working copy)
@@ -49,6 +49,7 @@ 
 #include "insn-attr.h"
 #include "recog.h"
 #include "expr.h"
+#include "insn-codes.h"
 #include "optabs.h"
 #include "flags.h"
 #include "debug.h"
Index: dojump.c
===================================================================
--- dojump.c	(revision 216804)
+++ dojump.c	(working copy)
@@ -36,6 +36,7 @@ 
 #include "insn-attr.h"
 /* Include expr.h after insn-config.h so we get HAVE_conditional_move.  */
 #include "expr.h"
+#include "insn-codes.h"
 #include "optabs.h"
 #include "langhooks.h"
 #include "ggc.h"
Index: dse.c
===================================================================
--- dse.c	(revision 216804)
+++ dse.c	(working copy)
@@ -48,6 +48,7 @@ 
 #include "insn-config.h"
 #include "expr.h"
 #include "recog.h"
+#include "insn-codes.h"
 #include "optabs.h"
 #include "dbgcnt.h"
 #include "target.h"
Index: explow.c
===================================================================
--- explow.c	(revision 216804)
+++ explow.c	(working copy)
@@ -37,6 +37,7 @@ 
 #include "input.h"
 #include "function.h"
 #include "expr.h"
+#include "insn-codes.h"
 #include "optabs.h"
 #include "libfuncs.h"
 #include "insn-config.h"
Index: expmed.c
===================================================================
--- expmed.c	(revision 216804)
+++ expmed.c	(working copy)
@@ -31,6 +31,7 @@ 
 #include "flags.h"
 #include "insn-config.h"
 #include "expr.h"
+#include "insn-codes.h"
 #include "optabs.h"
 #include "recog.h"
 #include "langhooks.h"
Index: function.c
===================================================================
--- function.c	(revision 216804)
+++ function.c	(working copy)
@@ -50,6 +50,7 @@ 
 #include "input.h"
 #include "function.h"
 #include "expr.h"
+#include "insn-codes.h"
 #include "optabs.h"
 #include "libfuncs.h"
 #include "regs.h"
Index: ifcvt.c
===================================================================
--- ifcvt.c	(revision 216804)
+++ ifcvt.c	(working copy)
@@ -44,6 +44,7 @@ 
 #include "basic-block.h"
 #include "expr.h"
 #include "output.h"
+#include "insn-codes.h"
 #include "optabs.h"
 #include "diagnostic-core.h"
 #include "tm_p.h"
Index: internal-fn.c
===================================================================
--- internal-fn.c	(revision 216804)
+++ internal-fn.c	(working copy)
@@ -24,6 +24,7 @@ 
 #include "internal-fn.h"
 #include "stor-layout.h"
 #include "expr.h"
+#include "insn-codes.h"
 #include "optabs.h"
 #include "predict.h"
 #include "vec.h"
Index: loop-unroll.c
===================================================================
--- loop-unroll.c	(revision 216804)
+++ loop-unroll.c	(working copy)
@@ -39,6 +39,8 @@ 
 #include "basic-block.h"
 #include "cfgloop.h"
 #include "params.h"
+#include "insn-codes.h"
+#include "optabs.h"
 #include "expr.h"
 #include "hash-table.h"
 #include "recog.h"
Index: lra.c
===================================================================
--- lra.c	(revision 216804)
+++ lra.c	(working copy)
@@ -112,6 +112,8 @@ 
 #include "machmode.h"
 #include "input.h"
 #include "function.h"
+#include "tree-core.h"
+#include "optabs.h"
 #include "expr.h"
 #include "predict.h"
 #include "dominance.h"
Index: modulo-sched.c
===================================================================
--- modulo-sched.c	(revision 216804)
+++ modulo-sched.c	(working copy)
@@ -48,6 +48,9 @@ 
 #include "sched-int.h"
 #include "target.h"
 #include "cfgloop.h"
+#include "tree-core.h"
+#include "insn-codes.h"
+#include "optabs.h"
 #include "expr.h"
 #include "params.h"
 #include "gcov-io.h"
Index: omp-low.c
===================================================================
--- omp-low.c	(revision 216805)
+++ omp-low.c	(working copy)
@@ -73,6 +73,7 @@ 
 #include "tree-pass.h"
 #include "except.h"
 #include "splay-tree.h"
+#include "insn-codes.h"
 #include "optabs.h"
 #include "cfgloop.h"
 #include "target.h"
Index: postreload.c
===================================================================
--- postreload.c	(revision 216804)
+++ postreload.c	(working copy)
@@ -35,6 +35,7 @@ 
 #include "input.h"
 #include "function.h"
 #include "expr.h"
+#include "insn-codes.h"
 #include "optabs.h"
 #include "regs.h"
 #include "predict.h"
Index: ree.c
===================================================================
--- ree.c	(revision 216805)
+++ ree.c	(working copy)
@@ -242,8 +242,8 @@ 
 #include "recog.h"
 #include "diagnostic-core.h"
 #include "target.h"
+#include "insn-codes.h"
 #include "optabs.h"
-#include "insn-codes.h"
 #include "rtlhooks-def.h"
 #include "params.h"
 #include "tree-pass.h"
Index: reload.c
===================================================================
--- reload.c	(revision 216804)
+++ reload.c	(working copy)
@@ -96,6 +96,7 @@ 
 #include "tm_p.h"
 #include "insn-config.h"
 #include "expr.h"
+#include "insn-codes.h"
 #include "optabs.h"
 #include "recog.h"
 #include "dominance.h"
Index: reload1.c
===================================================================
--- reload1.c	(revision 216804)
+++ reload1.c	(working copy)
@@ -36,6 +36,7 @@ 
 #include "input.h"
 #include "function.h"
 #include "expr.h"
+#include "insn-codes.h"
 #include "optabs.h"
 #include "regs.h"
 #include "addresses.h"
Index: shrink-wrap.c
===================================================================
--- shrink-wrap.c	(revision 216804)
+++ shrink-wrap.c	(working copy)
@@ -38,6 +38,7 @@ 
 #include "input.h"
 #include "function.h"
 #include "expr.h"
+#include "insn-codes.h"
 #include "optabs.h"
 #include "libfuncs.h"
 #include "regs.h"
Index: simplify-rtx.c
===================================================================
--- simplify-rtx.c	(revision 216804)
+++ simplify-rtx.c	(working copy)
@@ -37,6 +37,8 @@ 
 #include "machmode.h"
 #include "input.h"
 #include "function.h"
+#include "insn-codes.h"
+#include "optabs.h"
 #include "expr.h"
 #include "diagnostic-core.h"
 #include "ggc.h"
Index: stmt.c
===================================================================
--- stmt.c	(revision 216804)
+++ stmt.c	(working copy)
@@ -49,6 +49,7 @@ 
 #include "output.h"
 #include "langhooks.h"
 #include "predict.h"
+#include "insn-codes.h"
 #include "optabs.h"
 #include "target.h"
 #include "cfganal.h"
Index: target-globals.c
===================================================================
--- target-globals.c	(revision 216804)
+++ target-globals.c	(working copy)
@@ -34,6 +34,7 @@ 
 #include "reload.h"
 #include "expmed.h"
 #include "expr.h"
+#include "insn-codes.h"
 #include "optabs.h"
 #include "libfuncs.h"
 #include "cfgloop.h"
Index: targhooks.c
===================================================================
--- targhooks.c	(revision 216804)
+++ targhooks.c	(working copy)
@@ -69,6 +69,7 @@ 
 #include "target-def.h"
 #include "regs.h"
 #include "reload.h"
+#include "insn-codes.h"
 #include "optabs.h"
 #include "recog.h"
 #include "intl.h"
@@ -78,7 +79,6 @@ 
 #include "gimplify.h"
 #include "stringpool.h"
 #include "tree-ssanames.h"
-#include "insn-codes.h"
 
 
 bool
Index: toplev.c
===================================================================
--- toplev.c	(revision 216805)
+++ toplev.c	(working copy)
@@ -95,6 +95,7 @@ 
 #include "ipa-reference.h"
 #include "ipa-prop.h"
 #include "gcse.h"
+#include "insn-codes.h"
 #include "optabs.h"
 
 #if defined(DBX_DEBUGGING_INFO) || defined(XCOFF_DEBUGGING_INFO)
Index: tree-if-conv.c
===================================================================
--- tree-if-conv.c	(revision 216804)
+++ tree-if-conv.c	(working copy)
@@ -125,6 +125,7 @@ 
 #include "tree-pass.h"
 #include "dbgcnt.h"
 #include "expr.h"
+#include "insn-codes.h"
 #include "optabs.h"
 
 /* List of basic blocks in if-conversion-suitable order.  */
Index: tree-ssa-forwprop.c
===================================================================
--- tree-ssa-forwprop.c	(revision 216804)
+++ tree-ssa-forwprop.c	(working copy)
@@ -60,6 +60,7 @@ 
 #include "diagnostic.h"
 #include "expr.h"
 #include "cfgloop.h"
+#include "insn-codes.h"
 #include "optabs.h"
 #include "tree-ssa-propagate.h"
 #include "tree-ssa-dom.h"
Index: tree-ssa-loop-prefetch.c
===================================================================
--- tree-ssa-loop-prefetch.c	(revision 216804)
+++ tree-ssa-loop-prefetch.c	(working copy)
@@ -65,6 +65,7 @@ 
 /* FIXME: Needed for optabs, but this should all be moved to a TBD interface
    between the GIMPLE and RTL worlds.  */
 #include "expr.h"
+#include "insn-codes.h"
 #include "optabs.h"
 #include "recog.h"
 
Index: tree-ssa-math-opts.c
===================================================================
--- tree-ssa-math-opts.c	(revision 216804)
+++ tree-ssa-math-opts.c	(working copy)
@@ -129,6 +129,7 @@ 
 /* FIXME: RTL headers have to be included here for optabs.  */
 #include "rtl.h"		/* Because optabs.h wants enum rtx_code.  */
 #include "expr.h"		/* Because optabs.h wants sepops.  */
+#include "insn-codes.h"
 #include "optabs.h"
 
 /* This structure represents one basic block that either computes a
Index: tree-ssa-phiopt.c
===================================================================
--- tree-ssa-phiopt.c	(revision 216804)
+++ tree-ssa-phiopt.c	(working copy)
@@ -62,6 +62,7 @@ 
 #include "gimple-pretty-print.h"
 #include "insn-config.h"
 #include "expr.h"
+#include "insn-codes.h"
 #include "optabs.h"
 #include "tree-scalar-evolution.h"
 #include "tree-inline.h"
Index: tree-ssa-reassoc.c
===================================================================
--- tree-ssa-reassoc.c	(revision 216804)
+++ tree-ssa-reassoc.c	(working copy)
@@ -73,6 +73,7 @@ 
 #include "diagnostic-core.h"
 #include "builtins.h"
 #include "gimplify.h"
+#include "insn-codes.h"
 #include "optabs.h"
 
 /*  This is a simple global reassociation pass.  It is, in part, based
Index: tree-switch-conversion.c
===================================================================
--- tree-switch-conversion.c	(revision 216805)
+++ tree-switch-conversion.c	(working copy)
@@ -71,6 +71,7 @@ 
 
 /* Need to include expr.h and optabs.h for lshift_cheap_p.  */
 #include "expr.h"
+#include "insn-codes.h"
 #include "optabs.h"
 
 /* Maximum number of case bit tests.
Index: tree-vect-data-refs.c
===================================================================
--- tree-vect-data-refs.c	(revision 216805)
+++ tree-vect-data-refs.c	(working copy)
@@ -69,6 +69,7 @@ 
 #include "cgraph.h"
 /* Need to include rtl.h, expr.h, etc. for optabs.  */
 #include "expr.h"
+#include "insn-codes.h"
 #include "optabs.h"
 #include "builtins.h"
 #include "varasm.h"
Index: tree-vect-generic.c
===================================================================
--- tree-vect-generic.c	(revision 216804)
+++ tree-vect-generic.c	(working copy)
@@ -55,6 +55,7 @@ 
 
 /* Need to include rtl.h, expr.h, etc. for optabs.  */
 #include "expr.h"
+#include "insn-codes.h"
 #include "optabs.h"
 
 
Index: tree-vect-loop.c
===================================================================
--- tree-vect-loop.c	(revision 216804)
+++ tree-vect-loop.c	(working copy)
@@ -59,6 +59,7 @@ 
 #include "cfgloop.h"
 #include "expr.h"
 #include "recog.h"
+#include "insn-codes.h"
 #include "optabs.h"
 #include "params.h"
 #include "diagnostic-core.h"
Index: tree-vect-patterns.c
===================================================================
--- tree-vect-patterns.c	(revision 216804)
+++ tree-vect-patterns.c	(working copy)
@@ -51,6 +51,7 @@ 
 #include "tree-ssanames.h"
 #include "cfgloop.h"
 #include "expr.h"
+#include "insn-codes.h"
 #include "optabs.h"
 #include "params.h"
 #include "tree-data-ref.h"
Index: tree-vect-slp.c
===================================================================
--- tree-vect-slp.c	(revision 216804)
+++ tree-vect-slp.c	(working copy)
@@ -52,6 +52,7 @@ 
 #include "cfgloop.h"
 #include "expr.h"
 #include "recog.h"		/* FIXME: for insn_data */
+#include "insn-codes.h"
 #include "optabs.h"
 #include "tree-vectorizer.h"
 #include "langhooks.h"
Index: tree-vect-stmts.c
===================================================================
--- tree-vect-stmts.c	(revision 216805)
+++ tree-vect-stmts.c	(working copy)
@@ -60,6 +60,7 @@ 
 #include "tree-scalar-evolution.h"
 #include "expr.h"
 #include "recog.h"		/* FIXME: for insn_data */
+#include "insn-codes.h"
 #include "optabs.h"
 #include "diagnostic-core.h"
 #include "tree-vectorizer.h"
Index: tree-vrp.c
===================================================================
--- tree-vrp.c	(revision 216804)
+++ tree-vrp.c	(working copy)
@@ -69,6 +69,7 @@ 
 #include "tree-chrec.h"
 #include "tree-ssa-threadupdate.h"
 #include "expr.h"
+#include "insn-codes.h"
 #include "optabs.h"
 #include "tree-ssa-threadedge.h"
 #include "wide-int.h"
Index: value-prof.c
===================================================================
--- value-prof.c	(revision 216805)
+++ value-prof.c	(working copy)
@@ -41,6 +41,7 @@ 
 #include "flags.h"
 #include "insn-config.h"
 #include "recog.h"
+#include "insn-codes.h"
 #include "optabs.h"
 #include "regs.h"
 #include "tree-ssa-alias.h"