commit:     b095c1112333de93151068a47233a53baa9b2e2b
Author:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 25 12:15:21 2024 +0000
Commit:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
CommitDate: Thu Jul 25 12:15:21 2024 +0000
URL:        https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=b095c111

Remove redundant patch

Removed:
2940_handle-gcc-14-last-stmt-rename.patch

Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org>

 0000_README                               |  4 ----
 2940_handle-gcc-14-last-stmt-rename.patch | 31 -------------------------------
 2 files changed, 35 deletions(-)

diff --git a/0000_README b/0000_README
index 9ad98dff..ad9ca363 100644
--- a/0000_README
+++ b/0000_README
@@ -479,10 +479,6 @@ Patch:  2920_sign-file-patch-for-libressl.patch
 From:   https://bugs.gentoo.org/717166
 Desc:   sign-file: full functionality with modern LibreSSL
 
-Patch:  2940_handle-gcc-14-last-stmt-rename.patch
-From:   
https://lore.kernel.org/all/20230811060545.never.564-k...@kernel.org/#Z31scripts:gcc-plugins:gcc-common.h
-Desc:   gcc-plugins: Rename last_stmt() for GCC 14+
-
 Patch:  2950_kbuild-CRC32-1MB-dict-xz-modules.patch
 From:   
https://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git/commit/?h=kbuild&id=fbf5892df21a8ccfcb2fda0fd65bc3169c89ed28
 Desc:   kbuild: Use CRC32 and a 1MiB dictionary for XZ compressed modules

diff --git a/2940_handle-gcc-14-last-stmt-rename.patch 
b/2940_handle-gcc-14-last-stmt-rename.patch
deleted file mode 100644
index b04ce8da..00000000
--- a/2940_handle-gcc-14-last-stmt-rename.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Kees Cook <keesc...@chromium.org>
-To: linux-harden...@vger.kernel.org
-Cc: Kees Cook <keesc...@chromium.org>, linux-ker...@vger.kernel.org
-Subject: [PATCH] gcc-plugins: Rename last_stmt() for GCC 14+
-Date: Thu, 10 Aug 2023 23:05:49 -0700  [thread overview]
-Message-ID: <20230811060545.never.564-k...@kernel.org> (raw)
-
-In GCC 14, last_stmt() was renamed to last_nondebug_stmt(). Add a helper
-macro to handle the renaming.
-
-Cc: linux-harden...@vger.kernel.org
-Signed-off-by: Kees Cook <keesc...@chromium.org>
----
- scripts/gcc-plugins/gcc-common.h | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/scripts/gcc-plugins/gcc-common.h 
b/scripts/gcc-plugins/gcc-common.h
-index 84c730da36dd..1ae39b9f4a95 100644
---- a/scripts/gcc-plugins/gcc-common.h
-+++ b/scripts/gcc-plugins/gcc-common.h
-@@ -440,4 +440,8 @@ static inline void debug_gimple_stmt(const_gimple s)
- #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
--- 
-2.34.1

Reply via email to