main/postmarketos-initramfs: switch_root with /dev (MR 3230)

Mount /dev (and /run) in initramfs so util-linux switch_root can move the mounts over to the new sysroot before changing root. BusyBox switch_root doesn't even attempt to move anything so use util-linux's switch_root for this. Explicitly disable tests too...
2023-07-23 20:00:58 +01:00
3116 changed files with 41702 additions and 316945 deletions
@@ -1,108 +0,0 @@
-#!/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"
-	sh ./install_pmbootstrap.sh
-	exec su "${TESTUSER:-pmos}" -c "sh -e $0 $*"
-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"
-
-# Configure SSH key for signing
-mkdir -p ~/.ssh
-cp "$PMAPORTS_SSH_KEY" ~/.ssh/pmaports
-chmod 600 ~/.ssh/pmaports
-# Generate public key from private
-ssh-keygen -t ecdsa -f ~/.ssh/pmaports -y > ~/.ssh/pmaports.pub
-
-git config --global gpg.format ssh
-git config --global user.signingkey ~/.ssh/pmaports.pub
-
-export PYTHONUNBUFFERED=1
-
-PKGS="$1"
-if [ -z "$PKGS" ]; then
-	echo "Usage: $0 <packages>"
-	exit 1
-fi
-echo "Checking for new versions of packages: $PKGS"
-
-update_linux_next() {
-	# Check for the latest -next tag
-	local latest
-	local pkgver
-	local new_pkgver
-
-	# Get the current version
-	# shellcheck source=/dev/null
-	pkgver=$(. device/testing/linux-next/APKBUILD; echo "$pkgver")
-
-	curl -s "https://gitlab.com/linux-kernel/linux-next/-/tags?format=atom" | grep -oP "(?<=<title>)[^<]+" | tail -n +2 > /tmp/tags
-
-	latest=$(grep -v "v" < /tmp/tags | head -n1)
-	if [ -z "$latest" ]; then
-		echo "Failed to get the latest -next tag"
-		exit 1
-	fi
-	echo "Latest -next tag: $latest"
-
-	new_pkgver=$(grep "v" < /tmp/tags | head -n1)
-	if [ -z "$new_pkgver" ]; then
-		echo "Failed to get the latest mainline tag from atom feed, reusing current pkgver"
-		new_pkgver="${pkgver%_git*}"
-	else
-		echo "Latest mainline tag: $new_pkgver"
-		# new_pkgver is like 'v6.9-rc1' but we want '6.9'
-		new_pkgver=$(echo "$new_pkgver" | sed -e 's/^v//' -e 's/-.*//')
-	fi
-
-	new_pkgver="${new_pkgver}_git${latest#*-}"
-
-	if [ "$pkgver" = "$new_pkgver" ]; then
-		echo "No new version of linux-next"
-		exit 0
-	fi
-
-	echo "Updating linux-next from $pkgver to $new_pkgver..."
-	sed -i -e "s/pkgver=$pkgver/pkgver=$new_pkgver/" device/testing/linux-next/APKBUILD
-
-	# Update the checksums
-	pmbootstrap checksum linux-next
-
-	# Commit
-	git add device/testing/linux-next/APKBUILD
-	git commit -S -m "linux-next: upgrade to $latest"
-}
-
-# 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.com/postmarketOS/pmaports.git
-git fetch gitlab
-git checkout --track gitlab/master
-
-for pkg in $PKGS; do
-	case "$pkg" in
-		linux-next)
-			update_linux_next
-			;;
-		*)
-			echo "Unknown package: $pkg"
-			exit 1
-			;;
-	esac
-done
-
-git push
@@ -1,43 +0,0 @@
-#!/bin/sh -e
-# Description: verify CODEOWNERS file is sane
-# https://postmarketos.org/pmb-ci
-
-# TODO Future improvements:
-# * Check that all devices in main/community have someone in CODEOWNERS
-# * Check that GitLab user actually exists (e.g. deleted account, account with
-#   changed user name)
-
-if grep -q "  " CODEOWNERS; then
-	echo
-	echo "ERROR: Found space indentation in CODEOWNERS."
-	echo "ERROR: Please indent with tab characters."
-	grep "  " CODEOWNERS
-	echo
-	exit 1
-fi
-
-fail=0
-tmppipe=$(mktemp -u)
-mkfifo "$tmppipe"
-grep -v "^#" CODEOWNERS | cut -d'	' -f1  > "$tmppipe" &
-while IFS= read -r line; do
-	[ -z "$line" ] && continue
-
-	# Check if entry generally exists
-	# shellcheck disable=SC2086
-	ls $line >/dev/null 2>&1 || { fail=1; echo "Non-existing: $line"; }
-
-	# Check that directories end with a slash
-	# shellcheck disable=SC2086
-	if test -d "$(ls -d $line)"; then
-		echo "$line" | grep -q '/$' || { fail=1; echo "Missing trailing slash: $line"; }
-	fi
-done < "$tmppipe"
-rm "$tmppipe"
-
-if [ "$fail" = 1 ]; then
-	echo
-	echo "ERROR: Invalid CODEOWNERS entries, see above."
-	echo
-	exit 1
-fi
@@ -4,11 +4,11 @@

 if [ "$(id -u)" = 0 ]; then
 	set -x
-	apk -q add ruff
+	apk -q add py3-flake8
 	exec su "${TESTUSER:-build}" -c "sh -e $0"
 fi

 set -x

 # shellcheck disable=SC2046
-ruff check --ignore E501,F401,E722,W605 $(find .ci -name '*.py')
+flake8 --ignore E501,F401,E722,W504,W605 $(find .ci -name '*.py')
@@ -2,8 +2,6 @@
 # Description: check various bad patterns with grep
 # https://postmarketos.org/pmb-ci

-exit_code=0
-
 if [ "$(id -u)" = 0 ]; then
 	set -x
 	apk -q add grep
@@ -14,7 +12,7 @@ fi
 if grep -qr '(CHANGEME!)' -- *; then
 	echo "ERROR: Please replace '(CHANGEME!)' in the following files:"
 	grep --color=always -r '(CHANGEME!)' -- *
-	exit_code=1
+	exit 1
 fi

 # DTBs installed to /usr/share/db
@@ -25,7 +23,7 @@ if grep -qr 'INSTALL_DTBS_PATH="$pkgdir"/usr/share/dtb' device/; then
 	echo 'ERROR: Files that need fixing:'
 	# shellcheck disable=SC2016
 	grep --color=always -r 'INSTALL_DTBS_PATH="$pkgdir"/usr/share/dtb' device/
-	exit_code=1
+	exit 1
 fi


@@ -33,58 +31,17 @@ fi
 if grep -qr '/etc/postmarketos-mkinitfs' -- *; then
 	echo "ERROR: Please replace '/etc/postmarketos-mkinitfs' with '/usr/share/mkinitfs' in the following files:"
 	grep --color=always -r '/etc/postmarketos-mkinitfs' -- *
-	exit_code=1
+	exit 1
 fi
 if grep -qr '/usr/share/postmarketos-mkinitfs' -- *; then
 	echo "ERROR: Please replace '/usr/share/postmarketos-mkinitfs' with '/usr/share/mkinitfs' in the following files:"
 	grep --color=always -r '/usr/share/postmarketos-mkinitfs' -- *
-	exit_code=1
+	exit 1
 fi

 # Direct sourcing of deviceinfo
 if grep --exclude='source_deviceinfo' -qEr 'source /etc/deviceinfo|\. /etc/deviceinfo' -- *; then
 	echo 'ERROR: Please source the source_deviceinfo script instead of sourcing deviceinfo directly!'
 	grep --color=always --exclude='rootfs-usr-share-misc-source_deviceinfo' -Er 'source /etc/deviceinfo|\. /etc/deviceinfo' -- *
-	exit_code=1
+	exit 1
 fi
-
-# Removed deviceinfo variable
-if grep -qr 'deviceinfo_modules_initfs' -- *; then
-	echo 'ERROR: deviceinfo_modules_initfs variable has been removed. Use "modules-initfs" file instead.'
-	grep --color=always -r 'deviceinfo_modules_initfs' -- *
-	exit_code=1
-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
-if grep -qr $POSTMARKETOS_WALLPAPER_PATH \
-	--exclude-dir='device-pine64-pinetab' \
-	--exclude-dir='device-oneplus-kebab' \
-	--exclude-dir='device-xiaomi-willow' \
-	-- device; then
-	echo "ERROR: Please don't include configuration files that set the default wallpaper in device-specific packages!"
-	grep --color=always -r $POSTMARKETOS_WALLPAPER_PATH \
-		--exclude-dir='device-pine64-pinetab' \
-		--exclude-dir='device-oneplus-kebab' \
-		--exclude-dir='device-xiaomi-willow' \
-		-- device
-	exit_code=1
-fi
-
-OPENRC_SERVICE_FILES=$(find . -name '*.initd')
-# shellcheck disable=SC2086
-if grep -q 'before wpa_supplicant' $OPENRC_SERVICE_FILES; then
-	echo "ERROR: Please use 'before wlan' in OpenRC service files! This ensures compatibility with both wpa_supplicant and iwd."
-	grep --color=always 'before wpa_supplicant' $OPENRC_SERVICE_FILES
-	exit_code=1
-fi
-
-if grep -qEr 'PMOS_NO_OUTPUT_REDIRECT' -- *; then
-	echo "ERROR: PMOS_NO_OUTPUT_REDIRECT is deprecated and doesn't do anything."
-	echo "Please remove it from the following files:"
-	grep --color=always -Er 'PMOS_NO_OUTPUT_REDIRECT' -- *
-	exit_code=1
-fi
-
-exit "$exit_code"
@@ -6,7 +6,6 @@

 if [ "$(id -u)" = 0 ]; then
 	set -x
-	export PMBOOTSTRAP_TAG=master
 	wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
 	sh ./install_pmbootstrap.sh
 	exec su "${TESTUSER:-pmos}" -c "sh -e $0"
@@ -16,7 +16,8 @@ import pmb.parse
 import pmb.parse.version
 import pmb.helpers.logging

-def get_package_contents(args, package, revision, check=True):
+
+def get_package_version(args, package, revision, check=True):
    # Redirect stderr to /dev/null, so git doesn't complain about files not
    # existing in upstream branch for new packages
    stderr = None
@@ -39,15 +40,6 @@ def get_package_contents(args, package, revision, check=True):
            handle.write(apkbuild_content)
        parsed = pmb.parse.apkbuild(tempdir + "/APKBUILD", False, False)

-    return parsed
-
-
-def get_package_version(args, package, revision, check=True):
-    """ returns version in the format "{pkgver}-r{pkgrel}", or None if no 
-        matching package is found """
-    parsed = get_package_contents(args, package, revision, check)
-    if parsed is None:
-        return None
    return parsed["pkgver"] + "-r" + parsed["pkgrel"]


@@ -120,40 +112,6 @@ def check_versions(args, packages):
                print(f"- {package}: {head} (HEAD) (new package)")
            continue

-        # Check pkgver follows expected format for device packages
-        pkgver = head.rpartition('-r')[0]
-        if package.startswith('device-') and not pkgver.isdigit():
-            print(f" - {package}: invalid pkgver \"{pkgver}\""
-                  "See: https://wiki.postmarketos.org/wiki/Packaging#device_packages_and_other_packages_without_sources")
-            error = True
-
-        # Additional checks for device packages
-        if package.startswith('device-'):
-            head_parsed = get_package_contents(args, package, "HEAD", False)
-            upstream_parsed = get_package_contents(args, package, commit, False)
-
-            # checksums did not change
-            if head_parsed["sha512sums"] == upstream_parsed["sha512sums"]:
-                # Check that pkgver did not change
-                if head_parsed["pkgver"] != upstream_parsed["pkgver"]:
-                    print(f" - {package}: pkgver should not change when package source checksums did not change."
-                          "See: https://wiki.postmarketos.org/wiki/Packaging#device_packages_and_other_packages_without_sources")
-                    error = True
-                # We do not check for a bumped pkgrel, because not everything
-                # needs it, e.g: pmb_recommends
-            # checksums changed
-            else:
-                # Check that pkgrel was reset to 0
-                if head_parsed["pkgrel"] != "0":
-                    print(f" - {package}: pkgrel should be 0 when package source checksums change."
-                          "See: https://wiki.postmarketos.org/wiki/Packaging#device_packages_and_other_packages_without_sources")
-                    error = True
-                # Check that pkgver was changed
-                if head_parsed["pkgver"] == upstream_parsed["pkgver"]:
-                    print(f" - {package}: pkgver should change when package source checksums change."
-                          "See: https://wiki.postmarketos.org/wiki/Packaging#device_packages_and_other_packages_without_sources")
-                    error = True
-
        # Compare head and upstream versions
        result = pmb.parse.version.compare(head, upstream)
        if result != 1:
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright 2024 Oliver Smith
+# Copyright 2023 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later

 import glob
@@ -10,30 +10,42 @@ import subprocess
 # Same dir
 import common

+# pmbootstrap
+import add_pmbootstrap_to_import_path  # noqa
+import pmb.parse
+import pmb.helpers.logging

-def check_kconfig(pkgnames):
+
+def check_kconfig(args, pkgnames):
    last_failed = None
    for i in range(len(pkgnames)):
        pkgname = pkgnames[i]
        print(f"  ({i+1}/{len(pkgnames)}) {pkgname}")

-        p = subprocess.run(["pmbootstrap", "kconfig", "check", pkgname],
-                           check=False)
+        apkbuild_path = pmb.helpers.pmaports.find(args, pkgname)
+        apkbuild = pmb.parse._apkbuild.apkbuild(f"{apkbuild_path}/APKBUILD")

-        if p.returncode:
+        options = []
+
+        for opt in apkbuild["options"]:
+            if "pmb:kconfigcheck" in opt:
+                options += [opt]
+
+        if len(options):
+            options.sort()
+            print(f'options="{" ".join(options)}"')
+
+        if "!pmb:kconfigcheck" in apkbuild["options"]:
+            print("skipped (!pmb:kconfigcheck)")
+            continue
+
+        if not pmb.parse.kconfig.check(args, pkgname, details=True):
            last_failed = pkgname

    return last_failed


-def check_kconfig_all():
-    p = subprocess.run(["pmbootstrap", "kconfig", "check"], check=False)
-    return p.returncode == 0
-
-
 def show_error(last_failed):
-    print("")
-    print("---")
    print("")
    print("Please adjust your kernel config. This is required for getting your"
          " patch merged.")
@@ -47,43 +59,10 @@ def show_error(last_failed):
    print("Run this check again (on all kernels you modified):")
    print("  pmbootstrap ci kconfig")
    print("")
-    print("---")
-    print("")
-
-
-def show_error_all():
-    print("")
-    print("---")
-    print("")
-    print("Please adjust the failed kernel configs. This is required for")
-    print("getting your patch merged.")
-    print("")
-    print("If a kernel in the testing category failed, and fixing is too much")
-    print("effort, remove 'pmb:kconfigcheck-community' from the APKBUILD.")
-    print("")
-    print("Edit a kernel config:")
-    print("  pmbootstrap kconfig edit <PACKAGE NAME>")
-    print("")
-    print("Test a specific kernel config again:")
-    print("  pmbootstrap kconfig check <PACKAGE NAME>")
-    print("")
-    print("Run this check again (on all kernels you modified):")
-    print("  pmbootstrap ci kconfig")
-    print("")
-    print("---")
-    print("")


 if __name__ == "__main__":
    common.add_upstream_git_remote()
-
-    if "kconfigcheck.toml" in common.get_changed_files():
-        print("kconfigcheck.toml changed -> checking all kernels")
-        if not check_kconfig_all():
-            show_error_all()
-            exit(1)
-        exit(0)
-
    pkgnames = common.get_changed_kernels()
    print(f"Changed kernels: {pkgnames}")

@@ -91,7 +70,13 @@ if __name__ == "__main__":
        print("No kernels changed in this branch")
        exit(0)

-    last_failed = check_kconfig(pkgnames)
+    # Initialize args (so we can use pmbootstrap's kconfig parsing)
+    sys.argv = ["pmbootstrap", "kconfig", "check"]
+    args = pmb.parse.arguments()
+    pmb.helpers.logging.init(args)
+
+    print("Running kconfig check on changed kernels...")
+    last_failed = check_kconfig(args, pkgnames)

    if last_failed:
        show_error(last_failed)
@@ -106,7 +106,7 @@ def main():
    # Ask to adjust the wiki
    if error:
        print("*** Wiki check failed!")
-        print("Thank you for porting postmarketOS to a new device! \\o/")
+        print("Thank you for porting postmarketOS to a new device! \o/")
        print("")
        print("Now it's time to add some documentation:")
        print("1) Create a device specific wiki page as described here:")
@@ -59,11 +59,6 @@ def get_upstream_branch():
        channels.cfg from master to retrieve the upstream branch.

        :returns: branch name, e.g. "v20.05" """
-
-    # Prefer gitlab CI target branch name if it's set (i.e. running in gitlab CI)
-    if target_branch := os.environ.get("CI_MERGE_REQUEST_TARGET_BRANCH_NAME"):
-        return target_branch
-
    global cache
    if "upstream_branch" in cache:
        return cache["upstream_branch"]
@@ -135,28 +130,27 @@ def get_changed_packages_sanity_check(count):
        return

    branch = get_upstream_branch()
-    print(f"""
-ERROR: Too many packages have changed!
-
-This is a sanity check, so we don't end up building packages that
-have not been modified. CI won't run for more than three hours
-anyway.
-
-Your options:
-a) If you *did not* modify everything listed above, then rebase
-   your branch on the official postmarketOS/pmaports.git {branch}
-   branch. Feel free to ask in the chat for help if you need any.
-b) If you *did* modify all these packages, and you assume that
-   they will build within one hour: skip this sanity check by
-   adding '[ci:ignore-count]' to the commit message of the last
-   commit in the merge request (then force push).
-c) If you *did* modify all these packages, and you are sure that
-   they won't build in time, please add '[ci:skip-build]' to the
-   commit message (then force push). Make sure that all packages
-   build with 'pmbootstrap build --strict'!
-
-Thank you and sorry for the inconvenience.
-    """)
+    print()
+    print("ERROR: Too many packages have changed!")
+    print()
+    print("This is a sanity check, so we don't end up building packages that")
+    print("have not been modified. CI won't run for more than three hours")
+    print("anyway.")
+    print()
+    print("Your options:")
+    print("a) If you *did not* modify everything listed above, then rebase")
+    print(f"   your branch on the official postmarketOS/pmaports.git {branch}")
+    print("   branch. Feel free to ask in the chat for help if you need any.")
+    print("b) If you *did* modify all these packages, and you assume that")
+    print("   they will build within one hour: skip this sanity check by")
+    print("   adding '[ci:ignore-count]' to the commit message (then force")
+    print("   push).")
+    print("c) If you *did* modify all these packages, and you are sure that")
+    print("   they won't build in time, please add '[ci:skip-build]' to the")
+    print("   commit message (then force push). Make sure that all packages")
+    print("   build with 'pmbootstrap build --strict'!")
+    print()
+    print("Thank you and sorry for the inconvenience.")

    sys.exit(1)

@@ -15,14 +15,16 @@ fi
 # Shell: shellcheck
 sh_files="
 	./main/mdss-fb-init-hack/mdss-fb-init-hack.sh
+	./main/osk-sdl/unlock.sh
 	./main/postmarketos-base/rootfs-usr-lib-firmwareload.sh
 	./main/postmarketos-base-ui/rootfs-usr-lib-NetworkManager-dispatcher.d-50-dns-filter.sh
 	./main/postmarketos-base-ui/rootfs-usr-lib-NetworkManager-dispatcher.d-50-tethering.sh
 	./main/postmarketos-installkernel/installkernel-pmos
 	./main/postmarketos-initramfs/init.sh
 	./main/postmarketos-initramfs/init_functions.sh
-	./main/postmarketos-mkinitfs-hook-debug-shell/setup_usb_storage.sh
+	./main/postmarketos-mkinitfs-hook-debug-shell/20-debug-shell.sh
 	./main/postmarketos-mkinitfs-hook-netboot/netboot.sh
+	./main/postmarketos-update-kernel/update-kernel.sh
 	./main/ttyescape/*.post-install
 	./main/unl0kr/unlock.sh
 	./main/msm-firmware-loader/*.post-install
@@ -46,5 +48,5 @@ sh_files="
 for file in $sh_files; do
 	echo "Test with shellcheck: $file"
 	cd "$DIR/$(dirname "$file")"
-	shellcheck -e SC1008 -e SC3043 -x "$(basename "$file")"
+	shellcheck -e SC1008 -x "$(basename "$file")"
 done
@@ -7,7 +7,7 @@ import sys
 import os
 import importlib
 import importlib.util
-from site import getsitepackages
+from distutils.sysconfig import get_python_lib


 def path_pmbootstrap():
@@ -24,17 +24,16 @@ def path_pmbootstrap():
        sys.exit(1)

    # Resolve the symlink and verify the folder
-    directory = os.path.dirname(os.path.realpath(bin))
-    if os.path.exists(directory + "/pmb/__init__.py"):
-        return directory
+    dir = os.path.dirname(os.path.realpath(bin))
+    if os.path.exists(dir + "/pmb/__init__.py"):
+        return dir

-    directories = getsitepackages()
-    for directory in directories:
-        if os.path.exists(directory + "/pmb/__init__.py"):
-            return directory
+    dir = get_python_lib()
+    if os.path.exists(dir + "/pmb/__init__.py"):
+        return dir

    # Symlink not set up properly
-    print("ERROR: unable to find path to pmbootstrap.py. Try setting 'PMBOOTSTRAP_CMD'.")
+    print("ERROR: 'pmbootstrap' is not a symlink to pmbootstrap.py")
    sys.exit(1)


@@ -1,32 +1,30 @@
 #!/usr/bin/env python3
-# Copyright 2024 Oliver Smith
+# Copyright 2021 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later

-import fnmatch
 import glob
-import os
 import pytest
 import sys
+import os

 import add_pmbootstrap_to_import_path
 import pmb.parse
 import pmb.parse._apkbuild

-# Cache for codeowners_parse
-codeowners_parsed = {}
-
-# Don't complain if these nicknames are the only maintainers of an APKBUILD,
-# because they are actually a group of people
-gitlab_groups = [
-    "@sdm845-mainline",
-]
-

 def device_dependency_check(apkbuild, path):
    """ Raise an error if a device package has a dependency that is not allowed
        (e.g. because it should be in a subpackage instead). """

    for depend in apkbuild["depends"]:
+        if depend == "linux-firmware-none":
+            continue
+        if (depend.startswith("firmware-") or
+                depend.startswith("linux-firmware")):
+            raise RuntimeError("Firmware package '" + depend + "' found in"
+                               " depends of " + path + ". These go into"
+                               " subpackages now, see"
+                               " <https://postmarketos.org/devicepkg>.")
        if depend == "mesa-dri-gallium":
            raise RuntimeError(f"{path}: mesa-dri-gallium shouldn't be in"
                               " depends anymore (see pmaports!3478)")
@@ -48,7 +46,7 @@ def test_aports_device(args):
            raise RuntimeError("Missing 'postmarketos-base' in depends of " +
                               path)

-        # Depends: Must not have specific packages
+        # Depends: Must not have firmware packages
        for depend in apkbuild["depends"]:
            device_dependency_check(apkbuild, path)

@@ -61,6 +59,14 @@ def test_aports_device(args):
        if "!archcheck" not in apkbuild["options"]:
            raise RuntimeError("!archcheck missing in options= line: " + path)

+        if deviceinfo["flash_kernel_on_update"] == "true" \
+                and "postmarketos-update-kernel" not in apkbuild["depends"]:
+            raise RuntimeError(
+                "Deviceinfo indicates this device supports automatic kernel"
+                " flashing on update, but doesn't depend on"
+                " 'postmarketos-update-kernel'. Please add the missing"
+                " dependency.")
+

 def test_aports_device_kernel(args):
    """
@@ -102,84 +108,23 @@ def test_aports_device_kernel(args):
                               path)


-def codeowners_parse(args):
-    global codeowners_parsed
-
-    pattern_prev = None
-
-    with open(f"{args.aports}/CODEOWNERS") as h:
-        for line in h:
-            line = line.rstrip()
-            if not line or line.startswith("#"):
-                continue
-
-            pattern_nicks = line.split()
-            assert len(pattern_nicks) > 1, f"CODEOWNERS line without nicks: {line}"
-
-            pattern = pattern_nicks[0]
-            if pattern.endswith("/"):
-                pattern += "*"
-
-            nicks = []
-            for word in pattern_nicks[1:]:
-                if word.startswith("@"):
-                    nicks += [word]
-            codeowners_parsed[pattern] = nicks
-
-            if pattern_prev:
-                assert pattern_prev <= pattern, "CODEOWNERS: please order entries alphabetically"
-            pattern_prev = pattern
-
-
-def require_enough_codeowners_entries(args, path, maintainers):
-    """
-    :param path: full path to an APKBUILD (e.g. /home/user/…/APKBUILD)
-    :param maintainers: list of one or more maintainers
-    """
-    path = os.path.relpath(path, args.aports)
-
-    nicks = set()
-    for pattern, pattern_nicks in codeowners_parsed.items():
-        if fnmatch.fnmatch(path, pattern):
-            for nick in pattern_nicks:
-                nicks.add(nick)
-
-    print(f"{path}:")
-    print(f"  APKBUILD: {maintainers}")
-    print(f"  CODEOWNERS: {nicks}")
-
-    if len(nicks) < len(maintainers):
-        for nick in nicks:
-            if nick in gitlab_groups:
-                print(f"  -> {nick} is a group")
-                return
-
-    assert len(nicks) >= len(maintainers), \
-        f"{path}: make sure that each maintainer is listed in CODEOWNERS!"
-
-
 def test_aports_maintained(args):
    """
    Ensure that aports in /device/{main,community} have "Maintainer:" and
-    "Co-Maintainer:" (only required for main) listed in their APKBUILDs. Also
-    check that at least as many are listed in CODEOWNERS.
+    "Co-Maintainer:" (only required for main) listed in their APKBUILDs.
    """
-    codeowners_parse(args)
-
    for path in glob.iglob(f"{args.aports}/device/main/*/APKBUILD"):
        if '/firmware-' in path:
            continue
        maintainers = pmb.parse._apkbuild.maintainers(path)
        assert maintainers and len(maintainers) >= 2, \
            f"{path} in main needs at least 1 Maintainer and 1 Co-Maintainer"
-        require_enough_codeowners_entries(args, path, maintainers)

    for path in glob.iglob(f"{args.aports}/device/community/*/APKBUILD"):
        if '/firmware-' in path:
            continue
        maintainers = pmb.parse._apkbuild.maintainers(path)
        assert maintainers, f"{path} in community needs at least 1 Maintainer"
-        require_enough_codeowners_entries(args, path, maintainers)


 def test_aports_unmaintained(args):
@@ -6,10 +6,10 @@ import stat

 expected_directories = [
    "cross",
-    "device/archived",
    "device/community",
    "device/main",
    "device/testing",
+    "device/unmaintained",
    "main",
    "modem",
    "non-free",
@@ -30,7 +30,7 @@ def test_directories():
 # Ensure no file in pmaports are executable.
 # see https://gitlab.com/postmarketOS/pmaports/-/issues/593.
 def test_executable_files():
-    for file in glob.iglob("[!temp]**/**/*", recursive=True):
+    for file in glob.iglob("**/*", recursive=True):
        if os.path.isdir(file) or os.path.islink(file):
            continue
            # still check other less common inode types
@@ -6,8 +6,6 @@ import glob
 import pytest
 import sys
 import os
-import re
-from pathlib import Path

 import add_pmbootstrap_to_import_path
 import pmb.parse
@@ -42,9 +40,3 @@ def test_aports_kernel(args):
                if "pmb:kconfigcheck-community" not in apkbuild["options"]:
                    raise RuntimeError(f"{aport_name}: \"pmb:kconfigcheck-community\" missing in"
                                       " options= line, required for all community/main devices.")
-
-        # check for postmarketos-installkernel in makedepends when installing kernel with make
-        if bool(re.search("make z?install", Path(path).read_text(encoding="utf-8"))):
-            if "postmarketos-installkernel" not in apkbuild["makedepends"]:
-                raise RuntimeError(f"{aport_name}: \"postmarketos-installkernel\" missing in"
-                                   " makedepends, required when using make install/zinstall.")
@@ -1,4 +1,3 @@
 {
-  "SpacesAftertabs": true,
-  "Exclude": ["temp"]
+  "SpacesAftertabs": true
 }
@@ -7,7 +7,7 @@
 # Top-most EditorConfig file.
 root = true

-[{**.{md,ini,sh,rules,nft},**/APKBUILD,CODEOWNERS}]
+[{**.{md,ini,sh,rules,nft},**/APKBUILD}]
 indent_style = tab
 end_of_line = lf
 trim_trailing_whitespace = true
@@ -2,69 +2,69 @@

 # global settings
 image: alpine:latest
-before_script: &global_before_scripts
-  - apk upgrade -U
 after_script:
  - .ci/lib/move_logs.sh $CI_PROJECT_DIR
 stages:
  - lint
  - build
-  - autoupdate

-# This defines the rules for when a pipeline should run.
-workflow:
-  rules:
-    # Don't run branch pipeline if an MR is open (only the MR pipeline will run)
-    - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS && $CI_PIPELINE_SOURCE == "push"
-      when: never
-    # Run for merge requests
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-    # Run scheduled pipeline for autoupdate or manually triggered pipeline
-    - if: $CI_PIPELINE_SOURCE == "schedule" || $CI_PIPELINE_SOURCE == "web"
+# defaults for "only"
+# We need to run the CI jobs in a "merge request specific context", if CI is
+# running in a merge request. Otherwise the environment variable that holds the
+# merge request ID is not available. This means, we must set the "only"
+# variable accordingly - and if we only do it for one job, all other jobs will
+# not get executed. So have the defaults here, and use them in all jobs that
+# should run on both the master branch, and in merge requests.
+# https://docs.gitlab.com/ee/ci/merge_request_pipelines/index.html#excluding-certain-jobs
+.only-default: &only-default
+  only:
+    - master
+    - merge_requests
+    - tags

 # device documentation
 wiki:
  stage: lint
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
-      changes:
-        - .ci/**/*
-        - .gitlab-ci.yml
-        - device/*/device-*/*
+  <<: *only-default
+  only:
+    refs:
+      - merge_requests
+    changes:
+      - device/*/device-*/*
  script:
    - .ci/lib/gitlab_prepare_ci.sh
    - .ci/wiki.sh

 # testcases linting
-ruff:
+flake8:
  stage: lint
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
-      changes:
-        - .ci/*
-        - .ci/*/*
-        - .gitlab-ci.yml
+  <<: *only-default
+  only:
+    refs:
+      - merge_requests
+    changes:
+      - .ci/*
+      - .ci/*/*
+  before_script:
+    - apk -q add py-flake8
  script:
    - .ci/lib/gitlab_prepare_ci.sh
-    - .ci/ruff.sh
+    - .ci/flake8.sh

 # shellcheck and various grep checks
 shellcheck-grep:
  stage: lint
+  <<: *only-default
  image: alpine:edge
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
  script:
    - .ci/lib/gitlab_prepare_ci.sh
    - .ci/shellcheck.sh
    - .ci/grep.sh
-    - .ci/codeowners.sh

 editor-config:
  stage: lint
+  <<: *only-default
  image: alpine:edge
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
  script:
    - .ci/lib/gitlab_prepare_ci.sh
    - .ci/ec.sh
@@ -72,8 +72,7 @@ editor-config:
 # aports checks (generic)
 pytest-commits:
  stage: lint
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
+  <<: *only-default
  script:
    - .ci/lib/gitlab_prepare_ci.sh
    - .ci/pytest.sh
@@ -89,22 +88,23 @@ pytest-commits:
 # APKBUILD linting
 aport-lint:
  stage: lint
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
  script:
    - .ci/lib/gitlab_prepare_ci.sh
    - .ci/apkbuild-lint.sh
+  only:
+    - merge_requests
  allow_failure: true

 # kernel kconfig check
 kernel-kconfig:
  stage: lint
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
-      changes:
-        - kconfigcheck.toml
-        - device/*/linux-*/config-*
-        - main/linux-*/config-*
+  only:
+    refs:
+      - master
+      - merge_requests
+    changes:
+      - device/*/linux-*/config-*
+      - main/linux-*/config-*
  script:
    - .ci/lib/gitlab_prepare_ci.sh
    - .ci/kconfig.sh
@@ -113,10 +113,9 @@ kernel-kconfig:
 # (Checks for "Allow commits from members who can merge to the target branch")
 mr-settings:
  stage: lint
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+  only:
+    - merge_requests
  before_script:
-    - *global_before_scripts
    - apk -q add python3
  script:
    - wget -q "https://gitlab.com/postmarketOS/ci-common/-/raw/master/check_mr_settings.py"
@@ -125,12 +124,8 @@ mr-settings:
 # build changed aports
 .build:
  stage: build
-  tags:
-    - saas-linux-large-amd64
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
+  <<: *only-default
  before_script:
-    - *global_before_scripts
    - .ci/lib/gitlab_prepare_ci.sh
  after_script:
    - cp -r /home/pmos/.local/var/pmbootstrap/packages/ packages/ || true
@@ -152,8 +147,6 @@ build-x86:

 build-aarch64:
  extends: .build
-  tags:
-    - saas-linux-large-arm64
  script:
    - .ci/build-aarch64.sh

@@ -171,22 +164,3 @@ build-riscv64:
  extends: .build
  script:
    - .ci/build-riscv64.sh
-
-auto-update:
-  stage: autoupdate
-  rules:
-    # This variable is set in the scheduled pipeline configuration. It should be a space separated list of
-    # package names to update.
-    - if: $AUTOUPDATE_PACKAGES != null && $CI_PIPELINE_SOURCE == "schedule" || $CI_PIPELINE_SOURCE == "web"
-  before_script:
-    - .ci/lib/gitlab_prepare_ci.sh
-  script:
-    - .ci/autoupdate.sh "$AUTOUPDATE_PACKAGES"
-  after_script:
-    - .ci/lib/move_logs.sh $CI_PROJECT_DIR
-  artifacts:
-    when: on_failure
-    paths:
-      - log.txt
-      - log_testsuite_pmaports.txt
-      - pmbootstrap.cfg
@@ -1,12 +1,6 @@
 <!--
 	Thank you for using postmarketOS! In order to speed up process of resolving your issue,
-	we would like you to fill in the following form.
-
-	*** NOTE FOR CONFIDENTIAL ISSUES: ***
-	A lot of people can read confidential pmaports issues! If you want to
-	submit something that only the postmarketOS Core Team can see, write to
-		team@postmarketos.org
-	instead of opening an issue here!
+	we would like you to fill in the following :
 -->
 ### Describe your issue
 #### What's the expected behaviour?
@@ -27,8 +21,8 @@
 	Replace space inside `[ ]` with `x` to fill the checkbox
 -->
 * [ ] edge (`master` branch)
-* [ ] `v24.06`
-* [ ] `v23.12` (supported until 2024-07-16)
+* [ ] `v23.06`
+* [ ] `v22.12` (Supported until 2023-07-06)

 * [ ] I confirm that the issue still is present after running `sudo apk upgrade -a`

@@ -51,13 +45,4 @@
 -->

 ### Additional information
-<!--
-	logs, etc. -- make use <details> for long listings
-
-	If your device displays an error message on boot or drops to the debug
-	shell, attaching it to your PC with a USB cable may show a removable USB
-	drive. You can drag and drop the .tar.gz file or otherwise upload it
-	here.
-
-	Refer to the README file on the device for more information.
-->
+<!-- logs, etc. -- make use <details> for long listings -->
@@ -1,135 +1,88 @@
 # https://docs.gitlab.com/ee/user/project/code_owners.html
-# Put groups like @sdm845-mainline into test_device.py:gitlab_groups.
-# Order lines alphabetically!

-device/*/*-amlogic-s905*/			@funderscore
-device/*/*-arrow-db410c/			@Minecrell
-device/*/*-asus-me176c/				@Minecrell
-device/*/*-ayn-odin/				@jenneron
-device/*/*-bq-paella/				@Minecrell
-device/*/*-bq-tenshi/				@fossdd
-device/*/*-google-gru/				@jenneron
-device/*/*-google-kukui/			@jenneron @binarycraft
-device/*/*-google-oak/				@jenneron @adamthiede
-device/*/*-google-trogdor/			@jenneron
-device/*/*-google-veyron/			@jenneron
-device/*/*-google-x64cros/			@jenneron @JustSoup321 @alpernebbi
 device/*/*-htc-golfu/				@Newbyte
+device/*/*-pine64-pinephone/			@craftyguy @milesalan @bshah @proycon @anjandev @StacyHarper
 device/*/*-htc-m8qlul/				@Newbyte
-device/*/*-kobo-clara/				@akemnade
-device/*/*-lenovo-21bx/				@craftyguy @jane400
-device/*/*-lenovo-a6000/			@jenneron @Minecrell
-device/*/*-lenovo-a6010/			@jenneron @Minecrell
-device/*/*-librecomputer-lafrite/		@funderscore
-device/*/*-librecomputer-lepotato/		@funderscore
-device/*/*-librecomputer-solitude/		@Newbyte @funderscore
-device/*/*-motorola-harpia/			@Minecrell
-device/*/*-nokia-n900/				@sicelo @Danct12
-device/*/*-pine64-pinebookpro/			@QC8086
-device/*/*-pine64-pinephone/			@craftyguy @milesalan @proycon @anjandev @StacyHarper @Arnavion @PsychoGame
-device/*/*-pine64-pinephonepro/			@PsychoGame
-device/*/*-pine64-rockpro64/			@PureTryOut
-device/*/*-purism-librem5/			@craftyguy @alistair23 @Newbyte
-device/*/*-qcom-msm8916/			@Minecrell @TravMurav
-device/*/*-qcom-sdm845/				@sdm845-mainline
-device/*/*-qcom-sm6350/				@z3ntu
-device/*/*-samsung-a3/				@Mis012 @TravMurav @Minecrell
-device/*/*-samsung-a5/				@Minecrell @minlexx
-device/*/*-samsung-e7/				@wonderfulShrineMaidenOfParadise
-device/*/*-samsung-espresso10/			@MightyM17
-device/*/*-samsung-espresso7/			@MightyM17 @antoni.aloytorrens
-device/*/*-samsung-grandmax/			@wonderfulShrineMaidenOfParadise
-device/*/*-samsung-gt510/			@TravMurav
-device/*/*-samsung-gt58/			@TravMurav
-device/*/*-samsung-j5/				@wonderfulShrineMaidenOfParadise
-device/*/*-samsung-j5x/				@wonderfulShrineMaidenOfParadise
-device/*/*-samsung-serranove/			@Minecrell
-device/*/*-tolino-shine2hd/			@akemnade
-device/*/*-videostrong-kii-pro/			@funderscore
-device/*/*-wileyfox-crackling/			@TravMurav @Minecrell
-device/*/*-xiaomi-beryllium/			@joelselvaraj
-device/*/*-xiaomi-daisy/			@joelselvaraj @alikates
-device/*/*-xiaomi-markw/			@vipaoL
-device/*/*-xiaomi-mido/				@barni2000
-device/*/*-xiaomi-scorpio/			@Tooniis
-device/*/*-xiaomi-tissot/			@jiaxyga @barni2000
-device/*/*-xiaomi-vince/			@M0Rf30
-device/*/*-xiaomi-wt88047/			@Minecrell
-device/*/*-xiaomi-ysl/				@barni2000
-device/*/alsa-ucm-conf-cros/			@WeirdTreeThing
-device/*/device-fairphone-*/			@z3ntu
-device/*/device-generic-x86_64/			@craftyguy @ollieparanoid
-device/*/device-google-nyan-big/		@jenneron
-device/*/device-google-nyan-blaze/		@jenneron
-device/*/device-google-peach-pi/		@jenneron
-device/*/device-google-peach-pit/		@jenneron
-device/*/device-google-snow/			@jenneron
-device/*/device-huawei-plank/			@gtrxAC
+device/*/*-purism-librem5/			@craftyguy @bshah
 device/*/device-lg-judyln/			@Newbyte
-device/*/device-lg-judyp/			@jenneron
-device/*/device-microsoft-surface-rt/		@jenneron @jethrob
-device/*/device-nvidia-tegra-armv7/		@clamor-s @okias @mschwalm @nokun
-device/*/device-odroid-xu4/			@Grimler
+device/*/device-samsung-m0/			@Newbyte
+device/*/linux-postmarketos-exynos4/		@Newbyte
+device/*/linux-postmarketos-msm8939/		@Newbyte
+device/*/linux-postmarketos-stericsson/		@Newbyte
+device/*/*-qcom-sdm845/				@sdm845-mainline
+device/*/*-xiaomi-berrylium/ 			@joelselvaraj
 device/*/device-oneplus-enchilada/		@calebccff
 device/*/device-oneplus-fajita/			@calebccff
-device/*/device-postmarketos-trailblazer/	@calebccff
-device/*/device-qcom-msm8909/			@wonderfulShrineMaidenOfParadise
-device/*/device-qemu-aarch64/			@Minecrell @ollieparanoid
-device/*/device-qemu-amd64/			@Minecrell @ollieparanoid
-device/*/device-qemu-riscv64/			@Minecrell @z3ntu
-device/*/device-qualcomm-sdm845/		@calebccff
-device/*/device-samsung-chagallwifi/		@Grimler
-device/*/device-samsung-coreprimevelte/		@legolivesmatter @balejk
-device/*/device-samsung-j5y17lte/	@andrisas
-device/*/device-samsung-klimtlte/		@Grimler
-device/*/device-samsung-lt01/			@knuxify
-device/*/device-samsung-m0/			@Newbyte
-device/*/device-samsung-manta/			@jenneron @alexmrqt
-device/*/device-shift-axolotl/			@amartinz @calebccff @dylanvanassche
-device/*/firmware-google-veyron-brcm/		@jenneron
-device/*/firmware-odroid-xu4/			@Grimler
 device/*/firmware-oneplus-sdm845/		@calebccff
-device/*/firmware-powervr-gx6250/		@jenneron
-device/*/kobo-epdc-extractor/			@akemnade
-device/*/linux-google-nyan/			@jenneron
+device/*/device-shift-axolotl/			@amartinz @calebccff @dylanvanassche
+device/*/*-lenovo-a6010/			@jenneron
+device/*/*-lenovo-a6000/			@jenneron
+device/*/device-microsoft-surface-rt/		@jenneron
+device/*/device-google-fennel/			@jenneron
+device/*/device-google-veyron-minnie/		@jenneron
+device/*/device-google-burnet/			@jenneron
+device/*/device-google-elm/			@jenneron
+device/*/device-google-nyan-big/		@jenneron
+device/*/device-google-peach-pi/		@jenneron
+device/*/device-google-veyron-speedy/		@jenneron
 device/*/linux-google-veyron/			@jenneron
-device/*/linux-huawei-plank/			@gtrxAC
-device/*/linux-next/				@calebccff
-device/*/linux-postmarketos-allwinner/		@Arnavion @PsychoGame
-device/*/linux-postmarketos-amlogic/		@funderscore @exkc
-device/*/linux-postmarketos-exynos4/		@Newbyte @Grimler @knuxify
+device/*/u-boot-peach-pi/			@jenneron
+device/*/device-google-cozmo/			@jenneron
+device/*/u-boot-veyron-speedy/			@jenneron
+device/*/device-google-juniper/			@jenneron @binarycraft
+device/*/u-boot-peach-pit/			@jenneron
+device/*/device-google-damu/			@jenneron
+device/*/u-boot-nyan-4gb/			@jenneron
+device/*/device-google-kenzo/			@jenneron
+device/*/device-google-kodama/			@jenneron
+device/*/u-boot-snow/				@jenneron
+device/*/device-google-kevin/			@jenneron
 device/*/linux-postmarketos-exynos5/		@jenneron @Grimler
-device/*/linux-postmarketos-grate/		@clamor-s @jenneron @jethrob
-device/*/linux-postmarketos-imx-ereader/	@akemnade
-device/*/linux-postmarketos-mediatek-mt8173/	@jenneron @adamthiede
-device/*/linux-postmarketos-mediatek-mt8183/	@jenneron @binarycraft
-device/*/linux-postmarketos-omap/		@MightyM17 @Sicelo
-device/*/linux-postmarketos-qcom-msm8939/	@Newbyte
-device/*/linux-postmarketos-qcom-msm8953/	@M0Rf30 @Ultra-azu @barni2000
-device/*/linux-postmarketos-qcom-msm8996/	@Tooniis
-device/*/linux-postmarketos-qcom-sc7180/	@jenneron
-device/*/linux-postmarketos-rockchip/		@QC8086
-device/*/linux-postmarketos-stericsson/		@Newbyte
-device/*/linux-samsung-chagallwifi/		@Grimler
-device/*/linux-samsung-coreprimevelte/		@legolivesmatter @balejk
-device/*/linux-samsung-j5y17lte/	@andrisas
-device/*/linux-samsung-klimtlte/		@Grimler
-device/*/oem-amd/				@craftyguy
-device/*/oem-intel/				@craftyguy
+device/*/device-google-krane/			@jenneron
 device/*/soc-mediatek-mt8183/			@jenneron
-device/*/soc-qcom-msm8953/			@barni2000
-device/*/soc-qcom-msm8996/			@Tooniis
-device/*/soc-qcom-sc7180/			@jenneron
-device/*/soc-rockchip-rk3399/			@jenneron
-device/*/soc-samsung-exynos4412/		@Newbyte
-device/*/u-boot-librem5/			@craftyguy @alistair23 @Newbyte
-device/*/u-boot-pinebookpro/			@QC8086
-device/*/u-boot-pinephone/			@Arnavion @PsychoGame
-device/*/wl1251-cal/				@Danct12
-main/postmarketos*gnome*/			@pabloyoyoista @Newbyte
-main/postmarketos-initramfs/			@calebccff @craftyguy
-main/postmarketos-ui-i3wm/			@fossdd
-main/postmarketos-ui-phosh/			@pabloyoyoista @Newbyte
-main/postmarketos-ui-plasma-mobile/		@PureTryOut
-main/shutdown-clear-rtc-wakealarm/		@Arnavion
-main/ttyescape/					@calebccff
+device/*/u-boot-veyron-minnie/			@jenneron
+device/*/device-google-fennel14/		@jenneron
+device/*/linux-google-nyan/			@jenneron
+device/*/device-google-willow/			@jenneron
+device/*/linux-postmarketos-mediatek-mt8173/	@jenneron
+device/*/linux-postmarketos-mediatek-mt8183/	@jenneron @binarycraft
+device/*/device-google-nyan-blaze/		@jenneron
+device/*/firmware-powervr-gx6250/		@jenneron
+device/*/device-google-hana/			@jenneron
+device/*/device-google-snow/			@jenneron
+device/*/device-google-kappa/			@jenneron
+device/*/u-boot-nyan-2gb/			@jenneron
+device/*/device-google-veyron-jerry/		@jenneron
+device/*/device-google-kakadu/			@jenneron
+device/*/firmware-google-veyron-brcm/		@jenneron
+device/*/device-google-peach-pit/		@jenneron
+device/*/device-lg-judyp/			@jenneron
+device/*/device-asus-tf201/			@clamor95
+device/*/device-asus-tf300t/			@clamor95
+device/*/device-asus-tf300tg/			@clamor95
+device/*/device-asus-tf700t/			@clamor95
+device/*/device-lg-p895/			@clamor95
+device/*/firmware-asus-transformer/		@clamor95 @jenneron
+device/*/firmware-lg-x3/			@clamor95
+device/*/linux-postmarketos-grate/		@clamor95 @jenneron
+device/*/device-samsung-chagallwifi		@Grimler
+device/*/device-odroid-xu4			@Grimler
+device/*/device-samsung-klimtlte		@Grimler
+device/*/linux-samsung-klimtlte			@Grimler
+device/*/firmware-odroid-xu4			@Grimler
+device/*/linux-samsung-chagallwifi		@Grimler
+device/*/device-huawei-plank			@gtrxAC
+device/*/linux-huawei-plank			@gtrxAC
+
+main/postmarketos-update-depthcharge-kernel/	@jenneron
+main/osk-sdl/					@craftyguy
+main/postmarketos-ui-plasma-mobile/ 		@bshah
+main/ttyescape					@calebccff
+temp/u-boot-librem5/				@craftyguy @bshah
+temp/alsa-ucm-conf-google-kukui/		@jenneron @binarycraft
+temp/alsa-ucm-conf-google-gru/			@jenneron
+device/*/*-videostrong-kii-pro/                 @vitali64yt
+device/*/*-amlogic-s905*                        @vitali64yt
+device/*/linux-postmarketos-amlogic/            @vitali64yt @exkc
+
+# vim: ts=8 sw=4 et
@@ -8,20 +8,8 @@ branch_pmaports=master
 branch_aports=master
 mirrordir_alpine=edge

-[v24.06]
-description=Latest release / Recommended for best stability
-branch_pmaports=v24.06
-branch_aports=3.20-stable
-mirrordir_alpine=v3.20
-
-[v23.12]
-description=Old release (unsupported)
-branch_pmaports=v23.12
-branch_aports=3.19-stable
-mirrordir_alpine=v3.19
-
 [v23.06]
-description=Old release (unsupported)
+description=Latest release / Recommended for best stability
 branch_pmaports=v23.06
 branch_aports=3.18-stable
 mirrordir_alpine=v3.18
@@ -8,7 +8,7 @@ fi

 pkgname=busybox-static-aarch64
 pkgver=1.36.1
-pkgrel=31
+pkgrel=4

 _arch="aarch64"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }

 sha512sums="
-c34906bb0a5d7e268ab43ca1e3e2f9c75c06f3f5de8d41671396bcd7d585a79a66e25ad43e80a3e107a1de0ecaf83ac7198163d3e775edbd6d626ef014307ec5  busybox-static-1.36.1-r31-aarch64-edge.apk
+c0ea71bcec70e35de3dcb919c22c02afe7e35b3168845209e93bcd15ff380d62dc807848e36e1e5fef22c16adbbdfc1dc3a3559015d0c4a3b2978e0e303d4413  busybox-static-1.36.1-r4-aarch64-edge.apk
 "
@@ -8,7 +8,7 @@ fi

 pkgname=busybox-static-armhf
 pkgver=1.36.1
-pkgrel=31
+pkgrel=4

 _arch="armhf"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }

 sha512sums="
-7e6a961a0adcbc2912f5b261ce84a62b9189dce49c5dd3d2bcbdae407645dec72c27af8804c1d5446d50e78ea938a4d812c477db199ed83cac7c647c4b41f3fe  busybox-static-1.36.1-r31-armhf-edge.apk
+701ee52541aee37a075563c430b891860afd205e4446379a4686b3eac57ce8443c1203b06fb90f146c88064e00d99101c86d0d8b3a91377e465d46958c942366  busybox-static-1.36.1-r4-armhf-edge.apk
 "
@@ -8,7 +8,7 @@ fi

 pkgname=busybox-static-armv7
 pkgver=1.36.1
-pkgrel=31
+pkgrel=4

 _arch="armv7"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }

 sha512sums="
-b9736dc7df4230196bf05de3bd76b61fc689c56861bc7c5194cd310e23f513cec649c1b3e3f338266b8d58540468d97e8525948a3efc2d1af53e288cd525e836  busybox-static-1.36.1-r31-armv7-edge.apk
+e01fdc7edfe06b9b8c30acb0df90f026c49982d378724c8afd4e545f5ab7e9d317a9fd8e1e7ae06d3f89e3ddf5e572ad3f7d2d033225f195d5bc7530e6e4bcd2  busybox-static-1.36.1-r4-armv7-edge.apk
 "
@@ -1,6 +1,3 @@
-# Maintainer: Oliver Smith <ollieparanoid@postmarketos.org>
-# https://wiki.postmarketos.org/wiki/Pmbootstrap:_Cross_Compiling
-#
 # Wrapper for the "crossdirect" compilation method.
 # pmbootstrap mounts the native chroot in the foreign arch (e.g. armhf) chroot
 # as /native. This package gets installed into the native chroot, and creates
@@ -19,14 +16,14 @@
 # version is implemented as simple shell wrappers.

 pkgname=crossdirect
-pkgver=5.1.0
-pkgrel=0
+pkgver=4
+pkgrel=3
 pkgdesc="Wrappers to launch native cross compilers in foreign chroots"
 url="https://postmarketOS.org"
 arch="all"
 license="MIT"
 options="!check"
-source="cargo.sh crossdirect.c rustc.sh rust-qemu-linker.sh"
+source="crossdirect.c rustc.sh rust-qemu-linker.sh"

 build() {
 	cd "$srcdir"
@@ -43,6 +40,9 @@ build() {
 			-Werror \
 			-DHOSTSPEC="\"$_hostspec\"" \
 			crossdirect.c
+
+		# rustc
+		sed "s/@ARCH@/$_arch/g" rustc.sh >rustc-"$_arch"
 	done
 }

@@ -51,11 +51,9 @@ package() {
 	_archs="x86_64 armhf armv7 aarch64"
 	_bins="c++ cc cpp g++ gcc clang clang++"

-	# Rust wrappers
+	# Rust: qemu-linker
 	install -Dm755 "$srcdir/rust-qemu-linker.sh" \
 		"$pkgdir/usr/lib/crossdirect/rust-qemu-linker"
-	install -Dm755 "$srcdir/cargo.sh" "$pkgdir/usr/lib/crossdirect/cargo.sh"
-	install -Dm755 "$srcdir/rustc.sh" "$pkgdir/usr/lib/crossdirect/rustc.sh"

 	# Iterate over architectures
 	for _arch in $_archs; do
@@ -75,14 +73,10 @@ package() {
 			ln -s "crossdirect-$_arch" "$_hostspec-$_bin"
 		done

-		ln -s ../cargo.sh cargo
-		ln -s ../rustc.sh rustc
+		# Rust: arch-specific rustc wrapper
+		install -Dm755 "$srcdir/rustc-$_arch" "$_bindir/rustc"
 	done
 }
-
-sha512sums="
-0f4b48f250425dc57f63955fc8b38477d23db793bee367c3fbe03c3d2a559ba576434d07518310db4cae9d90d501af4051b80038b10fae94b980e537fc9374ad  cargo.sh
-500107e5aff8b34e74b54982ebcd447fc41bc8283956d506561b031a055cb30ec12698047c2604918b4b6d8560fe03db427a63dff2b83c907e8494b7f5233f29  crossdirect.c
-de2aa6929bbff5db9132673e667f4525b333d062cb1f7a0597dd924de9e5c7215a9f8e2e6263b6fb5ace06f2c4b64f4ebfd0ede9b78add07c2cd08ec8613e98f  rustc.sh
-ea9bf8db3810d03d0a7395057f3d6e57f7127d87c55deaedc171c255288f5f3cc6fbcc680a5a1b92786cf573875d5dc22521173799fe2639acc97d0715ff905b  rust-qemu-linker.sh
-"
+sha512sums="500107e5aff8b34e74b54982ebcd447fc41bc8283956d506561b031a055cb30ec12698047c2604918b4b6d8560fe03db427a63dff2b83c907e8494b7f5233f29  crossdirect.c
+6be16ba88720e628a3ecc8fa53f8e7a21d2af268b0509745d989139874d6b94b640bfcff09575eaa19073810be6ef91169c1f83e94f5cf8e6819f2670d9408de  rustc.sh
+ea9bf8db3810d03d0a7395057f3d6e57f7127d87c55deaedc171c255288f5f3cc6fbcc680a5a1b92786cf573875d5dc22521173799fe2639acc97d0715ff905b  rust-qemu-linker.sh"
@@ -1,66 +0,0 @@
-#!/bin/sh -e
-
-if [ -n "$CROSSDIRECT_DEBUG" ]; then
-	set -x
-fi
-
-native_version=$(LD_LIBRARY_PATH=/native/lib:/native/usr/lib /native/usr/bin/rustc -V)
-target_version=$(/usr/bin/rustc -V)
-
-if [ "$target_version" != "$native_version" ]; then
-	echo "ERROR: crossdirect: rustc version mismatch between native and build chroot. Please update your chroots and try again." >&2
-	exit 1
-fi
-
-triplet=$(/usr/bin/rustc -vV | sed -n 's/host: //p')
-cmd=$1
-shift
-
-case "$cmd" in
-	build|test|run)
-		;;
-	*)
-		echo "WARNING: crossdirect: 'cargo $cmd $*' command not supported, running in QEMU (slow!)" >&2
-		export PATH="$(echo "$PATH" | sed 's,/native/usr/lib/crossdirect/[^:]*:,,')"
-		exec /usr/bin/cargo "$cmd" "$@"
-		;;
-esac
-
-target_dir=${CARGO_TARGET_DIR:-target}
-target_already_specified=${CARGO_BUILD_TARGET:+1}
-
-if [ -z "$target_specified" ]; then
-	for arg in "$@"; do
-		if [ "$arg_target_dir" = 1 ]; then
-			target_dir=$arg
-			arg_target_dir=0
-		fi
-		case "$arg" in
-			--target|--target=*)
-				target_already_specified=1
-				break
-				;;
-			--target-dir)
-				arg_target_dir=1
-				;;
-			--target-dir=*)
-				target_dir=${arg##--target-dir=}
-				;;
-		esac
-	done
-fi
-
-if [ -n "$target_already_specified" ]; then
-	exec /usr/bin/cargo "$cmd" "$@"
-fi
-
-/usr/bin/cargo "$cmd" --target=$triplet "$@"
-
-# copy target/$triplet/{release,debug,...} to target/{release,debug,...}
-if [ -d "$target_dir/$triplet" ]; then
-	for dir in "$target_dir/$triplet"/*/; do
-		build=$(basename "$dir")
-		rm -rf "$target_dir/$build"
-		cp -r "$target_dir/$triplet/$build" "$target_dir/$build"
-	done
-fi
@@ -1,38 +1,48 @@
 #!/bin/sh -e

-if [ -n "$CROSSDIRECT_DEBUG" ]; then
-	set -x
-fi
+rust_triplet() {
+	# Find the triplets in Alpine's rust APKBUILD or with:
+	# pmbootstrap chroot -barmhf --add=rust -- ls /usr/lib/rustlib
+	case "$1" in
+		x86_64)
+			echo "x86_64-alpine-linux-musl"
+			;;
+		armhf)
+			echo "armv6-alpine-linux-musleabihf"
+			;;
+		armv7)
+			echo "armv7-alpine-linux-musleabihf"
+			;;
+		aarch64)
+			echo "aarch64-alpine-linux-musl"
+			;;
+		*)
+			echo "ERROR: don't know the rust triple for $1!" >&2
+			exit 1
+			;;
+	esac
+}

-# return the correct host architecture when cargo requests it
-if [ "$*" = "-vV" ] || [ "$*" = "-V" ]; then
-	exec /usr/bin/rustc "$*"
-fi
+arch="@ARCH@" # filled in by APKBUILD

-# pmbootstrap installs sccache when building a rust program, unless --no-ccache
-# is set. In that case it also sets CCACHE_DISABLE.
-SCCACHE=/native/usr/bin/sccache
-if ! [ -e "$SCCACHE" ] || [ -n "$CCACHE_DISABLE" ]; then
-	SCCACHE=""
-fi
-
-# We expect the right target to be set in the arguments if compiling for the
-# target architecture. Our cargo wrapper passes the right "--target" argument
-# automatically. If no target is provided, this is probably a macro or a
-# build script, so it should be compiled for the native architecture.
-if echo "$*" | grep -qFe "--target"; then
-	# Not using sccache when building for foreign architecture, as it
-	# doesn't cache the output with "Non-cacheable reasons: --sysroot"
-	LD_LIBRARY_PATH=/native/lib:/native/usr/lib \
-		/native/usr/bin/rustc \
+if ! LD_LIBRARY_PATH=/native/lib:/native/usr/lib \
+	/native/usr/bin/rustc \
 		-Clinker=/native/usr/lib/crossdirect/rust-qemu-linker \
+		--target=$(rust_triplet "$arch") \
 		--sysroot=/usr \
-		"$@"
-else
-	PATH=/native/usr/bin:/native/bin \
-	LD_LIBRARY_PATH=/native/lib:/native/usr/lib \
-		$SCCACHE \
-		/native/usr/bin/rustc \
-		-Clink-arg=-Wl,-rpath,/native/lib:/native/usr/lib \
-		"$@"
+		"$@"; then
+	echo "---" >&2
+	echo "WARNING: crossdirect: cross compiling with rustc failed, trying"\
+		"again with rustc + qemu" >&2
+	echo "---" >&2
+	# Usually the crossdirect approach works; however, when passing
+	# --extern to rustc with a dynamic library (.so), it fails with an
+	# error like 'can't find crate for `serde_derive`' (although the crate
+	# does exist). I think it fails to parse the metadata of the so file
+	# for some reason. We probably need to adjust rustc's
+	# librustc_metadata/locator.rs or something (and upstream that
+	# change!), but I've spent enough time on this already. Let's simply
+	# fall back to compiling in qemu in the very few cases where this is
+	# necessary.
+	/usr/bin/rustc "$@"
 fi
@@ -1,7 +1,7 @@
 From 47b4bd4deb2c356bb07d2a96f22127aefafec3a4 Mon Sep 17 00:00:00 2001
 From: Szabolcs Nagy <nsz@port70.net>
 Date: Fri, 26 Jan 2018 20:32:50 +0000
-Subject: [PATCH 01/35] posix_memalign
+Subject: [PATCH 01/34] posix_memalign

 ---
 gcc/config/i386/pmm_malloc.h | 9 +++++----
@@ -1,7 +1,7 @@
 From 4fa620d8c3e6730211bfb071eb4c817320491bd0 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Fri, 29 Mar 2013 08:59:00 +0400
-Subject: [PATCH 02/35] gcc: poison-system-directories
+Subject: [PATCH 02/34] gcc: poison-system-directories

 Add /sw/include and /opt/include based on the original
 zecke-no-host-includes.patch patch.  The original patch checked for
@@ -150,13 +150,13 @@ diff --git a/gcc/gcc.cc b/gcc/gcc.cc
 index 16bb07f2cdc..33b56e721d2 100644
 --- a/gcc/gcc.cc
 +++ b/gcc/gcc.cc
-@@ -1177,6 +1187,8 @@ proper position among the other output files.  */
-    "-z now " \
+@@ -1146,6 +1146,8 @@ proper position among the other output files.  */
+    "%{fuse-ld=*:-fuse-ld=%*} " LINK_COMPRESS_DEBUG_SPEC \
    "%X %{o*} %{e*} %{N} %{n} %{r}\
     %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!r:%{!nostartfiles:%S}}} \
 +    %{Wno-poison-system-directories:--no-poison-system-directories} \
 +    %{Werror=poison-system-directories:--error-poison-system-directories} \
-     %{static|no-pie|static-pie:} %@{L*} %(link_libgcc) " \
+     %{static|no-pie|static-pie:} %@{L*} %(mfwrap) %(link_libgcc) " \
     VTABLE_VERIFICATION_SPEC " " SANITIZER_EARLY_SPEC " %o "" \
     %{fopenacc|fopenmp|%:gt(%{ftree-parallelize-loops=*:%*} 1):\
 diff --git a/gcc/incpath.cc b/gcc/incpath.cc
@@ -1,7 +1,7 @@
 From ff4dd4ce33133e675b7bedc86b73357c04631cb9 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:45:49 +0000
-Subject: [PATCH 03/35] specs: turn on -Wl,-z,now by default
+Subject: [PATCH 03/34] specs: turn on -Wl,-z,now by default

 Previously, we also used to turn on -z relro here, but we now build
 binutils with --enable-relro, which is functionally equivalent.
@@ -1,7 +1,7 @@
 From 1b315235433701e4a974da259b8d651169ddc7ac Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:46:22 +0000
-Subject: [PATCH 04/35] Turn on -D_FORTIFY_SOURCE=2 by default for C, C++,
+Subject: [PATCH 04/34] Turn on -D_FORTIFY_SOURCE=2 by default for C, C++,
 ObjC, ObjC++, if the optimization level is > 0

 ---
@@ -1,7 +1,7 @@
 From 67c0f5789630b27149f60ff831999ef7c1dba5d5 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:46:56 +0000
-Subject: [PATCH 05/35] On linux targets pass --as-needed by default to the
+Subject: [PATCH 05/34] On linux targets pass --as-needed by default to the
 linker, but always link the sanitizer libraries with --no-as-needed.

 ---
@@ -1,7 +1,7 @@
 From bb25e8489384504cd59e4a2538720863da1fb29c Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:47:43 +0000
-Subject: [PATCH 06/35] Enable -Wformat and -Wformat-security by default.
+Subject: [PATCH 06/34] Enable -Wformat and -Wformat-security by default.

 ---
 gcc/c-family/c.opt | 4 ++--
@@ -1,7 +1,7 @@
 From 4a728ad48a7b437cc6f2697e26603bf648149f86 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:48:24 +0000
-Subject: [PATCH 07/35] Enable -Wtrampolines by default.
+Subject: [PATCH 07/34] Enable -Wtrampolines by default.

 ---
 gcc/common.opt | 2 +-
@@ -1,7 +1,7 @@
 From 32f24560d0602f7735d5e9efd92fe3151bd72cea Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:49:40 +0000
-Subject: [PATCH 08/35] Disable ssp on -nostdlib, -nodefaultlibs and
+Subject: [PATCH 08/34] Disable ssp on -nostdlib, -nodefaultlibs and
 -ffreestanding Change the buffer size.

 ---
@@ -1,7 +1,7 @@
 From c7ec8da7280d7f97f5543eb9ddeca7600aafc43c Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:50:33 +0000
-Subject: [PATCH 09/35] Ensure that msgfmt doesn't encounter problems during
+Subject: [PATCH 09/34] Ensure that msgfmt doesn't encounter problems during
 gcc bootstrapping.

 Solves error messages like the following:
@@ -1,7 +1,7 @@
 From aaa029bcee68298695b7c4278c90b6bc320d098c Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:52:07 +0000
-Subject: [PATCH 10/35] Don't declare asprintf if defined as a macro.
+Subject: [PATCH 10/34] Don't declare asprintf if defined as a macro.

 ---
 include/libiberty.h | 3 +++
@@ -1,7 +1,7 @@
 From 65e01e749205c9af218b01233cebd0077538d0ee Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:53:00 +0000
-Subject: [PATCH 11/35] libiberty: copy PIC objects during build process
+Subject: [PATCH 11/34] libiberty: copy PIC objects during build process

 ---
 libiberty/Makefile.in | 1 +
@@ -1,7 +1,7 @@
 From 453a815bf2844971a91eaef800af188d9e86b784 Mon Sep 17 00:00:00 2001
 From: Szabolcs Nagy <nsz@port70.net>
 Date: Sat, 24 Oct 2015 20:09:53 +0000
-Subject: [PATCH 12/35] libgcc_s
+Subject: [PATCH 12/34] libgcc_s

 ---
 gcc/config/i386/i386-expand.cc | 4 ++--
@@ -1,7 +1,7 @@
 From 7d7d12137c666761a8dd61179c9651b85dae9b41 Mon Sep 17 00:00:00 2001
 From: Szabolcs Nagy <nsz@port70.net>
 Date: Sat, 7 Nov 2015 02:08:05 +0000
-Subject: [PATCH 13/35] nopie
+Subject: [PATCH 13/34] nopie

 ---
 gcc/configure    | 27 +++++++++++++++++++++++++++
@@ -9,22 +9,23 @@ Subject: [PATCH 13/35] nopie
 2 files changed, 40 insertions(+)

 diff --git a/gcc/configure b/gcc/configure
-index 23da7d55d..f38732bb2 100755
+index 8c46369f73f..e59cbee1767 100755
 --- a/gcc/configure
 +++ b/gcc/configure
-@@ -34534,6 +34534,29 @@ rm -f core conftest.err conftest.$ac_objext \
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_no_pie" >&5
+@@ -32268,6 +32268,33 @@ fi
 $as_echo "$gcc_cv_no_pie" >&6; }
-+# Check if -nopie works.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -nopie option" >&5
+ if test "$gcc_cv_no_pie" = "yes"; then
+   NO_PIE_FLAG="-no-pie"
+else
+  # Check if -nopie works.
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -nopie option" >&5
 +$as_echo_n "checking for -nopie option... " >&6; }
-+if ${gcc_cv_nopie+:} false; then :
+if test "${gcc_cv_nopie+set}" = set; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  saved_LDFLAGS="$LDFLAGS"
-+   LDFLAGS="$LDFLAGS -nopie"
-+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+     LDFLAGS="$LDFLAGS -nopie"
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +int main(void) {return 0;}
 +_ACEOF
@@ -35,51 +36,40 @@ index 23da7d55d..f38732bb2 100755
 +fi
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
-+   LDFLAGS="$saved_LDFLAGS"
+     LDFLAGS="$saved_LDFLAGS"
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_nopie" >&5
 +$as_echo "$gcc_cv_nopie" >&6; }
- 
- if test x$enable_host_shared = xyes; then
-   PICFLAG=-fPIC
-@@ -34551,6 +34574,8 @@ if test x$enable_host_pie = xyes; then
-   LD_PICFLAG=-pie
- elif test x$gcc_cv_no_pie = xyes; then
-   LD_PICFLAG=-no-pie
-+elif test x$gcc_cv_nopie = xyes; then
-+  LD_PICFLAG=-nopie
- else
-   LD_PICFLAG=
+  if test "$gcc_cv_nopie" = "yes"; then
+    NO_PIE_FLAG="-nopie"
+  fi
 fi
+ 
+ 
 diff --git a/gcc/configure.ac b/gcc/configure.ac
-index d7cf0b92c..db2e2c802 100644
+index 5504bf6eb01..57268319de1 100644
 --- a/gcc/configure.ac
 +++ b/gcc/configure.ac
-@@ -7781,6 +7781,15 @@ AC_CACHE_CHECK([for -no-pie option],
-      [gcc_cv_no_pie=yes],
-      [gcc_cv_no_pie=no])
+@@ -7552,6 +7552,19 @@ AC_CACHE_CHECK([for -no-pie option],
    LDFLAGS="$saved_LDFLAGS"])
-+# Check if -nopie works.
-+AC_CACHE_CHECK([for -nopie option],
-+  [gcc_cv_nopie],
-+  [saved_LDFLAGS="$LDFLAGS"
-+   LDFLAGS="$LDFLAGS -nopie"
-+   AC_LINK_IFELSE([AC_LANG_SOURCE([int main(void) {return 0;}])],
-+     [gcc_cv_nopie=yes],
-+     [gcc_cv_nopie=no])
-+   LDFLAGS="$saved_LDFLAGS"])
- 
- if test x$enable_host_shared = xyes; then
-   PICFLAG=-fPIC
-@@ -7798,6 +7807,8 @@ if test x$enable_host_pie = xyes; then
-   LD_PICFLAG=-pie
- elif test x$gcc_cv_no_pie = xyes; then
-   LD_PICFLAG=-no-pie
-+elif test x$gcc_cv_nopie = xyes; then
-+  LD_PICFLAG=-nopie
- else
-   LD_PICFLAG=
+ if test "$gcc_cv_no_pie" = "yes"; then
+   NO_PIE_FLAG="-no-pie"
+else
+  # Check if -nopie works.
+  AC_CACHE_CHECK([for -nopie option],
+    [gcc_cv_nopie],
+    [saved_LDFLAGS="$LDFLAGS"
+     LDFLAGS="$LDFLAGS -nopie"
+     AC_LINK_IFELSE([int main(void) {return 0;}],
+       [gcc_cv_nopie=yes],
+       [gcc_cv_nopie=no])
+     LDFLAGS="$saved_LDFLAGS"])
+  if test "$gcc_cv_nopie" = "yes"; then
+    NO_PIE_FLAG="-nopie"
+  fi
 fi
+ AC_SUBST([NO_PIE_FLAG])
+ 
 -- 
 2.41.0

@@ -1,7 +1,7 @@
 From dd5bb97c31a9f57034c70a7a18ba6e2e133084c7 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:59:16 +0000
-Subject: [PATCH 14/35] ada: fix shared linking
+Subject: [PATCH 14/34] ada: fix shared linking

 ---
 gcc/ada/link.c | 12 ++++++------
@@ -1,7 +1,7 @@
 From 6bb5b7d9161d05f31b001d8211a9c63caf63fd2f Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:59:43 +0000
-Subject: [PATCH 15/35] build: fix CXXFLAGS_FOR_BUILD passing
+Subject: [PATCH 15/34] build: fix CXXFLAGS_FOR_BUILD passing

 ---
 Makefile.in | 1 +
@@ -1,7 +1,7 @@
 From f0d9e00cac06689f64b214de7aee80d7116ef084 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 07:01:06 +0000
-Subject: [PATCH 16/35] add fortify-headers paths
+Subject: [PATCH 16/34] add fortify-headers paths

 ---
 gcc/config/linux.h | 2 ++
@@ -1,7 +1,7 @@
 From 857db04f4f1a06e866551b4172fe8f27363f4a92 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
 Date: Fri, 21 Aug 2020 07:03:00 +0000
-Subject: [PATCH 17/35] Alpine musl package provides libssp_nonshared.a. We
+Subject: [PATCH 17/34] Alpine musl package provides libssp_nonshared.a. We
 link to it unconditionally, as otherwise we get link failures if some objects
 are -fstack-protector built and final link happens with -fno-stack-protector.
 This seems to be the common case when bootstrapping gcc, the piepatches do
@@ -1,7 +1,7 @@
 From 5a8347e23ab13912b6edec2c6c6e3a101b017c79 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 07:03:42 +0000
-Subject: [PATCH 18/35] DP: Use --push-state/--pop-state for gold as well when
+Subject: [PATCH 18/34] DP: Use --push-state/--pop-state for gold as well when
 linking libtsan.

 ---
@@ -1,7 +1,7 @@
 From 41d00a2eb0754acf71958808bd17dbebeb517b84 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Thu, 6 Jan 2022 03:12:55 +0000
-Subject: [PATCH 19/35] aarch64: disable multilib support
+Subject: [PATCH 19/34] aarch64: disable multilib support

 multilib is unsupported on Alpine GCC
 ---
@@ -1,7 +1,7 @@
 From 85b42bfbba71616831d14360b16998acb28790fd Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Thu, 6 Jan 2022 03:13:59 +0000
-Subject: [PATCH 20/35] s390x: disable multilib support
+Subject: [PATCH 20/34] s390x: disable multilib support

 multilib is not supported on Alpine GCC at present
 ---
@@ -1,7 +1,7 @@
 From 7b53df284242638e940c0155b6c21e88cea1f55b Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Thu, 6 Jan 2022 03:14:33 +0000
-Subject: [PATCH 21/35] ppc64[le]: disable multilib support
+Subject: [PATCH 21/34] ppc64[le]: disable multilib support

 multilib is not presently supported on Alpine GCC
 ---
@@ -1,7 +1,7 @@
 From 96e7e1e9a899d9bb5fcbdf788bd529d0390c626f Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Thu, 6 Jan 2022 03:14:54 +0000
-Subject: [PATCH 22/35] x86_64: disable multilib support
+Subject: [PATCH 22/34] x86_64: disable multilib support

 multilib is not presently supported on Alpine GCC
 ---
@@ -1,7 +1,7 @@
 From b26224acf342eacb33491f6ea0da1faf73d35715 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
 Date: Mon, 3 Jan 2022 07:14:48 +0100
-Subject: [PATCH 23/35] riscv: disable multilib support
+Subject: [PATCH 23/34] riscv: disable multilib support
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -46,10 +46,10 @@ diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h
 index f8c2c351e5a..8d9881eadeb 100644
 --- a/gcc/config/riscv/linux.h
 +++ b/gcc/config/riscv/linux.h
-@@ -60,11 +60,3 @@ along with GCC; see the file COPYING3.  If not see
- 	%{rdynamic:-export-dynamic} \
- 	-dynamic-linker " GNU_USER_DYNAMIC_LINKER "}} \
-     %{static:-static} %{static-pie:-static -pie --no-dynamic-linker -z text}}"
+@@ -61,11 +61,3 @@ along with GCC; see the file COPYING3.  If not see
+     %{static:-static}}"
+ 
+ #define TARGET_ASM_FILE_END file_end_indicate_exec_stack
 -
 -#define STARTFILE_PREFIX_SPEC 			\
 -   "/lib" XLEN_SPEC "/" ABI_SPEC "/ "		\
@@ -1,7 +1,7 @@
 From a72e0613f79f6b6867819317accb7a714031a08c Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 07:05:41 +0000
-Subject: [PATCH 24/35] always build libgcc_eh.a
+Subject: [PATCH 24/34] always build libgcc_eh.a

 highly inspired by:
  http://landley.net/hg/aboriginal/file/7e0747a665ab/sources/patches/gcc-core-libgcceh.patch
@@ -1,7 +1,7 @@
 From 3ee8cbc1cad261b30d4a7a66d31496d5f243ce2f Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 07:06:30 +0000
-Subject: [PATCH 25/35] ada: libgnarl compatibility for musl
+Subject: [PATCH 25/34] ada: libgnarl compatibility for musl

 ---
 gcc/ada/libgnarl/s-osinte__linux.ads | 11 ------
@@ -1,7 +1,7 @@
 From 3df4788c79c7429b196c7b284af2b4cf9a4b4f8d Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 07:07:48 +0000
-Subject: [PATCH 26/35] ada: musl support fixes
+Subject: [PATCH 26/34] ada: musl support fixes

 ---
 gcc/ada/Makefile.rtl | 10 +++++-----
@@ -41,15 +41,6 @@ index 96306f8cc9a..090b6770ae5 100644
   LIBGNAT_TARGET_PAIRS = \
   a-intnam.ads<libgnarl/a-intnam__linux.ads \
   s-inmaop.adb<libgnarl/s-inmaop__posix.adb \
-@@ -2311,7 +2311,7 @@ ifeq ($(strip $(filter-out aarch64% linux%,$(target_cpu) $(target_os))),)
-   s-intman.adb<libgnarl/s-intman__posix.adb \
-   s-linux.ads<libgnarl/s-linux.ads \
-   $(TRASYM_DWARF_UNIX_PAIRS) \
-  s-tsmona.adb<libgnat/s-tsmona__linux.adb \
-+  s-tsmona.adb<libgnat/s-tsmona.adb \
-   s-mudido.adb<libgnarl/s-mudido__affinity.adb \
-   s-osinte.ads<libgnarl/s-osinte__linux.ads \
-   s-osinte.adb<libgnarl/s-osinte__posix.adb \
@@ -2420,7 +2420,7 @@ ifeq ($(strip $(filter-out %ia64 linux%,$(target_cpu) $(target_os))),)
   s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \
   s-taspri.ads<libgnarl/s-taspri__posix-noaltstack.ads \
@@ -1,7 +1,7 @@
 From 7b50823d8a4131e5a55d2499a0f5a52b3d91eed2 Mon Sep 17 00:00:00 2001
 From: Drew DeVault <sir@cmpwn.com>
 Date: Wed, 9 Dec 2020 07:42:06 +0000
-Subject: [PATCH 27/35] configure: Add --enable-autolink-libatomic, use in
+Subject: [PATCH 27/34] configure: Add --enable-autolink-libatomic, use in
 LINK_GCC_C_SEQUENCE_SPEC [PR81358]

 This fixes issues with RISC-V.
@@ -1,7 +1,7 @@
 From 5bbbd320e54ab5341cfba83e8af98685131caba1 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
 Date: Sun, 29 Aug 2021 12:23:34 +0200
-Subject: [PATCH 28/35] configure: fix detection of atomic builtins in
+Subject: [PATCH 28/34] configure: fix detection of atomic builtins in
 libatomic configure script

 Alpine's --enable-autolink-libatomic (which is enabled for riscv64 by
@@ -1,7 +1,7 @@
 From 430c701a3cefbe09a9c7c8a2f5bbe957f9b2ecb2 Mon Sep 17 00:00:00 2001
 From: Samuel Holland <samuel@sholland.org>
 Date: Thu, 30 Jun 2022 16:44:51 +0000
-Subject: [PATCH 29/35] libstdc++: do not throw exceptions for non-C locales on
+Subject: [PATCH 29/34] libstdc++: do not throw exceptions for non-C locales on
 musl targets

 ---
@@ -1,7 +1,7 @@
 From 05f0043755f341a2ff4f845379327076b3e0203d Mon Sep 17 00:00:00 2001
 From: Mathias LANG <pro.mathias.lang@gmail.com>
 Date: Mon, 17 Jan 2022 03:49:21 +0000
-Subject: [PATCH 30/35] gdc: unconditionally link libgphobos against
+Subject: [PATCH 30/34] gdc: unconditionally link libgphobos against
 libucontext

 ref: alpine/aports#13422
@@ -1,7 +1,7 @@
 From 0b89a74fbf77ae6917f043c79cd03db0d6ef0212 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
 Date: Sat, 16 Jul 2022 09:21:11 +0200
-Subject: [PATCH 31/35] druntime: link against libucontext on all platforms
+Subject: [PATCH 31/34] druntime: link against libucontext on all platforms

 On musl-based Linux distributions, swapcontext etc. are not provided by
 musl but instead by libucontext. Hence, we _always_ need to link against
@@ -1,7 +1,7 @@
 From eeec799f43fbd0bfffc13594585b39d708972511 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
 Date: Tue, 19 Jul 2022 14:54:07 +0200
-Subject: [PATCH 32/35] libgnat: time_t is always 64-bit on musl libc
+Subject: [PATCH 32/34] libgnat: time_t is always 64-bit on musl libc

 ---
 gcc/ada/libgnat/s-parame.ads | 2 +-
@@ -1,7 +1,7 @@
 From b71d21b87e6946c763edad5e420bf22d8a453077 Mon Sep 17 00:00:00 2001
 From: psykose <alice@ayaya.dev>
 Date: Mon, 29 May 2023 15:33:11 +0000
-Subject: [PATCH 33/35] libphobos: do not use LFS64 symbols
+Subject: [PATCH 33/34] libphobos: do not use LFS64 symbols

 musl does not have these since 1.2.4, we can't use the compat interfaces.
 ---
@@ -1,7 +1,7 @@
 From 4bfcb35bc43d3e3b7510620362d7c28d9e4c17ca Mon Sep 17 00:00:00 2001
 From: psykose <alice@ayaya.dev>
 Date: Mon, 10 Jul 2023 23:23:29 +0000
-Subject: [PATCH 34/35] libgo: fix lfs64 use
+Subject: [PATCH 34/34] libgo: fix lfs64 use

 ---
 .../go/internal/syscall/unix/at_largefile.go  |  2 +-
@@ -1,32 +0,0 @@
-From c4f484f465a32e796ae384aa3f90e79fa218b4e9 Mon Sep 17 00:00:00 2001
-From: Jingyun Hua <huajingyun@loongson.cn>
-Date: Mon, 7 Aug 2023 15:25:58 +0800
-Subject: [PATCH] loongarch disable multilib support
-
-Signed-off-by: Jingyun Hua <huajingyun@loongson.cn>
---
- gcc/config/loongarch/t-linux    | 11 +++--------
- 1 file changed, 3 insertions(+), 8 deletions(-)
-
-diff --git a/gcc/config/loongarch/t-linux b/gcc/config/loongarch/t-linux
-index 23e1fb979..c2753abb8 100644
--- a/gcc/config/loongarch/t-linux
-+++ b/gcc/config/loongarch/t-linux
-@@ -21,11 +21,6 @@ MULTIOSDIR_lp64f := ../lib64/f32$(call if_multiarch,:loongarch64-linux-gnuf32)
- MULTIOSDIR_lp64s := ../lib64/sf$(call if_multiarch,:loongarch64-linux-gnusf)
- 
- # Don't define MULTILIB_OSDIRNAMES if multilib is disabled.
-ifeq ($(filter LA_DISABLE_MULTILIB,$(tm_defines)),)
-
-    MULTILIB_OSDIRNAMES = .=$(MULTIOSDIR_$(mlib_default))
-    MULTILIB_OSDIRNAMES += mabi.lp64d=$(MULTIOSDIR_lp64d)
-    MULTILIB_OSDIRNAMES += mabi.lp64f=$(MULTIOSDIR_lp64f)
-    MULTILIB_OSDIRNAMES += mabi.lp64s=$(MULTIOSDIR_lp64s)
-
-endif
-+    MULTILIB_OSDIRNAMES =  mabi.lp64d=../lib
-+    MULTILIB_OSDIRNAMES += mabi.lp64f=../lib
-+    MULTILIB_OSDIRNAMES += mabi.lp64s=../lib
-- 
-2.41.0
-
@@ -24,8 +24,8 @@ CBUILDROOT="/"
 _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"

 pkgname=gcc-aarch64
-pkgver=14.2.0
-# i.e. 13.2.1, must match gcc/BASE-VER
+pkgver=13.1.1_git20230715
+# i.e. 13.1.1, must match gcc/BASE-VER
 _pkgbase="${pkgver%%_git*}"
 # date component from snapshots
 _pkgsnap="${pkgver##*_git}"
@@ -34,7 +34,7 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""

 pkgname=gcc-aarch64
-pkgrel=0
+pkgrel=1
 pkgdesc="Stage2 cross-compiler for aarch64"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -46,7 +46,6 @@ makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-
 subpackages="g++-aarch64:gpp libstdc++-dev-aarch64:libcxx_dev"
 [ "$CHOST" = "$CTARGET" ] && subpackages="gcc-gdb gcc-doc$_target"
 replaces="libstdc++ binutils"
-options="!strip"

 : "${LANG_CXX:=true}"
 : "${LANG_D:=true}"
@@ -144,7 +143,7 @@ case "$CARCH" in
 # GDC hasn't been ported to PowerPC
 # See libphobos/configure.tgt in GCC sources for supported targets
 # riscv fails with: error: static assert  "unimplemented"
-ppc64le|riscv64|loongarch64)	LANG_D=false ;;
+ppc64le|riscv64)	LANG_D=false ;;
 # GDC does currently not work on 32-bit musl architectures.
 # This is a known upstream issue.
 # See: https://github.com/dlang/druntime/pull/3383
@@ -156,7 +155,6 @@ case "$CTARGET_ARCH" in
 arm*)		_libitm=false ;;
 mips*)		_libitm=false ;;
 riscv64)	_libitm=false ;;
-loongarch64)	_libitm=false ;;
 esac

 # Internal libffi fails to build on MIPS at the moment, need to
@@ -164,14 +162,13 @@ esac
 # the internal libffi.
 case "$CTARGET_ARCH" in
 mips*)		LANG_GO=false ;;
-loongarch64)	LANG_GO=false ;;
 esac

 # Fortran uses libquadmath if toolchain has __float128
 # currently on x86, x86_64 and ia64
 _libquadmath=$LANG_FORTRAN
 case "$CTARGET_ARCH" in
-x86 | x86_64)	_libquadmath=$LANG_FORTRAN ;;
+x86 | x86_64 | ppc64le)	_libquadmath=$LANG_FORTRAN ;;
 *)		_libquadmath=false ;;
 esac

@@ -189,11 +186,6 @@ riscv64)
 LANG_ADA=false;;
 esac

-case "$CTARGET_ARCH" in
-loongarch64)
-LANG_ADA=false;;
-esac
-
 _languages=c
 if $LANG_CXX; then
 	_languages="$_languages,c++"
@@ -241,8 +233,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://dev.alpinelinux.org/archive/gcc/${_pkgbase%%.*}-$_pkgsnap/gcc-${_pkgbase%%.*}-$_pkgsnap.tar.xz
 	0001-posix_memalign.patch
 	0002-gcc-poison-system-directories.patch
 	0003-specs-turn-on-Wl-z-now-by-default.patch
@@ -277,16 +268,10 @@ source="https://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$pkgver}/gcc-${_pkg
 	0032-libgnat-time_t-is-always-64-bit-on-musl-libc.patch
 	0033-libphobos-do-not-use-LFS64-symbols.patch
 	0034-libgo-fix-lfs64-use.patch
-	0035-loongarch-disable-multilib-support.patch
 	"

-# secfixes:
-#   13.2.1_git20231014-r0:
-#     - CVE-2023-4039
-
 # we build out-of-tree
-#_gccdir="$srcdir"/gcc-${_pkgbase%%.*}-$_pkgsnap
-_gccdir="$srcdir"/gcc-${_pkgbase:-$pkgver}
+_gccdir="$srcdir"/gcc-${_pkgbase%%.*}-$_pkgsnap
 _gcclibdir="/usr/lib/gcc/$CTARGET/${_pkgbase:-$pkgver}"
 _gcclibexec="/usr/libexec/gcc/$CTARGET/${_pkgbase:-$pkgver}"

@@ -338,7 +323,6 @@ build() {
 	i586-*-*-*)		_arch_configure="--with-arch=pentium-m --with-fpmath=sse --with-tune=generic --enable-cld";;
 	s390x-*-*-*)		_arch_configure="--with-arch=z196 --with-tune=zEC12 --with-zarch --with-long-double-128 --enable-decimal-float";;
 	riscv64-*-*-*)		_arch_configure="--with-arch=rv64gc --with-abi=lp64d --enable-autolink-libatomic";;
-	loongarch64-*-*-*)      _arch_configure="--with-arch=loongarch64 --with-abi=lp64d";;
 	esac

 	case "$CTARGET_ARCH" in
@@ -365,14 +349,7 @@ build() {
 	$_libgomp	|| _bootstrap_configure="$_bootstrap_configure --disable-libgomp"
 	$_libatomic	|| _bootstrap_configure="$_bootstrap_configure --disable-libatomic"
 	$_libitm	|| _bootstrap_configure="$_bootstrap_configure --disable-libitm"
-	if ! $_libquadmath; then
-		_arch_configure="$_arch_configure --disable-libquadmath"
-		# ppc64le needs both --disable-libquadmath{,-support}
-		# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=116007
-		[ "$CARCH" = "ppc64le" ] &&
-			_arch_configure="$_arch_configure
-				--disable-libquadmath-support"
-	fi
+	$_libquadmath	|| _arch_configure="$_arch_configure --disable-libquadmath"

 	msg "Building the following:"
 	echo ""
@@ -450,7 +427,6 @@ package() {
 	make -j1 DESTDIR="$pkgdir" install

 	ln -s gcc "$pkgdir"/usr/bin/cc
-	ln -s ${CTARGET}-gcc "$pkgdir"/usr/bin/${CTARGET}-cc

 	if $LANG_JIT; then
 		make -C "$_builddir"/libgccjit-build/gcc DESTDIR="$pkgdir" jit.install-common
@@ -701,6 +677,10 @@ go() {
 	depends="gcc=$_gccrel libgo=$_gccrel !go"
 	install="$pkgname-go.post-install"

+	# See https://lists.alpinelinux.org/~alpine/devel/%3C33KG0XO61I4IL.2Z7RTAZ5J3SY6%408pit.net%3E
+	provides="go-bootstrap"
+	provider_priority=1 # lowest, see community/go
+
 	mkdir -p "$subpkgdir"/$_gcclibexec \
 		"$subpkgdir"/usr/lib \
 		"$subpkgdir"/usr/bin
@@ -801,40 +781,39 @@ gdb() {
 }

 sha512sums="
-932bdef0cda94bacedf452ab17f103c0cb511ff2cec55e9112fc0328cbf1d803b42595728ea7b200e0a057c03e85626f937012e49a7515bc5dd256b2bf4bc396  gcc-14.2.0.tar.xz
-1ecffba1b07d60e1b4422302b032bbea918b674c8e12b30aa6965b544d700ce86b61e9f7b8d402c6caf59257f491a394dd0912f0948565d6eae9335ee54f3b35  0001-posix_memalign.patch
-1d102a7b17683909dde4d8591dd889149299e77a2b2003cdc0635dc816666be940e41ae534b469485391a9bed183cd5cd337f130e4e1ecb62cb9ad86c4a081db  0002-gcc-poison-system-directories.patch
-3f24bb6a50d3c45b71ea05590e32fe3e69b91377ab185352891d5035c76ed193117c6d0b314a4c364bcf136b9a9dd5c926d6c7c30ab436976c121ebfea8d3ddd  0003-specs-turn-on-Wl-z-now-by-default.patch
-17a2993027d3ddf8595952ebcae425695ddc7b1cf73b384d2e55fddecb9cbf3f6482860a502ff69b14075e12badf27300fd3039f3a9005e851fd8d121d258c2b  0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
-444550e55491ff89fe8cbbb4b73d017c9c147cdce1ad5c0561fe7d6ab3834515a814c7676c408cfeec18e1aaace27b3c26a2ffe4a75042285df5124976c38672  0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
-5a5f57e4e45745bb4d9d63d7d410fe9dd56ce12dbd70c376dd45015909307faf02391e75368e4e7404591614a874cee41b20652cf27be234765d6db97ceb4e7e  0006-Enable-Wformat-and-Wformat-security-by-default.patch
-3a2b22388398a93dae7787e794cd580b9c577326f286241e086120c1fcfdd9228c2e00407088ebb163fb1acc21722c199071343551c989a958dc3c845b15132d  0007-Enable-Wtrampolines-by-default.patch
-7535de1c552544e3a51cbb00b5e08ac59edbf3bdcfce2a63b9f319fada3f3676f47e3a00c75d91bcefd14500555ea0844f18c130ff46b20f416ea76071e5af39  0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
-93d03afd83dee5f7129c36a7b81fa8fd323476507e2f53a4fbe40a026037e7dfafa23591145d7af5848d9a322d212497947a0f58ef828734552e6a6dabd00cfa  0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
-da9eaf2f0ddbec5ee14dc26053936587e6c76fbf16846db804a18cf4d318579426ebcc566aed02daf8e34f60c08b61f5d3959305886dca9bbcdc84db057258d9  0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
-35b9aafe7eee8138cb7aad7164a8f77c15ccdce26843cee78b5871ef91d76cad22ed0871b20f51c4b89b71afd9cfe4ba4227086e158c466558513708fe7d2a1a  0011-libiberty-copy-PIC-objects-during-build-process.patch
-9d43f844fad0ac6e1c35a2b6f461f9278ae09e468f2c9ae8adc43accbe6934994aa10d3a433644d1393a4a76e3caed69e3191db7f3c0c24b4e7a0a0a0cbac3f1  0012-libgcc_s.patch
-91dde3079c1400c124ab5604597f5857185d075809649603aa3641a4581b34029bfcbd4281a5bd925d1c5e6e3b1f5f3322efda34345c6930652d685a6c9525f4  0013-nopie.patch
-0b50ad15115192699efa9fda3d4fb1c2fa95da06d7880ba34615b40c19a8256e1fe364da39f5c70dc22fbccf21db2de5900932afef68948722eeb25e435262f8  0014-ada-fix-shared-linking.patch
-00097c7106625ccf02149a757366f434c48f2abe824bb8b4bf067d29308889cb6039a5e5b2d3bd2683617693b47707d549252c56eea6bc3cdc2450a8d14f46a7  0015-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
-7f0bc42b93a389b614054e700b851abfbc53db391aa10cbdf6990d41396b293af78980bb39f1cf0967184d3fbf3d46ac7c7f096717b8f193ea34cbf7f37d7e91  0016-add-fortify-headers-paths.patch
-0841acbce81250f8cb140a75ff62958dfcab3bed792822baf1fe4193dd62633648343f4b66df886c12338eed88a98e591b968131416460f9f0274046019bb8ef  0017-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
-589d538bdf692559e475e53c79869734dede0eb15228cab9ca901c9db81b0e78a0e532b20dfb05ca584ea19ff4bedd83e139ddca912a26b446c5eb6905180536  0018-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
-2213e07bab6f5d8d3d39c732f5385f46cc8f0c84e35054139fdaf13051252d7bf11f647f54aa8456b532166b008fff0656d8f41278e34ba868dd6fe427427a3a  0019-aarch64-disable-multilib-support.patch
-a9567947471c3ba8a547a79c55e183974554bf823d9a97a165c966d7b3caad8789980e096e3b78452ece5de062bd9bb006af464bbf0c5a35b689eac3ee21e5c5  0020-s390x-disable-multilib-support.patch
-f382eb5f7c2c60c5a23fac587c9629a3059d7be0898e97a1feaf9b9cbe1ef4693cc1177eb29333e8b7944fa17487478e73958be45d5782ccb9ef501961fb9a96  0021-ppc64-le-disable-multilib-support.patch
-44ab86feb8e41e7c2b2e27accdf46194c9b80ee6a39543303dc04824f669d9fad182aabd40c9c7f6c265cf9bb71be830c257be115dc9d701d54eca3aa9ef174e  0022-x86_64-disable-multilib-support.patch
-abf845792433a21fed5dd06167b9f6cf5e8f8026a409acce93824e466c5148e192bf5f404a271931fe4b65283499329bf67bb01019f2f3e02501f20619404e6c  0023-riscv-disable-multilib-support.patch
-ab88a2f63e3545bbc36537aa9a86f2c6c35e41bbf702d6e13743a405cdac4f901eed5737189b780da96647fea9f5d863fdc76373f25a00064106dcb5514d6d87  0024-always-build-libgcc_eh.a.patch
-8fdbe0c8bf4ca60f458a33e59027de03d15ac91933fe46d8ca62119346d20b9bc2447c0bf22bceb63d0cf8613ab61512d9197f4e6c2224af473b63ef9f254295  0025-ada-libgnarl-compatibility-for-musl.patch
-5fd23a506b55c88d4f000e01c539eb25d6da2516949c9d7a1c9ee20f4c6b627e4788541284d9c14c33bafa7cb43ce2e0469dd91006152f00e30815107150320f  0026-ada-musl-support-fixes.patch
-3f9a406d7d2ce34951215ffbcadb49a45e55ad5c24ab9097c0e5e92383e43b876872ccd2a7e7def2833ab204975ee5733f8bcf90934db9fa9c4f6f56c62081f6  0027-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
-720a4001f9a1fa4122e456077ecff8d3eb8af7c83d0a81f9da6a6cca05b23664206a82a349e34482c48bfe40e99aa5f21567613d0913f6a24f282bc84a994496  0028-configure-fix-detection-of-atomic-builtins-in-libato.patch
-2044c23b23726965c0a6fd39f616cc464badd650947cb40495eeabd906a3af629878c1d28b403b8eb46b30a1a0ba39083023290d62f0c99ccf070063226e3f8f  0029-libstdc-do-not-throw-exceptions-for-non-C-locales-on.patch
-58e8415612e1042329ad114471852c19f6bf15bf3bfd7cd81ceeafa75778bcc28410a01071a7c8cbf12b8f549acd85723215772813deedb8f266e28b9e01a353  0030-gdc-unconditionally-link-libgphobos-against-libucont.patch
-d47b559075f40d526235f47b91da1d0cf6bfe6c5b7311bbfe08af9dd6e8f27e6c7cd82e3b2d529aab0536246fc56e2d42c089b22cacb0e7f09ca4a9d07556994  0031-druntime-link-against-libucontext-on-all-platforms.patch
-b325035cb7122d79c6b42ca6d3fc9e02319ed2f7cddb0639dff25d2798d2ce63812cd623462cdf95e21c9ffbf2412193f8b9fc89a4c36fa5a6a041661ac7399d  0032-libgnat-time_t-is-always-64-bit-on-musl-libc.patch
-c474f34e6f9a4239d486a65141a133dbe8ce91427d502a57a9fd6eb403478a2b5715ba74f24c1cc0761e16eec77ba2c1ca921fb7d7bc1e040fc3703fc9559e75  0033-libphobos-do-not-use-LFS64-symbols.patch
-c4482ffc36e7894b2140800159f4cbc9a3e9011e43a69b69f4fa92d5a11e2ee645c7e21df4423dd1e0636e8890849a5719647bfbdf84f951d638f8f488cb718c  0034-libgo-fix-lfs64-use.patch
-65df1d489e8d07a811f39e27fd29e3b2b4164fbc2c5fdc16a5142886d94a96e3fb28ccf4f20dd297ba6540ef8ea1ac3eb65a4279494639bf2f0f8376a3896cc3  0035-loongarch-disable-multilib-support.patch
+942d706e7f8ae8dbc85808e388b9c98de6bd922d49adeca63691218363a4f0b46829509ba1f1ed358ef436e1adf77ad7a820aaeb4bb03a4fc52cfdec118394f3  gcc-13-20230715.tar.xz
+438eda29a1851c72e65422bb4cd129ecc016f06f9bd038288e39762c01b932f786ed4aad587c7b16baf948c342c10dc9beff125166b97e0b8e0d05789aec95ce  0001-posix_memalign.patch
+4a7cd030e107b6e35fb883c80f21a547da14f540f989555ac2c9ba08958ace5b44dca194a96b460415c71f663e885954d73b04ade55f2f9d3cb116f50df8d8ca  0002-gcc-poison-system-directories.patch
+99b194f53677c3a75c3c376160673703f2d759d795ebd9f6e66d5ee095a648eba35d8aef1990a6a1e805c1cc1720636d7c23ef6102b674d92996b1e5646a0b2c  0003-specs-turn-on-Wl-z-now-by-default.patch
+39013ad0b255e9cfd168010eefc32ec4d015fce2c2b4e864341a6aa8bdb74e52a08f0ae83f29e27e9524d4da27f28369a6aa4d76f6aed6490dc2961b18f90e94  0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
+0ef08231bef5c77a38e8deaae4e00675de4312071425cf1db46ee54c3e00d2a5d1658a68302dd495c796d397e61e79efcf4e91fbd8fb2cd2e2fa539c2e884492  0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
+8202e22832141fb12601546cec42472fdb194892f839e9fed86b4ab597204b6e6575c0585c283301eeb598ac1f06d16ce500d9c0ea333444bd50ae2a210d2d76  0006-Enable-Wformat-and-Wformat-security-by-default.patch
+1b239b94b570a0eff2249a9ec7ad150270c3210128f8f8a67e1554a044a039b2acc69768ebc57a15cec661f039c41fb7b620e7ec65320efbce40ceec1c9c6b90  0007-Enable-Wtrampolines-by-default.patch
+eb3ce4df99bf4f22ca4bac2d4e24be4c235098fb67ae118cb8efe360f0441a39a9931076fa615fbc3b7d2b2a541d4ffb2cfc56097224fbd8b5f09bc01a1d7878  0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
+58a5ea76b4f7d662d3165dfeaad258087b0ec58b7ff87a62971c60817388ec6191d6dc841d63696d00fb68fe16b690790f3c0639e0edbd204033b4f8bbb4dafe  0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
+85d60bc6ef5f41854a5bc36847917dcee24bf6663fcd70b78a164a07fc08551f74fe37329b57cf187b95e23a6d04bce2ba620f21ac80c8df7d9cfcc8052089df  0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
+8ef0f45bc0639464537f39319f4954d9a9ab182e14a10c6e39455bebddd24dcdbe6ec3fc0316324a4f9d7dc1f95ec8babd7112c2ff05af54534e0fbe74ff6ebf  0011-libiberty-copy-PIC-objects-during-build-process.patch
+d8467365c19339e52bcf27476b338fb412b6a7dd6eefd4fd92822e67c756a1f04a106f4e0c1c1909b4bee8f5f3b506a98614c1bf3478d7714415cca9eb7257e1  0012-libgcc_s.patch
+cab0cb6c462f2f4abefde020e17199366c6c24ad2582fe7d793c552aa2bcbe3148c5f6cd6245bc9ff86017d949ef4e6f063c8a01ce7d247abfe685077c57e71c  0013-nopie.patch
+b1277a4edc91208fecf5ad7015e8cf237d567b310063f26d14ff39c4aade683e6d1d54d817b7f4fef79db7dc456be9f09a5a8c0ceeff784f839521d0cf243807  0014-ada-fix-shared-linking.patch
+9fa42ba8374b8e47cb3d96315d783c990cf35075354869f5657383908c4d5f143ee94d1f7f86f52140a974f5fc872b22bcaec1f732ebc249357a86ad9e781d4e  0015-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
+05e1e06a6e33958ec5c22b26919fe142153c9605173ad90c770a32d7d48dfb5df421553f3030b6d979f34acbd3614d0e32c86c3cb0b819f3fbaa054f2962ff20  0016-add-fortify-headers-paths.patch
+784d488cf55fafa259d3aa874f4230453b4d3aeb94158d0c96caf26524b8b7f8cea12367a72fa4616389dfcb877c4a1c4fe9d1cb57a67c0329bbad61e91ee423  0017-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
+18c1092273005f4fcaec36830a2cbfbf5e2a2e4e82cf5f7f4f7f3141dbbe2731db2f47a9869f271b4ee337835962c7dfbf009165f2988a14ff40d6c6935986ce  0018-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
+4bbce70032f125002aa857b0561c80e15588847282c2ab2851c3c507a48d22613ef3affb288c33da461688890c7ce265c6175fb1580194669621653788172d1b  0019-aarch64-disable-multilib-support.patch
+d4bf0a7add6d531871324c36004f7d92eea9ad7042d567e43377e5bdde7dce8d87c649c3c4bdf0144b82d2607b46fab4eb821cf9a82ee4eddb003601b331e395  0020-s390x-disable-multilib-support.patch
+e0002f9aea22c923530591f97cfb29953cd924a78b3c7ae5d15ccaae46491c1f40b03a5dc5fc17a286299b82ef48248a9ecbf6eea9bbd2058189a697e9e2ffe8  0021-ppc64-le-disable-multilib-support.patch
+28b6e2f1574611964f8e2effa57dcb6efff5d562ec5f923abfa9ddeaf4a09b0c6941d1406b02d113f950113b7239dcc8dd6b14d06ade3b2f4dbdb7f6d5560bed  0022-x86_64-disable-multilib-support.patch
+6955ea39199f258340b69c8aa7021c65fc15179323f50be08952a302b77cec1a720b99ada60bf2a07594ba536a50b682d06290497fc9d4553c8e11e2f536a606  0023-riscv-disable-multilib-support.patch
+46bfcfc122a29060d6ff1fb52b509251ba44357df67f81be1c274fdfe9b80099b1a5ad64f7d40d8412bb437e6147cb404448b8e067989018bdaf2df5cdfabaef  0024-always-build-libgcc_eh.a.patch
+07b4028c8d8c7b8bc71c0fb4e31669fb2066aefdded556d0a65773fa93db097a55e9bfa9ac9ee10fbc82e4ba21aa84738e91c331b768cf7d067407934fc30064  0025-ada-libgnarl-compatibility-for-musl.patch
+7201a76ac033bd4f7532600d7a975f2aa9f93692cec42e28323e6e8e27f7357e0cb1497c12503829a41ed025e9c7953bf4738ad0d980687a774088fabaf08cdf  0026-ada-musl-support-fixes.patch
+f3974d1a693c0e382fa78ae94ebf768c6a1ca0ee631b478cf52a366537edae373cd0ab31369ef1ae0627d2834bcacfb94c9a4d01505c91eaac9d228a5933d0ae  0027-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
+8f77c3a908ec92966fb1697fd40cc936d4dca2624f6f14b199ba154f8c46be773548a571b41a1cf537134b011e3426deb443e4a13e49fb763c91c821ca1bae63  0028-configure-fix-detection-of-atomic-builtins-in-libato.patch
+8cd10e3d10e3da0505cb4c09c4448335e5bbd18fe6e2c47cfa1257df3d83234983d71b1fdb0b4bfc76b24d477fd6e2d771b8eefacbb61e0ca1df105b980dbd4a  0029-libstdc-do-not-throw-exceptions-for-non-C-locales-on.patch
+e026f1e20b78328b55b92a5fdf8f9d1d761176d2eea90556d7be8e2bae72d0dc52fd482d1eac8ab623e98653ca56d39b18fd2139ff99d420994b10c36f266ca6  0030-gdc-unconditionally-link-libgphobos-against-libucont.patch
+80b41cf68a7e56bef50c05073cc79b9eafbd37535f6360deac16dfe5498ac041aaf91c3cc1bc6e323d574cd1da65aab22df32a03e39f606bff41a103063aafef  0031-druntime-link-against-libucontext-on-all-platforms.patch
+b4917017c45d170c6878c7744c1ecababef4346903ee1f684d5a59d65255a5576d16d40137f7dbfe46144907c6389035966813e9024c9a4f499e963ed533947a  0032-libgnat-time_t-is-always-64-bit-on-musl-libc.patch
+1cc7a5ef067bf543f6c1fa14dedc6378750a43be1649b18605699dffdc1ebce8b88405d3f12dd57e3d821c7d457d861ee0a54138c037917d6365b0bf69526e85  0033-libphobos-do-not-use-LFS64-symbols.patch
+77a1426e316b96b51edef9a35a64565d5f84b94d46a2fd7293ea406ede473b449613969f9e29cae44f8fbfbc767a27cef01b36392cf8ffb3f618c0df4e217c71  0034-libgo-fix-lfs64-use.patch
 "
@@ -1,7 +1,7 @@
 From 47b4bd4deb2c356bb07d2a96f22127aefafec3a4 Mon Sep 17 00:00:00 2001
 From: Szabolcs Nagy <nsz@port70.net>
 Date: Fri, 26 Jan 2018 20:32:50 +0000
-Subject: [PATCH 01/35] posix_memalign
+Subject: [PATCH 01/34] posix_memalign

 ---
 gcc/config/i386/pmm_malloc.h | 9 +++++----
@@ -1,7 +1,7 @@
 From 4fa620d8c3e6730211bfb071eb4c817320491bd0 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Fri, 29 Mar 2013 08:59:00 +0400
-Subject: [PATCH 02/35] gcc: poison-system-directories
+Subject: [PATCH 02/34] gcc: poison-system-directories

 Add /sw/include and /opt/include based on the original
 zecke-no-host-includes.patch patch.  The original patch checked for
@@ -150,13 +150,13 @@ diff --git a/gcc/gcc.cc b/gcc/gcc.cc
 index 16bb07f2cdc..33b56e721d2 100644
 --- a/gcc/gcc.cc
 +++ b/gcc/gcc.cc
-@@ -1177,6 +1187,8 @@ proper position among the other output files.  */
-    "-z now " \
+@@ -1146,6 +1146,8 @@ proper position among the other output files.  */
+    "%{fuse-ld=*:-fuse-ld=%*} " LINK_COMPRESS_DEBUG_SPEC \
    "%X %{o*} %{e*} %{N} %{n} %{r}\
     %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!r:%{!nostartfiles:%S}}} \
 +    %{Wno-poison-system-directories:--no-poison-system-directories} \
 +    %{Werror=poison-system-directories:--error-poison-system-directories} \
-     %{static|no-pie|static-pie:} %@{L*} %(link_libgcc) " \
+     %{static|no-pie|static-pie:} %@{L*} %(mfwrap) %(link_libgcc) " \
     VTABLE_VERIFICATION_SPEC " " SANITIZER_EARLY_SPEC " %o "" \
     %{fopenacc|fopenmp|%:gt(%{ftree-parallelize-loops=*:%*} 1):\
 diff --git a/gcc/incpath.cc b/gcc/incpath.cc
@@ -1,7 +1,7 @@
 From ff4dd4ce33133e675b7bedc86b73357c04631cb9 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:45:49 +0000
-Subject: [PATCH 03/35] specs: turn on -Wl,-z,now by default
+Subject: [PATCH 03/34] specs: turn on -Wl,-z,now by default

 Previously, we also used to turn on -z relro here, but we now build
 binutils with --enable-relro, which is functionally equivalent.
@@ -1,7 +1,7 @@
 From 1b315235433701e4a974da259b8d651169ddc7ac Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:46:22 +0000
-Subject: [PATCH 04/35] Turn on -D_FORTIFY_SOURCE=2 by default for C, C++,
+Subject: [PATCH 04/34] Turn on -D_FORTIFY_SOURCE=2 by default for C, C++,
 ObjC, ObjC++, if the optimization level is > 0

 ---
@@ -1,7 +1,7 @@
 From 67c0f5789630b27149f60ff831999ef7c1dba5d5 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:46:56 +0000
-Subject: [PATCH 05/35] On linux targets pass --as-needed by default to the
+Subject: [PATCH 05/34] On linux targets pass --as-needed by default to the
 linker, but always link the sanitizer libraries with --no-as-needed.

 ---
@@ -1,7 +1,7 @@
 From bb25e8489384504cd59e4a2538720863da1fb29c Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:47:43 +0000
-Subject: [PATCH 06/35] Enable -Wformat and -Wformat-security by default.
+Subject: [PATCH 06/34] Enable -Wformat and -Wformat-security by default.

 ---
 gcc/c-family/c.opt | 4 ++--
@@ -1,7 +1,7 @@
 From 4a728ad48a7b437cc6f2697e26603bf648149f86 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:48:24 +0000
-Subject: [PATCH 07/35] Enable -Wtrampolines by default.
+Subject: [PATCH 07/34] Enable -Wtrampolines by default.

 ---
 gcc/common.opt | 2 +-
@@ -1,7 +1,7 @@
 From 32f24560d0602f7735d5e9efd92fe3151bd72cea Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:49:40 +0000
-Subject: [PATCH 08/35] Disable ssp on -nostdlib, -nodefaultlibs and
+Subject: [PATCH 08/34] Disable ssp on -nostdlib, -nodefaultlibs and
 -ffreestanding Change the buffer size.

 ---
@@ -1,7 +1,7 @@
 From c7ec8da7280d7f97f5543eb9ddeca7600aafc43c Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:50:33 +0000
-Subject: [PATCH 09/35] Ensure that msgfmt doesn't encounter problems during
+Subject: [PATCH 09/34] Ensure that msgfmt doesn't encounter problems during
 gcc bootstrapping.

 Solves error messages like the following:
@@ -1,7 +1,7 @@
 From aaa029bcee68298695b7c4278c90b6bc320d098c Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:52:07 +0000
-Subject: [PATCH 10/35] Don't declare asprintf if defined as a macro.
+Subject: [PATCH 10/34] Don't declare asprintf if defined as a macro.

 ---
 include/libiberty.h | 3 +++
@@ -1,7 +1,7 @@
 From 65e01e749205c9af218b01233cebd0077538d0ee Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:53:00 +0000
-Subject: [PATCH 11/35] libiberty: copy PIC objects during build process
+Subject: [PATCH 11/34] libiberty: copy PIC objects during build process

 ---
 libiberty/Makefile.in | 1 +
@@ -1,7 +1,7 @@
 From 453a815bf2844971a91eaef800af188d9e86b784 Mon Sep 17 00:00:00 2001
 From: Szabolcs Nagy <nsz@port70.net>
 Date: Sat, 24 Oct 2015 20:09:53 +0000
-Subject: [PATCH 12/35] libgcc_s
+Subject: [PATCH 12/34] libgcc_s

 ---
 gcc/config/i386/i386-expand.cc | 4 ++--
@@ -1,7 +1,7 @@
 From 7d7d12137c666761a8dd61179c9651b85dae9b41 Mon Sep 17 00:00:00 2001
 From: Szabolcs Nagy <nsz@port70.net>
 Date: Sat, 7 Nov 2015 02:08:05 +0000
-Subject: [PATCH 13/35] nopie
+Subject: [PATCH 13/34] nopie

 ---
 gcc/configure    | 27 +++++++++++++++++++++++++++
@@ -9,22 +9,23 @@ Subject: [PATCH 13/35] nopie
 2 files changed, 40 insertions(+)

 diff --git a/gcc/configure b/gcc/configure
-index 23da7d55d..f38732bb2 100755
+index 8c46369f73f..e59cbee1767 100755
 --- a/gcc/configure
 +++ b/gcc/configure
-@@ -34534,6 +34534,29 @@ rm -f core conftest.err conftest.$ac_objext \
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_no_pie" >&5
+@@ -32268,6 +32268,33 @@ fi
 $as_echo "$gcc_cv_no_pie" >&6; }
-+# Check if -nopie works.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -nopie option" >&5
+ if test "$gcc_cv_no_pie" = "yes"; then
+   NO_PIE_FLAG="-no-pie"
+else
+  # Check if -nopie works.
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -nopie option" >&5
 +$as_echo_n "checking for -nopie option... " >&6; }
-+if ${gcc_cv_nopie+:} false; then :
+if test "${gcc_cv_nopie+set}" = set; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  saved_LDFLAGS="$LDFLAGS"
-+   LDFLAGS="$LDFLAGS -nopie"
-+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+     LDFLAGS="$LDFLAGS -nopie"
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +int main(void) {return 0;}
 +_ACEOF
@@ -35,51 +36,40 @@ index 23da7d55d..f38732bb2 100755
 +fi
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
-+   LDFLAGS="$saved_LDFLAGS"
+     LDFLAGS="$saved_LDFLAGS"
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_nopie" >&5
 +$as_echo "$gcc_cv_nopie" >&6; }
- 
- if test x$enable_host_shared = xyes; then
-   PICFLAG=-fPIC
-@@ -34551,6 +34574,8 @@ if test x$enable_host_pie = xyes; then
-   LD_PICFLAG=-pie
- elif test x$gcc_cv_no_pie = xyes; then
-   LD_PICFLAG=-no-pie
-+elif test x$gcc_cv_nopie = xyes; then
-+  LD_PICFLAG=-nopie
- else
-   LD_PICFLAG=
+  if test "$gcc_cv_nopie" = "yes"; then
+    NO_PIE_FLAG="-nopie"
+  fi
 fi
+ 
+ 
 diff --git a/gcc/configure.ac b/gcc/configure.ac
-index d7cf0b92c..db2e2c802 100644
+index 5504bf6eb01..57268319de1 100644
 --- a/gcc/configure.ac
 +++ b/gcc/configure.ac
-@@ -7781,6 +7781,15 @@ AC_CACHE_CHECK([for -no-pie option],
-      [gcc_cv_no_pie=yes],
-      [gcc_cv_no_pie=no])
+@@ -7552,6 +7552,19 @@ AC_CACHE_CHECK([for -no-pie option],
    LDFLAGS="$saved_LDFLAGS"])
-+# Check if -nopie works.
-+AC_CACHE_CHECK([for -nopie option],
-+  [gcc_cv_nopie],
-+  [saved_LDFLAGS="$LDFLAGS"
-+   LDFLAGS="$LDFLAGS -nopie"
-+   AC_LINK_IFELSE([AC_LANG_SOURCE([int main(void) {return 0;}])],
-+     [gcc_cv_nopie=yes],
-+     [gcc_cv_nopie=no])
-+   LDFLAGS="$saved_LDFLAGS"])
- 
- if test x$enable_host_shared = xyes; then
-   PICFLAG=-fPIC
-@@ -7798,6 +7807,8 @@ if test x$enable_host_pie = xyes; then
-   LD_PICFLAG=-pie
- elif test x$gcc_cv_no_pie = xyes; then
-   LD_PICFLAG=-no-pie
-+elif test x$gcc_cv_nopie = xyes; then
-+  LD_PICFLAG=-nopie
- else
-   LD_PICFLAG=
+ if test "$gcc_cv_no_pie" = "yes"; then
+   NO_PIE_FLAG="-no-pie"
+else
+  # Check if -nopie works.
+  AC_CACHE_CHECK([for -nopie option],
+    [gcc_cv_nopie],
+    [saved_LDFLAGS="$LDFLAGS"
+     LDFLAGS="$LDFLAGS -nopie"
+     AC_LINK_IFELSE([int main(void) {return 0;}],
+       [gcc_cv_nopie=yes],
+       [gcc_cv_nopie=no])
+     LDFLAGS="$saved_LDFLAGS"])
+  if test "$gcc_cv_nopie" = "yes"; then
+    NO_PIE_FLAG="-nopie"
+  fi
 fi
+ AC_SUBST([NO_PIE_FLAG])
+ 
 -- 
 2.41.0

@@ -1,7 +1,7 @@
 From dd5bb97c31a9f57034c70a7a18ba6e2e133084c7 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:59:16 +0000
-Subject: [PATCH 14/35] ada: fix shared linking
+Subject: [PATCH 14/34] ada: fix shared linking

 ---
 gcc/ada/link.c | 12 ++++++------
@@ -1,7 +1,7 @@
 From 6bb5b7d9161d05f31b001d8211a9c63caf63fd2f Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:59:43 +0000
-Subject: [PATCH 15/35] build: fix CXXFLAGS_FOR_BUILD passing
+Subject: [PATCH 15/34] build: fix CXXFLAGS_FOR_BUILD passing

 ---
 Makefile.in | 1 +
@@ -1,7 +1,7 @@
 From f0d9e00cac06689f64b214de7aee80d7116ef084 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 07:01:06 +0000
-Subject: [PATCH 16/35] add fortify-headers paths
+Subject: [PATCH 16/34] add fortify-headers paths

 ---
 gcc/config/linux.h | 2 ++
@@ -1,7 +1,7 @@
 From 857db04f4f1a06e866551b4172fe8f27363f4a92 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
 Date: Fri, 21 Aug 2020 07:03:00 +0000
-Subject: [PATCH 17/35] Alpine musl package provides libssp_nonshared.a. We
+Subject: [PATCH 17/34] Alpine musl package provides libssp_nonshared.a. We
 link to it unconditionally, as otherwise we get link failures if some objects
 are -fstack-protector built and final link happens with -fno-stack-protector.
 This seems to be the common case when bootstrapping gcc, the piepatches do
@@ -1,7 +1,7 @@
 From 5a8347e23ab13912b6edec2c6c6e3a101b017c79 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 07:03:42 +0000
-Subject: [PATCH 18/35] DP: Use --push-state/--pop-state for gold as well when
+Subject: [PATCH 18/34] DP: Use --push-state/--pop-state for gold as well when
 linking libtsan.

 ---
@@ -1,7 +1,7 @@
 From 41d00a2eb0754acf71958808bd17dbebeb517b84 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Thu, 6 Jan 2022 03:12:55 +0000
-Subject: [PATCH 19/35] aarch64: disable multilib support
+Subject: [PATCH 19/34] aarch64: disable multilib support

 multilib is unsupported on Alpine GCC
 ---
@@ -1,7 +1,7 @@
 From 85b42bfbba71616831d14360b16998acb28790fd Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Thu, 6 Jan 2022 03:13:59 +0000
-Subject: [PATCH 20/35] s390x: disable multilib support
+Subject: [PATCH 20/34] s390x: disable multilib support

 multilib is not supported on Alpine GCC at present
 ---
@@ -1,7 +1,7 @@
 From 7b53df284242638e940c0155b6c21e88cea1f55b Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Thu, 6 Jan 2022 03:14:33 +0000
-Subject: [PATCH 21/35] ppc64[le]: disable multilib support
+Subject: [PATCH 21/34] ppc64[le]: disable multilib support

 multilib is not presently supported on Alpine GCC
 ---
@@ -1,7 +1,7 @@
 From 96e7e1e9a899d9bb5fcbdf788bd529d0390c626f Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Thu, 6 Jan 2022 03:14:54 +0000
-Subject: [PATCH 22/35] x86_64: disable multilib support
+Subject: [PATCH 22/34] x86_64: disable multilib support

 multilib is not presently supported on Alpine GCC
 ---
@@ -1,7 +1,7 @@
 From b26224acf342eacb33491f6ea0da1faf73d35715 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
 Date: Mon, 3 Jan 2022 07:14:48 +0100
-Subject: [PATCH 23/35] riscv: disable multilib support
+Subject: [PATCH 23/34] riscv: disable multilib support
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -46,10 +46,10 @@ diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h
 index f8c2c351e5a..8d9881eadeb 100644
 --- a/gcc/config/riscv/linux.h
 +++ b/gcc/config/riscv/linux.h
-@@ -60,11 +60,3 @@ along with GCC; see the file COPYING3.  If not see
- 	%{rdynamic:-export-dynamic} \
- 	-dynamic-linker " GNU_USER_DYNAMIC_LINKER "}} \
-     %{static:-static} %{static-pie:-static -pie --no-dynamic-linker -z text}}"
+@@ -61,11 +61,3 @@ along with GCC; see the file COPYING3.  If not see
+     %{static:-static}}"
+ 
+ #define TARGET_ASM_FILE_END file_end_indicate_exec_stack
 -
 -#define STARTFILE_PREFIX_SPEC 			\
 -   "/lib" XLEN_SPEC "/" ABI_SPEC "/ "		\
@@ -1,7 +1,7 @@
 From a72e0613f79f6b6867819317accb7a714031a08c Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 07:05:41 +0000
-Subject: [PATCH 24/35] always build libgcc_eh.a
+Subject: [PATCH 24/34] always build libgcc_eh.a

 highly inspired by:
  http://landley.net/hg/aboriginal/file/7e0747a665ab/sources/patches/gcc-core-libgcceh.patch
@@ -1,7 +1,7 @@
 From 3ee8cbc1cad261b30d4a7a66d31496d5f243ce2f Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 07:06:30 +0000
-Subject: [PATCH 25/35] ada: libgnarl compatibility for musl
+Subject: [PATCH 25/34] ada: libgnarl compatibility for musl

 ---
 gcc/ada/libgnarl/s-osinte__linux.ads | 11 ------
@@ -1,7 +1,7 @@
 From 3df4788c79c7429b196c7b284af2b4cf9a4b4f8d Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 07:07:48 +0000
-Subject: [PATCH 26/35] ada: musl support fixes
+Subject: [PATCH 26/34] ada: musl support fixes

 ---
 gcc/ada/Makefile.rtl | 10 +++++-----
@@ -41,15 +41,6 @@ index 96306f8cc9a..090b6770ae5 100644
   LIBGNAT_TARGET_PAIRS = \
   a-intnam.ads<libgnarl/a-intnam__linux.ads \
   s-inmaop.adb<libgnarl/s-inmaop__posix.adb \
-@@ -2311,7 +2311,7 @@ ifeq ($(strip $(filter-out aarch64% linux%,$(target_cpu) $(target_os))),)
-   s-intman.adb<libgnarl/s-intman__posix.adb \
-   s-linux.ads<libgnarl/s-linux.ads \
-   $(TRASYM_DWARF_UNIX_PAIRS) \
-  s-tsmona.adb<libgnat/s-tsmona__linux.adb \
-+  s-tsmona.adb<libgnat/s-tsmona.adb \
-   s-mudido.adb<libgnarl/s-mudido__affinity.adb \
-   s-osinte.ads<libgnarl/s-osinte__linux.ads \
-   s-osinte.adb<libgnarl/s-osinte__posix.adb \
@@ -2420,7 +2420,7 @@ ifeq ($(strip $(filter-out %ia64 linux%,$(target_cpu) $(target_os))),)
   s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \
   s-taspri.ads<libgnarl/s-taspri__posix-noaltstack.ads \
@@ -1,7 +1,7 @@
 From 7b50823d8a4131e5a55d2499a0f5a52b3d91eed2 Mon Sep 17 00:00:00 2001
 From: Drew DeVault <sir@cmpwn.com>
 Date: Wed, 9 Dec 2020 07:42:06 +0000
-Subject: [PATCH 27/35] configure: Add --enable-autolink-libatomic, use in
+Subject: [PATCH 27/34] configure: Add --enable-autolink-libatomic, use in
 LINK_GCC_C_SEQUENCE_SPEC [PR81358]

 This fixes issues with RISC-V.
@@ -1,7 +1,7 @@
 From 5bbbd320e54ab5341cfba83e8af98685131caba1 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
 Date: Sun, 29 Aug 2021 12:23:34 +0200
-Subject: [PATCH 28/35] configure: fix detection of atomic builtins in
+Subject: [PATCH 28/34] configure: fix detection of atomic builtins in
 libatomic configure script

 Alpine's --enable-autolink-libatomic (which is enabled for riscv64 by
@@ -1,7 +1,7 @@
 From 430c701a3cefbe09a9c7c8a2f5bbe957f9b2ecb2 Mon Sep 17 00:00:00 2001
 From: Samuel Holland <samuel@sholland.org>
 Date: Thu, 30 Jun 2022 16:44:51 +0000
-Subject: [PATCH 29/35] libstdc++: do not throw exceptions for non-C locales on
+Subject: [PATCH 29/34] libstdc++: do not throw exceptions for non-C locales on
 musl targets

 ---
@@ -1,7 +1,7 @@
 From 05f0043755f341a2ff4f845379327076b3e0203d Mon Sep 17 00:00:00 2001
 From: Mathias LANG <pro.mathias.lang@gmail.com>
 Date: Mon, 17 Jan 2022 03:49:21 +0000
-Subject: [PATCH 30/35] gdc: unconditionally link libgphobos against
+Subject: [PATCH 30/34] gdc: unconditionally link libgphobos against
 libucontext

 ref: alpine/aports#13422
@@ -1,7 +1,7 @@
 From 0b89a74fbf77ae6917f043c79cd03db0d6ef0212 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
 Date: Sat, 16 Jul 2022 09:21:11 +0200
-Subject: [PATCH 31/35] druntime: link against libucontext on all platforms
+Subject: [PATCH 31/34] druntime: link against libucontext on all platforms

 On musl-based Linux distributions, swapcontext etc. are not provided by
 musl but instead by libucontext. Hence, we _always_ need to link against
@@ -1,7 +1,7 @@
 From eeec799f43fbd0bfffc13594585b39d708972511 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
 Date: Tue, 19 Jul 2022 14:54:07 +0200
-Subject: [PATCH 32/35] libgnat: time_t is always 64-bit on musl libc
+Subject: [PATCH 32/34] libgnat: time_t is always 64-bit on musl libc

 ---
 gcc/ada/libgnat/s-parame.ads | 2 +-
@@ -1,7 +1,7 @@
 From b71d21b87e6946c763edad5e420bf22d8a453077 Mon Sep 17 00:00:00 2001
 From: psykose <alice@ayaya.dev>
 Date: Mon, 29 May 2023 15:33:11 +0000
-Subject: [PATCH 33/35] libphobos: do not use LFS64 symbols
+Subject: [PATCH 33/34] libphobos: do not use LFS64 symbols

 musl does not have these since 1.2.4, we can't use the compat interfaces.
 ---
@@ -1,7 +1,7 @@
 From 4bfcb35bc43d3e3b7510620362d7c28d9e4c17ca Mon Sep 17 00:00:00 2001
 From: psykose <alice@ayaya.dev>
 Date: Mon, 10 Jul 2023 23:23:29 +0000
-Subject: [PATCH 34/35] libgo: fix lfs64 use
+Subject: [PATCH 34/34] libgo: fix lfs64 use

 ---
 .../go/internal/syscall/unix/at_largefile.go  |  2 +-
@@ -1,32 +0,0 @@
-From c4f484f465a32e796ae384aa3f90e79fa218b4e9 Mon Sep 17 00:00:00 2001
-From: Jingyun Hua <huajingyun@loongson.cn>
-Date: Mon, 7 Aug 2023 15:25:58 +0800
-Subject: [PATCH] loongarch disable multilib support
-
-Signed-off-by: Jingyun Hua <huajingyun@loongson.cn>
---
- gcc/config/loongarch/t-linux    | 11 +++--------
- 1 file changed, 3 insertions(+), 8 deletions(-)
-
-diff --git a/gcc/config/loongarch/t-linux b/gcc/config/loongarch/t-linux
-index 23e1fb979..c2753abb8 100644
--- a/gcc/config/loongarch/t-linux
-+++ b/gcc/config/loongarch/t-linux
-@@ -21,11 +21,6 @@ MULTIOSDIR_lp64f := ../lib64/f32$(call if_multiarch,:loongarch64-linux-gnuf32)
- MULTIOSDIR_lp64s := ../lib64/sf$(call if_multiarch,:loongarch64-linux-gnusf)
- 
- # Don't define MULTILIB_OSDIRNAMES if multilib is disabled.
-ifeq ($(filter LA_DISABLE_MULTILIB,$(tm_defines)),)
-
-    MULTILIB_OSDIRNAMES = .=$(MULTIOSDIR_$(mlib_default))
-    MULTILIB_OSDIRNAMES += mabi.lp64d=$(MULTIOSDIR_lp64d)
-    MULTILIB_OSDIRNAMES += mabi.lp64f=$(MULTIOSDIR_lp64f)
-    MULTILIB_OSDIRNAMES += mabi.lp64s=$(MULTIOSDIR_lp64s)
-
-endif
-+    MULTILIB_OSDIRNAMES =  mabi.lp64d=../lib
-+    MULTILIB_OSDIRNAMES += mabi.lp64f=../lib
-+    MULTILIB_OSDIRNAMES += mabi.lp64s=../lib
-- 
-2.41.0
-
@@ -24,8 +24,8 @@ CBUILDROOT="/"
 _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"

 pkgname=gcc-armhf
-pkgver=14.2.0
-# i.e. 13.2.1, must match gcc/BASE-VER
+pkgver=13.1.1_git20230715
+# i.e. 13.1.1, must match gcc/BASE-VER
 _pkgbase="${pkgver%%_git*}"
 # date component from snapshots
 _pkgsnap="${pkgver##*_git}"
@@ -34,7 +34,7 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""

 pkgname=gcc-armhf
-pkgrel=0
+pkgrel=1
 pkgdesc="Stage2 cross-compiler for armhf"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -46,7 +46,6 @@ makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-
 subpackages="g++-armhf:gpp libstdc++-dev-armhf:libcxx_dev"
 [ "$CHOST" = "$CTARGET" ] && subpackages="gcc-gdb gcc-doc$_target"
 replaces="libstdc++ binutils"
-options="!strip"

 : "${LANG_CXX:=true}"
 : "${LANG_D:=true}"
@@ -144,7 +143,7 @@ case "$CARCH" in
 # GDC hasn't been ported to PowerPC
 # See libphobos/configure.tgt in GCC sources for supported targets
 # riscv fails with: error: static assert  "unimplemented"
-ppc64le|riscv64|loongarch64)	LANG_D=false ;;
+ppc64le|riscv64)	LANG_D=false ;;
 # GDC does currently not work on 32-bit musl architectures.
 # This is a known upstream issue.
 # See: https://github.com/dlang/druntime/pull/3383
@@ -156,7 +155,6 @@ case "$CTARGET_ARCH" in
 arm*)		_libitm=false ;;
 mips*)		_libitm=false ;;
 riscv64)	_libitm=false ;;
-loongarch64)	_libitm=false ;;
 esac

 # Internal libffi fails to build on MIPS at the moment, need to
@@ -164,14 +162,13 @@ esac
 # the internal libffi.
 case "$CTARGET_ARCH" in
 mips*)		LANG_GO=false ;;
-loongarch64)	LANG_GO=false ;;
 esac

 # Fortran uses libquadmath if toolchain has __float128
 # currently on x86, x86_64 and ia64
 _libquadmath=$LANG_FORTRAN
 case "$CTARGET_ARCH" in
-x86 | x86_64)	_libquadmath=$LANG_FORTRAN ;;
+x86 | x86_64 | ppc64le)	_libquadmath=$LANG_FORTRAN ;;
 *)		_libquadmath=false ;;
 esac

@@ -189,11 +186,6 @@ riscv64)
 LANG_ADA=false;;
 esac

-case "$CTARGET_ARCH" in
-loongarch64)
-LANG_ADA=false;;
-esac
-
 _languages=c
 if $LANG_CXX; then
 	_languages="$_languages,c++"
@@ -241,8 +233,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://dev.alpinelinux.org/archive/gcc/${_pkgbase%%.*}-$_pkgsnap/gcc-${_pkgbase%%.*}-$_pkgsnap.tar.xz
 	0001-posix_memalign.patch
 	0002-gcc-poison-system-directories.patch
 	0003-specs-turn-on-Wl-z-now-by-default.patch
@@ -277,16 +268,10 @@ source="https://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$pkgver}/gcc-${_pkg
 	0032-libgnat-time_t-is-always-64-bit-on-musl-libc.patch
 	0033-libphobos-do-not-use-LFS64-symbols.patch
 	0034-libgo-fix-lfs64-use.patch
-	0035-loongarch-disable-multilib-support.patch
 	"

-# secfixes:
-#   13.2.1_git20231014-r0:
-#     - CVE-2023-4039
-
 # we build out-of-tree
-#_gccdir="$srcdir"/gcc-${_pkgbase%%.*}-$_pkgsnap
-_gccdir="$srcdir"/gcc-${_pkgbase:-$pkgver}
+_gccdir="$srcdir"/gcc-${_pkgbase%%.*}-$_pkgsnap
 _gcclibdir="/usr/lib/gcc/$CTARGET/${_pkgbase:-$pkgver}"
 _gcclibexec="/usr/libexec/gcc/$CTARGET/${_pkgbase:-$pkgver}"

@@ -338,7 +323,6 @@ build() {
 	i586-*-*-*)		_arch_configure="--with-arch=pentium-m --with-fpmath=sse --with-tune=generic --enable-cld";;
 	s390x-*-*-*)		_arch_configure="--with-arch=z196 --with-tune=zEC12 --with-zarch --with-long-double-128 --enable-decimal-float";;
 	riscv64-*-*-*)		_arch_configure="--with-arch=rv64gc --with-abi=lp64d --enable-autolink-libatomic";;
-	loongarch64-*-*-*)      _arch_configure="--with-arch=loongarch64 --with-abi=lp64d";;
 	esac

 	case "$CTARGET_ARCH" in
@@ -365,14 +349,7 @@ build() {
 	$_libgomp	|| _bootstrap_configure="$_bootstrap_configure --disable-libgomp"
 	$_libatomic	|| _bootstrap_configure="$_bootstrap_configure --disable-libatomic"
 	$_libitm	|| _bootstrap_configure="$_bootstrap_configure --disable-libitm"
-	if ! $_libquadmath; then
-		_arch_configure="$_arch_configure --disable-libquadmath"
-		# ppc64le needs both --disable-libquadmath{,-support}
-		# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=116007
-		[ "$CARCH" = "ppc64le" ] &&
-			_arch_configure="$_arch_configure
-				--disable-libquadmath-support"
-	fi
+	$_libquadmath	|| _arch_configure="$_arch_configure --disable-libquadmath"

 	msg "Building the following:"
 	echo ""
@@ -450,7 +427,6 @@ package() {
 	make -j1 DESTDIR="$pkgdir" install

 	ln -s gcc "$pkgdir"/usr/bin/cc
-	ln -s ${CTARGET}-gcc "$pkgdir"/usr/bin/${CTARGET}-cc

 	if $LANG_JIT; then
 		make -C "$_builddir"/libgccjit-build/gcc DESTDIR="$pkgdir" jit.install-common
@@ -701,6 +677,10 @@ go() {
 	depends="gcc=$_gccrel libgo=$_gccrel !go"
 	install="$pkgname-go.post-install"

+	# See https://lists.alpinelinux.org/~alpine/devel/%3C33KG0XO61I4IL.2Z7RTAZ5J3SY6%408pit.net%3E
+	provides="go-bootstrap"
+	provider_priority=1 # lowest, see community/go
+
 	mkdir -p "$subpkgdir"/$_gcclibexec \
 		"$subpkgdir"/usr/lib \
 		"$subpkgdir"/usr/bin
@@ -801,40 +781,39 @@ gdb() {
 }

 sha512sums="
-932bdef0cda94bacedf452ab17f103c0cb511ff2cec55e9112fc0328cbf1d803b42595728ea7b200e0a057c03e85626f937012e49a7515bc5dd256b2bf4bc396  gcc-14.2.0.tar.xz
-1ecffba1b07d60e1b4422302b032bbea918b674c8e12b30aa6965b544d700ce86b61e9f7b8d402c6caf59257f491a394dd0912f0948565d6eae9335ee54f3b35  0001-posix_memalign.patch
-1d102a7b17683909dde4d8591dd889149299e77a2b2003cdc0635dc816666be940e41ae534b469485391a9bed183cd5cd337f130e4e1ecb62cb9ad86c4a081db  0002-gcc-poison-system-directories.patch
-3f24bb6a50d3c45b71ea05590e32fe3e69b91377ab185352891d5035c76ed193117c6d0b314a4c364bcf136b9a9dd5c926d6c7c30ab436976c121ebfea8d3ddd  0003-specs-turn-on-Wl-z-now-by-default.patch
-17a2993027d3ddf8595952ebcae425695ddc7b1cf73b384d2e55fddecb9cbf3f6482860a502ff69b14075e12badf27300fd3039f3a9005e851fd8d121d258c2b  0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
-444550e55491ff89fe8cbbb4b73d017c9c147cdce1ad5c0561fe7d6ab3834515a814c7676c408cfeec18e1aaace27b3c26a2ffe4a75042285df5124976c38672  0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
-5a5f57e4e45745bb4d9d63d7d410fe9dd56ce12dbd70c376dd45015909307faf02391e75368e4e7404591614a874cee41b20652cf27be234765d6db97ceb4e7e  0006-Enable-Wformat-and-Wformat-security-by-default.patch
-3a2b22388398a93dae7787e794cd580b9c577326f286241e086120c1fcfdd9228c2e00407088ebb163fb1acc21722c199071343551c989a958dc3c845b15132d  0007-Enable-Wtrampolines-by-default.patch
-7535de1c552544e3a51cbb00b5e08ac59edbf3bdcfce2a63b9f319fada3f3676f47e3a00c75d91bcefd14500555ea0844f18c130ff46b20f416ea76071e5af39  0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
-93d03afd83dee5f7129c36a7b81fa8fd323476507e2f53a4fbe40a026037e7dfafa23591145d7af5848d9a322d212497947a0f58ef828734552e6a6dabd00cfa  0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
-da9eaf2f0ddbec5ee14dc26053936587e6c76fbf16846db804a18cf4d318579426ebcc566aed02daf8e34f60c08b61f5d3959305886dca9bbcdc84db057258d9  0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
-35b9aafe7eee8138cb7aad7164a8f77c15ccdce26843cee78b5871ef91d76cad22ed0871b20f51c4b89b71afd9cfe4ba4227086e158c466558513708fe7d2a1a  0011-libiberty-copy-PIC-objects-during-build-process.patch
-9d43f844fad0ac6e1c35a2b6f461f9278ae09e468f2c9ae8adc43accbe6934994aa10d3a433644d1393a4a76e3caed69e3191db7f3c0c24b4e7a0a0a0cbac3f1  0012-libgcc_s.patch
-91dde3079c1400c124ab5604597f5857185d075809649603aa3641a4581b34029bfcbd4281a5bd925d1c5e6e3b1f5f3322efda34345c6930652d685a6c9525f4  0013-nopie.patch
-0b50ad15115192699efa9fda3d4fb1c2fa95da06d7880ba34615b40c19a8256e1fe364da39f5c70dc22fbccf21db2de5900932afef68948722eeb25e435262f8  0014-ada-fix-shared-linking.patch
-00097c7106625ccf02149a757366f434c48f2abe824bb8b4bf067d29308889cb6039a5e5b2d3bd2683617693b47707d549252c56eea6bc3cdc2450a8d14f46a7  0015-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
-7f0bc42b93a389b614054e700b851abfbc53db391aa10cbdf6990d41396b293af78980bb39f1cf0967184d3fbf3d46ac7c7f096717b8f193ea34cbf7f37d7e91  0016-add-fortify-headers-paths.patch
-0841acbce81250f8cb140a75ff62958dfcab3bed792822baf1fe4193dd62633648343f4b66df886c12338eed88a98e591b968131416460f9f0274046019bb8ef  0017-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
-589d538bdf692559e475e53c79869734dede0eb15228cab9ca901c9db81b0e78a0e532b20dfb05ca584ea19ff4bedd83e139ddca912a26b446c5eb6905180536  0018-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
-2213e07bab6f5d8d3d39c732f5385f46cc8f0c84e35054139fdaf13051252d7bf11f647f54aa8456b532166b008fff0656d8f41278e34ba868dd6fe427427a3a  0019-aarch64-disable-multilib-support.patch
-a9567947471c3ba8a547a79c55e183974554bf823d9a97a165c966d7b3caad8789980e096e3b78452ece5de062bd9bb006af464bbf0c5a35b689eac3ee21e5c5  0020-s390x-disable-multilib-support.patch
-f382eb5f7c2c60c5a23fac587c9629a3059d7be0898e97a1feaf9b9cbe1ef4693cc1177eb29333e8b7944fa17487478e73958be45d5782ccb9ef501961fb9a96  0021-ppc64-le-disable-multilib-support.patch
-44ab86feb8e41e7c2b2e27accdf46194c9b80ee6a39543303dc04824f669d9fad182aabd40c9c7f6c265cf9bb71be830c257be115dc9d701d54eca3aa9ef174e  0022-x86_64-disable-multilib-support.patch
-abf845792433a21fed5dd06167b9f6cf5e8f8026a409acce93824e466c5148e192bf5f404a271931fe4b65283499329bf67bb01019f2f3e02501f20619404e6c  0023-riscv-disable-multilib-support.patch
-ab88a2f63e3545bbc36537aa9a86f2c6c35e41bbf702d6e13743a405cdac4f901eed5737189b780da96647fea9f5d863fdc76373f25a00064106dcb5514d6d87  0024-always-build-libgcc_eh.a.patch
-8fdbe0c8bf4ca60f458a33e59027de03d15ac91933fe46d8ca62119346d20b9bc2447c0bf22bceb63d0cf8613ab61512d9197f4e6c2224af473b63ef9f254295  0025-ada-libgnarl-compatibility-for-musl.patch
-5fd23a506b55c88d4f000e01c539eb25d6da2516949c9d7a1c9ee20f4c6b627e4788541284d9c14c33bafa7cb43ce2e0469dd91006152f00e30815107150320f  0026-ada-musl-support-fixes.patch
-3f9a406d7d2ce34951215ffbcadb49a45e55ad5c24ab9097c0e5e92383e43b876872ccd2a7e7def2833ab204975ee5733f8bcf90934db9fa9c4f6f56c62081f6  0027-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
-720a4001f9a1fa4122e456077ecff8d3eb8af7c83d0a81f9da6a6cca05b23664206a82a349e34482c48bfe40e99aa5f21567613d0913f6a24f282bc84a994496  0028-configure-fix-detection-of-atomic-builtins-in-libato.patch
-2044c23b23726965c0a6fd39f616cc464badd650947cb40495eeabd906a3af629878c1d28b403b8eb46b30a1a0ba39083023290d62f0c99ccf070063226e3f8f  0029-libstdc-do-not-throw-exceptions-for-non-C-locales-on.patch
-58e8415612e1042329ad114471852c19f6bf15bf3bfd7cd81ceeafa75778bcc28410a01071a7c8cbf12b8f549acd85723215772813deedb8f266e28b9e01a353  0030-gdc-unconditionally-link-libgphobos-against-libucont.patch
-d47b559075f40d526235f47b91da1d0cf6bfe6c5b7311bbfe08af9dd6e8f27e6c7cd82e3b2d529aab0536246fc56e2d42c089b22cacb0e7f09ca4a9d07556994  0031-druntime-link-against-libucontext-on-all-platforms.patch
-b325035cb7122d79c6b42ca6d3fc9e02319ed2f7cddb0639dff25d2798d2ce63812cd623462cdf95e21c9ffbf2412193f8b9fc89a4c36fa5a6a041661ac7399d  0032-libgnat-time_t-is-always-64-bit-on-musl-libc.patch
-c474f34e6f9a4239d486a65141a133dbe8ce91427d502a57a9fd6eb403478a2b5715ba74f24c1cc0761e16eec77ba2c1ca921fb7d7bc1e040fc3703fc9559e75  0033-libphobos-do-not-use-LFS64-symbols.patch
-c4482ffc36e7894b2140800159f4cbc9a3e9011e43a69b69f4fa92d5a11e2ee645c7e21df4423dd1e0636e8890849a5719647bfbdf84f951d638f8f488cb718c  0034-libgo-fix-lfs64-use.patch
-65df1d489e8d07a811f39e27fd29e3b2b4164fbc2c5fdc16a5142886d94a96e3fb28ccf4f20dd297ba6540ef8ea1ac3eb65a4279494639bf2f0f8376a3896cc3  0035-loongarch-disable-multilib-support.patch
+942d706e7f8ae8dbc85808e388b9c98de6bd922d49adeca63691218363a4f0b46829509ba1f1ed358ef436e1adf77ad7a820aaeb4bb03a4fc52cfdec118394f3  gcc-13-20230715.tar.xz
+438eda29a1851c72e65422bb4cd129ecc016f06f9bd038288e39762c01b932f786ed4aad587c7b16baf948c342c10dc9beff125166b97e0b8e0d05789aec95ce  0001-posix_memalign.patch
+4a7cd030e107b6e35fb883c80f21a547da14f540f989555ac2c9ba08958ace5b44dca194a96b460415c71f663e885954d73b04ade55f2f9d3cb116f50df8d8ca  0002-gcc-poison-system-directories.patch
+99b194f53677c3a75c3c376160673703f2d759d795ebd9f6e66d5ee095a648eba35d8aef1990a6a1e805c1cc1720636d7c23ef6102b674d92996b1e5646a0b2c  0003-specs-turn-on-Wl-z-now-by-default.patch
+39013ad0b255e9cfd168010eefc32ec4d015fce2c2b4e864341a6aa8bdb74e52a08f0ae83f29e27e9524d4da27f28369a6aa4d76f6aed6490dc2961b18f90e94  0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
+0ef08231bef5c77a38e8deaae4e00675de4312071425cf1db46ee54c3e00d2a5d1658a68302dd495c796d397e61e79efcf4e91fbd8fb2cd2e2fa539c2e884492  0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
+8202e22832141fb12601546cec42472fdb194892f839e9fed86b4ab597204b6e6575c0585c283301eeb598ac1f06d16ce500d9c0ea333444bd50ae2a210d2d76  0006-Enable-Wformat-and-Wformat-security-by-default.patch
+1b239b94b570a0eff2249a9ec7ad150270c3210128f8f8a67e1554a044a039b2acc69768ebc57a15cec661f039c41fb7b620e7ec65320efbce40ceec1c9c6b90  0007-Enable-Wtrampolines-by-default.patch
+eb3ce4df99bf4f22ca4bac2d4e24be4c235098fb67ae118cb8efe360f0441a39a9931076fa615fbc3b7d2b2a541d4ffb2cfc56097224fbd8b5f09bc01a1d7878  0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
+58a5ea76b4f7d662d3165dfeaad258087b0ec58b7ff87a62971c60817388ec6191d6dc841d63696d00fb68fe16b690790f3c0639e0edbd204033b4f8bbb4dafe  0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
+85d60bc6ef5f41854a5bc36847917dcee24bf6663fcd70b78a164a07fc08551f74fe37329b57cf187b95e23a6d04bce2ba620f21ac80c8df7d9cfcc8052089df  0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
+8ef0f45bc0639464537f39319f4954d9a9ab182e14a10c6e39455bebddd24dcdbe6ec3fc0316324a4f9d7dc1f95ec8babd7112c2ff05af54534e0fbe74ff6ebf  0011-libiberty-copy-PIC-objects-during-build-process.patch
+d8467365c19339e52bcf27476b338fb412b6a7dd6eefd4fd92822e67c756a1f04a106f4e0c1c1909b4bee8f5f3b506a98614c1bf3478d7714415cca9eb7257e1  0012-libgcc_s.patch
+cab0cb6c462f2f4abefde020e17199366c6c24ad2582fe7d793c552aa2bcbe3148c5f6cd6245bc9ff86017d949ef4e6f063c8a01ce7d247abfe685077c57e71c  0013-nopie.patch
+b1277a4edc91208fecf5ad7015e8cf237d567b310063f26d14ff39c4aade683e6d1d54d817b7f4fef79db7dc456be9f09a5a8c0ceeff784f839521d0cf243807  0014-ada-fix-shared-linking.patch
+9fa42ba8374b8e47cb3d96315d783c990cf35075354869f5657383908c4d5f143ee94d1f7f86f52140a974f5fc872b22bcaec1f732ebc249357a86ad9e781d4e  0015-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
+05e1e06a6e33958ec5c22b26919fe142153c9605173ad90c770a32d7d48dfb5df421553f3030b6d979f34acbd3614d0e32c86c3cb0b819f3fbaa054f2962ff20  0016-add-fortify-headers-paths.patch
+784d488cf55fafa259d3aa874f4230453b4d3aeb94158d0c96caf26524b8b7f8cea12367a72fa4616389dfcb877c4a1c4fe9d1cb57a67c0329bbad61e91ee423  0017-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
+18c1092273005f4fcaec36830a2cbfbf5e2a2e4e82cf5f7f4f7f3141dbbe2731db2f47a9869f271b4ee337835962c7dfbf009165f2988a14ff40d6c6935986ce  0018-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
+4bbce70032f125002aa857b0561c80e15588847282c2ab2851c3c507a48d22613ef3affb288c33da461688890c7ce265c6175fb1580194669621653788172d1b  0019-aarch64-disable-multilib-support.patch
+d4bf0a7add6d531871324c36004f7d92eea9ad7042d567e43377e5bdde7dce8d87c649c3c4bdf0144b82d2607b46fab4eb821cf9a82ee4eddb003601b331e395  0020-s390x-disable-multilib-support.patch
+e0002f9aea22c923530591f97cfb29953cd924a78b3c7ae5d15ccaae46491c1f40b03a5dc5fc17a286299b82ef48248a9ecbf6eea9bbd2058189a697e9e2ffe8  0021-ppc64-le-disable-multilib-support.patch
+28b6e2f1574611964f8e2effa57dcb6efff5d562ec5f923abfa9ddeaf4a09b0c6941d1406b02d113f950113b7239dcc8dd6b14d06ade3b2f4dbdb7f6d5560bed  0022-x86_64-disable-multilib-support.patch
+6955ea39199f258340b69c8aa7021c65fc15179323f50be08952a302b77cec1a720b99ada60bf2a07594ba536a50b682d06290497fc9d4553c8e11e2f536a606  0023-riscv-disable-multilib-support.patch
+46bfcfc122a29060d6ff1fb52b509251ba44357df67f81be1c274fdfe9b80099b1a5ad64f7d40d8412bb437e6147cb404448b8e067989018bdaf2df5cdfabaef  0024-always-build-libgcc_eh.a.patch
+07b4028c8d8c7b8bc71c0fb4e31669fb2066aefdded556d0a65773fa93db097a55e9bfa9ac9ee10fbc82e4ba21aa84738e91c331b768cf7d067407934fc30064  0025-ada-libgnarl-compatibility-for-musl.patch
+7201a76ac033bd4f7532600d7a975f2aa9f93692cec42e28323e6e8e27f7357e0cb1497c12503829a41ed025e9c7953bf4738ad0d980687a774088fabaf08cdf  0026-ada-musl-support-fixes.patch
+f3974d1a693c0e382fa78ae94ebf768c6a1ca0ee631b478cf52a366537edae373cd0ab31369ef1ae0627d2834bcacfb94c9a4d01505c91eaac9d228a5933d0ae  0027-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
+8f77c3a908ec92966fb1697fd40cc936d4dca2624f6f14b199ba154f8c46be773548a571b41a1cf537134b011e3426deb443e4a13e49fb763c91c821ca1bae63  0028-configure-fix-detection-of-atomic-builtins-in-libato.patch
+8cd10e3d10e3da0505cb4c09c4448335e5bbd18fe6e2c47cfa1257df3d83234983d71b1fdb0b4bfc76b24d477fd6e2d771b8eefacbb61e0ca1df105b980dbd4a  0029-libstdc-do-not-throw-exceptions-for-non-C-locales-on.patch
+e026f1e20b78328b55b92a5fdf8f9d1d761176d2eea90556d7be8e2bae72d0dc52fd482d1eac8ab623e98653ca56d39b18fd2139ff99d420994b10c36f266ca6  0030-gdc-unconditionally-link-libgphobos-against-libucont.patch
+80b41cf68a7e56bef50c05073cc79b9eafbd37535f6360deac16dfe5498ac041aaf91c3cc1bc6e323d574cd1da65aab22df32a03e39f606bff41a103063aafef  0031-druntime-link-against-libucontext-on-all-platforms.patch
+b4917017c45d170c6878c7744c1ecababef4346903ee1f684d5a59d65255a5576d16d40137f7dbfe46144907c6389035966813e9024c9a4f499e963ed533947a  0032-libgnat-time_t-is-always-64-bit-on-musl-libc.patch
+1cc7a5ef067bf543f6c1fa14dedc6378750a43be1649b18605699dffdc1ebce8b88405d3f12dd57e3d821c7d457d861ee0a54138c037917d6365b0bf69526e85  0033-libphobos-do-not-use-LFS64-symbols.patch
+77a1426e316b96b51edef9a35a64565d5f84b94d46a2fd7293ea406ede473b449613969f9e29cae44f8fbfbc767a27cef01b36392cf8ffb3f618c0df4e217c71  0034-libgo-fix-lfs64-use.patch
 "
@@ -1,7 +1,7 @@
 From 47b4bd4deb2c356bb07d2a96f22127aefafec3a4 Mon Sep 17 00:00:00 2001
 From: Szabolcs Nagy <nsz@port70.net>
 Date: Fri, 26 Jan 2018 20:32:50 +0000
-Subject: [PATCH 01/35] posix_memalign
+Subject: [PATCH 01/34] posix_memalign

 ---
 gcc/config/i386/pmm_malloc.h | 9 +++++----
@@ -1,7 +1,7 @@
 From 4fa620d8c3e6730211bfb071eb4c817320491bd0 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Fri, 29 Mar 2013 08:59:00 +0400
-Subject: [PATCH 02/35] gcc: poison-system-directories
+Subject: [PATCH 02/34] gcc: poison-system-directories

 Add /sw/include and /opt/include based on the original
 zecke-no-host-includes.patch patch.  The original patch checked for
@@ -150,13 +150,13 @@ diff --git a/gcc/gcc.cc b/gcc/gcc.cc
 index 16bb07f2cdc..33b56e721d2 100644
 --- a/gcc/gcc.cc
 +++ b/gcc/gcc.cc
-@@ -1177,6 +1187,8 @@ proper position among the other output files.  */
-    "-z now " \
+@@ -1146,6 +1146,8 @@ proper position among the other output files.  */
+    "%{fuse-ld=*:-fuse-ld=%*} " LINK_COMPRESS_DEBUG_SPEC \
    "%X %{o*} %{e*} %{N} %{n} %{r}\
     %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!r:%{!nostartfiles:%S}}} \
 +    %{Wno-poison-system-directories:--no-poison-system-directories} \
 +    %{Werror=poison-system-directories:--error-poison-system-directories} \
-     %{static|no-pie|static-pie:} %@{L*} %(link_libgcc) " \
+     %{static|no-pie|static-pie:} %@{L*} %(mfwrap) %(link_libgcc) " \
     VTABLE_VERIFICATION_SPEC " " SANITIZER_EARLY_SPEC " %o "" \
     %{fopenacc|fopenmp|%:gt(%{ftree-parallelize-loops=*:%*} 1):\
 diff --git a/gcc/incpath.cc b/gcc/incpath.cc