Date: Sunday, April 30, 2023 @ 20:56:06 Author: freswa Revision: 476088
upgpkg: linux-hardened 6.1.25.hardened1-3: gcc 13.1 rebuild Added: linux-hardened/trunk/gcc13-compat.patch Modified: linux-hardened/trunk/PKGBUILD --------------------+ PKGBUILD | 4 +++- gcc13-compat.patch | 45 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 1 deletion(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2023-04-30 19:59:07 UTC (rev 476087) +++ PKGBUILD 2023-04-30 20:56:06 UTC (rev 476088) @@ -5,7 +5,7 @@ pkgbase=linux-hardened pkgver=6.1.25.hardened1 -pkgrel=2 +pkgrel=3 pkgdesc='Security-Hardened Linux' url='https://github.com/anthraxx/linux-hardened' arch=(x86_64) @@ -21,6 +21,7 @@ source=( https://www.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/${_srcname}.tar.{xz,sign} https://github.com/anthraxx/${pkgbase}/releases/download/${_srctag}/${pkgbase}-${_srctag}.patch{,.sig} + gcc13-compat.patch config # the main kernel config file ) validpgpkeys=( @@ -32,6 +33,7 @@ 'SKIP' 'a71365d35e561df88f70a8f5271cb171b77721b7a7e214d6794b55fb2de92ee9' 'SKIP' + 'c6c5f6be7ae0ef5a8bdfea0a5578f096db38113774e08dc7b78fc48034c7b211' 'f9dcbe8f48d64fab2d38ac60a056ff31d5b05d2dce0113be115f7e6295dbf7b7') export KBUILD_BUILD_HOST=archlinux Added: gcc13-compat.patch =================================================================== --- gcc13-compat.patch (rev 0) +++ gcc13-compat.patch 2023-04-30 20:56:06 UTC (rev 476088) @@ -0,0 +1,45 @@ +From e6a71160cc145e18ab45195abf89884112e02dfb Mon Sep 17 00:00:00 2001 +From: Kees Cook <[email protected]> +Date: Wed, 18 Jan 2023 12:21:35 -0800 +Subject: [PATCH] gcc-plugins: Reorganize gimple includes for GCC 13 + +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 <[email protected]> +Acked-by: Palmer Dabbelt <[email protected]> +Link: https://lore.kernel.org/all/[email protected]/ +Cc: [email protected] +Signed-off-by: Kees Cook <[email protected]> +--- + scripts/gcc-plugins/gcc-common.h | 4 ++-- + 1 file 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" + +-- +2.40.1
