From 46af752d9d1cdd34c1978305f73d2a3f737c25cd Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Sun, 7 May 2023 13:06:12 -0700
Subject: Updated to 6.1.27

---
 PKGBUILD           | 14 +++++++++-----
 config             |  1 -
 gcc13-compat.patch | 45 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 54 insertions(+), 6 deletions(-)
 create mode 100644 gcc13-compat.patch

diff --git a/PKGBUILD b/PKGBUILD
index f9cd08d..5c08584 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -19,7 +19,7 @@ _custom=0
 pkgbase=linux
 _supver=6
 _majver=1
-_minver=24
+_minver=27
 _gccpatchver='20230105'
 _gccpatchker='5.17+'
   if [ "$_minver" == "0" ]; then
@@ -41,6 +41,7 @@ options=('!strip')
 _srcname=linux-${pkgver}
 source=(
   https://www.kernel.org/pub/linux/kernel/v${_supver}.x/${_srcname}.tar.{xz,sign}
+  gcc13-compat.patch
   config         # the main kernel config file
   0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
   kernel_compiler_patch-${_gccpatchver}.tar.gz::https://github.com/graysky2/kernel_compiler_patch/archive/${_gccpatchver}.tar.gz
@@ -52,16 +53,18 @@ validpgpkeys=(
   '647F28654894E3BD457199BE38DBBDC86092693E'  # Greg Kroah-Hartman
 )
 # https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc
-sha256sums=('aae6a7e38e33589011f5a5c0d7e087c8a26e3daf8d434432ee975ead90546504'
+sha256sums=('c2b74b96dd3d0cc9f300914ef7c4eef76d5fac9de6047961f49e69447ce9f905'
             'SKIP'
-            'd8ee94f1288a23585f06b774ff01a397c4743ad4a77fd2abc33e70d5c8b1dc8a'
+            'c6c5f6be7ae0ef5a8bdfea0a5578f096db38113774e08dc7b78fc48034c7b211'
+            '5c874fe1bae53cec4222d39e5bc74b16ab125d9fc1c4261a47b89702d066972e'
             '602a2fd8d11f86824889318ec33cdb20030cbd713d63514126e9c11dcb78ccf3'
             '802946f623c69ae1a636b63697c23ca48af31a099415ed837d2c1e168a272d23'
             'e9e0d289170b7fb598b572d9c892ae8d1420952034aa415e8b3334f20a58edcc'
             '6ab863c8cfe6e0dd53a9d6455872fd4391508a8b97ab92e3f13558a6617b12a6')
-b2sums=('2f20ad999655226bc79caca109bde0f940420d87a293cf000f2d8304122bdfcc388c1a558ff26f2f551c9b6133b8fb120dbd537f914e1b88d0fbbd5408e648b0'
+b2sums=('5d7ec9a6a2652abbe4afb70174a63f58d495291d522087f9adb33864063ce54e219fd6e426793077a346338ccb4d9d753a60cb76b448146fb592ff17c2618792'
         'SKIP'
-        '256bca3f44df4d96fcaab7edd8dfbe3b7b8c0d68887d3692ba26dc2b923dc5dced0381e28930c8a9515a887914eb19cf1b99b96bfe6c131cf2ba9755032bc461'
+        '18e6706d35fc686a2e53889dbb65eff7e7eb140bd8dbd8836545f5c74ff23e272cc95a0571902c98d454ccfa0c0517085fbda46488d3e06a1123dedbc9f6a45a'
+        'f616edbdd06c3f2eb3cac604ed410f86a9085c13cbb01d77d84fc87d768ea95d70bdf5d0024785814ee446fba170d0aab2eff8b99a0036f9d2fe0fbe97f4bfeb'
         '62b993e415186acc54f11c79f140f9f4df0c62658fa45e4895d131a3729810c181bfd7f13c6059ed882aa1d8ce79651acc30ab42077bae5497b4f0a1d05bf1aa'
         'd178dad69501967382d5c841f65e4f57651042bee8117041a9baa35ab3fa73af8174b8b999ae9e72ec381c52744ccaaabb77944d59f123c04b6ed5626432d843'
         'b6ef77035611139fa9a6d5b8d30570e2781bb4da483bb569884b0bd0129b62e0b82a5a6776fefe43fee801c70d39de1ea4d4c177f7cedd5ac135e3c64f7b895a'
@@ -84,6 +87,7 @@ prepare() {
 
   # Hotfixes
   echo "Applying hotfixes"
+  patch -p1 -i ../gcc13-compat.patch
   patch -p1 -i ../0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
 
   # graysky gcc patch
diff --git a/config b/config
index c61fce8..7c3668a 100644
--- a/config
+++ b/config
@@ -207,7 +207,6 @@ CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
 CONFIG_CC_HAS_INT128=y
 CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5"
 CONFIG_GCC11_NO_ARRAY_BOUNDS=y
-CONFIG_GCC12_NO_ARRAY_BOUNDS=y
 CONFIG_CC_NO_ARRAY_BOUNDS=y
 CONFIG_ARCH_SUPPORTS_INT128=y
 CONFIG_NUMA_BALANCING=y
diff --git a/gcc13-compat.patch b/gcc13-compat.patch
new file mode 100644
index 0000000..ab0d7e9
--- /dev/null
+++ b/gcc13-compat.patch
@@ -0,0 +1,45 @@
+From e6a71160cc145e18ab45195abf89884112e02dfb Mon Sep 17 00:00:00 2001
+From: Kees Cook <keescook@chromium.org>
+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 <palmer@rivosinc.com>
+Acked-by: Palmer Dabbelt <palmer@rivosinc.com>
+Link: https://lore.kernel.org/all/20230113173033.4380-1-palmer@rivosinc.com/
+Cc: linux-hardening@vger.kernel.org
+Signed-off-by: Kees Cook <keescook@chromium.org>
+---
+ 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
-- 
cgit v1.2.1