summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2023-01-18 12:21:35 -0800
committerKees Cook <keescook@chromium.org>2023-01-25 12:24:48 -0800
commite6a71160cc145e18ab45195abf89884112e02dfb (patch)
treef71e66f1de01ff99f3abed228dfe595273884f0b
parent4acf1de35f41549e60c3c02a8defa7cb95eabdf2 (diff)
downloadlinux-stable-e6a71160cc145e18ab45195abf89884112e02dfb.tar.gz
linux-stable-e6a71160cc145e18ab45195abf89884112e02dfb.tar.bz2
linux-stable-e6a71160cc145e18ab45195abf89884112e02dfb.zip
gcc-plugins: Reorganize gimple includes for GCC 13
The gimple-iterator.h header must be included before gimple-fold.h starting with GCC 13. Reorganize gimple headers to work for all GCC versions. Reported-by: Palmer Dabbelt <palmer@rivosinc.com> Acked-by: Palmer Dabbelt <palmer@rivosinc.com> Link: https://lore.kernel.org/all/20230113173033.4380-1-palmer@rivosinc.com/ Cc: linux-hardening@vger.kernel.org Signed-off-by: Kees Cook <keescook@chromium.org>
-rw-r--r--scripts/gcc-plugins/gcc-common.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/gcc-plugins/gcc-common.h b/scripts/gcc-plugins/gcc-common.h
index 9a1895747b15..84c730da36dd 100644
--- a/scripts/gcc-plugins/gcc-common.h
+++ b/scripts/gcc-plugins/gcc-common.h
@@ -71,7 +71,9 @@
#include "varasm.h"
#include "stor-layout.h"
#include "internal-fn.h"
+#include "gimple.h"
#include "gimple-expr.h"
+#include "gimple-iterator.h"
#include "gimple-fold.h"
#include "context.h"
#include "tree-ssa-alias.h"
@@ -85,10 +87,8 @@
#include "tree-eh.h"
#include "stmt.h"
#include "gimplify.h"
-#include "gimple.h"
#include "tree-phinodes.h"
#include "tree-cfg.h"
-#include "gimple-iterator.h"
#include "gimple-ssa.h"
#include "ssa-iterators.h"