diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index dd9b1b692f2270b51a8b4d2043cc5f623f9b33a6..56cbc5f5040b6941ca7b5e60c1b46426103014bd 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,236 @@
+2015-07-10 Andrew MacLeod <amacleod@redhat.com>
+
+ * gimple-predict.h: New file.
+ (gimple_predict_predictor, gimple_predict_set_predictor,
+ gimple_predict_outcome, gimple_predict_set_outcome,
+ gimple_build_predict): Relocate here.
+ * gimple.h (gimple_predict_predictor, gimple_predict_set_predictor,
+ gimple_predict_outcome, gimple_predict_set_outcome): Move to
+ gimple-predict.h.
+ * gimple.c (gimple_build_predict): Move to gimple-predict.h
+ * basic-block.h: Don't include cfghooks.h.
+ * backend.h: Don't include predict.h.
+ * cfghooks.h: Include predict.h.
+ * gimple-pretty-print.c: Include gimple-predict.h.
+ * gimplify.c: Likwise.
+ * predict.c: Adjust includes.
+ * tree-inline.c: Likewise.
+ * asan.c: Likewise.
+ * auto-inc-dec.c: Likewise.
+ * auto-profile.c: Likewise.
+ * bb-reorder.c: Likewise.
+ * builtins.c: Likewise.
+ * caller-save.c: Likewise.
+ * calls.c: Likewise.
+ * cfganal.c: Likewise.
+ * cfgbuild.c: Likewise.
+ * cfg.c: Likewise.
+ * cfgcleanup.c: Likewise.
+ * cfgexpand.c: Likewise.
+ * cfghooks.c: Likewise.
+ * cfgloopanal.c: Likewise.
+ * cfgloop.c: Likewise.
+ * cfgloopmanip.c: Likewise.
+ * cfgrtl.c: Likewise.
+ * cgraph.c: Likewise.
+ * cgraphunit.c: Likewise.
+ * combine.c: Likewise.
+ * cprop.c: Likewise.
+ * cse.c: Likewise.
+ * dce.c: Likewise.
+ * dojump.c: Likewise.
+ * dse.c: Likewise.
+ * except.c: Likewise.
+ * expmed.c: Likewise.
+ * expr.c: Likewise.
+ * final.c: Likewise.
+ * fold-const.c: Likewise.
+ * function.c: Likewise.
+ * fwprop.c: Likewise.
+ * gcc-plugin.h: Likewise.
+ * gcse.c: Likewise.
+ * genattrtab.c: Likewise.
+ * genemit.c: Likewise.
+ * gengtype.c: Likewise.
+ * genopinit.c: Likewise.
+ * genoutput.c: Likewise.
+ * genpreds.c: Likewise.
+ * genrecog.c: Likewise.
+ * gimple-fold.c: Likewise.
+ * gimple-iterator.c: Likewise.
+ * gimple-ssa-isolate-paths.c: Likewise.
+ * gimple-ssa-strength-reduction.c: Likewise.
+ * graph.c: Likewise.
+ * graphite-blocking.c: Likewise.
+ * graphite.c: Likewise.
+ * graphite-dependences.c: Likewise.
+ * graphite-interchange.c: Likewise.
+ * graphite-isl-ast-to-gimple.c: Likewise.
+ * graphite-optimize-isl.c: Likewise.
+ * graphite-poly.c: Likewise.
+ * graphite-scop-detection.c: Likewise.
+ * graphite-sese-to-poly.c: Likewise.
+ * haifa-sched.c: Likewise.
+ * ifcvt.c: Likewise.
+ * internal-fn.c: Likewise.
+ * ipa-cp.c: Likewise.
+ * ipa-profile.c: Likewise.
+ * ipa-split.c: Likewise.
+ * ipa-utils.c: Likewise.
+ * ira-build.c: Likewise.
+ * ira-color.c: Likewise.
+ * ira-conflicts.c: Likewise.
+ * ira-costs.c: Likewise.
+ * ira-emit.c: Likewise.
+ * ira-lives.c: Likewise.
+ * jump.c: Likewise.
+ * loop-doloop.c: Likewise.
+ * loop-init.c: Likewise.
+ * loop-invariant.c: Likewise.
+ * loop-unroll.c: Likewise.
+ * lower-subreg.c: Likewise.
+ * lra-assigns.c: Likewise.
+ * lra.c: Likewise.
+ * lra-coalesce.c: Likewise.
+ * lra-constraints.c: Likewise.
+ * lra-lives.c: Likewise.
+ * lto-cgraph.c: Likewise.
+ * lto-streamer-in.c: Likewise.
+ * mode-switching.c: Likewise.
+ * modulo-sched.c: Likewise.
+ * omp-low.c: Likewise.
+ * optabs.c: Likewise.
+ * passes.c: Likewise.
+ * postreload.c: Likewise.
+ * postreload-gcse.c: Likewise.
+ * profile.c: Likewise.
+ * recog.c: Likewise.
+ * regstat.c: Likewise.
+ * reload1.c: Likewise.
+ * reorg.c: Likewise.
+ * rtlanal.c: Likewise.
+ * sched-ebb.c: Likewise.
+ * sel-sched-ir.c: Likewise.
+ * sese.c: Likewise.
+ * shrink-wrap.c: Likewise.
+ * simplify-rtx.c: Likewise.
+ * stmt.c: Likewise.
+ * store-motion.c: Likewise.
+ * tracer.c: Likewise.
+ * trans-mem.c: Likewise.
+ * tree-call-cdce.c: Likewise.
+ * tree-cfg.c: Likewise.
+ * tree-cfgcleanup.c: Likewise.
+ * tree-chkp.c: Likewise.
+ * tree-complex.c: Likewise.
+ * tree-eh.c: Likewise.
+ * tree-if-conv.c: Likewise.
+ * tree-loop-distribution.c: Likewise.
+ * tree-outof-ssa.c: Likewise.
+ * tree-parloops.c: Likewise.
+ * tree-predcom.c: Likewise.
+ * tree-pretty-print.c: Likewise.
+ * tree-profile.c: Likewise.
+ * tree-sra.c: Likewise.
+ * tree-ssa.c: Likewise.
+ * tree-ssa-coalesce.c: Likewise.
+ * tree-ssa-dce.c: Likewise.
+ * tree-ssa-dom.c: Likewise.
+ * tree-ssa-forwprop.c: Likewise.
+ * tree-ssa-ifcombine.c: Likewise.
+ * tree-ssa-loop-ch.c: Likewise.
+ * tree-ssa-loop-im.c: Likewise.
+ * tree-ssa-loop-ivcanon.c: Likewise.
+ * tree-ssa-loop-ivopts.c: Likewise.
+ * tree-ssa-loop-manip.c: Likewise.
+ * tree-ssa-loop-prefetch.c: Likewise.
+ * tree-ssa-loop-unswitch.c: Likewise.
+ * tree-ssa-math-opts.c: Likewise.
+ * tree-ssa-phiopt.c: Likewise.
+ * tree-ssa-pre.c: Likewise.
+ * tree-ssa-reassoc.c: Likewise.
+ * tree-ssa-sink.c: Likewise.
+ * tree-ssa-tail-merge.c: Likewise.
+ * tree-ssa-threadedge.c: Likewise.
+ * tree-ssa-threadupdate.c: Likewise.
+ * tree-switch-conversion.c: Likewise.
+ * tree-tailcall.c: Likewise.
+ * tree-vect-data-refs.c: Likewise.
+ * tree-vect-loop.c: Likewise.
+ * tree-vect-loop-manip.c: Likewise.
+ * tree-vectorizer.c: Likewise.
+ * tree-vrp.c: Likewise.
+ * ubsan.c: Likewise.
+ * value-prof.c: Likewise.
+ * varasm.c: Likewise.
+ * var-tracking.c: Likewise.
+ * config/aarch64/aarch64-builtins.c: Likewise.
+ * config/aarch64/aarch64.c: Likewise.
+ * config/aarch64/cortex-a57-fma-steering.c: Likewise.
+ * config/alpha/alpha.c: Likewise.
+ * config/arc/arc.c: Likewise.
+ * config/arm/arm.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/darwin-c.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/ft32/ft32.c: Likewise.
+ * config/h8300/h8300.c: Likewise.
+ * config/i386/i386.c: Likewise.
+ * config/i386/winnt.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.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.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/nios2/nios2.c: Likewise.
+ * config/nvptx/nvptx.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/sh/sh.c: Likewise.
+ * config/sh/sh-mem.cc: Likewise.
+ * config/sh/sh_optimize_sett_clrt.cc: Likewise.
+ * config/sh/sh_treg_combine.cc: 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/visium/visium.c: Likewise.
+ * config/xtensa/xtensa.c: Likewise.
+
2015-07-10 Richard Biener <rguenther@suse.de>
* genmatch.c (dt_node::gen_kids_1): Fix indenting of
diff --git a/gcc/asan.c b/gcc/asan.c
index 1caeb32497d941643a093c9e8649f5afdcf043aa..f375b72d1d5eb41a1f3168e03ee577eee3e0fbb0 100644
--- a/gcc/asan.c
+++ b/gcc/asan.c
@@ -24,6 +24,7 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "alias.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "rtl.h"
diff --git a/gcc/auto-inc-dec.c b/gcc/auto-inc-dec.c
index f0c9ca3f98299e9122e8467b633004d3d83cdd85..3b9a1f360fb24bd64fdb430e5e020d0767699853 100644
--- a/gcc/auto-inc-dec.c
+++ b/gcc/auto-inc-dec.c
@@ -22,6 +22,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "predict.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/auto-profile.c b/gcc/auto-profile.c
index 33f5632f9ea201c63b29f708efbe3b56f860706f..fa0cd07f573f3dc551bae421ce2a5174512614a9 100644
--- a/gcc/auto-profile.c
+++ b/gcc/auto-profile.c
@@ -28,6 +28,7 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "alias.h"
#include "backend.h"
+#include "predict.h"
#include "tree.h"
#include "gimple.h"
#include "hard-reg-set.h"
diff --git a/gcc/backend.h b/gcc/backend.h
index 4066376c3a2bfc3fbdee942435605a37581adf28..a48966054c61ce622a93bf822fa9b6491fe4fadb 100644
--- a/gcc/backend.h
+++ b/gcc/backend.h
@@ -29,7 +29,6 @@ along with GCC; see the file COPYING3. If not see
#include "function.h"
#include "bitmap.h"
#include "sbitmap.h"
-#include "predict.h"
#include "basic-block.h"
#include "cfg.h"
diff --git a/gcc/basic-block.h b/gcc/basic-block.h
index f28fa578f5a30b9c62a6960cd18fbf3c9e2d4cae..67555b2392c6cba403a526c934d16294feeae153 100644
--- a/gcc/basic-block.h
+++ b/gcc/basic-block.h
@@ -519,8 +519,6 @@ ei_cond (edge_iterator ei, edge *p)
#define CLEANUP_CFGLAYOUT 32 /* Do cleanup in cfglayout mode. */
#define CLEANUP_CFG_CHANGED 64 /* The caller changed the CFG. */
-#include "cfghooks.h"
-
/* Return true if BB is in a transaction. */
static inline bool
diff --git a/gcc/bb-reorder.c b/gcc/bb-reorder.c
index cb421438f31558895725a47e7fd1415d5925ca56..2af1d5441b4e7d777d2a085e6e5b5244d1c7cac0 100644
--- a/gcc/bb-reorder.c
+++ b/gcc/bb-reorder.c
@@ -82,6 +82,7 @@
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/builtins.c b/gcc/builtins.c
index 4bdf2782a5c11962bb13659169aa32c09c7eff16..e24c12a9850415630d19a6a831f7c3fcca474c1c 100644
--- a/gcc/builtins.c
+++ b/gcc/builtins.c
@@ -21,6 +21,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "predict.h"
#include "tree.h"
#include "gimple.h"
#include "rtl.h"
diff --git a/gcc/caller-save.c b/gcc/caller-save.c
index 1526e03c15da2b56c6bcb71711464bffa65d85dc..0bc0681f3a1953d700fe22beeee9d2a984005458 100644
--- a/gcc/caller-save.c
+++ b/gcc/caller-save.c
@@ -21,6 +21,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "predict.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/calls.c b/gcc/calls.c
index a79825a44e8a3ba7ff246badc2dfde7c5ef51005..f7184e2c88cf570fc7af459235c46a6e4d685955 100644
--- a/gcc/calls.c
+++ b/gcc/calls.c
@@ -21,6 +21,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "predict.h"
#include "tree.h"
#include "gimple.h"
#include "rtl.h"
diff --git a/gcc/cfg.c b/gcc/cfg.c
index 8c2723ee0becd802c76f4ec7a8bee36d1add9e12..cbc351bb583ea1f7add56e98d38b565bc9ee0a48 100644
--- a/gcc/cfg.c
+++ b/gcc/cfg.c
@@ -53,6 +53,7 @@ along with GCC; see the file COPYING3. If not see
#include "alloc-pool.h"
#include "alias.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "hard-reg-set.h"
#include "df.h"
diff --git a/gcc/cfganal.c b/gcc/cfganal.c
index 22cfd280c61021a39c639fa81afd5ad184d23bfd..7676bd8d6ccaa1d8a4c19d0de5464eb29c6acaf6 100644
--- a/gcc/cfganal.c
+++ b/gcc/cfganal.c
@@ -23,6 +23,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "hard-reg-set.h"
#include "cfganal.h"
#include "timevar.h"
diff --git a/gcc/cfgbuild.c b/gcc/cfgbuild.c
index 236b84dc445925d4fba7e1b5449ff0a168faf898..797a60e45af04332ec93440cc4a3dbf122ccea27 100644
--- a/gcc/cfgbuild.c
+++ b/gcc/cfgbuild.c
@@ -22,6 +22,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "alias.h"
#include "tree.h"
#include "rtl.h"
diff --git a/gcc/cfgcleanup.c b/gcc/cfgcleanup.c
index 0183ca888fcb9733a94854daa6560eb72283cc2b..7e576bce39b9e27f2c2ff20fe19b6ee03ca83b20 100644
--- a/gcc/cfgcleanup.c
+++ b/gcc/cfgcleanup.c
@@ -33,6 +33,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/cfgexpand.c b/gcc/cfgexpand.c
index 777816aa61865b98fb1c9ffe0f3ad976d2e526a5..a047632ef75b7803e5d8d5168b257006cddb1053 100644
--- a/gcc/cfgexpand.c
+++ b/gcc/cfgexpand.c
@@ -21,6 +21,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "rtl.h"
diff --git a/gcc/cfghooks.c b/gcc/cfghooks.c
index 285ec3d291fed727fb8e239c682db74b4871f908..2cfdcfca5763b6f8c0d777f5c8d7cfbddbaf6b19 100644
--- a/gcc/cfghooks.c
+++ b/gcc/cfghooks.c
@@ -23,6 +23,7 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "dumpfile.h"
#include "backend.h"
+#include "cfghooks.h"
#include "alias.h"
#include "tree.h"
#include "rtl.h"
diff --git a/gcc/cfghooks.h b/gcc/cfghooks.h
index a8fbe5d8d303ba53859731d5ed404d502fb2a591..a33ee63b58f059b5b36a539b2c7eed4fdad25785 100644
--- a/gcc/cfghooks.h
+++ b/gcc/cfghooks.h
@@ -21,7 +21,7 @@ along with GCC; see the file COPYING3. If not see
#ifndef GCC_CFGHOOKS_H
#define GCC_CFGHOOKS_H
-/* Only basic-block.h includes this. */
+#include "predict.h"
/* Structure to gather statistic about profile consistency, per pass.
An array of this structure, indexed by pass static number, is allocated
diff --git a/gcc/cfgloop.c b/gcc/cfgloop.c
index 6d42206edca269935109084fc942eee0d4cb534f..b8a1244aaa652c4076864788c1b8c89ea5516d69 100644
--- a/gcc/cfgloop.c
+++ b/gcc/cfgloop.c
@@ -21,6 +21,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "rtl.h"
diff --git a/gcc/cfgloopanal.c b/gcc/cfgloopanal.c
index 575ae7a4905cc1d05690a99209ba63aefd759482..952a323bd4e23f7ff62e486299c7041e357a96b4 100644
--- a/gcc/cfgloopanal.c
+++ b/gcc/cfgloopanal.c
@@ -21,6 +21,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "predict.h"
#include "rtl.h"
#include "obstack.h"
#include "cfgloop.h"
diff --git a/gcc/cfgloopmanip.c b/gcc/cfgloopmanip.c
index b665f1a77760b390fc53c4f665f6cd210aaeaa3f..7d142aef2b6cc0a2534fbade13c7bde599319acd 100644
--- a/gcc/cfgloopmanip.c
+++ b/gcc/cfgloopmanip.c
@@ -21,6 +21,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "rtl.h"
diff --git a/gcc/cfgrtl.c b/gcc/cfgrtl.c
index cebec20382ed3a993bac9717e934cbb45f57c70f..c1dc7d35263c599d4ff8ca133338f3942a22254a 100644
--- a/gcc/cfgrtl.c
+++ b/gcc/cfgrtl.c
@@ -41,6 +41,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/cgraph.c b/gcc/cgraph.c
index d13bcd3a645b6fbb9615ad6db3dc47282f61818f..58e14baae0ff0f9e1379d952e2800b19e3b97c99 100644
--- a/gcc/cgraph.c
+++ b/gcc/cgraph.c
@@ -27,6 +27,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "predict.h"
#include "tree.h"
#include "gimple.h"
#include "rtl.h"
diff --git a/gcc/cgraphunit.c b/gcc/cgraphunit.c
index 0082191f86e32f07adf69465e1bf010968f5f3c2..a95ce9ee1fc1e48cde9784f7b674b25f0af50655 100644
--- a/gcc/cgraphunit.c
+++ b/gcc/cgraphunit.c
@@ -161,6 +161,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "rtl.h"
diff --git a/gcc/combine.c b/gcc/combine.c
index e4e1d3ab6565195bc5481ddbaadaf4dc4599ddfc..1ed49e36be8a49ad5eae15399e81d4b360a9718d 100644
--- a/gcc/combine.c
+++ b/gcc/combine.c
@@ -79,6 +79,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "predict.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/config/aarch64/aarch64-builtins.c b/gcc/config/aarch64/aarch64-builtins.c
index b6c89b91a8f86e437c8eb4baa0e4b598c440f3ff..294bf9d906b545e86d7dafc7ef29acae7a925834 100644
--- a/gcc/config/aarch64/aarch64-builtins.c
+++ b/gcc/config/aarch64/aarch64-builtins.c
@@ -23,7 +23,7 @@
#include "coretypes.h"
#include "tm.h"
#include "function.h"
-#include "predict.h"
+#include "cfghooks.h"
#include "basic-block.h"
#include "cfg.h"
#include "tree.h"
diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c
index 6c13a07862b71d9b3dbb2219f124476698847f7d..f382591dcd960c3504466bed322b1203857bc5d2 100644
--- a/gcc/config/aarch64/aarch64.c
+++ b/gcc/config/aarch64/aarch64.c
@@ -22,6 +22,7 @@
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "rtl.h"
diff --git a/gcc/config/aarch64/cortex-a57-fma-steering.c b/gcc/config/aarch64/cortex-a57-fma-steering.c
index 093c0e389cbae47ae856cd96815474baf80599d8..3744a9ea2a409c2194650a99f8c7a23636d8674f 100644
--- a/gcc/config/aarch64/cortex-a57-fma-steering.c
+++ b/gcc/config/aarch64/cortex-a57-fma-steering.c
@@ -22,6 +22,7 @@
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "rtl.h"
#include "df.h"
#include "regs.h"
diff --git a/gcc/config/alpha/alpha.c b/gcc/config/alpha/alpha.c
index dbd4a82aee7fdd640ce3160fec1d95c087a1de60..9919dd9cdea767e6f838b4efdf0e3752524df76a 100644
--- a/gcc/config/alpha/alpha.c
+++ b/gcc/config/alpha/alpha.c
@@ -23,6 +23,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "rtl.h"
diff --git a/gcc/config/arc/arc.c b/gcc/config/arc/arc.c
index ca2ac4d48c96e77b0886d63f948d0dd96e097b21..b5b644c5eb19150f1c9a1b4db90044694ffecba9 100644
--- a/gcc/config/arc/arc.c
+++ b/gcc/config/arc/arc.c
@@ -32,6 +32,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
index 16bda3b2ed8a074daa14bd3ff45505ed46808512..4d60a32ed75f8d9497c6fb8775de7d8177149233 100644
--- a/gcc/config/arm/arm.c
+++ b/gcc/config/arm/arm.c
@@ -24,6 +24,7 @@
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/config/avr/avr.c b/gcc/config/avr/avr.c
index a4564612586f803f9c8efc02ccdf485c0b3302f4..2434f58c947b08a2a97516bbe64470cdefc99c16 100644
--- a/gcc/config/avr/avr.c
+++ b/gcc/config/avr/avr.c
@@ -22,6 +22,7 @@
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/config/bfin/bfin.c b/gcc/config/bfin/bfin.c
index ea3e6679cb309ce0756c2bd9f243cd5109d5c2b2..a1310538ad0ce53335289fd17456c703be11c00d 100644
--- a/gcc/config/bfin/bfin.c
+++ b/gcc/config/bfin/bfin.c
@@ -22,6 +22,7 @@
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/config/c6x/c6x.c b/gcc/config/c6x/c6x.c
index 936161c3d166efa8ad2a66b745669c01e28b8d4b..1337c954d2217f39123f78d6090954b24d298188 100644
--- a/gcc/config/c6x/c6x.c
+++ b/gcc/config/c6x/c6x.c
@@ -23,6 +23,7 @@
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/config/cr16/cr16.c b/gcc/config/cr16/cr16.c
index 47d8c77cc340303e3af7340eadcb214e00984898..8185b59b2822144212fb4602684eac426ab24b94 100644
--- a/gcc/config/cr16/cr16.c
+++ b/gcc/config/cr16/cr16.c
@@ -22,6 +22,7 @@
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/config/cris/cris.c b/gcc/config/cris/cris.c
index b7fa1e627ca1ec6df4198cc895003023f0ca151b..70f34424e1859c8df4fbf5d141138b80883ab2a4 100644
--- a/gcc/config/cris/cris.c
+++ b/gcc/config/cris/cris.c
@@ -22,6 +22,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/config/darwin-c.c b/gcc/config/darwin-c.c
index 19f4404a6018375123df18fd53eac060930f4023..144d8af29382dc9c4c3d3afd4ca1bf869e7813f4 100644
--- a/gcc/config/darwin-c.c
+++ b/gcc/config/darwin-c.c
@@ -37,7 +37,7 @@ along with GCC; see the file COPYING3. If not see
#include "prefix.h"
#include "c-family/c-target.h"
#include "c-family/c-target-def.h"
-#include "predict.h"
+#include "cfghooks.h"
#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
diff --git a/gcc/config/darwin.c b/gcc/config/darwin.c
index 3e1ae5216cb8f742572894f95d6a5065011be4fa..0c5004396fea7d55424b51c1588b994ac9e67d60 100644
--- a/gcc/config/darwin.c
+++ b/gcc/config/darwin.c
@@ -22,6 +22,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "rtl.h"
diff --git a/gcc/config/epiphany/epiphany.c b/gcc/config/epiphany/epiphany.c
index 692fc7476faf10815f5e7df080b5c43e44f63764..f5aca81a8e98ead4e99eb9116407f4d269b86586 100644
--- a/gcc/config/epiphany/epiphany.c
+++ b/gcc/config/epiphany/epiphany.c
@@ -22,6 +22,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/config/epiphany/mode-switch-use.c b/gcc/config/epiphany/mode-switch-use.c
index f0657450aaa197322597d7d9ebaf328324099e32..e6d3dce29874f9b1533c5c84aa3b9439a239b09a 100644
--- a/gcc/config/epiphany/mode-switch-use.c
+++ b/gcc/config/epiphany/mode-switch-use.c
@@ -23,6 +23,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "rtl.h"
#include "df.h"
#include "emit-rtl.h"
diff --git a/gcc/config/epiphany/resolve-sw-modes.c b/gcc/config/epiphany/resolve-sw-modes.c
index 34ed2f599f565c329b573c01b6b2035b6b191de2..de3204e52238d112366f9384a62d2a7d258985aa 100644
--- a/gcc/config/epiphany/resolve-sw-modes.c
+++ b/gcc/config/epiphany/resolve-sw-modes.c
@@ -22,6 +22,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "rtl.h"
#include "df.h"
#include "tm_p.h"
diff --git a/gcc/config/fr30/fr30.c b/gcc/config/fr30/fr30.c
index e96c62131a11cce60a2c675671c1e587b7a4b02c..a347e9912e6fca53b443f965664aa698cb495bb7 100644
--- a/gcc/config/fr30/fr30.c
+++ b/gcc/config/fr30/fr30.c
@@ -24,6 +24,7 @@
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/config/frv/frv.c b/gcc/config/frv/frv.c
index 9be5d3f619c83dc06e5d57219390c07342fd3b6e..831f78a57c85863ddfaf245d8eefe00295a0cf4c 100644
--- a/gcc/config/frv/frv.c
+++ b/gcc/config/frv/frv.c
@@ -21,6 +21,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/config/ft32/ft32.c b/gcc/config/ft32/ft32.c
index 8a8dff7392c4e6aa5f9c51abcdb1af5ba7748195..3b04ea4cda1d87512ecbcf86d8b89d4db3ab41d4 100644
--- a/gcc/config/ft32/ft32.c
+++ b/gcc/config/ft32/ft32.c
@@ -22,6 +22,7 @@
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/config/h8300/h8300.c b/gcc/config/h8300/h8300.c
index 0abb92c26818d4cac0cc5d28bd410aed2ec3ef9a..63a7adbe58390e4820a42206241606c22f3d4aad 100644
--- a/gcc/config/h8300/h8300.c
+++ b/gcc/config/h8300/h8300.c
@@ -23,6 +23,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index 007e0e13955ce9414275321dad1f2dd793cde9c6..785990a7422519813243641595eed3dcd1043dce 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -21,6 +21,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "rtl.h"
diff --git a/gcc/config/i386/winnt.c b/gcc/config/i386/winnt.c
index a2ee1abe20f8a576c8bd56458b0cfc2df5e97f73..362ef492a2bbe94f3bd28f2c48d8ec8da4df25c3 100644
--- a/gcc/config/i386/winnt.c
+++ b/gcc/config/i386/winnt.c
@@ -23,7 +23,7 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "function.h"
-#include "predict.h"
+#include "cfghooks.h"
#include "basic-block.h"
#include "cfg.h"
#include "tree.h"
diff --git a/gcc/config/ia64/ia64.c b/gcc/config/ia64/ia64.c
index fef6839e0d29f9f9bd288c71f5fb3c40ec29bc7f..779fc58789fd27e67b58dad7db98f83c1663bc4f 100644
--- a/gcc/config/ia64/ia64.c
+++ b/gcc/config/ia64/ia64.c
@@ -23,6 +23,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "rtl.h"
diff --git a/gcc/config/iq2000/iq2000.c b/gcc/config/iq2000/iq2000.c
index 79087becd6b09f750b6d67df629b4fa8e1c10d2c..7e1fef62f92dc2a50ea224d6a3a3a67bd5098e1e 100644
--- a/gcc/config/iq2000/iq2000.c
+++ b/gcc/config/iq2000/iq2000.c
@@ -21,6 +21,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/config/lm32/lm32.c b/gcc/config/lm32/lm32.c
index 2402583f4857df37c9b7960cdcaaa81fdf694ca0..32cc58623712fe128da787126b941cbe1f86bec5 100644
--- a/gcc/config/lm32/lm32.c
+++ b/gcc/config/lm32/lm32.c
@@ -23,6 +23,7 @@
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/config/m32c/m32c.c b/gcc/config/m32c/m32c.c
index 40da261e44899d9d3db642892bebb8e855743700..b6493a4d33df432b094493bfc6830d224dda3fec 100644
--- a/gcc/config/m32c/m32c.c
+++ b/gcc/config/m32c/m32c.c
@@ -22,6 +22,7 @@
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "rtl.h"
diff --git a/gcc/config/m32r/m32r.c b/gcc/config/m32r/m32r.c
index 72cdfd8a5d570d6c81ca9b22b7e9a92f60837ae5..d126d2f70355b95ba354cb2f33dbb16ccca43cf8 100644
--- a/gcc/config/m32r/m32r.c
+++ b/gcc/config/m32r/m32r.c
@@ -21,6 +21,7 @@
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/config/m68k/m68k.c b/gcc/config/m68k/m68k.c
index 4bd20a5ff363baf759cf382b4c34c956bac43c90..c26f37bb2ee671e6c4bd89e36bd8548257cba0d8 100644
--- a/gcc/config/m68k/m68k.c
+++ b/gcc/config/m68k/m68k.c
@@ -21,6 +21,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/config/mcore/mcore.c b/gcc/config/mcore/mcore.c
index 1ba27d09714a1f6a8ffc392e5ae5b92b6629dd55..d572d6a30f8cf23fd720c3294f7cbbea13ab0b4a 100644
--- a/gcc/config/mcore/mcore.c
+++ b/gcc/config/mcore/mcore.c
@@ -21,6 +21,7 @@
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/config/mep/mep.c b/gcc/config/mep/mep.c
index 2d343b302633d252a904fb47cd381c43b0242cba..750de5a493acab9f4ac506690e2b6a1fe624cbca 100644
--- a/gcc/config/mep/mep.c
+++ b/gcc/config/mep/mep.c
@@ -22,6 +22,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "rtl.h"
diff --git a/gcc/config/microblaze/microblaze.c b/gcc/config/microblaze/microblaze.c
index da9005ee021ee4cbb5b556a927bb0fde4b9f9af2..40a659a8d7b0645bde9fb5e49a7a0751d2575373 100644
--- a/gcc/config/microblaze/microblaze.c
+++ b/gcc/config/microblaze/microblaze.c
@@ -23,6 +23,7 @@
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/config/mips/mips.c b/gcc/config/mips/mips.c
index 31756d702a975acdc142e6713d8cccd5f9194f17..8fd7f2d05123dcbaad23d476dadcd4aa5ab43446 100644
--- a/gcc/config/mips/mips.c
+++ b/gcc/config/mips/mips.c
@@ -25,6 +25,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "rtl.h"
diff --git a/gcc/config/mmix/mmix.c b/gcc/config/mmix/mmix.c
index 57f0659d462c0339fb6698182d77a3597684004a..16e734c9ece0a11bd970276ccaf6ea07d603393a 100644
--- a/gcc/config/mmix/mmix.c
+++ b/gcc/config/mmix/mmix.c
@@ -22,6 +22,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/config/mn10300/mn10300.c b/gcc/config/mn10300/mn10300.c
index 7abc61dabf1a291d1857827823ef9e48cb653b1c..8c5986acf0fd2221479278707b82b83984f41957 100644
--- a/gcc/config/mn10300/mn10300.c
+++ b/gcc/config/mn10300/mn10300.c
@@ -22,6 +22,7 @@
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/config/moxie/moxie.c b/gcc/config/moxie/moxie.c
index af05d823bc5a2b426c0b36031b7701e2cad80e61..1216153e5dbf722476f062b68fedd1b12d052779 100644
--- a/gcc/config/moxie/moxie.c
+++ b/gcc/config/moxie/moxie.c
@@ -22,6 +22,7 @@
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/config/msp430/msp430.c b/gcc/config/msp430/msp430.c
index 9d0e4a0e1287caf01c08e1c7366590dc041d577f..d2308cb064d1b4dcdcb0be50fb8bf3e0538509bc 100644
--- a/gcc/config/msp430/msp430.c
+++ b/gcc/config/msp430/msp430.c
@@ -22,6 +22,7 @@
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/config/nds32/nds32-cost.c b/gcc/config/nds32/nds32-cost.c
index d25c41ab0c771fd9ab111397b0c0c5ecdf566815..1546d51428956449eb521c7ce482e84e11a7944a 100644
--- a/gcc/config/nds32/nds32-cost.c
+++ b/gcc/config/nds32/nds32-cost.c
@@ -24,6 +24,7 @@
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/config/nds32/nds32-fp-as-gp.c b/gcc/config/nds32/nds32-fp-as-gp.c
index 85110829f83ee2f78ef16833c5cbaae70c257016..fe0fe6651b776c887b234e337287daa049b5297c 100644
--- a/gcc/config/nds32/nds32-fp-as-gp.c
+++ b/gcc/config/nds32/nds32-fp-as-gp.c
@@ -24,6 +24,7 @@
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/config/nds32/nds32-intrinsic.c b/gcc/config/nds32/nds32-intrinsic.c
index 4bfcc8207b0bb70d0500d852e6d819eeb58881dc..b94e71d1ff190edeac73b26bfe0f0d3fc7512a20 100644
--- a/gcc/config/nds32/nds32-intrinsic.c
+++ b/gcc/config/nds32/nds32-intrinsic.c
@@ -24,6 +24,7 @@
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/config/nds32/nds32-isr.c b/gcc/config/nds32/nds32-isr.c
index a61aa32b901ac0a651ac04c63a0f3f00aa6eff8c..b36664e9ca3ee4060e247a20a4ea5eb397542ce8 100644
--- a/gcc/config/nds32/nds32-isr.c
+++ b/gcc/config/nds32/nds32-isr.c
@@ -24,6 +24,7 @@
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/config/nds32/nds32-md-auxiliary.c b/gcc/config/nds32/nds32-md-auxiliary.c
index c01ce822f50d89d6649685778679ea4aee11e9c5..50f28226a083a8210374003f5d118d4fc8ee12b4 100644
--- a/gcc/config/nds32/nds32-md-auxiliary.c
+++ b/gcc/config/nds32/nds32-md-auxiliary.c
@@ -25,6 +25,7 @@
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/config/nds32/nds32-memory-manipulation.c b/gcc/config/nds32/nds32-memory-manipulation.c
index c857ab784c53203b0947f05962115f41326f51c4..caa45f8e2fb5b2ff20b5f75d8d80b4f5d5cb51db 100644
--- a/gcc/config/nds32/nds32-memory-manipulation.c
+++ b/gcc/config/nds32/nds32-memory-manipulation.c
@@ -25,6 +25,7 @@
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/config/nds32/nds32-pipelines-auxiliary.c b/gcc/config/nds32/nds32-pipelines-auxiliary.c
index ec6111c50c2bbf202fa01b5c76b09dbda0a8f0fb..df819a2560eb07e60ba94ee941b75534fd04694e 100644
--- a/gcc/config/nds32/nds32-pipelines-auxiliary.c
+++ b/gcc/config/nds32/nds32-pipelines-auxiliary.c
@@ -25,6 +25,7 @@
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/config/nds32/nds32-predicates.c b/gcc/config/nds32/nds32-predicates.c
index e0009e0db6e83d553cac43cf22ffd3fbae5ab465..b9681f535eb2f5905e22ae1d64b3207152b549a8 100644
--- a/gcc/config/nds32/nds32-predicates.c
+++ b/gcc/config/nds32/nds32-predicates.c
@@ -24,6 +24,7 @@
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/config/nds32/nds32.c b/gcc/config/nds32/nds32.c
index 56ba24a20d516ce0d83f12a2aa3f8e48c78d7d48..8417aac538b13e9780275779d1aca6be087486fb 100644
--- a/gcc/config/nds32/nds32.c
+++ b/gcc/config/nds32/nds32.c
@@ -24,6 +24,7 @@
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/config/nios2/nios2.c b/gcc/config/nios2/nios2.c
index 4b614db98910a8f6f7e162ac4fdeb27ca3fc11e6..77dac5795c6d6295f63ba3e0018b8054fdebc0a3 100644
--- a/gcc/config/nios2/nios2.c
+++ b/gcc/config/nios2/nios2.c
@@ -24,6 +24,7 @@
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/config/nvptx/nvptx.c b/gcc/config/nvptx/nvptx.c
index f44909b0d2c3ebdbadbfbf996e31ceaab88fbc9f..d4bbf32f98fd90cc34fb234d3b3970fc78617df7 100644
--- a/gcc/config/nvptx/nvptx.c
+++ b/gcc/config/nvptx/nvptx.c
@@ -24,6 +24,7 @@
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/config/pa/pa.c b/gcc/config/pa/pa.c
index 03ac6f220a2e4d08c2396628d8d3dccc968453f1..7cf540c778522e2f3d35927ee724bcb871bc3788 100644
--- a/gcc/config/pa/pa.c
+++ b/gcc/config/pa/pa.c
@@ -22,6 +22,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/config/pdp11/pdp11.c b/gcc/config/pdp11/pdp11.c
index cba2b35d03acc194514c7910eeb3da105f734dce..f0c2a5d8c9c6fc2a84c5de689720d0f3bde6a946 100644
--- a/gcc/config/pdp11/pdp11.c
+++ b/gcc/config/pdp11/pdp11.c
@@ -22,6 +22,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/config/rl78/rl78.c b/gcc/config/rl78/rl78.c
index eb07ca3b6d92206126436d5b1a86cf4c55e4e780..2bbfb2ead388750fe9f1ee8ec6a4ab4709b2d473 100644
--- a/gcc/config/rl78/rl78.c
+++ b/gcc/config/rl78/rl78.c
@@ -22,6 +22,7 @@
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index cac1de5abb98d767daf7f76a2a6e993dac5c7cc7..912393f0c7018464f5f80cdbabea5d6fb2ff7445 100644
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -22,6 +22,7 @@
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "rtl.h"
diff --git a/gcc/config/rx/rx.c b/gcc/config/rx/rx.c
index 7bda176da885fdfbc069b5211d1e8dbada5108c1..348470e8d8fb14fb0da8ffcde29255e996f9eb41 100644
--- a/gcc/config/rx/rx.c
+++ b/gcc/config/rx/rx.c
@@ -26,6 +26,7 @@
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/config/s390/s390.c b/gcc/config/s390/s390.c
index 3982afeaa87f7802e3118d5f9abba3c4233c76af..861dfb2bb35a41c1f01b343b7f1a1703427a51a1 100644
--- a/gcc/config/s390/s390.c
+++ b/gcc/config/s390/s390.c
@@ -24,6 +24,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "rtl.h"
diff --git a/gcc/config/sh/sh-mem.cc b/gcc/config/sh/sh-mem.cc
index b0a8cfc1f97a6b32edd48481a5c3910255c3d8b9..5a0fb9780d0ae431c5f628615d59a5c6828104e3 100644
--- a/gcc/config/sh/sh-mem.cc
+++ b/gcc/config/sh/sh-mem.cc
@@ -36,7 +36,7 @@ along with GCC; see the file COPYING3. If not see
#include "stmt.h"
#include "expr.h"
#include "tm_p.h"
-#include "predict.h"
+#include "cfghooks.h"
#include "cfg.h"
#include "cfgrtl.h"
#include "cfganal.h"
diff --git a/gcc/config/sh/sh.c b/gcc/config/sh/sh.c
index 71f3a5d7414fd9b5b3c92627a272aed2e2c9a563..8b287eb30db881c01576a857d3673373672967a7 100644
--- a/gcc/config/sh/sh.c
+++ b/gcc/config/sh/sh.c
@@ -26,6 +26,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "rtl.h"
diff --git a/gcc/config/sh/sh_optimize_sett_clrt.cc b/gcc/config/sh/sh_optimize_sett_clrt.cc
index 4c974d9dad714c0521e92632a8d63fddc6cd2c41..89c0ca250b912bac190c1e6c2a5a6fee563439d3 100644
--- a/gcc/config/sh/sh_optimize_sett_clrt.cc
+++ b/gcc/config/sh/sh_optimize_sett_clrt.cc
@@ -21,6 +21,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "rtl.h"
#include "df.h"
#include "cfgrtl.h"
diff --git a/gcc/config/sh/sh_treg_combine.cc b/gcc/config/sh/sh_treg_combine.cc
index 4d12175a4a5f226d90d504456770509abf0cf838..c4add22fd62e8e5dd502b06cb0205bd93139c086 100644
--- a/gcc/config/sh/sh_treg_combine.cc
+++ b/gcc/config/sh/sh_treg_combine.cc
@@ -22,6 +22,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/config/sparc/sparc.c b/gcc/config/sparc/sparc.c
index 0ea5102d9bff9bf2bc08e805cfd83131fb7ccc54..ed8a1665e6a296e37a95dae986073dfb8f976b41 100644
--- a/gcc/config/sparc/sparc.c
+++ b/gcc/config/sparc/sparc.c
@@ -24,6 +24,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "rtl.h"
diff --git a/gcc/config/spu/spu.c b/gcc/config/spu/spu.c
index 2470728e6f8c72739d42d8f2b452f50b6bf46a3d..9737ee2312bbb81ae82570134da994fec83672b4 100644
--- a/gcc/config/spu/spu.c
+++ b/gcc/config/spu/spu.c
@@ -18,6 +18,7 @@
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "rtl.h"
diff --git a/gcc/config/stormy16/stormy16.c b/gcc/config/stormy16/stormy16.c
index 9d243f6f209447044653c2354f44490249e4e3bb..3c9f0087f01cd57bd892fecbf50df0f89e8b8faa 100644
--- a/gcc/config/stormy16/stormy16.c
+++ b/gcc/config/stormy16/stormy16.c
@@ -22,6 +22,7 @@
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "rtl.h"
diff --git a/gcc/config/tilegx/tilegx.c b/gcc/config/tilegx/tilegx.c
index 8ceb41e4f506e1a73444492b4b53cee92fe1e64b..1c8e7d90fae289ad5c7f58de852584d15c78913c 100644
--- a/gcc/config/tilegx/tilegx.c
+++ b/gcc/config/tilegx/tilegx.c
@@ -22,6 +22,7 @@
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "rtl.h"
diff --git a/gcc/config/tilepro/tilepro.c b/gcc/config/tilepro/tilepro.c
index e68d075717a1ead880beeadfbbb0071bf54ca341..70e0956dcc5ae59cfeff9f565e8909e4c8b4d0b3 100644
--- a/gcc/config/tilepro/tilepro.c
+++ b/gcc/config/tilepro/tilepro.c
@@ -22,6 +22,7 @@
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "rtl.h"
diff --git a/gcc/config/v850/v850.c b/gcc/config/v850/v850.c
index 77e0a5f85870df7afeacbd3014d6696865a6d500..95c20ccc8046fdef39ef22646d6169854d446e09 100644
--- a/gcc/config/v850/v850.c
+++ b/gcc/config/v850/v850.c
@@ -22,6 +22,7 @@
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/config/vax/vax.c b/gcc/config/vax/vax.c
index 72dfa62a54bea149b804ab1f244a15470c55ec82..7e0a2c276290fc7ecc2764a97ac1af9dec21bc4b 100644
--- a/gcc/config/vax/vax.c
+++ b/gcc/config/vax/vax.c
@@ -21,6 +21,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/config/visium/visium.c b/gcc/config/visium/visium.c
index da48d10e0566fd5bbb3baa0da9d166b9cdcb0e05..41b79645b71087b2928ab5296bdf5ff7ac6dfbf3 100644
--- a/gcc/config/visium/visium.c
+++ b/gcc/config/visium/visium.c
@@ -22,6 +22,7 @@
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
index efcc2fbbba5a39445c1cb99448587f48d868ec8a..22ed13b900a304c10173e189f7ea4b685e29d278 100644
--- a/gcc/config/xtensa/xtensa.c
+++ b/gcc/config/xtensa/xtensa.c
@@ -22,6 +22,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "rtl.h"
diff --git a/gcc/cprop.c b/gcc/cprop.c
index cf3f99ae69a470e71ab255cf0b100cd7abd8a2c0..f55a0b4f57858409f133206f66b4924b80648046 100644
--- a/gcc/cprop.c
+++ b/gcc/cprop.c
@@ -21,6 +21,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/cse.c b/gcc/cse.c
index af06543cf06ce195c45caaa13c54e4c440dfc7dd..255c4dbea4cc6ed8d1b75d825c81c3e6d689e121 100644
--- a/gcc/cse.c
+++ b/gcc/cse.c
@@ -21,6 +21,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/dce.c b/gcc/dce.c
index 347c490fdca76bc48cf32d95b80b4868e222e287..c9cffc97055476314a1c86ba058c107a8f5d95f5 100644
--- a/gcc/dce.c
+++ b/gcc/dce.c
@@ -21,6 +21,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "predict.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/dojump.c b/gcc/dojump.c
index 1f1ec5366ff0d4ad77b9bbf34c5aec78fc953b39..6adc1a653cc38bdc82d7a7aa0416d5569d3d427e 100644
--- a/gcc/dojump.c
+++ b/gcc/dojump.c
@@ -21,6 +21,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "predict.h"
#include "rtl.h"
#include "alias.h"
#include "tree.h"
diff --git a/gcc/dse.c b/gcc/dse.c
index 89ba0c961a371c2e807592c222e07edda5097659..7a6bca2f8a9eb0dc14cb353d4c5a9e1970348848 100644
--- a/gcc/dse.c
+++ b/gcc/dse.c
@@ -26,6 +26,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "predict.h"
#include "tree.h"
#include "gimple.h"
#include "rtl.h"
diff --git a/gcc/except.c b/gcc/except.c
index d94cdabf25df737f50159bf7f6d3bb11d7eaf3c3..8d82c674726a1791ad7ce94024ba0c8983763345 100644
--- a/gcc/except.c
+++ b/gcc/except.c
@@ -113,6 +113,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "rtl.h"
#include "alias.h"
#include "tree.h"
diff --git a/gcc/expmed.c b/gcc/expmed.c
index b865382e0c3ef592ef2e932c4290505b3df3dbb8..557da33118fc99710b3dd895ffc1d779966d4e9e 100644
--- a/gcc/expmed.c
+++ b/gcc/expmed.c
@@ -23,6 +23,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "predict.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/expr.c b/gcc/expr.c
index 6f6ee9d4978862e24eb7c420be97ce9a444a65df..899a42c7e7b14bd62a01fdf573bcaa6fd5e18dc1 100644
--- a/gcc/expr.c
+++ b/gcc/expr.c
@@ -21,6 +21,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "predict.h"
#include "tree.h"
#include "gimple.h"
#include "rtl.h"
diff --git a/gcc/final.c b/gcc/final.c
index cb83964d05e5958cb9b7ce4dac70178ed323caed..3e692d8a5f4e1e59452f43d7d230b3130d88f41a 100644
--- a/gcc/final.c
+++ b/gcc/final.c
@@ -46,6 +46,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/fold-const.c b/gcc/fold-const.c
index 61eee4ae83095083e4e495e73ebb54d87b2e10d3..f78ec4e68dfa08954bacc01df0ca1c0d04e8f267 100644
--- a/gcc/fold-const.c
+++ b/gcc/fold-const.c
@@ -44,6 +44,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "predict.h"
#include "tree.h"
#include "gimple.h"
#include "rtl.h"
diff --git a/gcc/function.c b/gcc/function.c
index b87aef67989394ae83f2df1f29215eeaae28f4d4..f9d11bf4506e6255c0257a12bd666318cf5e7c03 100644
--- a/gcc/function.c
+++ b/gcc/function.c
@@ -35,6 +35,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/fwprop.c b/gcc/fwprop.c
index 263b40682887026ba6d1f58e71619ecd114fa47a..9316b34d745a819fed1bd5f303013c6dc5986bdb 100644
--- a/gcc/fwprop.c
+++ b/gcc/fwprop.c
@@ -22,6 +22,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "predict.h"
#include "rtl.h"
#include "df.h"
#include "diagnostic-core.h"
diff --git a/gcc/gcc-plugin.h b/gcc/gcc-plugin.h
index f04ef70dd26e7dbb18c40d8f78eefec5efd8e85a..7cdbf85d03124b00e24da4b7f10c0f11f9ef105d 100644
--- a/gcc/gcc-plugin.h
+++ b/gcc/gcc-plugin.h
@@ -28,6 +28,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "hard-reg-set.h"
#include "cfgrtl.h"
#include "cfganal.h"
diff --git a/gcc/gcse.c b/gcc/gcse.c
index 2f3d7f70d25c2aa603451e2e787068530e5a98ae..8573b7df91da7f12e95ed4404068a21b5e1a100e 100644
--- a/gcc/gcse.c
+++ b/gcc/gcse.c
@@ -136,6 +136,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "predict.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/genattrtab.c b/gcc/genattrtab.c
index 253a6beff6d6cb2a71b4977b96b1a710b9ba3ff4..31791be6b93c992f6a307b55a9e58f664e46a431 100644
--- a/gcc/genattrtab.c
+++ b/gcc/genattrtab.c
@@ -5104,6 +5104,7 @@ write_header (FILE *outf)
fprintf (outf, "#include \"system.h\"\n");
fprintf (outf, "#include \"coretypes.h\"\n");
fprintf (outf, "#include \"backend.h\"\n");
+ fprintf (outf, "#include \"predict.h\"\n");
fprintf (outf, "#include \"tree.h\"\n");
fprintf (outf, "#include \"rtl.h\"\n");
fprintf (outf, "#include \"alias.h\"\n");
diff --git a/gcc/genemit.c b/gcc/genemit.c
index 7409a88b6b6aaff1bedb7cb3a9e305db262863a2..288b8bddd3c7679782d8d62f08800edc30ccc019 100644
--- a/gcc/genemit.c
+++ b/gcc/genemit.c
@@ -745,6 +745,7 @@ from the machine description file `md'. */\n\n");
printf ("#include \"system.h\"\n");
printf ("#include \"coretypes.h\"\n");
printf ("#include \"backend.h\"\n");
+ printf ("#include \"predict.h\"\n");
printf ("#include \"tree.h\"\n");
printf ("#include \"rtl.h\"\n");
printf ("#include \"alias.h\"\n");
diff --git a/gcc/gengtype.c b/gcc/gengtype.c
index e49b7c8417742a0f2ca9e0932732ce6dd7b7edee..866d809889d6d295ed3bfc42ad0a0657521329eb 100644
--- a/gcc/gengtype.c
+++ b/gcc/gengtype.c
@@ -1710,7 +1710,7 @@ open_base_files (void)
{
/* The order of files here matters very much. */
static const char *const ifiles[] = {
- "config.h", "system.h", "coretypes.h", "backend.h", "tree.h",
+ "config.h", "system.h", "coretypes.h", "backend.h", "predict.h", "tree.h",
"rtl.h", "gimple.h", "fold-const.h", "insn-codes.h", "splay-tree.h",
"alias.h", "insn-config.h", "flags.h", "expmed.h", "dojump.h",
"explow.h", "calls.h", "emit-rtl.h", "varasm.h", "stmt.h",
diff --git a/gcc/genopinit.c b/gcc/genopinit.c
index 525317708fe132d3548cfd53f6f9d86c1e7c55a0..97acd4940be8f0fb5366f7c1906b9afbdf095b37 100644
--- a/gcc/genopinit.c
+++ b/gcc/genopinit.c
@@ -465,6 +465,7 @@ main (int argc, char **argv)
"#include \"system.h\"\n"
"#include \"coretypes.h\"\n"
"#include \"backend.h\"\n"
+ "#include \"predict.h\"\n"
"#include \"tree.h\"\n"
"#include \"rtl.h\"\n"
"#include \"alias.h\"\n"
diff --git a/gcc/genoutput.c b/gcc/genoutput.c
index cb78448d0b0789313957960a6934c5893c401593..308f3b5e0b66129bb32e99240582865eb499d1ff 100644
--- a/gcc/genoutput.c
+++ b/gcc/genoutput.c
@@ -227,6 +227,7 @@ output_prologue (void)
printf ("#include \"system.h\"\n");
printf ("#include \"coretypes.h\"\n");
printf ("#include \"backend.h\"\n");
+ printf ("#include \"predict.h\"\n");
printf ("#include \"tree.h\"\n");
printf ("#include \"rtl.h\"\n");
printf ("#include \"flags.h\"\n");
diff --git a/gcc/genpreds.c b/gcc/genpreds.c
index 4b5535405655cb98c622275003c22f125f6f5f62..878f819f544f7384b1c3fad92ee1bb838bef9047 100644
--- a/gcc/genpreds.c
+++ b/gcc/genpreds.c
@@ -1524,6 +1524,7 @@ write_insn_preds_c (void)
#include \"system.h\"\n\
#include \"coretypes.h\"\n\
#include \"backend.h\"\n\
+#include \"predict.h\"\n\
#include \"tree.h\"\n\
#include \"rtl.h\"\n\
#include \"alias.h\"\n\
diff --git a/gcc/genrecog.c b/gcc/genrecog.c
index 96656f8fe5a78fa4656ac14a3546976c9815d583..1cfefd82f68224df3b9bf80653617be89a563ec9 100644
--- a/gcc/genrecog.c
+++ b/gcc/genrecog.c
@@ -4180,6 +4180,7 @@ write_header (void)
#include \"system.h\"\n\
#include \"coretypes.h\"\n\
#include \"backend.h\"\n\
+#include \"predict.h\"\n\
#include \"rtl.h\"\n\
#include \"tm_p.h\"\n\
#include \"emit-rtl.h\"\n\
diff --git a/gcc/gimple-fold.c b/gcc/gimple-fold.c
index 7e8bd0d5a921e8bb063e316a98fa8491c77451ad..e19700de2ab348078ed0d658231205ae8200e6bf 100644
--- a/gcc/gimple-fold.c
+++ b/gcc/gimple-fold.c
@@ -22,6 +22,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "predict.h"
#include "tree.h"
#include "gimple.h"
#include "rtl.h"
diff --git a/gcc/gimple-iterator.c b/gcc/gimple-iterator.c
index 7b22a342abe39806d055284bbb02ce7c49ee2754..da873ae2d9cf4f0d9950e26b080fe7fbc4f72cad 100644
--- a/gcc/gimple-iterator.c
+++ b/gcc/gimple-iterator.c
@@ -22,6 +22,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "hard-reg-set.h"
diff --git a/gcc/gimple-predict.h b/gcc/gimple-predict.h
new file mode 100644
index 0000000000000000000000000000000000000000..9f009a5536622e34b95438645680404d76ccb9cf
--- /dev/null
+++ b/gcc/gimple-predict.h
@@ -0,0 +1,83 @@
+/* Gimple prediction routines.
+
+ Copyright (C) 2007-2015 Free Software Foundation, Inc.
+
+This file is part of GCC.
+
+GCC is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 3, or (at your option) any later
+version.
+
+GCC is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with GCC; see the file COPYING3. If not see
+<http://www.gnu.org/licenses/>. */
+
+#ifndef GCC_GIMPLE_PREDICT_H
+#define GCC_GIMPLE_PREDICT_H
+
+#include "predict.h"
+
+/* Return the predictor of GIMPLE_PREDICT statement GS. */
+
+static inline enum br_predictor
+gimple_predict_predictor (gimple gs)
+{
+ GIMPLE_CHECK (gs, GIMPLE_PREDICT);
+ return (enum br_predictor) (gs->subcode & ~GF_PREDICT_TAKEN);
+}
+
+
+/* Set the predictor of GIMPLE_PREDICT statement GS to PREDICT. */
+
+static inline void
+gimple_predict_set_predictor (gimple gs, enum br_predictor predictor)
+{
+ GIMPLE_CHECK (gs, GIMPLE_PREDICT);
+ gs->subcode = (gs->subcode & GF_PREDICT_TAKEN)
+ | (unsigned) predictor;
+}
+
+
+/* Return the outcome of GIMPLE_PREDICT statement GS. */
+
+static inline enum prediction
+gimple_predict_outcome (gimple gs)
+{
+ GIMPLE_CHECK (gs, GIMPLE_PREDICT);
+ return (gs->subcode & GF_PREDICT_TAKEN) ? TAKEN : NOT_TAKEN;
+}
+
+
+/* Set the outcome of GIMPLE_PREDICT statement GS to OUTCOME. */
+
+static inline void
+gimple_predict_set_outcome (gimple gs, enum prediction outcome)
+{
+ GIMPLE_CHECK (gs, GIMPLE_PREDICT);
+ if (outcome == TAKEN)
+ gs->subcode |= GF_PREDICT_TAKEN;
+ else
+ gs->subcode &= ~GF_PREDICT_TAKEN;
+}
+
+/* Build a GIMPLE_PREDICT statement. PREDICT is one of the predictors from
+ predict.def, OUTCOME is NOT_TAKEN or TAKEN. */
+
+inline gimple
+gimple_build_predict (enum br_predictor predictor, enum prediction outcome)
+{
+ gimple p = gimple_alloc (GIMPLE_PREDICT, 0);
+ /* Ensure all the predictors fit into the lower bits of the subcode. */
+ gcc_assert ((int) END_PREDICTORS <= GF_PREDICT_TAKEN);
+ gimple_predict_set_predictor (p, predictor);
+ gimple_predict_set_outcome (p, outcome);
+ return p;
+}
+
+#endif /* GCC_GIMPLE_PREDICT_H */
diff --git a/gcc/gimple-pretty-print.c b/gcc/gimple-pretty-print.c
index 8c230cc47eb36207472868441401b3e697fc9022..53900ddb48ec7462638141d964acbea4e5889d37 100644
--- a/gcc/gimple-pretty-print.c
+++ b/gcc/gimple-pretty-print.c
@@ -25,6 +25,7 @@ along with GCC; see the file COPYING3. If not see
#include "backend.h"
#include "tree.h"
#include "gimple.h"
+#include "gimple-predict.h"
#include "hard-reg-set.h"
#include "ssa.h"
#include "alias.h"
diff --git a/gcc/gimple-ssa-isolate-paths.c b/gcc/gimple-ssa-isolate-paths.c
index d43b5ac5abff2347f9c01deeb25ea54135f866d8..7d3758ce5abbe4d2ea406491b6bb461d85aa3b87 100644
--- a/gcc/gimple-ssa-isolate-paths.c
+++ b/gcc/gimple-ssa-isolate-paths.c
@@ -24,6 +24,7 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "alias.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "hard-reg-set.h"
diff --git a/gcc/gimple-ssa-strength-reduction.c b/gcc/gimple-ssa-strength-reduction.c
index 4bc72259aa65f1df37316aa2ff8e8dcfbc588f90..b369ef5ed89249e20f323dd3d372060810aba1a8 100644
--- a/gcc/gimple-ssa-strength-reduction.c
+++ b/gcc/gimple-ssa-strength-reduction.c
@@ -38,6 +38,7 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "alias.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "rtl.h"
diff --git a/gcc/gimple.c b/gcc/gimple.c
index b73ac2a7c9deab2e4e8f9ac57eedb774980dca76..89291b07cf46a33866d65efcf6676e75a5177560 100644
--- a/gcc/gimple.c
+++ b/gcc/gimple.c
@@ -1136,20 +1136,6 @@ gimple_build_transaction (gimple_seq body, tree label)
return p;
}
-/* Build a GIMPLE_PREDICT statement. PREDICT is one of the predictors from
- predict.def, OUTCOME is NOT_TAKEN or TAKEN. */
-
-gimple
-gimple_build_predict (enum br_predictor predictor, enum prediction outcome)
-{
- gimple p = gimple_alloc (GIMPLE_PREDICT, 0);
- /* Ensure all the predictors fit into the lower bits of the subcode. */
- gcc_assert ((int) END_PREDICTORS <= GF_PREDICT_TAKEN);
- gimple_predict_set_predictor (p, predictor);
- gimple_predict_set_outcome (p, outcome);
- return p;
-}
-
#if defined ENABLE_GIMPLE_CHECKING
/* Complain of a gimple type mismatch and die. */
diff --git a/gcc/gimple.h b/gcc/gimple.h
index bcf0acff2bb7d62aa85d9cf128a4e0c6e2fd3c7a..195ad3ce42ce48837509d660f70c87571c8f2a99 100644
--- a/gcc/gimple.h
+++ b/gcc/gimple.h
@@ -1358,7 +1358,6 @@ gomp_teams *gimple_build_omp_teams (gimple_seq, tree);
gomp_atomic_load *gimple_build_omp_atomic_load (tree, tree);
gomp_atomic_store *gimple_build_omp_atomic_store (tree);
gtransaction *gimple_build_transaction (gimple_seq, tree);
-gimple gimple_build_predict (enum br_predictor, enum prediction);
extern void gimple_seq_add_stmt (gimple_seq *, gimple);
extern void gimple_seq_add_stmt_without_update (gimple_seq *, gimple);
void gimple_seq_add_seq (gimple_seq *, gimple_seq);
@@ -5671,50 +5670,6 @@ is_gimple_resx (const_gimple gs)
return gimple_code (gs) == GIMPLE_RESX;
}
-/* Return the predictor of GIMPLE_PREDICT statement GS. */
-
-static inline enum br_predictor
-gimple_predict_predictor (gimple gs)
-{
- GIMPLE_CHECK (gs, GIMPLE_PREDICT);
- return (enum br_predictor) (gs->subcode & ~GF_PREDICT_TAKEN);
-}
-
-
-/* Set the predictor of GIMPLE_PREDICT statement GS to PREDICT. */
-
-static inline void
-gimple_predict_set_predictor (gimple gs, enum br_predictor predictor)
-{
- GIMPLE_CHECK (gs, GIMPLE_PREDICT);
- gs->subcode = (gs->subcode & GF_PREDICT_TAKEN)
- | (unsigned) predictor;
-}
-
-
-/* Return the outcome of GIMPLE_PREDICT statement GS. */
-
-static inline enum prediction
-gimple_predict_outcome (gimple gs)
-{
- GIMPLE_CHECK (gs, GIMPLE_PREDICT);
- return (gs->subcode & GF_PREDICT_TAKEN) ? TAKEN : NOT_TAKEN;
-}
-
-
-/* Set the outcome of GIMPLE_PREDICT statement GS to OUTCOME. */
-
-static inline void
-gimple_predict_set_outcome (gimple gs, enum prediction outcome)
-{
- GIMPLE_CHECK (gs, GIMPLE_PREDICT);
- if (outcome == TAKEN)
- gs->subcode |= GF_PREDICT_TAKEN;
- else
- gs->subcode &= ~GF_PREDICT_TAKEN;
-}
-
-
/* Return the type of the main expression computed by STMT. Return
void_type_node if the statement computes nothing. */
diff --git a/gcc/gimplify.c b/gcc/gimplify.c
index 07ea2a7aa61b25e356aef9711fa078493065d83e..94911543f2a1d18549e62b7ac77264f01018ba86 100644
--- a/gcc/gimplify.c
+++ b/gcc/gimplify.c
@@ -27,6 +27,7 @@ along with GCC; see the file COPYING3. If not see
#include "backend.h"
#include "tree.h"
#include "gimple.h"
+#include "gimple-predict.h"
#include "rtl.h"
#include "ssa.h"
#include "options.h"
diff --git a/gcc/graph.c b/gcc/graph.c
index 69dfe97d1ddc54a86216d8d9338b0b847a8600c1..f55ae22305847e5ee0819884d8f05b8a9ba005d5 100644
--- a/gcc/graph.c
+++ b/gcc/graph.c
@@ -24,6 +24,7 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "diagnostic-core.h" /* for fatal_error */
#include "backend.h"
+#include "cfghooks.h"
#include "hard-reg-set.h"
#include "cfganal.h"
#include "cfgloop.h"
diff --git a/gcc/graphite-blocking.c b/gcc/graphite-blocking.c
index 297c63762322cae96146181c73cc9e0c1678d941..9ee733e83b092e0ffa39ab53b548c714ef92c9a4 100644
--- a/gcc/graphite-blocking.c
+++ b/gcc/graphite-blocking.c
@@ -37,6 +37,7 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "alias.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "hard-reg-set.h"
diff --git a/gcc/graphite-dependences.c b/gcc/graphite-dependences.c
index 1ccb8ab75858f01c965135d85a063e8ebe91e97e..79b69a79cb1c38beb9e94046c18c1dbbf3af6a1b 100644
--- a/gcc/graphite-dependences.c
+++ b/gcc/graphite-dependences.c
@@ -36,6 +36,7 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "alias.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "hard-reg-set.h"
diff --git a/gcc/graphite-interchange.c b/gcc/graphite-interchange.c
index 0ddfae92f23c7bcf4d472b6ca06d55a46beda367..0f0580b0332d9dca7045f53ab858d1df75b16dde 100644
--- a/gcc/graphite-interchange.c
+++ b/gcc/graphite-interchange.c
@@ -48,6 +48,7 @@ extern "C" {
#include "coretypes.h"
#include "alias.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "hard-reg-set.h"
diff --git a/gcc/graphite-isl-ast-to-gimple.c b/gcc/graphite-isl-ast-to-gimple.c
index 1980a1b342e17382a87e08af9431172f1e423c15..e9da68014095f1eacf4c981f80387797b73b14cc 100644
--- a/gcc/graphite-isl-ast-to-gimple.c
+++ b/gcc/graphite-isl-ast-to-gimple.c
@@ -43,6 +43,7 @@ extern "C" {
#include "coretypes.h"
#include "alias.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "hard-reg-set.h"
diff --git a/gcc/graphite-optimize-isl.c b/gcc/graphite-optimize-isl.c
index b87e645dd57a1f4cb16635b86d08261edc40b564..3be82b502c0e61f13bb9810dd1c49bec0f7abb53 100644
--- a/gcc/graphite-optimize-isl.c
+++ b/gcc/graphite-optimize-isl.c
@@ -37,6 +37,7 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "alias.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "hard-reg-set.h"
diff --git a/gcc/graphite-poly.c b/gcc/graphite-poly.c
index 9aecc49464d60f4c94c42344bf0acab85339877f..d62b2afe21ebeb90d76d5b43c0c4b0479355f099 100644
--- a/gcc/graphite-poly.c
+++ b/gcc/graphite-poly.c
@@ -48,6 +48,7 @@ extern "C" {
#include "diagnostic-core.h"
#include "alias.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "hard-reg-set.h"
diff --git a/gcc/graphite-scop-detection.c b/gcc/graphite-scop-detection.c
index 007368bf2ab74618a0a32db07e5af3938b3ecd91..46a55347eeba1e63b368a5faa39d0396aab0c35b 100644
--- a/gcc/graphite-scop-detection.c
+++ b/gcc/graphite-scop-detection.c
@@ -34,6 +34,7 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "alias.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "hard-reg-set.h"
diff --git a/gcc/graphite-sese-to-poly.c b/gcc/graphite-sese-to-poly.c
index 91955929344702aa058b5b4efc16ef5b0ad97009..6ab44d9d195a205e3f8e41c988f21701caa2b7df 100644
--- a/gcc/graphite-sese-to-poly.c
+++ b/gcc/graphite-sese-to-poly.c
@@ -45,6 +45,7 @@ extern "C" {
#include "coretypes.h"
#include "alias.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "rtl.h"
diff --git a/gcc/graphite.c b/gcc/graphite.c
index d633da602007b18589d1a0d29e96f57cfdaec431..7a3536b8ea886907be12031f46c4fa49a0b70435 100644
--- a/gcc/graphite.c
+++ b/gcc/graphite.c
@@ -49,6 +49,7 @@ along with GCC; see the file COPYING3. If not see
#include "diagnostic-core.h"
#include "alias.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "hard-reg-set.h"
diff --git a/gcc/haifa-sched.c b/gcc/haifa-sched.c
index b197c85b96e89f9bf33899762ee38432a714e867..0912606aa1a377b3b3a77aaa275aa23c570eaa96 100644
--- a/gcc/haifa-sched.c
+++ b/gcc/haifa-sched.c
@@ -126,6 +126,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "rtl.h"
#include "df.h"
#include "diagnostic-core.h"
diff --git a/gcc/ifcvt.c b/gcc/ifcvt.c
index 31849eea445d4d1079b948fecac2fe58e48b13d5..2d97cc578453a0eb50f38180830950b41a76b140 100644
--- a/gcc/ifcvt.c
+++ b/gcc/ifcvt.c
@@ -21,6 +21,7 @@
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/internal-fn.c b/gcc/internal-fn.c
index 82d59c92ecfb3bc8590000784db0705642b911e2..87260982569edc71d3afbebfb331fb3cc59d2541 100644
--- a/gcc/internal-fn.c
+++ b/gcc/internal-fn.c
@@ -22,6 +22,7 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "alias.h"
#include "backend.h"
+#include "predict.h"
#include "tree.h"
#include "gimple.h"
#include "rtl.h"
diff --git a/gcc/ipa-cp.c b/gcc/ipa-cp.c
index 16b9cde43b9670d1c293f321eb73be82ab402405..41501ed75579d20d6c4a484ced23d9062b484ba5 100644
--- a/gcc/ipa-cp.c
+++ b/gcc/ipa-cp.c
@@ -111,6 +111,7 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-expr.h"
#include "target.h"
#include "backend.h"
+#include "predict.h"
#include "hard-reg-set.h"
#include "cgraph.h"
#include "alloc-pool.h"
diff --git a/gcc/ipa-profile.c b/gcc/ipa-profile.c
index 698729b1b0b670f9675d0092ee76a5c353a6d8dc..e15061360a3c2e4a264af0a89871c4253fa19b56 100644
--- a/gcc/ipa-profile.c
+++ b/gcc/ipa-profile.c
@@ -48,6 +48,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "predict.h"
#include "tree.h"
#include "gimple.h"
#include "hard-reg-set.h"
diff --git a/gcc/ipa-split.c b/gcc/ipa-split.c
index df6572f282db1e867a6a2611519040678238287b..69f293f7a8827ac6a5750456483df8319bf3029e 100644
--- a/gcc/ipa-split.c
+++ b/gcc/ipa-split.c
@@ -79,6 +79,7 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "alias.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "rtl.h"
diff --git a/gcc/ipa-utils.c b/gcc/ipa-utils.c
index fb3a9a1faa25ccfad76b7c3bed4aab94d4450bf3..30b08b2f6e3dbf68da6e4fd44025f81c69b6570f 100644
--- a/gcc/ipa-utils.c
+++ b/gcc/ipa-utils.c
@@ -22,6 +22,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "predict.h"
#include "tree.h"
#include "gimple.h"
#include "hard-reg-set.h"
diff --git a/gcc/ira-build.c b/gcc/ira-build.c
index 2dc6ec4c0eee03402e5c9306c0b533c9e588b732..f5297246ee18b250f4f805cc9ed0aa5d4b85d5af 100644
--- a/gcc/ira-build.c
+++ b/gcc/ira-build.c
@@ -22,6 +22,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "predict.h"
#include "rtl.h"
#include "df.h"
#include "tm_p.h"
diff --git a/gcc/ira-color.c b/gcc/ira-color.c
index 98858b3d536c2d3c4a60a900d6d599c79809043b..85c226c5d7b162d5e3350e6f56730bc58e1f8014 100644
--- a/gcc/ira-color.c
+++ b/gcc/ira-color.c
@@ -22,6 +22,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "predict.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/ira-conflicts.c b/gcc/ira-conflicts.c
index a093fdc6e700ba312d2085f3baa14137934201b9..35f120be768b4757d844dc0802b214cf361fdb1e 100644
--- a/gcc/ira-conflicts.c
+++ b/gcc/ira-conflicts.c
@@ -22,6 +22,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "predict.h"
#include "rtl.h"
#include "df.h"
#include "regs.h"
diff --git a/gcc/ira-costs.c b/gcc/ira-costs.c
index e520f77820dbf748c44dc5c2ad1aabc61d05a721..0a5b1e12964bad11f7fa69d8c5a83e383198e31b 100644
--- a/gcc/ira-costs.c
+++ b/gcc/ira-costs.c
@@ -22,6 +22,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "predict.h"
#include "rtl.h"
#include "tree.h"
#include "flags.h"
diff --git a/gcc/ira-emit.c b/gcc/ira-emit.c
index df9f71b6ad36d9add88b706011348c57cd7f2152..544f200cf7564dc07e95f3840786e354269424ac 100644
--- a/gcc/ira-emit.c
+++ b/gcc/ira-emit.c
@@ -69,6 +69,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "predict.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/ira-lives.c b/gcc/ira-lives.c
index 44f0cbf74ffab5e8fbb8851e3a8d1b773fb9e260..7358f6760913e6b8f69c4ca34165bdcf83b709cf 100644
--- a/gcc/ira-lives.c
+++ b/gcc/ira-lives.c
@@ -22,6 +22,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "predict.h"
#include "rtl.h"
#include "df.h"
#include "regs.h"
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index e560d70bf9cbae264756467e3715d949161e5b9e..d64d3f2f327edc128453b16d0345682c06089378 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,7 @@
+2015-07-10 Andrew MacLeod <amacleod@redhat.com>
+
+ * java-gimplify.c: Include cfghooks.h rather than predict.h.
+
2015-07-07 Andrew MacLeod <amacleod@redhat.com>
* boehm.c: Adjust includes.
diff --git a/gcc/java/java-gimplify.c b/gcc/java/java-gimplify.c
index 43a462d7f75bfc994e27fad56fdf171d4bf6f173..c6e7657b5fb82154bbef7d52711b1e928826f4ec 100644
--- a/gcc/java/java-gimplify.c
+++ b/gcc/java/java-gimplify.c
@@ -27,7 +27,7 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "alias.h"
#include "tm.h"
#include "function.h"
-#include "predict.h"
+#include "cfghooks.h"
#include "basic-block.h"
#include "tree.h"
#include "gimple.h"
diff --git a/gcc/jump.c b/gcc/jump.c
index 66ea73c7a93a40ef656c5eb0ac000abe41e87ae5..21324cd0741f6dae2ec0784941d2eca208970bef 100644
--- a/gcc/jump.c
+++ b/gcc/jump.c
@@ -37,6 +37,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "rtl.h"
#include "tm_p.h"
#include "flags.h"
diff --git a/gcc/loop-doloop.c b/gcc/loop-doloop.c
index 25f7a4f8438a7712832f66f60d0b5b07c63bce0b..6554597ba860130ed0d3f6bbc6ca622607c7a1b8 100644
--- a/gcc/loop-doloop.c
+++ b/gcc/loop-doloop.c
@@ -22,6 +22,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "rtl.h"
#include "flags.h"
#include "tree.h"
diff --git a/gcc/loop-init.c b/gcc/loop-init.c
index b786442fc36ae18d6dfe3324dc3a7cb8f1faa3dc..f7aea991d625cbcf140b8abd669d0711481ef114 100644
--- a/gcc/loop-init.c
+++ b/gcc/loop-init.c
@@ -21,6 +21,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/loop-invariant.c b/gcc/loop-invariant.c
index 702f3e32bd7c7c77918eea2c80ac69aec362540c..111cdfda1fa651cb0807b1be6d9e391684dd3d93 100644
--- a/gcc/loop-invariant.c
+++ b/gcc/loop-invariant.c
@@ -38,6 +38,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/loop-unroll.c b/gcc/loop-unroll.c
index f19b10d0b626292a02ddb2a8211805f25ace2121..e8158416a8dddd3cc4f7accddff107e9f4315525 100644
--- a/gcc/loop-unroll.c
+++ b/gcc/loop-unroll.c
@@ -21,6 +21,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "rtl.h"
#include "alias.h"
#include "tree.h"
diff --git a/gcc/lower-subreg.c b/gcc/lower-subreg.c
index f3b2ab5497daeb36f96003bf1554f477d4c1e5f1..7b73ffd0ccc525018daeb7d5bfaff1d1d645cb51 100644
--- a/gcc/lower-subreg.c
+++ b/gcc/lower-subreg.c
@@ -23,6 +23,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/lra-assigns.c b/gcc/lra-assigns.c
index 409f999b8b674e576566703d5067fb13705aef35..839036c79e702efd6235772a22f57f088ceb01c4 100644
--- a/gcc/lra-assigns.c
+++ b/gcc/lra-assigns.c
@@ -78,6 +78,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "predict.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/lra-coalesce.c b/gcc/lra-coalesce.c
index 3ec4e157a96890fa3fd204bddd4a6eb05e5dd864..2794fedfcecb476dc2fc614b00e2fc321e4d860b 100644
--- a/gcc/lra-coalesce.c
+++ b/gcc/lra-coalesce.c
@@ -46,6 +46,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "predict.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/lra-constraints.c b/gcc/lra-constraints.c
index 7d170b63bc83bab0b9dd746ab24f43d0670622a4..ddb91dd49cf9aaf6a83c7ff62aa8848ba3865925 100644
--- a/gcc/lra-constraints.c
+++ b/gcc/lra-constraints.c
@@ -110,6 +110,7 @@
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "predict.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/lra-lives.c b/gcc/lra-lives.c
index 78f165315590be8a8934297d2e76a4a8b3493616..8b8636875642b8beec19ba118acb94d033ab8a6d 100644
--- a/gcc/lra-lives.c
+++ b/gcc/lra-lives.c
@@ -29,6 +29,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "predict.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/lra.c b/gcc/lra.c
index a7b9919e6fc4977539a88cb966b55062b8e46315..0ba7b1ce1b1617e9c44bd1207d6a507e0fc54d75 100644
--- a/gcc/lra.c
+++ b/gcc/lra.c
@@ -104,6 +104,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "predict.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/lto-cgraph.c b/gcc/lto-cgraph.c
index 97585c961b2a7304f0654ae99a4dc0eb4d5415f1..f700b0ce16d7626521992b96673f27ed76acc517 100644
--- a/gcc/lto-cgraph.c
+++ b/gcc/lto-cgraph.c
@@ -24,6 +24,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "predict.h"
#include "tree.h"
#include "gimple.h"
#include "rtl.h"
diff --git a/gcc/lto-streamer-in.c b/gcc/lto-streamer-in.c
index b9cdd0040507504939db0f7582fafed39431fcf7..a9e31b1284c7ccd7b3a13541d590836112004312 100644
--- a/gcc/lto-streamer-in.c
+++ b/gcc/lto-streamer-in.c
@@ -24,6 +24,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "rtl.h"
diff --git a/gcc/lto/ChangeLog b/gcc/lto/ChangeLog
index 4f2d0ec34d7c094fd22a5b087ac001a1beb1b008..9970d59e6e738b30699346de7186ad51dadb32ac 100644
--- a/gcc/lto/ChangeLog
+++ b/gcc/lto/ChangeLog
@@ -1,3 +1,7 @@
+2015-07-10 Andrew MacLeod <amacleod@redhat.com>
+
+ * lto.c: Include cfghooks.h rather than predict.h.
+
2015-07-09 Andrew MacLeod <amacleod@redhat.com>
* lto-lang.c: Adjust includes of target.h, alloc-pool.h and
diff --git a/gcc/lto/lto.c b/gcc/lto/lto.c
index d1a1e6d812eaaf89a98c682db71f4a2b06f3cb2e..2d80ffec61a897b3fd8a8070141e53326fa43dda 100644
--- a/gcc/lto/lto.c
+++ b/gcc/lto/lto.c
@@ -27,7 +27,7 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "function.h"
#include "bitmap.h"
-#include "predict.h"
+#include "cfghooks.h"
#include "basic-block.h"
#include "tree.h"
#include "gimple.h"
diff --git a/gcc/mode-switching.c b/gcc/mode-switching.c
index cbcd7365b5952a8992c2e56314708b8bd72d6f59..4529bc29fa266842961e7e4d4138b9d2f020e97d 100644
--- a/gcc/mode-switching.c
+++ b/gcc/mode-switching.c
@@ -21,6 +21,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "rtl.h"
#include "df.h"
#include "target.h"
diff --git a/gcc/modulo-sched.c b/gcc/modulo-sched.c
index 83220d3081f30a69025ab86a2320da579a20382a..d9596c33e10da75a9e353513b32a8276f96e32b6 100644
--- a/gcc/modulo-sched.c
+++ b/gcc/modulo-sched.c
@@ -23,6 +23,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/omp-low.c b/gcc/omp-low.c
index aa1e6666dbdc447008f2c2bdd491de04e5f59f19..0e69bc21269f6a42c64f87ea863220115d034185 100644
--- a/gcc/omp-low.c
+++ b/gcc/omp-low.c
@@ -26,6 +26,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "rtl.h"
diff --git a/gcc/optabs.c b/gcc/optabs.c
index 1c76411c1420edc67e14ace15e020cdcdb65887c..0719ba2c558ce3cea7da04bccd1babf33e3de4aa 100644
--- a/gcc/optabs.c
+++ b/gcc/optabs.c
@@ -22,6 +22,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "predict.h"
#include "diagnostic-core.h"
/* Include insn-config.h before expr.h so that HAVE_conditional_move
diff --git a/gcc/passes.c b/gcc/passes.c
index a2afb0aa614ebd10060866bcc7dbaae3ce554c00..d8e9271fa89b2922b06632a8513a17d5849fc685 100644
--- a/gcc/passes.c
+++ b/gcc/passes.c
@@ -26,6 +26,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "rtl.h"
diff --git a/gcc/postreload-gcse.c b/gcc/postreload-gcse.c
index 46b14b246179f70e34fd85f23e5fac690e68b31d..7ab9a0c4d89acefcbb2070ea810e111b5ac0c3a2 100644
--- a/gcc/postreload-gcse.c
+++ b/gcc/postreload-gcse.c
@@ -21,6 +21,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "predict.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/postreload.c b/gcc/postreload.c
index 03babc87695c2613011565ef1337a87814bfc31c..c8d199958e430463ef942d3b6c79133270fc806f 100644
--- a/gcc/postreload.c
+++ b/gcc/postreload.c
@@ -21,6 +21,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "predict.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/predict.c b/gcc/predict.c
index 6a3ff4241c2a70a76fb2e269160a7a3e642cb437..965d7cb6ade26e9eef42d13b7eedbe91c7075577 100644
--- a/gcc/predict.c
+++ b/gcc/predict.c
@@ -31,8 +31,10 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
+#include "gimple-predict.h"
#include "rtl.h"
#include "ssa.h"
#include "alias.h"
diff --git a/gcc/profile.c b/gcc/profile.c
index eb9e028d804a0b285a23cfaad1df2b3a0104d46c..8e887692c0dcb27e7fff35bd0244f640c8f1115f 100644
--- a/gcc/profile.c
+++ b/gcc/profile.c
@@ -51,6 +51,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "rtl.h"
diff --git a/gcc/recog.c b/gcc/recog.c
index b69ace56c8b08cd7269f30edb78bea3ece7ffc62..120f7b9a44a76a71fd0ef0cb3f26743d26e23616 100644
--- a/gcc/recog.c
+++ b/gcc/recog.c
@@ -22,6 +22,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/regstat.c b/gcc/regstat.c
index d7307b3a870f5599c6b8d8fb20b66e0308d5ef06..cd4a5c44b281bf6b80905af4085eb965df8ff524 100644
--- a/gcc/regstat.c
+++ b/gcc/regstat.c
@@ -23,6 +23,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "predict.h"
#include "rtl.h"
#include "df.h"
#include "tm_p.h"
diff --git a/gcc/reload1.c b/gcc/reload1.c
index 5192a99a3cec71316b844fc642b25d5033fd0f2b..1d199ca45c8268a74e73c7fb629412ddda777c68 100644
--- a/gcc/reload1.c
+++ b/gcc/reload1.c
@@ -21,6 +21,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "predict.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/reorg.c b/gcc/reorg.c
index dd1cdfd61fec6ff236a3e662ade59fa72822aa41..bdeabcbdc16c83f5f2042783a798cd565182b20f 100644
--- a/gcc/reorg.c
+++ b/gcc/reorg.c
@@ -104,6 +104,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "predict.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/rtlanal.c b/gcc/rtlanal.c
index cb20c2537dcbe41609b68ce51f1cab4689105f0a..0bba878d3b5108040b46aa224086fa1465596a94 100644
--- a/gcc/rtlanal.c
+++ b/gcc/rtlanal.c
@@ -22,6 +22,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "predict.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/sched-ebb.c b/gcc/sched-ebb.c
index b6109eac21268d84c547e074d5230471b6be8c52..01aa808463197003fb7790f9b8efb586201410ee 100644
--- a/gcc/sched-ebb.c
+++ b/gcc/sched-ebb.c
@@ -23,6 +23,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "rtl.h"
#include "df.h"
#include "diagnostic-core.h"
diff --git a/gcc/sel-sched-ir.c b/gcc/sel-sched-ir.c
index 2926b67afcccc1d72738325621880ce12b015c83..6ac2c4bbb8a80ac692de261beb4c57de51e01f51 100644
--- a/gcc/sel-sched-ir.c
+++ b/gcc/sel-sched-ir.c
@@ -21,6 +21,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/sese.c b/gcc/sese.c
index 8e5b9064d13a319c4ce5cdbc652169d140d907ac..2dedd9516b679cc559b7609133b831809726f506 100644
--- a/gcc/sese.c
+++ b/gcc/sese.c
@@ -24,6 +24,7 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "alias.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "hard-reg-set.h"
diff --git a/gcc/shrink-wrap.c b/gcc/shrink-wrap.c
index a357aa3b7762c6f9288d0ecf1470e73f7718fbbb..c90c40a242971ffeb9b033139bbc06174c0a1c5b 100644
--- a/gcc/shrink-wrap.c
+++ b/gcc/shrink-wrap.c
@@ -23,6 +23,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/simplify-rtx.c b/gcc/simplify-rtx.c
index aeca187d83fc82ff3dbe235520f100c3a3719cb7..c243080be2607401fbdc016e6d3faa4350d18309 100644
--- a/gcc/simplify-rtx.c
+++ b/gcc/simplify-rtx.c
@@ -22,6 +22,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "predict.h"
#include "rtl.h"
#include "alias.h"
#include "tree.h"
diff --git a/gcc/stmt.c b/gcc/stmt.c
index 6fb72337d180b3ca8f68fdad786fadeb5980b602..fba72df270efa45e61fbae189d67170f182ffce1 100644
--- a/gcc/stmt.c
+++ b/gcc/stmt.c
@@ -26,6 +26,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "predict.h"
#include "tree.h"
#include "gimple.h"
#include "rtl.h"
diff --git a/gcc/store-motion.c b/gcc/store-motion.c
index a990c03f191adc592cb790de400552992e199a4b..ec3faa2ba54de3592aabd5e2a394439e556b0f91 100644
--- a/gcc/store-motion.c
+++ b/gcc/store-motion.c
@@ -21,6 +21,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "predict.h"
#include "tree.h"
#include "rtl.h"
#include "df.h"
diff --git a/gcc/tracer.c b/gcc/tracer.c
index f7947635b62a9f5505c8c2b5d4c9f3eea71a51bf..cad7ab1e018911aa27701e9db4b9f074bc777613 100644
--- a/gcc/tracer.c
+++ b/gcc/tracer.c
@@ -37,6 +37,7 @@
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "rtl.h"
diff --git a/gcc/trans-mem.c b/gcc/trans-mem.c
index 287283f1362769d13159391c778626afa1e09a9a..891e6388cc43824722f8a113ebe9886d8295249a 100644
--- a/gcc/trans-mem.c
+++ b/gcc/trans-mem.c
@@ -22,6 +22,7 @@
#include "coretypes.h"
#include "alias.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "rtl.h"
diff --git a/gcc/tree-call-cdce.c b/gcc/tree-call-cdce.c
index 8c37143f8e871c16bcb8ee0f02f30c3d924567d7..6e9b14c6f1ca7b2fe9acf49a78eb735c53eca5ec 100644
--- a/gcc/tree-call-cdce.c
+++ b/gcc/tree-call-cdce.c
@@ -22,6 +22,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "hard-reg-set.h"
diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c
index e90ca3d81c84d6612cdddc8210deeb22d4308fca..d97b8240f228969e7133e5828fe3dcc9eb43376a 100644
--- a/gcc/tree-cfg.c
+++ b/gcc/tree-cfg.c
@@ -22,6 +22,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "rtl.h"
diff --git a/gcc/tree-cfgcleanup.c b/gcc/tree-cfgcleanup.c
index 123e34c63dbb5724be989850b74f1adddb6d3284..f3da9c54bf75d7d1a95de69152bf484f6e3bae58 100644
--- a/gcc/tree-cfgcleanup.c
+++ b/gcc/tree-cfgcleanup.c
@@ -21,6 +21,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "rtl.h"
diff --git a/gcc/tree-chkp.c b/gcc/tree-chkp.c
index 1c8b5585985eebd79a2f73309ecbf0f297ba7fee..8c1b48cf45c8a320a982f32a8e72cf182003618a 100644
--- a/gcc/tree-chkp.c
+++ b/gcc/tree-chkp.c
@@ -23,6 +23,7 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "alias.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "rtl.h"
diff --git a/gcc/tree-complex.c b/gcc/tree-complex.c
index fae85b6d98ee60f76bfea120cddabe88b0c6e2ca..193fc65c0e805130370dc3ce9c4f20d5d8070586 100644
--- a/gcc/tree-complex.c
+++ b/gcc/tree-complex.c
@@ -21,6 +21,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "rtl.h"
diff --git a/gcc/tree-eh.c b/gcc/tree-eh.c
index f62fb067cf3a53dfc2f60840e1faaf48cf5491b9..f708c9f5ea1e9b5451aff1f3fcec8d1c79cb11b8 100644
--- a/gcc/tree-eh.c
+++ b/gcc/tree-eh.c
@@ -21,6 +21,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "rtl.h"
diff --git a/gcc/tree-if-conv.c b/gcc/tree-if-conv.c
index a1a584bdf8d08436848f299727fb6f542e6ba53a..a284c2a10fef360d6e88707b13db6c5d2a9d7343 100644
--- a/gcc/tree-if-conv.c
+++ b/gcc/tree-if-conv.c
@@ -84,6 +84,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "rtl.h"
diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c
index 012e536ffe6f5a964de1616554157ac588cbe4d8..15adb175f058ae468628033f834ac826b7aabad2 100644
--- a/gcc/tree-inline.c
+++ b/gcc/tree-inline.c
@@ -22,8 +22,10 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
+#include "gimple-predict.h"
#include "rtl.h"
#include "ssa.h"
#include "diagnostic-core.h"
diff --git a/gcc/tree-loop-distribution.c b/gcc/tree-loop-distribution.c
index 95a39f48ea27c995801db378eb1d8bf79c4b4ccc..213793e001c82e77880400830709d0b0aaf4fdc7 100644
--- a/gcc/tree-loop-distribution.c
+++ b/gcc/tree-loop-distribution.c
@@ -46,6 +46,7 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "alias.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "hard-reg-set.h"
diff --git a/gcc/tree-outof-ssa.c b/gcc/tree-outof-ssa.c
index a253bb9bb2abf28a3db93a1ddea0f46b4f4574ec..7b747ab922cb6001a0fce073f59af036267c57f2 100644
--- a/gcc/tree-outof-ssa.c
+++ b/gcc/tree-outof-ssa.c
@@ -22,6 +22,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "rtl.h"
diff --git a/gcc/tree-parloops.c b/gcc/tree-parloops.c
index bda5d05cb6fca072e353b3de2f0ce33195a272df..036677bb123f59a578df92d4d394c378ca95d213 100644
--- a/gcc/tree-parloops.c
+++ b/gcc/tree-parloops.c
@@ -24,6 +24,7 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "alias.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "hard-reg-set.h"
diff --git a/gcc/tree-predcom.c b/gcc/tree-predcom.c
index 7751c5f9368223d628a0a6b05c7beb1d359e7e90..ea0d30cfa0d1b54f50b966bce0052ac219203740 100644
--- a/gcc/tree-predcom.c
+++ b/gcc/tree-predcom.c
@@ -188,6 +188,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "predict.h"
#include "tree.h"
#include "gimple.h"
#include "rtl.h"
diff --git a/gcc/tree-pretty-print.c b/gcc/tree-pretty-print.c
index 781e475c5114e36e62ce82fb0d334a6535c056a7..7cd1fe75ab886de07e0e2744e6efb15503882a2a 100644
--- a/gcc/tree-pretty-print.c
+++ b/gcc/tree-pretty-print.c
@@ -22,6 +22,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "predict.h"
#include "alias.h"
#include "tree.h"
#include "stor-layout.h"
diff --git a/gcc/tree-profile.c b/gcc/tree-profile.c
index b6f7a3968e72f6f1907354853a1e6d9a46484283..4dcc58d146db74aaf1ad2cc5e83a4e0c6a6d41c5 100644
--- a/gcc/tree-profile.c
+++ b/gcc/tree-profile.c
@@ -28,6 +28,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "hard-reg-set.h"
diff --git a/gcc/tree-sra.c b/gcc/tree-sra.c
index 3f6111c160f3f6b691c698655ca49e21b7b9d5f6..77e8735a5ad3d2b69568278accf4ec91e27dc18e 100644
--- a/gcc/tree-sra.c
+++ b/gcc/tree-sra.c
@@ -76,6 +76,7 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "alloc-pool.h"
#include "backend.h"
+#include "predict.h"
#include "tree.h"
#include "gimple.h"
#include "rtl.h"
diff --git a/gcc/tree-ssa-coalesce.c b/gcc/tree-ssa-coalesce.c
index bd2b97e42d4c1ba719d6a05675a33c8db674d9ff..bf8983f0a60dbed5f4131071ff01d44ee0483977 100644
--- a/gcc/tree-ssa-coalesce.c
+++ b/gcc/tree-ssa-coalesce.c
@@ -22,6 +22,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "predict.h"
#include "tree.h"
#include "gimple.h"
#include "hard-reg-set.h"
diff --git a/gcc/tree-ssa-dce.c b/gcc/tree-ssa-dce.c
index 6c29d90c19222474981f9d642b72aa00dba3f35b..2d2edc801168d9c71e34d3f25b51c2634624fc6f 100644
--- a/gcc/tree-ssa-dce.c
+++ b/gcc/tree-ssa-dce.c
@@ -46,6 +46,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "rtl.h"
diff --git a/gcc/tree-ssa-dom.c b/gcc/tree-ssa-dom.c
index c138d52c4ef64ab9b5af7335314c7943f2946884..8ebc8877dfa8a68fd86c59ea568070d08ec206b5 100644
--- a/gcc/tree-ssa-dom.c
+++ b/gcc/tree-ssa-dom.c
@@ -22,6 +22,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "hard-reg-set.h"
diff --git a/gcc/tree-ssa-forwprop.c b/gcc/tree-ssa-forwprop.c
index 1d596f3cf0879b18e7b45c65f901a3adeab2279d..ccfde5f1e3668642402509afe73028778b757194 100644
--- a/gcc/tree-ssa-forwprop.c
+++ b/gcc/tree-ssa-forwprop.c
@@ -21,6 +21,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "rtl.h"
diff --git a/gcc/tree-ssa-ifcombine.c b/gcc/tree-ssa-ifcombine.c
index 3f0bc6e2739b3a14a857725b5d4457f10db1325a..e199689bdf30ee34ead2aba8ae8c97b70f3079ab 100644
--- a/gcc/tree-ssa-ifcombine.c
+++ b/gcc/tree-ssa-ifcombine.c
@@ -22,6 +22,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "rtl.h"
diff --git a/gcc/tree-ssa-loop-ch.c b/gcc/tree-ssa-loop-ch.c
index dafa40d80ebd75077d6a6966cfcd6212388da43f..19d1b4cf3efdb4d023d9306016aa639367c27dea 100644
--- a/gcc/tree-ssa-loop-ch.c
+++ b/gcc/tree-ssa-loop-ch.c
@@ -21,6 +21,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "hard-reg-set.h"
diff --git a/gcc/tree-ssa-loop-im.c b/gcc/tree-ssa-loop-im.c
index 8959b1437718aaac812a8afad1a4cc0d6e9c9f56..b85d9cb5956eba158665b5f380dd4ea0c690a32a 100644
--- a/gcc/tree-ssa-loop-im.c
+++ b/gcc/tree-ssa-loop-im.c
@@ -21,6 +21,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "hard-reg-set.h"
diff --git a/gcc/tree-ssa-loop-ivcanon.c b/gcc/tree-ssa-loop-ivcanon.c
index 7c11827e6b24be76cb3fbf7d3b7b9ad833b77ae1..eca70a908edd2e14ef1ea533d6b2b68f61943303 100644
--- a/gcc/tree-ssa-loop-ivcanon.c
+++ b/gcc/tree-ssa-loop-ivcanon.c
@@ -39,6 +39,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "hard-reg-set.h"
diff --git a/gcc/tree-ssa-loop-ivopts.c b/gcc/tree-ssa-loop-ivopts.c
index b022bd716b194d2024224c8f94b97451e02fa84f..ef03dd1e48aab54ced631338b376bfc151a52b8a 100644
--- a/gcc/tree-ssa-loop-ivopts.c
+++ b/gcc/tree-ssa-loop-ivopts.c
@@ -65,6 +65,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "rtl.h"
diff --git a/gcc/tree-ssa-loop-manip.c b/gcc/tree-ssa-loop-manip.c
index be58ae2e4fcbdd5af2da40285e18f22b16171e96..cb762df45240c52a07c32af70bff3ba736e05754 100644
--- a/gcc/tree-ssa-loop-manip.c
+++ b/gcc/tree-ssa-loop-manip.c
@@ -21,6 +21,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "hard-reg-set.h"
diff --git a/gcc/tree-ssa-loop-prefetch.c b/gcc/tree-ssa-loop-prefetch.c
index a4e5b80afba551d6c64c6145fad1029c10cbe6f2..1adaed598c934e846b68ac85df1c9c5c747f5ec6 100644
--- a/gcc/tree-ssa-loop-prefetch.c
+++ b/gcc/tree-ssa-loop-prefetch.c
@@ -21,6 +21,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "predict.h"
#include "tree.h"
#include "gimple.h"
#include "rtl.h"
diff --git a/gcc/tree-ssa-loop-unswitch.c b/gcc/tree-ssa-loop-unswitch.c
index 596593bc6233cb81b1e395351efcac11fec5da8c..a27363822df042d7a146c9a65ab0bf16af1982fa 100644
--- a/gcc/tree-ssa-loop-unswitch.c
+++ b/gcc/tree-ssa-loop-unswitch.c
@@ -21,6 +21,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "predict.h"
#include "tree.h"
#include "gimple.h"
#include "hard-reg-set.h"
diff --git a/gcc/tree-ssa-math-opts.c b/gcc/tree-ssa-math-opts.c
index bb3c2ef01a3c6bd438a8750249ee4799943a2dda..55382f3fca4138a468f350fe6d2b704fe48c0f75 100644
--- a/gcc/tree-ssa-math-opts.c
+++ b/gcc/tree-ssa-math-opts.c
@@ -88,6 +88,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "predict.h"
#include "tree.h"
#include "gimple.h"
#include "rtl.h"
diff --git a/gcc/tree-ssa-phiopt.c b/gcc/tree-ssa-phiopt.c
index 9014891e49f31ad69cea8cc55b48b79fc547d83d..666e0d946e95aae4d18d20db461ab20a81b37d82 100644
--- a/gcc/tree-ssa-phiopt.c
+++ b/gcc/tree-ssa-phiopt.c
@@ -21,6 +21,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "rtl.h"
diff --git a/gcc/tree-ssa-pre.c b/gcc/tree-ssa-pre.c
index 644fa267319a9a855ed2db9a5b4b31bc9ed48dfd..5c78c43f38ab32136a789fa563054c9d3b093510 100644
--- a/gcc/tree-ssa-pre.c
+++ b/gcc/tree-ssa-pre.c
@@ -23,6 +23,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "predict.h"
#include "tree.h"
#include "gimple.h"
#include "rtl.h"
diff --git a/gcc/tree-ssa-reassoc.c b/gcc/tree-ssa-reassoc.c
index 47a14bde2b28a3f544b61bc2bddc61796fbe7f0b..932c83ab3aaa9f1751ad76202b8b4573710884c9 100644
--- a/gcc/tree-ssa-reassoc.c
+++ b/gcc/tree-ssa-reassoc.c
@@ -22,6 +22,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "rtl.h"
diff --git a/gcc/tree-ssa-sink.c b/gcc/tree-ssa-sink.c
index 8108a163b58a0cf222f602481d90d3bfa2853d49..8118f357852e2372a264def6de419d67c0446f53 100644
--- a/gcc/tree-ssa-sink.c
+++ b/gcc/tree-ssa-sink.c
@@ -22,6 +22,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "hard-reg-set.h"
diff --git a/gcc/tree-ssa-tail-merge.c b/gcc/tree-ssa-tail-merge.c
index 018a9660b75953a0cd1ef686baf3f97d3fe76603..462c7d181b26f4c801d9a84273bd98c83a304a59 100644
--- a/gcc/tree-ssa-tail-merge.c
+++ b/gcc/tree-ssa-tail-merge.c
@@ -189,6 +189,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "hard-reg-set.h"
diff --git a/gcc/tree-ssa-threadedge.c b/gcc/tree-ssa-threadedge.c
index 4ab161a7b455e5e405a6de65dccc24cfe3d53b9b..7164122823705735247a05762910762189995cc2 100644
--- a/gcc/tree-ssa-threadedge.c
+++ b/gcc/tree-ssa-threadedge.c
@@ -22,6 +22,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "predict.h"
#include "tree.h"
#include "gimple.h"
#include "hard-reg-set.h"
diff --git a/gcc/tree-ssa-threadupdate.c b/gcc/tree-ssa-threadupdate.c
index 8e86ee4d8aca80616921ab1f9ef63332397b44f6..6af09b53791e084d762af90f202726b279ae2aaa 100644
--- a/gcc/tree-ssa-threadupdate.c
+++ b/gcc/tree-ssa-threadupdate.c
@@ -22,6 +22,7 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "alias.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "hard-reg-set.h"
diff --git a/gcc/tree-ssa.c b/gcc/tree-ssa.c
index 24989ad889f84bcad24cbfbbaad8900ea87ed668..96464665c479953c0af089b2239dfb0fdd832caa 100644
--- a/gcc/tree-ssa.c
+++ b/gcc/tree-ssa.c
@@ -21,6 +21,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "hard-reg-set.h"
diff --git a/gcc/tree-switch-conversion.c b/gcc/tree-switch-conversion.c
index 81a93a2724b6aa458e2492e85b9a35b99210cb7f..32019120b904de22b532c86ddea46eb29c17614f 100644
--- a/gcc/tree-switch-conversion.c
+++ b/gcc/tree-switch-conversion.c
@@ -26,6 +26,7 @@ Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "rtl.h"
diff --git a/gcc/tree-tailcall.c b/gcc/tree-tailcall.c
index 25936bb73dbef703e91f948c38176b549cc2e64a..7b723c2caebe3f29a20296581e803898b8446449 100644
--- a/gcc/tree-tailcall.c
+++ b/gcc/tree-tailcall.c
@@ -21,6 +21,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "rtl.h"
diff --git a/gcc/tree-vect-data-refs.c b/gcc/tree-vect-data-refs.c
index 26d7d8faa442faa588e9d920cc99f54e2b271000..603facaaeb4f3a3a812a18a5f88f2a3764acd3b1 100644
--- a/gcc/tree-vect-data-refs.c
+++ b/gcc/tree-vect-data-refs.c
@@ -24,6 +24,7 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "dumpfile.h"
#include "backend.h"
+#include "predict.h"
#include "tree.h"
#include "gimple.h"
#include "rtl.h"
diff --git a/gcc/tree-vect-loop-manip.c b/gcc/tree-vect-loop-manip.c
index cd7fb91032b0be156c2f31351693d7b1bce3d146..26fb841e2678c2cb7c8a9fa5e271a3fcb0b38cdb 100644
--- a/gcc/tree-vect-loop-manip.c
+++ b/gcc/tree-vect-loop-manip.c
@@ -24,6 +24,7 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "dumpfile.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "hard-reg-set.h"
diff --git a/gcc/tree-vect-loop.c b/gcc/tree-vect-loop.c
index 83a993f2690ec72c225de1cd0f86b7f327a03981..9145dbf19e169ab05ee04fa276777a8439c68f2c 100644
--- a/gcc/tree-vect-loop.c
+++ b/gcc/tree-vect-loop.c
@@ -24,6 +24,7 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "dumpfile.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "rtl.h"
diff --git a/gcc/tree-vectorizer.c b/gcc/tree-vectorizer.c
index 7b524cb9f0eac6b011402f820fdf315b7e57c377..85a0cf66a2a6550369b56d0f382dd9b7c0322910 100644
--- a/gcc/tree-vectorizer.c
+++ b/gcc/tree-vectorizer.c
@@ -59,6 +59,7 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "dumpfile.h"
#include "backend.h"
+#include "predict.h"
#include "tree.h"
#include "gimple.h"
#include "hard-reg-set.h"
diff --git a/gcc/tree-vrp.c b/gcc/tree-vrp.c
index db824c435bffab3044764033e44170178e1888f9..04ef4a5da406a3bc3eeb5d6dc2f71c2c90d885d9 100644
--- a/gcc/tree-vrp.c
+++ b/gcc/tree-vrp.c
@@ -22,6 +22,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "rtl.h"
diff --git a/gcc/ubsan.c b/gcc/ubsan.c
index 1e3210428c2b0bdff1c72ddf5d38457f124d49a8..d75c4ee0f3de8f2152cf2bbb172d19085db2bd92 100644
--- a/gcc/ubsan.c
+++ b/gcc/ubsan.c
@@ -23,6 +23,7 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "alias.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "rtl.h"
diff --git a/gcc/value-prof.c b/gcc/value-prof.c
index 20299183ec768f2fd11a4593087b592d513fc5d1..8aace8c872c9bf847c23c9cde1f65a39d9e8bfb2 100644
--- a/gcc/value-prof.c
+++ b/gcc/value-prof.c
@@ -21,6 +21,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "tree.h"
#include "gimple.h"
#include "rtl.h"
diff --git a/gcc/var-tracking.c b/gcc/var-tracking.c
index b7ecea8092ac4f4fcb38ec70fbb70de04f5d2bca..b5b0cb6a3bdbb0d623b4a8c769edb4734401490b 100644
--- a/gcc/var-tracking.c
+++ b/gcc/var-tracking.c
@@ -89,6 +89,7 @@
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "cfghooks.h"
#include "rtl.h"
#include "alias.h"
#include "tree.h"
diff --git a/gcc/varasm.c b/gcc/varasm.c
index b69b3a3885f567b621825167d3ee9868d5a78214..6a4ba0bb8f5107c338c623480990132c9c3854c0 100644
--- a/gcc/varasm.c
+++ b/gcc/varasm.c
@@ -29,6 +29,7 @@ along with GCC; see the file COPYING3. If not see
#include "system.h"
#include "coretypes.h"
#include "backend.h"
+#include "predict.h"
#include "rtl.h"
#include "alias.h"
#include "tree.h"