summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog31
-rw-r--r--gcc/Makefile.in72
-rw-r--r--gcc/alias.c1
-rw-r--r--gcc/bb-reorder.c1
-rw-r--r--gcc/builtins.c2
-rw-r--r--gcc/calls.c1
-rw-r--r--gcc/combine.c2
-rw-r--r--gcc/config/a29k/a29k.c1
-rw-r--r--gcc/config/alpha/alpha.c1
-rw-r--r--gcc/config/arc/arc.c1
-rw-r--r--gcc/config/arm/arm.c1
-rw-r--r--gcc/config/avr/avr.c1
-rw-r--r--gcc/config/c4x/c4x.c2
-rw-r--r--gcc/config/clipper/clipper.c1
-rw-r--r--gcc/config/convex/convex.c1
-rw-r--r--gcc/config/d30v/d30v.c1
-rw-r--r--gcc/config/dsp16xx/dsp16xx.c1
-rw-r--r--gcc/config/fr30/fr30.c1
-rw-r--r--gcc/config/h8300/h8300.c1
-rw-r--r--gcc/config/i370/i370.c1
-rw-r--r--gcc/config/i386/i386.c1
-rw-r--r--gcc/config/i860/i860.c1
-rw-r--r--gcc/config/i960/i960.c2
-rw-r--r--gcc/config/ia64/ia64.c1
-rw-r--r--gcc/config/m32r/m32r.c1
-rw-r--r--gcc/config/m68hc11/m68hc11.c1
-rw-r--r--gcc/config/m68k/m68k.c1
-rw-r--r--gcc/config/m88k/m88k.c1
-rw-r--r--gcc/config/mcore/mcore.c1
-rw-r--r--gcc/config/mips/mips.c2
-rw-r--r--gcc/config/mn10200/mn10200.c1
-rw-r--r--gcc/config/mn10300/mn10300.c1
-rw-r--r--gcc/config/ns32k/ns32k.c1
-rw-r--r--gcc/config/pa/pa.c1
-rw-r--r--gcc/config/pdp11/pdp11.c1
-rw-r--r--gcc/config/pj/pj.c1
-rw-r--r--gcc/config/romp/romp.c1
-rw-r--r--gcc/config/rs6000/rs6000.c1
-rw-r--r--gcc/config/sh/sh.c1
-rw-r--r--gcc/config/sh/sh.h3
-rw-r--r--gcc/config/sparc/sparc.c1
-rw-r--r--gcc/config/v850/v850.c1
-rw-r--r--gcc/config/vax/vax.c1
-rw-r--r--gcc/diagnostic.c1
-rw-r--r--gcc/doloop.c1
-rw-r--r--gcc/except.c2
-rw-r--r--gcc/explow.c2
-rw-r--r--gcc/expmed.c2
-rw-r--r--gcc/expr.c2
-rw-r--r--gcc/expr.h4
-rw-r--r--gcc/final.c2
-rw-r--r--gcc/flow.c1
-rw-r--r--gcc/function.c2
-rw-r--r--gcc/genemit.c2
-rw-r--r--gcc/genflags.c7
-rw-r--r--gcc/genopinit.c2
-rw-r--r--gcc/genoutput.c2
-rw-r--r--gcc/haifa-sched.c1
-rw-r--r--gcc/integrate.c1
-rw-r--r--gcc/jump.c1
-rw-r--r--gcc/loop.c1
-rw-r--r--gcc/mkconfig.sh1
-rw-r--r--gcc/optabs.c2
-rw-r--r--gcc/predict.c1
-rw-r--r--gcc/profile.c1
-rw-r--r--gcc/recog.c2
-rw-r--r--gcc/reg-stack.c1
-rw-r--r--gcc/regmove.c1
-rw-r--r--gcc/reload.c1
-rw-r--r--gcc/reload1.c2
-rw-r--r--gcc/reorg.c1
-rw-r--r--gcc/stmt.c2
-rw-r--r--gcc/toplev.c1
73 files changed, 74 insertions, 129 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b52795c5a65..73afd2179c1 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,34 @@
+2001-03-22 Richard Henderson <rth@redhat.com>
+
+ * mkconfig.sh: Include insn-flags.h.
+ * Makefile.in (CONFIG_H): Include insn-flags.h.
+ (lots of objects): Remove insn-codes.h and insn-flags.h.
+
+ * alias.c, bb-reorder.c, calls.c, do-loop.c, flow.c, haifa-sched.c,
+ integrate.c, jump.c, loop.c, predict.c, profile.c, reg-stack.c,
+ regmove.c, reorg.c, a29k/a29k.c, alpha/alpha.c, arc/arc.c, arm/arm.c,
+ avr/avr.c, clipper/clipper.c, convex/convex.c, d30v/d30v.c,
+ dsp16xx/dsp16xx.c, fr30/fr30.c, h8300/h8300.c, i370/i370.c,
+ i386/i386.c, i860/i860.c, ia64/ia64.c, m32r/m32r.c, m68hc11/m68hc11.c,
+ m68k/m68k.c, m88k/m88k.c, mcore/mcore.c, mn10200/mn10200.c,
+ mn10300/mn10300.c, ns32k/ns32k.c, pa/pa.c, pdp11/pdp11.c,
+ pj/pj.c, romp/romp.c, rs6000/rs6000.c, sh/sh.c, sparc/sparc.c,
+ v850/v850.c, vax/vax.c:
+ Don't include insn-flags.h.
+
+ * diagnostic.c, expr.h, reload.c, toplev.c:
+ Don't include insn-codes.h.
+
+ * builtins.c, combine.c, except.c, explow.c, expmed.c, expr.c,
+ final.c, function.c, optabs.c, recog.c, reload1.c, stmt.c,
+ c4x/c4x.c, i960/i960.c, mips/mips.c:
+ Don't include insn-codes.h or insn-flags.h.
+
+ * genemit.c, genopinit.c, genoutput.c: Don't include insn-codes.h
+ or insn-flags.h in the generated code.
+ * genflags.c (gen_proto): Use "struct rtx_def *" instead of "rtx".
+ (main): Forward declare struct rtx_def.
+
2001-03-22 Joseph S. Myers <jsm28@cam.ac.uk>
* invoke.texi (-ffast-math): Remove duplicate line about
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index dc9a55f5505..b172fa0acf6 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -811,7 +811,7 @@ DPBIT_FUNCS = _pack_df _unpack_df _addsub_df _mul_df _div_df \
# a file generated by gencodes.
GCONFIG_H = config.h $(host_xm_file_list)
HCONFIG_H = hconfig.h $(build_xm_file_list)
-CONFIG_H = $(GCONFIG_H) insn-codes.h
+CONFIG_H = $(GCONFIG_H) insn-codes.h insn-flags.h
TCONFIG_H = tconfig.h $(xm_file_list) insn-codes.h
TM_P_H = tm_p.h $(tm_p_file_list) insn-codes.h
@@ -1352,10 +1352,10 @@ fold-const.o : fold-const.c $(CONFIG_H) system.h $(TREE_H) flags.h toplev.h \
$(EXPR_H) $(RTL_H) $(GGC_H) $(TM_P_H)
diagnostic.o : diagnostic.c diagnostic.h \
$(CONFIG_H) system.h $(TREE_H) $(RTL_H) $(TM_P_H) flags.h \
- $(GGC_H) input.h $(INSN_ATTR_H) insn-codes.h insn-config.h toplev.h intl.h
+ $(GGC_H) input.h $(INSN_ATTR_H) insn-config.h toplev.h intl.h
toplev.o : toplev.c $(CONFIG_H) system.h $(TREE_H) $(RTL_H) function.h \
flags.h input.h $(INSN_ATTR_H) xcoffout.h output.h diagnostic.h \
- insn-codes.h insn-config.h intl.h $(RECOG_H) Makefile toplev.h dwarfout.h \
+ insn-config.h intl.h $(RECOG_H) Makefile toplev.h dwarfout.h \
dwarf2out.h sdbout.h dbxout.h $(EXPR_H) hard-reg-set.h $(BASIC_BLOCK_H) \
graph.h $(LOOP_H) except.h $(REGS_H) $(TIMEVAR_H) $(lang_options_files) \
ssa.h params.h $(TM_P_H)
@@ -1378,32 +1378,32 @@ varasm.o : varasm.c $(CONFIG_H) system.h $(TREE_H) $(RTL_H) flags.h \
function.h $(EXPR_H) hard-reg-set.h $(REGS_H) \
xcoffout.h output.h c-pragma.h toplev.h dbxout.h sdbout.h $(GGC_H) $(TM_P_H)
function.o : function.c $(CONFIG_H) system.h $(RTL_H) $(TREE_H) flags.h \
- function.h insn-flags.h insn-codes.h $(EXPR_H) $(REGS_H) hard-reg-set.h \
+ function.h $(EXPR_H) $(REGS_H) hard-reg-set.h \
insn-config.h $(RECOG_H) output.h toplev.h except.h hash.h $(GGC_H) $(TM_P_H)
stmt.o : stmt.c $(CONFIG_H) system.h $(RTL_H) $(TREE_H) flags.h function.h \
- insn-flags.h insn-config.h insn-codes.h hard-reg-set.h $(EXPR_H) except.h \
+ insn-config.h hard-reg-set.h $(EXPR_H) except.h \
$(LOOP_H) $(RECOG_H) toplev.h output.h varray.h $(GGC_H) $(TM_P_H)
except.o : except.c $(CONFIG_H) system.h $(RTL_H) $(TREE_H) flags.h \
- function.h insn-flags.h $(EXPR_H) $(REGS_H) hard-reg-set.h \
+ function.h $(EXPR_H) $(REGS_H) hard-reg-set.h \
insn-config.h $(RECOG_H) output.h except.h toplev.h intl.h $(GGC_H) $(TM_P_H)
expr.o : expr.c $(CONFIG_H) system.h $(RTL_H) $(TREE_H) flags.h function.h \
- $(REGS_H) insn-flags.h insn-codes.h $(EXPR_H) insn-config.h $(RECOG_H) \
+ $(REGS_H) $(EXPR_H) insn-config.h $(RECOG_H) \
output.h typeclass.h hard-reg-set.h toplev.h hard-reg-set.h except.h \
reload.h $(GGC_H) intl.h $(TM_P_H)
builtins.o : builtins.c $(CONFIG_H) system.h $(RTL_H) $(TREE_H) flags.h \
- function.h $(REGS_H) insn-flags.h insn-codes.h $(EXPR_H) insn-config.h \
+ function.h $(REGS_H) $(EXPR_H) insn-config.h \
$(RECOG_H) output.h typeclass.h hard-reg-set.h toplev.h hard-reg-set.h \
except.h $(TM_P_H)
calls.o : calls.c $(CONFIG_H) system.h $(RTL_H) $(TREE_H) flags.h $(EXPR_H) \
- insn-flags.h $(REGS_H) toplev.h output.h function.h $(TIMEVAR_H) $(TM_P_H)
+ $(REGS_H) toplev.h output.h function.h $(TIMEVAR_H) $(TM_P_H)
expmed.o : expmed.c $(CONFIG_H) system.h $(RTL_H) $(TREE_H) flags.h \
- insn-flags.h insn-config.h insn-codes.h $(EXPR_H) $(RECOG_H) real.h \
+ insn-config.h $(EXPR_H) $(RECOG_H) real.h \
toplev.h $(TM_P_H)
explow.o : explow.c $(CONFIG_H) system.h $(RTL_H) $(TREE_H) flags.h \
- hard-reg-set.h insn-config.h $(EXPR_H) $(RECOG_H) insn-flags.h \
- insn-codes.h toplev.h function.h $(TM_P_H)
+ hard-reg-set.h insn-config.h $(EXPR_H) $(RECOG_H) \
+ toplev.h function.h $(TM_P_H)
optabs.o : optabs.c $(CONFIG_H) system.h $(RTL_H) $(TREE_H) flags.h \
- insn-flags.h insn-config.h insn-codes.h $(EXPR_H) $(RECOG_H) reload.h \
+ insn-config.h $(EXPR_H) $(RECOG_H) reload.h \
toplev.h $(GGC_H) real.h $(TM_P_H)
dbxout.o : dbxout.c $(CONFIG_H) system.h $(TREE_H) $(RTL_H) flags.h $(REGS_H) \
insn-config.h reload.h gstab.h xcoffout.h output.h dbxout.h toplev.h \
@@ -1428,11 +1428,11 @@ emit-rtl.o : emit-rtl.c $(CONFIG_H) system.h $(RTL_H) $(TREE_H) flags.h \
$(HASHTAB_H) $(TM_P_H)
real.o : real.c $(CONFIG_H) system.h $(TREE_H) toplev.h $(TM_P_H)
integrate.o : integrate.c $(CONFIG_H) system.h $(RTL_H) $(TREE_H) flags.h \
- $(INTEGRATE_H) insn-flags.h insn-config.h $(EXPR_H) real.h $(REGS_H) \
+ $(INTEGRATE_H) insn-config.h $(EXPR_H) real.h $(REGS_H) \
intl.h function.h output.h $(RECOG_H) except.h toplev.h $(LOOP_H) \
params.h $(TM_P_H)
jump.o : jump.c $(CONFIG_H) system.h $(RTL_H) flags.h hard-reg-set.h $(REGS_H) \
- insn-config.h insn-flags.h $(RECOG_H) $(EXPR_H) real.h except.h function.h \
+ insn-config.h $(RECOG_H) $(EXPR_H) real.h except.h function.h \
toplev.h $(INSN_ATTR_H) $(TM_P_H)
simplify-rtx.o : simplify-rtx.c $(CONFIG_H) system.h $(RTL_H) $(REGS_H) \
@@ -1463,23 +1463,23 @@ dce.o : dce.c $(CONFIG_H) system.h $(RTL_H) hard-reg-set.h $(BASIC_BLOCK_H) \
conflict.o : conflict.c $(CONFIG_H) system.h $(OBSTACK_H) $(HASHTAB_H) \
$(RTL_H) hard-reg-set.h $(BASIC_BLOCK_H)
profile.o : profile.c $(CONFIG_H) system.h $(RTL_H) $(TREE_H) flags.h \
- insn-flags.h insn-config.h output.h $(REGS_H) $(EXPR_H) function.h \
+ insn-config.h output.h $(REGS_H) $(EXPR_H) function.h \
gcov-io.h toplev.h $(GGC_H) hard-reg-set.h $(BASIC_BLOCK_H)
loop.o : loop.c $(CONFIG_H) system.h $(RTL_H) flags.h $(LOOP_H) insn-config.h \
- insn-flags.h $(REGS_H) hard-reg-set.h $(RECOG_H) $(EXPR_H) real.h \
+ $(REGS_H) hard-reg-set.h $(RECOG_H) $(EXPR_H) real.h \
$(BASIC_BLOCK_H) function.h toplev.h varray.h except.h cselib.h $(TM_P_H)
doloop.o : doloop.c $(CONFIG_H) system.h $(RTL_H) flags.h $(LOOP_H) \
- insn-flags.h $(EXPR_H) hard-reg-set.h $(BASIC_BLOCK_H) $(TM_P_H)
+ $(EXPR_H) hard-reg-set.h $(BASIC_BLOCK_H) $(TM_P_H)
unroll.o : unroll.c $(CONFIG_H) system.h $(RTL_H) insn-config.h function.h \
$(INTEGRATE_H) $(REGS_H) $(RECOG_H) flags.h $(EXPR_H) $(LOOP_H) toplev.h \
hard-reg-set.h varray.h $(BASIC_BLOCK_H) $(TM_P_H)
flow.o : flow.c $(CONFIG_H) system.h $(RTL_H) $(TREE_H) flags.h insn-config.h \
$(BASIC_BLOCK_H) $(REGS_H) hard-reg-set.h output.h toplev.h $(RECOG_H) \
- insn-flags.h function.h except.h $(EXPR_H) ssa.h $(GGC_H) $(TM_P_H)
+ function.h except.h $(EXPR_H) ssa.h $(GGC_H) $(TM_P_H)
dominance.o : dominance.c $(CONFIG_H) system.h $(RTL_H) hard-reg-set.h \
$(BASIC_BLOCK_H)
combine.o : combine.c $(CONFIG_H) system.h $(RTL_H) flags.h function.h \
- insn-config.h insn-flags.h insn-codes.h $(INSN_ATTR_H) $(REGS_H) $(EXPR_H) \
+ insn-config.h $(INSN_ATTR_H) $(REGS_H) $(EXPR_H) \
$(BASIC_BLOCK_H) $(RECOG_H) real.h hard-reg-set.h toplev.h $(TM_P_H)
regclass.o : regclass.c $(CONFIG_H) system.h $(RTL_H) hard-reg-set.h flags.h \
$(BASIC_BLOCK_H) $(REGS_H) insn-config.h $(RECOG_H) reload.h real.h \
@@ -1495,26 +1495,26 @@ global.o : global.c $(CONFIG_H) system.h $(RTL_H) flags.h reload.h function.h \
$(TM_P_H)
varray.o : varray.c $(CONFIG_H) system.h varray.h $(RTL_H) $(TREE_H) bitmap.h
reload.o : reload.c $(CONFIG_H) system.h $(RTL_H) flags.h output.h $(EXPR_H) \
- reload.h $(RECOG_H) hard-reg-set.h insn-config.h insn-codes.h $(REGS_H) \
+ reload.h $(RECOG_H) hard-reg-set.h insn-config.h $(REGS_H) \
function.h real.h toplev.h $(TM_P_H)
reload1.o : reload1.c $(CONFIG_H) system.h $(RTL_H) real.h flags.h $(EXPR_H) \
- reload.h $(REGS_H) hard-reg-set.h insn-config.h insn-flags.h insn-codes.h \
+ reload.h $(REGS_H) hard-reg-set.h insn-config.h \
$(BASIC_BLOCK_H) $(RECOG_H) output.h function.h toplev.h cselib.h $(TM_P_H)
caller-save.o : caller-save.c $(CONFIG_H) system.h $(RTL_H) flags.h \
$(REGS_H) hard-reg-set.h insn-config.h $(BASIC_BLOCK_H) function.h \
$(RECOG_H) reload.h $(EXPR_H) toplev.h $(TM_P_H)
reorg.o : reorg.c $(CONFIG_H) system.h $(RTL_H) conditions.h hard-reg-set.h \
- $(BASIC_BLOCK_H) $(REGS_H) insn-config.h $(INSN_ATTR_H) insn-flags.h \
+ $(BASIC_BLOCK_H) $(REGS_H) insn-config.h $(INSN_ATTR_H) \
$(RECOG_H) function.h flags.h output.h $(EXPR_H) toplev.h params.h $(TM_P_H)
alias.o : alias.c $(CONFIG_H) system.h $(RTL_H) flags.h hard-reg-set.h \
- $(BASIC_BLOCK_H) $(REGS_H) toplev.h output.h $(EXPR_H) insn-flags.h \
+ $(BASIC_BLOCK_H) $(REGS_H) toplev.h output.h $(EXPR_H) \
$(GGC_H) function.h cselib.h $(TREE_H) $(TM_P_H)
regmove.o : regmove.c $(CONFIG_H) system.h $(RTL_H) insn-config.h \
$(RECOG_H) output.h $(REGS_H) hard-reg-set.h flags.h function.h \
- $(EXPR_H) insn-flags.h $(BASIC_BLOCK_H) toplev.h $(TM_P_H)
+ $(EXPR_H) $(BASIC_BLOCK_H) toplev.h $(TM_P_H)
haifa-sched.o : haifa-sched.c $(CONFIG_H) system.h $(RTL_H) sched-int.h \
$(BASIC_BLOCK_H) $(REGS_H) hard-reg-set.h flags.h insn-config.h function.h \
- $(INSN_ATTR_H) insn-flags.h toplev.h $(RECOG_H) except.h $(TM_P_H)
+ $(INSN_ATTR_H) toplev.h $(RECOG_H) except.h $(TM_P_H)
sched-deps.o : sched-deps.c $(CONFIG_H) system.h $(RTL_H) sched-int.h \
$(BASIC_BLOCK_H) $(REGS_H) hard-reg-set.h flags.h insn-config.h function.h \
$(INSN_ATTR_H) toplev.h $(RECOG_H) except.h $(TM_P_H)
@@ -1528,22 +1528,22 @@ sched-vis.o : sched-vis.c $(CONFIG_H) system.h $(RTL_H) sched-int.h \
hard-reg-set.h $(BASIC_BLOCK_H) $(INSN_ATTR_H) $(REGS_H) $(TM_P_H)
final.o : final.c $(CONFIG_H) system.h $(RTL_H) $(TREE_H) flags.h intl.h \
$(REGS_H) $(RECOG_H) conditions.h insn-config.h $(INSN_ATTR_H) function.h \
- real.h output.h hard-reg-set.h insn-flags.h insn-codes.h gstab.h except.h \
+ real.h output.h hard-reg-set.h gstab.h except.h \
xcoffout.h toplev.h reload.h dwarfout.h dwarf2out.h sdbout.h \
dbxout.h $(BASIC_BLOCK_H) $(TM_P_H)
recog.o : recog.c $(CONFIG_H) system.h $(RTL_H) function.h $(BASIC_BLOCK_H) \
$(REGS_H) $(RECOG_H) hard-reg-set.h flags.h insn-config.h $(INSN_ATTR_H) \
- insn-flags.h insn-codes.h real.h toplev.h output.h reload.h $(TM_P_H)
+ real.h toplev.h output.h reload.h $(TM_P_H)
reg-stack.o : reg-stack.c $(CONFIG_H) system.h $(RTL_H) $(TREE_H) $(RECOG_H) \
- $(REGS_H) hard-reg-set.h flags.h insn-config.h insn-flags.h toplev.h \
+ $(REGS_H) hard-reg-set.h flags.h insn-config.h toplev.h \
varray.h function.h $(TM_P_H)
predict.o: predict.c $(CONFIG_H) system.h $(RTL_H) $(TREE_H) flags.h \
insn-config.h $(BASIC_BLOCK_H) $(REGS_H) hard-reg-set.h output.h toplev.h \
- $(RECOG_H) insn-flags.h function.h except.h $(EXPR_H) $(TM_P_H)
+ $(RECOG_H) function.h except.h $(EXPR_H) $(TM_P_H)
lists.o: lists.c $(CONFIG_H) system.h toplev.h $(RTL_H) $(GGC_H)
bb-reorder.o : bb-reorder.c $(CONFIG_H) system.h $(RTL_H) $(TREE_H) flags.h \
insn-config.h $(BASIC_BLOCK_H) $(REGS_H) hard-reg-set.h output.h toplev.h \
- $(RECOG_H) insn-flags.h function.h except.h $(EXPR_H) $(TM_P_H)
+ $(RECOG_H) function.h except.h $(EXPR_H) $(TM_P_H)
timevar.o : timevar.c $(CONFIG_H) system.h $(TIMEVAR_H) flags.h intl.h
regrename.o : regrename.c $(CONFIG_H) system.h $(RTL_H) insn-config.h \
$(BASIC_BLOCK_H) $(REGS_H) hard-reg-set.h output.h $(RECOG_H) function.h \
@@ -1557,7 +1557,7 @@ params.o : params.c $(CONFIG_H) system.h params.h toplev.h
$(out_object_file): $(out_file) $(CONFIG_H) $(TREE_H) $(GGC_H) \
$(RTL_H) $(REGS_H) hard-reg-set.h real.h insn-config.h conditions.h \
- insn-flags.h output.h $(INSN_ATTR_H) insn-codes.h system.h toplev.h \
+ output.h $(INSN_ATTR_H) system.h toplev.h \
function.h sched-int.h $(TM_P_H)
$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
$(out_file) $(OUTPUT_OPTION)
@@ -1622,7 +1622,7 @@ s-codes : $(md_file) gencodes$(build_exeext) $(srcdir)/move-if-change
touch s-codes
insn-emit.o : insn-emit.c $(CONFIG_H) $(RTL_H) $(EXPR_H) real.h output.h \
- insn-config.h insn-flags.h insn-codes.h system.h reload.h $(RECOG_H) \
+ insn-config.h system.h reload.h $(RECOG_H) \
function.h flags.h hard-reg-set.h resource.h $(TM_P_H)
$(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) -c insn-emit.c
@@ -1643,7 +1643,7 @@ s-recog : $(md_file) genrecog$(build_exeext) $(srcdir)/move-if-change
$(SHELL) $(srcdir)/move-if-change tmp-recog.c insn-recog.c
touch s-recog
-insn-opinit.o : insn-opinit.c $(CONFIG_H) $(RTL_H) insn-codes.h insn-flags.h \
+insn-opinit.o : insn-opinit.c $(CONFIG_H) $(RTL_H) \
insn-config.h flags.h $(RECOG_H) $(EXPR_H) reload.h system.h
$(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) -c insn-opinit.c
@@ -1690,8 +1690,8 @@ s-attrtab : $(md_file) genattrtab$(build_exeext) $(srcdir)/move-if-change
touch s-attrtab
insn-output.o : insn-output.c $(CONFIG_H) $(RTL_H) $(GGC_H) $(REGS_H) real.h \
- conditions.h hard-reg-set.h insn-config.h insn-flags.h $(INSN_ATTR_H) \
- output.h $(RECOG_H) function.h insn-codes.h system.h toplev.h flags.h \
+ conditions.h hard-reg-set.h insn-config.h $(INSN_ATTR_H) \
+ output.h $(RECOG_H) function.h system.h toplev.h flags.h \
$(TM_P_H)
$(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) -c insn-output.c
diff --git a/gcc/alias.c b/gcc/alias.c
index 6b20df765fd..a1f2e0b785c 100644
--- a/gcc/alias.c
+++ b/gcc/alias.c
@@ -25,7 +25,6 @@ Boston, MA 02111-1307, USA. */
#include "tree.h"
#include "tm_p.h"
#include "function.h"
-#include "insn-flags.h"
#include "expr.h"
#include "regs.h"
#include "hard-reg-set.h"
diff --git a/gcc/bb-reorder.c b/gcc/bb-reorder.c
index 08d23264632..740be9aff04 100644
--- a/gcc/bb-reorder.c
+++ b/gcc/bb-reorder.c
@@ -95,7 +95,6 @@
#include "except.h"
#include "toplev.h"
#include "recog.h"
-#include "insn-flags.h"
#include "expr.h"
#include "obstack.h"
diff --git a/gcc/builtins.c b/gcc/builtins.c
index 8ccd0922f62..27804e2b8bf 100644
--- a/gcc/builtins.c
+++ b/gcc/builtins.c
@@ -30,8 +30,6 @@ Boston, MA 02111-1307, USA. */
#include "hard-reg-set.h"
#include "except.h"
#include "function.h"
-#include "insn-flags.h"
-#include "insn-codes.h"
#include "insn-config.h"
#include "expr.h"
#include "recog.h"
diff --git a/gcc/calls.c b/gcc/calls.c
index 6b5f5083777..a5c29af9953 100644
--- a/gcc/calls.c
+++ b/gcc/calls.c
@@ -27,7 +27,6 @@ Boston, MA 02111-1307, USA. */
#include "expr.h"
#include "function.h"
#include "regs.h"
-#include "insn-flags.h"
#include "toplev.h"
#include "output.h"
#include "tm_p.h"
diff --git a/gcc/combine.c b/gcc/combine.c
index 230d4fd074d..723f9a9d4bf 100644
--- a/gcc/combine.c
+++ b/gcc/combine.c
@@ -86,8 +86,6 @@ Boston, MA 02111-1307, USA. */
#include "function.h"
/* Include expr.h after insn-config.h so we get HAVE_conditional_move. */
#include "expr.h"
-#include "insn-flags.h"
-#include "insn-codes.h"
#include "insn-attr.h"
#include "recog.h"
#include "real.h"
diff --git a/gcc/config/a29k/a29k.c b/gcc/config/a29k/a29k.c
index a895f446eea..c6d7ba28e4a 100644
--- a/gcc/config/a29k/a29k.c
+++ b/gcc/config/a29k/a29k.c
@@ -29,7 +29,6 @@ Boston, MA 02111-1307, USA. */
#include "real.h"
#include "insn-config.h"
#include "conditions.h"
-#include "insn-flags.h"
#include "output.h"
#include "insn-attr.h"
#include "flags.h"
diff --git a/gcc/config/alpha/alpha.c b/gcc/config/alpha/alpha.c
index a52d572f1a1..997fb36e031 100644
--- a/gcc/config/alpha/alpha.c
+++ b/gcc/config/alpha/alpha.c
@@ -29,7 +29,6 @@ Boston, MA 02111-1307, USA. */
#include "real.h"
#include "insn-config.h"
#include "conditions.h"
-#include "insn-flags.h"
#include "output.h"
#include "insn-attr.h"
#include "flags.h"
diff --git a/gcc/config/arc/arc.c b/gcc/config/arc/arc.c
index e0ad002a4ff..5c9acc603ca 100644
--- a/gcc/config/arc/arc.c
+++ b/gcc/config/arc/arc.c
@@ -30,7 +30,6 @@ Boston, MA 02111-1307, USA. */
#include "real.h"
#include "insn-config.h"
#include "conditions.h"
-#include "insn-flags.h"
#include "output.h"
#include "insn-attr.h"
#include "flags.h"
diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
index d906b14c514..0f0c5e9d9a3 100644
--- a/gcc/config/arm/arm.c
+++ b/gcc/config/arm/arm.c
@@ -32,7 +32,6 @@ Boston, MA 02111-1307, USA. */
#include "real.h"
#include "insn-config.h"
#include "conditions.h"
-#include "insn-flags.h"
#include "output.h"
#include "insn-attr.h"
#include "flags.h"
diff --git a/gcc/config/avr/avr.c b/gcc/config/avr/avr.c
index b01f9519859..fe3df9490aa 100644
--- a/gcc/config/avr/avr.c
+++ b/gcc/config/avr/avr.c
@@ -27,7 +27,6 @@
#include "real.h"
#include "insn-config.h"
#include "conditions.h"
-#include "insn-flags.h"
#include "output.h"
#include "insn-attr.h"
#include "flags.h"
diff --git a/gcc/config/c4x/c4x.c b/gcc/config/c4x/c4x.c
index b8f3d2ad152..dcc948e728c 100644
--- a/gcc/config/c4x/c4x.c
+++ b/gcc/config/c4x/c4x.c
@@ -33,9 +33,7 @@ Boston, MA 02111-1307, USA. */
#include "real.h"
#include "insn-config.h"
#include "insn-attr.h"
-#include "insn-codes.h"
#include "conditions.h"
-#include "insn-flags.h"
#include "output.h"
#include "tree.h"
#include "function.h"
diff --git a/gcc/config/clipper/clipper.c b/gcc/config/clipper/clipper.c
index 9e743eb0294..0c3f379569c 100644
--- a/gcc/config/clipper/clipper.c
+++ b/gcc/config/clipper/clipper.c
@@ -28,7 +28,6 @@ Boston, MA 02111-1307, USA. */
#include "real.h"
#include "insn-config.h"
#include "conditions.h"
-#include "insn-flags.h"
#include "output.h"
#include "insn-attr.h"
#include "tree.h"
diff --git a/gcc/config/convex/convex.c b/gcc/config/convex/convex.c
index 1b41db35dc7..947a715fccd 100644
--- a/gcc/config/convex/convex.c
+++ b/gcc/config/convex/convex.c
@@ -28,7 +28,6 @@ Boston, MA 02111-1307, USA. */
#include "real.h"
#include "insn-config.h"
#include "conditions.h"
-#include "insn-flags.h"
#include "insn-attr.h"
#include "output.h"
#include "function.h"
diff --git a/gcc/config/d30v/d30v.c b/gcc/config/d30v/d30v.c
index c103e81b36b..a4f5e8d8473 100644
--- a/gcc/config/d30v/d30v.c
+++ b/gcc/config/d30v/d30v.c
@@ -28,7 +28,6 @@
#include "real.h"
#include "insn-config.h"
#include "conditions.h"
-#include "insn-flags.h"
#include "output.h"
#include "insn-attr.h"
#include "flags.h"
diff --git a/gcc/config/dsp16xx/dsp16xx.c b/gcc/config/dsp16xx/dsp16xx.c
index c74ac388411..fbc28c0d505 100644
--- a/gcc/config/dsp16xx/dsp16xx.c
+++ b/gcc/config/dsp16xx/dsp16xx.c
@@ -28,7 +28,6 @@ Boston, MA 02111-1307, USA. */
#include "real.h"
#include "insn-config.h"
#include "conditions.h"
-#include "insn-flags.h"
#include "output.h"
#include "insn-attr.h"
#include "tree.h"
diff --git a/gcc/config/fr30/fr30.c b/gcc/config/fr30/fr30.c
index c2ee0055b82..f1f63e1c324 100644
--- a/gcc/config/fr30/fr30.c
+++ b/gcc/config/fr30/fr30.c
@@ -32,7 +32,6 @@ Boston, MA 02111-1307, USA. */
#include "real.h"
#include "insn-config.h"
#include "conditions.h"
-#include "insn-flags.h"
#include "output.h"
#include "insn-attr.h"
#include "flags.h"
diff --git a/gcc/config/h8300/h8300.c b/gcc/config/h8300/h8300.c
index a52120c9dca..1a4a766638a 100644
--- a/gcc/config/h8300/h8300.c
+++ b/gcc/config/h8300/h8300.c
@@ -30,7 +30,6 @@ Boston, MA 02111-1307, USA. */
#include "real.h"
#include "insn-config.h"
#include "conditions.h"
-#include "insn-flags.h"
#include "output.h"
#include "insn-attr.h"
#include "flags.h"
diff --git a/gcc/config/i370/i370.c b/gcc/config/i370/i370.c
index 2db1a01b9fc..778930e5808 100644
--- a/gcc/config/i370/i370.c
+++ b/gcc/config/i370/i370.c
@@ -31,7 +31,6 @@ Boston, MA 02111-1307, USA. */
#include "real.h"
#include "insn-config.h"
#include "conditions.h"
-#include "insn-flags.h"
#include "output.h"
#include "insn-attr.h"
#include "function.h"
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index d5a1da118d9..af169794300 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -30,7 +30,6 @@ Boston, MA 02111-1307, USA. */
#include "real.h"
#include "insn-config.h"
#include "conditions.h"
-#include "insn-flags.h"
#include "output.h"
#include "insn-attr.h"
#include "flags.h"
diff --git a/gcc/config/i860/i860.c b/gcc/config/i860/i860.c
index 912e4e62e4f..7cc9d51e22e 100644
--- a/gcc/config/i860/i860.c
+++ b/gcc/config/i860/i860.c
@@ -36,7 +36,6 @@ Boston, MA 02111-1307, USA. */
#include "real.h"
#include "insn-config.h"
#include "conditions.h"
-#include "insn-flags.h"
#include "output.h"
#include "recog.h"
#include "insn-attr.h"
diff --git a/gcc/config/i960/i960.c b/gcc/config/i960/i960.c
index c56f2f7bb54..3346529bf58 100644
--- a/gcc/config/i960/i960.c
+++ b/gcc/config/i960/i960.c
@@ -31,12 +31,10 @@ Boston, MA 02111-1307, USA. */
#include "real.h"
#include "insn-config.h"
#include "conditions.h"
-#include "insn-flags.h"
#include "output.h"
#include "insn-attr.h"
#include "flags.h"
#include "tree.h"
-#include "insn-codes.h"
#include "expr.h"
#include "except.h"
#include "function.h"
diff --git a/gcc/config/ia64/ia64.c b/gcc/config/ia64/ia64.c
index 8f74bdc95c3..3d30ff872e6 100644
--- a/gcc/config/ia64/ia64.c
+++ b/gcc/config/ia64/ia64.c
@@ -30,7 +30,6 @@ Boston, MA 02111-1307, USA. */
#include "real.h"
#include "insn-config.h"
#include "conditions.h"
-#include "insn-flags.h"
#include "output.h"
#include "insn-attr.h"
#include "flags.h"
diff --git a/gcc/config/m32r/m32r.c b/gcc/config/m32r/m32r.c
index 4cf0a3e50c5..88351dd97b8 100644
--- a/gcc/config/m32r/m32r.c
+++ b/gcc/config/m32r/m32r.c
@@ -27,7 +27,6 @@ Boston, MA 02111-1307, USA. */
#include "real.h"
#include "insn-config.h"
#include "conditions.h"
-#include "insn-flags.h"
#include "output.h"
#include "insn-attr.h"
#include "flags.h"
diff --git a/gcc/config/m68hc11/m68hc11.c b/gcc/config/m68hc11/m68hc11.c
index 2fcf4ce6dab..44a8b26c263 100644
--- a/gcc/config/m68hc11/m68hc11.c
+++ b/gcc/config/m68hc11/m68hc11.c
@@ -45,7 +45,6 @@ Note:
#include "real.h"
#include "insn-config.h"
#include "conditions.h"
-#include "insn-flags.h"
#include "output.h"
#include "insn-attr.h"
#include "flags.h"
diff --git a/gcc/config/m68k/m68k.c b/gcc/config/m68k/m68k.c
index f2265b796f7..8bd26a7d823 100644
--- a/gcc/config/m68k/m68k.c
+++ b/gcc/config/m68k/m68k.c
@@ -29,7 +29,6 @@ Boston, MA 02111-1307, USA. */
#include "real.h"
#include "insn-config.h"
#include "conditions.h"
-#include "insn-flags.h"
#include "output.h"
#include "insn-attr.h"
#include "recog.h"
diff --git a/gcc/config/m88k/m88k.c b/gcc/config/m88k/m88k.c
index beeb8fcfeb7..cd6f1fbe1da 100644
--- a/gcc/config/m88k/m88k.c
+++ b/gcc/config/m88k/m88k.c
@@ -29,7 +29,6 @@ Boston, MA 02111-1307, USA. */
#include "real.h"
#include "insn-config.h"
#include "conditions.h"
-#include "insn-flags.h"
#include "output.h"
#include "insn-attr.h"
#include "tree.h"
diff --git a/gcc/config/mcore/mcore.c b/gcc/config/mcore/mcore.c
index 42cb5784836..89ef10dcb5b 100644
--- a/gcc/config/mcore/mcore.c
+++ b/gcc/config/mcore/mcore.c
@@ -30,7 +30,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#include "real.h"
#include "insn-config.h"
#include "conditions.h"
-#include "insn-flags.h"
#include "output.h"
#include "insn-attr.h"
#include "flags.h"
diff --git a/gcc/config/mips/mips.c b/gcc/config/mips/mips.c
index 23a05bc6281..e33cb9b65a3 100644
--- a/gcc/config/mips/mips.c
+++ b/gcc/config/mips/mips.c
@@ -36,9 +36,7 @@ Boston, MA 02111-1307, USA. */
#include "real.h"
#include "insn-config.h"
#include "conditions.h"
-#include "insn-flags.h"
#include "insn-attr.h"
-#include "insn-codes.h"
#include "recog.h"
#include "toplev.h"
#include "output.h"
diff --git a/gcc/config/mn10200/mn10200.c b/gcc/config/mn10200/mn10200.c
index 9cafc33a114..1e520a84c60 100644
--- a/gcc/config/mn10200/mn10200.c
+++ b/gcc/config/mn10200/mn10200.c
@@ -28,7 +28,6 @@ Boston, MA 02111-1307, USA. */
#include "real.h"
#include "insn-config.h"
#include "conditions.h"
-#include "insn-flags.h"
#include "output.h"
#include "insn-attr.h"
#include "flags.h"
diff --git a/gcc/config/mn10300/mn10300.c b/gcc/config/mn10300/mn10300.c
index bc6b1fc3c87..225c8789994 100644
--- a/gcc/config/mn10300/mn10300.c
+++ b/gcc/config/mn10300/mn10300.c
@@ -28,7 +28,6 @@ Boston, MA 02111-1307, USA. */
#include "real.h"
#include "insn-config.h"
#include "conditions.h"
-#include "insn-flags.h"
#include "output.h"
#include "insn-attr.h"
#include "flags.h"
diff --git a/gcc/config/ns32k/ns32k.c b/gcc/config/ns32k/ns32k.c
index 42ad19d370f..3fbde5a8f16 100644
--- a/gcc/config/ns32k/ns32k.c
+++ b/gcc/config/ns32k/ns32k.c
@@ -27,7 +27,6 @@ Boston, MA 02111-1307, USA. */
#include "real.h"
#include "insn-config.h"
#include "conditions.h"
-#include "insn-flags.h"
#include "output.h"
#include "insn-attr.h"
#include "tree.h"
diff --git a/gcc/config/pa/pa.c b/gcc/config/pa/pa.c
index 878635fa037..699af79ff7b 100644
--- a/gcc/config/pa/pa.c
+++ b/gcc/config/pa/pa.c
@@ -28,7 +28,6 @@ Boston, MA 02111-1307, USA. */
#include "real.h"
#include "insn-config.h"
#include "conditions.h"
-#include "insn-flags.h"
#include "output.h"
#include "insn-attr.h"
#include "flags.h"
diff --git a/gcc/config/pdp11/pdp11.c b/gcc/config/pdp11/pdp11.c
index 83f191f340d..b298ea0ebff 100644
--- a/gcc/config/pdp11/pdp11.c
+++ b/gcc/config/pdp11/pdp11.c
@@ -28,7 +28,6 @@ Boston, MA 02111-1307, USA. */
#include "real.h"
#include "insn-config.h"
#include "conditions.h"
-#include "insn-flags.h"
#include "function.h"
#include "output.h"
#include "insn-attr.h"
diff --git a/gcc/config/pj/pj.c b/gcc/config/pj/pj.c
index 43a3066d07c..febe2997bcf 100644
--- a/gcc/config/pj/pj.c
+++ b/gcc/config/pj/pj.c
@@ -89,7 +89,6 @@ Boston, MA 02111-1307, USA. */
#include "real.h"
#include "insn-config.h"
#include "conditions.h"
-#include "insn-flags.h"
#include "output.h"
#include "insn-attr.h"
#include "flags.h"
diff --git a/gcc/config/romp/romp.c b/gcc/config/romp/romp.c
index 91cfeeba33b..7aedeb60024 100644
--- a/gcc/config/romp/romp.c
+++ b/gcc/config/romp/romp.c
@@ -29,7 +29,6 @@ Boston, MA 02111-1307, USA. */
#include "real.h"
#include "insn-config.h"
#include "conditions.h"
-#include "insn-flags.h"
#include "output.h"
#include "insn-attr.h"
#include "flags.h"
diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index 557dc196b38..ea42bf53899 100644
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -28,7 +28,6 @@ Boston, MA 02111-1307, USA. */
#include "real.h"
#include "insn-config.h"
#include "conditions.h"
-#include "insn-flags.h"
#include "insn-attr.h"
#include "flags.h"
#include "recog.h"
diff --git a/gcc/config/sh/sh.c b/gcc/config/sh/sh.c
index f991fe7b14a..4cb5cf27fb0 100644
--- a/gcc/config/sh/sh.c
+++ b/gcc/config/sh/sh.c
@@ -27,7 +27,6 @@ Boston, MA 02111-1307, USA. */
#include "rtl.h"
#include "tree.h"
#include "flags.h"
-#include "insn-flags.h"
#include "expr.h"
#include "function.h"
#include "regs.h"
diff --git a/gcc/config/sh/sh.h b/gcc/config/sh/sh.h
index 60f63190da5..7045148ae29 100644
--- a/gcc/config/sh/sh.h
+++ b/gcc/config/sh/sh.h
@@ -28,7 +28,8 @@ Boston, MA 02111-1307, USA. */
fputs (" (Hitachi SH)", stderr);
/* Unfortunately, insn-attrtab.c doesn't include insn-codes.h. We can't
- include it here, because hconfig.h is also included by gencodes.c . */
+ include it here, because hconfig.h is also included by gencodes.c . */
+/* ??? No longer true. */
extern int code_for_indirect_jump_scratch;
/* Generate SDB debugging information. */
diff --git a/gcc/config/sparc/sparc.c b/gcc/config/sparc/sparc.c
index 2072fec8932..e4850271c6c 100644
--- a/gcc/config/sparc/sparc.c
+++ b/gcc/config/sparc/sparc.c
@@ -31,7 +31,6 @@ Boston, MA 02111-1307, USA. */
#include "real.h"
#include "insn-config.h"
#include "conditions.h"
-#include "insn-flags.h"
#include "output.h"
#include "insn-attr.h"
#include "flags.h"
diff --git a/gcc/config/v850/v850.c b/gcc/config/v850/v850.c
index ffc2a2474de..34369d46325 100644
--- a/gcc/config/v850/v850.c
+++ b/gcc/config/v850/v850.c
@@ -29,7 +29,6 @@ Boston, MA 02111-1307, USA. */
#include "real.h"
#include "insn-config.h"
#include "conditions.h"
-#include "insn-flags.h"
#include "output.h"
#include "insn-attr.h"
#include "flags.h"
diff --git a/gcc/config/vax/vax.c b/gcc/config/vax/vax.c
index f64b4701647..574ffa525c4 100644
--- a/gcc/config/vax/vax.c
+++ b/gcc/config/vax/vax.c
@@ -27,7 +27,6 @@ Boston, MA 02111-1307, USA. */
#include "real.h"
#include "insn-config.h"
#include "conditions.h"
-#include "insn-flags.h"
#include "function.h"
#include "output.h"
#include "insn-attr.h"
diff --git a/gcc/diagnostic.c b/gcc/diagnostic.c
index 1863a2c3904..c807885a2c4 100644
--- a/gcc/diagnostic.c
+++ b/gcc/diagnostic.c
@@ -34,7 +34,6 @@ Boston, MA 02111-1307, USA. */
#include "flags.h"
#include "input.h"
#include "insn-attr.h"
-#include "insn-codes.h"
#include "insn-config.h"
#include "toplev.h"
#include "intl.h"
diff --git a/gcc/doloop.c b/gcc/doloop.c
index 191cdf0cf37..7d474aa82cc 100644
--- a/gcc/doloop.c
+++ b/gcc/doloop.c
@@ -22,7 +22,6 @@ Boston, MA 02111-1307, USA. */
#include "config.h"
#include "system.h"
#include "rtl.h"
-#include "insn-flags.h"
#include "flags.h"
#include "expr.h"
#include "loop.h"
diff --git a/gcc/except.c b/gcc/except.c
index 4770031220a..5c854684680 100644
--- a/gcc/except.c
+++ b/gcc/except.c
@@ -397,9 +397,7 @@ Boston, MA 02111-1307, USA. */
#include "flags.h"
#include "except.h"
#include "function.h"
-#include "insn-flags.h"
#include "expr.h"
-#include "insn-codes.h"
#include "regs.h"
#include "hard-reg-set.h"
#include "insn-config.h"
diff --git a/gcc/explow.c b/gcc/explow.c
index 719421f6cd6..b1c2a896571 100644
--- a/gcc/explow.c
+++ b/gcc/explow.c
@@ -32,8 +32,6 @@ Boston, MA 02111-1307, USA. */
#include "hard-reg-set.h"
#include "insn-config.h"
#include "recog.h"
-#include "insn-flags.h"
-#include "insn-codes.h"
#if !defined PREFERRED_STACK_BOUNDARY && defined STACK_BOUNDARY
#define PREFERRED_STACK_BOUNDARY STACK_BOUNDARY
diff --git a/gcc/expmed.c b/gcc/expmed.c
index 6eb5f9ebfee..7fdbdf5d2bf 100644
--- a/gcc/expmed.c
+++ b/gcc/expmed.c
@@ -28,8 +28,6 @@ Boston, MA 02111-1307, USA. */
#include "tree.h"
#include "tm_p.h"
#include "flags.h"
-#include "insn-flags.h"
-#include "insn-codes.h"
#include "insn-config.h"
#include "expr.h"
#include "real.h"
diff --git a/gcc/expr.c b/gcc/expr.c
index f2523a41b22..ac683dbf1b6 100644
--- a/gcc/expr.c
+++ b/gcc/expr.c
@@ -30,8 +30,6 @@ Boston, MA 02111-1307, USA. */
#include "hard-reg-set.h"
#include "except.h"
#include "function.h"
-#include "insn-flags.h"
-#include "insn-codes.h"
#include "insn-config.h"
/* Include expr.h after insn-config.h so we get HAVE_conditional_move. */
#include "expr.h"
diff --git a/gcc/expr.h b/gcc/expr.h
index abfc38de8e9..b1f2765e5c0 100644
--- a/gcc/expr.h
+++ b/gcc/expr.h
@@ -268,10 +268,6 @@ enum direction {none, upward, downward}; /* Value has this type. */
A few optabs, such as move_optab and cmp_optab, are used
by special code. */
-/* Everything that uses expr.h needs to define enum insn_code
- but we don't list it in the Makefile dependencies just for that. */
-#include "insn-codes.h"
-
typedef struct optab
{
enum rtx_code code;
diff --git a/gcc/final.c b/gcc/final.c
index 123ea082cc3..402ff8c2272 100644
--- a/gcc/final.c
+++ b/gcc/final.c
@@ -52,9 +52,7 @@ Boston, MA 02111-1307, USA. */
#include "tm_p.h"
#include "regs.h"
#include "insn-config.h"
-#include "insn-flags.h"
#include "insn-attr.h"
-#include "insn-codes.h"
#include "recog.h"
#include "conditions.h"
#include "flags.h"
diff --git a/gcc/flow.c b/gcc/flow.c
index 819765523a2..5b9b31bfb96 100644
--- a/gcc/flow.c
+++ b/gcc/flow.c
@@ -133,7 +133,6 @@ Boston, MA 02111-1307, USA. */
#include "except.h"
#include "toplev.h"
#include "recog.h"
-#include "insn-flags.h"
#include "expr.h"
#include "ssa.h"
diff --git a/gcc/function.c b/gcc/function.c
index 16bf73a6375..e8e35aee5a5 100644
--- a/gcc/function.c
+++ b/gcc/function.c
@@ -45,9 +45,7 @@ Boston, MA 02111-1307, USA. */
#include "flags.h"
#include "except.h"
#include "function.h"
-#include "insn-flags.h"
#include "expr.h"
-#include "insn-codes.h"
#include "regs.h"
#include "hard-reg-set.h"
#include "insn-config.h"
diff --git a/gcc/genemit.c b/gcc/genemit.c
index fafa04fd8f6..254bc376bdf 100644
--- a/gcc/genemit.c
+++ b/gcc/genemit.c
@@ -813,8 +813,6 @@ from the machine description file `md'. */\n\n");
printf ("#include \"flags.h\"\n");
printf ("#include \"output.h\"\n");
printf ("#include \"insn-config.h\"\n");
- printf ("#include \"insn-flags.h\"\n");
- printf ("#include \"insn-codes.h\"\n");
printf ("#include \"hard-reg-set.h\"\n");
printf ("#include \"recog.h\"\n");
printf ("#include \"resource.h\"\n");
diff --git a/gcc/genflags.c b/gcc/genflags.c
index 2e18585edbb..73e8bc7475e 100644
--- a/gcc/genflags.c
+++ b/gcc/genflags.c
@@ -156,16 +156,16 @@ gen_proto (insn)
gen_macro (name, num, 5);
}
- printf ("extern rtx gen_%-*s PARAMS ((", max_id_len, name);
+ printf ("extern struct rtx_def *gen_%-*s PARAMS ((", max_id_len, name);
if (num == 0)
printf ("void");
else
{
while (num-- > 1)
- printf ("rtx, ");
+ printf ("struct rtx_def *, ");
- printf ("rtx");
+ printf ("struct rtx_def *");
}
printf ("));\n");
@@ -254,6 +254,7 @@ from the machine description file `md'. */\n\n");
obstack_grow (&obstack, &dummy, sizeof (rtx));
insns = (rtx *) obstack_finish (&obstack);
+ printf ("struct rtx_def;\n");
for (insn_ptr = insns; *insn_ptr; insn_ptr++)
gen_proto (*insn_ptr);
diff --git a/gcc/genopinit.c b/gcc/genopinit.c
index 9aeaee7baac..e8b12112865 100644
--- a/gcc/genopinit.c
+++ b/gcc/genopinit.c
@@ -326,8 +326,6 @@ from the machine description file `md'. */\n\n");
printf ("#include \"system.h\"\n");
printf ("#include \"rtl.h\"\n");
printf ("#include \"flags.h\"\n");
- printf ("#include \"insn-flags.h\"\n");
- printf ("#include \"insn-codes.h\"\n");
printf ("#include \"insn-config.h\"\n");
printf ("#include \"recog.h\"\n");
printf ("#include \"expr.h\"\n");
diff --git a/gcc/genoutput.c b/gcc/genoutput.c
index c10b8e5d15a..724f011fb8c 100644
--- a/gcc/genoutput.c
+++ b/gcc/genoutput.c
@@ -229,9 +229,7 @@ output_prologue ()
printf ("#include \"real.h\"\n");
printf ("#include \"insn-config.h\"\n\n");
printf ("#include \"conditions.h\"\n");
- printf ("#include \"insn-flags.h\"\n");
printf ("#include \"insn-attr.h\"\n\n");
- printf ("#include \"insn-codes.h\"\n\n");
printf ("#include \"recog.h\"\n\n");
printf ("#include \"toplev.h\"\n");
printf ("#include \"output.h\"\n");
diff --git a/gcc/haifa-sched.c b/gcc/haifa-sched.c
index 977b6ecd297..d795c2d86d1 100644
--- a/gcc/haifa-sched.c
+++ b/gcc/haifa-sched.c
@@ -144,7 +144,6 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include "flags.h"
#include "insn-config.h"
#include "insn-attr.h"
-#include "insn-flags.h"
#include "except.h"
#include "toplev.h"
#include "recog.h"
diff --git a/gcc/integrate.c b/gcc/integrate.c
index f26a4461312..f91f9f15c37 100644
--- a/gcc/integrate.c
+++ b/gcc/integrate.c
@@ -29,7 +29,6 @@ Boston, MA 02111-1307, USA. */
#include "regs.h"
#include "flags.h"
#include "insn-config.h"
-#include "insn-flags.h"
#include "expr.h"
#include "output.h"
#include "recog.h"
diff --git a/gcc/jump.c b/gcc/jump.c
index 6fc4deb10f9..bc80ba2e3b6 100644
--- a/gcc/jump.c
+++ b/gcc/jump.c
@@ -59,7 +59,6 @@ Boston, MA 02111-1307, USA. */
#include "hard-reg-set.h"
#include "regs.h"
#include "insn-config.h"
-#include "insn-flags.h"
#include "insn-attr.h"
#include "recog.h"
#include "function.h"
diff --git a/gcc/loop.c b/gcc/loop.c
index 7eb4d0df450..f2d44cba7cc 100644
--- a/gcc/loop.c
+++ b/gcc/loop.c
@@ -44,7 +44,6 @@ Boston, MA 02111-1307, USA. */
#include "hard-reg-set.h"
#include "basic-block.h"
#include "insn-config.h"
-#include "insn-flags.h"
#include "regs.h"
#include "recog.h"
#include "flags.h"
diff --git a/gcc/mkconfig.sh b/gcc/mkconfig.sh
index 53151d00d29..e89d382e002 100644
--- a/gcc/mkconfig.sh
+++ b/gcc/mkconfig.sh
@@ -50,6 +50,7 @@ done
# and we want EXTRA_CC_MODES to be taken into account.
echo "#ifndef GENERATOR_FILE"
echo "#include \"insn-codes.h\""
+echo "#include \"insn-flags.h\""
echo "#endif"
exec >&-
diff --git a/gcc/optabs.c b/gcc/optabs.c
index bde10d4cde4..0322510300d 100644
--- a/gcc/optabs.c
+++ b/gcc/optabs.c
@@ -31,8 +31,6 @@ Boston, MA 02111-1307, USA. */
#include "tree.h"
#include "tm_p.h"
#include "flags.h"
-#include "insn-flags.h"
-#include "insn-codes.h"
#include "function.h"
#include "expr.h"
#include "recog.h"
diff --git a/gcc/predict.c b/gcc/predict.c
index d598ef92e6c..fe9fcd1c812 100644
--- a/gcc/predict.c
+++ b/gcc/predict.c
@@ -45,7 +45,6 @@
#include "except.h"
#include "toplev.h"
#include "recog.h"
-#include "insn-flags.h"
#include "expr.h"
diff --git a/gcc/profile.c b/gcc/profile.c
index 55eab8b117c..7b5169c8d37 100644
--- a/gcc/profile.c
+++ b/gcc/profile.c
@@ -38,7 +38,6 @@ Boston, MA 02111-1307, USA. */
#include "rtl.h"
#include "tree.h"
#include "flags.h"
-#include "insn-flags.h"
#include "insn-config.h"
#include "output.h"
#include "regs.h"
diff --git a/gcc/recog.c b/gcc/recog.c
index 55f6656a4a3..1596a019067 100644
--- a/gcc/recog.c
+++ b/gcc/recog.c
@@ -26,8 +26,6 @@ Boston, MA 02111-1307, USA. */
#include "tm_p.h"
#include "insn-config.h"
#include "insn-attr.h"
-#include "insn-flags.h"
-#include "insn-codes.h"
#include "hard-reg-set.h"
#include "recog.h"
#include "regs.h"
diff --git a/gcc/reg-stack.c b/gcc/reg-stack.c
index 189fdca1e07..0e85a5ab922 100644
--- a/gcc/reg-stack.c
+++ b/gcc/reg-stack.c
@@ -161,7 +161,6 @@
#include "regs.h"
#include "hard-reg-set.h"
#include "flags.h"
-#include "insn-flags.h"
#include "toplev.h"
#include "recog.h"
#include "output.h"
diff --git a/gcc/regmove.c b/gcc/regmove.c
index cbbeb835c7e..262338f6b05 100644
--- a/gcc/regmove.c
+++ b/gcc/regmove.c
@@ -37,7 +37,6 @@ Boston, MA 02111-1307, USA. */
#include "flags.h"
#include "function.h"
#include "expr.h"
-#include "insn-flags.h"
#include "basic-block.h"
#include "toplev.h"
diff --git a/gcc/reload.c b/gcc/reload.c
index 5f27744057d..9849aed299b 100644
--- a/gcc/reload.c
+++ b/gcc/reload.c
@@ -91,7 +91,6 @@ a register with any other reload. */
#include "rtl.h"
#include "tm_p.h"
#include "insn-config.h"
-#include "insn-codes.h"
#include "recog.h"
#include "reload.h"
#include "regs.h"
diff --git a/gcc/reload1.c b/gcc/reload1.c
index 39d1cc3383c..bdcc7c517bd 100644
--- a/gcc/reload1.c
+++ b/gcc/reload1.c
@@ -28,8 +28,6 @@ Boston, MA 02111-1307, USA. */
#include "tm_p.h"
#include "obstack.h"
#include "insn-config.h"
-#include "insn-flags.h"
-#include "insn-codes.h"
#include "flags.h"
#include "function.h"
#include "expr.h"
diff --git a/gcc/reorg.c b/gcc/reorg.c
index 142ecdf6767..b521645d621 100644
--- a/gcc/reorg.c
+++ b/gcc/reorg.c
@@ -132,7 +132,6 @@ Boston, MA 02111-1307, USA. */
#include "hard-reg-set.h"
#include "basic-block.h"
#include "regs.h"
-#include "insn-flags.h"
#include "recog.h"
#include "flags.h"
#include "output.h"
diff --git a/gcc/stmt.c b/gcc/stmt.c
index 1786c209a73..4f950ce5ce7 100644
--- a/gcc/stmt.c
+++ b/gcc/stmt.c
@@ -42,9 +42,7 @@ Boston, MA 02111-1307, USA. */
#include "flags.h"
#include "except.h"
#include "function.h"
-#include "insn-flags.h"
#include "insn-config.h"
-#include "insn-codes.h"
#include "expr.h"
#include "hard-reg-set.h"
#include "obstack.h"
diff --git a/gcc/toplev.c b/gcc/toplev.c
index 0a906725199..7a9569722ad 100644
--- a/gcc/toplev.c
+++ b/gcc/toplev.c
@@ -45,7 +45,6 @@ Boston, MA 02111-1307, USA. */
#include "tm_p.h"
#include "flags.h"
#include "insn-attr.h"
-#include "insn-codes.h"
#include "insn-config.h"
#include "hard-reg-set.h"
#include "recog.h"