From 9885183c08138752a954b68a3328e749976d8f93 Mon Sep 17 00:00:00 2001 From: David Edelsohn Date: Fri, 2 Oct 2020 12:09:52 -0400 Subject: [PATCH] rs6000: clean up headers in rs6000.c and rs6000-call.c When Andrew Macleod investigated the recent rs6000 bootstrap failure, he suggested a clean up of the headers in rs6000.c and rs6000-call.c. It now is recommended to include ssa.h instead of the individual headers. This also ensures that value-range.h is included and in the correct order so that the tree-ssa-propagate.h inclusion of value-query.h and its dependencies are satisfied. Bootstrapped on powerpc-ibm-aix7.2.0.0 and powerpc64le-linux. gcc/ChangeLog: 2020-10-02 David Edelsohn Andrew MacLeod * config/rs6000/rs6000.c: Include ssa.h. Reorder some headers. * config/rs6000/rs6000-call.c: Same. --- gcc/config/rs6000/rs6000-call.c | 7 ++----- gcc/config/rs6000/rs6000.c | 9 +++------ 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/gcc/config/rs6000/rs6000-call.c b/gcc/config/rs6000/rs6000-call.c index d10119bd6bf..9fdf97bc803 100644 --- a/gcc/config/rs6000/rs6000-call.c +++ b/gcc/config/rs6000/rs6000-call.c @@ -57,17 +57,14 @@ #include "gimplify.h" #include "gimple-fold.h" #include "gimple-iterator.h" -#include "gimple-ssa.h" +#include "ssa.h" +#include "tree-ssa-propagate.h" #include "builtins.h" #include "tree-vector-builder.h" #if TARGET_XCOFF #include "xcoffout.h" /* get declarations of xcoff_*_section_name */ #endif #include "ppc-auxv.h" -#include "value-range.h" -#include "tree-ssa-propagate.h" -#include "tree-vrp.h" -#include "tree-ssanames.h" #include "targhooks.h" #include "opts.h" diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c index 69c4f368efb..b58eeae2b98 100644 --- a/gcc/config/rs6000/rs6000.c +++ b/gcc/config/rs6000/rs6000.c @@ -59,11 +59,12 @@ #include "gimplify.h" #include "gimple-fold.h" #include "gimple-iterator.h" -#include "gimple-ssa.h" #include "gimple-walk.h" +#include "ssa.h" +#include "tree-vectorizer.h" +#include "tree-ssa-propagate.h" #include "intl.h" #include "tm-constrs.h" -#include "tree-vectorizer.h" #include "target-globals.h" #include "builtins.h" #include "tree-vector-builder.h" @@ -75,10 +76,6 @@ #endif #include "case-cfn-macros.h" #include "ppc-auxv.h" -#include "value-range.h" -#include "tree-ssa-propagate.h" -#include "tree-vrp.h" -#include "tree-ssanames.h" #include "rs6000-internal.h" #include "opts.h" -- 2.30.2