summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoramacleod <amacleod@138bc75d-0d04-0410-961f-82ee72b054a4>2014-10-16 16:37:19 +0000
committeramacleod <amacleod@138bc75d-0d04-0410-961f-82ee72b054a4>2014-10-16 16:37:19 +0000
commita3020f2f4274cf3fdbc665ab08a4af38d888772c (patch)
tree16f08b07a88339a4442c9c25ec594a8f928181c3
parent10635db93c483ea70a866d8ec1d5206ddcd8d205 (diff)
downloadgcc-a3020f2f4274cf3fdbc665ab08a4af38d888772c.tar.gz
2014-10-16 Andrew MacLeod <amacleod@redhat.com>
* function.h: Flatten file. Remove includes, adjust prototypes to reflect only what is in function.h. (enum direction, struct args_size, struct locate_and_pad_arg_data, ADD_PARM_SIZE, SUB_PARM_SIZE, ARGS_SIZE_TREE, ARGS_SIZE_RTX): Relocate from expr.h. (ASLK_REDUCE_ALIGN, ASLK_RECORD_PAD): Relocate from rtl.h. (optimize_function_for_size_p, optimize_function_for_speed_p): Move prototypes to predict.h. (init_varasm_status): Move prototype to varasm.h. * expr.h: Adjust include files. (enum direction, struct args_size, struct locate_and_pad_arg_data, ADD_PARM_SIZE, SUB_PARM_SIZE, ARGS_SIZE_TREE, ARGS_SIZE_RTX): Move to function.h. (locate_and_pad_parm): Move prototype to function.h. * rtl.h: (assign_stack_local, ASLK_REDUCE_ALIGN, ASLK_RECORD_PAD, assign_stack_local_1, assign_stack_temp, assign_stack_temp_for_type, assign_temp, reposition_prologue_and_epilogue_notes, prologue_epilogue_contains, sibcall_epilogue_contains, update_temp_slot_address, maybe_copy_prologue_epilogue_insn, set_return_jump_label): Move prototypes to function.h. * predict.h (optimize_function_for_size_p, optimize_function_for_speed_p): Relocate prototypes from function.h. * shrink-wrap.h (emit_return_into_block, active_insn_between, convert_jumps_to_returns, emit_return_for_exit): Move prototypes to function.h. * varasm.h (init_varasm_status): Relocate prototype from function.h. * genattrtab.c (write_header): Add predict.h to include list. * genconditions.c (write_header): Add predict.h to include list. * genemit.c (main): Adjust header file includes. * gengtype.c (ifiles): Add flattened function.h header files. * genoutput.c (output_prologue): Add predict.h to include list. * genpreds.c (write_insn_preds_c): Adjust header file includes. * genrecog.c (write_header): Add flattened function.h header files. * alias.c: Adjust include files. * auto-inc-dec.c: Likewise. * basic-block.h: Likewise. * bb-reorder.c: Likewise. * bt-load.c: Likewise. * builtins.c: Likewise. * caller-save.c: Likewise. * calls.c: Likewise. * cfgbuild.c: Likewise. * cfgcleanup.c: Likewise. * cfgexpand.c: Likewise. * cfgloop.c: Likewise. * cfgloop.h: Likewise. * cfgrtl.c: Likewise. * cgraph.h: Likewise. * cgraphclones.c: Likewise. * cgraphunit.c: Likewise. * combine-stack-adj.c: Likewise. * combine.c: Likewise. * coverage.c: Likewise. * cprop.c: Likewise. * cse.c: Likewise. * cselib.c: Likewise. * dbxout.c: Likewise. * ddg.c: Likewise. * df-core.c: Likewise. * df-problems.c: Likewise. * df-scan.c: Likewise. * dojump.c: Likewise. * dwarf2cfi.c: Likewise. * dwarf2out.c: Likewise. * emit-rtl.c: Likewise. * except.c: Likewise. * explow.c: Likewise. * expr.c: Likewise. * final.c: Likewise. * function.c: Likewise. * gcse.c: Likewise. * gimple-fold.c: Likewise. * gimple-low.c: Likewise. * gimple-streamer.h: Likewise. * haifa-sched.c: Likewise. * ifcvt.c: Likewise. * ira.c: Likewise. * jump.c: Likewise. * lcm.c: Likewise. * loop-invariant.c: Likewise. * lra-assigns.c: Likewise. * lra-coalesce.c: Likewise. * lra-constraints.c: Likewise. * lra-eliminations.c: Likewise. * lra-lives.c: Likewise. * lra-spills.c: Likewise. * lra.c: Likewise. * lto-cgraph.c: Likewise. * lto-section-in.c: Likewise. * lto-section-out.c: Likewise. * lto-streamer-in.c: Likewise. * lto-streamer-out.c: Likewise. * mode-switching.c: Likewise. * modulo-sched.c: Likewise. * omp-low.c: Likewise. * optabs.c: Likewise. * passes.c: Likewise. * postreload-gcse.c: Likewise. * postreload.c: Likewise. * predict.c: Likewise. * profile.c: Likewise. * recog.c: Likewise. * ree.c: Likewise. * reg-stack.c: Likewise. * regcprop.c: Likewise. * reginfo.c: Likewise. * regrename.c: Likewise. * reload.c: Likewise. * reload1.c: Likewise. * reorg.c: Likewise. * resource.c: Likewise. * rtlanal.c: Likewise. * sched-deps.c: Likewise. * sched-ebb.c: Likewise. * sched-rgn.c: Likewise. * sel-sched-dump.c: Likewise. * sel-sched-ir.c: Likewise. * sel-sched.c: Likewise. * shrink-wrap.c: Likewise. * simplify-rtx.c: Likewise. * statistics.c: Likewise. * stmt.c: Likewise. * stor-layout.c: Likewise. * store-motion.c: Likewise. * symtab.c: Likewise. * targhooks.c: Likewise. * toplev.c: Likewise. * trans-mem.c: Likewise. * tree-cfg.c: Likewise. * tree-cfgcleanup.c: Likewise. * tree-dfa.c: Likewise. * tree-eh.c: Likewise. * tree-inline.c: Likewise. * tree-into-ssa.c: Likewise. * tree-nested.c: Likewise. * tree-nrv.c: Likewise. * tree-profile.c: Likewise. * tree-ssa-alias.c: Likewise. * tree-ssa-ccp.c: Likewise. * tree-ssa-copy.c: Likewise. * tree-ssa-copyrename.c: Likewise. * tree-ssa-dom.c: Likewise. * tree-ssa-operands.c: Likewise. * tree-ssa-propagate.c: Likewise. * tree-ssa-structalias.c: Likewise. * tree-ssa-tail-merge.c: Likewise. * tree-ssa-threadedge.c: Likewise. * tree-ssa-threadupdate.c: Likewise. * tree-ssa-uncprop.c: Likewise. * tree-ssa-uninit.c: Likewise. * tree-ssa.c: Likewise. * tree-stdarg.c: Likewise. * tree-tailcall.c: Likewise. * tree.c: Likewise. * tsan.c: Likewise. * valtrack.c: Likewise. * varasm.c: Likewise. * vmsdbgout.c: Likewise. * web.c: Likewise. * testsuite/g++.dg/plugin/pragma_plugin.c: Adjust include files. * config/aarch64/aarch64.c: Add flattened includes from function.h. * config/alpha/alpha.c: Likewise. * config/arc/arc.c: Likewise. * config/arm/arm.c: Likewise. * config/avr/avr-log.c: Likewise. * config/avr/avr.c: Likewise. * config/bfin/bfin.c: Likewise. * config/c6x/c6x.c: Likewise. * config/cr16/cr16.c: Likewise. * config/cris/cris.c: Likewise. * config/darwin.c: Likewise. * config/epiphany/epiphany.c: Likewise. * config/epiphany/mode-switch-use.c: Likewise. * config/epiphany/resolve-sw-modes.c: Likewise. * config/fr30/fr30.c: Likewise. * config/frv/frv.c: Likewise. * config/h8300/h8300.c: Likewise. * config/i386/i386.c: Likewise. * config/ia64/ia64.c: Likewise. * config/iq2000/iq2000.c: Likewise. * config/lm32/lm32.c: Likewise. * config/m32c/m32c.c: Likewise. * config/m32r/m32r.c: Likewise. * config/m68k/m68k.c: Likewise. * config/mcore/mcore.c: Likewise. * config/mep/mep-pragma.c: Likewise. * config/mep/mep.c: Likewise. * config/microblaze/microblaze.c: Likewise. * config/mips/mips.c: Likewise. * config/mmix/mmix.c: Likewise. * config/mn10300/mn10300.c: Likewise. * config/moxie/moxie.c: Likewise. * config/msp430/msp430.c: Likewise. * config/nds32/nds32-cost.c: Likewise. * config/nds32/nds32-fp-as-gp.c: Likewise. * config/nds32/nds32-intrinsic.c: Likewise. * config/nds32/nds32-isr.c: Likewise. * config/nds32/nds32-md-auxiliary.c: Likewise. * config/nds32/nds32-memory-manipulation.c: Likewise. * config/nds32/nds32-pipelines-auxiliary.c: Likewise. * config/nds32/nds32-predicates.c: Likewise. * config/nds32/nds32.c: Likewise. * config/nios2/nios2.c: Likewise. * config/pa/pa.c: Likewise. * config/pdp11/pdp11.c: Likewise. * config/rl78/rl78.c: Likewise. * config/rs6000/rs6000.c: Likewise. * config/rx/rx.c: Likewise. * config/s390/s390.c: Likewise. * config/score/score.c: Likewise. * config/sh/sh.c: Likewise. * config/sparc/sparc.c: Likewise. * config/spu/spu.c: Likewise. * config/stormy16/stormy16.c: Likewise. * config/tilegx/tilegx.c: Likewise. * config/tilepro/tilepro.c: Likewise. * config/v850/v850.c: Likewise. * config/vax/vax.c: Likewise. * config/xtensa/xtensa.c: Likewise. 2014-10-16 Andrew MacLeod <amacleod@redhat.com> * ada/gcc-interface/misc.c: Adjust include files. 2014-10-16 Andrew MacLeod <amacleod@redhat.com> * c/c-decl.c: Adjust include files. 2014-10-16 Andrew MacLeod <amacleod@redhat.com> * c-family/c-pragma.c: Adjust include files. * c-family/c-semantics.c: Likewise. 2014-10-16 Andrew MacLeod <amacleod@redhat.com> * cp/cp-tree.h: Adjust include files. 2014-10-16 Andrew MacLeod <amacleod@redhat.com> * fortran/f95-lang.c: Adjust include files. * fortran/trans-decl.c: Likewise. 2014-10-16 Andrew MacLeod <amacleod@redhat.com> * java/class.c: Adjust include files. * java/resource.c: Likewise. 2014-10-16 Andrew MacLeod <amacleod@redhat.com> * objc/objc-act.c: Adjust include files. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@216337 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/ChangeLog221
-rw-r--r--gcc/ada/ChangeLog4
-rw-r--r--gcc/ada/gcc-interface/misc.c6
-rw-r--r--gcc/alias.c7
-rw-r--r--gcc/auto-inc-dec.c5
-rw-r--r--gcc/basic-block.h6
-rw-r--r--gcc/bb-reorder.c6
-rw-r--r--gcc/bt-load.c5
-rw-r--r--gcc/builtins.c4
-rw-r--r--gcc/c-family/ChangeLog5
-rw-r--r--gcc/c-family/c-pragma.c7
-rw-r--r--gcc/c-family/c-semantics.c6
-rw-r--r--gcc/c/ChangeLog4
-rw-r--r--gcc/c/c-decl.c6
-rw-r--r--gcc/caller-save.c5
-rw-r--r--gcc/calls.c6
-rw-r--r--gcc/cfgbuild.c5
-rw-r--r--gcc/cfgcleanup.c5
-rw-r--r--gcc/cfgexpand.c6
-rw-r--r--gcc/cfgloop.c7
-rw-r--r--gcc/cfgloop.h7
-rw-r--r--gcc/cfgrtl.c5
-rw-r--r--gcc/cgraph.h6
-rw-r--r--gcc/cgraphclones.c7
-rw-r--r--gcc/cgraphunit.c6
-rw-r--r--gcc/combine-stack-adj.c5
-rw-r--r--gcc/combine.c5
-rw-r--r--gcc/config/aarch64/aarch64.c6
-rw-r--r--gcc/config/alpha/alpha.c6
-rw-r--r--gcc/config/arc/arc.c5
-rw-r--r--gcc/config/arm/arm.c5
-rw-r--r--gcc/config/avr/avr-log.c5
-rw-r--r--gcc/config/avr/avr.c5
-rw-r--r--gcc/config/bfin/bfin.c6
-rw-r--r--gcc/config/c6x/c6x.c6
-rw-r--r--gcc/config/cr16/cr16.c5
-rw-r--r--gcc/config/cris/cris.c5
-rw-r--r--gcc/config/darwin.c7
-rw-r--r--gcc/config/epiphany/epiphany.c5
-rw-r--r--gcc/config/epiphany/mode-switch-use.c6
-rw-r--r--gcc/config/epiphany/resolve-sw-modes.c3
-rw-r--r--gcc/config/fr30/fr30.c5
-rw-r--r--gcc/config/frv/frv.c5
-rw-r--r--gcc/config/h8300/h8300.c5
-rw-r--r--gcc/config/i386/i386.c6
-rw-r--r--gcc/config/ia64/ia64.c6
-rw-r--r--gcc/config/iq2000/iq2000.c5
-rw-r--r--gcc/config/lm32/lm32.c5
-rw-r--r--gcc/config/m32c/m32c.c6
-rw-r--r--gcc/config/m32r/m32r.c5
-rw-r--r--gcc/config/m68k/m68k.c7
-rw-r--r--gcc/config/mcore/mcore.c5
-rw-r--r--gcc/config/mep/mep-pragma.c5
-rw-r--r--gcc/config/mep/mep.c6
-rw-r--r--gcc/config/microblaze/microblaze.c6
-rw-r--r--gcc/config/mips/mips.c6
-rw-r--r--gcc/config/mmix/mmix.c4
-rw-r--r--gcc/config/mn10300/mn10300.c5
-rw-r--r--gcc/config/moxie/moxie.c5
-rw-r--r--gcc/config/msp430/msp430.c5
-rw-r--r--gcc/config/nds32/nds32-cost.c5
-rw-r--r--gcc/config/nds32/nds32-fp-as-gp.c5
-rw-r--r--gcc/config/nds32/nds32-intrinsic.c5
-rw-r--r--gcc/config/nds32/nds32-isr.c5
-rw-r--r--gcc/config/nds32/nds32-md-auxiliary.c5
-rw-r--r--gcc/config/nds32/nds32-memory-manipulation.c5
-rw-r--r--gcc/config/nds32/nds32-pipelines-auxiliary.c5
-rw-r--r--gcc/config/nds32/nds32-predicates.c5
-rw-r--r--gcc/config/nds32/nds32.c5
-rw-r--r--gcc/config/nios2/nios2.c5
-rw-r--r--gcc/config/pa/pa.c5
-rw-r--r--gcc/config/pdp11/pdp11.c5
-rw-r--r--gcc/config/rl78/rl78.c5
-rw-r--r--gcc/config/rs6000/rs6000.c7
-rw-r--r--gcc/config/rx/rx.c5
-rw-r--r--gcc/config/s390/s390.c6
-rw-r--r--gcc/config/sh/sh.c7
-rw-r--r--gcc/config/sparc/sparc.c6
-rw-r--r--gcc/config/spu/spu.c7
-rw-r--r--gcc/config/stormy16/stormy16.c6
-rw-r--r--gcc/config/tilegx/tilegx.c7
-rw-r--r--gcc/config/tilepro/tilepro.c7
-rw-r--r--gcc/config/v850/v850.c5
-rw-r--r--gcc/config/vax/vax.c5
-rw-r--r--gcc/config/xtensa/xtensa.c5
-rw-r--r--gcc/coverage.c6
-rw-r--r--gcc/cp/ChangeLog4
-rw-r--r--gcc/cp/cp-tree.h7
-rw-r--r--gcc/cprop.c6
-rw-r--r--gcc/cse.c6
-rw-r--r--gcc/cselib.c5
-rw-r--r--gcc/dbxout.c6
-rw-r--r--gcc/ddg.c5
-rw-r--r--gcc/df-core.c7
-rw-r--r--gcc/df-problems.c7
-rw-r--r--gcc/df-scan.c7
-rw-r--r--gcc/dojump.c6
-rw-r--r--gcc/dwarf2cfi.c6
-rw-r--r--gcc/dwarf2out.c9
-rw-r--r--gcc/emit-rtl.c8
-rw-r--r--gcc/except.c7
-rw-r--r--gcc/explow.c7
-rw-r--r--gcc/expr.c4
-rw-r--r--gcc/expr.h87
-rw-r--r--gcc/final.c5
-rw-r--r--gcc/fortran/ChangeLog5
-rw-r--r--gcc/fortran/f95-lang.c6
-rw-r--r--gcc/fortran/trans-decl.c7
-rw-r--r--gcc/function.c8
-rw-r--r--gcc/function.h223
-rw-r--r--gcc/gcse.c5
-rw-r--r--gcc/genattrtab.c1
-rw-r--r--gcc/genconditions.c3
-rw-r--r--gcc/genemit.c7
-rw-r--r--gcc/gengtype.c4
-rw-r--r--gcc/genoutput.c1
-rw-r--r--gcc/genpreds.c6
-rw-r--r--gcc/genrecog.c7
-rw-r--r--gcc/gimple-fold.c6
-rw-r--r--gcc/gimple-low.c6
-rw-r--r--gcc/gimple-streamer.h7
-rw-r--r--gcc/haifa-sched.c5
-rw-r--r--gcc/ifcvt.c8
-rw-r--r--gcc/ira.c5
-rw-r--r--gcc/java/ChangeLog5
-rw-r--r--gcc/java/class.c7
-rw-r--r--gcc/java/resource.c7
-rw-r--r--gcc/jump.c5
-rw-r--r--gcc/lcm.c5
-rw-r--r--gcc/loop-invariant.c5
-rw-r--r--gcc/lra-assigns.c5
-rw-r--r--gcc/lra-coalesce.c5
-rw-r--r--gcc/lra-constraints.c5
-rw-r--r--gcc/lra-eliminations.c5
-rw-r--r--gcc/lra-lives.c5
-rw-r--r--gcc/lra-spills.c5
-rw-r--r--gcc/lra.c6
-rw-r--r--gcc/lto-cgraph.c3
-rw-r--r--gcc/lto-section-in.c4
-rw-r--r--gcc/lto-section-out.c4
-rw-r--r--gcc/lto-streamer-in.c4
-rw-r--r--gcc/lto-streamer-out.c3
-rw-r--r--gcc/mode-switching.c5
-rw-r--r--gcc/modulo-sched.c5
-rw-r--r--gcc/objc/ChangeLog4
-rw-r--r--gcc/objc/objc-act.c5
-rw-r--r--gcc/omp-low.c6
-rw-r--r--gcc/optabs.c6
-rw-r--r--gcc/passes.c4
-rw-r--r--gcc/postreload-gcse.c6
-rw-r--r--gcc/postreload.c4
-rw-r--r--gcc/predict.c5
-rw-r--r--gcc/predict.h3
-rw-r--r--gcc/profile.c6
-rw-r--r--gcc/recog.c5
-rw-r--r--gcc/ree.c5
-rw-r--r--gcc/reg-stack.c7
-rw-r--r--gcc/regcprop.c5
-rw-r--r--gcc/reginfo.c6
-rw-r--r--gcc/regrename.c5
-rw-r--r--gcc/reload.c5
-rw-r--r--gcc/reload1.c4
-rw-r--r--gcc/reorg.c7
-rw-r--r--gcc/resource.c5
-rw-r--r--gcc/rtl.h17
-rw-r--r--gcc/rtlanal.c5
-rw-r--r--gcc/sched-deps.c5
-rw-r--r--gcc/sched-ebb.c5
-rw-r--r--gcc/sched-rgn.c5
-rw-r--r--gcc/sel-sched-dump.c5
-rw-r--r--gcc/sel-sched-ir.c6
-rw-r--r--gcc/sel-sched.c6
-rw-r--r--gcc/shrink-wrap.c8
-rw-r--r--gcc/shrink-wrap.h9
-rw-r--r--gcc/simplify-rtx.c6
-rw-r--r--gcc/statistics.c7
-rw-r--r--gcc/stmt.c7
-rw-r--r--gcc/stor-layout.c6
-rw-r--r--gcc/store-motion.c5
-rw-r--r--gcc/symtab.c7
-rw-r--r--gcc/targhooks.c6
-rw-r--r--gcc/testsuite/ChangeLog4
-rw-r--r--gcc/testsuite/g++.dg/plugin/pragma_plugin.c6
-rw-r--r--gcc/toplev.c4
-rw-r--r--gcc/trans-mem.c7
-rw-r--r--gcc/tree-cfg.c6
-rw-r--r--gcc/tree-cfgcleanup.c7
-rw-r--r--gcc/tree-dfa.c5
-rw-r--r--gcc/tree-eh.c7
-rw-r--r--gcc/tree-inline.c4
-rw-r--r--gcc/tree-into-ssa.c6
-rw-r--r--gcc/tree-nested.c6
-rw-r--r--gcc/tree-nrv.c6
-rw-r--r--gcc/tree-profile.c6
-rw-r--r--gcc/tree-ssa-alias.c6
-rw-r--r--gcc/tree-ssa-ccp.c6
-rw-r--r--gcc/tree-ssa-copy.c6
-rw-r--r--gcc/tree-ssa-copyrename.c7
-rw-r--r--gcc/tree-ssa-dom.c6
-rw-r--r--gcc/tree-ssa-operands.c6
-rw-r--r--gcc/tree-ssa-propagate.c6
-rw-r--r--gcc/tree-ssa-structalias.c6
-rw-r--r--gcc/tree-ssa-tail-merge.c6
-rw-r--r--gcc/tree-ssa-threadedge.c7
-rw-r--r--gcc/tree-ssa-threadupdate.c7
-rw-r--r--gcc/tree-ssa-uncprop.c6
-rw-r--r--gcc/tree-ssa-uninit.c8
-rw-r--r--gcc/tree-ssa.c7
-rw-r--r--gcc/tree-stdarg.c6
-rw-r--r--gcc/tree-tailcall.c6
-rw-r--r--gcc/tree.c7
-rw-r--r--gcc/tsan.c6
-rw-r--r--gcc/valtrack.c6
-rw-r--r--gcc/varasm.c9
-rw-r--r--gcc/varasm.h2
-rw-r--r--gcc/vmsdbgout.c6
-rw-r--r--gcc/web.c5
217 files changed, 1494 insertions, 246 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 70ef40f2f35..7e4b5d4aae1 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,224 @@
+2014-10-16 Andrew MacLeod <amacleod@redhat.com>
+
+ * function.h: Flatten file. Remove includes, adjust prototypes to
+ reflect only what is in function.h.
+ (enum direction, struct args_size, struct locate_and_pad_arg_data,
+ ADD_PARM_SIZE, SUB_PARM_SIZE, ARGS_SIZE_TREE, ARGS_SIZE_RTX): Relocate
+ from expr.h.
+ (ASLK_REDUCE_ALIGN, ASLK_RECORD_PAD): Relocate from rtl.h.
+ (optimize_function_for_size_p, optimize_function_for_speed_p): Move
+ prototypes to predict.h.
+ (init_varasm_status): Move prototype to varasm.h.
+ * expr.h: Adjust include files.
+ (enum direction, struct args_size, struct locate_and_pad_arg_data,
+ ADD_PARM_SIZE, SUB_PARM_SIZE, ARGS_SIZE_TREE, ARGS_SIZE_RTX): Move
+ to function.h.
+ (locate_and_pad_parm): Move prototype to function.h.
+ * rtl.h: (assign_stack_local, ASLK_REDUCE_ALIGN, ASLK_RECORD_PAD,
+ assign_stack_local_1, assign_stack_temp, assign_stack_temp_for_type,
+ assign_temp, reposition_prologue_and_epilogue_notes,
+ prologue_epilogue_contains, sibcall_epilogue_contains,
+ update_temp_slot_address, maybe_copy_prologue_epilogue_insn,
+ set_return_jump_label): Move prototypes to function.h.
+ * predict.h (optimize_function_for_size_p,
+ optimize_function_for_speed_p): Relocate prototypes from function.h.
+ * shrink-wrap.h (emit_return_into_block, active_insn_between,
+ convert_jumps_to_returns, emit_return_for_exit): Move prototypes to
+ function.h.
+ * varasm.h (init_varasm_status): Relocate prototype from function.h.
+ * genattrtab.c (write_header): Add predict.h to include list.
+ * genconditions.c (write_header): Add predict.h to include list.
+ * genemit.c (main): Adjust header file includes.
+ * gengtype.c (ifiles): Add flattened function.h header files.
+ * genoutput.c (output_prologue): Add predict.h to include list.
+ * genpreds.c (write_insn_preds_c): Adjust header file includes.
+ * genrecog.c (write_header): Add flattened function.h header files.
+ * alias.c: Adjust include files.
+ * auto-inc-dec.c: Likewise.
+ * basic-block.h: Likewise.
+ * bb-reorder.c: Likewise.
+ * bt-load.c: Likewise.
+ * builtins.c: Likewise.
+ * caller-save.c: Likewise.
+ * calls.c: Likewise.
+ * cfgbuild.c: Likewise.
+ * cfgcleanup.c: Likewise.
+ * cfgexpand.c: Likewise.
+ * cfgloop.c: Likewise.
+ * cfgloop.h: Likewise.
+ * cfgrtl.c: Likewise.
+ * cgraph.h: Likewise.
+ * cgraphclones.c: Likewise.
+ * cgraphunit.c: Likewise.
+ * combine-stack-adj.c: Likewise.
+ * combine.c: Likewise.
+ * coverage.c: Likewise.
+ * cprop.c: Likewise.
+ * cse.c: Likewise.
+ * cselib.c: Likewise.
+ * dbxout.c: Likewise.
+ * ddg.c: Likewise.
+ * df-core.c: Likewise.
+ * df-problems.c: Likewise.
+ * df-scan.c: Likewise.
+ * dojump.c: Likewise.
+ * dwarf2cfi.c: Likewise.
+ * dwarf2out.c: Likewise.
+ * emit-rtl.c: Likewise.
+ * except.c: Likewise.
+ * explow.c: Likewise.
+ * expr.c: Likewise.
+ * final.c: Likewise.
+ * function.c: Likewise.
+ * gcse.c: Likewise.
+ * gimple-fold.c: Likewise.
+ * gimple-low.c: Likewise.
+ * gimple-streamer.h: Likewise.
+ * haifa-sched.c: Likewise.
+ * ifcvt.c: Likewise.
+ * ira.c: Likewise.
+ * jump.c: Likewise.
+ * lcm.c: Likewise.
+ * loop-invariant.c: Likewise.
+ * lra-assigns.c: Likewise.
+ * lra-coalesce.c: Likewise.
+ * lra-constraints.c: Likewise.
+ * lra-eliminations.c: Likewise.
+ * lra-lives.c: Likewise.
+ * lra-spills.c: Likewise.
+ * lra.c: Likewise.
+ * lto-cgraph.c: Likewise.
+ * lto-section-in.c: Likewise.
+ * lto-section-out.c: Likewise.
+ * lto-streamer-in.c: Likewise.
+ * lto-streamer-out.c: Likewise.
+ * mode-switching.c: Likewise.
+ * modulo-sched.c: Likewise.
+ * omp-low.c: Likewise.
+ * optabs.c: Likewise.
+ * passes.c: Likewise.
+ * postreload-gcse.c: Likewise.
+ * postreload.c: Likewise.
+ * predict.c: Likewise.
+ * profile.c: Likewise.
+ * recog.c: Likewise.
+ * ree.c: Likewise.
+ * reg-stack.c: Likewise.
+ * regcprop.c: Likewise.
+ * reginfo.c: Likewise.
+ * regrename.c: Likewise.
+ * reload.c: Likewise.
+ * reload1.c: Likewise.
+ * reorg.c: Likewise.
+ * resource.c: Likewise.
+ * rtlanal.c: Likewise.
+ * sched-deps.c: Likewise.
+ * sched-ebb.c: Likewise.
+ * sched-rgn.c: Likewise.
+ * sel-sched-dump.c: Likewise.
+ * sel-sched-ir.c: Likewise.
+ * sel-sched.c: Likewise.
+ * shrink-wrap.c: Likewise.
+ * simplify-rtx.c: Likewise.
+ * statistics.c: Likewise.
+ * stmt.c: Likewise.
+ * stor-layout.c: Likewise.
+ * store-motion.c: Likewise.
+ * symtab.c: Likewise.
+ * targhooks.c: Likewise.
+ * toplev.c: Likewise.
+ * trans-mem.c: Likewise.
+ * tree-cfg.c: Likewise.
+ * tree-cfgcleanup.c: Likewise.
+ * tree-dfa.c: Likewise.
+ * tree-eh.c: Likewise.
+ * tree-inline.c: Likewise.
+ * tree-into-ssa.c: Likewise.
+ * tree-nested.c: Likewise.
+ * tree-nrv.c: Likewise.
+ * tree-profile.c: Likewise.
+ * tree-ssa-alias.c: Likewise.
+ * tree-ssa-ccp.c: Likewise.
+ * tree-ssa-copy.c: Likewise.
+ * tree-ssa-copyrename.c: Likewise.
+ * tree-ssa-dom.c: Likewise.
+ * tree-ssa-operands.c: Likewise.
+ * tree-ssa-propagate.c: Likewise.
+ * tree-ssa-structalias.c: Likewise.
+ * tree-ssa-tail-merge.c: Likewise.
+ * tree-ssa-threadedge.c: Likewise.
+ * tree-ssa-threadupdate.c: Likewise.
+ * tree-ssa-uncprop.c: Likewise.
+ * tree-ssa-uninit.c: Likewise.
+ * tree-ssa.c: Likewise.
+ * tree-stdarg.c: Likewise.
+ * tree-tailcall.c: Likewise.
+ * tree.c: Likewise.
+ * tsan.c: Likewise.
+ * valtrack.c: Likewise.
+ * varasm.c: Likewise.
+ * vmsdbgout.c: Likewise.
+ * web.c: Likewise.
+ * config/aarch64/aarch64.c: Add flattened includes from function.h.
+ * config/alpha/alpha.c: Likewise.
+ * config/arc/arc.c: Likewise.
+ * config/arm/arm.c: Likewise.
+ * config/avr/avr-log.c: Likewise.
+ * config/avr/avr.c: Likewise.
+ * config/bfin/bfin.c: Likewise.
+ * config/c6x/c6x.c: Likewise.
+ * config/cr16/cr16.c: Likewise.
+ * config/cris/cris.c: Likewise.
+ * config/darwin.c: Likewise.
+ * config/epiphany/epiphany.c: Likewise.
+ * config/epiphany/mode-switch-use.c: Likewise.
+ * config/epiphany/resolve-sw-modes.c: Likewise.
+ * config/fr30/fr30.c: Likewise.
+ * config/frv/frv.c: Likewise.
+ * config/h8300/h8300.c: Likewise.
+ * config/i386/i386.c: Likewise.
+ * config/ia64/ia64.c: Likewise.
+ * config/iq2000/iq2000.c: Likewise.
+ * config/lm32/lm32.c: Likewise.
+ * config/m32c/m32c.c: Likewise.
+ * config/m32r/m32r.c: Likewise.
+ * config/m68k/m68k.c: Likewise.
+ * config/mcore/mcore.c: Likewise.
+ * config/mep/mep-pragma.c: Likewise.
+ * config/mep/mep.c: Likewise.
+ * config/microblaze/microblaze.c: Likewise.
+ * config/mips/mips.c: Likewise.
+ * config/mmix/mmix.c: Likewise.
+ * config/mn10300/mn10300.c: Likewise.
+ * config/moxie/moxie.c: Likewise.
+ * config/msp430/msp430.c: Likewise.
+ * config/nds32/nds32-cost.c: Likewise.
+ * config/nds32/nds32-fp-as-gp.c: Likewise.
+ * config/nds32/nds32-intrinsic.c: Likewise.
+ * config/nds32/nds32-isr.c: Likewise.
+ * config/nds32/nds32-md-auxiliary.c: Likewise.
+ * config/nds32/nds32-memory-manipulation.c: Likewise.
+ * config/nds32/nds32-pipelines-auxiliary.c: Likewise.
+ * config/nds32/nds32-predicates.c: Likewise.
+ * config/nds32/nds32.c: Likewise.
+ * config/nios2/nios2.c: Likewise.
+ * config/pa/pa.c: Likewise.
+ * config/pdp11/pdp11.c: Likewise.
+ * config/rl78/rl78.c: Likewise.
+ * config/rs6000/rs6000.c: Likewise.
+ * config/rx/rx.c: Likewise.
+ * config/s390/s390.c: Likewise.
+ * config/score/score.c: Likewise.
+ * config/sh/sh.c: Likewise.
+ * config/sparc/sparc.c: Likewise.
+ * config/spu/spu.c: Likewise.
+ * config/stormy16/stormy16.c: Likewise.
+ * config/tilegx/tilegx.c: Likewise.
+ * config/tilepro/tilepro.c: Likewise.
+ * config/v850/v850.c: Likewise.
+ * config/vax/vax.c: Likewise.
+ * config/xtensa/xtensa.c: Likewise.
+
2014-10-16 Richard Earnshaw <rearnsha@arm.com>
* config/aarch64/aarch64.c (aarch64_legitimize_address): New function.
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 76828c7b521..fb647138c73 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-16 Andrew MacLeod <amacleod@redhat.com>
+
+ * gcc-interface/misc.c: Adjust include files.
+
2014-10-13 Eric Botcazou <ebotcazou@adacore.com>
Alan Modra <amodra@gmail.com>
diff --git a/gcc/ada/gcc-interface/misc.c b/gcc/ada/gcc-interface/misc.c
index 240ca445d21..68da231e106 100644
--- a/gcc/ada/gcc-interface/misc.c
+++ b/gcc/ada/gcc-interface/misc.c
@@ -42,6 +42,12 @@
#include "langhooks-def.h"
#include "plugin.h"
#include "real.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h" /* For pass_by_reference. */
#include "ada.h"
diff --git a/gcc/alias.c b/gcc/alias.c
index 4ff0aacfba8..30454c3210b 100644
--- a/gcc/alias.c
+++ b/gcc/alias.c
@@ -27,11 +27,16 @@ along with GCC; see the file COPYING3. If not see
#include "varasm.h"
#include "expr.h"
#include "tm_p.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "alias.h"
#include "emit-rtl.h"
#include "regs.h"
-#include "hard-reg-set.h"
#include "flags.h"
#include "diagnostic-core.h"
#include "cselib.h"
diff --git a/gcc/auto-inc-dec.c b/gcc/auto-inc-dec.c
index 0c85abbb01a..6690b19e8b5 100644
--- a/gcc/auto-inc-dec.c
+++ b/gcc/auto-inc-dec.c
@@ -30,6 +30,11 @@ along with GCC; see the file COPYING3. If not see
#include "insn-config.h"
#include "regs.h"
#include "flags.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "except.h"
#include "diagnostic-core.h"
diff --git a/gcc/basic-block.h b/gcc/basic-block.h
index 5bd37c9e3f6..a2b31275e02 100644
--- a/gcc/basic-block.h
+++ b/gcc/basic-block.h
@@ -22,6 +22,12 @@ along with GCC; see the file COPYING3. If not see
#include "predict.h"
#include "vec.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "machmode.h"
+#include "tm.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
/* Use gcov_type to hold basic block counters. Should be at least
diff --git a/gcc/bb-reorder.c b/gcc/bb-reorder.c
index b3f770d4797..813b75385c0 100644
--- a/gcc/bb-reorder.c
+++ b/gcc/bb-reorder.c
@@ -89,6 +89,12 @@
#include "output.h"
#include "fibheap.h"
#include "target.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "tm_p.h"
#include "obstack.h"
diff --git a/gcc/bt-load.c b/gcc/bt-load.c
index 2e21f86bc45..053310c12d3 100644
--- a/gcc/bt-load.c
+++ b/gcc/bt-load.c
@@ -30,6 +30,11 @@ along with GCC; see the file COPYING3. If not see
#include "expr.h"
#include "flags.h"
#include "insn-attr.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "except.h"
#include "tm_p.h"
diff --git a/gcc/builtins.c b/gcc/builtins.c
index 8d0288fa14a..7d07b4d6823 100644
--- a/gcc/builtins.c
+++ b/gcc/builtins.c
@@ -40,6 +40,10 @@ along with GCC; see the file COPYING3. If not see
#include "regs.h"
#include "hard-reg-set.h"
#include "except.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "input.h"
#include "function.h"
#include "insn-config.h"
#include "expr.h"
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index ea7a990ff43..0a47f434d00 100644
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-16 Andrew MacLeod <amacleod@redhat.com>
+
+ * c-pragma.c: Adjust include files.
+ * c-semantics.c: Likewise.
+
2014-10-16 DJ Delorie <dj@redhat.com>
* c-cppbuiltin.c (cpp_atomic_builtins): Don't assume pointers are
diff --git a/gcc/c-family/c-pragma.c b/gcc/c-family/c-pragma.c
index da928b2abdd..debd5f6fca3 100644
--- a/gcc/c-family/c-pragma.c
+++ b/gcc/c-family/c-pragma.c
@@ -25,6 +25,12 @@ along with GCC; see the file COPYING3. If not see
#include "stringpool.h"
#include "attribs.h"
#include "varasm.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h" /* For cfun. FIXME: Does the parser know
when it is inside a function, so that
we don't have to look at cfun? */
@@ -34,7 +40,6 @@ along with GCC; see the file COPYING3. If not see
#include "c-common.h"
#include "tm_p.h" /* For REGISTER_TARGET_PRAGMAS (why is
this not a target hook?). */
-#include "vec.h"
#include "target.h"
#include "diagnostic.h"
#include "opts.h"
diff --git a/gcc/c-family/c-semantics.c b/gcc/c-family/c-semantics.c
index f25805a79b0..173147f6558 100644
--- a/gcc/c-family/c-semantics.c
+++ b/gcc/c-family/c-semantics.c
@@ -23,6 +23,12 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "tree.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "splay-tree.h"
#include "c-common.h"
diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog
index 690c3153c74..e999e6f7f61 100644
--- a/gcc/c/ChangeLog
+++ b/gcc/c/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-16 Andrew MacLeod <amacleod@redhat.com>
+
+ * c-decl.c: Adjust include files.
+
2014-10-14 DJ Delorie <dj@redhat.com>
* c-parser.c (c_parse_init): Add RID entries for each __intN.
diff --git a/gcc/c/c-decl.c b/gcc/c/c-decl.c
index d9941141041..fb16be6769c 100644
--- a/gcc/c/c-decl.c
+++ b/gcc/c/c-decl.c
@@ -38,6 +38,11 @@ along with GCC; see the file COPYING3. If not see
#include "stringpool.h"
#include "tree-inline.h"
#include "flags.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
#include "function.h"
#include "c-tree.h"
#include "toplev.h"
@@ -59,7 +64,6 @@ along with GCC; see the file COPYING3. If not see
#include "cgraph.h"
#include "hash-table.h"
#include "langhooks-def.h"
-#include "hash-set.h"
#include "plugin.h"
#include "c-family/c-ada-spec.h"
#include "cilk.h"
diff --git a/gcc/caller-save.c b/gcc/caller-save.c
index 31b1a365b7a..53d312f5459 100644
--- a/gcc/caller-save.c
+++ b/gcc/caller-save.c
@@ -30,6 +30,11 @@ along with GCC; see the file COPYING3. If not see
#include "basic-block.h"
#include "df.h"
#include "reload.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "expr.h"
#include "diagnostic-core.h"
diff --git a/gcc/calls.c b/gcc/calls.c
index 9c19f38302a..219eb921a64 100644
--- a/gcc/calls.c
+++ b/gcc/calls.c
@@ -37,6 +37,12 @@ along with GCC; see the file COPYING3. If not see
#include "expr.h"
#include "optabs.h"
#include "libfuncs.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "regs.h"
#include "diagnostic-core.h"
diff --git a/gcc/cfgbuild.c b/gcc/cfgbuild.c
index 00dab3e72db..e1ce1191534 100644
--- a/gcc/cfgbuild.c
+++ b/gcc/cfgbuild.c
@@ -28,6 +28,11 @@ along with GCC; see the file COPYING3. If not see
#include "basic-block.h"
#include "regs.h"
#include "flags.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "except.h"
#include "expr.h"
diff --git a/gcc/cfgcleanup.c b/gcc/cfgcleanup.c
index 9325ea07708..41e2fd2671f 100644
--- a/gcc/cfgcleanup.c
+++ b/gcc/cfgcleanup.c
@@ -45,6 +45,11 @@ along with GCC; see the file COPYING3. If not see
#include "params.h"
#include "tm_p.h"
#include "target.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h" /* For inline functions in emit-rtl.h they need crtl. */
#include "emit-rtl.h"
#include "tree-pass.h"
diff --git a/gcc/cfgexpand.c b/gcc/cfgexpand.c
index 5cb96df037f..5200053ffa1 100644
--- a/gcc/cfgexpand.c
+++ b/gcc/cfgexpand.c
@@ -31,11 +31,15 @@ along with GCC; see the file COPYING3. If not see
#include "print-tree.h"
#include "tm_p.h"
#include "basic-block.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "expr.h"
#include "langhooks.h"
#include "bitmap.h"
-#include "hash-set.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "tree-eh.h"
diff --git a/gcc/cfgloop.c b/gcc/cfgloop.c
index 0eaadde9a0e..3cb2241a7dd 100644
--- a/gcc/cfgloop.c
+++ b/gcc/cfgloop.c
@@ -22,13 +22,18 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "rtl.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "basic-block.h"
#include "cfgloop.h"
#include "diagnostic-core.h"
#include "flags.h"
#include "tree.h"
-#include "hash-set.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-expr.h"
diff --git a/gcc/cfgloop.h b/gcc/cfgloop.h
index 932465d9911..6ce35286e78 100644
--- a/gcc/cfgloop.h
+++ b/gcc/cfgloop.h
@@ -24,6 +24,13 @@ along with GCC; see the file COPYING3. If not see
#include "wide-int.h"
#include "bitmap.h"
#include "sbitmap.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "tm.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
/* Structure to hold decision about unrolling/peeling. */
diff --git a/gcc/cfgrtl.c b/gcc/cfgrtl.c
index 07c82681c1f..2070b034873 100644
--- a/gcc/cfgrtl.c
+++ b/gcc/cfgrtl.c
@@ -47,6 +47,11 @@ along with GCC; see the file COPYING3. If not see
#include "bb-reorder.h"
#include "regs.h"
#include "flags.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "except.h"
#include "rtl-error.h"
diff --git a/gcc/cgraph.h b/gcc/cgraph.h
index 69b5d0a8481..aa28414e851 100644
--- a/gcc/cgraph.h
+++ b/gcc/cgraph.h
@@ -26,6 +26,12 @@ along with GCC; see the file COPYING3. If not see
#include "plugin-api.h"
#include "vec.h"
#include "basic-block.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "machmode.h"
+#include "tm.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "ipa-ref.h"
#include "dumpfile.h"
diff --git a/gcc/cgraphclones.c b/gcc/cgraphclones.c
index 71b9269f984..0c4d86ff517 100644
--- a/gcc/cgraphclones.c
+++ b/gcc/cgraphclones.c
@@ -71,6 +71,12 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "tree.h"
#include "stringpool.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "emit-rtl.h"
#include "basic-block.h"
@@ -91,7 +97,6 @@ along with GCC; see the file COPYING3. If not see
#include "diagnostic.h"
#include "params.h"
#include "intl.h"
-#include "function.h"
#include "ipa-prop.h"
#include "tree-iterator.h"
#include "tree-dump.h"
diff --git a/gcc/cgraphunit.c b/gcc/cgraphunit.c
index 321674a08e8..c558a000c62 100644
--- a/gcc/cgraphunit.c
+++ b/gcc/cgraphunit.c
@@ -191,6 +191,12 @@ along with GCC; see the file COPYING3. If not see
#include "params.h"
#include "fibheap.h"
#include "intl.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "ipa-prop.h"
#include "tree-iterator.h"
diff --git a/gcc/combine-stack-adj.c b/gcc/combine-stack-adj.c
index 844873c574d..493a00775ea 100644
--- a/gcc/combine-stack-adj.c
+++ b/gcc/combine-stack-adj.c
@@ -49,6 +49,11 @@ along with GCC; see the file COPYING3. If not see
#include "regs.h"
#include "hard-reg-set.h"
#include "flags.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "expr.h"
#include "basic-block.h"
diff --git a/gcc/combine.c b/gcc/combine.c
index ff5f0dbd509..15e6833c003 100644
--- a/gcc/combine.c
+++ b/gcc/combine.c
@@ -88,6 +88,11 @@ along with GCC; see the file COPYING3. If not see
#include "hard-reg-set.h"
#include "basic-block.h"
#include "insn-config.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
/* Include expr.h after insn-config.h so we get HAVE_conditional_move. */
#include "expr.h"
diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c
index 92c78543846..2ad5c28282e 100644
--- a/gcc/config/aarch64/aarch64.c
+++ b/gcc/config/aarch64/aarch64.c
@@ -41,13 +41,17 @@
#include "target-def.h"
#include "targhooks.h"
#include "ggc.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "tm_p.h"
#include "recog.h"
#include "langhooks.h"
#include "diagnostic-core.h"
#include "hash-table.h"
-#include "vec.h"
#include "basic-block.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
diff --git a/gcc/config/alpha/alpha.c b/gcc/config/alpha/alpha.c
index 1fdde29009e..260ec8d4384 100644
--- a/gcc/config/alpha/alpha.c
+++ b/gcc/config/alpha/alpha.c
@@ -41,6 +41,11 @@ along with GCC; see the file COPYING3. If not see
#include "reload.h"
#include "obstack.h"
#include "except.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "diagnostic-core.h"
#include "ggc.h"
@@ -52,7 +57,6 @@ along with GCC; see the file COPYING3. If not see
#include "langhooks.h"
#include "splay-tree.h"
#include "hash-table.h"
-#include "vec.h"
#include "basic-block.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
diff --git a/gcc/config/arc/arc.c b/gcc/config/arc/arc.c
index bae1a05f8c2..9b6cb0c66d4 100644
--- a/gcc/config/arc/arc.c
+++ b/gcc/config/arc/arc.c
@@ -44,6 +44,11 @@ along with GCC; see the file COPYING3. If not see
#include "insn-config.h"
#include "conditions.h"
#include "insn-flags.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "toplev.h"
#include "ggc.h"
diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
index 93b989d334f..1ee0eb355c3 100644
--- a/gcc/config/arm/arm.c
+++ b/gcc/config/arm/arm.c
@@ -40,6 +40,11 @@
#include "insn-attr.h"
#include "flags.h"
#include "reload.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "expr.h"
#include "optabs.h"
diff --git a/gcc/config/avr/avr-log.c b/gcc/config/avr/avr-log.c
index ad51edca7a2..0b073d7e6a6 100644
--- a/gcc/config/avr/avr-log.c
+++ b/gcc/config/avr/avr-log.c
@@ -27,6 +27,11 @@
#include "print-tree.h"
#include "output.h"
#include "input.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
#include "function.h"
#include "tm_p.h"
#include "tree-pass.h" /* for current_pass */
diff --git a/gcc/config/avr/avr.c b/gcc/config/avr/avr.c
index 4e25fcf459c..704c6f7b35e 100644
--- a/gcc/config/avr/avr.c
+++ b/gcc/config/avr/avr.c
@@ -42,6 +42,11 @@
#include "c-family/c-common.h"
#include "diagnostic-core.h"
#include "obstack.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "recog.h"
#include "optabs.h"
diff --git a/gcc/config/bfin/bfin.c b/gcc/config/bfin/bfin.c
index 0556592430d..f91913fe0a7 100644
--- a/gcc/config/bfin/bfin.c
+++ b/gcc/config/bfin/bfin.c
@@ -36,8 +36,12 @@
#include "calls.h"
#include "flags.h"
#include "except.h"
-#include "function.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
#include "input.h"
+#include "function.h"
#include "target.h"
#include "target-def.h"
#include "expr.h"
diff --git a/gcc/config/c6x/c6x.c b/gcc/config/c6x/c6x.c
index 6a80f66d72a..370b5a3f76d 100644
--- a/gcc/config/c6x/c6x.c
+++ b/gcc/config/c6x/c6x.c
@@ -44,6 +44,12 @@
#include "tm-preds.h"
#include "tm-constrs.h"
#include "df.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "diagnostic-core.h"
#include "cgraph.h"
diff --git a/gcc/config/cr16/cr16.c b/gcc/config/cr16/cr16.c
index e9bfc8917f0..2a007d53143 100644
--- a/gcc/config/cr16/cr16.c
+++ b/gcc/config/cr16/cr16.c
@@ -36,6 +36,11 @@
#include "insn-attr.h"
#include "flags.h"
#include "except.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "recog.h"
#include "expr.h"
diff --git a/gcc/config/cris/cris.c b/gcc/config/cris/cris.c
index 0221a6867b5..6d2501823f2 100644
--- a/gcc/config/cris/cris.c
+++ b/gcc/config/cris/cris.c
@@ -36,6 +36,11 @@ along with GCC; see the file COPYING3. If not see
#include "stmt.h"
#include "expr.h"
#include "except.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "diagnostic-core.h"
#include "recog.h"
diff --git a/gcc/config/darwin.c b/gcc/config/darwin.c
index 34dc9aa1dd9..e8e9412df16 100644
--- a/gcc/config/darwin.c
+++ b/gcc/config/darwin.c
@@ -37,6 +37,11 @@ along with GCC; see the file COPYING3. If not see
#include "stor-layout.h"
#include "expr.h"
#include "reload.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "ggc.h"
#include "langhooks.h"
@@ -44,12 +49,10 @@ along with GCC; see the file COPYING3. If not see
#include "tm_p.h"
#include "diagnostic-core.h"
#include "toplev.h"
-#include "hashtab.h"
#include "df.h"
#include "debug.h"
#include "obstack.h"
#include "hash-table.h"
-#include "vec.h"
#include "basic-block.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
diff --git a/gcc/config/epiphany/epiphany.c b/gcc/config/epiphany/epiphany.c
index 4460ab82479..b9ef5865019 100644
--- a/gcc/config/epiphany/epiphany.c
+++ b/gcc/config/epiphany/epiphany.c
@@ -36,6 +36,11 @@ along with GCC; see the file COPYING3. If not see
#include "output.h"
#include "insn-attr.h"
#include "flags.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "expr.h"
#include "diagnostic-core.h"
diff --git a/gcc/config/epiphany/mode-switch-use.c b/gcc/config/epiphany/mode-switch-use.c
index 8f9c512160e..75c843addb6 100644
--- a/gcc/config/epiphany/mode-switch-use.c
+++ b/gcc/config/epiphany/mode-switch-use.c
@@ -24,6 +24,12 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "rtl.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "emit-rtl.h"
#include "tree-pass.h"
diff --git a/gcc/config/epiphany/resolve-sw-modes.c b/gcc/config/epiphany/resolve-sw-modes.c
index 47c11ff711c..53df7b2d136 100644
--- a/gcc/config/epiphany/resolve-sw-modes.c
+++ b/gcc/config/epiphany/resolve-sw-modes.c
@@ -34,6 +34,9 @@ along with GCC; see the file COPYING3. If not see
#include "insn-codes.h"
#include "emit-rtl.h"
#include "recog.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "input.h"
#include "function.h"
#include "insn-attr-common.h"
#include "tree-pass.h"
diff --git a/gcc/config/fr30/fr30.c b/gcc/config/fr30/fr30.c
index 37759cc7bd4..4dbec231ae4 100644
--- a/gcc/config/fr30/fr30.c
+++ b/gcc/config/fr30/fr30.c
@@ -39,6 +39,11 @@
#include "expr.h"
#include "obstack.h"
#include "except.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "df.h"
#include "diagnostic-core.h"
diff --git a/gcc/config/frv/frv.c b/gcc/config/frv/frv.c
index 854d1eac3bc..4ae6d29239e 100644
--- a/gcc/config/frv/frv.c
+++ b/gcc/config/frv/frv.c
@@ -39,6 +39,11 @@ along with GCC; see the file COPYING3. If not see
#include "expr.h"
#include "obstack.h"
#include "except.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "optabs.h"
#include "diagnostic-core.h"
diff --git a/gcc/config/h8300/h8300.c b/gcc/config/h8300/h8300.c
index 896f4487304..a83f3def80a 100644
--- a/gcc/config/h8300/h8300.c
+++ b/gcc/config/h8300/h8300.c
@@ -38,6 +38,11 @@ along with GCC; see the file COPYING3. If not see
#include "flags.h"
#include "recog.h"
#include "expr.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "optabs.h"
#include "diagnostic-core.h"
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index baf0d3daafa..7e8a32b790a 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -38,6 +38,11 @@ along with GCC; see the file COPYING3. If not see
#include "insn-attr.h"
#include "flags.h"
#include "except.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "recog.h"
#include "expr.h"
@@ -53,7 +58,6 @@ along with GCC; see the file COPYING3. If not see
#include "reload.h"
#include "cgraph.h"
#include "hash-table.h"
-#include "vec.h"
#include "basic-block.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
diff --git a/gcc/config/ia64/ia64.c b/gcc/config/ia64/ia64.c
index 9337be14413..4f11395dc24 100644
--- a/gcc/config/ia64/ia64.c
+++ b/gcc/config/ia64/ia64.c
@@ -40,6 +40,11 @@ along with GCC; see the file COPYING3. If not see
#include "expr.h"
#include "optabs.h"
#include "except.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "ggc.h"
#include "basic-block.h"
@@ -53,7 +58,6 @@ along with GCC; see the file COPYING3. If not see
#include "tm_p.h"
#include "hash-table.h"
#include "langhooks.h"
-#include "vec.h"
#include "basic-block.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
diff --git a/gcc/config/iq2000/iq2000.c b/gcc/config/iq2000/iq2000.c
index e568a7c3d2b..8b7c043f31b 100644
--- a/gcc/config/iq2000/iq2000.c
+++ b/gcc/config/iq2000/iq2000.c
@@ -33,6 +33,11 @@ along with GCC; see the file COPYING3. If not see
#include "output.h"
#include "insn-attr.h"
#include "flags.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "expr.h"
#include "optabs.h"
diff --git a/gcc/config/lm32/lm32.c b/gcc/config/lm32/lm32.c
index bfba0489974..51714ecd640 100644
--- a/gcc/config/lm32/lm32.c
+++ b/gcc/config/lm32/lm32.c
@@ -40,6 +40,11 @@
#include "flags.h"
#include "reload.h"
#include "tm_p.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "diagnostic-core.h"
#include "optabs.h"
diff --git a/gcc/config/m32c/m32c.c b/gcc/config/m32c/m32c.c
index fc89821f168..d4a87889e71 100644
--- a/gcc/config/m32c/m32c.c
+++ b/gcc/config/m32c/m32c.c
@@ -42,6 +42,11 @@
#include "expr.h"
#include "optabs.h"
#include "except.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "ggc.h"
#include "target.h"
@@ -49,7 +54,6 @@
#include "tm_p.h"
#include "langhooks.h"
#include "hash-table.h"
-#include "vec.h"
#include "basic-block.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
diff --git a/gcc/config/m32r/m32r.c b/gcc/config/m32r/m32r.c
index bcd4309b44d..a78f5c2ff5f 100644
--- a/gcc/config/m32r/m32r.c
+++ b/gcc/config/m32r/m32r.c
@@ -36,6 +36,11 @@
#include "insn-attr.h"
#include "flags.h"
#include "expr.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "recog.h"
#include "diagnostic-core.h"
diff --git a/gcc/config/m68k/m68k.c b/gcc/config/m68k/m68k.c
index cb37af5242c..e396bb20cfd 100644
--- a/gcc/config/m68k/m68k.c
+++ b/gcc/config/m68k/m68k.c
@@ -26,9 +26,14 @@ along with GCC; see the file COPYING3. If not see
#include "stor-layout.h"
#include "varasm.h"
#include "rtl.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "regs.h"
-#include "hard-reg-set.h"
#include "insn-config.h"
#include "conditions.h"
#include "output.h"
diff --git a/gcc/config/mcore/mcore.c b/gcc/config/mcore/mcore.c
index e2208b7af6b..2a8b74c88d3 100644
--- a/gcc/config/mcore/mcore.c
+++ b/gcc/config/mcore/mcore.c
@@ -40,6 +40,11 @@
#include "expr.h"
#include "reload.h"
#include "recog.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "ggc.h"
#include "diagnostic-core.h"
diff --git a/gcc/config/mep/mep-pragma.c b/gcc/config/mep/mep-pragma.c
index 7bda2973b11..e3e5764b76a 100644
--- a/gcc/config/mep/mep-pragma.c
+++ b/gcc/config/mep/mep-pragma.c
@@ -29,6 +29,11 @@ along with GCC; see the file COPYING3. If not see
#include "hard-reg-set.h"
#include "output.h" /* for decode_reg_name */
#include "mep-protos.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#define MAX_RECOG_OPERANDS 10
#include "reload.h"
diff --git a/gcc/config/mep/mep.c b/gcc/config/mep/mep.c
index 03ecc96ad04..26d3ff90dac 100644
--- a/gcc/config/mep/mep.c
+++ b/gcc/config/mep/mep.c
@@ -41,6 +41,11 @@ along with GCC; see the file COPYING3. If not see
#include "tree.h"
#include "expr.h"
#include "except.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "optabs.h"
#include "reload.h"
@@ -52,7 +57,6 @@ along with GCC; see the file COPYING3. If not see
#include "langhooks.h"
#include "df.h"
#include "hash-table.h"
-#include "vec.h"
#include "basic-block.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
diff --git a/gcc/config/microblaze/microblaze.c b/gcc/config/microblaze/microblaze.c
index b08a6d503f6..3992a28b0e0 100644
--- a/gcc/config/microblaze/microblaze.c
+++ b/gcc/config/microblaze/microblaze.c
@@ -36,13 +36,17 @@
#include "varasm.h"
#include "stor-layout.h"
#include "calls.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "expr.h"
#include "flags.h"
#include "reload.h"
#include "output.h"
#include "ggc.h"
-#include "hashtab.h"
#include "target.h"
#include "target-def.h"
#include "tm_p.h"
diff --git a/gcc/config/mips/mips.c b/gcc/config/mips/mips.c
index af72da55423..41a3ba4ce7a 100644
--- a/gcc/config/mips/mips.c
+++ b/gcc/config/mips/mips.c
@@ -38,6 +38,11 @@ along with GCC; see the file COPYING3. If not see
#include "stringpool.h"
#include "stor-layout.h"
#include "calls.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "expr.h"
#include "optabs.h"
@@ -54,7 +59,6 @@ along with GCC; see the file COPYING3. If not see
#include "common/common-target.h"
#include "langhooks.h"
#include "sched-int.h"
-#include "vec.h"
#include "basic-block.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
diff --git a/gcc/config/mmix/mmix.c b/gcc/config/mmix/mmix.c
index b9edc3ccb43..db297aa7e7f 100644
--- a/gcc/config/mmix/mmix.c
+++ b/gcc/config/mmix/mmix.c
@@ -34,6 +34,10 @@ along with GCC; see the file COPYING3. If not see
#include "varasm.h"
#include "stor-layout.h"
#include "calls.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "expr.h"
#include "diagnostic-core.h"
diff --git a/gcc/config/mn10300/mn10300.c b/gcc/config/mn10300/mn10300.c
index 1289bc50eeb..a6018d289a4 100644
--- a/gcc/config/mn10300/mn10300.c
+++ b/gcc/config/mn10300/mn10300.c
@@ -38,6 +38,11 @@
#include "reload.h"
#include "expr.h"
#include "optabs.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "obstack.h"
#include "diagnostic-core.h"
diff --git a/gcc/config/moxie/moxie.c b/gcc/config/moxie/moxie.c
index 1e289068179..037c578f9ac 100644
--- a/gcc/config/moxie/moxie.c
+++ b/gcc/config/moxie/moxie.c
@@ -42,6 +42,11 @@
#include "expr.h"
#include "optabs.h"
#include "except.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "ggc.h"
#include "target.h"
diff --git a/gcc/config/msp430/msp430.c b/gcc/config/msp430/msp430.c
index 6e9405d5fb5..da7bfb3e855 100644
--- a/gcc/config/msp430/msp430.c
+++ b/gcc/config/msp430/msp430.c
@@ -33,6 +33,11 @@
#include "output.h"
#include "insn-attr.h"
#include "flags.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "expr.h"
#include "optabs.h"
diff --git a/gcc/config/nds32/nds32-cost.c b/gcc/config/nds32/nds32-cost.c
index b1792d59726..70e6ae11153 100644
--- a/gcc/config/nds32/nds32-cost.c
+++ b/gcc/config/nds32/nds32-cost.c
@@ -38,6 +38,11 @@
#include "insn-codes.h" /* For CODE_FOR_xxx. */
#include "reload.h" /* For push_reload(). */
#include "flags.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "expr.h"
#include "recog.h"
diff --git a/gcc/config/nds32/nds32-fp-as-gp.c b/gcc/config/nds32/nds32-fp-as-gp.c
index b4c5af994e6..e2cdcfcd232 100644
--- a/gcc/config/nds32/nds32-fp-as-gp.c
+++ b/gcc/config/nds32/nds32-fp-as-gp.c
@@ -38,6 +38,11 @@
#include "insn-codes.h" /* For CODE_FOR_xxx. */
#include "reload.h" /* For push_reload(). */
#include "flags.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "expr.h"
#include "recog.h"
diff --git a/gcc/config/nds32/nds32-intrinsic.c b/gcc/config/nds32/nds32-intrinsic.c
index 0f1646c0892..163a16a524e 100644
--- a/gcc/config/nds32/nds32-intrinsic.c
+++ b/gcc/config/nds32/nds32-intrinsic.c
@@ -38,6 +38,11 @@
#include "insn-codes.h" /* For CODE_FOR_xxx. */
#include "reload.h" /* For push_reload(). */
#include "flags.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "expr.h"
#include "recog.h"
diff --git a/gcc/config/nds32/nds32-isr.c b/gcc/config/nds32/nds32-isr.c
index bb8fcdd7561..ff8746282b5 100644
--- a/gcc/config/nds32/nds32-isr.c
+++ b/gcc/config/nds32/nds32-isr.c
@@ -38,6 +38,11 @@
#include "insn-codes.h" /* For CODE_FOR_xxx. */
#include "reload.h" /* For push_reload(). */
#include "flags.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "expr.h"
#include "recog.h"
diff --git a/gcc/config/nds32/nds32-md-auxiliary.c b/gcc/config/nds32/nds32-md-auxiliary.c
index 85a3a301bcd..d0bcea18728 100644
--- a/gcc/config/nds32/nds32-md-auxiliary.c
+++ b/gcc/config/nds32/nds32-md-auxiliary.c
@@ -39,6 +39,11 @@
#include "insn-codes.h" /* For CODE_FOR_xxx. */
#include "reload.h" /* For push_reload(). */
#include "flags.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "expr.h"
#include "recog.h"
diff --git a/gcc/config/nds32/nds32-memory-manipulation.c b/gcc/config/nds32/nds32-memory-manipulation.c
index d4450e1899b..842c1fb21dc 100644
--- a/gcc/config/nds32/nds32-memory-manipulation.c
+++ b/gcc/config/nds32/nds32-memory-manipulation.c
@@ -39,6 +39,11 @@
#include "insn-codes.h" /* For CODE_FOR_xxx. */
#include "reload.h" /* For push_reload(). */
#include "flags.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "expr.h"
#include "recog.h"
diff --git a/gcc/config/nds32/nds32-pipelines-auxiliary.c b/gcc/config/nds32/nds32-pipelines-auxiliary.c
index 034c7c91322..3080d486aad 100644
--- a/gcc/config/nds32/nds32-pipelines-auxiliary.c
+++ b/gcc/config/nds32/nds32-pipelines-auxiliary.c
@@ -39,6 +39,11 @@
#include "insn-codes.h" /* For CODE_FOR_xxx. */
#include "reload.h" /* For push_reload(). */
#include "flags.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "expr.h"
#include "recog.h"
diff --git a/gcc/config/nds32/nds32-predicates.c b/gcc/config/nds32/nds32-predicates.c
index 374a1a81124..c0576212e7d 100644
--- a/gcc/config/nds32/nds32-predicates.c
+++ b/gcc/config/nds32/nds32-predicates.c
@@ -38,6 +38,11 @@
#include "insn-codes.h" /* For CODE_FOR_xxx. */
#include "reload.h" /* For push_reload(). */
#include "flags.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "expr.h"
#include "recog.h"
diff --git a/gcc/config/nds32/nds32.c b/gcc/config/nds32/nds32.c
index 24360eacb41..28de0a6744a 100644
--- a/gcc/config/nds32/nds32.c
+++ b/gcc/config/nds32/nds32.c
@@ -38,6 +38,11 @@
#include "insn-codes.h" /* For CODE_FOR_xxx. */
#include "reload.h" /* For push_reload(). */
#include "flags.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "expr.h"
#include "recog.h"
diff --git a/gcc/config/nios2/nios2.c b/gcc/config/nios2/nios2.c
index 1ab74f97744..86f3319dcc3 100644
--- a/gcc/config/nios2/nios2.c
+++ b/gcc/config/nios2/nios2.c
@@ -36,6 +36,11 @@
#include "recog.h"
#include "expr.h"
#include "optabs.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "ggc.h"
#include "basic-block.h"
diff --git a/gcc/config/pa/pa.c b/gcc/config/pa/pa.c
index 59755f28da5..07ba94abb90 100644
--- a/gcc/config/pa/pa.c
+++ b/gcc/config/pa/pa.c
@@ -40,6 +40,11 @@ along with GCC; see the file COPYING3. If not see
#include "expr.h"
#include "optabs.h"
#include "reload.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "diagnostic-core.h"
#include "ggc.h"
diff --git a/gcc/config/pdp11/pdp11.c b/gcc/config/pdp11/pdp11.c
index 821eed7fb6b..88dbc67cd89 100644
--- a/gcc/config/pdp11/pdp11.c
+++ b/gcc/config/pdp11/pdp11.c
@@ -27,6 +27,11 @@ along with GCC; see the file COPYING3. If not see
#include "hard-reg-set.h"
#include "insn-config.h"
#include "conditions.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "output.h"
#include "insn-attr.h"
diff --git a/gcc/config/rl78/rl78.c b/gcc/config/rl78/rl78.c
index 5c2a9c6ddc5..e8f72abdfe9 100644
--- a/gcc/config/rl78/rl78.c
+++ b/gcc/config/rl78/rl78.c
@@ -34,6 +34,11 @@
#include "output.h"
#include "insn-attr.h"
#include "flags.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "expr.h"
#include "optabs.h"
diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index 912fe3d5c87..c4510323def 100644
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -40,6 +40,11 @@
#include "expr.h"
#include "optabs.h"
#include "except.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "output.h"
#include "dbxout.h"
@@ -47,7 +52,6 @@
#include "diagnostic-core.h"
#include "toplev.h"
#include "ggc.h"
-#include "hashtab.h"
#include "tm_p.h"
#include "target.h"
#include "target-def.h"
@@ -57,7 +61,6 @@
#include "cfgloop.h"
#include "sched-int.h"
#include "hash-table.h"
-#include "vec.h"
#include "basic-block.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
diff --git a/gcc/config/rx/rx.c b/gcc/config/rx/rx.c
index e177facc7b8..969e11d5281 100644
--- a/gcc/config/rx/rx.c
+++ b/gcc/config/rx/rx.c
@@ -38,6 +38,11 @@
#include "output.h"
#include "insn-attr.h"
#include "flags.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "expr.h"
#include "optabs.h"
diff --git a/gcc/config/s390/s390.c b/gcc/config/s390/s390.c
index 0a97e58dbf7..76b0731176c 100644
--- a/gcc/config/s390/s390.c
+++ b/gcc/config/s390/s390.c
@@ -40,6 +40,11 @@ along with GCC; see the file COPYING3. If not see
#include "insn-attr.h"
#include "flags.h"
#include "except.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "recog.h"
#include "expr.h"
@@ -53,7 +58,6 @@ along with GCC; see the file COPYING3. If not see
#include "langhooks.h"
#include "optabs.h"
#include "hash-table.h"
-#include "vec.h"
#include "basic-block.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
diff --git a/gcc/config/sh/sh.c b/gcc/config/sh/sh.c
index 288a955dee7..7433476601d 100644
--- a/gcc/config/sh/sh.c
+++ b/gcc/config/sh/sh.c
@@ -38,9 +38,14 @@ along with GCC; see the file COPYING3. If not see
#include "expr.h"
#include "optabs.h"
#include "reload.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "regs.h"
-#include "hard-reg-set.h"
#include "output.h"
#include "insn-attr.h"
#include "diagnostic-core.h"
diff --git a/gcc/config/sparc/sparc.c b/gcc/config/sparc/sparc.c
index 103288cecca..42d14e91c54 100644
--- a/gcc/config/sparc/sparc.c
+++ b/gcc/config/sparc/sparc.c
@@ -38,6 +38,11 @@ along with GCC; see the file COPYING3. If not see
#include "output.h"
#include "insn-attr.h"
#include "flags.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "except.h"
#include "expr.h"
@@ -51,7 +56,6 @@ along with GCC; see the file COPYING3. If not see
#include "target-def.h"
#include "common/common-target.h"
#include "hash-table.h"
-#include "vec.h"
#include "basic-block.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
diff --git a/gcc/config/spu/spu.c b/gcc/config/spu/spu.c
index 028b61f65e2..bf15631d171 100644
--- a/gcc/config/spu/spu.c
+++ b/gcc/config/spu/spu.c
@@ -35,12 +35,16 @@
#include "expr.h"
#include "optabs.h"
#include "except.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "output.h"
#include "basic-block.h"
#include "diagnostic-core.h"
#include "ggc.h"
-#include "hashtab.h"
#include "tm_p.h"
#include "target.h"
#include "target-def.h"
@@ -48,7 +52,6 @@
#include "reload.h"
#include "sched-int.h"
#include "params.h"
-#include "machmode.h"
#include "hash-table.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
diff --git a/gcc/config/stormy16/stormy16.c b/gcc/config/stormy16/stormy16.c
index 1a34d9730b1..67d5396c0f3 100644
--- a/gcc/config/stormy16/stormy16.c
+++ b/gcc/config/stormy16/stormy16.c
@@ -42,13 +42,17 @@
#include "expr.h"
#include "optabs.h"
#include "except.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "target.h"
#include "target-def.h"
#include "tm_p.h"
#include "langhooks.h"
#include "hash-table.h"
-#include "vec.h"
#include "ggc.h"
#include "basic-block.h"
#include "tree-ssa-alias.h"
diff --git a/gcc/config/tilegx/tilegx.c b/gcc/config/tilegx/tilegx.c
index ed9d6b2e7b3..40b6fa252bf 100644
--- a/gcc/config/tilegx/tilegx.c
+++ b/gcc/config/tilegx/tilegx.c
@@ -36,12 +36,17 @@
#include "tm-constrs.h"
#include "target.h"
#include "target-def.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "dwarf2.h"
#include "timevar.h"
#include "tree.h"
#include "hash-table.h"
-#include "vec.h"
#include "ggc.h"
#include "basic-block.h"
#include "tree-ssa-alias.h"
diff --git a/gcc/config/tilepro/tilepro.c b/gcc/config/tilepro/tilepro.c
index 2fc588b79fa..2054d7a63fa 100644
--- a/gcc/config/tilepro/tilepro.c
+++ b/gcc/config/tilepro/tilepro.c
@@ -37,12 +37,17 @@
#include "tm-constrs.h"
#include "target.h"
#include "target-def.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "dwarf2.h"
#include "timevar.h"
#include "tree.h"
#include "hash-table.h"
-#include "vec.h"
#include "ggc.h"
#include "basic-block.h"
#include "tree-ssa-alias.h"
diff --git a/gcc/config/v850/v850.c b/gcc/config/v850/v850.c
index 45312fa1d4a..c8e86b16ea8 100644
--- a/gcc/config/v850/v850.c
+++ b/gcc/config/v850/v850.c
@@ -37,6 +37,11 @@
#include "flags.h"
#include "recog.h"
#include "expr.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "diagnostic-core.h"
#include "ggc.h"
diff --git a/gcc/config/vax/vax.c b/gcc/config/vax/vax.c
index 4897ac2d62c..ab259b5b9fb 100644
--- a/gcc/config/vax/vax.c
+++ b/gcc/config/vax/vax.c
@@ -30,6 +30,11 @@ along with GCC; see the file COPYING3. If not see
#include "hard-reg-set.h"
#include "insn-config.h"
#include "conditions.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "output.h"
#include "insn-attr.h"
diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
index dc0629a0b8a..a4184d92264 100644
--- a/gcc/config/xtensa/xtensa.c
+++ b/gcc/config/xtensa/xtensa.c
@@ -42,6 +42,11 @@ along with GCC; see the file COPYING3. If not see
#include "flags.h"
#include "reload.h"
#include "tm_p.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "diagnostic-core.h"
#include "optabs.h"
diff --git a/gcc/coverage.c b/gcc/coverage.c
index d936cb0f200..66217ed862d 100644
--- a/gcc/coverage.c
+++ b/gcc/coverage.c
@@ -36,6 +36,12 @@ along with GCC; see the file COPYING3. If not see
#include "output.h"
#include "regs.h"
#include "expr.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "basic-block.h"
#include "toplev.h"
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 3616af3c842..016c8f6f6f1 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-16 Andrew MacLeod <amacleod@redhat.com>
+
+ * cp-tree.h: Adjust include files.
+
2014-10-15 Jason Merrill <jason@redhat.com>
PR c++/63528
diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index c450b5b909d..b6afc311fe0 100644
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -22,9 +22,14 @@ along with GCC; see the file COPYING3. If not see
#define GCC_CP_TREE_H
#include "ggc.h"
-#include "function.h"
#include "hashtab.h"
+#include "hash-set.h"
#include "vec.h"
+#include "machmode.h"
+#include "tm.h"
+#include "hard-reg-set.h"
+#include "input.h"
+#include "function.h"
#include "hash-map.h"
/* In order for the format checking to accept the C++ front end
diff --git a/gcc/cprop.c b/gcc/cprop.c
index f73abc2c311..1ac06e0262f 100644
--- a/gcc/cprop.c
+++ b/gcc/cprop.c
@@ -33,6 +33,11 @@ along with GCC; see the file COPYING3. If not see
#include "insn-config.h"
#include "recog.h"
#include "basic-block.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "expr.h"
#include "except.h"
@@ -41,7 +46,6 @@ along with GCC; see the file COPYING3. If not see
#include "intl.h"
#include "obstack.h"
#include "tree-pass.h"
-#include "hashtab.h"
#include "df.h"
#include "dbgcnt.h"
#include "target.h"
diff --git a/gcc/cse.c b/gcc/cse.c
index be2f31bc205..8ad1eff8ba6 100644
--- a/gcc/cse.c
+++ b/gcc/cse.c
@@ -29,6 +29,11 @@ along with GCC; see the file COPYING3. If not see
#include "flags.h"
#include "insn-config.h"
#include "recog.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "expr.h"
#include "diagnostic-core.h"
@@ -41,7 +46,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree-pass.h"
#include "df.h"
#include "dbgcnt.h"
-#include "hash-set.h"
#include "rtl-iter.h"
/* The basic idea of common subexpression elimination is to go
diff --git a/gcc/cselib.c b/gcc/cselib.c
index d06a1d56d2a..4fb5010cbf2 100644
--- a/gcc/cselib.c
+++ b/gcc/cselib.c
@@ -30,6 +30,11 @@ along with GCC; see the file COPYING3. If not see
#include "flags.h"
#include "insn-config.h"
#include "recog.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "emit-rtl.h"
#include "diagnostic-core.h"
diff --git a/gcc/dbxout.c b/gcc/dbxout.c
index 91cedf7e9f2..3452d470b66 100644
--- a/gcc/dbxout.c
+++ b/gcc/dbxout.c
@@ -86,6 +86,12 @@ along with GCC; see the file COPYING3. If not see
#include "tm_p.h"
#include "ggc.h"
#include "debug.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "target.h"
#include "common/common-target.h"
diff --git a/gcc/ddg.c b/gcc/ddg.c
index 09757185b2e..52d5ac41208 100644
--- a/gcc/ddg.c
+++ b/gcc/ddg.c
@@ -28,6 +28,11 @@ along with GCC; see the file COPYING3. If not see
#include "tm_p.h"
#include "hard-reg-set.h"
#include "regs.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "flags.h"
#include "insn-config.h"
diff --git a/gcc/df-core.c b/gcc/df-core.c
index 4b7d660d90d..f5af9a66027 100644
--- a/gcc/df-core.c
+++ b/gcc/df-core.c
@@ -382,11 +382,16 @@ are write-only operations.
#include "tm_p.h"
#include "insn-config.h"
#include "recog.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "regs.h"
#include "alloc-pool.h"
#include "flags.h"
-#include "hard-reg-set.h"
#include "basic-block.h"
#include "sbitmap.h"
#include "bitmap.h"
diff --git a/gcc/df-problems.c b/gcc/df-problems.c
index bf8800f9aff..389a6491d99 100644
--- a/gcc/df-problems.c
+++ b/gcc/df-problems.c
@@ -29,11 +29,16 @@ along with GCC; see the file COPYING3. If not see
#include "tm_p.h"
#include "insn-config.h"
#include "recog.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "regs.h"
#include "alloc-pool.h"
#include "flags.h"
-#include "hard-reg-set.h"
#include "basic-block.h"
#include "sbitmap.h"
#include "bitmap.h"
diff --git a/gcc/df-scan.c b/gcc/df-scan.c
index e2aaf61a3ee..2da10d70ecb 100644
--- a/gcc/df-scan.c
+++ b/gcc/df-scan.c
@@ -29,11 +29,16 @@ along with GCC; see the file COPYING3. If not see
#include "tm_p.h"
#include "insn-config.h"
#include "recog.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "regs.h"
#include "alloc-pool.h"
#include "flags.h"
-#include "hard-reg-set.h"
#include "basic-block.h"
#include "sbitmap.h"
#include "bitmap.h"
diff --git a/gcc/dojump.c b/gcc/dojump.c
index 18966208267..045d1fc5bbe 100644
--- a/gcc/dojump.c
+++ b/gcc/dojump.c
@@ -25,6 +25,12 @@ along with GCC; see the file COPYING3. If not see
#include "tree.h"
#include "stor-layout.h"
#include "flags.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "insn-config.h"
#include "insn-attr.h"
diff --git a/gcc/dwarf2cfi.c b/gcc/dwarf2cfi.c
index b7fa3bc5b75..d68c167943d 100644
--- a/gcc/dwarf2cfi.c
+++ b/gcc/dwarf2cfi.c
@@ -26,6 +26,12 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "tree.h"
#include "stor-layout.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "basic-block.h"
#include "dwarf2.h"
diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index 00eba789685..8c651766f0b 100644
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -64,17 +64,21 @@ along with GCC; see the file COPYING3. If not see
#include "stringpool.h"
#include "stor-layout.h"
#include "varasm.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "emit-rtl.h"
#include "hash-table.h"
#include "version.h"
#include "flags.h"
-#include "hard-reg-set.h"
#include "regs.h"
#include "rtlhash.h"
#include "insn-config.h"
#include "reload.h"
-#include "function.h"
#include "output.h"
#include "expr.h"
#include "except.h"
@@ -91,7 +95,6 @@ along with GCC; see the file COPYING3. If not see
#include "common/common-target.h"
#include "langhooks.h"
#include "cgraph.h"
-#include "input.h"
#include "ira.h"
#include "lra.h"
#include "dumpfile.h"
diff --git a/gcc/emit-rtl.c b/gcc/emit-rtl.c
index dce5fd6eba7..aa95f68c166 100644
--- a/gcc/emit-rtl.c
+++ b/gcc/emit-rtl.c
@@ -43,12 +43,16 @@ along with GCC; see the file COPYING3. If not see
#include "tree-eh.h"
#include "tm_p.h"
#include "flags.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "stringpool.h"
#include "expr.h"
#include "regs.h"
-#include "hard-reg-set.h"
-#include "hashtab.h"
#include "insn-config.h"
#include "recog.h"
#include "bitmap.h"
diff --git a/gcc/except.c b/gcc/except.c
index 78518ea808b..e846d88f21d 100644
--- a/gcc/except.c
+++ b/gcc/except.c
@@ -118,12 +118,17 @@ along with GCC; see the file COPYING3. If not see
#include "stringpool.h"
#include "stor-layout.h"
#include "flags.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "expr.h"
#include "libfuncs.h"
#include "insn-config.h"
#include "except.h"
-#include "hard-reg-set.h"
#include "output.h"
#include "dwarf2asm.h"
#include "dwarf2out.h"
diff --git a/gcc/explow.c b/gcc/explow.c
index 1066f56222a..1cfc411a346 100644
--- a/gcc/explow.c
+++ b/gcc/explow.c
@@ -29,11 +29,16 @@ along with GCC; see the file COPYING3. If not see
#include "tm_p.h"
#include "flags.h"
#include "except.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "expr.h"
#include "optabs.h"
#include "libfuncs.h"
-#include "hard-reg-set.h"
#include "insn-config.h"
#include "ggc.h"
#include "recog.h"
diff --git a/gcc/expr.c b/gcc/expr.c
index a6233f33d28..5519af22181 100644
--- a/gcc/expr.c
+++ b/gcc/expr.c
@@ -32,6 +32,10 @@ along with GCC; see the file COPYING3. If not see
#include "regs.h"
#include "hard-reg-set.h"
#include "except.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "input.h"
#include "function.h"
#include "insn-config.h"
#include "insn-attr.h"
diff --git a/gcc/expr.h b/gcc/expr.h
index 2e663290910..c17a9abaad5 100644
--- a/gcc/expr.h
+++ b/gcc/expr.h
@@ -21,6 +21,13 @@ along with GCC; see the file COPYING3. If not see
#define GCC_EXPR_H
/* For inhibit_defer_pop */
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "tm.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
/* For XEXP, GEN_INT, rtx_code */
#include "rtl.h"
@@ -30,7 +37,6 @@ along with GCC; see the file COPYING3. If not see
ssize_int, TREE_CODE, TYPE_SIZE, int_size_in_bytes, */
#include "tree-core.h"
/* For GET_MODE_BITSIZE, word_mode */
-#include "machmode.h"
/* This is the 4th arg to `expand_expr'.
EXPAND_STACK_PARM means we are possibly expanding a call param onto
@@ -55,81 +61,6 @@ enum expand_modifier {EXPAND_NORMAL = 0, EXPAND_STACK_PARM, EXPAND_SUM,
more information. */
#define OK_DEFER_POP (inhibit_defer_pop -= 1)
-enum direction {none, upward, downward};
-
-/* Structure to record the size of a sequence of arguments
- as the sum of a tree-expression and a constant. This structure is
- also used to store offsets from the stack, which might be negative,
- so the variable part must be ssizetype, not sizetype. */
-
-struct args_size
-{
- HOST_WIDE_INT constant;
- tree var;
-};
-
-/* Package up various arg related fields of struct args for
- locate_and_pad_parm. */
-struct locate_and_pad_arg_data
-{
- /* Size of this argument on the stack, rounded up for any padding it
- gets. If REG_PARM_STACK_SPACE is defined, then register parms are
- counted here, otherwise they aren't. */
- struct args_size size;
- /* Offset of this argument from beginning of stack-args. */
- struct args_size offset;
- /* Offset to the start of the stack slot. Different from OFFSET
- if this arg pads downward. */
- struct args_size slot_offset;
- /* The amount that the stack pointer needs to be adjusted to
- force alignment for the next argument. */
- struct args_size alignment_pad;
- /* Which way we should pad this arg. */
- enum direction where_pad;
- /* slot_offset is at least this aligned. */
- unsigned int boundary;
-};
-
-/* Add the value of the tree INC to the `struct args_size' TO. */
-
-#define ADD_PARM_SIZE(TO, INC) \
-do { \
- tree inc = (INC); \
- if (tree_fits_shwi_p (inc)) \
- (TO).constant += tree_to_shwi (inc); \
- else if ((TO).var == 0) \
- (TO).var = fold_convert (ssizetype, inc); \
- else \
- (TO).var = size_binop (PLUS_EXPR, (TO).var, \
- fold_convert (ssizetype, inc)); \
-} while (0)
-
-#define SUB_PARM_SIZE(TO, DEC) \
-do { \
- tree dec = (DEC); \
- if (tree_fits_shwi_p (dec)) \
- (TO).constant -= tree_to_shwi (dec); \
- else if ((TO).var == 0) \
- (TO).var = size_binop (MINUS_EXPR, ssize_int (0), \
- fold_convert (ssizetype, dec)); \
- else \
- (TO).var = size_binop (MINUS_EXPR, (TO).var, \
- fold_convert (ssizetype, dec)); \
-} while (0)
-
-/* Convert the implicit sum in a `struct args_size' into a tree
- of type ssizetype. */
-#define ARGS_SIZE_TREE(SIZE) \
-((SIZE).var == 0 ? ssize_int ((SIZE).constant) \
- : size_binop (PLUS_EXPR, fold_convert (ssizetype, (SIZE).var), \
- ssize_int ((SIZE).constant)))
-
-/* Convert the implicit sum in a `struct args_size' into an rtx. */
-#define ARGS_SIZE_RTX(SIZE) \
-((SIZE).var == 0 ? GEN_INT ((SIZE).constant) \
- : expand_normal (ARGS_SIZE_TREE (SIZE)))
-
-
/* This structure is used to pass around information about exploded
unary, binary and trinary expressions between expand_expr_real_1 and
friends. */
@@ -550,10 +481,6 @@ extern rtx expand_divmod (int, enum tree_code, enum machine_mode, rtx, rtx,
rtx, int);
#endif
-extern void locate_and_pad_parm (enum machine_mode, tree, int, int, int,
- tree, struct args_size *,
- struct locate_and_pad_arg_data *);
-
/* Return the CODE_LABEL rtx for a LABEL_DECL, creating it if necessary. */
extern rtx label_rtx (tree);
diff --git a/gcc/final.c b/gcc/final.c
index a923d163e6b..5ce87c7dd2b 100644
--- a/gcc/final.c
+++ b/gcc/final.c
@@ -60,6 +60,11 @@ along with GCC; see the file COPYING3. If not see
#include "flags.h"
#include "output.h"
#include "except.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "rtl-error.h"
#include "toplev.h" /* exact_log2, floor_log2 */
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index a2a1cf15c33..f4b33d04393 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-16 Andrew MacLeod <amacleod@redhat.com>
+
+ * f95-lang.c: Adjust include files.
+ * trans-decl.c: Likewise.
+
2014-10-12 Trevor Saunders <tsaunders@mozilla.com>
* trans-decl.c, trans.c, trans.h: Use hash_table instead of hashtab.
diff --git a/gcc/fortran/f95-lang.c b/gcc/fortran/f95-lang.c
index 66cd3a33148..403ab200830 100644
--- a/gcc/fortran/f95-lang.c
+++ b/gcc/fortran/f95-lang.c
@@ -34,6 +34,12 @@ along with GCC; see the file COPYING3. If not see
#include "langhooks-def.h"
#include "timevar.h"
#include "tm.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "ggc.h"
#include "toplev.h"
diff --git a/gcc/fortran/trans-decl.c b/gcc/fortran/trans-decl.c
index d168bdc6931..522c0f08ece 100644
--- a/gcc/fortran/trans-decl.c
+++ b/gcc/fortran/trans-decl.c
@@ -36,11 +36,16 @@ along with GCC; see the file COPYING3. If not see
#include "diagnostic-core.h" /* For internal_error. */
#include "toplev.h" /* For announce_function. */
#include "target.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "flags.h"
#include "cgraph.h"
#include "debug.h"
-#include "hash-set.h"
#include "constructor.h"
#include "trans.h"
#include "trans-types.h"
diff --git a/gcc/function.c b/gcc/function.c
index 2becdfb591e..2f9c719040f 100644
--- a/gcc/function.c
+++ b/gcc/function.c
@@ -42,16 +42,20 @@ along with GCC; see the file COPYING3. If not see
#include "stringpool.h"
#include "flags.h"
#include "except.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "expr.h"
#include "optabs.h"
#include "libfuncs.h"
#include "regs.h"
-#include "hard-reg-set.h"
#include "insn-config.h"
#include "recog.h"
#include "output.h"
-#include "hashtab.h"
#include "tm_p.h"
#include "langhooks.h"
#include "target.h"
diff --git a/gcc/function.h b/gcc/function.h
index a8d9f6a5135..66384e5323d 100644
--- a/gcc/function.h
+++ b/gcc/function.h
@@ -20,13 +20,6 @@ along with GCC; see the file COPYING3. If not see
#ifndef GCC_FUNCTION_H
#define GCC_FUNCTION_H
-#include "hashtab.h"
-#include "hash-set.h"
-#include "vec.h"
-#include "machmode.h"
-#include "tm.h" /* For CUMULATIVE_ARGS. */
-#include "hard-reg-set.h" /* For HARD_REG_SET in struct rtl_data. */
-#include "input.h" /* For location_t. */
/* Stack of pending (incomplete) sequences saved by `start_sequence'.
Each element describes one pending sequence.
@@ -727,11 +720,6 @@ void types_used_by_var_decl_insert (tree type, tree var_decl);
referenced by the global variable. */
extern GTY(()) vec<tree, va_gc> *types_used_by_cur_var_decl;
-/* cfun shouldn't be set directly; use one of these functions instead. */
-extern void set_cfun (struct function *new_cfun);
-extern void push_cfun (struct function *new_cfun);
-extern void pop_cfun (void);
-extern void instantiate_decl_rtl (rtx x);
/* Return the loop tree of FN. */
@@ -758,16 +746,95 @@ set_loops_for_fn (struct function *fn, struct loops *loops)
#define n_bbs_in_dom_tree (cfun->cfg->x_n_bbs_in_dom_tree)
#define VALUE_HISTOGRAMS(fun) (fun)->value_histograms
-/* Identify BLOCKs referenced by more than one NOTE_INSN_BLOCK_{BEG,END},
- and create duplicate blocks. */
-extern void reorder_blocks (void);
+/* A pointer to a function to create target specific, per-function
+ data structures. */
+extern struct machine_function * (*init_machine_status) (void);
-/* Set BLOCK_NUMBER for all the blocks in FN. */
-extern void number_blocks (tree);
+enum direction {none, upward, downward};
-extern void clear_block_marks (tree);
-extern tree blocks_nreverse (tree);
-extern tree block_chainon (tree, tree);
+/* Structure to record the size of a sequence of arguments
+ as the sum of a tree-expression and a constant. This structure is
+ also used to store offsets from the stack, which might be negative,
+ so the variable part must be ssizetype, not sizetype. */
+
+struct args_size
+{
+ HOST_WIDE_INT constant;
+ tree var;
+};
+
+/* Package up various arg related fields of struct args for
+ locate_and_pad_parm. */
+struct locate_and_pad_arg_data
+{
+ /* Size of this argument on the stack, rounded up for any padding it
+ gets. If REG_PARM_STACK_SPACE is defined, then register parms are
+ counted here, otherwise they aren't. */
+ struct args_size size;
+ /* Offset of this argument from beginning of stack-args. */
+ struct args_size offset;
+ /* Offset to the start of the stack slot. Different from OFFSET
+ if this arg pads downward. */
+ struct args_size slot_offset;
+ /* The amount that the stack pointer needs to be adjusted to
+ force alignment for the next argument. */
+ struct args_size alignment_pad;
+ /* Which way we should pad this arg. */
+ enum direction where_pad;
+ /* slot_offset is at least this aligned. */
+ unsigned int boundary;
+};
+
+/* Add the value of the tree INC to the `struct args_size' TO. */
+
+#define ADD_PARM_SIZE(TO, INC) \
+do { \
+ tree inc = (INC); \
+ if (tree_fits_shwi_p (inc)) \
+ (TO).constant += tree_to_shwi (inc); \
+ else if ((TO).var == 0) \
+ (TO).var = fold_convert (ssizetype, inc); \
+ else \
+ (TO).var = size_binop (PLUS_EXPR, (TO).var, \
+ fold_convert (ssizetype, inc)); \
+} while (0)
+
+#define SUB_PARM_SIZE(TO, DEC) \
+do { \
+ tree dec = (DEC); \
+ if (tree_fits_shwi_p (dec)) \
+ (TO).constant -= tree_to_shwi (dec); \
+ else if ((TO).var == 0) \
+ (TO).var = size_binop (MINUS_EXPR, ssize_int (0), \
+ fold_convert (ssizetype, dec)); \
+ else \
+ (TO).var = size_binop (MINUS_EXPR, (TO).var, \
+ fold_convert (ssizetype, dec)); \
+} while (0)
+
+/* Convert the implicit sum in a `struct args_size' into a tree
+ of type ssizetype. */
+#define ARGS_SIZE_TREE(SIZE) \
+((SIZE).var == 0 ? ssize_int ((SIZE).constant) \
+ : size_binop (PLUS_EXPR, fold_convert (ssizetype, (SIZE).var), \
+ ssize_int ((SIZE).constant)))
+
+/* Convert the implicit sum in a `struct args_size' into an rtx. */
+#define ARGS_SIZE_RTX(SIZE) \
+((SIZE).var == 0 ? GEN_INT ((SIZE).constant) \
+ : expand_normal (ARGS_SIZE_TREE (SIZE)))
+
+#define ASLK_REDUCE_ALIGN 1
+#define ASLK_RECORD_PAD 2
+
+
+
+extern void push_function_context (void);
+extern void pop_function_context (void);
+
+/* Save and restore status information for a nested function. */
+extern void free_after_parsing (struct function *);
+extern void free_after_compilation (struct function *);
/* Return size needed for stack frame based on slots so far allocated.
This size counts from zero. It is not rounded to STACK_BOUNDARY;
@@ -779,71 +846,87 @@ extern HOST_WIDE_INT get_frame_size (void);
return FALSE. */
extern bool frame_offset_overflow (HOST_WIDE_INT, tree);
-/* A pointer to a function to create target specific, per-function
- data structures. */
-extern struct machine_function * (*init_machine_status) (void);
+extern rtx assign_stack_local_1 (enum machine_mode, HOST_WIDE_INT, int, int);
+extern rtx assign_stack_local (enum machine_mode, HOST_WIDE_INT, int);
+extern rtx assign_stack_temp_for_type (enum machine_mode, HOST_WIDE_INT, tree);
+extern rtx assign_stack_temp (enum machine_mode, HOST_WIDE_INT);
+extern rtx assign_temp (tree, int, int);
+extern void update_temp_slot_address (rtx, rtx);
+extern void preserve_temp_slots (rtx);
+extern void free_temp_slots (void);
+extern void push_temp_slots (void);
+extern void pop_temp_slots (void);
+extern void init_temp_slots (void);
+extern rtx get_hard_reg_initial_reg (rtx);
+extern rtx get_hard_reg_initial_val (enum machine_mode, unsigned int);
+extern rtx has_hard_reg_initial_val (enum machine_mode, unsigned int);
-/* Save and restore status information for a nested function. */
-extern void free_after_parsing (struct function *);
-extern void free_after_compilation (struct function *);
+/* Called from gimple_expand_cfg. */
+extern unsigned int emit_initial_value_sets (void);
+
+extern bool initial_value_entry (int i, rtx *, rtx *);
+extern void instantiate_decl_rtl (rtx x);
+extern int aggregate_value_p (const_tree, const_tree);
+extern bool use_register_for_decl (const_tree);
+extern bool pass_by_reference (CUMULATIVE_ARGS *, enum machine_mode,
+ tree, bool);
+extern bool reference_callee_copied (CUMULATIVE_ARGS *, enum machine_mode,
+ tree, bool);
+extern gimple_seq gimplify_parameters (void);
+extern void locate_and_pad_parm (enum machine_mode, tree, int, int, int,
+ tree, struct args_size *,
+ struct locate_and_pad_arg_data *);
+extern void generate_setjmp_warnings (void);
+
+/* Identify BLOCKs referenced by more than one NOTE_INSN_BLOCK_{BEG,END},
+ and create duplicate blocks. */
+extern void reorder_blocks (void);
+extern void clear_block_marks (tree);
+extern tree blocks_nreverse (tree);
+extern tree block_chainon (tree, tree);
-extern void init_varasm_status (void);
+/* Set BLOCK_NUMBER for all the blocks in FN. */
+extern void number_blocks (tree);
+
+/* cfun shouldn't be set directly; use one of these functions instead. */
+extern void set_cfun (struct function *new_cfun);
+extern void push_cfun (struct function *new_cfun);
+extern void pop_cfun (void);
+
+extern int get_next_funcdef_no (void);
+extern int get_last_funcdef_no (void);
+extern void allocate_struct_function (tree, bool);
+extern void push_struct_function (tree fndecl);
+extern void init_dummy_function_start (void);
+extern void init_function_start (tree);
+extern void stack_protect_epilogue (void);
+extern void expand_function_start (tree);
+extern void expand_dummy_function_end (void);
#ifdef RTX_CODE
extern void diddle_return_value (void (*)(rtx, void*), void*);
extern void clobber_return_register (void);
#endif
+extern void do_warn_unused_parameter (tree);
+extern void expand_function_end (void);
extern rtx get_arg_pointer_save_area (void);
+extern void maybe_copy_prologue_epilogue_insn (rtx, rtx);
+extern int prologue_epilogue_contains (const_rtx);
+extern void emit_return_into_block (bool simple_p, basic_block bb);
+extern void set_return_jump_label (rtx);
+extern bool active_insn_between (rtx_insn *head, rtx_insn *tail);
+extern vec<edge> convert_jumps_to_returns (basic_block last_bb, bool simple_p,
+ vec<edge> unconverted);
+extern basic_block emit_return_for_exit (edge exit_fallthru_edge,
+ bool simple_p);
+extern void reposition_prologue_and_epilogue_notes (void);
/* Returns the name of the current function. */
extern const char *fndecl_name (tree);
extern const char *function_name (struct function *);
extern const char *current_function_name (void);
-extern void do_warn_unused_parameter (tree);
-
-extern bool pass_by_reference (CUMULATIVE_ARGS *, enum machine_mode,
- tree, bool);
-extern bool reference_callee_copied (CUMULATIVE_ARGS *, enum machine_mode,
- tree, bool);
-
extern void used_types_insert (tree);
-extern int get_next_funcdef_no (void);
-extern int get_last_funcdef_no (void);
-
-extern rtx get_hard_reg_initial_val (enum machine_mode, unsigned int);
-extern rtx has_hard_reg_initial_val (enum machine_mode, unsigned int);
-extern rtx get_hard_reg_initial_reg (rtx);
-extern bool initial_value_entry (int i, rtx *, rtx *);
-
-/* Called from gimple_expand_cfg. */
-extern unsigned int emit_initial_value_sets (void);
-
-/* In predict.c */
-extern bool optimize_function_for_size_p (struct function *);
-extern bool optimize_function_for_speed_p (struct function *);
-
-/* In function.c */
-extern void expand_function_end (void);
-extern void expand_function_start (tree);
-extern void stack_protect_epilogue (void);
-extern void init_dummy_function_start (void);
-extern void expand_dummy_function_end (void);
-extern void allocate_struct_function (tree, bool);
-extern void push_struct_function (tree fndecl);
-extern void init_function_start (tree);
-extern bool use_register_for_decl (const_tree);
-extern void generate_setjmp_warnings (void);
-extern void init_temp_slots (void);
-extern void free_temp_slots (void);
-extern void pop_temp_slots (void);
-extern void push_temp_slots (void);
-extern void preserve_temp_slots (rtx);
-extern int aggregate_value_p (const_tree, const_tree);
-extern void push_function_context (void);
-extern void pop_function_context (void);
-extern gimple_seq gimplify_parameters (void);
-
#endif /* GCC_FUNCTION_H */
diff --git a/gcc/gcse.c b/gcc/gcse.c
index 7c629418e6f..b6e3cf801b1 100644
--- a/gcc/gcse.c
+++ b/gcc/gcse.c
@@ -149,6 +149,11 @@ along with GCC; see the file COPYING3. If not see
#include "insn-config.h"
#include "recog.h"
#include "basic-block.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "expr.h"
#include "except.h"
diff --git a/gcc/genattrtab.c b/gcc/genattrtab.c
index 9d34bc8d61c..7911f78f526 100644
--- a/gcc/genattrtab.c
+++ b/gcc/genattrtab.c
@@ -5123,6 +5123,7 @@ write_header (FILE *outf)
fprintf (outf, "#include \"toplev.h\"\n");
fprintf (outf, "#include \"flags.h\"\n");
fprintf (outf, "#include \"function.h\"\n");
+ fprintf (outf, "#include \"predict.h\"\n");
fprintf (outf, "\n");
fprintf (outf, "#define operands recog_data.operand\n\n");
}
diff --git a/gcc/genconditions.c b/gcc/genconditions.c
index 048a9923802..cdb44f1a4ae 100644
--- a/gcc/genconditions.c
+++ b/gcc/genconditions.c
@@ -73,6 +73,9 @@ write_header (void)
#include \"ggc.h\"\n\
#include \"rtl.h\"\n\
#include \"tm_p.h\"\n\
+#include \"hashtab.h\"\n\
+#include \"hash-set.h\"\n\
+#include \"hard-reg-set.h\"\n\
#include \"function.h\"\n\
\n\
/* Fake - insn-config.h doesn't exist yet. */\n\
diff --git a/gcc/genemit.c b/gcc/genemit.c
index 65434b5367b..21028d7b573 100644
--- a/gcc/genemit.c
+++ b/gcc/genemit.c
@@ -801,6 +801,12 @@ from the machine description file `md'. */\n\n");
printf ("#include \"calls.h\"\n");
printf ("#include \"rtl.h\"\n");
printf ("#include \"tm_p.h\"\n");
+ printf ("#include \"hashtab.h\"\n");
+ printf ("#include \"hash-set.h\"\n");
+ printf ("#include \"vec.h\"\n");
+ printf ("#include \"machmode.h\"\n");
+ printf ("#include \"hard-reg-set.h\"\n");
+ printf ("#include \"input.h\"\n");
printf ("#include \"function.h\"\n");
printf ("#include \"expr.h\"\n");
printf ("#include \"optabs.h\"\n");
@@ -808,7 +814,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 \"hard-reg-set.h\"\n");
printf ("#include \"recog.h\"\n");
printf ("#include \"resource.h\"\n");
printf ("#include \"reload.h\"\n");
diff --git a/gcc/gengtype.c b/gcc/gengtype.c
index bc88eb8224f..a4d075b9752 100644
--- a/gcc/gengtype.c
+++ b/gcc/gengtype.c
@@ -1828,7 +1828,9 @@ open_base_files (void)
static const char *const ifiles[] = {
"config.h", "system.h", "coretypes.h", "tm.h",
"hashtab.h", "splay-tree.h", "obstack.h", "bitmap.h", "input.h",
- "tree.h", "rtl.h", "wide-int.h", "function.h", "insn-config.h", "expr.h",
+ "tree.h", "rtl.h", "wide-int.h", "hashtab.h", "hash-set.h", "vec.h",
+ "machmode.h", "tm.h", "hard-reg-set.h", "input.h",
+ "function.h", "insn-config.h", "expr.h",
"hard-reg-set.h", "basic-block.h", "cselib.h", "insn-addr.h",
"optabs.h", "libfuncs.h", "debug.h", "ggc.h", "cgraph.h",
"hash-table.h", "vec.h", "ggc.h", "basic-block.h",
diff --git a/gcc/genoutput.c b/gcc/genoutput.c
index b1321d83ac3..c0e250b5b14 100644
--- a/gcc/genoutput.c
+++ b/gcc/genoutput.c
@@ -248,6 +248,7 @@ output_prologue (void)
printf ("#include \"output.h\"\n");
printf ("#include \"target.h\"\n");
printf ("#include \"tm-constrs.h\"\n");
+ printf ("#include \"predict.h\"\n");
}
static void
diff --git a/gcc/genpreds.c b/gcc/genpreds.c
index b14a4ac104b..0eb1c30aa8d 100644
--- a/gcc/genpreds.c
+++ b/gcc/genpreds.c
@@ -1422,6 +1422,12 @@ write_insn_preds_c (void)
#include \"stor-layout.h\"\n\
#include \"calls.h\"\n\
#include \"tm_p.h\"\n\
+#include \"hashtab.h\"\n\
+#include \"hash-set.h\"\n\
+#include \"vec.h\"\n\
+#include \"machmode.h\"\n\
+#include \"hard-reg-set.h\"\n\
+#include \"input.h\"\n\
#include \"function.h\"\n\
#include \"insn-config.h\"\n\
#include \"recog.h\"\n\
diff --git a/gcc/genrecog.c b/gcc/genrecog.c
index 4d7d3b781bf..a3589d3add0 100644
--- a/gcc/genrecog.c
+++ b/gcc/genrecog.c
@@ -2305,6 +2305,12 @@ write_header (void)
#include \"tm.h\"\n\
#include \"rtl.h\"\n\
#include \"tm_p.h\"\n\
+#include \"hashtab.h\"\n\
+#include \"hash-set.h\"\n\
+#include \"vec.h\"\n\
+#include \"machmode.h\"\n\
+#include \"hard-reg-set.h\"\n\
+#include \"input.h\"\n\
#include \"function.h\"\n\
#include \"insn-config.h\"\n\
#include \"recog.h\"\n\
@@ -2316,6 +2322,7 @@ write_header (void)
#include \"reload.h\"\n\
#include \"regs.h\"\n\
#include \"tm-constrs.h\"\n\
+#include \"predict.h\"\n\
\n");
puts ("\n\
diff --git a/gcc/gimple-fold.c b/gcc/gimple-fold.c
index 2c79f8a6573..9344e0b9dea 100644
--- a/gcc/gimple-fold.c
+++ b/gcc/gimple-fold.c
@@ -28,6 +28,12 @@ along with GCC; see the file COPYING3. If not see
#include "stmt.h"
#include "stor-layout.h"
#include "flags.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "dumpfile.h"
#include "bitmap.h"
diff --git a/gcc/gimple-low.c b/gcc/gimple-low.c
index c8a6e6b57fb..76100c6e6aa 100644
--- a/gcc/gimple-low.c
+++ b/gcc/gimple-low.c
@@ -35,6 +35,12 @@ along with GCC; see the file COPYING3. If not see
#include "tree-iterator.h"
#include "tree-inline.h"
#include "flags.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "diagnostic-core.h"
#include "tree-pass.h"
diff --git a/gcc/gimple-streamer.h b/gcc/gimple-streamer.h
index 4c4aa0ad391..75afe85a327 100644
--- a/gcc/gimple-streamer.h
+++ b/gcc/gimple-streamer.h
@@ -23,6 +23,13 @@ along with GCC; see the file COPYING3. If not see
#define GCC_GIMPLE_STREAMER_H
#include "basic-block.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "tm.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "lto-streamer.h"
diff --git a/gcc/haifa-sched.c b/gcc/haifa-sched.c
index cb41cc2b0d2..db8a45cf5ec 100644
--- a/gcc/haifa-sched.c
+++ b/gcc/haifa-sched.c
@@ -131,6 +131,11 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "tm_p.h"
#include "regs.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "flags.h"
#include "insn-config.h"
diff --git a/gcc/ifcvt.c b/gcc/ifcvt.c
index b6b479f39a5..949d2b40ba5 100644
--- a/gcc/ifcvt.c
+++ b/gcc/ifcvt.c
@@ -24,12 +24,17 @@
#include "rtl.h"
#include "regs.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "flags.h"
#include "insn-config.h"
#include "recog.h"
#include "except.h"
-#include "hard-reg-set.h"
#include "basic-block.h"
#include "expr.h"
#include "output.h"
@@ -40,7 +45,6 @@
#include "target.h"
#include "tree-pass.h"
#include "df.h"
-#include "vec.h"
#include "dbgcnt.h"
#include "shrink-wrap.h"
diff --git a/gcc/ira.c b/gcc/ira.c
index aac1fad74f8..3f4405eca08 100644
--- a/gcc/ira.c
+++ b/gcc/ira.c
@@ -386,6 +386,11 @@ along with GCC; see the file COPYING3. If not see
#include "except.h"
#include "reload.h"
#include "diagnostic-core.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "ggc.h"
#include "ira-int.h"
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 5b1e588cd61..777849f8e9f 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-16 Andrew MacLeod <amacleod@redhat.com>
+
+ * class.c: Adjust include files.
+ * resource.c: Likewise.
+
2014-10-15 Evgeny Stupachenko <evstupac@gmail.com>
PR target/63536
diff --git a/gcc/java/class.c b/gcc/java/class.c
index 25af6976ed0..2c29a44837c 100644
--- a/gcc/java/class.c
+++ b/gcc/java/class.c
@@ -38,6 +38,13 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "toplev.h"
#include "output.h" /* for switch_to_section and get_section */
#include "parse.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "tm.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "ggc.h"
#include "cgraph.h"
diff --git a/gcc/java/resource.c b/gcc/java/resource.c
index 8ae7e4269cd..bc9e029a679 100644
--- a/gcc/java/resource.c
+++ b/gcc/java/resource.c
@@ -32,6 +32,13 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "diagnostic-core.h"
#include "toplev.h"
#include "parse.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "tm.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "ggc.h"
#include "tree-iterator.h"
diff --git a/gcc/jump.c b/gcc/jump.c
index 8e85f5f191b..f1aaf8c9b3c 100644
--- a/gcc/jump.c
+++ b/gcc/jump.c
@@ -45,6 +45,11 @@ along with GCC; see the file COPYING3. If not see
#include "insn-config.h"
#include "insn-attr.h"
#include "recog.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "basic-block.h"
#include "expr.h"
diff --git a/gcc/lcm.c b/gcc/lcm.c
index cf69428a51c..694d33e3989 100644
--- a/gcc/lcm.c
+++ b/gcc/lcm.c
@@ -60,6 +60,11 @@ along with GCC; see the file COPYING3. If not see
#include "recog.h"
#include "basic-block.h"
#include "tm_p.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "sbitmap.h"
#include "dumpfile.h"
diff --git a/gcc/loop-invariant.c b/gcc/loop-invariant.c
index 1ac2ebdf86c..783d74a45fe 100644
--- a/gcc/loop-invariant.c
+++ b/gcc/loop-invariant.c
@@ -47,6 +47,11 @@ along with GCC; see the file COPYING3. If not see
#include "expr.h"
#include "recog.h"
#include "target.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "flags.h"
#include "df.h"
diff --git a/gcc/lra-assigns.c b/gcc/lra-assigns.c
index 8dbcec4eaec..1047acfcce9 100644
--- a/gcc/lra-assigns.c
+++ b/gcc/lra-assigns.c
@@ -87,6 +87,11 @@ along with GCC; see the file COPYING3. If not see
#include "recog.h"
#include "output.h"
#include "regs.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "expr.h"
#include "basic-block.h"
diff --git a/gcc/lra-coalesce.c b/gcc/lra-coalesce.c
index 70e74f384c6..d7ea7e212c0 100644
--- a/gcc/lra-coalesce.c
+++ b/gcc/lra-coalesce.c
@@ -54,6 +54,11 @@ along with GCC; see the file COPYING3. If not see
#include "regs.h"
#include "hard-reg-set.h"
#include "flags.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "expr.h"
#include "basic-block.h"
diff --git a/gcc/lra-constraints.c b/gcc/lra-constraints.c
index 2b17aa39fbc..6ee99a29312 100644
--- a/gcc/lra-constraints.c
+++ b/gcc/lra-constraints.c
@@ -120,6 +120,11 @@
#include "output.h"
#include "addresses.h"
#include "target.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "expr.h"
#include "basic-block.h"
diff --git a/gcc/lra-eliminations.c b/gcc/lra-eliminations.c
index 8109af84ae0..3133e9aa2e2 100644
--- a/gcc/lra-eliminations.c
+++ b/gcc/lra-eliminations.c
@@ -65,6 +65,11 @@ along with GCC; see the file COPYING3. If not see
#include "output.h"
#include "addresses.h"
#include "target.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "expr.h"
#include "basic-block.h"
diff --git a/gcc/lra-lives.c b/gcc/lra-lives.c
index b72824e8fa8..38b9d3ba6ad 100644
--- a/gcc/lra-lives.c
+++ b/gcc/lra-lives.c
@@ -36,6 +36,11 @@ along with GCC; see the file COPYING3. If not see
#include "recog.h"
#include "output.h"
#include "regs.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "expr.h"
#include "basic-block.h"
diff --git a/gcc/lra-spills.c b/gcc/lra-spills.c
index 8d494af38eb..5f1038bcbe1 100644
--- a/gcc/lra-spills.c
+++ b/gcc/lra-spills.c
@@ -67,6 +67,11 @@ along with GCC; see the file COPYING3. If not see
#include "regs.h"
#include "hard-reg-set.h"
#include "flags.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "expr.h"
#include "basic-block.h"
diff --git a/gcc/lra.c b/gcc/lra.c
index f664f070cbb..6fb35a13fac 100644
--- a/gcc/lra.c
+++ b/gcc/lra.c
@@ -106,6 +106,11 @@ along with GCC; see the file COPYING3. If not see
#include "output.h"
#include "addresses.h"
#include "flags.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "expr.h"
#include "basic-block.h"
@@ -113,7 +118,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree-pass.h"
#include "timevar.h"
#include "target.h"
-#include "vec.h"
#include "ira.h"
#include "lra-int.h"
#include "df.h"
diff --git a/gcc/lto-cgraph.c b/gcc/lto-cgraph.c
index 136fc86420e..b5ae3c016ed 100644
--- a/gcc/lto-cgraph.c
+++ b/gcc/lto-cgraph.c
@@ -40,6 +40,9 @@ along with GCC; see the file COPYING3. If not see
#include "hash-set.h"
#include "langhooks.h"
#include "bitmap.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
#include "function.h"
#include "diagnostic-core.h"
#include "except.h"
diff --git a/gcc/lto-section-in.c b/gcc/lto-section-in.c
index c053545b506..ba4c488bb14 100644
--- a/gcc/lto-section-in.c
+++ b/gcc/lto-section-in.c
@@ -35,6 +35,10 @@ along with GCC; see the file COPYING3. If not see
#include "params.h"
#include "input.h"
#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
#include "function.h"
#include "diagnostic-core.h"
#include "except.h"
diff --git a/gcc/lto-section-out.c b/gcc/lto-section-out.c
index d9dce9322fc..2c940cc2e2c 100644
--- a/gcc/lto-section-out.c
+++ b/gcc/lto-section-out.c
@@ -34,6 +34,10 @@ along with GCC; see the file COPYING3. If not see
#include "params.h"
#include "input.h"
#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
#include "function.h"
#include "except.h"
#include "langhooks.h"
diff --git a/gcc/lto-streamer-in.c b/gcc/lto-streamer-in.c
index 271b51ca4cc..dee19bfccee 100644
--- a/gcc/lto-streamer-in.c
+++ b/gcc/lto-streamer-in.c
@@ -46,6 +46,10 @@ along with GCC; see the file COPYING3. If not see
#include "tree-dfa.h"
#include "tree-ssa.h"
#include "tree-pass.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
#include "function.h"
#include "diagnostic.h"
#include "except.h"
diff --git a/gcc/lto-streamer-out.c b/gcc/lto-streamer-out.c
index 6d1384f2143..7d29d4fc68c 100644
--- a/gcc/lto-streamer-out.c
+++ b/gcc/lto-streamer-out.c
@@ -43,6 +43,9 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-ssa.h"
#include "tree-ssanames.h"
#include "tree-pass.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
#include "function.h"
#include "diagnostic-core.h"
#include "inchash.h"
diff --git a/gcc/mode-switching.c b/gcc/mode-switching.c
index 379656d1b72..f75fd5dc20a 100644
--- a/gcc/mode-switching.c
+++ b/gcc/mode-switching.c
@@ -30,6 +30,11 @@ along with GCC; see the file COPYING3. If not see
#include "recog.h"
#include "basic-block.h"
#include "tm_p.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "tree-pass.h"
#include "df.h"
diff --git a/gcc/modulo-sched.c b/gcc/modulo-sched.c
index c59c16b0bad..5a44cbf97af 100644
--- a/gcc/modulo-sched.c
+++ b/gcc/modulo-sched.c
@@ -28,6 +28,11 @@ along with GCC; see the file COPYING3. If not see
#include "tm_p.h"
#include "hard-reg-set.h"
#include "regs.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "flags.h"
#include "insn-config.h"
diff --git a/gcc/objc/ChangeLog b/gcc/objc/ChangeLog
index 6cfbefacfb7..50de31ebb7b 100644
--- a/gcc/objc/ChangeLog
+++ b/gcc/objc/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-16 Andrew MacLeod <amacleod@redhat.com>
+
+ * objc-act.c: Adjust include files.
+
2014-10-12 Trevor Saunders <tsaunders@mozilla.com>
* objc-act.c: use hash_table instead of hashtab.
diff --git a/gcc/objc/objc-act.c b/gcc/objc/objc-act.c
index a703c4291e3..13decfa7e71 100644
--- a/gcc/objc/objc-act.c
+++ b/gcc/objc/objc-act.c
@@ -43,6 +43,11 @@ along with GCC; see the file COPYING3. If not see
#include "objc-act.h"
#include "objc-map.h"
#include "input.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
#include "function.h"
#include "toplev.h"
#include "debug.h"
diff --git a/gcc/omp-low.c b/gcc/omp-low.c
index 06db877291f..62911fa21d2 100644
--- a/gcc/omp-low.c
+++ b/gcc/omp-low.c
@@ -55,6 +55,12 @@ along with GCC; see the file COPYING3. If not see
#include "tree-dfa.h"
#include "tree-ssa.h"
#include "flags.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "expr.h"
#include "tree-pass.h"
diff --git a/gcc/optabs.c b/gcc/optabs.c
index d55a6bbf8d9..dfac28120ef 100644
--- a/gcc/optabs.c
+++ b/gcc/optabs.c
@@ -35,6 +35,12 @@ along with GCC; see the file COPYING3. If not see
#include "varasm.h"
#include "tm_p.h"
#include "flags.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "except.h"
#include "expr.h"
diff --git a/gcc/passes.c b/gcc/passes.c
index 5001c3d047d..68de5d62d32 100644
--- a/gcc/passes.c
+++ b/gcc/passes.c
@@ -40,6 +40,10 @@ along with GCC; see the file COPYING3. If not see
#include "recog.h"
#include "output.h"
#include "except.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
#include "function.h"
#include "toplev.h"
#include "expr.h"
diff --git a/gcc/postreload-gcse.c b/gcc/postreload-gcse.c
index b81c402cc8a..d6fa3d13ef2 100644
--- a/gcc/postreload-gcse.c
+++ b/gcc/postreload-gcse.c
@@ -33,12 +33,16 @@ along with GCC; see the file COPYING3. If not see
#include "insn-config.h"
#include "recog.h"
#include "basic-block.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "expr.h"
#include "except.h"
#include "intl.h"
#include "obstack.h"
-#include "hashtab.h"
#include "params.h"
#include "target.h"
#include "tree-pass.h"
diff --git a/gcc/postreload.c b/gcc/postreload.c
index dae4bd89be1..c9bb4ae3a35 100644
--- a/gcc/postreload.c
+++ b/gcc/postreload.c
@@ -29,6 +29,10 @@ along with GCC; see the file COPYING3. If not see
#include "obstack.h"
#include "insn-config.h"
#include "flags.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "input.h"
#include "function.h"
#include "expr.h"
#include "optabs.h"
diff --git a/gcc/predict.c b/gcc/predict.c
index b5556db1839..29e3c79f98b 100644
--- a/gcc/predict.c
+++ b/gcc/predict.c
@@ -40,6 +40,11 @@ along with GCC; see the file COPYING3. If not see
#include "insn-config.h"
#include "regs.h"
#include "flags.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "except.h"
#include "diagnostic-core.h"
diff --git a/gcc/predict.h b/gcc/predict.h
index c75b6b6b238..20b495896d4 100644
--- a/gcc/predict.h
+++ b/gcc/predict.h
@@ -55,4 +55,7 @@ extern void tree_estimate_probability (void);
extern void compute_function_frequency (void);
extern void rebuild_frequencies (void);
+extern bool optimize_function_for_size_p (struct function *);
+extern bool optimize_function_for_speed_p (struct function *);
+
#endif /* GCC_PREDICT_H */
diff --git a/gcc/profile.c b/gcc/profile.c
index 6be8a030fc6..bcff4110522 100644
--- a/gcc/profile.c
+++ b/gcc/profile.c
@@ -55,6 +55,12 @@ along with GCC; see the file COPYING3. If not see
#include "flags.h"
#include "regs.h"
#include "expr.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "basic-block.h"
#include "diagnostic-core.h"
diff --git a/gcc/recog.c b/gcc/recog.c
index 5ee3816c7cf..35cd22c56f7 100644
--- a/gcc/recog.c
+++ b/gcc/recog.c
@@ -32,6 +32,11 @@ along with GCC; see the file COPYING3. If not see
#include "regs.h"
#include "addresses.h"
#include "expr.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "flags.h"
#include "basic-block.h"
diff --git a/gcc/ree.c b/gcc/ree.c
index a58f114df83..1ccd88ec53c 100644
--- a/gcc/ree.c
+++ b/gcc/ree.c
@@ -227,6 +227,11 @@ along with GCC; see the file COPYING3. If not see
#include "hard-reg-set.h"
#include "basic-block.h"
#include "insn-config.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "expr.h"
#include "insn-attr.h"
diff --git a/gcc/reg-stack.c b/gcc/reg-stack.c
index 8c0a5c8748b..644ab71e867 100644
--- a/gcc/reg-stack.c
+++ b/gcc/reg-stack.c
@@ -157,10 +157,15 @@
#include "varasm.h"
#include "rtl-error.h"
#include "tm_p.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "insn-config.h"
#include "regs.h"
-#include "hard-reg-set.h"
#include "flags.h"
#include "recog.h"
#include "basic-block.h"
diff --git a/gcc/regcprop.c b/gcc/regcprop.c
index 01135dea179..7035a84a649 100644
--- a/gcc/regcprop.c
+++ b/gcc/regcprop.c
@@ -29,6 +29,11 @@
#include "hard-reg-set.h"
#include "basic-block.h"
#include "reload.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "recog.h"
#include "flags.h"
diff --git a/gcc/reginfo.c b/gcc/reginfo.c
index 226152278b4..ae15e7d2119 100644
--- a/gcc/reginfo.c
+++ b/gcc/reginfo.c
@@ -38,13 +38,17 @@ along with GCC; see the file COPYING3. If not see
#include "basic-block.h"
#include "regs.h"
#include "addresses.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "insn-config.h"
#include "recog.h"
#include "reload.h"
#include "diagnostic-core.h"
#include "output.h"
-#include "hashtab.h"
#include "target.h"
#include "tree-pass.h"
#include "df.h"
diff --git a/gcc/regrename.c b/gcc/regrename.c
index 95947894c1a..7b9ca45fd1b 100644
--- a/gcc/regrename.c
+++ b/gcc/regrename.c
@@ -30,6 +30,11 @@
#include "basic-block.h"
#include "reload.h"
#include "output.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "recog.h"
#include "flags.h"
diff --git a/gcc/reload.c b/gcc/reload.c
index 3e563d0041c..8e92f22084a 100644
--- a/gcc/reload.c
+++ b/gcc/reload.c
@@ -104,6 +104,11 @@ a register with any other reload. */
#include "addresses.h"
#include "hard-reg-set.h"
#include "flags.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "params.h"
#include "target.h"
diff --git a/gcc/reload1.c b/gcc/reload1.c
index 22d3e8e1e59..d706e529b88 100644
--- a/gcc/reload1.c
+++ b/gcc/reload1.c
@@ -30,6 +30,10 @@ along with GCC; see the file COPYING3. If not see
#include "insn-config.h"
#include "ggc.h"
#include "flags.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "input.h"
#include "function.h"
#include "expr.h"
#include "optabs.h"
diff --git a/gcc/reorg.c b/gcc/reorg.c
index ac6eaa03315..57f32bbf787 100644
--- a/gcc/reorg.c
+++ b/gcc/reorg.c
@@ -108,10 +108,15 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "tm_p.h"
#include "expr.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "insn-config.h"
#include "conditions.h"
-#include "hard-reg-set.h"
#include "basic-block.h"
#include "regs.h"
#include "recog.h"
diff --git a/gcc/resource.c b/gcc/resource.c
index 6acc71846b8..bc69739e4c9 100644
--- a/gcc/resource.c
+++ b/gcc/resource.c
@@ -25,6 +25,11 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "tm_p.h"
#include "hard-reg-set.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "regs.h"
#include "flags.h"
diff --git a/gcc/rtl.h b/gcc/rtl.h
index 6ce0dce31b5..5a34fea283f 100644
--- a/gcc/rtl.h
+++ b/gcc/rtl.h
@@ -2641,15 +2641,6 @@ extern enum machine_mode get_pool_mode (const_rtx);
extern rtx simplify_subtraction (rtx);
extern void decide_function_section (tree);
-/* In function.c */
-extern rtx assign_stack_local (enum machine_mode, HOST_WIDE_INT, int);
-#define ASLK_REDUCE_ALIGN 1
-#define ASLK_RECORD_PAD 2
-extern rtx assign_stack_local_1 (enum machine_mode, HOST_WIDE_INT, int, int);
-extern rtx assign_stack_temp (enum machine_mode, HOST_WIDE_INT);
-extern rtx assign_stack_temp_for_type (enum machine_mode, HOST_WIDE_INT, tree);
-extern rtx assign_temp (tree, int, int);
-
/* In emit-rtl.c */
extern rtx_insn *emit_insn_before (rtx, rtx);
extern rtx_insn *emit_insn_before_noloc (rtx, rtx_insn *, basic_block);
@@ -3441,14 +3432,6 @@ extern void print_insn (pretty_printer *, const_rtx, int);
extern void rtl_dump_bb_for_graph (pretty_printer *, basic_block);
extern const char *str_pattern_slim (const_rtx);
-/* In function.c */
-extern void reposition_prologue_and_epilogue_notes (void);
-extern int prologue_epilogue_contains (const_rtx);
-extern int sibcall_epilogue_contains (const_rtx);
-extern void update_temp_slot_address (rtx, rtx);
-extern void maybe_copy_prologue_epilogue_insn (rtx, rtx);
-extern void set_return_jump_label (rtx);
-
/* In stmt.c */
extern void expand_null_return (void);
extern void expand_naked_return (void);
diff --git a/gcc/rtlanal.c b/gcc/rtlanal.c
index 4651f709f97..75362e4b79b 100644
--- a/gcc/rtlanal.c
+++ b/gcc/rtlanal.c
@@ -32,6 +32,11 @@ along with GCC; see the file COPYING3. If not see
#include "tm_p.h"
#include "flags.h"
#include "regs.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "df.h"
#include "tree.h"
diff --git a/gcc/sched-deps.c b/gcc/sched-deps.c
index 1f3a2211e41..80ca41fec6e 100644
--- a/gcc/sched-deps.c
+++ b/gcc/sched-deps.c
@@ -30,6 +30,11 @@ along with GCC; see the file COPYING3. If not see
#include "tm_p.h"
#include "hard-reg-set.h"
#include "regs.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "flags.h"
#include "insn-config.h"
diff --git a/gcc/sched-ebb.c b/gcc/sched-ebb.c
index c3be721c89d..3930ff5f71d 100644
--- a/gcc/sched-ebb.c
+++ b/gcc/sched-ebb.c
@@ -28,6 +28,11 @@ along with GCC; see the file COPYING3. If not see
#include "tm_p.h"
#include "hard-reg-set.h"
#include "regs.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "flags.h"
#include "insn-config.h"
diff --git a/gcc/sched-rgn.c b/gcc/sched-rgn.c
index 509a2243b84..83110d088b9 100644
--- a/gcc/sched-rgn.c
+++ b/gcc/sched-rgn.c
@@ -52,6 +52,11 @@ along with GCC; see the file COPYING3. If not see
#include "tm_p.h"
#include "hard-reg-set.h"
#include "regs.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "flags.h"
#include "insn-config.h"
diff --git a/gcc/sel-sched-dump.c b/gcc/sel-sched-dump.c
index d2169c8c6ea..70b7e2f0ee1 100644
--- a/gcc/sel-sched-dump.c
+++ b/gcc/sel-sched-dump.c
@@ -26,6 +26,11 @@ along with GCC; see the file COPYING3. If not see
#include "tm_p.h"
#include "hard-reg-set.h"
#include "regs.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "flags.h"
#include "insn-config.h"
diff --git a/gcc/sel-sched-ir.c b/gcc/sel-sched-ir.c
index 3bc7d848e9a..bc191a92762 100644
--- a/gcc/sel-sched-ir.c
+++ b/gcc/sel-sched-ir.c
@@ -26,6 +26,11 @@ along with GCC; see the file COPYING3. If not see
#include "tm_p.h"
#include "hard-reg-set.h"
#include "regs.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "flags.h"
#include "insn-config.h"
@@ -37,7 +42,6 @@ along with GCC; see the file COPYING3. If not see
#include "sched-int.h"
#include "ggc.h"
#include "tree.h"
-#include "vec.h"
#include "langhooks.h"
#include "rtlhooks-def.h"
#include "emit-rtl.h" /* FIXME: Can go away once crtl is moved to rtl.h. */
diff --git a/gcc/sel-sched.c b/gcc/sel-sched.c
index e860300094a..9b2be733279 100644
--- a/gcc/sel-sched.c
+++ b/gcc/sel-sched.c
@@ -25,6 +25,11 @@ along with GCC; see the file COPYING3. If not see
#include "tm_p.h"
#include "hard-reg-set.h"
#include "regs.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "flags.h"
#include "insn-config.h"
@@ -37,7 +42,6 @@ along with GCC; see the file COPYING3. If not see
#include "sched-int.h"
#include "ggc.h"
#include "tree.h"
-#include "vec.h"
#include "langhooks.h"
#include "rtlhooks-def.h"
#include "emit-rtl.h"
diff --git a/gcc/shrink-wrap.c b/gcc/shrink-wrap.c
index 5f6f27cc7b0..d864784d894 100644
--- a/gcc/shrink-wrap.c
+++ b/gcc/shrink-wrap.c
@@ -30,16 +30,20 @@ along with GCC; see the file COPYING3. If not see
#include "stringpool.h"
#include "flags.h"
#include "except.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "expr.h"
#include "optabs.h"
#include "libfuncs.h"
#include "regs.h"
-#include "hard-reg-set.h"
#include "insn-config.h"
#include "recog.h"
#include "output.h"
-#include "hashtab.h"
#include "tm_p.h"
#include "langhooks.h"
#include "target.h"
diff --git a/gcc/shrink-wrap.h b/gcc/shrink-wrap.h
index 7b8031aab5d..ccf95925c8a 100644
--- a/gcc/shrink-wrap.h
+++ b/gcc/shrink-wrap.h
@@ -25,13 +25,8 @@ along with GCC; see the file COPYING3. If not see
#include "machmode.h"
#ifdef HAVE_simple_return
-/* In function.c. */
-extern void emit_return_into_block (bool simple_p, basic_block bb);
-extern bool active_insn_between (rtx_insn *head, rtx_insn *tail);
-extern vec<edge> convert_jumps_to_returns (basic_block last_bb, bool simple_p,
- vec<edge> unconverted);
-extern basic_block emit_return_for_exit (edge exit_fallthru_edge,
- bool simple_p);
+
+#include "function.h"
/* In shrink-wrap.c. */
extern bool requires_stack_frame_p (rtx_insn *, HARD_REG_SET, HARD_REG_SET);
diff --git a/gcc/simplify-rtx.c b/gcc/simplify-rtx.c
index 32df80d331e..a85f756fdc8 100644
--- a/gcc/simplify-rtx.c
+++ b/gcc/simplify-rtx.c
@@ -31,11 +31,17 @@ along with GCC; see the file COPYING3. If not see
#include "flags.h"
#include "insn-config.h"
#include "recog.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "expr.h"
#include "diagnostic-core.h"
#include "ggc.h"
#include "target.h"
+#include "predict.h"
/* Simplification and canonicalization of RTL. */
diff --git a/gcc/statistics.c b/gcc/statistics.c
index eb3210ba757..b3e63de8c5d 100644
--- a/gcc/statistics.c
+++ b/gcc/statistics.c
@@ -25,6 +25,13 @@ along with GCC; see the file COPYING3. If not see
#include "tree-dump.h"
#include "statistics.h"
#include "hash-table.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "tm.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "context.h"
#include "pass_manager.h"
diff --git a/gcc/stmt.c b/gcc/stmt.c
index 6d4eed9613b..96a4c627ad1 100644
--- a/gcc/stmt.c
+++ b/gcc/stmt.c
@@ -35,19 +35,22 @@ along with GCC; see the file COPYING3. If not see
#include "tm_p.h"
#include "flags.h"
#include "except.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "insn-config.h"
#include "expr.h"
#include "libfuncs.h"
#include "recog.h"
-#include "machmode.h"
#include "diagnostic-core.h"
#include "output.h"
#include "langhooks.h"
#include "predict.h"
#include "optabs.h"
#include "target.h"
-#include "hash-set.h"
#include "basic-block.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
diff --git a/gcc/stor-layout.c b/gcc/stor-layout.c
index a95722ac10e..237cf6926e2 100644
--- a/gcc/stor-layout.c
+++ b/gcc/stor-layout.c
@@ -30,6 +30,12 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "tm_p.h"
#include "flags.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "expr.h"
#include "diagnostic-core.h"
diff --git a/gcc/store-motion.c b/gcc/store-motion.c
index 85870f6815b..7d7c961600f 100644
--- a/gcc/store-motion.c
+++ b/gcc/store-motion.c
@@ -33,6 +33,11 @@ along with GCC; see the file COPYING3. If not see
#include "insn-config.h"
#include "recog.h"
#include "basic-block.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "expr.h"
#include "except.h"
diff --git a/gcc/symtab.c b/gcc/symtab.c
index d99546f7e98..adfa7af511a 100644
--- a/gcc/symtab.c
+++ b/gcc/symtab.c
@@ -26,6 +26,12 @@ along with GCC; see the file COPYING3. If not see
#include "tree.h"
#include "print-tree.h"
#include "varasm.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "emit-rtl.h"
#include "basic-block.h"
@@ -36,7 +42,6 @@ along with GCC; see the file COPYING3. If not see
#include "gimple.h"
#include "tree-inline.h"
#include "langhooks.h"
-#include "hashtab.h"
#include "cgraph.h"
#include "diagnostic.h"
#include "timevar.h"
diff --git a/gcc/targhooks.c b/gcc/targhooks.c
index 9f15559f57a..b6745f0ef9f 100644
--- a/gcc/targhooks.c
+++ b/gcc/targhooks.c
@@ -58,11 +58,15 @@ along with GCC; see the file COPYING3. If not see
#include "expr.h"
#include "output.h"
#include "diagnostic-core.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "target.h"
#include "tm_p.h"
#include "target-def.h"
-#include "hard-reg-set.h"
#include "regs.h"
#include "reload.h"
#include "optabs.h"
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 910840d40de..818896e698e 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-16 Andrew MacLeod <amacleod@redhat.com>
+
+ * g++.dg/plugin/pragma_plugin.c: Adjust include files.
+
2014-10-16 Martin Liska <mliska@suse.cz>
* g++.dg/ipa/ipa-icf-4.C: Correct number of equivalences set.
diff --git a/gcc/testsuite/g++.dg/plugin/pragma_plugin.c b/gcc/testsuite/g++.dg/plugin/pragma_plugin.c
index 940c302df7d..a4de7770a2a 100644
--- a/gcc/testsuite/g++.dg/plugin/pragma_plugin.c
+++ b/gcc/testsuite/g++.dg/plugin/pragma_plugin.c
@@ -8,6 +8,12 @@
#include "tm.h"
#include "rtl.h"
#include "tree.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "c-family/c-pragma.h"
#include "cpplib.h"
diff --git a/gcc/toplev.c b/gcc/toplev.c
index f7a5035fdce..7df9cc79004 100644
--- a/gcc/toplev.c
+++ b/gcc/toplev.c
@@ -43,6 +43,10 @@ along with GCC; see the file COPYING3. If not see
#include "recog.h"
#include "output.h"
#include "except.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
#include "function.h"
#include "toplev.h"
#include "expr.h"
diff --git a/gcc/trans-mem.c b/gcc/trans-mem.c
index 94d896d6f9d..4fe4579fe1f 100644
--- a/gcc/trans-mem.c
+++ b/gcc/trans-mem.c
@@ -30,6 +30,13 @@
#include "is-a.h"
#include "gimple.h"
#include "calls.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "tm.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "rtl.h"
#include "emit-rtl.h"
diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c
index ff72601b244..3e00d7417c4 100644
--- a/gcc/tree-cfg.c
+++ b/gcc/tree-cfg.c
@@ -31,6 +31,12 @@ along with GCC; see the file COPYING3. If not see
#include "tm_p.h"
#include "basic-block.h"
#include "flags.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "gimple-pretty-print.h"
#include "tree-ssa-alias.h"
diff --git a/gcc/tree-cfgcleanup.c b/gcc/tree-cfgcleanup.c
index 451630f1563..b48da5c624f 100644
--- a/gcc/tree-cfgcleanup.c
+++ b/gcc/tree-cfgcleanup.c
@@ -26,6 +26,12 @@ along with GCC; see the file COPYING3. If not see
#include "basic-block.h"
#include "diagnostic-core.h"
#include "flags.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "langhooks.h"
#include "tree-ssa-alias.h"
@@ -49,7 +55,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree-pass.h"
#include "except.h"
#include "cfgloop.h"
-#include "hashtab.h"
#include "tree-ssa-propagate.h"
#include "tree-scalar-evolution.h"
diff --git a/gcc/tree-dfa.c b/gcc/tree-dfa.c
index 9e3902841a9..b7309e83edf 100644
--- a/gcc/tree-dfa.c
+++ b/gcc/tree-dfa.c
@@ -29,6 +29,11 @@ along with GCC; see the file COPYING3. If not see
#include "basic-block.h"
#include "langhooks.h"
#include "flags.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "tree-pretty-print.h"
#include "tree-ssa-alias.h"
diff --git a/gcc/tree-eh.c b/gcc/tree-eh.c
index 6cfdcce6ec9..d452cf9ba73 100644
--- a/gcc/tree-eh.c
+++ b/gcc/tree-eh.c
@@ -26,9 +26,14 @@ along with GCC; see the file COPYING3. If not see
#include "expr.h"
#include "calls.h"
#include "flags.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "except.h"
-#include "hash-set.h"
#include "basic-block.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c
index a817989200e..2d6fbd69319 100644
--- a/gcc/tree-inline.c
+++ b/gcc/tree-inline.c
@@ -57,6 +57,10 @@ along with GCC; see the file COPYING3. If not see
#include "expr.h"
#include "tree-dfa.h"
#include "tree-ssa.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
#include "function.h"
#include "tree-pretty-print.h"
#include "except.h"
diff --git a/gcc/tree-into-ssa.c b/gcc/tree-into-ssa.c
index f1983f1ac73..369286fbc2b 100644
--- a/gcc/tree-into-ssa.c
+++ b/gcc/tree-into-ssa.c
@@ -27,6 +27,12 @@ along with GCC; see the file COPYING3. If not see
#include "tm_p.h"
#include "langhooks.h"
#include "basic-block.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "gimple-pretty-print.h"
#include "hash-table.h"
diff --git a/gcc/tree-nested.c b/gcc/tree-nested.c
index a378a02196d..ce06c45d938 100644
--- a/gcc/tree-nested.c
+++ b/gcc/tree-nested.c
@@ -25,6 +25,12 @@
#include "stringpool.h"
#include "stor-layout.h"
#include "tm_p.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "tree-dump.h"
#include "tree-inline.h"
diff --git a/gcc/tree-nrv.c b/gcc/tree-nrv.c
index 02a4af9e681..944ec8f0c64 100644
--- a/gcc/tree-nrv.c
+++ b/gcc/tree-nrv.c
@@ -22,6 +22,12 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "tree.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "basic-block.h"
#include "tree-pretty-print.h"
diff --git a/gcc/tree-profile.c b/gcc/tree-profile.c
index 48d13a22d34..c25626c60aa 100644
--- a/gcc/tree-profile.c
+++ b/gcc/tree-profile.c
@@ -29,6 +29,12 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "flags.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "basic-block.h"
#include "diagnostic-core.h"
diff --git a/gcc/tree-ssa-alias.c b/gcc/tree-ssa-alias.c
index 1bf88e29548..5a14ff9e8fd 100644
--- a/gcc/tree-ssa-alias.c
+++ b/gcc/tree-ssa-alias.c
@@ -29,6 +29,12 @@ along with GCC; see the file COPYING3. If not see
#include "timevar.h" /* for TV_ALIAS_STMT_WALK */
#include "langhooks.h"
#include "flags.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "tree-pretty-print.h"
#include "dumpfile.h"
diff --git a/gcc/tree-ssa-ccp.c b/gcc/tree-ssa-ccp.c
index ce23019058d..325a9f05a8a 100644
--- a/gcc/tree-ssa-ccp.c
+++ b/gcc/tree-ssa-ccp.c
@@ -127,6 +127,12 @@ along with GCC; see the file COPYING3. If not see
#include "flags.h"
#include "tm_p.h"
#include "basic-block.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "gimple-pretty-print.h"
#include "hash-table.h"
diff --git a/gcc/tree-ssa-copy.c b/gcc/tree-ssa-copy.c
index 3bbbb67ce08..26824336278 100644
--- a/gcc/tree-ssa-copy.c
+++ b/gcc/tree-ssa-copy.c
@@ -25,6 +25,12 @@ along with GCC; see the file COPYING3. If not see
#include "flags.h"
#include "tm_p.h"
#include "basic-block.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "gimple-pretty-print.h"
#include "tree-ssa-alias.h"
diff --git a/gcc/tree-ssa-copyrename.c b/gcc/tree-ssa-copyrename.c
index 441238166cd..b4e698de0af 100644
--- a/gcc/tree-ssa-copyrename.c
+++ b/gcc/tree-ssa-copyrename.c
@@ -31,6 +31,12 @@ along with GCC; see the file COPYING3. If not see
#include "gimple.h"
#include "gimple-iterator.h"
#include "flags.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "tree-pretty-print.h"
#include "bitmap.h"
@@ -40,7 +46,6 @@ along with GCC; see the file COPYING3. If not see
#include "expr.h"
#include "tree-dfa.h"
#include "tree-inline.h"
-#include "hashtab.h"
#include "tree-ssa-live.h"
#include "tree-pass.h"
#include "langhooks.h"
diff --git a/gcc/tree-ssa-dom.c b/gcc/tree-ssa-dom.c
index fec386e3152..eb62f567d03 100644
--- a/gcc/tree-ssa-dom.c
+++ b/gcc/tree-ssa-dom.c
@@ -30,6 +30,12 @@ along with GCC; see the file COPYING3. If not see
#include "basic-block.h"
#include "cfgloop.h"
#include "inchash.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "gimple-pretty-print.h"
#include "tree-ssa-alias.h"
diff --git a/gcc/tree-ssa-operands.c b/gcc/tree-ssa-operands.c
index a7ccf04bea9..c068a65c23c 100644
--- a/gcc/tree-ssa-operands.c
+++ b/gcc/tree-ssa-operands.c
@@ -25,6 +25,12 @@ along with GCC; see the file COPYING3. If not see
#include "stmt.h"
#include "print-tree.h"
#include "flags.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "gimple-pretty-print.h"
#include "bitmap.h"
diff --git a/gcc/tree-ssa-propagate.c b/gcc/tree-ssa-propagate.c
index 2e337e428c6..c62749a1623 100644
--- a/gcc/tree-ssa-propagate.c
+++ b/gcc/tree-ssa-propagate.c
@@ -26,6 +26,12 @@
#include "flags.h"
#include "tm_p.h"
#include "basic-block.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "gimple-pretty-print.h"
#include "dumpfile.h"
diff --git a/gcc/tree-ssa-structalias.c b/gcc/tree-ssa-structalias.c
index 01690872b9d..78e166645a5 100644
--- a/gcc/tree-ssa-structalias.c
+++ b/gcc/tree-ssa-structalias.c
@@ -46,6 +46,12 @@
#include "tree-dfa.h"
#include "tree-inline.h"
#include "diagnostic-core.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "tree-pass.h"
#include "alloc-pool.h"
diff --git a/gcc/tree-ssa-tail-merge.c b/gcc/tree-ssa-tail-merge.c
index 37181bd6c74..b61711b67f7 100644
--- a/gcc/tree-ssa-tail-merge.c
+++ b/gcc/tree-ssa-tail-merge.c
@@ -196,6 +196,12 @@ along with GCC; see the file COPYING3. If not see
#include "tm_p.h"
#include "basic-block.h"
#include "flags.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "hash-table.h"
#include "tree-ssa-alias.h"
diff --git a/gcc/tree-ssa-threadedge.c b/gcc/tree-ssa-threadedge.c
index 3dee5badf4f..31ba4419abc 100644
--- a/gcc/tree-ssa-threadedge.c
+++ b/gcc/tree-ssa-threadedge.c
@@ -27,10 +27,15 @@ along with GCC; see the file COPYING3. If not see
#include "tm_p.h"
#include "basic-block.h"
#include "cfgloop.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "timevar.h"
#include "dumpfile.h"
-#include "hash-set.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-expr.h"
diff --git a/gcc/tree-ssa-threadupdate.c b/gcc/tree-ssa-threadupdate.c
index 2be3ab2edf7..d2cf4de3c6a 100644
--- a/gcc/tree-ssa-threadupdate.c
+++ b/gcc/tree-ssa-threadupdate.c
@@ -23,6 +23,13 @@ along with GCC; see the file COPYING3. If not see
#include "tree.h"
#include "flags.h"
#include "basic-block.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "tm.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "hash-table.h"
#include "tree-ssa-alias.h"
diff --git a/gcc/tree-ssa-uncprop.c b/gcc/tree-ssa-uncprop.c
index a4c61bda189..8ea1d456817 100644
--- a/gcc/tree-ssa-uncprop.c
+++ b/gcc/tree-ssa-uncprop.c
@@ -26,6 +26,12 @@ along with GCC; see the file COPYING3. If not see
#include "flags.h"
#include "tm_p.h"
#include "basic-block.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "hash-table.h"
#include "hash-map.h"
diff --git a/gcc/tree-ssa-uninit.c b/gcc/tree-ssa-uninit.c
index 3b38fd480d3..be93d5fd318 100644
--- a/gcc/tree-ssa-uninit.c
+++ b/gcc/tree-ssa-uninit.c
@@ -26,10 +26,15 @@ along with GCC; see the file COPYING3. If not see
#include "flags.h"
#include "tm_p.h"
#include "basic-block.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "gimple-pretty-print.h"
#include "bitmap.h"
-#include "hash-set.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-expr.h"
@@ -41,7 +46,6 @@ along with GCC; see the file COPYING3. If not see
#include "ssa-iterators.h"
#include "tree-ssa.h"
#include "tree-inline.h"
-#include "hashtab.h"
#include "tree-pass.h"
#include "diagnostic-core.h"
#include "params.h"
diff --git a/gcc/tree-ssa.c b/gcc/tree-ssa.c
index f05db176f9b..bf590d2fdff 100644
--- a/gcc/tree-ssa.c
+++ b/gcc/tree-ssa.c
@@ -28,6 +28,12 @@ along with GCC; see the file COPYING3. If not see
#include "target.h"
#include "langhooks.h"
#include "basic-block.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "gimple-pretty-print.h"
#include "tree-ssa-alias.h"
@@ -49,7 +55,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree-ssa.h"
#include "tree-inline.h"
#include "hash-map.h"
-#include "hashtab.h"
#include "tree-pass.h"
#include "diagnostic-core.h"
#include "cfgloop.h"
diff --git a/gcc/tree-stdarg.c b/gcc/tree-stdarg.c
index a9d0a48cc81..883b3b5c6f5 100644
--- a/gcc/tree-stdarg.c
+++ b/gcc/tree-stdarg.c
@@ -23,6 +23,12 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "tree.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "langhooks.h"
#include "gimple-pretty-print.h"
diff --git a/gcc/tree-tailcall.c b/gcc/tree-tailcall.c
index 9e98968a671..9e54a466cb8 100644
--- a/gcc/tree-tailcall.c
+++ b/gcc/tree-tailcall.c
@@ -25,6 +25,12 @@ along with GCC; see the file COPYING3. If not see
#include "stor-layout.h"
#include "tm_p.h"
#include "basic-block.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
diff --git a/gcc/tree.c b/gcc/tree.c
index e7032065da0..fbe35d8cc9c 100644
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -38,10 +38,15 @@ along with GCC; see the file COPYING3. If not see
#include "attribs.h"
#include "varasm.h"
#include "tm_p.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "obstack.h"
#include "toplev.h" /* get_random_seed */
-#include "hashtab.h"
#include "inchash.h"
#include "filenames.h"
#include "output.h"
diff --git a/gcc/tsan.c b/gcc/tsan.c
index 5384806c43f..1ba0cbc7216 100644
--- a/gcc/tsan.c
+++ b/gcc/tsan.c
@@ -34,6 +34,12 @@ along with GCC; see the file COPYING3. If not see
#include "gimple.h"
#include "gimplify.h"
#include "gimple-iterator.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "gimple-ssa.h"
#include "cgraph.h"
diff --git a/gcc/valtrack.c b/gcc/valtrack.c
index a3d00e21130..58e7669fa21 100644
--- a/gcc/valtrack.c
+++ b/gcc/valtrack.c
@@ -25,6 +25,12 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "rtl.h"
#include "valtrack.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "regs.h"
#include "emit-rtl.h"
diff --git a/gcc/varasm.c b/gcc/varasm.c
index abb743b6b83..899265c7a8f 100644
--- a/gcc/varasm.c
+++ b/gcc/varasm.c
@@ -35,13 +35,17 @@ along with GCC; see the file COPYING3. If not see
#include "stringpool.h"
#include "varasm.h"
#include "flags.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "expr.h"
-#include "hard-reg-set.h"
#include "regs.h"
#include "output.h"
#include "diagnostic-core.h"
-#include "hashtab.h"
#include "ggc.h"
#include "langhooks.h"
#include "tm_p.h"
@@ -50,7 +54,6 @@ along with GCC; see the file COPYING3. If not see
#include "common/common-target.h"
#include "targhooks.h"
#include "cgraph.h"
-#include "hash-set.h"
#include "asan.h"
#include "basic-block.h"
#include "rtl-iter.h"
diff --git a/gcc/varasm.h b/gcc/varasm.h
index aa9d47a5a65..8c5e6216c6a 100644
--- a/gcc/varasm.h
+++ b/gcc/varasm.h
@@ -66,4 +66,6 @@ extern bool initializer_constant_valid_for_bitfield_p (tree);
evaluate the property while walking a constructor for other purposes. */
extern bool constructor_static_from_elts_p (const_tree);
+extern void init_varasm_status (void);
+
#endif // GCC_VARASM_H
diff --git a/gcc/vmsdbgout.c b/gcc/vmsdbgout.c
index 463a4182622..f2734ca5fd2 100644
--- a/gcc/vmsdbgout.c
+++ b/gcc/vmsdbgout.c
@@ -34,6 +34,12 @@ along with GCC; see the file COPYING3. If not see
#include "vmsdbg.h"
#include "debug.h"
#include "langhooks.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
#include "function.h"
#include "target.h"
diff --git a/gcc/web.c b/gcc/web.c
index 58f38318542..90da6c90a75 100644
--- a/gcc/web.c
+++ b/gcc/web.c
@@ -45,6 +45,11 @@ along with GCC; see the file COPYING3. If not see
#include "obstack.h"
#include "basic-block.h"
#include "df.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "input.h"
#include "function.h"
#include "insn-config.h"
#include "recog.h"