DEBUG: make CI more verbose (MR 5704)

Qemu by default starts a GTK window in VGA resolution 640x480. The content
adapts to this resolution, thus X11 shows up in resolution 640x480 as well.

This resolution causes some handling issues. In Xfce4 the shutdown button of
the menu isn't reachable. Even worse in MATE, where the "Apply" button for
changing the resolution is out of the screen, making it difficult to change
the resolution.

The default resolution for X11 can be set by a config file. The Qemu GTK
window resolution remains independently at default 640x480. Setting the X11
resolution to default 800x600 mitigates the issue: Most of the screen content
becomes accessible while font size and button sizes are still large enough.
From this point the user can adjust the resolutions of the Qemu GTK window
and X11 content as desired.
[ci:skip-build]: already built successfully in CI

.ci/apkbuild-lint.sh

@@ -6,7 +6,7 @@
 
 if [ "$(id -u)" = 0 ]; then
 	set -x
-	wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
+	wget "https://gitlab.postmarketos.org/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
 	sh ./install_pmbootstrap.sh
 	exec su "${TESTUSER:-pmos}" -c "sh -e $0"
 fi

.ci/autoupdate.sh

@@ -1,12 +1,9 @@
 #!/bin/sh -e
-# Description: update a list of packages
-# Options: native slow
-# https://postmarketos.org/pmb-ci
 
 if [ "$(id -u)" = 0 ]; then
 	set -x
 	apk add git openssh-keygen grep curl
-	wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
+	wget "https://gitlab.postmarketos.org/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
 	sh ./install_pmbootstrap.sh
 	exec su "${TESTUSER:-pmos}" -c "sh -e $0 $*"
 fi
@@ -14,11 +11,7 @@ fi
 git config --global --add safe.directory "$CI_PROJECT_DIR"
 git config --global user.name "postmarketOS CI"
 # pmaports
-# The email address is the username of the bot (from the GitLab group members page) @noreply.gitlab.com
-git config --global user.email "project_8065375_bot_13cf44ca4cd2c938688af6e3d500d9cb@noreply.gitlab.com"
-
-# For testing with pmaports-autoupdate-test repo
-# git config --global user.email "project_58002231_bot_be2d4e9e7aba929855726aafe12940d6@noreply.gitlab.com"
+git config --global user.email "project_226_bot_a365eaa0c380d1bee0af03adf42ebea3@noreply.gitlab.postmarketos.org"
 
 # Configure SSH key for signing
 mkdir -p ~/.ssh
@@ -90,9 +83,9 @@ update_linux_next() {
 }
 
 # For testing
-#git remote add gitlab https://pmos-ci:"$PMAPORTS_PUSH_TOKEN"@gitlab.com/postmarketOS/pmaports-autoupdate-test.git
+#git remote add gitlab https://pmos-ci:"$PMAPORTS_PUSH_TOKEN"@gitlab.postmarketos.org/postmarketOS/pmaports-autoupdate-test.git
 
-git remote add gitlab https://pmos-ci:"$PMAPORTS_PUSH_TOKEN"@gitlab.com/postmarketOS/pmaports.git
+git remote add gitlab https://pmos-ci:"$PMAPORTS_PUSH_TOKEN"@gitlab.postmarketos.org/postmarketOS/pmaports.git
 git fetch gitlab
 git checkout --track gitlab/master
 

.ci/commits.sh

@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh -ex
 # Copyright 2023 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later
 # Description: check pkgver/pkgrel bumps, amount of changed pkgs etc
@@ -11,8 +11,8 @@ if [ "$(id -u)" = 0 ]; then
 	# In .gitlab-ci.yml currently .ci/pytest.sh runs before this and
 	# already downloads and runs install_pmbootstrap.sh.
 	if ! [ -e install_pmbootstrap.sh ]; then
-		wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
-		sh ./install_pmbootstrap.sh
+		wget "https://gitlab.postmarketos.org/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
+		sh -x ./install_pmbootstrap.sh
 	fi
 	exec su "${TESTUSER:-pmos}" -c "sh -e $0"
 fi

.ci/grep.sh

@@ -57,7 +57,7 @@ fi
 
 POSTMARKETOS_WALLPAPER_PATH='/usr/share/wallpapers/postmarketos.jpg'
 # The excluded devices are "grandfathered in". New devices should not be added here.
-# See https://gitlab.com/postmarketOS/pmaports/-/issues/2529
+# See https://gitlab.postmarketos.org/postmarketOS/pmaports/-/issues/2529
 if grep -qr $POSTMARKETOS_WALLPAPER_PATH \
 	--exclude-dir='device-pine64-pinetab' \
 	--exclude-dir='device-oneplus-kebab' \

.ci/kconfig.sh

@@ -6,7 +6,7 @@
 
 if [ "$(id -u)" = 0 ]; then
 	set -x
-	wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
+	wget "https://gitlab.postmarketos.org/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
 	sh ./install_pmbootstrap.sh
 	exec su "${TESTUSER:-pmos}" -c "sh -e $0"
 fi

.ci/lib/build_changed_aports.py

@@ -2,6 +2,7 @@
 # Copyright 2021 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later
 import sys
+import os
 import pathlib
 
 # Same dir
@@ -9,6 +10,7 @@ import common
 
 # pmbootstrap
 import add_pmbootstrap_to_import_path
+import pmb.core
 import pmb.parse
 import pmb.parse._apkbuild
 import pmb.helpers.pmaports
@@ -66,9 +68,29 @@ if __name__ == "__main__":
     args = pmb.parse.arguments()
     context = get_context()
 
-    # Filter out packages that can't be built for given arch
+    # Get set of all buildable packages for the enabled repos, for skipping unbuildable
+    # aports later. We might be given a changed aport from e.g. extra-repos/systemd when
+    # that repo is not enabled
+    buildable_pkgs = set()
+    for path in pmb.core.pkgrepo.pkgrepo_iter_package_dirs():
+        buildable_pkgs.add(os.path.basename(path))
+
+    # To store a list of packages from extra-repos/systemd for special handling later:
+    systemd_pkgs = list()
+
+    # Filter out packages that either:
+    #  1. can't be built for given arch
+    #  2. are not found in enabled repos
     # (Iterate over copy of packages, because we modify it in this loop)
     for package in packages.copy():
+        if package not in buildable_pkgs:
+            print(f"{package}: not in any available repos, skipping")
+            packages.remove(package)
+            # FIXME: this should probably be more generic, if other repos are added later?
+            # This just tosses the package into the list of packages to try building later w/ systemd enabled, and assumes it'll be found there.
+            systemd_pkgs.append(package)
+            continue
+
         apkbuild_path = pmb.helpers.pmaports.find(package)
         apkbuild = pmb.parse._apkbuild.apkbuild(pathlib.Path(apkbuild_path, "APKBUILD"))
 
@@ -84,3 +106,10 @@ if __name__ == "__main__":
     # Build packages
     print(f"building in strict mode for {arch}: {', '.join(packages)}")
     build_strict(packages, arch)
+
+    # Build packages in extra-repos/systemd
+    # FIXME: this should probably be more generic, if other repos are added later?
+    if systemd_pkgs:
+        print(f"building in strict mode for {arch}, from extra-repos/systemd: {', '.join(packages)}")
+        common.run_pmbootstrap(["config", "systemd", "always"])
+        build_strict(systemd_pkgs, arch)

.ci/lib/build_changed_aports.sh

@@ -5,7 +5,7 @@
 
 if [ "$(id -u)" = 0 ]; then
 	set -x
-	wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
+	wget "https://gitlab.postmarketos.org/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
 	sh ./install_pmbootstrap.sh
 	exec su "${TESTUSER:-pmos}" -c "sh -e $0"
 fi

.ci/lib/common.py

@@ -36,7 +36,7 @@ def run_git(parameters, check=True, stderr=None):
 def add_upstream_git_remote():
     """ Add a remote pointing to postmarketOS/pmaports. """
     run_git(["remote", "add", "upstream",
-             "https://gitlab.com/postmarketOS/pmaports.git"], False)
+             "https://gitlab.postmarketos.org/postmarketOS/pmaports.git"], False)
     run_git(["fetch", "-q", "upstream"])
 
 
@@ -100,7 +100,7 @@ def get_changed_files(removed=True):
     commit_head = run_git(["rev-parse", "HEAD"])[:-1]
     commit_upstream = run_git(["rev-parse", branch_upstream])[:-1]
     print("commit HEAD: " + commit_head)
-    print(f"commit {branch_upstream}: f{commit_upstream}")
+    print(f"commit {branch_upstream}: {commit_upstream}")
 
     # Check if we are HEAD on the upstream branch
     if commit_head == commit_upstream:

.ci/pytest.sh

@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh -ex
 # Copyright 2023 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later
 # Description: lint with various python tests
@@ -8,8 +8,8 @@
 
 if [ "$(id -u)" = 0 ]; then
 	set -x
-	wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
-	sh ./install_pmbootstrap.sh pytest
+	wget "https://gitlab.postmarketos.org/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
+	sh -x ./install_pmbootstrap.sh pytest
 	exec su "${TESTUSER:-pmos}" -c "sh -e $0"
 fi
 

.ci/testcases/test_directory_structure.py

@@ -28,7 +28,7 @@ def test_directories():
 
 
 # Ensure no file in pmaports are executable.
-# see https://gitlab.com/postmarketOS/pmaports/-/issues/593.
+# see https://gitlab.postmarketos.org/postmarketOS/pmaports/-/issues/593.
 def test_executable_files():
     for file in glob.iglob("[!temp]**/**/*", recursive=True):
         if os.path.isdir(file) or os.path.islink(file):

.gitlab-ci.yml

@@ -10,7 +10,12 @@ stages:
   - lint
   - build
   - autoupdate
-
+variables:
+  # Default of 20 is pretty small, sometimes MRs have >20 commits in them. 100
+  # seems like a reasonable balance. If this is too low, git merge-base (from ci/
+  # common.py) can fail
+  GIT_DEPTH: 100
+  
 # This defines the rules for when a pipeline should run.
 workflow:
   rules:
@@ -119,7 +124,7 @@ mr-settings:
     - *global_before_scripts
     - apk -q add python3
   script:
-    - wget -q "https://gitlab.com/postmarketOS/ci-common/-/raw/master/check_mr_settings.py"
+    - wget -q "https://gitlab.postmarketos.org/postmarketOS/ci-common/-/raw/master/check_mr_settings.py"
     - python3 ./check_mr_settings.py
 
 # build changed aports

cross/busybox-static-aarch64/APKBUILD

@@ -7,8 +7,8 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi
 
 pkgname=busybox-static-aarch64
-pkgver=1.36.1
-pkgrel=32
+pkgver=1.37.0
+pkgrel=3
 
 _arch="aarch64"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }
 
 sha512sums="
-88f07677919711bb577f60e1861f4fa555168a8703a0a3b904550e24d4045135bb0296e00464899fc6231df07db09bb11f1bc81cdf593a71a8f74dfc3333c29e  busybox-static-1.36.1-r32-aarch64-edge.apk
+c0e12a73463638803a7adddb241f93ae0617498bb88bc349c62e2e1fe0b3ee25ebec1853e21bd0a42efb7578f09c8d0324073bc93a530855030d4f192a49e0b0  busybox-static-1.37.0-r3-aarch64-edge.apk
 "

cross/busybox-static-armhf/APKBUILD

@@ -7,8 +7,8 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi
 
 pkgname=busybox-static-armhf
-pkgver=1.36.1
-pkgrel=32
+pkgver=1.37.0
+pkgrel=3
 
 _arch="armhf"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }
 
 sha512sums="
-b0985e2f62df8f1d4e1b7a1206dc3e462df1e6b2a8aae662e57cc497ca3f474f37cc952de0d3bbaad6532d569bf540f17ad4eccc9cabfdc3c9f95f8feaf08049  busybox-static-1.36.1-r32-armhf-edge.apk
+a56b1f41818d5c4c9096c406e7a3d61ed1ea97624bd274c0f6f8914276cf041ee2cd6a170241f9cc93ed170fe13f183304166bfa12152d261cf898f838c1e781  busybox-static-1.37.0-r3-armhf-edge.apk
 "

cross/busybox-static-armv7/APKBUILD

@@ -7,8 +7,8 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi
 
 pkgname=busybox-static-armv7
-pkgver=1.36.1
-pkgrel=32
+pkgver=1.37.0
+pkgrel=3
 
 _arch="armv7"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }
 
 sha512sums="
-f383286e58183232b41a0d299528734cb29b11e51112eab1fe513322a269a2cdf90a1341d7e329ed7cd58e2d158e3a80bc3a5290ef93de2b28aaf7a25b78bfd7  busybox-static-1.36.1-r32-armv7-edge.apk
+f4027d0be53ae42fb079208e04f2ad9ca6971b8b489389c4ebae364f423cea361d2a304dd0ceced1acf3780583456fc404d599760ea9df0550f77c11eac30a04  busybox-static-1.37.0-r3-armv7-edge.apk
 "

cross/crossdirect/APKBUILD

@@ -20,7 +20,7 @@
 
 pkgname=crossdirect
 pkgver=5.1.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Wrappers to launch native cross compilers in foreign chroots"
 url="https://postmarketOS.org"
 arch="all"
@@ -82,7 +82,7 @@ package() {
 
 sha512sums="
 0f4b48f250425dc57f63955fc8b38477d23db793bee367c3fbe03c3d2a559ba576434d07518310db4cae9d90d501af4051b80038b10fae94b980e537fc9374ad  cargo.sh
-500107e5aff8b34e74b54982ebcd447fc41bc8283956d506561b031a055cb30ec12698047c2604918b4b6d8560fe03db427a63dff2b83c907e8494b7f5233f29  crossdirect.c
+a1af3d2876dc05bb840e4bfb8b6e1c1dcf5b952375a6644dcb9cf659d82ec8bfc4be5d813064057fe9626104a10907ae7072a9d5fd7ac40f3b87e90dbf535eaf  crossdirect.c
 de2aa6929bbff5db9132673e667f4525b333d062cb1f7a0597dd924de9e5c7215a9f8e2e6263b6fb5ace06f2c4b64f4ebfd0ede9b78add07c2cd08ec8613e98f  rustc.sh
 ea9bf8db3810d03d0a7395057f3d6e57f7127d87c55deaedc171c255288f5f3cc6fbcc680a5a1b92786cf573875d5dc22521173799fe2639acc97d0715ff905b  rust-qemu-linker.sh
 "

cross/crossdirect/crossdirect.c

@@ -43,7 +43,7 @@
 
 void exit_userfriendly()
 {
-	fprintf(stderr, "Please report this at: https://gitlab.com/postmarketOS/pmaports/issues\n");
+	fprintf(stderr, "Please report this at: https://gitlab.postmarketos.org/postmarketOS/pmaports/issues\n");
 	fprintf(stderr, "As a workaround, you can compile without crossdirect.\n");
 	fprintf(stderr, "See 'pmbootstrap -h' for related options.\n");
 	exit(1);

cross/gcc-aarch64/APKBUILD

@@ -34,7 +34,7 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname=gcc-aarch64
-pkgrel=3
+pkgrel=4
 pkgdesc="Stage2 cross-compiler for aarch64"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -44,9 +44,10 @@ depends="binutils-aarch64 mpc1"
 makedepends_build="gcc g++ bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev"
 makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-dev-aarch64 binutils-aarch64"
 subpackages="g++-aarch64:gpp libstdc++-dev-aarch64:libcxx_dev"
-[ "$CHOST" = "$CTARGET" ] && subpackages="gcc-gdb gcc-doc$_target"
+[ "$CHOST" = "$CTARGET" ] && subpackages="gcc-gdb gcc-doc"
 replaces="libstdc++ binutils"
-options="!strip"
+options="!strip !tracedeps"
+depends="$depends so:libc.musl-x86_64.so.1 so:libgcc_s.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libstdc++.so.6 so:libz.so.1"
 
 : "${LANG_CXX:=true}"
 : "${LANG_D:=true}"
@@ -135,7 +136,6 @@ else
 	export CXXFLAGS_FOR_TARGET="$CXXFLAGS"
 	export LDFLAGS_FOR_TARGET="$LDFLAGS"
 	export BOOT_CFLAGS="$CFLAGS"
-	export BOOT_CXXFLAGS="$CXXFLAGS"
 	export BOOT_LDFLAGS="$LDFLAGS"
 fi
 
@@ -170,7 +170,7 @@ esac
 # currently on x86, x86_64 and ia64
 _libquadmath=$LANG_FORTRAN
 case "$CTARGET_ARCH" in
-x86 | x86_64 | ppc64le)	_libquadmath=$LANG_FORTRAN ;;
+x86 | x86_64 | ppc64le) ;;
 *)		_libquadmath=false ;;
 esac
 
@@ -218,13 +218,12 @@ if $LANG_FORTRAN; then
 	_languages="$_languages,fortran"
 fi
 if $LANG_ADA; then
-	subpackages="$subpackages gcc-gnat$_target:gnat"
+	subpackages="$subpackages gcc-gnat$_target:gnat libgnat::$CTARGET_ARCH"
 	_languages="$_languages,ada"
 	if [ "$CBUILD" = "$CTARGET" ]; then
 		makedepends_build="$makedepends_build gcc-gnat-bootstrap"
-		subpackages="$subpackages libgnat-static:libgnatstatic:$CTARGET_ARCH libgnat::$CTARGET_ARCH"
+		subpackages="$subpackages libgnat-static:libgnatstatic:$CTARGET_ARCH"
 	else
-		subpackages="$subpackages libgnat::$CTARGET_ARCH"
 		makedepends_build="$makedepends_build gcc-gnat gcc-gnat$_cross"
 	fi
 fi
@@ -234,7 +233,7 @@ fi
 makedepends="$makedepends_build $makedepends_host"
 
 # when using upstream releases, use this URI template
-# https://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$pkgver}/gcc-${_pkgbase:-$pkgver}.tar.xz
+# https://gcc.gnu.org/pub/gcc/releases/gcc-$_pkgbase/gcc-$_pkgbase.tar.xz
 #
 # right now, we are using a git snapshot. snapshots are taken from gcc.gnu.org/pub/gcc/snapshots.
 # However, since they are periodically deleted from the GCC mirrors the utilized snapshots are
@@ -244,7 +243,7 @@ makedepends="$makedepends_build $makedepends_host"
 # PLEASE submit all patches to gcc to https://gitlab.alpinelinux.org/kaniini/alpine-gcc-patches,
 # so that they can be properly tracked and easily rebased if needed.
 #source="https://dev.alpinelinux.org/archive/gcc/${_pkgbase%%.*}-$_pkgsnap/gcc-${_pkgbase%%.*}-$_pkgsnap.tar.xz
-source="https://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$pkgver}/gcc-${_pkgbase:-$pkgver}.tar.xz
+source="https://gcc.gnu.org/pub/gcc/releases/gcc-$_pkgbase/gcc-$_pkgbase.tar.xz
 	0001-posix_memalign.patch
 	0002-gcc-poison-system-directories.patch
 	0003-specs-turn-on-Wl-z-now-by-default.patch
@@ -283,6 +282,7 @@ source="https://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$pkgver}/gcc-${_pkg
 	0036-libphobos-add-riscv64-and-loongarch64-support.patch
 	fix-arm64.patch
 	ppc64le-quadmath.patch
+	riscv64-improve-build-time.patch
 	"
 
 # secfixes:
@@ -290,44 +290,21 @@ source="https://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$pkgver}/gcc-${_pkg
 #     - CVE-2023-4039
 
 # we build out-of-tree
-#_gccdir="$srcdir"/gcc-${_pkgbase%%.*}-$_pkgsnap
-_gccdir="$srcdir"/gcc-${_pkgbase:-$pkgver}
-_gcclibdir="/usr/lib/gcc/$CTARGET/${_pkgbase:-$pkgver}"
-_gcclibexec="/usr/libexec/gcc/$CTARGET/${_pkgbase:-$pkgver}"
+#builddir="$srcdir"/gcc-${_pkgbase%%.*}-$_pkgsnap
+builddir="$srcdir"/gcc-$_pkgbase
+_gcclibdir="/usr/lib/gcc/$CTARGET/$_pkgbase"
+_gcclibexec="/usr/libexec/gcc/$CTARGET/$_pkgbase"
 
 prepare() {
-	cd "$_gccdir"
-
-	_err=
-	for i in $source; do
-		case "$i" in
-		*.patch)
-			msg "Applying $i"
-			patch -p1 -i "$srcdir"/$i || _err="$_err $i"
-			;;
-		esac
-	done
-
-	if [ -n "$_err" ]; then
-		error "The following patches failed:"
-		for i in $_err; do
-			echo "  $i"
-		done
-		return 1
-	fi
-
-	echo ${_pkgbase:-$pkgver} > gcc/BASE-VER
+	default_prepare
+	echo $_pkgbase > gcc/BASE-VER
 }
 
 build() {
 	local _arch_configure=
-	local _libc_configure=
 	local _bootstrap_configure=
-	local _symvers=
 	local _jit_configure=
 
-	cd "$_gccdir"
-
 	case "$CTARGET" in
 	aarch64-*-*-*)		_arch_configure="--with-arch=armv8-a --with-abi=lp64";;
 	armv5-*-*-*eabi)	_arch_configure="--with-arch=armv5te --with-tune=arm926ej-s --with-float=soft --with-abi=aapcs-linux";;
@@ -351,15 +328,7 @@ build() {
 	*)	_hash_style_configure="--with-linker-hash-style=gnu" ;;
 	esac
 
-	case "$CTARGET_LIBC" in
-	musl)
-		# musl does not support libsanitizer
-		# alpine musl provides libssp_nonshared.a, so we don't need libssp either
-		_libc_configure="--disable-libssp --disable-libsanitizer"
-		_symvers="--disable-symvers"
-		export libat_cv_have_ifunc=no
-		;;
-	esac
+	export libat_cv_have_ifunc=no
 
 
 	case "$BOOTSTRAP" in
@@ -388,10 +357,8 @@ build() {
 	echo "  CHOST=$CHOST"
 	echo "  CTARGET=$CTARGET"
 	echo "  CTARGET_ARCH=$CTARGET_ARCH"
-	echo "  CTARGET_LIBC=$CTARGET_LIBC"
 	echo "  languages=$_languages"
 	echo "  arch_configure=$_arch_configure"
-	echo "  libc_configure=$_libc_configure"
 	echo "  cross_configure=$_cross_configure"
 	echo "  bootstrap_configure=$_bootstrap_configure"
 	echo "  hash_style_configure=$_hash_style_configure"
@@ -412,7 +379,7 @@ build() {
 		--disable-multilib
 		--disable-nls
 		--disable-werror
-		$_symvers
+		--disable-symvers
 		--enable-__cxa_atexit
 		--enable-default-pie
 		--enable-default-ssp
@@ -420,7 +387,8 @@ build() {
 		--enable-link-serialization=2
 		--enable-linker-build-id
 		$_arch_configure
-		$_libc_configure
+		--disable-libssp
+		--disable-libsanitizer
 		$_cross_configure
 		$_bootstrap_configure
 		--with-bugurl=https://gitlab.alpinelinux.org/alpine/aports/-/issues
@@ -430,7 +398,7 @@ build() {
 
 	mkdir -p "$_builddir"
 	cd "$_builddir"
-	"$_gccdir"/configure $gccconfiguration \
+	"$builddir"/configure $gccconfiguration \
 		--with-pkgversion="$version"
 
 	msg "building gcc"
@@ -446,7 +414,7 @@ build() {
 	if $LANG_JIT; then
 		mkdir -p "$_builddir"/libgccjit-build
 		cd "$_builddir"/libgccjit-build
-		"$_gccdir"/configure $gccconfiguration \
+		"$builddir"/configure $gccconfiguration \
 			--disable-bootstrap \
 			--enable-host-shared \
 			--enable-languages=jit \
@@ -461,7 +429,7 @@ package() {
 	cd "$_builddir"
 	make -j1 DESTDIR="$pkgdir" install
 
-	ln -s gcc "$pkgdir"/usr/bin/cc
+	[ "$CHOST" = "$CTARGET" ] && ln -s gcc "$pkgdir"/usr/bin/cc
 	ln -s ${CTARGET}-gcc "$pkgdir"/usr/bin/${CTARGET}-cc
 
 	if $LANG_JIT; then
@@ -505,25 +473,23 @@ package() {
 
 	# move ada runtime libs
 	if $LANG_ADA; then
-		for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 -name "libgna*.so"); do
+		for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 \( -name "libgna*.so" -o -name "libgna*.a" \) ); do
 			mv "$i" "$pkgdir"/usr/lib/
 			ln -s ../../../../${i##*/} $i
 		done
-		if [ "$CHOST" = "$CTARGET" ]; then
-			for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 -name "libgna*.a"); do
-				mv "$i" "$pkgdir"/usr/lib/
-				ln -s ../../../../${i##*/} $i
-			done
-		fi
 	fi
 
 	if [ "$CHOST" != "$CTARGET" ]; then
 		# cross-gcc: remove any files that would conflict with the
 		# native gcc package
-		rm -rf "$pkgdir"/usr/bin/cc "$pkgdir"/usr/include "${pkgdir:?}"/usr/share
+		rm -rf "$pkgdir"/usr/include "${pkgdir:?}"/usr/share
 		# libcc1 does not depend on target, don't ship it
 		rm -rf "$pkgdir"/usr/lib/libcc1.so*
 
+		# These are moved into packages with arch=$CTARGET_ARCH so remove
+		# cross prefix
+		#mv "$pkgdir"/usr/$CTARGET/lib/*.so.* "$pkgdir"/usr/lib/ # FIXME
+
 		# fixup gcc library symlinks to be linker scripts so
 		# linker finds the libs from relocated sysroot
 		for so in "$pkgdir"/usr/"$CTARGET"/lib/*.so; do
@@ -572,8 +538,7 @@ libatomic() {
 	depends=
 	replaces="gcc"
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/${_target:+$CTARGET/}lib/libatomic.so.* "$subpkgdir"/usr/lib/
+	amove usr/lib/libatomic.so.*
 }
 
 libcxx() {
@@ -586,8 +551,7 @@ libcxx() {
 		nm -D "$pkgdir"/usr/lib/libstdc++.so.* | grep clock_gettime
 	fi
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/${_target:+$CTARGET/}lib/libstdc++.so.* "$subpkgdir"/usr/lib/
+	amove usr/lib/libstdc++.so.*
 }
 
 libcxx_dev() {
@@ -605,15 +569,12 @@ libcxx_dev() {
 
 gpp() {
 	pkgdesc="GNU C++ standard library and compiler"
-	depends="libstdc++=$_gccrel libstdc++-dev$_target=$_gccrel gcc$_target=$_gccrel libc-dev"
-	mkdir -p "$subpkgdir/$_gcclibexec" \
-		"$subpkgdir"/usr/bin \
-		"$subpkgdir"/usr/${_target:+$CTARGET/}include \
-		"$subpkgdir"/usr/${_target:+$CTARGET/}lib \
+	depends="libstdc++-dev$_target=$_gccrel gcc$_target=$_gccrel musl-dev"
+	depends="$depends so:libc.musl-x86_64.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libz.so.1"
+	[ "$CHOST" = "$CTARGET" ] && depends="$depends libstdc++=$_gccrel"
 
-	mv "$pkgdir/$_gcclibexec/cc1plus" "$subpkgdir/$_gcclibexec/"
-
-	mv "$pkgdir"/usr/bin/*++ "$subpkgdir"/usr/bin/
+	amove $_gcclibexec/cc1plus
+	amove usr/bin/*++
 }
 
 jit() {
@@ -632,30 +593,26 @@ libobjc() {
 	pkgdesc="GNU Objective-C runtime"
 	replaces="objc"
 	depends=
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/${_target:+$CTARGET/}lib/libobjc.so.* "$subpkgdir"/usr/lib/
+
+	amove usr/lib/libobjc.so.*
 }
 
 objc() {
 	pkgdesc="GNU Objective-C"
 	replaces="gcc"
-	depends="libc-dev gcc=$_gccrel libobjc=$_gccrel"
+	depends="musl-dev gcc=$_gccrel libobjc=$_gccrel"
 
-	mkdir -p "$subpkgdir/$_gcclibexec" \
-		"$subpkgdir"/$_gcclibdir/include \
-		"$subpkgdir"/usr/lib
-	mv "$pkgdir/$_gcclibexec/cc1obj" "$subpkgdir/$_gcclibexec/"
-	mv "$pkgdir"/$_gcclibdir/include/objc "$subpkgdir"/$_gcclibdir/include/
-	mv "$pkgdir"/usr/lib/libobjc.so "$pkgdir"/usr/lib/libobjc.a \
-		"$subpkgdir"/usr/lib/
+	amove $_gcclibexec/cc1obj
+	amove $_gcclibdir/include/objc
+	amove usr/lib/libobjc.so
+	amove usr/lib/libobjc.a
 }
 
 libgcc() {
 	pkgdesc="GNU C compiler runtime libraries"
 	depends=
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/${_target:+$CTARGET/}lib/libgcc_s.so.* "$subpkgdir"/usr/lib/
+	amove usr/lib/libgcc_s.so.*
 }
 
 libgomp() {
@@ -663,17 +620,15 @@ libgomp() {
 	depends=
 	replaces="gcc"
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/${_target:+$CTARGET/}lib/libgomp.so.* "$subpkgdir"/usr/lib/
+	amove usr/lib/libgomp.so.*
 }
 
 libgphobos() {
 	pkgdesc="D programming language standard library for GCC"
 	depends=
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libgdruntime.so.* "$subpkgdir"/usr/lib/
-	mv "$pkgdir"/usr/lib/libgphobos.so.*  "$subpkgdir"/usr/lib/
+	amove usr/lib/libgdruntime.so.*
+	amove usr/lib/libgphobos.so.*
 }
 
 gdc() {
@@ -682,42 +637,26 @@ gdc() {
 	[ "$CBUILD" = "$CTARGET" ] && depends="$depends libgphobos=$_gccrel"
 	[ "$CHOST" = "$CTARGET" ] && provides="gcc-gdc-bootstrap=$_gccrel"
 
-	mkdir -p "$subpkgdir/$_gcclibexec" \
-		"$subpkgdir"/$_gcclibdir/include/d/ \
-		"$subpkgdir"/usr/lib \
-		"$subpkgdir"/usr/bin
 	# Copy: The installed '.d' files, the static lib, the binary itself
 	# The shared libs are part of 'libgphobos' so one can run program
 	# without installing the compiler
-	mv "$pkgdir/$_gcclibexec/d21" "$subpkgdir/$_gcclibexec/"
-	mv "$pkgdir"/$_gcclibdir/include/d/* "$subpkgdir"/$_gcclibdir/include/d/
+	amove $_gcclibexec/d21
+	amove $_gcclibdir/include/d
 	if [ "$CBUILD" = "$CTARGET" ]; then
-		mv "$pkgdir"/usr/lib/libgdruntime.so "$subpkgdir"/usr/lib/
-		mv "$pkgdir"/usr/lib/libgphobos.so "$subpkgdir"/usr/lib/
+		amove usr/lib/libgdruntime.so
+		amove usr/lib/libgphobos.so
 	fi
-	if [ "$CHOST" = "$CTARGET" ]; then
-		mv "$pkgdir"/usr/lib/libgdruntime.a "$subpkgdir"/usr/lib/
-		mv "$pkgdir"/usr/lib/libgphobos.a "$subpkgdir"/usr/lib/
-		mv "$pkgdir"/usr/lib/libgphobos.spec "$subpkgdir"/usr/lib/
-		mv "$pkgdir"/usr/bin/gdc "$subpkgdir"/usr/bin/
-	else
-		mkdir -p "$subpkgdir"/usr/$CTARGET/lib/
-		mv "$pkgdir"/usr/$CTARGET/lib/libgdruntime.a \
-			"$subpkgdir"/usr/$CTARGET/lib/
-		mv "$pkgdir"/usr/$CTARGET/lib/libgphobos.a \
-			"$subpkgdir"/usr/$CTARGET/lib/
-		mv "$pkgdir"/usr/$CTARGET/lib/libgphobos.spec \
-			"$subpkgdir"/usr/$CTARGET/lib/
-	fi
-	mv "$pkgdir"/usr/bin/$CTARGET-gdc "$subpkgdir"/usr/bin/
+	amove usr/${_target:+$CTARGET/}lib/libgdruntime.a
+	amove usr/${_target:+$CTARGET/}lib/libgphobos.a
+	amove usr/${_target:+$CTARGET/}lib/libgphobos.spec
+	amove usr/bin/*gdc
 }
 
 libgo() {
 	pkgdesc="Go runtime library for GCC"
 	depends=
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libgo.so.* "$subpkgdir"/usr/lib/
+	amove usr/lib/libgo.so.*
 }
 
 go() {
@@ -725,31 +664,25 @@ go() {
 	depends="gcc=$_gccrel libgo=$_gccrel !go"
 	install="$pkgname-go.post-install"
 
-	mkdir -p "$subpkgdir"/$_gcclibexec \
-		"$subpkgdir"/usr/lib \
-		"$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/lib/go "$subpkgdir"/usr/lib/
-	mv "$pkgdir"/usr/bin/*gccgo "$subpkgdir"/usr/bin/
-	mv "$pkgdir"/usr/bin/*go "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/*gofmt "$subpkgdir"/usr/bin
-	mv "$pkgdir"/$_gcclibexec/go1 "$subpkgdir"/$_gcclibexec/
-	mv "$pkgdir"/$_gcclibexec/cgo "$subpkgdir"/$_gcclibexec/
-	mv "$pkgdir"/$_gcclibexec/buildid "$subpkgdir"/$_gcclibexec/
-	mv "$pkgdir"/$_gcclibexec/test2json "$subpkgdir"/$_gcclibexec/
-	mv "$pkgdir"/$_gcclibexec/vet "$subpkgdir"/$_gcclibexec/
-	mv "$pkgdir"/usr/lib/libgo.a \
-		"$pkgdir"/usr/lib/libgo.so \
-		"$pkgdir"/usr/lib/libgobegin.a \
-		"$pkgdir"/usr/lib/libgolibbegin.a \
-		"$subpkgdir"/usr/lib/
+	amove usr/lib/go
+	amove usr/bin/*go
+	amove usr/bin/*gofmt
+	amove $_gcclibexec/go1
+	amove $_gcclibexec/cgo
+	amove $_gcclibexec/buildid
+	amove $_gcclibexec/test2json
+	amove $_gcclibexec/vet
+	amove usr/lib/libgo.a
+	amove usr/lib/libgo.so
+	amove usr/lib/libgobegin.a
+	amove usr/lib/libgolibbegin.a
 }
 
 libgfortran() {
 	pkgdesc="Fortran runtime library for GCC"
 	depends=
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libgfortran.so.* "$subpkgdir"/usr/lib/
+	amove usr/lib/libgfortran.so.*
 }
 
 libquadmath() {
@@ -757,8 +690,7 @@ libquadmath() {
 	pkgdesc="128-bit math library for GCC"
 	depends=
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libquadmath.so.* "$subpkgdir"/usr/lib/
+	amove usr/lib/libquadmath.so.*
 }
 
 gfortran() {
@@ -767,38 +699,30 @@ gfortran() {
 	$_libquadmath && depends="$depends libquadmath=$_gccrel"
 	replaces="gcc"
 
-	mkdir -p "$subpkgdir"/$_gcclibexec \
-		"$subpkgdir"/$_gcclibdir \
-		"$subpkgdir"/usr/lib \
-		"$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/*gfortran "$subpkgdir"/usr/bin/
-	mv "$pkgdir"/usr/lib/libgfortran.a \
-		"$pkgdir"/usr/lib/libgfortran.so \
-		"$subpkgdir"/usr/lib/
+	amove usr/bin/*gfortran
+	amove usr/lib/libgfortran.a
+	amove usr/lib/libgfortran.so
 	if $_libquadmath; then
-		mv "$pkgdir"/usr/lib/libquadmath.a \
-			"$pkgdir"/usr/lib/libquadmath.so \
-			"$subpkgdir"/usr/lib/
+		amove usr/lib/libquadmath.a
+		amove usr/lib/libquadmath.so
 	fi
-	mv "$pkgdir"/$_gcclibdir/finclude "$subpkgdir"/$_gcclibdir/
-	mv "$pkgdir"/$_gcclibexec/f951 "$subpkgdir"/$_gcclibexec
-	mv "$pkgdir"/usr/lib/libgfortran.spec "$subpkgdir"/$_gcclibdir
+	amove $_gcclibdir/finclude
+	amove $_gcclibexec/f951
+	mv -v "$pkgdir"/usr/lib/libgfortran.spec "$subpkgdir"/$_gcclibdir/
 }
 
 libgnat() {
 	pkgdesc="GNU Ada runtime shared libraries"
 	depends=
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libgna*.so "$subpkgdir"/usr/lib/
+	amove usr/lib/libgna*.so
 }
 
 libgnatstatic() {
 	pkgdesc="GNU Ada static libraries"
 	depends=
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libgna*.a "$subpkgdir"/usr/lib/
+	amove usr/lib/libgna*.a
 }
 
 gnat() {
@@ -807,12 +731,9 @@ gnat() {
 	provides="$pkgname-gnat-bootstrap=$_gccrel"
 	[ "$CHOST" = "$CTARGET" ] && depends="$depends libgnat=$_gccrel"
 
-	mkdir -p "$subpkgdir"/$_gcclibexec \
-		"$subpkgdir"/$_gcclibdir \
-		"$subpkgdir"/usr/bin
-	mv "$pkgdir"/$_gcclibexec/*gnat* "$subpkgdir"/$_gcclibexec/
-	mv "$pkgdir"/$_gcclibdir/*ada* "$subpkgdir"/$_gcclibdir/
-	mv "$pkgdir"/usr/bin/*gnat* "$subpkgdir"/usr/bin/
+	amove $_gcclibexec/*gnat*
+	amove $_gcclibdir/*ada*
+	amove usr/bin/*gnat*
 }
 
 gdb() {
@@ -864,4 +785,5 @@ c4482ffc36e7894b2140800159f4cbc9a3e9011e43a69b69f4fa92d5a11e2ee645c7e21df4423dd1
 06f64544fd8bc4b6c8b06410c5198aa8fb4e82c232afc0cad83b2c69ac5d39399968206defa78297222700cd18e7fd7e8244afa76d343406a01f657c86306453  0036-libphobos-add-riscv64-and-loongarch64-support.patch
 00319c9770362520e8e93bd03fda1769dfa3622eba77d620e11d8af45a38e6d804a5e924046ae388e1cfaea605696e89c343fca507aaaa5edd58d80744fff14f  fix-arm64.patch
 815265826742400f86336f0c2d3e4edc37398dbc6505ee81107c0103c13ac0f406cff851438d2323033c6c6d0c0323765ee15b975eab8d1dd465f9e988168fb9  ppc64le-quadmath.patch
+ea55e0fa6813fc95c4ca2e87f059182edc54dc61515ebb92bf6eb31dbbd176d0fe81edcc7ea28d32f84ca37e8d48a544623d3d9bc94aa41ffc0859326a616aa2  riscv64-improve-build-time.patch
 "

cross/gcc-aarch64/riscv64-improve-build-time.patch

@@ -0,0 +1,149 @@
+Patch-Source: https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=2cf89ae83225f932b226cd57ef2d083a59bcf8a3
+--
+From 2cf89ae83225f932b226cd57ef2d083a59bcf8a3 Mon Sep 17 00:00:00 2001
+From: Richard Biener <rguenther@suse.de>
+Date: Tue, 6 Aug 2024 14:56:26 +0200
+Subject: [PATCH] tree-optimization/116166 - forward jump-threading going wild
+
+Currently the forward threader isn't limited as to the search space
+it explores and with it now using path-ranger for simplifying
+conditions it runs into it became pretty slow for degenerate cases
+like compiling insn-emit.cc for RISC-V esp. when compiling for
+a host with LOGICAL_OP_NON_SHORT_CIRCUIT disabled.
+
+The following makes the forward threader honor the search space
+limit I introduced for the backward threader.  This reduces
+compile-time from minutes to seconds for the testcase in PR116166.
+
+Note this wasn't necessary before we had ranger but with ranger
+the work we do is quadatic in the length of the threading path
+we build up (the same is true for the backwards threader).
+
+	PR tree-optimization/116166
+	* tree-ssa-threadedge.h (jump_threader::thread_around_empty_blocks):
+	Add limit parameter.
+	(jump_threader::thread_through_normal_block): Likewise.
+	* tree-ssa-threadedge.cc (jump_threader::thread_around_empty_blocks):
+	Honor and decrement limit parameter.
+	(jump_threader::thread_through_normal_block): Likewise.
+	(jump_threader::thread_across_edge): Initialize limit from
+	param_max_jump_thread_paths and pass it down to workers.
+---
+ gcc/tree-ssa-threadedge.cc | 30 ++++++++++++++++++++++--------
+ gcc/tree-ssa-threadedge.h  |  4 ++--
+ 2 files changed, 24 insertions(+), 10 deletions(-)
+
+diff --git a/gcc/tree-ssa-threadedge.cc b/gcc/tree-ssa-threadedge.cc
+index 7f82639b8ecc..0aa2aa851430 100644
+--- a/gcc/tree-ssa-threadedge.cc
++++ b/gcc/tree-ssa-threadedge.cc
+@@ -786,13 +786,17 @@ propagate_threaded_block_debug_into (basic_block dest, basic_block src)
+ bool
+ jump_threader::thread_around_empty_blocks (vec<jump_thread_edge *> *path,
+ 					   edge taken_edge,
+-					   bitmap visited)
++					   bitmap visited, unsigned &limit)
+ {
+   basic_block bb = taken_edge->dest;
+   gimple_stmt_iterator gsi;
+   gimple *stmt;
+   tree cond;
+ 
++  if (limit == 0)
++    return false;
++  --limit;
++
+   /* The key property of these blocks is that they need not be duplicated
+      when threading.  Thus they cannot have visible side effects such
+      as PHI nodes.  */
+@@ -830,7 +834,8 @@ jump_threader::thread_around_empty_blocks (vec<jump_thread_edge *> *path,
+ 	      m_registry->push_edge (path, taken_edge, EDGE_NO_COPY_SRC_BLOCK);
+ 	      m_state->append_path (taken_edge->dest);
+ 	      bitmap_set_bit (visited, taken_edge->dest->index);
+-	      return thread_around_empty_blocks (path, taken_edge, visited);
++	      return thread_around_empty_blocks (path, taken_edge, visited,
++						 limit);
+ 	    }
+ 	}
+ 
+@@ -872,7 +877,7 @@ jump_threader::thread_around_empty_blocks (vec<jump_thread_edge *> *path,
+       m_registry->push_edge (path, taken_edge, EDGE_NO_COPY_SRC_BLOCK);
+       m_state->append_path (taken_edge->dest);
+ 
+-      thread_around_empty_blocks (path, taken_edge, visited);
++      thread_around_empty_blocks (path, taken_edge, visited, limit);
+       return true;
+     }
+ 
+@@ -899,8 +904,13 @@ jump_threader::thread_around_empty_blocks (vec<jump_thread_edge *> *path,
+ 
+ int
+ jump_threader::thread_through_normal_block (vec<jump_thread_edge *> *path,
+-					    edge e, bitmap visited)
++					    edge e, bitmap visited,
++					    unsigned &limit)
+ {
++  if (limit == 0)
++    return 0;
++  limit--;
++
+   m_state->register_equivs_edge (e);
+ 
+   /* PHIs create temporary equivalences.
+@@ -989,7 +999,7 @@ jump_threader::thread_through_normal_block (vec<jump_thread_edge *> *path,
+  	     visited.  This may be overly conservative.  */
+ 	  bitmap_set_bit (visited, dest->index);
+ 	  bitmap_set_bit (visited, e->dest->index);
+-	  thread_around_empty_blocks (path, taken_edge, visited);
++	  thread_around_empty_blocks (path, taken_edge, visited, limit);
+ 	  return 1;
+ 	}
+     }
+@@ -1075,9 +1085,12 @@ jump_threader::thread_across_edge (edge e)
+   bitmap_set_bit (visited, e->src->index);
+   bitmap_set_bit (visited, e->dest->index);
+ 
++  /* Limit search space.  */
++  unsigned limit = param_max_jump_thread_paths;
++
+   int threaded = 0;
+   if ((e->flags & EDGE_DFS_BACK) == 0)
+-    threaded = thread_through_normal_block (path, e, visited);
++    threaded = thread_through_normal_block (path, e, visited, limit);
+ 
+   if (threaded > 0)
+     {
+@@ -1148,11 +1161,12 @@ jump_threader::thread_across_edge (edge e)
+ 	m_registry->push_edge (path, e, EDGE_START_JUMP_THREAD);
+ 	m_registry->push_edge (path, taken_edge, EDGE_COPY_SRC_JOINER_BLOCK);
+ 
+-	found = thread_around_empty_blocks (path, taken_edge, visited);
++	found = thread_around_empty_blocks (path, taken_edge, visited, limit);
+ 
+ 	if (!found)
+ 	  found = thread_through_normal_block (path,
+-					       path->last ()->e, visited) > 0;
++					       path->last ()->e, visited,
++					       limit) > 0;
+ 
+ 	/* If we were able to thread through a successor of E->dest, then
+ 	   record the jump threading opportunity.  */
+diff --git a/gcc/tree-ssa-threadedge.h b/gcc/tree-ssa-threadedge.h
+index 9f6cbfe93307..245b3506a550 100644
+--- a/gcc/tree-ssa-threadedge.h
++++ b/gcc/tree-ssa-threadedge.h
+@@ -101,9 +101,9 @@ private:
+ 					  unsigned limit);
+ 
+   bool thread_around_empty_blocks (vec<class jump_thread_edge *> *path,
+-				   edge, bitmap visited);
++				   edge, bitmap visited, unsigned &limit);
+   int thread_through_normal_block (vec<jump_thread_edge *> *path,
+-				   edge, bitmap visited);
++				   edge, bitmap visited, unsigned &limit);
+   void thread_across_edge (edge);
+   bool record_temporary_equivalences_from_phis (edge);
+   gimple *record_temporary_equivalences_from_stmts_at_dest (edge);
+-- 
+2.43.5
+

cross/gcc-armhf/APKBUILD

@@ -34,7 +34,7 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname=gcc-armhf
-pkgrel=3
+pkgrel=4
 pkgdesc="Stage2 cross-compiler for armhf"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -44,9 +44,10 @@ depends="binutils-armhf mpc1"
 makedepends_build="gcc g++ bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev"
 makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-dev-armhf binutils-armhf"
 subpackages="g++-armhf:gpp libstdc++-dev-armhf:libcxx_dev"
-[ "$CHOST" = "$CTARGET" ] && subpackages="gcc-gdb gcc-doc$_target"
+[ "$CHOST" = "$CTARGET" ] && subpackages="gcc-gdb gcc-doc"
 replaces="libstdc++ binutils"
-options="!strip"
+options="!strip !tracedeps"
+depends="$depends so:libc.musl-x86_64.so.1 so:libgcc_s.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libstdc++.so.6 so:libz.so.1"
 
 : "${LANG_CXX:=true}"
 : "${LANG_D:=true}"
@@ -135,7 +136,6 @@ else
 	export CXXFLAGS_FOR_TARGET="$CXXFLAGS"
 	export LDFLAGS_FOR_TARGET="$LDFLAGS"
 	export BOOT_CFLAGS="$CFLAGS"
-	export BOOT_CXXFLAGS="$CXXFLAGS"
 	export BOOT_LDFLAGS="$LDFLAGS"
 fi
 
@@ -170,7 +170,7 @@ esac
 # currently on x86, x86_64 and ia64
 _libquadmath=$LANG_FORTRAN
 case "$CTARGET_ARCH" in
-x86 | x86_64 | ppc64le)	_libquadmath=$LANG_FORTRAN ;;
+x86 | x86_64 | ppc64le) ;;
 *)		_libquadmath=false ;;
 esac
 
@@ -218,13 +218,12 @@ if $LANG_FORTRAN; then
 	_languages="$_languages,fortran"
 fi
 if $LANG_ADA; then
-	subpackages="$subpackages gcc-gnat$_target:gnat"
+	subpackages="$subpackages gcc-gnat$_target:gnat libgnat::$CTARGET_ARCH"
 	_languages="$_languages,ada"
 	if [ "$CBUILD" = "$CTARGET" ]; then
 		makedepends_build="$makedepends_build gcc-gnat-bootstrap"
-		subpackages="$subpackages libgnat-static:libgnatstatic:$CTARGET_ARCH libgnat::$CTARGET_ARCH"
+		subpackages="$subpackages libgnat-static:libgnatstatic:$CTARGET_ARCH"
 	else
-		subpackages="$subpackages libgnat::$CTARGET_ARCH"
 		makedepends_build="$makedepends_build gcc-gnat gcc-gnat$_cross"
 	fi
 fi
@@ -234,7 +233,7 @@ fi
 makedepends="$makedepends_build $makedepends_host"
 
 # when using upstream releases, use this URI template
-# https://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$pkgver}/gcc-${_pkgbase:-$pkgver}.tar.xz
+# https://gcc.gnu.org/pub/gcc/releases/gcc-$_pkgbase/gcc-$_pkgbase.tar.xz
 #
 # right now, we are using a git snapshot. snapshots are taken from gcc.gnu.org/pub/gcc/snapshots.
 # However, since they are periodically deleted from the GCC mirrors the utilized snapshots are
@@ -244,7 +243,7 @@ makedepends="$makedepends_build $makedepends_host"
 # PLEASE submit all patches to gcc to https://gitlab.alpinelinux.org/kaniini/alpine-gcc-patches,
 # so that they can be properly tracked and easily rebased if needed.
 #source="https://dev.alpinelinux.org/archive/gcc/${_pkgbase%%.*}-$_pkgsnap/gcc-${_pkgbase%%.*}-$_pkgsnap.tar.xz
-source="https://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$pkgver}/gcc-${_pkgbase:-$pkgver}.tar.xz
+source="https://gcc.gnu.org/pub/gcc/releases/gcc-$_pkgbase/gcc-$_pkgbase.tar.xz
 	0001-posix_memalign.patch
 	0002-gcc-poison-system-directories.patch
 	0003-specs-turn-on-Wl-z-now-by-default.patch
@@ -283,6 +282,7 @@ source="https://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$pkgver}/gcc-${_pkg
 	0036-libphobos-add-riscv64-and-loongarch64-support.patch
 	fix-arm64.patch
 	ppc64le-quadmath.patch
+	riscv64-improve-build-time.patch
 	"
 
 # secfixes:
@@ -290,44 +290,21 @@ source="https://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$pkgver}/gcc-${_pkg
 #     - CVE-2023-4039
 
 # we build out-of-tree
-#_gccdir="$srcdir"/gcc-${_pkgbase%%.*}-$_pkgsnap
-_gccdir="$srcdir"/gcc-${_pkgbase:-$pkgver}
-_gcclibdir="/usr/lib/gcc/$CTARGET/${_pkgbase:-$pkgver}"
-_gcclibexec="/usr/libexec/gcc/$CTARGET/${_pkgbase:-$pkgver}"
+#builddir="$srcdir"/gcc-${_pkgbase%%.*}-$_pkgsnap
+builddir="$srcdir"/gcc-$_pkgbase
+_gcclibdir="/usr/lib/gcc/$CTARGET/$_pkgbase"
+_gcclibexec="/usr/libexec/gcc/$CTARGET/$_pkgbase"
 
 prepare() {
-	cd "$_gccdir"
-
-	_err=
-	for i in $source; do
-		case "$i" in
-		*.patch)
-			msg "Applying $i"
-			patch -p1 -i "$srcdir"/$i || _err="$_err $i"
-			;;
-		esac
-	done
-
-	if [ -n "$_err" ]; then
-		error "The following patches failed:"
-		for i in $_err; do
-			echo "  $i"
-		done
-		return 1
-	fi
-
-	echo ${_pkgbase:-$pkgver} > gcc/BASE-VER
+	default_prepare
+	echo $_pkgbase > gcc/BASE-VER
 }
 
 build() {
 	local _arch_configure=
-	local _libc_configure=
 	local _bootstrap_configure=
-	local _symvers=
 	local _jit_configure=
 
-	cd "$_gccdir"
-
 	case "$CTARGET" in
 	aarch64-*-*-*)		_arch_configure="--with-arch=armv8-a --with-abi=lp64";;
 	armv5-*-*-*eabi)	_arch_configure="--with-arch=armv5te --with-tune=arm926ej-s --with-float=soft --with-abi=aapcs-linux";;
@@ -351,15 +328,7 @@ build() {
 	*)	_hash_style_configure="--with-linker-hash-style=gnu" ;;
 	esac
 
-	case "$CTARGET_LIBC" in
-	musl)
-		# musl does not support libsanitizer
-		# alpine musl provides libssp_nonshared.a, so we don't need libssp either
-		_libc_configure="--disable-libssp --disable-libsanitizer"
-		_symvers="--disable-symvers"
-		export libat_cv_have_ifunc=no
-		;;
-	esac
+	export libat_cv_have_ifunc=no
 
 
 	case "$BOOTSTRAP" in
@@ -388,10 +357,8 @@ build() {
 	echo "  CHOST=$CHOST"
 	echo "  CTARGET=$CTARGET"
 	echo "  CTARGET_ARCH=$CTARGET_ARCH"
-	echo "  CTARGET_LIBC=$CTARGET_LIBC"
 	echo "  languages=$_languages"
 	echo "  arch_configure=$_arch_configure"
-	echo "  libc_configure=$_libc_configure"
 	echo "  cross_configure=$_cross_configure"
 	echo "  bootstrap_configure=$_bootstrap_configure"
 	echo "  hash_style_configure=$_hash_style_configure"
@@ -412,7 +379,7 @@ build() {
 		--disable-multilib
 		--disable-nls
 		--disable-werror
-		$_symvers
+		--disable-symvers
 		--enable-__cxa_atexit
 		--enable-default-pie
 		--enable-default-ssp
@@ -420,7 +387,8 @@ build() {
 		--enable-link-serialization=2
 		--enable-linker-build-id
 		$_arch_configure
-		$_libc_configure
+		--disable-libssp
+		--disable-libsanitizer
 		$_cross_configure
 		$_bootstrap_configure
 		--with-bugurl=https://gitlab.alpinelinux.org/alpine/aports/-/issues
@@ -430,7 +398,7 @@ build() {
 
 	mkdir -p "$_builddir"
 	cd "$_builddir"
-	"$_gccdir"/configure $gccconfiguration \
+	"$builddir"/configure $gccconfiguration \
 		--with-pkgversion="$version"
 
 	msg "building gcc"
@@ -446,7 +414,7 @@ build() {
 	if $LANG_JIT; then
 		mkdir -p "$_builddir"/libgccjit-build
 		cd "$_builddir"/libgccjit-build
-		"$_gccdir"/configure $gccconfiguration \
+		"$builddir"/configure $gccconfiguration \
 			--disable-bootstrap \
 			--enable-host-shared \
 			--enable-languages=jit \
@@ -461,7 +429,7 @@ package() {
 	cd "$_builddir"
 	make -j1 DESTDIR="$pkgdir" install
 
-	ln -s gcc "$pkgdir"/usr/bin/cc
+	[ "$CHOST" = "$CTARGET" ] && ln -s gcc "$pkgdir"/usr/bin/cc
 	ln -s ${CTARGET}-gcc "$pkgdir"/usr/bin/${CTARGET}-cc
 
 	if $LANG_JIT; then
@@ -505,25 +473,23 @@ package() {
 
 	# move ada runtime libs
 	if $LANG_ADA; then
-		for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 -name "libgna*.so"); do
+		for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 \( -name "libgna*.so" -o -name "libgna*.a" \) ); do
 			mv "$i" "$pkgdir"/usr/lib/
 			ln -s ../../../../${i##*/} $i
 		done
-		if [ "$CHOST" = "$CTARGET" ]; then
-			for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 -name "libgna*.a"); do
-				mv "$i" "$pkgdir"/usr/lib/
-				ln -s ../../../../${i##*/} $i
-			done
-		fi
 	fi
 
 	if [ "$CHOST" != "$CTARGET" ]; then
 		# cross-gcc: remove any files that would conflict with the
 		# native gcc package
-		rm -rf "$pkgdir"/usr/bin/cc "$pkgdir"/usr/include "${pkgdir:?}"/usr/share
+		rm -rf "$pkgdir"/usr/include "${pkgdir:?}"/usr/share
 		# libcc1 does not depend on target, don't ship it
 		rm -rf "$pkgdir"/usr/lib/libcc1.so*
 
+		# These are moved into packages with arch=$CTARGET_ARCH so remove
+		# cross prefix
+		#mv "$pkgdir"/usr/$CTARGET/lib/*.so.* "$pkgdir"/usr/lib/ # FIXME
+
 		# fixup gcc library symlinks to be linker scripts so
 		# linker finds the libs from relocated sysroot
 		for so in "$pkgdir"/usr/"$CTARGET"/lib/*.so; do
@@ -572,8 +538,7 @@ libatomic() {
 	depends=
 	replaces="gcc"
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/${_target:+$CTARGET/}lib/libatomic.so.* "$subpkgdir"/usr/lib/
+	amove usr/lib/libatomic.so.*
 }
 
 libcxx() {
@@ -586,8 +551,7 @@ libcxx() {
 		nm -D "$pkgdir"/usr/lib/libstdc++.so.* | grep clock_gettime
 	fi
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/${_target:+$CTARGET/}lib/libstdc++.so.* "$subpkgdir"/usr/lib/
+	amove usr/lib/libstdc++.so.*
 }
 
 libcxx_dev() {
@@ -605,15 +569,12 @@ libcxx_dev() {
 
 gpp() {
 	pkgdesc="GNU C++ standard library and compiler"
-	depends="libstdc++=$_gccrel libstdc++-dev$_target=$_gccrel gcc$_target=$_gccrel libc-dev"
-	mkdir -p "$subpkgdir/$_gcclibexec" \
-		"$subpkgdir"/usr/bin \
-		"$subpkgdir"/usr/${_target:+$CTARGET/}include \
-		"$subpkgdir"/usr/${_target:+$CTARGET/}lib \
+	depends="libstdc++-dev$_target=$_gccrel gcc$_target=$_gccrel musl-dev"
+	depends="$depends so:libc.musl-x86_64.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libz.so.1"
+	[ "$CHOST" = "$CTARGET" ] && depends="$depends libstdc++=$_gccrel"
 
-	mv "$pkgdir/$_gcclibexec/cc1plus" "$subpkgdir/$_gcclibexec/"
-
-	mv "$pkgdir"/usr/bin/*++ "$subpkgdir"/usr/bin/
+	amove $_gcclibexec/cc1plus
+	amove usr/bin/*++
 }
 
 jit() {
@@ -632,30 +593,26 @@ libobjc() {
 	pkgdesc="GNU Objective-C runtime"
 	replaces="objc"
 	depends=
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/${_target:+$CTARGET/}lib/libobjc.so.* "$subpkgdir"/usr/lib/
+
+	amove usr/lib/libobjc.so.*
 }
 
 objc() {
 	pkgdesc="GNU Objective-C"
 	replaces="gcc"
-	depends="libc-dev gcc=$_gccrel libobjc=$_gccrel"
+	depends="musl-dev gcc=$_gccrel libobjc=$_gccrel"
 
-	mkdir -p "$subpkgdir/$_gcclibexec" \
-		"$subpkgdir"/$_gcclibdir/include \
-		"$subpkgdir"/usr/lib
-	mv "$pkgdir/$_gcclibexec/cc1obj" "$subpkgdir/$_gcclibexec/"
-	mv "$pkgdir"/$_gcclibdir/include/objc "$subpkgdir"/$_gcclibdir/include/
-	mv "$pkgdir"/usr/lib/libobjc.so "$pkgdir"/usr/lib/libobjc.a \
-		"$subpkgdir"/usr/lib/
+	amove $_gcclibexec/cc1obj
+	amove $_gcclibdir/include/objc
+	amove usr/lib/libobjc.so
+	amove usr/lib/libobjc.a
 }
 
 libgcc() {
 	pkgdesc="GNU C compiler runtime libraries"
 	depends=
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/${_target:+$CTARGET/}lib/libgcc_s.so.* "$subpkgdir"/usr/lib/
+	amove usr/lib/libgcc_s.so.*
 }
 
 libgomp() {
@@ -663,17 +620,15 @@ libgomp() {
 	depends=
 	replaces="gcc"
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/${_target:+$CTARGET/}lib/libgomp.so.* "$subpkgdir"/usr/lib/
+	amove usr/lib/libgomp.so.*
 }
 
 libgphobos() {
 	pkgdesc="D programming language standard library for GCC"
 	depends=
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libgdruntime.so.* "$subpkgdir"/usr/lib/
-	mv "$pkgdir"/usr/lib/libgphobos.so.*  "$subpkgdir"/usr/lib/
+	amove usr/lib/libgdruntime.so.*
+	amove usr/lib/libgphobos.so.*
 }
 
 gdc() {
@@ -682,42 +637,26 @@ gdc() {
 	[ "$CBUILD" = "$CTARGET" ] && depends="$depends libgphobos=$_gccrel"
 	[ "$CHOST" = "$CTARGET" ] && provides="gcc-gdc-bootstrap=$_gccrel"
 
-	mkdir -p "$subpkgdir/$_gcclibexec" \
-		"$subpkgdir"/$_gcclibdir/include/d/ \
-		"$subpkgdir"/usr/lib \
-		"$subpkgdir"/usr/bin
 	# Copy: The installed '.d' files, the static lib, the binary itself
 	# The shared libs are part of 'libgphobos' so one can run program
 	# without installing the compiler
-	mv "$pkgdir/$_gcclibexec/d21" "$subpkgdir/$_gcclibexec/"
-	mv "$pkgdir"/$_gcclibdir/include/d/* "$subpkgdir"/$_gcclibdir/include/d/
+	amove $_gcclibexec/d21
+	amove $_gcclibdir/include/d
 	if [ "$CBUILD" = "$CTARGET" ]; then
-		mv "$pkgdir"/usr/lib/libgdruntime.so "$subpkgdir"/usr/lib/
-		mv "$pkgdir"/usr/lib/libgphobos.so "$subpkgdir"/usr/lib/
+		amove usr/lib/libgdruntime.so
+		amove usr/lib/libgphobos.so
 	fi
-	if [ "$CHOST" = "$CTARGET" ]; then
-		mv "$pkgdir"/usr/lib/libgdruntime.a "$subpkgdir"/usr/lib/
-		mv "$pkgdir"/usr/lib/libgphobos.a "$subpkgdir"/usr/lib/
-		mv "$pkgdir"/usr/lib/libgphobos.spec "$subpkgdir"/usr/lib/
-		mv "$pkgdir"/usr/bin/gdc "$subpkgdir"/usr/bin/
-	else
-		mkdir -p "$subpkgdir"/usr/$CTARGET/lib/
-		mv "$pkgdir"/usr/$CTARGET/lib/libgdruntime.a \
-			"$subpkgdir"/usr/$CTARGET/lib/
-		mv "$pkgdir"/usr/$CTARGET/lib/libgphobos.a \
-			"$subpkgdir"/usr/$CTARGET/lib/
-		mv "$pkgdir"/usr/$CTARGET/lib/libgphobos.spec \
-			"$subpkgdir"/usr/$CTARGET/lib/
-	fi
-	mv "$pkgdir"/usr/bin/$CTARGET-gdc "$subpkgdir"/usr/bin/
+	amove usr/${_target:+$CTARGET/}lib/libgdruntime.a
+	amove usr/${_target:+$CTARGET/}lib/libgphobos.a
+	amove usr/${_target:+$CTARGET/}lib/libgphobos.spec
+	amove usr/bin/*gdc
 }
 
 libgo() {
 	pkgdesc="Go runtime library for GCC"
 	depends=
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libgo.so.* "$subpkgdir"/usr/lib/
+	amove usr/lib/libgo.so.*
 }
 
 go() {
@@ -725,31 +664,25 @@ go() {
 	depends="gcc=$_gccrel libgo=$_gccrel !go"
 	install="$pkgname-go.post-install"
 
-	mkdir -p "$subpkgdir"/$_gcclibexec \
-		"$subpkgdir"/usr/lib \
-		"$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/lib/go "$subpkgdir"/usr/lib/
-	mv "$pkgdir"/usr/bin/*gccgo "$subpkgdir"/usr/bin/
-	mv "$pkgdir"/usr/bin/*go "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/*gofmt "$subpkgdir"/usr/bin
-	mv "$pkgdir"/$_gcclibexec/go1 "$subpkgdir"/$_gcclibexec/
-	mv "$pkgdir"/$_gcclibexec/cgo "$subpkgdir"/$_gcclibexec/
-	mv "$pkgdir"/$_gcclibexec/buildid "$subpkgdir"/$_gcclibexec/
-	mv "$pkgdir"/$_gcclibexec/test2json "$subpkgdir"/$_gcclibexec/
-	mv "$pkgdir"/$_gcclibexec/vet "$subpkgdir"/$_gcclibexec/
-	mv "$pkgdir"/usr/lib/libgo.a \
-		"$pkgdir"/usr/lib/libgo.so \
-		"$pkgdir"/usr/lib/libgobegin.a \
-		"$pkgdir"/usr/lib/libgolibbegin.a \
-		"$subpkgdir"/usr/lib/
+	amove usr/lib/go
+	amove usr/bin/*go
+	amove usr/bin/*gofmt
+	amove $_gcclibexec/go1
+	amove $_gcclibexec/cgo
+	amove $_gcclibexec/buildid
+	amove $_gcclibexec/test2json
+	amove $_gcclibexec/vet
+	amove usr/lib/libgo.a
+	amove usr/lib/libgo.so
+	amove usr/lib/libgobegin.a
+	amove usr/lib/libgolibbegin.a
 }
 
 libgfortran() {
 	pkgdesc="Fortran runtime library for GCC"
 	depends=
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libgfortran.so.* "$subpkgdir"/usr/lib/
+	amove usr/lib/libgfortran.so.*
 }
 
 libquadmath() {
@@ -757,8 +690,7 @@ libquadmath() {
 	pkgdesc="128-bit math library for GCC"
 	depends=
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libquadmath.so.* "$subpkgdir"/usr/lib/
+	amove usr/lib/libquadmath.so.*
 }
 
 gfortran() {
@@ -767,38 +699,30 @@ gfortran() {
 	$_libquadmath && depends="$depends libquadmath=$_gccrel"
 	replaces="gcc"
 
-	mkdir -p "$subpkgdir"/$_gcclibexec \
-		"$subpkgdir"/$_gcclibdir \
-		"$subpkgdir"/usr/lib \
-		"$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/*gfortran "$subpkgdir"/usr/bin/
-	mv "$pkgdir"/usr/lib/libgfortran.a \
-		"$pkgdir"/usr/lib/libgfortran.so \
-		"$subpkgdir"/usr/lib/
+	amove usr/bin/*gfortran
+	amove usr/lib/libgfortran.a
+	amove usr/lib/libgfortran.so
 	if $_libquadmath; then
-		mv "$pkgdir"/usr/lib/libquadmath.a \
-			"$pkgdir"/usr/lib/libquadmath.so \
-			"$subpkgdir"/usr/lib/
+		amove usr/lib/libquadmath.a
+		amove usr/lib/libquadmath.so
 	fi
-	mv "$pkgdir"/$_gcclibdir/finclude "$subpkgdir"/$_gcclibdir/
-	mv "$pkgdir"/$_gcclibexec/f951 "$subpkgdir"/$_gcclibexec
-	mv "$pkgdir"/usr/lib/libgfortran.spec "$subpkgdir"/$_gcclibdir
+	amove $_gcclibdir/finclude
+	amove $_gcclibexec/f951
+	mv -v "$pkgdir"/usr/lib/libgfortran.spec "$subpkgdir"/$_gcclibdir/
 }
 
 libgnat() {
 	pkgdesc="GNU Ada runtime shared libraries"
 	depends=
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libgna*.so "$subpkgdir"/usr/lib/
+	amove usr/lib/libgna*.so
 }
 
 libgnatstatic() {
 	pkgdesc="GNU Ada static libraries"
 	depends=
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libgna*.a "$subpkgdir"/usr/lib/
+	amove usr/lib/libgna*.a
 }
 
 gnat() {
@@ -807,12 +731,9 @@ gnat() {
 	provides="$pkgname-gnat-bootstrap=$_gccrel"
 	[ "$CHOST" = "$CTARGET" ] && depends="$depends libgnat=$_gccrel"
 
-	mkdir -p "$subpkgdir"/$_gcclibexec \
-		"$subpkgdir"/$_gcclibdir \
-		"$subpkgdir"/usr/bin
-	mv "$pkgdir"/$_gcclibexec/*gnat* "$subpkgdir"/$_gcclibexec/
-	mv "$pkgdir"/$_gcclibdir/*ada* "$subpkgdir"/$_gcclibdir/
-	mv "$pkgdir"/usr/bin/*gnat* "$subpkgdir"/usr/bin/
+	amove $_gcclibexec/*gnat*
+	amove $_gcclibdir/*ada*
+	amove usr/bin/*gnat*
 }
 
 gdb() {
@@ -864,4 +785,5 @@ c4482ffc36e7894b2140800159f4cbc9a3e9011e43a69b69f4fa92d5a11e2ee645c7e21df4423dd1
 06f64544fd8bc4b6c8b06410c5198aa8fb4e82c232afc0cad83b2c69ac5d39399968206defa78297222700cd18e7fd7e8244afa76d343406a01f657c86306453  0036-libphobos-add-riscv64-and-loongarch64-support.patch
 00319c9770362520e8e93bd03fda1769dfa3622eba77d620e11d8af45a38e6d804a5e924046ae388e1cfaea605696e89c343fca507aaaa5edd58d80744fff14f  fix-arm64.patch
 815265826742400f86336f0c2d3e4edc37398dbc6505ee81107c0103c13ac0f406cff851438d2323033c6c6d0c0323765ee15b975eab8d1dd465f9e988168fb9  ppc64le-quadmath.patch
+ea55e0fa6813fc95c4ca2e87f059182edc54dc61515ebb92bf6eb31dbbd176d0fe81edcc7ea28d32f84ca37e8d48a544623d3d9bc94aa41ffc0859326a616aa2  riscv64-improve-build-time.patch
 "

cross/gcc-armhf/riscv64-improve-build-time.patch

@@ -0,0 +1,149 @@
+Patch-Source: https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=2cf89ae83225f932b226cd57ef2d083a59bcf8a3
+--
+From 2cf89ae83225f932b226cd57ef2d083a59bcf8a3 Mon Sep 17 00:00:00 2001
+From: Richard Biener <rguenther@suse.de>
+Date: Tue, 6 Aug 2024 14:56:26 +0200
+Subject: [PATCH] tree-optimization/116166 - forward jump-threading going wild
+
+Currently the forward threader isn't limited as to the search space
+it explores and with it now using path-ranger for simplifying
+conditions it runs into it became pretty slow for degenerate cases
+like compiling insn-emit.cc for RISC-V esp. when compiling for
+a host with LOGICAL_OP_NON_SHORT_CIRCUIT disabled.
+
+The following makes the forward threader honor the search space
+limit I introduced for the backward threader.  This reduces
+compile-time from minutes to seconds for the testcase in PR116166.
+
+Note this wasn't necessary before we had ranger but with ranger
+the work we do is quadatic in the length of the threading path
+we build up (the same is true for the backwards threader).
+
+	PR tree-optimization/116166
+	* tree-ssa-threadedge.h (jump_threader::thread_around_empty_blocks):
+	Add limit parameter.
+	(jump_threader::thread_through_normal_block): Likewise.
+	* tree-ssa-threadedge.cc (jump_threader::thread_around_empty_blocks):
+	Honor and decrement limit parameter.
+	(jump_threader::thread_through_normal_block): Likewise.
+	(jump_threader::thread_across_edge): Initialize limit from
+	param_max_jump_thread_paths and pass it down to workers.
+---
+ gcc/tree-ssa-threadedge.cc | 30 ++++++++++++++++++++++--------
+ gcc/tree-ssa-threadedge.h  |  4 ++--
+ 2 files changed, 24 insertions(+), 10 deletions(-)
+
+diff --git a/gcc/tree-ssa-threadedge.cc b/gcc/tree-ssa-threadedge.cc
+index 7f82639b8ecc..0aa2aa851430 100644
+--- a/gcc/tree-ssa-threadedge.cc
++++ b/gcc/tree-ssa-threadedge.cc
+@@ -786,13 +786,17 @@ propagate_threaded_block_debug_into (basic_block dest, basic_block src)
+ bool
+ jump_threader::thread_around_empty_blocks (vec<jump_thread_edge *> *path,
+ 					   edge taken_edge,
+-					   bitmap visited)
++					   bitmap visited, unsigned &limit)
+ {
+   basic_block bb = taken_edge->dest;
+   gimple_stmt_iterator gsi;
+   gimple *stmt;
+   tree cond;
+ 
++  if (limit == 0)
++    return false;
++  --limit;
++
+   /* The key property of these blocks is that they need not be duplicated
+      when threading.  Thus they cannot have visible side effects such
+      as PHI nodes.  */
+@@ -830,7 +834,8 @@ jump_threader::thread_around_empty_blocks (vec<jump_thread_edge *> *path,
+ 	      m_registry->push_edge (path, taken_edge, EDGE_NO_COPY_SRC_BLOCK);
+ 	      m_state->append_path (taken_edge->dest);
+ 	      bitmap_set_bit (visited, taken_edge->dest->index);
+-	      return thread_around_empty_blocks (path, taken_edge, visited);
++	      return thread_around_empty_blocks (path, taken_edge, visited,
++						 limit);
+ 	    }
+ 	}
+ 
+@@ -872,7 +877,7 @@ jump_threader::thread_around_empty_blocks (vec<jump_thread_edge *> *path,
+       m_registry->push_edge (path, taken_edge, EDGE_NO_COPY_SRC_BLOCK);
+       m_state->append_path (taken_edge->dest);
+ 
+-      thread_around_empty_blocks (path, taken_edge, visited);
++      thread_around_empty_blocks (path, taken_edge, visited, limit);
+       return true;
+     }
+ 
+@@ -899,8 +904,13 @@ jump_threader::thread_around_empty_blocks (vec<jump_thread_edge *> *path,
+ 
+ int
+ jump_threader::thread_through_normal_block (vec<jump_thread_edge *> *path,
+-					    edge e, bitmap visited)
++					    edge e, bitmap visited,
++					    unsigned &limit)
+ {
++  if (limit == 0)
++    return 0;
++  limit--;
++
+   m_state->register_equivs_edge (e);
+ 
+   /* PHIs create temporary equivalences.
+@@ -989,7 +999,7 @@ jump_threader::thread_through_normal_block (vec<jump_thread_edge *> *path,
+  	     visited.  This may be overly conservative.  */
+ 	  bitmap_set_bit (visited, dest->index);
+ 	  bitmap_set_bit (visited, e->dest->index);
+-	  thread_around_empty_blocks (path, taken_edge, visited);
++	  thread_around_empty_blocks (path, taken_edge, visited, limit);
+ 	  return 1;
+ 	}
+     }
+@@ -1075,9 +1085,12 @@ jump_threader::thread_across_edge (edge e)
+   bitmap_set_bit (visited, e->src->index);
+   bitmap_set_bit (visited, e->dest->index);
+ 
++  /* Limit search space.  */
++  unsigned limit = param_max_jump_thread_paths;
++
+   int threaded = 0;
+   if ((e->flags & EDGE_DFS_BACK) == 0)
+-    threaded = thread_through_normal_block (path, e, visited);
++    threaded = thread_through_normal_block (path, e, visited, limit);
+ 
+   if (threaded > 0)
+     {
+@@ -1148,11 +1161,12 @@ jump_threader::thread_across_edge (edge e)
+ 	m_registry->push_edge (path, e, EDGE_START_JUMP_THREAD);
+ 	m_registry->push_edge (path, taken_edge, EDGE_COPY_SRC_JOINER_BLOCK);
+ 
+-	found = thread_around_empty_blocks (path, taken_edge, visited);
++	found = thread_around_empty_blocks (path, taken_edge, visited, limit);
+ 
+ 	if (!found)
+ 	  found = thread_through_normal_block (path,
+-					       path->last ()->e, visited) > 0;
++					       path->last ()->e, visited,
++					       limit) > 0;
+ 
+ 	/* If we were able to thread through a successor of E->dest, then
+ 	   record the jump threading opportunity.  */
+diff --git a/gcc/tree-ssa-threadedge.h b/gcc/tree-ssa-threadedge.h
+index 9f6cbfe93307..245b3506a550 100644
+--- a/gcc/tree-ssa-threadedge.h
++++ b/gcc/tree-ssa-threadedge.h
+@@ -101,9 +101,9 @@ private:
+ 					  unsigned limit);
+ 
+   bool thread_around_empty_blocks (vec<class jump_thread_edge *> *path,
+-				   edge, bitmap visited);
++				   edge, bitmap visited, unsigned &limit);
+   int thread_through_normal_block (vec<jump_thread_edge *> *path,
+-				   edge, bitmap visited);
++				   edge, bitmap visited, unsigned &limit);
+   void thread_across_edge (edge);
+   bool record_temporary_equivalences_from_phis (edge);
+   gimple *record_temporary_equivalences_from_stmts_at_dest (edge);
+-- 
+2.43.5
+

cross/gcc-armv7/APKBUILD

@@ -34,7 +34,7 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname=gcc-armv7
-pkgrel=3
+pkgrel=4
 pkgdesc="Stage2 cross-compiler for armv7"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -44,9 +44,10 @@ depends="binutils-armv7 mpc1"
 makedepends_build="gcc g++ bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev"
 makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-dev-armv7 binutils-armv7"
 subpackages="g++-armv7:gpp libstdc++-dev-armv7:libcxx_dev"
-[ "$CHOST" = "$CTARGET" ] && subpackages="gcc-gdb gcc-doc$_target"
+[ "$CHOST" = "$CTARGET" ] && subpackages="gcc-gdb gcc-doc"
 replaces="libstdc++ binutils"
-options="!strip"
+options="!strip !tracedeps"
+depends="$depends so:libc.musl-x86_64.so.1 so:libgcc_s.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libstdc++.so.6 so:libz.so.1"
 
 : "${LANG_CXX:=true}"
 : "${LANG_D:=true}"
@@ -135,7 +136,6 @@ else
 	export CXXFLAGS_FOR_TARGET="$CXXFLAGS"
 	export LDFLAGS_FOR_TARGET="$LDFLAGS"
 	export BOOT_CFLAGS="$CFLAGS"
-	export BOOT_CXXFLAGS="$CXXFLAGS"
 	export BOOT_LDFLAGS="$LDFLAGS"
 fi
 
@@ -170,7 +170,7 @@ esac
 # currently on x86, x86_64 and ia64
 _libquadmath=$LANG_FORTRAN
 case "$CTARGET_ARCH" in
-x86 | x86_64 | ppc64le)	_libquadmath=$LANG_FORTRAN ;;
+x86 | x86_64 | ppc64le) ;;
 *)		_libquadmath=false ;;
 esac
 
@@ -218,13 +218,12 @@ if $LANG_FORTRAN; then
 	_languages="$_languages,fortran"
 fi
 if $LANG_ADA; then
-	subpackages="$subpackages gcc-gnat$_target:gnat"
+	subpackages="$subpackages gcc-gnat$_target:gnat libgnat::$CTARGET_ARCH"
 	_languages="$_languages,ada"
 	if [ "$CBUILD" = "$CTARGET" ]; then
 		makedepends_build="$makedepends_build gcc-gnat-bootstrap"
-		subpackages="$subpackages libgnat-static:libgnatstatic:$CTARGET_ARCH libgnat::$CTARGET_ARCH"
+		subpackages="$subpackages libgnat-static:libgnatstatic:$CTARGET_ARCH"
 	else
-		subpackages="$subpackages libgnat::$CTARGET_ARCH"
 		makedepends_build="$makedepends_build gcc-gnat gcc-gnat$_cross"
 	fi
 fi
@@ -234,7 +233,7 @@ fi
 makedepends="$makedepends_build $makedepends_host"
 
 # when using upstream releases, use this URI template
-# https://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$pkgver}/gcc-${_pkgbase:-$pkgver}.tar.xz
+# https://gcc.gnu.org/pub/gcc/releases/gcc-$_pkgbase/gcc-$_pkgbase.tar.xz
 #
 # right now, we are using a git snapshot. snapshots are taken from gcc.gnu.org/pub/gcc/snapshots.
 # However, since they are periodically deleted from the GCC mirrors the utilized snapshots are
@@ -244,7 +243,7 @@ makedepends="$makedepends_build $makedepends_host"
 # PLEASE submit all patches to gcc to https://gitlab.alpinelinux.org/kaniini/alpine-gcc-patches,
 # so that they can be properly tracked and easily rebased if needed.
 #source="https://dev.alpinelinux.org/archive/gcc/${_pkgbase%%.*}-$_pkgsnap/gcc-${_pkgbase%%.*}-$_pkgsnap.tar.xz
-source="https://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$pkgver}/gcc-${_pkgbase:-$pkgver}.tar.xz
+source="https://gcc.gnu.org/pub/gcc/releases/gcc-$_pkgbase/gcc-$_pkgbase.tar.xz
 	0001-posix_memalign.patch
 	0002-gcc-poison-system-directories.patch
 	0003-specs-turn-on-Wl-z-now-by-default.patch
@@ -283,6 +282,7 @@ source="https://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$pkgver}/gcc-${_pkg
 	0036-libphobos-add-riscv64-and-loongarch64-support.patch
 	fix-arm64.patch
 	ppc64le-quadmath.patch
+	riscv64-improve-build-time.patch
 	"
 
 # secfixes:
@@ -290,44 +290,21 @@ source="https://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$pkgver}/gcc-${_pkg
 #     - CVE-2023-4039
 
 # we build out-of-tree
-#_gccdir="$srcdir"/gcc-${_pkgbase%%.*}-$_pkgsnap
-_gccdir="$srcdir"/gcc-${_pkgbase:-$pkgver}
-_gcclibdir="/usr/lib/gcc/$CTARGET/${_pkgbase:-$pkgver}"
-_gcclibexec="/usr/libexec/gcc/$CTARGET/${_pkgbase:-$pkgver}"
+#builddir="$srcdir"/gcc-${_pkgbase%%.*}-$_pkgsnap
+builddir="$srcdir"/gcc-$_pkgbase
+_gcclibdir="/usr/lib/gcc/$CTARGET/$_pkgbase"
+_gcclibexec="/usr/libexec/gcc/$CTARGET/$_pkgbase"
 
 prepare() {
-	cd "$_gccdir"
-
-	_err=
-	for i in $source; do
-		case "$i" in
-		*.patch)
-			msg "Applying $i"
-			patch -p1 -i "$srcdir"/$i || _err="$_err $i"
-			;;
-		esac
-	done
-
-	if [ -n "$_err" ]; then
-		error "The following patches failed:"
-		for i in $_err; do
-			echo "  $i"
-		done
-		return 1
-	fi
-
-	echo ${_pkgbase:-$pkgver} > gcc/BASE-VER
+	default_prepare
+	echo $_pkgbase > gcc/BASE-VER
 }
 
 build() {
 	local _arch_configure=
-	local _libc_configure=
 	local _bootstrap_configure=
-	local _symvers=
 	local _jit_configure=
 
-	cd "$_gccdir"
-
 	case "$CTARGET" in
 	aarch64-*-*-*)		_arch_configure="--with-arch=armv8-a --with-abi=lp64";;
 	armv5-*-*-*eabi)	_arch_configure="--with-arch=armv5te --with-tune=arm926ej-s --with-float=soft --with-abi=aapcs-linux";;
@@ -351,15 +328,7 @@ build() {
 	*)	_hash_style_configure="--with-linker-hash-style=gnu" ;;
 	esac
 
-	case "$CTARGET_LIBC" in
-	musl)
-		# musl does not support libsanitizer
-		# alpine musl provides libssp_nonshared.a, so we don't need libssp either
-		_libc_configure="--disable-libssp --disable-libsanitizer"
-		_symvers="--disable-symvers"
-		export libat_cv_have_ifunc=no
-		;;
-	esac
+	export libat_cv_have_ifunc=no
 
 
 	case "$BOOTSTRAP" in
@@ -388,10 +357,8 @@ build() {
 	echo "  CHOST=$CHOST"
 	echo "  CTARGET=$CTARGET"
 	echo "  CTARGET_ARCH=$CTARGET_ARCH"
-	echo "  CTARGET_LIBC=$CTARGET_LIBC"
 	echo "  languages=$_languages"
 	echo "  arch_configure=$_arch_configure"
-	echo "  libc_configure=$_libc_configure"
 	echo "  cross_configure=$_cross_configure"
 	echo "  bootstrap_configure=$_bootstrap_configure"
 	echo "  hash_style_configure=$_hash_style_configure"
@@ -412,7 +379,7 @@ build() {
 		--disable-multilib
 		--disable-nls
 		--disable-werror
-		$_symvers
+		--disable-symvers
 		--enable-__cxa_atexit
 		--enable-default-pie
 		--enable-default-ssp
@@ -420,7 +387,8 @@ build() {
 		--enable-link-serialization=2
 		--enable-linker-build-id
 		$_arch_configure
-		$_libc_configure
+		--disable-libssp
+		--disable-libsanitizer
 		$_cross_configure
 		$_bootstrap_configure
 		--with-bugurl=https://gitlab.alpinelinux.org/alpine/aports/-/issues
@@ -430,7 +398,7 @@ build() {
 
 	mkdir -p "$_builddir"
 	cd "$_builddir"
-	"$_gccdir"/configure $gccconfiguration \
+	"$builddir"/configure $gccconfiguration \
 		--with-pkgversion="$version"
 
 	msg "building gcc"
@@ -446,7 +414,7 @@ build() {
 	if $LANG_JIT; then
 		mkdir -p "$_builddir"/libgccjit-build
 		cd "$_builddir"/libgccjit-build
-		"$_gccdir"/configure $gccconfiguration \
+		"$builddir"/configure $gccconfiguration \
 			--disable-bootstrap \
 			--enable-host-shared \
 			--enable-languages=jit \
@@ -461,7 +429,7 @@ package() {
 	cd "$_builddir"
 	make -j1 DESTDIR="$pkgdir" install
 
-	ln -s gcc "$pkgdir"/usr/bin/cc
+	[ "$CHOST" = "$CTARGET" ] && ln -s gcc "$pkgdir"/usr/bin/cc
 	ln -s ${CTARGET}-gcc "$pkgdir"/usr/bin/${CTARGET}-cc
 
 	if $LANG_JIT; then
@@ -505,25 +473,23 @@ package() {
 
 	# move ada runtime libs
 	if $LANG_ADA; then
-		for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 -name "libgna*.so"); do
+		for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 \( -name "libgna*.so" -o -name "libgna*.a" \) ); do
 			mv "$i" "$pkgdir"/usr/lib/
 			ln -s ../../../../${i##*/} $i
 		done
-		if [ "$CHOST" = "$CTARGET" ]; then
-			for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 -name "libgna*.a"); do
-				mv "$i" "$pkgdir"/usr/lib/
-				ln -s ../../../../${i##*/} $i
-			done
-		fi
 	fi
 
 	if [ "$CHOST" != "$CTARGET" ]; then
 		# cross-gcc: remove any files that would conflict with the
 		# native gcc package
-		rm -rf "$pkgdir"/usr/bin/cc "$pkgdir"/usr/include "${pkgdir:?}"/usr/share
+		rm -rf "$pkgdir"/usr/include "${pkgdir:?}"/usr/share
 		# libcc1 does not depend on target, don't ship it
 		rm -rf "$pkgdir"/usr/lib/libcc1.so*
 
+		# These are moved into packages with arch=$CTARGET_ARCH so remove
+		# cross prefix
+		#mv "$pkgdir"/usr/$CTARGET/lib/*.so.* "$pkgdir"/usr/lib/ # FIXME
+
 		# fixup gcc library symlinks to be linker scripts so
 		# linker finds the libs from relocated sysroot
 		for so in "$pkgdir"/usr/"$CTARGET"/lib/*.so; do
@@ -572,8 +538,7 @@ libatomic() {
 	depends=
 	replaces="gcc"
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/${_target:+$CTARGET/}lib/libatomic.so.* "$subpkgdir"/usr/lib/
+	amove usr/lib/libatomic.so.*
 }
 
 libcxx() {
@@ -586,8 +551,7 @@ libcxx() {
 		nm -D "$pkgdir"/usr/lib/libstdc++.so.* | grep clock_gettime
 	fi
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/${_target:+$CTARGET/}lib/libstdc++.so.* "$subpkgdir"/usr/lib/
+	amove usr/lib/libstdc++.so.*
 }
 
 libcxx_dev() {
@@ -605,15 +569,12 @@ libcxx_dev() {
 
 gpp() {
 	pkgdesc="GNU C++ standard library and compiler"
-	depends="libstdc++=$_gccrel libstdc++-dev$_target=$_gccrel gcc$_target=$_gccrel libc-dev"
-	mkdir -p "$subpkgdir/$_gcclibexec" \
-		"$subpkgdir"/usr/bin \
-		"$subpkgdir"/usr/${_target:+$CTARGET/}include \
-		"$subpkgdir"/usr/${_target:+$CTARGET/}lib \
+	depends="libstdc++-dev$_target=$_gccrel gcc$_target=$_gccrel musl-dev"
+	depends="$depends so:libc.musl-x86_64.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libz.so.1"
+	[ "$CHOST" = "$CTARGET" ] && depends="$depends libstdc++=$_gccrel"
 
-	mv "$pkgdir/$_gcclibexec/cc1plus" "$subpkgdir/$_gcclibexec/"
-
-	mv "$pkgdir"/usr/bin/*++ "$subpkgdir"/usr/bin/
+	amove $_gcclibexec/cc1plus
+	amove usr/bin/*++
 }
 
 jit() {
@@ -632,30 +593,26 @@ libobjc() {
 	pkgdesc="GNU Objective-C runtime"
 	replaces="objc"
 	depends=
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/${_target:+$CTARGET/}lib/libobjc.so.* "$subpkgdir"/usr/lib/
+
+	amove usr/lib/libobjc.so.*
 }
 
 objc() {
 	pkgdesc="GNU Objective-C"
 	replaces="gcc"
-	depends="libc-dev gcc=$_gccrel libobjc=$_gccrel"
+	depends="musl-dev gcc=$_gccrel libobjc=$_gccrel"
 
-	mkdir -p "$subpkgdir/$_gcclibexec" \
-		"$subpkgdir"/$_gcclibdir/include \
-		"$subpkgdir"/usr/lib
-	mv "$pkgdir/$_gcclibexec/cc1obj" "$subpkgdir/$_gcclibexec/"
-	mv "$pkgdir"/$_gcclibdir/include/objc "$subpkgdir"/$_gcclibdir/include/
-	mv "$pkgdir"/usr/lib/libobjc.so "$pkgdir"/usr/lib/libobjc.a \
-		"$subpkgdir"/usr/lib/
+	amove $_gcclibexec/cc1obj
+	amove $_gcclibdir/include/objc
+	amove usr/lib/libobjc.so
+	amove usr/lib/libobjc.a
 }
 
 libgcc() {
 	pkgdesc="GNU C compiler runtime libraries"
 	depends=
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/${_target:+$CTARGET/}lib/libgcc_s.so.* "$subpkgdir"/usr/lib/
+	amove usr/lib/libgcc_s.so.*
 }
 
 libgomp() {
@@ -663,17 +620,15 @@ libgomp() {
 	depends=
 	replaces="gcc"
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/${_target:+$CTARGET/}lib/libgomp.so.* "$subpkgdir"/usr/lib/
+	amove usr/lib/libgomp.so.*
 }
 
 libgphobos() {
 	pkgdesc="D programming language standard library for GCC"
 	depends=
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libgdruntime.so.* "$subpkgdir"/usr/lib/
-	mv "$pkgdir"/usr/lib/libgphobos.so.*  "$subpkgdir"/usr/lib/
+	amove usr/lib/libgdruntime.so.*
+	amove usr/lib/libgphobos.so.*
 }
 
 gdc() {
@@ -682,42 +637,26 @@ gdc() {
 	[ "$CBUILD" = "$CTARGET" ] && depends="$depends libgphobos=$_gccrel"
 	[ "$CHOST" = "$CTARGET" ] && provides="gcc-gdc-bootstrap=$_gccrel"
 
-	mkdir -p "$subpkgdir/$_gcclibexec" \
-		"$subpkgdir"/$_gcclibdir/include/d/ \
-		"$subpkgdir"/usr/lib \
-		"$subpkgdir"/usr/bin
 	# Copy: The installed '.d' files, the static lib, the binary itself
 	# The shared libs are part of 'libgphobos' so one can run program
 	# without installing the compiler
-	mv "$pkgdir/$_gcclibexec/d21" "$subpkgdir/$_gcclibexec/"
-	mv "$pkgdir"/$_gcclibdir/include/d/* "$subpkgdir"/$_gcclibdir/include/d/
+	amove $_gcclibexec/d21
+	amove $_gcclibdir/include/d
 	if [ "$CBUILD" = "$CTARGET" ]; then
-		mv "$pkgdir"/usr/lib/libgdruntime.so "$subpkgdir"/usr/lib/
-		mv "$pkgdir"/usr/lib/libgphobos.so "$subpkgdir"/usr/lib/
+		amove usr/lib/libgdruntime.so
+		amove usr/lib/libgphobos.so
 	fi
-	if [ "$CHOST" = "$CTARGET" ]; then
-		mv "$pkgdir"/usr/lib/libgdruntime.a "$subpkgdir"/usr/lib/
-		mv "$pkgdir"/usr/lib/libgphobos.a "$subpkgdir"/usr/lib/
-		mv "$pkgdir"/usr/lib/libgphobos.spec "$subpkgdir"/usr/lib/
-		mv "$pkgdir"/usr/bin/gdc "$subpkgdir"/usr/bin/
-	else
-		mkdir -p "$subpkgdir"/usr/$CTARGET/lib/
-		mv "$pkgdir"/usr/$CTARGET/lib/libgdruntime.a \
-			"$subpkgdir"/usr/$CTARGET/lib/
-		mv "$pkgdir"/usr/$CTARGET/lib/libgphobos.a \
-			"$subpkgdir"/usr/$CTARGET/lib/
-		mv "$pkgdir"/usr/$CTARGET/lib/libgphobos.spec \
-			"$subpkgdir"/usr/$CTARGET/lib/
-	fi
-	mv "$pkgdir"/usr/bin/$CTARGET-gdc "$subpkgdir"/usr/bin/
+	amove usr/${_target:+$CTARGET/}lib/libgdruntime.a
+	amove usr/${_target:+$CTARGET/}lib/libgphobos.a
+	amove usr/${_target:+$CTARGET/}lib/libgphobos.spec
+	amove usr/bin/*gdc
 }
 
 libgo() {
 	pkgdesc="Go runtime library for GCC"
 	depends=
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libgo.so.* "$subpkgdir"/usr/lib/
+	amove usr/lib/libgo.so.*
 }
 
 go() {
@@ -725,31 +664,25 @@ go() {
 	depends="gcc=$_gccrel libgo=$_gccrel !go"
 	install="$pkgname-go.post-install"
 
-	mkdir -p "$subpkgdir"/$_gcclibexec \
-		"$subpkgdir"/usr/lib \
-		"$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/lib/go "$subpkgdir"/usr/lib/
-	mv "$pkgdir"/usr/bin/*gccgo "$subpkgdir"/usr/bin/
-	mv "$pkgdir"/usr/bin/*go "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/*gofmt "$subpkgdir"/usr/bin
-	mv "$pkgdir"/$_gcclibexec/go1 "$subpkgdir"/$_gcclibexec/
-	mv "$pkgdir"/$_gcclibexec/cgo "$subpkgdir"/$_gcclibexec/
-	mv "$pkgdir"/$_gcclibexec/buildid "$subpkgdir"/$_gcclibexec/
-	mv "$pkgdir"/$_gcclibexec/test2json "$subpkgdir"/$_gcclibexec/
-	mv "$pkgdir"/$_gcclibexec/vet "$subpkgdir"/$_gcclibexec/
-	mv "$pkgdir"/usr/lib/libgo.a \
-		"$pkgdir"/usr/lib/libgo.so \
-		"$pkgdir"/usr/lib/libgobegin.a \
-		"$pkgdir"/usr/lib/libgolibbegin.a \
-		"$subpkgdir"/usr/lib/
+	amove usr/lib/go
+	amove usr/bin/*go
+	amove usr/bin/*gofmt
+	amove $_gcclibexec/go1
+	amove $_gcclibexec/cgo
+	amove $_gcclibexec/buildid
+	amove $_gcclibexec/test2json
+	amove $_gcclibexec/vet
+	amove usr/lib/libgo.a
+	amove usr/lib/libgo.so
+	amove usr/lib/libgobegin.a
+	amove usr/lib/libgolibbegin.a
 }
 
 libgfortran() {
 	pkgdesc="Fortran runtime library for GCC"
 	depends=
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libgfortran.so.* "$subpkgdir"/usr/lib/
+	amove usr/lib/libgfortran.so.*
 }
 
 libquadmath() {
@@ -757,8 +690,7 @@ libquadmath() {
 	pkgdesc="128-bit math library for GCC"
 	depends=
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libquadmath.so.* "$subpkgdir"/usr/lib/
+	amove usr/lib/libquadmath.so.*
 }
 
 gfortran() {
@@ -767,38 +699,30 @@ gfortran() {
 	$_libquadmath && depends="$depends libquadmath=$_gccrel"
 	replaces="gcc"
 
-	mkdir -p "$subpkgdir"/$_gcclibexec \
-		"$subpkgdir"/$_gcclibdir \
-		"$subpkgdir"/usr/lib \
-		"$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/*gfortran "$subpkgdir"/usr/bin/
-	mv "$pkgdir"/usr/lib/libgfortran.a \
-		"$pkgdir"/usr/lib/libgfortran.so \
-		"$subpkgdir"/usr/lib/
+	amove usr/bin/*gfortran
+	amove usr/lib/libgfortran.a
+	amove usr/lib/libgfortran.so
 	if $_libquadmath; then
-		mv "$pkgdir"/usr/lib/libquadmath.a \
-			"$pkgdir"/usr/lib/libquadmath.so \
-			"$subpkgdir"/usr/lib/
+		amove usr/lib/libquadmath.a
+		amove usr/lib/libquadmath.so
 	fi
-	mv "$pkgdir"/$_gcclibdir/finclude "$subpkgdir"/$_gcclibdir/
-	mv "$pkgdir"/$_gcclibexec/f951 "$subpkgdir"/$_gcclibexec
-	mv "$pkgdir"/usr/lib/libgfortran.spec "$subpkgdir"/$_gcclibdir
+	amove $_gcclibdir/finclude
+	amove $_gcclibexec/f951
+	mv -v "$pkgdir"/usr/lib/libgfortran.spec "$subpkgdir"/$_gcclibdir/
 }
 
 libgnat() {
 	pkgdesc="GNU Ada runtime shared libraries"
 	depends=
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libgna*.so "$subpkgdir"/usr/lib/
+	amove usr/lib/libgna*.so
 }
 
 libgnatstatic() {
 	pkgdesc="GNU Ada static libraries"
 	depends=
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libgna*.a "$subpkgdir"/usr/lib/
+	amove usr/lib/libgna*.a
 }
 
 gnat() {
@@ -807,12 +731,9 @@ gnat() {
 	provides="$pkgname-gnat-bootstrap=$_gccrel"
 	[ "$CHOST" = "$CTARGET" ] && depends="$depends libgnat=$_gccrel"
 
-	mkdir -p "$subpkgdir"/$_gcclibexec \
-		"$subpkgdir"/$_gcclibdir \
-		"$subpkgdir"/usr/bin
-	mv "$pkgdir"/$_gcclibexec/*gnat* "$subpkgdir"/$_gcclibexec/
-	mv "$pkgdir"/$_gcclibdir/*ada* "$subpkgdir"/$_gcclibdir/
-	mv "$pkgdir"/usr/bin/*gnat* "$subpkgdir"/usr/bin/
+	amove $_gcclibexec/*gnat*
+	amove $_gcclibdir/*ada*
+	amove usr/bin/*gnat*
 }
 
 gdb() {
@@ -864,4 +785,5 @@ c4482ffc36e7894b2140800159f4cbc9a3e9011e43a69b69f4fa92d5a11e2ee645c7e21df4423dd1
 06f64544fd8bc4b6c8b06410c5198aa8fb4e82c232afc0cad83b2c69ac5d39399968206defa78297222700cd18e7fd7e8244afa76d343406a01f657c86306453  0036-libphobos-add-riscv64-and-loongarch64-support.patch
 00319c9770362520e8e93bd03fda1769dfa3622eba77d620e11d8af45a38e6d804a5e924046ae388e1cfaea605696e89c343fca507aaaa5edd58d80744fff14f  fix-arm64.patch
 815265826742400f86336f0c2d3e4edc37398dbc6505ee81107c0103c13ac0f406cff851438d2323033c6c6d0c0323765ee15b975eab8d1dd465f9e988168fb9  ppc64le-quadmath.patch
+ea55e0fa6813fc95c4ca2e87f059182edc54dc61515ebb92bf6eb31dbbd176d0fe81edcc7ea28d32f84ca37e8d48a544623d3d9bc94aa41ffc0859326a616aa2  riscv64-improve-build-time.patch
 "

cross/gcc-armv7/riscv64-improve-build-time.patch

@@ -0,0 +1,149 @@
+Patch-Source: https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=2cf89ae83225f932b226cd57ef2d083a59bcf8a3
+--
+From 2cf89ae83225f932b226cd57ef2d083a59bcf8a3 Mon Sep 17 00:00:00 2001
+From: Richard Biener <rguenther@suse.de>
+Date: Tue, 6 Aug 2024 14:56:26 +0200
+Subject: [PATCH] tree-optimization/116166 - forward jump-threading going wild
+
+Currently the forward threader isn't limited as to the search space
+it explores and with it now using path-ranger for simplifying
+conditions it runs into it became pretty slow for degenerate cases
+like compiling insn-emit.cc for RISC-V esp. when compiling for
+a host with LOGICAL_OP_NON_SHORT_CIRCUIT disabled.
+
+The following makes the forward threader honor the search space
+limit I introduced for the backward threader.  This reduces
+compile-time from minutes to seconds for the testcase in PR116166.
+
+Note this wasn't necessary before we had ranger but with ranger
+the work we do is quadatic in the length of the threading path
+we build up (the same is true for the backwards threader).
+
+	PR tree-optimization/116166
+	* tree-ssa-threadedge.h (jump_threader::thread_around_empty_blocks):
+	Add limit parameter.
+	(jump_threader::thread_through_normal_block): Likewise.
+	* tree-ssa-threadedge.cc (jump_threader::thread_around_empty_blocks):
+	Honor and decrement limit parameter.
+	(jump_threader::thread_through_normal_block): Likewise.
+	(jump_threader::thread_across_edge): Initialize limit from
+	param_max_jump_thread_paths and pass it down to workers.
+---
+ gcc/tree-ssa-threadedge.cc | 30 ++++++++++++++++++++++--------
+ gcc/tree-ssa-threadedge.h  |  4 ++--
+ 2 files changed, 24 insertions(+), 10 deletions(-)
+
+diff --git a/gcc/tree-ssa-threadedge.cc b/gcc/tree-ssa-threadedge.cc
+index 7f82639b8ecc..0aa2aa851430 100644
+--- a/gcc/tree-ssa-threadedge.cc
++++ b/gcc/tree-ssa-threadedge.cc
+@@ -786,13 +786,17 @@ propagate_threaded_block_debug_into (basic_block dest, basic_block src)
+ bool
+ jump_threader::thread_around_empty_blocks (vec<jump_thread_edge *> *path,
+ 					   edge taken_edge,
+-					   bitmap visited)
++					   bitmap visited, unsigned &limit)
+ {
+   basic_block bb = taken_edge->dest;
+   gimple_stmt_iterator gsi;
+   gimple *stmt;
+   tree cond;
+ 
++  if (limit == 0)
++    return false;
++  --limit;
++
+   /* The key property of these blocks is that they need not be duplicated
+      when threading.  Thus they cannot have visible side effects such
+      as PHI nodes.  */
+@@ -830,7 +834,8 @@ jump_threader::thread_around_empty_blocks (vec<jump_thread_edge *> *path,
+ 	      m_registry->push_edge (path, taken_edge, EDGE_NO_COPY_SRC_BLOCK);
+ 	      m_state->append_path (taken_edge->dest);
+ 	      bitmap_set_bit (visited, taken_edge->dest->index);
+-	      return thread_around_empty_blocks (path, taken_edge, visited);
++	      return thread_around_empty_blocks (path, taken_edge, visited,
++						 limit);
+ 	    }
+ 	}
+ 
+@@ -872,7 +877,7 @@ jump_threader::thread_around_empty_blocks (vec<jump_thread_edge *> *path,
+       m_registry->push_edge (path, taken_edge, EDGE_NO_COPY_SRC_BLOCK);
+       m_state->append_path (taken_edge->dest);
+ 
+-      thread_around_empty_blocks (path, taken_edge, visited);
++      thread_around_empty_blocks (path, taken_edge, visited, limit);
+       return true;
+     }
+ 
+@@ -899,8 +904,13 @@ jump_threader::thread_around_empty_blocks (vec<jump_thread_edge *> *path,
+ 
+ int
+ jump_threader::thread_through_normal_block (vec<jump_thread_edge *> *path,
+-					    edge e, bitmap visited)
++					    edge e, bitmap visited,
++					    unsigned &limit)
+ {
++  if (limit == 0)
++    return 0;
++  limit--;
++
+   m_state->register_equivs_edge (e);
+ 
+   /* PHIs create temporary equivalences.
+@@ -989,7 +999,7 @@ jump_threader::thread_through_normal_block (vec<jump_thread_edge *> *path,
+  	     visited.  This may be overly conservative.  */
+ 	  bitmap_set_bit (visited, dest->index);
+ 	  bitmap_set_bit (visited, e->dest->index);
+-	  thread_around_empty_blocks (path, taken_edge, visited);
++	  thread_around_empty_blocks (path, taken_edge, visited, limit);
+ 	  return 1;
+ 	}
+     }
+@@ -1075,9 +1085,12 @@ jump_threader::thread_across_edge (edge e)
+   bitmap_set_bit (visited, e->src->index);
+   bitmap_set_bit (visited, e->dest->index);
+ 
++  /* Limit search space.  */
++  unsigned limit = param_max_jump_thread_paths;
++
+   int threaded = 0;
+   if ((e->flags & EDGE_DFS_BACK) == 0)
+-    threaded = thread_through_normal_block (path, e, visited);
++    threaded = thread_through_normal_block (path, e, visited, limit);
+ 
+   if (threaded > 0)
+     {
+@@ -1148,11 +1161,12 @@ jump_threader::thread_across_edge (edge e)
+ 	m_registry->push_edge (path, e, EDGE_START_JUMP_THREAD);
+ 	m_registry->push_edge (path, taken_edge, EDGE_COPY_SRC_JOINER_BLOCK);
+ 
+-	found = thread_around_empty_blocks (path, taken_edge, visited);
++	found = thread_around_empty_blocks (path, taken_edge, visited, limit);
+ 
+ 	if (!found)
+ 	  found = thread_through_normal_block (path,
+-					       path->last ()->e, visited) > 0;
++					       path->last ()->e, visited,
++					       limit) > 0;
+ 
+ 	/* If we were able to thread through a successor of E->dest, then
+ 	   record the jump threading opportunity.  */
+diff --git a/gcc/tree-ssa-threadedge.h b/gcc/tree-ssa-threadedge.h
+index 9f6cbfe93307..245b3506a550 100644
+--- a/gcc/tree-ssa-threadedge.h
++++ b/gcc/tree-ssa-threadedge.h
+@@ -101,9 +101,9 @@ private:
+ 					  unsigned limit);
+ 
+   bool thread_around_empty_blocks (vec<class jump_thread_edge *> *path,
+-				   edge, bitmap visited);
++				   edge, bitmap visited, unsigned &limit);
+   int thread_through_normal_block (vec<jump_thread_edge *> *path,
+-				   edge, bitmap visited);
++				   edge, bitmap visited, unsigned &limit);
+   void thread_across_edge (edge);
+   bool record_temporary_equivalences_from_phis (edge);
+   gimple *record_temporary_equivalences_from_stmts_at_dest (edge);
+-- 
+2.43.5
+

cross/gcc-riscv64/APKBUILD

@@ -34,7 +34,7 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname=gcc-riscv64
-pkgrel=3
+pkgrel=4
 pkgdesc="Stage2 cross-compiler for riscv64"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -44,9 +44,10 @@ depends="binutils-riscv64 mpc1"
 makedepends_build="gcc g++ bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev"
 makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-dev-riscv64 binutils-riscv64"
 subpackages="g++-riscv64:gpp libstdc++-dev-riscv64:libcxx_dev"
-[ "$CHOST" = "$CTARGET" ] && subpackages="gcc-gdb gcc-doc$_target"
+[ "$CHOST" = "$CTARGET" ] && subpackages="gcc-gdb gcc-doc"
 replaces="libstdc++ binutils"
-options="!strip"
+options="!strip !tracedeps"
+depends="$depends so:libc.musl-x86_64.so.1 so:libgcc_s.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libstdc++.so.6 so:libz.so.1"
 
 : "${LANG_CXX:=true}"
 : "${LANG_D:=true}"
@@ -135,7 +136,6 @@ else
 	export CXXFLAGS_FOR_TARGET="$CXXFLAGS"
 	export LDFLAGS_FOR_TARGET="$LDFLAGS"
 	export BOOT_CFLAGS="$CFLAGS"
-	export BOOT_CXXFLAGS="$CXXFLAGS"
 	export BOOT_LDFLAGS="$LDFLAGS"
 fi
 
@@ -170,7 +170,7 @@ esac
 # currently on x86, x86_64 and ia64
 _libquadmath=$LANG_FORTRAN
 case "$CTARGET_ARCH" in
-x86 | x86_64 | ppc64le)	_libquadmath=$LANG_FORTRAN ;;
+x86 | x86_64 | ppc64le) ;;
 *)		_libquadmath=false ;;
 esac
 
@@ -218,13 +218,12 @@ if $LANG_FORTRAN; then
 	_languages="$_languages,fortran"
 fi
 if $LANG_ADA; then
-	subpackages="$subpackages gcc-gnat$_target:gnat"
+	subpackages="$subpackages gcc-gnat$_target:gnat libgnat::$CTARGET_ARCH"
 	_languages="$_languages,ada"
 	if [ "$CBUILD" = "$CTARGET" ]; then
 		makedepends_build="$makedepends_build gcc-gnat-bootstrap"
-		subpackages="$subpackages libgnat-static:libgnatstatic:$CTARGET_ARCH libgnat::$CTARGET_ARCH"
+		subpackages="$subpackages libgnat-static:libgnatstatic:$CTARGET_ARCH"
 	else
-		subpackages="$subpackages libgnat::$CTARGET_ARCH"
 		makedepends_build="$makedepends_build gcc-gnat gcc-gnat$_cross"
 	fi
 fi
@@ -234,7 +233,7 @@ fi
 makedepends="$makedepends_build $makedepends_host"
 
 # when using upstream releases, use this URI template
-# https://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$pkgver}/gcc-${_pkgbase:-$pkgver}.tar.xz
+# https://gcc.gnu.org/pub/gcc/releases/gcc-$_pkgbase/gcc-$_pkgbase.tar.xz
 #
 # right now, we are using a git snapshot. snapshots are taken from gcc.gnu.org/pub/gcc/snapshots.
 # However, since they are periodically deleted from the GCC mirrors the utilized snapshots are
@@ -244,7 +243,7 @@ makedepends="$makedepends_build $makedepends_host"
 # PLEASE submit all patches to gcc to https://gitlab.alpinelinux.org/kaniini/alpine-gcc-patches,
 # so that they can be properly tracked and easily rebased if needed.
 #source="https://dev.alpinelinux.org/archive/gcc/${_pkgbase%%.*}-$_pkgsnap/gcc-${_pkgbase%%.*}-$_pkgsnap.tar.xz
-source="https://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$pkgver}/gcc-${_pkgbase:-$pkgver}.tar.xz
+source="https://gcc.gnu.org/pub/gcc/releases/gcc-$_pkgbase/gcc-$_pkgbase.tar.xz
 	0001-posix_memalign.patch
 	0002-gcc-poison-system-directories.patch
 	0003-specs-turn-on-Wl-z-now-by-default.patch
@@ -283,6 +282,7 @@ source="https://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$pkgver}/gcc-${_pkg
 	0036-libphobos-add-riscv64-and-loongarch64-support.patch
 	fix-arm64.patch
 	ppc64le-quadmath.patch
+	riscv64-improve-build-time.patch
 	"
 
 # secfixes:
@@ -290,44 +290,21 @@ source="https://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$pkgver}/gcc-${_pkg
 #     - CVE-2023-4039
 
 # we build out-of-tree
-#_gccdir="$srcdir"/gcc-${_pkgbase%%.*}-$_pkgsnap
-_gccdir="$srcdir"/gcc-${_pkgbase:-$pkgver}
-_gcclibdir="/usr/lib/gcc/$CTARGET/${_pkgbase:-$pkgver}"
-_gcclibexec="/usr/libexec/gcc/$CTARGET/${_pkgbase:-$pkgver}"
+#builddir="$srcdir"/gcc-${_pkgbase%%.*}-$_pkgsnap
+builddir="$srcdir"/gcc-$_pkgbase
+_gcclibdir="/usr/lib/gcc/$CTARGET/$_pkgbase"
+_gcclibexec="/usr/libexec/gcc/$CTARGET/$_pkgbase"
 
 prepare() {
-	cd "$_gccdir"
-
-	_err=
-	for i in $source; do
-		case "$i" in
-		*.patch)
-			msg "Applying $i"
-			patch -p1 -i "$srcdir"/$i || _err="$_err $i"
-			;;
-		esac
-	done
-
-	if [ -n "$_err" ]; then
-		error "The following patches failed:"
-		for i in $_err; do
-			echo "  $i"
-		done
-		return 1
-	fi
-
-	echo ${_pkgbase:-$pkgver} > gcc/BASE-VER
+	default_prepare
+	echo $_pkgbase > gcc/BASE-VER
 }
 
 build() {
 	local _arch_configure=
-	local _libc_configure=
 	local _bootstrap_configure=
-	local _symvers=
 	local _jit_configure=
 
-	cd "$_gccdir"
-
 	case "$CTARGET" in
 	aarch64-*-*-*)		_arch_configure="--with-arch=armv8-a --with-abi=lp64";;
 	armv5-*-*-*eabi)	_arch_configure="--with-arch=armv5te --with-tune=arm926ej-s --with-float=soft --with-abi=aapcs-linux";;
@@ -351,15 +328,7 @@ build() {
 	*)	_hash_style_configure="--with-linker-hash-style=gnu" ;;
 	esac
 
-	case "$CTARGET_LIBC" in
-	musl)
-		# musl does not support libsanitizer
-		# alpine musl provides libssp_nonshared.a, so we don't need libssp either
-		_libc_configure="--disable-libssp --disable-libsanitizer"
-		_symvers="--disable-symvers"
-		export libat_cv_have_ifunc=no
-		;;
-	esac
+	export libat_cv_have_ifunc=no
 
 
 	case "$BOOTSTRAP" in
@@ -388,10 +357,8 @@ build() {
 	echo "  CHOST=$CHOST"
 	echo "  CTARGET=$CTARGET"
 	echo "  CTARGET_ARCH=$CTARGET_ARCH"
-	echo "  CTARGET_LIBC=$CTARGET_LIBC"
 	echo "  languages=$_languages"
 	echo "  arch_configure=$_arch_configure"
-	echo "  libc_configure=$_libc_configure"
 	echo "  cross_configure=$_cross_configure"
 	echo "  bootstrap_configure=$_bootstrap_configure"
 	echo "  hash_style_configure=$_hash_style_configure"
@@ -412,7 +379,7 @@ build() {
 		--disable-multilib
 		--disable-nls
 		--disable-werror
-		$_symvers
+		--disable-symvers
 		--enable-__cxa_atexit
 		--enable-default-pie
 		--enable-default-ssp
@@ -420,7 +387,8 @@ build() {
 		--enable-link-serialization=2
 		--enable-linker-build-id
 		$_arch_configure
-		$_libc_configure
+		--disable-libssp
+		--disable-libsanitizer
 		$_cross_configure
 		$_bootstrap_configure
 		--with-bugurl=https://gitlab.alpinelinux.org/alpine/aports/-/issues
@@ -430,7 +398,7 @@ build() {
 
 	mkdir -p "$_builddir"
 	cd "$_builddir"
-	"$_gccdir"/configure $gccconfiguration \
+	"$builddir"/configure $gccconfiguration \
 		--with-pkgversion="$version"
 
 	msg "building gcc"
@@ -446,7 +414,7 @@ build() {
 	if $LANG_JIT; then
 		mkdir -p "$_builddir"/libgccjit-build
 		cd "$_builddir"/libgccjit-build
-		"$_gccdir"/configure $gccconfiguration \
+		"$builddir"/configure $gccconfiguration \
 			--disable-bootstrap \
 			--enable-host-shared \
 			--enable-languages=jit \
@@ -461,7 +429,7 @@ package() {
 	cd "$_builddir"
 	make -j1 DESTDIR="$pkgdir" install
 
-	ln -s gcc "$pkgdir"/usr/bin/cc
+	[ "$CHOST" = "$CTARGET" ] && ln -s gcc "$pkgdir"/usr/bin/cc
 	ln -s ${CTARGET}-gcc "$pkgdir"/usr/bin/${CTARGET}-cc
 
 	if $LANG_JIT; then
@@ -505,25 +473,23 @@ package() {
 
 	# move ada runtime libs
 	if $LANG_ADA; then
-		for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 -name "libgna*.so"); do
+		for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 \( -name "libgna*.so" -o -name "libgna*.a" \) ); do
 			mv "$i" "$pkgdir"/usr/lib/
 			ln -s ../../../../${i##*/} $i
 		done
-		if [ "$CHOST" = "$CTARGET" ]; then
-			for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 -name "libgna*.a"); do
-				mv "$i" "$pkgdir"/usr/lib/
-				ln -s ../../../../${i##*/} $i
-			done
-		fi
 	fi
 
 	if [ "$CHOST" != "$CTARGET" ]; then
 		# cross-gcc: remove any files that would conflict with the
 		# native gcc package
-		rm -rf "$pkgdir"/usr/bin/cc "$pkgdir"/usr/include "${pkgdir:?}"/usr/share
+		rm -rf "$pkgdir"/usr/include "${pkgdir:?}"/usr/share
 		# libcc1 does not depend on target, don't ship it
 		rm -rf "$pkgdir"/usr/lib/libcc1.so*
 
+		# These are moved into packages with arch=$CTARGET_ARCH so remove
+		# cross prefix
+		#mv "$pkgdir"/usr/$CTARGET/lib/*.so.* "$pkgdir"/usr/lib/ # FIXME
+
 		# fixup gcc library symlinks to be linker scripts so
 		# linker finds the libs from relocated sysroot
 		for so in "$pkgdir"/usr/"$CTARGET"/lib/*.so; do
@@ -572,8 +538,7 @@ libatomic() {
 	depends=
 	replaces="gcc"
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/${_target:+$CTARGET/}lib/libatomic.so.* "$subpkgdir"/usr/lib/
+	amove usr/lib/libatomic.so.*
 }
 
 libcxx() {
@@ -586,8 +551,7 @@ libcxx() {
 		nm -D "$pkgdir"/usr/lib/libstdc++.so.* | grep clock_gettime
 	fi
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/${_target:+$CTARGET/}lib/libstdc++.so.* "$subpkgdir"/usr/lib/
+	amove usr/lib/libstdc++.so.*
 }
 
 libcxx_dev() {
@@ -605,15 +569,12 @@ libcxx_dev() {
 
 gpp() {
 	pkgdesc="GNU C++ standard library and compiler"
-	depends="libstdc++=$_gccrel libstdc++-dev$_target=$_gccrel gcc$_target=$_gccrel libc-dev"
-	mkdir -p "$subpkgdir/$_gcclibexec" \
-		"$subpkgdir"/usr/bin \
-		"$subpkgdir"/usr/${_target:+$CTARGET/}include \
-		"$subpkgdir"/usr/${_target:+$CTARGET/}lib \
+	depends="libstdc++-dev$_target=$_gccrel gcc$_target=$_gccrel musl-dev"
+	depends="$depends so:libc.musl-x86_64.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libz.so.1"
+	[ "$CHOST" = "$CTARGET" ] && depends="$depends libstdc++=$_gccrel"
 
-	mv "$pkgdir/$_gcclibexec/cc1plus" "$subpkgdir/$_gcclibexec/"
-
-	mv "$pkgdir"/usr/bin/*++ "$subpkgdir"/usr/bin/
+	amove $_gcclibexec/cc1plus
+	amove usr/bin/*++
 }
 
 jit() {
@@ -632,30 +593,26 @@ libobjc() {
 	pkgdesc="GNU Objective-C runtime"
 	replaces="objc"
 	depends=
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/${_target:+$CTARGET/}lib/libobjc.so.* "$subpkgdir"/usr/lib/
+
+	amove usr/lib/libobjc.so.*
 }
 
 objc() {
 	pkgdesc="GNU Objective-C"
 	replaces="gcc"
-	depends="libc-dev gcc=$_gccrel libobjc=$_gccrel"
+	depends="musl-dev gcc=$_gccrel libobjc=$_gccrel"
 
-	mkdir -p "$subpkgdir/$_gcclibexec" \
-		"$subpkgdir"/$_gcclibdir/include \
-		"$subpkgdir"/usr/lib
-	mv "$pkgdir/$_gcclibexec/cc1obj" "$subpkgdir/$_gcclibexec/"
-	mv "$pkgdir"/$_gcclibdir/include/objc "$subpkgdir"/$_gcclibdir/include/
-	mv "$pkgdir"/usr/lib/libobjc.so "$pkgdir"/usr/lib/libobjc.a \
-		"$subpkgdir"/usr/lib/
+	amove $_gcclibexec/cc1obj
+	amove $_gcclibdir/include/objc
+	amove usr/lib/libobjc.so
+	amove usr/lib/libobjc.a
 }
 
 libgcc() {
 	pkgdesc="GNU C compiler runtime libraries"
 	depends=
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/${_target:+$CTARGET/}lib/libgcc_s.so.* "$subpkgdir"/usr/lib/
+	amove usr/lib/libgcc_s.so.*
 }
 
 libgomp() {
@@ -663,17 +620,15 @@ libgomp() {
 	depends=
 	replaces="gcc"
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/${_target:+$CTARGET/}lib/libgomp.so.* "$subpkgdir"/usr/lib/
+	amove usr/lib/libgomp.so.*
 }
 
 libgphobos() {
 	pkgdesc="D programming language standard library for GCC"
 	depends=
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libgdruntime.so.* "$subpkgdir"/usr/lib/
-	mv "$pkgdir"/usr/lib/libgphobos.so.*  "$subpkgdir"/usr/lib/
+	amove usr/lib/libgdruntime.so.*
+	amove usr/lib/libgphobos.so.*
 }
 
 gdc() {
@@ -682,42 +637,26 @@ gdc() {
 	[ "$CBUILD" = "$CTARGET" ] && depends="$depends libgphobos=$_gccrel"
 	[ "$CHOST" = "$CTARGET" ] && provides="gcc-gdc-bootstrap=$_gccrel"
 
-	mkdir -p "$subpkgdir/$_gcclibexec" \
-		"$subpkgdir"/$_gcclibdir/include/d/ \
-		"$subpkgdir"/usr/lib \
-		"$subpkgdir"/usr/bin
 	# Copy: The installed '.d' files, the static lib, the binary itself
 	# The shared libs are part of 'libgphobos' so one can run program
 	# without installing the compiler
-	mv "$pkgdir/$_gcclibexec/d21" "$subpkgdir/$_gcclibexec/"
-	mv "$pkgdir"/$_gcclibdir/include/d/* "$subpkgdir"/$_gcclibdir/include/d/
+	amove $_gcclibexec/d21
+	amove $_gcclibdir/include/d
 	if [ "$CBUILD" = "$CTARGET" ]; then
-		mv "$pkgdir"/usr/lib/libgdruntime.so "$subpkgdir"/usr/lib/
-		mv "$pkgdir"/usr/lib/libgphobos.so "$subpkgdir"/usr/lib/
+		amove usr/lib/libgdruntime.so
+		amove usr/lib/libgphobos.so
 	fi
-	if [ "$CHOST" = "$CTARGET" ]; then
-		mv "$pkgdir"/usr/lib/libgdruntime.a "$subpkgdir"/usr/lib/
-		mv "$pkgdir"/usr/lib/libgphobos.a "$subpkgdir"/usr/lib/
-		mv "$pkgdir"/usr/lib/libgphobos.spec "$subpkgdir"/usr/lib/
-		mv "$pkgdir"/usr/bin/gdc "$subpkgdir"/usr/bin/
-	else
-		mkdir -p "$subpkgdir"/usr/$CTARGET/lib/
-		mv "$pkgdir"/usr/$CTARGET/lib/libgdruntime.a \
-			"$subpkgdir"/usr/$CTARGET/lib/
-		mv "$pkgdir"/usr/$CTARGET/lib/libgphobos.a \
-			"$subpkgdir"/usr/$CTARGET/lib/
-		mv "$pkgdir"/usr/$CTARGET/lib/libgphobos.spec \
-			"$subpkgdir"/usr/$CTARGET/lib/
-	fi
-	mv "$pkgdir"/usr/bin/$CTARGET-gdc "$subpkgdir"/usr/bin/
+	amove usr/${_target:+$CTARGET/}lib/libgdruntime.a
+	amove usr/${_target:+$CTARGET/}lib/libgphobos.a
+	amove usr/${_target:+$CTARGET/}lib/libgphobos.spec
+	amove usr/bin/*gdc
 }
 
 libgo() {
 	pkgdesc="Go runtime library for GCC"
 	depends=
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libgo.so.* "$subpkgdir"/usr/lib/
+	amove usr/lib/libgo.so.*
 }
 
 go() {
@@ -725,31 +664,25 @@ go() {
 	depends="gcc=$_gccrel libgo=$_gccrel !go"
 	install="$pkgname-go.post-install"
 
-	mkdir -p "$subpkgdir"/$_gcclibexec \
-		"$subpkgdir"/usr/lib \
-		"$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/lib/go "$subpkgdir"/usr/lib/
-	mv "$pkgdir"/usr/bin/*gccgo "$subpkgdir"/usr/bin/
-	mv "$pkgdir"/usr/bin/*go "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/*gofmt "$subpkgdir"/usr/bin
-	mv "$pkgdir"/$_gcclibexec/go1 "$subpkgdir"/$_gcclibexec/
-	mv "$pkgdir"/$_gcclibexec/cgo "$subpkgdir"/$_gcclibexec/
-	mv "$pkgdir"/$_gcclibexec/buildid "$subpkgdir"/$_gcclibexec/
-	mv "$pkgdir"/$_gcclibexec/test2json "$subpkgdir"/$_gcclibexec/
-	mv "$pkgdir"/$_gcclibexec/vet "$subpkgdir"/$_gcclibexec/
-	mv "$pkgdir"/usr/lib/libgo.a \
-		"$pkgdir"/usr/lib/libgo.so \
-		"$pkgdir"/usr/lib/libgobegin.a \
-		"$pkgdir"/usr/lib/libgolibbegin.a \
-		"$subpkgdir"/usr/lib/
+	amove usr/lib/go
+	amove usr/bin/*go
+	amove usr/bin/*gofmt
+	amove $_gcclibexec/go1
+	amove $_gcclibexec/cgo
+	amove $_gcclibexec/buildid
+	amove $_gcclibexec/test2json
+	amove $_gcclibexec/vet
+	amove usr/lib/libgo.a
+	amove usr/lib/libgo.so
+	amove usr/lib/libgobegin.a
+	amove usr/lib/libgolibbegin.a
 }
 
 libgfortran() {
 	pkgdesc="Fortran runtime library for GCC"
 	depends=
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libgfortran.so.* "$subpkgdir"/usr/lib/
+	amove usr/lib/libgfortran.so.*
 }
 
 libquadmath() {
@@ -757,8 +690,7 @@ libquadmath() {
 	pkgdesc="128-bit math library for GCC"
 	depends=
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libquadmath.so.* "$subpkgdir"/usr/lib/
+	amove usr/lib/libquadmath.so.*
 }
 
 gfortran() {
@@ -767,38 +699,30 @@ gfortran() {
 	$_libquadmath && depends="$depends libquadmath=$_gccrel"
 	replaces="gcc"
 
-	mkdir -p "$subpkgdir"/$_gcclibexec \
-		"$subpkgdir"/$_gcclibdir \
-		"$subpkgdir"/usr/lib \
-		"$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/*gfortran "$subpkgdir"/usr/bin/
-	mv "$pkgdir"/usr/lib/libgfortran.a \
-		"$pkgdir"/usr/lib/libgfortran.so \
-		"$subpkgdir"/usr/lib/
+	amove usr/bin/*gfortran
+	amove usr/lib/libgfortran.a
+	amove usr/lib/libgfortran.so
 	if $_libquadmath; then
-		mv "$pkgdir"/usr/lib/libquadmath.a \
-			"$pkgdir"/usr/lib/libquadmath.so \
-			"$subpkgdir"/usr/lib/
+		amove usr/lib/libquadmath.a
+		amove usr/lib/libquadmath.so
 	fi
-	mv "$pkgdir"/$_gcclibdir/finclude "$subpkgdir"/$_gcclibdir/
-	mv "$pkgdir"/$_gcclibexec/f951 "$subpkgdir"/$_gcclibexec
-	mv "$pkgdir"/usr/lib/libgfortran.spec "$subpkgdir"/$_gcclibdir
+	amove $_gcclibdir/finclude
+	amove $_gcclibexec/f951
+	mv -v "$pkgdir"/usr/lib/libgfortran.spec "$subpkgdir"/$_gcclibdir/
 }
 
 libgnat() {
 	pkgdesc="GNU Ada runtime shared libraries"
 	depends=
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libgna*.so "$subpkgdir"/usr/lib/
+	amove usr/lib/libgna*.so
 }
 
 libgnatstatic() {
 	pkgdesc="GNU Ada static libraries"
 	depends=
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libgna*.a "$subpkgdir"/usr/lib/
+	amove usr/lib/libgna*.a
 }
 
 gnat() {
@@ -807,12 +731,9 @@ gnat() {
 	provides="$pkgname-gnat-bootstrap=$_gccrel"
 	[ "$CHOST" = "$CTARGET" ] && depends="$depends libgnat=$_gccrel"
 
-	mkdir -p "$subpkgdir"/$_gcclibexec \
-		"$subpkgdir"/$_gcclibdir \
-		"$subpkgdir"/usr/bin
-	mv "$pkgdir"/$_gcclibexec/*gnat* "$subpkgdir"/$_gcclibexec/
-	mv "$pkgdir"/$_gcclibdir/*ada* "$subpkgdir"/$_gcclibdir/
-	mv "$pkgdir"/usr/bin/*gnat* "$subpkgdir"/usr/bin/
+	amove $_gcclibexec/*gnat*
+	amove $_gcclibdir/*ada*
+	amove usr/bin/*gnat*
 }
 
 gdb() {
@@ -864,4 +785,5 @@ c4482ffc36e7894b2140800159f4cbc9a3e9011e43a69b69f4fa92d5a11e2ee645c7e21df4423dd1
 06f64544fd8bc4b6c8b06410c5198aa8fb4e82c232afc0cad83b2c69ac5d39399968206defa78297222700cd18e7fd7e8244afa76d343406a01f657c86306453  0036-libphobos-add-riscv64-and-loongarch64-support.patch
 00319c9770362520e8e93bd03fda1769dfa3622eba77d620e11d8af45a38e6d804a5e924046ae388e1cfaea605696e89c343fca507aaaa5edd58d80744fff14f  fix-arm64.patch
 815265826742400f86336f0c2d3e4edc37398dbc6505ee81107c0103c13ac0f406cff851438d2323033c6c6d0c0323765ee15b975eab8d1dd465f9e988168fb9  ppc64le-quadmath.patch
+ea55e0fa6813fc95c4ca2e87f059182edc54dc61515ebb92bf6eb31dbbd176d0fe81edcc7ea28d32f84ca37e8d48a544623d3d9bc94aa41ffc0859326a616aa2  riscv64-improve-build-time.patch
 "

cross/gcc-riscv64/riscv64-improve-build-time.patch

@@ -0,0 +1,149 @@
+Patch-Source: https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=2cf89ae83225f932b226cd57ef2d083a59bcf8a3
+--
+From 2cf89ae83225f932b226cd57ef2d083a59bcf8a3 Mon Sep 17 00:00:00 2001
+From: Richard Biener <rguenther@suse.de>
+Date: Tue, 6 Aug 2024 14:56:26 +0200
+Subject: [PATCH] tree-optimization/116166 - forward jump-threading going wild
+
+Currently the forward threader isn't limited as to the search space
+it explores and with it now using path-ranger for simplifying
+conditions it runs into it became pretty slow for degenerate cases
+like compiling insn-emit.cc for RISC-V esp. when compiling for
+a host with LOGICAL_OP_NON_SHORT_CIRCUIT disabled.
+
+The following makes the forward threader honor the search space
+limit I introduced for the backward threader.  This reduces
+compile-time from minutes to seconds for the testcase in PR116166.
+
+Note this wasn't necessary before we had ranger but with ranger
+the work we do is quadatic in the length of the threading path
+we build up (the same is true for the backwards threader).
+
+	PR tree-optimization/116166
+	* tree-ssa-threadedge.h (jump_threader::thread_around_empty_blocks):
+	Add limit parameter.
+	(jump_threader::thread_through_normal_block): Likewise.
+	* tree-ssa-threadedge.cc (jump_threader::thread_around_empty_blocks):
+	Honor and decrement limit parameter.
+	(jump_threader::thread_through_normal_block): Likewise.
+	(jump_threader::thread_across_edge): Initialize limit from
+	param_max_jump_thread_paths and pass it down to workers.
+---
+ gcc/tree-ssa-threadedge.cc | 30 ++++++++++++++++++++++--------
+ gcc/tree-ssa-threadedge.h  |  4 ++--
+ 2 files changed, 24 insertions(+), 10 deletions(-)
+
+diff --git a/gcc/tree-ssa-threadedge.cc b/gcc/tree-ssa-threadedge.cc
+index 7f82639b8ecc..0aa2aa851430 100644
+--- a/gcc/tree-ssa-threadedge.cc
++++ b/gcc/tree-ssa-threadedge.cc
+@@ -786,13 +786,17 @@ propagate_threaded_block_debug_into (basic_block dest, basic_block src)
+ bool
+ jump_threader::thread_around_empty_blocks (vec<jump_thread_edge *> *path,
+ 					   edge taken_edge,
+-					   bitmap visited)
++					   bitmap visited, unsigned &limit)
+ {
+   basic_block bb = taken_edge->dest;
+   gimple_stmt_iterator gsi;
+   gimple *stmt;
+   tree cond;
+ 
++  if (limit == 0)
++    return false;
++  --limit;
++
+   /* The key property of these blocks is that they need not be duplicated
+      when threading.  Thus they cannot have visible side effects such
+      as PHI nodes.  */
+@@ -830,7 +834,8 @@ jump_threader::thread_around_empty_blocks (vec<jump_thread_edge *> *path,
+ 	      m_registry->push_edge (path, taken_edge, EDGE_NO_COPY_SRC_BLOCK);
+ 	      m_state->append_path (taken_edge->dest);
+ 	      bitmap_set_bit (visited, taken_edge->dest->index);
+-	      return thread_around_empty_blocks (path, taken_edge, visited);
++	      return thread_around_empty_blocks (path, taken_edge, visited,
++						 limit);
+ 	    }
+ 	}
+ 
+@@ -872,7 +877,7 @@ jump_threader::thread_around_empty_blocks (vec<jump_thread_edge *> *path,
+       m_registry->push_edge (path, taken_edge, EDGE_NO_COPY_SRC_BLOCK);
+       m_state->append_path (taken_edge->dest);
+ 
+-      thread_around_empty_blocks (path, taken_edge, visited);
++      thread_around_empty_blocks (path, taken_edge, visited, limit);
+       return true;
+     }
+ 
+@@ -899,8 +904,13 @@ jump_threader::thread_around_empty_blocks (vec<jump_thread_edge *> *path,
+ 
+ int
+ jump_threader::thread_through_normal_block (vec<jump_thread_edge *> *path,
+-					    edge e, bitmap visited)
++					    edge e, bitmap visited,
++					    unsigned &limit)
+ {
++  if (limit == 0)
++    return 0;
++  limit--;
++
+   m_state->register_equivs_edge (e);
+ 
+   /* PHIs create temporary equivalences.
+@@ -989,7 +999,7 @@ jump_threader::thread_through_normal_block (vec<jump_thread_edge *> *path,
+  	     visited.  This may be overly conservative.  */
+ 	  bitmap_set_bit (visited, dest->index);
+ 	  bitmap_set_bit (visited, e->dest->index);
+-	  thread_around_empty_blocks (path, taken_edge, visited);
++	  thread_around_empty_blocks (path, taken_edge, visited, limit);
+ 	  return 1;
+ 	}
+     }
+@@ -1075,9 +1085,12 @@ jump_threader::thread_across_edge (edge e)
+   bitmap_set_bit (visited, e->src->index);
+   bitmap_set_bit (visited, e->dest->index);
+ 
++  /* Limit search space.  */
++  unsigned limit = param_max_jump_thread_paths;
++
+   int threaded = 0;
+   if ((e->flags & EDGE_DFS_BACK) == 0)
+-    threaded = thread_through_normal_block (path, e, visited);
++    threaded = thread_through_normal_block (path, e, visited, limit);
+ 
+   if (threaded > 0)
+     {
+@@ -1148,11 +1161,12 @@ jump_threader::thread_across_edge (edge e)
+ 	m_registry->push_edge (path, e, EDGE_START_JUMP_THREAD);
+ 	m_registry->push_edge (path, taken_edge, EDGE_COPY_SRC_JOINER_BLOCK);
+ 
+-	found = thread_around_empty_blocks (path, taken_edge, visited);
++	found = thread_around_empty_blocks (path, taken_edge, visited, limit);
+ 
+ 	if (!found)
+ 	  found = thread_through_normal_block (path,
+-					       path->last ()->e, visited) > 0;
++					       path->last ()->e, visited,
++					       limit) > 0;
+ 
+ 	/* If we were able to thread through a successor of E->dest, then
+ 	   record the jump threading opportunity.  */
+diff --git a/gcc/tree-ssa-threadedge.h b/gcc/tree-ssa-threadedge.h
+index 9f6cbfe93307..245b3506a550 100644
+--- a/gcc/tree-ssa-threadedge.h
++++ b/gcc/tree-ssa-threadedge.h
+@@ -101,9 +101,9 @@ private:
+ 					  unsigned limit);
+ 
+   bool thread_around_empty_blocks (vec<class jump_thread_edge *> *path,
+-				   edge, bitmap visited);
++				   edge, bitmap visited, unsigned &limit);
+   int thread_through_normal_block (vec<jump_thread_edge *> *path,
+-				   edge, bitmap visited);
++				   edge, bitmap visited, unsigned &limit);
+   void thread_across_edge (edge);
+   bool record_temporary_equivalences_from_phis (edge);
+   gimple *record_temporary_equivalences_from_stmts_at_dest (edge);
+-- 
+2.43.5
+

cross/gcc-x86/APKBUILD

@@ -34,7 +34,7 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname=gcc-x86
-pkgrel=3
+pkgrel=4
 pkgdesc="Stage2 cross-compiler for x86"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -44,9 +44,10 @@ depends="binutils-x86 mpc1"
 makedepends_build="gcc g++ bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev"
 makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-dev-x86 binutils-x86"
 subpackages="g++-x86:gpp libstdc++-dev-x86:libcxx_dev"
-[ "$CHOST" = "$CTARGET" ] && subpackages="gcc-gdb gcc-doc$_target"
+[ "$CHOST" = "$CTARGET" ] && subpackages="gcc-gdb gcc-doc"
 replaces="libstdc++ binutils"
-options="!strip"
+options="!strip !tracedeps"
+depends="$depends so:libc.musl-x86_64.so.1 so:libgcc_s.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libstdc++.so.6 so:libz.so.1"
 
 : "${LANG_CXX:=true}"
 : "${LANG_D:=true}"
@@ -135,7 +136,6 @@ else
 	export CXXFLAGS_FOR_TARGET="$CXXFLAGS"
 	export LDFLAGS_FOR_TARGET="$LDFLAGS"
 	export BOOT_CFLAGS="$CFLAGS"
-	export BOOT_CXXFLAGS="$CXXFLAGS"
 	export BOOT_LDFLAGS="$LDFLAGS"
 fi
 
@@ -170,7 +170,7 @@ esac
 # currently on x86, x86_64 and ia64
 _libquadmath=$LANG_FORTRAN
 case "$CTARGET_ARCH" in
-x86 | x86_64 | ppc64le)	_libquadmath=$LANG_FORTRAN ;;
+x86 | x86_64 | ppc64le) ;;
 *)		_libquadmath=false ;;
 esac
 
@@ -218,13 +218,12 @@ if $LANG_FORTRAN; then
 	_languages="$_languages,fortran"
 fi
 if $LANG_ADA; then
-	subpackages="$subpackages gcc-gnat$_target:gnat"
+	subpackages="$subpackages gcc-gnat$_target:gnat libgnat::$CTARGET_ARCH"
 	_languages="$_languages,ada"
 	if [ "$CBUILD" = "$CTARGET" ]; then
 		makedepends_build="$makedepends_build gcc-gnat-bootstrap"
-		subpackages="$subpackages libgnat-static:libgnatstatic:$CTARGET_ARCH libgnat::$CTARGET_ARCH"
+		subpackages="$subpackages libgnat-static:libgnatstatic:$CTARGET_ARCH"
 	else
-		subpackages="$subpackages libgnat::$CTARGET_ARCH"
 		makedepends_build="$makedepends_build gcc-gnat gcc-gnat$_cross"
 	fi
 fi
@@ -234,7 +233,7 @@ fi
 makedepends="$makedepends_build $makedepends_host"
 
 # when using upstream releases, use this URI template
-# https://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$pkgver}/gcc-${_pkgbase:-$pkgver}.tar.xz
+# https://gcc.gnu.org/pub/gcc/releases/gcc-$_pkgbase/gcc-$_pkgbase.tar.xz
 #
 # right now, we are using a git snapshot. snapshots are taken from gcc.gnu.org/pub/gcc/snapshots.
 # However, since they are periodically deleted from the GCC mirrors the utilized snapshots are
@@ -244,7 +243,7 @@ makedepends="$makedepends_build $makedepends_host"
 # PLEASE submit all patches to gcc to https://gitlab.alpinelinux.org/kaniini/alpine-gcc-patches,
 # so that they can be properly tracked and easily rebased if needed.
 #source="https://dev.alpinelinux.org/archive/gcc/${_pkgbase%%.*}-$_pkgsnap/gcc-${_pkgbase%%.*}-$_pkgsnap.tar.xz
-source="https://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$pkgver}/gcc-${_pkgbase:-$pkgver}.tar.xz
+source="https://gcc.gnu.org/pub/gcc/releases/gcc-$_pkgbase/gcc-$_pkgbase.tar.xz
 	0001-posix_memalign.patch
 	0002-gcc-poison-system-directories.patch
 	0003-specs-turn-on-Wl-z-now-by-default.patch
@@ -283,6 +282,7 @@ source="https://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$pkgver}/gcc-${_pkg
 	0036-libphobos-add-riscv64-and-loongarch64-support.patch
 	fix-arm64.patch
 	ppc64le-quadmath.patch
+	riscv64-improve-build-time.patch
 	"
 
 # secfixes:
@@ -290,44 +290,21 @@ source="https://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$pkgver}/gcc-${_pkg
 #     - CVE-2023-4039
 
 # we build out-of-tree
-#_gccdir="$srcdir"/gcc-${_pkgbase%%.*}-$_pkgsnap
-_gccdir="$srcdir"/gcc-${_pkgbase:-$pkgver}
-_gcclibdir="/usr/lib/gcc/$CTARGET/${_pkgbase:-$pkgver}"
-_gcclibexec="/usr/libexec/gcc/$CTARGET/${_pkgbase:-$pkgver}"
+#builddir="$srcdir"/gcc-${_pkgbase%%.*}-$_pkgsnap
+builddir="$srcdir"/gcc-$_pkgbase
+_gcclibdir="/usr/lib/gcc/$CTARGET/$_pkgbase"
+_gcclibexec="/usr/libexec/gcc/$CTARGET/$_pkgbase"
 
 prepare() {
-	cd "$_gccdir"
-
-	_err=
-	for i in $source; do
-		case "$i" in
-		*.patch)
-			msg "Applying $i"
-			patch -p1 -i "$srcdir"/$i || _err="$_err $i"
-			;;
-		esac
-	done
-
-	if [ -n "$_err" ]; then
-		error "The following patches failed:"
-		for i in $_err; do
-			echo "  $i"
-		done
-		return 1
-	fi
-
-	echo ${_pkgbase:-$pkgver} > gcc/BASE-VER
+	default_prepare
+	echo $_pkgbase > gcc/BASE-VER
 }
 
 build() {
 	local _arch_configure=
-	local _libc_configure=
 	local _bootstrap_configure=
-	local _symvers=
 	local _jit_configure=
 
-	cd "$_gccdir"
-
 	case "$CTARGET" in
 	aarch64-*-*-*)		_arch_configure="--with-arch=armv8-a --with-abi=lp64";;
 	armv5-*-*-*eabi)	_arch_configure="--with-arch=armv5te --with-tune=arm926ej-s --with-float=soft --with-abi=aapcs-linux";;
@@ -351,15 +328,7 @@ build() {
 	*)	_hash_style_configure="--with-linker-hash-style=gnu" ;;
 	esac
 
-	case "$CTARGET_LIBC" in
-	musl)
-		# musl does not support libsanitizer
-		# alpine musl provides libssp_nonshared.a, so we don't need libssp either
-		_libc_configure="--disable-libssp --disable-libsanitizer"
-		_symvers="--disable-symvers"
-		export libat_cv_have_ifunc=no
-		;;
-	esac
+	export libat_cv_have_ifunc=no
 
 
 	case "$BOOTSTRAP" in
@@ -388,10 +357,8 @@ build() {
 	echo "  CHOST=$CHOST"
 	echo "  CTARGET=$CTARGET"
 	echo "  CTARGET_ARCH=$CTARGET_ARCH"
-	echo "  CTARGET_LIBC=$CTARGET_LIBC"
 	echo "  languages=$_languages"
 	echo "  arch_configure=$_arch_configure"
-	echo "  libc_configure=$_libc_configure"
 	echo "  cross_configure=$_cross_configure"
 	echo "  bootstrap_configure=$_bootstrap_configure"
 	echo "  hash_style_configure=$_hash_style_configure"
@@ -412,7 +379,7 @@ build() {
 		--disable-multilib
 		--disable-nls
 		--disable-werror
-		$_symvers
+		--disable-symvers
 		--enable-__cxa_atexit
 		--enable-default-pie
 		--enable-default-ssp
@@ -420,7 +387,8 @@ build() {
 		--enable-link-serialization=2
 		--enable-linker-build-id
 		$_arch_configure
-		$_libc_configure
+		--disable-libssp
+		--disable-libsanitizer
 		$_cross_configure
 		$_bootstrap_configure
 		--with-bugurl=https://gitlab.alpinelinux.org/alpine/aports/-/issues
@@ -430,7 +398,7 @@ build() {
 
 	mkdir -p "$_builddir"
 	cd "$_builddir"
-	"$_gccdir"/configure $gccconfiguration \
+	"$builddir"/configure $gccconfiguration \
 		--with-pkgversion="$version"
 
 	msg "building gcc"
@@ -446,7 +414,7 @@ build() {
 	if $LANG_JIT; then
 		mkdir -p "$_builddir"/libgccjit-build
 		cd "$_builddir"/libgccjit-build
-		"$_gccdir"/configure $gccconfiguration \
+		"$builddir"/configure $gccconfiguration \
 			--disable-bootstrap \
 			--enable-host-shared \
 			--enable-languages=jit \
@@ -461,7 +429,7 @@ package() {
 	cd "$_builddir"
 	make -j1 DESTDIR="$pkgdir" install
 
-	ln -s gcc "$pkgdir"/usr/bin/cc
+	[ "$CHOST" = "$CTARGET" ] && ln -s gcc "$pkgdir"/usr/bin/cc
 	ln -s ${CTARGET}-gcc "$pkgdir"/usr/bin/${CTARGET}-cc
 
 	if $LANG_JIT; then
@@ -505,25 +473,23 @@ package() {
 
 	# move ada runtime libs
 	if $LANG_ADA; then
-		for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 -name "libgna*.so"); do
+		for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 \( -name "libgna*.so" -o -name "libgna*.a" \) ); do
 			mv "$i" "$pkgdir"/usr/lib/
 			ln -s ../../../../${i##*/} $i
 		done
-		if [ "$CHOST" = "$CTARGET" ]; then
-			for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 -name "libgna*.a"); do
-				mv "$i" "$pkgdir"/usr/lib/
-				ln -s ../../../../${i##*/} $i
-			done
-		fi
 	fi
 
 	if [ "$CHOST" != "$CTARGET" ]; then
 		# cross-gcc: remove any files that would conflict with the
 		# native gcc package
-		rm -rf "$pkgdir"/usr/bin/cc "$pkgdir"/usr/include "${pkgdir:?}"/usr/share
+		rm -rf "$pkgdir"/usr/include "${pkgdir:?}"/usr/share
 		# libcc1 does not depend on target, don't ship it
 		rm -rf "$pkgdir"/usr/lib/libcc1.so*
 
+		# These are moved into packages with arch=$CTARGET_ARCH so remove
+		# cross prefix
+		#mv "$pkgdir"/usr/$CTARGET/lib/*.so.* "$pkgdir"/usr/lib/ # FIXME
+
 		# fixup gcc library symlinks to be linker scripts so
 		# linker finds the libs from relocated sysroot
 		for so in "$pkgdir"/usr/"$CTARGET"/lib/*.so; do
@@ -572,8 +538,7 @@ libatomic() {
 	depends=
 	replaces="gcc"
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/${_target:+$CTARGET/}lib/libatomic.so.* "$subpkgdir"/usr/lib/
+	amove usr/lib/libatomic.so.*
 }
 
 libcxx() {
@@ -586,8 +551,7 @@ libcxx() {
 		nm -D "$pkgdir"/usr/lib/libstdc++.so.* | grep clock_gettime
 	fi
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/${_target:+$CTARGET/}lib/libstdc++.so.* "$subpkgdir"/usr/lib/
+	amove usr/lib/libstdc++.so.*
 }
 
 libcxx_dev() {
@@ -605,15 +569,12 @@ libcxx_dev() {
 
 gpp() {
 	pkgdesc="GNU C++ standard library and compiler"
-	depends="libstdc++=$_gccrel libstdc++-dev$_target=$_gccrel gcc$_target=$_gccrel libc-dev"
-	mkdir -p "$subpkgdir/$_gcclibexec" \
-		"$subpkgdir"/usr/bin \
-		"$subpkgdir"/usr/${_target:+$CTARGET/}include \
-		"$subpkgdir"/usr/${_target:+$CTARGET/}lib \
+	depends="libstdc++-dev$_target=$_gccrel gcc$_target=$_gccrel musl-dev"
+	depends="$depends so:libc.musl-x86_64.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libz.so.1"
+	[ "$CHOST" = "$CTARGET" ] && depends="$depends libstdc++=$_gccrel"
 
-	mv "$pkgdir/$_gcclibexec/cc1plus" "$subpkgdir/$_gcclibexec/"
-
-	mv "$pkgdir"/usr/bin/*++ "$subpkgdir"/usr/bin/
+	amove $_gcclibexec/cc1plus
+	amove usr/bin/*++
 }
 
 jit() {
@@ -632,30 +593,26 @@ libobjc() {
 	pkgdesc="GNU Objective-C runtime"
 	replaces="objc"
 	depends=
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/${_target:+$CTARGET/}lib/libobjc.so.* "$subpkgdir"/usr/lib/
+
+	amove usr/lib/libobjc.so.*
 }
 
 objc() {
 	pkgdesc="GNU Objective-C"
 	replaces="gcc"
-	depends="libc-dev gcc=$_gccrel libobjc=$_gccrel"
+	depends="musl-dev gcc=$_gccrel libobjc=$_gccrel"
 
-	mkdir -p "$subpkgdir/$_gcclibexec" \
-		"$subpkgdir"/$_gcclibdir/include \
-		"$subpkgdir"/usr/lib
-	mv "$pkgdir/$_gcclibexec/cc1obj" "$subpkgdir/$_gcclibexec/"
-	mv "$pkgdir"/$_gcclibdir/include/objc "$subpkgdir"/$_gcclibdir/include/
-	mv "$pkgdir"/usr/lib/libobjc.so "$pkgdir"/usr/lib/libobjc.a \
-		"$subpkgdir"/usr/lib/
+	amove $_gcclibexec/cc1obj
+	amove $_gcclibdir/include/objc
+	amove usr/lib/libobjc.so
+	amove usr/lib/libobjc.a
 }
 
 libgcc() {
 	pkgdesc="GNU C compiler runtime libraries"
 	depends=
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/${_target:+$CTARGET/}lib/libgcc_s.so.* "$subpkgdir"/usr/lib/
+	amove usr/lib/libgcc_s.so.*
 }
 
 libgomp() {
@@ -663,17 +620,15 @@ libgomp() {
 	depends=
 	replaces="gcc"
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/${_target:+$CTARGET/}lib/libgomp.so.* "$subpkgdir"/usr/lib/
+	amove usr/lib/libgomp.so.*
 }
 
 libgphobos() {
 	pkgdesc="D programming language standard library for GCC"
 	depends=
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libgdruntime.so.* "$subpkgdir"/usr/lib/
-	mv "$pkgdir"/usr/lib/libgphobos.so.*  "$subpkgdir"/usr/lib/
+	amove usr/lib/libgdruntime.so.*
+	amove usr/lib/libgphobos.so.*
 }
 
 gdc() {
@@ -682,42 +637,26 @@ gdc() {
 	[ "$CBUILD" = "$CTARGET" ] && depends="$depends libgphobos=$_gccrel"
 	[ "$CHOST" = "$CTARGET" ] && provides="gcc-gdc-bootstrap=$_gccrel"
 
-	mkdir -p "$subpkgdir/$_gcclibexec" \
-		"$subpkgdir"/$_gcclibdir/include/d/ \
-		"$subpkgdir"/usr/lib \
-		"$subpkgdir"/usr/bin
 	# Copy: The installed '.d' files, the static lib, the binary itself
 	# The shared libs are part of 'libgphobos' so one can run program
 	# without installing the compiler
-	mv "$pkgdir/$_gcclibexec/d21" "$subpkgdir/$_gcclibexec/"
-	mv "$pkgdir"/$_gcclibdir/include/d/* "$subpkgdir"/$_gcclibdir/include/d/
+	amove $_gcclibexec/d21
+	amove $_gcclibdir/include/d
 	if [ "$CBUILD" = "$CTARGET" ]; then
-		mv "$pkgdir"/usr/lib/libgdruntime.so "$subpkgdir"/usr/lib/
-		mv "$pkgdir"/usr/lib/libgphobos.so "$subpkgdir"/usr/lib/
+		amove usr/lib/libgdruntime.so
+		amove usr/lib/libgphobos.so
 	fi
-	if [ "$CHOST" = "$CTARGET" ]; then
-		mv "$pkgdir"/usr/lib/libgdruntime.a "$subpkgdir"/usr/lib/
-		mv "$pkgdir"/usr/lib/libgphobos.a "$subpkgdir"/usr/lib/
-		mv "$pkgdir"/usr/lib/libgphobos.spec "$subpkgdir"/usr/lib/
-		mv "$pkgdir"/usr/bin/gdc "$subpkgdir"/usr/bin/
-	else
-		mkdir -p "$subpkgdir"/usr/$CTARGET/lib/
-		mv "$pkgdir"/usr/$CTARGET/lib/libgdruntime.a \
-			"$subpkgdir"/usr/$CTARGET/lib/
-		mv "$pkgdir"/usr/$CTARGET/lib/libgphobos.a \
-			"$subpkgdir"/usr/$CTARGET/lib/
-		mv "$pkgdir"/usr/$CTARGET/lib/libgphobos.spec \
-			"$subpkgdir"/usr/$CTARGET/lib/
-	fi
-	mv "$pkgdir"/usr/bin/$CTARGET-gdc "$subpkgdir"/usr/bin/
+	amove usr/${_target:+$CTARGET/}lib/libgdruntime.a
+	amove usr/${_target:+$CTARGET/}lib/libgphobos.a
+	amove usr/${_target:+$CTARGET/}lib/libgphobos.spec
+	amove usr/bin/*gdc
 }
 
 libgo() {
 	pkgdesc="Go runtime library for GCC"
 	depends=
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libgo.so.* "$subpkgdir"/usr/lib/
+	amove usr/lib/libgo.so.*
 }
 
 go() {
@@ -725,31 +664,25 @@ go() {
 	depends="gcc=$_gccrel libgo=$_gccrel !go"
 	install="$pkgname-go.post-install"
 
-	mkdir -p "$subpkgdir"/$_gcclibexec \
-		"$subpkgdir"/usr/lib \
-		"$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/lib/go "$subpkgdir"/usr/lib/
-	mv "$pkgdir"/usr/bin/*gccgo "$subpkgdir"/usr/bin/
-	mv "$pkgdir"/usr/bin/*go "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/*gofmt "$subpkgdir"/usr/bin
-	mv "$pkgdir"/$_gcclibexec/go1 "$subpkgdir"/$_gcclibexec/
-	mv "$pkgdir"/$_gcclibexec/cgo "$subpkgdir"/$_gcclibexec/
-	mv "$pkgdir"/$_gcclibexec/buildid "$subpkgdir"/$_gcclibexec/
-	mv "$pkgdir"/$_gcclibexec/test2json "$subpkgdir"/$_gcclibexec/
-	mv "$pkgdir"/$_gcclibexec/vet "$subpkgdir"/$_gcclibexec/
-	mv "$pkgdir"/usr/lib/libgo.a \
-		"$pkgdir"/usr/lib/libgo.so \
-		"$pkgdir"/usr/lib/libgobegin.a \
-		"$pkgdir"/usr/lib/libgolibbegin.a \
-		"$subpkgdir"/usr/lib/
+	amove usr/lib/go
+	amove usr/bin/*go
+	amove usr/bin/*gofmt
+	amove $_gcclibexec/go1
+	amove $_gcclibexec/cgo
+	amove $_gcclibexec/buildid
+	amove $_gcclibexec/test2json
+	amove $_gcclibexec/vet
+	amove usr/lib/libgo.a
+	amove usr/lib/libgo.so
+	amove usr/lib/libgobegin.a
+	amove usr/lib/libgolibbegin.a
 }
 
 libgfortran() {
 	pkgdesc="Fortran runtime library for GCC"
 	depends=
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libgfortran.so.* "$subpkgdir"/usr/lib/
+	amove usr/lib/libgfortran.so.*
 }
 
 libquadmath() {
@@ -757,8 +690,7 @@ libquadmath() {
 	pkgdesc="128-bit math library for GCC"
 	depends=
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libquadmath.so.* "$subpkgdir"/usr/lib/
+	amove usr/lib/libquadmath.so.*
 }
 
 gfortran() {
@@ -767,38 +699,30 @@ gfortran() {
 	$_libquadmath && depends="$depends libquadmath=$_gccrel"
 	replaces="gcc"
 
-	mkdir -p "$subpkgdir"/$_gcclibexec \
-		"$subpkgdir"/$_gcclibdir \
-		"$subpkgdir"/usr/lib \
-		"$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/*gfortran "$subpkgdir"/usr/bin/
-	mv "$pkgdir"/usr/lib/libgfortran.a \
-		"$pkgdir"/usr/lib/libgfortran.so \
-		"$subpkgdir"/usr/lib/
+	amove usr/bin/*gfortran
+	amove usr/lib/libgfortran.a
+	amove usr/lib/libgfortran.so
 	if $_libquadmath; then
-		mv "$pkgdir"/usr/lib/libquadmath.a \
-			"$pkgdir"/usr/lib/libquadmath.so \
-			"$subpkgdir"/usr/lib/
+		amove usr/lib/libquadmath.a
+		amove usr/lib/libquadmath.so
 	fi
-	mv "$pkgdir"/$_gcclibdir/finclude "$subpkgdir"/$_gcclibdir/
-	mv "$pkgdir"/$_gcclibexec/f951 "$subpkgdir"/$_gcclibexec
-	mv "$pkgdir"/usr/lib/libgfortran.spec "$subpkgdir"/$_gcclibdir
+	amove $_gcclibdir/finclude
+	amove $_gcclibexec/f951
+	mv -v "$pkgdir"/usr/lib/libgfortran.spec "$subpkgdir"/$_gcclibdir/
 }
 
 libgnat() {
 	pkgdesc="GNU Ada runtime shared libraries"
 	depends=
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libgna*.so "$subpkgdir"/usr/lib/
+	amove usr/lib/libgna*.so
 }
 
 libgnatstatic() {
 	pkgdesc="GNU Ada static libraries"
 	depends=
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libgna*.a "$subpkgdir"/usr/lib/
+	amove usr/lib/libgna*.a
 }
 
 gnat() {
@@ -807,12 +731,9 @@ gnat() {
 	provides="$pkgname-gnat-bootstrap=$_gccrel"
 	[ "$CHOST" = "$CTARGET" ] && depends="$depends libgnat=$_gccrel"
 
-	mkdir -p "$subpkgdir"/$_gcclibexec \
-		"$subpkgdir"/$_gcclibdir \
-		"$subpkgdir"/usr/bin
-	mv "$pkgdir"/$_gcclibexec/*gnat* "$subpkgdir"/$_gcclibexec/
-	mv "$pkgdir"/$_gcclibdir/*ada* "$subpkgdir"/$_gcclibdir/
-	mv "$pkgdir"/usr/bin/*gnat* "$subpkgdir"/usr/bin/
+	amove $_gcclibexec/*gnat*
+	amove $_gcclibdir/*ada*
+	amove usr/bin/*gnat*
 }
 
 gdb() {
@@ -864,4 +785,5 @@ c4482ffc36e7894b2140800159f4cbc9a3e9011e43a69b69f4fa92d5a11e2ee645c7e21df4423dd1
 06f64544fd8bc4b6c8b06410c5198aa8fb4e82c232afc0cad83b2c69ac5d39399968206defa78297222700cd18e7fd7e8244afa76d343406a01f657c86306453  0036-libphobos-add-riscv64-and-loongarch64-support.patch
 00319c9770362520e8e93bd03fda1769dfa3622eba77d620e11d8af45a38e6d804a5e924046ae388e1cfaea605696e89c343fca507aaaa5edd58d80744fff14f  fix-arm64.patch
 815265826742400f86336f0c2d3e4edc37398dbc6505ee81107c0103c13ac0f406cff851438d2323033c6c6d0c0323765ee15b975eab8d1dd465f9e988168fb9  ppc64le-quadmath.patch
+ea55e0fa6813fc95c4ca2e87f059182edc54dc61515ebb92bf6eb31dbbd176d0fe81edcc7ea28d32f84ca37e8d48a544623d3d9bc94aa41ffc0859326a616aa2  riscv64-improve-build-time.patch
 "

cross/gcc-x86/riscv64-improve-build-time.patch

@@ -0,0 +1,149 @@
+Patch-Source: https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=2cf89ae83225f932b226cd57ef2d083a59bcf8a3
+--
+From 2cf89ae83225f932b226cd57ef2d083a59bcf8a3 Mon Sep 17 00:00:00 2001
+From: Richard Biener <rguenther@suse.de>
+Date: Tue, 6 Aug 2024 14:56:26 +0200
+Subject: [PATCH] tree-optimization/116166 - forward jump-threading going wild
+
+Currently the forward threader isn't limited as to the search space
+it explores and with it now using path-ranger for simplifying
+conditions it runs into it became pretty slow for degenerate cases
+like compiling insn-emit.cc for RISC-V esp. when compiling for
+a host with LOGICAL_OP_NON_SHORT_CIRCUIT disabled.
+
+The following makes the forward threader honor the search space
+limit I introduced for the backward threader.  This reduces
+compile-time from minutes to seconds for the testcase in PR116166.
+
+Note this wasn't necessary before we had ranger but with ranger
+the work we do is quadatic in the length of the threading path
+we build up (the same is true for the backwards threader).
+
+	PR tree-optimization/116166
+	* tree-ssa-threadedge.h (jump_threader::thread_around_empty_blocks):
+	Add limit parameter.
+	(jump_threader::thread_through_normal_block): Likewise.
+	* tree-ssa-threadedge.cc (jump_threader::thread_around_empty_blocks):
+	Honor and decrement limit parameter.
+	(jump_threader::thread_through_normal_block): Likewise.
+	(jump_threader::thread_across_edge): Initialize limit from
+	param_max_jump_thread_paths and pass it down to workers.
+---
+ gcc/tree-ssa-threadedge.cc | 30 ++++++++++++++++++++++--------
+ gcc/tree-ssa-threadedge.h  |  4 ++--
+ 2 files changed, 24 insertions(+), 10 deletions(-)
+
+diff --git a/gcc/tree-ssa-threadedge.cc b/gcc/tree-ssa-threadedge.cc
+index 7f82639b8ecc..0aa2aa851430 100644
+--- a/gcc/tree-ssa-threadedge.cc
++++ b/gcc/tree-ssa-threadedge.cc
+@@ -786,13 +786,17 @@ propagate_threaded_block_debug_into (basic_block dest, basic_block src)
+ bool
+ jump_threader::thread_around_empty_blocks (vec<jump_thread_edge *> *path,
+ 					   edge taken_edge,
+-					   bitmap visited)
++					   bitmap visited, unsigned &limit)
+ {
+   basic_block bb = taken_edge->dest;
+   gimple_stmt_iterator gsi;
+   gimple *stmt;
+   tree cond;
+ 
++  if (limit == 0)
++    return false;
++  --limit;
++
+   /* The key property of these blocks is that they need not be duplicated
+      when threading.  Thus they cannot have visible side effects such
+      as PHI nodes.  */
+@@ -830,7 +834,8 @@ jump_threader::thread_around_empty_blocks (vec<jump_thread_edge *> *path,
+ 	      m_registry->push_edge (path, taken_edge, EDGE_NO_COPY_SRC_BLOCK);
+ 	      m_state->append_path (taken_edge->dest);
+ 	      bitmap_set_bit (visited, taken_edge->dest->index);
+-	      return thread_around_empty_blocks (path, taken_edge, visited);
++	      return thread_around_empty_blocks (path, taken_edge, visited,
++						 limit);
+ 	    }
+ 	}
+ 
+@@ -872,7 +877,7 @@ jump_threader::thread_around_empty_blocks (vec<jump_thread_edge *> *path,
+       m_registry->push_edge (path, taken_edge, EDGE_NO_COPY_SRC_BLOCK);
+       m_state->append_path (taken_edge->dest);
+ 
+-      thread_around_empty_blocks (path, taken_edge, visited);
++      thread_around_empty_blocks (path, taken_edge, visited, limit);
+       return true;
+     }
+ 
+@@ -899,8 +904,13 @@ jump_threader::thread_around_empty_blocks (vec<jump_thread_edge *> *path,
+ 
+ int
+ jump_threader::thread_through_normal_block (vec<jump_thread_edge *> *path,
+-					    edge e, bitmap visited)
++					    edge e, bitmap visited,
++					    unsigned &limit)
+ {
++  if (limit == 0)
++    return 0;
++  limit--;
++
+   m_state->register_equivs_edge (e);
+ 
+   /* PHIs create temporary equivalences.
+@@ -989,7 +999,7 @@ jump_threader::thread_through_normal_block (vec<jump_thread_edge *> *path,
+  	     visited.  This may be overly conservative.  */
+ 	  bitmap_set_bit (visited, dest->index);
+ 	  bitmap_set_bit (visited, e->dest->index);
+-	  thread_around_empty_blocks (path, taken_edge, visited);
++	  thread_around_empty_blocks (path, taken_edge, visited, limit);
+ 	  return 1;
+ 	}
+     }
+@@ -1075,9 +1085,12 @@ jump_threader::thread_across_edge (edge e)
+   bitmap_set_bit (visited, e->src->index);
+   bitmap_set_bit (visited, e->dest->index);
+ 
++  /* Limit search space.  */
++  unsigned limit = param_max_jump_thread_paths;
++
+   int threaded = 0;
+   if ((e->flags & EDGE_DFS_BACK) == 0)
+-    threaded = thread_through_normal_block (path, e, visited);
++    threaded = thread_through_normal_block (path, e, visited, limit);
+ 
+   if (threaded > 0)
+     {
+@@ -1148,11 +1161,12 @@ jump_threader::thread_across_edge (edge e)
+ 	m_registry->push_edge (path, e, EDGE_START_JUMP_THREAD);
+ 	m_registry->push_edge (path, taken_edge, EDGE_COPY_SRC_JOINER_BLOCK);
+ 
+-	found = thread_around_empty_blocks (path, taken_edge, visited);
++	found = thread_around_empty_blocks (path, taken_edge, visited, limit);
+ 
+ 	if (!found)
+ 	  found = thread_through_normal_block (path,
+-					       path->last ()->e, visited) > 0;
++					       path->last ()->e, visited,
++					       limit) > 0;
+ 
+ 	/* If we were able to thread through a successor of E->dest, then
+ 	   record the jump threading opportunity.  */
+diff --git a/gcc/tree-ssa-threadedge.h b/gcc/tree-ssa-threadedge.h
+index 9f6cbfe93307..245b3506a550 100644
+--- a/gcc/tree-ssa-threadedge.h
++++ b/gcc/tree-ssa-threadedge.h
+@@ -101,9 +101,9 @@ private:
+ 					  unsigned limit);
+ 
+   bool thread_around_empty_blocks (vec<class jump_thread_edge *> *path,
+-				   edge, bitmap visited);
++				   edge, bitmap visited, unsigned &limit);
+   int thread_through_normal_block (vec<jump_thread_edge *> *path,
+-				   edge, bitmap visited);
++				   edge, bitmap visited, unsigned &limit);
+   void thread_across_edge (edge);
+   bool record_temporary_equivalences_from_phis (edge);
+   gimple *record_temporary_equivalences_from_stmts_at_dest (edge);
+-- 
+2.43.5
+

cross/gcc-x86_64/APKBUILD

@@ -34,7 +34,7 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname=gcc-x86_64
-pkgrel=3
+pkgrel=4
 pkgdesc="Stage2 cross-compiler for x86_64"
 url="https://gcc.gnu.org"
 arch="aarch64"
@@ -44,9 +44,11 @@ depends="binutils-x86_64 mpc1"
 makedepends_build="gcc g++ bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev"
 makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-dev-x86_64 binutils-x86_64"
 subpackages="g++-x86_64:gpp libstdc++-dev-x86_64:libcxx_dev"
-[ "$CHOST" = "$CTARGET" ] && subpackages="gcc-gdb gcc-doc$_target"
+[ "$CHOST" = "$CTARGET" ] && subpackages="gcc-gdb gcc-doc"
 replaces="libstdc++ binutils"
-options="!strip"
+options="!strip !tracedeps"
+depends="$depends so:libc.musl-aarch64.so.1 so:libgcc_s.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libstdc++.so.6 so:libz.so.1"
+
 
 : "${LANG_CXX:=true}"
 : "${LANG_D:=true}"
@@ -135,7 +137,6 @@ else
 	export CXXFLAGS_FOR_TARGET="$CXXFLAGS"
 	export LDFLAGS_FOR_TARGET="$LDFLAGS"
 	export BOOT_CFLAGS="$CFLAGS"
-	export BOOT_CXXFLAGS="$CXXFLAGS"
 	export BOOT_LDFLAGS="$LDFLAGS"
 fi
 
@@ -170,7 +171,7 @@ esac
 # currently on x86, x86_64 and ia64
 _libquadmath=$LANG_FORTRAN
 case "$CTARGET_ARCH" in
-x86 | x86_64 | ppc64le)	_libquadmath=$LANG_FORTRAN ;;
+x86 | x86_64 | ppc64le) ;;
 *)		_libquadmath=false ;;
 esac
 
@@ -218,13 +219,12 @@ if $LANG_FORTRAN; then
 	_languages="$_languages,fortran"
 fi
 if $LANG_ADA; then
-	subpackages="$subpackages gcc-gnat$_target:gnat"
+	subpackages="$subpackages gcc-gnat$_target:gnat libgnat::$CTARGET_ARCH"
 	_languages="$_languages,ada"
 	if [ "$CBUILD" = "$CTARGET" ]; then
 		makedepends_build="$makedepends_build gcc-gnat-bootstrap"
-		subpackages="$subpackages libgnat-static:libgnatstatic:$CTARGET_ARCH libgnat::$CTARGET_ARCH"
+		subpackages="$subpackages libgnat-static:libgnatstatic:$CTARGET_ARCH"
 	else
-		subpackages="$subpackages libgnat::$CTARGET_ARCH"
 		makedepends_build="$makedepends_build gcc-gnat gcc-gnat$_cross"
 	fi
 fi
@@ -234,7 +234,7 @@ fi
 makedepends="$makedepends_build $makedepends_host"
 
 # when using upstream releases, use this URI template
-# https://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$pkgver}/gcc-${_pkgbase:-$pkgver}.tar.xz
+# https://gcc.gnu.org/pub/gcc/releases/gcc-$_pkgbase/gcc-$_pkgbase.tar.xz
 #
 # right now, we are using a git snapshot. snapshots are taken from gcc.gnu.org/pub/gcc/snapshots.
 # However, since they are periodically deleted from the GCC mirrors the utilized snapshots are
@@ -244,7 +244,7 @@ makedepends="$makedepends_build $makedepends_host"
 # PLEASE submit all patches to gcc to https://gitlab.alpinelinux.org/kaniini/alpine-gcc-patches,
 # so that they can be properly tracked and easily rebased if needed.
 #source="https://dev.alpinelinux.org/archive/gcc/${_pkgbase%%.*}-$_pkgsnap/gcc-${_pkgbase%%.*}-$_pkgsnap.tar.xz
-source="https://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$pkgver}/gcc-${_pkgbase:-$pkgver}.tar.xz
+source="https://gcc.gnu.org/pub/gcc/releases/gcc-$_pkgbase/gcc-$_pkgbase.tar.xz
 	0001-posix_memalign.patch
 	0002-gcc-poison-system-directories.patch
 	0003-specs-turn-on-Wl-z-now-by-default.patch
@@ -283,6 +283,7 @@ source="https://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$pkgver}/gcc-${_pkg
 	0036-libphobos-add-riscv64-and-loongarch64-support.patch
 	fix-arm64.patch
 	ppc64le-quadmath.patch
+	riscv64-improve-build-time.patch
 	"
 
 # secfixes:
@@ -290,44 +291,21 @@ source="https://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$pkgver}/gcc-${_pkg
 #     - CVE-2023-4039
 
 # we build out-of-tree
-#_gccdir="$srcdir"/gcc-${_pkgbase%%.*}-$_pkgsnap
-_gccdir="$srcdir"/gcc-${_pkgbase:-$pkgver}
-_gcclibdir="/usr/lib/gcc/$CTARGET/${_pkgbase:-$pkgver}"
-_gcclibexec="/usr/libexec/gcc/$CTARGET/${_pkgbase:-$pkgver}"
+#builddir="$srcdir"/gcc-${_pkgbase%%.*}-$_pkgsnap
+builddir="$srcdir"/gcc-$_pkgbase
+_gcclibdir="/usr/lib/gcc/$CTARGET/$_pkgbase"
+_gcclibexec="/usr/libexec/gcc/$CTARGET/$_pkgbase"
 
 prepare() {
-	cd "$_gccdir"
-
-	_err=
-	for i in $source; do
-		case "$i" in
-		*.patch)
-			msg "Applying $i"
-			patch -p1 -i "$srcdir"/$i || _err="$_err $i"
-			;;
-		esac
-	done
-
-	if [ -n "$_err" ]; then
-		error "The following patches failed:"
-		for i in $_err; do
-			echo "  $i"
-		done
-		return 1
-	fi
-
-	echo ${_pkgbase:-$pkgver} > gcc/BASE-VER
+	default_prepare
+	echo $_pkgbase > gcc/BASE-VER
 }
 
 build() {
 	local _arch_configure=
-	local _libc_configure=
 	local _bootstrap_configure=
-	local _symvers=
 	local _jit_configure=
 
-	cd "$_gccdir"
-
 	case "$CTARGET" in
 	aarch64-*-*-*)		_arch_configure="--with-arch=armv8-a --with-abi=lp64";;
 	armv5-*-*-*eabi)	_arch_configure="--with-arch=armv5te --with-tune=arm926ej-s --with-float=soft --with-abi=aapcs-linux";;
@@ -351,15 +329,7 @@ build() {
 	*)	_hash_style_configure="--with-linker-hash-style=gnu" ;;
 	esac
 
-	case "$CTARGET_LIBC" in
-	musl)
-		# musl does not support libsanitizer
-		# alpine musl provides libssp_nonshared.a, so we don't need libssp either
-		_libc_configure="--disable-libssp --disable-libsanitizer"
-		_symvers="--disable-symvers"
-		export libat_cv_have_ifunc=no
-		;;
-	esac
+	export libat_cv_have_ifunc=no
 
 
 	case "$BOOTSTRAP" in
@@ -388,10 +358,8 @@ build() {
 	echo "  CHOST=$CHOST"
 	echo "  CTARGET=$CTARGET"
 	echo "  CTARGET_ARCH=$CTARGET_ARCH"
-	echo "  CTARGET_LIBC=$CTARGET_LIBC"
 	echo "  languages=$_languages"
 	echo "  arch_configure=$_arch_configure"
-	echo "  libc_configure=$_libc_configure"
 	echo "  cross_configure=$_cross_configure"
 	echo "  bootstrap_configure=$_bootstrap_configure"
 	echo "  hash_style_configure=$_hash_style_configure"
@@ -412,7 +380,7 @@ build() {
 		--disable-multilib
 		--disable-nls
 		--disable-werror
-		$_symvers
+		--disable-symvers
 		--enable-__cxa_atexit
 		--enable-default-pie
 		--enable-default-ssp
@@ -420,7 +388,8 @@ build() {
 		--enable-link-serialization=2
 		--enable-linker-build-id
 		$_arch_configure
-		$_libc_configure
+		--disable-libssp
+		--disable-libsanitizer
 		$_cross_configure
 		$_bootstrap_configure
 		--with-bugurl=https://gitlab.alpinelinux.org/alpine/aports/-/issues
@@ -430,7 +399,7 @@ build() {
 
 	mkdir -p "$_builddir"
 	cd "$_builddir"
-	"$_gccdir"/configure $gccconfiguration \
+	"$builddir"/configure $gccconfiguration \
 		--with-pkgversion="$version"
 
 	msg "building gcc"
@@ -446,7 +415,7 @@ build() {
 	if $LANG_JIT; then
 		mkdir -p "$_builddir"/libgccjit-build
 		cd "$_builddir"/libgccjit-build
-		"$_gccdir"/configure $gccconfiguration \
+		"$builddir"/configure $gccconfiguration \
 			--disable-bootstrap \
 			--enable-host-shared \
 			--enable-languages=jit \
@@ -461,7 +430,7 @@ package() {
 	cd "$_builddir"
 	make -j1 DESTDIR="$pkgdir" install
 
-	ln -s gcc "$pkgdir"/usr/bin/cc
+	[ "$CHOST" = "$CTARGET" ] && ln -s gcc "$pkgdir"/usr/bin/cc
 	ln -s ${CTARGET}-gcc "$pkgdir"/usr/bin/${CTARGET}-cc
 
 	if $LANG_JIT; then
@@ -505,25 +474,23 @@ package() {
 
 	# move ada runtime libs
 	if $LANG_ADA; then
-		for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 -name "libgna*.so"); do
+		for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 \( -name "libgna*.so" -o -name "libgna*.a" \) ); do
 			mv "$i" "$pkgdir"/usr/lib/
 			ln -s ../../../../${i##*/} $i
 		done
-		if [ "$CHOST" = "$CTARGET" ]; then
-			for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 -name "libgna*.a"); do
-				mv "$i" "$pkgdir"/usr/lib/
-				ln -s ../../../../${i##*/} $i
-			done
-		fi
 	fi
 
 	if [ "$CHOST" != "$CTARGET" ]; then
 		# cross-gcc: remove any files that would conflict with the
 		# native gcc package
-		rm -rf "$pkgdir"/usr/bin/cc "$pkgdir"/usr/include "${pkgdir:?}"/usr/share
+		rm -rf "$pkgdir"/usr/include "${pkgdir:?}"/usr/share
 		# libcc1 does not depend on target, don't ship it
 		rm -rf "$pkgdir"/usr/lib/libcc1.so*
 
+		# These are moved into packages with arch=$CTARGET_ARCH so remove
+		# cross prefix
+		#mv "$pkgdir"/usr/$CTARGET/lib/*.so.* "$pkgdir"/usr/lib/ # FIXME
+
 		# fixup gcc library symlinks to be linker scripts so
 		# linker finds the libs from relocated sysroot
 		for so in "$pkgdir"/usr/"$CTARGET"/lib/*.so; do
@@ -572,8 +539,7 @@ libatomic() {
 	depends=
 	replaces="gcc"
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/${_target:+$CTARGET/}lib/libatomic.so.* "$subpkgdir"/usr/lib/
+	amove usr/lib/libatomic.so.*
 }
 
 libcxx() {
@@ -586,8 +552,7 @@ libcxx() {
 		nm -D "$pkgdir"/usr/lib/libstdc++.so.* | grep clock_gettime
 	fi
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/${_target:+$CTARGET/}lib/libstdc++.so.* "$subpkgdir"/usr/lib/
+	amove usr/lib/libstdc++.so.*
 }
 
 libcxx_dev() {
@@ -605,15 +570,13 @@ libcxx_dev() {
 
 gpp() {
 	pkgdesc="GNU C++ standard library and compiler"
-	depends="libstdc++=$_gccrel libstdc++-dev$_target=$_gccrel gcc$_target=$_gccrel libc-dev"
-	mkdir -p "$subpkgdir/$_gcclibexec" \
-		"$subpkgdir"/usr/bin \
-		"$subpkgdir"/usr/${_target:+$CTARGET/}include \
-		"$subpkgdir"/usr/${_target:+$CTARGET/}lib \
+	depends="libstdc++-dev$_target=$_gccrel gcc$_target=$_gccrel musl-dev"
+	depends="$depends so:libc.musl-aarch64.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libz.so.1"
 
-	mv "$pkgdir/$_gcclibexec/cc1plus" "$subpkgdir/$_gcclibexec/"
+	[ "$CHOST" = "$CTARGET" ] && depends="$depends libstdc++=$_gccrel"
 
-	mv "$pkgdir"/usr/bin/*++ "$subpkgdir"/usr/bin/
+	amove $_gcclibexec/cc1plus
+	amove usr/bin/*++
 }
 
 jit() {
@@ -632,30 +595,26 @@ libobjc() {
 	pkgdesc="GNU Objective-C runtime"
 	replaces="objc"
 	depends=
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/${_target:+$CTARGET/}lib/libobjc.so.* "$subpkgdir"/usr/lib/
+
+	amove usr/lib/libobjc.so.*
 }
 
 objc() {
 	pkgdesc="GNU Objective-C"
 	replaces="gcc"
-	depends="libc-dev gcc=$_gccrel libobjc=$_gccrel"
+	depends="musl-dev gcc=$_gccrel libobjc=$_gccrel"
 
-	mkdir -p "$subpkgdir/$_gcclibexec" \
-		"$subpkgdir"/$_gcclibdir/include \
-		"$subpkgdir"/usr/lib
-	mv "$pkgdir/$_gcclibexec/cc1obj" "$subpkgdir/$_gcclibexec/"
-	mv "$pkgdir"/$_gcclibdir/include/objc "$subpkgdir"/$_gcclibdir/include/
-	mv "$pkgdir"/usr/lib/libobjc.so "$pkgdir"/usr/lib/libobjc.a \
-		"$subpkgdir"/usr/lib/
+	amove $_gcclibexec/cc1obj
+	amove $_gcclibdir/include/objc
+	amove usr/lib/libobjc.so
+	amove usr/lib/libobjc.a
 }
 
 libgcc() {
 	pkgdesc="GNU C compiler runtime libraries"
 	depends=
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/${_target:+$CTARGET/}lib/libgcc_s.so.* "$subpkgdir"/usr/lib/
+	amove usr/lib/libgcc_s.so.*
 }
 
 libgomp() {
@@ -663,17 +622,15 @@ libgomp() {
 	depends=
 	replaces="gcc"
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/${_target:+$CTARGET/}lib/libgomp.so.* "$subpkgdir"/usr/lib/
+	amove usr/lib/libgomp.so.*
 }
 
 libgphobos() {
 	pkgdesc="D programming language standard library for GCC"
 	depends=
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libgdruntime.so.* "$subpkgdir"/usr/lib/
-	mv "$pkgdir"/usr/lib/libgphobos.so.*  "$subpkgdir"/usr/lib/
+	amove usr/lib/libgdruntime.so.*
+	amove usr/lib/libgphobos.so.*
 }
 
 gdc() {
@@ -682,42 +639,26 @@ gdc() {
 	[ "$CBUILD" = "$CTARGET" ] && depends="$depends libgphobos=$_gccrel"
 	[ "$CHOST" = "$CTARGET" ] && provides="gcc-gdc-bootstrap=$_gccrel"
 
-	mkdir -p "$subpkgdir/$_gcclibexec" \
-		"$subpkgdir"/$_gcclibdir/include/d/ \
-		"$subpkgdir"/usr/lib \
-		"$subpkgdir"/usr/bin
 	# Copy: The installed '.d' files, the static lib, the binary itself
 	# The shared libs are part of 'libgphobos' so one can run program
 	# without installing the compiler
-	mv "$pkgdir/$_gcclibexec/d21" "$subpkgdir/$_gcclibexec/"
-	mv "$pkgdir"/$_gcclibdir/include/d/* "$subpkgdir"/$_gcclibdir/include/d/
+	amove $_gcclibexec/d21
+	amove $_gcclibdir/include/d
 	if [ "$CBUILD" = "$CTARGET" ]; then
-		mv "$pkgdir"/usr/lib/libgdruntime.so "$subpkgdir"/usr/lib/
-		mv "$pkgdir"/usr/lib/libgphobos.so "$subpkgdir"/usr/lib/
+		amove usr/lib/libgdruntime.so
+		amove usr/lib/libgphobos.so
 	fi
-	if [ "$CHOST" = "$CTARGET" ]; then
-		mv "$pkgdir"/usr/lib/libgdruntime.a "$subpkgdir"/usr/lib/
-		mv "$pkgdir"/usr/lib/libgphobos.a "$subpkgdir"/usr/lib/
-		mv "$pkgdir"/usr/lib/libgphobos.spec "$subpkgdir"/usr/lib/
-		mv "$pkgdir"/usr/bin/gdc "$subpkgdir"/usr/bin/
-	else
-		mkdir -p "$subpkgdir"/usr/$CTARGET/lib/
-		mv "$pkgdir"/usr/$CTARGET/lib/libgdruntime.a \
-			"$subpkgdir"/usr/$CTARGET/lib/
-		mv "$pkgdir"/usr/$CTARGET/lib/libgphobos.a \
-			"$subpkgdir"/usr/$CTARGET/lib/
-		mv "$pkgdir"/usr/$CTARGET/lib/libgphobos.spec \
-			"$subpkgdir"/usr/$CTARGET/lib/
-	fi
-	mv "$pkgdir"/usr/bin/$CTARGET-gdc "$subpkgdir"/usr/bin/
+	amove usr/${_target:+$CTARGET/}lib/libgdruntime.a
+	amove usr/${_target:+$CTARGET/}lib/libgphobos.a
+	amove usr/${_target:+$CTARGET/}lib/libgphobos.spec
+	amove usr/bin/*gdc
 }
 
 libgo() {
 	pkgdesc="Go runtime library for GCC"
 	depends=
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libgo.so.* "$subpkgdir"/usr/lib/
+	amove usr/lib/libgo.so.*
 }
 
 go() {
@@ -725,31 +666,25 @@ go() {
 	depends="gcc=$_gccrel libgo=$_gccrel !go"
 	install="$pkgname-go.post-install"
 
-	mkdir -p "$subpkgdir"/$_gcclibexec \
-		"$subpkgdir"/usr/lib \
-		"$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/lib/go "$subpkgdir"/usr/lib/
-	mv "$pkgdir"/usr/bin/*gccgo "$subpkgdir"/usr/bin/
-	mv "$pkgdir"/usr/bin/*go "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/*gofmt "$subpkgdir"/usr/bin
-	mv "$pkgdir"/$_gcclibexec/go1 "$subpkgdir"/$_gcclibexec/
-	mv "$pkgdir"/$_gcclibexec/cgo "$subpkgdir"/$_gcclibexec/
-	mv "$pkgdir"/$_gcclibexec/buildid "$subpkgdir"/$_gcclibexec/
-	mv "$pkgdir"/$_gcclibexec/test2json "$subpkgdir"/$_gcclibexec/
-	mv "$pkgdir"/$_gcclibexec/vet "$subpkgdir"/$_gcclibexec/
-	mv "$pkgdir"/usr/lib/libgo.a \
-		"$pkgdir"/usr/lib/libgo.so \
-		"$pkgdir"/usr/lib/libgobegin.a \
-		"$pkgdir"/usr/lib/libgolibbegin.a \
-		"$subpkgdir"/usr/lib/
+	amove usr/lib/go
+	amove usr/bin/*go
+	amove usr/bin/*gofmt
+	amove $_gcclibexec/go1
+	amove $_gcclibexec/cgo
+	amove $_gcclibexec/buildid
+	amove $_gcclibexec/test2json
+	amove $_gcclibexec/vet
+	amove usr/lib/libgo.a
+	amove usr/lib/libgo.so
+	amove usr/lib/libgobegin.a
+	amove usr/lib/libgolibbegin.a
 }
 
 libgfortran() {
 	pkgdesc="Fortran runtime library for GCC"
 	depends=
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libgfortran.so.* "$subpkgdir"/usr/lib/
+	amove usr/lib/libgfortran.so.*
 }
 
 libquadmath() {
@@ -757,8 +692,7 @@ libquadmath() {
 	pkgdesc="128-bit math library for GCC"
 	depends=
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libquadmath.so.* "$subpkgdir"/usr/lib/
+	amove usr/lib/libquadmath.so.*
 }
 
 gfortran() {
@@ -767,38 +701,30 @@ gfortran() {
 	$_libquadmath && depends="$depends libquadmath=$_gccrel"
 	replaces="gcc"
 
-	mkdir -p "$subpkgdir"/$_gcclibexec \
-		"$subpkgdir"/$_gcclibdir \
-		"$subpkgdir"/usr/lib \
-		"$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/*gfortran "$subpkgdir"/usr/bin/
-	mv "$pkgdir"/usr/lib/libgfortran.a \
-		"$pkgdir"/usr/lib/libgfortran.so \
-		"$subpkgdir"/usr/lib/
+	amove usr/bin/*gfortran
+	amove usr/lib/libgfortran.a
+	amove usr/lib/libgfortran.so
 	if $_libquadmath; then
-		mv "$pkgdir"/usr/lib/libquadmath.a \
-			"$pkgdir"/usr/lib/libquadmath.so \
-			"$subpkgdir"/usr/lib/
+		amove usr/lib/libquadmath.a
+		amove usr/lib/libquadmath.so
 	fi
-	mv "$pkgdir"/$_gcclibdir/finclude "$subpkgdir"/$_gcclibdir/
-	mv "$pkgdir"/$_gcclibexec/f951 "$subpkgdir"/$_gcclibexec
-	mv "$pkgdir"/usr/lib/libgfortran.spec "$subpkgdir"/$_gcclibdir
+	amove $_gcclibdir/finclude
+	amove $_gcclibexec/f951
+	mv -v "$pkgdir"/usr/lib/libgfortran.spec "$subpkgdir"/$_gcclibdir/
 }
 
 libgnat() {
 	pkgdesc="GNU Ada runtime shared libraries"
 	depends=
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libgna*.so "$subpkgdir"/usr/lib/
+	amove usr/lib/libgna*.so
 }
 
 libgnatstatic() {
 	pkgdesc="GNU Ada static libraries"
 	depends=
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libgna*.a "$subpkgdir"/usr/lib/
+	amove usr/lib/libgna*.a
 }
 
 gnat() {
@@ -807,12 +733,9 @@ gnat() {
 	provides="$pkgname-gnat-bootstrap=$_gccrel"
 	[ "$CHOST" = "$CTARGET" ] && depends="$depends libgnat=$_gccrel"
 
-	mkdir -p "$subpkgdir"/$_gcclibexec \
-		"$subpkgdir"/$_gcclibdir \
-		"$subpkgdir"/usr/bin
-	mv "$pkgdir"/$_gcclibexec/*gnat* "$subpkgdir"/$_gcclibexec/
-	mv "$pkgdir"/$_gcclibdir/*ada* "$subpkgdir"/$_gcclibdir/
-	mv "$pkgdir"/usr/bin/*gnat* "$subpkgdir"/usr/bin/
+	amove $_gcclibexec/*gnat*
+	amove $_gcclibdir/*ada*
+	amove usr/bin/*gnat*
 }
 
 gdb() {
@@ -864,4 +787,5 @@ c4482ffc36e7894b2140800159f4cbc9a3e9011e43a69b69f4fa92d5a11e2ee645c7e21df4423dd1
 06f64544fd8bc4b6c8b06410c5198aa8fb4e82c232afc0cad83b2c69ac5d39399968206defa78297222700cd18e7fd7e8244afa76d343406a01f657c86306453  0036-libphobos-add-riscv64-and-loongarch64-support.patch
 00319c9770362520e8e93bd03fda1769dfa3622eba77d620e11d8af45a38e6d804a5e924046ae388e1cfaea605696e89c343fca507aaaa5edd58d80744fff14f  fix-arm64.patch
 815265826742400f86336f0c2d3e4edc37398dbc6505ee81107c0103c13ac0f406cff851438d2323033c6c6d0c0323765ee15b975eab8d1dd465f9e988168fb9  ppc64le-quadmath.patch
+ea55e0fa6813fc95c4ca2e87f059182edc54dc61515ebb92bf6eb31dbbd176d0fe81edcc7ea28d32f84ca37e8d48a544623d3d9bc94aa41ffc0859326a616aa2  riscv64-improve-build-time.patch
 "

cross/gcc-x86_64/riscv64-improve-build-time.patch

@@ -0,0 +1,149 @@
+Patch-Source: https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=2cf89ae83225f932b226cd57ef2d083a59bcf8a3
+--
+From 2cf89ae83225f932b226cd57ef2d083a59bcf8a3 Mon Sep 17 00:00:00 2001
+From: Richard Biener <rguenther@suse.de>
+Date: Tue, 6 Aug 2024 14:56:26 +0200
+Subject: [PATCH] tree-optimization/116166 - forward jump-threading going wild
+
+Currently the forward threader isn't limited as to the search space
+it explores and with it now using path-ranger for simplifying
+conditions it runs into it became pretty slow for degenerate cases
+like compiling insn-emit.cc for RISC-V esp. when compiling for
+a host with LOGICAL_OP_NON_SHORT_CIRCUIT disabled.
+
+The following makes the forward threader honor the search space
+limit I introduced for the backward threader.  This reduces
+compile-time from minutes to seconds for the testcase in PR116166.
+
+Note this wasn't necessary before we had ranger but with ranger
+the work we do is quadatic in the length of the threading path
+we build up (the same is true for the backwards threader).
+
+	PR tree-optimization/116166
+	* tree-ssa-threadedge.h (jump_threader::thread_around_empty_blocks):
+	Add limit parameter.
+	(jump_threader::thread_through_normal_block): Likewise.
+	* tree-ssa-threadedge.cc (jump_threader::thread_around_empty_blocks):
+	Honor and decrement limit parameter.
+	(jump_threader::thread_through_normal_block): Likewise.
+	(jump_threader::thread_across_edge): Initialize limit from
+	param_max_jump_thread_paths and pass it down to workers.
+---
+ gcc/tree-ssa-threadedge.cc | 30 ++++++++++++++++++++++--------
+ gcc/tree-ssa-threadedge.h  |  4 ++--
+ 2 files changed, 24 insertions(+), 10 deletions(-)
+
+diff --git a/gcc/tree-ssa-threadedge.cc b/gcc/tree-ssa-threadedge.cc
+index 7f82639b8ecc..0aa2aa851430 100644
+--- a/gcc/tree-ssa-threadedge.cc
++++ b/gcc/tree-ssa-threadedge.cc
+@@ -786,13 +786,17 @@ propagate_threaded_block_debug_into (basic_block dest, basic_block src)
+ bool
+ jump_threader::thread_around_empty_blocks (vec<jump_thread_edge *> *path,
+ 					   edge taken_edge,
+-					   bitmap visited)
++					   bitmap visited, unsigned &limit)
+ {
+   basic_block bb = taken_edge->dest;
+   gimple_stmt_iterator gsi;
+   gimple *stmt;
+   tree cond;
+ 
++  if (limit == 0)
++    return false;
++  --limit;
++
+   /* The key property of these blocks is that they need not be duplicated
+      when threading.  Thus they cannot have visible side effects such
+      as PHI nodes.  */
+@@ -830,7 +834,8 @@ jump_threader::thread_around_empty_blocks (vec<jump_thread_edge *> *path,
+ 	      m_registry->push_edge (path, taken_edge, EDGE_NO_COPY_SRC_BLOCK);
+ 	      m_state->append_path (taken_edge->dest);
+ 	      bitmap_set_bit (visited, taken_edge->dest->index);
+-	      return thread_around_empty_blocks (path, taken_edge, visited);
++	      return thread_around_empty_blocks (path, taken_edge, visited,
++						 limit);
+ 	    }
+ 	}
+ 
+@@ -872,7 +877,7 @@ jump_threader::thread_around_empty_blocks (vec<jump_thread_edge *> *path,
+       m_registry->push_edge (path, taken_edge, EDGE_NO_COPY_SRC_BLOCK);
+       m_state->append_path (taken_edge->dest);
+ 
+-      thread_around_empty_blocks (path, taken_edge, visited);
++      thread_around_empty_blocks (path, taken_edge, visited, limit);
+       return true;
+     }
+ 
+@@ -899,8 +904,13 @@ jump_threader::thread_around_empty_blocks (vec<jump_thread_edge *> *path,
+ 
+ int
+ jump_threader::thread_through_normal_block (vec<jump_thread_edge *> *path,
+-					    edge e, bitmap visited)
++					    edge e, bitmap visited,
++					    unsigned &limit)
+ {
++  if (limit == 0)
++    return 0;
++  limit--;
++
+   m_state->register_equivs_edge (e);
+ 
+   /* PHIs create temporary equivalences.
+@@ -989,7 +999,7 @@ jump_threader::thread_through_normal_block (vec<jump_thread_edge *> *path,
+  	     visited.  This may be overly conservative.  */
+ 	  bitmap_set_bit (visited, dest->index);
+ 	  bitmap_set_bit (visited, e->dest->index);
+-	  thread_around_empty_blocks (path, taken_edge, visited);
++	  thread_around_empty_blocks (path, taken_edge, visited, limit);
+ 	  return 1;
+ 	}
+     }
+@@ -1075,9 +1085,12 @@ jump_threader::thread_across_edge (edge e)
+   bitmap_set_bit (visited, e->src->index);
+   bitmap_set_bit (visited, e->dest->index);
+ 
++  /* Limit search space.  */
++  unsigned limit = param_max_jump_thread_paths;
++
+   int threaded = 0;
+   if ((e->flags & EDGE_DFS_BACK) == 0)
+-    threaded = thread_through_normal_block (path, e, visited);
++    threaded = thread_through_normal_block (path, e, visited, limit);
+ 
+   if (threaded > 0)
+     {
+@@ -1148,11 +1161,12 @@ jump_threader::thread_across_edge (edge e)
+ 	m_registry->push_edge (path, e, EDGE_START_JUMP_THREAD);
+ 	m_registry->push_edge (path, taken_edge, EDGE_COPY_SRC_JOINER_BLOCK);
+ 
+-	found = thread_around_empty_blocks (path, taken_edge, visited);
++	found = thread_around_empty_blocks (path, taken_edge, visited, limit);
+ 
+ 	if (!found)
+ 	  found = thread_through_normal_block (path,
+-					       path->last ()->e, visited) > 0;
++					       path->last ()->e, visited,
++					       limit) > 0;
+ 
+ 	/* If we were able to thread through a successor of E->dest, then
+ 	   record the jump threading opportunity.  */
+diff --git a/gcc/tree-ssa-threadedge.h b/gcc/tree-ssa-threadedge.h
+index 9f6cbfe93307..245b3506a550 100644
+--- a/gcc/tree-ssa-threadedge.h
++++ b/gcc/tree-ssa-threadedge.h
+@@ -101,9 +101,9 @@ private:
+ 					  unsigned limit);
+ 
+   bool thread_around_empty_blocks (vec<class jump_thread_edge *> *path,
+-				   edge, bitmap visited);
++				   edge, bitmap visited, unsigned &limit);
+   int thread_through_normal_block (vec<jump_thread_edge *> *path,
+-				   edge, bitmap visited);
++				   edge, bitmap visited, unsigned &limit);
+   void thread_across_edge (edge);
+   bool record_temporary_equivalences_from_phis (edge);
+   gimple *record_temporary_equivalences_from_stmts_at_dest (edge);
+-- 
+2.43.5
+

cross/musl-aarch64/APKBUILD

@@ -8,7 +8,7 @@ fi
 
 pkgname=musl-aarch64
 pkgver=1.2.5
-pkgrel=3
+pkgrel=5
 arch="x86_64"
 subpackages="musl-dev-aarch64:package_dev"
 
@@ -57,6 +57,6 @@ package_dev() {
 }
 
 sha512sums="
-30c20d050028bbe9a2203a0db0bb1453d921ac381fc3a7dc2c79c535a7ac25ecf65d7ee367b17178a37aa0e26d028a860d03567e9662c6251171c53bf2562893  musl-1.2.5-r3-aarch64-edge.apk
-43ef19c8698e98eb473116e7c21dbb9e66d994bd1cd63837d0f0c43ceaf1ce4f1db582e48b22478574ef7fe4bc309aa7bb387af2f99d8d88bcecfaf7763ec82c  musl-dev-1.2.5-r3-aarch64-edge.apk
+5b3c6f1f1d87164a8a72c9d90b6e35ccc256bb2f6e1a12e4a3ff04b6309fff6c438eef60b824e4993958c4348c122fb96ef8f59dc468e10ee5be69aa81e6f4bc  musl-1.2.5-r5-aarch64-edge.apk
+ebbd7300b2102f322633dbc01449b5d4f25374609193359bf5da97e3a6cf34f1288a69ed0638bd5505b4548fdeb1efa481c9cd3a031ae3a98759b36cbf2db46e  musl-dev-1.2.5-r5-aarch64-edge.apk
 "

cross/musl-armhf/APKBUILD

@@ -8,7 +8,7 @@ fi
 
 pkgname=musl-armhf
 pkgver=1.2.5
-pkgrel=3
+pkgrel=5
 arch="x86_64"
 subpackages="musl-dev-armhf:package_dev"
 
@@ -57,6 +57,6 @@ package_dev() {
 }
 
 sha512sums="
-b98e17b30e5968ca8f6c963e8752544112337b641186c269dbc4dd4b0a9496de9f4a549deb1bbf03e419b145b86b0c48fd22db1b8dff188bd3b451632b8c2b3f  musl-1.2.5-r3-armhf-edge.apk
-0e9fa461b75f3a9832e26f8086c9397b9d5dbea9c5821cf7898c0ccf64281f603137265606ee97810cba988fdff967ea7ec240e4e59c1d87da7e001cd4bf719a  musl-dev-1.2.5-r3-armhf-edge.apk
+302f14e5dc60b4c55f5f299be6cd158fe0955549e8b559afb5985c29a5c98432f82586732954c0dc3776104efc072b11ad9e4818842e6592df2e1931ba3590de  musl-1.2.5-r5-armhf-edge.apk
+71fc34ce05c5ed73136e77baa478986ec205f882f02602f54f772498451c70a254c89301e932c1e9d3b48a4b4513ca99f64b54de38bdd95966421c297e81ac5b  musl-dev-1.2.5-r5-armhf-edge.apk
 "

cross/musl-armv7/APKBUILD

@@ -8,7 +8,7 @@ fi
 
 pkgname=musl-armv7
 pkgver=1.2.5
-pkgrel=3
+pkgrel=5
 arch="x86_64"
 subpackages="musl-dev-armv7:package_dev"
 
@@ -57,6 +57,6 @@ package_dev() {
 }
 
 sha512sums="
-05d888f66cb8bb75fcf767327068aff0152c32c97d6de680f7df0b9b11bbf99fefd8f2b7c1b92de8489e0f051d536e0d708faa3c5aaff783565e6c0e05d34c3b  musl-1.2.5-r3-armv7-edge.apk
-2c8775a37f2f7d5730857dcf7a7f038a1b0838a775a03e05ce299807f3608a112e95c61b776b32152434c27ee23b999915357b4e89e6559eb89e820666e36d97  musl-dev-1.2.5-r3-armv7-edge.apk
+9e2af487860c1a232941a8c5e9833457af1f8c1bd45ce2105dcffcd39879363d4a14928c8670b6e5b8295c97a9fd121d880f8eee2f301df243e1e12dcae1cb69  musl-1.2.5-r5-armv7-edge.apk
+8de555df4077de3f12bb5a113d2baaa93f403bd829058dd94093e58a0a7cd7b868d76bdc3f5bc0e5953f2bffdac4360cdbbada3be72578a17c7b1118cb2330a0  musl-dev-1.2.5-r5-armv7-edge.apk
 "

cross/musl-riscv64/APKBUILD

@@ -8,7 +8,7 @@ fi
 
 pkgname=musl-riscv64
 pkgver=1.2.5
-pkgrel=3
+pkgrel=5
 arch="x86_64"
 subpackages="musl-dev-riscv64:package_dev"
 
@@ -57,6 +57,6 @@ package_dev() {
 }
 
 sha512sums="
-d9adef7c000203504c357db8b84008f95f97fa68e3944103c345e0bc511f84bff7175ea1afd029de81dd2acce64795c55f100b7abfed3a5bad464c654e620ac3  musl-1.2.5-r3-riscv64-edge.apk
-51a20229c477c691429d2fb800ff441f0181e98879996c0fede94a39e37d66fd2bddd50f663c85090837b8cfaf41ed65c2d2142eaa0ce503b2c5bf6fd2d0194e  musl-dev-1.2.5-r3-riscv64-edge.apk
+4234a6980ea7bae2d275537f2c55e6ff1c480fc1ff838341d252ca71f6d098e1e91b60a8341744c91721d0850886f9155de330de7a71b037b9b87ac514582587  musl-1.2.5-r5-riscv64-edge.apk
+6d10394c2e778699645ed3a65a52bd1fead39aeea13371a83cacae4b301fd577b2cb8cd9779c285d1dafeebef99cbd09807b86013468fe74f45cac1498c400ff  musl-dev-1.2.5-r5-riscv64-edge.apk
 "

cross/musl-x86/APKBUILD

@@ -8,7 +8,7 @@ fi
 
 pkgname=musl-x86
 pkgver=1.2.5
-pkgrel=3
+pkgrel=5
 arch="x86_64"
 subpackages="musl-dev-x86:package_dev"
 
@@ -57,6 +57,6 @@ package_dev() {
 }
 
 sha512sums="
-68f290b5c1a8e8c1b5b70e34c4be391fa49fc8f91902a6dd432a3c34317788c69d5a31f9fedeec51a4d12509aee735d8875f0c4349d3d9cab1d9789a50a78bf8  musl-1.2.5-r3-x86-edge.apk
-2115a6da3ac624872a8e4d764aed69c0e729853d3b74643da83bef1083d20147de2f2f181df82d0bb273fad0597d37b719048bd66e23ed072982018ecf07b8fc  musl-dev-1.2.5-r3-x86-edge.apk
+5a556b306c4fe7969318c3af456dfa3b91f4a8563cf21d95154b27864d74baa68e99fc78302ac1b19f7aa3f72febb647959ef6c1c664798bbc8d411f8fe950f3  musl-1.2.5-r5-x86-edge.apk
+52b49e9789176f47d6c00e0cf5e4ec66a70f1977ae86d4f8cbc33631e0f5586c8d745536aa04fcd612ec4aee9bfca2cc2e5beea0e5108d81a6a8e015a58d1666  musl-dev-1.2.5-r5-x86-edge.apk
 "

cross/musl-x86_64/APKBUILD

@@ -8,7 +8,7 @@ fi
 
 pkgname=musl-x86_64
 pkgver=1.2.5
-pkgrel=3
+pkgrel=5
 arch="aarch64"
 subpackages="musl-dev-x86_64:package_dev"
 
@@ -57,6 +57,6 @@ package_dev() {
 }
 
 sha512sums="
-c4667bf824340766c2b6c41e88e4dc76a7e51b7247ece8f85e8e9347769fce6bd4459d94fcdc82ea12e0a67f7160d68cf2a1ed322eee7d6ca9d075036c17e193  musl-1.2.5-r3-x86_64-edge.apk
-a64220117e1614e585be89fcb00e387b4ea2f4251ce2b6af38c576787093b4ce6a0bed3e4d7bc86517369ee5c4f11db63c6f572e16f336a1178fa99dfa394aff  musl-dev-1.2.5-r3-x86_64-edge.apk
+73c14308a84b80ffefa83e48322869a99c9adede367155493bee7f19e2be0846908cf52f0068748d641df9e19566c2fd49feda56e7848432054674a81c10f85e  musl-1.2.5-r5-x86_64-edge.apk
+8521be7365f75c68752c1527d32bc7c83a9f6670f5aff97752d9708607aaca04bf6afbed437192736f9e1baa85c1ff8f40dc75ce010554ac5ffbc777b9f0a6ac  musl-dev-1.2.5-r5-x86_64-edge.apk
 "

device/archived/device-samsung-on7xelte-downstream/APKBUILD

@@ -3,13 +3,13 @@
 pkgname=device-samsung-on7xelte-downstream
 pkgdesc="Samsung Galaxy J7 Prime"
 pkgver=1
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="
-	linux-samsung-on7xelte
+	linux-samsung-on7xelte-downstream
 	mkbootimg
 	msm-fb-refresher
 	postmarketos-base

device/community/alsa-ucm-conf-qcom-sdm670/APKBUILD

@@ -1,6 +1,6 @@
 # Maintainer: Richard Acayan <mailingradian@gmail.com>
 pkgname=alsa-ucm-conf-qcom-sdm670
-pkgver=1.2.9_git20240801
+pkgver=1.2.9_git20241012
 pkgrel=0
 pkgdesc="ALSA UCM configuration for SDM670 devices"
 url="https://gitlab.com/sdm670-mainline/alsa-ucm-conf"
@@ -8,7 +8,7 @@ arch="aarch64"
 license="BSD-3-Clause"
 provides="alsa-ucm-conf"
 provider_priority=1
-_commit="4712327133bcf730a35ce2c80ffb2dfc06b43df1"
+_commit="437f49545593a3e285feff1820bc1a282213af45"
 source="https://gitlab.com/sdm670-mainline/alsa-ucm-conf/-/archive/$_commit/alsa-ucm-conf-$_commit.tar.gz"
 options="!check"
 
@@ -19,5 +19,5 @@ package() {
 }
 
 sha512sums="
-2401dce746edfef9c025b6e291de42262376839ea0556649b43cce995dbedb71f58574c1654bc05e3b80f19aca4789661f67a5503eb3308fddb6e057fa7c2d2d  alsa-ucm-conf-4712327133bcf730a35ce2c80ffb2dfc06b43df1.tar.gz
+4e0edfaf6451bc0177e2115f21ef00504abf2b974e7f8eb8e5f4089f11ff6d2692ff07965946eb9086b1dce7016ab14bdc998bbf6f72ae9da00d83678ed5c956  alsa-ucm-conf-437f49545593a3e285feff1820bc1a282213af45.tar.gz
 "

device/community/device-lenovo-21bx/APKBUILD

@@ -5,12 +5,13 @@
 pkgname=device-lenovo-21bx
 pkgdesc="Lenovo ThinkPad X13s"
 pkgver=10
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck !strip"
 depends="
+	alsa-ucm-conf
 	bootmac
 	firmware-lenovo-21bx
 	libmbim-tools

device/community/device-motorola-harpia/APKBUILD

@@ -33,7 +33,7 @@ nonfree_firmware() {
 	pkgdesc="GPU/WiFi/BT/Modem/Video firmware"
 	# harpia's WCNSS firmware has problems with WiFi channels on some device
 	# variants, using osprey's firmware seems to help as a workaround
-	# (see https://gitlab.com/postmarketOS/pmaports/-/issues/1085)
+	# (see https://gitlab.postmarketos.org/postmarketOS/pmaports/-/issues/1085)
 	depends="firmware-qcom-adreno-a300 msm-firmware-loader
 		 firmware-motorola-harpia-wcnss-nv firmware-motorola-harpia-venus
 		 firmware-motorola-osprey-wcnss"

device/community/device-nokia-n900/APKBUILD

@@ -2,7 +2,7 @@
 # Maintainer: Sicelo <absicsz@gmail.com>
 # Co-Maintainer: Danct12 <danct12@disroot.org>
 pkgname=device-nokia-n900
-pkgver=29
+pkgver=30
 pkgrel=0
 pkgdesc="Nokia N900"
 url="https://postmarketos.org"
@@ -215,7 +215,7 @@ ff51909873160c2d4c6f0c0119b6d4a02751df29f571b8596b4bc8b04ce2541913c11a583b0e5dab
 67acc17a33bc75113300393b4a5bba15319014032407e774d079abf310368e75f4f697dbb4856ba2d2d8ea184b056bb33561f42918de3ee91ab6a77df89a133c  asound.state.speakers
 3d55e34b95791636e44a5f41754f3d0de039dbba41f7a556d43a95c9e64afcfa930046b4b96b40020b6f196096ffba93514682927e32fa4488686fdd19c6da5a  backlight-enable.sh
 e6bbac8de1a198ba716f44ade76606e1e0adcc574156b855ac41be5eb5308389d3277fd89cc34b119fbc33d9801ab9f79a6ff213392596bff40bc17e931c05ef  device-nokia-n900.start
-2463008d270ed09342f15b51f24ea455bd884021f95397991b85616b6840a6608d91cd1fc43186094f5c3d1bd25e88c16aa9ead07b018aea3d93cd2359bba0b1  deviceinfo
+40aaeb44941a988ab8ec58d331bc6cd42c4a23c6b6e8fc302f9216a38b46baab38d0a0137606a5b7959a51326983c03d684615c5ba9c58b0e36314ec8c49cfbb  deviceinfo
 f48b8dd7297d03008f73e1ecd55b77ace535ecb03f9bdf021123b96fb5f4fb491ff4c532e226b835c8118fa8d505cc4c635a2b604a3e42a162746021552a551c  modules-initfs
 826a3790b49324c1e61c75b6c0ffc043a2a1d7c13a8c554fb5eae4977af47a1ca93d70ef8c783d712b953b70e18ae58fa4c6a49bf97263398a01a0c4f91ebc8f  i3blocks.conf
 506accabcf9fb3e2a270228ea53fdcb57f51092d6e7126a631af8eed697cd882cc805b19cf255422284bec12c928b58219d173a4a790d784db5335a059b6bb4f  i3wm.conf

device/community/device-nokia-n900/deviceinfo

@@ -22,3 +22,4 @@ deviceinfo_swap_size_recommended="1024"
 # Bootloader related
 deviceinfo_flash_method="0xffff"
 deviceinfo_generate_legacy_uboot_initfs="true"
+deviceinfo_partition_type="msdos"

device/community/device-xiaomi-scorpio/APKBUILD

@@ -4,7 +4,7 @@
 pkgname=device-xiaomi-scorpio
 pkgdesc="Xiaomi Mi Note 2"
 pkgver=3
-pkgrel=13
+pkgrel=14
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -15,6 +15,7 @@ depends="
 	megapixels
 	mkbootimg
 	postmarketos-base
+	postprocessd
 	soc-qcom-msm8996
 	soc-qcom-msm8996-ucm
 	"

device/community/firmware-google-sargo/APKBUILD

@@ -1,7 +1,7 @@
 # Maintainer: Richard Acayan <mailingradian@gmail.com>
 pkgname=firmware-google-sargo
 pkgver=220505.008
-pkgrel=5
+pkgrel=6
 pkgdesc="Proprietary firmware blobs from the Google Pixel 3a factory image"
 url="https://github.com/TheMuppets/proprietary_vendor_google_sargo"
 arch="aarch64"
@@ -9,9 +9,11 @@ license="proprietary"
 makedepends="pil-squasher sscregistrygen"
 _commit="c631f0f2aa24ea60cfb505d327cd4ae56ca27f16"
 _modemfw_commit="34bbe2c27f35537f13747c9eba67ece6ae141806"
+_device_android_commit="a1cd8bf2603569b8b3b450b9d7b5b595eb549df0"
 source="
 	https://github.com/TheMuppets/proprietary_vendor_google_sargo/archive/$_commit.tar.gz
 	https://gitlab.com/flamingradian/firmware-google-sargo-modem/-/archive/$_modemfw_commit/firmware-google-sargo-modem-$_modemfw_commit.tar.gz
+	https://raw.githubusercontent.com/LineageOS/android_device_google_bonito/$_device_android_commit/acdbdata/OEM/sdm670-intcodec-s4-snd-card/Global_cal.acdb
 "
 builddir="$srcdir/proprietary_vendor_google_sargo-$_commit"
 options="!check !archcheck !strip !tracedeps pmb:cross-native"
@@ -56,9 +58,13 @@ package() {
 	mkdir -p "$pkgdir"/usr/share/qcom/sdm670/Google/sargo/sensors/
 	cp -r "$builddir"/sensors-registry \
 	      "$pkgdir"/usr/share/qcom/sdm670/Google/sargo/sensors/registry
+
+	install -Dm644 "$srcdir"/Global_cal.acdb \
+		       "$pkgdir"/lib/firmware/qcom/sdm670/sargo/Global_cal.acdb
 }
 
 sha512sums="
 fbbb852405bd521efa4add32136b25f5d07b0671953b05ec66f7b04b6de483269b1e57500f1a723b6b00abb7b9b405e01d14552c686c5c6ffbdb4d0c14f98af0  c631f0f2aa24ea60cfb505d327cd4ae56ca27f16.tar.gz
 53a71c7d51d6277375076dcf7d89c2189ba67272238a8efa89f712238c2474ee777c3b0d749e8e28eeaa8e6bfbbd6eb56949481029d5ca3505cac321ce8963ef  firmware-google-sargo-modem-34bbe2c27f35537f13747c9eba67ece6ae141806.tar.gz
+dc2418dd0a45e0a5ed2e31771f5039d085527e30af9541d4469de7a52071f6a9133d87e00f7697f1379ac1dc201c4f4e8f5031a2eaf27ae5831d35bc06b61578  Global_cal.acdb
 "

device/community/linux-postmarketos-mediatek-mt8173/APKBUILD

@@ -1,8 +1,8 @@
 # Maintainer: Adam Thiede <me@adamthiede.com>
 # Co-Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=linux-postmarketos-mediatek-mt8173
-pkgver=6.10.10
-pkgrel=2
+pkgver=6.11.3
+pkgrel=0
 pkgdesc="Mainline kernel fork for Mediatek MT8173 devices"
 arch="aarch64"
 _carch="arm64"
@@ -37,6 +37,7 @@ source="
 	https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-${pkgver//_/-}.tar.xz
 	$_config
 	fix-mmc-order.patch
+	revert-drm-change.patch
 "
 builddir="$srcdir/linux-${_kernver//_/-}"
 
@@ -66,7 +67,8 @@ package() {
 }
 
 sha512sums="
-affaa3690150ca13f0ee14f91f0e09a5ad3340a7ea6404e34286dfb4bd4fdfe12fcac47e83da7878681bf28a8a8b78e0b315e1563408885dbb07aac5bd2e4dce  linux-6.10.10.tar.xz
-44c35de93ea3bfe214585c4b8909613b17a6e280765ab84352e3d07490a42403e3e68ab7f26eb9442004a1ee7f78ef0fd6ebdeab01561ac84a8073d817ca3434  config-postmarketos-mediatek-mt8173.aarch64
+da3088bf011da14d45c8abf16b003261fadd85bd05e8c48781134c75830b26b5e5ec3b1cf0b1bb0ea18bb596d95e13b5445e8084ae4cb61110db0c719c7b046e  linux-6.11.3.tar.xz
+b3e98c76a0ac95a3d3628296e76400be4a8e0110611151910f4da7512cb5e5493d1074b56fd0a9be083950eb08affc6441b4615c37da3a3a8b3e053e7a963594  config-postmarketos-mediatek-mt8173.aarch64
 c86f8dfc32165a32381d45a4c8b6811ebf43f01b5d8a48fbe227cf5084cfefe24b32264c1c150cb49115db4759a2d21ad48b37dcaac78367d226e9cc2a5ba849  fix-mmc-order.patch
+837e3cbd28f5948beb6f71ce6c39cd738ce5916596c9c3d9727621b7441268a415ec8487dc6b8ae936ac9193bbbd23ebcf023419357e1e1ec5b9d1a9ffc52452  revert-drm-change.patch
 "

device/community/linux-postmarketos-mediatek-mt8173/config-postmarketos-mediatek-mt8173.aarch64

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.10.10 Kernel Configuration
+# Linux/arm64 6.11.3 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (Alpine 14.2.0) 14.2.0"
 CONFIG_CC_IS_GCC=y
@@ -178,7 +178,7 @@ CONFIG_CGROUPS=y
 CONFIG_PAGE_COUNTER=y
 # CONFIG_CGROUP_FAVOR_DYNMODS is not set
 CONFIG_MEMCG=y
-CONFIG_MEMCG_KMEM=y
+# CONFIG_MEMCG_V1 is not set
 CONFIG_BLK_CGROUP=y
 CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
@@ -537,6 +537,7 @@ CONFIG_ARM64_CONTPTE=y
 CONFIG_CMDLINE=""
 CONFIG_EFI_STUB=y
 CONFIG_EFI=y
+# CONFIG_COMPRESSED_INSTALL is not set
 CONFIG_DMI=y
 # end of Boot options
 
@@ -811,7 +812,6 @@ CONFIG_BLK_CGROUP_PUNT_BIO=y
 CONFIG_BLK_DEV_BSG_COMMON=y
 CONFIG_BLK_DEV_BSGLIB=y
 CONFIG_BLK_DEV_INTEGRITY=y
-CONFIG_BLK_DEV_INTEGRITY_T10=y
 CONFIG_BLK_DEV_WRITE_MOUNTED=y
 # CONFIG_BLK_DEV_ZONED is not set
 CONFIG_BLK_DEV_THROTTLING=y
@@ -893,11 +893,12 @@ CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO=y
 # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD is not set
 CONFIG_ZSWAP_COMPRESSOR_DEFAULT="lzo"
 CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y
-# CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD is not set
+# CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD_DEPRECATED is not set
 # CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC is not set
 CONFIG_ZSWAP_ZPOOL_DEFAULT="zbud"
 CONFIG_ZBUD=y
-CONFIG_Z3FOLD=y
+# CONFIG_Z3FOLD_DEPRECATED is not set
+CONFIG_HAVE_ZSMALLOC=y
 CONFIG_ZSMALLOC=y
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_ZSMALLOC_CHAIN_SIZE=8
@@ -909,6 +910,7 @@ CONFIG_SLUB=y
 CONFIG_SLAB_MERGE_DEFAULT=y
 # CONFIG_SLAB_FREELIST_RANDOM is not set
 # CONFIG_SLAB_FREELIST_HARDENED is not set
+# CONFIG_SLAB_BUCKETS is not set
 # CONFIG_SLUB_STATS is not set
 CONFIG_SLUB_CPU_PARTIAL=y
 # CONFIG_RANDOM_KMALLOC_CACHES is not set
@@ -1405,6 +1407,7 @@ CONFIG_NET_DSA_TAG_BRCM_PREPEND=m
 # CONFIG_NET_DSA_TAG_LAN9303 is not set
 # CONFIG_NET_DSA_TAG_SJA1105 is not set
 # CONFIG_NET_DSA_TAG_TRAILER is not set
+# CONFIG_NET_DSA_TAG_VSC73XX_8021Q is not set
 # CONFIG_NET_DSA_TAG_XRS700X is not set
 CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_GVRP=y
@@ -1722,7 +1725,6 @@ CONFIG_PCI_HOST_COMMON=y
 CONFIG_PCI_HOST_GENERIC=y
 # CONFIG_PCIE_MEDIATEK is not set
 # CONFIG_PCIE_MEDIATEK_GEN3 is not set
-# CONFIG_PCIE_MICROCHIP_HOST is not set
 CONFIG_PCI_XGENE=y
 CONFIG_PCI_XGENE_MSI=y
 # CONFIG_PCIE_XILINX is not set
@@ -1751,6 +1753,12 @@ CONFIG_PCIE_KIRIN=y
 # Mobiveil-based PCIe controllers
 #
 # end of Mobiveil-based PCIe controllers
+
+#
+# PLDA-based PCIe controllers
+#
+# CONFIG_PCIE_MICROCHIP_HOST is not set
+# end of PLDA-based PCIe controllers
 # end of PCI controller drivers
 
 #
@@ -2192,6 +2200,7 @@ CONFIG_EEPROM_93CX6=m
 CONFIG_UACCE=m
 # CONFIG_PVPANIC is not set
 # CONFIG_GP_PCI1XXXX is not set
+# CONFIG_KEBA_CP500 is not set
 # end of Misc devices
 
 #
@@ -2580,6 +2589,7 @@ CONFIG_SKY2=y
 # CONFIG_PRESTERA is not set
 # CONFIG_NET_VENDOR_MEDIATEK is not set
 # CONFIG_NET_VENDOR_MELLANOX is not set
+# CONFIG_NET_VENDOR_META is not set
 # CONFIG_NET_VENDOR_MICREL is not set
 # CONFIG_NET_VENDOR_MICROCHIP is not set
 # CONFIG_NET_VENDOR_MICROSEMI is not set
@@ -2776,6 +2786,7 @@ CONFIG_MDIO_BUS_MUX_MMIOREG=m
 #
 # PCS device drivers
 #
+# CONFIG_PCS_XPCS is not set
 # end of PCS device drivers
 
 # CONFIG_PPP is not set
@@ -2847,6 +2858,7 @@ CONFIG_ATH10K_SDIO=m
 # CONFIG_ATH10K_USB is not set
 CONFIG_ATH10K_DEBUG=y
 CONFIG_ATH10K_DEBUGFS=y
+CONFIG_ATH10K_LEDS=y
 # CONFIG_ATH10K_SPECTRAL is not set
 # CONFIG_ATH10K_TRACING is not set
 CONFIG_WCN36XX=m
@@ -2935,6 +2947,7 @@ CONFIG_RTL_CARDS=m
 # CONFIG_RTL8192EE is not set
 # CONFIG_RTL8821AE is not set
 # CONFIG_RTL8192CU is not set
+# CONFIG_RTL8192DU is not set
 CONFIG_RTL8XXXU=m
 # CONFIG_RTL8XXXU_UNTESTED is not set
 # CONFIG_RTW88 is not set
@@ -3476,6 +3489,7 @@ CONFIG_SPI_MEM=y
 # CONFIG_SPI_CADENCE is not set
 CONFIG_SPI_CADENCE_QUADSPI=y
 # CONFIG_SPI_CADENCE_XSPI is not set
+# CONFIG_SPI_CH341 is not set
 CONFIG_SPI_DESIGNWARE=m
 CONFIG_SPI_DW_DMA=y
 # CONFIG_SPI_DW_PCI is not set
@@ -3564,6 +3578,7 @@ CONFIG_PINCTRL_MAX77620=y
 CONFIG_PINCTRL_SINGLE=y
 # CONFIG_PINCTRL_STMFX is not set
 # CONFIG_PINCTRL_SX150X is not set
+# CONFIG_PINCTRL_IMX_SCMI is not set
 
 #
 # MediaTek pinctrl drivers
@@ -3692,6 +3707,12 @@ CONFIG_GPIO_MAX77620=y
 # CONFIG_GPIO_SIM is not set
 # end of Virtual GPIO drivers
 
+#
+# GPIO Debugging utilities
+#
+# CONFIG_GPIO_VIRTUSER is not set
+# end of GPIO Debugging utilities
+
 # CONFIG_W1 is not set
 CONFIG_POWER_RESET=y
 # CONFIG_POWER_RESET_GPIO is not set
@@ -3706,6 +3727,7 @@ CONFIG_POWER_RESET_SYSCON=y
 CONFIG_REBOOT_MODE=y
 CONFIG_SYSCON_REBOOT_MODE=y
 # CONFIG_NVMEM_REBOOT_MODE is not set
+# CONFIG_POWER_SEQUENCING is not set
 CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
 CONFIG_POWER_SUPPLY_HWMON=y
@@ -3727,6 +3749,7 @@ CONFIG_BATTERY_BQ27XXX_I2C=y
 # CONFIG_AXP20X_POWER is not set
 # CONFIG_BATTERY_MAX17040 is not set
 CONFIG_BATTERY_MAX17042=m
+# CONFIG_BATTERY_MAX1720X is not set
 # CONFIG_CHARGER_ISP1704 is not set
 # CONFIG_CHARGER_MAX8903 is not set
 # CONFIG_CHARGER_LP8727 is not set
@@ -3791,6 +3814,7 @@ CONFIG_SENSORS_ARM_SCPI=y
 # CONFIG_SENSORS_CHIPCAP2 is not set
 # CONFIG_SENSORS_CORSAIR_CPRO is not set
 # CONFIG_SENSORS_CORSAIR_PSU is not set
+CONFIG_SENSORS_CROS_EC=y
 # CONFIG_SENSORS_DRIVETEMP is not set
 # CONFIG_SENSORS_DS620 is not set
 # CONFIG_SENSORS_DS1621 is not set
@@ -3910,6 +3934,7 @@ CONFIG_SENSORS_PWM_FAN=m
 CONFIG_SENSORS_INA2XX=m
 # CONFIG_SENSORS_INA238 is not set
 CONFIG_SENSORS_INA3221=m
+# CONFIG_SENSORS_SPD5118 is not set
 # CONFIG_SENSORS_TC74 is not set
 # CONFIG_SENSORS_THMC50 is not set
 # CONFIG_SENSORS_TMP102 is not set
@@ -4058,6 +4083,7 @@ CONFIG_MFD_HI6421_PMIC=y
 # CONFIG_MFD_88PM800 is not set
 # CONFIG_MFD_88PM805 is not set
 # CONFIG_MFD_88PM860X is not set
+# CONFIG_MFD_88PM886_PMIC is not set
 # CONFIG_MFD_MAX14577 is not set
 # CONFIG_MFD_MAX77541 is not set
 CONFIG_MFD_MAX77620=y
@@ -4134,11 +4160,14 @@ CONFIG_MFD_SYSCON=y
 CONFIG_MFD_ROHM_BD718XX=y
 # CONFIG_MFD_ROHM_BD71828 is not set
 # CONFIG_MFD_ROHM_BD957XMUF is not set
+# CONFIG_MFD_ROHM_BD96801 is not set
 # CONFIG_MFD_STPMIC1 is not set
 # CONFIG_MFD_STMFX is not set
 CONFIG_MFD_WCD934X=m
 # CONFIG_MFD_ATC260X_I2C is not set
 # CONFIG_MFD_QCOM_PM8008 is not set
+# CONFIG_MFD_CS40L50_I2C is not set
+# CONFIG_MFD_CS40L50_SPI is not set
 # CONFIG_RAVE_SP_CORE is not set
 # CONFIG_MFD_INTEL_M10_BMC_SPI is not set
 # CONFIG_MFD_RSMU_I2C is not set
@@ -4477,6 +4506,10 @@ CONFIG_VIDEO_MEDIATEK_VPU=m
 # Qualcomm media platform drivers
 #
 
+#
+# Raspberry Pi media platform drivers
+#
+
 #
 # Renesas media platform drivers
 #
@@ -4541,6 +4574,8 @@ CONFIG_VIDEO_CAMERA_SENSOR=y
 # CONFIG_VIDEO_ALVIUM_CSI2 is not set
 # CONFIG_VIDEO_AR0521 is not set
 # CONFIG_VIDEO_GC0308 is not set
+# CONFIG_VIDEO_GC05A2 is not set
+# CONFIG_VIDEO_GC08A3 is not set
 # CONFIG_VIDEO_GC2145 is not set
 # CONFIG_VIDEO_HI556 is not set
 # CONFIG_VIDEO_HI846 is not set
@@ -4550,6 +4585,7 @@ CONFIG_VIDEO_CAMERA_SENSOR=y
 CONFIG_VIDEO_IMX219=m
 # CONFIG_VIDEO_IMX258 is not set
 # CONFIG_VIDEO_IMX274 is not set
+# CONFIG_VIDEO_IMX283 is not set
 # CONFIG_VIDEO_IMX290 is not set
 # CONFIG_VIDEO_IMX296 is not set
 # CONFIG_VIDEO_IMX319 is not set
@@ -4605,7 +4641,7 @@ CONFIG_VIDEO_OV5645=m
 # CONFIG_VIDEO_S5C73M3 is not set
 # CONFIG_VIDEO_S5K5BAF is not set
 # CONFIG_VIDEO_S5K6A3 is not set
-# CONFIG_VIDEO_ST_VGXY61 is not set
+# CONFIG_VIDEO_VGXY61 is not set
 # CONFIG_VIDEO_CCS is not set
 # CONFIG_VIDEO_ET8EK8 is not set
 
@@ -4648,6 +4684,8 @@ CONFIG_VIDEO_OV5645=m
 # CONFIG_VIDEO_DS90UB913 is not set
 # CONFIG_VIDEO_DS90UB953 is not set
 # CONFIG_VIDEO_DS90UB960 is not set
+# CONFIG_VIDEO_MAX96714 is not set
+# CONFIG_VIDEO_MAX96717 is not set
 # end of Video serializers and deserializers
 
 #
@@ -4740,18 +4778,21 @@ CONFIG_DRM_KMS_HELPER=y
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
-CONFIG_DRM_DISPLAY_HELPER=y
 CONFIG_DRM_DISPLAY_DP_AUX_BUS=y
+CONFIG_DRM_DISPLAY_HELPER=y
+CONFIG_DRM_BRIDGE_CONNECTOR=y
 # CONFIG_DRM_DISPLAY_DP_AUX_CEC is not set
 # CONFIG_DRM_DISPLAY_DP_AUX_CHARDEV is not set
 CONFIG_DRM_DISPLAY_DP_HELPER=y
 CONFIG_DRM_DISPLAY_HDCP_HELPER=y
+CONFIG_DRM_DISPLAY_HDMI_HELPER=y
+CONFIG_DRM_DISPLAY_HDMI_STATE_HELPER=y
 CONFIG_DRM_TTM=m
 CONFIG_DRM_EXEC=y
 CONFIG_DRM_GPUVM=y
 CONFIG_DRM_VRAM_HELPER=m
 CONFIG_DRM_TTM_HELPER=m
-CONFIG_DRM_GEM_DMA_HELPER=m
+CONFIG_DRM_GEM_DMA_HELPER=y
 CONFIG_DRM_GEM_SHMEM_HELPER=y
 CONFIG_DRM_SCHED=y
 
@@ -4805,11 +4846,13 @@ CONFIG_DRM_PANEL_BOE_TV101WUM_NL6=y
 # CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D is not set
 # CONFIG_DRM_PANEL_DSI_CM is not set
 CONFIG_DRM_PANEL_LVDS=y
+# CONFIG_DRM_PANEL_HIMAX_HX83102 is not set
 # CONFIG_DRM_PANEL_HIMAX_HX83112A is not set
 # CONFIG_DRM_PANEL_HIMAX_HX8394 is not set
 # CONFIG_DRM_PANEL_ILITEK_IL9322 is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9341 is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9805 is not set
+# CONFIG_DRM_PANEL_ILITEK_ILI9806E is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9881C is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9882T is not set
 # CONFIG_DRM_PANEL_INNOLUX_EJ030NA is not set
@@ -4822,6 +4865,7 @@ CONFIG_DRM_PANEL_INNOLUX_P079ZCA=y
 CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04=y
 # CONFIG_DRM_PANEL_LEADTEK_LTK050H3146W is not set
 # CONFIG_DRM_PANEL_LEADTEK_LTK500HD1829 is not set
+# CONFIG_DRM_PANEL_LINCOLNTECH_LCD197 is not set
 # CONFIG_DRM_PANEL_LG_LB035Q02 is not set
 # CONFIG_DRM_PANEL_LG_LG4573 is not set
 # CONFIG_DRM_PANEL_LG_SW43408 is not set
@@ -5044,6 +5088,7 @@ CONFIG_BACKLIGHT_PWM=y
 # CONFIG_BACKLIGHT_QCOM_WLED is not set
 # CONFIG_BACKLIGHT_ADP8860 is not set
 # CONFIG_BACKLIGHT_ADP8870 is not set
+# CONFIG_BACKLIGHT_LM3509 is not set
 # CONFIG_BACKLIGHT_LM3630A is not set
 # CONFIG_BACKLIGHT_LM3639 is not set
 # CONFIG_BACKLIGHT_LP855X is not set
@@ -5283,6 +5328,7 @@ CONFIG_SND_SOC_I2C_AND_SPI=y
 # CONFIG_SND_SOC_AK4458 is not set
 # CONFIG_SND_SOC_AK4554 is not set
 CONFIG_SND_SOC_AK4613=m
+# CONFIG_SND_SOC_AK4619 is not set
 # CONFIG_SND_SOC_AK4642 is not set
 # CONFIG_SND_SOC_AK5386 is not set
 # CONFIG_SND_SOC_AK5558 is not set
@@ -5326,6 +5372,7 @@ CONFIG_SND_SOC_CROS_EC_CODEC=m
 # CONFIG_SND_SOC_CS4341 is not set
 # CONFIG_SND_SOC_CS4349 is not set
 # CONFIG_SND_SOC_CS53L30 is not set
+# CONFIG_SND_SOC_CS530X_I2C is not set
 # CONFIG_SND_SOC_CX2072X is not set
 # CONFIG_SND_SOC_DA7213 is not set
 CONFIG_SND_SOC_DA7219=m
@@ -5333,6 +5380,7 @@ CONFIG_SND_SOC_DMIC=m
 CONFIG_SND_SOC_HDMI_CODEC=y
 CONFIG_SND_SOC_ES7134=m
 CONFIG_SND_SOC_ES7241=m
+# CONFIG_SND_SOC_ES8311 is not set
 # CONFIG_SND_SOC_ES8316 is not set
 # CONFIG_SND_SOC_ES8326 is not set
 # CONFIG_SND_SOC_ES8328_I2C is not set
@@ -5380,6 +5428,7 @@ CONFIG_SND_SOC_RT1015P=m
 # CONFIG_SND_SOC_RT1308_SDW is not set
 # CONFIG_SND_SOC_RT1316_SDW is not set
 # CONFIG_SND_SOC_RT1318_SDW is not set
+# CONFIG_SND_SOC_RT1320_SDW is not set
 CONFIG_SND_SOC_RT5514=m
 # CONFIG_SND_SOC_RT5616 is not set
 # CONFIG_SND_SOC_RT5631 is not set
@@ -5446,6 +5495,7 @@ CONFIG_SND_SOC_WCD_CLASSH=m
 CONFIG_SND_SOC_WCD9335=m
 CONFIG_SND_SOC_WCD_MBHC=m
 CONFIG_SND_SOC_WCD934X=m
+# CONFIG_SND_SOC_WCD937X_SDW is not set
 # CONFIG_SND_SOC_WCD938X_SDW is not set
 # CONFIG_SND_SOC_WCD939X_SDW is not set
 # CONFIG_SND_SOC_WM8510 is not set
@@ -6113,6 +6163,7 @@ CONFIG_LEDS_CLASS_MULTICOLOR=m
 # CONFIG_LEDS_BCM6328 is not set
 # CONFIG_LEDS_BCM6358 is not set
 # CONFIG_LEDS_CR0014114 is not set
+CONFIG_LEDS_CROS_EC=m
 # CONFIG_LEDS_EL15203000 is not set
 # CONFIG_LEDS_LM3530 is not set
 # CONFIG_LEDS_LM3532 is not set
@@ -6189,6 +6240,7 @@ CONFIG_LEDS_TRIGGER_PANIC=y
 # CONFIG_LEDS_TRIGGER_NETDEV is not set
 CONFIG_LEDS_TRIGGER_PATTERN=y
 # CONFIG_LEDS_TRIGGER_TTY is not set
+# CONFIG_LEDS_TRIGGER_INPUT_EVENTS is not set
 
 #
 # Simple LED drivers
@@ -6538,10 +6590,10 @@ CONFIG_CROS_EC_TYPEC=m
 # CONFIG_CROS_HPS_I2C is not set
 CONFIG_CROS_USBPD_LOGGER=m
 CONFIG_CROS_USBPD_NOTIFY=y
+# CONFIG_CZNIC_PLATFORMS is not set
 # CONFIG_MELLANOX_PLATFORM is not set
 CONFIG_SURFACE_PLATFORMS=y
 CONFIG_ARM64_PLATFORM_DEVICES=y
-# CONFIG_EC_ACER_ASPIRE1 is not set
 CONFIG_HAVE_CLK=y
 CONFIG_HAVE_CLK_PREPARE=y
 CONFIG_COMMON_CLK=y
@@ -7017,6 +7069,7 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
 # CONFIG_AD7291 is not set
 # CONFIG_AD7292 is not set
 # CONFIG_AD7298 is not set
+# CONFIG_AD7380 is not set
 # CONFIG_AD7476 is not set
 # CONFIG_AD7606_IFACE_PARALLEL is not set
 # CONFIG_AD7606_IFACE_SPI is not set
@@ -7031,7 +7084,6 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
 # CONFIG_AD7949 is not set
 # CONFIG_AD799X is not set
 # CONFIG_AD9467 is not set
-# CONFIG_ADI_AXI_ADC is not set
 # CONFIG_AXP20X_ADC is not set
 # CONFIG_AXP288_ADC is not set
 # CONFIG_CC10001_ADC is not set
@@ -7057,6 +7109,7 @@ CONFIG_MAX9611=m
 # CONFIG_MCP3422 is not set
 # CONFIG_MCP3564 is not set
 # CONFIG_MCP3911 is not set
+# CONFIG_MEDIATEK_MT6359_AUXADC is not set
 # CONFIG_MEDIATEK_MT6360_ADC is not set
 CONFIG_MEDIATEK_MT6577_AUXADC=m
 # CONFIG_NAU7802 is not set
@@ -7075,6 +7128,7 @@ CONFIG_QCOM_SPMI_ADC5=m
 # CONFIG_TI_ADC128S052 is not set
 # CONFIG_TI_ADC161S626 is not set
 CONFIG_TI_ADS1015=m
+# CONFIG_TI_ADS1119 is not set
 # CONFIG_TI_ADS7924 is not set
 # CONFIG_TI_ADS1100 is not set
 # CONFIG_TI_ADS1298 is not set
@@ -7126,6 +7180,7 @@ CONFIG_TI_ADS1015=m
 # CONFIG_ATLAS_EZO_SENSOR is not set
 # CONFIG_BME680 is not set
 # CONFIG_CCS811 is not set
+# CONFIG_ENS160 is not set
 # CONFIG_IAQCORE is not set
 # CONFIG_PMS7003 is not set
 # CONFIG_SCD30_CORE is not set
@@ -7179,7 +7234,6 @@ CONFIG_IIO_ST_SENSORS_CORE=m
 # CONFIG_AD5504 is not set
 # CONFIG_AD5624R_SPI is not set
 # CONFIG_AD9739A is not set
-# CONFIG_ADI_AXI_DAC is not set
 # CONFIG_LTC2688 is not set
 # CONFIG_AD5686_SPI is not set
 # CONFIG_AD5696_I2C is not set
@@ -7375,6 +7429,7 @@ CONFIG_SENSORS_ISL29018=m
 CONFIG_VCNL4000=m
 # CONFIG_VCNL4035 is not set
 # CONFIG_VEML6030 is not set
+# CONFIG_VEML6040 is not set
 # CONFIG_VEML6070 is not set
 # CONFIG_VEML6075 is not set
 # CONFIG_VL6180 is not set
@@ -7540,6 +7595,7 @@ CONFIG_PWM=y
 CONFIG_PWM_CROS_EC=y
 # CONFIG_PWM_DWC is not set
 # CONFIG_PWM_FSL_FTM is not set
+# CONFIG_PWM_GPIO is not set
 CONFIG_PWM_MTK_DISP=y
 CONFIG_PWM_MEDIATEK=y
 # CONFIG_PWM_PCA9685 is not set
@@ -7555,7 +7611,9 @@ CONFIG_ARM_GIC_V2M=y
 CONFIG_ARM_GIC_V3=y
 CONFIG_ARM_GIC_V3_ITS=y
 CONFIG_ARM_GIC_V3_ITS_PCI=y
+CONFIG_IRQ_MSI_LIB=y
 # CONFIG_AL_FIC is not set
+# CONFIG_LAN966X_OIC is not set
 # CONFIG_XILINX_INTC is not set
 CONFIG_PARTITION_PERCPU=y
 CONFIG_MST_IRQ=y
@@ -7702,6 +7760,7 @@ CONFIG_PM_OPP=y
 CONFIG_SLIMBUS=m
 CONFIG_SLIM_QCOM_CTRL=m
 CONFIG_INTERCONNECT=y
+# CONFIG_INTERCONNECT_MTK is not set
 # CONFIG_COUNTER is not set
 # CONFIG_MOST is not set
 # CONFIG_PECI is not set
@@ -7796,6 +7855,7 @@ CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
 #
 CONFIG_NETFS_SUPPORT=y
 # CONFIG_NETFS_STATS is not set
+# CONFIG_NETFS_DEBUG is not set
 # CONFIG_FSCACHE is not set
 # end of Caches
 
@@ -8006,6 +8066,9 @@ CONFIG_KEYS=y
 # CONFIG_ENCRYPTED_KEYS is not set
 CONFIG_KEY_DH_OPERATIONS=y
 # CONFIG_SECURITY_DMESG_RESTRICT is not set
+CONFIG_PROC_MEM_ALWAYS_FORCE=y
+# CONFIG_PROC_MEM_FORCE_PTRACE is not set
+# CONFIG_PROC_MEM_NO_FORCE is not set
 CONFIG_SECURITY=y
 CONFIG_SECURITYFS=y
 CONFIG_SECURITY_NETWORK=y
@@ -8120,7 +8183,6 @@ CONFIG_CRYPTO_ECC=m
 CONFIG_CRYPTO_ECDH=m
 # CONFIG_CRYPTO_ECDSA is not set
 # CONFIG_CRYPTO_ECRDSA is not set
-# CONFIG_CRYPTO_SM2 is not set
 # CONFIG_CRYPTO_CURVE25519 is not set
 # end of Public-key cryptography
 

device/community/linux-postmarketos-mediatek-mt8173/revert-drm-change.patch

@@ -0,0 +1,27 @@
+From 94cb0ae98fc7e8e0ad0dc4e0d8f0dde2beb681a8 Mon Sep 17 00:00:00 2001
+From: Adam Thiede <me@adamthiede.com>
+Date: Mon, 30 Sep 2024 08:08:23 -0500
+Subject: [PATCH] Revert "drm/mediatek: Support DRM plane alpha in OVL"
+
+This reverts commit bc46eb5d5d7780782c70c7915f59ed25a908d550.
+---
+ drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
+index 9d6d9fd8342e41..3cf02b4eaff6d1 100644
+--- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
++++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
+@@ -453,10 +453,8 @@ void mtk_ovl_layer_config(struct device *dev, unsigned int idx,
+ 	}
+ 
+ 	con = ovl_fmt_convert(ovl, fmt);
+-	if (state->base.fb) {
+-		con |= OVL_CON_AEN;
+-		con |= state->base.alpha & OVL_CON_ALPHA;
+-	}
++	if (state->base.fb && state->base.fb->format->has_alpha)
++		con |= OVL_CON_AEN | OVL_CON_ALPHA;
+ 
+ 	/* CONST_BLD must be enabled for XRGB formats although the alpha channel
+ 	 * can be ignored, or OVL will still read the value from memory.

device/community/linux-postmarketos-qcom-msm8953/APKBUILD

@@ -5,7 +5,7 @@
 
 _flavor="postmarketos-qcom-msm8953"
 pkgname=linux-$_flavor
-pkgver=6.11.0
+pkgver=6.11.1
 pkgrel=0
 pkgdesc="Close to mainline linux kernel for Qualcomm Snapdragon MSM8953"
 arch="aarch64"
@@ -27,7 +27,7 @@ makedepends="
 	python3
 "
 
-_tag="$pkgver-r2"
+_tag="$pkgver-r0"
 
 source="
 	$pkgname-v$_tag.tar.gz::$url/archive/v$_tag.tar.gz
@@ -61,6 +61,6 @@ package() {
 		"$pkgdir/usr/share/kernel/$_flavor/kernel.release"
 }
 sha512sums="
-3ae8f3f3fa3652b0eaa66d6c144815589969405db96bb60b0ac2fbf8cc6392c96242e5f3f5a4394019a0288821418ec7b6fd2eded4f6d0288cc16d708b71d54e  linux-postmarketos-qcom-msm8953-v6.11.0-r2.tar.gz
-08dc20ca5b72e4c4aaf13dcd34a9346fb08233e97f1cb30c329ac3740afb2cca39743deb0d67bc89a515cfaae41788e7ed105b170c77fc3bffe3242724ad215f  config-postmarketos-qcom-msm8953.aarch64
+1a3778c6c6e05691cdee6358ad76f7b4853a02c2db1be655701db88cc7d68c3ae2355af1a962db052e7622bf7ab30e6b8b03b3e39f26d6e19d035e2a9e17195f  linux-postmarketos-qcom-msm8953-v6.11.1-r0.tar.gz
+49a4f6b018076411909267ac9f2f18544861f2b37e97b3af7828ffd6cf7d89179e43e0eefb5400279577083c471aaa418f79d0869699177265dc76ce4417cf79  config-postmarketos-qcom-msm8953.aarch64
 "

device/community/linux-postmarketos-qcom-msm8953/config-postmarketos-qcom-msm8953.aarch64

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.11.0 Kernel Configuration
+# Linux/arm64 6.11.1 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 14.2.0) 14.2.0"
 CONFIG_CC_IS_GCC=y
@@ -1745,9 +1745,10 @@ CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_NULL_BLK is not set
 CONFIG_ZRAM=m
 # CONFIG_ZRAM_DEF_COMP_LZORLE is not set
-CONFIG_ZRAM_DEF_COMP_LZ4=y
+CONFIG_ZRAM_DEF_COMP_ZSTD=y
+# CONFIG_ZRAM_DEF_COMP_LZ4 is not set
 # CONFIG_ZRAM_DEF_COMP_LZO is not set
-CONFIG_ZRAM_DEF_COMP="lz4"
+CONFIG_ZRAM_DEF_COMP="zstd"
 # CONFIG_ZRAM_WRITEBACK is not set
 # CONFIG_ZRAM_TRACK_ENTRY_ACTIME is not set
 # CONFIG_ZRAM_MEMORY_TRACKING is not set
@@ -3723,6 +3724,12 @@ CONFIG_DRM_PANEL_EDP=m
 # MSM8953 panel drivers generated with linux-mdss-dsi-panel-driver-generator
 #
 CONFIG_DRM_PANEL_MSM8953_GENERATED=m
+CONFIG_DRM_PANEL_ASUS_ZE520KL_ILI7807B_BOE=m
+CONFIG_DRM_PANEL_ASUS_ZE520KL_R63350_TM=m
+CONFIG_DRM_PANEL_ASUS_ZE552KL_ILI7807B_CTC=m
+CONFIG_DRM_PANEL_ASUS_ZE552KL_NT35596_TXD=m
+CONFIG_DRM_PANEL_ASUS_ZE552KL_OTM1901A_LCE=m
+CONFIG_DRM_PANEL_ASUS_ZE552KL_R63350_TM=m
 CONFIG_DRM_PANEL_BOE_BS052FHM_A00_6C01=m
 CONFIG_DRM_PANEL_CSOT_622_V0=m
 CONFIG_DRM_PANEL_FAIRPHONE_FP3_HX83112B=m
@@ -6694,7 +6701,7 @@ CONFIG_CRYPTO_LZO=y
 # CONFIG_CRYPTO_842 is not set
 CONFIG_CRYPTO_LZ4=m
 # CONFIG_CRYPTO_LZ4HC is not set
-# CONFIG_CRYPTO_ZSTD is not set
+CONFIG_CRYPTO_ZSTD=m
 # end of Compression
 
 #

device/community/linux-postmarketos-qcom-sdm670/APKBUILD

@@ -4,8 +4,8 @@
 
 _flavor="postmarketos-qcom-sdm670"
 pkgname=linux-$_flavor
-pkgver=6.10.2
-pkgrel=2
+pkgver=6.11.3
+pkgrel=0
 pkgdesc="Mainline Kernel fork for SDM670 devices"
 arch="aarch64"
 _carch="arm64"
@@ -66,6 +66,6 @@ package() {
 }
 
 sha512sums="
-b992e72c8a8f2186088afb427acb8b79760ddb6350087abe15c0ac6064d10bd77adb2c3e260cf3f2014f93dd4b9fafd3f5a9805e9905cf75907e53a1f672dc36  linux-sdm670-v6.10.2.tar.gz
-b42f289628a1e92f0939ceaf4a3a1a3c4832fb122bd35043190b8a12360257796e41c81ab2d5cc26b7c50201d15723069a37e9ad78b9ca32281ce83164abc172  config-postmarketos-qcom-sdm670.aarch64
+c0503c5de978df3925143d2d27f973c9ce41612020fc5d7d21bf8137c9b6c7f8f0fab6dff7fd8f59606d0b80d51ccc8cb41f8617a4a39befc7cfd4aec5d2fa97  linux-sdm670-v6.11.3.tar.gz
+7f7885a8e5360d451fb2efb934034bbec4c79a12fac62c75d02a7cbb3e24aa22b829e94eb3827dd64e48535c4f38c160ff7c31171a92045232c7c21efe9e1f46  config-postmarketos-qcom-sdm670.aarch64
 "

device/community/linux-postmarketos-qcom-sdm670/config-postmarketos-qcom-sdm670.aarch64

@@ -1,21 +1,23 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.10.2 Kernel Configuration
+# Linux/arm64 6.11.3 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 14.2.0) 14.2.0"
+CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (GCC) 14.1.0"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=140200
+CONFIG_GCC_VERSION=140100
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
 CONFIG_AS_VERSION=24200
 CONFIG_LD_IS_BFD=y
 CONFIG_LD_VERSION=24200
 CONFIG_LLD_VERSION=0
+CONFIG_CC_CAN_LINK=y
+CONFIG_CC_CAN_LINK_STATIC=y
 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
 CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
 CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
-CONFIG_PAHOLE_VERSION=0
+CONFIG_PAHOLE_VERSION=127
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_TABLE_SORT=y
 CONFIG_THREAD_INFO_IN_TASK=y
@@ -176,7 +178,7 @@ CONFIG_CGROUPS=y
 CONFIG_PAGE_COUNTER=y
 # CONFIG_CGROUP_FAVOR_DYNMODS is not set
 CONFIG_MEMCG=y
-CONFIG_MEMCG_KMEM=y
+# CONFIG_MEMCG_V1 is not set
 CONFIG_BLK_CGROUP=y
 CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
@@ -252,7 +254,6 @@ CONFIG_CACHESTAT_SYSCALL=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_SELFTEST is not set
 CONFIG_KALLSYMS_ALL=y
-CONFIG_KALLSYMS_BASE_RELATIVE=y
 CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
 CONFIG_HAVE_PERF_EVENTS=y
 CONFIG_GUEST_PERF_EVENTS=y
@@ -394,9 +395,7 @@ CONFIG_ARM64_ERRATUM_2645198=y
 CONFIG_ARM64_WORKAROUND_SPECULATIVE_UNPRIV_LOAD=y
 CONFIG_ARM64_ERRATUM_2966298=y
 CONFIG_ARM64_ERRATUM_3117295=y
-CONFIG_ARM64_WORKAROUND_SPECULATIVE_SSBS=y
 CONFIG_ARM64_ERRATUM_3194386=y
-CONFIG_ARM64_ERRATUM_3312417=y
 # CONFIG_CAVIUM_ERRATUM_22375 is not set
 CONFIG_CAVIUM_ERRATUM_23144=y
 # CONFIG_CAVIUM_ERRATUM_23154 is not set
@@ -539,6 +538,7 @@ CONFIG_ARM64_CONTPTE=y
 #
 CONFIG_CMDLINE=""
 # CONFIG_EFI is not set
+# CONFIG_COMPRESSED_INSTALL is not set
 # end of Boot options
 
 #
@@ -803,7 +803,6 @@ CONFIG_BLK_DEV_BSG_COMMON=y
 CONFIG_BLK_ICQ=y
 CONFIG_BLK_DEV_BSGLIB=y
 CONFIG_BLK_DEV_INTEGRITY=y
-CONFIG_BLK_DEV_INTEGRITY_T10=y
 CONFIG_BLK_DEV_WRITE_MOUNTED=y
 # CONFIG_BLK_DEV_ZONED is not set
 CONFIG_BLK_DEV_THROTTLING=y
@@ -876,6 +875,7 @@ CONFIG_COREDUMP=y
 #
 CONFIG_SWAP=y
 # CONFIG_ZSWAP is not set
+CONFIG_HAVE_ZSMALLOC=y
 CONFIG_ZSMALLOC=m
 CONFIG_ZSMALLOC_STAT=y
 CONFIG_ZSMALLOC_CHAIN_SIZE=8
@@ -887,6 +887,7 @@ CONFIG_SLUB=y
 CONFIG_SLAB_MERGE_DEFAULT=y
 # CONFIG_SLAB_FREELIST_RANDOM is not set
 # CONFIG_SLAB_FREELIST_HARDENED is not set
+# CONFIG_SLAB_BUCKETS is not set
 # CONFIG_SLUB_STATS is not set
 CONFIG_SLUB_CPU_PARTIAL=y
 # CONFIG_RANDOM_KMALLOC_CACHES is not set
@@ -1466,9 +1467,9 @@ CONFIG_NET_FLOW_LIMIT=y
 # CONFIG_CAN is not set
 CONFIG_BT=m
 CONFIG_BT_BREDR=y
-CONFIG_BT_RFCOMM=y
+CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=y
+CONFIG_BT_BNEP=m
 CONFIG_BT_BNEP_MC_FILTER=y
 CONFIG_BT_BNEP_PROTO_FILTER=y
 CONFIG_BT_HIDP=m
@@ -1711,6 +1712,9 @@ CONFIG_ARM_PSCI_FW=y
 # Qualcomm firmware drivers
 #
 CONFIG_QCOM_SCM=y
+CONFIG_QCOM_TZMEM=y
+# CONFIG_QCOM_TZMEM_MODE_GENERIC is not set
+CONFIG_QCOM_TZMEM_MODE_SHMBRIDGE=y
 # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
 CONFIG_QCOM_QSEECOM=y
 # end of Qualcomm firmware drivers
@@ -1992,6 +1996,7 @@ CONFIG_NET_VENDOR_MARVELL=y
 CONFIG_NET_VENDOR_MELLANOX=y
 # CONFIG_MLXSW_CORE is not set
 # CONFIG_MLXFW is not set
+CONFIG_NET_VENDOR_META=y
 CONFIG_NET_VENDOR_MICREL=y
 # CONFIG_KS8842 is not set
 # CONFIG_KS8851 is not set
@@ -2073,7 +2078,7 @@ CONFIG_BCM_NET_PHYLIB=m
 # CONFIG_LSI_ET1011C_PHY is not set
 CONFIG_MARVELL_PHY=m
 CONFIG_MARVELL_10G_PHY=y
-# CONFIG_MARVELL_88Q2XXX_PHY is not set
+CONFIG_MARVELL_88Q2XXX_PHY=y
 # CONFIG_MARVELL_88X2222_PHY is not set
 # CONFIG_MAXLINEAR_GPHY is not set
 # CONFIG_MEDIATEK_GE_PHY is not set
@@ -2136,6 +2141,7 @@ CONFIG_MDIO_GPIO=y
 #
 # PCS device drivers
 #
+CONFIG_PCS_XPCS=m
 # end of PCS device drivers
 
 # CONFIG_PPP is not set
@@ -2202,6 +2208,7 @@ CONFIG_ATH10K_SDIO=m
 CONFIG_ATH10K_SNOC=m
 CONFIG_ATH10K_DEBUG=y
 CONFIG_ATH10K_DEBUGFS=y
+CONFIG_ATH10K_LEDS=y
 CONFIG_ATH10K_SPECTRAL=y
 # CONFIG_ATH10K_TRACING is not set
 # CONFIG_WCN36XX is not set
@@ -2242,6 +2249,7 @@ CONFIG_WLAN_VENDOR_REALTEK=y
 # CONFIG_RTL8187 is not set
 CONFIG_RTL_CARDS=m
 # CONFIG_RTL8192CU is not set
+# CONFIG_RTL8192DU is not set
 # CONFIG_RTL8XXXU is not set
 # CONFIG_RTW88 is not set
 # CONFIG_RTW89 is not set
@@ -2335,6 +2343,7 @@ CONFIG_KEYBOARD_GPIO_POLLED=m
 # CONFIG_KEYBOARD_OMAP4 is not set
 # CONFIG_KEYBOARD_TM2_TOUCHKEY is not set
 # CONFIG_KEYBOARD_XTKBD is not set
+CONFIG_KEYBOARD_CROS_EC=y
 # CONFIG_KEYBOARD_CAP11XX is not set
 # CONFIG_KEYBOARD_BCM is not set
 # CONFIG_KEYBOARD_CYPRESS_SF is not set
@@ -2711,6 +2720,7 @@ CONFIG_I2C_QUP=y
 #
 # Other I2C/SMBus bus drivers
 #
+CONFIG_I2C_CROS_EC_TUNNEL=y
 # CONFIG_I2C_VIRTIO is not set
 # end of I2C Hardware Bus support
 
@@ -2738,6 +2748,7 @@ CONFIG_SPI_MEM=y
 # CONFIG_SPI_CADENCE is not set
 # CONFIG_SPI_CADENCE_QUADSPI is not set
 # CONFIG_SPI_CADENCE_XSPI is not set
+# CONFIG_SPI_CH341 is not set
 # CONFIG_SPI_DESIGNWARE is not set
 # CONFIG_SPI_GPIO is not set
 # CONFIG_SPI_FSL_SPI is not set
@@ -2820,6 +2831,7 @@ CONFIG_GENERIC_PINCONF=y
 # CONFIG_PINCTRL_STMFX is not set
 # CONFIG_PINCTRL_SX150X is not set
 # CONFIG_PINCTRL_TPS6594 is not set
+# CONFIG_PINCTRL_IMX_SCMI is not set
 CONFIG_PINCTRL_MSM=y
 # CONFIG_PINCTRL_IPQ5018 is not set
 # CONFIG_PINCTRL_IPQ5332 is not set
@@ -2851,24 +2863,25 @@ CONFIG_PINCTRL_SDM670=y
 # CONFIG_PINCTRL_SM6350 is not set
 # CONFIG_PINCTRL_SM6375 is not set
 # CONFIG_PINCTRL_SM7150 is not set
-# CONFIG_PINCTRL_SM8150 is not set
+CONFIG_PINCTRL_SM8150=y
 # CONFIG_PINCTRL_SM8250 is not set
-# CONFIG_PINCTRL_SM8350 is not set
+CONFIG_PINCTRL_SM8350=y
 # CONFIG_PINCTRL_SM8450 is not set
-# CONFIG_PINCTRL_SM8550 is not set
+CONFIG_PINCTRL_SM8550=y
 # CONFIG_PINCTRL_SM8650 is not set
 # CONFIG_PINCTRL_X1E80100 is not set
 CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
 # CONFIG_PINCTRL_QCOM_SSBI_PMIC is not set
 CONFIG_PINCTRL_LPASS_LPI=m
 # CONFIG_PINCTRL_SC7280_LPASS_LPI is not set
+# CONFIG_PINCTRL_SM4250_LPASS_LPI is not set
 CONFIG_PINCTRL_SDM670_LPASS_LPI=m
 # CONFIG_PINCTRL_SM6115_LPASS_LPI is not set
 # CONFIG_PINCTRL_SM8250_LPASS_LPI is not set
 # CONFIG_PINCTRL_SM8350_LPASS_LPI is not set
 # CONFIG_PINCTRL_SM8450_LPASS_LPI is not set
 # CONFIG_PINCTRL_SC8280XP_LPASS_LPI is not set
-# CONFIG_PINCTRL_SM8550_LPASS_LPI is not set
+CONFIG_PINCTRL_SM8550_LPASS_LPI=m
 CONFIG_PINCTRL_SM8650_LPASS_LPI=m
 
 #
@@ -2926,6 +2939,7 @@ CONFIG_GPIO_WCD934X=m
 #
 # MFD GPIO expanders
 #
+# CONFIG_GPIO_CROS_EC is not set
 # CONFIG_GPIO_WM8994 is not set
 # end of MFD GPIO expanders
 
@@ -2955,6 +2969,12 @@ CONFIG_GPIO_AGGREGATOR=m
 # CONFIG_GPIO_SIM is not set
 # end of Virtual GPIO drivers
 
+#
+# GPIO Debugging utilities
+#
+# CONFIG_GPIO_VIRTUSER is not set
+# end of GPIO Debugging utilities
+
 # CONFIG_W1 is not set
 CONFIG_POWER_RESET=y
 # CONFIG_POWER_RESET_GPIO is not set
@@ -2970,6 +2990,8 @@ CONFIG_POWER_RESET_SYSCON_POWEROFF=y
 CONFIG_REBOOT_MODE=y
 CONFIG_SYSCON_REBOOT_MODE=y
 CONFIG_NVMEM_REBOOT_MODE=m
+CONFIG_POWER_SEQUENCING=m
+CONFIG_POWER_SEQUENCING_QCOM_WCN=m
 CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
 CONFIG_POWER_SUPPLY_HWMON=y
@@ -2989,6 +3011,7 @@ CONFIG_BATTERY_QCOM_BATTMGR=m
 # CONFIG_BATTERY_BQ27XXX is not set
 # CONFIG_BATTERY_MAX17040 is not set
 CONFIG_BATTERY_MAX17042=m
+# CONFIG_BATTERY_MAX1720X is not set
 # CONFIG_CHARGER_MAX8903 is not set
 # CONFIG_CHARGER_LP8727 is not set
 # CONFIG_CHARGER_GPIO is not set
@@ -3017,6 +3040,8 @@ CONFIG_CHARGER_RK817=m
 # CONFIG_CHARGER_RT9455 is not set
 # CONFIG_CHARGER_RT9467 is not set
 # CONFIG_CHARGER_RT9471 is not set
+# CONFIG_CHARGER_CROS_USBPD is not set
+CONFIG_CHARGER_CROS_PCHG=y
 # CONFIG_CHARGER_UCS1002 is not set
 # CONFIG_CHARGER_BD99954 is not set
 # CONFIG_BATTERY_UG3105 is not set
@@ -3032,7 +3057,6 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_AD7314 is not set
 # CONFIG_SENSORS_AD7414 is not set
 # CONFIG_SENSORS_AD7418 is not set
-# CONFIG_SENSORS_ADM1021 is not set
 # CONFIG_SENSORS_ADM1025 is not set
 # CONFIG_SENSORS_ADM1026 is not set
 # CONFIG_SENSORS_ADM1029 is not set
@@ -3057,6 +3081,7 @@ CONFIG_SENSORS_ARM_SCMI=y
 # CONFIG_SENSORS_CHIPCAP2 is not set
 # CONFIG_SENSORS_CORSAIR_CPRO is not set
 # CONFIG_SENSORS_CORSAIR_PSU is not set
+CONFIG_SENSORS_CROS_EC=y
 # CONFIG_SENSORS_DS620 is not set
 # CONFIG_SENSORS_DS1621 is not set
 # CONFIG_SENSORS_F71805F is not set
@@ -3105,7 +3130,6 @@ CONFIG_SENSORS_ARM_SCMI=y
 # CONFIG_SENSORS_MAX6620 is not set
 # CONFIG_SENSORS_MAX6621 is not set
 # CONFIG_SENSORS_MAX6639 is not set
-# CONFIG_SENSORS_MAX6642 is not set
 # CONFIG_SENSORS_MAX6650 is not set
 # CONFIG_SENSORS_MAX6697 is not set
 # CONFIG_SENSORS_MAX31790 is not set
@@ -3174,6 +3198,7 @@ CONFIG_SENSORS_LM75=m
 # CONFIG_SENSORS_INA2XX is not set
 # CONFIG_SENSORS_INA238 is not set
 # CONFIG_SENSORS_INA3221 is not set
+# CONFIG_SENSORS_SPD5118 is not set
 # CONFIG_SENSORS_TC74 is not set
 # CONFIG_SENSORS_THMC50 is not set
 # CONFIG_SENSORS_TMP102 is not set
@@ -3243,6 +3268,7 @@ CONFIG_WATCHDOG_OPEN_TIMEOUT=0
 # Watchdog Device Drivers
 #
 # CONFIG_SOFT_WATCHDOG is not set
+# CONFIG_CROS_EC_WATCHDOG is not set
 # CONFIG_GPIO_WATCHDOG is not set
 # CONFIG_XILINX_WATCHDOG is not set
 # CONFIG_XILINX_WINDOW_WATCHDOG is not set
@@ -3282,6 +3308,7 @@ CONFIG_MFD_CORE=y
 # CONFIG_MFD_BCM590XX is not set
 # CONFIG_MFD_BD9571MWV is not set
 # CONFIG_MFD_AXP20X_I2C is not set
+CONFIG_MFD_CROS_EC_DEV=y
 # CONFIG_MFD_CS42L43_I2C is not set
 # CONFIG_MFD_CS42L43_SDW is not set
 # CONFIG_MFD_MADERA is not set
@@ -3305,6 +3332,7 @@ CONFIG_MFD_CORE=y
 # CONFIG_MFD_88PM800 is not set
 # CONFIG_MFD_88PM805 is not set
 # CONFIG_MFD_88PM860X is not set
+# CONFIG_MFD_88PM886_PMIC is not set
 # CONFIG_MFD_MAX14577 is not set
 # CONFIG_MFD_MAX77541 is not set
 # CONFIG_MFD_MAX77620 is not set
@@ -3383,11 +3411,14 @@ CONFIG_MFD_WM8994=m
 # CONFIG_MFD_ROHM_BD718XX is not set
 # CONFIG_MFD_ROHM_BD71828 is not set
 # CONFIG_MFD_ROHM_BD957XMUF is not set
+# CONFIG_MFD_ROHM_BD96801 is not set
 # CONFIG_MFD_STPMIC1 is not set
 # CONFIG_MFD_STMFX is not set
 CONFIG_MFD_WCD934X=m
 # CONFIG_MFD_ATC260X_I2C is not set
 # CONFIG_MFD_QCOM_PM8008 is not set
+# CONFIG_MFD_CS40L50_I2C is not set
+# CONFIG_MFD_CS40L50_SPI is not set
 # CONFIG_RAVE_SP_CORE is not set
 # CONFIG_MFD_INTEL_M10_BMC_SPI is not set
 # CONFIG_MFD_RSMU_I2C is not set
@@ -3403,8 +3434,9 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y
 # CONFIG_REGULATOR_88PG86X is not set
 # CONFIG_REGULATOR_ACT8865 is not set
 # CONFIG_REGULATOR_AD5398 is not set
-# CONFIG_REGULATOR_ARM_SCMI is not set
+CONFIG_REGULATOR_ARM_SCMI=y
 # CONFIG_REGULATOR_AW37503 is not set
+CONFIG_REGULATOR_CROS_EC=y
 # CONFIG_REGULATOR_DA9121 is not set
 # CONFIG_REGULATOR_DA9210 is not set
 # CONFIG_REGULATOR_DA9211 is not set
@@ -3522,6 +3554,7 @@ CONFIG_CEC_CORE=m
 # CONFIG_MEDIA_CEC_RC is not set
 CONFIG_MEDIA_CEC_SUPPORT=y
 # CONFIG_CEC_CH7322 is not set
+# CONFIG_CEC_CROS_EC is not set
 # CONFIG_CEC_GPIO is not set
 # CONFIG_USB_PULSE8_CEC is not set
 # CONFIG_USB_RAINSHADOW_CEC is not set
@@ -3557,6 +3590,8 @@ CONFIG_V4L2_MEM2MEM_DEV=m
 # CONFIG_V4L2_FLASH_LED_CLASS is not set
 CONFIG_V4L2_FWNODE=m
 CONFIG_V4L2_ASYNC=m
+CONFIG_V4L2_CCI=m
+CONFIG_V4L2_CCI_I2C=m
 # end of Video4Linux options
 
 #
@@ -3661,6 +3696,10 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y
 CONFIG_VIDEO_QCOM_CAMSS=m
 CONFIG_VIDEO_QCOM_VENUS=m
 
+#
+# Raspberry Pi media platform drivers
+#
+
 #
 # Renesas media platform drivers
 #
@@ -3720,6 +3759,8 @@ CONFIG_VIDEO_CAMERA_SENSOR=y
 # CONFIG_VIDEO_ALVIUM_CSI2 is not set
 # CONFIG_VIDEO_AR0521 is not set
 # CONFIG_VIDEO_GC0308 is not set
+# CONFIG_VIDEO_GC05A2 is not set
+# CONFIG_VIDEO_GC08A3 is not set
 # CONFIG_VIDEO_GC2145 is not set
 # CONFIG_VIDEO_HI556 is not set
 # CONFIG_VIDEO_HI846 is not set
@@ -3729,12 +3770,14 @@ CONFIG_VIDEO_CAMERA_SENSOR=y
 # CONFIG_VIDEO_IMX219 is not set
 # CONFIG_VIDEO_IMX258 is not set
 # CONFIG_VIDEO_IMX274 is not set
+# CONFIG_VIDEO_IMX283 is not set
 # CONFIG_VIDEO_IMX290 is not set
 # CONFIG_VIDEO_IMX296 is not set
 # CONFIG_VIDEO_IMX319 is not set
 # CONFIG_VIDEO_IMX334 is not set
 # CONFIG_VIDEO_IMX335 is not set
 CONFIG_VIDEO_IMX355=m
+CONFIG_VIDEO_IMX363=m
 # CONFIG_VIDEO_IMX412 is not set
 # CONFIG_VIDEO_IMX415 is not set
 # CONFIG_VIDEO_MT9M001 is not set
@@ -3784,7 +3827,7 @@ CONFIG_VIDEO_OV5640=m
 # CONFIG_VIDEO_S5C73M3 is not set
 # CONFIG_VIDEO_S5K5BAF is not set
 # CONFIG_VIDEO_S5K6A3 is not set
-# CONFIG_VIDEO_ST_VGXY61 is not set
+# CONFIG_VIDEO_VGXY61 is not set
 # CONFIG_VIDEO_CCS is not set
 # CONFIG_VIDEO_ET8EK8 is not set
 
@@ -3827,6 +3870,8 @@ CONFIG_VIDEO_OV5640=m
 # CONFIG_VIDEO_DS90UB913 is not set
 # CONFIG_VIDEO_DS90UB953 is not set
 # CONFIG_VIDEO_DS90UB960 is not set
+# CONFIG_VIDEO_MAX96714 is not set
+# CONFIG_VIDEO_MAX96717 is not set
 # end of Video serializers and deserializers
 
 #
@@ -3853,12 +3898,15 @@ CONFIG_DRM_KMS_HELPER=y
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
 # CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
-CONFIG_DRM_DISPLAY_HELPER=y
 CONFIG_DRM_DISPLAY_DP_AUX_BUS=y
+CONFIG_DRM_DISPLAY_HELPER=y
+CONFIG_DRM_BRIDGE_CONNECTOR=y
 # CONFIG_DRM_DISPLAY_DP_AUX_CEC is not set
 # CONFIG_DRM_DISPLAY_DP_AUX_CHARDEV is not set
 CONFIG_DRM_DISPLAY_DP_HELPER=y
 CONFIG_DRM_DISPLAY_HDCP_HELPER=y
+CONFIG_DRM_DISPLAY_HDMI_HELPER=y
+CONFIG_DRM_DISPLAY_HDMI_STATE_HELPER=y
 CONFIG_DRM_EXEC=m
 CONFIG_DRM_GEM_DMA_HELPER=m
 CONFIG_DRM_GEM_SHMEM_HELPER=m
@@ -3921,11 +3969,13 @@ CONFIG_DRM_PANEL=y
 # CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D is not set
 # CONFIG_DRM_PANEL_DSI_CM is not set
 # CONFIG_DRM_PANEL_LVDS is not set
+# CONFIG_DRM_PANEL_HIMAX_HX83102 is not set
 # CONFIG_DRM_PANEL_HIMAX_HX83112A is not set
 # CONFIG_DRM_PANEL_HIMAX_HX8394 is not set
 # CONFIG_DRM_PANEL_ILITEK_IL9322 is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9341 is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9805 is not set
+# CONFIG_DRM_PANEL_ILITEK_ILI9806E is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9881C is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9882T is not set
 # CONFIG_DRM_PANEL_INNOLUX_EJ030NA is not set
@@ -3938,9 +3988,10 @@ CONFIG_DRM_PANEL=y
 # CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04 is not set
 # CONFIG_DRM_PANEL_LEADTEK_LTK050H3146W is not set
 # CONFIG_DRM_PANEL_LEADTEK_LTK500HD1829 is not set
+# CONFIG_DRM_PANEL_LINCOLNTECH_LCD197 is not set
 # CONFIG_DRM_PANEL_LG_LB035Q02 is not set
 # CONFIG_DRM_PANEL_LG_LG4573 is not set
-# CONFIG_DRM_PANEL_LG_SW43408 is not set
+CONFIG_DRM_PANEL_LG_SW43408=y
 # CONFIG_DRM_PANEL_MAGNACHIP_D53E6EA8966 is not set
 # CONFIG_DRM_PANEL_MANTIX_MLAF057WE51 is not set
 # CONFIG_DRM_PANEL_NEC_NL8048HL11 is not set
@@ -3952,6 +4003,7 @@ CONFIG_DRM_PANEL=y
 # CONFIG_DRM_PANEL_NOVATEK_NT36523 is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT36672A is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT36672E is not set
+CONFIG_DRM_PANEL_NOVATEK_NT37700F=m
 # CONFIG_DRM_PANEL_NOVATEK_NT39016 is not set
 # CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO is not set
 # CONFIG_DRM_PANEL_ORISETECH_OTA5601A is not set
@@ -4015,6 +4067,7 @@ CONFIG_DRM_AUX_HPD_BRIDGE=m
 #
 # CONFIG_DRM_CHIPONE_ICN6211 is not set
 # CONFIG_DRM_CHRONTEL_CH7033 is not set
+# CONFIG_DRM_CROS_EC_ANX7688 is not set
 CONFIG_DRM_DISPLAY_CONNECTOR=m
 # CONFIG_DRM_ITE_IT6505 is not set
 CONFIG_DRM_LONTIUM_LT8912B=m
@@ -4129,6 +4182,7 @@ CONFIG_BACKLIGHT_PWM=y
 CONFIG_BACKLIGHT_QCOM_WLED=y
 # CONFIG_BACKLIGHT_ADP8860 is not set
 # CONFIG_BACKLIGHT_ADP8870 is not set
+# CONFIG_BACKLIGHT_LM3509 is not set
 # CONFIG_BACKLIGHT_LM3630A is not set
 # CONFIG_BACKLIGHT_LM3639 is not set
 # CONFIG_BACKLIGHT_LP855X is not set
@@ -4312,6 +4366,7 @@ CONFIG_SND_SOC_I2C_AND_SPI=y
 # CONFIG_SND_SOC_AK4458 is not set
 # CONFIG_SND_SOC_AK4554 is not set
 # CONFIG_SND_SOC_AK4613 is not set
+# CONFIG_SND_SOC_AK4619 is not set
 # CONFIG_SND_SOC_AK4642 is not set
 # CONFIG_SND_SOC_AK5386 is not set
 # CONFIG_SND_SOC_AK5558 is not set
@@ -4325,6 +4380,7 @@ CONFIG_SND_SOC_I2C_AND_SPI=y
 # CONFIG_SND_SOC_BD28623 is not set
 CONFIG_SND_SOC_BT_SCO=m
 # CONFIG_SND_SOC_CHV3_CODEC is not set
+CONFIG_SND_SOC_CROS_EC_CODEC=m
 # CONFIG_SND_SOC_CS35L32 is not set
 # CONFIG_SND_SOC_CS35L33 is not set
 # CONFIG_SND_SOC_CS35L34 is not set
@@ -4354,12 +4410,14 @@ CONFIG_SND_SOC_CS35L36=m
 # CONFIG_SND_SOC_CS4341 is not set
 # CONFIG_SND_SOC_CS4349 is not set
 # CONFIG_SND_SOC_CS53L30 is not set
+# CONFIG_SND_SOC_CS530X_I2C is not set
 # CONFIG_SND_SOC_CX2072X is not set
 CONFIG_SND_SOC_DA7213=m
 CONFIG_SND_SOC_DMIC=m
 CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_ES7134 is not set
 # CONFIG_SND_SOC_ES7241 is not set
+# CONFIG_SND_SOC_ES8311 is not set
 CONFIG_SND_SOC_ES8316=m
 # CONFIG_SND_SOC_ES8326 is not set
 # CONFIG_SND_SOC_ES8328_I2C is not set
@@ -4405,6 +4463,7 @@ CONFIG_SND_SOC_RL6231=m
 # CONFIG_SND_SOC_RT1308_SDW is not set
 # CONFIG_SND_SOC_RT1316_SDW is not set
 # CONFIG_SND_SOC_RT1318_SDW is not set
+# CONFIG_SND_SOC_RT1320_SDW is not set
 CONFIG_SND_SOC_RT5514=m
 CONFIG_SND_SOC_RT5514_SPI=m
 # CONFIG_SND_SOC_RT5616 is not set
@@ -4470,6 +4529,7 @@ CONFIG_SND_SOC_WCD_CLASSH=m
 CONFIG_SND_SOC_WCD9335=m
 CONFIG_SND_SOC_WCD_MBHC=m
 CONFIG_SND_SOC_WCD934X=m
+# CONFIG_SND_SOC_WCD937X_SDW is not set
 # CONFIG_SND_SOC_WCD938X_SDW is not set
 CONFIG_SND_SOC_WCD939X=m
 CONFIG_SND_SOC_WCD939X_SDW=m
@@ -4571,6 +4631,7 @@ CONFIG_HID_EZKEY=y
 # CONFIG_HID_GFRM is not set
 # CONFIG_HID_GLORIOUS is not set
 # CONFIG_HID_HOLTEK is not set
+# CONFIG_HID_GOOGLE_HAMMER is not set
 # CONFIG_HID_GOOGLE_STADIA_FF is not set
 # CONFIG_HID_VIVALDI is not set
 # CONFIG_HID_GT683R is not set
@@ -5068,6 +5129,7 @@ CONFIG_LEDS_CLASS_MULTICOLOR=m
 # CONFIG_LEDS_BCM6328 is not set
 # CONFIG_LEDS_BCM6358 is not set
 # CONFIG_LEDS_CR0014114 is not set
+CONFIG_LEDS_CROS_EC=m
 # CONFIG_LEDS_EL15203000 is not set
 # CONFIG_LEDS_LM3530 is not set
 # CONFIG_LEDS_LM3532 is not set
@@ -5118,6 +5180,7 @@ CONFIG_LEDS_QCOM_FLASH=m
 # CONFIG_LEDS_RT4505 is not set
 # CONFIG_LEDS_RT8515 is not set
 # CONFIG_LEDS_SGM3140 is not set
+# CONFIG_LEDS_SY7802 is not set
 
 #
 # RGB LED drivers
@@ -5150,6 +5213,7 @@ CONFIG_LEDS_TRIGGER_PANIC=y
 # CONFIG_LEDS_TRIGGER_NETDEV is not set
 CONFIG_LEDS_TRIGGER_PATTERN=y
 # CONFIG_LEDS_TRIGGER_TTY is not set
+# CONFIG_LEDS_TRIGGER_INPUT_EVENTS is not set
 
 #
 # Simple LED drivers
@@ -5264,6 +5328,7 @@ CONFIG_RTC_I2C_AND_SPI=y
 # CONFIG_RTC_DRV_RP5C01 is not set
 # CONFIG_RTC_DRV_OPTEE is not set
 # CONFIG_RTC_DRV_ZYNQMP is not set
+CONFIG_RTC_DRV_CROS_EC=y
 
 #
 # on-CPU RTC drivers
@@ -5444,7 +5509,23 @@ CONFIG_VIDEO_MAX96712=m
 # CONFIG_XIL_AXIS_FIFO is not set
 # CONFIG_FIELDBUS_DEV is not set
 # CONFIG_GOLDFISH is not set
-# CONFIG_CHROME_PLATFORMS is not set
+CONFIG_CHROME_PLATFORMS=y
+CONFIG_CROS_EC=y
+CONFIG_CROS_EC_I2C=y
+CONFIG_CROS_EC_RPMSG=m
+CONFIG_CROS_EC_SPI=y
+CONFIG_CROS_EC_PROTO=y
+CONFIG_CROS_KBD_LED_BACKLIGHT=m
+CONFIG_CROS_EC_CHARDEV=m
+CONFIG_CROS_EC_LIGHTBAR=y
+CONFIG_CROS_EC_VBC=y
+CONFIG_CROS_EC_DEBUGFS=y
+CONFIG_CROS_EC_SENSORHUB=y
+CONFIG_CROS_EC_SYSFS=y
+CONFIG_CROS_EC_TYPEC=m
+# CONFIG_CROS_HPS_I2C is not set
+CONFIG_CROS_USBPD_NOTIFY=y
+# CONFIG_CZNIC_PLATFORMS is not set
 # CONFIG_MELLANOX_PLATFORM is not set
 # CONFIG_SURFACE_PLATFORMS is not set
 # CONFIG_ARM64_PLATFORM_DEVICES is not set
@@ -5482,13 +5563,13 @@ CONFIG_COMMON_CLK_RS9_PCIE=y
 # CONFIG_COMMON_CLK_VC7 is not set
 # CONFIG_COMMON_CLK_FIXED_MMIO is not set
 CONFIG_QCOM_GDSC=y
-CONFIG_QCOM_RPMCC=y
 CONFIG_COMMON_CLK_QCOM=y
 CONFIG_CLK_X1E80100_CAMCC=m
 CONFIG_CLK_X1E80100_DISPCC=m
 CONFIG_CLK_X1E80100_GCC=m
 CONFIG_CLK_X1E80100_GPUCC=m
 CONFIG_CLK_X1E80100_TCSRCC=y
+# CONFIG_CLK_QCM2290_GPUCC is not set
 CONFIG_QCOM_A53PLL=y
 # CONFIG_QCOM_A7PLL is not set
 CONFIG_QCOM_CLK_APCS_MSM8916=y
@@ -5504,6 +5585,7 @@ CONFIG_IPQ_APSS_6018=y
 # CONFIG_IPQ_GCC_6018 is not set
 # CONFIG_IPQ_GCC_8074 is not set
 # CONFIG_IPQ_GCC_9574 is not set
+# CONFIG_IPQ_NSSCC_QCA8K is not set
 # CONFIG_MSM_GCC_8916 is not set
 # CONFIG_MSM_GCC_8917 is not set
 # CONFIG_MSM_GCC_8939 is not set
@@ -5529,7 +5611,7 @@ CONFIG_IPQ_APSS_6018=y
 # CONFIG_SA_GPUCC_8775P is not set
 # CONFIG_SC_GCC_7180 is not set
 # CONFIG_SC_GCC_7280 is not set
-# CONFIG_SC_GCC_8180X is not set
+CONFIG_SC_GCC_8180X=y
 # CONFIG_SC_GCC_8280XP is not set
 # CONFIG_SC_GPUCC_7180 is not set
 # CONFIG_SC_GPUCC_7280 is not set
@@ -5555,9 +5637,11 @@ CONFIG_SDM_DISPCC_845=m
 CONFIG_SDM_LPASSCC_845=m
 # CONFIG_SDX_GCC_75 is not set
 # CONFIG_SM_CAMCC_6350 is not set
+# CONFIG_SM_CAMCC_7150 is not set
 # CONFIG_SM_CAMCC_8250 is not set
 # CONFIG_SM_CAMCC_8450 is not set
 # CONFIG_SM_CAMCC_8550 is not set
+# CONFIG_SM_CAMCC_8650 is not set
 # CONFIG_SM_DISPCC_8250 is not set
 # CONFIG_SM_DISPCC_8650 is not set
 # CONFIG_SM_GCC_4450 is not set
@@ -5566,7 +5650,7 @@ CONFIG_SDM_LPASSCC_845=m
 # CONFIG_SM_GCC_6350 is not set
 # CONFIG_SM_GCC_6375 is not set
 # CONFIG_SM_GCC_7150 is not set
-# CONFIG_SM_GCC_8150 is not set
+CONFIG_SM_GCC_8150=y
 CONFIG_SM_GCC_8250=y
 # CONFIG_SM_GCC_8350 is not set
 # CONFIG_SM_GCC_8450 is not set
@@ -5576,14 +5660,15 @@ CONFIG_SM_GCC_8250=y
 # CONFIG_SM_GPUCC_6125 is not set
 # CONFIG_SM_GPUCC_6375 is not set
 # CONFIG_SM_GPUCC_6350 is not set
-# CONFIG_SM_GPUCC_8150 is not set
+CONFIG_SM_GPUCC_8150=y
 CONFIG_SM_GPUCC_8250=y
 # CONFIG_SM_GPUCC_8350 is not set
 # CONFIG_SM_GPUCC_8450 is not set
 # CONFIG_SM_GPUCC_8550 is not set
 # CONFIG_SM_GPUCC_8650 is not set
-# CONFIG_SM_TCSRCC_8550 is not set
+CONFIG_SM_TCSRCC_8550=y
 # CONFIG_SM_TCSRCC_8650 is not set
+# CONFIG_SM_VIDEOCC_7150 is not set
 # CONFIG_SM_VIDEOCC_8150 is not set
 CONFIG_SM_VIDEOCC_8250=y
 # CONFIG_SM_VIDEOCC_8350 is not set
@@ -5620,6 +5705,7 @@ CONFIG_PLATFORM_MHU=y
 # CONFIG_ALTERA_MBOX is not set
 # CONFIG_MAILBOX_TEST is not set
 CONFIG_QCOM_APCS_IPC=y
+# CONFIG_QCOM_CPUCP_MBOX is not set
 CONFIG_QCOM_IPCC=y
 CONFIG_IOMMU_IOVA=y
 CONFIG_IOMMU_API=y
@@ -5739,7 +5825,9 @@ CONFIG_QCOM_LLCC=y
 CONFIG_QCOM_KRYO_L2_ACCESSORS=y
 CONFIG_QCOM_MDT_LOADER=m
 CONFIG_QCOM_OCMEM=y
+CONFIG_QCOM_PD_MAPPER=m
 CONFIG_QCOM_PDR_HELPERS=y
+CONFIG_QCOM_PDR_MSG=y
 # CONFIG_QCOM_PMIC_PDCHARGER_ULOG is not set
 CONFIG_QCOM_PMIC_GLINK=m
 CONFIG_QCOM_QMI_HELPERS=y
@@ -5832,6 +5920,7 @@ CONFIG_EXTCON=y
 # CONFIG_EXTCON_RT8973A is not set
 # CONFIG_EXTCON_SM5502 is not set
 CONFIG_EXTCON_USB_GPIO=y
+CONFIG_EXTCON_USBC_CROS_EC=y
 # CONFIG_EXTCON_USBC_TUSB320 is not set
 CONFIG_MEMORY=y
 # CONFIG_ARM_PL172_MPMC is not set
@@ -5877,6 +5966,7 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
 # CONFIG_DMARD10 is not set
 # CONFIG_FXLS8962AF_I2C is not set
 # CONFIG_FXLS8962AF_SPI is not set
+# CONFIG_IIO_CROS_EC_ACCEL_LEGACY is not set
 # CONFIG_IIO_ST_ACCEL_3AXIS is not set
 # CONFIG_IIO_KX022A_SPI is not set
 # CONFIG_IIO_KX022A_I2C is not set
@@ -5912,6 +6002,7 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
 # CONFIG_AD7291 is not set
 # CONFIG_AD7292 is not set
 # CONFIG_AD7298 is not set
+# CONFIG_AD7380 is not set
 # CONFIG_AD7476 is not set
 # CONFIG_AD7606_IFACE_PARALLEL is not set
 # CONFIG_AD7606_IFACE_SPI is not set
@@ -5926,7 +6017,6 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
 # CONFIG_AD7949 is not set
 # CONFIG_AD799X is not set
 # CONFIG_AD9467 is not set
-# CONFIG_ADI_AXI_ADC is not set
 # CONFIG_CC10001_ADC is not set
 # CONFIG_ENVELOPE_DETECTOR is not set
 # CONFIG_HI8435 is not set
@@ -5968,6 +6058,7 @@ CONFIG_QCOM_SPMI_ADC5=y
 # CONFIG_TI_ADC128S052 is not set
 # CONFIG_TI_ADC161S626 is not set
 CONFIG_TI_ADS1015=m
+# CONFIG_TI_ADS1119 is not set
 # CONFIG_TI_ADS7924 is not set
 # CONFIG_TI_ADS1100 is not set
 # CONFIG_TI_ADS1298 is not set
@@ -6019,6 +6110,7 @@ CONFIG_TI_ADS1015=m
 # CONFIG_ATLAS_EZO_SENSOR is not set
 # CONFIG_BME680 is not set
 # CONFIG_CCS811 is not set
+# CONFIG_ENS160 is not set
 # CONFIG_IAQCORE is not set
 # CONFIG_PMS7003 is not set
 # CONFIG_SCD30_CORE is not set
@@ -6031,6 +6123,10 @@ CONFIG_TI_ADS1015=m
 # CONFIG_VZ89X is not set
 # end of Chemical Sensors
 
+CONFIG_IIO_CROS_EC_SENSORS_CORE=m
+CONFIG_IIO_CROS_EC_SENSORS=m
+# CONFIG_IIO_CROS_EC_SENSORS_LID_ANGLE is not set
+
 #
 # Hid Sensor IIO Common
 #
@@ -6067,7 +6163,6 @@ CONFIG_IIO_ST_SENSORS_CORE=m
 # CONFIG_AD5504 is not set
 # CONFIG_AD5624R_SPI is not set
 # CONFIG_AD9739A is not set
-# CONFIG_ADI_AXI_DAC is not set
 # CONFIG_LTC2688 is not set
 # CONFIG_AD5686_SPI is not set
 # CONFIG_AD5696_I2C is not set
@@ -6223,6 +6318,7 @@ CONFIG_IIO_ST_LSM6DSX_SPI=m
 # CONFIG_CM3323 is not set
 # CONFIG_CM3605 is not set
 # CONFIG_CM36651 is not set
+CONFIG_IIO_CROS_EC_LIGHT_PROX=m
 # CONFIG_GP2AP002 is not set
 # CONFIG_GP2AP020A00F is not set
 # CONFIG_SENSORS_ISL29018 is not set
@@ -6258,6 +6354,7 @@ CONFIG_IIO_ST_LSM6DSX_SPI=m
 CONFIG_VCNL4000=m
 # CONFIG_VCNL4035 is not set
 # CONFIG_VEML6030 is not set
+# CONFIG_VEML6040 is not set
 # CONFIG_VEML6070 is not set
 # CONFIG_VEML6075 is not set
 # CONFIG_VL6180 is not set
@@ -6338,6 +6435,7 @@ CONFIG_IIO_ST_MAGN_SPI_3AXIS=m
 # CONFIG_ABP060MG is not set
 # CONFIG_ROHM_BM1390 is not set
 # CONFIG_BMP280 is not set
+CONFIG_IIO_CROS_EC_BARO=m
 # CONFIG_DLHL60D is not set
 # CONFIG_DPS310 is not set
 # CONFIG_HP03 is not set
@@ -6364,6 +6462,7 @@ CONFIG_IIO_ST_MAGN_SPI_3AXIS=m
 #
 # Proximity and distance sensors
 #
+# CONFIG_CROS_EC_MKBP_PROXIMITY is not set
 # CONFIG_IRSD200 is not set
 # CONFIG_ISL29501 is not set
 # CONFIG_LIDAR_LITE_V2 is not set
@@ -6411,7 +6510,9 @@ CONFIG_PWM=y
 # CONFIG_PWM_DEBUG is not set
 # CONFIG_PWM_ATMEL_TCB is not set
 # CONFIG_PWM_CLK is not set
+CONFIG_PWM_CROS_EC=m
 # CONFIG_PWM_FSL_FTM is not set
+# CONFIG_PWM_GPIO is not set
 # CONFIG_PWM_PCA9685 is not set
 # CONFIG_PWM_XILINX is not set
 
@@ -6423,7 +6524,9 @@ CONFIG_ARM_GIC=y
 CONFIG_ARM_GIC_MAX_NR=1
 CONFIG_ARM_GIC_V3=y
 CONFIG_ARM_GIC_V3_ITS=y
+CONFIG_IRQ_MSI_LIB=y
 # CONFIG_AL_FIC is not set
+# CONFIG_LAN966X_OIC is not set
 # CONFIG_XILINX_INTC is not set
 CONFIG_PARTITION_PERCPU=y
 CONFIG_QCOM_PDC=y
@@ -6519,6 +6622,7 @@ CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder"
 # CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # end of Android
 
+CONFIG_TRACE_GPU_MEM=y
 # CONFIG_LIBNVDIMM is not set
 # CONFIG_DAX is not set
 CONFIG_NVMEM=y
@@ -6577,6 +6681,7 @@ CONFIG_INTERCONNECT_QCOM_BCM_VOTER=y
 # CONFIG_INTERCONNECT_QCOM_MSM8909 is not set
 # CONFIG_INTERCONNECT_QCOM_MSM8916 is not set
 # CONFIG_INTERCONNECT_QCOM_MSM8939 is not set
+# CONFIG_INTERCONNECT_QCOM_MSM8953 is not set
 # CONFIG_INTERCONNECT_QCOM_MSM8974 is not set
 # CONFIG_INTERCONNECT_QCOM_MSM8996 is not set
 CONFIG_INTERCONNECT_QCOM_OSM_L3=y
@@ -6586,10 +6691,10 @@ CONFIG_INTERCONNECT_QCOM_QDU1000=y
 CONFIG_INTERCONNECT_QCOM_RPMH_POSSIBLE=y
 CONFIG_INTERCONNECT_QCOM_RPMH=y
 # CONFIG_INTERCONNECT_QCOM_SA8775P is not set
-# CONFIG_INTERCONNECT_QCOM_SC7180 is not set
+CONFIG_INTERCONNECT_QCOM_SC7180=y
 # CONFIG_INTERCONNECT_QCOM_SC7280 is not set
 # CONFIG_INTERCONNECT_QCOM_SC8180X is not set
-# CONFIG_INTERCONNECT_QCOM_SC8280XP is not set
+CONFIG_INTERCONNECT_QCOM_SC8280XP=y
 # CONFIG_INTERCONNECT_QCOM_SDM660 is not set
 CONFIG_INTERCONNECT_QCOM_SDM670=y
 # CONFIG_INTERCONNECT_QCOM_SDM845 is not set
@@ -6599,11 +6704,11 @@ CONFIG_INTERCONNECT_QCOM_SDM670=y
 # CONFIG_INTERCONNECT_QCOM_SM6115 is not set
 # CONFIG_INTERCONNECT_QCOM_SM6350 is not set
 # CONFIG_INTERCONNECT_QCOM_SM7150 is not set
-# CONFIG_INTERCONNECT_QCOM_SM8150 is not set
+CONFIG_INTERCONNECT_QCOM_SM8150=y
 # CONFIG_INTERCONNECT_QCOM_SM8250 is not set
-# CONFIG_INTERCONNECT_QCOM_SM8350 is not set
-# CONFIG_INTERCONNECT_QCOM_SM8450 is not set
-# CONFIG_INTERCONNECT_QCOM_SM8550 is not set
+CONFIG_INTERCONNECT_QCOM_SM8350=y
+CONFIG_INTERCONNECT_QCOM_SM8450=y
+CONFIG_INTERCONNECT_QCOM_SM8550=y
 # CONFIG_INTERCONNECT_QCOM_SM8650 is not set
 # CONFIG_INTERCONNECT_QCOM_X1E80100 is not set
 CONFIG_INTERCONNECT_CLK=y
@@ -6703,6 +6808,7 @@ CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
 #
 CONFIG_NETFS_SUPPORT=y
 # CONFIG_NETFS_STATS is not set
+# CONFIG_NETFS_DEBUG is not set
 # CONFIG_FSCACHE is not set
 # end of Caches
 
@@ -6871,7 +6977,7 @@ CONFIG_NLS_CODEPAGE_437=y
 # CONFIG_NLS_ISO8859_8 is not set
 # CONFIG_NLS_CODEPAGE_1250 is not set
 # CONFIG_NLS_CODEPAGE_1251 is not set
-# CONFIG_NLS_ASCII is not set
+CONFIG_NLS_ASCII=y
 CONFIG_NLS_ISO8859_1=y
 # CONFIG_NLS_ISO8859_2 is not set
 # CONFIG_NLS_ISO8859_3 is not set
@@ -6913,6 +7019,9 @@ CONFIG_KEYS=y
 # CONFIG_ENCRYPTED_KEYS is not set
 CONFIG_KEY_DH_OPERATIONS=y
 # CONFIG_SECURITY_DMESG_RESTRICT is not set
+CONFIG_PROC_MEM_ALWAYS_FORCE=y
+# CONFIG_PROC_MEM_FORCE_PTRACE is not set
+# CONFIG_PROC_MEM_NO_FORCE is not set
 CONFIG_SECURITY=y
 CONFIG_SECURITYFS=y
 # CONFIG_SECURITY_NETWORK is not set
@@ -7017,7 +7126,6 @@ CONFIG_CRYPTO_ECC=m
 CONFIG_CRYPTO_ECDH=m
 # CONFIG_CRYPTO_ECDSA is not set
 # CONFIG_CRYPTO_ECRDSA is not set
-# CONFIG_CRYPTO_SM2 is not set
 CONFIG_CRYPTO_CURVE25519=m
 # end of Public-key cryptography
 
@@ -7416,6 +7524,8 @@ CONFIG_DEBUG_INFO_COMPRESSED_NONE=y
 # CONFIG_DEBUG_INFO_COMPRESSED_ZLIB is not set
 # CONFIG_DEBUG_INFO_COMPRESSED_ZSTD is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
+CONFIG_PAHOLE_HAS_SPLIT_BTF=y
+CONFIG_PAHOLE_HAS_LANG_EXCLUDE=y
 # CONFIG_GDB_SCRIPTS is not set
 CONFIG_FRAME_WARN=2048
 # CONFIG_STRIP_ASM_SYMS is not set
@@ -7700,7 +7810,6 @@ CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_TEST_LKM is not set
 # CONFIG_TEST_BITOPS is not set
 # CONFIG_TEST_VMALLOC is not set
-# CONFIG_TEST_USER_COPY is not set
 # CONFIG_TEST_BPF is not set
 # CONFIG_TEST_BLACKHOLE_DEV is not set
 # CONFIG_FIND_BIT_BENCHMARK is not set

device/community/linux-postmarketos-qcom-sdm845/APKBUILD

@@ -5,8 +5,8 @@
 
 _flavor="postmarketos-qcom-sdm845"
 pkgname=linux-$_flavor
-pkgver=6.9.0
-pkgrel=4
+pkgver=6.11.0
+pkgrel=1
 pkgdesc="Mainline Kernel fork for SDM845 devices"
 arch="aarch64"
 _carch="arm64"
@@ -18,7 +18,7 @@ options="!check !tracedeps
 makedepends="bash bison findutils flex installkernel openssl-dev perl zstd python3"
 
 _config="config-$_flavor.$arch"
-_tag="sdm845-6.9.0-r2"
+_tag="sdm845-6.11"
 
 # Source
 source="
@@ -71,6 +71,6 @@ package() {
 }
 
 sha512sums="
-45fb653328776a7b3687b9192979ada93c5ac7c321d54d4b72f47cddc10120982701d4990edc9103f6ec3ffcd2bc917b43ce7fea6ec15a3d3aded2279ecd9226  linux-sdm845-6.9.0-r2.tar.gz
-daf67730b0f8a1280a40ee595e477fd2c86679cd28160227d60821f1feee74de092cb6d2568167086e9edc3f12eafd42024b07cdbbd994f1e71adf6705626391  config-postmarketos-qcom-sdm845.aarch64
+40a127d280404c61f3c87692b85de6270144f98109b6e026649629e50c8e52a6a067d7f841cbbba6337791b115620894f205016a0dce46e65f9b95bcccff793a  linux-sdm845-6.11.tar.gz
+98b9bf6313079676dd8289a5f7fa79b3ff827e66894683cc2a3f39a2d6905514c9512ead4c8e7681f319fc6d140bf8145a721087fef6558b7fc3bf391eba8506  config-postmarketos-qcom-sdm845.aarch64
 "

device/community/linux-postmarketos-qcom-sm6350/APKBUILD

@@ -2,8 +2,8 @@
 
 _flavor="postmarketos-qcom-sm6350"
 pkgname=linux-$_flavor
-pkgver=6.10.5
-pkgrel=3
+pkgver=6.11.0
+pkgrel=0
 pkgdesc="Mainline Kernel fork for SM6350/SM7225 devices"
 arch="aarch64"
 _carch="arm64"
@@ -54,6 +54,6 @@ package() {
 }
 
 sha512sums="
-5756a8fd466f5c34dcaa9818d274facbe0b0b541ce9d7997b95868b2e84f1491ce8bf7d2714206ad8378d560996b8a736bc3c8505ef8022371644866c841e2a1  linux-v6.10.5-sm6350.tar.gz
-711e5ce6a7e9b491b40270eb23114ee4ad1deeb6312d10ec012abafd0c2cca288f72c4b5f49503f9c12c33ebd6fa3e0dc64ca8323121872d60f7ffd2a0411312  config-postmarketos-qcom-sm6350.aarch64
+6394edf25f6d4476b3bc26484c6fe6a02e2aa40b74e8526ab07b8257fe11accdd4b037fd7ce4429a246e36aaa443f556f1a9208003569ef044bee439931e93c9  linux-v6.11.0-sm6350.tar.gz
+234683d98b8a526e892bb4547c6e2b10715f171ac2a9ddc20cf47e449b70ba828fee8d00954d37442863ab354ce3ba513fb64a2a53be866733f4f5b6b6d51602  config-postmarketos-qcom-sm6350.aarch64
 "

device/community/linux-postmarketos-qcom-sm6350/config-postmarketos-qcom-sm6350.aarch64

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.10.5 Kernel Configuration
+# Linux/arm64 6.11.0 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 14.2.0) 14.2.0"
 CONFIG_CC_IS_GCC=y
@@ -11,8 +11,6 @@ CONFIG_AS_VERSION=24200
 CONFIG_LD_IS_BFD=y
 CONFIG_LD_VERSION=24200
 CONFIG_LLD_VERSION=0
-CONFIG_CC_CAN_LINK=y
-CONFIG_CC_CAN_LINK_STATIC=y
 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
 CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
 CONFIG_CC_HAS_ASM_INLINE=y
@@ -167,7 +165,7 @@ CONFIG_CGROUPS=y
 CONFIG_PAGE_COUNTER=y
 # CONFIG_CGROUP_FAVOR_DYNMODS is not set
 CONFIG_MEMCG=y
-CONFIG_MEMCG_KMEM=y
+# CONFIG_MEMCG_V1 is not set
 CONFIG_BLK_CGROUP=y
 CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
@@ -243,7 +241,6 @@ CONFIG_CACHESTAT_SYSCALL=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_SELFTEST is not set
 CONFIG_KALLSYMS_ALL=y
-CONFIG_KALLSYMS_BASE_RELATIVE=y
 CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
 CONFIG_HAVE_PERF_EVENTS=y
 
@@ -525,6 +522,7 @@ CONFIG_ARM64_CONTPTE=y
 CONFIG_CMDLINE=""
 CONFIG_EFI_STUB=y
 CONFIG_EFI=y
+# CONFIG_COMPRESSED_INSTALL is not set
 CONFIG_DMI=y
 # end of Boot options
 
@@ -771,7 +769,6 @@ CONFIG_BLK_CGROUP_PUNT_BIO=y
 CONFIG_BLK_DEV_BSG_COMMON=y
 CONFIG_BLK_DEV_BSGLIB=y
 CONFIG_BLK_DEV_INTEGRITY=y
-CONFIG_BLK_DEV_INTEGRITY_T10=y
 CONFIG_BLK_DEV_WRITE_MOUNTED=y
 # CONFIG_BLK_DEV_ZONED is not set
 CONFIG_BLK_DEV_THROTTLING=y
@@ -891,6 +888,7 @@ CONFIG_COREDUMP=y
 #
 CONFIG_SWAP=y
 # CONFIG_ZSWAP is not set
+CONFIG_HAVE_ZSMALLOC=y
 CONFIG_ZSMALLOC=m
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_ZSMALLOC_CHAIN_SIZE=8
@@ -902,6 +900,7 @@ CONFIG_SLUB=y
 CONFIG_SLAB_MERGE_DEFAULT=y
 # CONFIG_SLAB_FREELIST_RANDOM is not set
 # CONFIG_SLAB_FREELIST_HARDENED is not set
+# CONFIG_SLAB_BUCKETS is not set
 # CONFIG_SLUB_STATS is not set
 CONFIG_SLUB_CPU_PARTIAL=y
 # CONFIG_RANDOM_KMALLOC_CACHES is not set
@@ -1666,6 +1665,9 @@ CONFIG_ARM_PSCI_FW=y
 # Qualcomm firmware drivers
 #
 CONFIG_QCOM_SCM=y
+CONFIG_QCOM_TZMEM=y
+CONFIG_QCOM_TZMEM_MODE_GENERIC=y
+# CONFIG_QCOM_TZMEM_MODE_SHMBRIDGE is not set
 # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
 # CONFIG_QCOM_QSEECOM is not set
 # end of Qualcomm firmware drivers
@@ -1925,6 +1927,7 @@ CONFIG_NET_VENDOR_MARVELL=y
 CONFIG_NET_VENDOR_MELLANOX=y
 # CONFIG_MLXSW_CORE is not set
 # CONFIG_MLXFW is not set
+CONFIG_NET_VENDOR_META=y
 CONFIG_NET_VENDOR_MICREL=y
 # CONFIG_KS8842 is not set
 # CONFIG_KS8851_MLL is not set
@@ -2058,6 +2061,7 @@ CONFIG_MDIO_DEVRES=y
 #
 # PCS device drivers
 #
+# CONFIG_PCS_XPCS is not set
 # end of PCS device drivers
 
 # CONFIG_PPP is not set
@@ -2089,6 +2093,7 @@ CONFIG_ATH10K_CE=y
 CONFIG_ATH10K_SNOC=m
 CONFIG_ATH10K_DEBUG=y
 # CONFIG_ATH10K_DEBUGFS is not set
+CONFIG_ATH10K_LEDS=y
 # CONFIG_ATH10K_TRACING is not set
 # CONFIG_WCN36XX is not set
 # CONFIG_ATH11K is not set
@@ -2601,6 +2606,7 @@ CONFIG_GENERIC_PINCONF=y
 # CONFIG_PINCTRL_SINGLE is not set
 # CONFIG_PINCTRL_STMFX is not set
 # CONFIG_PINCTRL_SX150X is not set
+# CONFIG_PINCTRL_IMX_SCMI is not set
 CONFIG_PINCTRL_MSM=y
 # CONFIG_PINCTRL_IPQ5018 is not set
 # CONFIG_PINCTRL_IPQ5332 is not set
@@ -2713,6 +2719,12 @@ CONFIG_GPIO_CDEV_V1=y
 # CONFIG_GPIO_SIM is not set
 # end of Virtual GPIO drivers
 
+#
+# GPIO Debugging utilities
+#
+# CONFIG_GPIO_VIRTUSER is not set
+# end of GPIO Debugging utilities
+
 # CONFIG_W1 is not set
 CONFIG_POWER_RESET=y
 # CONFIG_POWER_RESET_GPIO is not set
@@ -2728,6 +2740,7 @@ CONFIG_POWER_RESET_QCOM_PON=y
 CONFIG_REBOOT_MODE=y
 # CONFIG_SYSCON_REBOOT_MODE is not set
 # CONFIG_NVMEM_REBOOT_MODE is not set
+# CONFIG_POWER_SEQUENCING is not set
 CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
 CONFIG_POWER_SUPPLY_HWMON=y
@@ -2746,6 +2759,7 @@ CONFIG_POWER_SUPPLY_HWMON=y
 # CONFIG_BATTERY_BQ27XXX is not set
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
+# CONFIG_BATTERY_MAX1720X is not set
 # CONFIG_CHARGER_MAX8903 is not set
 # CONFIG_CHARGER_LP8727 is not set
 # CONFIG_CHARGER_GPIO is not set
@@ -2785,7 +2799,6 @@ CONFIG_HWMON=y
 #
 # CONFIG_SENSORS_AD7414 is not set
 # CONFIG_SENSORS_AD7418 is not set
-# CONFIG_SENSORS_ADM1021 is not set
 # CONFIG_SENSORS_ADM1025 is not set
 # CONFIG_SENSORS_ADM1026 is not set
 # CONFIG_SENSORS_ADM1029 is not set
@@ -2851,7 +2864,6 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_MAX6620 is not set
 # CONFIG_SENSORS_MAX6621 is not set
 # CONFIG_SENSORS_MAX6639 is not set
-# CONFIG_SENSORS_MAX6642 is not set
 # CONFIG_SENSORS_MAX6650 is not set
 # CONFIG_SENSORS_MAX6697 is not set
 # CONFIG_SENSORS_MAX31790 is not set
@@ -2916,6 +2928,7 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_INA2XX is not set
 # CONFIG_SENSORS_INA238 is not set
 # CONFIG_SENSORS_INA3221 is not set
+# CONFIG_SENSORS_SPD5118 is not set
 # CONFIG_SENSORS_TC74 is not set
 # CONFIG_SENSORS_THMC50 is not set
 # CONFIG_SENSORS_TMP102 is not set
@@ -3043,6 +3056,7 @@ CONFIG_MFD_CORE=y
 # CONFIG_MFD_88PM800 is not set
 # CONFIG_MFD_88PM805 is not set
 # CONFIG_MFD_88PM860X is not set
+# CONFIG_MFD_88PM886_PMIC is not set
 # CONFIG_MFD_MAX14577 is not set
 # CONFIG_MFD_MAX77541 is not set
 # CONFIG_MFD_MAX77620 is not set
@@ -3111,10 +3125,12 @@ CONFIG_MFD_SYSCON=y
 # CONFIG_MFD_ROHM_BD718XX is not set
 # CONFIG_MFD_ROHM_BD71828 is not set
 # CONFIG_MFD_ROHM_BD957XMUF is not set
+# CONFIG_MFD_ROHM_BD96801 is not set
 # CONFIG_MFD_STPMIC1 is not set
 # CONFIG_MFD_STMFX is not set
 # CONFIG_MFD_ATC260X_I2C is not set
 CONFIG_MFD_QCOM_PM8008=y
+# CONFIG_MFD_CS40L50_I2C is not set
 # CONFIG_RAVE_SP_CORE is not set
 # CONFIG_MFD_RSMU_I2C is not set
 # end of Multifunction device drivers
@@ -3224,14 +3240,17 @@ CONFIG_DRM_KMS_HELPER=y
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
 # CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
-CONFIG_DRM_DISPLAY_HELPER=m
-CONFIG_DRM_DISPLAY_DP_AUX_BUS=m
+CONFIG_DRM_DISPLAY_DP_AUX_BUS=y
+CONFIG_DRM_DISPLAY_HELPER=y
+CONFIG_DRM_BRIDGE_CONNECTOR=y
 # CONFIG_DRM_DISPLAY_DP_AUX_CEC is not set
 # CONFIG_DRM_DISPLAY_DP_AUX_CHARDEV is not set
 CONFIG_DRM_DISPLAY_DP_HELPER=y
-CONFIG_DRM_EXEC=m
+CONFIG_DRM_DISPLAY_HDMI_HELPER=y
+CONFIG_DRM_DISPLAY_HDMI_STATE_HELPER=y
+CONFIG_DRM_EXEC=y
 CONFIG_DRM_GEM_SHMEM_HELPER=y
-CONFIG_DRM_SCHED=m
+CONFIG_DRM_SCHED=y
 
 #
 # I2C encoder or helper chips
@@ -3253,7 +3272,7 @@ CONFIG_DRM_SCHED=m
 # CONFIG_DRM_VGEM is not set
 # CONFIG_DRM_VKMS is not set
 # CONFIG_DRM_UDL is not set
-CONFIG_DRM_MSM=m
+CONFIG_DRM_MSM=y
 CONFIG_DRM_MSM_GPU_STATE=y
 CONFIG_DRM_MSM_MDSS=y
 # CONFIG_DRM_MSM_MDP4 is not set
@@ -3285,9 +3304,11 @@ CONFIG_DRM_PANEL=y
 # CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D is not set
 # CONFIG_DRM_PANEL_DSI_CM is not set
 # CONFIG_DRM_PANEL_LVDS is not set
-CONFIG_DRM_PANEL_HIMAX_HX83112A=m
+# CONFIG_DRM_PANEL_HIMAX_HX83102 is not set
+CONFIG_DRM_PANEL_HIMAX_HX83112A=y
 # CONFIG_DRM_PANEL_HIMAX_HX8394 is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9805 is not set
+# CONFIG_DRM_PANEL_ILITEK_ILI9806E is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9881C is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9882T is not set
 # CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
@@ -3299,6 +3320,7 @@ CONFIG_DRM_PANEL_HIMAX_HX83112A=m
 # CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04 is not set
 # CONFIG_DRM_PANEL_LEADTEK_LTK050H3146W is not set
 # CONFIG_DRM_PANEL_LEADTEK_LTK500HD1829 is not set
+# CONFIG_DRM_PANEL_LINCOLNTECH_LCD197 is not set
 # CONFIG_DRM_PANEL_LG_SW43408 is not set
 # CONFIG_DRM_PANEL_MANTIX_MLAF057WE51 is not set
 # CONFIG_DRM_PANEL_NEWVISION_NV3051D is not set
@@ -3452,6 +3474,7 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_BACKLIGHT_QCOM_WLED=y
 # CONFIG_BACKLIGHT_ADP8860 is not set
 # CONFIG_BACKLIGHT_ADP8870 is not set
+# CONFIG_BACKLIGHT_LM3509 is not set
 # CONFIG_BACKLIGHT_LM3639 is not set
 # CONFIG_BACKLIGHT_GPIO is not set
 # CONFIG_BACKLIGHT_LV5207LP is not set
@@ -3655,7 +3678,6 @@ CONFIG_HID_LOGITECH=y
 #
 # HID-BPF support
 #
-# CONFIG_HID_BPF is not set
 # end of HID-BPF support
 
 #
@@ -4023,6 +4045,7 @@ CONFIG_LEDS_QCOM_FLASH=y
 # CONFIG_LEDS_RT4505 is not set
 # CONFIG_LEDS_RT8515 is not set
 # CONFIG_LEDS_SGM3140 is not set
+# CONFIG_LEDS_SY7802 is not set
 
 #
 # RGB LED drivers
@@ -4050,6 +4073,7 @@ CONFIG_LEDS_TRIGGER_TIMER=y
 # CONFIG_LEDS_TRIGGER_NETDEV is not set
 CONFIG_LEDS_TRIGGER_PATTERN=y
 # CONFIG_LEDS_TRIGGER_TTY is not set
+# CONFIG_LEDS_TRIGGER_INPUT_EVENTS is not set
 
 #
 # Simple LED drivers
@@ -4228,10 +4252,12 @@ CONFIG_VIRTIO=y
 # CONFIG_STAGING is not set
 # CONFIG_GOLDFISH is not set
 # CONFIG_CHROME_PLATFORMS is not set
+# CONFIG_CZNIC_PLATFORMS is not set
 # CONFIG_MELLANOX_PLATFORM is not set
 # CONFIG_SURFACE_PLATFORMS is not set
 CONFIG_ARM64_PLATFORM_DEVICES=y
 # CONFIG_EC_ACER_ASPIRE1 is not set
+# CONFIG_EC_LENOVO_YOGA_C630 is not set
 CONFIG_HAVE_CLK=y
 CONFIG_HAVE_CLK_PREPARE=y
 CONFIG_COMMON_CLK=y
@@ -4268,6 +4294,7 @@ CONFIG_COMMON_CLK_QCOM=y
 # CONFIG_CLK_X1E80100_GCC is not set
 # CONFIG_CLK_X1E80100_GPUCC is not set
 # CONFIG_CLK_X1E80100_TCSRCC is not set
+# CONFIG_CLK_QCM2290_GPUCC is not set
 # CONFIG_QCOM_A53PLL is not set
 # CONFIG_QCOM_A7PLL is not set
 # CONFIG_QCOM_CLK_APCC_MSM8996 is not set
@@ -4279,6 +4306,7 @@ CONFIG_QCOM_CLK_RPMH=y
 # CONFIG_IPQ_GCC_6018 is not set
 # CONFIG_IPQ_GCC_8074 is not set
 # CONFIG_IPQ_GCC_9574 is not set
+# CONFIG_IPQ_NSSCC_QCA8K is not set
 # CONFIG_MSM_GCC_8916 is not set
 # CONFIG_MSM_GCC_8917 is not set
 # CONFIG_MSM_GCC_8939 is not set
@@ -4330,9 +4358,11 @@ CONFIG_QCOM_CLK_RPMH=y
 # CONFIG_SDM_LPASSCC_845 is not set
 # CONFIG_SDX_GCC_75 is not set
 CONFIG_SM_CAMCC_6350=y
+# CONFIG_SM_CAMCC_7150 is not set
 # CONFIG_SM_CAMCC_8250 is not set
 # CONFIG_SM_CAMCC_8450 is not set
 # CONFIG_SM_CAMCC_8550 is not set
+# CONFIG_SM_CAMCC_8650 is not set
 CONFIG_SM_DISPCC_6350=y
 # CONFIG_SM_DISPCC_8650 is not set
 # CONFIG_SM_GCC_4450 is not set
@@ -4359,6 +4389,7 @@ CONFIG_SM_GPUCC_6350=y
 # CONFIG_SM_GPUCC_8650 is not set
 # CONFIG_SM_TCSRCC_8550 is not set
 # CONFIG_SM_TCSRCC_8650 is not set
+# CONFIG_SM_VIDEOCC_7150 is not set
 # CONFIG_SM_VIDEOCC_8150 is not set
 # CONFIG_SM_VIDEOCC_8250 is not set
 # CONFIG_SM_VIDEOCC_8350 is not set
@@ -4395,6 +4426,7 @@ CONFIG_MAILBOX=y
 # CONFIG_ALTERA_MBOX is not set
 # CONFIG_MAILBOX_TEST is not set
 # CONFIG_QCOM_APCS_IPC is not set
+# CONFIG_QCOM_CPUCP_MBOX is not set
 CONFIG_QCOM_IPCC=y
 CONFIG_IOMMU_IOVA=y
 CONFIG_IOMMU_API=y
@@ -4507,8 +4539,10 @@ CONFIG_QCOM_COMMAND_DB=y
 CONFIG_QCOM_GENI_SE=y
 # CONFIG_QCOM_GSBI is not set
 CONFIG_QCOM_LLCC=y
-CONFIG_QCOM_MDT_LOADER=m
+CONFIG_QCOM_MDT_LOADER=y
 # CONFIG_QCOM_OCMEM is not set
+CONFIG_QCOM_PD_MAPPER=m
+CONFIG_QCOM_PDR_MSG=m
 # CONFIG_QCOM_PMIC_PDCHARGER_ULOG is not set
 # CONFIG_QCOM_PMIC_GLINK is not set
 CONFIG_QCOM_QMI_HELPERS=y
@@ -4650,7 +4684,6 @@ CONFIG_IIO=y
 # CONFIG_AD7291 is not set
 # CONFIG_AD7606_IFACE_PARALLEL is not set
 # CONFIG_AD799X is not set
-# CONFIG_ADI_AXI_ADC is not set
 # CONFIG_CC10001_ADC is not set
 # CONFIG_ENVELOPE_DETECTOR is not set
 # CONFIG_HX711 is not set
@@ -4674,6 +4707,7 @@ CONFIG_QCOM_SPMI_ADC5=y
 # CONFIG_SD_ADC_MODULATOR is not set
 # CONFIG_TI_ADC081C is not set
 # CONFIG_TI_ADS1015 is not set
+# CONFIG_TI_ADS1119 is not set
 # CONFIG_TI_ADS7924 is not set
 # CONFIG_TI_ADS1100 is not set
 # CONFIG_VF610_ADC is not set
@@ -4712,6 +4746,7 @@ CONFIG_QCOM_SPMI_ADC5=y
 # CONFIG_ATLAS_EZO_SENSOR is not set
 # CONFIG_BME680 is not set
 # CONFIG_CCS811 is not set
+# CONFIG_ENS160 is not set
 # CONFIG_IAQCORE is not set
 # CONFIG_PMS7003 is not set
 # CONFIG_SCD30_CORE is not set
@@ -4747,7 +4782,6 @@ CONFIG_QCOM_SPMI_ADC5=y
 # CONFIG_AD5380 is not set
 # CONFIG_AD5446 is not set
 # CONFIG_AD5593R is not set
-# CONFIG_ADI_AXI_DAC is not set
 # CONFIG_AD5696_I2C is not set
 # CONFIG_DPOT_DAC is not set
 # CONFIG_DS4424 is not set
@@ -4891,6 +4925,7 @@ CONFIG_QCOM_SPMI_ADC5=y
 # CONFIG_VCNL4000 is not set
 # CONFIG_VCNL4035 is not set
 # CONFIG_VEML6030 is not set
+# CONFIG_VEML6040 is not set
 # CONFIG_VEML6070 is not set
 # CONFIG_VEML6075 is not set
 # CONFIG_VL6180 is not set
@@ -5024,7 +5059,9 @@ CONFIG_ARM_GIC=y
 CONFIG_ARM_GIC_MAX_NR=1
 CONFIG_ARM_GIC_V3=y
 CONFIG_ARM_GIC_V3_ITS=y
+CONFIG_IRQ_MSI_LIB=y
 # CONFIG_AL_FIC is not set
+# CONFIG_LAN966X_OIC is not set
 # CONFIG_XILINX_INTC is not set
 CONFIG_PARTITION_PERCPU=y
 CONFIG_QCOM_PDC=y
@@ -5115,6 +5152,7 @@ CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder"
 # CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # end of Android
 
+CONFIG_TRACE_GPU_MEM=y
 # CONFIG_LIBNVDIMM is not set
 # CONFIG_DAX is not set
 CONFIG_NVMEM=y
@@ -5174,6 +5212,7 @@ CONFIG_INTERCONNECT_QCOM_SM6350=y
 # CONFIG_INTERCONNECT_QCOM_SM8550 is not set
 # CONFIG_INTERCONNECT_QCOM_SM8650 is not set
 # CONFIG_INTERCONNECT_QCOM_X1E80100 is not set
+CONFIG_INTERCONNECT_CLK=y
 # CONFIG_COUNTER is not set
 # CONFIG_MOST is not set
 # CONFIG_PECI is not set
@@ -5265,6 +5304,7 @@ CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
 #
 CONFIG_NETFS_SUPPORT=m
 # CONFIG_NETFS_STATS is not set
+# CONFIG_NETFS_DEBUG is not set
 # CONFIG_FSCACHE is not set
 # end of Caches
 
@@ -5529,7 +5569,6 @@ CONFIG_CRYPTO_ECC=m
 CONFIG_CRYPTO_ECDH=m
 # CONFIG_CRYPTO_ECDSA is not set
 # CONFIG_CRYPTO_ECRDSA is not set
-# CONFIG_CRYPTO_SM2 is not set
 # CONFIG_CRYPTO_CURVE25519 is not set
 # end of Public-key cryptography
 
@@ -5856,6 +5895,7 @@ CONFIG_NLATTR=y
 CONFIG_CLZ_TAB=y
 CONFIG_IRQ_POLL=y
 CONFIG_MPILIB=y
+CONFIG_DIMLIB=y
 CONFIG_LIBFDT=y
 CONFIG_OID_REGISTRY=y
 CONFIG_UCS2_STRING=y
@@ -6177,7 +6217,6 @@ CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_TEST_LKM is not set
 # CONFIG_TEST_BITOPS is not set
 # CONFIG_TEST_VMALLOC is not set
-# CONFIG_TEST_USER_COPY is not set
 # CONFIG_TEST_BPF is not set
 # CONFIG_TEST_BLACKHOLE_DEV is not set
 # CONFIG_FIND_BIT_BENCHMARK is not set

device/community/soc-qcom-sdm845/APKBUILD

@@ -2,8 +2,8 @@
 # Co-Maintainer: Joel Selvaraj <joelselvaraj.oss@gmail.com>
 pkgname=soc-qcom-sdm845
 pkgdesc="Common package for Qualcomm SDM845 devices"
-pkgver=22
-pkgrel=3
+pkgver=23
+pkgrel=0
 url="https://postmarketos.org"
 license="BSD-3-Clause"
 arch="aarch64"
@@ -25,7 +25,7 @@ subpackages="
 	$pkgname-vulkan
 "
 
-_ucm_commit="aaa7889f7a6de640b4d78300e118457335ad16c0"
+_ucm_commit="45cb4c634e534ddfb255e85162fe705f94a23015"
 source="
 	10-initramfs-sdm845.files
 	51-qcom-sdm845.conf
@@ -153,7 +153,7 @@ sha512sums="
 28c14f47eaedec577d152001c51753537c98f267ac4a0acf78a304efebe5f6a1b4dc6d501497da9a0a925806a1d9c80b25e001cf9b1eb21efa22cd6a41ff753b  51-qcom-sdm845.conf
 4f2c22a3a3fc7d380e200ad977578107d81f0e7ade7918e03bdb15b60a564e8db5f47e13cce22f636d38fd3722696bb46076b8872dae0ca2d8a3838522a1f025  90-feedbackd-pmi8998.rules
 9d455b56558d453d501a1ad869ffa79f9952ed43485a9847d506db6a78bfcd9f9c9d855660ee1d368eb74f4429385ec166addc30d802261c75562e785fe84c52  UPower.conf
-62e85ff4d983bd58078633088a6506b8ed9dab88b13adb1af72abd324386a3614ad4af6b3a9594c5a1d1fbdb1891ad906d360764081c83318e9970c94838dfb8  alsa-ucm-conf-aaa7889f7a6de640b4d78300e118457335ad16c0.tar.gz
+af58c9dfcbeb9fe01e433c36e869bef1f2fe03e1087fb28fb6752008d5320b5ac19c32aa64bb88f7d3a619d8e20ab001ec36f11960957d806cc3b14eb30b377d  alsa-ucm-conf-45cb4c634e534ddfb255e85162fe705f94a23015.tar.gz
 6fb4c0bd8b7ed534d855a6732ccff783960e3cfa0e0cc7effcbb93afa00798dec15361a37a3200081bc114c8d266b7a0851cc4e819ad36eabdb47a50c72620d9  call_audio_idle_suspend_workaround.confd
 5a58475b6e2ee1d655f3f23d8dc19e1cb2f32f1dfff3b9a9337d9c5baad1ec24bfaec0fb9cc03f00e5a291bee27c6b8bffbc65157e2bee5d65ef6d1adcb0910b  call_audio_idle_suspend_workaround.initd
 6da0a9209f114354aa2aa1185ec3896a8e0bb1bfce0dc3fc4c0de339cf1389feaa2d724e733c251ff032a5e86d37d9549e94f8f7c7a5accfedbd8a4d6316bbfd  call_audio_idle_suspend_workaround.sh

device/main/device-pine64-pinephone/APKBUILD

@@ -3,7 +3,7 @@
 # Co-Maintainer: Jan Jasper de Kroon <jajadekroon@gmail.com>
 pkgname=device-pine64-pinephone
 pkgver=4
-pkgrel=3
+pkgrel=4
 pkgdesc="PINE64 PinePhone"
 url="https://postmarketos.org"
 license="MIT"
@@ -34,6 +34,7 @@ depends="
 	pinephone-callaudiod
 	postmarketos-base
 	postmarketos-base-ui-audio-pipewire
+	postprocessd
 	u-boot-pinephone>=2021.01_git20201228-r2
 	u-boot-tools
 	fwupd>=1.8.6

device/main/device-pine64-pinephone/device-pine64-pinephone.pre-upgrade

@@ -3,7 +3,7 @@
 # legacy u-boot images are no longer necessary, but were generated outside of
 # packaging so remove them here to prevent a failed upgrade if /boot is too
 # full
-# see: https://gitlab.com/postmarketOS/pmaports/-/merge_requests/2449
+# see: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/2449
 rm -f /boot/uImage-postmarketos-allwinner
 rm -f /boot/uInitrd-postmarketos-allwinner
 

device/main/device-purism-librem5/APKBUILD

@@ -3,9 +3,9 @@
 # Co-Maintainer: Newbyte <newbyte@postmarketos.org>
 # Contributor: Clayton Craft <clayton@craftyguy.net>
 pkgname=device-purism-librem5
-pkgver=4
-pkgrel=2
-_confver=64
+pkgver=5
+pkgrel=1
+_confver=65
 _purismrel=1
 # <librem5-base ver>.<purism release>
 _purismver=${_confver}pureos$_purismrel
@@ -26,6 +26,7 @@ depends="
 	mesa-egl
 	millipixels
 	postmarketos-base
+	postprocessd
 	u-boot-librem5
 	u-boot-tools
 "
@@ -203,16 +204,16 @@ nonfree_firmware() {
 }
 
 sha512sums="
-46bff1208af87c9b6b2c61daaeeb95c3ff30617dce548a5877ea279ff9ced5338caaa32827bfbd98f3cb7c92d3535c27224c55bf1c03bf82f99e8ca53fe4cf6c  librem5-base-pureos-64pureos1.tar.gz
+4ce01a78016475873535927330a26143170153968cb22214ca606929ffc73ff2df2fcdd044c44d1cd9c514e989c267b5267402f0c047a240d01192d9b29ed57b  librem5-base-pureos-65pureos1.tar.gz
 2e72d9a084ecd6c96cafbbd8fda461ae8b2ebd14ffda601d9f36d73f08f04088213de17da078293ddd958d4c76d33148c7af6e252eb0709f6934855a55578509  00-mesa.sh
 703d12826464eb2bdb6bf4a7d10adb73b37564d3792794523b252f0f7cb66184add150a6938580cc33615281d1c0abd7ff158ae2143b89fa28c0cd3dc367e5ff  deviceinfo
 138ed85e6509e4611bf21a0061c312e6c2ce60f722ee9e4565d19c5f025301d4df3fa321343524219a54b20c5288dc6ed1b058ac66f4d608af22eb5bc83e84c6  modules-initfs
 ccb47fd421c5e35a8def8e6fb61dad99e42cf542690068a68f90c257e41d33f45f1069db0a8d89372d9029681812957033995639a6a8a5e3eed48019325e0f4d  flash_script.lst
-3f62c04eb92d850e32d5e1b17534dec753563342ea6c4f9dc2572700d4f6eeb8ae8cd8e8e4f1b0f5c61f21d87bc61c02212f27313986157220003d78e2d69505  modprobe.d_rsi.conf
+79a7088139629745a19b0465ac632d61ce7c513fc0bb6ea71784cd615f5ab8b32bee5ea903d7d7eb1a4508c4844f90f0435d789ea2642a529dd930d0de631ca5  modprobe.d_rsi.conf
 a0740e405781ec6ef765fdc9f5700c95adbb241c45c97b9384ba68cdece662cb216ca5918640042f6e65a5d1b1a9099936382c99b49a44303f7b6d77a075a471  modules-load.d_librem5.conf
 8ef4ec7a9e9a4fb801d207e7d94b627aacc9243a93b0ec28e0823a6f44b8102416c040e4ddf499f87bb9dfa960cf6f627b008b79f197f6814b3fd881e18ae8ef  pcscd-librem5-reader.conf
 2618b40eebd3602066ee75ab85cbdbb4cfee498def9879c95a304f05a6eeedf1ab28c5dd9fa5efc8f88c790f49c96458c61d5dfe8a3ca0f96bcc0e244313ab01  pcscd-librem5.initd
-976c36b469a5c36e1823c35e4e1bc41d88f12c6710d1d4f8f904349ab06ee58a6c728dc4b705b7578427e322c57ecd4e4c61fc62effc88e25987f6ea3e6ffcc2  uboot-script.cmd
+59634b85867a65191934e365ccde40ae03dbad6cf3dc3cc513daf3265dd1105af7cca7d52ef8e20f40fdbdbeb74aee5a26908ae8de083a80e223d2c275a8135d  uboot-script.cmd
 1cbc65cf2cb8fad4b0332d012a0256a266205b9b64371f5c0dae09dbb7f1e45b254e8c43993b896097e9d7035a72d547d9bce1ab2133addc56a5abdb80b44616  xorg.conf
 fad386071fc45f9880a94cc8004fabd5d98b3e6a12606c98d8e72e0208f22ab54f03b921f5967a959782507e2bff67d2fa92e46d8cd242011a3afcdbda529279  70-librem5-xwayland-accel.sh
 b45749fcddfd65a302b502bcabfa5828d1b63e45d844fd50e44009a756b919db20fe9526102947c0f0dfcdffe4a037e5050fe1b24fb915933ce0837f49759378  0001-udev-cameras-use-correct-path-for-modprobe-on-Alpine.patch

device/main/device-purism-librem5/modprobe.d_rsi.conf

@@ -2,7 +2,7 @@
 blacklist rsi_91x
 blacklist rsi_sdio
 # Redpine WIFI module
-# Note: LE coex. disabled, see: https://gitlab.com/postmarketOS/pmaports/-/issues/1042
+# Note: LE coex. disabled, see: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/issues/1042
 options redpine_91x dev_oper_mode=5 rsi_zone_enabled=1 antenna_diversity=1
 # Note: this line re-enables LE, replace above line with this one when LE
 # is fixed:

device/main/device-purism-librem5/uboot-script.cmd

@@ -23,7 +23,7 @@ setenv bootargs init=/init.sh rw console=ttymxc0,115200 PMOS_FORCE_PARTITION_RES
 # Default to "-r4" if board_rev isn't set, since there are apparently Evergreen
 # boards that either 1) identify as r4, 2) identify as r5 (or something else?),
 # or 3) don't identify as anything(?).
-# See: https://gitlab.com/postmarketOS/pmaports/-/issues/1643#note_1147248594
+# See: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/issues/1643#note_1147248594
 dtb_file=imx8mq-librem5-r4.dtb
 if itest.s "x3" == "x$board_rev" ; then
         dtb_file=imx8mq-librem5-r3.dtb

device/main/device-qemu-aarch64/APKBUILD

@@ -2,8 +2,8 @@
 # Maintainer: Minecrell <minecrell@minecrell.net>
 # Co-Maintainer: Oliver Smith <ollieparanoid@postmarketos.org>
 pkgname=device-qemu-aarch64
-pkgver=5
-pkgrel=1
+pkgver=6
+pkgrel=0
 pkgdesc="Simulated device in QEMU (aarch64)"
 url="https://postmarketos.org"
 arch="aarch64"
@@ -16,12 +16,14 @@ subpackages="
 	$pkgname-kernel-edge:kernel_edge
 	$pkgname-mce
 	$pkgname-sway
+	$pkgname-x11
 	"
 
 source="
 	deviceinfo
 	modules-initfs
 	mce-display-blanking.conf
+	resolution-qemu-X11.conf
 	"
 options="!check !archcheck"
 
@@ -46,6 +48,12 @@ sway() {
 	mkdir "$subpkgdir"
 }
 
+x11() {
+	install_if="$pkgname=$pkgver-r$pkgrel xorg-server"
+	install -Dm644 "$srcdir"/resolution-qemu-X11.conf \
+		"$subpkgdir"/etc/X11/xorg.conf.d/10-resolution-qemu-X11.conf
+}
+
 kernel_virt() {
 	pkgdesc="Alpine Virt kernel (minimal, no audio)"
 	depends="linux-virt"
@@ -68,4 +76,5 @@ sha512sums="
 90527c2be00f97172f8e9b7508aba706c62e9067c50c93cfa69fbe5940462e9a165f35b9c8dd0efe2b690a839c6069b26d0c8706b7c4114219ef3004ea3dda3e  deviceinfo
 8129439ec53e76e714b2d3dac97bbe702822d6f6642ea6b631aa26001fec85ca310fbe9eeb04c2bd849145a1137b7934c21b704524f3a98b96b7c6f71c2ca992  modules-initfs
 99d32eed6c5cda59e91516e982c5bd5165ff718133e2411a0dbba04e2057d1dfad49a75e5cc67140d0e0adcbe1383671bd2892335929b782a5b19f5472e635ad  mce-display-blanking.conf
+bfff3ebf11abb43d8ea45e778c19554b1bc8ef9e694d8160daaac0ef906b4d8eda772e5f984033cce52ebddfbbe76e5340c6805e68f967994a3240c1e10c8b5b  resolution-qemu-X11.conf
 "

device/main/device-qemu-aarch64/resolution-qemu-X11.conf

@@ -0,0 +1,6 @@
+Section "Screen"
+	Identifier "Virtual-1"
+	SubSection "Display"
+		Modes	"800x600"
+	EndSubSection
+EndSection

device/main/device-qemu-amd64/APKBUILD

@@ -2,8 +2,8 @@
 # Maintainer: Minecrell <minecrell@minecrell.net>
 # Co-Maintainer: Oliver Smith <ollieparanoid@postmarketos.org>
 pkgname=device-qemu-amd64
-pkgver=6
-pkgrel=4
+pkgver=7
+pkgrel=0
 pkgdesc="Simulated device in QEMU (x86_64)"
 url="https://postmarketos.org"
 arch="x86_64"
@@ -18,11 +18,13 @@ subpackages="
 	$pkgname-kernel-none:kernel_none
 	$pkgname-mce
 	$pkgname-sway
+	$pkgname-x11
 	"
 source="
 	deviceinfo
 	modules-initfs
 	mce-display-blanking.conf
+	resolution-qemu-X11.conf
 	"
 options="!check !archcheck"
 
@@ -47,6 +49,12 @@ sway() {
 	mkdir "$subpkgdir"
 }
 
+x11() {
+	install_if="$pkgname=$pkgver-r$pkgrel xorg-server"
+	install -Dm644 "$srcdir"/resolution-qemu-X11.conf \
+		"$subpkgdir"/etc/X11/xorg.conf.d/10-resolution-qemu-X11.conf
+}
+
 kernel_none() {
 	pkgdesc="No kernel (does not boot! can be used during pmbootstrap testing to save time)"
 	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
@@ -74,4 +82,5 @@ sha512sums="
 74dd746b16f17ce67f6d58b6b86878b6eebaaa473fa36f475074c2c14ed738386c1b5cfcf15ad07b58f94d303799e8a9ed356143061e7854cf38170bef999a0b  deviceinfo
 29766094e64a7ce881c8e96433203ea538057b8fd1d577fc69b9add6bc1217af04ddf60cbcf82333811c627897eda7537b0b1f862899e1fdfd93403b3f6425d7  modules-initfs
 99d32eed6c5cda59e91516e982c5bd5165ff718133e2411a0dbba04e2057d1dfad49a75e5cc67140d0e0adcbe1383671bd2892335929b782a5b19f5472e635ad  mce-display-blanking.conf
+bfff3ebf11abb43d8ea45e778c19554b1bc8ef9e694d8160daaac0ef906b4d8eda772e5f984033cce52ebddfbbe76e5340c6805e68f967994a3240c1e10c8b5b  resolution-qemu-X11.conf
 "

device/main/device-qemu-amd64/resolution-qemu-X11.conf

@@ -0,0 +1,6 @@
+Section "Screen"
+	Identifier "Virtual-1"
+	SubSection "Display"
+		Modes	"800x600"
+	EndSubSection
+EndSection

device/main/device-qemu-riscv64/APKBUILD

@@ -2,8 +2,8 @@
 # Maintainer: Minecrell <minecrell@minecrell.net>
 # Co-Maintainer: Luca Weiss <luca@lucaweiss.eu>
 pkgname=device-qemu-riscv64
-pkgver=2
-pkgrel=2
+pkgver=3
+pkgrel=0
 pkgdesc="Simulated device in QEMU (riscv64)"
 url="https://postmarketos.org"
 arch="riscv64"
@@ -14,12 +14,14 @@ subpackages="
 	$pkgname-kernel-edge:kernel_edge
 	$pkgname-mce
 	$pkgname-sway
+	$pkgname-x11
 	"
 
 source="
 	deviceinfo
 	modules-initfs
 	mce-display-blanking.conf
+	resolution-qemu-X11.conf
 	"
 options="!check !archcheck"
 
@@ -44,6 +46,12 @@ sway() {
 	mkdir "$subpkgdir"
 }
 
+x11() {
+	install_if="$pkgname=$pkgver-r$pkgrel xorg-server"
+	install -Dm644 "$srcdir"/resolution-qemu-X11.conf \
+		"$subpkgdir"/etc/X11/xorg.conf.d/10-resolution-qemu-X11.conf
+}
+
 kernel_edge() {
 	pkgdesc="Alpine Edge kernel"
 	depends="linux-edge linux-firmware-none"
@@ -54,4 +62,5 @@ sha512sums="
 4e2acace2d7a5b55302e9571eef3e57cbc14c2831a2e0797ef5ff87290aef581a0bf112816c2f113878b9ca57599b66d0e3f8a593e0c08819322ff8d5ea7f351  deviceinfo
 8129439ec53e76e714b2d3dac97bbe702822d6f6642ea6b631aa26001fec85ca310fbe9eeb04c2bd849145a1137b7934c21b704524f3a98b96b7c6f71c2ca992  modules-initfs
 99d32eed6c5cda59e91516e982c5bd5165ff718133e2411a0dbba04e2057d1dfad49a75e5cc67140d0e0adcbe1383671bd2892335929b782a5b19f5472e635ad  mce-display-blanking.conf
+bfff3ebf11abb43d8ea45e778c19554b1bc8ef9e694d8160daaac0ef906b4d8eda772e5f984033cce52ebddfbbe76e5340c6805e68f967994a3240c1e10c8b5b  resolution-qemu-X11.conf
 "

device/main/device-qemu-riscv64/resolution-qemu-X11.conf

@@ -0,0 +1,6 @@
+Section "Screen"
+	Identifier "Virtual-1"
+	SubSection "Display"
+		Modes	"800x600"
+	EndSubSection
+EndSection

device/main/firmware-pine64-rtl8723bt/APKBUILD

@@ -39,7 +39,7 @@ package() {
 	#
 	# Ref:
 	#
-	# - https://gitlab.com/postmarketOS/pmaports/-/issues/3179
+	# - https://gitlab.postmarketos.org/postmarketOS/pmaports/-/issues/3179
 	#
 	# - https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/commit/?id=ed9c1349f8ebae720f3572ad3e74af59bfe345d7
 

device/main/linux-postmarketos-allwinner/0001-dts-add-dontbeevil-pinephone-devkit.patch

@@ -1,4 +1,4 @@
-From d4332814a2b716a54a743412559cd98cb050d652 Mon Sep 17 00:00:00 2001
+From b1aa006649db47a3a7f4f8a0cb9867bc553d9609 Mon Sep 17 00:00:00 2001
 From: Martijn Braam <martijn@brixit.nl>
 Date: Sat, 20 Apr 2019 01:19:48 +0200
 Subject: [PATCH] dts: add dontbeevil (pinephone devkit)
@@ -17,7 +17,7 @@ Subject: [PATCH] dts: add dontbeevil (pinephone devkit)
  create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64-dontbeevil.dts
 
 diff --git a/arch/arm64/boot/dts/allwinner/Makefile b/arch/arm64/boot/dts/allwinner/Makefile
-index 38867649c063..5cddf8655d64 100644
+index 0a0ec8a39259..0fb55ce917d7 100644
 --- a/arch/arm64/boot/dts/allwinner/Makefile
 +++ b/arch/arm64/boot/dts/allwinner/Makefile
 @@ -1,6 +1,8 @@
@@ -532,5 +532,5 @@ index 000000000000..15a91f2d6202
 +	status = "disabled";
 +};
 -- 
-2.45.0
+2.46.1
 

device/main/linux-postmarketos-allwinner/0002-dts-add-pinetab-dev-old-display-panel.patch

@@ -1,4 +1,4 @@
-From 915dabee2a8213d0fc343179e815d4639c184d32 Mon Sep 17 00:00:00 2001
+From 5c671df3771c2ccda1e3537949050bab1d012e8f Mon Sep 17 00:00:00 2001
 From: Martijn Braam <martijn@brixit.nl>
 Date: Tue, 20 Oct 2020 14:42:01 +0200
 Subject: [PATCH] dts: add pinetab-dev (old display panel)
@@ -10,7 +10,7 @@ Subject: [PATCH] dts: add pinetab-dev (old display panel)
  create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab-dev.dts
 
 diff --git a/arch/arm64/boot/dts/allwinner/Makefile b/arch/arm64/boot/dts/allwinner/Makefile
-index 5cddf8655d64..8cfed65e268d 100644
+index 0fb55ce917d7..c17cc1afa402 100644
 --- a/arch/arm64/boot/dts/allwinner/Makefile
 +++ b/arch/arm64/boot/dts/allwinner/Makefile
 @@ -17,6 +17,7 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-pinephone-1.2.dtb
@@ -57,5 +57,5 @@ index 000000000000..1e287f2fb9f3
 +	};
 +};
 -- 
-2.45.0
+2.46.1
 

device/main/linux-postmarketos-allwinner/0003-dts-pinetab-add-missing-ohci1.patch

@@ -1,4 +1,4 @@
-From 388517c7e13be56a364e48820e64a7f9376b1248 Mon Sep 17 00:00:00 2001
+From c52f6eb387d094ea181bb156440b9f5014361b39 Mon Sep 17 00:00:00 2001
 From: Oliver Smith <ollieparanoid@postmarketos.org>
 Date: Tue, 20 Oct 2020 11:11:48 +0200
 Subject: [PATCH] dts: pinetab: add missing ohci1
@@ -13,7 +13,7 @@ https://gitlab.com/pine64-org/linux/-/commit/69ae7087ec51b09bb6a0afb53dddb5eb030
  1 file changed, 4 insertions(+)
 
 diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
-index 37466d70bb25..29e527e499db 100644
+index 419fe19b4a6f..e30034a1553b 100644
 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
 +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
 @@ -311,6 +311,10 @@ &ohci0 {
@@ -28,5 +28,5 @@ index 37466d70bb25..29e527e499db 100644
  	status = "okay";
  };
 -- 
-2.45.0
+2.46.1
 

device/main/linux-postmarketos-allwinner/0004-dts-pinetab-make-audio-routing-consistent-with-pinep.patch

@@ -1,4 +1,4 @@
-From eba1ff43e3bb9c7624f9678e7e9528663f89380e Mon Sep 17 00:00:00 2001
+From 91f8fcf39d8465ba7d6c8147650eb564915225e6 Mon Sep 17 00:00:00 2001
 From: Martijn Braam <martijn@brixit.nl>
 Date: Tue, 20 Oct 2020 14:44:51 +0200
 Subject: [PATCH] dts: pinetab: make audio routing consistent with
@@ -9,7 +9,7 @@ Subject: [PATCH] dts: pinetab: make audio routing consistent with
  1 file changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
-index 29e527e499db..230eedb39d50 100644
+index e30034a1553b..b2a3c0f97ce1 100644
 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
 +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
 @@ -494,13 +494,13 @@ &sound {
@@ -32,5 +32,5 @@ index 29e527e499db..230eedb39d50 100644
  			"ADCR", "Right ADC",
  			"Internal Microphone Left", "MBIAS",
 -- 
-2.45.0
+2.46.1
 

device/main/linux-postmarketos-allwinner/0005-dts-pinephone-drop-modem-power-node.patch

@@ -1,4 +1,4 @@
-From 2ee09f1d8da9d5fcf7b2579525c87151ee0896a2 Mon Sep 17 00:00:00 2001
+From 48e55b423aa0347751c58c90c5d6846943736122 Mon Sep 17 00:00:00 2001
 From: Clayton Craft <clayton@craftyguy.net>
 Date: Wed, 16 Dec 2020 20:16:14 -0800
 Subject: [PATCH] dts: pinephone: drop modem-power node
@@ -139,7 +139,7 @@ index ec4927dfe9dc..57b651d695af 100644
 +	gpios = <&r_pio 0 6 GPIO_ACTIVE_LOW>; /* PL6 */
 +};
 diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
-index fe7f2113a727..68392dee4407 100644
+index dcd392fe6027..24b7f01fd901 100644
 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
 +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
 @@ -310,6 +310,17 @@ ec25_codec: ec25-codec {
@@ -160,7 +160,7 @@ index fe7f2113a727..68392dee4407 100644
  	i2c_csi: i2c-csi {
  		compatible = "i2c-gpio";
  		sda-gpios = <&pio 4 13 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; /* PE13 */
-@@ -382,6 +393,7 @@ reg_usb_5v: usb-5v {
+@@ -389,6 +400,7 @@ reg_usb_5v: usb-5v {
  	reg_vbat_bb: vbat-bb {
  		compatible = "regulator-fixed";
  		regulator-name = "vbat-bb";
@@ -169,5 +169,5 @@ index fe7f2113a727..68392dee4407 100644
  		regulator-max-microvolt = <3500000>;
  		gpio = <&r_pio 0 7 GPIO_ACTIVE_HIGH>; /* PL7 */
 -- 
-2.45.0
+2.46.1
 

device/main/linux-postmarketos-allwinner/0006-drm-panel-simple-Add-Hannstar-TQTM070CB501.patch

@@ -1,4 +1,4 @@
-From dee9e527e2f59edf679dffbd0dad2179be9e9965 Mon Sep 17 00:00:00 2001
+From 39c6fba7dd220d7349e0a425e9aaaabe979dd924 Mon Sep 17 00:00:00 2001
 From: JuniorJPDJ <git@juniorjpdj.pl>
 Date: Tue, 23 Mar 2021 12:27:30 +0100
 Subject: [PATCH] drm: panel: simple: Add Hannstar TQTM070CB501
@@ -8,10 +8,10 @@ Subject: [PATCH] drm: panel: simple: Add Hannstar TQTM070CB501
  1 file changed, 27 insertions(+)
 
 diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c
-index 20e3df1c59d4..d37108020fb7 100644
+index bf40057c5cf3..55a8d221b002 100644
 --- a/drivers/gpu/drm/panel/panel-simple.c
 +++ b/drivers/gpu/drm/panel/panel-simple.c
-@@ -2344,6 +2344,30 @@ static const struct panel_desc hannstar_hsd101pww2 = {
+@@ -2381,6 +2381,30 @@ static const struct panel_desc hannstar_hsd101pww2 = {
  	.connector_type = DRM_MODE_CONNECTOR_LVDS,
  };
  
@@ -42,7 +42,7 @@ index 20e3df1c59d4..d37108020fb7 100644
  static const struct drm_display_mode hitachi_tx23d38vm0caa_mode = {
  	.clock = 33333,
  	.hdisplay = 800,
-@@ -4513,6 +4537,9 @@ static const struct of_device_id platform_of_match[] = {
+@@ -4717,6 +4741,9 @@ static const struct of_device_id platform_of_match[] = {
  	}, {
  		.compatible = "hit,tx23d38vm0caa",
  		.data = &hitachi_tx23d38vm0caa
@@ -53,5 +53,5 @@ index 20e3df1c59d4..d37108020fb7 100644
  		.compatible = "innolux,at043tn24",
  		.data = &innolux_at043tn24,
 -- 
-2.45.0
+2.46.1
 

device/main/linux-postmarketos-allwinner/0007-ARM-dts-sun6i-Add-GoClever-Orion-70L-tablet.patch

@@ -1,4 +1,4 @@
-From 538c7faf1059027cb62f2e5ec4931a8fccaa3976 Mon Sep 17 00:00:00 2001
+From 21d71ed910712ed81eef6cf6254d89fe6d49c3a1 Mon Sep 17 00:00:00 2001
 From: JuniorJPDJ <git@juniorjpdj.pl>
 Date: Tue, 23 Mar 2021 12:29:37 +0100
 Subject: [PATCH] ARM: dts: sun6i: Add GoClever Orion 70L tablet
@@ -10,10 +10,10 @@ Subject: [PATCH] ARM: dts: sun6i: Add GoClever Orion 70L tablet
  create mode 100644 arch/arm/boot/dts/allwinner/sun6i-a31s-goclever-gcta741l.dts
 
 diff --git a/arch/arm/boot/dts/allwinner/Makefile b/arch/arm/boot/dts/allwinner/Makefile
-index 7c7fb94d2153..097614b95ff2 100644
+index 54b156fca9bf..77593039273c 100644
 --- a/arch/arm/boot/dts/allwinner/Makefile
 +++ b/arch/arm/boot/dts/allwinner/Makefile
-@@ -110,6 +110,7 @@ dtb-$(CONFIG_MACH_SUN6I) += \
+@@ -111,6 +111,7 @@ dtb-$(CONFIG_MACH_SUN6I) += \
  	sun6i-a31-mele-a1000g-quad.dtb \
  	sun6i-a31s-colorfly-e708-q1.dtb \
  	sun6i-a31s-cs908.dtb \
@@ -131,5 +131,5 @@ index 000000000000..4fcba20ffe48
 +	status = "okay";
 +};
 -- 
-2.45.0
+2.46.1
 

device/main/linux-postmarketos-allwinner/0008-drm-panel-simple-Add-Hannstar-HSD070IDW1-A.patch

@@ -1,4 +1,4 @@
-From c8bf750c05bff5c271c1f51135d75e5641b0c58a Mon Sep 17 00:00:00 2001
+From 6aa3e90d38c53c76b31ecc33e190605f0b63d554 Mon Sep 17 00:00:00 2001
 From: JuniorJPDJ <git@juniorjpdj.pl>
 Date: Thu, 25 Mar 2021 19:11:22 +0100
 Subject: [PATCH] drm: panel: simple: Add Hannstar HSD070IDW1-A
@@ -8,10 +8,10 @@ Subject: [PATCH] drm: panel: simple: Add Hannstar HSD070IDW1-A
  1 file changed, 27 insertions(+)
 
 diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c
-index d37108020fb7..b269ddadd64f 100644
+index 55a8d221b002..abdf57dc2a63 100644
 --- a/drivers/gpu/drm/panel/panel-simple.c
 +++ b/drivers/gpu/drm/panel/panel-simple.c
-@@ -2264,6 +2264,30 @@ static const struct panel_desc giantplus_gpm940b0 = {
+@@ -2301,6 +2301,30 @@ static const struct panel_desc giantplus_gpm940b0 = {
  	.bus_flags = DRM_BUS_FLAG_DE_HIGH | DRM_BUS_FLAG_PIXDATA_SAMPLE_POSEDGE,
  };
  
@@ -42,7 +42,7 @@ index d37108020fb7..b269ddadd64f 100644
  static const struct display_timing hannstar_hsd070pww1_timing = {
  	.pixelclock = { 64300000, 71100000, 82000000 },
  	.hactive = { 1280, 1280, 1280 },
-@@ -4525,6 +4549,9 @@ static const struct of_device_id platform_of_match[] = {
+@@ -4729,6 +4753,9 @@ static const struct of_device_id platform_of_match[] = {
  	}, {
  		.compatible = "giantplus,gpm940b0",
  		.data = &giantplus_gpm940b0,
@@ -53,5 +53,5 @@ index d37108020fb7..b269ddadd64f 100644
  		.compatible = "hannstar,hsd070pww1",
  		.data = &hannstar_hsd070pww1,
 -- 
-2.45.0
+2.46.1
 

device/main/linux-postmarketos-allwinner/0009-ARM-dts-sun6i-Add-Lark-FreeMe-70.2S-tablet.patch

@@ -1,4 +1,4 @@
-From 4b4c85b0a093be28ec9a8a72ef3a3f764fb28e03 Mon Sep 17 00:00:00 2001
+From b346724c85c5d7852eab9b9902fd2f761185df7c Mon Sep 17 00:00:00 2001
 From: JuniorJPDJ <git@juniorjpdj.pl>
 Date: Thu, 25 Mar 2021 19:18:58 +0100
 Subject: [PATCH] ARM: dts: sun6i: Add Lark FreeMe 70.2S tablet
@@ -10,7 +10,7 @@ Subject: [PATCH] ARM: dts: sun6i: Add Lark FreeMe 70.2S tablet
  create mode 100644 arch/arm/boot/dts/allwinner/sun4i-a10-lark-freeme-70-2s.dts
 
 diff --git a/arch/arm/boot/dts/allwinner/Makefile b/arch/arm/boot/dts/allwinner/Makefile
-index 097614b95ff2..902b8f6752a0 100644
+index 77593039273c..ddc3b0deab8c 100644
 --- a/arch/arm/boot/dts/allwinner/Makefile
 +++ b/arch/arm/boot/dts/allwinner/Makefile
 @@ -36,6 +36,7 @@ dtb-$(CONFIG_MACH_SUN4I) += \
@@ -274,5 +274,5 @@ index 000000000000..5f17902410c1
 +	status = "okay";
 +};
 -- 
-2.45.0
+2.46.1
 

device/main/linux-postmarketos-allwinner/0010-eMMC-workaround.patch

@@ -1,4 +1,4 @@
-From 125b782564a7dac6e6d1137e8103e2613b12600e Mon Sep 17 00:00:00 2001
+From cd0734143da954f0a4bda9c40b353d55f9cacf66 Mon Sep 17 00:00:00 2001
 From: Jernej Skrabec <jernej.skrabec@siol.net>
 Date: Sat, 24 Aug 2019 01:36:44 +0200
 Subject: [PATCH] eMMC workaround
@@ -34,5 +34,5 @@ index e9370c736497..a4abd589e95d 100644
  
  	ret = mmc_of_parse(mmc);
 -- 
-2.45.0
+2.46.1
 

device/main/linux-postmarketos-allwinner/0011-arm64-dts-allwinner-orangepi-3-fix-ethernet.patch

@@ -1,4 +1,4 @@
-From c824f1e06e282be26c78918cb15f2dd1c6687e5e Mon Sep 17 00:00:00 2001
+From e166f056c5a77c2258f8c1581d9b34de76f4a839 Mon Sep 17 00:00:00 2001
 From: Maxim Karasev <begs@disroot.org>
 Date: Sat, 4 Sep 2021 14:56:01 +0300
 Subject: [PATCH] arm64: dts: allwinner: orangepi-3: fix ethernet
@@ -10,7 +10,7 @@ patch from LibreELEC tree.
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts
-index 218c26c59429..a424eded0016 100644
+index 332a9fe83ccd..6e53dadf543e 100644
 --- a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts
 +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts
 @@ -145,7 +145,7 @@ hdmi_out_con: endpoint {
@@ -34,5 +34,5 @@ index 218c26c59429..a424eded0016 100644
  };
  
 -- 
-2.45.0
+2.46.1
 

device/main/linux-postmarketos-allwinner/0012-ARM-dts-allwinner-sun5i-a13-pocketbook-614-plus-Add-.patch

@@ -1,295 +0,0 @@
-From b9e47d013dac71b2f6d6c877222aa128138c3099 Mon Sep 17 00:00:00 2001
-From: Denis Burkov <hitechshell@mail.ru>
-Date: Mon, 11 Mar 2024 18:23:39 +0500
-Subject: [PATCH] ARM: dts: allwinner: sun5i-a13-pocketbook-614-plus: Add
- initial devicetree
-
----
- arch/arm/boot/dts/allwinner/Makefile          |   2 +
- .../sun5i-a13-pocketbook-614-plus.dts         | 254 ++++++++++++++++++
- 2 files changed, 256 insertions(+)
- create mode 100644 arch/arm/boot/dts/allwinner/sun5i-a13-pocketbook-614-plus.dts
-
-diff --git a/arch/arm/boot/dts/allwinner/Makefile b/arch/arm/boot/dts/allwinner/Makefile
-index 902b8f6752a0..f7eb88a5709b 100644
---- a/arch/arm/boot/dts/allwinner/Makefile
-+++ b/arch/arm/boot/dts/allwinner/Makefile
-@@ -62,6 +62,7 @@ dtb-$(CONFIG_MACH_SUN5I) += \
- 	sun5i-a13-olinuxino.dtb \
- 	sun5i-a13-olinuxino-micro.dtb \
- 	sun5i-a13-pocketbook-touch-lux-3.dtb \
-+	sun5i-a13-pocketbook-614-plus.dtb \
- 	sun5i-a13-q8-tablet.dtb \
- 	sun5i-a13-utoo-p66.dtb \
- 	sun5i-gr8-chip-pro.dtb \
-@@ -83,6 +84,7 @@ dtb-$(CONFIG_MACH_SUN5I) += \
- 	sun5i-a13-olinuxino.dtb \
- 	sun5i-a13-olinuxino-micro.dtb \
- 	sun5i-a13-pocketbook-touch-lux-3.dtb \
-+	sun5i-a13-pocketbook-614-plus.dtb \
- 	sun5i-a13-q8-tablet.dtb \
- 	sun5i-a13-utoo-p66.dtb \
- 	sun5i-gr8-chip-pro.dtb \
-diff --git a/arch/arm/boot/dts/allwinner/sun5i-a13-pocketbook-614-plus.dts b/arch/arm/boot/dts/allwinner/sun5i-a13-pocketbook-614-plus.dts
-new file mode 100644
-index 000000000000..cad9ce5f2a6f
---- /dev/null
-+++ b/arch/arm/boot/dts/allwinner/sun5i-a13-pocketbook-614-plus.dts
-@@ -0,0 +1,254 @@
-+// SPDX-License-Identifier: GPL-2.0+
-+/*
-+ * Copyright 2024 Denis Burkov <hitechshell@mail.ru>
-+ */
-+
-+/dts-v1/;
-+#include "sun5i-a13.dtsi"
-+#include "sunxi-common-regulators.dtsi"
-+#include <dt-bindings/gpio/gpio.h>
-+#include <dt-bindings/input/input.h>
-+#include <dt-bindings/interrupt-controller/irq.h>
-+
-+/ {
-+	model = "PocketBook 614 Plus";
-+	compatible = "pocketbook,614-plus", "allwinner,sun5i-a13";
-+
-+	aliases {
-+		serial0 = &uart1;
-+		i2c0 = &i2c0;
-+		i2c1 = &i2c1;
-+		i2c2 = &i2c2;
-+		rtc0 = &pcf8563;
-+	};
-+
-+	chosen {
-+		stdout-path = "serial0:115200n8";
-+	};
-+
-+	leds {
-+		compatible = "gpio-leds";
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&led_pins_pocketbook>;
-+
-+		led {
-+			gpios = <&pio 4 8 GPIO_ACTIVE_LOW>; /* PE8 */
-+			default-state = "on";
-+		};
-+	};
-+
-+	gpio-keys {
-+		compatible = "gpio-keys";
-+		autorepeat;
-+		label = "GPIO Keys";
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&pocketbook_btn_pins>;
-+
-+		key-right {
-+			label = "Right";
-+			linux,code = <KEY_NEXT>;
-+			gpios = <&pio 6 9 GPIO_ACTIVE_LOW>; /* PG9 */
-+		};
-+
-+		key-left {
-+			label = "Left";
-+			linux,code = <KEY_PREVIOUS>;
-+			gpios = <&pio 6 10 GPIO_ACTIVE_LOW>; /* PG10 */
-+		};
-+	};
-+
-+	reg_3v3_mmc0: regulator-mmc0 {
-+		compatible = "regulator-fixed";
-+		regulator-name = "vdd-mmc0";
-+		regulator-min-microvolt = <3300000>;
-+		regulator-max-microvolt = <3300000>;
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&pocketbook_reg_mmc0_pin>;
-+		gpio = <&pio 4 4 GPIO_ACTIVE_LOW>; /* PE4 */
-+		vin-supply = <&reg_vcc3v3>;
-+	};
-+};
-+
-+&cpu0 {
-+	cpu-supply = <&reg_dcdc2>;
-+};
-+
-+&ehci0 {
-+	status = "okay";
-+};
-+
-+&i2c0 {
-+	status = "okay";
-+
-+	axp209: pmic@34 {
-+		compatible = "x-powers,axp209";
-+		reg = <0x34>;
-+		interrupts = <0>;
-+	};
-+};
-+
-+#include "axp209.dtsi"
-+
-+&i2c1 {
-+	status = "okay";
-+
-+	pcf8563: rtc@51 {
-+		compatible = "nxp,pcf8563";
-+		reg = <0x51>;
-+		#clock-cells = <0>;
-+	};
-+};
-+
-+&i2c2 {
-+	status = "okay";
-+
-+	/* Touchpanel is connected here. */
-+};
-+
-+&lradc {
-+	vref-supply = <&reg_ldo2>;
-+	status = "okay";
-+
-+	button-300 {
-+		label = "Down";
-+		linux,code = <KEY_DOWN>;
-+		channel = <0>;
-+		voltage = <300000>;
-+	};
-+
-+	button-700 {
-+		label = "Up";
-+		linux,code = <KEY_UP>;
-+		channel = <0>;
-+		voltage = <700000>;
-+	};
-+
-+	button-1000 {
-+		label = "Left";
-+		linux,code = <KEY_LEFT>;
-+		channel = <0>;
-+		voltage = <1000000>;
-+	};
-+
-+	button-1200 {
-+		label = "Menu";
-+		linux,code = <KEY_MENU>;
-+		channel = <0>;
-+		voltage = <1200000>;
-+	};
-+
-+	button-1500 {
-+		label = "Right";
-+		linux,code = <KEY_RIGHT>;
-+		channel = <0>;
-+		voltage = <1500000>;
-+	};
-+};
-+
-+&mmc0 {
-+	vmmc-supply = <&reg_3v3_mmc0>;
-+	bus-width = <4>;
-+	cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */
-+	status = "okay";
-+};
-+
-+&mmc2 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&mmc2_4bit_pc_pins>;
-+	vmmc-supply = <&reg_vcc3v3>;
-+	bus-width = <4>;
-+	non-removable;
-+	status = "okay";
-+};
-+
-+&ohci0 {
-+	status = "okay";
-+};
-+
-+&otg_sram {
-+	status = "okay";
-+};
-+
-+&pio {
-+	led_pins_pocketbook: led-pin {
-+		pins = "PE8";
-+		function = "gpio_out";
-+	};
-+	pocketbook_btn_pins: pocketbook_btn_pins {
-+		pins = "PG9", "PG10";
-+		function = "gpio_in";
-+		bias-pull-up;
-+	};
-+	pocketbook_reg_mmc0_pin: pocketbook_reg_mmc0_pin {
-+		pins = "PE4";
-+		function = "gpio_out";
-+	};
-+};
-+
-+&reg_dcdc2 {
-+	regulator-always-on;
-+	regulator-min-microvolt = <1000000>;
-+	regulator-max-microvolt = <1500000>;
-+	regulator-name = "vdd-cpu";
-+};
-+
-+&reg_dcdc3 {
-+	regulator-always-on;
-+	regulator-min-microvolt = <1000000>;
-+	regulator-max-microvolt = <1400000>;
-+	regulator-name = "vdd-int-dll";
-+};
-+
-+&reg_ldo1 {
-+	regulator-name = "vdd-rtc";
-+};
-+
-+&reg_ldo2 {
-+	regulator-always-on;
-+	regulator-min-microvolt = <3000000>;
-+	regulator-max-microvolt = <3000000>;
-+	regulator-name = "avcc";
-+};
-+
-+&reg_ldo3 {
-+	regulator-min-microvolt = <3300000>;
-+	regulator-max-microvolt = <3300000>;
-+	regulator-name = "vcc-wifi";
-+};
-+
-+&reg_usb0_vbus {
-+	status = "okay";
-+	gpio = <&pio 6 12 GPIO_ACTIVE_HIGH>; /* PG12 */
-+};
-+
-+&reg_usb1_vbus {
-+	gpio = <&pio 6 11 GPIO_ACTIVE_HIGH>; /* PG11 */
-+	status = "okay";
-+};
-+
-+&uart1 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&uart1_pg_pins>;
-+	status = "okay";
-+};
-+
-+&usb_otg {
-+	dr_mode = "otg";
-+	status = "okay";
-+};
-+
-+&usb_power_supply {
-+	status = "okay";
-+};
-+
-+&battery_power_supply {
-+	status = "okay";
-+};
-+
-+&usbphy {
-+	usb0_id_det-gpios = <&pio 6 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PG2 */
-+	usb0_vbus_det-gpios = <&axp_gpio 1 GPIO_ACTIVE_HIGH>;
-+	usb0_vbus-supply = <&reg_usb0_vbus>;
-+	usb1_vbus-supply = <&reg_usb1_vbus>;
-+	status = "okay";
-+};
--- 
-2.45.0
-

device/main/linux-postmarketos-allwinner/APKBUILD

@@ -1,11 +1,11 @@
-# Maintainer: Jan Jasper de Kroon <jajadekroon@gmail.com>
-# Co-Maintainer: Arnav Singh <me@arnavion.dev>
+# Maintainer: Arnav Singh <me@arnavion.dev>
+# Co-Maintainer: Jan Jasper de Kroon <jajadekroon@gmail.com>
 _flavor=postmarketos-allwinner
 _config="config-$_flavor.$CARCH"
 pkgname=linux-$_flavor
-pkgver=6.9.10_git20240721
-pkgrel=5
-_tag="orange-pi-6.9-20240721-2345"
+pkgver=6.11.0_git20240915
+pkgrel=0
+_tag="orange-pi-6.11-20240915-2344"
 pkgdesc="Kernel fork with Pine64 patches (megi's tree, slightly patched)"
 arch="aarch64 armv7"
 url="https://megous.com/git/linux/"
@@ -43,7 +43,6 @@ source="$pkgname-$_tag.tar.gz::https://codeberg.org/megi/linux/archive/$_tag.tar
 	0009-ARM-dts-sun6i-Add-Lark-FreeMe-70.2S-tablet.patch
 	0010-eMMC-workaround.patch
 	0011-arm64-dts-allwinner-orangepi-3-fix-ethernet.patch
-	0012-ARM-dts-allwinner-sun5i-a13-pocketbook-614-plus-Add-.patch
 	"
 builddir="$srcdir/linux"
 
@@ -80,19 +79,18 @@ package() {
 		INSTALL_DTBS_PATH="$pkgdir/boot/dtbs"
 }
 sha512sums="
-c6081383741fe883d8f6e223caa45d7ecf179f4cd0c759432bbbb2e43603088840393a0cf58735ab5dda4dbf5e2655d8c9b053a74b029ac4768c200ff6ca6f65  linux-postmarketos-allwinner-orange-pi-6.9-20240721-2345.tar.gz
-3281e69061af98020adf412773a187cb3245b26e0dc22c29a08f37c64360e8ad23a5ea2c4cc19365e2c2ed07d7aae0d63e9e116a9f0badb25584dfe763f3476c  config-postmarketos-allwinner.aarch64
-0011646badbea59ecc670667252d0f6b9fe84c05e43cd3583f7730de526d072f29f47100f65d17dbf84d1284ed6b6cae8eb9d7b6a8df33a178cdfa376402b2e1  config-postmarketos-allwinner.armv7
-a1fe1a21c34062eb92b6a4a9d2ef330d0e745859af283ccf05fc899ec263f9d452c1399c29620a0e4c748eca4b0c13645668b2fc0dc72f5703426d472f1294be  0001-dts-add-dontbeevil-pinephone-devkit.patch
-0ef26b34fa834c119ebff6daa27b1dd3fac27448d6a40c0b2022a00c239dad0ef3e2b3ab3f9eec5460f921c9c6ea21db360adc175a7e658d5c34c5d0aacc498f  0002-dts-add-pinetab-dev-old-display-panel.patch
-d37d929100a9de9431cc3cef6b714b61b5af9633e35a2880fcc8b60279fdc9ab65198fa70d01e070a9f263818d994b9b851973bb079ddea1ca66d2b7964f365d  0003-dts-pinetab-add-missing-ohci1.patch
-e368935e8e1a2380b0b42961ca65e7ebb842916e80b7b3e96211d5091413d5b8112e60f2437f82795e9c21183411f81daf1f2806b7a93b0c03dca0a64e25f079  0004-dts-pinetab-make-audio-routing-consistent-with-pinep.patch
-e4dd137537cecc8cfbb2152120134ee4fb19b930ed0e66313c414fb14061f9d2dd4c280cfbde722f8f39531868823c8f12ec79e45800f5c6e0ded03475557f79  0005-dts-pinephone-drop-modem-power-node.patch
-0234490da9ea6d172ccea95092ab8a0623d2b57d43b0066d0b77a096b4a5e2a02047579f12b09d2e6bc1b77a3f9ea67dc26e9d5c02b947a7126f822132c85d30  0006-drm-panel-simple-Add-Hannstar-TQTM070CB501.patch
-09e8a2b06b45bb0be75a4c09f6a9d165861a950bf6ed1cd91faa493710dd9fdc0aa35a38e23a731bb3f281c30c353310e4a17cdea3ddc6ab7ec3436722eb3b07  0007-ARM-dts-sun6i-Add-GoClever-Orion-70L-tablet.patch
-96d7b7d8161dcd7379092b6aec531ca47ee0566c308057aec2f934256f67ee9f3dcd2fb7ca592b056a5305600ea4125932c96f2c244966d7d46f9b1f3fb77052  0008-drm-panel-simple-Add-Hannstar-HSD070IDW1-A.patch
-22cf608d79337aee6354e7db6bf1f177a6b4ab89f7b26da46e0cf2e280978ace7203829a0e87675449ef41b488ab114cedd5ab911e326b87fa823a0073c8d1fc  0009-ARM-dts-sun6i-Add-Lark-FreeMe-70.2S-tablet.patch
-898f1227fe27e38706ea8e6e2846cbc9bded328090ddb457733cf6417f2e1da5bac2d9caa753b29a0667a2733a937b9d447b666a070462a93d1cfea3f88daea7  0010-eMMC-workaround.patch
-4acfd79aa2978d6b8078fbd7649a2dda4ef5a1e03b52d7e034a7cc40b5a7349c4dc741fab9cb7722fa61eb022fd270719ed5257ac8487796c9e2b1135a123e86  0011-arm64-dts-allwinner-orangepi-3-fix-ethernet.patch
-0770f510a12f8ec29fa2798682b0687438f733634df0b339876b8181c08cd154904412aa88d5dd5df336803da3a4f5c274cba5008be533e036dc5deb3c41fb17  0012-ARM-dts-allwinner-sun5i-a13-pocketbook-614-plus-Add-.patch
+8ade8d4c15c9cd1e27a2cc5a93d98e50597824d98995d69ab1b428677ad9e8232704184f9eafd36986f88b783d39735c16210b542aa346d37679a2ccfcfca835  linux-postmarketos-allwinner-orange-pi-6.11-20240915-2344.tar.gz
+d6b6ac843e93aa26c0d9ec1c03d2d3d71200bc802119d7e7bd76efabeb30fd2cfdfabb22a60ee5e078a13f9a56bd09531ee8acc43e293565f9bd24383ae8573f  config-postmarketos-allwinner.aarch64
+8d918a9f28a3e47feebcf53732b0c20d9c0f1068ccda01cbd5d1d2c8c41183899d8fbfb95f773ad9468d863ceaeaf9d35cfb09603d4b5c52f55673efad98bf2b  config-postmarketos-allwinner.armv7
+54bb653f2eec755d831e4c3c7d5a202c09e8d738335d79664879fea6783c54ea74a935259e77bbbe748138a17e92f421ab3e6bd5b07f7e970fd7b22deebcb84b  0001-dts-add-dontbeevil-pinephone-devkit.patch
+1bfff7c0bd3c6761520c444968b9d61b9c43a733d398628dbe12134858a2803b4761117cd2946e86595a3dd2cbffb395c075502dafa40d9fa97e298f49701eb2  0002-dts-add-pinetab-dev-old-display-panel.patch
+91d10d8d377e3f957f76b634a2e075a8927462621610a12be3fbb7e233580bfbb41e0bc5dab06d16eb59fda54a61c4d0415de7b07a7a3de4b46c7f33d7c00aa3  0003-dts-pinetab-add-missing-ohci1.patch
+27f740236f9612616984bb25fee9970b5874b1f4560fdad45738174953cc00c6b6632e6beb384c84d7d18333c1788a49c20ba32ab360a0a7deda17fbadcaf838  0004-dts-pinetab-make-audio-routing-consistent-with-pinep.patch
+ac775aef3fcece0d1bb18dd6df40e84ed616549a9f4369da196bc3f92da9eaab1d388e8c38ae8082bcf18884f7cda9e8a226fa79442af3bdfade8acfcab88685  0005-dts-pinephone-drop-modem-power-node.patch
+0fe41ef47ace057d4f4bdab2c9f8c908ea4f16f6b118432c71c2a2ad467286532a62dffdbfe0e46781619eca449f11a6d8b13c18e1859a9aaa8a3208156e75a9  0006-drm-panel-simple-Add-Hannstar-TQTM070CB501.patch
+029d2e5863af00bbfe1e6a7fa2455d8773a475434881f528d9c868a9b04c6173c13e9dc63d51920142a89f6d66d6e49d8d14577b243d6c15427dfe2bf2788a8d  0007-ARM-dts-sun6i-Add-GoClever-Orion-70L-tablet.patch
+fa4da8e9b43dfa217afb49fe7c83d7a0a59b1a1bef31d7228c8c5560df36c61bfaaff4134d31655c24e791106a7e75b6797d91f487b802133136d8cb79b32572  0008-drm-panel-simple-Add-Hannstar-HSD070IDW1-A.patch
+7393d67d1144c61bc327a6ce571d4c2b043576a356a74ec74384afc667bc044ecbeb57d2218523b83f84bc873b1b3ae3161b7f8270113953092bb55bbeb89aeb  0009-ARM-dts-sun6i-Add-Lark-FreeMe-70.2S-tablet.patch
+1d922045f835beec1e1a652ae6c2cf7c0081d114bfa4a9bf03c6fdbd79827d9600aae7c79b0740b354bf5aa9c1bd131ced5e939fb1b3e01777e93fcd17dd4f19  0010-eMMC-workaround.patch
+359cda536862c90f0a5c7e87e12448982650c9451921cbad6d611887031ac2c6d0b619666c557acadedf12bc8c27511f118deb97b8e88c76fd09bc18462ed844  0011-arm64-dts-allwinner-orangepi-3-fix-ethernet.patch
 "

device/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.aarch64

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.9.10 Kernel Configuration
+# Linux/arm64 6.11.0 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 14.2.0) 14.2.0"
 CONFIG_CC_IS_GCC=y
@@ -115,7 +115,7 @@ CONFIG_TICK_CPU_ACCOUNTING=y
 # CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
 CONFIG_IRQ_TIME_ACCOUNTING=y
 CONFIG_HAVE_SCHED_AVG_IRQ=y
-CONFIG_SCHED_THERMAL_PRESSURE=y
+CONFIG_SCHED_HW_PRESSURE=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
 CONFIG_TASKSTATS=y
@@ -137,6 +137,7 @@ CONFIG_RCU_EXPERT=y
 CONFIG_TREE_SRCU=y
 CONFIG_TASKS_RCU_GENERIC=y
 # CONFIG_FORCE_TASKS_RCU is not set
+CONFIG_NEED_TASKS_RCU=y
 CONFIG_TASKS_RCU=y
 # CONFIG_FORCE_TASKS_RUDE_RCU is not set
 CONFIG_TASKS_RUDE_RCU=y
@@ -179,11 +180,12 @@ CONFIG_CC_NO_ARRAY_BOUNDS=y
 CONFIG_GCC_NO_STRINGOP_OVERFLOW=y
 CONFIG_CC_NO_STRINGOP_OVERFLOW=y
 CONFIG_ARCH_SUPPORTS_INT128=y
+CONFIG_SLAB_OBJ_EXT=y
 CONFIG_CGROUPS=y
 CONFIG_PAGE_COUNTER=y
 # CONFIG_CGROUP_FAVOR_DYNMODS is not set
 CONFIG_MEMCG=y
-CONFIG_MEMCG_KMEM=y
+# CONFIG_MEMCG_V1 is not set
 CONFIG_BLK_CGROUP=y
 CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
@@ -241,7 +243,6 @@ CONFIG_POSIX_TIMERS=y
 CONFIG_PRINTK=y
 CONFIG_BUG=y
 CONFIG_ELF_CORE=y
-CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
 CONFIG_FUTEX_PI=y
 CONFIG_EPOLL=y
@@ -258,7 +259,6 @@ CONFIG_RSEQ=y
 CONFIG_CACHESTAT_SYSCALL=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_SELFTEST is not set
-CONFIG_KALLSYMS_BASE_RELATIVE=y
 CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
 CONFIG_HAVE_PERF_EVENTS=y
 
@@ -311,6 +311,7 @@ CONFIG_BUILTIN_RETURN_ADDRESS_STRIPS_PAC=y
 # Platform selection
 #
 # CONFIG_ARCH_ACTIONS is not set
+# CONFIG_ARCH_AIROHA is not set
 CONFIG_ARCH_SUNXI=y
 # CONFIG_ARCH_ALPINE is not set
 # CONFIG_ARCH_APPLE is not set
@@ -391,6 +392,7 @@ CONFIG_ARM64_ERRATUM_2645198=y
 CONFIG_ARM64_WORKAROUND_SPECULATIVE_UNPRIV_LOAD=y
 CONFIG_ARM64_ERRATUM_2966298=y
 CONFIG_ARM64_ERRATUM_3117295=y
+CONFIG_ARM64_ERRATUM_3194386=y
 CONFIG_CAVIUM_ERRATUM_22375=y
 CONFIG_CAVIUM_ERRATUM_23154=y
 CONFIG_CAVIUM_ERRATUM_27456=y
@@ -528,6 +530,7 @@ CONFIG_CMDLINE="console=ttyAMA0"
 CONFIG_CMDLINE_FROM_BOOTLOADER=y
 # CONFIG_CMDLINE_FORCE is not set
 # CONFIG_EFI is not set
+# CONFIG_COMPRESSED_INSTALL is not set
 # end of Boot options
 
 #
@@ -694,6 +697,7 @@ CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
 CONFIG_ARCH_WANT_PMD_MKWRITE=y
 CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
 CONFIG_MODULES_USE_ELF_RELA=y
+CONFIG_ARCH_WANTS_EXECMEM_LATE=y
 CONFIG_HAVE_SOFTIRQ_ON_OWN_STACK=y
 CONFIG_SOFTIRQ_ON_OWN_STACK=y
 CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
@@ -731,6 +735,7 @@ CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 CONFIG_ARCH_SUPPORTS_PAGE_TABLE_CHECK=y
 CONFIG_ARCH_HAVE_TRACE_MMIO_ACCESS=y
 CONFIG_ARCH_HAS_HW_PTE_YOUNG=y
+CONFIG_ARCH_HAS_KERNEL_FPU_SUPPORT=y
 
 #
 # GCOV-based kernel profiling
@@ -750,7 +755,6 @@ CONFIG_CC_HAS_SANE_FUNCTION_ALIGNMENT=y
 # end of General architecture-dependent options
 
 CONFIG_RT_MUTEXES=y
-CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
 # CONFIG_MODULE_DEBUG is not set
 # CONFIG_MODULE_FORCE_LOAD is not set
@@ -776,11 +780,9 @@ CONFIG_BLK_CGROUP_PUNT_BIO=y
 CONFIG_BLK_DEV_BSG_COMMON=y
 CONFIG_BLK_DEV_BSGLIB=y
 CONFIG_BLK_DEV_INTEGRITY=y
-CONFIG_BLK_DEV_INTEGRITY_T10=y
 CONFIG_BLK_DEV_WRITE_MOUNTED=y
 # CONFIG_BLK_DEV_ZONED is not set
 CONFIG_BLK_DEV_THROTTLING=y
-# CONFIG_BLK_DEV_THROTTLING_LOW is not set
 # CONFIG_BLK_WBT is not set
 # CONFIG_BLK_CGROUP_IOLATENCY is not set
 # CONFIG_BLK_CGROUP_IOCOST is not set
@@ -845,6 +847,7 @@ CONFIG_COREDUMP=y
 #
 CONFIG_SWAP=y
 # CONFIG_ZSWAP is not set
+CONFIG_HAVE_ZSMALLOC=y
 CONFIG_ZSMALLOC=m
 CONFIG_ZSMALLOC_STAT=y
 CONFIG_ZSMALLOC_CHAIN_SIZE=8
@@ -856,6 +859,7 @@ CONFIG_SLUB=y
 CONFIG_SLAB_MERGE_DEFAULT=y
 # CONFIG_SLAB_FREELIST_RANDOM is not set
 # CONFIG_SLAB_FREELIST_HARDENED is not set
+# CONFIG_SLAB_BUCKETS is not set
 # CONFIG_SLUB_STATS is not set
 CONFIG_SLUB_CPU_PARTIAL=y
 # CONFIG_RANDOM_KMALLOC_CACHES is not set
@@ -867,7 +871,7 @@ CONFIG_SPARSEMEM=y
 CONFIG_SPARSEMEM_EXTREME=y
 CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
 CONFIG_SPARSEMEM_VMEMMAP=y
-CONFIG_HAVE_FAST_GUP=y
+CONFIG_HAVE_GUP_FAST=y
 CONFIG_ARCH_KEEP_MEMBLOCK=y
 CONFIG_MEMORY_ISOLATION=y
 CONFIG_EXCLUSIVE_SYSTEM_RAM=y
@@ -897,6 +901,7 @@ CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
 # CONFIG_TRANSPARENT_HUGEPAGE_NEVER is not set
 CONFIG_THP_SWAP=y
 # CONFIG_READ_ONLY_THP_FOR_FS is not set
+CONFIG_PGTABLE_HAS_HUGE_LEAVES=y
 CONFIG_CMA=y
 # CONFIG_CMA_DEBUGFS is not set
 # CONFIG_CMA_SYSFS is not set
@@ -927,6 +932,7 @@ CONFIG_LRU_GEN_WALKS_MMU=y
 CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y
 CONFIG_PER_VMA_LOCK=y
 CONFIG_LOCK_MM_AND_FIND_VMA=y
+CONFIG_EXECMEM=y
 
 #
 # Data Access Monitoring
@@ -1860,6 +1866,7 @@ CONFIG_VXLAN=m
 # CONFIG_GENEVE is not set
 # CONFIG_BAREUDP is not set
 # CONFIG_GTP is not set
+# CONFIG_PFCP is not set
 # CONFIG_AMT is not set
 # CONFIG_MACSEC is not set
 # CONFIG_NETCONSOLE is not set
@@ -1895,6 +1902,7 @@ CONFIG_SUN4I_EMAC=y
 # CONFIG_NET_VENDOR_LITEX is not set
 # CONFIG_NET_VENDOR_MARVELL is not set
 # CONFIG_NET_VENDOR_MELLANOX is not set
+CONFIG_NET_VENDOR_META=y
 # CONFIG_NET_VENDOR_MICREL is not set
 # CONFIG_NET_VENDOR_MICROCHIP is not set
 # CONFIG_NET_VENDOR_MICROSEMI is not set
@@ -1941,6 +1949,7 @@ CONFIG_FIXED_PHY=y
 #
 # MII PHY device drivers
 #
+# CONFIG_AIR_EN8811H_PHY is not set
 # CONFIG_AMD_PHY is not set
 # CONFIG_ADIN_PHY is not set
 # CONFIG_ADIN1100_PHY is not set
@@ -1983,6 +1992,7 @@ CONFIG_MICROCHIP_PHY=m
 CONFIG_REALTEK_PHY=m
 # CONFIG_RENESAS_PHY is not set
 # CONFIG_ROCKCHIP_PHY is not set
+# CONFIG_RK630_PHY is not set
 CONFIG_SMSC_PHY=m
 # CONFIG_STE10XP is not set
 # CONFIG_TERANETICS_PHY is not set
@@ -2089,6 +2099,7 @@ CONFIG_ATH10K_CE=y
 # CONFIG_ATH10K_USB is not set
 # CONFIG_ATH10K_DEBUG is not set
 # CONFIG_ATH10K_DEBUGFS is not set
+CONFIG_ATH10K_LEDS=y
 # CONFIG_ATH10K_TRACING is not set
 # CONFIG_WCN36XX is not set
 # CONFIG_ATH11K is not set
@@ -2134,6 +2145,7 @@ CONFIG_WLAN_VENDOR_REALTEK=y
 # CONFIG_RTL8187 is not set
 CONFIG_RTL_CARDS=m
 # CONFIG_RTL8192CU is not set
+# CONFIG_RTL8192DU is not set
 # CONFIG_RTL8XXXU is not set
 # CONFIG_RTW88 is not set
 # CONFIG_RTW89 is not set
@@ -2464,6 +2476,7 @@ CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=m
 CONFIG_DEVMEM=y
 CONFIG_DEVPORT=y
 CONFIG_TCG_TPM=y
+# CONFIG_TCG_TPM2_HMAC is not set
 # CONFIG_TCG_TIS is not set
 # CONFIG_TCG_TIS_I2C is not set
 # CONFIG_TCG_TIS_I2C_CR50 is not set
@@ -2681,6 +2694,12 @@ CONFIG_GPIO_PCA953X_IRQ=y
 # CONFIG_GPIO_SIM is not set
 # end of Virtual GPIO drivers
 
+#
+# GPIO Debugging utilities
+#
+# CONFIG_GPIO_VIRTUSER is not set
+# end of GPIO Debugging utilities
+
 # CONFIG_W1 is not set
 CONFIG_POWER_RESET=y
 # CONFIG_POWER_RESET_GPIO is not set
@@ -2694,6 +2713,7 @@ CONFIG_POWER_RESET_SYSCON=y
 CONFIG_REBOOT_MODE=y
 CONFIG_SYSCON_REBOOT_MODE=y
 # CONFIG_NVMEM_REBOOT_MODE is not set
+# CONFIG_POWER_SEQUENCING is not set
 CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
 CONFIG_POWER_SUPPLY_HWMON=y
@@ -2717,6 +2737,7 @@ CONFIG_BATTERY_AXP20X=y
 CONFIG_AXP20X_POWER=y
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
+# CONFIG_BATTERY_MAX1720X is not set
 # CONFIG_CHARGER_ISP1704 is not set
 # CONFIG_CHARGER_MAX8903 is not set
 # CONFIG_CHARGER_LP8727 is not set
@@ -2753,7 +2774,6 @@ CONFIG_HWMON=y
 #
 # CONFIG_SENSORS_AD7414 is not set
 # CONFIG_SENSORS_AD7418 is not set
-# CONFIG_SENSORS_ADM1021 is not set
 # CONFIG_SENSORS_ADM1025 is not set
 # CONFIG_SENSORS_ADM1026 is not set
 # CONFIG_SENSORS_ADM1029 is not set
@@ -2819,7 +2839,6 @@ CONFIG_SENSORS_ARM_SCPI=y
 # CONFIG_SENSORS_MAX6620 is not set
 # CONFIG_SENSORS_MAX6621 is not set
 # CONFIG_SENSORS_MAX6639 is not set
-# CONFIG_SENSORS_MAX6642 is not set
 # CONFIG_SENSORS_MAX6650 is not set
 # CONFIG_SENSORS_MAX6697 is not set
 # CONFIG_SENSORS_MAX31790 is not set
@@ -2885,6 +2904,7 @@ CONFIG_SENSORS_ARM_SCPI=y
 # CONFIG_SENSORS_INA2XX is not set
 # CONFIG_SENSORS_INA238 is not set
 # CONFIG_SENSORS_INA3221 is not set
+# CONFIG_SENSORS_SPD5118 is not set
 # CONFIG_SENSORS_TC74 is not set
 # CONFIG_SENSORS_THMC50 is not set
 # CONFIG_SENSORS_TMP102 is not set
@@ -3007,6 +3027,7 @@ CONFIG_MFD_AXP20X_RSB=y
 # CONFIG_MFD_88PM800 is not set
 # CONFIG_MFD_88PM805 is not set
 # CONFIG_MFD_88PM860X is not set
+# CONFIG_MFD_88PM886_PMIC is not set
 # CONFIG_MFD_MAX14577 is not set
 # CONFIG_MFD_MAX77541 is not set
 # CONFIG_MFD_MAX77620 is not set
@@ -3074,10 +3095,12 @@ CONFIG_MFD_SYSCON=y
 # CONFIG_MFD_ROHM_BD718XX is not set
 # CONFIG_MFD_ROHM_BD71828 is not set
 # CONFIG_MFD_ROHM_BD957XMUF is not set
+# CONFIG_MFD_ROHM_BD96801 is not set
 # CONFIG_MFD_STPMIC1 is not set
 # CONFIG_MFD_STMFX is not set
 # CONFIG_MFD_ATC260X_I2C is not set
 # CONFIG_MFD_QCOM_PM8008 is not set
+# CONFIG_MFD_CS40L50_I2C is not set
 # CONFIG_RAVE_SP_CORE is not set
 # CONFIG_MFD_RSMU_I2C is not set
 # end of Multifunction device drivers
@@ -3150,6 +3173,7 @@ CONFIG_REGULATOR_PWM=y
 # CONFIG_REGULATOR_RTQ6752 is not set
 # CONFIG_REGULATOR_RTQ2208 is not set
 # CONFIG_REGULATOR_SLG51000 is not set
+CONFIG_REGULATOR_SUN20I=y
 # CONFIG_REGULATOR_SY8106A is not set
 # CONFIG_REGULATOR_SY8824X is not set
 # CONFIG_REGULATOR_SY8827N is not set
@@ -3339,6 +3363,7 @@ CONFIG_VIDEO_MEM2MEM_DEINTERLACE=y
 #
 # Chips&Media media platform drivers
 #
+# CONFIG_VIDEO_E5010_JPEG_ENC is not set
 
 #
 # Intel media platform drivers
@@ -3372,6 +3397,11 @@ CONFIG_VIDEO_MEM2MEM_DEINTERLACE=y
 # Qualcomm media platform drivers
 #
 
+#
+# Raspberry Pi media platform drivers
+#
+# CONFIG_VIDEO_RASPBERRYPI_PISP_BE is not set
+
 #
 # Renesas media platform drivers
 #
@@ -3431,6 +3461,8 @@ CONFIG_VIDEO_CAMERA_SENSOR=y
 # CONFIG_VIDEO_ALVIUM_CSI2 is not set
 # CONFIG_VIDEO_AR0521 is not set
 # CONFIG_VIDEO_GC0308 is not set
+# CONFIG_VIDEO_GC05A2 is not set
+# CONFIG_VIDEO_GC08A3 is not set
 # CONFIG_VIDEO_GC2145_MIPI is not set
 # CONFIG_VIDEO_HI556 is not set
 # CONFIG_VIDEO_HI846 is not set
@@ -3440,6 +3472,7 @@ CONFIG_VIDEO_CAMERA_SENSOR=y
 # CONFIG_VIDEO_IMX219 is not set
 # CONFIG_VIDEO_IMX258 is not set
 # CONFIG_VIDEO_IMX274 is not set
+# CONFIG_VIDEO_IMX283 is not set
 # CONFIG_VIDEO_IMX290 is not set
 # CONFIG_VIDEO_IMX296 is not set
 # CONFIG_VIDEO_IMX319 is not set
@@ -3494,7 +3527,7 @@ CONFIG_VIDEO_OV5640=m
 # CONFIG_VIDEO_RJ54N1 is not set
 # CONFIG_VIDEO_S5K5BAF is not set
 # CONFIG_VIDEO_S5K6A3 is not set
-# CONFIG_VIDEO_ST_VGXY61 is not set
+# CONFIG_VIDEO_VGXY61 is not set
 # CONFIG_VIDEO_CCS is not set
 # CONFIG_VIDEO_ET8EK8 is not set
 # CONFIG_VIDEO_HM5065 is not set
@@ -3635,6 +3668,8 @@ CONFIG_VIDEO_GC2145=m
 # CONFIG_VIDEO_DS90UB913 is not set
 # CONFIG_VIDEO_DS90UB953 is not set
 # CONFIG_VIDEO_DS90UB960 is not set
+# CONFIG_VIDEO_MAX96714 is not set
+# CONFIG_VIDEO_MAX96717 is not set
 # end of Video serializers and deserializers
 # end of Media ancillary drivers
 
@@ -3652,9 +3687,9 @@ CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
 # CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
 CONFIG_DRM_DISPLAY_HELPER=y
+# CONFIG_DRM_DISPLAY_DP_AUX_CEC is not set
+# CONFIG_DRM_DISPLAY_DP_AUX_CHARDEV is not set
 CONFIG_DRM_DISPLAY_HDMI_HELPER=y
-# CONFIG_DRM_DP_AUX_CHARDEV is not set
-# CONFIG_DRM_DP_CEC is not set
 CONFIG_DRM_GEM_DMA_HELPER=y
 CONFIG_DRM_GEM_SHMEM_HELPER=y
 CONFIG_DRM_SCHED=y
@@ -3701,9 +3736,11 @@ CONFIG_DRM_PANEL_FEIXIN_K101_IM2BA02=y
 CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D=y
 # CONFIG_DRM_PANEL_DSI_CM is not set
 # CONFIG_DRM_PANEL_LVDS is not set
+# CONFIG_DRM_PANEL_HIMAX_HX83102 is not set
 # CONFIG_DRM_PANEL_HIMAX_HX83112A is not set
 # CONFIG_DRM_PANEL_HIMAX_HX8394 is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9805 is not set
+# CONFIG_DRM_PANEL_ILITEK_ILI9806E is not set
 CONFIG_DRM_PANEL_ILITEK_ILI9881C=y
 # CONFIG_DRM_PANEL_ILITEK_ILI9882T is not set
 # CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
@@ -3715,6 +3752,8 @@ CONFIG_DRM_PANEL_ILITEK_ILI9881C=y
 # CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04 is not set
 # CONFIG_DRM_PANEL_LEADTEK_LTK050H3146W is not set
 # CONFIG_DRM_PANEL_LEADTEK_LTK500HD1829 is not set
+# CONFIG_DRM_PANEL_LINCOLNTECH_LCD197 is not set
+# CONFIG_DRM_PANEL_LG_SW43408 is not set
 # CONFIG_DRM_PANEL_MANTIX_MLAF057WE51 is not set
 # CONFIG_DRM_PANEL_NEWVISION_NV3051D is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT35510 is not set
@@ -3731,9 +3770,11 @@ CONFIG_DRM_PANEL_ILITEK_ILI9881C=y
 # CONFIG_DRM_PANEL_RAYDIUM_RM67191 is not set
 # CONFIG_DRM_PANEL_RAYDIUM_RM68200 is not set
 # CONFIG_DRM_PANEL_RAYDIUM_RM692E5 is not set
+# CONFIG_DRM_PANEL_RAYDIUM_RM69380 is not set
 # CONFIG_DRM_PANEL_RONBO_RB070D30 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_ATNA33XC20 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6E3FA7 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6D16D0 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6D7AA0 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set
@@ -3821,6 +3862,7 @@ CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
 # CONFIG_DRM_PL111 is not set
 CONFIG_DRM_LIMA=y
 CONFIG_DRM_PANFROST=y
+# CONFIG_DRM_PANTHOR is not set
 # CONFIG_DRM_TIDSS is not set
 # CONFIG_DRM_GUD is not set
 # CONFIG_DRM_SSD130X is not set
@@ -3876,6 +3918,7 @@ CONFIG_BACKLIGHT_PWM=y
 # CONFIG_BACKLIGHT_QCOM_WLED is not set
 # CONFIG_BACKLIGHT_ADP8860 is not set
 # CONFIG_BACKLIGHT_ADP8870 is not set
+# CONFIG_BACKLIGHT_LM3509 is not set
 # CONFIG_BACKLIGHT_LM3630A is not set
 # CONFIG_BACKLIGHT_LM3639 is not set
 # CONFIG_BACKLIGHT_LP855X is not set
@@ -4034,6 +4077,7 @@ CONFIG_SND_SOC_I2C_AND_SPI=m
 # CONFIG_SND_SOC_AK4458 is not set
 # CONFIG_SND_SOC_AK4554 is not set
 CONFIG_SND_SOC_AK4613=m
+# CONFIG_SND_SOC_AK4619 is not set
 # CONFIG_SND_SOC_AK4642 is not set
 # CONFIG_SND_SOC_AK5386 is not set
 # CONFIG_SND_SOC_AK5558 is not set
@@ -4070,6 +4114,7 @@ CONFIG_SND_SOC_BT_SCO=m
 # CONFIG_SND_SOC_CS4341 is not set
 # CONFIG_SND_SOC_CS4349 is not set
 # CONFIG_SND_SOC_CS53L30 is not set
+# CONFIG_SND_SOC_CS530X_I2C is not set
 # CONFIG_SND_SOC_CX2072X is not set
 # CONFIG_SND_SOC_DA7213 is not set
 CONFIG_SND_SOC_DMIC=m
@@ -4077,13 +4122,13 @@ CONFIG_SND_SOC_HDMI_CODEC=m
 CONFIG_SND_SOC_EC25=m
 # CONFIG_SND_SOC_ES7134 is not set
 # CONFIG_SND_SOC_ES7241 is not set
+# CONFIG_SND_SOC_ES8311 is not set
 # CONFIG_SND_SOC_ES8316 is not set
 # CONFIG_SND_SOC_ES8326 is not set
 # CONFIG_SND_SOC_ES8328_I2C is not set
 # CONFIG_SND_SOC_GTM601 is not set
 # CONFIG_SND_SOC_HDA is not set
 # CONFIG_SND_SOC_ICS43432 is not set
-# CONFIG_SND_SOC_INNO_RK3036 is not set
 # CONFIG_SND_SOC_MAX98088 is not set
 # CONFIG_SND_SOC_MAX98090 is not set
 # CONFIG_SND_SOC_MAX98357A is not set
@@ -4106,7 +4151,7 @@ CONFIG_SND_SOC_EC25=m
 # CONFIG_SND_SOC_PCM3168A_I2C is not set
 # CONFIG_SND_SOC_PCM5102A is not set
 # CONFIG_SND_SOC_PCM512x_I2C is not set
-# CONFIG_SND_SOC_RK3328 is not set
+# CONFIG_SND_SOC_PCM6240 is not set
 # CONFIG_SND_SOC_RT5616 is not set
 # CONFIG_SND_SOC_RT5631 is not set
 # CONFIG_SND_SOC_RT5640 is not set
@@ -4309,6 +4354,7 @@ CONFIG_HID_MULTITOUCH=y
 # CONFIG_HID_U2FZERO is not set
 CONFIG_HID_WACOM=m
 # CONFIG_HID_WIIMOTE is not set
+# CONFIG_HID_WINWING is not set
 # CONFIG_HID_XINMO is not set
 # CONFIG_HID_ZEROPLUS is not set
 # CONFIG_HID_ZYDACRON is not set
@@ -4561,7 +4607,7 @@ CONFIG_USB_HSIC_USB3503=y
 # CONFIG_USB_HSIC_USB4604 is not set
 # CONFIG_USB_LINK_LAYER_TEST is not set
 # CONFIG_USB_CHAOSKEY is not set
-# CONFIG_USB_ONBOARD_HUB is not set
+# CONFIG_USB_ONBOARD_DEV is not set
 
 #
 # USB Physical Layer drivers
@@ -4579,6 +4625,7 @@ CONFIG_USB_GADGET=y
 # CONFIG_USB_GADGET_DEBUG_FS is not set
 CONFIG_USB_GADGET_VBUS_DRAW=2
 CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
+# CONFIG_U_SERIAL_CONSOLE is not set
 
 #
 # USB Peripheral Controller
@@ -4598,6 +4645,8 @@ CONFIG_USB_BDC_UDC=y
 # end of USB Peripheral Controller
 
 CONFIG_USB_LIBCOMPOSITE=y
+CONFIG_USB_F_ACM=y
+CONFIG_USB_U_SERIAL=y
 CONFIG_USB_U_ETHER=y
 CONFIG_USB_F_NCM=y
 CONFIG_USB_F_ECM=y
@@ -4791,6 +4840,7 @@ CONFIG_LEDS_SGM3140=y
 # CONFIG_LEDS_LM3601X is not set
 # CONFIG_LEDS_RT4505 is not set
 # CONFIG_LEDS_RT8515 is not set
+# CONFIG_LEDS_SY7802 is not set
 
 #
 # RGB LED drivers
@@ -4817,8 +4867,8 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
 CONFIG_LEDS_TRIGGER_PANIC=y
 # CONFIG_LEDS_TRIGGER_NETDEV is not set
 CONFIG_LEDS_TRIGGER_PATTERN=y
-# CONFIG_LEDS_TRIGGER_AUDIO is not set
 # CONFIG_LEDS_TRIGGER_TTY is not set
+# CONFIG_LEDS_TRIGGER_INPUT_EVENTS is not set
 
 #
 # Simple LED drivers
@@ -4878,6 +4928,7 @@ CONFIG_RTC_INTF_DEV=y
 # CONFIG_RTC_DRV_S35390A is not set
 # CONFIG_RTC_DRV_FM3130 is not set
 # CONFIG_RTC_DRV_RX8010 is not set
+# CONFIG_RTC_DRV_RX8111 is not set
 # CONFIG_RTC_DRV_RX8581 is not set
 # CONFIG_RTC_DRV_RX8025 is not set
 # CONFIG_RTC_DRV_EM3027 is not set
@@ -5012,7 +5063,6 @@ CONFIG_VHOST_MENU=y
 # CONFIG_GREYBUS is not set
 # CONFIG_COMEDI is not set
 CONFIG_STAGING=y
-# CONFIG_PRISM2_USB is not set
 # CONFIG_RTLLIB is not set
 CONFIG_RTL8723BS=m
 # CONFIG_R8712U is not set
@@ -5068,8 +5118,10 @@ CONFIG_VIDEO_SUNXI_CEDRUS=y
 CONFIG_RTL8723CS=m
 # CONFIG_GOLDFISH is not set
 # CONFIG_CHROME_PLATFORMS is not set
+# CONFIG_CZNIC_PLATFORMS is not set
 # CONFIG_MELLANOX_PLATFORM is not set
 # CONFIG_SURFACE_PLATFORMS is not set
+CONFIG_ARM64_PLATFORM_DEVICES=y
 CONFIG_HAVE_CLK=y
 CONFIG_HAVE_CLK_PREPARE=y
 CONFIG_COMMON_CLK=y
@@ -5135,6 +5187,7 @@ CONFIG_SUN50I_ERRATUM_UNKNOWN1=y
 CONFIG_MAILBOX=y
 CONFIG_ARM_MHU=y
 # CONFIG_ARM_MHU_V2 is not set
+# CONFIG_ARM_MHU_V3 is not set
 CONFIG_PLATFORM_MHU=y
 # CONFIG_PL320_MBOX is not set
 # CONFIG_ALTERA_MBOX is not set
@@ -5357,7 +5410,6 @@ CONFIG_BMC150_ACCEL_I2C=m
 # CONFIG_AD7291 is not set
 # CONFIG_AD7606_IFACE_PARALLEL is not set
 # CONFIG_AD799X is not set
-# CONFIG_ADI_AXI_ADC is not set
 CONFIG_AXP20X_ADC=y
 # CONFIG_AXP288_ADC is not set
 # CONFIG_CC10001_ADC is not set
@@ -5382,6 +5434,7 @@ CONFIG_AXP20X_ADC=y
 # CONFIG_SUN20I_GPADC is not set
 # CONFIG_TI_ADC081C is not set
 # CONFIG_TI_ADS1015 is not set
+# CONFIG_TI_ADS1119 is not set
 # CONFIG_TI_ADS7924 is not set
 # CONFIG_TI_ADS1100 is not set
 # CONFIG_VF610_ADC is not set
@@ -5420,6 +5473,7 @@ CONFIG_AXP20X_ADC=y
 # CONFIG_ATLAS_EZO_SENSOR is not set
 # CONFIG_BME680 is not set
 # CONFIG_CCS811 is not set
+# CONFIG_ENS160 is not set
 # CONFIG_IAQCORE is not set
 # CONFIG_PMS7003 is not set
 # CONFIG_SCD30_CORE is not set
@@ -5558,6 +5612,7 @@ CONFIG_INV_MPU6050_I2C=m
 # CONFIG_AL3010 is not set
 # CONFIG_AL3320A is not set
 # CONFIG_APDS9300 is not set
+# CONFIG_APDS9306 is not set
 # CONFIG_APDS9960 is not set
 # CONFIG_AS73211 is not set
 # CONFIG_BH1750 is not set
@@ -5602,6 +5657,7 @@ CONFIG_STK3310=m
 # CONFIG_VCNL4000 is not set
 # CONFIG_VCNL4035 is not set
 # CONFIG_VEML6030 is not set
+# CONFIG_VEML6040 is not set
 # CONFIG_VEML6070 is not set
 # CONFIG_VEML6075 is not set
 # CONFIG_VL6180 is not set
@@ -5734,10 +5790,10 @@ CONFIG_IIO_ST_MAGN_I2C_3AXIS=m
 # end of Temperature sensors
 
 CONFIG_PWM=y
-CONFIG_PWM_SYSFS=y
 # CONFIG_PWM_ATMEL_TCB is not set
 # CONFIG_PWM_CLK is not set
 # CONFIG_PWM_FSL_FTM is not set
+# CONFIG_PWM_GPIO is not set
 # CONFIG_PWM_PCA9685 is not set
 CONFIG_PWM_SUN4I=y
 # CONFIG_PWM_XILINX is not set
@@ -5750,7 +5806,9 @@ CONFIG_ARM_GIC=y
 CONFIG_ARM_GIC_MAX_NR=1
 CONFIG_ARM_GIC_V3=y
 CONFIG_ARM_GIC_V3_ITS=y
+CONFIG_IRQ_MSI_LIB=y
 # CONFIG_AL_FIC is not set
+# CONFIG_LAN966X_OIC is not set
 CONFIG_SUN6I_R_INTC=y
 CONFIG_SUNXI_NMI_INTC=y
 # CONFIG_XILINX_INTC is not set
@@ -5958,9 +6016,9 @@ CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
 #
 CONFIG_NETFS_SUPPORT=m
 # CONFIG_NETFS_STATS is not set
+# CONFIG_NETFS_DEBUG is not set
 CONFIG_FSCACHE=y
 # CONFIG_FSCACHE_STATS is not set
-# CONFIG_FSCACHE_DEBUG is not set
 CONFIG_CACHEFILES=m
 # CONFIG_CACHEFILES_DEBUG is not set
 # CONFIG_CACHEFILES_ERROR_INJECTION is not set
@@ -6269,7 +6327,6 @@ CONFIG_CRYPTO_ECC=m
 CONFIG_CRYPTO_ECDH=m
 # CONFIG_CRYPTO_ECDSA is not set
 # CONFIG_CRYPTO_ECRDSA is not set
-# CONFIG_CRYPTO_SM2 is not set
 # CONFIG_CRYPTO_CURVE25519 is not set
 # end of Public-key cryptography
 
@@ -6390,7 +6447,6 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m
 # CONFIG_CRYPTO_USER_API_RNG is not set
 # CONFIG_CRYPTO_USER_API_AEAD is not set
 # CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE is not set
-# CONFIG_CRYPTO_STATS is not set
 # end of Userspace interface
 
 CONFIG_CRYPTO_HASH_INFO=y
@@ -6565,13 +6621,13 @@ CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_ARCH_DMA_ADDR_T_64BIT=y
 CONFIG_DMA_DECLARE_COHERENT=y
 CONFIG_ARCH_HAS_SETUP_DMA_OPS=y
-CONFIG_ARCH_HAS_TEARDOWN_DMA_OPS=y
 CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE=y
 CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU=y
 CONFIG_ARCH_HAS_DMA_PREP_COHERENT=y
 CONFIG_SWIOTLB=y
 # CONFIG_SWIOTLB_DYNAMIC is not set
 CONFIG_DMA_BOUNCE_UNALIGNED_KMALLOC=y
+CONFIG_DMA_NEED_SYNC=y
 # CONFIG_DMA_RESTRICTED_POOL is not set
 CONFIG_DMA_NONCOHERENT_MMAP=y
 CONFIG_DMA_COHERENT_POOL=y
@@ -6598,6 +6654,7 @@ CONFIG_NLATTR=y
 CONFIG_CLZ_TAB=y
 # CONFIG_IRQ_POLL is not set
 CONFIG_MPILIB=y
+CONFIG_DIMLIB=y
 CONFIG_LIBFDT=y
 CONFIG_OID_REGISTRY=y
 CONFIG_HAVE_GENERIC_VDSO=y
@@ -6690,6 +6747,7 @@ CONFIG_ARCH_HAS_DEBUG_VM_PGTABLE=y
 # CONFIG_DEBUG_VM_PGTABLE is not set
 CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
 CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_MEM_ALLOC_PROFILING is not set
 CONFIG_HAVE_ARCH_KASAN=y
 CONFIG_HAVE_ARCH_KASAN_SW_TAGS=y
 CONFIG_HAVE_ARCH_KASAN_HW_TAGS=y
@@ -6716,6 +6774,7 @@ CONFIG_HAVE_HARDLOCKUP_DETECTOR_BUDDY=y
 # Scheduler Debugging
 #
 CONFIG_SCHED_INFO=y
+# CONFIG_SCHEDSTATS is not set
 # end of Scheduler Debugging
 
 # CONFIG_DEBUG_TIMEKEEPING is not set
@@ -6744,6 +6803,7 @@ CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=0
 # CONFIG_RCU_CPU_STALL_CPUTIME is not set
 # end of RCU Debugging
 
+CONFIG_USER_STACKTRACE_SUPPORT=y
 CONFIG_NOP_TRACER=y
 CONFIG_HAVE_FUNCTION_TRACER=y
 CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
@@ -6799,6 +6859,7 @@ CONFIG_FTRACE_MCOUNT_USE_PATCHABLE_FUNCTION_ENTRY=y
 # CONFIG_RING_BUFFER_BENCHMARK is not set
 # CONFIG_TRACE_EVAL_MAP_FILE is not set
 # CONFIG_FTRACE_RECORD_RECURSION is not set
+# CONFIG_FTRACE_VALIDATE_RCU_IS_WATCHING is not set
 # CONFIG_FTRACE_STARTUP_TEST is not set
 # CONFIG_RING_BUFFER_STARTUP_TEST is not set
 # CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS is not set

device/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.armv7

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 6.9.10 Kernel Configuration
+# Linux/arm 6.11.0 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="armv7-alpine-linux-musleabihf-gcc (Alpine 14.2.0) 14.2.0"
 CONFIG_CC_IS_GCC=y
@@ -115,7 +115,7 @@ CONFIG_PREEMPTION=y
 CONFIG_TICK_CPU_ACCOUNTING=y
 # CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
 # CONFIG_IRQ_TIME_ACCOUNTING is not set
-CONFIG_SCHED_THERMAL_PRESSURE=y
+CONFIG_SCHED_HW_PRESSURE=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
 CONFIG_PSI=y
@@ -134,6 +134,7 @@ CONFIG_TREE_SRCU=y
 CONFIG_NEED_SRCU_NMI_SAFE=y
 CONFIG_TASKS_RCU_GENERIC=y
 # CONFIG_FORCE_TASKS_RCU is not set
+CONFIG_NEED_TASKS_RCU=y
 CONFIG_TASKS_RCU=y
 # CONFIG_FORCE_TASKS_RUDE_RCU is not set
 CONFIG_TASKS_RUDE_RCU=y
@@ -172,11 +173,12 @@ CONFIG_GCC10_NO_ARRAY_BOUNDS=y
 CONFIG_CC_NO_ARRAY_BOUNDS=y
 CONFIG_GCC_NO_STRINGOP_OVERFLOW=y
 CONFIG_CC_NO_STRINGOP_OVERFLOW=y
+CONFIG_SLAB_OBJ_EXT=y
 CONFIG_CGROUPS=y
 CONFIG_PAGE_COUNTER=y
 # CONFIG_CGROUP_FAVOR_DYNMODS is not set
 CONFIG_MEMCG=y
-CONFIG_MEMCG_KMEM=y
+# CONFIG_MEMCG_V1 is not set
 CONFIG_BLK_CGROUP=y
 CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
@@ -218,6 +220,7 @@ CONFIG_RD_ZSTD=y
 CONFIG_INITRAMFS_PRESERVE_MTIME=y
 CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_HAVE_LD_DEAD_CODE_DATA_ELIMINATION=y
 CONFIG_LD_ORPHAN_WARN=y
 CONFIG_LD_ORPHAN_WARN_LEVEL="warn"
 CONFIG_SYSCTL=y
@@ -231,7 +234,6 @@ CONFIG_POSIX_TIMERS=y
 CONFIG_PRINTK=y
 CONFIG_BUG=y
 CONFIG_ELF_CORE=y
-CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
 CONFIG_FUTEX_PI=y
 CONFIG_EPOLL=y
@@ -248,7 +250,6 @@ CONFIG_RSEQ=y
 CONFIG_CACHESTAT_SYSCALL=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_SELFTEST is not set
-CONFIG_KALLSYMS_BASE_RELATIVE=y
 CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
 CONFIG_HAVE_PERF_EVENTS=y
 CONFIG_PERF_USE_VMALLOC=y
@@ -481,6 +482,7 @@ CONFIG_ARCH_FLATMEM_ENABLE=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_HIGHMEM=y
 CONFIG_HIGHPTE=y
+CONFIG_ARM_PAN=y
 CONFIG_CPU_SW_DOMAIN_PAN=y
 CONFIG_HW_PERF_EVENTS=y
 CONFIG_ARM_MODULE_PLTS=y
@@ -633,10 +635,12 @@ CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
 CONFIG_SECCOMP=y
 CONFIG_SECCOMP_FILTER=y
 # CONFIG_SECCOMP_CACHE_DEBUG is not set
+CONFIG_HAVE_ARCH_STACKLEAK=y
 CONFIG_HAVE_STACKPROTECTOR=y
 CONFIG_STACKPROTECTOR=y
 CONFIG_STACKPROTECTOR_STRONG=y
 CONFIG_LTO_NONE=y
+CONFIG_ARCH_SUPPORTS_CFI_CLANG=y
 CONFIG_HAVE_CONTEXT_TRACKING_USER=y
 CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
 CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
@@ -687,7 +691,6 @@ CONFIG_CC_HAS_SANE_FUNCTION_ALIGNMENT=y
 # end of General architecture-dependent options
 
 CONFIG_RT_MUTEXES=y
-CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
 # CONFIG_MODULE_DEBUG is not set
 # CONFIG_MODULE_FORCE_LOAD is not set
@@ -712,11 +715,9 @@ CONFIG_BLK_CGROUP_PUNT_BIO=y
 CONFIG_BLK_DEV_BSG_COMMON=y
 # CONFIG_BLK_DEV_BSGLIB is not set
 CONFIG_BLK_DEV_INTEGRITY=y
-CONFIG_BLK_DEV_INTEGRITY_T10=y
 CONFIG_BLK_DEV_WRITE_MOUNTED=y
 # CONFIG_BLK_DEV_ZONED is not set
 CONFIG_BLK_DEV_THROTTLING=y
-# CONFIG_BLK_DEV_THROTTLING_LOW is not set
 # CONFIG_BLK_WBT is not set
 # CONFIG_BLK_CGROUP_IOLATENCY is not set
 # CONFIG_BLK_CGROUP_IOCOST is not set
@@ -774,6 +775,7 @@ CONFIG_COREDUMP=y
 #
 CONFIG_SWAP=y
 # CONFIG_ZSWAP is not set
+CONFIG_HAVE_ZSMALLOC=y
 CONFIG_ZSMALLOC=m
 CONFIG_ZSMALLOC_STAT=y
 CONFIG_ZSMALLOC_CHAIN_SIZE=8
@@ -785,6 +787,7 @@ CONFIG_SLUB=y
 CONFIG_SLAB_MERGE_DEFAULT=y
 # CONFIG_SLAB_FREELIST_RANDOM is not set
 # CONFIG_SLAB_FREELIST_HARDENED is not set
+# CONFIG_SLAB_BUCKETS is not set
 # CONFIG_SLUB_STATS is not set
 CONFIG_SLUB_CPU_PARTIAL=y
 # CONFIG_RANDOM_KMALLOC_CACHES is not set
@@ -832,6 +835,7 @@ CONFIG_LRU_GEN_ENABLED=y
 CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y
 CONFIG_PER_VMA_LOCK=y
 CONFIG_LOCK_MM_AND_FIND_VMA=y
+CONFIG_EXECMEM=y
 
 #
 # Data Access Monitoring
@@ -1730,6 +1734,7 @@ CONFIG_VXLAN=m
 # CONFIG_GENEVE is not set
 # CONFIG_BAREUDP is not set
 # CONFIG_GTP is not set
+# CONFIG_PFCP is not set
 # CONFIG_MACSEC is not set
 # CONFIG_NETCONSOLE is not set
 CONFIG_TUN=y
@@ -1779,6 +1784,7 @@ CONFIG_NET_VENDOR_ADI=y
 CONFIG_NET_VENDOR_MELLANOX=y
 # CONFIG_MLXSW_CORE is not set
 # CONFIG_MLXFW is not set
+CONFIG_NET_VENDOR_META=y
 # CONFIG_NET_VENDOR_MICREL is not set
 # CONFIG_NET_VENDOR_MICROCHIP is not set
 CONFIG_NET_VENDOR_MICROSEMI=y
@@ -1830,6 +1836,7 @@ CONFIG_FIXED_PHY=y
 #
 # MII PHY device drivers
 #
+# CONFIG_AIR_EN8811H_PHY is not set
 # CONFIG_AMD_PHY is not set
 # CONFIG_ADIN_PHY is not set
 # CONFIG_ADIN1100_PHY is not set
@@ -1872,6 +1879,7 @@ CONFIG_MICREL_PHY=y
 CONFIG_REALTEK_PHY=y
 # CONFIG_RENESAS_PHY is not set
 # CONFIG_ROCKCHIP_PHY is not set
+# CONFIG_RK630_PHY is not set
 # CONFIG_SMSC_PHY is not set
 # CONFIG_STE10XP is not set
 # CONFIG_TERANETICS_PHY is not set
@@ -2040,6 +2048,7 @@ CONFIG_ATH10K_SDIO=m
 CONFIG_ATH10K_USB=m
 # CONFIG_ATH10K_DEBUG is not set
 CONFIG_ATH10K_DEBUGFS=y
+CONFIG_ATH10K_LEDS=y
 CONFIG_ATH10K_SPECTRAL=y
 # CONFIG_ATH10K_TRACING is not set
 CONFIG_WCN36XX=m
@@ -2137,6 +2146,7 @@ CONFIG_WLAN_VENDOR_REALTEK=y
 # CONFIG_RTL8187 is not set
 CONFIG_RTL_CARDS=m
 # CONFIG_RTL8192CU is not set
+# CONFIG_RTL8192DU is not set
 CONFIG_RTL8XXXU=m
 CONFIG_RTL8XXXU_UNTESTED=y
 CONFIG_RTW88=m
@@ -2567,6 +2577,7 @@ CONFIG_SPI_MASTER=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_CADENCE is not set
 # CONFIG_SPI_CADENCE_QUADSPI is not set
+# CONFIG_SPI_CH341 is not set
 # CONFIG_SPI_DESIGNWARE is not set
 # CONFIG_SPI_GPIO is not set
 # CONFIG_SPI_FSL_SPI is not set
@@ -2744,8 +2755,15 @@ CONFIG_GPIO_CDEV_V1=y
 # CONFIG_GPIO_SIM is not set
 # end of Virtual GPIO drivers
 
+#
+# GPIO Debugging utilities
+#
+# CONFIG_GPIO_VIRTUSER is not set
+# end of GPIO Debugging utilities
+
 # CONFIG_W1 is not set
 # CONFIG_POWER_RESET is not set
+# CONFIG_POWER_SEQUENCING is not set
 CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
 CONFIG_POWER_SUPPLY_HWMON=y
@@ -2767,6 +2785,7 @@ CONFIG_BATTERY_AXP20X=y
 CONFIG_AXP20X_POWER=y
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
+# CONFIG_BATTERY_MAX1720X is not set
 # CONFIG_CHARGER_ISP1704 is not set
 # CONFIG_CHARGER_MAX8903 is not set
 # CONFIG_CHARGER_LP8727 is not set
@@ -2804,7 +2823,6 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_AD7314 is not set
 # CONFIG_SENSORS_AD7414 is not set
 # CONFIG_SENSORS_AD7418 is not set
-# CONFIG_SENSORS_ADM1021 is not set
 # CONFIG_SENSORS_ADM1025 is not set
 # CONFIG_SENSORS_ADM1026 is not set
 # CONFIG_SENSORS_ADM1029 is not set
@@ -2874,7 +2892,6 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_MAX6620 is not set
 # CONFIG_SENSORS_MAX6621 is not set
 # CONFIG_SENSORS_MAX6639 is not set
-# CONFIG_SENSORS_MAX6642 is not set
 # CONFIG_SENSORS_MAX6650 is not set
 # CONFIG_SENSORS_MAX6697 is not set
 # CONFIG_SENSORS_MAX31790 is not set
@@ -2942,6 +2959,7 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_INA2XX is not set
 # CONFIG_SENSORS_INA238 is not set
 # CONFIG_SENSORS_INA3221 is not set
+# CONFIG_SENSORS_SPD5118 is not set
 # CONFIG_SENSORS_TC74 is not set
 # CONFIG_SENSORS_THMC50 is not set
 # CONFIG_SENSORS_TMP102 is not set
@@ -3068,6 +3086,7 @@ CONFIG_MFD_AXP20X_RSB=y
 # CONFIG_MFD_88PM800 is not set
 # CONFIG_MFD_88PM805 is not set
 # CONFIG_MFD_88PM860X is not set
+# CONFIG_MFD_88PM886_PMIC is not set
 # CONFIG_MFD_MAX14577 is not set
 # CONFIG_MFD_MAX77541 is not set
 # CONFIG_MFD_MAX77620 is not set
@@ -3144,10 +3163,13 @@ CONFIG_MFD_SYSCON=y
 # CONFIG_MFD_ROHM_BD718XX is not set
 # CONFIG_MFD_ROHM_BD71828 is not set
 # CONFIG_MFD_ROHM_BD957XMUF is not set
+# CONFIG_MFD_ROHM_BD96801 is not set
 # CONFIG_MFD_STPMIC1 is not set
 # CONFIG_MFD_STMFX is not set
 # CONFIG_MFD_ATC260X_I2C is not set
 # CONFIG_MFD_QCOM_PM8008 is not set
+# CONFIG_MFD_CS40L50_I2C is not set
+# CONFIG_MFD_CS40L50_SPI is not set
 # CONFIG_MFD_INTEL_M10_BMC_SPI is not set
 # CONFIG_MFD_RSMU_I2C is not set
 # CONFIG_MFD_RSMU_SPI is not set
@@ -3218,6 +3240,7 @@ CONFIG_REGULATOR_GPIO=y
 # CONFIG_REGULATOR_RTQ6752 is not set
 # CONFIG_REGULATOR_RTQ2208 is not set
 # CONFIG_REGULATOR_SLG51000 is not set
+CONFIG_REGULATOR_SUN20I=y
 # CONFIG_REGULATOR_SY8106A is not set
 # CONFIG_REGULATOR_SY8824X is not set
 # CONFIG_REGULATOR_SY8827N is not set
@@ -3346,6 +3369,7 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y
 #
 # Chips&Media media platform drivers
 #
+# CONFIG_VIDEO_E5010_JPEG_ENC is not set
 
 #
 # Intel media platform drivers
@@ -3379,6 +3403,11 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y
 # Qualcomm media platform drivers
 #
 
+#
+# Raspberry Pi media platform drivers
+#
+# CONFIG_VIDEO_RASPBERRYPI_PISP_BE is not set
+
 #
 # Renesas media platform drivers
 #
@@ -3456,6 +3485,8 @@ CONFIG_VIDEO_IR_I2C=y
 # CONFIG_VIDEO_DS90UB913 is not set
 # CONFIG_VIDEO_DS90UB953 is not set
 # CONFIG_VIDEO_DS90UB960 is not set
+# CONFIG_VIDEO_MAX96714 is not set
+# CONFIG_VIDEO_MAX96717 is not set
 # end of Video serializers and deserializers
 
 #
@@ -3483,9 +3514,10 @@ CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
 # CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
 CONFIG_DRM_DISPLAY_HELPER=y
+# CONFIG_DRM_DISPLAY_DP_AUX_CEC is not set
+# CONFIG_DRM_DISPLAY_DP_AUX_CHARDEV is not set
 CONFIG_DRM_DISPLAY_HDMI_HELPER=y
-# CONFIG_DRM_DP_AUX_CHARDEV is not set
-# CONFIG_DRM_DP_CEC is not set
+CONFIG_DRM_DISPLAY_HDMI_STATE_HELPER=y
 CONFIG_DRM_GEM_DMA_HELPER=y
 CONFIG_DRM_GEM_SHMEM_HELPER=y
 CONFIG_DRM_SCHED=y
@@ -3541,11 +3573,13 @@ CONFIG_DRM_PANEL=y
 # CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D is not set
 # CONFIG_DRM_PANEL_DSI_CM is not set
 CONFIG_DRM_PANEL_LVDS=y
+# CONFIG_DRM_PANEL_HIMAX_HX83102 is not set
 # CONFIG_DRM_PANEL_HIMAX_HX83112A is not set
 # CONFIG_DRM_PANEL_HIMAX_HX8394 is not set
 # CONFIG_DRM_PANEL_ILITEK_IL9322 is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9341 is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9805 is not set
+# CONFIG_DRM_PANEL_ILITEK_ILI9806E is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9881C is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9882T is not set
 # CONFIG_DRM_PANEL_INNOLUX_EJ030NA is not set
@@ -3558,8 +3592,10 @@ CONFIG_DRM_PANEL_LVDS=y
 # CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04 is not set
 # CONFIG_DRM_PANEL_LEADTEK_LTK050H3146W is not set
 # CONFIG_DRM_PANEL_LEADTEK_LTK500HD1829 is not set
+# CONFIG_DRM_PANEL_LINCOLNTECH_LCD197 is not set
 # CONFIG_DRM_PANEL_LG_LB035Q02 is not set
 # CONFIG_DRM_PANEL_LG_LG4573 is not set
+# CONFIG_DRM_PANEL_LG_SW43408 is not set
 # CONFIG_DRM_PANEL_MAGNACHIP_D53E6EA8966 is not set
 # CONFIG_DRM_PANEL_MANTIX_MLAF057WE51 is not set
 # CONFIG_DRM_PANEL_NEC_NL8048HL11 is not set
@@ -3581,11 +3617,13 @@ CONFIG_DRM_PANEL_LVDS=y
 # CONFIG_DRM_PANEL_RAYDIUM_RM67191 is not set
 # CONFIG_DRM_PANEL_RAYDIUM_RM68200 is not set
 # CONFIG_DRM_PANEL_RAYDIUM_RM692E5 is not set
+# CONFIG_DRM_PANEL_RAYDIUM_RM69380 is not set
 # CONFIG_DRM_PANEL_RONBO_RB070D30 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_ATNA33XC20 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_DB7430 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6E3FA7 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6D16D0 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6D27A1 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6D7AA0 is not set
@@ -3690,6 +3728,7 @@ CONFIG_DRM_DW_HDMI=y
 # CONFIG_DRM_TVE200 is not set
 CONFIG_DRM_LIMA=y
 # CONFIG_DRM_PANFROST is not set
+# CONFIG_DRM_PANTHOR is not set
 # CONFIG_DRM_MCDE is not set
 # CONFIG_DRM_TIDSS is not set
 # CONFIG_DRM_GUD is not set
@@ -3744,6 +3783,7 @@ CONFIG_BACKLIGHT_PWM=y
 # CONFIG_BACKLIGHT_QCOM_WLED is not set
 # CONFIG_BACKLIGHT_ADP8860 is not set
 # CONFIG_BACKLIGHT_ADP8870 is not set
+# CONFIG_BACKLIGHT_LM3509 is not set
 # CONFIG_BACKLIGHT_LM3630A is not set
 # CONFIG_BACKLIGHT_LM3639 is not set
 # CONFIG_BACKLIGHT_LP855X is not set
@@ -3901,6 +3941,7 @@ CONFIG_SND_SOC_I2C_AND_SPI=y
 # CONFIG_SND_SOC_AK4458 is not set
 # CONFIG_SND_SOC_AK4554 is not set
 # CONFIG_SND_SOC_AK4613 is not set
+# CONFIG_SND_SOC_AK4619 is not set
 # CONFIG_SND_SOC_AK4642 is not set
 # CONFIG_SND_SOC_AK5386 is not set
 # CONFIG_SND_SOC_AK5558 is not set
@@ -3941,12 +3982,14 @@ CONFIG_SND_SOC_I2C_AND_SPI=y
 # CONFIG_SND_SOC_CS4341 is not set
 # CONFIG_SND_SOC_CS4349 is not set
 # CONFIG_SND_SOC_CS53L30 is not set
+# CONFIG_SND_SOC_CS530X_I2C is not set
 # CONFIG_SND_SOC_CX2072X is not set
 # CONFIG_SND_SOC_DA7213 is not set
 # CONFIG_SND_SOC_DMIC is not set
 # CONFIG_SND_SOC_EC25 is not set
 # CONFIG_SND_SOC_ES7134 is not set
 # CONFIG_SND_SOC_ES7241 is not set
+# CONFIG_SND_SOC_ES8311 is not set
 # CONFIG_SND_SOC_ES8316 is not set
 # CONFIG_SND_SOC_ES8326 is not set
 # CONFIG_SND_SOC_ES8328_I2C is not set
@@ -3955,7 +3998,6 @@ CONFIG_SND_SOC_I2C_AND_SPI=y
 # CONFIG_SND_SOC_HDA is not set
 # CONFIG_SND_SOC_ICS43432 is not set
 # CONFIG_SND_SOC_IDT821034 is not set
-# CONFIG_SND_SOC_INNO_RK3036 is not set
 # CONFIG_SND_SOC_MAX98088 is not set
 # CONFIG_SND_SOC_MAX98090 is not set
 # CONFIG_SND_SOC_MAX98357A is not set
@@ -3982,8 +4024,8 @@ CONFIG_SND_SOC_I2C_AND_SPI=y
 # CONFIG_SND_SOC_PCM5102A is not set
 # CONFIG_SND_SOC_PCM512x_I2C is not set
 # CONFIG_SND_SOC_PCM512x_SPI is not set
+# CONFIG_SND_SOC_PCM6240 is not set
 # CONFIG_SND_SOC_PEB2466 is not set
-# CONFIG_SND_SOC_RK3328 is not set
 # CONFIG_SND_SOC_RT5616 is not set
 # CONFIG_SND_SOC_RT5631 is not set
 # CONFIG_SND_SOC_RT5640 is not set
@@ -4192,6 +4234,7 @@ CONFIG_HID_MONTEREY=y
 # CONFIG_HID_UDRAW_PS3 is not set
 CONFIG_HID_WACOM=m
 # CONFIG_HID_WIIMOTE is not set
+# CONFIG_HID_WINWING is not set
 # CONFIG_HID_XINMO is not set
 # CONFIG_HID_ZEROPLUS is not set
 # CONFIG_HID_ZYDACRON is not set
@@ -4368,7 +4411,7 @@ CONFIG_APPLE_MFI_FASTCHARGE=m
 # CONFIG_USB_HSIC_USB3503 is not set
 # CONFIG_USB_HSIC_USB4604 is not set
 # CONFIG_USB_LINK_LAYER_TEST is not set
-# CONFIG_USB_ONBOARD_HUB is not set
+# CONFIG_USB_ONBOARD_DEV is not set
 
 #
 # USB Physical Layer drivers
@@ -4410,6 +4453,7 @@ CONFIG_USB_MAX3420_UDC=m
 # end of USB Peripheral Controller
 
 CONFIG_USB_LIBCOMPOSITE=m
+CONFIG_USB_F_ACM=m
 CONFIG_USB_U_SERIAL=m
 CONFIG_USB_U_ETHER=m
 CONFIG_USB_U_AUDIO=m
@@ -4617,8 +4661,8 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
 # CONFIG_LEDS_TRIGGER_PANIC is not set
 # CONFIG_LEDS_TRIGGER_NETDEV is not set
 CONFIG_LEDS_TRIGGER_PATTERN=y
-# CONFIG_LEDS_TRIGGER_AUDIO is not set
 # CONFIG_LEDS_TRIGGER_TTY is not set
+# CONFIG_LEDS_TRIGGER_INPUT_EVENTS is not set
 
 #
 # Simple LED drivers
@@ -4674,6 +4718,7 @@ CONFIG_RTC_DRV_PCF8563=m
 # CONFIG_RTC_DRV_S35390A is not set
 # CONFIG_RTC_DRV_FM3130 is not set
 # CONFIG_RTC_DRV_RX8010 is not set
+# CONFIG_RTC_DRV_RX8111 is not set
 # CONFIG_RTC_DRV_RX8581 is not set
 # CONFIG_RTC_DRV_RX8025 is not set
 # CONFIG_RTC_DRV_EM3027 is not set
@@ -4789,7 +4834,6 @@ CONFIG_DMABUF_HEAPS_CMA=y
 CONFIG_UIO=m
 CONFIG_UIO_PDRV_GENIRQ=m
 CONFIG_UIO_DMEM_GENIRQ=m
-# CONFIG_UIO_PRUSS is not set
 # CONFIG_VFIO is not set
 # CONFIG_VIRT_DRIVERS is not set
 CONFIG_VIRTIO_MENU=y
@@ -4808,7 +4852,6 @@ CONFIG_VHOST_MENU=y
 # CONFIG_GREYBUS is not set
 # CONFIG_COMEDI is not set
 CONFIG_STAGING=y
-CONFIG_PRISM2_USB=m
 CONFIG_RTLLIB=m
 CONFIG_RTLLIB_CRYPTO_CCMP=m
 CONFIG_RTLLIB_CRYPTO_TKIP=m
@@ -4868,12 +4911,12 @@ CONFIG_VIDEO_SUNXI_CEDRUS=y
 # CONFIG_LTE_GDM724X is not set
 # CONFIG_FB_TFT is not set
 # CONFIG_KS7010 is not set
-# CONFIG_PI433 is not set
 # CONFIG_XIL_AXIS_FIFO is not set
 # CONFIG_FIELDBUS_DEV is not set
 CONFIG_RTL8723CS=m
 # CONFIG_GOLDFISH is not set
 # CONFIG_CHROME_PLATFORMS is not set
+# CONFIG_CZNIC_PLATFORMS is not set
 # CONFIG_MELLANOX_PLATFORM is not set
 CONFIG_HAVE_CLK=y
 CONFIG_HAVE_CLK_PREPARE=y
@@ -4943,6 +4986,7 @@ CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
 # end of Clock Source drivers
 
 CONFIG_MAILBOX=y
+# CONFIG_ARM_MHU_V3 is not set
 # CONFIG_PLATFORM_MHU is not set
 # CONFIG_ALTERA_MBOX is not set
 # CONFIG_MAILBOX_TEST is not set
@@ -5139,12 +5183,14 @@ CONFIG_MMA7660=m
 # CONFIG_AD7091R5 is not set
 # CONFIG_AD7091R8 is not set
 # CONFIG_AD7124 is not set
+# CONFIG_AD7173 is not set
 # CONFIG_AD7192 is not set
 # CONFIG_AD7266 is not set
 # CONFIG_AD7280 is not set
 # CONFIG_AD7291 is not set
 # CONFIG_AD7292 is not set
 # CONFIG_AD7298 is not set
+# CONFIG_AD7380 is not set
 # CONFIG_AD7476 is not set
 # CONFIG_AD7606_IFACE_PARALLEL is not set
 # CONFIG_AD7606_IFACE_SPI is not set
@@ -5155,10 +5201,10 @@ CONFIG_MMA7660=m
 # CONFIG_AD7793 is not set
 # CONFIG_AD7887 is not set
 # CONFIG_AD7923 is not set
+# CONFIG_AD7944 is not set
 # CONFIG_AD7949 is not set
 # CONFIG_AD799X is not set
 # CONFIG_AD9467 is not set
-# CONFIG_ADI_AXI_ADC is not set
 CONFIG_AXP20X_ADC=y
 # CONFIG_AXP288_ADC is not set
 # CONFIG_CC10001_ADC is not set
@@ -5198,6 +5244,7 @@ CONFIG_AXP20X_ADC=y
 # CONFIG_TI_ADC128S052 is not set
 # CONFIG_TI_ADC161S626 is not set
 # CONFIG_TI_ADS1015 is not set
+# CONFIG_TI_ADS1119 is not set
 # CONFIG_TI_ADS7924 is not set
 # CONFIG_TI_ADS1100 is not set
 # CONFIG_TI_ADS1298 is not set
@@ -5249,6 +5296,7 @@ CONFIG_AXP20X_ADC=y
 # CONFIG_ATLAS_EZO_SENSOR is not set
 # CONFIG_BME680 is not set
 # CONFIG_CCS811 is not set
+# CONFIG_ENS160 is not set
 # CONFIG_IAQCORE is not set
 # CONFIG_SCD30_CORE is not set
 # CONFIG_SCD4X is not set
@@ -5289,6 +5337,7 @@ CONFIG_AXP20X_ADC=y
 # CONFIG_AD5593R is not set
 # CONFIG_AD5504 is not set
 # CONFIG_AD5624R_SPI is not set
+# CONFIG_AD9739A is not set
 # CONFIG_LTC2688 is not set
 # CONFIG_AD5686_SPI is not set
 # CONFIG_AD5696_I2C is not set
@@ -5429,6 +5478,7 @@ CONFIG_AXP20X_ADC=y
 # CONFIG_AL3010 is not set
 # CONFIG_AL3320A is not set
 # CONFIG_APDS9300 is not set
+# CONFIG_APDS9306 is not set
 # CONFIG_APDS9960 is not set
 # CONFIG_AS73211 is not set
 # CONFIG_BH1750 is not set
@@ -5473,6 +5523,7 @@ CONFIG_AXP20X_ADC=y
 # CONFIG_VCNL4000 is not set
 # CONFIG_VCNL4035 is not set
 # CONFIG_VEML6030 is not set
+# CONFIG_VEML6040 is not set
 # CONFIG_VEML6070 is not set
 # CONFIG_VEML6075 is not set
 # CONFIG_VL6180 is not set
@@ -5614,10 +5665,10 @@ CONFIG_AXP20X_ADC=y
 # end of Temperature sensors
 
 CONFIG_PWM=y
-CONFIG_PWM_SYSFS=y
 # CONFIG_PWM_ATMEL_TCB is not set
 # CONFIG_PWM_CLK is not set
 # CONFIG_PWM_FSL_FTM is not set
+# CONFIG_PWM_GPIO is not set
 # CONFIG_PWM_PCA9685 is not set
 CONFIG_PWM_SUN4I=y
 # CONFIG_PWM_XILINX is not set
@@ -5629,6 +5680,7 @@ CONFIG_IRQCHIP=y
 CONFIG_ARM_GIC=y
 CONFIG_ARM_GIC_MAX_NR=1
 # CONFIG_AL_FIC is not set
+# CONFIG_LAN966X_OIC is not set
 CONFIG_SUN4I_INTC=y
 CONFIG_SUN6I_R_INTC=y
 CONFIG_SUNXI_NMI_INTC=y
@@ -5686,6 +5738,7 @@ CONFIG_PHY_SUN50I_USB3=y
 # CONFIG_ARM_CCI_PMU is not set
 # CONFIG_ARM_CCN is not set
 CONFIG_ARM_PMU=y
+CONFIG_ARM_V7_PMU=y
 # CONFIG_ARM_PMUV3 is not set
 # end of Performance monitor support
 
@@ -5813,9 +5866,9 @@ CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
 #
 CONFIG_NETFS_SUPPORT=m
 # CONFIG_NETFS_STATS is not set
+# CONFIG_NETFS_DEBUG is not set
 CONFIG_FSCACHE=y
 # CONFIG_FSCACHE_STATS is not set
-# CONFIG_FSCACHE_DEBUG is not set
 CONFIG_CACHEFILES=m
 # CONFIG_CACHEFILES_DEBUG is not set
 # CONFIG_CACHEFILES_ERROR_INJECTION is not set
@@ -6025,6 +6078,7 @@ CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO=y
 CONFIG_INIT_STACK_NONE=y
 # CONFIG_INIT_STACK_ALL_PATTERN is not set
 # CONFIG_INIT_STACK_ALL_ZERO is not set
+# CONFIG_GCC_PLUGIN_STACKLEAK is not set
 # CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
 # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
 CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y
@@ -6093,7 +6147,6 @@ CONFIG_CRYPTO_ECC=y
 CONFIG_CRYPTO_ECDH=y
 # CONFIG_CRYPTO_ECDSA is not set
 # CONFIG_CRYPTO_ECRDSA is not set
-# CONFIG_CRYPTO_SM2 is not set
 # CONFIG_CRYPTO_CURVE25519 is not set
 # end of Public-key cryptography
 
@@ -6211,7 +6264,6 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m
 # CONFIG_CRYPTO_USER_API_RNG is not set
 # CONFIG_CRYPTO_USER_API_AEAD is not set
 # CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE is not set
-# CONFIG_CRYPTO_STATS is not set
 # end of Userspace interface
 
 CONFIG_CRYPTO_HASH_INFO=y
@@ -6377,6 +6429,7 @@ CONFIG_ARCH_HAS_SETUP_DMA_OPS=y
 CONFIG_ARCH_HAS_TEARDOWN_DMA_OPS=y
 CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE=y
 CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU=y
+CONFIG_DMA_NEED_SYNC=y
 CONFIG_DMA_NONCOHERENT_MMAP=y
 CONFIG_ARCH_HAS_DMA_ALLOC=y
 CONFIG_DMA_CMA=y
@@ -6401,6 +6454,7 @@ CONFIG_NLATTR=y
 CONFIG_CLZ_TAB=y
 # CONFIG_IRQ_POLL is not set
 CONFIG_MPILIB=y
+CONFIG_DIMLIB=y
 CONFIG_LIBFDT=y
 CONFIG_OID_REGISTRY=y
 CONFIG_HAVE_GENERIC_VDSO=y
@@ -6484,6 +6538,7 @@ CONFIG_HAVE_DEBUG_KMEMLEAK=y
 # CONFIG_SHRINKER_DEBUG is not set
 CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
 CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_MEM_ALLOC_PROFILING is not set
 CONFIG_HAVE_ARCH_KASAN=y
 CONFIG_HAVE_ARCH_KASAN_VMALLOC=y
 CONFIG_CC_HAS_KASAN_GENERIC=y
@@ -6506,6 +6561,7 @@ CONFIG_HAVE_HARDLOCKUP_DETECTOR_BUDDY=y
 #
 # Scheduler Debugging
 #
+# CONFIG_SCHEDSTATS is not set
 # end of Scheduler Debugging
 
 # CONFIG_DEBUG_TIMEKEEPING is not set

device/testing/device-fairphone-fp2/APKBUILD

@@ -1,8 +1,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-fairphone-fp2
 pkgdesc="Fairphone 2"
-pkgver=7
-pkgrel=7
+pkgver=8
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -90,7 +90,7 @@ phosh() {
 }
 
 sha512sums="
-f44cc3b5db025b0df7e3df88561a46b10b8b106e27e5a227ea50b44ebbd91d2986f4eac3a5f1e3cbac2d3a8c119708d22c057bbb9e4fc7b3b9c0c03460f5e850  deviceinfo
+4f662c7c66601a9c277b260cbbd2806d37cdc273f39599bc49bbc0974a8dd6541338f3a4f9ca3758670b72ee56df64ae918781c21b7ee9441cee40408e983196  deviceinfo
 1a99953420a4068c6205dd90015e895909d39011dcc72fd73ac6880920fe4b95fe54377b9d4864a2d4fac56c4334e0c896ba8cc92dea61f93e9384de0998a910  modules-initfs.mainline
 55360b1ba4ddadea341c9edb13c32ba5f19aabf75ab28602f30cfb79b9df8834f115ef979c70569f23ec1293b1fcd408baf320d87803293ce7106bdc73a26c9f  FP2.conf
 b834461c6866bb0c473dd089dd5da641dd42a00f610aad6503117aa50fe6e200db9ad0a264bb609f12350d59faee1f772907bacd75439f702ea7d52f6f85e2b1  hifi

device/testing/device-fairphone-fp2/deviceinfo

@@ -26,6 +26,7 @@ deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline_downstream="console=ttyHSL0,115200,n8 androidboot.hardware=qcom user_debug=31 msm_rtb.filter=0x3b7 ehci-hcd.park=3 androidboot.bootdevice=msm_sdcc.1"
 deviceinfo_kernel_cmdline_mainline="earlycon=msm_serial_dm,0xf991e000 msm.vram=192m msm.allow_vram_carveout=1"
 deviceinfo_generate_bootimg="true"
+deviceinfo_generate_extlinux_config="true"
 deviceinfo_bootimg_qcdt_downstream="true"
 deviceinfo_flash_offset_base="0x00000000"
 deviceinfo_flash_offset_kernel="0x00008000"

device/testing/device-google-blueline/APKBUILD

@@ -0,0 +1,42 @@
+# Reference: <https://postmarketos.org/devicepkg>
+# Maintainer: Victoria Brekenfeld <postmarketos@drakulix.de>
+# Co-Maintainer: Joel Selvaraj <joelselvaraj.oss@gmail.com>
+# Co-Maintainer: Caleb Connolly <caleb@postmarketos.org>
+
+pkgname=device-google-blueline
+pkgdesc="Google Pixel 3"
+pkgver=1
+pkgrel=0
+url="https://postmarketos.org"
+license="MIT"
+arch="aarch64"
+options="!check !archcheck"
+depends="
+	linux-postmarketos-qcom-sdm845
+	mkbootimg
+	firmware-google-blueline
+	firmware-google-blueline-dtbo
+	postmarketos-base
+	soc-qcom-sdm845
+	soc-qcom-sdm845-ucm
+	soc-qcom-sdm845-qbootctl
+	soc-qcom-sdm845-nonfree-firmware
+"
+makedepends="devicepkg-dev"
+source="
+	deviceinfo
+	modules-initfs
+"
+
+build() {
+	devicepkg_build $startdir $pkgname
+}
+
+package() {
+	devicepkg_package $startdir $pkgname
+}
+
+sha512sums="
+1a6c56470ccf94a51d235b011d0069ed028f781eb94863759113b62646138e3a8a34936536715eb908b5bea06c360567b0f217427fc4e5b34a617388072367ec  deviceinfo
+e92b431723994d0edc9d946d45746282d7ff25d13b799bada703ba13669de131a97f317ed0fecdedeefea7879a06bafe1df7e4a42f86c46e9e4f30309a928b15  modules-initfs
+"

device/testing/device-google-blueline/deviceinfo

@@ -0,0 +1,39 @@
+# Reference: <https://postmarketos.org/deviceinfo>
+# Please use double quotes only. You can source this file in shell scripts.
+
+deviceinfo_format_version="0"
+deviceinfo_name="Google Pixel 3"
+deviceinfo_manufacturer="Google"
+deviceinfo_codename="google-blueline"
+deviceinfo_year="2018"
+deviceinfo_arch="aarch64"
+
+# Device related
+deviceinfo_gpu_accelerated="true"
+deviceinfo_chassis="handset"
+deviceinfo_keyboard="false"
+deviceinfo_external_storage="false"
+deviceinfo_screen_width="1080"
+deviceinfo_screen_height="2160"
+
+# Bootloader related
+deviceinfo_flash_method="fastboot"
+deviceinfo_kernel_cmdline="console=ttyMSM0,115200"
+deviceinfo_generate_bootimg="true"
+deviceinfo_bootimg_qcdt="false"
+deviceinfo_bootimg_dtb_second="false"
+deviceinfo_flash_offset_base="0x00000000"
+deviceinfo_flash_offset_kernel="0x00008000"
+deviceinfo_flash_offset_ramdisk="0x01000000"
+deviceinfo_flash_offset_second="0x00000000"
+deviceinfo_flash_offset_tags="0x00000100"
+deviceinfo_flash_pagesize="4096"
+deviceinfo_flash_sparse="true"
+
+# Kernel options
+deviceinfo_dtb="qcom/sdm845-google-blueline"
+deviceinfo_append_dtb="true"
+deviceinfo_flash_kernel_on_update="true"
+
+# Required for devices using UFS as storage (instead of e.g. eMMC)
+deviceinfo_rootfs_image_sector_size="4096"

device/testing/device-google-blueline/modules-initfs

@@ -0,0 +1,6 @@
+i2c_qcom_geni
+rmi_core
+rmi_i2c
+qcom_fg
+qcom_pmi8998_charger
+ftm5

device/testing/device-google-bonito/APKBUILD

@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-google-bonito
 pkgdesc="Google Pixel 3a XL"
-pkgver=2
+pkgver=3
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -24,6 +24,7 @@ source="
 "
 subpackages="
 	$pkgname-kernel-sdc:kernel_sdc
+	$pkgname-kernel-tianma:kernel_tianma
 	$pkgname-nonfree-firmware:nonfree_firmware
 "
 
@@ -45,6 +46,13 @@ kernel_sdc() {
 	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
 }
 
+kernel_tianma() {
+	pkgdesc="Kernel for devices with the Tianma panel"
+	depends="linux-postmarketos-qcom-sdm670"
+
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+}
+
 nonfree_firmware() {
 	pkgdesc="Proprietary firmware blobs for the Google Pixel 3a XL"
 	depends="
@@ -63,7 +71,7 @@ nonfree_firmware() {
 
 sha512sums="
 016d398155f2344417f5e5649a361719ba6e53e593c501b5df39114cdd284302b9bf8686a39817aee0c08fec95b3ab613c181d6cc9596299aaf7fd05dbe0c3dd  90-feedbackd-drv2624.rules
-a6860945d4c75b698a9fadfd0f42355a601c064f62bcf197061ba97be46d23727cac1df355a238042ce9c9017e0ddf458f23a858aad60bebe672ba495cc6c4ad  deviceinfo
+e04b8da50199066badd5f7f381fb1ae84f0ee1b800e3136f3712647bd1ce909ab89c83e0811d546580cf58ac55c0ac8b5144912a3bff24af7a5f9979df5e4698  deviceinfo
 1eb5f138619f499fab31ea64f63ee9f8984f195528708ec6a01ddc533c74cfb71d1442b97905ae15db24b8faac259fa3e89db357ca9c747ce3ee598c2d681639  modules-initfs
 3a4a9322839d4b3ef9d79668a37840a9f444954759ae3c512e694051d2f9a2573db42ad6c4c1a5c75eeb861232a27ba1a8cef9b503decd54ead25a96e3dd6f98  q6voiced.conf
 "

device/testing/device-google-bonito/deviceinfo

@@ -7,6 +7,7 @@ deviceinfo_name="Google Pixel 3a XL"
 deviceinfo_manufacturer="Google"
 deviceinfo_codename="google-bonito"
 deviceinfo_dtb_sdc="qcom/sdm670-google-bonito-sdc"
+deviceinfo_dtb_tianma="qcom/sdm670-google-bonito-tianma"
 deviceinfo_append_dtb="true"
 deviceinfo_year="2019"
 deviceinfo_arch="aarch64"

device/testing/device-lg-hammerhead/APKBUILD

@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-lg-hammerhead
-pkgver=7
-pkgrel=1
+pkgver=8
+pkgrel=0
 pkgdesc="Google Nexus 5"
 url="https://postmarketos.org"
 arch="armv7"
@@ -86,7 +86,7 @@ sha512sums="
 f700af3145b79d1ef9edfb22982899b25cabfb212f9620dcbd3a2e6f44b5ad591e0a66056c6fcd66c3fde89a2b5f551e8a8fe2e65cf0e2a48adec57c027d7825  10-unl0kr.conf
 b0ff3cf868380481638cce975688eb622e50d4a45a877892e087789ad7f292f8723de1fbf3da2af445adad31df99d7976c31dcf4f685a046b644b38aa109067d  20-gsk-gpu-workaround.sh
 6cef5f8ae1785ac16e6fe84bfc861ac50cdfb94db35d764f44a25c960e123cb82f6e56f45362a5340c62a3d5ac225f2689afd4f6964cb88305a0892ba44214f0  bt-module-deps.conf
-9d4839f940ff55dc3213e4fae3f119a5cd9c5242f06fb835fb7cf38d8455ba2278c41fef41e2dcd9f6aa06857ec772c2ca9ba018e482f7e8b32409a42542774f  deviceinfo
+a4cc185a61fd0657783ee3f3a1bb897ea5adced032b71e8fc84e0211bf91a194d2c9651211cf4f6a6e4309358466d708503643e15d316198294109c599ad749e  deviceinfo
 fd639faebbee2c0c2c227710678376e0d039b7d96a62103f7ba7e6304d7060023f09064918e93a125465d20d125c0334225680521a7aeae5a43d77d7360c180c  modules-initfs
 ee1deae3c21de4dfcf9842abc7ba984229fd37bff058cb630a9bd44e787484ddfa3e5d4d85dbd30850d3ac34822aa91c82c3a5d7c107a990f202fb7da2f4db98  phoc.ini
 0a9da551fa9d48d8a663f6bc74e8a7d6e2d2a6e009bd163fa46cd302e75656ad7ae57402a0bd70614ec253e0f2445b4c6999df07104f4c657ed630305c7f40d4  xorg.conf

device/testing/device-lg-hammerhead/deviceinfo

@@ -21,6 +21,7 @@ deviceinfo_gpu_accelerated="true"
 
 # Fastboot related
 deviceinfo_generate_bootimg="true"
+deviceinfo_generate_extlinux_config="true"
 deviceinfo_bootimg_qcdt="false"
 deviceinfo_flash_method="fastboot"
 deviceinfo_flash_kernel_on_update="true"

device/testing/device-oneplus-bacon/APKBUILD

@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-oneplus-bacon
-pkgver=3
-pkgrel=2
+pkgver=4
+pkgrel=0
 pkgdesc="OnePlus One"
 url="https://postmarketos.org"
 arch="armv7"
@@ -49,7 +49,7 @@ nonfree_firmware() {
 }
 
 sha512sums="
-28ba572e6e45383e5a55670977195235dab098439987f57aa02fa2bb4865877bf2156f665301e25af051742e828f15cae74ee2de306cfc45d092dedd6a83bac2  deviceinfo
+c287140317c0cf8bc912ceb75260dd95f95e4222b507e0f2c3d436e1c3e0ae9055108a9a70748b6bf0a5465339ffb18286e62d6f5e2ee1e050a1ef904474bd20  deviceinfo
 fd639faebbee2c0c2c227710678376e0d039b7d96a62103f7ba7e6304d7060023f09064918e93a125465d20d125c0334225680521a7aeae5a43d77d7360c180c  modules-initfs.mainline
 65e9ee7352b1dc39d99ea411eb0ed9c56f9975230907db5add3a1b4146cdf6f227c934052dab38a1937ed67d67585f28fb7410f10a1bec9dd5e4eb69d7253515  90-android-touch-dev.rules
 "

device/testing/device-oneplus-bacon/deviceinfo

@@ -22,6 +22,7 @@ deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline_downstream="console=ttyHSL0,115200,n8 androidboot.hardware=bacon user_debug=31 msm_rtb.filter=0x3F ehci-hcd.park=3 androidboot.bootdevice=msm_sdcc.1 buildvariant=userdebug"
 deviceinfo_kernel_cmdline_mainline="msm.vram=192m msm.allow_vram_carveout=1"
 deviceinfo_generate_bootimg="true"
+deviceinfo_generate_extlinux_config="true"
 deviceinfo_bootimg_qcdt_downstream="true"
 deviceinfo_flash_offset_kernel="0x00008000"
 deviceinfo_flash_offset_ramdisk="0x02000000"

device/testing/device-pine64-pinenote/APKBUILD

@@ -2,7 +2,7 @@
 pkgname=device-pine64-pinenote
 pkgdesc="Pine64 PineNote"
 pkgver=2
-pkgrel=6
+pkgrel=7
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -24,7 +24,6 @@ source="
 "
 subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
-	$pkgname-gnome
 	$pkgname-phosh
 "
 
@@ -45,12 +44,6 @@ package() {
 		"$pkgdir"/usr/lib/udev/rules.d
 }
 
-gnome() {
-	install_if="$pkgname=$pkgver-r$pkgrel gnome"
-	depends="gnome-shell gnome-shell-extension-pinenote"
-	mkdir -p "$subpkgdir"
-}
-
 phosh() {
 	install_if="$pkgname=$pkgver-r$pkgrel phosh"
 	depends="postmarketos-theme"

device/testing/device-purism-librem5dev/APKBUILD

@@ -3,7 +3,7 @@
 pkgname=device-purism-librem5dev
 pkgdesc="Purism Librem 5 Devkit"
 pkgver=2
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -60,7 +60,7 @@ package() {
 	install -D -m644 "$srcdir"/modprobe.d_rsi.conf "$pkgdir"/etc/modprobe.d/rsi.conf
 	install -D -m644 "$srcdir"/00-mesa.sh "$pkgdir"/etc/profile.d/00-mesa.sh
 	install -D -m644 "$srcdir"/flash_script.lst "$pkgdir"/usr/share/uuu/flash_script.lst
-	install -D -m644 "$_confdir"/default/hwdb/80-librem5.hwdb "$pkgdir"/lib/udev/hwdb.d/80-librem5.hwdb
+	install -D -m644 "$_confdir"/default/hwdb/80-librem5.hwdb "$pkgdir"/usr/lib/udev/hwdb.d/80-librem5.hwdb
 	install -D -m644 "$_confdir"/debian/librem5-base-defaults.librem5-devkit-sgtl5000.udev \
 		"$pkgdir"/usr/lib/udev/rules.d/librem5-base-defaults.librem5-devkit-sgtl5000.udev
 	install -D -m644 "$_confdir"/debian/librem5-base-defaults.librem5-pm.udev  \

device/testing/device-qcom-msm8953/APKBUILD

@@ -0,0 +1,39 @@
+# Maintainer: Barnabas Czeman <trabarni@gmail.com>
+# Reference: <https://postmarketos.org/devicepkg>
+
+pkgname=device-qcom-msm8953
+pkgdesc="Generic device package for various Qualcomm MSM8953/SDM450/SDM632-based devices"
+pkgver=1
+pkgrel=0
+url="https://postmarketos.org"
+license="MIT"
+arch="aarch64"
+options="!check !archcheck"
+depends="
+	firmware-qcom-adreno-a530
+	linux-postmarketos-qcom-msm8953
+	lk2nd-msm8953
+	mkbootimg
+	msm-firmware-loader
+	postmarketos-base
+	soc-qcom-msm8953
+	soc-qcom-msm8953-modem
+"
+makedepends="devicepkg-dev"
+source="
+	deviceinfo
+	modules-initfs
+"
+
+build() {
+	devicepkg_build $startdir $pkgname
+}
+
+package() {
+	devicepkg_package $startdir $pkgname
+}
+
+sha512sums="
+b624c27c7e87cc57c20f79682ca119765b826e0f95bec94f18617d67a832cd2869475fa212d7c21e36a9b448312cb98c497007e0081e1a3c64bf3d60b40bb87a  deviceinfo
+bd17b9384a4aba90d3938b170e47349b98f5e035715abac6ae8cb2e65431159e20e5324c72e69f8f0492d12dd45813615850f1f83a48327fd1a7313e82183d43  modules-initfs
+"

device/testing/device-qcom-msm8953/deviceinfo

@@ -0,0 +1,24 @@
+# Reference: <https://postmarketos.org/deviceinfo>
+# Please use double quotes only. You can source this file in shell
+# scripts.
+
+deviceinfo_format_version="0"
+deviceinfo_name="Qualcomm msm8953-based device"
+deviceinfo_manufacturer="Qualcomm"
+deviceinfo_codename="qcom-msm8953"
+deviceinfo_year="2016"
+deviceinfo_arch="aarch64"
+
+# Device related
+deviceinfo_gpu_accelerated="true"
+deviceinfo_chassis="embedded"
+deviceinfo_external_storage="true"
+deviceinfo_keyboard="false"
+
+# Bootloader related
+deviceinfo_flash_method="fastboot"
+
+# extlinux.conf
+deviceinfo_dtb="qcom/apq8053-* qcom/msm8953-* qcom/sdm450-* qcom/sdm632-*"
+deviceinfo_generate_extlinux_config="true"
+deviceinfo_boot_filesystem="ext2"

device/testing/device-qcom-msm8953/modules-initfs

@@ -0,0 +1,51 @@
+atmel_mxt_ts
+edt_ft5x06
+goodix_ts
+msm
+nt36xxx
+panel-motorola-ali-boe
+panel-motorola-ali-tianma
+panel-samsung-s6e3fa7
+panel-xiaomi-rosy-ft8006m-boe
+panel-xiaomi-rosy-ft8613-csot
+panel-xiaomi-rosy-ft8613-ebbg
+panel_boe_bs052fhm_a00_6c01
+panel_himax_hx8399c_fhdplus
+panel_huawei_milan_boe_otm1906c
+panel_huawei_milan_boe_td4322
+panel_huawei_milan_boe_test1906c
+panel_huawei_milan_ctc_nt35596s
+panel_huawei_milan_ctc_otm1906c
+panel_huawei_milan_jdi_r63452
+panel_huawei_milan_tianma_fic8736
+panel_huawei_milan_tianma_focal8716
+panel_huawei_milan_tianma_otm1906c
+panel_mdss_ft8716_fhd
+panel_mdss_ili7807_fhd
+panel_mdss_ili7807_fhdplus
+panel_mdss_nt35596_ebbg
+panel_mdss_otm1911_fhd
+panel_mdss_otm1911_fhdplus
+panel_mdss_r63350
+panel_tianma_tl052vdxp02
+panel_xiaomi_boe_ili9885
+panel_xiaomi_ebbg_r63350
+panel_xiaomi_nt35532
+panel_xiaomi_nt36672_csot_fhdplus_e7
+panel_xiaomi_nt36672_tianma_fhdplus_e7
+panel_xiaomi_onclite_hx8394f
+panel_xiaomi_onclite_ili9881
+panel_xiaomi_onclite_otm1901a
+panel_xiaomi_otm1911
+panel_xiaomi_td4310_ebbg_fhdplus_e7
+panel_xiaomi_td4310_fhdplus_e7
+panel_xiaomi_td4310_fhdplus_e7_g55
+panel_xiaomi_tianma_nt35596
+panel_xiaomi_ysl_hx8394f
+panel_xiaomi_ysl_ili7807d
+panel_xiaomi_ysl_ili9881c
+rmi_core
+rmi_i2c
+s6sy761
+simple-mfd-i2c
+sm5708-charger

device/testing/device-raspberry-pi/APKBUILD

@@ -2,7 +2,7 @@
 pkgname=device-raspberry-pi
 pkgdesc="Raspberry Pi"
 pkgver=1
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armhf"
@@ -44,7 +44,7 @@ kernel_rpi() {
 
 kernel_rpi2() {
 	pkgdesc="Kernel for the Raspberry Pi 2 (from Alpine, depends on non free firmware!)"
-	depends="$pkgname linux-rpi2"
+	depends="$pkgname linux-rpi"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
 	mkdir "$subpkgdir"
 }

device/testing/device-samsung-klte/APKBUILD

@@ -1,8 +1,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-klte
 pkgdesc="Samsung Galaxy S5 (G900F/G9006/G9008/G9009W)"
-pkgver=7
-pkgrel=1
+pkgver=8
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -64,6 +64,6 @@ nonfree_firmware() {
 
 sha512sums="
 6cef5f8ae1785ac16e6fe84bfc861ac50cdfb94db35d764f44a25c960e123cb82f6e56f45362a5340c62a3d5ac225f2689afd4f6964cb88305a0892ba44214f0  bt-module-deps.conf
-74118bac1032a58f4d337b91410fee5c71d3380bfef4f656407fa5cf93717ee0dcdd2464e4ccaad5c5f2f93f20f8ff6ad8e3a4631708cbee8227bc6056c904a0  deviceinfo
+ad2971c45756c705c0cb52709be14fe41a2cef8087aeeaefddecefa94dfe9c5d819f58379ee710dc9ab37a809b775c1fef848145b4694f34f289dbad0e2ac990  deviceinfo
 0e123f1ce1255395addf08218c7ca7947c7dbd0a81f578ff1c96c53c51bb2c616cd50b390fa92f6fc67ed9c73957f8dd8390213df1520e2d97b9ff256ddbb954  modules-initfs
 "

device/testing/device-samsung-klte/deviceinfo

@@ -25,6 +25,7 @@ deviceinfo_flash_method="fastboot"
 deviceinfo_flash_sparse="true"
 deviceinfo_kernel_cmdline="console=ttyMSM0,115200,n8 msm.vram=192m msm.allow_vram_carveout=1"
 deviceinfo_generate_bootimg="true"
+deviceinfo_generate_extlinux_config="true"
 deviceinfo_bootimg_qcdt="false"
 deviceinfo_flash_offset_base="0x00000000"
 deviceinfo_flash_offset_kernel="0x00008000"