diff options
141 files changed, 667 insertions, 738 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 0065f944087..22afbdc1b10 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,11 @@ +2015-10-29 Andrew MacLeod <amacleod@redhat.com> + + * gcc-interface/decl.c: Reorder #include's and remove duplicates. + * gcc-interface/misc.c: Likewise. + * gcc-interface/targtyps.c: Likewise. + * gcc-interface/trans.c: Likewise. + * gcc-interface/utils.c: Likewise. + 2015-10-27 Tristan Gingold <gingold@adacore.com> * bindgen.adb (System_BB_CPU_Primitives_Multiprocessors_Used): diff --git a/gcc/ada/gcc-interface/decl.c b/gcc/ada/gcc-interface/decl.c index 3922bb80cb3..7f15b7cdf93 100644 --- a/gcc/ada/gcc-interface/decl.c +++ b/gcc/ada/gcc-interface/decl.c @@ -26,20 +26,17 @@ #include "config.h" #include "system.h" #include "coretypes.h" -#include "tm.h" -#include "vec.h" -#include "alias.h" +#include "ggc.h" +#include "target.h" #include "tree.h" -#include "inchash.h" -#include "fold-const.h" #include "stringpool.h" +#include "diagnostic-core.h" +#include "alias.h" +#include "fold-const.h" #include "stor-layout.h" #include "flags.h" #include "toplev.h" -#include "ggc.h" -#include "target.h" #include "tree-inline.h" -#include "diagnostic-core.h" #include "ada.h" #include "types.h" diff --git a/gcc/ada/gcc-interface/misc.c b/gcc/ada/gcc-interface/misc.c index 128234223e1..da724f17cfc 100644 --- a/gcc/ada/gcc-interface/misc.c +++ b/gcc/ada/gcc-interface/misc.c @@ -26,27 +26,21 @@ #include "config.h" #include "system.h" #include "coretypes.h" +#include "ggc.h" +#include "target.h" +#include "tree.h" +#include "diagnostic.h" #include "opts.h" -#include "options.h" -#include "tm.h" -#include "vec.h" #include "alias.h" -#include "tree.h" -#include "inchash.h" #include "fold-const.h" #include "stor-layout.h" #include "print-tree.h" -#include "diagnostic.h" -#include "target.h" -#include "ggc.h" #include "flags.h" #include "debug.h" #include "toplev.h" #include "langhooks.h" #include "langhooks-def.h" #include "plugin.h" -#include "hashtab.h" -#include "hard-reg-set.h" #include "calls.h" /* For pass_by_reference. */ #include "dwarf2out.h" diff --git a/gcc/ada/gcc-interface/targtyps.c b/gcc/ada/gcc-interface/targtyps.c index 5e756c258ba..b5081570f03 100644 --- a/gcc/ada/gcc-interface/targtyps.c +++ b/gcc/ada/gcc-interface/targtyps.c @@ -28,13 +28,10 @@ #include "config.h" #include "system.h" #include "coretypes.h" -#include "vec.h" -#include "alias.h" -#include "tree.h" -#include "inchash.h" -#include "options.h" #include "tm.h" +#include "tree.h" #include "tm_p.h" +#include "alias.h" #include "ada.h" #include "types.h" diff --git a/gcc/ada/gcc-interface/trans.c b/gcc/ada/gcc-interface/trans.c index ac190bece98..946c91a5df9 100644 --- a/gcc/ada/gcc-interface/trans.c +++ b/gcc/ada/gcc-interface/trans.c @@ -26,13 +26,16 @@ #include "config.h" #include "system.h" #include "coretypes.h" -#include "tm.h" -#include "vec.h" -#include "alias.h" +#include "target.h" +#include "function.h" +#include "bitmap.h" #include "tree.h" -#include "inchash.h" -#include "fold-const.h" +#include "gimple-expr.h" #include "stringpool.h" +#include "cgraph.h" +#include "diagnostic.h" +#include "alias.h" +#include "fold-const.h" #include "stor-layout.h" #include "stmt.h" #include "varasm.h" @@ -40,16 +43,8 @@ #include "output.h" #include "libfuncs.h" /* For set_stack_check_libfunc. */ #include "tree-iterator.h" -#include "gimple-expr.h" #include "gimplify.h" -#include "bitmap.h" -#include "hash-map.h" -#include "hard-reg-set.h" -#include "function.h" -#include "cgraph.h" -#include "diagnostic.h" #include "opts.h" -#include "target.h" #include "common/common-target.h" #include "ada.h" diff --git a/gcc/ada/gcc-interface/utils.c b/gcc/ada/gcc-interface/utils.c index f270713748f..8617a876ae6 100644 --- a/gcc/ada/gcc-interface/utils.c +++ b/gcc/ada/gcc-interface/utils.c @@ -26,32 +26,26 @@ #include "config.h" #include "system.h" #include "coretypes.h" -#include "tm.h" -#include "vec.h" -#include "alias.h" +#include "ggc.h" +#include "target.h" +#include "function.h" #include "tree.h" -#include "inchash.h" -#include "fold-const.h" +#include "timevar.h" #include "stringpool.h" +#include "cgraph.h" +#include "diagnostic.h" +#include "alias.h" +#include "fold-const.h" #include "stor-layout.h" #include "attribs.h" #include "varasm.h" #include "flags.h" #include "toplev.h" -#include "diagnostic-core.h" #include "output.h" -#include "ggc.h" #include "debug.h" #include "convert.h" -#include "target.h" #include "common/common-target.h" #include "langhooks.h" -#include "hash-map.h" -#include "hard-reg-set.h" -#include "function.h" -#include "cgraph.h" -#include "diagnostic.h" -#include "timevar.h" #include "tree-dump.h" #include "tree-inline.h" #include "tree-iterator.h" diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog index fb017fa464e..54e75d0a986 100644 --- a/gcc/c-family/ChangeLog +++ b/gcc/c-family/ChangeLog @@ -1,3 +1,26 @@ +2015-10-29 Andrew MacLeod <amacleod@redhat.com> + + * array-notation-common.c: Reorder #include's and remove duplicates. + * c-ada-spec.c: Likewise. + * c-cilkplus.c: Likewise. + * c-common.c: Likewise. + * c-cppbuiltin.c: Likewise. + * c-dump.c: Likewise. + * c-format.c: Likewise. + * c-gimplify.c: Likewise. + * c-indentation.c: Likewise. + * c-lex.c: Likewise. + * c-omp.c: Likewise. + * c-opts.c: Likewise. + * c-pch.c: Likewise. + * c-ppoutput.c: Likewise. + * c-pragma.c: Likewise. + * c-pretty-print.c: Likewise. + * c-semantics.c: Likewise. + * c-ubsan.c: Likewise. + * cilk.c: Likewise. + * stub-objc.c: Likewise. + 2015-10-28 Jason Merrill <jason@redhat.com> * c-common.c (pointer_int_sum): Fold the MULT_EXPR. diff --git a/gcc/c-family/array-notation-common.c b/gcc/c-family/array-notation-common.c index 6b55747b7d6..960b2076bb2 100644 --- a/gcc/c-family/array-notation-common.c +++ b/gcc/c-family/array-notation-common.c @@ -24,13 +24,11 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" #include "coretypes.h" -#include "alias.h" -#include "tree.h" #include "options.h" +#include "tree.h" +#include "c-family/c-common.h" #include "langhooks.h" #include "tree-iterator.h" -#include "c-family/c-common.h" -#include "diagnostic-core.h" /* Returns true if the function call in FNDECL is __sec_implicit_index. */ diff --git a/gcc/c-family/c-ada-spec.c b/gcc/c-family/c-ada-spec.c index 3a1ffe6ad4a..cf4c6e9f9d0 100644 --- a/gcc/c-family/c-ada-spec.c +++ b/gcc/c-family/c-ada-spec.c @@ -23,12 +23,11 @@ along with GCC; see the file COPYING3. If not see #include "system.h" #include "coretypes.h" #include "tm.h" -#include "alias.h" #include "tree.h" -#include "options.h" +#include "c-ada-spec.h" +#include "alias.h" #include "fold-const.h" #include "dumpfile.h" -#include "c-ada-spec.h" #include "cpplib.h" #include "c-pragma.h" #include "cpp-id-data.h" diff --git a/gcc/c-family/c-cilkplus.c b/gcc/c-family/c-cilkplus.c index f402d0d3e1e..6042462657b 100644 --- a/gcc/c-family/c-cilkplus.c +++ b/gcc/c-family/c-cilkplus.c @@ -23,10 +23,10 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" #include "coretypes.h" -#include "alias.h" -#include "tree.h" #include "options.h" +#include "tree.h" #include "c-common.h" +#include "alias.h" /* Validate the body of a _Cilk_for construct or a <#pragma simd> for loop. diff --git a/gcc/c-family/c-common.c b/gcc/c-family/c-common.c index f957018845b..902b662e897 100644 --- a/gcc/c-family/c-common.c +++ b/gcc/c-family/c-common.c @@ -22,37 +22,32 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" #include "coretypes.h" +#include "target.h" +#include "function.h" +#include "obstack.h" +#include "tree.h" #include "c-common.h" -#include "tm.h" +#include "gimple-expr.h" +#include "tm_p.h" +#include "stringpool.h" +#include "cgraph.h" +#include "diagnostic.h" #include "intl.h" -#include "tree.h" -#include "fold-const.h" #include "stor-layout.h" #include "calls.h" -#include "stringpool.h" #include "attribs.h" #include "varasm.h" #include "trans-mem.h" #include "flags.h" #include "c-pragma.h" #include "c-objc.h" -#include "tm_p.h" -#include "obstack.h" -#include "cpplib.h" -#include "target.h" #include "common/common-target.h" #include "langhooks.h" #include "tree-inline.h" #include "toplev.h" -#include "diagnostic.h" #include "tree-iterator.h" #include "opts.h" -#include "hard-reg-set.h" -#include "function.h" -#include "cgraph.h" #include "gimplify.h" -#include "wide-int-print.h" -#include "gimple-expr.h" cpp_reader *parse_in; /* Declared in c-pragma.h. */ diff --git a/gcc/c-family/c-cppbuiltin.c b/gcc/c-family/c-cppbuiltin.c index c6c3d6b0116..f7297877f97 100644 --- a/gcc/c-family/c-cppbuiltin.c +++ b/gcc/c-family/c-cppbuiltin.c @@ -20,19 +20,18 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" #include "coretypes.h" -#include "tm.h" -#include "alias.h" +#include "target.h" #include "tree.h" -#include "stor-layout.h" +#include "c-common.h" +#include "tm_p.h" /* For TARGET_CPU_CPP_BUILTINS & friends. */ #include "stringpool.h" +#include "alias.h" +#include "stor-layout.h" #include "version.h" #include "flags.h" -#include "c-common.h" #include "c-pragma.h" #include "output.h" /* For user_label_prefix. */ #include "debug.h" /* For dwarf2out_do_cfi_asm. */ -#include "tm_p.h" /* For TARGET_CPU_CPP_BUILTINS & friends. */ -#include "target.h" #include "common/common-target.h" #include "cpp-id-data.h" #include "cppbuiltin.h" diff --git a/gcc/c-family/c-dump.c b/gcc/c-family/c-dump.c index 6ff9552c066..5cebcb96a13 100644 --- a/gcc/c-family/c-dump.c +++ b/gcc/c-family/c-dump.c @@ -22,10 +22,10 @@ along with GCC; see the file COPYING3. If not see #include "system.h" #include "coretypes.h" #include "tm.h" -#include "alias.h" #include "tree.h" -#include "tree-dump.h" #include "c-common.h" +#include "alias.h" +#include "tree-dump.h" /* Dump any C-specific tree codes and attributes of common codes. */ diff --git a/gcc/c-family/c-format.c b/gcc/c-family/c-format.c index d358098b3e5..c309a5450a1 100644 --- a/gcc/c-family/c-format.c +++ b/gcc/c-family/c-format.c @@ -21,18 +21,17 @@ along with GCC; see the file COPYING3. If not see #include "system.h" #include "coretypes.h" #include "tm.h" -#include "alias.h" +#include "c-target.h" #include "tree.h" +#include "c-common.h" +#include "alloc-pool.h" #include "stringpool.h" +#include "alias.h" #include "flags.h" -#include "c-common.h" #include "c-objc.h" #include "intl.h" -#include "diagnostic-core.h" #include "langhooks.h" #include "c-format.h" -#include "alloc-pool.h" -#include "c-target.h" /* Handle attributes associated with format checking. */ diff --git a/gcc/c-family/c-gimplify.c b/gcc/c-family/c-gimplify.c index 92987b588f7..c67db888d1c 100644 --- a/gcc/c-family/c-gimplify.c +++ b/gcc/c-family/c-gimplify.c @@ -28,24 +28,23 @@ along with GCC; see the file COPYING3. If not see #include "coretypes.h" #include "tm.h" #include "function.h" -#include "predict.h" #include "basic-block.h" +#include "hard-reg-set.h" #include "tree.h" +#include "c-common.h" #include "gimple.h" -#include "hard-reg-set.h" +#include "predict.h" +#include "cgraph.h" +#include "c-pretty-print.h" #include "alias.h" #include "fold-const.h" -#include "c-common.h" #include "internal-fn.h" #include "gimplify.h" #include "tree-inline.h" -#include "diagnostic-core.h" #include "langhooks.h" #include "langhooks-def.h" #include "flags.h" #include "dumpfile.h" -#include "c-pretty-print.h" -#include "cgraph.h" #include "cilk.h" #include "c-ubsan.h" diff --git a/gcc/c-family/c-indentation.c b/gcc/c-family/c-indentation.c index 5b119f790f0..a525e9a345a 100644 --- a/gcc/c-family/c-indentation.c +++ b/gcc/c-family/c-indentation.c @@ -21,11 +21,11 @@ along with GCC; see the file COPYING3. If not see #include "system.h" #include "coretypes.h" #include "tm.h" -#include "alias.h" #include "tree.h" +#include "c-common.h" #include "stringpool.h" +#include "alias.h" #include "stor-layout.h" -#include "c-common.h" #include "c-indentation.h" extern cpp_options *cpp_opts; diff --git a/gcc/c-family/c-lex.c b/gcc/c-family/c-lex.c index c69f4a6e817..ae16cfce455 100644 --- a/gcc/c-family/c-lex.c +++ b/gcc/c-family/c-lex.c @@ -20,20 +20,17 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" #include "coretypes.h" -#include "tm.h" -#include "alias.h" +#include "target.h" #include "tree.h" +#include "c-common.h" +#include "timevar.h" #include "stringpool.h" +#include "alias.h" #include "stor-layout.h" -#include "c-common.h" #include "flags.h" -#include "timevar.h" -#include "cpplib.h" #include "c-pragma.h" #include "intl.h" -#include "splay-tree.h" #include "debug.h" -#include "target.h" #include "attribs.h" diff --git a/gcc/c-family/c-omp.c b/gcc/c-family/c-omp.c index 93bff2e2ec5..133d07905ce 100644 --- a/gcc/c-family/c-omp.c +++ b/gcc/c-family/c-omp.c @@ -25,11 +25,11 @@ along with GCC; see the file COPYING3. If not see #include "system.h" #include "coretypes.h" #include "tm.h" -#include "alias.h" #include "tree.h" #include "c-common.h" -#include "c-pragma.h" #include "gimple-expr.h" +#include "alias.h" +#include "c-pragma.h" #include "langhooks.h" #include "omp-low.h" #include "gomp-constants.h" diff --git a/gcc/c-family/c-opts.c b/gcc/c-family/c-opts.c index bf2e6b07e07..e42b7aed345 100644 --- a/gcc/c-family/c-opts.c +++ b/gcc/c-family/c-opts.c @@ -22,14 +22,16 @@ along with GCC; see the file COPYING3. If not see #include "system.h" #include "coretypes.h" #include "tm.h" -#include "alias.h" +#include "c-target.h" #include "tree.h" #include "c-common.h" +#include "tm_p.h" /* For C_COMMON_OVERRIDE_OPTIONS. */ +#include "diagnostic.h" +#include "alias.h" #include "c-pragma.h" #include "flags.h" #include "toplev.h" #include "langhooks.h" -#include "diagnostic.h" #include "tree-diagnostic.h" /* for virt_loc_aware_diagnostic_finalizer */ #include "intl.h" #include "cppdefault.h" @@ -38,8 +40,6 @@ along with GCC; see the file COPYING3. If not see #include "opts.h" #include "plugin.h" /* For PLUGIN_INCLUDE_FILE event. */ #include "mkdeps.h" -#include "c-target.h" -#include "tm_p.h" /* For C_COMMON_OVERRIDE_OPTIONS. */ #include "dumpfile.h" #ifndef DOLLARS_IN_IDENTIFIERS diff --git a/gcc/c-family/c-pch.c b/gcc/c-family/c-pch.c index b433e71e0cb..fa256e45066 100644 --- a/gcc/c-family/c-pch.c +++ b/gcc/c-family/c-pch.c @@ -20,20 +20,19 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" #include "coretypes.h" +#include "target.h" +#include "tree.h" +#include "c-common.h" +#include "timevar.h" #include "version.h" #include "cpplib.h" -#include "options.h" #include "alias.h" -#include "tree.h" #include "flags.h" -#include "c-common.h" #include "debug.h" #include "c-pragma.h" #include "langhooks.h" #include "hosthooks.h" -#include "target.h" #include "opts.h" -#include "timevar.h" /* This is a list of flag variables that must match exactly, and their names for the error message. The possible values for *flag_var must diff --git a/gcc/c-family/c-ppoutput.c b/gcc/c-family/c-ppoutput.c index 085555459eb..65022481bfd 100644 --- a/gcc/c-family/c-ppoutput.c +++ b/gcc/c-family/c-ppoutput.c @@ -19,12 +19,12 @@ #include "config.h" #include "system.h" #include "coretypes.h" +#include "options.h" +#include "tree.h" +#include "c-common.h" /* For flags. */ #include "cpplib.h" #include "../libcpp/internal.h" #include "alias.h" -#include "tree.h" -#include "options.h" -#include "c-common.h" /* For flags. */ #include "c-pragma.h" /* For parse_in. */ /* Encapsulates state used to convert a stream of tokens into a text diff --git a/gcc/c-family/c-pragma.c b/gcc/c-family/c-pragma.c index 834a916fcb5..d99c2af61e3 100644 --- a/gcc/c-family/c-pragma.c +++ b/gcc/c-family/c-pragma.c @@ -20,28 +20,22 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" #include "coretypes.h" -#include "tm.h" -#include "alias.h" +#include "target.h" +#include "function.h" /* For cfun. */ #include "tree.h" -#include "options.h" +#include "c-common.h" +#include "tm_p.h" /* For REGISTER_TARGET_PRAGMAS. */ #include "stringpool.h" +#include "cgraph.h" +#include "diagnostic.h" +#include "alias.h" #include "attribs.h" #include "varasm.h" -#include "hard-reg-set.h" -#include "function.h" /* For cfun. FIXME: Does the parser know - when it is inside a function, so that - we don't have to look at cfun? */ #include "cpplib.h" #include "c-pragma.h" #include "flags.h" -#include "c-common.h" -#include "tm_p.h" /* For REGISTER_TARGET_PRAGMAS (why is - this not a target hook?). */ -#include "target.h" -#include "diagnostic.h" #include "opts.h" #include "plugin.h" -#include "cgraph.h" #define GCC_BAD(gmsgid) \ do { warning (OPT_Wpragmas, gmsgid); return; } while (0) diff --git a/gcc/c-family/c-pretty-print.c b/gcc/c-family/c-pretty-print.c index c61c41f1810..6b439ec4d3b 100644 --- a/gcc/c-family/c-pretty-print.c +++ b/gcc/c-family/c-pretty-print.c @@ -22,17 +22,15 @@ along with GCC; see the file COPYING3. If not see #include "system.h" #include "coretypes.h" #include "tm.h" -#include "alias.h" #include "tree.h" -#include "options.h" +#include "c-pretty-print.h" +#include "diagnostic.h" +#include "alias.h" #include "stor-layout.h" #include "attribs.h" #include "intl.h" -#include "c-pretty-print.h" #include "tree-pretty-print.h" #include "tree-iterator.h" -#include "diagnostic.h" -#include "wide-int-print.h" /* The pretty-printer code is primarily designed to closely follow (GNU) C and C++ grammars. That is to be contrasted with spaghetti diff --git a/gcc/c-family/c-semantics.c b/gcc/c-family/c-semantics.c index cea23541d95..e481f96724a 100644 --- a/gcc/c-family/c-semantics.c +++ b/gcc/c-family/c-semantics.c @@ -22,13 +22,12 @@ along with GCC; see the file COPYING3. If not see #include "system.h" #include "coretypes.h" #include "tm.h" -#include "alias.h" -#include "tree.h" -#include "options.h" -#include "hard-reg-set.h" #include "function.h" -#include "splay-tree.h" +#include "hard-reg-set.h" +#include "tree.h" #include "c-common.h" +#include "alias.h" +#include "splay-tree.h" #include "flags.h" #include "tree-iterator.h" diff --git a/gcc/c-family/c-ubsan.c b/gcc/c-family/c-ubsan.c index 672762c2aa0..f35e8eb5917 100644 --- a/gcc/c-family/c-ubsan.c +++ b/gcc/c-family/c-ubsan.c @@ -21,18 +21,16 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" #include "coretypes.h" -#include "alias.h" -#include "tree.h" -#include "options.h" -#include "alloc-pool.h" #include "tm.h" -#include "hard-reg-set.h" #include "function.h" +#include "hard-reg-set.h" +#include "tree.h" +#include "c-family/c-common.h" +#include "alloc-pool.h" #include "cgraph.h" #include "output.h" #include "toplev.h" #include "ubsan.h" -#include "c-family/c-common.h" #include "c-family/c-ubsan.h" #include "asan.h" #include "internal-fn.h" diff --git a/gcc/c-family/cilk.c b/gcc/c-family/cilk.c index 1c316a4eb78..3ab7f4eff0a 100644 --- a/gcc/c-family/cilk.c +++ b/gcc/c-family/cilk.c @@ -23,24 +23,21 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" #include "coretypes.h" -#include "alias.h" +#include "tm.h" +#include "function.h" +#include "hard-reg-set.h" #include "tree.h" -#include "options.h" -#include "fold-const.h" +#include "c-family/c-common.h" +#include "gimple-expr.h" #include "stringpool.h" +#include "cgraph.h" +#include "diagnostic.h" #include "langhooks.h" -#include "gimple-expr.h" #include "gimplify.h" #include "tree-iterator.h" #include "tree-inline.h" -#include "c-family/c-common.h" #include "toplev.h" -#include "tm.h" -#include "hard-reg-set.h" -#include "function.h" #include "calls.h" -#include "cgraph.h" -#include "diagnostic.h" #include "cilk.h" enum add_variable_type { diff --git a/gcc/c-family/stub-objc.c b/gcc/c-family/stub-objc.c index fb6037b6658..4aa2f4d7887 100644 --- a/gcc/c-family/stub-objc.c +++ b/gcc/c-family/stub-objc.c @@ -22,9 +22,9 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" #include "coretypes.h" -#include "alias.h" #include "tree.h" #include "c-common.h" +#include "alias.h" #include "c-objc.h" tree diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog index d203f9d5bef..20df0865724 100644 --- a/gcc/c/ChangeLog +++ b/gcc/c/ChangeLog @@ -1,3 +1,15 @@ +2015-10-29 Andrew MacLeod <amacleod@redhat.com> + + * c-array-notation.c: Reorder #include's and remove duplicates. + * c-aux-info.c: Likewise. + * c-convert.c: Likewise. + * c-decl.c: Likewise. + * c-errors.c: Likewise. + * c-lang.c: Likewise. + * c-objc-common.c: Likewise. + * c-parser.c: Likewise. + * c-typeck.c: Likewise. + 2015-10-26 Jim Wilson <jim.wilson@linaro.org> PR debug/66068 diff --git a/gcc/c/c-array-notation.c b/gcc/c/c-array-notation.c index 3de75692973..0537cbc7fdd 100644 --- a/gcc/c/c-array-notation.c +++ b/gcc/c/c-array-notation.c @@ -69,12 +69,11 @@ #include "system.h" #include "coretypes.h" #include "tree.h" -#include "alias.h" +#include "c-family/c-common.h" #include "c-tree.h" #include "gimple-expr.h" #include "tree-iterator.h" #include "opts.h" -#include "c-family/c-common.h" /* If *VALUE is not of type INTEGER_CST, PARM_DECL or VAR_DECL, then map it to a variable and then set *VALUE to the new variable. */ diff --git a/gcc/c/c-aux-info.c b/gcc/c/c-aux-info.c index d983e2ccf43..e8b6de64dc3 100644 --- a/gcc/c/c-aux-info.c +++ b/gcc/c/c-aux-info.c @@ -24,10 +24,10 @@ along with GCC; see the file COPYING3. If not see #include "system.h" #include "coretypes.h" #include "tm.h" -#include "flags.h" #include "tree.h" -#include "alias.h" #include "c-tree.h" +#include "flags.h" +#include "alias.h" enum formals_style { ansi, diff --git a/gcc/c/c-convert.c b/gcc/c/c-convert.c index f023de92438..3d16ccb6eed 100644 --- a/gcc/c/c-convert.c +++ b/gcc/c/c-convert.c @@ -26,15 +26,13 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" #include "coretypes.h" -#include "tm.h" +#include "target.h" #include "tree.h" -#include "alias.h" -#include "flags.h" -#include "convert.h" #include "c-family/c-common.h" #include "c-tree.h" +#include "flags.h" +#include "convert.h" #include "langhooks.h" -#include "target.h" #include "ubsan.h" /* Change of width--truncation and extension of integers or reals-- diff --git a/gcc/c/c-decl.c b/gcc/c/c-decl.c index 4a0e090dbd0..ab9ba5d808d 100644 --- a/gcc/c/c-decl.c +++ b/gcc/c/c-decl.c @@ -27,38 +27,32 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" #include "coretypes.h" -#include "tm.h" -#include "intl.h" +#include "target.h" +#include "function.h" #include "tree.h" -#include "alias.h" -#include "fold-const.h" +#include "c-family/c-common.h" +#include "c-tree.h" +#include "timevar.h" +#include "tm_p.h" +#include "stringpool.h" +#include "cgraph.h" +#include "intl.h" #include "print-tree.h" #include "stor-layout.h" #include "varasm.h" #include "attribs.h" -#include "stringpool.h" #include "tree-inline.h" #include "flags.h" -#include "hard-reg-set.h" -#include "function.h" -#include "c-tree.h" #include "toplev.h" -#include "tm_p.h" -#include "cpplib.h" -#include "target.h" #include "debug.h" #include "opts.h" -#include "timevar.h" -#include "c-family/c-common.h" #include "c-family/c-objc.h" #include "c-family/c-pragma.h" #include "c-family/c-ubsan.h" #include "c-lang.h" #include "langhooks.h" #include "tree-iterator.h" -#include "diagnostic-core.h" #include "dumpfile.h" -#include "cgraph.h" #include "langhooks-def.h" #include "plugin.h" #include "c-family/c-ada-spec.h" diff --git a/gcc/c/c-errors.c b/gcc/c/c-errors.c index e5fbf05e76f..d9176ec0f11 100644 --- a/gcc/c/c-errors.c +++ b/gcc/c/c-errors.c @@ -23,11 +23,10 @@ along with GCC; see the file COPYING3. If not see #include "coretypes.h" #include "tm.h" #include "tree.h" -#include "alias.h" #include "c-tree.h" #include "tm_p.h" +#include "alias.h" #include "flags.h" -#include "diagnostic.h" #include "opts.h" /* Issue an ISO C99 pedantic warning MSGID if -pedantic outside C11 mode, diff --git a/gcc/c/c-lang.c b/gcc/c/c-lang.c index d3c266f3416..9728a4797e4 100644 --- a/gcc/c/c-lang.c +++ b/gcc/c/c-lang.c @@ -23,13 +23,11 @@ along with GCC; see the file COPYING3. If not see #include "coretypes.h" #include "tm.h" #include "tree.h" -#include "alias.h" -#include "c-tree.h" #include "c-family/c-common.h" +#include "c-tree.h" #include "langhooks.h" #include "langhooks-def.h" #include "tree-inline.h" -#include "diagnostic-core.h" #include "c-objc-common.h" #include "c-family/c-pragma.h" diff --git a/gcc/c/c-objc-common.c b/gcc/c/c-objc-common.c index 47fd7de05ed..ac61191c511 100644 --- a/gcc/c/c-objc-common.c +++ b/gcc/c/c-objc-common.c @@ -21,11 +21,10 @@ along with GCC; see the file COPYING3. If not see #include "system.h" #include "coretypes.h" #include "tree.h" -#include "alias.h" #include "c-tree.h" +#include "alias.h" #include "intl.h" #include "c-family/c-pretty-print.h" -#include "diagnostic.h" #include "tree-pretty-print.h" #include "langhooks.h" #include "c-objc-common.h" diff --git a/gcc/c/c-parser.c b/gcc/c/c-parser.c index 05700769449..90038d560e0 100644 --- a/gcc/c/c-parser.c +++ b/gcc/c/c-parser.c @@ -38,29 +38,23 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" #include "coretypes.h" -#include "tm.h" /* For rtl.h: needs enum reg_class. */ +#include "target.h" +#include "function.h" #include "tree.h" -#include "alias.h" -#include "flags.h" -#include "fold-const.h" +#include "c-family/c-common.h" +#include "c-tree.h" +#include "timevar.h" #include "stringpool.h" +#include "cgraph.h" +#include "flags.h" #include "attribs.h" #include "stor-layout.h" #include "varasm.h" #include "trans-mem.h" #include "langhooks.h" -#include "cpplib.h" -#include "timevar.h" #include "c-family/c-pragma.h" -#include "c-tree.h" #include "c-lang.h" -#include "flags.h" -#include "c-family/c-common.h" #include "c-family/c-objc.h" -#include "target.h" -#include "hard-reg-set.h" -#include "function.h" -#include "cgraph.h" #include "plugin.h" #include "omp-low.h" #include "builtins.h" diff --git a/gcc/c/c-typeck.c b/gcc/c/c-typeck.c index 1b0b9e2a6d7..2363b9b4340 100644 --- a/gcc/c/c-typeck.c +++ b/gcc/c/c-typeck.c @@ -26,31 +26,27 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" #include "coretypes.h" -#include "tm.h" +#include "target.h" +#include "function.h" +#include "bitmap.h" #include "tree.h" -#include "alias.h" -#include "fold-const.h" +#include "c-family/c-common.h" +#include "c-tree.h" +#include "gimple-expr.h" +#include "predict.h" #include "stor-layout.h" #include "trans-mem.h" #include "varasm.h" #include "stmt.h" #include "langhooks.h" -#include "c-tree.h" #include "c-lang.h" #include "flags.h" #include "intl.h" -#include "target.h" #include "tree-iterator.h" -#include "bitmap.h" -#include "predict.h" -#include "hard-reg-set.h" -#include "function.h" -#include "gimple-expr.h" #include "gimplify.h" #include "tree-inline.h" #include "omp-low.h" #include "c-family/c-objc.h" -#include "c-family/c-common.h" #include "c-family/c-ubsan.h" #include "cilk.h" #include "gomp-constants.h" diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index a85166b757d..01c8d0667b6 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,42 @@ +2015-10-29 Andrew MacLeod <amacleod@redhat.com> + + * call.c: Reorder #include's and remove duplicates. + * class.c: Likewise. + * constexpr.c: Likewise. + * cp-array-notation.c: Likewise. + * cp-cilkplus.c: Likewise. + * cp-gimplify.c: Likewise. + * cp-lang.c: Likewise. + * cp-objcp-common.c: Likewise. + * cp-ubsan.c: Likewise. + * cvt.c: Likewise. + * cxx-pretty-print.c: Likewise. + * decl.c: Likewise. + * decl2.c: Likewise. + * dump.c: Likewise. + * error.c: Likewise. + * except.c: Likewise. + * expr.c: Likewise. + * friend.c: Likewise. + * init.c: Likewise. + * lambda.c: Likewise. + * lex.c: Likewise. + * mangle.c: Likewise. + * method.c: Likewise. + * name-lookup.c: Likewise. + * optimize.c: Likewise. + * parser.c: Likewise. + * pt.c: Likewise. + * ptree.c: Likewise. + * repo.c: Likewise. + * rtti.c: Likewise. + * search.c: Likewise. + * semantics.c: Likewise. + * tree.c: Likewise. + * typeck.c: Likewise. + * typeck2.c: Likewise. + * vtable-class-hierarchy.c: Likewise. + 2015-10-29 Paolo Carlini <paolo.carlini@oracle.com> PR c++/67845 diff --git a/gcc/cp/call.c b/gcc/cp/call.c index 1223dcd3b14..9178188c14b 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -25,25 +25,21 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" #include "coretypes.h" -#include "tm.h" -#include "alias.h" +#include "target.h" #include "tree.h" +#include "cp-tree.h" +#include "timevar.h" +#include "stringpool.h" +#include "cgraph.h" +#include "alias.h" #include "stor-layout.h" #include "trans-mem.h" -#include "stringpool.h" -#include "cp-tree.h" #include "flags.h" #include "toplev.h" -#include "diagnostic-core.h" #include "intl.h" -#include "target.h" #include "convert.h" #include "langhooks.h" #include "c-family/c-objc.h" -#include "timevar.h" -#include "hard-reg-set.h" -#include "function.h" -#include "cgraph.h" #include "internal-fn.h" /* The various kinds of conversion. */ diff --git a/gcc/cp/class.c b/gcc/cp/class.c index 4465963523f..b1239325991 100644 --- a/gcc/cp/class.c +++ b/gcc/cp/class.c @@ -24,23 +24,18 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" #include "coretypes.h" -#include "alias.h" +#include "target.h" #include "tree.h" -#include "options.h" -#include "tm.h" +#include "cp-tree.h" #include "stringpool.h" +#include "cgraph.h" +#include "alias.h" #include "stor-layout.h" #include "attribs.h" -#include "cp-tree.h" #include "flags.h" #include "toplev.h" -#include "target.h" #include "convert.h" -#include "hard-reg-set.h" -#include "function.h" -#include "cgraph.h" #include "dumpfile.h" -#include "splay-tree.h" #include "gimplify.h" /* The number of nested classes being processed. If we are not in the diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c index ebca411b3eb..038c6f505cc 100644 --- a/gcc/cp/constexpr.c +++ b/gcc/cp/constexpr.c @@ -23,11 +23,10 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" #include "coretypes.h" -#include "alias.h" #include "tree.h" -#include "options.h" -#include "varasm.h" #include "cp-tree.h" +#include "alias.h" +#include "varasm.h" #include "c-family/c-objc.h" #include "tree-iterator.h" #include "gimplify.h" diff --git a/gcc/cp/cp-array-notation.c b/gcc/cp/cp-array-notation.c index 2b7d4164379..9fd348ce2e9 100644 --- a/gcc/cp/cp-array-notation.c +++ b/gcc/cp/cp-array-notation.c @@ -53,12 +53,9 @@ #include "config.h" #include "system.h" #include "coretypes.h" -#include "alias.h" #include "tree.h" -#include "options.h" #include "cp-tree.h" #include "c-family/c-common.h" -#include "diagnostic.h" #include "tree-iterator.h" /* Creates a FOR_STMT with INIT, COND, INCR and BODY as the initializer, diff --git a/gcc/cp/cp-cilkplus.c b/gcc/cp/cp-cilkplus.c index 74662b14a4e..42af45f81db 100644 --- a/gcc/cp/cp-cilkplus.c +++ b/gcc/cp/cp-cilkplus.c @@ -24,7 +24,6 @@ #include "system.h" #include "coretypes.h" #include "cp-tree.h" -#include "diagnostic-core.h" #include "tree-iterator.h" #include "tree-inline.h" /* for copy_tree_body_r. */ #include "cilk.h" diff --git a/gcc/cp/cp-gimplify.c b/gcc/cp/cp-gimplify.c index e37cbc7cd99..e4b50e51292 100644 --- a/gcc/cp/cp-gimplify.c +++ b/gcc/cp/cp-gimplify.c @@ -22,26 +22,21 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" #include "coretypes.h" -#include "tm.h" +#include "target.h" #include "function.h" -#include "predict.h" #include "basic-block.h" #include "tree.h" #include "cp-tree.h" +#include "c-family/c-common.h" #include "gimple.h" -#include "hard-reg-set.h" -#include "alias.h" +#include "predict.h" #include "stor-layout.h" -#include "c-family/c-common.h" #include "tree-iterator.h" #include "internal-fn.h" #include "gimplify.h" #include "flags.h" -#include "splay-tree.h" -#include "target.h" #include "c-family/c-ubsan.h" #include "cilk.h" -#include "gimplify.h" /* Forward declarations. */ diff --git a/gcc/cp/cp-lang.c b/gcc/cp/cp-lang.c index 45f41c01ac2..451e03b9f81 100644 --- a/gcc/cp/cp-lang.c +++ b/gcc/cp/cp-lang.c @@ -21,17 +21,15 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" #include "coretypes.h" -#include "tm.h" -#include "alias.h" +#include "target.h" #include "tree.h" -#include "stor-layout.h" #include "cp-tree.h" #include "c-family/c-common.h" +#include "stor-layout.h" #include "langhooks.h" #include "langhooks-def.h" #include "debug.h" #include "cp-objcp-common.h" -#include "target.h" #include "parser.h" enum c_language_kind c_language = clk_cxx; diff --git a/gcc/cp/cp-objcp-common.c b/gcc/cp/cp-objcp-common.c index 22f063b7093..e5fe83703af 100644 --- a/gcc/cp/cp-objcp-common.c +++ b/gcc/cp/cp-objcp-common.c @@ -22,13 +22,11 @@ along with GCC; see the file COPYING3. If not see #include "system.h" #include "coretypes.h" #include "tm.h" -#include "alias.h" #include "tree.h" #include "cp-tree.h" #include "c-family/c-common.h" #include "langhooks.h" #include "langhooks-def.h" -#include "diagnostic.h" #include "debug.h" #include "cxx-pretty-print.h" #include "cp-objcp-common.h" diff --git a/gcc/cp/cp-ubsan.c b/gcc/cp/cp-ubsan.c index 6486218e8da..86af6c7e55f 100644 --- a/gcc/cp/cp-ubsan.c +++ b/gcc/cp/cp-ubsan.c @@ -21,25 +21,22 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" #include "coretypes.h" -#include "alias.h" -#include "predict.h" #include "basic-block.h" #include "tree.h" #include "cp-tree.h" +#include "c-family/c-common.h" #include "gimple.h" -#include "options.h" +#include "predict.h" +#include "stringpool.h" +#include "cgraph.h" #include "output.h" #include "toplev.h" #include "ubsan.h" -#include "c-family/c-common.h" #include "c-family/c-ubsan.h" #include "asan.h" #include "internal-fn.h" #include "stor-layout.h" #include "builtins.h" -#include "fold-const.h" -#include "stringpool.h" -#include "cgraph.h" /* Test if we should instrument vptr access. */ diff --git a/gcc/cp/cvt.c b/gcc/cp/cvt.c index b61588021a3..e764ee15243 100644 --- a/gcc/cp/cvt.c +++ b/gcc/cp/cvt.c @@ -27,16 +27,15 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" #include "coretypes.h" -#include "tm.h" -#include "alias.h" +#include "target.h" #include "tree.h" +#include "cp-tree.h" +#include "alias.h" #include "stor-layout.h" #include "flags.h" -#include "cp-tree.h" #include "intl.h" #include "convert.h" #include "decl.h" -#include "target.h" static tree cp_convert_to_pointer (tree, tree, tsubst_flags_t); static tree convert_to_pointer_force (tree, tree, tsubst_flags_t); diff --git a/gcc/cp/cxx-pretty-print.c b/gcc/cp/cxx-pretty-print.c index 879eb71fc3a..ea6b4c56b63 100644 --- a/gcc/cp/cxx-pretty-print.c +++ b/gcc/cp/cxx-pretty-print.c @@ -22,8 +22,8 @@ along with GCC; see the file COPYING3. If not see #include "system.h" #include "coretypes.h" #include "tm.h" -#include "intl.h" #include "cp-tree.h" +#include "intl.h" #include "cxx-pretty-print.h" #include "tree-pretty-print.h" diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index c5ceb5a2d6f..bd3f2bc6084 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -29,38 +29,31 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" #include "coretypes.h" -#include "tm.h" -#include "alias.h" +#include "target.h" +#include "c-family/c-target.h" #include "tree.h" -#include "tree-hasher.h" +#include "cp-tree.h" +#include "c-family/c-common.h" +#include "timevar.h" +#include "tm_p.h" #include "stringpool.h" +#include "cgraph.h" +#include "tree-hasher.h" #include "stor-layout.h" #include "varasm.h" #include "attribs.h" #include "calls.h" #include "flags.h" -#include "cp-tree.h" #include "tree-iterator.h" #include "tree-inline.h" #include "decl.h" #include "intl.h" #include "toplev.h" -#include "tm_p.h" -#include "target.h" -#include "c-family/c-common.h" #include "c-family/c-objc.h" #include "c-family/c-pragma.h" -#include "c-family/c-target.h" #include "c-family/c-ubsan.h" -#include "diagnostic.h" -#include "intl.h" #include "debug.h" -#include "timevar.h" -#include "splay-tree.h" #include "plugin.h" -#include "hard-reg-set.h" -#include "function.h" -#include "cgraph.h" #include "cilk.h" #include "builtins.h" diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c index 3b3817e6da9..01d46070a80 100644 --- a/gcc/cp/decl2.c +++ b/gcc/cp/decl2.c @@ -29,31 +29,25 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" #include "coretypes.h" -#include "tm.h" -#include "alias.h" +#include "target.h" #include "tree.h" +#include "cp-tree.h" +#include "c-family/c-common.h" +#include "timevar.h" #include "stringpool.h" +#include "cgraph.h" #include "varasm.h" #include "attribs.h" #include "stor-layout.h" #include "calls.h" #include "flags.h" -#include "cp-tree.h" #include "decl.h" #include "toplev.h" -#include "timevar.h" -#include "cpplib.h" -#include "target.h" -#include "c-family/c-common.h" #include "c-family/c-objc.h" -#include "hard-reg-set.h" -#include "function.h" -#include "cgraph.h" #include "tree-inline.h" #include "c-family/c-pragma.h" #include "dumpfile.h" #include "intl.h" -#include "splay-tree.h" #include "langhooks.h" #include "c-family/c-ada-spec.h" #include "asan.h" diff --git a/gcc/cp/dump.c b/gcc/cp/dump.c index 25a15d71e26..471e124551a 100644 --- a/gcc/cp/dump.c +++ b/gcc/cp/dump.c @@ -22,9 +22,9 @@ along with GCC; see the file COPYING3. If not see #include "system.h" #include "coretypes.h" #include "tm.h" -#include "alias.h" #include "tree.h" #include "cp-tree.h" +#include "alias.h" #include "tree-dump.h" static void dump_access (dump_info_p, tree); diff --git a/gcc/cp/error.c b/gcc/cp/error.c index 17870b5f1c3..b0280d27ed0 100644 --- a/gcc/cp/error.c +++ b/gcc/cp/error.c @@ -21,12 +21,11 @@ along with GCC; see the file COPYING3. If not see #include "system.h" #include "coretypes.h" #include "tm.h" -#include "alias.h" #include "tree.h" -#include "stringpool.h" #include "cp-tree.h" +#include "stringpool.h" +#include "alias.h" #include "flags.h" -#include "diagnostic.h" #include "tree-diagnostic.h" #include "langhooks-def.h" #include "intl.h" diff --git a/gcc/cp/except.c b/gcc/cp/except.c index d2d1531e4c2..abcfde889d2 100644 --- a/gcc/cp/except.c +++ b/gcc/cp/except.c @@ -24,17 +24,16 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" #include "coretypes.h" -#include "tm.h" -#include "alias.h" +#include "target.h" #include "tree.h" +#include "cp-tree.h" #include "stringpool.h" +#include "alias.h" #include "trans-mem.h" #include "attribs.h" -#include "cp-tree.h" #include "flags.h" #include "tree-inline.h" #include "tree-iterator.h" -#include "target.h" static void push_eh_cleanup (tree); static tree prepare_eh_type (tree); diff --git a/gcc/cp/expr.c b/gcc/cp/expr.c index 71dec3da033..946ad89cdd2 100644 --- a/gcc/cp/expr.c +++ b/gcc/cp/expr.c @@ -23,11 +23,11 @@ along with GCC; see the file COPYING3. If not see #include "system.h" #include "coretypes.h" #include "tm.h" -#include "alias.h" #include "tree.h" -#include "flags.h" #include "cp-tree.h" #include "tm_p.h" +#include "alias.h" +#include "flags.h" /* Expand C++-specific constants. Currently, this means PTRMEM_CST. */ diff --git a/gcc/cp/friend.c b/gcc/cp/friend.c index f53ce27f19d..9d58efcc1c0 100644 --- a/gcc/cp/friend.c +++ b/gcc/cp/friend.c @@ -21,9 +21,9 @@ along with GCC; see the file COPYING3. If not see #include "system.h" #include "coretypes.h" #include "tm.h" -#include "alias.h" #include "tree.h" #include "cp-tree.h" +#include "alias.h" #include "flags.h" /* Friend data structures are described in cp-tree.h. */ diff --git a/gcc/cp/init.c b/gcc/cp/init.c index d89e1ac0b5a..035ec2921be 100644 --- a/gcc/cp/init.c +++ b/gcc/cp/init.c @@ -23,14 +23,13 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" #include "coretypes.h" -#include "tm.h" -#include "alias.h" +#include "target.h" #include "tree.h" +#include "cp-tree.h" #include "stringpool.h" +#include "alias.h" #include "varasm.h" -#include "cp-tree.h" #include "flags.h" -#include "target.h" #include "gimplify.h" #include "c-family/c-ubsan.h" diff --git a/gcc/cp/lambda.c b/gcc/cp/lambda.c index c1e747173eb..d10fff2ce63 100644 --- a/gcc/cp/lambda.c +++ b/gcc/cp/lambda.c @@ -24,16 +24,15 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" #include "coretypes.h" -#include "alias.h" -#include "tree.h" -#include "options.h" -#include "stringpool.h" #include "tm.h" -#include "hard-reg-set.h" #include "function.h" +#include "hard-reg-set.h" +#include "tree.h" +#include "cp-tree.h" +#include "stringpool.h" #include "cgraph.h" +#include "alias.h" #include "tree-iterator.h" -#include "cp-tree.h" #include "toplev.h" /* Constructor for a lambda expression. */ diff --git a/gcc/cp/lex.c b/gcc/cp/lex.c index 6acf47e631e..3dc11553c5f 100644 --- a/gcc/cp/lex.c +++ b/gcc/cp/lex.c @@ -25,16 +25,15 @@ along with GCC; see the file COPYING3. If not see #include "system.h" #include "coretypes.h" #include "tm.h" -#include "alias.h" #include "tree.h" -#include "stringpool.h" #include "cp-tree.h" -#include "cpplib.h" +#include "timevar.h" +#include "tm_p.h" +#include "stringpool.h" +#include "alias.h" #include "flags.h" #include "c-family/c-pragma.h" #include "c-family/c-objc.h" -#include "tm_p.h" -#include "timevar.h" static int interface_strcmp (const char *); static void init_cp_pragma (void); diff --git a/gcc/cp/mangle.c b/gcc/cp/mangle.c index faeea141528..b6b9f38add5 100644 --- a/gcc/cp/mangle.c +++ b/gcc/cp/mangle.c @@ -47,22 +47,18 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" #include "coretypes.h" -#include "tm.h" -#include "alias.h" +#include "target.h" +#include "vtable-verify.h" #include "tree.h" +#include "cp-tree.h" +#include "tm_p.h" +#include "stringpool.h" +#include "cgraph.h" +#include "alias.h" #include "tree-hasher.h" #include "stor-layout.h" -#include "stringpool.h" -#include "tm_p.h" -#include "cp-tree.h" -#include "obstack.h" #include "flags.h" -#include "target.h" -#include "hard-reg-set.h" -#include "function.h" -#include "cgraph.h" #include "attribs.h" -#include "vtable-verify.h" /* Debugging support. */ diff --git a/gcc/cp/method.c b/gcc/cp/method.c index 21eb32aedd7..4de6cc2dd8c 100644 --- a/gcc/cp/method.c +++ b/gcc/cp/method.c @@ -24,21 +24,17 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" #include "coretypes.h" -#include "tm.h" -#include "alias.h" +#include "target.h" #include "tree.h" +#include "cp-tree.h" +#include "tm_p.h" #include "stringpool.h" +#include "cgraph.h" +#include "alias.h" #include "varasm.h" -#include "cp-tree.h" #include "flags.h" #include "toplev.h" -#include "tm_p.h" -#include "target.h" #include "common/common-target.h" -#include "diagnostic.h" -#include "hard-reg-set.h" -#include "function.h" -#include "cgraph.h" /* Various flags to control the mangling process. */ diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c index b5030120d6d..8744fff5c56 100644 --- a/gcc/cp/name-lookup.c +++ b/gcc/cp/name-lookup.c @@ -22,16 +22,14 @@ along with GCC; see the file COPYING3. If not see #include "system.h" #include "coretypes.h" #include "tm.h" -#include "flags.h" -#include "alias.h" #include "tree.h" +#include "cp-tree.h" +#include "timevar.h" #include "stringpool.h" +#include "flags.h" +#include "alias.h" #include "print-tree.h" #include "attribs.h" -#include "cp-tree.h" -#include "name-lookup.h" -#include "timevar.h" -#include "diagnostic-core.h" #include "intl.h" #include "debug.h" #include "c-family/c-pragma.h" diff --git a/gcc/cp/optimize.c b/gcc/cp/optimize.c index 33c67c0450a..f947d09a6d0 100644 --- a/gcc/cp/optimize.c +++ b/gcc/cp/optimize.c @@ -21,23 +21,19 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" #include "coretypes.h" -#include "tm.h" -#include "alias.h" +#include "target.h" #include "tree.h" -#include "stringpool.h" #include "cp-tree.h" +#include "stringpool.h" +#include "cgraph.h" +#include "alias.h" #include "params.h" -#include "target.h" #include "debug.h" #include "tree-inline.h" #include "flags.h" #include "langhooks.h" -#include "diagnostic-core.h" #include "dumpfile.h" #include "tree-iterator.h" -#include "hard-reg-set.h" -#include "function.h" -#include "cgraph.h" /* Prototypes. */ diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 169c17dc778..c8f8b3dd362 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -21,26 +21,20 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" #include "coretypes.h" -#include "tm.h" -#include "timevar.h" -#include "cpplib.h" -#include "alias.h" +#include "target.h" #include "tree.h" -#include "print-tree.h" +#include "cp-tree.h" +#include "c-family/c-common.h" +#include "timevar.h" #include "stringpool.h" +#include "cgraph.h" +#include "print-tree.h" #include "attribs.h" #include "trans-mem.h" -#include "cp-tree.h" #include "intl.h" #include "c-family/c-pragma.h" #include "decl.h" #include "flags.h" -#include "diagnostic-core.h" -#include "target.h" -#include "hard-reg-set.h" -#include "function.h" -#include "cgraph.h" -#include "c-family/c-common.h" #include "c-family/c-objc.h" #include "plugin.h" #include "tree-pretty-print.h" diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 2745b40fd7e..438ec2df18d 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -28,22 +28,21 @@ along with GCC; see the file COPYING3. If not see #include "system.h" #include "coretypes.h" #include "tm.h" -#include "alias.h" #include "tree.h" +#include "cp-tree.h" +#include "c-family/c-common.h" +#include "timevar.h" #include "stringpool.h" #include "varasm.h" #include "attribs.h" #include "stor-layout.h" #include "intl.h" #include "flags.h" -#include "cp-tree.h" -#include "c-family/c-common.h" #include "c-family/c-objc.h" #include "cp-objcp-common.h" #include "tree-inline.h" #include "decl.h" #include "toplev.h" -#include "timevar.h" #include "tree-iterator.h" #include "type-utils.h" #include "gimplify.h" diff --git a/gcc/cp/ptree.c b/gcc/cp/ptree.c index b0281df19b9..d01e8caab72 100644 --- a/gcc/cp/ptree.c +++ b/gcc/cp/ptree.c @@ -23,10 +23,10 @@ along with GCC; see the file COPYING3. If not see #include "system.h" #include "coretypes.h" #include "tm.h" -#include "alias.h" #include "tree.h" -#include "print-tree.h" #include "cp-tree.h" +#include "alias.h" +#include "print-tree.h" void cxx_print_decl (FILE *file, tree node, int indent) diff --git a/gcc/cp/repo.c b/gcc/cp/repo.c index 5155a2fa295..2978198f45a 100644 --- a/gcc/cp/repo.c +++ b/gcc/cp/repo.c @@ -28,13 +28,11 @@ along with GCC; see the file COPYING3. If not see #include "system.h" #include "coretypes.h" #include "tm.h" -#include "alias.h" #include "tree.h" -#include "stringpool.h" #include "cp-tree.h" -#include "obstack.h" +#include "stringpool.h" +#include "alias.h" #include "toplev.h" -#include "diagnostic-core.h" #include "flags.h" static const char *extract_string (const char **); diff --git a/gcc/cp/rtti.c b/gcc/cp/rtti.c index 85be2b29d15..be25be4e07d 100644 --- a/gcc/cp/rtti.c +++ b/gcc/cp/rtti.c @@ -20,18 +20,17 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" -#include "intl.h" #include "coretypes.h" -#include "tm.h" -#include "alias.h" +#include "target.h" #include "tree.h" +#include "cp-tree.h" #include "tm_p.h" #include "stringpool.h" +#include "intl.h" +#include "alias.h" #include "stor-layout.h" -#include "cp-tree.h" #include "flags.h" #include "convert.h" -#include "target.h" #include "c-family/c-pragma.h" /* C++ returns type information to the user in struct type_info diff --git a/gcc/cp/search.c b/gcc/cp/search.c index 56bb266da31..93054bda5d8 100644 --- a/gcc/cp/search.c +++ b/gcc/cp/search.c @@ -24,14 +24,13 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" #include "coretypes.h" -#include "tm.h" -#include "alias.h" +#include "target.h" #include "tree.h" #include "cp-tree.h" +#include "alias.h" #include "intl.h" #include "flags.h" #include "toplev.h" -#include "target.h" static int is_subobject_of_p (tree, tree); static tree dfs_lookup_base (tree, void *); diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index a6d7e361d05..c73dcd0007b 100644 --- a/gcc/cp/semantics.c +++ b/gcc/cp/semantics.c @@ -26,29 +26,24 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" #include "coretypes.h" -#include "tm.h" -#include "alias.h" +#include "target.h" +#include "bitmap.h" #include "tree.h" +#include "cp-tree.h" +#include "c-family/c-common.h" +#include "timevar.h" +#include "stringpool.h" +#include "cgraph.h" #include "stmt.h" #include "varasm.h" #include "stor-layout.h" -#include "stringpool.h" -#include "cp-tree.h" -#include "c-family/c-common.h" #include "c-family/c-objc.h" #include "tree-inline.h" #include "intl.h" #include "toplev.h" #include "flags.h" -#include "timevar.h" -#include "diagnostic.h" -#include "hard-reg-set.h" -#include "function.h" -#include "cgraph.h" #include "tree-iterator.h" -#include "target.h" #include "gimplify.h" -#include "bitmap.h" #include "omp-low.h" #include "builtins.h" #include "convert.h" diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c index b9b801f311c..11bd1299bd6 100644 --- a/gcc/cp/tree.c +++ b/gcc/cp/tree.c @@ -22,23 +22,20 @@ along with GCC; see the file COPYING3. If not see #include "system.h" #include "coretypes.h" #include "tm.h" -#include "alias.h" #include "tree.h" +#include "cp-tree.h" +#include "gimple-expr.h" +#include "cgraph.h" +#include "alias.h" #include "fold-const.h" #include "tree-hasher.h" #include "stor-layout.h" #include "print-tree.h" #include "tree-iterator.h" -#include "cp-tree.h" #include "flags.h" #include "tree-inline.h" #include "debug.h" #include "convert.h" -#include "hard-reg-set.h" -#include "function.h" -#include "cgraph.h" -#include "splay-tree.h" -#include "gimple-expr.h" #include "gimplify.h" #include "attribs.h" diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c index 3147609d427..9d043e0411f 100644 --- a/gcc/cp/typeck.c +++ b/gcc/cp/typeck.c @@ -27,19 +27,15 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" #include "coretypes.h" -#include "tm.h" -#include "alias.h" +#include "target.h" #include "tree.h" -#include "fold-const.h" +#include "cp-tree.h" +#include "c-family/c-common.h" #include "stor-layout.h" #include "varasm.h" -#include "cp-tree.h" #include "flags.h" -#include "diagnostic.h" #include "intl.h" -#include "target.h" #include "convert.h" -#include "c-family/c-common.h" #include "c-family/c-objc.h" #include "c-family/c-ubsan.h" #include "params.h" diff --git a/gcc/cp/typeck2.c b/gcc/cp/typeck2.c index e61a57f8b35..b717ea9d5c7 100644 --- a/gcc/cp/typeck2.c +++ b/gcc/cp/typeck2.c @@ -29,14 +29,13 @@ along with GCC; see the file COPYING3. If not see #include "system.h" #include "coretypes.h" #include "tm.h" -#include "alias.h" #include "tree.h" +#include "cp-tree.h" +#include "alias.h" #include "stor-layout.h" #include "varasm.h" #include "intl.h" -#include "cp-tree.h" #include "flags.h" -#include "diagnostic-core.h" static tree process_init_constructor (tree type, tree init, tsubst_flags_t complain); diff --git a/gcc/cp/vtable-class-hierarchy.c b/gcc/cp/vtable-class-hierarchy.c index 2c59f14f389..d5c31e8ce07 100644 --- a/gcc/cp/vtable-class-hierarchy.c +++ b/gcc/cp/vtable-class-hierarchy.c @@ -113,16 +113,14 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" #include "coretypes.h" -#include "cp-tree.h" -#include "output.h" #include "tm.h" -#include "hard-reg-set.h" -#include "function.h" +#include "vtable-verify.h" +#include "cp-tree.h" +#include "stringpool.h" #include "cgraph.h" +#include "output.h" #include "tree-iterator.h" -#include "vtable-verify.h" #include "gimplify.h" -#include "stringpool.h" #include "stor-layout.h" static int num_calls_to_regset = 0; diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 2d737f2f783..a58d1f14dcd 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,31 @@ +2015-10-29 Andrew MacLeod <amacleod@redhat.com> + + * array.c: Reorder #include's and remove duplicates. + * convert.c: Likewise. + * cpp.c: Likewise. + * decl.c: Likewise. + * f95-lang.c: Likewise. + * frontend-passes.c: Likewise. + * iresolve.c: Likewise. + * match.c: Likewise. + * module.c: Likewise. + * options.c: Likewise. + * parse.c: Likewise. + * resolve.c: Likewise. + * simplify.c: Likewise. + * target-memory.c: Likewise. + * trans-array.c: Likewise. + * trans-common.c: Likewise. + * trans-const.c: Likewise. + * trans-decl.c: Likewise. + * trans-expr.c: Likewise. + * trans-intrinsic.c: Likewise. + * trans-io.c: Likewise. + * trans-openmp.c: Likewise. + * trans-stmt.c: Likewise. + * trans-types.c: Likewise. + * trans.c: Likewise. + 2015-10-29 Richard Biener <rguenther@suse.de> * f95-lang.c: Properly build variadic types for classification diff --git a/gcc/fortran/array.c b/gcc/fortran/array.c index 940eeafd7b6..2083044774f 100644 --- a/gcc/fortran/array.c +++ b/gcc/fortran/array.c @@ -22,8 +22,8 @@ along with GCC; see the file COPYING3. If not see #include "system.h" #include "coretypes.h" #include "options.h" -#include "flags.h" #include "gfortran.h" +#include "flags.h" #include "match.h" #include "constructor.h" diff --git a/gcc/fortran/convert.c b/gcc/fortran/convert.c index 21fc36fc747..37520770cb3 100644 --- a/gcc/fortran/convert.c +++ b/gcc/fortran/convert.c @@ -25,9 +25,9 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" #include "coretypes.h" -#include "alias.h" -#include "tree.h" #include "options.h" +#include "tree.h" +#include "alias.h" #include "fold-const.h" #include "convert.h" diff --git a/gcc/fortran/cpp.c b/gcc/fortran/cpp.c index daffc2069bf..7d296255b42 100644 --- a/gcc/fortran/cpp.c +++ b/gcc/fortran/cpp.c @@ -19,19 +19,17 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" #include "coretypes.h" -#include "tm.h" -#include "alias.h" +#include "target.h" #include "tree.h" +#include "gfortran.h" +#include "tm_p.h" /* Target prototypes. */ +#include "diagnostic.h" +#include "alias.h" #include "version.h" #include "flags.h" -#include "options.h" -#include "gfortran.h" -#include "tm_p.h" /* Target prototypes. */ -#include "target.h" #include "toplev.h" -#include "diagnostic.h" #include "../../libcpp/internal.h" #include "cpp.h" diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c index 07c539162f4..5c34dc94387 100644 --- a/gcc/fortran/decl.c +++ b/gcc/fortran/decl.c @@ -21,14 +21,14 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" #include "coretypes.h" +#include "options.h" +#include "tree.h" #include "gfortran.h" +#include "stringpool.h" #include "match.h" #include "parse.h" -#include "options.h" #include "constructor.h" #include "alias.h" -#include "tree.h" -#include "stringpool.h" /* Macros to access allocate memory for gfc_data_variable, gfc_data_value and gfc_data. */ diff --git a/gcc/fortran/f95-lang.c b/gcc/fortran/f95-lang.c index fdb396dc5ff..2e91470675f 100644 --- a/gcc/fortran/f95-lang.c +++ b/gcc/fortran/f95-lang.c @@ -24,28 +24,24 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" -#include "ansidecl.h" -#include "system.h" #include "coretypes.h" +#include "target.h" +#include "function.h" +#include "tree.h" #include "gfortran.h" +#include "trans.h" +#include "timevar.h" +#include "cgraph.h" +#include "diagnostic.h" /* For errorcount/warningcount */ +#include "ansidecl.h" #include "alias.h" -#include "tree.h" -#include "options.h" #include "flags.h" #include "langhooks.h" #include "langhooks-def.h" -#include "timevar.h" -#include "tm.h" -#include "hard-reg-set.h" -#include "function.h" #include "toplev.h" -#include "target.h" #include "debug.h" -#include "diagnostic.h" /* For errorcount/warningcount */ #include "dumpfile.h" -#include "cgraph.h" #include "cpp.h" -#include "trans.h" #include "trans-types.h" #include "trans-const.h" diff --git a/gcc/fortran/frontend-passes.c b/gcc/fortran/frontend-passes.c index bc9f6210f4f..fbcc96444e8 100644 --- a/gcc/fortran/frontend-passes.c +++ b/gcc/fortran/frontend-passes.c @@ -21,9 +21,9 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" #include "coretypes.h" +#include "options.h" #include "gfortran.h" #include "arith.h" -#include "options.h" #include "dependency.h" #include "constructor.h" #include "opts.h" diff --git a/gcc/fortran/iresolve.c b/gcc/fortran/iresolve.c index 7503f183749..f176390ffca 100644 --- a/gcc/fortran/iresolve.c +++ b/gcc/fortran/iresolve.c @@ -29,11 +29,11 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" #include "coretypes.h" -#include "alias.h" -#include "tree.h" #include "options.h" -#include "stringpool.h" +#include "tree.h" #include "gfortran.h" +#include "stringpool.h" +#include "alias.h" #include "intrinsic.h" #include "constructor.h" #include "arith.h" diff --git a/gcc/fortran/match.c b/gcc/fortran/match.c index dda2d5ab1da..7abb5dee4a9 100644 --- a/gcc/fortran/match.c +++ b/gcc/fortran/match.c @@ -22,13 +22,13 @@ along with GCC; see the file COPYING3. If not see #include "system.h" #include "coretypes.h" #include "options.h" -#include "flags.h" +#include "tree.h" #include "gfortran.h" +#include "stringpool.h" +#include "flags.h" #include "match.h" #include "parse.h" #include "alias.h" -#include "tree.h" -#include "stringpool.h" int gfc_matching_ptr_assignment = 0; int gfc_matching_procptr_assignment = 0; diff --git a/gcc/fortran/module.c b/gcc/fortran/module.c index f0d84a48612..91d2bd6b394 100644 --- a/gcc/fortran/module.c +++ b/gcc/fortran/module.c @@ -67,16 +67,16 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" #include "coretypes.h" +#include "options.h" +#include "tree.h" #include "gfortran.h" +#include "stringpool.h" #include "arith.h" #include "match.h" #include "parse.h" /* FIXME */ #include "constructor.h" #include "cpp.h" #include "alias.h" -#include "tree.h" -#include "options.h" -#include "stringpool.h" #include "scanner.h" #include <zlib.h> diff --git a/gcc/fortran/options.c b/gcc/fortran/options.c index e367e157e14..f689518c4c2 100644 --- a/gcc/fortran/options.c +++ b/gcc/fortran/options.c @@ -21,20 +21,18 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" #include "coretypes.h" -#include "alias.h" +#include "target.h" #include "tree.h" -#include "options.h" +#include "gfortran.h" +#include "diagnostic.h" /* For global_dc. */ +#include "alias.h" #include "flags.h" #include "intl.h" #include "opts.h" #include "toplev.h" /* For save_decoded_options. */ #include "params.h" #include "tree-inline.h" -#include "gfortran.h" -#include "target.h" #include "cpp.h" -#include "diagnostic.h" /* For global_dc. */ -#include "tm.h" #include "langhooks.h" gfc_option_t gfc_option; diff --git a/gcc/fortran/parse.c b/gcc/fortran/parse.c index 4925c7ee58a..650135b1833 100644 --- a/gcc/fortran/parse.c +++ b/gcc/fortran/parse.c @@ -20,10 +20,10 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" -#include <setjmp.h> #include "coretypes.h" #include "options.h" #include "gfortran.h" +#include <setjmp.h> #include "match.h" #include "parse.h" #include "debug.h" diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index 8798d4d9e96..1049c0c1652 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -22,9 +22,8 @@ along with GCC; see the file COPYING3. If not see #include "system.h" #include "coretypes.h" #include "options.h" -#include "gfortran.h" -#include "obstack.h" #include "bitmap.h" +#include "gfortran.h" #include "arith.h" /* For gfc_compare_expr(). */ #include "dependency.h" #include "data.h" diff --git a/gcc/fortran/simplify.c b/gcc/fortran/simplify.c index 6a81dc32eca..9b58b994d52 100644 --- a/gcc/fortran/simplify.c +++ b/gcc/fortran/simplify.c @@ -21,12 +21,12 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" #include "coretypes.h" +#include "tm.h" /* For BITS_PER_UNIT. */ #include "gfortran.h" #include "arith.h" #include "intrinsic.h" #include "target-memory.h" #include "constructor.h" -#include "tm.h" /* For BITS_PER_UNIT. */ #include "version.h" /* For version_string. */ diff --git a/gcc/fortran/target-memory.c b/gcc/fortran/target-memory.c index a58a97747c8..ae339ed430c 100644 --- a/gcc/fortran/target-memory.c +++ b/gcc/fortran/target-memory.c @@ -21,14 +21,14 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" #include "coretypes.h" -#include "alias.h" #include "tree.h" +#include "gfortran.h" +#include "trans.h" +#include "alias.h" #include "fold-const.h" #include "stor-layout.h" -#include "gfortran.h" #include "arith.h" #include "constructor.h" -#include "trans.h" #include "trans-const.h" #include "trans-types.h" #include "target-memory.h" diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c index f6e980d72ab..6bbf8cc6279 100644 --- a/gcc/fortran/trans-array.c +++ b/gcc/fortran/trans-array.c @@ -78,16 +78,16 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" #include "coretypes.h" -#include "gfortran.h" -#include "alias.h" -#include "tree.h" #include "options.h" -#include "fold-const.h" +#include "tree.h" +#include "gfortran.h" #include "gimple-expr.h" +#include "trans.h" #include "diagnostic-core.h" /* For internal_error/fatal_error. */ +#include "alias.h" +#include "fold-const.h" #include "flags.h" #include "constructor.h" -#include "trans.h" #include "trans-stmt.h" #include "trans-types.h" #include "trans-array.h" diff --git a/gcc/fortran/trans-common.c b/gcc/fortran/trans-common.c index ae336c15e3e..6809932a787 100644 --- a/gcc/fortran/trans-common.c +++ b/gcc/fortran/trans-common.c @@ -94,19 +94,19 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" +#include "coretypes.h" +#include "tm.h" +#include "tree.h" +#include "gfortran.h" +#include "trans.h" +#include "stringpool.h" #include <map> -#include "coretypes.h" -#include "tm.h" #include "alias.h" -#include "tree.h" #include "fold-const.h" -#include "stringpool.h" #include "stor-layout.h" #include "varasm.h" -#include "gfortran.h" -#include "trans.h" #include "trans-types.h" #include "trans-const.h" #include "target-memory.h" diff --git a/gcc/fortran/trans-const.c b/gcc/fortran/trans-const.c index 1d1e9634633..55c5d141bcc 100644 --- a/gcc/fortran/trans-const.c +++ b/gcc/fortran/trans-const.c @@ -23,15 +23,15 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" #include "coretypes.h" +#include "options.h" +#include "tree.h" #include "gfortran.h" +#include "trans.h" +#include "diagnostic-core.h" /* For fatal_error. */ #include "alias.h" -#include "tree.h" -#include "options.h" #include "fold-const.h" #include "stor-layout.h" #include "realmpfr.h" -#include "diagnostic-core.h" /* For fatal_error. */ -#include "trans.h" #include "trans-const.h" #include "trans-types.h" #include "target-memory.h" diff --git a/gcc/fortran/trans-decl.c b/gcc/fortran/trans-decl.c index 269c235e465..ded5c1fb3d7 100644 --- a/gcc/fortran/trans-decl.c +++ b/gcc/fortran/trans-decl.c @@ -23,27 +23,25 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" #include "coretypes.h" -#include "tm.h" +#include "target.h" +#include "function.h" +#include "tree.h" #include "gfortran.h" +#include "gimple-expr.h" /* For create_tmp_var_raw. */ +#include "trans.h" +#include "stringpool.h" +#include "cgraph.h" +#include "diagnostic-core.h" /* For internal_error. */ #include "alias.h" -#include "tree.h" #include "fold-const.h" -#include "stringpool.h" #include "stor-layout.h" #include "varasm.h" #include "attribs.h" #include "tree-dump.h" -#include "gimple-expr.h" /* For create_tmp_var_raw. */ -#include "diagnostic-core.h" /* For internal_error. */ #include "toplev.h" /* For announce_function. */ -#include "target.h" -#include "hard-reg-set.h" -#include "function.h" #include "flags.h" -#include "cgraph.h" #include "debug.h" #include "constructor.h" -#include "trans.h" #include "trans-types.h" #include "trans-array.h" #include "trans-const.h" diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c index f8ed0df8beb..b8f47900bdf 100644 --- a/gcc/fortran/trans-expr.c +++ b/gcc/fortran/trans-expr.c @@ -24,18 +24,18 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" #include "coretypes.h" -#include "gfortran.h" -#include "alias.h" -#include "tree.h" #include "options.h" -#include "fold-const.h" +#include "tree.h" +#include "gfortran.h" +#include "trans.h" #include "stringpool.h" #include "diagnostic-core.h" /* For fatal_error. */ +#include "alias.h" +#include "fold-const.h" #include "langhooks.h" #include "flags.h" #include "arith.h" #include "constructor.h" -#include "trans.h" #include "trans-const.h" #include "trans-types.h" #include "trans-array.h" diff --git a/gcc/fortran/trans-intrinsic.c b/gcc/fortran/trans-intrinsic.c index d72ea98abf3..c84f12cbb3a 100644 --- a/gcc/fortran/trans-intrinsic.c +++ b/gcc/fortran/trans-intrinsic.c @@ -25,26 +25,25 @@ along with GCC; see the file COPYING3. If not see #include "system.h" #include "coretypes.h" #include "tm.h" /* For UNITS_PER_WORD. */ -#include "alias.h" #include "tree.h" -#include "fold-const.h" +#include "gfortran.h" +#include "trans.h" #include "stringpool.h" +#include "diagnostic-core.h" /* For internal_error. */ +#include "alias.h" +#include "fold-const.h" #include "tree-nested.h" #include "stor-layout.h" -#include "gfortran.h" -#include "diagnostic-core.h" /* For internal_error. */ #include "toplev.h" /* For rest_of_decl_compilation. */ #include "flags.h" #include "arith.h" #include "intrinsic.h" -#include "trans.h" #include "trans-const.h" #include "trans-types.h" #include "trans-array.h" #include "dependency.h" /* For CAF array alias analysis. */ /* Only for gfc_trans_assign and gfc_trans_pointer_assign. */ #include "trans-stmt.h" -#include "tree-nested.h" /* This maps Fortran intrinsic math functions to external library or GCC builtin functions. */ diff --git a/gcc/fortran/trans-io.c b/gcc/fortran/trans-io.c index 7afa726c961..306d2e911e1 100644 --- a/gcc/fortran/trans-io.c +++ b/gcc/fortran/trans-io.c @@ -22,15 +22,15 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" #include "coretypes.h" -#include "alias.h" -#include "tree.h" #include "options.h" -#include "fold-const.h" -#include "stringpool.h" -#include "stor-layout.h" +#include "tree.h" #include "gfortran.h" -#include "diagnostic-core.h" /* For internal_error. */ #include "trans.h" +#include "stringpool.h" +#include "diagnostic-core.h" /* For internal_error. */ +#include "alias.h" +#include "fold-const.h" +#include "stor-layout.h" #include "trans-stmt.h" #include "trans-array.h" #include "trans-types.h" diff --git a/gcc/fortran/trans-openmp.c b/gcc/fortran/trans-openmp.c index 3be9f516e58..7e01e720737 100644 --- a/gcc/fortran/trans-openmp.c +++ b/gcc/fortran/trans-openmp.c @@ -22,16 +22,16 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" #include "coretypes.h" -#include "alias.h" -#include "tree.h" #include "options.h" -#include "fold-const.h" +#include "tree.h" +#include "gfortran.h" #include "gimple-expr.h" -#include "gimplify.h" /* For create_tmp_var_raw. */ +#include "trans.h" #include "stringpool.h" -#include "gfortran.h" #include "diagnostic-core.h" /* For internal_error. */ -#include "trans.h" +#include "alias.h" +#include "fold-const.h" +#include "gimplify.h" /* For create_tmp_var_raw. */ #include "trans-stmt.h" #include "trans-types.h" #include "trans-array.h" diff --git a/gcc/fortran/trans-stmt.c b/gcc/fortran/trans-stmt.c index 85558f0e892..1c61606dd14 100644 --- a/gcc/fortran/trans-stmt.c +++ b/gcc/fortran/trans-stmt.c @@ -23,14 +23,14 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" #include "coretypes.h" -#include "alias.h" -#include "tree.h" #include "options.h" -#include "fold-const.h" -#include "stringpool.h" +#include "tree.h" #include "gfortran.h" -#include "flags.h" #include "trans.h" +#include "stringpool.h" +#include "alias.h" +#include "fold-const.h" +#include "flags.h" #include "trans-stmt.h" #include "trans-types.h" #include "trans-array.h" diff --git a/gcc/fortran/trans-types.c b/gcc/fortran/trans-types.c index 7f3f2619fdd..780200e5f5d 100644 --- a/gcc/fortran/trans-types.c +++ b/gcc/fortran/trans-types.c @@ -24,18 +24,17 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" #include "coretypes.h" -#include "tm.h" -#include "alias.h" +#include "target.h" #include "tree.h" +#include "gfortran.h" +#include "trans.h" +#include "stringpool.h" +#include "diagnostic-core.h" /* For fatal_error. */ +#include "alias.h" #include "fold-const.h" #include "stor-layout.h" -#include "stringpool.h" #include "langhooks.h" /* For iso-c-bindings.def. */ -#include "target.h" -#include "gfortran.h" -#include "diagnostic-core.h" /* For fatal_error. */ #include "toplev.h" /* For rest_of_decl_compilation. */ -#include "trans.h" #include "trans-types.h" #include "trans-const.h" #include "flags.h" diff --git a/gcc/fortran/trans.c b/gcc/fortran/trans.c index 4eaea53dd08..4337fcbe4a0 100644 --- a/gcc/fortran/trans.c +++ b/gcc/fortran/trans.c @@ -21,17 +21,17 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" #include "coretypes.h" -#include "gfortran.h" -#include "alias.h" -#include "tree.h" #include "options.h" -#include "fold-const.h" +#include "tree.h" +#include "gfortran.h" #include "gimple-expr.h" /* For create_tmp_var_raw. */ +#include "trans.h" #include "stringpool.h" -#include "tree-iterator.h" #include "diagnostic-core.h" /* For internal_error. */ +#include "alias.h" +#include "fold-const.h" +#include "tree-iterator.h" #include "flags.h" -#include "trans.h" #include "trans-stmt.h" #include "trans-array.h" #include "trans-types.h" diff --git a/gcc/go/ChangeLog b/gcc/go/ChangeLog index f25c898782b..7057b02e057 100644 --- a/gcc/go/ChangeLog +++ b/gcc/go/ChangeLog @@ -1,3 +1,8 @@ +2015-10-29 Andrew MacLeod <amacleod@redhat.com> + + * go-backend.c: Reorder #include's and remove duplicates. + * go-lang.c: Likewise. + 2015-10-20 Alan Modra <amodra@gmail.com> PR go/66870 diff --git a/gcc/go/go-backend.c b/gcc/go/go-backend.c index b6dcc25d0aa..f9221dbd6ba 100644 --- a/gcc/go/go-backend.c +++ b/gcc/go/go-backend.c @@ -20,17 +20,16 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" #include "coretypes.h" +#include "target.h" +#include "tree.h" +#include "tm_p.h" +#include "diagnostic.h" #include "simple-object.h" -#include "tm.h" #include "alias.h" -#include "tree.h" #include "stor-layout.h" -#include "tm_p.h" #include "intl.h" #include "output.h" /* for assemble_string */ -#include "target.h" #include "common/common-target.h" -#include "diagnostic.h" #include "go-c.h" diff --git a/gcc/go/go-lang.c b/gcc/go/go-lang.c index 675b5828b29..7b76a35fff5 100644 --- a/gcc/go/go-lang.c +++ b/gcc/go/go-lang.c @@ -19,28 +19,24 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" -#include "ansidecl.h" #include "coretypes.h" +#include "target.h" +#include "function.h" +#include "tree.h" +#include "gimple-expr.h" +#include "diagnostic.h" +#include "ansidecl.h" #include "opts.h" #include "alias.h" -#include "tree.h" -#include "options.h" #include "fold-const.h" -#include "tm.h" -#include "hard-reg-set.h" -#include "function.h" -#include "gimple-expr.h" #include "gimplify.h" #include "stor-layout.h" #include "toplev.h" #include "debug.h" -#include "options.h" #include "flags.h" #include "convert.h" -#include "diagnostic.h" #include "langhooks.h" #include "langhooks-def.h" -#include "target.h" #include "common/common-target.h" #include <mpfr.h> diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 3d1ad640ca4..33722e247b3 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,25 @@ +2015-10-29 Andrew MacLeod <amacleod@redhat.com> + + * boehm.c: Reorder #include's and remove duplicates. + * builtins.c: Likewise. + * class.c: Likewise. + * constants.c: Likewise. + * decl.c: Likewise. + * except.c: Likewise. + * expr.c: Likewise. + * java-gimplify.c: Likewise. + * jcf-dump.c: Likewise. + * jcf-io.c: Likewise. + * jcf-parse.c: Likewise. + * jvgenmain.c: Likewise. + * lang.c: Likewise. + * mangle.c: Likewise. + * mangle_name.c: Likewise. + * resource.c: Likewise. + * typeck.c: Likewise. + * verify-glue.c: Likewise. + * verify-impl.c: Likewise. + 2015-10-22 Mikhail Maltsev <maltsevm@gmail.com> * decl.c (java_mark_decl_local): Use flag_checking instead of diff --git a/gcc/java/boehm.c b/gcc/java/boehm.c index 717dd168c9c..fbe99d9a7c3 100644 --- a/gcc/java/boehm.c +++ b/gcc/java/boehm.c @@ -27,12 +27,11 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ #include "system.h" #include "coretypes.h" #include "tm.h" -#include "alias.h" #include "tree.h" -#include "options.h" +#include "diagnostic-core.h" +#include "alias.h" #include "java-tree.h" #include "parse.h" -#include "diagnostic-core.h" static void mark_reference_fields (tree, wide_int *, unsigned int, int *, int *, int *, HOST_WIDE_INT *); diff --git a/gcc/java/builtins.c b/gcc/java/builtins.c index f10227f19e1..7f6d74573a8 100644 --- a/gcc/java/builtins.c +++ b/gcc/java/builtins.c @@ -30,31 +30,28 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ #include "system.h" #include "coretypes.h" #include "tm.h" -#include "alias.h" +#include "function.h" +#include "rtl.h" #include "tree.h" -#include "options.h" +#include "stringpool.h" +#include "expmed.h" +#include "optabs.h" +#include "emit-rtl.h" +#include "alias.h" #include "fold-const.h" #include "stor-layout.h" -#include "stringpool.h" #include "flags.h" #include "langhooks.h" #include "java-tree.h" /* FIXME: All these headers are necessary for sync_compare_and_swap. Front ends should never have to look at that. */ -#include "rtl.h" -#include "insn-codes.h" -#include "function.h" -#include "insn-config.h" -#include "expmed.h" #include "dojump.h" #include "explow.h" #include "calls.h" -#include "emit-rtl.h" #include "varasm.h" #include "stmt.h" #include "expr.h" -#include "optabs.h" static tree max_builtin (tree, tree); static tree min_builtin (tree, tree); diff --git a/gcc/java/class.c b/gcc/java/class.c index 8f1288f8584..8ecc1d902de 100644 --- a/gcc/java/class.c +++ b/gcc/java/class.c @@ -26,27 +26,24 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ #include "config.h" #include "system.h" #include "coretypes.h" -#include "alias.h" +#include "target.h" +#include "function.h" +#include "obstack.h" #include "tree.h" -#include "options.h" -#include "fold-const.h" #include "stringpool.h" +#include "cgraph.h" +#include "diagnostic-core.h" +#include "alias.h" +#include "fold-const.h" #include "stor-layout.h" #include "varasm.h" #include "flags.h" #include "java-tree.h" #include "jcf.h" -#include "obstack.h" -#include "diagnostic-core.h" #include "toplev.h" #include "output.h" /* for switch_to_section and get_section */ #include "parse.h" -#include "tm.h" -#include "hard-reg-set.h" -#include "function.h" -#include "cgraph.h" #include "tree-iterator.h" -#include "target.h" static tree make_method_value (tree); static tree build_java_method_type (tree, tree, int); diff --git a/gcc/java/constants.c b/gcc/java/constants.c index 942c867fb70..3e9962351f1 100644 --- a/gcc/java/constants.c +++ b/gcc/java/constants.c @@ -24,14 +24,14 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ #include "system.h" #include "coretypes.h" #include "tm.h" +#include "tree.h" +#include "stringpool.h" +#include "diagnostic-core.h" #include "jcf.h" #include "alias.h" -#include "tree.h" #include "fold-const.h" -#include "stringpool.h" #include "stor-layout.h" #include "java-tree.h" -#include "diagnostic-core.h" #include "toplev.h" static void set_constant_entry (CPool *, int, int, jword); diff --git a/gcc/java/decl.c b/gcc/java/decl.c index 2b33621d15e..43675a97936 100644 --- a/gcc/java/decl.c +++ b/gcc/java/decl.c @@ -27,24 +27,21 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ #include "config.h" #include "system.h" #include "coretypes.h" -#include "alias.h" +#include "target.h" +#include "function.h" #include "tree.h" -#include "options.h" -#include "stor-layout.h" #include "stringpool.h" -#include "varasm.h" +#include "cgraph.h" #include "diagnostic-core.h" +#include "alias.h" +#include "stor-layout.h" +#include "varasm.h" #include "toplev.h" #include "flags.h" #include "java-tree.h" #include "jcf.h" #include "java-except.h" -#include "tm.h" -#include "hard-reg-set.h" -#include "function.h" -#include "cgraph.h" #include "tree-inline.h" -#include "target.h" #include "version.h" #include "tree-iterator.h" #include "langhooks.h" diff --git a/gcc/java/except.c b/gcc/java/except.c index a2bd0daf4e8..03457f66e21 100644 --- a/gcc/java/except.c +++ b/gcc/java/except.c @@ -25,17 +25,17 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ #include "system.h" #include "coretypes.h" #include "tm.h" -#include "alias.h" #include "tree.h" -#include "fold-const.h" #include "stringpool.h" +#include "diagnostic-core.h" +#include "alias.h" +#include "fold-const.h" #include "stor-layout.h" #include "java-tree.h" #include "javaop.h" #include "java-opcodes.h" #include "jcf.h" #include "java-except.h" -#include "diagnostic-core.h" #include "toplev.h" #include "tree-iterator.h" diff --git a/gcc/java/expr.c b/gcc/java/expr.c index 37a705c855f..e1eadd2d267 100644 --- a/gcc/java/expr.c +++ b/gcc/java/expr.c @@ -26,11 +26,12 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ #include "config.h" #include "system.h" #include "coretypes.h" -#include "tm.h" -#include "alias.h" +#include "target.h" #include "tree.h" -#include "fold-const.h" #include "stringpool.h" +#include "diagnostic-core.h" +#include "alias.h" +#include "fold-const.h" #include "stor-layout.h" #include "flags.h" #include "java-tree.h" @@ -39,9 +40,7 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ #include "jcf.h" #include "java-except.h" #include "parse.h" -#include "diagnostic-core.h" #include "tree-iterator.h" -#include "target.h" static void flush_quick_stack (void); static void push_value (tree); diff --git a/gcc/java/java-gimplify.c b/gcc/java/java-gimplify.c index c6e7657b5fb..2e64e8f6f3d 100644 --- a/gcc/java/java-gimplify.c +++ b/gcc/java/java-gimplify.c @@ -24,15 +24,14 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ #include "config.h" #include "system.h" #include "coretypes.h" -#include "alias.h" #include "tm.h" #include "function.h" -#include "cfghooks.h" #include "basic-block.h" +#include "hard-reg-set.h" #include "tree.h" #include "gimple.h" -#include "hard-reg-set.h" -#include "options.h" +#include "cfghooks.h" +#include "alias.h" #include "fold-const.h" #include "java-tree.h" #include "dumpfile.h" diff --git a/gcc/java/jcf-dump.c b/gcc/java/jcf-dump.c index 8bd8e072430..fec3a404413 100644 --- a/gcc/java/jcf-dump.c +++ b/gcc/java/jcf-dump.c @@ -50,13 +50,13 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ #include "config.h" #include "system.h" #include "coretypes.h" -#include "intl.h" +#include "options.h" +#include "tree.h" #include "diagnostic.h" +#include "intl.h" #include "jcf.h" #include "alias.h" -#include "tree.h" -#include "options.h" #include "java-tree.h" #include "version.h" @@ -457,7 +457,6 @@ utf8_equal_string (JCF *jcf, int index, const char * value) if (flag_print_attributes > 0) \ fprintf (out, "\nAttributes (count: %d):\n", attributes_count); -#include "javaop.h" diff --git a/gcc/java/jcf-io.c b/gcc/java/jcf-io.c index 87d194279b4..642ca738a9d 100644 --- a/gcc/java/jcf-io.c +++ b/gcc/java/jcf-io.c @@ -26,11 +26,11 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ #include "config.h" #include "system.h" #include "coretypes.h" +#include "options.h" +#include "tree.h" #include "jcf.h" #include "alias.h" -#include "tree.h" -#include "options.h" #include "java-tree.h" #include <dirent.h> diff --git a/gcc/java/jcf-parse.c b/gcc/java/jcf-parse.c index bb6e743e2b4..00d36a3de9c 100644 --- a/gcc/java/jcf-parse.c +++ b/gcc/java/jcf-parse.c @@ -26,24 +26,21 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ #include "config.h" #include "system.h" #include "coretypes.h" -#include "alias.h" +#include "target.h" +#include "function.h" +#include "obstack.h" +#include "bitmap.h" #include "tree.h" -#include "options.h" #include "stringpool.h" -#include "obstack.h" +#include "cgraph.h" +#include "diagnostic-core.h" +#include "alias.h" #include "flags.h" #include "java-except.h" #include "javaop.h" #include "java-tree.h" -#include "diagnostic-core.h" #include "parse.h" #include "debug.h" -#include "tm.h" -#include "hard-reg-set.h" -#include "function.h" -#include "cgraph.h" -#include "bitmap.h" -#include "target.h" #include "toplev.h" #ifdef HAVE_LOCALE_H diff --git a/gcc/java/jvgenmain.c b/gcc/java/jvgenmain.c index 2f6d94bf346..aa103778270 100644 --- a/gcc/java/jvgenmain.c +++ b/gcc/java/jvgenmain.c @@ -26,14 +26,14 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ #include "config.h" #include "system.h" #include "coretypes.h" +#include "options.h" #include "obstack.h" +#include "tree.h" +#include "diagnostic.h" #include "jcf.h" #include "alias.h" -#include "tree.h" -#include "options.h" #include "java-tree.h" #include "intl.h" -#include "diagnostic.h" static char * do_mangle_classname (const char *string); diff --git a/gcc/java/lang.c b/gcc/java/lang.c index 11e786cb5be..94b2dcf7907 100644 --- a/gcc/java/lang.c +++ b/gcc/java/lang.c @@ -26,21 +26,19 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ #include "config.h" #include "system.h" #include "coretypes.h" -#include "tm.h" -#include "alias.h" +#include "target.h" #include "tree.h" +#include "diagnostic.h" +#include "alias.h" #include "java-tree.h" #include "jcf.h" #include "langhooks.h" #include "langhooks-def.h" #include "flags.h" -#include "diagnostic.h" #include "tree-inline.h" #include "splay-tree.h" #include "tree-dump.h" #include "opts.h" -#include "options.h" -#include "target.h" #include "context.h" static bool java_init (void); diff --git a/gcc/java/mangle.c b/gcc/java/mangle.c index a9fc8867fd0..c69bcd872c1 100644 --- a/gcc/java/mangle.c +++ b/gcc/java/mangle.c @@ -27,14 +27,14 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ #include "config.h" #include "system.h" #include "coretypes.h" -#include "jcf.h" -#include "alias.h" -#include "tree.h" #include "options.h" -#include "stringpool.h" -#include "java-tree.h" #include "obstack.h" +#include "tree.h" +#include "stringpool.h" #include "diagnostic-core.h" +#include "jcf.h" +#include "alias.h" +#include "java-tree.h" #include "langhooks-def.h" static void mangle_class_field (tree); diff --git a/gcc/java/mangle_name.c b/gcc/java/mangle_name.c index 26c1931d9f4..47e3b523a68 100644 --- a/gcc/java/mangle_name.c +++ b/gcc/java/mangle_name.c @@ -27,13 +27,13 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ #include "config.h" #include "system.h" #include "coretypes.h" -#include "jcf.h" -#include "alias.h" -#include "tree.h" #include "options.h" -#include "java-tree.h" #include "obstack.h" +#include "tree.h" #include "diagnostic-core.h" +#include "jcf.h" +#include "alias.h" +#include "java-tree.h" static void append_unicode_mangled_name (const char *, int); #ifndef HAVE_AS_UTF8 diff --git a/gcc/java/resource.c b/gcc/java/resource.c index 6fb730b76e2..922dfe7d315 100644 --- a/gcc/java/resource.c +++ b/gcc/java/resource.c @@ -24,22 +24,21 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ #include "config.h" #include "system.h" #include "coretypes.h" -#include "alias.h" +#include "tm.h" +#include "function.h" +#include "hard-reg-set.h" #include "tree.h" -#include "options.h" -#include "fold-const.h" #include "stringpool.h" +#include "cgraph.h" +#include "diagnostic-core.h" +#include "alias.h" +#include "fold-const.h" #include "stor-layout.h" #include "java-tree.h" #include "jcf.h" -#include "diagnostic-core.h" #include "toplev.h" #include "parse.h" -#include "tm.h" -#include "hard-reg-set.h" -#include "function.h" #include "tree-iterator.h" -#include "cgraph.h" /* A list of all the resources files. */ static GTY(()) vec<tree, va_gc> *resources; diff --git a/gcc/java/typeck.c b/gcc/java/typeck.c index 6cbb3561dca..1cdd070c99a 100644 --- a/gcc/java/typeck.c +++ b/gcc/java/typeck.c @@ -26,18 +26,18 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ #include "config.h" #include "system.h" #include "coretypes.h" -#include "alias.h" -#include "tree.h" #include "options.h" +#include "obstack.h" +#include "tree.h" +#include "stringpool.h" +#include "diagnostic-core.h" +#include "alias.h" #include "fold-const.h" #include "stor-layout.h" -#include "stringpool.h" -#include "obstack.h" #include "flags.h" #include "java-tree.h" #include "jcf.h" #include "convert.h" -#include "diagnostic-core.h" static tree convert_ieee_real_to_integer (tree, tree); static tree parse_signature_type (const unsigned char **, diff --git a/gcc/java/verify-glue.c b/gcc/java/verify-glue.c index a1630c7d77e..508383d5fff 100644 --- a/gcc/java/verify-glue.c +++ b/gcc/java/verify-glue.c @@ -27,16 +27,15 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ #include "system.h" #include "coretypes.h" -#include "alias.h" -#include "tree.h" #include "options.h" +#include "tree.h" #include "stringpool.h" +#include "diagnostic-core.h" +#include "alias.h" #include "parse.h" #include "verify.h" -#include "java-tree.h" #include "java-except.h" -#include "diagnostic-core.h" void * vfy_alloc (size_t bytes) diff --git a/gcc/java/verify-impl.c b/gcc/java/verify-impl.c index ee06eec478c..4969318691d 100644 --- a/gcc/java/verify-impl.c +++ b/gcc/java/verify-impl.c @@ -14,12 +14,12 @@ details. */ #include "config.h" #include "system.h" #include "coretypes.h" - -#include "alias.h" -#include "symtab.h" #include "options.h" +#include "symtab.h" #include "verify.h" +#include "alias.h" + /* Hack to work around namespace pollution from java-tree.h. */ #undef current_class diff --git a/gcc/jit/ChangeLog b/gcc/jit/ChangeLog index 4922bc0511b..301179bbdc0 100644 --- a/gcc/jit/ChangeLog +++ b/gcc/jit/ChangeLog @@ -1,3 +1,11 @@ +2015-10-29 Andrew MacLeod <amacleod@redhat.com> + + * dummy-frontend.c: Reorder #include's and remove duplicates. + * jit-builtins.c: Likewise. + * jit-playback.c: Likewise. + * jit-recording.c: Likewise. + * libgccjit.c: Likewise. + 2015-10-13 Jakub Jelinek <jakub@redhat.com> * jit-builtins.c (DEF_FUNCTION_TYPE_9, DEF_FUNCTION_TYPE_10, diff --git a/gcc/jit/dummy-frontend.c b/gcc/jit/dummy-frontend.c index 1a6b09a35d1..d8f3d5e4304 100644 --- a/gcc/jit/dummy-frontend.c +++ b/gcc/jit/dummy-frontend.c @@ -20,26 +20,22 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" #include "coretypes.h" +#include "tm.h" +#include "function.h" +#include "hard-reg-set.h" +#include "tree.h" +#include "jit-playback.h" +#include "cgraph.h" #include "opts.h" #include "alias.h" -#include "tree.h" #include "stor-layout.h" -#include "inchash.h" #include "debug.h" #include "langhooks.h" #include "langhooks-def.h" -#include "hash-map.h" -#include "vec.h" -#include "hashtab.h" -#include "tm.h" -#include "hard-reg-set.h" -#include "function.h" #include "dumpfile.h" -#include "cgraph.h" #include "jit-common.h" #include "jit-logging.h" -#include "jit-playback.h" #include <mpfr.h> diff --git a/gcc/jit/jit-builtins.c b/gcc/jit/jit-builtins.c index e67c0f86cea..b28a5de21f7 100644 --- a/gcc/jit/jit-builtins.c +++ b/gcc/jit/jit-builtins.c @@ -20,14 +20,13 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" #include "coretypes.h" -#include "vec.h" #include "target.h" +#include "jit-common.h" +#include "jit-playback.h" #include "stringpool.h" -#include "jit-common.h" #include "jit-builtins.h" #include "jit-recording.h" -#include "jit-playback.h" namespace gcc { diff --git a/gcc/jit/jit-playback.c b/gcc/jit/jit-playback.c index 44c3ce00d98..8af62f90950 100644 --- a/gcc/jit/jit-playback.c +++ b/gcc/jit/jit-playback.c @@ -21,27 +21,18 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" #include "coretypes.h" +#include "target.h" +#include "function.h" +#include "tree.h" +#include "timevar.h" +#include "stringpool.h" +#include "cgraph.h" #include "opts.h" -#include "hashtab.h" -#include "statistics.h" -#include "vec.h" #include "alias.h" -#include "tree.h" -#include "inchash.h" -#include "hash-map.h" -#include "vec.h" -#include "hashtab.h" -#include "tm.h" -#include "hard-reg-set.h" -#include "function.h" #include "dumpfile.h" -#include "cgraph.h" #include "toplev.h" -#include "timevar.h" #include "tree-cfg.h" -#include "target.h" #include "convert.h" -#include "stringpool.h" #include "stor-layout.h" #include "print-tree.h" #include "gimplify.h" diff --git a/gcc/jit/jit-recording.c b/gcc/jit/jit-recording.c index 70bd171a892..afe59c36aee 100644 --- a/gcc/jit/jit-recording.c +++ b/gcc/jit/jit-recording.c @@ -22,14 +22,13 @@ along with GCC; see the file COPYING3. If not see #include "system.h" #include "coretypes.h" #include "tm.h" +#include "jit-common.h" +#include "timevar.h" #include "pretty-print.h" -#include "hash-map.h" #include "toplev.h" -#include "timevar.h" #include <pthread.h> -#include "jit-common.h" #include "jit-builtins.h" #include "jit-logging.h" #include "jit-recording.h" diff --git a/gcc/jit/libgccjit.c b/gcc/jit/libgccjit.c index 55cda6bf890..1e74e66afbe 100644 --- a/gcc/jit/libgccjit.c +++ b/gcc/jit/libgccjit.c @@ -21,13 +21,12 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" #include "coretypes.h" +#include "jit-common.h" +#include "timevar.h" #include "opts.h" -#include "safe-ctype.h" #include "typed-splay-tree.h" -#include "timevar.h" #include "libgccjit.h" -#include "jit-common.h" #include "jit-logging.h" #include "jit-recording.h" #include "jit-result.h" diff --git a/gcc/lto/ChangeLog b/gcc/lto/ChangeLog index 4ec06b8db6b..332251cd62f 100644 --- a/gcc/lto/ChangeLog +++ b/gcc/lto/ChangeLog @@ -1,3 +1,11 @@ +2015-10-29 Andrew MacLeod <amacleod@redhat.com> + + * lto-lang.c: Reorder #include's and remove duplicates. + * lto-object.c: Likewise. + * lto-partition.c: Likewise. + * lto-symtab.c: Likewise. + * lto.c: Likewise. + 2015-10-27 Mikhail Maltsev <maltsevm@gmail.com> * lto.c (unify_scc): Use flag_checking and remove ENABLE_CHECKING diff --git a/gcc/lto/lto-lang.c b/gcc/lto/lto-lang.c index 94b54dcb397..be317a42fbe 100644 --- a/gcc/lto/lto-lang.c +++ b/gcc/lto/lto-lang.c @@ -21,18 +21,18 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" #include "coretypes.h" -#include "tm.h" +#include "target.h" #include "function.h" -#include "predict.h" #include "basic-block.h" #include "tree.h" #include "gimple.h" -#include "hard-reg-set.h" +#include "predict.h" +#include "stringpool.h" +#include "cgraph.h" +#include "diagnostic-core.h" #include "alias.h" #include "fold-const.h" -#include "stringpool.h" #include "stor-layout.h" -#include "target.h" #include "langhooks.h" #include "langhooks-def.h" #include "debug.h" @@ -40,9 +40,7 @@ along with GCC; see the file COPYING3. If not see #include "lto.h" #include "tree-inline.h" #include "internal-fn.h" -#include "diagnostic-core.h" #include "toplev.h" -#include "cgraph.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 087c6b11d63..923ed517814 100644 --- a/gcc/lto/lto-object.c +++ b/gcc/lto/lto-object.c @@ -21,20 +21,19 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" #include "coretypes.h" -#include "alias.h" #include "tm.h" #include "function.h" -#include "predict.h" #include "basic-block.h" +#include "hard-reg-set.h" #include "tree.h" #include "gimple.h" -#include "hard-reg-set.h" -#include "options.h" +#include "predict.h" +#include "cgraph.h" +#include "diagnostic-core.h" +#include "alias.h" #include "fold-const.h" #include "internal-fn.h" -#include "diagnostic-core.h" #include "lto.h" -#include "cgraph.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 8e5b555908f..03ed72b4181 100644 --- a/gcc/lto/lto-partition.c +++ b/gcc/lto/lto-partition.c @@ -20,30 +20,27 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" #include "coretypes.h" -#include "toplev.h" -#include "alias.h" -#include "tm.h" +#include "target.h" #include "function.h" -#include "predict.h" #include "basic-block.h" #include "tree.h" #include "gimple.h" -#include "hard-reg-set.h" -#include "options.h" -#include "fold-const.h" -#include "internal-fn.h" -#include "cgraph.h" -#include "target.h" +#include "predict.h" #include "alloc-pool.h" -#include "lto-streamer.h" #include "timevar.h" +#include "stringpool.h" +#include "cgraph.h" +#include "lto-streamer.h" +#include "toplev.h" +#include "alias.h" +#include "fold-const.h" +#include "internal-fn.h" #include "params.h" #include "symbol-summary.h" #include "ipa-prop.h" #include "ipa-inline.h" #include "ipa-utils.h" #include "lto-partition.h" -#include "stringpool.h" vec<ltrans_partition> ltrans_partitions; diff --git a/gcc/lto/lto-symtab.c b/gcc/lto/lto-symtab.c index c77ae947c32..e77639f0c6b 100644 --- a/gcc/lto/lto-symtab.c +++ b/gcc/lto/lto-symtab.c @@ -21,22 +21,19 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" #include "coretypes.h" -#include "diagnostic-core.h" -#include "alias.h" -#include "tm.h" +#include "target.h" #include "function.h" -#include "predict.h" #include "basic-block.h" #include "tree.h" #include "gimple.h" -#include "hard-reg-set.h" -#include "options.h" -#include "fold-const.h" -#include "internal-fn.h" -#include "cgraph.h" -#include "target.h" +#include "predict.h" #include "alloc-pool.h" +#include "cgraph.h" #include "lto-streamer.h" +#include "diagnostic-core.h" +#include "alias.h" +#include "fold-const.h" +#include "internal-fn.h" #include "ipa-utils.h" #include "symbol-summary.h" #include "ipa-prop.h" diff --git a/gcc/lto/lto.c b/gcc/lto/lto.c index def681d09dd..8510f6598ba 100644 --- a/gcc/lto/lto.c +++ b/gcc/lto/lto.c @@ -21,26 +21,26 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" #include "coretypes.h" -#include "opts.h" -#include "toplev.h" -#include "alias.h" #include "tm.h" #include "function.h" #include "bitmap.h" -#include "cfghooks.h" #include "basic-block.h" +#include "hard-reg-set.h" #include "tree.h" #include "gimple.h" -#include "hard-reg-set.h" -#include "options.h" +#include "cfghooks.h" +#include "alloc-pool.h" +#include "tree-pass.h" +#include "tree-ssa-operands.h" +#include "tree-streamer.h" +#include "cgraph.h" +#include "diagnostic-core.h" +#include "opts.h" +#include "toplev.h" +#include "alias.h" #include "fold-const.h" #include "stor-layout.h" -#include "diagnostic-core.h" -#include "cgraph.h" -#include "tree-ssa-operands.h" -#include "tree-pass.h" #include "langhooks.h" -#include "alloc-pool.h" #include "symbol-summary.h" #include "ipa-prop.h" #include "common.h" @@ -48,7 +48,6 @@ along with GCC; see the file COPYING3. If not see #include "internal-fn.h" #include "lto.h" #include "lto-tree.h" -#include "tree-streamer.h" #include "lto-section-names.h" #include "splay-tree.h" #include "lto-partition.h" diff --git a/gcc/objc/ChangeLog b/gcc/objc/ChangeLog index e1c730ebeac..23721f60005 100644 --- a/gcc/objc/ChangeLog +++ b/gcc/objc/ChangeLog @@ -1,3 +1,8 @@ +2015-10-29 Andrew MacLeod <amacleod@redhat.com> + + * objc-lang.c: Reorder #include's and remove duplicates. + * objc-map.c: Likewise. + 2015-08-18 Trevor Saunders <tbsaunde@tbsaunde.org> * objc-act.h, objc-next-runtime-abi-02.c, objc-runtime-hooks.h: diff --git a/gcc/objc/objc-lang.c b/gcc/objc/objc-lang.c index 530f2725575..c2c57d1f116 100644 --- a/gcc/objc/objc-lang.c +++ b/gcc/objc/objc-lang.c @@ -23,11 +23,9 @@ along with GCC; see the file COPYING3. If not see #include "system.h" #include "coretypes.h" #include "tm.h" -#include "alias.h" #include "tree.h" -#include "options.h" -#include "c/c-tree.h" #include "c-family/c-common.h" +#include "c/c-tree.h" #include "c-family/c-objc.h" #include "objc-act.h" #include "langhooks.h" diff --git a/gcc/objc/objc-map.c b/gcc/objc/objc-map.c index 73834a8cb78..0915a5ab592 100644 --- a/gcc/objc/objc-map.c +++ b/gcc/objc/objc-map.c @@ -20,9 +20,9 @@ Boston, MA 02110-1301, USA. */ #include "config.h" #include "system.h" #include "coretypes.h" -#include "alias.h" -#include "tree.h" #include "options.h" +#include "tree.h" +#include "alias.h" #include "objc-map.h" #define OUT_OF_MEMORY { fprintf (stderr, "Out of memory\n"); abort (); } diff --git a/gcc/objcp/ChangeLog b/gcc/objcp/ChangeLog index b422f76d7bb..5be68550054 100644 --- a/gcc/objcp/ChangeLog +++ b/gcc/objcp/ChangeLog @@ -1,3 +1,8 @@ +2015-10-29 Andrew MacLeod <amacleod@redhat.com> + + * objcp-decl.c: Reorder #include's and remove duplicates. + * objcp-lang.c: Likewise. + 2015-07-07 Andrew MacLeod <amacleod@redhat.com> * objcp-decl.c: Adjust includes. diff --git a/gcc/objcp/objcp-decl.c b/gcc/objcp/objcp-decl.c index b94562c5e24..ab757fafbd8 100644 --- a/gcc/objcp/objcp-decl.c +++ b/gcc/objcp/objcp-decl.c @@ -23,12 +23,9 @@ along with GCC; see the file COPYING3. If not see #include "system.h" #include "coretypes.h" #include "tm.h" -#include "vec.h" -#include "alias.h" #include "tree.h" -#include "options.h" -#include "inchash.h" #include "cp-tree.h" +#include "alias.h" #include "c-family/c-objc.h" #include "objc-act.h" diff --git a/gcc/objcp/objcp-lang.c b/gcc/objcp/objcp-lang.c index abcd559ae98..a04bea7b567 100644 --- a/gcc/objcp/objcp-lang.c +++ b/gcc/objcp/objcp-lang.c @@ -21,19 +21,14 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" #include "coretypes.h" -#include "tm.h" -#include "vec.h" -#include "alias.h" +#include "target.h" #include "tree.h" -#include "options.h" -#include "inchash.h" #include "cp-tree.h" #include "c-family/c-common.h" #include "c-family/c-objc.h" #include "objc-act.h" #include "langhooks.h" #include "langhooks-def.h" -#include "target.h" #include "cp-objcp-common.h" enum c_language_kind c_language = clk_objcxx; |