summary refs log tree commit diff
path: root/scripts
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2023-01-18 12:21:35 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-08-16 18:27:20 +0200
commit65383fe06065bea6b40a6e1f309d6a763a7d6357 (patch)
tree6419eab71b70c6df293f0da3797fc2c98fd2ab5c /scripts
parent1321ab403b38366a4cfb283145bb2c005becb1e5 (diff)
downloadlinux-65383fe06065bea6b40a6e1f309d6a763a7d6357.tar.gz
gcc-plugins: Reorganize gimple includes for GCC 13
commit e6a71160cc145e18ab45195abf89884112e02dfb upstream.

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>
Cc: Naresh Kamboju <naresh.kamboju@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'scripts')
-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"