From c582198bd9e28ee85e7bf4d4caa68e1ce9b0d924 Mon Sep 17 00:00:00 2001
From: Andrew MacLeod <amacleod@redhat.com>
Date: Tue, 28 Oct 2014 16:17:19 +0000
Subject: [PATCH] cgraph.h: Flatten.
* cgraph.h: Flatten. Remove all include files.
(symbol_table::initialize): Move to cgraph.c.
* cgraph.c: Adjust include files.
(symbol_table::initialize): Relocate from cgraph.h.
* gengtype.c (open_base_files): Adjust include files.
* gccplugin.h: Add hash-map.h, is-a.h, plugin-api.h, and ipa-ref.h to
included files.
* ipa-inline.h: Remove all include files.
* ipa-prop.h: Ditto.
* ipa-reference.h: Ditto.
* ipa-utils.h: Ditto:
* lto-streamer.h: Remove cgraph.h from include list.
* asan.c: Adjust include files.
* auto-profile.c: Ditto.
* bb-reorder.c: Ditto.
* calls.c: Ditto.
* cfgexpand.c: Ditto.
* cgraphbuild.c: Ditto.
* cgraphclones.c: Ditto.
* cgraphunit.c: Ditto.
* combine.c: Ditto.
* coverage.c: Ditto.
* data-streamer.c: Ditto.
* data-streamer-in.c: Ditto.
* data-streamer-out.c: Ditto.
* dbxout.c: Ditto.
* dwarf2out.c: Ditto.
* except.c: Ditto.
* expr.c: Ditto.
* final.c: Ditto.
* fold-const.c: Ditto.
* ggc-page.c: Ditto.
* gimple-fold.c: Ditto.
* gimple-iterator.c: Ditto.
* gimple-pretty-print.c: Ditto.
* gimple-streamer-in.c: Ditto.
* gimple-streamer-out.c: Ditto.
* gimplify.c: Ditto.
* ipa.c: Ditto.
* ipa-comdats.c: Ditto.
* ipa-cp.c: Ditto.
* ipa-devirt.c: Ditto.
* ipa-icf.c: Ditto.
* ipa-icf-gimple.c: Ditto.
* ipa-inline-analysis.c: Ditto.
* ipa-inline.c: Ditto.
* ipa-inline-transform.c: Ditto.
* ipa-polymorphic-call.c: Ditto.
* ipa-profile.c: Ditto.
* ipa-prop.c: Ditto.
* ipa-pure-const.c: Ditto.
* ipa-ref.c: Ditto.
* ipa-reference.c: Ditto.
* ipa-split.c: Ditto.
* ipa-utils.c: Ditto.
* ipa-visibility.c: Ditto.
* langhooks.c: Ditto.
* lto-cgraph.c: Ditto.
* lto-compress.c: Ditto.
* lto-opts.c: Ditto.
* lto-section-in.c: Ditto.
* lto-section-out.c: Ditto.
* lto-streamer.c: Ditto.
* lto-streamer-in.c: Ditto.
* lto-streamer-out.c: Ditto.
* omp-low.c: Ditto.
* opts-global.c: Ditto.
* passes.c: Ditto.
* predict.c: Ditto.
* print-tree.c: Ditto.
* profile.c: Ditto.
* ree.c: Ditto.
* stor-layout.c: Ditto.
* symtab.c: Ditto.
* toplev.c: Ditto.
* trans-mem.c: Ditto.
* tree.c: Ditto.
* tree-cfg.c: Ditto.
* tree-eh.c: Ditto.
* tree-emutls.c: Ditto.
* tree-inline.c: Ditto.
* tree-nested.c: Ditto.
* tree-pretty-print.c: Ditto.
* tree-profile.c: Ditto.
* tree-sra.c: Ditto.
* tree-ssa-alias.c: Ditto.
* tree-ssa-loop-ivcanon.c: Ditto.
* tree-ssa-loop-ivopts.c: Ditto.
* tree-ssa-pre.c: Ditto.
* tree-ssa-structalias.c: Ditto.
* tree-streamer.c: Ditto.
* tree-streamer-in.c: Ditto.
* tree-streamer-out.c: Ditto.
* tree-switch-conversion.c: Ditto.
* tree-tailcall.c: Ditto.
* tree-vect-data-refs.c: Ditto.
* tree-vectorizer.c: Ditto.
* tree-vect-stmts.c: Ditto.
* tsan.c: Ditto.
* ubsan.c: Ditto.
* value-prof.c: Ditto.
* varasm.c: Ditto.
* varpool.c: Ditto.
* config/arm/arm.c: Ditto.
* config/bfin/bfin.c: Ditto.
* config/c6x/c6x.c: Ditto.
* config/cris/cris.c: Ditto.
* config/darwin.c: Ditto.
* config/darwin-c.c: Ditto.
* config/i386/i386.c: Ditto.
* config/i386/winnt.c: Ditto.
* config/microblaze/microblaze.c: Ditto.
* config/mips/mips.c: Ditto.
* config/rs6000/rs6000.c: Ditto.
* config/rx/rx.c: Ditto.
* ada/gcc-interface/trans.c: Adjust include files.
* ada/gcc-interface/utils.c: Ditto.
* c/c-decl.c: Adjust include files.
* c/c-parser.c: Ditto.
* c-family/c-common.c: Adjust include files.
* c-family/c-gimplify.c: Ditto.
* c-family/cilk.c: Ditto.
* c-family/c-pragma.c: Ditto.
* c-family/c-ubsan.c: Ditto.
* cp/call.c: Adjust include files.
* cp/class.c: Ditto.
* cp/decl2.c: Ditto.
* cp/decl.c: Ditto.
* cp/lambda.c: Ditto.
* cp/mangle.c: Ditto.
* cp/method.c: Ditto.
* cp/optimize.c: Ditto.
* cp/parser.c: Ditto.
* cp/semantics.c: Ditto.
* cp/tree.c: Ditto.
* cp/vtable-class-hierarchy.c: Ditto.
* fortran/f95-lang.c: Adjust include files.
* fortran/trans-decl.c: Ditto.
* go/go-gcc.cc: Adjust include files.
* java/class.c: Adjust include files.
* java/decl.c: Ditto.
* java/jcf-parse.c: Ditto.
* java/resource.c: Ditto.
* lto/lto.c: Adjust include files.
* lto/lto-lang.c: Ditto.
* lto/lto-object.c: Ditto.
* lto/lto-partition.c: Ditto.
* lto/lto-symtab.c: Ditto.
* objc/objc-act.c: Adjust include files.
From-SVN: r216805
---
gcc/ChangeLog | 118 +++++++++++++++++++++++++++++
gcc/ada/ChangeLog | 5 ++
gcc/ada/gcc-interface/trans.c | 10 +++
gcc/ada/gcc-interface/utils.c | 11 +++
gcc/asan.c | 3 +
gcc/auto-profile.c | 5 ++
gcc/bb-reorder.c | 4 +
gcc/c-family/ChangeLog | 8 ++
gcc/c-family/c-common.c | 10 +++
gcc/c-family/c-gimplify.c | 3 +
gcc/c-family/c-pragma.c | 4 +
gcc/c-family/c-ubsan.c | 12 +++
gcc/c-family/cilk.c | 12 +++
gcc/c/ChangeLog | 5 ++
gcc/c/c-decl.c | 4 +
gcc/c/c-parser.c | 9 +++
gcc/calls.c | 3 +
gcc/cfgexpand.c | 3 +
gcc/cgraph.c | 21 ++++-
gcc/cgraph.h | 20 +----
gcc/cgraphbuild.c | 6 ++
gcc/cgraphclones.c | 5 ++
gcc/cgraphunit.c | 5 ++
gcc/combine.c | 4 +
gcc/config/arm/arm.c | 4 +
gcc/config/bfin/bfin.c | 4 +
gcc/config/c6x/c6x.c | 4 +
gcc/config/cris/cris.c | 4 +
gcc/config/darwin-c.c | 11 +++
gcc/config/darwin.c | 4 +
gcc/config/i386/i386.c | 5 +-
gcc/config/i386/winnt.c | 4 +
gcc/config/microblaze/microblaze.c | 4 +
gcc/config/mips/mips.c | 3 +
gcc/config/rs6000/rs6000.c | 3 +
gcc/config/rx/rx.c | 4 +
gcc/coverage.c | 4 +
gcc/cp/ChangeLog | 15 ++++
gcc/cp/call.c | 11 +++
gcc/cp/class.c | 11 +++
gcc/cp/decl.c | 10 +++
gcc/cp/decl2.c | 11 +++
gcc/cp/lambda.c | 13 +++-
gcc/cp/mangle.c | 11 +++
gcc/cp/method.c | 11 +++
gcc/cp/optimize.c | 9 +++
gcc/cp/parser.c | 11 +++
gcc/cp/semantics.c | 11 +++
gcc/cp/tree.c | 11 +++
gcc/cp/vtable-class-hierarchy.c | 12 +++
gcc/data-streamer-in.c | 4 +
gcc/data-streamer-out.c | 4 +
gcc/data-streamer.c | 4 +
gcc/dbxout.c | 4 +
gcc/dwarf2out.c | 4 +
gcc/except.c | 4 +
gcc/expr.c | 3 +
gcc/final.c | 4 +
gcc/fold-const.c | 3 +
gcc/fortran/ChangeLog | 5 ++
gcc/fortran/f95-lang.c | 4 +
gcc/fortran/trans-decl.c | 4 +
gcc/gcc-plugin.h | 4 +
gcc/gengtype.c | 8 +-
gcc/ggc-page.c | 11 +++
gcc/gimple-fold.c | 4 +
gcc/gimple-iterator.c | 3 +
gcc/gimple-pretty-print.c | 3 +
gcc/gimple-streamer-in.c | 4 +
gcc/gimple-streamer-out.c | 4 +
gcc/gimplify.c | 3 +
gcc/go/ChangeLog | 4 +
gcc/go/go-gcc.cc | 8 +-
gcc/ipa-comdats.c | 12 ++-
gcc/ipa-cp.c | 14 ++++
gcc/ipa-devirt.c | 15 +++-
gcc/ipa-icf-gimple.c | 4 +
gcc/ipa-icf.c | 6 ++
gcc/ipa-inline-analysis.c | 6 +-
gcc/ipa-inline-transform.c | 13 ++++
gcc/ipa-inline.c | 5 ++
gcc/ipa-inline.h | 1 -
gcc/ipa-polymorphic-call.c | 13 ++++
gcc/ipa-profile.c | 12 +++
gcc/ipa-prop.c | 5 ++
gcc/ipa-prop.h | 3 -
gcc/ipa-pure-const.c | 4 +
gcc/ipa-ref.c | 12 +++
gcc/ipa-reference.c | 5 ++
gcc/ipa-reference.h | 2 -
gcc/ipa-split.c | 5 ++
gcc/ipa-utils.c | 7 ++
gcc/ipa-utils.h | 1 -
gcc/ipa-visibility.c | 11 +++
gcc/ipa.c | 15 +++-
gcc/java/ChangeLog | 7 ++
gcc/java/class.c | 4 +
gcc/java/decl.c | 13 +++-
gcc/java/jcf-parse.c | 11 +++
gcc/java/resource.c | 4 +
gcc/langhooks.c | 11 +++
gcc/lto-cgraph.c | 4 +
gcc/lto-compress.c | 4 +
gcc/lto-opts.c | 4 +
gcc/lto-section-in.c | 4 +
gcc/lto-section-out.c | 4 +
gcc/lto-streamer-in.c | 4 +
gcc/lto-streamer-out.c | 4 +
gcc/lto-streamer.c | 4 +
gcc/lto-streamer.h | 1 -
gcc/lto/ChangeLog | 8 ++
gcc/lto/lto-lang.c | 4 +
gcc/lto/lto-object.c | 4 +
gcc/lto/lto-partition.c | 5 ++
gcc/lto/lto-symtab.c | 5 ++
gcc/lto/lto.c | 14 +++-
gcc/objc/ChangeLog | 4 +
gcc/objc/objc-act.c | 4 +
gcc/omp-low.c | 4 +
gcc/opts-global.c | 4 +
gcc/passes.c | 5 +-
gcc/predict.c | 2 +
gcc/print-tree.c | 11 +++
gcc/profile.c | 3 +
gcc/ree.c | 4 +
gcc/stor-layout.c | 4 +
gcc/symtab.c | 3 +
gcc/toplev.c | 5 ++
gcc/trans-mem.c | 3 +
gcc/tree-cfg.c | 2 +
gcc/tree-eh.c | 3 +
gcc/tree-emutls.c | 4 +-
gcc/tree-inline.c | 5 ++
gcc/tree-nested.c | 3 +
gcc/tree-pretty-print.c | 9 +++
gcc/tree-profile.c | 3 +
gcc/tree-sra.c | 3 +
gcc/tree-ssa-alias.c | 5 ++
gcc/tree-ssa-loop-ivcanon.c | 3 +
gcc/tree-ssa-loop-ivopts.c | 2 +
gcc/tree-ssa-pre.c | 4 +
gcc/tree-ssa-structalias.c | 3 +
gcc/tree-streamer-in.c | 4 +
gcc/tree-streamer-out.c | 4 +
gcc/tree-streamer.c | 3 +
gcc/tree-switch-conversion.c | 3 +
gcc/tree-tailcall.c | 4 +
gcc/tree-vect-data-refs.c | 3 +
gcc/tree-vect-stmts.c | 3 +
gcc/tree-vectorizer.c | 3 +
gcc/tree.c | 3 +
gcc/tsan.c | 3 +
gcc/ubsan.c | 13 +++-
gcc/value-prof.c | 4 +
gcc/varasm.c | 4 +
gcc/varpool.c | 13 +++-
156 files changed, 1014 insertions(+), 50 deletions(-)
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 00708ed6d5e9..4de57e05a54b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,121 @@
+2014-10-28 Andrew MacLeod <amacleod@redhat.com>
+
+ * cgraph.h: Flatten. Remove all include files.
+ (symbol_table::initialize): Move to cgraph.c.
+ * cgraph.c: Adjust include files.
+ (symbol_table::initialize): Relocate from cgraph.h.
+ * gengtype.c (open_base_files): Adjust include files.
+ * gccplugin.h: Add hash-map.h, is-a.h, plugin-api.h, and ipa-ref.h to
+ included files.
+ * ipa-inline.h: Remove all include files.
+ * ipa-prop.h: Ditto.
+ * ipa-reference.h: Ditto.
+ * ipa-utils.h: Ditto:
+ * lto-streamer.h: Remove cgraph.h from include list.
+ * asan.c: Adjust include files.
+ * auto-profile.c: Ditto.
+ * bb-reorder.c: Ditto.
+ * calls.c: Ditto.
+ * cfgexpand.c: Ditto.
+ * cgraphbuild.c: Ditto.
+ * cgraphclones.c: Ditto.
+ * cgraphunit.c: Ditto.
+ * combine.c: Ditto.
+ * coverage.c: Ditto.
+ * data-streamer.c: Ditto.
+ * data-streamer-in.c: Ditto.
+ * data-streamer-out.c: Ditto.
+ * dbxout.c: Ditto.
+ * dwarf2out.c: Ditto.
+ * except.c: Ditto.
+ * expr.c: Ditto.
+ * final.c: Ditto.
+ * fold-const.c: Ditto.
+ * ggc-page.c: Ditto.
+ * gimple-fold.c: Ditto.
+ * gimple-iterator.c: Ditto.
+ * gimple-pretty-print.c: Ditto.
+ * gimple-streamer-in.c: Ditto.
+ * gimple-streamer-out.c: Ditto.
+ * gimplify.c: Ditto.
+ * ipa.c: Ditto.
+ * ipa-comdats.c: Ditto.
+ * ipa-cp.c: Ditto.
+ * ipa-devirt.c: Ditto.
+ * ipa-icf.c: Ditto.
+ * ipa-icf-gimple.c: Ditto.
+ * ipa-inline-analysis.c: Ditto.
+ * ipa-inline.c: Ditto.
+ * ipa-inline-transform.c: Ditto.
+ * ipa-polymorphic-call.c: Ditto.
+ * ipa-profile.c: Ditto.
+ * ipa-prop.c: Ditto.
+ * ipa-pure-const.c: Ditto.
+ * ipa-ref.c: Ditto.
+ * ipa-reference.c: Ditto.
+ * ipa-split.c: Ditto.
+ * ipa-utils.c: Ditto.
+ * ipa-visibility.c: Ditto.
+ * langhooks.c: Ditto.
+ * lto-cgraph.c: Ditto.
+ * lto-compress.c: Ditto.
+ * lto-opts.c: Ditto.
+ * lto-section-in.c: Ditto.
+ * lto-section-out.c: Ditto.
+ * lto-streamer.c: Ditto.
+ * lto-streamer-in.c: Ditto.
+ * lto-streamer-out.c: Ditto.
+ * omp-low.c: Ditto.
+ * opts-global.c: Ditto.
+ * passes.c: Ditto.
+ * predict.c: Ditto.
+ * print-tree.c: Ditto.
+ * profile.c: Ditto.
+ * ree.c: Ditto.
+ * stor-layout.c: Ditto.
+ * symtab.c: Ditto.
+ * toplev.c: Ditto.
+ * trans-mem.c: Ditto.
+ * tree.c: Ditto.
+ * tree-cfg.c: Ditto.
+ * tree-eh.c: Ditto.
+ * tree-emutls.c: Ditto.
+ * tree-inline.c: Ditto.
+ * tree-nested.c: Ditto.
+ * tree-pretty-print.c: Ditto.
+ * tree-profile.c: Ditto.
+ * tree-sra.c: Ditto.
+ * tree-ssa-alias.c: Ditto.
+ * tree-ssa-loop-ivcanon.c: Ditto.
+ * tree-ssa-loop-ivopts.c: Ditto.
+ * tree-ssa-pre.c: Ditto.
+ * tree-ssa-structalias.c: Ditto.
+ * tree-streamer.c: Ditto.
+ * tree-streamer-in.c: Ditto.
+ * tree-streamer-out.c: Ditto.
+ * tree-switch-conversion.c: Ditto.
+ * tree-tailcall.c: Ditto.
+ * tree-vect-data-refs.c: Ditto.
+ * tree-vectorizer.c: Ditto.
+ * tree-vect-stmts.c: Ditto.
+ * tsan.c: Ditto.
+ * ubsan.c: Ditto.
+ * value-prof.c: Ditto.
+ * varasm.c: Ditto.
+ * varpool.c: Ditto.
+ * config/arm/arm.c: Ditto.
+ * config/bfin/bfin.c: Ditto.
+ * config/c6x/c6x.c: Ditto.
+ * config/cris/cris.c: Ditto.
+ * config/darwin.c: Ditto.
+ * config/darwin-c.c: Ditto.
+ * config/i386/i386.c: Ditto.
+ * config/i386/winnt.c: Ditto.
+ * config/microblaze/microblaze.c: Ditto.
+ * config/mips/mips.c: Ditto.
+ * config/rs6000/rs6000.c: Ditto.
+ * config/rx/rx.c: Ditto.
+
2014-10-28 Richard Biener <rguenther@suse.de>
* gimple-fold.h (follow_single_use_edges): Declare.
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index f4aba2339054..aab7f4cc6188 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-28 Andrew MacLeod <amacleod@redhat.com>
+
+ * gcc-interface/trans.c: Adjust include files.
+ * gcc-interface/utils.c: Ditto.
+
2014-10-27 Eric Botcazou <ebotcazou@adacore.com>
* gcc-interface/utils.c (create_subprog_decl): Adjust condition.
diff --git a/gcc/ada/gcc-interface/trans.c b/gcc/ada/gcc-interface/trans.c
index 7c3edd399aa2..6f6ee816ee84 100644
--- a/gcc/ada/gcc-interface/trans.c
+++ b/gcc/ada/gcc-interface/trans.c
@@ -40,6 +40,16 @@
#include "gimple-expr.h"
#include "gimplify.h"
#include "bitmap.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "vec.h"
+#include "hashtab.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
+#include "function.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "diagnostic.h"
#include "opts.h"
diff --git a/gcc/ada/gcc-interface/utils.c b/gcc/ada/gcc-interface/utils.c
index e823a35b1afb..98409539d09b 100644
--- a/gcc/ada/gcc-interface/utils.c
+++ b/gcc/ada/gcc-interface/utils.c
@@ -42,6 +42,17 @@
#include "target.h"
#include "common/common-target.h"
#include "langhooks.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "vec.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
+#include "function.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "diagnostic.h"
#include "timevar.h"
diff --git a/gcc/asan.c b/gcc/asan.c
index ad366903847d..d4adeb335725 100644
--- a/gcc/asan.c
+++ b/gcc/asan.c
@@ -49,6 +49,9 @@ along with GCC; see the file COPYING3. If not see
#include "varasm.h"
#include "stor-layout.h"
#include "tree-iterator.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "stringpool.h"
#include "tree-ssanames.h"
diff --git a/gcc/auto-profile.c b/gcc/auto-profile.c
index acc94469e308..8c7b4ca2189d 100644
--- a/gcc/auto-profile.c
+++ b/gcc/auto-profile.c
@@ -59,10 +59,15 @@ along with GCC; see the file COPYING3. If not see
#include "gimple.h"
#include "gimple-iterator.h"
#include "gimple-ssa.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "value-prof.h"
#include "coverage.h"
#include "params.h"
+#include "alloc-pool.h"
+#include "ipa-prop.h"
#include "ipa-inline.h"
#include "tree-inline.h"
#include "stringpool.h"
diff --git a/gcc/bb-reorder.c b/gcc/bb-reorder.c
index d29a95160d2f..b6985d401e25 100644
--- a/gcc/bb-reorder.c
+++ b/gcc/bb-reorder.c
@@ -113,6 +113,10 @@
#include "basic-block.h"
#include "df.h"
#include "bb-reorder.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "except.h"
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index d76a7cb7ea03..17cc8c0f1419 100644
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,11 @@
+2014-10-28 Andrew MacLeod <amacleod@redhat.com>
+
+ * c-family/c-common.c: Adjust include files.
+ * c-family/c-gimplify.c: Ditto.
+ * c-family/cilk.c: Ditto.
+ * c-family/c-pragma.c: Ditto.
+ * c-family/c-ubsan.c: Ditto.
+
2014-10-27 Andrew MacLeod <amacleod@redhat.com>
* c-gimplify.c: Adjust include files.
diff --git a/gcc/c-family/c-common.c b/gcc/c-family/c-common.c
index cd73e2727282..d42a8789ce67 100644
--- a/gcc/c-family/c-common.c
+++ b/gcc/c-family/c-common.c
@@ -46,6 +46,16 @@ along with GCC; see the file COPYING3. If not see
#include "tree-iterator.h"
#include "hashtab.h"
#include "opts.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "vec.h"
+#include "hash-set.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
+#include "function.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "target-def.h"
#include "gimplify.h"
diff --git a/gcc/c-family/c-gimplify.c b/gcc/c-family/c-gimplify.c
index 065553607cf1..05fadb783a17 100644
--- a/gcc/c-family/c-gimplify.c
+++ b/gcc/c-family/c-gimplify.c
@@ -51,6 +51,9 @@ along with GCC; see the file COPYING3. If not see
#include "flags.h"
#include "dumpfile.h"
#include "c-pretty-print.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "cilk.h"
#include "c-ubsan.h"
diff --git a/gcc/c-family/c-pragma.c b/gcc/c-family/c-pragma.c
index debd5f6fca36..3183410e72a7 100644
--- a/gcc/c-family/c-pragma.c
+++ b/gcc/c-family/c-pragma.c
@@ -44,6 +44,10 @@ along with GCC; see the file COPYING3. If not see
#include "diagnostic.h"
#include "opts.h"
#include "plugin.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#define GCC_BAD(gmsgid) \
diff --git a/gcc/c-family/c-ubsan.c b/gcc/c-family/c-ubsan.c
index 7f4dc258e01c..ab16799b0c93 100644
--- a/gcc/c-family/c-ubsan.c
+++ b/gcc/c-family/c-ubsan.c
@@ -23,6 +23,18 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tree.h"
#include "alloc-pool.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "vec.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "machmode.h"
+#include "tm.h"
+#include "hard-reg-set.h"
+#include "input.h"
+#include "function.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "output.h"
#include "toplev.h"
diff --git a/gcc/c-family/cilk.c b/gcc/c-family/cilk.c
index 20b343214d4f..f28a9d828048 100644
--- a/gcc/c-family/cilk.c
+++ b/gcc/c-family/cilk.c
@@ -33,6 +33,18 @@ along with GCC; see the file COPYING3. If not see
#include "tree-inline.h"
#include "c-family/c-common.h"
#include "toplev.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "vec.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "machmode.h"
+#include "tm.h"
+#include "hard-reg-set.h"
+#include "input.h"
+#include "function.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "diagnostic.h"
#include "cilk.h"
diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog
index dcc5548a905d..693331242159 100644
--- a/gcc/c/ChangeLog
+++ b/gcc/c/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-28 Andrew MacLeod <amacleod@redhat.com>
+
+ * c-decl.c: Adjust include files.
+ * c-parser.c: Ditto.
+
2014-10-27 Phil Muldoon <pmuldoon@redhat.com>
Tom Tromey <tromey@redhat.com>
diff --git a/gcc/c/c-decl.c b/gcc/c/c-decl.c
index d0105ff122b9..8196a7def0ce 100644
--- a/gcc/c/c-decl.c
+++ b/gcc/c/c-decl.c
@@ -61,6 +61,10 @@ along with GCC; see the file COPYING3. If not see
#include "tree-iterator.h"
#include "diagnostic-core.h"
#include "dumpfile.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "hash-table.h"
#include "langhooks-def.h"
diff --git a/gcc/c/c-parser.c b/gcc/c/c-parser.c
index fa146de35d08..d316216cbe1d 100644
--- a/gcc/c/c-parser.c
+++ b/gcc/c/c-parser.c
@@ -58,6 +58,15 @@ along with GCC; see the file COPYING3. If not see
#include "c-family/c-objc.h"
#include "vec.h"
#include "target.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "function.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "plugin.h"
#include "omp-low.h"
diff --git a/gcc/calls.c b/gcc/calls.c
index 0aebff5e304c..1ddc6ed32038 100644
--- a/gcc/calls.c
+++ b/gcc/calls.c
@@ -53,6 +53,9 @@ along with GCC; see the file COPYING3. If not see
#include "sbitmap.h"
#include "langhooks.h"
#include "target.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "except.h"
#include "dbgcnt.h"
diff --git a/gcc/cfgexpand.c b/gcc/cfgexpand.c
index e889409c25b3..d78e50a8d722 100644
--- a/gcc/cfgexpand.c
+++ b/gcc/cfgexpand.c
@@ -56,6 +56,9 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-iterator.h"
#include "gimple-walk.h"
#include "gimple-ssa.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "tree-cfg.h"
#include "tree-phinodes.h"
diff --git a/gcc/cgraph.c b/gcc/cgraph.c
index 9a47ba24e53a..d430bc5524d1 100644
--- a/gcc/cgraph.c
+++ b/gcc/cgraph.c
@@ -43,6 +43,15 @@ along with GCC; see the file COPYING3. If not see
#include "dominance.h"
#include "cfg.h"
#include "basic-block.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
+#include "function.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "intl.h"
#include "tree-ssa-alias.h"
@@ -54,7 +63,6 @@ along with GCC; see the file COPYING3. If not see
#include "timevar.h"
#include "dumpfile.h"
#include "gimple-ssa.h"
-#include "cgraph.h"
#include "tree-cfg.h"
#include "tree-ssa.h"
#include "value-prof.h"
@@ -63,6 +71,8 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "ipa-utils.h"
#include "lto-streamer.h"
+#include "alloc-pool.h"
+#include "ipa-prop.h"
#include "ipa-inline.h"
#include "cfgloop.h"
#include "gimple-pretty-print.h"
@@ -243,6 +253,15 @@ cgraph_node::record_function_versions (tree decl1, tree decl2)
after->prev = before;
}
+/* Initialize callgraph dump file. */
+
+void
+symbol_table::initialize (void)
+{
+ if (!dump_file)
+ dump_file = dump_begin (TDI_cgraph, NULL);
+}
+
/* Allocate new callgraph node and insert it into basic data structures. */
cgraph_node *
diff --git a/gcc/cgraph.h b/gcc/cgraph.h
index 377adce517ee..ae73f075cce0 100644
--- a/gcc/cgraph.h
+++ b/gcc/cgraph.h
@@ -21,19 +21,6 @@ along with GCC; see the file COPYING3. If not see
#ifndef GCC_CGRAPH_H
#define GCC_CGRAPH_H
-#include "hash-map.h"
-#include "is-a.h"
-#include "plugin-api.h"
-#include "vec.h"
-#include "hashtab.h"
-#include "hash-set.h"
-#include "machmode.h"
-#include "tm.h"
-#include "hard-reg-set.h"
-#include "input.h"
-#include "function.h"
-#include "ipa-ref.h"
-#include "dumpfile.h"
/* Symbol table consists of functions and variables.
TODO: add labels and CONST_DECLs. */
@@ -1785,12 +1772,7 @@ public:
friend class cgraph_edge;
/* Initialize callgraph dump file. */
- inline void
- initialize (void)
- {
- if (!dump_file)
- dump_file = dump_begin (TDI_cgraph, NULL);
- }
+ void initialize (void);
/* Register a top-level asm statement ASM_STR. */
inline asm_node *finalize_toplevel_asm (tree asm_str);
diff --git a/gcc/cgraphbuild.c b/gcc/cgraphbuild.c
index 2dc10a60eff3..51ec01bf0329 100644
--- a/gcc/cgraphbuild.c
+++ b/gcc/cgraphbuild.c
@@ -45,8 +45,14 @@ along with GCC; see the file COPYING3. If not see
#include "langhooks.h"
#include "intl.h"
#include "tree-pass.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
#include "ipa-utils.h"
#include "except.h"
+#include "alloc-pool.h"
+#include "ipa-prop.h"
#include "ipa-inline.h"
/* Context of record_reference. */
diff --git a/gcc/cgraphclones.c b/gcc/cgraphclones.c
index a1ae50f44cba..c8892daf52d4 100644
--- a/gcc/cgraphclones.c
+++ b/gcc/cgraphclones.c
@@ -98,6 +98,11 @@ along with GCC; see the file COPYING3. If not see
#include "diagnostic.h"
#include "params.h"
#include "intl.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
+#include "alloc-pool.h"
#include "ipa-prop.h"
#include "tree-iterator.h"
#include "tree-dump.h"
diff --git a/gcc/cgraphunit.c b/gcc/cgraphunit.c
index 3e76bf0a68d0..a86bd1bcd035 100644
--- a/gcc/cgraphunit.c
+++ b/gcc/cgraphunit.c
@@ -199,6 +199,11 @@ along with GCC; see the file COPYING3. If not see
#include "params.h"
#include "fibheap.h"
#include "intl.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
+#include "alloc-pool.h"
#include "ipa-prop.h"
#include "tree-iterator.h"
#include "tree-pass.h"
diff --git a/gcc/combine.c b/gcc/combine.c
index a0e10d3c341e..0787d5031a93 100644
--- a/gcc/combine.c
+++ b/gcc/combine.c
@@ -112,6 +112,10 @@ along with GCC; see the file COPYING3. If not see
#include "tree-pass.h"
#include "df.h"
#include "valtrack.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "obstack.h"
#include "statistics.h"
diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
index d25a52d35da6..b424d929014d 100644
--- a/gcc/config/arm/arm.c
+++ b/gcc/config/arm/arm.c
@@ -59,6 +59,10 @@
#include "cfgbuild.h"
#include "cfgcleanup.h"
#include "basic-block.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "ggc.h"
#include "except.h"
diff --git a/gcc/config/bfin/bfin.c b/gcc/config/bfin/bfin.c
index 74313af11eb6..2906644dae62 100644
--- a/gcc/config/bfin/bfin.c
+++ b/gcc/config/bfin/bfin.c
@@ -58,6 +58,10 @@
#include "cfgbuild.h"
#include "cfgcleanup.h"
#include "basic-block.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "langhooks.h"
#include "bfin-protos.h"
diff --git a/gcc/config/c6x/c6x.c b/gcc/config/c6x/c6x.c
index ca563f89a371..1b44baa728e2 100644
--- a/gcc/config/c6x/c6x.c
+++ b/gcc/config/c6x/c6x.c
@@ -61,6 +61,10 @@
#include "input.h"
#include "function.h"
#include "diagnostic-core.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "langhooks.h"
#include "target.h"
diff --git a/gcc/config/cris/cris.c b/gcc/config/cris/cris.c
index 19e281ef1500..d3673fdf0b28 100644
--- a/gcc/config/cris/cris.c
+++ b/gcc/config/cris/cris.c
@@ -64,6 +64,10 @@ along with GCC; see the file COPYING3. If not see
#include "basic-block.h"
#include "df.h"
#include "opts.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "builtins.h"
diff --git a/gcc/config/darwin-c.c b/gcc/config/darwin-c.c
index 3460c54d9afd..ffefa37bcbe7 100644
--- a/gcc/config/darwin-c.c
+++ b/gcc/config/darwin-c.c
@@ -45,6 +45,17 @@ along with GCC; see the file COPYING3. If not see
#include "cfgbuild.h"
#include "cfgcleanup.h"
#include "basic-block.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "vec.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
+#include "function.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "../../libcpp/internal.h"
diff --git a/gcc/config/darwin.c b/gcc/config/darwin.c
index c9dfd87d99b8..ef898f35a0a0 100644
--- a/gcc/config/darwin.c
+++ b/gcc/config/darwin.c
@@ -70,6 +70,10 @@ along with GCC; see the file COPYING3. If not see
#include "is-a.h"
#include "gimple.h"
#include "gimplify.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
#include "lto-streamer.h"
#include "lto-section-names.h"
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index 71a4f6a3996a..2442f3464dca 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -64,6 +64,10 @@ along with GCC; see the file COPYING3. If not see
#include "common/common-target.h"
#include "langhooks.h"
#include "reload.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "hash-table.h"
#include "tree-ssa-alias.h"
@@ -71,7 +75,6 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-fold.h"
#include "tree-eh.h"
#include "gimple-expr.h"
-#include "is-a.h"
#include "gimple.h"
#include "gimplify.h"
#include "cfgloop.h"
diff --git a/gcc/config/i386/winnt.c b/gcc/config/i386/winnt.c
index 288cbde0ed0f..3e7902f6e7ad 100644
--- a/gcc/config/i386/winnt.c
+++ b/gcc/config/i386/winnt.c
@@ -60,6 +60,10 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-expr.h"
#include "is-a.h"
#include "gimple.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
#include "lto-streamer.h"
#include "lto-section-names.h"
#include "builtins.h"
diff --git a/gcc/config/microblaze/microblaze.c b/gcc/config/microblaze/microblaze.c
index 4549ee9da653..f9fc6d21da06 100644
--- a/gcc/config/microblaze/microblaze.c
+++ b/gcc/config/microblaze/microblaze.c
@@ -63,6 +63,10 @@
#include "df.h"
#include "optabs.h"
#include "diagnostic-core.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "builtins.h"
#include "rtl-iter.h"
diff --git a/gcc/config/mips/mips.c b/gcc/config/mips/mips.c
index 2f9d2da70f39..3c5ba86cfb26 100644
--- a/gcc/config/mips/mips.c
+++ b/gcc/config/mips/mips.c
@@ -82,6 +82,9 @@ along with GCC; see the file COPYING3. If not see
#include "opts.h"
#include "tree-pass.h"
#include "context.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "builtins.h"
#include "rtl-iter.h"
diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index 281e7c95d6c7..cd13e77c854f 100644
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -86,6 +86,9 @@
#include "opts.h"
#include "tree-vectorizer.h"
#include "dumpfile.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "target-globals.h"
#include "builtins.h"
diff --git a/gcc/config/rx/rx.c b/gcc/config/rx/rx.c
index 56a4b1407b1f..3b2822833ee1 100644
--- a/gcc/config/rx/rx.c
+++ b/gcc/config/rx/rx.c
@@ -68,6 +68,10 @@
#include "target-def.h"
#include "langhooks.h"
#include "opts.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "builtins.h"
diff --git a/gcc/coverage.c b/gcc/coverage.c
index 6b6bebc493e0..0f4fec1c9ca4 100644
--- a/gcc/coverage.c
+++ b/gcc/coverage.c
@@ -57,6 +57,10 @@ along with GCC; see the file COPYING3. If not see
#include "context.h"
#include "pass_manager.h"
#include "tree-pass.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "dumpfile.h"
#include "diagnostic-core.h"
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 90e69a36bc47..1a2e884a84bc 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,18 @@
+2014-10-28 Andrew MacLeod <amacleod@redhat.com>
+
+ * call.c: Adjust include files.
+ * class.c: Ditto.
+ * decl2.c: Ditto.
+ * decl.c: Ditto.
+ * lambda.c: Ditto.
+ * mangle.c: Ditto.
+ * method.c: Ditto.
+ * optimize.c: Ditto.
+ * parser.c: Ditto.
+ * semantics.c: Ditto.
+ * tree.c: Ditto.
+ * vtable-class-hierarchy.c: Ditto.
+
2014-10-24 Jason Merrill <jason@redhat.com>
Implement N3653 (Member initializers and aggregates) and fix
diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index 8a89aadeaf9c..31864e902d87 100644
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -40,6 +40,17 @@ along with GCC; see the file COPYING3. If not see
#include "langhooks.h"
#include "c-family/c-objc.h"
#include "timevar.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "vec.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
+#include "function.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "wide-int.h"
diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index 5f50aff2417f..ce1d07c90efe 100644
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -35,6 +35,17 @@ along with GCC; see the file COPYING3. If not see
#include "toplev.h"
#include "target.h"
#include "convert.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "vec.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
+#include "function.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "dumpfile.h"
#include "splay-tree.h"
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 1b214ab40907..320c39f636a2 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -58,6 +58,16 @@ along with GCC; see the file COPYING3. If not see
#include "timevar.h"
#include "splay-tree.h"
#include "plugin.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "vec.h"
+#include "hash-set.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
+#include "function.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "cilk.h"
#include "wide-int.h"
diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index 60c8a63e1b97..ff407101f081 100644
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -45,6 +45,17 @@ along with GCC; see the file COPYING3. If not see
#include "target.h"
#include "c-family/c-common.h"
#include "c-family/c-objc.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "vec.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
+#include "function.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "tree-inline.h"
#include "c-family/c-pragma.h"
diff --git a/gcc/cp/lambda.c b/gcc/cp/lambda.c
index d4030e332e7e..01a508aad565 100644
--- a/gcc/cp/lambda.c
+++ b/gcc/cp/lambda.c
@@ -26,11 +26,22 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tree.h"
#include "stringpool.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "vec.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "machmode.h"
+#include "tm.h"
+#include "hard-reg-set.h"
+#include "input.h"
+#include "function.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "tree-iterator.h"
#include "cp-tree.h"
#include "toplev.h"
-#include "vec.h"
/* Constructor for a lambda expression. */
diff --git a/gcc/cp/mangle.c b/gcc/cp/mangle.c
index 55f508a272a0..048c957519bb 100644
--- a/gcc/cp/mangle.c
+++ b/gcc/cp/mangle.c
@@ -57,6 +57,17 @@ along with GCC; see the file COPYING3. If not see
#include "obstack.h"
#include "flags.h"
#include "target.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "vec.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
+#include "function.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "wide-int.h"
diff --git a/gcc/cp/method.c b/gcc/cp/method.c
index 418ed8874d09..10751ed6ba65 100644
--- a/gcc/cp/method.c
+++ b/gcc/cp/method.c
@@ -35,6 +35,17 @@ along with GCC; see the file COPYING3. If not see
#include "target.h"
#include "common/common-target.h"
#include "diagnostic.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "vec.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
+#include "function.h"
+#include "ipa-ref.h"
#include "cgraph.h"
/* Various flags to control the mangling process. */
diff --git a/gcc/cp/optimize.c b/gcc/cp/optimize.c
index f37515ec257f..62e32d21bfff 100644
--- a/gcc/cp/optimize.c
+++ b/gcc/cp/optimize.c
@@ -36,6 +36,15 @@ along with GCC; see the file COPYING3. If not see
#include "diagnostic-core.h"
#include "dumpfile.h"
#include "tree-iterator.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "vec.h"
+#include "hash-set.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "function.h"
+#include "ipa-ref.h"
#include "cgraph.h"
/* Prototypes. */
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 62a815eb42cf..e142f42a4db2 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -36,6 +36,17 @@ along with GCC; see the file COPYING3. If not see
#include "flags.h"
#include "diagnostic-core.h"
#include "target.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "vec.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
+#include "function.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "c-family/c-common.h"
#include "c-family/c-objc.h"
diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index 26e66f512cf4..0d757cadf9cd 100644
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -41,6 +41,17 @@ along with GCC; see the file COPYING3. If not see
#include "flags.h"
#include "timevar.h"
#include "diagnostic.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "vec.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
+#include "function.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "tree-iterator.h"
#include "target.h"
diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c
index ef7f6756ef6b..32e7bd5499d9 100644
--- a/gcc/cp/tree.c
+++ b/gcc/cp/tree.c
@@ -32,6 +32,17 @@ along with GCC; see the file COPYING3. If not see
#include "tree-inline.h"
#include "debug.h"
#include "convert.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "vec.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
+#include "function.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "splay-tree.h"
#include "hash-table.h"
diff --git a/gcc/cp/vtable-class-hierarchy.c b/gcc/cp/vtable-class-hierarchy.c
index 54c5dd383a21..4d6de986fc54 100644
--- a/gcc/cp/vtable-class-hierarchy.c
+++ b/gcc/cp/vtable-class-hierarchy.c
@@ -115,6 +115,18 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "cp-tree.h"
#include "output.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "vec.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "machmode.h"
+#include "tm.h"
+#include "hard-reg-set.h"
+#include "input.h"
+#include "function.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "tree-iterator.h"
#include "vtable-verify.h"
diff --git a/gcc/data-streamer-in.c b/gcc/data-streamer-in.c
index 0aa604fa61a0..1ee3e9c5e38d 100644
--- a/gcc/data-streamer-in.c
+++ b/gcc/data-streamer-in.c
@@ -40,6 +40,10 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-expr.h"
#include "is-a.h"
#include "gimple.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
#include "data-streamer.h"
/* Read a string from the string table in DATA_IN using input block
diff --git a/gcc/data-streamer-out.c b/gcc/data-streamer-out.c
index 324003ead816..ca8b3ab7f42e 100644
--- a/gcc/data-streamer-out.c
+++ b/gcc/data-streamer-out.c
@@ -39,6 +39,10 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-expr.h"
#include "is-a.h"
#include "gimple.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
#include "data-streamer.h"
diff --git a/gcc/data-streamer.c b/gcc/data-streamer.c
index 3d15be11a730..e11746a8ee16 100644
--- a/gcc/data-streamer.c
+++ b/gcc/data-streamer.c
@@ -38,6 +38,10 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-expr.h"
#include "is-a.h"
#include "gimple.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
#include "data-streamer.h"
/* Pack WORK into BP in a variant of uleb format. */
diff --git a/gcc/dbxout.c b/gcc/dbxout.c
index 3452d470b667..9a84f5d2f08e 100644
--- a/gcc/dbxout.c
+++ b/gcc/dbxout.c
@@ -98,6 +98,10 @@ along with GCC; see the file COPYING3. If not see
#include "langhooks.h"
#include "obstack.h"
#include "expr.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#ifdef XCOFF_DEBUGGING_INFO
diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index 3bce20f345a7..77337bf40ebc 100644
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -94,6 +94,10 @@ along with GCC; see the file COPYING3. If not see
#include "target.h"
#include "common/common-target.h"
#include "langhooks.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "ira.h"
#include "lra.h"
diff --git a/gcc/except.c b/gcc/except.c
index fae9f50fb8f3..5f156b7a68f4 100644
--- a/gcc/except.c
+++ b/gcc/except.c
@@ -145,6 +145,10 @@ along with GCC; see the file COPYING3. If not see
#include "cfg.h"
#include "cfgrtl.h"
#include "basic-block.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "diagnostic.h"
#include "tree-pretty-print.h"
diff --git a/gcc/expr.c b/gcc/expr.c
index 78bdfa24869a..c39a4b78ad6d 100644
--- a/gcc/expr.c
+++ b/gcc/expr.c
@@ -61,6 +61,9 @@ along with GCC; see the file COPYING3. If not see
#include "is-a.h"
#include "gimple.h"
#include "gimple-ssa.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "tree-ssanames.h"
#include "target.h"
diff --git a/gcc/final.c b/gcc/final.c
index a3d004ca11fc..d5fa89d95dd2 100644
--- a/gcc/final.c
+++ b/gcc/final.c
@@ -80,6 +80,10 @@ along with GCC; see the file COPYING3. If not see
#include "debug.h"
#include "expr.h"
#include "tree-pass.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "tree-ssa.h"
#include "coverage.h"
diff --git a/gcc/fold-const.c b/gcc/fold-const.c
index 218afa01ab4b..b5a023ae11ed 100644
--- a/gcc/fold-const.c
+++ b/gcc/fold-const.c
@@ -77,6 +77,9 @@ along with GCC; see the file COPYING3. If not see
#include "tree-dfa.h"
#include "hash-table.h" /* Required for ENABLE_FOLD_CHECKING. */
#include "builtins.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "generic-match.h"
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 6c84d6192edb..743b1d4f4c9f 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-28 Andrew MacLeod <amacleod@redhat.com>
+
+ * f95-lang.c: Adjust include files.
+ * trans-decl.c: Ditto.
+
2014-10-24 Tobias Burnus <burnus@net-b.de>
* check.c (check_co_collective): Reject coindexed A args.
diff --git a/gcc/fortran/f95-lang.c b/gcc/fortran/f95-lang.c
index 403ab200830c..9c3ff228b771 100644
--- a/gcc/fortran/f95-lang.c
+++ b/gcc/fortran/f95-lang.c
@@ -47,6 +47,10 @@ along with GCC; see the file COPYING3. If not see
#include "debug.h"
#include "diagnostic.h" /* For errorcount/warningcount */
#include "dumpfile.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "cpp.h"
#include "trans.h"
diff --git a/gcc/fortran/trans-decl.c b/gcc/fortran/trans-decl.c
index 3fbc789b3469..07fefd90b2ab 100644
--- a/gcc/fortran/trans-decl.c
+++ b/gcc/fortran/trans-decl.c
@@ -44,6 +44,10 @@ along with GCC; see the file COPYING3. If not see
#include "input.h"
#include "function.h"
#include "flags.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "debug.h"
#include "constructor.h"
diff --git a/gcc/gcc-plugin.h b/gcc/gcc-plugin.h
index b632fb3a8aba..f1c13a50d04f 100644
--- a/gcc/gcc-plugin.h
+++ b/gcc/gcc-plugin.h
@@ -44,6 +44,10 @@ along with GCC; see the file COPYING3. If not see
#include "lcm.h"
#include "cfgbuild.h"
#include "cfgcleanup.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
/* Event names. */
enum plugin_event
diff --git a/gcc/gengtype.c b/gcc/gengtype.c
index e48b448b3fcc..f96c5931ce0b 100644
--- a/gcc/gengtype.c
+++ b/gcc/gengtype.c
@@ -1830,9 +1830,9 @@ open_base_files (void)
"hashtab.h", "splay-tree.h", "obstack.h", "bitmap.h", "input.h",
"tree.h", "rtl.h", "wide-int.h", "hashtab.h", "hash-set.h", "vec.h",
"machmode.h", "tm.h", "hard-reg-set.h", "input.h", "predict.h",
- "function.h", "insn-config.h", "expr.h",
+ "function.h", "insn-config.h", "expr.h", "alloc-pool.h",
"hard-reg-set.h", "basic-block.h", "cselib.h", "insn-addr.h",
- "optabs.h", "libfuncs.h", "debug.h", "ggc.h", "cgraph.h",
+ "optabs.h", "libfuncs.h", "debug.h", "ggc.h",
"hash-table.h", "vec.h", "ggc.h", "dominance.h", "cfg.h", "basic-block.h",
"tree-ssa-alias.h", "internal-fn.h", "gimple-fold.h", "tree-eh.h",
"gimple-expr.h", "is-a.h",
@@ -1841,8 +1841,8 @@ open_base_files (void)
"tree-ssa-loop.h", "tree-ssa-loop-ivopts.h", "tree-ssa-loop-manip.h",
"tree-ssa-loop-niter.h", "tree-into-ssa.h", "tree-dfa.h",
"tree-ssa.h", "reload.h", "cpp-id-data.h", "tree-chrec.h",
- "except.h", "output.h", "cfgloop.h",
- "target.h", "ipa-prop.h", "lto-streamer.h", "target-globals.h",
+ "except.h", "output.h", "cfgloop.h", "target.h", "lto-streamer.h",
+ "target-globals.h", "ipa-ref.h", "cgraph.h", "ipa-prop.h",
"ipa-inline.h", "dwarf2out.h", NULL
};
const char *const *ifp;
diff --git a/gcc/ggc-page.c b/gcc/ggc-page.c
index af0c1ef1e63c..f55c4e9c6fb2 100644
--- a/gcc/ggc-page.c
+++ b/gcc/ggc-page.c
@@ -30,6 +30,17 @@ along with GCC; see the file COPYING3. If not see
#include "ggc-internal.h"
#include "timevar.h"
#include "params.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "vec.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
+#include "function.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "cfgloop.h"
#include "plugin.h"
diff --git a/gcc/gimple-fold.c b/gcc/gimple-fold.c
index d0554f4e54f7..088a0dd0f33b 100644
--- a/gcc/gimple-fold.c
+++ b/gcc/gimple-fold.c
@@ -55,6 +55,10 @@ along with GCC; see the file COPYING3. If not see
#include "tree-ssa.h"
#include "tree-ssa-propagate.h"
#include "target.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
#include "ipa-utils.h"
#include "gimple-pretty-print.h"
#include "tree-ssa-address.h"
diff --git a/gcc/gimple-iterator.c b/gcc/gimple-iterator.c
index f7253dcf90c9..d64a46f8c7e2 100644
--- a/gcc/gimple-iterator.c
+++ b/gcc/gimple-iterator.c
@@ -42,6 +42,9 @@ along with GCC; see the file COPYING3. If not see
#include "gimple.h"
#include "gimple-iterator.h"
#include "gimple-ssa.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "tree-cfg.h"
#include "tree-phinodes.h"
diff --git a/gcc/gimple-pretty-print.c b/gcc/gimple-pretty-print.c
index e53f92aeb279..6ae781745d4b 100644
--- a/gcc/gimple-pretty-print.c
+++ b/gcc/gimple-pretty-print.c
@@ -45,6 +45,9 @@ along with GCC; see the file COPYING3. If not see
#include "gimple.h"
#include "gimple-iterator.h"
#include "gimple-ssa.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "tree-cfg.h"
#include "tree-ssanames.h"
diff --git a/gcc/gimple-streamer-in.c b/gcc/gimple-streamer-in.c
index efcbb347be3d..d1930dc281de 100644
--- a/gcc/gimple-streamer-in.c
+++ b/gcc/gimple-streamer-in.c
@@ -47,6 +47,10 @@ along with GCC; see the file COPYING3. If not see
#include "tree-phinodes.h"
#include "stringpool.h"
#include "tree-ssanames.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
#include "data-streamer.h"
#include "tree-streamer.h"
#include "gimple-streamer.h"
diff --git a/gcc/gimple-streamer-out.c b/gcc/gimple-streamer-out.c
index d2aa68953f3a..34a19134f0b0 100644
--- a/gcc/gimple-streamer-out.c
+++ b/gcc/gimple-streamer-out.c
@@ -41,6 +41,10 @@ along with GCC; see the file COPYING3. If not see
#include "gimple.h"
#include "gimple-iterator.h"
#include "gimple-ssa.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
#include "data-streamer.h"
#include "gimple-streamer.h"
#include "lto-streamer.h"
diff --git a/gcc/gimplify.c b/gcc/gimplify.c
index 30260595903f..38be0ce9f540 100644
--- a/gcc/gimplify.c
+++ b/gcc/gimplify.c
@@ -57,6 +57,9 @@ along with GCC; see the file COPYING3. If not see
#include "langhooks.h"
#include "bitmap.h"
#include "gimple-ssa.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "tree-cfg.h"
#include "tree-ssanames.h"
diff --git a/gcc/go/ChangeLog b/gcc/go/ChangeLog
index 9d33a6a05bf5..97aae4bbf2f2 100644
--- a/gcc/go/ChangeLog
+++ b/gcc/go/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-28 Andrew MacLeod <amacleod@redhat.com>
+
+ * go-gcc.cc: Adjust include files.
+
2014-10-27 Andrew MacLeod <amacleod@redhat.com>
* go-gcc.cc: Adjust include files.
diff --git a/gcc/go/go-gcc.cc b/gcc/go/go-gcc.cc
index 91b07c6e9365..9aad6b07b5c7 100644
--- a/gcc/go/go-gcc.cc
+++ b/gcc/go/go-gcc.cc
@@ -29,8 +29,9 @@
#include "stor-layout.h"
#include "varasm.h"
#include "tree-iterator.h"
-#include "cgraph.h"
-#include "convert.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
#include "vec.h"
#include "hashtab.h"
#include "hash-set.h"
@@ -39,6 +40,9 @@
#include "hard-reg-set.h"
#include "input.h"
#include "function.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
+#include "convert.h"
#include "gimple-expr.h"
#include "gimplify.h"
#include "langhooks.h"
diff --git a/gcc/ipa-comdats.c b/gcc/ipa-comdats.c
index b270d9717b27..af2aef8efad2 100644
--- a/gcc/ipa-comdats.c
+++ b/gcc/ipa-comdats.c
@@ -53,9 +53,19 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "tree.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "vec.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
+#include "function.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "tree-pass.h"
-#include "hash-map.h"
/* Main dataflow loop propagating comdat groups across
the symbol table. All references to SYMBOL are examined
diff --git a/gcc/ipa-cp.c b/gcc/ipa-cp.c
index 13da4af13a39..3331dca7f8b0 100644
--- a/gcc/ipa-cp.c
+++ b/gcc/ipa-cp.c
@@ -109,6 +109,20 @@ along with GCC; see the file COPYING3. If not see
#include "target.h"
#include "predict.h"
#include "basic-block.h"
+#include "vec.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "machmode.h"
+#include "tm.h"
+#include "hard-reg-set.h"
+#include "input.h"
+#include "function.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
+#include "alloc-pool.h"
#include "ipa-prop.h"
#include "bitmap.h"
#include "tree-pass.h"
diff --git a/gcc/ipa-devirt.c b/gcc/ipa-devirt.c
index e9bc85327047..32c654906b15 100644
--- a/gcc/ipa-devirt.c
+++ b/gcc/ipa-devirt.c
@@ -114,10 +114,20 @@ along with GCC; see the file COPYING3. If not see
#include "calls.h"
#include "predict.h"
#include "basic-block.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "vec.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
+#include "function.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "expr.h"
#include "tree-pass.h"
-#include "hash-set.h"
#include "target.h"
#include "hash-table.h"
#include "inchash.h"
@@ -128,6 +138,8 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-fold.h"
#include "gimple-expr.h"
#include "gimple.h"
+#include "alloc-pool.h"
+#include "ipa-prop.h"
#include "ipa-inline.h"
#include "diagnostic.h"
#include "tree-dfa.h"
@@ -136,7 +148,6 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-pretty-print.h"
#include "stor-layout.h"
#include "intl.h"
-#include "hash-map.h"
/* Hash based set of pairs of types. */
typedef struct
diff --git a/gcc/ipa-icf-gimple.c b/gcc/ipa-icf-gimple.c
index 827f53fbd76c..d3f379557f16 100644
--- a/gcc/ipa-icf-gimple.c
+++ b/gcc/ipa-icf-gimple.c
@@ -48,6 +48,10 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-pretty-print.h"
#include "cfgloop.h"
#include "except.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
#include "data-streamer.h"
#include "ipa-utils.h"
#include <list>
diff --git a/gcc/ipa-icf.c b/gcc/ipa-icf.c
index 23816f866a7a..975894beee0d 100644
--- a/gcc/ipa-icf.c
+++ b/gcc/ipa-icf.c
@@ -82,6 +82,12 @@ along with GCC; see the file COPYING3. If not see
#include "tree-dfa.h"
#include "tree-pass.h"
#include "gimple-pretty-print.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
+#include "alloc-pool.h"
+#include "ipa-prop.h"
#include "ipa-inline.h"
#include "cfgloop.h"
#include "except.h"
diff --git a/gcc/ipa-inline-analysis.c b/gcc/ipa-inline-analysis.c
index 7da02cda91c4..68b9de07eb97 100644
--- a/gcc/ipa-inline-analysis.c
+++ b/gcc/ipa-inline-analysis.c
@@ -105,12 +105,16 @@ along with GCC; see the file COPYING3. If not see
#include "tree-ssanames.h"
#include "tree-ssa-loop-niter.h"
#include "tree-ssa-loop.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
+#include "alloc-pool.h"
#include "ipa-prop.h"
#include "lto-streamer.h"
#include "data-streamer.h"
#include "tree-streamer.h"
#include "ipa-inline.h"
-#include "alloc-pool.h"
#include "cfgloop.h"
#include "tree-scalar-evolution.h"
#include "ipa-utils.h"
diff --git a/gcc/ipa-inline-transform.c b/gcc/ipa-inline-transform.c
index 1cb4c0520e83..dbc56c599b0a 100644
--- a/gcc/ipa-inline-transform.c
+++ b/gcc/ipa-inline-transform.c
@@ -38,6 +38,19 @@ along with GCC; see the file COPYING3. If not see
#include "coverage.h"
#include "ggc.h"
#include "tree-cfg.h"
+#include "vec.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
+#include "function.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
+#include "alloc-pool.h"
#include "ipa-prop.h"
#include "ipa-inline.h"
#include "tree-inline.h"
diff --git a/gcc/ipa-inline.c b/gcc/ipa-inline.c
index bb8c99d22871..d599900fba79 100644
--- a/gcc/ipa-inline.c
+++ b/gcc/ipa-inline.c
@@ -124,6 +124,11 @@ along with GCC; see the file COPYING3. If not see
#include "is-a.h"
#include "gimple.h"
#include "gimple-ssa.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
+#include "alloc-pool.h"
#include "ipa-prop.h"
#include "except.h"
#include "target.h"
diff --git a/gcc/ipa-inline.h b/gcc/ipa-inline.h
index 8edf49621ada..2ac6e4e93cb2 100644
--- a/gcc/ipa-inline.h
+++ b/gcc/ipa-inline.h
@@ -21,7 +21,6 @@ along with GCC; see the file COPYING3. If not see
#ifndef GCC_IPA_INLINE_H
#define GCC_IPA_INLINE_H
-#include "ipa-prop.h"
/* Representation of inline parameters that do depend on context function is
inlined into (i.e. known constant values of function parameters.
diff --git a/gcc/ipa-polymorphic-call.c b/gcc/ipa-polymorphic-call.c
index 3f2d303b2894..33dd1a8c384c 100644
--- a/gcc/ipa-polymorphic-call.c
+++ b/gcc/ipa-polymorphic-call.c
@@ -34,12 +34,25 @@ along with GCC; see the file COPYING3. If not see
#include "tree-pretty-print.h"
#include "predict.h"
#include "basic-block.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "vec.h"
+#include "hashtab.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
+#include "function.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
#include "ipa-utils.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-fold.h"
#include "gimple-expr.h"
#include "gimple.h"
+#include "alloc-pool.h"
+#include "ipa-prop.h"
#include "ipa-inline.h"
#include "diagnostic.h"
#include "tree-dfa.h"
diff --git a/gcc/ipa-profile.c b/gcc/ipa-profile.c
index 482d007d6c03..b83d1cf7cbcd 100644
--- a/gcc/ipa-profile.c
+++ b/gcc/ipa-profile.c
@@ -53,6 +53,17 @@ along with GCC; see the file COPYING3. If not see
#include "dominance.h"
#include "cfg.h"
#include "basic-block.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "vec.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
+#include "function.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "tree-pass.h"
#include "tree-ssa-alias.h"
@@ -71,6 +82,7 @@ along with GCC; see the file COPYING3. If not see
#include "tree-inline.h"
#include "lto-streamer.h"
#include "data-streamer.h"
+#include "ipa-prop.h"
#include "ipa-inline.h"
/* Entry in the histogram. */
diff --git a/gcc/ipa-prop.c b/gcc/ipa-prop.c
index b574889a98d7..db85c7d1e7f9 100644
--- a/gcc/ipa-prop.c
+++ b/gcc/ipa-prop.c
@@ -49,6 +49,11 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-walk.h"
#include "langhooks.h"
#include "target.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
+#include "alloc-pool.h"
#include "ipa-prop.h"
#include "bitmap.h"
#include "gimple-ssa.h"
diff --git a/gcc/ipa-prop.h b/gcc/ipa-prop.h
index d2f0c675846e..165fc1a7f459 100644
--- a/gcc/ipa-prop.h
+++ b/gcc/ipa-prop.h
@@ -20,9 +20,6 @@ along with GCC; see the file COPYING3. If not see
#ifndef IPA_PROP_H
#define IPA_PROP_H
-#include "vec.h"
-#include "cgraph.h"
-#include "alloc-pool.h"
/* The following definitions and interfaces are used by
interprocedural analyses or parameters. */
diff --git a/gcc/ipa-pure-const.c b/gcc/ipa-pure-const.c
index 7613e1cf000f..74aefafce810 100644
--- a/gcc/ipa-pure-const.c
+++ b/gcc/ipa-pure-const.c
@@ -63,6 +63,10 @@ along with GCC; see the file COPYING3. If not see
#include "tree-inline.h"
#include "tree-pass.h"
#include "langhooks.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
#include "ipa-utils.h"
#include "flags.h"
#include "diagnostic.h"
diff --git a/gcc/ipa-ref.c b/gcc/ipa-ref.c
index 4b23f5fe5744..42b703aa1703 100644
--- a/gcc/ipa-ref.c
+++ b/gcc/ipa-ref.c
@@ -24,6 +24,18 @@ along with GCC; see the file COPYING3. If not see
#include "tree.h"
#include "ggc.h"
#include "target.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "vec.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "machmode.h"
+#include "tm.h"
+#include "hard-reg-set.h"
+#include "input.h"
+#include "function.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "ipa-utils.h"
diff --git a/gcc/ipa-reference.c b/gcc/ipa-reference.c
index 6993f93c45b6..b421f63fcb72 100644
--- a/gcc/ipa-reference.c
+++ b/gcc/ipa-reference.c
@@ -59,7 +59,12 @@ along with GCC; see the file COPYING3. If not see
#include "tree-inline.h"
#include "tree-pass.h"
#include "splay-tree.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
#include "ipa-utils.h"
+#include "bitmap.h"
#include "ipa-reference.h"
#include "flags.h"
#include "diagnostic.h"
diff --git a/gcc/ipa-reference.h b/gcc/ipa-reference.h
index 3e7dc7319809..bca6fb2e6809 100644
--- a/gcc/ipa-reference.h
+++ b/gcc/ipa-reference.h
@@ -20,8 +20,6 @@ along with GCC; see the file COPYING3. If not see
#ifndef GCC_IPA_REFERENCE_H
#define GCC_IPA_REFERENCE_H
-#include "bitmap.h"
-#include "cgraph.h"
/* In ipa-reference.c */
bitmap ipa_reference_get_not_read_global (struct cgraph_node *fn);
diff --git a/gcc/ipa-split.c b/gcc/ipa-split.c
index 6a5f5c012e81..ac68c87f2823 100644
--- a/gcc/ipa-split.c
+++ b/gcc/ipa-split.c
@@ -104,6 +104,11 @@ along with GCC; see the file COPYING3. If not see
#include "gimplify-me.h"
#include "gimple-walk.h"
#include "target.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
+#include "alloc-pool.h"
#include "ipa-prop.h"
#include "gimple-ssa.h"
#include "tree-cfg.h"
diff --git a/gcc/ipa-utils.c b/gcc/ipa-utils.c
index e4ea84c27b5b..22900ccaac68 100644
--- a/gcc/ipa-utils.c
+++ b/gcc/ipa-utils.c
@@ -43,12 +43,19 @@ along with GCC; see the file COPYING3. If not see
#include "dumpfile.h"
#include "langhooks.h"
#include "splay-tree.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
#include "ipa-utils.h"
+#include "bitmap.h"
#include "ipa-reference.h"
#include "flags.h"
#include "diagnostic.h"
#include "langhooks.h"
#include "lto-streamer.h"
+#include "alloc-pool.h"
+#include "ipa-prop.h"
#include "ipa-inline.h"
/* Debugging function for postorder and inorder code. NOTE is a string
diff --git a/gcc/ipa-utils.h b/gcc/ipa-utils.h
index e1b2d548121f..b3701af7c24b 100644
--- a/gcc/ipa-utils.h
+++ b/gcc/ipa-utils.h
@@ -20,7 +20,6 @@ along with GCC; see the file COPYING3. If not see
#ifndef GCC_IPA_UTILS_H
#define GCC_IPA_UTILS_H
-#include "cgraph.h"
struct ipa_dfs_info {
int dfn_number;
diff --git a/gcc/ipa-visibility.c b/gcc/ipa-visibility.c
index 42d528c6634c..b0823fff8c9e 100644
--- a/gcc/ipa-visibility.c
+++ b/gcc/ipa-visibility.c
@@ -77,6 +77,17 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "tm.h"
#include "tree.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "vec.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
+#include "function.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "tree-pass.h"
#include "calls.h"
diff --git a/gcc/ipa.c b/gcc/ipa.c
index b28e7cced524..8562102ea80a 100644
--- a/gcc/ipa.c
+++ b/gcc/ipa.c
@@ -26,16 +26,27 @@ along with GCC; see the file COPYING3. If not see
#include "stringpool.h"
#include "predict.h"
#include "basic-block.h"
-#include "cgraph.h"
-#include "tree-pass.h"
#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "vec.h"
+#include "hashtab.h"
#include "hash-set.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
+#include "function.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
+#include "tree-pass.h"
#include "gimple-expr.h"
#include "gimplify.h"
#include "flags.h"
#include "target.h"
#include "tree-iterator.h"
#include "ipa-utils.h"
+#include "alloc-pool.h"
+#include "ipa-prop.h"
#include "ipa-inline.h"
#include "tree-inline.h"
#include "profile.h"
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 6d3813e7935d..731d2d43f94b 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,10 @@
+2014-10-28 Andrew MacLeod <amacleod@redhat.com>
+
+ * class.c: Adjust include files.
+ * decl.c: Ditto.
+ * jcf-parse.c: Ditto.
+ * resource.c: Ditto.
+
2014-10-27 Andrew MacLeod <amacleod@redhat.com>
* java-gimplify.c: Adjust include files.
diff --git a/gcc/java/class.c b/gcc/java/class.c
index 2c29a44837c6..7597af75d63c 100644
--- a/gcc/java/class.c
+++ b/gcc/java/class.c
@@ -47,6 +47,10 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "input.h"
#include "function.h"
#include "ggc.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "tree-iterator.h"
#include "target.h"
diff --git a/gcc/java/decl.c b/gcc/java/decl.c
index 7271ea70aba3..fbd09a3d0894 100644
--- a/gcc/java/decl.c
+++ b/gcc/java/decl.c
@@ -38,13 +38,24 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "jcf.h"
#include "java-except.h"
#include "ggc.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "vec.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "machmode.h"
+#include "tm.h"
+#include "hard-reg-set.h"
+#include "input.h"
+#include "function.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "tree-inline.h"
#include "target.h"
#include "version.h"
#include "tree-iterator.h"
#include "langhooks.h"
-#include "cgraph.h"
#if defined (DEBUG_JAVA_BINDING_LEVELS)
extern void indent (void);
diff --git a/gcc/java/jcf-parse.c b/gcc/java/jcf-parse.c
index 9c4a9cf8be6e..a94b15110a74 100644
--- a/gcc/java/jcf-parse.c
+++ b/gcc/java/jcf-parse.c
@@ -38,6 +38,17 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "parse.h"
#include "ggc.h"
#include "debug.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "vec.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "machmode.h"
+#include "tm.h"
+#include "hard-reg-set.h"
+#include "function.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "bitmap.h"
#include "target.h"
diff --git a/gcc/java/resource.c b/gcc/java/resource.c
index bc9e029a6796..c0a9249bf9ca 100644
--- a/gcc/java/resource.c
+++ b/gcc/java/resource.c
@@ -42,6 +42,10 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "function.h"
#include "ggc.h"
#include "tree-iterator.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
/* A list of all the resources files. */
diff --git a/gcc/langhooks.c b/gcc/langhooks.c
index 4bdeaa066f84..2461fc5f6683 100644
--- a/gcc/langhooks.c
+++ b/gcc/langhooks.c
@@ -37,6 +37,17 @@ along with GCC; see the file COPYING3. If not see
#include "langhooks-def.h"
#include "diagnostic.h"
#include "tree-diagnostic.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "vec.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
+#include "function.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "timevar.h"
#include "output.h"
diff --git a/gcc/lto-cgraph.c b/gcc/lto-cgraph.c
index 3071f0c0c86b..28ec341f5654 100644
--- a/gcc/lto-cgraph.c
+++ b/gcc/lto-cgraph.c
@@ -48,6 +48,10 @@ along with GCC; see the file COPYING3. If not see
#include "diagnostic-core.h"
#include "except.h"
#include "timevar.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
#include "lto-streamer.h"
#include "data-streamer.h"
#include "tree-streamer.h"
diff --git a/gcc/lto-compress.c b/gcc/lto-compress.c
index fa4b8f49e4d1..fec42f9a6e32 100644
--- a/gcc/lto-compress.c
+++ b/gcc/lto-compress.c
@@ -45,6 +45,10 @@ along with GCC; see the file COPYING3. If not see
#include "gimple.h"
#include "diagnostic-core.h"
#include "langhooks.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
#include "lto-streamer.h"
#include "lto-compress.h"
diff --git a/gcc/lto-opts.c b/gcc/lto-opts.c
index ea2a2456e481..d1d153d04087 100644
--- a/gcc/lto-opts.c
+++ b/gcc/lto-opts.c
@@ -44,6 +44,10 @@ along with GCC; see the file COPYING3. If not see
#include "options.h"
#include "common/common-target.h"
#include "diagnostic.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
#include "lto-streamer.h"
#include "toplev.h"
diff --git a/gcc/lto-section-in.c b/gcc/lto-section-in.c
index 2485da99c247..042dd99fc43e 100644
--- a/gcc/lto-section-in.c
+++ b/gcc/lto-section-in.c
@@ -44,6 +44,10 @@ along with GCC; see the file COPYING3. If not see
#include "diagnostic-core.h"
#include "except.h"
#include "timevar.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
#include "lto-streamer.h"
#include "lto-compress.h"
diff --git a/gcc/lto-section-out.c b/gcc/lto-section-out.c
index bb0b394e6438..8089d5df79f3 100644
--- a/gcc/lto-section-out.c
+++ b/gcc/lto-section-out.c
@@ -42,6 +42,10 @@ along with GCC; see the file COPYING3. If not see
#include "params.h"
#include "except.h"
#include "langhooks.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
#include "data-streamer.h"
#include "lto-streamer.h"
#include "lto-compress.h"
diff --git a/gcc/lto-streamer-in.c b/gcc/lto-streamer-in.c
index 52186b5426e0..d271af7fa9df 100644
--- a/gcc/lto-streamer-in.c
+++ b/gcc/lto-streamer-in.c
@@ -57,6 +57,10 @@ along with GCC; see the file COPYING3. If not see
#include "diagnostic.h"
#include "except.h"
#include "debug.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
#include "ipa-utils.h"
#include "data-streamer.h"
#include "gimple-streamer.h"
diff --git a/gcc/lto-streamer-out.c b/gcc/lto-streamer-out.c
index 39931e39e158..dc406da67e39 100644
--- a/gcc/lto-streamer-out.c
+++ b/gcc/lto-streamer-out.c
@@ -54,6 +54,10 @@ along with GCC; see the file COPYING3. If not see
#include "inchash.h"
#include "except.h"
#include "lto-symtab.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
#include "lto-streamer.h"
#include "data-streamer.h"
#include "gimple-streamer.h"
diff --git a/gcc/lto-streamer.c b/gcc/lto-streamer.c
index cb647bd3d2b6..b6cac0b5e997 100644
--- a/gcc/lto-streamer.c
+++ b/gcc/lto-streamer.c
@@ -43,6 +43,10 @@ along with GCC; see the file COPYING3. If not see
#include "gimple.h"
#include "bitmap.h"
#include "diagnostic-core.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
#include "tree-streamer.h"
#include "lto-streamer.h"
#include "lto-section-names.h"
diff --git a/gcc/lto-streamer.h b/gcc/lto-streamer.h
index 63e4b32d8e53..4b875a2b8ba0 100644
--- a/gcc/lto-streamer.h
+++ b/gcc/lto-streamer.h
@@ -27,7 +27,6 @@ along with GCC; see the file COPYING3. If not see
#include "hash-table.h"
#include "hash-map.h"
#include "target.h"
-#include "cgraph.h"
#include "vec.h"
#include "alloc-pool.h"
#include "gcov-io.h"
diff --git a/gcc/lto/ChangeLog b/gcc/lto/ChangeLog
index 39a05e8cc4a9..426aedfe7603 100644
--- a/gcc/lto/ChangeLog
+++ b/gcc/lto/ChangeLog
@@ -1,3 +1,11 @@
+2014-10-28 Andrew MacLeod <amacleod@redhat.com>
+
+ * lto.c: Adjust include files.
+ * lto-lang.c: Ditto.
+ * lto-object.c: Ditto.
+ * lto-partition.c: Ditto.
+ * lto-symtab.c: Ditto.
+
2014-10-27 Andrew MacLeod <amacleod@redhat.com>
* lto-lang.c: Adjust include files.
diff --git a/gcc/lto/lto-lang.c b/gcc/lto/lto-lang.c
index 8ecce5da8db3..bcef4de90964 100644
--- a/gcc/lto/lto-lang.c
+++ b/gcc/lto/lto-lang.c
@@ -49,6 +49,10 @@ along with GCC; see the file COPYING3. If not see
#include "gimple.h"
#include "diagnostic-core.h"
#include "toplev.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
#include "lto-streamer.h"
#include "cilk.h"
diff --git a/gcc/lto/lto-object.c b/gcc/lto/lto-object.c
index 28b459cfa54b..1178326b9919 100644
--- a/gcc/lto/lto-object.c
+++ b/gcc/lto/lto-object.c
@@ -39,6 +39,10 @@ along with GCC; see the file COPYING3. If not see
#include "gimple.h"
#include "diagnostic-core.h"
#include "lto.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
#include "lto-streamer.h"
#include "lto-section-names.h"
#include "simple-object.h"
diff --git a/gcc/lto/lto-partition.c b/gcc/lto/lto-partition.c
index b6472753da70..c38931b3f954 100644
--- a/gcc/lto/lto-partition.c
+++ b/gcc/lto/lto-partition.c
@@ -37,10 +37,15 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-expr.h"
#include "is-a.h"
#include "gimple.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "lto-streamer.h"
#include "timevar.h"
#include "params.h"
+#include "alloc-pool.h"
+#include "ipa-prop.h"
#include "ipa-inline.h"
#include "ipa-utils.h"
#include "lto-partition.h"
diff --git a/gcc/lto/lto-symtab.c b/gcc/lto/lto-symtab.c
index 9ee3cd28d339..4c4e48af3341 100644
--- a/gcc/lto/lto-symtab.c
+++ b/gcc/lto/lto-symtab.c
@@ -39,8 +39,13 @@ along with GCC; see the file COPYING3. If not see
#include "is-a.h"
#include "gimple.h"
#include "plugin-api.h"
+#include "hash-map.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
#include "lto-streamer.h"
#include "ipa-utils.h"
+#include "alloc-pool.h"
+#include "ipa-prop.h"
#include "ipa-inline.h"
#include "builtins.h"
diff --git a/gcc/lto/lto.c b/gcc/lto/lto.c
index 1234cee41357..d8519d9426b1 100644
--- a/gcc/lto/lto.c
+++ b/gcc/lto/lto.c
@@ -29,20 +29,30 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "predict.h"
#include "basic-block.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "vec.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
+#include "function.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "tree-ssa-operands.h"
#include "tree-pass.h"
#include "langhooks.h"
#include "bitmap.h"
-#include "hash-map.h"
#include "inchash.h"
+#include "alloc-pool.h"
#include "ipa-prop.h"
#include "common.h"
#include "debug.h"
#include "tree-ssa-alias.h"
#include "internal-fn.h"
#include "gimple-expr.h"
-#include "is-a.h"
#include "gimple.h"
#include "lto.h"
#include "lto-tree.h"
diff --git a/gcc/objc/ChangeLog b/gcc/objc/ChangeLog
index dcd74889e885..0f0f5b2f4d5f 100644
--- a/gcc/objc/ChangeLog
+++ b/gcc/objc/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-28 Andrew MacLeod <amacleod@redhat.com>
+
+ * objc-act.c: Adjust include files.
+
2014-10-22 Alan Modra <amodra@gmail.com>
* objc-encoding.c (encode_array): Cast result of obstack_base.
diff --git a/gcc/objc/objc-act.c b/gcc/objc/objc-act.c
index 13decfa7e714..12614feb0474 100644
--- a/gcc/objc/objc-act.c
+++ b/gcc/objc/objc-act.c
@@ -54,6 +54,10 @@ along with GCC; see the file COPYING3. If not see
#include "c-family/c-target.h"
#include "diagnostic-core.h"
#include "intl.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "tree-iterator.h"
#include "hash-table.h"
diff --git a/gcc/omp-low.c b/gcc/omp-low.c
index fe9bf80c0647..9098f0abb916 100644
--- a/gcc/omp-low.c
+++ b/gcc/omp-low.c
@@ -56,6 +56,9 @@ along with GCC; see the file COPYING3. If not see
#include "langhooks.h"
#include "diagnostic-core.h"
#include "gimple-ssa.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "tree-cfg.h"
#include "tree-phinodes.h"
@@ -77,6 +80,7 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-low.h"
#include "tree-cfgcleanup.h"
#include "pretty-print.h"
+#include "alloc-pool.h"
#include "ipa-prop.h"
#include "tree-nested.h"
#include "tree-eh.h"
diff --git a/gcc/opts-global.c b/gcc/opts-global.c
index 149abc41a169..6825943a8a5e 100644
--- a/gcc/opts-global.c
+++ b/gcc/opts-global.c
@@ -44,6 +44,10 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "dbgcnt.h"
#include "debug.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
#include "lto-streamer.h"
#include "output.h"
#include "plugin.h"
diff --git a/gcc/passes.c b/gcc/passes.c
index 8432de8cd600..f9d15b89205d 100644
--- a/gcc/passes.c
+++ b/gcc/passes.c
@@ -80,6 +80,10 @@ along with GCC; see the file COPYING3. If not see
#include "tree-pass.h"
#include "tree-dump.h"
#include "df.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
#include "lto-streamer.h"
#include "plugin.h"
#include "ipa-utils.h"
@@ -88,7 +92,6 @@ along with GCC; see the file COPYING3. If not see
#include "pass_manager.h"
#include "tree-ssa-live.h" /* For remove_unused_locals. */
#include "tree-cfgcleanup.h"
-#include "hash-map.h"
using namespace gcc;
diff --git a/gcc/predict.c b/gcc/predict.c
index 7ecaab38db13..714a88d72715 100644
--- a/gcc/predict.c
+++ b/gcc/predict.c
@@ -68,6 +68,8 @@ along with GCC; see the file COPYING3. If not see
#include "gimple.h"
#include "gimple-iterator.h"
#include "gimple-ssa.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "tree-cfg.h"
#include "tree-phinodes.h"
diff --git a/gcc/print-tree.c b/gcc/print-tree.c
index 9563e4dfaec7..18783511d195 100644
--- a/gcc/print-tree.c
+++ b/gcc/print-tree.c
@@ -31,6 +31,17 @@ along with GCC; see the file COPYING3. If not see
#include "tree-iterator.h"
#include "diagnostic.h"
#include "gimple-pretty-print.h" /* FIXME */
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "vec.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
+#include "function.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "tree-cfg.h"
#include "tree-dump.h"
diff --git a/gcc/profile.c b/gcc/profile.c
index d0063d178ec0..a84d5fd10be0 100644
--- a/gcc/profile.c
+++ b/gcc/profile.c
@@ -80,6 +80,9 @@ along with GCC; see the file COPYING3. If not see
#include "tree-cfg.h"
#include "cfgloop.h"
#include "dumpfile.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "profile.h"
diff --git a/gcc/ree.c b/gcc/ree.c
index c992e8a3cd62..792f04991dd8 100644
--- a/gcc/ree.c
+++ b/gcc/ree.c
@@ -248,6 +248,10 @@ along with GCC; see the file COPYING3. If not see
#include "params.h"
#include "tree-pass.h"
#include "df.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
/* This structure represents a candidate for elimination. */
diff --git a/gcc/stor-layout.c b/gcc/stor-layout.c
index fcfabf3bc1ab..b97b7d7b2598 100644
--- a/gcc/stor-layout.c
+++ b/gcc/stor-layout.c
@@ -43,6 +43,10 @@ along with GCC; see the file COPYING3. If not see
#include "langhooks.h"
#include "regs.h"
#include "params.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "tree-inline.h"
#include "tree-dump.h"
diff --git a/gcc/symtab.c b/gcc/symtab.c
index 0b1a12146cca..44bb3a6a929c 100644
--- a/gcc/symtab.c
+++ b/gcc/symtab.c
@@ -43,6 +43,9 @@ along with GCC; see the file COPYING3. If not see
#include "gimple.h"
#include "tree-inline.h"
#include "langhooks.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "diagnostic.h"
#include "timevar.h"
diff --git a/gcc/toplev.c b/gcc/toplev.c
index 7d8cefadc213..2c570d4afd60 100644
--- a/gcc/toplev.c
+++ b/gcc/toplev.c
@@ -69,6 +69,10 @@ along with GCC; see the file COPYING3. If not see
#include "hosthooks.h"
#include "predict.h"
#include "basic-block.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "opts.h"
#include "opts-diagnostic.h"
@@ -87,6 +91,7 @@ along with GCC; see the file COPYING3. If not see
#include "pass_manager.h"
#include "auto-profile.h"
#include "dwarf2out.h"
+#include "bitmap.h"
#include "ipa-reference.h"
#include "ipa-prop.h"
#include "gcse.h"
diff --git a/gcc/trans-mem.c b/gcc/trans-mem.c
index 4b0b6422498c..4f451c514781 100644
--- a/gcc/trans-mem.c
+++ b/gcc/trans-mem.c
@@ -48,6 +48,9 @@
#include "gimplify-me.h"
#include "gimple-walk.h"
#include "gimple-ssa.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "tree-cfg.h"
#include "stringpool.h"
diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c
index a1793e819557..ee10bc614b1c 100644
--- a/gcc/tree-cfg.c
+++ b/gcc/tree-cfg.c
@@ -54,6 +54,8 @@ along with GCC; see the file COPYING3. If not see
#include "gimplify-me.h"
#include "gimple-walk.h"
#include "gimple-ssa.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "tree-cfg.h"
#include "tree-phinodes.h"
diff --git a/gcc/tree-eh.c b/gcc/tree-eh.c
index 7a6e04aeb571..ebd9a3aec155 100644
--- a/gcc/tree-eh.c
+++ b/gcc/tree-eh.c
@@ -48,6 +48,9 @@ along with GCC; see the file COPYING3. If not see
#include "gimple.h"
#include "gimple-iterator.h"
#include "gimple-ssa.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "tree-cfg.h"
#include "tree-phinodes.h"
diff --git a/gcc/tree-emutls.c b/gcc/tree-emutls.c
index eaf977784726..c4f9fb6d3d1a 100644
--- a/gcc/tree-emutls.c
+++ b/gcc/tree-emutls.c
@@ -44,6 +44,9 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-walk.h"
#include "tree-pass.h"
#include "gimple-ssa.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "tree-phinodes.h"
#include "ssa-iterators.h"
@@ -53,7 +56,6 @@ along with GCC; see the file COPYING3. If not see
#include "target.h"
#include "targhooks.h"
#include "tree-iterator.h"
-#include "hash-map.h"
/* Whenever a target does not support thread-local storage (TLS) natively,
we can emulate it with some run-time support in libgcc. This will in
diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c
index ea62c8647680..7ccd66d064ad 100644
--- a/gcc/tree-inline.c
+++ b/gcc/tree-inline.c
@@ -69,6 +69,11 @@ along with GCC; see the file COPYING3. If not see
#include "tree-pretty-print.h"
#include "except.h"
#include "debug.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
+#include "alloc-pool.h"
#include "ipa-prop.h"
#include "value-prof.h"
#include "tree-pass.h"
diff --git a/gcc/tree-nested.c b/gcc/tree-nested.c
index d0041c92c93f..68043f9fa406 100644
--- a/gcc/tree-nested.c
+++ b/gcc/tree-nested.c
@@ -46,6 +46,9 @@
#include "gimple-walk.h"
#include "tree-iterator.h"
#include "bitmap.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "tree-cfg.h"
#include "expr.h" /* FIXME: For STACK_SAVEAREA_MODE and SAVE_NONLOCAL. */
diff --git a/gcc/tree-pretty-print.c b/gcc/tree-pretty-print.c
index a74d85adc811..bafdc5c70d6b 100644
--- a/gcc/tree-pretty-print.c
+++ b/gcc/tree-pretty-print.c
@@ -30,6 +30,15 @@ along with GCC; see the file COPYING3. If not see
#include "hash-set.h"
#include "gimple-expr.h"
#include "predict.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
+#include "function.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "langhooks.h"
#include "tree-iterator.h"
diff --git a/gcc/tree-profile.c b/gcc/tree-profile.c
index 70a51f6cd90b..1db1de0c8e52 100644
--- a/gcc/tree-profile.c
+++ b/gcc/tree-profile.c
@@ -54,6 +54,9 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-iterator.h"
#include "gimplify-me.h"
#include "gimple-ssa.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "tree-cfg.h"
#include "stringpool.h"
diff --git a/gcc/tree-sra.c b/gcc/tree-sra.c
index f2013f8d61ab..b723ca52b668 100644
--- a/gcc/tree-sra.c
+++ b/gcc/tree-sra.c
@@ -112,6 +112,9 @@ along with GCC; see the file COPYING3. If not see
#include "tree-dfa.h"
#include "tree-ssa.h"
#include "tree-pass.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
#include "ipa-prop.h"
#include "statistics.h"
#include "params.h"
diff --git a/gcc/tree-ssa-alias.c b/gcc/tree-ssa-alias.c
index 29543d697303..2ad57cd00e2a 100644
--- a/gcc/tree-ssa-alias.c
+++ b/gcc/tree-ssa-alias.c
@@ -55,6 +55,11 @@ along with GCC; see the file COPYING3. If not see
#include "params.h"
#include "alloc-pool.h"
#include "tree-ssa-alias.h"
+#include "bitmap.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
#include "ipa-reference.h"
/* Broad overview of how alias analysis on gimple works:
diff --git a/gcc/tree-ssa-loop-ivcanon.c b/gcc/tree-ssa-loop-ivcanon.c
index 4be72ccf7849..73ad46aedacb 100644
--- a/gcc/tree-ssa-loop-ivcanon.c
+++ b/gcc/tree-ssa-loop-ivcanon.c
@@ -63,6 +63,9 @@ along with GCC; see the file COPYING3. If not see
#include "gimple.h"
#include "gimple-iterator.h"
#include "gimple-ssa.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "tree-cfg.h"
#include "tree-phinodes.h"
diff --git a/gcc/tree-ssa-loop-ivopts.c b/gcc/tree-ssa-loop-ivopts.c
index 38b9d321affb..cfa5babd36ae 100644
--- a/gcc/tree-ssa-loop-ivopts.c
+++ b/gcc/tree-ssa-loop-ivopts.c
@@ -92,6 +92,8 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-iterator.h"
#include "gimplify-me.h"
#include "gimple-ssa.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "tree-cfg.h"
#include "tree-phinodes.h"
diff --git a/gcc/tree-ssa-pre.c b/gcc/tree-ssa-pre.c
index 7774755f7898..736fbf87c3a7 100644
--- a/gcc/tree-ssa-pre.c
+++ b/gcc/tree-ssa-pre.c
@@ -73,6 +73,10 @@ along with GCC; see the file COPYING3. If not see
#include "params.h"
#include "dbgcnt.h"
#include "domwalk.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
#include "ipa-prop.h"
#include "tree-ssa-propagate.h"
#include "ipa-utils.h"
diff --git a/gcc/tree-ssa-structalias.c b/gcc/tree-ssa-structalias.c
index 129798ae21ab..36213772f4cb 100644
--- a/gcc/tree-ssa-structalias.c
+++ b/gcc/tree-ssa-structalias.c
@@ -48,6 +48,9 @@
#include "gimple.h"
#include "gimple-iterator.h"
#include "gimple-ssa.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "stringpool.h"
#include "tree-ssanames.h"
diff --git a/gcc/tree-streamer-in.c b/gcc/tree-streamer-in.c
index d6db46fc7629..dfe777569140 100644
--- a/gcc/tree-streamer-in.c
+++ b/gcc/tree-streamer-in.c
@@ -40,6 +40,10 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-expr.h"
#include "is-a.h"
#include "gimple.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
#include "tree-streamer.h"
#include "data-streamer.h"
#include "streamer-hooks.h"
diff --git a/gcc/tree-streamer-out.c b/gcc/tree-streamer-out.c
index 94eab7977386..7419f5ae34f8 100644
--- a/gcc/tree-streamer-out.c
+++ b/gcc/tree-streamer-out.c
@@ -40,6 +40,10 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-expr.h"
#include "is-a.h"
#include "gimple.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
#include "tree-streamer.h"
#include "data-streamer.h"
#include "streamer-hooks.h"
diff --git a/gcc/tree-streamer.c b/gcc/tree-streamer.c
index 709e392045f7..102cb2256eaa 100644
--- a/gcc/tree-streamer.c
+++ b/gcc/tree-streamer.c
@@ -41,6 +41,9 @@ along with GCC; see the file COPYING3. If not see
#include "is-a.h"
#include "gimple.h"
#include "streamer-hooks.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
#include "tree-streamer.h"
/* Check that all the TS_* structures handled by the streamer_write_* and
diff --git a/gcc/tree-switch-conversion.c b/gcc/tree-switch-conversion.c
index 687b0b7848b6..913bad4cbbe1 100644
--- a/gcc/tree-switch-conversion.c
+++ b/gcc/tree-switch-conversion.c
@@ -53,6 +53,9 @@ Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
#include "gimple-iterator.h"
#include "gimplify-me.h"
#include "gimple-ssa.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "tree-cfg.h"
#include "tree-phinodes.h"
diff --git a/gcc/tree-tailcall.c b/gcc/tree-tailcall.c
index e5da0909a63c..551ddcbc4a8a 100644
--- a/gcc/tree-tailcall.c
+++ b/gcc/tree-tailcall.c
@@ -59,6 +59,10 @@ along with GCC; see the file COPYING3. If not see
#include "target.h"
#include "cfgloop.h"
#include "common/common-target.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
#include "ipa-utils.h"
/* The file implements the tail recursion elimination. It is also used to
diff --git a/gcc/tree-vect-data-refs.c b/gcc/tree-vect-data-refs.c
index 1d30bdf78cbd..4387de0f921f 100644
--- a/gcc/tree-vect-data-refs.c
+++ b/gcc/tree-vect-data-refs.c
@@ -63,6 +63,9 @@ along with GCC; see the file COPYING3. If not see
#include "tree-scalar-evolution.h"
#include "tree-vectorizer.h"
#include "diagnostic-core.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
/* Need to include rtl.h, expr.h, etc. for optabs. */
#include "expr.h"
diff --git a/gcc/tree-vect-stmts.c b/gcc/tree-vect-stmts.c
index 681479ed911e..0650c6cafc1b 100644
--- a/gcc/tree-vect-stmts.c
+++ b/gcc/tree-vect-stmts.c
@@ -64,6 +64,9 @@ along with GCC; see the file COPYING3. If not see
#include "diagnostic-core.h"
#include "tree-vectorizer.h"
#include "dumpfile.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "builtins.h"
diff --git a/gcc/tree-vectorizer.c b/gcc/tree-vectorizer.c
index 1a15c8195529..dc37d1fc029f 100644
--- a/gcc/tree-vectorizer.c
+++ b/gcc/tree-vectorizer.c
@@ -81,6 +81,9 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-iterator.h"
#include "gimple-walk.h"
#include "gimple-ssa.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "tree-phinodes.h"
#include "ssa-iterators.h"
diff --git a/gcc/tree.c b/gcc/tree.c
index 02a730426260..19fa89e01869 100644
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -68,6 +68,9 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-iterator.h"
#include "gimplify.h"
#include "gimple-ssa.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "tree-phinodes.h"
#include "stringpool.h"
diff --git a/gcc/tsan.c b/gcc/tsan.c
index 05771049b217..3685b8a43d78 100644
--- a/gcc/tsan.c
+++ b/gcc/tsan.c
@@ -45,6 +45,9 @@ along with GCC; see the file COPYING3. If not see
#include "gimplify.h"
#include "gimple-iterator.h"
#include "gimple-ssa.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "tree-cfg.h"
#include "stringpool.h"
diff --git a/gcc/ubsan.c b/gcc/ubsan.c
index 7e056356c953..568f3c95ea08 100644
--- a/gcc/ubsan.c
+++ b/gcc/ubsan.c
@@ -29,6 +29,18 @@ along with GCC; see the file COPYING3. If not see
#include "cfg.h"
#include "cfganal.h"
#include "basic-block.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "vec.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "machmode.h"
+#include "tm.h"
+#include "hard-reg-set.h"
+#include "input.h"
+#include "function.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "tree-pass.h"
#include "tree-ssa-alias.h"
@@ -39,7 +51,6 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-iterator.h"
#include "gimple-ssa.h"
#include "gimple-walk.h"
-#include "hashtab.h"
#include "output.h"
#include "tm_p.h"
#include "toplev.h"
diff --git a/gcc/value-prof.c b/gcc/value-prof.c
index 889720ed0526..a65ccb8e8c92 100644
--- a/gcc/value-prof.c
+++ b/gcc/value-prof.c
@@ -65,6 +65,10 @@ along with GCC; see the file COPYING3. If not see
#include "timevar.h"
#include "dumpfile.h"
#include "profile.h"
+#include "hash-map.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
+#include "cgraph.h"
#include "data-streamer.h"
#include "builtins.h"
#include "tree-nested.h"
diff --git a/gcc/varasm.c b/gcc/varasm.c
index a1e5d5d4ef60..61cda94e5546 100644
--- a/gcc/varasm.c
+++ b/gcc/varasm.c
@@ -57,6 +57,10 @@ along with GCC; see the file COPYING3. If not see
#include "dominance.h"
#include "cfg.h"
#include "basic-block.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "asan.h"
#include "rtl-iter.h"
diff --git a/gcc/varpool.c b/gcc/varpool.c
index 50b5665a2918..3d1ab690dcb9 100644
--- a/gcc/varpool.c
+++ b/gcc/varpool.c
@@ -26,10 +26,20 @@ along with GCC; see the file COPYING3. If not see
#include "varasm.h"
#include "predict.h"
#include "basic-block.h"
+#include "hash-map.h"
+#include "is-a.h"
+#include "plugin-api.h"
+#include "vec.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
+#include "function.h"
+#include "ipa-ref.h"
#include "cgraph.h"
#include "langhooks.h"
#include "diagnostic-core.h"
-#include "hashtab.h"
#include "timevar.h"
#include "debug.h"
#include "target.h"
@@ -39,7 +49,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree-ssa-alias.h"
#include "gimple.h"
#include "lto-streamer.h"
-#include "hash-set.h"
const char * const tls_model_names[]={"none", "tls-emulated", "tls-real",
"tls-global-dynamic", "tls-local-dynamic",
--
GitLab