* 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.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b52795c..73afd21 100644 (file)
--- 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 dc9a55f..b172fa0 100644 (file)
--- 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 6b20df7..a1f2e0b 100644 (file)
--- 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 08d2326..740be9a 100644 (file)
--- 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 8ccd092..27804e2 100644 (file)
--- 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 6b5f508..a5c29af 100644 (file)
--- 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 230d4fd..723f9a9 100644 (file)
--- 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 a895f44..c6d7ba2 100644 (file)
--- 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 a52d572..997fb36 100644 (file)
--- 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 e0ad002..5c9acc6 100644 (file)
--- 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 d906b14..0f0c5e9 100644 (file)
--- 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 b01f951..fe3df94 100644 (file)
--- 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 b8f3d2a..dcc948e 100644 (file)
--- 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 9e743eb..0c3f379 100644 (file)
--- 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 1b41db3..947a715 100644 (file)
--- 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 c103e81..a4f5e8d 100644 (file)
--- 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 c74ac38..fbc28c0 100644 (file)
--- 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 c2ee005..f1f63e1 100644 (file)
--- 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 a52120c..1a4a766 100644 (file)
--- 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 2db1a01..778930e 100644 (file)
--- 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 d5a1da1..af16979 100644 (file)
--- 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 912e4e6..7cc9d51 100644 (file)
--- 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 c56f2f7..3346529 100644 (file)
--- 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 8f74bdc..3d30ff8 100644 (file)
--- 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 4cf0a3e..88351dd 100644 (file)
--- 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 2fcf4ce..44a8b26 100644 (file)
--- 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 f2265b7..8bd26a7 100644 (file)
--- 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 beeb8fc..cd6f1fb 100644 (file)
--- 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 42cb578..89ef10d 100644 (file)
--- 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 23a05bc..e33cb9b 100644 (file)
--- 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 9cafc33..1e520a8 100644 (file)
--- 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 bc6b1fc..225c878 100644 (file)
--- 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 42ad19d..3fbde5a 100644 (file)
--- 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 878635f..699af79 100644 (file)
--- 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 83f191f..b298ea0 100644 (file)
--- 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 43a3066..febe299 100644 (file)
--- 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 91cfeeb..7aedeb6 100644 (file)
--- 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 557dc19..ea42bf5 100644 (file)
--- 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 f991fe7..4cb5cf2 100644 (file)
--- 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 60f6319..7045148 100644 (file)
--- 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 2072fec..e485027 100644 (file)
--- 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 ffc2a24..34369d4 100644 (file)
--- 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 f64b470..574ffa5 100644 (file)
--- 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 1863a2c..c807885 100644 (file)
--- 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 191cdf0..7d474aa 100644 (file)
--- 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 4770031..5c85468 100644 (file)
--- 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 719421f..b1c2a89 100644 (file)
--- 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 6eb5f9e..7fdbdf5 100644 (file)
--- 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 f2523a4..ac683db 100644 (file)
--- 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 abfc38d..b1f2765 100644 (file)
--- 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 123ea08..402ff8c 100644 (file)
--- 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 8197655..5b9b31b 100644 (file)
--- 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 16bf73a..e8e35ae 100644 (file)
--- 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 fafa04f..254bc37 100644 (file)
--- 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 2e18585..73e8bc7 100644 (file)
--- 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 9aeaee7..e8b1211 100644 (file)
--- 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 c10b8e5..724f011 100644 (file)
--- 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 977b6ec..d795c2d 100644 (file)
--- 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 f26a446..f91f9f1 100644 (file)
--- 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 6fc4deb..bc80ba2 100644 (file)
--- 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 7eb4d0d..f2d44cb 100644 (file)
--- 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 53151d0..e89d382 100644 (file)
--- 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 bde10d4..0322510 100644 (file)
--- 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 d598ef9..fe9fcd1 100644 (file)
--- 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 55eab8b..7b5169c 100644 (file)
--- 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 55f6656..1596a01 100644 (file)
--- 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 189fdca..0e85a5a 100644 (file)
--- 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 cbbeb83..262338f 100644 (file)
--- 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 5f27744..9849aed 100644 (file)
--- 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 39d1cc3..bdcc7c5 100644 (file)
--- 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 142ecdf..b521645 100644 (file)
--- 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 1786c20..4f950ce 100644 (file)
--- 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 0a90672..7a95697 100644 (file)
--- 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"