From f51ade332ab18b527d3d0908130416edb331e14a Mon Sep 17 00:00:00 2001 From: Andrew MacLeod Date: Thu, 9 Jul 2015 14:24:20 +0000 Subject: [PATCH] lto-streamer.h: Don't include target.h and alloc-pool.h. 2015-07-09 Andrew MacLeod * lto-streamer.h: Don't include target.h and alloc-pool.h. * builtins.c: Adjust includes. * gimple.c: Likewise. * ipa-icf.c: Likewise. * lto-opts.c: Likewise. * ipa-reference.c: Likewise. * lto-section-out.c: Likewise. * lto-streamer-in.c: Likewise. * lto-streamer-out.c: Likewise. * opts-global.c: Likewise. * symtab.c: Likewise. * tree-chkp.c: Likewise. * tree-ssa-live.c: Likewise. * tree-streamer-in.c: Likewise. * tree-streamer-out.c: Likewise. * config/darwin.c: Likewise. * config/i386/winnt.c: Likewise. cp 2015-07-09 Andrew MacLeod * cp-ubsan.c: Don't include alloc-pool.h or lto-streamer.h. lto 2015-07-09 Andrew MacLeod * lto-lang.c: Adjust includes of target.h, alloc-pool.h and lto-streamer.h. * lto-object.c: Likewise. * lto-partition.c: Likewise. * lto-symtab.c: Likewise. From-SVN: r225612 --- gcc/ChangeLog | 20 ++++++++++++++++++++ gcc/builtins.c | 1 - gcc/config/darwin.c | 1 + gcc/config/i386/winnt.c | 1 + gcc/cp/ChangeLog | 4 ++++ gcc/cp/cp-ubsan.c | 2 -- gcc/gimple.c | 1 - gcc/ipa-icf.c | 1 + gcc/ipa-reference.c | 1 - gcc/lto-opts.c | 1 + gcc/lto-section-out.c | 1 - gcc/lto-streamer-in.c | 1 + gcc/lto-streamer-out.c | 1 + gcc/lto-streamer.h | 2 -- gcc/lto/ChangeLog | 8 ++++++++ gcc/lto/lto-lang.c | 1 - gcc/lto/lto-object.c | 1 - gcc/lto/lto-partition.c | 3 ++- gcc/lto/lto-symtab.c | 3 ++- gcc/opts-global.c | 2 +- gcc/symtab.c | 1 + gcc/tree-chkp.c | 1 - gcc/tree-ssa-live.c | 1 - gcc/tree-streamer-in.c | 2 +- gcc/tree-streamer-out.c | 1 + 25 files changed, 46 insertions(+), 16 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 8e05c427c45..14c55fc6f70 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,23 @@ +2015-07-09 Andrew MacLeod + + * lto-streamer.h: Don't include target.h and alloc-pool.h. + * builtins.c: Adjust includes. + * gimple.c: Likewise. + * ipa-icf.c: Likewise. + * lto-opts.c: Likewise. + * ipa-reference.c: Likewise. + * lto-section-out.c: Likewise. + * lto-streamer-in.c: Likewise. + * lto-streamer-out.c: Likewise. + * opts-global.c: Likewise. + * symtab.c: Likewise. + * tree-chkp.c: Likewise. + * tree-ssa-live.c: Likewise. + * tree-streamer-in.c: Likewise. + * tree-streamer-out.c: Likewise. + * config/darwin.c: Likewise. + * config/i386/winnt.c: Likewise. + 2015-07-09 Richard Biener * genmatch.c (struct expr): Add force_single_use flag. diff --git a/gcc/builtins.c b/gcc/builtins.c index 530cf85c087..4bdf2782a5c 100644 --- a/gcc/builtins.c +++ b/gcc/builtins.c @@ -60,7 +60,6 @@ along with GCC; see the file COPYING3. If not see #include "builtins.h" #include "asan.h" #include "cilk.h" -#include "lto-streamer.h" #include "cgraph.h" #include "tree-chkp.h" #include "rtl-chkp.h" diff --git a/gcc/config/darwin.c b/gcc/config/darwin.c index ad703283e60..3e1ae5216cb 100644 --- a/gcc/config/darwin.c +++ b/gcc/config/darwin.c @@ -63,6 +63,7 @@ along with GCC; see the file COPYING3. If not see #include "tree-eh.h" #include "gimplify.h" #include "cgraph.h" +#include "alloc-pool.h" #include "lto-streamer.h" #include "lto-section-names.h" diff --git a/gcc/config/i386/winnt.c b/gcc/config/i386/winnt.c index e9c7d287b92..a2ee1abe20f 100644 --- a/gcc/config/i386/winnt.c +++ b/gcc/config/i386/winnt.c @@ -51,6 +51,7 @@ along with GCC; see the file COPYING3. If not see #include "gimple-fold.h" #include "tree-eh.h" #include "cgraph.h" +#include "alloc-pool.h" #include "lto-streamer.h" #include "lto-section-names.h" #include "builtins.h" diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index b6cca3ade33..609c7ed460a 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +2015-07-09 Andrew MacLeod + + * cp-ubsan.c: Don't include alloc-pool.h or lto-streamer.h. + 2015-07-08 Eric Botcazou * decl2.c (cpp_check): Deal with IS_CONSTEXPR. diff --git a/gcc/cp/cp-ubsan.c b/gcc/cp/cp-ubsan.c index 8fab27d6553..6486218e8da 100644 --- a/gcc/cp/cp-ubsan.c +++ b/gcc/cp/cp-ubsan.c @@ -28,7 +28,6 @@ along with GCC; see the file COPYING3. If not see #include "cp-tree.h" #include "gimple.h" #include "options.h" -#include "alloc-pool.h" #include "output.h" #include "toplev.h" #include "ubsan.h" @@ -40,7 +39,6 @@ along with GCC; see the file COPYING3. If not see #include "builtins.h" #include "fold-const.h" #include "stringpool.h" -#include "lto-streamer.h" #include "cgraph.h" /* Test if we should instrument vptr access. */ diff --git a/gcc/gimple.c b/gcc/gimple.c index 3d07857f9e2..b73ac2a7c9d 100644 --- a/gcc/gimple.c +++ b/gcc/gimple.c @@ -44,7 +44,6 @@ along with GCC; see the file COPYING3. If not see #include "alias.h" #include "demangle.h" #include "langhooks.h" -#include "lto-streamer.h" #include "cgraph.h" diff --git a/gcc/ipa-icf.c b/gcc/ipa-icf.c index c4386c0f762..a52448b4014 100644 --- a/gcc/ipa-icf.c +++ b/gcc/ipa-icf.c @@ -89,6 +89,7 @@ along with GCC; see the file COPYING3. If not see #include "coverage.h" #include "attribs.h" #include "print-tree.h" +#include "target.h" #include "lto-streamer.h" #include "data-streamer.h" #include "ipa-utils.h" diff --git a/gcc/ipa-reference.c b/gcc/ipa-reference.c index 465a74bcc9f..c00fca34526 100644 --- a/gcc/ipa-reference.c +++ b/gcc/ipa-reference.c @@ -57,7 +57,6 @@ along with GCC; see the file COPYING3. If not see #include "flags.h" #include "diagnostic.h" #include "data-streamer.h" -#include "lto-streamer.h" static void remove_node_data (struct cgraph_node *node, void *data ATTRIBUTE_UNUSED); diff --git a/gcc/lto-opts.c b/gcc/lto-opts.c index ae660d92329..80cd172bebb 100644 --- a/gcc/lto-opts.c +++ b/gcc/lto-opts.c @@ -36,6 +36,7 @@ along with GCC; see the file COPYING3. If not see #include "common/common-target.h" #include "diagnostic.h" #include "cgraph.h" +#include "target.h" #include "lto-streamer.h" #include "lto-section-names.h" #include "toplev.h" diff --git a/gcc/lto-section-out.c b/gcc/lto-section-out.c index 83a9758eab6..b4b5b077d2a 100644 --- a/gcc/lto-section-out.c +++ b/gcc/lto-section-out.c @@ -44,7 +44,6 @@ along with GCC; see the file COPYING3. If not see #include "langhooks.h" #include "cgraph.h" #include "data-streamer.h" -#include "lto-streamer.h" #include "lto-compress.h" static vec decl_state_stack; diff --git a/gcc/lto-streamer-in.c b/gcc/lto-streamer-in.c index 45a1155d03f..b9cdd004050 100644 --- a/gcc/lto-streamer-in.c +++ b/gcc/lto-streamer-in.c @@ -54,6 +54,7 @@ along with GCC; see the file COPYING3. If not see #include "debug.h" #include "cgraph.h" #include "ipa-utils.h" +#include "target.h" #include "data-streamer.h" #include "gimple-streamer.h" #include "lto-streamer.h" diff --git a/gcc/lto-streamer-out.c b/gcc/lto-streamer-out.c index a58c54ef5ba..8dcfcf57c59 100644 --- a/gcc/lto-streamer-out.c +++ b/gcc/lto-streamer-out.c @@ -49,6 +49,7 @@ along with GCC; see the file COPYING3. If not see #include "except.h" #include "lto-symtab.h" #include "cgraph.h" +#include "target.h" #include "lto-streamer.h" #include "data-streamer.h" #include "gimple-streamer.h" diff --git a/gcc/lto-streamer.h b/gcc/lto-streamer.h index 945b6ed4593..66a824e19b2 100644 --- a/gcc/lto-streamer.h +++ b/gcc/lto-streamer.h @@ -24,8 +24,6 @@ along with GCC; see the file COPYING3. If not see #define GCC_LTO_STREAMER_H #include "plugin-api.h" -#include "target.h" -#include "alloc-pool.h" #include "gcov-io.h" #include "diagnostic.h" diff --git a/gcc/lto/ChangeLog b/gcc/lto/ChangeLog index 03d06e2e4cd..4f2d0ec34d7 100644 --- a/gcc/lto/ChangeLog +++ b/gcc/lto/ChangeLog @@ -1,3 +1,11 @@ +2015-07-09 Andrew MacLeod + + * lto-lang.c: Adjust includes of target.h, alloc-pool.h and + lto-streamer.h. + * lto-object.c: Likewise. + * lto-partition.c: Likewise. + * lto-symtab.c: Likewise. + 2015-07-09 Andrew MacLeod * lto-lang.c: Adjust includes for flags.h changes. diff --git a/gcc/lto/lto-lang.c b/gcc/lto/lto-lang.c index 9bf6496ec65..6e74a9a6dd0 100644 --- a/gcc/lto/lto-lang.c +++ b/gcc/lto/lto-lang.c @@ -43,7 +43,6 @@ along with GCC; see the file COPYING3. If not see #include "diagnostic-core.h" #include "toplev.h" #include "cgraph.h" -#include "lto-streamer.h" #include "cilk.h" static tree lto_type_for_size (unsigned, int); diff --git a/gcc/lto/lto-object.c b/gcc/lto/lto-object.c index 3f3ee954e92..087c6b11d63 100644 --- a/gcc/lto/lto-object.c +++ b/gcc/lto/lto-object.c @@ -35,7 +35,6 @@ along with GCC; see the file COPYING3. If not see #include "diagnostic-core.h" #include "lto.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 1f25702035f..8e5b555908f 100644 --- a/gcc/lto/lto-partition.c +++ b/gcc/lto/lto-partition.c @@ -33,10 +33,11 @@ along with GCC; see the file COPYING3. If not see #include "fold-const.h" #include "internal-fn.h" #include "cgraph.h" +#include "target.h" +#include "alloc-pool.h" #include "lto-streamer.h" #include "timevar.h" #include "params.h" -#include "alloc-pool.h" #include "symbol-summary.h" #include "ipa-prop.h" #include "ipa-inline.h" diff --git a/gcc/lto/lto-symtab.c b/gcc/lto/lto-symtab.c index 87c81dd1795..979579f4f16 100644 --- a/gcc/lto/lto-symtab.c +++ b/gcc/lto/lto-symtab.c @@ -34,9 +34,10 @@ along with GCC; see the file COPYING3. If not see #include "fold-const.h" #include "internal-fn.h" #include "cgraph.h" +#include "target.h" +#include "alloc-pool.h" #include "lto-streamer.h" #include "ipa-utils.h" -#include "alloc-pool.h" #include "symbol-summary.h" #include "ipa-prop.h" #include "ipa-inline.h" diff --git a/gcc/opts-global.c b/gcc/opts-global.c index 50b32ac4502..9f5050b1cab 100644 --- a/gcc/opts-global.c +++ b/gcc/opts-global.c @@ -36,7 +36,7 @@ along with GCC; see the file COPYING3. If not see #include "dbgcnt.h" #include "debug.h" #include "cgraph.h" -#include "lto-streamer.h" +#include "target.h" #include "output.h" #include "plugin.h" #include "toplev.h" diff --git a/gcc/symtab.c b/gcc/symtab.c index 8abe0608c29..756a62d8c7b 100644 --- a/gcc/symtab.c +++ b/gcc/symtab.c @@ -36,6 +36,7 @@ along with GCC; see the file COPYING3. If not see #include "cgraph.h" #include "diagnostic.h" #include "timevar.h" +#include "target.h" #include "lto-streamer.h" #include "output.h" #include "ipa-utils.h" diff --git a/gcc/tree-chkp.c b/gcc/tree-chkp.c index 731947ae5af..1c8b5585985 100644 --- a/gcc/tree-chkp.c +++ b/gcc/tree-chkp.c @@ -60,7 +60,6 @@ along with GCC; see the file COPYING3. If not see #include "tree-chkp.h" #include "gimple-walk.h" #include "tree-dfa.h" -#include "lto-streamer.h" #include "cgraph.h" #include "ipa-chkp.h" #include "params.h" diff --git a/gcc/tree-ssa-live.c b/gcc/tree-ssa-live.c index fc7f34e2089..5b00f58c06e 100644 --- a/gcc/tree-ssa-live.c +++ b/gcc/tree-ssa-live.c @@ -48,7 +48,6 @@ along with GCC; see the file COPYING3. If not see #include "diagnostic-core.h" #include "debug.h" #include "tree-ssa.h" -#include "lto-streamer.h" #include "cgraph.h" #include "ipa-utils.h" diff --git a/gcc/tree-streamer-in.c b/gcc/tree-streamer-in.c index 4ebfeaec008..14ecfbedbdd 100644 --- a/gcc/tree-streamer-in.c +++ b/gcc/tree-streamer-in.c @@ -33,10 +33,10 @@ along with GCC; see the file COPYING3. If not see #include "stringpool.h" #include "internal-fn.h" #include "cgraph.h" +#include "target.h" #include "tree-streamer.h" #include "data-streamer.h" #include "streamer-hooks.h" -#include "lto-streamer.h" #include "builtins.h" #include "ipa-chkp.h" #include "gomp-constants.h" diff --git a/gcc/tree-streamer-out.c b/gcc/tree-streamer-out.c index dd910b47508..a0c46652c34 100644 --- a/gcc/tree-streamer-out.c +++ b/gcc/tree-streamer-out.c @@ -32,6 +32,7 @@ along with GCC; see the file COPYING3. If not see #include "stor-layout.h" #include "internal-fn.h" #include "cgraph.h" +#include "target.h" #include "tree-streamer.h" #include "data-streamer.h" #include "streamer-hooks.h" -- 2.30.2