From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 22 Jul 2024 12:03:13 +0000 (+0200)
Subject: 5.15-stable patches
X-Git-Tag: v6.10.1~49
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=259004b561ddbce85305ff9f304be9c08438346f;p=thirdparty%2Fkernel%2Fstable-queue.git

5.15-stable patches

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

diff --git a/queue-5.15/gcc-plugins-rename-last_stmt-for-gcc-14.patch b/queue-5.15/gcc-plugins-rename-last_stmt-for-gcc-14.patch
new file mode 100644
index 00000000000..df0d31b87d0
--- /dev/null
+++ b/queue-5.15/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
+@@ -570,4 +570,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-5.15/series b/queue-5.15/series
new file mode 100644
index 00000000000..0c400691d60
--- /dev/null
+++ b/queue-5.15/series
@@ -0,0 +1 @@
+gcc-plugins-rename-last_stmt-for-gcc-14.patch