This is a note to let you know that I've just added the patch titled
gcc-plugins: Reorganize gimple includes for GCC 13
to the 5.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
gcc-plugins-reorganize-gimple-includes-for-gcc-13.patch
and it can be found in the queue-5.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From stable-owner@xxxxxxxxxxxxxxx Fri Jun 9 00:14:18 2023
From: Paul Barker <paul.barker@xxxxxxxxxxxx>
Date: Thu, 8 Jun 2023 23:13:35 +0100
Subject: gcc-plugins: Reorganize gimple includes for GCC 13
To: stable@xxxxxxxxxxxxxxx
Cc: Kees Cook <keescook@xxxxxxxxxxxx>, Palmer Dabbelt <palmer@xxxxxxxxxxxx>, linux-hardening@xxxxxxxxxxxxxxx, Paul Barker <paul.barker@xxxxxxxxxxxx>
Message-ID: <20230608221335.124520-3-paul.barker@xxxxxxxxxxxx>
From: Kees Cook <keescook@xxxxxxxxxxxx>
mainline commit: e6a71160cc145e18ab45195abf89884112e02dfb
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@xxxxxxxxxxxx>
Acked-by: Palmer Dabbelt <palmer@xxxxxxxxxxxx>
Link: https://lore.kernel.org/all/20230113173033.4380-1-palmer@xxxxxxxxxxxx/
Cc: linux-hardening@xxxxxxxxxxxxxxx
Signed-off-by: Kees Cook <keescook@xxxxxxxxxxxx>
[ Modified to handle differences in other includes and conditional compilation in the 5.10.y tree. ]
Signed-off-by: Paul Barker <paul.barker@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
scripts/gcc-plugins/gcc-common.h | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
--- a/scripts/gcc-plugins/gcc-common.h
+++ b/scripts/gcc-plugins/gcc-common.h
@@ -108,7 +108,13 @@
#include "varasm.h"
#include "stor-layout.h"
#include "internal-fn.h"
+#endif
+
+#include "gimple.h"
+
+#if BUILDING_GCC_VERSION >= 4009
#include "gimple-expr.h"
+#include "gimple-iterator.h"
#include "gimple-fold.h"
#include "context.h"
#include "tree-ssa-alias.h"
@@ -124,13 +130,10 @@
#include "gimplify.h"
#endif
-#include "gimple.h"
-
#if BUILDING_GCC_VERSION >= 4009
#include "tree-ssa-operands.h"
#include "tree-phinodes.h"
#include "tree-cfg.h"
-#include "gimple-iterator.h"
#include "gimple-ssa.h"
#include "ssa-iterators.h"
#endif
Patches currently in stable-queue which might be from stable-owner@xxxxxxxxxxxxxxx are
queue-5.10/gcc-plugins-reorganize-gimple-includes-for-gcc-13.patch
queue-5.10/ata-ahci-fix-enum-constants-for-gcc-13.patch
