From 3fad2cf8df2351797f10c86e6f47ec4d5a42c143 Mon Sep 17 00:00:00 2001
From: Aster Boese <asterboese@mailbox.org>
Date: Wed, 1 Apr 2026 21:59:47 +0200
Subject: [PATCH] linux-google-crosshatch-mainline: build with LLVM and sync
 kconfig

Signed-off-by: Aster Boese <asterboese@mailbox.org>
Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8254>
---
 .../linux-google-crosshatch-mainline/APKBUILD | 22 ++++++++++++++-----
 .../config-google-crosshatch-mainline.aarch64 | 16 ++++++++------
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/device/testing/linux-google-crosshatch-mainline/APKBUILD b/device/testing/linux-google-crosshatch-mainline/APKBUILD
index ffb9bfe4f..da16944ce 100644
--- a/device/testing/linux-google-crosshatch-mainline/APKBUILD
+++ b/device/testing/linux-google-crosshatch-mainline/APKBUILD
@@ -8,13 +8,24 @@ _config="config-$_flavor.$CARCH"
 maintainer=""
 pkgname=linux-$_flavor
 pkgver=5.3_rc5
-pkgrel=6
+pkgrel=7
 arch="aarch64"
 _carch="arm64"
 pkgdesc="Google Pixel 3 XL kernel fork, close to mainline"
 url="https://kernel.org/"
-license="GPL2-2.0-only"
-makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev openssl-dev file bison flex"
+license="GPL-2.0-only"
+makedepends="
+	bison
+	clang
+	findutils
+	flex
+	lld
+	llvm
+	openssl-dev
+	perl
+	postmarketos-installkernel
+	zstd
+"
 options="!strip !check !tracedeps
 		pmb:cross-native
 "
@@ -38,7 +49,7 @@ prepare() {
 build() {
 	unset LDFLAGS
 	# V=1: workaround for pma#1990
-	make ARCH="$_carch" CC="${CC:-gcc}" \
+	make ARCH="$_carch" LLVM=1 \
 		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-$_flavor" \
 		CFLAGS_MODULE=-fno-pic V=1
 }
@@ -50,6 +61,7 @@ package() {
 
 	make modules_install dtbs_install \
 		ARCH="$_carch" \
+		LLVM=1 \
 		INSTALL_PATH="$pkgdir"/boot \
 		INSTALL_MOD_PATH="$pkgdir" \
 		INSTALL_DTBS_PATH="$pkgdir/boot/dtbs"
@@ -62,6 +74,6 @@ package() {
 
 sha512sums="
 1ce235689d7ce0b40be203cb16c1bdfe9bc7b2c5e793a942afc5ea4f3268a0a15b684d9c4017a87916d989d8592a96a4223976c95bf7fcca603e71d2f20fee86  linux-google-crosshatch-mainline-9c9b87cec239101274451cc9c086da60108f9fda.tar.gz
-c5ad0da2c43bdc6ba482ed2f087622e9c6d8f05e4a68c7af331fe7ad5403cac22bd25d2e366b8f1a5491dbd43d79b32cb3096c3a3e24ea13950400d0fa26725b  config-google-crosshatch-mainline.aarch64
+62eb29876da044ee5b112a80e750b7511280a2a1624d7264ee41ec09d09072c03ba8052f27df644b116dded1becc86c807de9fe3ba31fca54dcdc12b58345f12  config-google-crosshatch-mainline.aarch64
 27827877040007fc1c4c719f7e2e19e5c272d44972415cfc53feba0313d87e4074f8204bdb13cbc5fe21ea61bf595314b68f10c081e7b7bac3c888b60f008acf  0001-linux4.17-gcc10-extern_YYLOC_global_declaration.patch
 "
diff --git a/device/testing/linux-google-crosshatch-mainline/config-google-crosshatch-mainline.aarch64 b/device/testing/linux-google-crosshatch-mainline/config-google-crosshatch-mainline.aarch64
index 21c39618c..eeb62bbc8 100644
--- a/device/testing/linux-google-crosshatch-mainline/config-google-crosshatch-mainline.aarch64
+++ b/device/testing/linux-google-crosshatch-mainline/config-google-crosshatch-mainline.aarch64
@@ -4,11 +4,12 @@
 #
 
 #
-# Compiler: aarch64-alpine-linux-musl-gcc (Alpine 14.2.0) 14.2.0
+# Compiler: gcc (Alpine 15.2.0) 15.2.0
 #
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=140200
+CONFIG_GCC_VERSION=150200
 CONFIG_CLANG_VERSION=0
+CONFIG_CC_CAN_LINK=y
 CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y
 CONFIG_IRQ_WORK=y
@@ -95,7 +96,8 @@ CONFIG_TASKSTATS=y
 CONFIG_TASK_DELAY_ACCT=y
 CONFIG_TASK_XACCT=y
 CONFIG_TASK_IO_ACCOUNTING=y
-# CONFIG_PSI is not set
+CONFIG_PSI=y
+# CONFIG_PSI_DEFAULT_DISABLED is not set
 # end of CPU/Task time and stats accounting
 
 CONFIG_CPU_ISOLATION=y
@@ -895,7 +897,7 @@ CONFIG_IP_PNP_BOOTP=y
 # CONFIG_NET_IPGRE_DEMUX is not set
 CONFIG_NET_IP_TUNNEL=m
 # CONFIG_IP_MROUTE is not set
-# CONFIG_SYN_COOKIES is not set
+CONFIG_SYN_COOKIES=y
 # CONFIG_NET_IPVTI is not set
 CONFIG_NET_UDP_TUNNEL=m
 # CONFIG_NET_FOU is not set
@@ -2508,7 +2510,7 @@ CONFIG_INPUT_MATRIXKMAP=y
 #
 # CONFIG_INPUT_MOUSEDEV is not set
 # CONFIG_INPUT_JOYDEV is not set
-CONFIG_INPUT_EVDEV=y
+CONFIG_INPUT_EVDEV=m
 # CONFIG_INPUT_EVBUG is not set
 
 #
@@ -2719,7 +2721,7 @@ CONFIG_LEGACY_PTY_COUNT=16
 # CONFIG_NOZOMI is not set
 # CONFIG_N_GSM is not set
 # CONFIG_TRACE_SINK is not set
-CONFIG_NULL_TTY=y
+CONFIG_NULL_TTY=m
 CONFIG_LDISC_AUTOLOAD=y
 CONFIG_DEVMEM=y
 
@@ -5615,7 +5617,7 @@ CONFIG_DMA_ENGINE_RAID=y
 #
 CONFIG_SYNC_FILE=y
 # CONFIG_SW_SYNC is not set
-# CONFIG_UDMABUF is not set
+CONFIG_UDMABUF=y
 # end of DMABUF options
 
 # CONFIG_AUXDISPLAY is not set