6.1-stable patches

added patches:
	gcc-plugins-rename-last_stmt-for-gcc-14.patch
	series

diff --git a/queue-6.1/gcc-plugins-rename-last_stmt-for-gcc-14.patch b/queue-6.1/gcc-plugins-rename-last_stmt-for-gcc-14.patch
new file mode 100644 (file)
index 0000000..3754f1a
--- /dev/null
+++ b/queue-6.1/gcc-plugins-rename-last_stmt-for-gcc-14.patch
@@ -0,0 +1,31 @@
+From 2e3f65ccfe6b0778b261ad69c9603ae85f210334 Mon Sep 17 00:00:00 2001
+From: Kees Cook <keescook@chromium.org>
+Date: Mon, 7 Aug 2023 09:41:19 -0700
+Subject: gcc-plugins: Rename last_stmt() for GCC 14+
+
+From: Kees Cook <keescook@chromium.org>
+
+commit 2e3f65ccfe6b0778b261ad69c9603ae85f210334 upstream.
+
+In GCC 14, last_stmt() was renamed to last_nondebug_stmt(). Add a helper
+macro to handle the renaming.
+
+Cc: linux-hardening@vger.kernel.org
+Signed-off-by: Kees Cook <keescook@chromium.org>
+Cc: Thomas Meyer <thomas@m3y3r.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ scripts/gcc-plugins/gcc-common.h |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/scripts/gcc-plugins/gcc-common.h
++++ b/scripts/gcc-plugins/gcc-common.h
+@@ -440,4 +440,8 @@ static inline void debug_gimple_stmt(con
+ #define SET_DECL_MODE(decl, mode)     DECL_MODE(decl) = (mode)
+ #endif
+ 
++#if BUILDING_GCC_VERSION >= 14000
++#define last_stmt(x)                  last_nondebug_stmt(x)
++#endif
++
+ #endif

diff --git a/queue-6.1/series b/queue-6.1/series
new file mode 100644 (file)
index 0000000..0c40069
--- /dev/null
+++ b/queue-6.1/series
@@ -0,0 +1 @@
+gcc-plugins-rename-last_stmt-for-gcc-14.patch