main/debugcc: new aport

Signed-off-by: Caleb Connolly <caleb@connolly.tech>
2024-01-22 19:56:16 +00:00
6557 changed files with 148819 additions and 445161 deletions
@@ -6,9 +6,17 @@

 if [ "$(id -u)" = 0 ]; then
 	set -x
-	wget "https://gitlab.postmarketos.org/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
+	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

+# Wrap pmbootstrap to use this repository for --aports
+pmaports="$(cd "$(dirname "$0")"/..; pwd -P)"
+_pmbootstrap="$(command -v pmbootstrap)"
+pmbootstrap() {
+	"$_pmbootstrap" --aports="$pmaports" "$@"
+}
+
 .ci/lib/apkbuild_linting.py
+
@@ -1,106 +0,0 @@
-#!/bin/sh -e
-
-if [ "$(id -u)" = 0 ]; then
-	set -x
-	apk add git openssh-keygen grep curl
-	wget "https://gitlab.postmarketos.org/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
-	sh ./install_pmbootstrap.sh
-	exec su "${TESTUSER:-pmos}" -c "sh -e $0 $*"
-fi
-
-git config --global --add safe.directory "$CI_PROJECT_DIR"
-git config --global user.name "postmarketOS CI"
-# The username for the bot associated with the access token
-# e.g. project_226_bot_bfa19b84bf7f559c8ff7438a01fd29b9
-git config --global user.email "$PMAPORTS_TOKEN_BOT@noreply.gitlab.postmarketos.org"
-
-# 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://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/refs/tags/ | grep -oE "<a href='.*'>(.*)</a>.*\.tar\.gz</a>" | awk -F'[<>]' '{print $3}' > /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
-	sed -i -e "s/^pkgrel=.*/pkgrel=0/" device/testing/linux-next/APKBUILD
-
-	# Update the checksums
-	pmbootstrap checksum linux-next
-
-	# Ensure it builds
-	pmbootstrap --details-to-stdout build 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.postmarketos.org/postmarketOS/pmaports-autoupdate-test.git
-
-git remote add gitlab https://pmos-ci:"$PMAPORTS_PUSH_TOKEN"@gitlab.postmarketos.org/postmarketOS/pmaports.git
-git fetch gitlab
-git checkout --track gitlab/master
-
-for pkg in $PKGS; do
-	case "$pkg" in
-		linux-next)
-			update_linux_next
-			;;
-		*)
-			echo "Unknown package: $pkg"
-			exit 1
-			;;
-	esac
-done
-
-git push
@@ -1,90 +0,0 @@
-image: alpine:latest
-stages:
-  - build
-
-workflow:
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "parent_pipeline"
-
-{% if archs|length == 0 %}
-# Needed because gitlab fails if no jobs are ran:
-#  - https://gitlab.com/gitlab-org/gitlab/-/issues/368248
-# This applies to `when: manual` is used on all jobs.
-placeholder:
-  stage: build
-  script:
-    - 'true'
-{% endif %}
-
-.build:
-  # Create jobs, but don't run them unless this is
-  # overriden in jobs that extend it
-  when: manual
-  stage: build
-  interruptible: true
-  before_script:
-    # upgrade is mostly needed for "qemu" runners that run edge based on a VM
-    # The other build jobs run natively in docker on latest alpine stable and
-    # those should always have whatever we need
-    - apk upgrade -U
-    - .ci/lib/gitlab_prepare_ci.sh
-  after_script:
-    - cp -r /home/pmos/.local/var/pmbootstrap/packages/ packages/ || true
-    - .ci/lib/move_logs.sh $CI_PROJECT_DIR
-  artifacts:
-    expire_in: 1 week
-    paths:
-      - packages/
-  timeout: 10 h
-
-build-x86_64:
-{% if ('x86_64' in archs) %}
-  when: always
-{% endif %}
-  extends: .build
-  script:
-    - .ci/build-x86_64.sh
-
-build-x86:
-{% if ('x86' in archs) %}
-  when: always
-{% endif %}
-  extends: .build
-  script:
-    - .ci/build-x86.sh
-
-build-aarch64:
-{% if ('aarch64' in archs) %}
-  when: always
-{% endif %}
-  extends: .build
-  tags: [arm64]
-  script:
-    - .ci/build-aarch64.sh
-
-build-armv7:
-{% if ('armv7' in archs) %}
-  when: always
-{% endif %}
-  extends: .build
-  tags: [qemu]
-  script:
-    - .ci/build-armv7.sh
-
-build-armhf:
-{% if ('armhf' in archs) %}
-  when: always
-{% endif %}
-  extends: .build
-  tags: [qemu]
-  script:
-    - .ci/build-armhf.sh
-
-build-riscv64:
-{% if ('riscv64' in archs) %}
-  when: always
-{% endif %}
-  extends: .build
-  tags: [qemu]
-  script:
-    - .ci/build-riscv64.sh
@@ -0,0 +1,43 @@
+#!/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
@@ -11,7 +11,7 @@ if [ "$(id -u)" = 0 ]; then
 	# In .gitlab-ci.yml currently .ci/pytest.sh runs before this and
 	# already downloads and runs install_pmbootstrap.sh.
 	if ! [ -e install_pmbootstrap.sh ]; then
-		wget "https://gitlab.postmarketos.org/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
+		wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
 		sh ./install_pmbootstrap.sh
 	fi
 	exec su "${TESTUSER:-pmos}" -c "sh -e $0"
@@ -0,0 +1,14 @@
+#!/bin/sh -e
+# Description: lint CI related python scripts/tests
+# https://postmarketos.org/pmb-ci
+
+if [ "$(id -u)" = 0 ]; then
+	set -x
+	apk -q add py3-flake8
+	exec su "${TESTUSER:-build}" -c "sh -e $0"
+fi
+
+set -x
+
+# shellcheck disable=SC2046
+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,65 +31,24 @@ 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
+	exit 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.postmarketos.org/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
-
-if grep -qEr '^deviceinfo_kernel_cmdline.*[\"\s]console=null' -- device/; then
-	echo "ERROR: Do not use console=null in the kernel command line."
-	echo "Use these params to quiet console on boot: quiet loglevel=2"
-	echo "For more information, see: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/issues/2989"
-	exit_code=1
-fi
-
-exit "$exit_code"
@@ -6,7 +6,7 @@

 if [ "$(id -u)" = 0 ]; then
 	set -x
-	wget "https://gitlab.postmarketos.org/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
+	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
@@ -23,4 +23,9 @@ if __name__ == "__main__":
        print("No APKBUILDs to lint")
        sys.exit(0)

-    common.run_pmbootstrap(["-q", "lint"] + packages)
+    result = common.run_pmbootstrap(["-q", "lint"] + packages, output_return=True)
+
+    if len(result) > 0:
+        print("Linting issues found:")
+        print(result)
+        sys.exit(1)
@@ -2,19 +2,15 @@
 # Copyright 2021 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later
 import sys
-import os
-import pathlib

 # Same dir
 import common

 # pmbootstrap
 import add_pmbootstrap_to_import_path
-import pmb.core
 import pmb.parse
 import pmb.parse._apkbuild
 import pmb.helpers.pmaports
-from pmb.core.context import get_context


 def build_strict(packages, arch):
@@ -24,6 +20,23 @@ def build_strict(packages, arch):
                            "--arch", arch, ] + list(packages))


+def verify_checksums(packages, arch):
+    # Only do this with one build-{arch} job
+    arch_verify = "x86_64"
+    if arch != arch_verify:
+        print(f"NOTE: doing checksum verification in build-{arch_verify} job,"
+              " not here.")
+        return
+
+    if len(packages) == 0:
+        print("no packages changed, not doing any checksums verification")
+        return
+
+    common.run_pmbootstrap(["build_init"])
+    common.run_pmbootstrap(["--details-to-stdout", "checksum", "--verify"] +
+                           list(packages))
+
+
 if __name__ == "__main__":
    # Architecture to build for (as in build-{arch})
    if len(sys.argv) != 2:
@@ -38,36 +51,23 @@ if __name__ == "__main__":
    # Package count sanity check
    common.get_changed_packages_sanity_check(len(packages))

-    # Load context
-    sys.argv = ["pmbootstrap.py", "chroot"]
+    # [ci:skip-build]: verify checksums and stop
+    verify_only = common.commit_message_has_string("[ci:skip-build]")
+    if verify_only:
+        print("WARNING: not building changed packages ([ci:skip-build])!")
+        print("verifying checksums: " + ", ".join(packages))
+        verify_checksums(packages, arch)
+        sys.exit(0)
+
+    # Prepare "args" to use pmbootstrap code
+    sys.argv = ["pmbootstrap", "chroot"]
    args = pmb.parse.arguments()
-    context = get_context()

-    # Get set of all buildable packages for the enabled repos, for skipping unbuildable
-    # aports later. We might be given a changed aport from e.g. extra-repos/systemd when
-    # that repo is not enabled
-    buildable_pkgs = set()
-    for path in pmb.core.pkgrepo.pkgrepo_iter_package_dirs():
-        buildable_pkgs.add(os.path.basename(path))
-
-    # To store a list of packages from extra-repos/systemd for special handling later:
-    systemd_pkgs = list()
-
-    # Filter out packages that either:
-    #  1. can't be built for given arch
-    #  2. are not found in enabled repos
+    # Filter out packages that can't be built for given arch
    # (Iterate over copy of packages, because we modify it in this loop)
    for package in packages.copy():
-        if package not in buildable_pkgs:
-            print(f"{package}: not in any available repos, skipping")
-            packages.remove(package)
-            # FIXME: this should probably be more generic, if other repos are added later?
-            # This just tosses the package into the list of packages to try building later w/ systemd enabled, and assumes it'll be found there.
-            systemd_pkgs.append(package)
-            continue
-
-        apkbuild_path = pmb.helpers.pmaports.find(package)
-        apkbuild = pmb.parse._apkbuild.apkbuild(pathlib.Path(apkbuild_path, "APKBUILD"))
+        apkbuild_path = pmb.helpers.pmaports.find(args, package)
+        apkbuild = pmb.parse._apkbuild.apkbuild(f"{apkbuild_path}/APKBUILD")

        if not pmb.helpers.pmaports.check_arches(apkbuild["arch"], arch):
            print(f"{package}: not enabled for {arch}, skipping")
@@ -78,29 +78,6 @@ if __name__ == "__main__":
        print(f"no packages changed, which can be built for {arch}")
        sys.exit(0)

+    # Build packages
+    print(f"building in strict mode for {arch}: {', '.join(packages)}")
    build_strict(packages, arch)
-
-    # Build packages in extra-repos/systemd
-    # FIXME: this should probably be more generic, if other repos are added later?
-    if systemd_pkgs:
-        common.run_pmbootstrap(["config", "systemd", "always"])
-        # To fix the ERROR: Chroot 'native' is for the 'edge' channel, but you are on the
-        # 'systemd-edge' channel. Run 'pmbootstrap zap' to delete your chroots and try again.
-        # To do this automatically, run 'pmbootstrap config auto_zap_misconfigured_chroots yes'.
-        common.run_pmbootstrap(["config", "auto_zap_misconfigured_chroots", "yes"])
-
-        # filter out packages that can't be built for arch
-        # (Iterate over copy of `systemd_pkgs`, because we modify it in this loop)
-        for package in systemd_pkgs.copy():
-            apkbuild_path = pmb.helpers.pmaports.find(package, True, True, with_extra_repos="enabled")
-            apkbuild = pmb.parse._apkbuild.apkbuild(pathlib.Path(apkbuild_path, "APKBUILD"))
-            if not pmb.helpers.pmaports.check_arches(apkbuild["arch"], arch):
-                print(f"(extra-repos/systemd) {package}: not enabled for {arch}, skipping")
-                systemd_pkgs.remove(package)
-
-        # No packages: skip build
-        if len(systemd_pkgs) == 0:
-            print(f"no packages changed, which can be built for {arch}")
-            sys.exit(0)
-
-        build_strict(systemd_pkgs, arch)
@@ -5,7 +5,7 @@

 if [ "$(id -u)" = 0 ]; then
 	set -x
-	wget "https://gitlab.postmarketos.org/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
+	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
@@ -3,7 +3,6 @@
 # SPDX-License-Identifier: GPL-3.0-or-later

 import glob
-import pathlib
 import tempfile
 import sys
 import subprocess
@@ -16,9 +15,9 @@ import add_pmbootstrap_to_import_path  # noqa
 import pmb.parse
 import pmb.parse.version
 import pmb.helpers.logging
-from pmb.core.context import get_context

-def get_package_contents(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,18 +38,8 @@ def get_package_contents(package, revision, check=True):
    with tempfile.TemporaryDirectory() as tempdir:
        with open(tempdir + "/APKBUILD", "w", encoding="utf-8") as handle:
            handle.write(apkbuild_content)
-        parsed = pmb.parse.apkbuild(pathlib.Path(tempdir, "APKBUILD"),
-                                    False, False)
+        parsed = pmb.parse.apkbuild(tempdir + "/APKBUILD", False, False)

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


@@ -94,7 +83,7 @@ def exit_with_error_message():
    exit(1)


-def check_versions(packages):
+def check_versions(args, packages):
    error = False

    # Get relevant commits: compare HEAD against upstream branch or HEAD~1
@@ -111,18 +100,10 @@ def check_versions(packages):
              " HEAD against HEAD~1.")
        commit = "HEAD~1"

-    # Exclude linux-next from pkgrel checks, as it is updated automatically.
-    #
-    # Without this, .ci/commits.sh complains about the following:
-    # ERROR: Modified package(s) don't have an increased version or a new
-    #        package has a nonzero pkgrel!
-    if "linux-next" in packages:
-        packages.remove("linux-next")
-
    for package in packages:
        # Get versions, skip new packages
-        head = get_package_version(package, "HEAD")
-        upstream = get_package_version(package, commit, False)
+        head = get_package_version(args, package, "HEAD")
+        upstream = get_package_version(args, package, commit, False)
        if not upstream:
            if head.rpartition('r')[2] != "0":
                print(f"- {package}: {head} (HEAD) (new package) [ERROR]")
@@ -131,40 +112,6 @@ def check_versions(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(package, "HEAD", False)
-            upstream_parsed = get_package_contents(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:
@@ -202,12 +149,8 @@ if __name__ == "__main__":
    # Initialize args (so we can use pmbootstrap's APKBUILD parsing)
    sys.argv = ["pmbootstrap.py", "chroot"]
    args = pmb.parse.arguments()
-    context = get_context()
-
-    # pmb.helpers.logging.init(args)
-    pmb.helpers.logging.init(context.log, args.verbose, context.details_to_stdout)
-
+    pmb.helpers.logging.init(args)

    # Verify package versions
    print("checking changed package versions...")
-    check_versions(packages)
+    check_versions(args, packages)
@@ -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", "--keep-going", 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", "--keep-going"], 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:")
@@ -36,20 +36,22 @@ def run_git(parameters, check=True, stderr=None):
 def add_upstream_git_remote():
    """ Add a remote pointing to postmarketOS/pmaports. """
    run_git(["remote", "add", "upstream",
-             "https://gitlab.postmarketos.org/postmarketOS/pmaports.git"], False)
+             "https://gitlab.com/postmarketOS/pmaports.git"], False)
    run_git(["fetch", "-q", "upstream"])


 def commit_message_has_string(needle):
-    base_commit = get_base_commit()
-
-    return needle in run_git(["log", "--pretty=format:%B", f"{base_commit}..HEAD"])
+    return needle in run_git(["show", "-s", "--format=full", "HEAD"])


-def run_pmbootstrap(parameters):
+def run_pmbootstrap(parameters, output_return=False):
    """ Run pmbootstrap with the pmaports dir as --aports """
    cmd = ["pmbootstrap", "--aports", get_pmaports_dir()] + parameters
-    subprocess.run(cmd, universal_newlines=True, check=True)
+    stdout = subprocess.PIPE if output_return else None
+    result = subprocess.run(cmd, stdout=stdout, universal_newlines=True)
+    result.check_returncode()
+    if output_return:
+        return result.stdout


 def get_upstream_branch():
@@ -57,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"]
@@ -88,15 +85,17 @@ def get_upstream_branch():
    return ret


-def get_base_commit() -> str:
-    """Get the base commit that can be compared with HEAD to get all commits in the
-    given branch/merge request."""
-
+def get_changed_files(removed=True):
+    """ Get all changed files and print them, as well as the branch and the
+        commit that was used for the diff.
+        :param removed: also return removed files (default: True)
+        :returns: set of changed files
+    """
    branch_upstream = f"upstream/{get_upstream_branch()}"
    commit_head = run_git(["rev-parse", "HEAD"])[:-1]
    commit_upstream = run_git(["rev-parse", branch_upstream])[:-1]
    print("commit HEAD: " + commit_head)
-    print(f"commit {branch_upstream}: {commit_upstream}")
+    print(f"commit {branch_upstream}: f{commit_upstream}")

    # Check if we are HEAD on the upstream branch
    if commit_head == commit_upstream:
@@ -107,17 +106,6 @@ def get_base_commit() -> str:
        commit = run_git(["merge-base", branch_upstream, "HEAD"])[:-1]
    print("comparing HEAD with: " + commit)

-    return commit
-
-
-def get_changed_files(removed=True):
-    """ Get all changed files and print them, as well as the branch and the
-        commit that was used for the diff.
-        :param removed: also return removed files (default: True)
-        :returns: set of changed files
-    """
-    commit = get_base_commit()
-
    # Changed files
    ret = set()
    print("changed file(s):")
@@ -142,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)

@@ -1,56 +0,0 @@
-#!/usr/bin/env python3
-# Copyright 2025 Pablo Correa Gomez
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-from pathlib import Path
-import shutil
-import sys
-
-from jinja2 import Template
-import add_pmbootstrap_to_import_path
-import pmb.parse
-import pmb.helpers.logging
-from pmb.core.arch import Arch
-
-# Same dir
-import common
-
-if __name__ == "__main__":
-    # Needs input to output if we should create the jobs
-    if len(sys.argv) != 3:
-        print("usage: generate_build_jobs.py TEMPLATE CHILD_PIPELINE")
-        print(sys.argv)
-        sys.exit(1)
-    template = sys.argv[1]
-    child_pipeline = sys.argv[2]
-
-    # pmb logging has to be initialized for later pmb commands to work, setting
-    # to /dev/null since we don't care about the output. Later this could
-    # be changed to a file and added as a CI artifact if we need to debug
-    # something.
-    pmb.logging.init(Path("/dev/null"), False)
-    archs = set()
-    # Get and print modified packages
-    common.add_upstream_git_remote()
-    for file in common.get_changed_files():
-        path = Path(file)
-        if path.name != "APKBUILD":
-            continue
-        elif not path.exists():
-            continue  # APKBUILD was deleted
-        apkbuild = pmb.parse.apkbuild(path)
-        archs.update(apkbuild["arch"])
-
-    if common.commit_message_has_string("[ci:skip-build]"):
-        print("User requested skipping build, not creating child pipeline file")
-        archs = set()
-
-    # This ignores things like !armv7, that could be a follow-up optimization
-    if 'noarch' in archs or 'all' in archs:
-        archs = set([str(arch) for arch in Arch.supported()])
-
-    print(archs)
-    with open(template) as f:
-        rendered = Template(f.read()).render(archs=archs)
-        with open(child_pipeline, "w") as fw:
-            fw.write(rendered)
@@ -1,199 +0,0 @@
-#!/bin/sh
-# Unit testing framework for shell scripts
-# Invoke with the path to a tests/ subdir of a package and the
-# package name as arguments. Or source it with the following
-# variables set:
-# * results_dir - second argument to the test script
-
-set -e
-
-# Colors :D
-RED="\e[31m"
-GREEN="\e[32m"
-YELLOW="\e[33m"
-BLUE="\e[34m"
-BOLDBLUE="\e[1;34m"
-RESET="\e[0m"
-
-testlib_path="$(realpath "$0")"
-
-_test_assert_failed=""
-_test_testn=1
-_test_passedn=0
-_test_failedn=0
-_test_current_test=""
-_test_statefile="$(mktemp)"
-# Set by each test
-results_dir="${results_dir:-}"
-
-test_log() {
-	# ash supports echo -e
-	# shellcheck disable=SC3037
-	echo -e "$*" >&2
-}
-
-test_info() {
-	# shellcheck disable=SC3037
-	echo -e "${BLUE}$*${RESET}" >&2
-}
-
-test_debug() {
-	# shellcheck disable=SC3037
-	echo -e "${YELLOW}$*${RESET}" >&2
-}
-
-assert_strequal() {
-	# $1: first string
-	# $2: second string
-	if [ -z "$1" ] || [ -z "$2" ]; then
-		test_log "ERROR: assert_equal: not enough arguments given"
-		exit 1
-	fi
-	if [ "$1" != "$2" ]; then
-		_test_assert_failed="$1 != $2"
-		test_log "    ❌ $_test_assert_failed"
-		return
-	fi
-	test_log "    ✅ $1 == $2"
-}
-
-assert_equal() {
-	# $1: name of variable
-	# $2: value to compare
-	if [ -z "$1" ] || [ -z "$2" ]; then
-		test_log "ERROR: assert_equal: not enough arguments given"
-		exit 1
-	fi
-	val="$(eval echo "\$$1")"
-	if [ "$val" != "$2" ]; then
-		_test_assert_failed="\$$1 != $2 (got $val)"
-		test_log "    ❌ $_test_assert_failed"
-		return
-	fi
-	test_log "    ✅ \$$1 == $2"
-}
-
-assert_unset() {
-	if [ -z "$1" ]; then
-		test_log "ERROR: assert_unset: not enough arguments given"
-		exit 1
-	fi
-	val="$(eval echo \$"$1")"
-	if [ -n "$val" ]; then
-		_test_assert_failed="\$$1 should be unset (has value '$val')"
-		test_log "    ❌ $_test_assert_failed"
-		return
-	fi
-	test_log "    ✅ \$$1 is unset"
-}
-
-# Log some expression and evaluate it
-logeval() {
-	eval "$*"
-	test_log "${YELLOW}+ $*${RESET}"
-}
-
-# Start a test. Shell scripts involved in the test should be sourced AFTER calling this function!
-start_test() {
-	if [ -n "$_test_current_test" ]; then
-		test_log "ERROR: multiple calls to start_test without calling end_test first!"
-		test_log "Current test: $_test_current_test"
-		exit 1
-	fi
-	test_log "==> Test $_test_testn: $1"
-	_test_current_test="$1"
-	set > "$_test_statefile"
-}
-
-# End a test and reset the environment.
-end_test() {
-	local msg
-	local save_assert_failed
-
-	# Restore environment
-	save_assert_failed="$_test_assert_failed"
-
-	# Splitting is intentional
-	# shellcheck disable=SC2046
-	unset $(set | grep "='" | cut -d= -f1 | grep -vE "(PATH|IFS|TERM|LANG|HOME|PWD|SHELL|USER|save_assert_failed|_test_statefile)" )
-
-	# shellcheck disable=SC1090
-	. "$_test_statefile"
-	_test_assert_failed="$save_assert_failed"
-
-	if [ -n "$_test_assert_failed" ]; then
-		msg="${RED}Failed! ❌ ${_test_assert_failed}${RESET}"
-		echo "Test $_test_testn: $_test_assert_failed" >> "$results_dir/failed"
-		_test_failedn=$((_test_failedn+1))
-		echo "$_test_failedn" > "$results_dir/failedn"
-		unset _test_assert_failed
-	else
-		msg="${GREEN}Passed!${RESET}"
-		_test_passedn=$((_test_passedn+1))
-		echo "$_test_passedn" > "$results_dir/passedn"
-	fi
-	test_log "<== Test $_test_testn: $msg $_test_current_test\n"
-	_test_testn=$((_test_testn+1))
-	_test_current_test=""
-}
-
-# Call at the end of each testsuite shell script
-end_testsuite() {
-	if [ -n "$_test_current_test" ]; then
-		test_log "${RED}ERROR: end_testsuite called without calling end_test first!${RESET}"
-		test_log "${RED}Current test: $_test_current_test${RESET}"
-		exit 1
-	fi
-	if [ -f "$results_dir/failed" ]; then
-		exit 1
-	fi
-
-	exit 0
-}
-
-run_tests() {
-	local failed test_results_base
-	local test name total passedn failedn t_passed t_failed
-
-	test_results_base="$(mktemp -d)"
-	test_log "Running tests for $2"
-
-	# FIXME: yeah this isn't quite the best way to iterate the files
-	# shellcheck disable=SC2010
-	for name in $(ls "$1" | grep "\.sh$"); do
-		test="$1/$name"
-		mkdir "$test_results_base/$name"
-		echo 0 > "$test_results_base/$name/passedn"
-		echo 0 > "$test_results_base/$name/failedn"
-		test_log
-		test_log "${BOLDBLUE}# Test suite ${name}${RESET}"
-		$test "$testlib_path" "$test_results_base/$name" || failed="$failed $name"
-		t_passed=$(cat "$test_results_base/$name/passedn")
-		t_failed=$(cat "$test_results_base/$name/failedn")
-		passedn=$((passedn+t_passed))
-		failedn=$((failedn+t_failed))
-		total=$((total+t_passed+t_failed))
-	done
-	if [ -n "$failed" ]; then
-		test_log
-		test_log "Some tests failed:"
-		for test in $failed; do
-			test_log "❌ $test"
-			test_log "    ${RED}$(cat "$test_results_base/$test/failed")${RESET}"
-		done
-	fi
-
-	if [ $passedn -lt $total ]; then
-		test_log "[${RED}$passedn/$total tests passed${RESET}]"
-	else
-		test_log "[${GREEN}$passedn/$total tests passed!${RESET}]"
-	fi
-	test_log
-
-	if [ -n "$failed" ]; then exit 1; else exit 0; fi
-}
-
-# FIXME: probably not the best way to determine if this was sourced
-if [ $# -gt 0 ]; then
-	run_tests "$1" "$2"
-fi
@@ -1,82 +0,0 @@
-#!/usr/bin/env python3
-# Copyright 2025 Pablo Correa Gomez
-# SPDX-License-Identifier: GPL-3.0-or-later
-import os
-import sys
-
-# Same dir
-import common
-
-# pmbootstrap
-import add_pmbootstrap_to_import_path
-import pmb.core
-from pmb.core.context import get_context
-
-
-def verify_checksums(packages):
-    if len(packages) == 0:
-        print("no packages changed, not doing any checksums verification")
-        return
-
-    print("verifying checksums: " + ", ".join(packages))
-    common.run_pmbootstrap(["build_init"])
-    common.run_pmbootstrap(["--details-to-stdout", "checksum", "--verify"] +
-                           list(packages))
-
-
-if __name__ == "__main__":
-    # Get and print modified packages
-    common.add_upstream_git_remote()
-    packages = common.get_changed_packages()
-
-    # Load context
-    sys.argv = ["pmbootstrap.py", "chroot"]
-    args = pmb.parse.arguments()
-    context = get_context()
-
-    # Get set of all buildable packages for the enabled repos, for skipping unbuildable
-    # aports later. We might be given a changed aport from e.g. extra-repos/systemd when
-    # that repo is not enabled
-    buildable_pkgs = set()
-    for path in pmb.core.pkgrepo.pkgrepo_iter_package_dirs():
-        buildable_pkgs.add(os.path.basename(path))
-
-    # To store a list of packages from extra-repos/systemd for special handling
-    #  later:
-    systemd_pkgs = list()
-
-    # Filter out packages are not found in enabled repos
-    # (Iterate over copy of packages, because we modify it in this loop)
-    for package in packages.copy():
-        if package not in buildable_pkgs:
-            print(f"{package}: not in current repo, skipping")
-            packages.remove(package)
-            # FIXME: this should probably be more generic, if other repos are added
-            #  later?
-            # This just tosses the package into the list of packages to try
-            # building later w/ systemd enabled, and assumes it'll be found
-            # there.
-            print(f"{package}: adding to list of packages to check in systemd repo")
-            systemd_pkgs.append(package)
-            continue
-
-    # No packages: skip build
-    if len(packages) == 0:
-        print("no packages to check for the current repo")
-    else:
-       verify_checksums(packages)
-
-    # FIXME: this should probably be more generic, if other repos are added later?
-    if systemd_pkgs:
-        common.run_pmbootstrap(["config", "systemd", "always"])
-        # To fix the ERROR: Chroot 'native' is for the 'edge' channel, but you are on the
-        # 'systemd-edge' channel. Run 'pmbootstrap zap' to delete your chroots and try again.
-        # To do this automatically, run 'pmbootstrap config auto_zap_misconfigured_chroots yes'.
-        common.run_pmbootstrap(["config", "auto_zap_misconfigured_chroots", "yes"])
-
-        # No packages: skip build
-        if len(systemd_pkgs) == 0:
-            print("no packages to check for the systemd repo")
-
-        else:
-            verify_checksums(systemd_pkgs)
@@ -8,7 +8,7 @@

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

+# Wrap pmbootstrap to use this repository for --aports
 pmaports="$(cd "$(dirname "$0")"/..; pwd -P)"
+_pmbootstrap="$(command -v pmbootstrap)"
+pmbootstrap() {
+	"$_pmbootstrap" --aports="$pmaports" "$@"
+}
+
 # Make sure that the work folder format is up to date, and that there are no
 # mounts from aborted test cases (pmbootstrap#1595)
 pmbootstrap work_migrate
-pmbootstrap config aports "$pmaports"
 pmbootstrap -q shutdown

 # Make sure we have a valid device (pmbootstrap#1128)
@@ -1,14 +0,0 @@
-#!/bin/sh -e
-# Description: lint CI related python scripts/tests
-# https://postmarketos.org/pmb-ci
-
-if [ "$(id -u)" = 0 ]; then
-	set -x
-	apk -q add ruff
-	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')
@@ -15,15 +15,21 @@ 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/20-debug-shell.sh
+	./main/postmarketos-mkinitfs-hook-debug-shell/setup_usb_storage.sh
 	./main/postmarketos-mkinitfs-hook-netboot/netboot.sh
+	./main/postmarketos-update-kernel/update-kernel.sh
 	./main/ttyescape/*.post-install
 	./main/unl0kr/unlock.sh
-	./device/community/soc-qcom/call_audio_idle_suspend_workaround.sh
+	./main/msm-firmware-loader/*.post-install
+	./device/community/soc-qcom-sdm845/call_audio_idle_suspend_workaround.sh

 	$(find . -path './main/postmarketos-ui-*/*.sh')
 	$(find . -path './main/postmarketos-ui-*/*.pre-install')
@@ -38,11 +44,10 @@ sh_files="
 	$(find . -path './main/postmarketos-mvcfg/*.sh')

 	$(find . -path './.ci/**.sh')
-	$(find . -path '**/tests/*.sh')
 "

 for file in $sh_files; do
 	echo "Test with shellcheck: $file"
 	cd "$DIR/$(dirname "$file")"
-	shellcheck -S warning -e SC1008 -e SC3043 -x "$(basename "$file")"
+	shellcheck -e SC1008 -e SC3043 -x "$(basename "$file")"
 done
@@ -34,7 +34,7 @@ def path_pmbootstrap():
            return directory

    # 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)


@@ -2,33 +2,24 @@
 # Copyright 2021 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later

-from pathlib import Path
 import add_pmbootstrap_to_import_path
 import pmb.parse
-from pmb.helpers.args import init as init_args
-from pmb.types import PmbArgs
-import pmb.config
-from pmb.core.pkgrepo import pkgrepo_default_path
 import pytest
 import sys
 import os

-@pytest.fixture(scope="session", autouse=True)
+
+@pytest.fixture
 def args(request):
    # Initialize args
-    pmaports = Path(os.path.realpath(f"{os.path.dirname(__file__)}/../.."))
-    args = PmbArgs()
-    args.aports = [pmaports]
-    args.config = pmb.config.defaults["config"]
-    args.timeout = 900
-    args.details_to_stdout = False
-    args.quiet = False
-    args.verbose = True
-    args.offline = False
-    args.action = "init"
-    args.cross = False
-    args.log = None
+    pmaports = os.path.realpath(f"{os.path.dirname(__file__)}/../..")
+    sys.argv = ["pmbootstrap",
+                "--aports", pmaports,
+                "--log", "$WORK/log_testsuite_pmaports.txt"
+                "chroot"]
+    args = pmb.parse.arguments()

-    init_args(args)
+    # Initialize logging
+    pmb.helpers.logging.init(args)
    request.addfinalizer(pmb.helpers.logging.logfd.close)
    return args
@@ -1,24 +1,15 @@
 #!/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
-from pmb.core.pkgrepo import pkgrepo_default_path, pkgrepo_iglob, pkgrepo_relative_path
-from pmb.core.arch import Arch
-
-# 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):
@@ -26,16 +17,24 @@ def device_dependency_check(apkbuild, path):
        (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)")


-def test_aports_device():
+def test_aports_device(args):
    """
    Various tests performed on the /device/*/device-* aports.
    """
-    for path in pkgrepo_iglob("device/*/device-*/APKBUILD"):
+    for path in glob.iglob(args.aports + "/device/*/device-*/APKBUILD"):
        apkbuild = pmb.parse.apkbuild(path)

        # Depends: Require "postmarketos-base"
@@ -44,35 +43,44 @@ def test_aports_device():
            if "postmarketos-base" == dependency or "postmarketos-base>" in dependency:
                depend_flag = True
        if not depend_flag:
-            raise RuntimeError(f"Missing 'postmarketos-base' in depends of {path}")
+            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)

        # Architecture
        device = apkbuild["pkgname"][len("device-"):]
-        deviceinfo = pmb.parse.deviceinfo(device)
-        if Arch.from_str("".join(apkbuild["arch"])) != deviceinfo.arch:
-            raise RuntimeError("wrong architecture, please change to arch=\""
-                               f"{deviceinfo.arch}\": {path}")
+        deviceinfo = pmb.parse.deviceinfo(args, device)
+        if "".join(apkbuild["arch"]) != deviceinfo["arch"]:
+            raise RuntimeError("wrong architecture, please change to arch=\"" +
+                               deviceinfo["arch"] + "\": " + path)
        if "!archcheck" not in apkbuild["options"]:
-            raise RuntimeError(f"!archcheck missing in options= line: {path}")
+            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():
+def test_aports_device_kernel(args):
    """
    Verify the kernels specified in the device packages:
    * Kernel must not be in depends when kernels are in subpackages
    * Check if only one kernel is defined in depends
    """
-    aports = pkgrepo_default_path()
+
    # Iterate over device aports
-    for path in aports.glob("device/*/device-*/APKBUILD"):
+    for path in glob.glob(args.aports + "/device/*/device-*/APKBUILD"):
        # Parse apkbuild and kernels from subpackages
        apkbuild = pmb.parse.apkbuild(path)
        device = apkbuild["pkgname"][len("device-"):]
-        kernels_subpackages = pmb.parse._apkbuild.kernels(device)
+        kernels_subpackages = pmb.parse._apkbuild.kernels(args, device)

        # Parse kernels from depends
        kernels_depends = []
@@ -83,50 +91,48 @@ def test_aports_device_kernel():

            # Kernel in subpackages *and* depends
            if kernels_subpackages:
-                raise RuntimeError(f"Kernel package '{depend}' needs to"
+                raise RuntimeError("Kernel package '" + depend + "' needs to"
                                   " be removed when using kernel" +
-                                   f" subpackages: {path}")
+                                   " subpackages: " + path)

        # No kernel
        if not kernels_depends and not kernels_subpackages:
            raise RuntimeError("Device doesn't have a kernel in depends or"
-                               f" subpackages: {path}")
+                               " subpackages: " + path)

        # Multiple kernels in depends
        if len(kernels_depends) > 1:
            raise RuntimeError("Please use kernel subpackages instead of"
                               " multiple kernels in depends (see"
-                               f" <https://postmarketos.org/devicepkg>): {path}")
+                               " <https://postmarketos.org/devicepkg>): " +
+                               path)


-# @pytest.mark.xfail # Not all aports have been updated yet
-def test_aports_maintained():
+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.
    """
-
-    for path in pkgrepo_iglob("device/main/*/APKBUILD"):
-        if 'firmware-' in path.parent.name:
+    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"

-    for path in pkgrepo_iglob("device/community/*/APKBUILD"):
-        if 'firmware-' in path.parent.name:
+    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"


-def test_aports_archived():
+def test_aports_unmaintained(args):
    """
-    Ensure that aports in /device/archived have an "Archived:" comment
-    that describes why the aport is archived.
+    Ensure that aports in /device/unmaintained have an "Unmaintained:" comment
+    that describes why the aport is unmaintained.
    """
-
-    for path in pkgrepo_iglob("device/archived/*/APKBUILD"):
-        archived = pmb.parse._apkbuild.archived(path)
-        assert archived, f"{path} should have an Archived: " +\
-            "comment that describes why the package is archived"
+    for path in glob.iglob(f"{args.aports}/device/unmaintained/*/APKBUILD"):
+        unmaintained = pmb.parse._apkbuild.unmaintained(path)
+        assert unmaintained, f"{path} should have an Unmaintained: " +\
+            "comment that describes why the package is unmaintained"
@@ -10,7 +10,6 @@ import sys

 import add_pmbootstrap_to_import_path
 import pmb.parse
-from pmb.core.pkgrepo import pkgrepo_iglob


 def deviceinfo_obsolete(info):
@@ -23,25 +22,25 @@ def deviceinfo_obsolete(info):
        "weston_pixman_type",
    ]
    for option in obsolete_options:
-        if getattr(info, option, None):
+        if option in info and info[option]:
            raise RuntimeError(f"option {option} is obsolete, please rename"
                               " or remove it (see reasons for removal of at"
                               " https://postmarketos.org/deviceinfo)")


-def test_deviceinfo():
+def test_deviceinfo(args):
    """
    Parse all deviceinfo files successfully and run checks on the parsed data.
    """
    # Iterate over all devices
    last_exception = None
    count = 0
-    pattern = re.compile("^deviceinfo_[a-zA-Z0-9_]*=\".*\"(\\s*# .*)?$")
+    pattern = re.compile("^deviceinfo_[a-zA-Z0-9_]*=\".*\"$")

-    for folder in pkgrepo_iglob("device/*/device-*"):
-        device = folder.name.split("-", 1)[1]
+    for folder in glob.glob(args.aports + "/device/*/device-*"):
+        device = folder[len(args.aports):].split("-", 1)[1]

-        f = open(folder / "deviceinfo")
+        f = open(folder[len(args.aports):][1:] + "/deviceinfo")
        lines = f.read().split("\n")
        f.close()

@@ -63,19 +62,18 @@ def test_deviceinfo():
                # Check line against regex (can't use multiple lines etc.)
                if not pattern.match(line) or line.endswith("\\\""):
                    raise RuntimeError("Line looks invalid, maybe missing"
-                                       " quotes/multi-line string/malformed"
-                                       f" inline comment? {line}")
+                                       " quotes/multi-line string/comment next"
+                                       f" to line instead of above? {line}")

            # Successful deviceinfo parsing / obsolete options
-            info = pmb.parse.deviceinfo(device)
+            info = pmb.parse.deviceinfo(args, device)
            deviceinfo_obsolete(info)

            # deviceinfo_name must start with manufacturer
-            name = info.name
-            manufacturer = info.manufacturer
+            name = info["name"]
+            manufacturer = info["manufacturer"]
            if not name.startswith(manufacturer) and \
-                    not name.startswith("Google") and \
-                    not name.startswith("Jolla"):
+                    not name.startswith("Google"):
                raise RuntimeError("Please add the manufacturer in front of"
                                   " the deviceinfo_name, e.g.: '" +
                                   manufacturer + " " + name + "'")
@@ -6,12 +6,10 @@ import stat

 expected_directories = [
    "cross",
-    "device/archived",
    "device/community",
-    "device/downstream",
    "device/main",
    "device/testing",
-    "extra-repos/systemd",
+    "device/unmaintained",
    "main",
    "modem",
    "non-free",
@@ -30,9 +28,9 @@ def test_directories():


 # Ensure no file in pmaports are executable.
-# see https://gitlab.postmarketos.org/postmarketOS/pmaports/-/issues/593.
+# 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
@@ -7,10 +7,9 @@ import os

 import add_pmbootstrap_to_import_path
 import pmb.parse
-from pmb.core.pkgrepo import pkgrepo_default_path, pkgrepo_iglob


-def test_aports_firmware():
+def test_aports_firmware(args):
    """
    Various tests performed on the /**/firmware-* aports.
    """
@@ -25,12 +24,11 @@ def test_aports_firmware():
        "firmware-samsung-maguro",  # Depends on firmware-aosp-broadcom-wlan
        "firmware-xiaomi-ferrari",  # Depends on soc-qcom-msm8916
        "firmware-xiaomi-willow",  # Doesn't build, source link is dead (pma#1212)
-        "firmware-samsung-i9105p", # Depends on firmware-aosp-broadcom-wlan
    ]

-    for path in pkgrepo_iglob("**/firmware-*/APKBUILD", recursive=True):
+    for path in glob.iglob(f"{args.aports}/**/firmware-*/APKBUILD", recursive=True):
        apkbuild = pmb.parse.apkbuild(path)
-        aport_name = os.path.basename(path.parent)
+        aport_name = os.path.basename(os.path.dirname(path))

        if aport_name not in excluded:
            if "pmb:cross-native" not in apkbuild["options"]:
@@ -15,10 +15,9 @@ import sys
 import add_pmbootstrap_to_import_path
 import pmb.config
 import pmb.parse
-from pmb.core.pkgrepo import pkgrepo_iter_package_dirs


-def get_categorized_packages():
+def get_categorized_packages(args):
    """
    Parse all aports and categorize them.

@@ -29,7 +28,7 @@ def get_categorized_packages():
    """
    ret = {}

-    for path in pkgrepo_iter_package_dirs():
+    for path in glob.glob(args.aports + "/*/*/APKBUILD"):
        # Parse APKBUILD
        apkbuild = pmb.parse.apkbuild(path)
        url = apkbuild["url"]
@@ -110,10 +109,10 @@ def check_categories(categories):
    return ret


-def test_framework_versions():
+def test_framework_versions(args):
    """
    Make sure that packages of the same framework have the same version.
    """
-    categories = get_categorized_packages()
+    categories = get_categorized_packages(args)
    if not check_categories(categories):
        raise RuntimeError("Framework version check failed!")
@@ -6,26 +6,20 @@ import glob
 import pytest
 import sys
 import os
-import re
-from pathlib import Path

 import add_pmbootstrap_to_import_path
 import pmb.parse
-from pmb.core.pkgrepo import pkgrepo_iglob, pkgrepo_relative_path


-def test_aports_kernel():
+def test_aports_kernel(args):
    """
    Various tests performed on the /**/linux-* aports.
    """

-    for path in pkgrepo_iglob("**/linux-*/APKBUILD", recursive=True):
+    for path in glob.iglob(f"{args.aports}/**/linux-*/APKBUILD", recursive=True):
        apkbuild = pmb.parse.apkbuild(path)
        aport_name = os.path.basename(os.path.dirname(path))

-        if aport_name == "linux-pam-pmos":
-            continue  # This package isn't a linux kernel!
-
        if "pmb:cross-native" not in apkbuild["options"]:
            raise RuntimeError(f"{aport_name}: \"pmb:cross-native\" missing in"
                               " options= line")
@@ -41,15 +35,8 @@ def test_aports_kernel():
                                   " automatically.")

        # check some options only for main and community devices
-        _, relpath = pkgrepo_relative_path(path)
-        for part in ["main", "community"]:
-            if part in relpath.parts:
+        for dir in ["main", "device/main", "device/community"]:
+            if path.startswith(f"{args.aports}/{dir}"):
                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.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.")
@@ -6,12 +6,10 @@ import logging
 import os
 import pytest
 import sys
-import re

 import add_pmbootstrap_to_import_path
 import pmb.parse
 import pmb.parse._apkbuild
-from pmb.core.pkgrepo import pkgrepo_iter_package_dirs, pkgrepo_relative_path


 def apkbuild_check_provides(path, apkbuild, version, pkgname, subpkgname=None):
@@ -45,40 +43,35 @@ def apkbuild_check_provides(path, apkbuild, version, pkgname, subpkgname=None):
        # already replaces the variables, so we check against the inserted
        # values here.
        if not provide.endswith(f"={version}"):
-            # Valid version strings, per the APKBUILD reference, are fine. This regex
-            # attempts to detect those.
-            pattern = r'^\d+(\.\d+)*[a-z]?(_(?:alpha|beta|pre|rc|cvs|svn|git|hg|p)\d*)*-r\d+$'
-            [provide_no_ver, provide_ver] = provide.split("=", 1)
-            if not re.match(pattern, provide_ver):
-                error = f"error in , provide_ver{path}:\n"
-                if subpkgname:
-                    error += f"in subpackage:\n  {subpkgname}\n"
-                else:
-                    error += f"in package:\n  {pkgname}\n"
-                error += f"broken provides entry:\n  {provide_no_ver}\n"
-                error += "\n"
-                error += "This provides entry needs to be changed to"
-                error += f" '{provide_no_ver}=$pkgver-r$pkgrel'"
-                error += " (do not replace the variables, without '').\n"
-                error += "\n"
-                error += "If you know what you are doing and didn't add the"
-                error += " version on purpose, you also need to set a"
-                error += " provider_priority (pma#1766).\n"
-                error += "Reference:"
-                error += " https://wiki.alpinelinux.org/wiki/APKBUILD_Reference#provides"
-                error += f"\nVERSION: {provide_no_ver}"
-                ret += [error]
+            provide_no_ver = provide.split("=", 1)[0]
+
+            error = f"error in {path}:\n"
+            if subpkgname:
+                error += f"in subpackage:\n  {subpkgname}\n"
+            else:
+                error += f"in package:\n  {pkgname}\n"
+            error += f"broken provides entry:\n  {provide_no_ver}\n"
+            error += "\n"
+            error += "This provides entry needs to be changed to"
+            error += f" '{provide_no_ver}=$pkgver-r$pkgrel'"
+            error += " (do not replace the variables, without '').\n"
+            error += "\n"
+            error += "If you know what you are doing and didn't add the"
+            error += " version on purpose, you also need to set a"
+            error += " provider_priority (pma#1766).\n"
+            error += "Reference:"
+            error += " https://wiki.alpinelinux.org/wiki/APKBUILD_Reference#provides"
+            ret += [error]
    return ret


-def test_provides():
+def test_provides(args):
    errors = []
-    for path in pkgrepo_iter_package_dirs():
-        path = path / "APKBUILD"
+    for path in glob.iglob(f"{args.aports}/**/APKBUILD", recursive=True):
        apkbuild = pmb.parse.apkbuild(path)
        pkgname = apkbuild["pkgname"]
        version = f"{apkbuild['pkgver']}-r{apkbuild['pkgrel']}"
-        _, path_rel = pkgrepo_relative_path(path)
+        path_rel = os.path.relpath(path, args.aports)
        errors += apkbuild_check_provides(path_rel, apkbuild, version, pkgname)

        for subpkg, subpkg_data in apkbuild["subpackages"].items():
@@ -14,10 +14,9 @@ import pmb.parse
 import pmb.parse._apkbuild
 import pmb.parse.apkindex
 import pmb.helpers.repo
-from pmb.core.pkgrepo import pkgrepo_iter_package_dirs, pkgrepo_relative_path


-def parse_source_from_checksums(apkbuild_path):
+def parse_source_from_checksums(args, apkbuild_path):
    """
    Read the APKBUILD file and parse source files from the checksums at the
    bottom. This has always the same format, even if $source is built with hard
@@ -65,20 +64,17 @@ def parse_source_from_checksums(apkbuild_path):
    return ret


-def test_aports_unreferenced_files():
+def test_aports_unreferenced_files(args):
    """
    Raise an error if an unreferenced file is found
    """
-    for apkbuild_path in pkgrepo_iter_package_dirs():
+    for apkbuild_path in glob.iglob(args.aports + "/**/APKBUILD", recursive=True):
        # pmbootstrap parser has some issues with complicated APKBUILDs, skip those.
-        _, relpath = pkgrepo_relative_path(apkbuild_path)
-        if relpath.parts[0] == "cross":
+        if apkbuild_path.startswith(args.aports + "/cross/"):
            continue

-        apkbuild_path = apkbuild_path / "APKBUILD"
-
        apkbuild = pmb.parse.apkbuild(apkbuild_path)
-        sources_chk = parse_source_from_checksums(apkbuild_path)
+        sources_chk = parse_source_from_checksums(args, apkbuild_path)

        # Collect files from subpackages
        subpackage_installs = []
@@ -105,12 +101,11 @@ def test_aports_unreferenced_files():
            if os.path.basename(rel_file_path) not in sources_chk \
                    and rel_file_path not in apkbuild["install"] \
                    and rel_file_path not in subpackage_installs \
-                    and rel_file_path not in trigger_sources \
-                    and not rel_file_path.startswith("tests/"):
+                    and rel_file_path not in trigger_sources:
                raise RuntimeError(f"{apkbuild_path}: found unreferenced file: {rel_file_path}")


-def test_distfiles_conflict():
+def test_distfiles_conflict(args):
    """
    Make sure that each filename mentioned in any source= of any APKBUILD
    always has the same checksum. This is important because apk caches
@@ -120,11 +115,10 @@ def test_distfiles_conflict():
    with a checksum error.
    """
    source_all = {}
-    for apkbuild_path in pkgrepo_iter_package_dirs():
-        apkbuild_path = apkbuild_path / "APKBUILD"
-        source = parse_source_from_checksums(apkbuild_path)
+    for apkbuild_path in glob.iglob(f"{args.aports}/**/APKBUILD", recursive=True):
+        source = parse_source_from_checksums(args, apkbuild_path)
        dir_path = os.path.dirname(apkbuild_path)
-        _, apkbuild_rel = pkgrepo_relative_path(apkbuild_path)
+        apkbuild_rel = os.path.relpath(apkbuild_path, args.aports)
        for filename, checksum in source.items():
            # Files bundled with the APKBUILD don't get copied to the distfiles
            # cache, so not relevant for this check. Use glob.glob here and not
@@ -1,25 +0,0 @@
-#!/usr/bin/env python3
-# Copyright 2025 Oliver Smith
-# SPDX-License-Identifier: GPL-3.0-or-later
-import logging
-import os
-
-import pmb.parse
-from pmb.core.context import get_context
-from pathlib import Path
-
-
-def test_systemd_stage0_version():
-    """Ensure systemd-stage0 and systemd have the same pkgver."""
-    # Don't clutter output with verbose APKBUILD parsing messages
-    logging.getLogger().setLevel(logging.DEBUG)
-
-    config = get_context().config
-    pma_systemd = os.path.join(config.aports[0], "extra-repos/systemd")
-
-    sd0 = pmb.parse.apkbuild(Path(os.path.join(pma_systemd, "systemd-stage0/APKBUILD")))
-    sd1 = pmb.parse.apkbuild(Path(os.path.join(pma_systemd, "systemd/APKBUILD")))
-
-    assert sd0["pkgver"] == sd1["pkgver"], (
-        f"systemd-stage0 pkgver ({sd0['pkgver']}) doesn't match systemd pkgver ({sd1['pkgver']})!"
-    )
@@ -9,26 +9,25 @@ import os

 import add_pmbootstrap_to_import_path
 import pmb.parse
-from pmb.core.pkgrepo import pkgrepo_iglob


-def test_aports_ui():
+def test_aports_ui(args):
    """
    Raise an error if package in _pmb_recommends is not found
    """
-    pmaports_cfg = pmb.config.pmaports.read_config()
+    pmaports_cfg = pmb.config.pmaports.read_config(args)

    for arch in pmaports_cfg["supported_arches"].split(","):
-        for path in pkgrepo_iglob("main/postmarketos-ui-*/APKBUILD"):
+        for path in glob.iglob(args.aports + "/main/postmarketos-ui-*/APKBUILD"):
            apkbuild = pmb.parse.apkbuild(path)
            # Skip if arch isn't enabled
-            if not pmb.helpers.package.check_arch(apkbuild["pkgname"], arch, False):
+            if not pmb.helpers.package.check_arch(args, apkbuild["pkgname"], arch, False):
                continue

            for package in apkbuild["_pmb_recommends"]:
-                depend = pmb.helpers.package.get(package,
+                depend = pmb.helpers.package.get(args, package,
                                                 arch, must_exist=False)
-                if depend is None or not pmb.helpers.package.check_arch(package, arch):
+                if depend is None or not pmb.helpers.package.check_arch(args, package, arch):
                    raise RuntimeError(f"{path}: package '{package}' from"
                                       f" _pmb_recommends not found for arch '{arch}'")

@@ -36,8 +35,8 @@ def test_aports_ui():
            if f"{apkbuild['pkgname']}-extras" in apkbuild["subpackages"]:
                apkbuild = apkbuild["subpackages"][f"{apkbuild['pkgname']}-extras"]
                for package in apkbuild["_pmb_recommends"]:
-                    depend = pmb.helpers.package.get(package,
+                    depend = pmb.helpers.package.get(args, package,
                                                     arch, must_exist=False)
-                    if depend is None or not pmb.helpers.package.check_arch(package, arch):
+                    if depend is None or not pmb.helpers.package.check_arch(args, package, arch):
                        raise RuntimeError(f"{path}: package '{package}' from _pmb_recommends "
                                           f"of -extras subpackage is not found for arch '{arch}'")
@@ -1,19 +0,0 @@
-#!/bin/sh -e
-# Description: run unit-tests for packages
-# https://postmarketos.org/pmb-ci
-#
-# This script only exists to allow running unit-tests locally.
-# In actual CI the package tests/ subdir has it's own YAML
-# fine defining a job which calls testlib for that package.
-# This way we can run all the package unit-tests locally but
-# have them be individual jobs in GitLab.
-
-if [ "$(id -u)" = 0 ]; then
-	set -x
-	exec su "${TESTUSER:-build}" -c "sh -e $0"
-fi
-
-find . -type d -name "tests" | while read -r testdir; do
-	pkg="$(basename "$(dirname "$testdir")")"
-	.ci/lib/testlib.sh "$testdir" "$pkg"
-done
@@ -1,16 +0,0 @@
-#!/bin/sh -e
-# Description: verify checksums of modified packages
-# Options: native
-# Use 'native' because it requires running pmbootstrap.
-# https://postmarketos.org/pmb-ci
-
-if [ "$(id -u)" = 0 ]; then
-	set -x
-	wget "https://gitlab.postmarketos.org/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
-	sh ./install_pmbootstrap.sh
-	exec su "${TESTUSER:-pmos}" -c "sh -e $0"
-fi
-
-export PYTHONUNBUFFERED=1
-
-.ci/lib/verify_checksums.py
@@ -1,4 +1,3 @@
 {
-  "SpacesAftertabs": true,
-  "Exclude": ["temp"]
+  "SpacesAftertabs": true
 }
@@ -7,13 +7,8 @@
 # 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
 insert_final_newline = true
-
-# Forked from Alpine
-[extra-repos/systemd/networkmanager/networkmanager.rules]
-indent_style = space
-indent_size = 4
@@ -65,7 +65,7 @@ is_symlink() {
 # available in git tree and checksums are correct.
 check_local_sources() {
 	local apkbuild="$1"
-	local startdir="$2"
+	local startdir="${apkbuild%/*}"
 	local status=0
 	local checksum_act checksum_exp content filename line sources

@@ -109,21 +109,11 @@ check_file_size() {
 	fi
 }

-cleanup() {
-  [ -f "$_staged" ] && rm "$_staged"
-}
-
-trap cleanup EXIT

 for apkbuild in $(changed_files '**/APKBUILD'); do
-	_staged="$(mktemp)"
-	git show ":$apkbuild" >"$_staged"
-	check_local_sources "$_staged" "${apkbuild%/*}"
-	cleanup
+	check_local_sources "$apkbuild"
 done

 for path in $(changed_files); do
 	check_file_size "$path"
 done
-
-trap - EXIT
@@ -37,30 +37,13 @@ prepend_msg() {
 [ -z "$SOURCE" ] || exit 0

 lcp=$(git diff-index --name-only --cached HEAD | longest_common_prefix)
-prefix=""

 case "$lcp" in
-	extra-repos/systemd/systemd/*)
-		prefix="systemd"
-		;;
-	extra-repos/systemd/*)
-		prefix="systemd/$(echo "$lcp" | cut -d/ -f3)"
-		;;
-	device/*/*)
-		prefix="$(echo "$lcp" | cut -d/ -f3)"
-		;;
-	device/*)
-		# Multiple packages touched for same device category. More
-		# logic could be added to detect if they all belong to same
-		# device.
-		;;
-	[^.]*/*)
-		prefix="$(echo "$lcp" | cut -d/ -f1-2)"
-		;;
+	device/*/*) prepend_msg "$(echo "$lcp" | cut -d/ -f3): ";;
+	# Multiple packages touched for same device category
+	# More logic could be added to detect if they all belong to same device
+	device/*)  ;;
+	[^.]*/*) prepend_msg "$(echo "$lcp" | cut -d/ -f1-2): ";;
 esac

-if [ -n "$prefix" ]; then
-	prepend_msg "$prefix: "
-fi
-
 exit 0
@@ -118,6 +118,3 @@ ENV/

 # Allow having untracked packages in aports using a custom-something directory
 /custom-*/
-
-# child pipeline
-.ci/build-jobs.yaml
@@ -6,70 +6,66 @@ after_script:
  - .ci/lib/move_logs.sh $CI_PROJECT_DIR
 stages:
  - lint
-  - prepare
  - build
-  - autoupdate
-  - test
-variables:
-  # Default of 20 is pretty small, sometimes MRs have >20 commits in them. 100
-  # seems like a reasonable balance. If this is too low, git merge-base (from ci/
-  # common.py) can fail
-  GIT_DEPTH: 100

-# This defines the rules for when a pipeline should run.
-workflow:
-  rules:
-    # 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"
-
-# Some packages have their own yaml files defining tests. All of these should contain
-# only jobs which extend the .package-test job!
-include: "**/.gitlab-ci.yml"
+# 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: &mr_rule $CI_PIPELINE_SOURCE == "merge_request_event"
-      changes:
-        - .ci/**/*
-        - .ci/build-jobs.yaml.j2
-        - .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: *mr_rule
-      changes:
-        - .ci/*
-        - .ci/*/*
-        - .ci/build-jobs.yaml.j2
-        - .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
-  rules:
-    - if: *mr_rule
+  <<: *only-default
+  image: alpine:edge
  script:
    - .ci/lib/gitlab_prepare_ci.sh
    - .ci/shellcheck.sh
    - .ci/grep.sh
+    - .ci/codeowners.sh

 editor-config:
  stage: lint
-  rules:
-    - if: *mr_rule
+  <<: *only-default
+  image: alpine:edge
  script:
    - .ci/lib/gitlab_prepare_ci.sh
    - .ci/ec.sh
@@ -77,8 +73,7 @@ editor-config:
 # aports checks (generic)
 pytest-commits:
  stage: lint
-  rules:
-    - if: *mr_rule
+  <<: *only-default
  script:
    - .ci/lib/gitlab_prepare_ci.sh
    - .ci/pytest.sh
@@ -94,111 +89,79 @@ pytest-commits:
 # APKBUILD linting
 aport-lint:
  stage: lint
-  rules:
-    - if: *mr_rule
  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: *mr_rule
-      changes:
-        - kconfigcheck.toml
-      allow_failure: true
-    - if: *mr_rule
-      changes:
-        - device/*/linux-*/config-*
+  only:
+    refs:
+      - master
+      - merge_requests
+    changes:
+      - device/*/linux-*/config-*
+      - main/linux-*/config-*
  script:
    - .ci/lib/gitlab_prepare_ci.sh
    - .ci/kconfig.sh

-# Verify checksums
-verify-checksums:
-  stage: lint
-  rules:
-    - if: *mr_rule
-  script:
-    - .ci/lib/gitlab_prepare_ci.sh
-    - .ci/verify-checksums.sh
-
 # MR settings
 # (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:
    - apk -q add python3
  script:
-    - wget -q "https://gitlab.postmarketos.org/postmarketOS/ci-common/-/raw/master/check_mr_settings.py"
+    - wget -q "https://gitlab.com/postmarketOS/ci-common/-/raw/master/check_mr_settings.py"
    - python3 ./check_mr_settings.py

-# Calculate build of changed aports using a dynamic downstream pipelines:
-# https://docs.gitlab.com/ci/pipelines/downstream_pipelines/#dynamic-child-pipelines
-# For those to work, we need two jobs:
-# * First one (this one) that generates a valid yaml file with the job yaml as
-#   an artifact
-# * Second one (build-jobs) that has a "trigger" key with the yaml file from
-#   which to trigger pipelines
-# To avoid reworking the whole CI file, for now we are re-using this same file
-# to trigger the downstream pipeline. In that case, $CI_PIPELINE_SOURCE will
-# be set to "parent_pipeline", and only the jobs that extend .build will run
-generate-build-jobs:
-  stage: prepare
-  before_script:
-    - .ci/lib/gitlab_prepare_ci.sh
-  needs: []
-  script:
-    - wget "https://gitlab.postmarketos.org/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
-    - sh ./install_pmbootstrap.sh py3-jinja2
-    - .ci/lib/generate_build_jobs.py .ci/build-jobs.yaml.j2 .ci/build-jobs.yaml
-
-  artifacts:
-    paths:
-      - .ci/build-jobs.yaml
-  rules:
-    - if: *mr_rule
-
-build-jobs:
+# build changed aports
+.build:
  stage: build
-  trigger:
-    include:
-      - artifact: .ci/build-jobs.yaml
-        job: generate-build-jobs
-    strategy: depend
-    forward:
-      # So that we don't have to duplicate GIT_DEPTH
-      pipeline_variables: true
-  rules:
-    - if: *mr_rule
-
-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"
+  <<: *only-default
  before_script:
    - .ci/lib/gitlab_prepare_ci.sh
-  script:
-    - .ci/autoupdate.sh "$AUTOUPDATE_PACKAGES"
  after_script:
-    - .ci/lib/move_logs.sh $CI_PROJECT_DIR
+    - cp -r /home/pmos/.local/var/pmbootstrap/packages/ packages/ || true
  artifacts:
-    when: on_failure
+    expire_in: 1 week
    paths:
-      - log.txt
-      - log_testsuite_pmaports.txt
-      - pmbootstrap.cfg
+      - packages/
+  timeout: 10 h

-# Template for package test jobs defined per-package
-.package-test:
-  stage: test
-  rules:
-    - if: *mr_rule
-  before_script:
-    - .ci/lib/gitlab_prepare_ci.sh
+build-x86_64:
+  extends: .build
+  script:
+    - .ci/build-x86_64.sh
+
+build-x86:
+  extends: .build
+  script:
+    - .ci/build-x86.sh
+
+build-aarch64:
+  extends: .build
+  script:
+    - .ci/build-aarch64.sh
+
+build-armv7:
+  extends: .build
+  script:
+    - .ci/build-armv7.sh
+
+build-armhf:
+  extends: .build
+  script:
+    - .ci/build-armhf.sh
+
+build-riscv64:
+  extends: .build
+  script:
+    - .ci/build-riscv64.sh
@@ -1,31 +0,0 @@
-<!-- Use this template to kick off the discussion for changing one or more
-     related kernel config options.
-->
-
-### Read the fine manual, please :)
-
- [ ] I have read https://postmarketos.org/kconfig-adjust-multiple
-
-### What benefit does the change have?
-
-### Which option(s) would you like to change?
-
-<!-- Make sure to specify if you would like to enable/disable/set a value. -->
-
-### Did you already test that this works as expected?
-
-<!-- Not required, but recommended. If you did test it, please list which
-     device you have tested it with. -->
-
-### For which kernel configs would you do the change?
-
-<!-- If it makes sense, we encourage to adjust all kernels used by devices in
-     the main and community categories, so devices behave consistently. -->
-
- [ ] all in main and community
- [ ] certain SoC(s):
- [ ] other (please specify):
-
-
-<!-- leave this, so it applies the correct label in gitlab -->
-/label ~"change-kernel-config"
@@ -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,22 +21,18 @@
 	Replace space inside `[ ]` with `x` to fill the checkbox
 -->
 * [ ] edge (`master` branch)
-* [ ] `v25.06`
-* [ ] `v24.12`
+* [ ] `v23.12`
+* [ ] `v23.06` (supported until 2024-01-18)

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

 ### On what environment did you encounter the issue?
 #### Environments
-* [ ] COSMIC
 * [ ] GNOME Shell on Mobile
 * [ ] Phosh
 * [ ] Plasma Mobile
 * [ ] Sxmo (Wayland/Sway) **Please post the output of `sxmo_version.sh`**
 * [ ] Other: **Please fill out**
-### Which init system are you using?
-* [ ] OpenRC
-* [ ] systemd
 ### How did you get postmarketOS image?
 * [ ] from https://images.postmarketos.org
 * [ ] I built it using pmbootstrap
@@ -55,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,3 +0,0 @@
-Casey Connolly <casey.connolly@linaro.org> <caleb.connolly@linaro.org>
-Casey Connolly <kcxt@postmarketos.org> <caleb@postmarketos.org>
-
@@ -0,0 +1,14 @@
+{
+    "subject_format": {
+        "pass": [
+            "^(([a-z]+\\/[a-z\\-0-9*{}]+),?)+: [A-Za-z\\/\\-0-9*{}\\(\\)\\.,_&:=' ]+( \\(MR \\d+\\)|)$",
+            "^CI: [a-z-0-9*{}\\(\\)\\.,_ ][A-Za-z\\/\\-0-9*{}\\(\\)\\.,_ ]+( \\(MR \\d+\\)|)$",
+            "^mrhlpr.json: [a-z-0-9*{}\\(\\)\\.,_ ][A-Za-z\\/\\-0-9*{}\\(\\)\\.,_ ]+( \\(MR \\d+\\)|)$",
+            "^pmaports.cfg: [a-z-0-9*{}\\(\\)\\.,_ ][A-Za-z\\/\\-0-9*{}\\(\\)\\.,_ ]+( \\(MR \\d+\\)|)$"
+        ],
+        "unknown": [
+            "^[a-z-0-9_.*{}\\/]+: [a-z-0-9*{}\\(\\)\\.,_ ][A-Za-z\\/\\-0-9*{}\\(\\)\\.,_ ]+( \\(MR \\d+\\)|)$"
+        ]
+    }
+}
+
@@ -1 +0,0 @@
-https://postmarketos.org/funding.json
@@ -0,0 +1,59 @@
+# https://docs.gitlab.com/ee/user/project/code_owners.html
+
+device/*/*-htc-golfu/				@Newbyte
+device/*/*-pine64-pinephone/			@craftyguy @milesalan @bshah @proycon @anjandev @StacyHarper
+device/*/*-htc-m8qlul/				@Newbyte
+device/*/*-purism-librem5/			@craftyguy @bshah
+device/*/device-lg-judyln/			@Newbyte
+device/*/device-samsung-m0/			@Newbyte
+device/*/linux-postmarketos-exynos4/		@Newbyte
+device/*/linux-postmarketos-qcom-msm8939/	@Newbyte
+device/*/linux-postmarketos-stericsson/		@Newbyte
+device/*/*-qcom-sdm845/				@sdm845-mainline
+device/*/*-xiaomi-beryllium/			@joelselvaraj
+device/*/device-oneplus-enchilada/		@calebccff
+device/*/device-oneplus-fajita/			@calebccff
+device/*/firmware-oneplus-sdm845/		@calebccff
+device/*/device-shift-axolotl/			@amartinz @calebccff @dylanvanassche
+device/*/*-lenovo-21bx/				@craftyguy
+device/*/*-lenovo-a6010/			@jenneron
+device/*/*-lenovo-a6000/			@jenneron
+device/*/device-microsoft-surface-rt/		@jenneron
+device/*/device-google-nyan-big/		@jenneron
+device/*/device-google-peach-pi/		@jenneron
+device/*/linux-google-veyron/			@jenneron
+device/*/linux-postmarketos-exynos5/		@jenneron @Grimler
+device/*/soc-mediatek-mt8183/			@jenneron
+device/*/linux-google-nyan/			@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-snow/			@jenneron
+device/*/firmware-google-veyron-brcm/		@jenneron
+device/*/device-google-peach-pit/		@jenneron
+device/*/device-lg-judyp/			@jenneron
+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
+device/*/device-samsung-coreprimevelte/		@legolivesmatter @balejk
+device/*/linux-samsung-coreprimevelte/		@legolivesmatter @balejk
+
+main/postmarketos-update-depthcharge-kernel/	@jenneron
+main/osk-sdl/					@craftyguy
+main/postmarketos-ui-plasma-mobile/		@bshah
+main/ttyescape/					@calebccff
+device/*/u-boot-librem5/			@craftyguy @bshah
+device/*/alsa-ucm-conf-google-kukui/		@jenneron @binarycraft
+device/*/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
@@ -42,19 +42,6 @@ commit title can opt to use the following format:

 	manufacturer-codename: description of change

-### Changes to packages inside of the systemd directory
-
-We also shorten the prefixes for packages in `extra-repos/systemd`.
-When the `systemd` package itself gets changed, use `systemd: ` as
-prefix. For example:
-
-	systemd: add triggers for reloading/restarting services
-
-When another package inside the systemd directory gets changed, use
-`systemd/$pkgname: ` as prefix. For example:
-
-	systemd/cups: restart on upgrade
-
 ### Moving devices between categories

 As we do not include directory prefixes in device-related commits,
@@ -1,8 +1,4 @@
-# postmarketOS aports repository
-
-This repository contains the APKBUILD files for postmarketOS-specific packages, along with the required patches and scripts, if any.
-
-There are many more packages defined in the [Alpine Linux aports](https://gitlab.alpinelinux.org/alpine/aports/) on which these packages depend.
+# postmarketOS aports

 Helpful resources:
 * [How to create a package](https://wiki.postmarketos.org/wiki/Create_a_package)
@@ -8,32 +8,14 @@ branch_pmaports=master
 branch_aports=master
 mirrordir_alpine=edge

-[v25.06]
-description=Upcoming stable release (DO NOT USE)
-branch_pmaports=v25.06
-branch_aports=3.22-stable
-mirrordir_alpine=v3.22
-
-[v24.12]
-description=Latest release / Recommended for best stability
-branch_pmaports=v24.12
-branch_aports=3.21-stable
-mirrordir_alpine=v3.21
-
-[v24.06]
-description=Old release (unsupported)
-branch_pmaports=v24.06
-branch_aports=3.20-stable
-mirrordir_alpine=v3.20
-
 [v23.12]
-description=Old release (unsupported)
+description=Latest release / Recommended for best stability
 branch_pmaports=v23.12
 branch_aports=3.19-stable
 mirrordir_alpine=v3.19

 [v23.06]
-description=Old release (unsupported)
+description=Old release (supported until 2024-01-18)
 branch_pmaports=v23.06
 branch_aports=3.18-stable
 mirrordir_alpine=v3.18
@@ -7,7 +7,7 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi

 pkgname=busybox-static-aarch64
-pkgver=1.37.0
+pkgver=1.36.1
 pkgrel=18

 _arch="aarch64"
@@ -32,5 +32,5 @@ package() {
 }

 sha512sums="
-6073862965c61eeaeac5b733e6e96dfae58052bcd6f6695883991ba8b6ae6d282d8b3aeabebb31c8be00c167e388e1ba645fd264e562371d483c8920d262cf2e  busybox-static-1.37.0-r18-aarch64-edge.apk
+08f68b23bd880be12f95c5e1f071891f6b658fe7576f63d54e71d7390e4afc58de01813b2ea628f2b062830a89b0f69e8bd8a2b15fdb08bb9aba9e2a08971b0b  busybox-static-1.36.1-r18-aarch64-edge.apk
 "
@@ -7,7 +7,7 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi

 pkgname=busybox-static-armhf
-pkgver=1.37.0
+pkgver=1.36.1
 pkgrel=18

 _arch="armhf"
@@ -32,5 +32,5 @@ package() {
 }

 sha512sums="
-7b40353ad8bc4484376572b49195a7449bbfc3bba75b58e77db31f4370752672e9d82e3af0f8d82e1eb0a12ac996db0b4577b2ba8641353343358f02325b7a39  busybox-static-1.37.0-r18-armhf-edge.apk
+20b11081b5d1f25298fd4d8dfde51062f5c65060f5b53840eaad6fb69b94d64c5f5e522c9286f9a56cef4a9c88bdf53dcd385f47451b1563faf2058f1ea928cb  busybox-static-1.36.1-r18-armhf-edge.apk
 "
@@ -7,7 +7,7 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi

 pkgname=busybox-static-armv7
-pkgver=1.37.0
+pkgver=1.36.1
 pkgrel=18

 _arch="armv7"
@@ -32,5 +32,5 @@ package() {
 }

 sha512sums="
-c9cb8e130348b8e478c8da405eb3eab359be15656d6d7e2198906d1de1e5aa8d5bbb2d54eaf5ba9712b02eedcba0d9a4d9e9e8f656bb5b6e2427e13ec960e87d  busybox-static-1.37.0-r18-armv7-edge.apk
+8f2fa87d979bdbe88eef0b9dece61001998df960e025902854b2af415b96d63ce9831dbe44d5c32b671c313efdfe9e22743a26de73febcc92d8d45d944ad66c0  busybox-static-1.36.1-r18-armv7-edge.apk
 "
@@ -5,7 +5,7 @@

 pkgname=ccache-cross-symlinks
 pkgver=3
-pkgrel=1
+pkgrel=0
 pkgdesc="Enable ccache for cross-compilers with symlinks"
 url="https://ccache.samba.org/"
 arch="noarch"
@@ -15,7 +15,7 @@ options="!check"

 package() {
 	# Keep in sync with pmb.config.build_device_architectures
-	local _archs="armhf armv7 aarch64 x86_64 x86 riscv64"
+	local _archs="armhf armv7 aarch64 x86_64 x86"

 	local _bins="c++ cc cpp g++ gcc clang clang++"
 	mkdir -p "$pkgdir/usr/lib/ccache/bin"
@@ -19,8 +19,8 @@
 # version is implemented as simple shell wrappers.

 pkgname=crossdirect
-pkgver=5.2.0
-pkgrel=1
+pkgver=5.1.0
+pkgrel=0
 pkgdesc="Wrappers to launch native cross compilers in foreign chroots"
 url="https://postmarketOS.org"
 arch="all"
@@ -31,7 +31,7 @@ source="cargo.sh crossdirect.c rustc.sh rust-qemu-linker.sh"
 build() {
 	cd "$srcdir"
 	# Architectures and binaries
-	_archs="x86_64 armhf armv7 aarch64 riscv64"
+	_archs="x86_64 armhf armv7 aarch64"
 	for _arch in $_archs; do
 		[ "$_arch" == "$CARCH" ] && continue
 		_hostspec="$(arch_to_hostspec $_arch)"
@@ -48,7 +48,7 @@ build() {

 package() {
 	# Architectures and binaries
-	_archs="x86_64 armhf armv7 aarch64 riscv64"
+	_archs="x86_64 armhf armv7 aarch64"
 	_bins="c++ cc cpp g++ gcc clang clang++"

 	# Rust wrappers
@@ -82,7 +82,7 @@ package() {

 sha512sums="
 0f4b48f250425dc57f63955fc8b38477d23db793bee367c3fbe03c3d2a559ba576434d07518310db4cae9d90d501af4051b80038b10fae94b980e537fc9374ad  cargo.sh
-b2e602b7fc95ed403d29f0d754879d5f773c39ee33e726bb10cff17b3c088406dac84f2ca6d8ad563c64370007d98af805d6ee9cd4a06fe3d4c61c0cb90c5c0c  crossdirect.c
+500107e5aff8b34e74b54982ebcd447fc41bc8283956d506561b031a055cb30ec12698047c2604918b4b6d8560fe03db427a63dff2b83c907e8494b7f5233f29  crossdirect.c
 de2aa6929bbff5db9132673e667f4525b333d062cb1f7a0597dd924de9e5c7215a9f8e2e6263b6fb5ace06f2c4b64f4ebfd0ede9b78add07c2cd08ec8613e98f  rustc.sh
 ea9bf8db3810d03d0a7395057f3d6e57f7127d87c55deaedc171c255288f5f3cc6fbcc680a5a1b92786cf573875d5dc22521173799fe2639acc97d0715ff905b  rust-qemu-linker.sh
 "
@@ -43,8 +43,9 @@

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

@@ -117,17 +118,11 @@ int main(int argc, char **argv)
 		NULL };
 	char *ldPreload = getenv("LD_PRELOAD");
 	if (ldPreload) {
-		if (strstr(ldPreload, "libfakeroot.so")) {
-			fprintf(stderr, "============================================================================================\n");
-			fprintf(stderr, "ERROR: crossdirect was called with: LD_PRELOAD=%s\n", ldPreload);
-			fprintf(stderr, "This means your package tried to run a compiler during package().\n");
-			fprintf(stderr, "This is not supported by crossdirect, and usually not a good idea.\n");
-			fprintf(stderr, "* Try to fix your APKBUILD so it does not run the compiler during package(), only in build()\n");
-			fprintf(stderr, "  * If you're using 'meson install', try to add '--no-rebuild'\n");
-			fprintf(stderr, "* If this is not possible, you can work around it by setting options=\"!pmb:crossdirect\"\n");
-			fprintf(stderr, "  (compilation will be slower!)\n");
-			fprintf(stderr, "============================================================================================\n");
-			exit(1);
+		if (strcmp(ldPreload, "/usr/lib/libfakeroot.so") == 0) {
+			env[0] = "LD_PRELOAD=/native/usr/lib/libfakeroot.so";
+		} else {
+			fprintf(stderr, "ERROR: crossdirect: can't handle LD_PRELOAD: %s\n", ldPreload);
+			exit_userfriendly();
 		}
 	}

@@ -25,9 +25,11 @@ Upstream-Status: Pending
 gcc/incpath.cc      | 21 +++++++++++++++++++++
 7 files changed, 68 insertions(+)

+diff --git a/gcc/common.opt b/gcc/common.opt
+index 862c474d3c8..64c4277c991 100644
 --- a/gcc/common.opt
 +++ b/gcc/common.opt
-@@ -715,6 +715,10 @@ Wreturn-local-addr
+@@ -711,6 +711,10 @@ Wreturn-local-addr
 Common Var(warn_return_local_addr) Init(1) Warning
 Warn about returning a pointer/reference to a local or temporary variable.
 
@@ -38,9 +40,11 @@ Upstream-Status: Pending
 Wshadow
 Common Var(warn_shadow) Warning
 Warn when one variable shadows another.  Same as -Wshadow=global.
+diff --git a/gcc/config.in b/gcc/config.in
+index 4cad077bfbe..0679fbbf4c6 100644
 --- a/gcc/config.in
 +++ b/gcc/config.in
-@@ -249,6 +249,12 @@
+@@ -236,6 +236,12 @@
 #endif
 
 
@@ -53,17 +57,19 @@ Upstream-Status: Pending
 /* Define if you want all operations on RTL (the basic data structure of the
    optimizer and back end) to be checked for dynamic type safety at runtime.
    This is quite expensive. */
+diff --git a/gcc/configure b/gcc/configure
+index c7b26d1927d..8c46369f73f 100755
 --- a/gcc/configure
 +++ b/gcc/configure
-@@ -1050,6 +1050,7 @@ enable_maintainer_mode
+@@ -1026,6 +1026,7 @@ enable_maintainer_mode
 enable_link_mutex
 enable_link_serialization
 enable_version_specific_runtime_libs
 +enable_poison_system_directories
 enable_plugin
 enable_host_shared
- enable_host_pie
-@@ -1823,6 +1824,8 @@ Optional Features:
+ enable_libquadmath_support
+@@ -1788,6 +1789,8 @@ Optional Features:
   --enable-version-specific-runtime-libs
                           specify that runtime libraries should be installed
                           in a compiler-specific directory
@@ -71,8 +77,8 @@ Upstream-Status: Pending
 +                          warn for use of native system header directories
   --enable-plugin         enable plugin support
   --enable-host-shared    build host code as shared libraries
-   --enable-host-pie       build host code as PIE
-@@ -34082,6 +34085,19 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then :
+   --disable-libquadmath-support
+@@ -31753,6 +31756,19 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then :
 fi
 
 
@@ -92,9 +98,11 @@ Upstream-Status: Pending
 # Substitute configuration variables
 
 
+diff --git a/gcc/configure.ac b/gcc/configure.ac
+index 09082e8ccae..5504bf6eb01 100644
 --- a/gcc/configure.ac
 +++ b/gcc/configure.ac
-@@ -7555,6 +7555,16 @@ AC_ARG_ENABLE(version-specific-runtime-libs,
+@@ -7292,6 +7292,16 @@ AC_ARG_ENABLE(version-specific-runtime-libs,
                 [specify that runtime libraries should be
                  installed in a compiler-specific directory])])
 
@@ -111,9 +119,11 @@ Upstream-Status: Pending
 # Substitute configuration variables
 AC_SUBST(subdirs)
 AC_SUBST(srcdir)
+diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
+index af0e5933fdb..b6731a4673c 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
-@@ -391,6 +391,7 @@ Objective-C and Objective-C++ Dialects}.
+@@ -384,6 +384,7 @@ Objective-C and Objective-C++ Dialects}.
 -Wpacked  -Wno-packed-bitfield-compat  -Wpacked-not-aligned  -Wpadded
 -Wparentheses  -Wno-pedantic-ms-format
 -Wpointer-arith  -Wno-pointer-compare  -Wno-pointer-to-int-cast
@@ -121,7 +131,7 @@ Upstream-Status: Pending
 -Wno-pragmas  -Wno-prio-ctor-dtor  -Wredundant-decls
 -Wrestrict  -Wno-return-local-addr  -Wreturn-type
 -Wno-scalar-storage-order  -Wsequence-point
-@@ -8861,6 +8862,14 @@ made up of data only and thus requires no special treatment.  But, for
+@@ -8426,6 +8427,14 @@ made up of data only and thus requires no special treatment.  But, for
 most targets, it is made up of code and thus requires the stack to be
 made executable in order for the program to work properly.
 
@@ -136,17 +146,21 @@ Upstream-Status: Pending
 @opindex Wfloat-equal
 @opindex Wno-float-equal
 @item -Wfloat-equal
+diff --git a/gcc/gcc.cc b/gcc/gcc.cc
+index 16bb07f2cdc..33b56e721d2 100644
 --- a/gcc/gcc.cc
 +++ b/gcc/gcc.cc
-@@ -1163,6 +1163,8 @@ proper position among the other output files.  */
+@@ -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
+index 4d44321183f..0f3f071b44c 100644
 --- a/gcc/incpath.cc
 +++ b/gcc/incpath.cc
@@ -26,6 +26,7 @@
@@ -184,3 +198,6 @@ Upstream-Status: Pending
 }
 
 /* Use given -I paths for #include "..." but not #include <...>, and
+-- 
+2.41.0
+
@@ -13,9 +13,11 @@ now by default.
 gcc/gcc.cc          | 1 +
 2 files changed, 4 insertions(+)

+diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
+index b6731a4673c..f393c7846c6 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
-@@ -18935,6 +18935,9 @@ For example, @option{-Wl,-Map,output.map} passes @option{-Map output.map} to the
+@@ -17961,6 +17961,9 @@ For example, @option{-Wl,-Map,output.map} passes @option{-Map output.map} to the
 linker.  When using the GNU linker, you can also get the same effect with
 @option{-Wl,-Map=output.map}.
 
@@ -25,9 +27,11 @@ now by default.
 @opindex u
 @item -u @var{symbol}
 Pretend the symbol @var{symbol} is undefined, to force linking of
+diff --git a/gcc/gcc.cc b/gcc/gcc.cc
+index 33b56e721d2..f82fae23c22 100644
 --- a/gcc/gcc.cc
 +++ b/gcc/gcc.cc
-@@ -1161,6 +1161,7 @@ proper position among the other output files.  */
+@@ -1144,6 +1144,7 @@ proper position among the other output files.  */
    "%{flto|flto=*:%<fcompare-debug*} \
     %{flto} %{fno-lto} %{flto=*} %l " LINK_PIE_SPEC \
    "%{fuse-ld=*:-fuse-ld=%*} " LINK_COMPRESS_DEBUG_SPEC \
@@ -35,3 +39,6 @@ now by default.
    "%X %{o*} %{e*} %{N} %{n} %{r}\
     %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!r:%{!nostartfiles:%S}}} \
     %{Wno-poison-system-directories:--no-poison-system-directories} \
+-- 
+2.41.0
+
@@ -9,9 +9,11 @@ Subject: [PATCH 04/35] Turn on -D_FORTIFY_SOURCE=2 by default for C, C++,
 gcc/doc/invoke.texi          | 6 ++++++
 2 files changed, 10 insertions(+)

+diff --git a/gcc/c-family/c-cppbuiltin.cc b/gcc/c-family/c-cppbuiltin.cc
+index 5d64625fcd7..868d69506e4 100644
 --- a/gcc/c-family/c-cppbuiltin.cc
 +++ b/gcc/c-family/c-cppbuiltin.cc
-@@ -1570,6 +1570,10 @@ c_cpp_builtins (cpp_reader *pfile)
+@@ -1546,6 +1546,10 @@ c_cpp_builtins (cpp_reader *pfile)
   builtin_define_with_value ("__REGISTER_PREFIX__", REGISTER_PREFIX, 0);
   builtin_define_with_value ("__USER_LABEL_PREFIX__", user_label_prefix, 0);
 
@@ -22,9 +24,11 @@ Subject: [PATCH 04/35] Turn on -D_FORTIFY_SOURCE=2 by default for C, C++,
   /* Misc.  */
   if (flag_gnu89_inline)
     cpp_define (pfile, "__GNUC_GNU_INLINE__");
+diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
+index f393c7846c6..ef3c14a189e 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
-@@ -12496,6 +12496,12 @@ also turns on the following optimization flags:
+@@ -11868,6 +11868,12 @@ also turns on the following optimization flags:
 Please note the warning under @option{-fgcse} about
 invoking @option{-O2} on programs that use computed gotos.
 
@@ -37,3 +41,6 @@ Subject: [PATCH 04/35] Turn on -D_FORTIFY_SOURCE=2 by default for C, C++,
 @opindex O3
 @item -O3
 Optimize yet more.  @option{-O3} turns on all optimizations specified
+-- 
+2.41.0
+
@@ -21,6 +21,8 @@ Subject: [PATCH 05/35] On linux targets pass --as-needed by default to the
 gcc/gcc.cc                         | 28 ++++++++++++++++++++--------
 14 files changed, 36 insertions(+), 19 deletions(-)

+diff --git a/gcc/config/aarch64/aarch64-linux.h b/gcc/config/aarch64/aarch64-linux.h
+index 4277f03da2a..b131983a546 100644
 --- a/gcc/config/aarch64/aarch64-linux.h
 +++ b/gcc/config/aarch64/aarch64-linux.h
@@ -35,6 +35,7 @@
@@ -31,6 +33,8 @@ Subject: [PATCH 05/35] On linux targets pass --as-needed by default to the
    %{static:-Bstatic}				\
    %{shared:-shared}				\
    %{symbolic:-Bsymbolic}			\
+diff --git a/gcc/config/alpha/linux-elf.h b/gcc/config/alpha/linux-elf.h
+index 03f783f2ad1..d946e700dda 100644
 --- a/gcc/config/alpha/linux-elf.h
 +++ b/gcc/config/alpha/linux-elf.h
@@ -37,7 +37,7 @@ along with GCC; see the file COPYING3.  If not see
@@ -42,6 +46,8 @@ Subject: [PATCH 05/35] On linux targets pass --as-needed by default to the
   %{O*:-O3} %{!O*:-O1}						\
   %{shared:-shared}						\
   %{!shared:							\
+diff --git a/gcc/config/arm/linux-elf.h b/gcc/config/arm/linux-elf.h
+index 7b7b7cbbe14..49c050c6f2c 100644
 --- a/gcc/config/arm/linux-elf.h
 +++ b/gcc/config/arm/linux-elf.h
@@ -70,6 +70,7 @@
@@ -52,6 +58,8 @@ Subject: [PATCH 05/35] On linux targets pass --as-needed by default to the
    %{mbig-endian:-EB} %{mlittle-endian:-EL}" \
    SUBTARGET_EXTRA_LINK_SPEC
 
+diff --git a/gcc/config/gnu-user.h b/gcc/config/gnu-user.h
+index eda8010b133..b26b17f2f2a 100644
 --- a/gcc/config/gnu-user.h
 +++ b/gcc/config/gnu-user.h
@@ -136,7 +136,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
@@ -78,6 +86,8 @@ Subject: [PATCH 05/35] On linux targets pass --as-needed by default to the
 #endif
 
 #undef TARGET_F951_OPTIONS
+diff --git a/gcc/config/i386/gnu-user.h b/gcc/config/i386/gnu-user.h
+index a79b739089d..e0752673dff 100644
 --- a/gcc/config/i386/gnu-user.h
 +++ b/gcc/config/i386/gnu-user.h
@@ -68,7 +68,7 @@ along with GCC; see the file COPYING3.  If not see
@@ -89,6 +99,8 @@ Subject: [PATCH 05/35] On linux targets pass --as-needed by default to the
   %{!shared: \
     %{!static: \
       %{!static-pie: \
+diff --git a/gcc/config/i386/gnu-user64.h b/gcc/config/i386/gnu-user64.h
+index 3b63b99acf6..759bf0db86f 100644
 --- a/gcc/config/i386/gnu-user64.h
 +++ b/gcc/config/i386/gnu-user64.h
@@ -56,6 +56,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
@@ -99,6 +111,8 @@ Subject: [PATCH 05/35] On linux targets pass --as-needed by default to the
   %{shared:-shared} \
   %{!shared: \
     %{!static: \
+diff --git a/gcc/config/ia64/linux.h b/gcc/config/ia64/linux.h
+index 5dfd428aa17..02656dad7fc 100644
 --- a/gcc/config/ia64/linux.h
 +++ b/gcc/config/ia64/linux.h
@@ -58,7 +58,7 @@ do {						\
@@ -110,6 +124,8 @@ Subject: [PATCH 05/35] On linux targets pass --as-needed by default to the
   %{shared:-shared} \
   %{!shared: \
     %{!static: \
+diff --git a/gcc/config/mips/gnu-user.h b/gcc/config/mips/gnu-user.h
+index a4e5380b589..3cc61bce69f 100644
 --- a/gcc/config/mips/gnu-user.h
 +++ b/gcc/config/mips/gnu-user.h
@@ -55,6 +55,7 @@ along with GCC; see the file COPYING3.  If not see
@@ -120,6 +136,8 @@ Subject: [PATCH 05/35] On linux targets pass --as-needed by default to the
   %{!shared: \
     %{!static: \
       %{rdynamic:-export-dynamic} \
+diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h
+index 3e625e0f867..f8c2c351e5a 100644
 --- a/gcc/config/riscv/linux.h
 +++ b/gcc/config/riscv/linux.h
@@ -48,6 +48,7 @@ along with GCC; see the file COPYING3.  If not see
@@ -129,10 +147,12 @@ Subject: [PATCH 05/35] On linux targets pass --as-needed by default to the
 +-as-needed \
 -melf" XLEN_SPEC DEFAULT_ENDIAN_SPEC "riscv" LD_EMUL_SUFFIX " \
 %{mno-relax:--no-relax} \
- -X \
+ %{mbig-endian:-EB} \
+diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h
+index 9e457033d11..08016bf224d 100644
 --- a/gcc/config/rs6000/linux64.h
 +++ b/gcc/config/rs6000/linux64.h
-@@ -378,13 +378,13 @@ extern int dot_symbols;
+@@ -377,13 +377,13 @@ extern int dot_symbols;
 					   " -m elf64ppc")
 #endif
 
@@ -148,9 +168,11 @@ Subject: [PATCH 05/35] On linux targets pass --as-needed by default to the
   %{!static-pie: \
     %{rdynamic:-export-dynamic} \
     -dynamic-linker " GNU_USER_DYNAMIC_LINKER64 "}}} \
+diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h
+index ae932fc22f0..c8ff0c6dc8e 100644
 --- a/gcc/config/rs6000/sysv4.h
 +++ b/gcc/config/rs6000/sysv4.h
-@@ -781,7 +781,7 @@ GNU_USER_TARGET_CC1_SPEC
+@@ -780,7 +780,7 @@ GNU_USER_TARGET_CC1_SPEC
 #define GNU_USER_DYNAMIC_LINKER GLIBC_DYNAMIC_LINKER
 #endif
 
@@ -159,6 +181,8 @@ Subject: [PATCH 05/35] On linux targets pass --as-needed by default to the
   %{rdynamic:-export-dynamic} \
   -dynamic-linker " GNU_USER_DYNAMIC_LINKER "}}"
 
+diff --git a/gcc/config/s390/linux.h b/gcc/config/s390/linux.h
+index 02aa1edaff8..64df5801134 100644
 --- a/gcc/config/s390/linux.h
 +++ b/gcc/config/s390/linux.h
@@ -82,7 +82,7 @@ along with GCC; see the file COPYING3.  If not see
@@ -170,6 +194,8 @@ Subject: [PATCH 05/35] On linux targets pass --as-needed by default to the
    %{shared:-shared} \
    %{!shared: \
       %{static:-static} \
+diff --git a/gcc/config/sparc/linux.h b/gcc/config/sparc/linux.h
+index 0e33b3cac2c..c2f44546e62 100644
 --- a/gcc/config/sparc/linux.h
 +++ b/gcc/config/sparc/linux.h
@@ -81,7 +81,7 @@ extern const char *host_detect_local_cpu (int argc, const char **argv);
@@ -181,9 +207,11 @@ Subject: [PATCH 05/35] On linux targets pass --as-needed by default to the
   %{!mno-relax:%{!r:-relax}} \
   %{!shared: \
     %{!static: \
+diff --git a/gcc/gcc.cc b/gcc/gcc.cc
+index f82fae23c22..da6417dd0d1 100644
 --- a/gcc/gcc.cc
 +++ b/gcc/gcc.cc
-@@ -771,8 +771,11 @@ proper position among the other output files.  */
+@@ -754,8 +754,11 @@ proper position among the other output files.  */
 #ifdef LIBASAN_EARLY_SPEC
 #define LIBASAN_SPEC STATIC_LIBASAN_LIBS
 #elif defined(HAVE_LD_STATIC_DYNAMIC)
@@ -197,7 +225,7 @@ Subject: [PATCH 05/35] On linux targets pass --as-needed by default to the
 		     STATIC_LIBASAN_LIBS
 #else
 #define LIBASAN_SPEC "-lasan" STATIC_LIBASAN_LIBS
-@@ -807,8 +810,11 @@ proper position among the other output files.  */
+@@ -790,8 +793,11 @@ proper position among the other output files.  */
 #ifdef LIBTSAN_EARLY_SPEC
 #define LIBTSAN_SPEC STATIC_LIBTSAN_LIBS
 #elif defined(HAVE_LD_STATIC_DYNAMIC)
@@ -211,7 +239,7 @@ Subject: [PATCH 05/35] On linux targets pass --as-needed by default to the
 		     STATIC_LIBTSAN_LIBS
 #else
 #define LIBTSAN_SPEC "-ltsan" STATIC_LIBTSAN_LIBS
-@@ -825,8 +831,11 @@ proper position among the other output files.  */
+@@ -808,8 +814,11 @@ proper position among the other output files.  */
 #ifdef LIBLSAN_EARLY_SPEC
 #define LIBLSAN_SPEC STATIC_LIBLSAN_LIBS
 #elif defined(HAVE_LD_STATIC_DYNAMIC)
@@ -225,7 +253,7 @@ Subject: [PATCH 05/35] On linux targets pass --as-needed by default to the
 		     STATIC_LIBLSAN_LIBS
 #else
 #define LIBLSAN_SPEC "-llsan" STATIC_LIBLSAN_LIBS
-@@ -841,8 +850,11 @@ proper position among the other output files.  */
+@@ -824,8 +833,11 @@ proper position among the other output files.  */
 #define STATIC_LIBUBSAN_LIBS \
   " %{static-libubsan|static:%:include(libsanitizer.spec)%(link_libubsan)}"
 #ifdef HAVE_LD_STATIC_DYNAMIC
@@ -239,3 +267,6 @@ Subject: [PATCH 05/35] On linux targets pass --as-needed by default to the
 		     STATIC_LIBUBSAN_LIBS
 #else
 #define LIBUBSAN_SPEC "-lubsan" STATIC_LIBUBSAN_LIBS
+-- 
+2.41.0
+
@@ -7,10 +7,12 @@ Subject: [PATCH 06/35] Enable -Wformat and -Wformat-security by default.
 gcc/c-family/c.opt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

+diff --git a/gcc/c-family/c.opt b/gcc/c-family/c.opt
+index a75038930ae..b98726f33ed 100644
 --- a/gcc/c-family/c.opt
 +++ b/gcc/c-family/c.opt
-@@ -774,7 +774,7 @@ Warn about function calls with format strings that write past the end
- of the destination region.
+@@ -704,7 +704,7 @@ Warn about function calls with format strings that write past the end
+ of the destination region.  Same as -Wformat-overflow=1.
 
 Wformat-security
 -C ObjC C++ ObjC++ Var(warn_format_security) Warning LangEnabledBy(C ObjC C++ ObjC++,Wformat=, warn_format >= 2, 0)
@@ -18,7 +20,7 @@ Subject: [PATCH 06/35] Enable -Wformat and -Wformat-security by default.
 Warn about possible security problems with format functions.
 
 Wformat-signedness
-@@ -799,7 +799,7 @@ C ObjC C++ ObjC++ Var(warn_format_zero_length) Warning LangEnabledBy(C ObjC C++
+@@ -725,7 +725,7 @@ C ObjC C++ ObjC++ Var(warn_format_zero_length) Warning LangEnabledBy(C ObjC C++
 Warn about zero-length formats.
 
 Wformat=
@@ -26,4 +28,7 @@ Subject: [PATCH 06/35] Enable -Wformat and -Wformat-security by default.
 +C ObjC C++ ObjC++ Joined RejectNegative UInteger Var(warn_format) Init(1) Warning LangEnabledBy(C ObjC C++ ObjC++,Wall, 1, 0) IntegerRange(0, 2)
 Warn about printf/scanf/strftime/strfmon format string anomalies.
 
- Wframe-address
+ Wformat-overflow=
+-- 
+2.41.0
+
@@ -7,9 +7,11 @@ Subject: [PATCH 07/35] Enable -Wtrampolines by default.
 gcc/common.opt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

+diff --git a/gcc/common.opt b/gcc/common.opt
+index 64c4277c991..c24839d32bc 100644
 --- a/gcc/common.opt
 +++ b/gcc/common.opt
-@@ -811,7 +811,7 @@ Common Var(warn_system_headers) Warning
+@@ -803,7 +803,7 @@ Common Var(warn_system_headers) Warning
 Do not suppress warnings from system headers.
 
 Wtrampolines
@@ -18,3 +20,6 @@ Subject: [PATCH 07/35] Enable -Wtrampolines by default.
 Warn whenever a trampoline is generated.
 
 Wtrivial-auto-var-init
+-- 
+2.41.0
+
@@ -9,9 +9,11 @@ Subject: [PATCH 08/35] Disable ssp on -nostdlib, -nodefaultlibs and
 gcc/params.opt | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

+diff --git a/gcc/gcc.cc b/gcc/gcc.cc
+index da6417dd0d1..b5a6f200635 100644
 --- a/gcc/gcc.cc
 +++ b/gcc/gcc.cc
-@@ -1000,6 +1000,12 @@ proper position among the other output files.  */
+@@ -983,6 +983,12 @@ proper position among the other output files.  */
 #define LINK_GCC_C_SEQUENCE_SPEC "%G %{!nolibc:%L %G}"
 #endif
 
@@ -24,18 +26,20 @@ Subject: [PATCH 08/35] Disable ssp on -nostdlib, -nodefaultlibs and
 #ifndef LINK_SSP_SPEC
 #ifdef TARGET_LIBC_PROVIDES_SSP
 #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
-@@ -1305,7 +1311,7 @@ static const char *cc1_options =
+@@ -1282,7 +1288,7 @@ static const char *cc1_options =
  %{-version:--version}\
  %{-help=*:--help=%*}\
  %{!fsyntax-only:%{S:%W{o*}%{!o*:-o %w%b.s}}}\
 - %{fsyntax-only:-o %j} %{-param*}\
 + %{fsyntax-only:-o %j} %{-param*} " NO_SSP_SPEC "\
  %{coverage:-fprofile-arcs -ftest-coverage}\
-  %{fprofile-arcs|fcondition-coverage|fprofile-generate*|coverage:\
+  %{fprofile-arcs|fprofile-generate*|coverage:\
    %{!fprofile-update=single:\
+diff --git a/gcc/params.opt b/gcc/params.opt
+index 823cdb2ff85..5b096899b40 100644
 --- a/gcc/params.opt
 +++ b/gcc/params.opt
-@@ -1013,7 +1013,7 @@ Common Joined UInteger Var(param_ssa_name_def_chain_limit) Init(512) Param Optim
+@@ -1006,7 +1006,7 @@ Common Joined UInteger Var(param_ssa_name_def_chain_limit) Init(512) Param Optim
 The maximum number of SSA_NAME assignments to follow in determining a value.
 
 -param=ssp-buffer-size=
@@ -44,3 +48,6 @@ Subject: [PATCH 08/35] Disable ssp on -nostdlib, -nodefaultlibs and
 The lower bound for a buffer to be considered for stack smashing protection.
 
 -param=stack-clash-protection-guard-size=
+-- 
+2.41.0
+
@@ -9,9 +9,11 @@ Subject: [PATCH 12/35] libgcc_s
 libgcc/config/i386/t-linux     | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

+diff --git a/gcc/config/i386/i386-expand.cc b/gcc/config/i386/i386-expand.cc
+index 0d817fc3f3b..2e99db00db9 100644
 --- a/gcc/config/i386/i386-expand.cc
 +++ b/gcc/config/i386/i386-expand.cc
-@@ -13089,10 +13089,10 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget,
+@@ -12691,10 +12691,10 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget,
     {
     case IX86_BUILTIN_CPU_INIT:
       {
@@ -24,6 +26,8 @@ Subject: [PATCH 12/35] libgcc_s
 	call_expr = build_call_expr (fndecl, 0);
 	return expand_expr (call_expr, target, mode, EXPAND_NORMAL);
       }
+diff --git a/libgcc/config/i386/cpuinfo.c b/libgcc/config/i386/cpuinfo.c
+index 50b6d8248a2..724ced402a1 100644
 --- a/libgcc/config/i386/cpuinfo.c
 +++ b/libgcc/config/i386/cpuinfo.c
@@ -63,7 +63,7 @@ __cpu_indicator_init (void)
@@ -37,6 +41,8 @@ Subject: [PATCH 12/35] libgcc_s
 +int __cpu_indicator_init_local (void)
 +  __attribute__ ((weak, alias ("__cpu_indicator_init")));
 #endif
+diff --git a/libgcc/config/i386/t-linux b/libgcc/config/i386/t-linux
+index 8506a635790..564296f788e 100644
 --- a/libgcc/config/i386/t-linux
 +++ b/libgcc/config/i386/t-linux
@@ -3,5 +3,5 @@
@@ -46,3 +52,6 @@ Subject: [PATCH 12/35] libgcc_s
 -HOST_LIBGCC2_CFLAGS += -mlong-double-80 -DUSE_ELF_SYMVER $(CET_FLAGS)
 +HOST_LIBGCC2_CFLAGS += -mlong-double-80 $(CET_FLAGS)
 CRTSTUFF_T_CFLAGS += $(CET_FLAGS)
+-- 
+2.41.0
+
@@ -4,25 +4,28 @@ Date: Sat, 7 Nov 2015 02:08:05 +0000
 Subject: [PATCH 13/35] nopie

 ---
- gcc/configure    | 25 +++++++++++++++++++++++++
- gcc/configure.ac | 11 +++++++++++
- 2 files changed, 36 insertions(+)
+ gcc/configure    | 27 +++++++++++++++++++++++++++
+ gcc/configure.ac | 13 +++++++++++++
+ 2 files changed, 40 insertions(+)

+diff --git a/gcc/configure b/gcc/configure
+index 8c46369f73f..e59cbee1767 100755
 --- a/gcc/configure
 +++ b/gcc/configure
-@@ -34606,6 +34606,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
@@ -33,46 +36,40 @@ Subject: [PATCH 13/35] nopie
 +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
-@@ -34623,6 +34646,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 5504bf6eb01..57268319de1 100644
 --- a/gcc/configure.ac
 +++ b/gcc/configure.ac
-@@ -7821,6 +7821,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
-@@ -7838,6 +7847,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
+
@@ -7,9 +7,11 @@ Subject: [PATCH 15/35] build: fix CXXFLAGS_FOR_BUILD passing
 Makefile.in | 1 +
 1 file changed, 1 insertion(+)

+diff --git a/Makefile.in b/Makefile.in
+index 06a9398e172..6ff2b3f9925 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -179,6 +179,7 @@ BUILD_EXPORTS = \
+@@ -178,6 +178,7 @@ BUILD_EXPORTS = \
 # built for the build system to override those in BASE_FLAGS_TO_PASS.
 EXTRA_BUILD_FLAGS = \
 	CFLAGS="$(CFLAGS_FOR_BUILD)" \
@@ -17,3 +19,6 @@ Subject: [PATCH 15/35] build: fix CXXFLAGS_FOR_BUILD passing
 	LDFLAGS="$(LDFLAGS_FOR_BUILD)"
 
 # This is the list of directories to built for the host system.
+-- 
+2.41.0
+
@@ -12,9 +12,11 @@ Subject: [PATCH 17/35] Alpine musl package provides libssp_nonshared.a. We
 gcc/gcc.cc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

+diff --git a/gcc/gcc.cc b/gcc/gcc.cc
+index b5a6f200635..6cbb726599b 100644
 --- a/gcc/gcc.cc
 +++ b/gcc/gcc.cc
-@@ -1008,8 +1008,7 @@ proper position among the other output files.  */
+@@ -991,8 +991,7 @@ proper position among the other output files.  */
 
 #ifndef LINK_SSP_SPEC
 #ifdef TARGET_LIBC_PROVIDES_SSP
@@ -24,3 +26,6 @@ Subject: [PATCH 17/35] Alpine musl package provides libssp_nonshared.a. We
 #else
 #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
 		       "|fstack-protector-strong|fstack-protector-explicit" \
+-- 
+2.41.0
+
@@ -8,9 +8,11 @@ Subject: [PATCH 18/35] DP: Use --push-state/--pop-state for gold as well when
 gcc/gcc.cc | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

+diff --git a/gcc/gcc.cc b/gcc/gcc.cc
+index 6cbb726599b..59390fd39d6 100644
 --- a/gcc/gcc.cc
 +++ b/gcc/gcc.cc
-@@ -772,10 +772,10 @@ proper position among the other output files.  */
+@@ -755,10 +755,10 @@ proper position among the other output files.  */
 #define LIBASAN_SPEC STATIC_LIBASAN_LIBS
 #elif defined(HAVE_LD_STATIC_DYNAMIC)
 #define LIBASAN_SPEC "%{static-libasan:" LD_STATIC_OPTION "}" \
@@ -23,7 +25,7 @@ Subject: [PATCH 18/35] DP: Use --push-state/--pop-state for gold as well when
 		     STATIC_LIBASAN_LIBS
 #else
 #define LIBASAN_SPEC "-lasan" STATIC_LIBASAN_LIBS
-@@ -811,10 +811,10 @@ proper position among the other output files.  */
+@@ -794,10 +794,10 @@ proper position among the other output files.  */
 #define LIBTSAN_SPEC STATIC_LIBTSAN_LIBS
 #elif defined(HAVE_LD_STATIC_DYNAMIC)
 #define LIBTSAN_SPEC "%{static-libtsan:" LD_STATIC_OPTION "}" \
@@ -36,7 +38,7 @@ Subject: [PATCH 18/35] DP: Use --push-state/--pop-state for gold as well when
 		     STATIC_LIBTSAN_LIBS
 #else
 #define LIBTSAN_SPEC "-ltsan" STATIC_LIBTSAN_LIBS
-@@ -832,10 +832,10 @@ proper position among the other output files.  */
+@@ -815,10 +815,10 @@ proper position among the other output files.  */
 #define LIBLSAN_SPEC STATIC_LIBLSAN_LIBS
 #elif defined(HAVE_LD_STATIC_DYNAMIC)
 #define LIBLSAN_SPEC "%{static-liblsan:" LD_STATIC_OPTION "}" \
@@ -49,7 +51,7 @@ Subject: [PATCH 18/35] DP: Use --push-state/--pop-state for gold as well when
 		     STATIC_LIBLSAN_LIBS
 #else
 #define LIBLSAN_SPEC "-llsan" STATIC_LIBLSAN_LIBS
-@@ -851,10 +851,10 @@ proper position among the other output files.  */
+@@ -834,10 +834,10 @@ proper position among the other output files.  */
   " %{static-libubsan|static:%:include(libsanitizer.spec)%(link_libubsan)}"
 #ifdef HAVE_LD_STATIC_DYNAMIC
 #define LIBUBSAN_SPEC "%{static-libubsan:" LD_STATIC_OPTION "}" \
@@ -62,3 +64,6 @@ Subject: [PATCH 18/35] DP: Use --push-state/--pop-state for gold as well when
 		     STATIC_LIBUBSAN_LIBS
 #else
 #define LIBUBSAN_SPEC "-lubsan" STATIC_LIBUBSAN_LIBS
+-- 
+2.41.0
+
@@ -42,12 +42,14 @@ library.
 gcc/config/riscv/t-linux | 7 +++++--
 2 files changed, 5 insertions(+), 10 deletions(-)

+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
@@ -61,11 +61,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}}"
+     %{static:-static}}"
+ 
+ #define TARGET_ASM_FILE_END file_end_indicate_exec_stack
 -
 -#define STARTFILE_PREFIX_SPEC 			\
 -   "/lib" XLEN_SPEC "/" ABI_SPEC "/ "		\
@@ -56,9 +58,11 @@ library.
 -   "/usr/lib/ "
 -
 -#define RISCV_USE_CUSTOMISED_MULTI_LIB select_by_abi
+diff --git a/gcc/config/riscv/t-linux b/gcc/config/riscv/t-linux
+index 216d2776a18..1a8a863853e 100644
 --- a/gcc/config/riscv/t-linux
 +++ b/gcc/config/riscv/t-linux
-@@ -1,5 +1,8 @@
+@@ -1,3 +1,6 @@
 -# Only XLEN and ABI affect Linux multilib dir names, e.g. /lib32/ilp32d/
 -MULTILIB_DIRNAMES := $(patsubst rv32%,lib32,$(patsubst rv64%,lib64,$(MULTILIB_DIRNAMES)))
 +MULTILIB_OPTIONS := march=rv64gc
@@ -67,5 +71,6 @@ library.
 +MULTILIB_DIRNAMES := $(patsubst rv32%,lib32,$(patsubst rv64%,lib,$(MULTILIB_DIRNAMES)))
 MULTILIB_OSDIRNAMES := $(patsubst lib%,../lib%,$(MULTILIB_DIRNAMES))
 +MULTILIB_MATCHES := march?rv64gc=march?rv64imafdc
- 
- MULTIARCH_DIRNAME := $(call if_multiarch,$(firstword $(subst -, ,$(target)))-linux-gnu)
+-- 
+2.41.0
+
@@ -9,9 +9,11 @@ highly inspired by:
 libgcc/Makefile.in | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

+diff --git a/libgcc/Makefile.in b/libgcc/Makefile.in
+index 6c4dc79ab71..023cede18a7 100644
 --- a/libgcc/Makefile.in
 +++ b/libgcc/Makefile.in
-@@ -967,8 +967,9 @@ ifneq ($(LIBUNWIND),)
+@@ -960,8 +960,9 @@ ifneq ($(LIBUNWIND),)
 all: libunwind.a
 endif
 
@@ -22,7 +24,7 @@ highly inspired by:
 ifneq ($(LIBUNWIND),)
 all: libunwind$(SHLIB_EXT)
 libgcc_s$(SHLIB_EXT): libunwind$(SHLIB_EXT)
-@@ -1173,10 +1174,6 @@ install-libunwind:
+@@ -1163,10 +1164,6 @@ install-libunwind:
 install-shared:
 	$(mkinstalldirs) $(DESTDIR)$(inst_libdir)
 
@@ -33,7 +35,7 @@ highly inspired by:
 	$(subst @multilib_dir@,$(MULTIDIR),$(subst \
 		@shlib_base_name@,libgcc_s,$(subst \
 		@shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(SHLIB_INSTALL))))
-@@ -1193,6 +1190,10 @@ ifeq ($(enable_gcov),yes)
+@@ -1183,6 +1180,10 @@ ifeq ($(enable_gcov),yes)
 	$(RANLIB) $(DESTDIR)$(inst_libdir)/libgcov.a
 endif
 
@@ -44,3 +46,6 @@ highly inspired by:
 	parts="$(INSTALL_PARTS)";				\
 	for file in $$parts; do					\
 	  rm -f $(DESTDIR)$(inst_libdir)/$$file;		\
+-- 
+2.41.0
+
@@ -4,15 +4,17 @@ Date: Fri, 21 Aug 2020 07:07:48 +0000
 Subject: [PATCH 26/35] ada: musl support fixes

 ---
- gcc/ada/Makefile.rtl | 16 ++++++++--------
+ gcc/ada/Makefile.rtl | 10 +++++-----
 gcc/ada/adaint.c     | 34 +++++++++++++++++++---------------
 gcc/ada/adaint.h     | 10 ++++------
 gcc/ada/terminals.c  |  8 ++++----
- 4 files changed, 35 insertions(+), 33 deletions(-)
+ 4 files changed, 32 insertions(+), 30 deletions(-)

+diff --git a/gcc/ada/Makefile.rtl b/gcc/ada/Makefile.rtl
+index 96306f8cc9a..090b6770ae5 100644
 --- a/gcc/ada/Makefile.rtl
 +++ b/gcc/ada/Makefile.rtl
-@@ -1558,7 +1558,7 @@ ifeq ($(strip $(filter-out %86 linux%,$(target_cpu) $(target_os))),)
+@@ -1549,7 +1549,7 @@ ifeq ($(strip $(filter-out %86 linux%,$(target_cpu) $(target_os))),)
   s-intman.adb<libgnarl/s-intman__posix.adb \
   s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \
   $(TRASYM_DWARF_UNIX_PAIRS) \
@@ -21,16 +23,7 @@ Subject: [PATCH 26/35] ada: musl support fixes
   a-exetim.adb<libgnarl/a-exetim__posix.adb \
   a-exetim.ads<libgnarl/a-exetim__default.ads \
   s-linux.ads<libgnarl/s-linux.ads \
-@@ -2145,7 +2145,7 @@ ifeq ($(strip $(filter-out loongarch% linux%,$(target_cpu) $(target_os))),)
-   g-sercom.adb<libgnat/g-sercom__linux.adb \
-   $(TRASYM_DWARF_UNIX_PAIRS) \
-   $(GNATRTL_128BIT_PAIRS) \
-  s-tsmona.adb<libgnat/s-tsmona__linux.adb \
-+  s-tsmona.adb<libgnat/s-tsmona.adb \
-   $(ATOMICS_TARGET_PAIRS) \
-   $(ATOMICS_BUILTINS_TARGET_PAIRS) \
-   system.ads<libgnat/system-linux-loongarch.ads
-@@ -2233,7 +2233,7 @@ ifeq ($(strip $(filter-out powerpc% linux%,$(target_cpu) $(target_os))),)
+@@ -2174,7 +2174,7 @@ ifeq ($(strip $(filter-out powerpc% linux%,$(target_cpu) $(target_os))),)
   s-tasinf.adb<libgnarl/s-tasinf__linux.adb \
   s-taspri.ads<libgnarl/s-taspri__posix.ads \
   $(TRASYM_DWARF_UNIX_PAIRS) \
@@ -39,7 +32,7 @@ Subject: [PATCH 26/35] ada: musl support fixes
   $(ATOMICS_TARGET_PAIRS) \
   $(ATOMICS_BUILTINS_TARGET_PAIRS) \
   system.ads<libgnat/system-linux-ppc.ads
-@@ -2268,7 +2268,7 @@ ifeq ($(strip $(filter-out powerpc% linux%,$(target_cpu) $(target_os))),)
+@@ -2205,7 +2205,7 @@ ifeq ($(strip $(filter-out powerpc% linux%,$(target_cpu) $(target_os))),)
 endif
 
 # ARM linux, GNU eabi
@@ -48,16 +41,7 @@ Subject: [PATCH 26/35] ada: musl support fixes
   LIBGNAT_TARGET_PAIRS = \
   a-intnam.ads<libgnarl/a-intnam__linux.ads \
   s-inmaop.adb<libgnarl/s-inmaop__posix.adb \
-@@ -2312,7 +2312,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 \
-@@ -2489,7 +2489,7 @@ ifeq ($(strip $(filter-out %ia64 linux%,$(target_cpu) $(target_os))),)
+@@ -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 \
   $(TRASYM_DWARF_UNIX_PAIRS) \
@@ -66,16 +50,7 @@ Subject: [PATCH 26/35] ada: musl support fixes
   $(ATOMICS_TARGET_PAIRS) \
   $(ATOMICS_BUILTINS_TARGET_PAIRS) \
   $(GNATRTL_128BIT_PAIRS) \
-@@ -2593,7 +2593,7 @@ ifeq ($(strip $(filter-out %x86_64 linux%,$(target_cpu) $(target_os))),)
-   s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \
-   s-taspri.ads<libgnarl/s-taspri__posix.ads \
-   $(TRASYM_DWARF_UNIX_PAIRS) \
-  s-tsmona.adb<libgnat/s-tsmona__linux.adb \
-+  s-tsmona.adb<libgnat/s-tsmona.adb \
-   $(ATOMICS_TARGET_PAIRS) \
-   $(X86_64_TARGET_PAIRS) \
-   $(SIMD_PATH_TARGET_PAIRS) \
-@@ -2638,7 +2638,7 @@ ifeq ($(strip $(filter-out %x32 linux%,$(target_cpu) $(target_os))),)
+@@ -2524,7 +2524,7 @@ ifeq ($(strip $(filter-out %x86_64 linux%,$(target_cpu) $(target_os))),)
   s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \
   s-taspri.ads<libgnarl/s-taspri__posix.ads \
   $(TRASYM_DWARF_UNIX_PAIRS) \
@@ -84,9 +59,11 @@ Subject: [PATCH 26/35] ada: musl support fixes
   $(ATOMICS_TARGET_PAIRS) \
   $(X86_64_TARGET_PAIRS) \
   $(SIMD_PATH_TARGET_PAIRS) \
+diff --git a/gcc/ada/adaint.c b/gcc/ada/adaint.c
+index 8522094164e..92b230a462b 100644
 --- a/gcc/ada/adaint.c
 +++ b/gcc/ada/adaint.c
-@@ -94,6 +94,11 @@
+@@ -91,6 +91,11 @@
 #include <sys/param.h>
 #include <sys/pstat.h>
 #endif
@@ -98,7 +75,7 @@ Subject: [PATCH 26/35] ada: musl support fixes
 
 #ifdef __PikeOS__
 #define __BSD_VISIBLE 1
-@@ -3465,7 +3470,6 @@ __gnat_lwp_self (void)
+@@ -3438,7 +3443,6 @@ __gnat_lwp_self (void)
 #endif
 
 #if defined (__linux__)
@@ -106,7 +83,7 @@ Subject: [PATCH 26/35] ada: musl support fixes
 
 /* glibc versions earlier than 2.7 do not define the routines to handle
    dynamically allocated CPU sets. For these targets, we use the static
-@@ -3475,7 +3479,7 @@ __gnat_lwp_self (void)
+@@ -3448,7 +3452,7 @@ __gnat_lwp_self (void)
 
 /* Dynamic cpu sets */
 
@@ -115,7 +92,7 @@ Subject: [PATCH 26/35] ada: musl support fixes
 __gnat_cpu_alloc (size_t count)
 {
   return CPU_ALLOC (count);
-@@ -3488,33 +3492,33 @@ __gnat_cpu_alloc_size (size_t count)
+@@ -3461,33 +3465,33 @@ __gnat_cpu_alloc_size (size_t count)
 }
 
 void
@@ -157,7 +134,7 @@ Subject: [PATCH 26/35] ada: musl support fixes
 }
 
 size_t
-@@ -3524,23 +3528,23 @@ __gnat_cpu_alloc_size (size_t count ATTRIBUTE_UNUSED)
+@@ -3497,23 +3501,23 @@ __gnat_cpu_alloc_size (size_t count ATTRIBUTE_UNUSED)
 }
 
 void
@@ -186,6 +163,8 @@ Subject: [PATCH 26/35] ada: musl support fixes
 }
 #endif /* !CPU_ALLOC */
 #endif /* __linux__ */
+diff --git a/gcc/ada/adaint.h b/gcc/ada/adaint.h
+index 987432c9307..4d782f07de9 100644
 --- a/gcc/ada/adaint.h
 +++ b/gcc/ada/adaint.h
@@ -319,13 +319,11 @@ extern void   *__gnat_lwp_self			   (void);
@@ -206,9 +185,11 @@ Subject: [PATCH 26/35] ada: musl support fixes
 #endif
 
 #if defined (_WIN32)
+diff --git a/gcc/ada/terminals.c b/gcc/ada/terminals.c
+index c0ee4a16bb1..ed796a48c1b 100644
 --- a/gcc/ada/terminals.c
 +++ b/gcc/ada/terminals.c
-@@ -1134,7 +1134,7 @@ __gnat_setup_winsize (void *desc ATTRIBUTE_UNUSED,
+@@ -1127,7 +1127,7 @@ __gnat_setup_winsize (void *desc ATTRIBUTE_UNUSED,
 /* POSIX does not specify how to open the master side of a terminal.Several
    methods are available (system specific):
       1- using a cloning device (USE_CLONE_DEVICE)
@@ -217,7 +198,7 @@ Subject: [PATCH 26/35] ada: musl support fixes
       3- openpty                (USE_OPENPTY)
 
    When using the cloning device method, the macro USE_CLONE_DEVICE should
-@@ -1148,7 +1148,7 @@ __gnat_setup_winsize (void *desc ATTRIBUTE_UNUSED,
+@@ -1141,7 +1141,7 @@ __gnat_setup_winsize (void *desc ATTRIBUTE_UNUSED,
 #if defined (__APPLE__) || defined (BSD)
 #define USE_OPENPTY
 #elif defined (__linux__)
@@ -226,7 +207,7 @@ Subject: [PATCH 26/35] ada: musl support fixes
 #elif defined (__sun__)
 #define USE_CLONE_DEVICE "/dev/ptmx"
 #elif defined (_AIX)
-@@ -1197,8 +1197,8 @@ allocate_pty_desc (pty_desc **desc) {
+@@ -1190,8 +1190,8 @@ allocate_pty_desc (pty_desc **desc) {
    int  master_fd   = -1;
    char *slave_name = NULL;
 
@@ -237,3 +218,6 @@ Subject: [PATCH 26/35] ada: musl support fixes
 #elif defined (USE_OPENPTY)
   status = openpty (&master_fd, &slave_fd, NULL, NULL, NULL);
 #elif defined (USE_CLONE_DEVICE)
+-- 
+2.41.0
+
@@ -7,8 +7,8 @@ Subject: [PATCH 27/35] configure: Add --enable-autolink-libatomic, use in
 This fixes issues with RISC-V.
 ---
 Makefile.in           |  1 +
- gcc/config/gnu-user.h | 12 +++++++++++-
 gcc/config.in         |  6 ++++++
+ gcc/config/gnu-user.h | 12 +++++++++++-
 gcc/configure         | 31 ++++++++++++++++++++++++++++++-
 gcc/configure.ac      | 21 +++++++++++++++++++++
 gcc/doc/install.texi  |  8 ++++++++
@@ -17,9 +17,11 @@ This fixes issues with RISC-V.
 gcc/gcc.cc            | 12 +++++++++++-
 9 files changed, 102 insertions(+), 5 deletions(-)

+diff --git a/Makefile.in b/Makefile.in
+index 6ff2b3f9925..394b105b271 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -237,6 +237,7 @@ HOST_EXPORTS = \
+@@ -235,6 +235,7 @@ HOST_EXPORTS = \
 	RANLIB_FOR_TARGET="$(RANLIB_FOR_TARGET)"; export RANLIB_FOR_TARGET; \
 	READELF_FOR_TARGET="$(READELF_FOR_TARGET)"; export READELF_FOR_TARGET; \
 	TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export TOPLEVEL_CONFIGURE_ARGUMENTS; \
@@ -27,6 +29,25 @@ This fixes issues with RISC-V.
 	HOST_LIBS="$(STAGE1_LIBS)"; export HOST_LIBS; \
 	GMPLIBS="$(HOST_GMPLIBS)"; export GMPLIBS; \
 	GMPINC="$(HOST_GMPINC)"; export GMPINC; \
+diff --git a/gcc/config.in b/gcc/config.in
+index 0679fbbf4c6..ee81139b385 100644
+--- a/gcc/config.in
+++ b/gcc/config.in
+@@ -118,6 +118,12 @@
+ #endif
+ 
+ 
+/* Define if libatomic should always be linked. */
+#ifndef USED_FOR_TARGET
+#undef ENABLE_AUTOLINK_LIBATOMIC
+#endif
+
+
+ /* Define to 1 to specify that we are using the BID decimal floating point
+    format instead of DPD */
+ #ifndef USED_FOR_TARGET
+diff --git a/gcc/config/gnu-user.h b/gcc/config/gnu-user.h
+index b26b17f2f2a..3f64ea46180 100644
 --- a/gcc/config/gnu-user.h
 +++ b/gcc/config/gnu-user.h
@@ -109,8 +109,18 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
@@ -49,24 +70,11 @@ This fixes issues with RISC-V.
    %{static|static-pie:--end-group}%{!static:%{!static-pie:%G}}"
 
 #undef LINK_GCC_C_SEQUENCE_SPEC
--- a/gcc/config.in
-+++ b/gcc/config.in
-@@ -131,6 +131,12 @@
- #endif
- 
- 
-+/* Define if libatomic should always be linked. */
-+#ifndef USED_FOR_TARGET
-+#undef ENABLE_AUTOLINK_LIBATOMIC
-+#endif
-+
-+
- /* Define to 1 to specify that we are using the BID decimal floating point
-    format instead of DPD */
- #ifndef USED_FOR_TARGET
+diff --git a/gcc/configure b/gcc/configure
+index e59cbee1767..787c35d4e25 100755
 --- a/gcc/configure
 +++ b/gcc/configure
-@@ -1002,6 +1002,7 @@ with_changes_root_url
+@@ -984,6 +984,7 @@ with_changes_root_url
 enable_languages
 with_multilib_list
 with_multilib_generator
@@ -74,7 +82,7 @@ This fixes issues with RISC-V.
 with_zstd
 with_zstd_include
 with_zstd_lib
-@@ -1739,6 +1740,9 @@ Optional Features:
+@@ -1713,6 +1714,9 @@ Optional Features:
   --disable-shared        don't provide a shared libgcc
   --disable-gcov          don't provide libgcov and related host tools
   --enable-languages=LIST specify which front-ends to build
@@ -84,7 +92,7 @@ This fixes issues with RISC-V.
   --disable-rpath         do not hardcode runtime library paths
   --enable-sjlj-exceptions
                           arrange to use setjmp/longjmp exception handling
-@@ -8380,7 +8384,6 @@ else
+@@ -8329,7 +8333,6 @@ else
 fi
 
 
@@ -92,7 +100,7 @@ This fixes issues with RISC-V.
 # Check whether --with-multilib-generator was given.
 if test "${with_multilib_generator+set}" = set; then :
   withval=$with_multilib_generator; :
-@@ -8388,6 +8391,32 @@ else
+@@ -8337,6 +8340,32 @@ else
   with_multilib_generator=default
 fi
 
@@ -125,9 +133,11 @@ This fixes issues with RISC-V.
 
 # -------------------------
 # Checks for other programs
+diff --git a/gcc/configure.ac b/gcc/configure.ac
+index 57268319de1..56bcaa87620 100644
 --- a/gcc/configure.ac
 +++ b/gcc/configure.ac
-@@ -1215,6 +1215,27 @@ AC_ARG_WITH(multilib-generator,
+@@ -1199,6 +1199,27 @@ AC_ARG_WITH(multilib-generator,
 :,
 with_multilib_generator=default)
 
@@ -155,9 +165,11 @@ This fixes issues with RISC-V.
 # -------------------------
 # Checks for other programs
 # -------------------------
+diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi
+index b30d3691fe6..ccc8e5dbb00 100644
 --- a/gcc/doc/install.texi
 +++ b/gcc/doc/install.texi
-@@ -2525,6 +2525,14 @@ files, but these changed header paths may conflict with some compilation
+@@ -2377,6 +2377,14 @@ files, but these changed header paths may conflict with some compilation
 environments.  Enabled by default, and may be disabled using
 @option{--disable-canonical-system-headers}.
 
@@ -172,9 +184,11 @@ This fixes issues with RISC-V.
 @item --with-glibc-version=@var{major}.@var{minor}
 Tell GCC that when the GNU C Library (glibc) is used on the target it
 will be version @var{major}.@var{minor} or later.  Normally this can
+diff --git a/gcc/doc/tm.texi b/gcc/doc/tm.texi
+index a660e33739b..6183c407a2b 100644
 --- a/gcc/doc/tm.texi
 +++ b/gcc/doc/tm.texi
-@@ -390,7 +390,13 @@ the argument @option{-lgcc} to tell the linker to do the search.
+@@ -381,7 +381,13 @@ the argument @option{-lgcc} to tell the linker to do the search.
 
 @defmac LINK_GCC_C_SEQUENCE_SPEC
 The sequence in which libgcc and libc are specified to the linker.
@@ -189,9 +203,11 @@ This fixes issues with RISC-V.
 @end defmac
 
 @defmac POST_LINK_SPEC
+diff --git a/gcc/doc/tm.texi.in b/gcc/doc/tm.texi.in
+index f7ab5d48a63..281540aba68 100644
 --- a/gcc/doc/tm.texi.in
 +++ b/gcc/doc/tm.texi.in
-@@ -390,7 +390,13 @@ the argument @option{-lgcc} to tell the linker to do the search.
+@@ -381,7 +381,13 @@ the argument @option{-lgcc} to tell the linker to do the search.
 
 @defmac LINK_GCC_C_SEQUENCE_SPEC
 The sequence in which libgcc and libc are specified to the linker.
@@ -206,9 +222,11 @@ This fixes issues with RISC-V.
 @end defmac
 
 @defmac POST_LINK_SPEC
+diff --git a/gcc/gcc.cc b/gcc/gcc.cc
+index 59390fd39d6..dae1dd4cf79 100644
 --- a/gcc/gcc.cc
 +++ b/gcc/gcc.cc
-@@ -991,13 +991,23 @@ proper position among the other output files.  */
+@@ -974,13 +974,23 @@ proper position among the other output files.  */
 # define ASM_DEBUG_OPTION_SPEC ""
 #endif
 
@@ -233,3 +251,6 @@ This fixes issues with RISC-V.
 #endif
 
 #ifdef ENABLE_DEFAULT_SSP
+-- 
+2.41.0
+
@@ -9,9 +9,11 @@ ref: alpine/aports#13422
 Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

+diff --git a/Makefile.in b/Makefile.in
+index 394b105b271..bc4a77fc300 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -54362,7 +54362,7 @@ configure-target-libphobos:
+@@ -52809,7 +52809,7 @@ configure-target-libphobos:
 	esac; \
 	module_srcdir=libphobos; \
 	rm -f no-such-file || : ; \
@@ -20,3 +22,6 @@ ref: alpine/aports#13422
 	  $$s/$$module_srcdir/configure \
 	  --srcdir=$${topdir}/$$module_srcdir \
 	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+-- 
+2.41.0
+
@@ -11,9 +11,11 @@ an external library for these functions.
 libphobos/m4/druntime/libraries.m4 | 8 --------
 2 files changed, 16 deletions(-)

+diff --git a/libphobos/configure b/libphobos/configure
+index 925c53c5f5e..60c2a0c11c6 100755
 --- a/libphobos/configure
 +++ b/libphobos/configure
-@@ -15375,14 +15375,6 @@ fi
+@@ -15216,14 +15216,6 @@ fi
   # Keep this in sync with core/thread.d, set druntime_fiber_asm_external to
   # "yes" for targets that have 'version = AsmExternal'.
   druntime_fiber_asm_external=no
@@ -28,6 +30,8 @@ an external library for these functions.
   if test "$druntime_fiber_asm_external" = no; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing swapcontext" >&5
 $as_echo_n "checking for library containing swapcontext... " >&6; }
+diff --git a/libphobos/m4/druntime/libraries.m4 b/libphobos/m4/druntime/libraries.m4
+index 45a56f6f76a..fef6e890b1e 100644
 --- a/libphobos/m4/druntime/libraries.m4
 +++ b/libphobos/m4/druntime/libraries.m4
@@ -220,14 +220,6 @@ AC_DEFUN([DRUNTIME_LIBRARIES_UCONTEXT],
@@ -45,3 +49,6 @@ an external library for these functions.
   if test "$druntime_fiber_asm_external" = no; then
     AC_SEARCH_LIBS([swapcontext], [c ucontext], [],
       AC_MSG_ERROR([swapcontext required but not found]))
+-- 
+2.41.0
+
@@ -7,9 +7,11 @@ Subject: [PATCH 32/35] libgnat: time_t is always 64-bit on musl libc
 gcc/ada/libgnat/s-parame.ads | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

+diff --git a/gcc/ada/libgnat/s-parame.ads b/gcc/ada/libgnat/s-parame.ads
+index 3d6e345a1ba..cfe0b4d3ca6 100644
 --- a/gcc/ada/libgnat/s-parame.ads
 +++ b/gcc/ada/libgnat/s-parame.ads
-@@ -100,7 +100,7 @@ package System.Parameters is
+@@ -102,7 +102,7 @@ package System.Parameters is
    -- Characteristics of time_t type --
    ------------------------------------
 
@@ -18,3 +20,6 @@ Subject: [PATCH 32/35] libgnat: time_t is always 64-bit on musl libc
    --  Number of bits in type time_t
 
    ----------------------------------------------
+-- 
+2.41.0
+
@@ -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
-
@@ -0,0 +1,186 @@
+https://gcc.gnu.org/PR110792
+https://gcc.gnu.org/git/gitweb.cgi?p=gcc.git;h=790c1f60a5662b16eb19eb4b81922995863c7571
+https://github.com/randombit/botan/issues/3637
+
+From 85628c5653ff40963158a24c60eeec6a3b5a8e56 Mon Sep 17 00:00:00 2001
+From: Roger Sayle <roger@nextmovesoftware.com>
+Date: Thu, 3 Aug 2023 07:12:04 +0100
+Subject: [PATCH] PR target/110792: Early clobber issues with
+ rot32di2_doubleword on i386.
+
+This patch is a conservative fix for PR target/110792, a wrong-code
+regression affecting doubleword rotations by BITS_PER_WORD, which
+effectively swaps the highpart and lowpart words, when the source to be
+rotated resides in memory. The issue is that if the register used to
+hold the lowpart of the destination is mentioned in the address of
+the memory operand, the current define_insn_and_split unintentionally
+clobbers it before reading the highpart.
+
+Hence, for the testcase, the incorrectly generated code looks like:
+
+        salq    $4, %rdi		// calculate address
+        movq    WHIRL_S+8(%rdi), %rdi	// accidentally clobber addr
+        movq    WHIRL_S(%rdi), %rbp	// load (wrong) lowpart
+
+Traditionally, the textbook way to fix this would be to add an
+explicit early clobber to the instruction's constraints.
+
+ (define_insn_and_split "<insn>32di2_doubleword"
+- [(set (match_operand:DI 0 "register_operand" "=r,r,r")
+ [(set (match_operand:DI 0 "register_operand" "=r,r,&r")
+        (any_rotate:DI (match_operand:DI 1 "nonimmediate_operand" "0,r,o")
+                       (const_int 32)))]
+
+but unfortunately this currently generates significantly worse code,
+due to a strange choice of reloads (effectively memcpy), which ends up
+looking like:
+
+        salq    $4, %rdi		// calculate address
+        movdqa  WHIRL_S(%rdi), %xmm0	// load the double word in SSE reg.
+        movaps  %xmm0, -16(%rsp)	// store the SSE reg back to the stack
+        movq    -8(%rsp), %rdi		// load highpart
+        movq    -16(%rsp), %rbp		// load lowpart
+
+Note that reload's "&" doesn't distinguish between the memory being
+early clobbered, vs the registers used in an addressing mode being
+early clobbered.
+
+The fix proposed in this patch is to remove the third alternative, that
+allowed offsetable memory as an operand, forcing reload to place the
+operand into a register before the rotation.  This results in:
+
+        salq    $4, %rdi
+        movq    WHIRL_S(%rdi), %rax
+        movq    WHIRL_S+8(%rdi), %rdi
+        movq    %rax, %rbp
+
+I believe there's a more advanced solution, by swapping the order of
+the loads (if first destination register is mentioned in the address),
+or inserting a lea insn (if both destination registers are mentioned
+in the address), but this fix is a minimal "safe" solution, that
+should hopefully be suitable for backporting.
+
+2023-08-03  Roger Sayle  <roger@nextmovesoftware.com>
+
+gcc/ChangeLog
+	PR target/110792
+	* config/i386/i386.md (<any_rotate>ti3): For rotations by 64 bits
+	place operand in a register before gen_<insn>64ti2_doubleword.
+	(<any_rotate>di3): Likewise, for rotations by 32 bits, place
+	operand in a register before gen_<insn>32di2_doubleword.
+	(<any_rotate>32di2_doubleword): Constrain operand to be in register.
+	(<any_rotate>64ti2_doubleword): Likewise.
+
+gcc/testsuite/ChangeLog
+	PR target/110792
+	* g++.target/i386/pr110792.C: New 32-bit C++ test case.
+	* gcc.target/i386/pr110792.c: New 64-bit C test case.
+
+(cherry picked from commit 790c1f60a5662b16eb19eb4b81922995863c7571)
+---
+ gcc/config/i386/i386.md                  | 18 ++++++++++++------
+ gcc/testsuite/g++.target/i386/pr110792.C | 16 ++++++++++++++++
+ gcc/testsuite/gcc.target/i386/pr110792.c | 18 ++++++++++++++++++
+ 3 files changed, 46 insertions(+), 6 deletions(-)
+ create mode 100644 gcc/testsuite/g++.target/i386/pr110792.C
+ create mode 100644 gcc/testsuite/gcc.target/i386/pr110792.c
+
+diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md
+index f3a3305..a71e837 100644
+--- a/gcc/config/i386/i386.md
+++ b/gcc/config/i386/i386.md
+@@ -14359,7 +14359,10 @@
+     emit_insn (gen_ix86_<insn>ti3_doubleword
+ 		(operands[0], operands[1], operands[2]));
+   else if (CONST_INT_P (operands[2]) && INTVAL (operands[2]) == 64)
+-    emit_insn (gen_<insn>64ti2_doubleword (operands[0], operands[1]));
+    {
+      operands[1] = force_reg (TImode, operands[1]);
+      emit_insn (gen_<insn>64ti2_doubleword (operands[0], operands[1]));
+    }
+   else
+     {
+       rtx amount = force_reg (QImode, operands[2]);
+@@ -14394,7 +14397,10 @@
+     emit_insn (gen_ix86_<insn>di3_doubleword
+ 		(operands[0], operands[1], operands[2]));
+   else if (CONST_INT_P (operands[2]) && INTVAL (operands[2]) == 32)
+-    emit_insn (gen_<insn>32di2_doubleword (operands[0], operands[1]));
+    {
+      operands[1] = force_reg (DImode, operands[1]);
+      emit_insn (gen_<insn>32di2_doubleword (operands[0], operands[1]));
+    }
+   else
+     FAIL;
+ 
+@@ -14562,8 +14568,8 @@
+ })
+ 
+ (define_insn_and_split "<insn>32di2_doubleword"
+- [(set (match_operand:DI 0 "register_operand" "=r,r,r")
+-       (any_rotate:DI (match_operand:DI 1 "nonimmediate_operand" "0,r,o")
+ [(set (match_operand:DI 0 "register_operand" "=r,r")
+       (any_rotate:DI (match_operand:DI 1 "register_operand" "0,r")
+                       (const_int 32)))]
+  "!TARGET_64BIT"
+  "#"
+@@ -14580,8 +14586,8 @@
+ })
+ 
+ (define_insn_and_split "<insn>64ti2_doubleword"
+- [(set (match_operand:TI 0 "register_operand" "=r,r,r")
+-       (any_rotate:TI (match_operand:TI 1 "nonimmediate_operand" "0,r,o")
+ [(set (match_operand:TI 0 "register_operand" "=r,r")
+       (any_rotate:TI (match_operand:TI 1 "register_operand" "0,r")
+                       (const_int 64)))]
+  "TARGET_64BIT"
+  "#"
+diff --git a/gcc/testsuite/g++.target/i386/pr110792.C b/gcc/testsuite/g++.target/i386/pr110792.C
+new file mode 100644
+index 0000000..ce21a7a
+--- /dev/null
+++ b/gcc/testsuite/g++.target/i386/pr110792.C
+@@ -0,0 +1,16 @@
+/* { dg-do compile { target ia32 } } */
+/* { dg-options "-O2" } */
+
+template <int ROT, typename T>
+inline T rotr(T input)
+{
+   return static_cast<T>((input >> ROT) | (input << (8 * sizeof(T) - ROT)));
+}
+
+unsigned long long WHIRL_S[256] = {0x18186018C07830D8};
+unsigned long long whirl(unsigned char x0)
+{
+   const unsigned long long s4 = WHIRL_S[x0&0xFF];
+   return rotr<32>(s4);
+}
+/* { dg-final { scan-assembler-not "movl\tWHIRL_S\\+4\\(,%eax,8\\), %eax" } } */
+diff --git a/gcc/testsuite/gcc.target/i386/pr110792.c b/gcc/testsuite/gcc.target/i386/pr110792.c
+new file mode 100644
+index 0000000..b65125c
+--- /dev/null
+++ b/gcc/testsuite/gcc.target/i386/pr110792.c
+@@ -0,0 +1,18 @@
+/* { dg-do compile { target int128 } } */
+/* { dg-options "-O2" } */
+
+static inline unsigned __int128 rotr(unsigned __int128 input)
+{
+   return ((input >> 64) | (input << (64)));
+}
+
+unsigned __int128 WHIRL_S[256] = {((__int128)0x18186018C07830D8) << 64 |0x18186018C07830D8};
+unsigned __int128 whirl(unsigned char x0)
+{
+   register int t __asm("rdi") = x0&0xFF;
+   const unsigned __int128 s4 = WHIRL_S[t];
+   register unsigned __int128 tt  __asm("rdi") = rotr(s4);
+   asm("":::"memory");
+   return tt;
+}
+/* { dg-final { scan-assembler-not "movq\tWHIRL_S\\+8\\(%rdi\\), %rdi" } } */
+-- 
+2.41.0
+
@@ -1,87 +0,0 @@
-From: Celeste <cielesti@protonmail.com>
-Date: Mon, 2 Sep 2024 02:54:17 +0000
-Subject: [PATCH] libphobos: add riscv64 and loongarch64 support
-
-Add musl support for these 2 architectures based on fenv.h and signal.h from:
-
-https://git.musl-libc.org/cgit/musl/tree/arch/riscv64/bits?h=v1.2.5
-
-https://git.musl-libc.org/cgit/musl/tree/arch/loongarch64/bits?h=v1.2.5
---
- libphobos/libdruntime/core/stdc/fenv.d        | 13 +++++++++++++
- libphobos/libdruntime/core/sys/posix/signal.d | 10 ++++++++++
- 2 files changed, 23 insertions(+)
-
-diff --git a/libphobos/libdruntime/core/stdc/fenv.d b/libphobos/libdruntime/core/stdc/fenv.d
-index a7364c0a..5b327e4a 100644
--- a/libphobos/libdruntime/core/stdc/fenv.d
-+++ b/libphobos/libdruntime/core/stdc/fenv.d
-@@ -436,20 +436,33 @@ else version (CRuntime_Musl)
-             ushort __cs_selector;
-             ushort __opcode;
-             uint   __data_offset;
-             ushort __data_selector;
-             ushort __unused5;
-             version (X86_64)
-                 uint __mxcsr;
-         }
-         alias ushort fexcept_t;
-     }
-+    else version (RISCV64)
-+    {
-+        alias uint fenv_t;
-+        alias uint fexcept_t;
-+    }
-+    else version (LoongArch64)
-+    {
-+        struct fenv_t
-+        {
-+            uint __cw;
-+        }
-+        alias uint fexcept_t;
-+    }
-     else
-     {
-         static assert(false, "Architecture not supported.");
-     }
- }
- else version (CRuntime_Newlib)
- {
-     version (AArch64)
-     {
-         alias fenv_t = ulong;
-diff --git a/libphobos/libdruntime/core/sys/posix/signal.d b/libphobos/libdruntime/core/sys/posix/signal.d
-index a8b7f751..78d8b3cd 100644
--- a/libphobos/libdruntime/core/sys/posix/signal.d
-+++ b/libphobos/libdruntime/core/sys/posix/signal.d
-@@ -2751,20 +2751,30 @@ else version (CRuntime_Musl)
-     else version (PPC_Any)
-     {
-         enum MINSIGSTKSZ = 4096;
-         enum SIGSTKSZ    = 10240;
-     }
-     else version (X86_Any)
-     {
-         enum MINSIGSTKSZ = 2048;
-         enum SIGSTKSZ    = 8192;
-     }
-+    else version (RISCV64)
-+    {
-+        enum MINSIGSTKSZ = 2048;
-+        enum SIGSTKSZ    = 8192;
-+    }
-+    else version (LoongArch64)
-+    {
-+        enum MINSIGSTKSZ = 4096;
-+        enum SIGSTKSZ    = 16384;
-+    }
-     else
-         static assert(0, "unimplemented");
- 
-     //ucontext_t (defined in core.sys.posix.ucontext)
-     //mcontext_t (defined in core.sys.posix.ucontext)
- 
-     version (MIPS_Any)
-     {
-         struct stack_t
-         {
@@ -1,101 +0,0 @@
-Patch-Source: https://github.com/richfelker/musl-cross-make/blob/6f3701d08137496d5aac479e3a3977b5ae993c1f/patches/gcc-14.2.0/0004-static-pie.diff
-
-gcc doesn't enable static-pie for all arches. As of this writing arm
-32-bit is missing. musl supports static-pie on all arches so this
-should be allowed on all arches.
-
-Without this patch binaries with (only) -static-pie are broken on some
-arches.
-
-diff --git a/gcc/common.opt b/gcc/common.opt
-index a75b44ee47e..7c564818b49 100644
--- a/gcc/common.opt
-+++ b/gcc/common.opt
-@@ -3473,11 +3473,11 @@ Driver
- 
- no-pie
- Driver RejectNegative Negative(shared)
-Don't create a dynamically linked position independent executable.
-+Don't create a position independent executable.
- 
- pie
- Driver RejectNegative Negative(no-pie)
-Create a dynamically linked position independent executable.
-+Create a position independent executable.
- 
- static-pie
- Driver RejectNegative Negative(pie)
-diff --git a/gcc/config/gnu-user.h b/gcc/config/gnu-user.h
-index 5ebbf42a13d..bb907d8e89a 100644
--- a/gcc/config/gnu-user.h
-+++ b/gcc/config/gnu-user.h
-@@ -51,13 +51,12 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
- #define GNU_USER_TARGET_STARTFILE_SPEC \
-   "%{shared:; \
-      pg|p|profile:%{static-pie:grcrt1.o%s;:gcrt1.o%s}; \
-     static:crt1.o%s; \
-     static-pie:rcrt1.o%s; \
-+     static|static-pie:%{" PIE_SPEC ":rcrt1.o%s;:crt1.o%s}; \
-      " PIE_SPEC ":Scrt1.o%s; \
-      :crt1.o%s} " \
-    GNU_USER_TARGET_CRTI " \
-   %{static:crtbeginT.o%s; \
-     shared|static-pie|" PIE_SPEC ":crtbeginS.o%s; \
-+   %{shared|" PIE_SPEC ":crtbeginS.o%s; \
-+     static:crtbeginT.o%s; \
-      :crtbegin.o%s} \
-    %{fvtable-verify=none:%s; \
-      fvtable-verify=preinit:vtv_start_preinit.o%s; \
-@@ -73,11 +72,11 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-    GNU userspace "finalizer" file, `crtn.o'.  */
- 
- #define GNU_USER_TARGET_ENDFILE_SPEC \
-  "%{!static:%{fvtable-verify=none:%s; \
-+  "%{static|static-pie:; \
-+     fvtable-verify=none:%s; \
-      fvtable-verify=preinit:vtv_end_preinit.o%s; \
-     fvtable-verify=std:vtv_end.o%s}} \
-   %{static:crtend.o%s; \
-     shared|static-pie|" PIE_SPEC ":crtendS.o%s; \
-+     fvtable-verify=std:vtv_end.o%s} \
-+   %{shared|" PIE_SPEC ":crtendS.o%s; \
-      :crtend.o%s} " \
-    GNU_USER_TARGET_CRTN " " \
-    CRTOFFLOADEND
-@@ -106,7 +105,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
- #define LIB_SPEC GNU_USER_TARGET_LIB_SPEC
- 
- #if defined(HAVE_LD_EH_FRAME_HDR)
-#define LINK_EH_SPEC "%{!static|static-pie:--eh-frame-hdr} "
-+#define LINK_EH_SPEC "%{!static|" PIE_SPEC ":--eh-frame-hdr} "
- #endif
- 
- #define GNU_USER_TARGET_LINK_GCC_C_SEQUENCE_SPEC \
-diff --git a/gcc/gcc.cc b/gcc/gcc.cc
-index 3c81c5798d8..cd96eac5d12 100644
--- a/gcc/gcc.cc
-+++ b/gcc/gcc.cc
-@@ -1010,7 +1010,7 @@ proper position among the other output files.  */
- #define NO_FPIE_AND_FPIC_SPEC	NO_FPIE_SPEC "|" NO_FPIC_SPEC
- #define FPIE_OR_FPIC_SPEC	NO_FPIE_AND_FPIC_SPEC ":;"
- #else
-#define PIE_SPEC		"pie"
-+#define PIE_SPEC		"pie|static-pie"
- #define FPIE1_SPEC		"fpie"
- #define NO_FPIE1_SPEC		FPIE1_SPEC ":;"
- #define FPIE2_SPEC		"fPIE"
-@@ -1034,12 +1034,12 @@ proper position among the other output files.  */
- #ifndef LINK_PIE_SPEC
- #ifdef HAVE_LD_PIE
- #ifndef LD_PIE_SPEC
-#define LD_PIE_SPEC "-pie"
-+#define LD_PIE_SPEC "-pie %{static|static-pie:--no-dynamic-linker -z text -Bsymbolic}"
- #endif
- #else
- #define LD_PIE_SPEC ""
- #endif
-#define LINK_PIE_SPEC "%{static|shared|r:;" PIE_SPEC ":" LD_PIE_SPEC "} "
-+#define LINK_PIE_SPEC "%{shared|r:;" PIE_SPEC ":" LD_PIE_SPEC "} "
- #endif
- 
- #ifndef LINK_BUILDID_SPEC
@@ -24,7 +24,7 @@ CBUILDROOT="/"
 _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"

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

 pkgname=gcc-aarch64
-pkgrel=3
+pkgrel=0
 pkgdesc="Stage2 cross-compiler for aarch64"
 url="https://gcc.gnu.org"
 arch="x86_64"
 license="GPL-2.0-or-later AND LGPL-2.1-or-later"
 _gccrel=$pkgver-r$pkgrel
-depends="binutils-aarch64 mpc1 so:libc.musl-x86_64.so.1 so:libgcc_s.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libstdc++.so.6 so:libz.so.1"
+depends="binutils-aarch64 mpc1"
 makedepends_build="gcc g++ bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev"
 makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-dev-aarch64 binutils-aarch64"
 subpackages="g++-aarch64:gpp libstdc++-dev-aarch64:libcxx_dev"
-[ "$CHOST" = "$CTARGET" ] && subpackages="gcc-gdb gcc-doc"
+[ "$CHOST" = "$CTARGET" ] && subpackages="gcc-gdb gcc-doc$_target"
 replaces="libstdc++ binutils"
-options="!strip !tracedeps"

 : "${LANG_CXX:=true}"
 : "${LANG_D:=true}"
@@ -64,7 +63,6 @@ _libitm=true
 if [ "$CHOST" != "$CTARGET" ]; then
 	if [ "$BOOTSTRAP" = nolibc ]; then
 		LANG_CXX=false
-		LANG_D=false
 		LANG_ADA=false
 		_libgcc=false
 		_builddir="$srcdir/build-cross-pass2"
@@ -74,6 +72,7 @@ if [ "$CHOST" != "$CTARGET" ]; then
 	LANG_OBJC=false
 	LANG_GO=false
 	LANG_FORTRAN=false
+	LANG_D=false
 	LANG_JIT=false
 	_libgomp=false
 	_libatomic=false
@@ -115,6 +114,7 @@ elif [ "$CBUILD" != "$CHOST" ]; then
 	LANG_OBJC=false
 	LANG_GO=false
 	LANG_FORTRAN=false
+	LANG_D=false
 	LANG_JIT=false

 	STRIP_FOR_TARGET=${CROSS_COMPILE}strip
@@ -135,10 +135,11 @@ else
 	export CXXFLAGS_FOR_TARGET="$CXXFLAGS"
 	export LDFLAGS_FOR_TARGET="$LDFLAGS"
 	export BOOT_CFLAGS="$CFLAGS"
+	export BOOT_CXXFLAGS="$CXXFLAGS"
 	export BOOT_LDFLAGS="$LDFLAGS"
 fi

-case "$CTARGET_ARCH" in
+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"
@@ -154,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
@@ -162,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 | ppc64le) ;;
+x86 | x86_64 | ppc64le)	_libquadmath=$LANG_FORTRAN ;;
 *)		_libquadmath=false ;;
 esac

@@ -182,8 +181,8 @@ if $_libgomp; then
 	subpackages="$subpackages libgomp::$CTARGET_ARCH"
 fi

-case "$CTARGET_ARCH" in
-riscv64|loongarch64)
+case "$CARCH" in
+riscv64)
 LANG_ADA=false;;
 esac

@@ -192,17 +191,9 @@ if $LANG_CXX; then
 	_languages="$_languages,c++"
 fi
 if $LANG_D; then
-	subpackages="$subpackages gcc-gdc$_target:gdc"
+	subpackages="$subpackages libgphobos::$CTARGET_ARCH gcc-gdc$_target:gdc"
 	_languages="$_languages,d"
-	makedepends_build="$makedepends_build libucontext-dev"
-	if [ "$CBUILD" = "$CTARGET" ]; then
-		makedepends_build="$makedepends_build gcc-gdc-bootstrap"
-		subpackages="$subpackages libgphobos::$CTARGET_ARCH"
-	else
-		# shared libgphobos is for D programs to link against, so
-		# skip building that while cross-compiling the GDC compiler
-		makedepends_build="$makedepends_build gcc-gdc gcc-gdc$_cross"
-	fi
+	makedepends_build="$makedepends_build libucontext-dev gcc-gdc-bootstrap"
 fi
 if $LANG_OBJC; then
 	subpackages="$subpackages libobjc::$CTARGET_ARCH gcc-objc$_target:objc"
@@ -217,21 +208,23 @@ if $LANG_FORTRAN; then
 	_languages="$_languages,fortran"
 fi
 if $LANG_ADA; then
-	subpackages="$subpackages gcc-gnat$_target:gnat libgnat::$CTARGET_ARCH"
+	subpackages="$subpackages gcc-gnat$_target:gnat"
 	_languages="$_languages,ada"
 	if [ "$CBUILD" = "$CTARGET" ]; then
 		makedepends_build="$makedepends_build gcc-gnat-bootstrap"
-		subpackages="$subpackages libgnat-static:libgnatstatic:$CTARGET_ARCH"
+		subpackages="$subpackages libgnat-static:libgnatstatic:$CTARGET_ARCH libgnat::$CTARGET_ARCH"
 	else
+		subpackages="$subpackages libgnat::$CTARGET_ARCH"
 		makedepends_build="$makedepends_build gcc-gnat gcc-gnat$_cross"
 	fi
 fi
 if $LANG_JIT; then
 	subpackages="$subpackages libgccjit:jit libgccjit-dev:jitdev"
 fi
+makedepends="$makedepends_build $makedepends_host"

 # when using upstream releases, use this URI template
-# https://gcc.gnu.org/pub/gcc/releases/gcc-$_pkgbase/gcc-$_pkgbase.tar.xz
+# https://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$pkgver}/gcc-${_pkgbase:-$pkgver}.tar.xz
 #
 # right now, we are using a git snapshot. snapshots are taken from gcc.gnu.org/pub/gcc/snapshots.
 # However, since they are periodically deleted from the GCC mirrors the utilized snapshots are
@@ -240,8 +233,7 @@ fi
 #
 # 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/gcc-$_pkgbase.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
@@ -276,9 +268,7 @@ source="https://gcc.gnu.org/pub/gcc/releases/gcc-$_pkgbase/gcc-$_pkgbase.tar.xz
 	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
-	0036-libphobos-add-riscv64-and-loongarch64-support.patch
-	0037-static-pie.patch
+	0036-PR110792-Early-clobber-issues-with-rot32di2-on-i386.patch
 	"

 # secfixes:
@@ -286,21 +276,43 @@ source="https://gcc.gnu.org/pub/gcc/releases/gcc-$_pkgbase/gcc-$_pkgbase.tar.xz
 #     - CVE-2023-4039

 # we build out-of-tree
-#builddir="$srcdir"/gcc-${_pkgbase%%.*}-$_pkgsnap
-builddir="$srcdir"/gcc-$_pkgbase
-_gcclibdir="usr/lib/gcc/$CTARGET/$_pkgbase"
-_gcclibexec="usr/libexec/gcc/$CTARGET/$_pkgbase"
+_gccdir="$srcdir"/gcc-${_pkgbase%%.*}-$_pkgsnap
+_gcclibdir="/usr/lib/gcc/$CTARGET/${_pkgbase:-$pkgver}"
+_gcclibexec="/usr/libexec/gcc/$CTARGET/${_pkgbase:-$pkgver}"

 prepare() {
-	default_prepare
-	echo $_pkgbase > gcc/BASE-VER
+	cd "$_gccdir"
+
+	_err=
+	for i in $source; do
+		case "$i" in
+		*.patch)
+			msg "Applying $i"
+			patch -p1 -i "$srcdir"/$i || _err="$_err $i"
+			;;
+		esac
+	done
+
+	if [ -n "$_err" ]; then
+		error "The following patches failed:"
+		for i in $_err; do
+			echo "  $i"
+		done
+		return 1
+	fi
+
+	echo ${_pkgbase:-$pkgver} > gcc/BASE-VER
 }

 build() {
 	local _arch_configure=
+	local _libc_configure=
 	local _bootstrap_configure=
+	local _symvers=
 	local _jit_configure=

+	cd "$_gccdir"
+
 	case "$CTARGET" in
 	aarch64-*-*-*)		_arch_configure="--with-arch=armv8-a --with-abi=lp64";;
 	armv5-*-*-*eabi)	_arch_configure="--with-arch=armv5te --with-tune=arm926ej-s --with-float=soft --with-abi=aapcs-linux";;
@@ -316,7 +328,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=la64v1.0 --with-abi=lp64d";;
 	esac

 	case "$CTARGET_ARCH" in
@@ -324,22 +335,20 @@ build() {
 	*)	_hash_style_configure="--with-linker-hash-style=gnu" ;;
 	esac

-	export libat_cv_have_ifunc=no
+	case "$CTARGET_LIBC" in
+	musl)
+		# musl does not support libsanitizer
+		# alpine musl provides libssp_nonshared.a, so we don't need libssp either
+		_libc_configure="--disable-libssp --disable-libsanitizer"
+		_symvers="--disable-symvers"
+		export libat_cv_have_ifunc=no
+		;;
+	esac


 	case "$BOOTSTRAP" in
 	nolibc)	_bootstrap_configure="--with-newlib --disable-shared --enable-threads=no" ;;
-	*)
-		# cross-bootstrap GDC with a static libphobos: due to GCC's
-		# ./configure not having a --disable-shared=libphobos option,
-		# we have to use --enable-shared with everything else instead.
-		if $LANG_D && [ "$CBUILD" != "$CTARGET" ]; then
-			_bootstrap_configure="--enable-shared=libgcc,libstdc++,libffi,zlib,boehm-gc,ada,libada,libgo,libobjc,libatomic,libgomp,libitm,libgfortran,libquadmath"
-		else
-			_bootstrap_configure="--enable-shared"
-		fi
-		_bootstrap_configure="$_bootstrap_configure --enable-threads --enable-tls"
-		;;
+	*)	_bootstrap_configure="--enable-shared --enable-threads --enable-tls" ;;
 	esac

 	$_libgomp	|| _bootstrap_configure="$_bootstrap_configure --disable-libgomp"
@@ -353,8 +362,10 @@ build() {
 	echo "  CHOST=$CHOST"
 	echo "  CTARGET=$CTARGET"
 	echo "  CTARGET_ARCH=$CTARGET_ARCH"
+	echo "  CTARGET_LIBC=$CTARGET_LIBC"
 	echo "  languages=$_languages"
 	echo "  arch_configure=$_arch_configure"
+	echo "  libc_configure=$_libc_configure"
 	echo "  cross_configure=$_cross_configure"
 	echo "  bootstrap_configure=$_bootstrap_configure"
 	echo "  hash_style_configure=$_hash_style_configure"
@@ -375,7 +386,7 @@ build() {
 		--disable-multilib
 		--disable-nls
 		--disable-werror
-		--disable-symvers
+		$_symvers
 		--enable-__cxa_atexit
 		--enable-default-pie
 		--enable-default-ssp
@@ -383,8 +394,7 @@ build() {
 		--enable-link-serialization=2
 		--enable-linker-build-id
 		$_arch_configure
-		--disable-libssp
-		--disable-libsanitizer
+		$_libc_configure
 		$_cross_configure
 		$_bootstrap_configure
 		--with-bugurl=https://gitlab.alpinelinux.org/alpine/aports/-/issues
@@ -394,14 +404,10 @@ build() {

 	mkdir -p "$_builddir"
 	cd "$_builddir"
-	"$builddir"/configure $gccconfiguration \
+	"$_gccdir"/configure $gccconfiguration \
 		--with-pkgversion="$version"

 	msg "building gcc"
-	if $LANG_D && [ "$CBUILD" != "$CTARGET" ]; then
-		# cross-compiling libphobos with parallel make fails
-		make all-target-libphobos
-	fi
 	make

 	# we build gccjit separate to not build all of gcc with --enable-host-shared
@@ -410,7 +416,7 @@ build() {
 	if $LANG_JIT; then
 		mkdir -p "$_builddir"/libgccjit-build
 		cd "$_builddir"/libgccjit-build
-		"$builddir"/configure $gccconfiguration \
+		"$_gccdir"/configure $gccconfiguration \
 			--disable-bootstrap \
 			--enable-host-shared \
 			--enable-languages=jit \
@@ -425,14 +431,9 @@ package() {
 	cd "$_builddir"
 	make -j1 DESTDIR="$pkgdir" install

-	[ "$CHOST" = "$CTARGET" ] && ln -s gcc "$pkgdir"/usr/bin/cc
+	ln -s gcc "$pkgdir"/usr/bin/cc
 	ln -s ${CTARGET}-gcc "$pkgdir"/usr/bin/${CTARGET}-cc

-	# symlink to vendor-less target triple for
-	# supporting clang --target's fallback match
-	# ref: https://gitlab.alpinelinux.org/alpine/aports/-/issues/16828
-	ln -s "$CTARGET" "$pkgdir/usr/lib/gcc/${CTARGET%%-*}-${CTARGET#*-*-}"
-
 	if $LANG_JIT; then
 		make -C "$_builddir"/libgccjit-build/gcc DESTDIR="$pkgdir" jit.install-common
 	fi
@@ -474,22 +475,25 @@ package() {

 	# move ada runtime libs
 	if $LANG_ADA; then
-		local libgnat_static=
-		[ "$CHOST" = "$CTARGET" ] && libgnat_static="libgna*.a"
-		for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 \( -name "libgna*.so" -o -name "$libgnat_static" \) ); do
+		for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 -name "libgna*.so"); do
 			mv "$i" "$pkgdir"/usr/lib/
 			ln -s ../../../../${i##*/} $i
 		done
+		if [ "$CHOST" = "$CTARGET" ]; then
+			for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 -name "libgna*.a"); do
+				mv "$i" "$pkgdir"/usr/lib/
+				ln -s ../../../../${i##*/} $i
+			done
+		fi
 	fi

 	if [ "$CHOST" != "$CTARGET" ]; then
 		# cross-gcc: remove any files that would conflict with the
 		# native gcc package
-		rm -rf "$pkgdir"/usr/include "${pkgdir:?}"/usr/share
+		rm -rf "$pkgdir"/usr/bin/cc "$pkgdir"/usr/include "${pkgdir:?}"/usr/share
 		# libcc1 does not depend on target, don't ship it
 		rm -rf "$pkgdir"/usr/lib/libcc1.so*

-
 		# fixup gcc library symlinks to be linker scripts so
 		# linker finds the libs from relocated sysroot
 		for so in "$pkgdir"/usr/"$CTARGET"/lib/*.so; do
@@ -538,7 +542,8 @@ libatomic() {
 	depends=
 	replaces="gcc"

-	amove usr/lib/libatomic.so.*
+	mkdir -p "$subpkgdir"/usr/lib
+	mv "$pkgdir"/usr/${_target:+$CTARGET/}lib/libatomic.so.* "$subpkgdir"/usr/lib/
 }

 libcxx() {
@@ -551,7 +556,8 @@ libcxx() {
 		nm -D "$pkgdir"/usr/lib/libstdc++.so.* | grep clock_gettime
 	fi

-	amove usr/lib/libstdc++.so.*
+	mkdir -p "$subpkgdir"/usr/lib
+	mv "$pkgdir"/usr/${_target:+$CTARGET/}lib/libstdc++.so.* "$subpkgdir"/usr/lib/
 }

 libcxx_dev() {
@@ -569,13 +575,15 @@ libcxx_dev() {

 gpp() {
 	pkgdesc="GNU C++ standard library and compiler"
-	depends="libstdc++-dev$_target=$_gccrel gcc$_target=$_gccrel musl-dev"
-	[ "$CHOST" = "$CTARGET" ] && depends="$depends libstdc++=$_gccrel"
+	depends="libstdc++=$_gccrel libstdc++-dev$_target=$_gccrel gcc$_target=$_gccrel libc-dev"
+	mkdir -p "$subpkgdir/$_gcclibexec" \
+		"$subpkgdir"/usr/bin \
+		"$subpkgdir"/usr/${_target:+$CTARGET/}include \
+		"$subpkgdir"/usr/${_target:+$CTARGET/}lib \

-	depends="$depends so:libc.musl-x86_64.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libz.so.1"
+	mv "$pkgdir/$_gcclibexec/cc1plus" "$subpkgdir/$_gcclibexec/"

-	amove $_gcclibexec/cc1plus
-	amove usr/bin/*++
+	mv "$pkgdir"/usr/bin/*++ "$subpkgdir"/usr/bin/
 }

 jit() {
@@ -594,26 +602,30 @@ libobjc() {
 	pkgdesc="GNU Objective-C runtime"
 	replaces="objc"
 	depends=
-
-	amove usr/lib/libobjc.so.*
+	mkdir -p "$subpkgdir"/usr/lib
+	mv "$pkgdir"/usr/${_target:+$CTARGET/}lib/libobjc.so.* "$subpkgdir"/usr/lib/
 }

 objc() {
 	pkgdesc="GNU Objective-C"
 	replaces="gcc"
-	depends="musl-dev gcc=$_gccrel libobjc=$_gccrel"
+	depends="libc-dev gcc=$_gccrel libobjc=$_gccrel"

-	amove $_gcclibexec/cc1obj
-	amove $_gcclibdir/include/objc
-	amove usr/lib/libobjc.so
-	amove usr/lib/libobjc.a
+	mkdir -p "$subpkgdir/$_gcclibexec" \
+		"$subpkgdir"/$_gcclibdir/include \
+		"$subpkgdir"/usr/lib
+	mv "$pkgdir/$_gcclibexec/cc1obj" "$subpkgdir/$_gcclibexec/"
+	mv "$pkgdir"/$_gcclibdir/include/objc "$subpkgdir"/$_gcclibdir/include/
+	mv "$pkgdir"/usr/lib/libobjc.so "$pkgdir"/usr/lib/libobjc.a \
+		"$subpkgdir"/usr/lib/
 }

 libgcc() {
 	pkgdesc="GNU C compiler runtime libraries"
 	depends=

-	amove usr/lib/libgcc_s.so.*
+	mkdir -p "$subpkgdir"/usr/lib
+	mv "$pkgdir"/usr/${_target:+$CTARGET/}lib/libgcc_s.so.* "$subpkgdir"/usr/lib/
 }

 libgomp() {
@@ -621,68 +633,85 @@ libgomp() {
 	depends=
 	replaces="gcc"

-	amove usr/lib/libgomp.so.*
+	mkdir -p "$subpkgdir"/usr/lib
+	mv "$pkgdir"/usr/${_target:+$CTARGET/}lib/libgomp.so.* "$subpkgdir"/usr/lib/
 }

 libgphobos() {
 	pkgdesc="D programming language standard library for GCC"
 	depends=

-	amove usr/lib/libgdruntime.so.*
-	amove usr/lib/libgphobos.so.*
+	mkdir -p "$subpkgdir"/usr/lib
+	mv "$pkgdir"/usr/lib/libgdruntime.so.* "$subpkgdir"/usr/lib/
+	mv "$pkgdir"/usr/lib/libgphobos.so.*  "$subpkgdir"/usr/lib/
 }

 gdc() {
 	pkgdesc="GCC-based D language compiler"
-	depends="gcc$_target=$_gccrel musl-dev libucontext-dev"
-	[ "$CBUILD" = "$CTARGET" ] && depends="$depends libgphobos=$_gccrel"
-	[ "$CHOST" = "$CTARGET" ] && provides="gcc-gdc-bootstrap=$_gccrel"
+	depends="gcc=$_gccrel libgphobos=$_gccrel musl-dev"
+	depends="$depends libucontext-dev"
+	provides="gcc-gdc-bootstrap=$_gccrel"

+	mkdir -p "$subpkgdir/$_gcclibexec" \
+		"$subpkgdir"/$_gcclibdir/include/d/ \
+		"$subpkgdir"/usr/lib \
+		"$subpkgdir"/usr/bin
 	# Copy: The installed '.d' files, the static lib, the binary itself
 	# The shared libs are part of 'libgphobos' so one can run program
 	# without installing the compiler
-	amove $_gcclibexec/d21
-	amove $_gcclibdir/include/d
-	if [ "$CBUILD" = "$CTARGET" ]; then
-		amove usr/lib/libgdruntime.so
-		amove usr/lib/libgphobos.so
-	fi
-	amove usr/${_target:+$CTARGET/}lib/libgdruntime.a
-	amove usr/${_target:+$CTARGET/}lib/libgphobos.a
-	amove usr/${_target:+$CTARGET/}lib/libgphobos.spec
-	amove usr/bin/*gdc
+	mv "$pkgdir/$_gcclibexec/d21" "$subpkgdir/$_gcclibexec/"
+	mv "$pkgdir"/$_gcclibdir/include/d/* "$subpkgdir"/$_gcclibdir/include/d/
+	mv "$pkgdir"/usr/lib/libgdruntime.a "$subpkgdir"/usr/lib/
+	mv "$pkgdir"/usr/lib/libgdruntime.so "$subpkgdir"/usr/lib/
+	mv "$pkgdir"/usr/lib/libgphobos.a "$subpkgdir"/usr/lib/
+	mv "$pkgdir"/usr/lib/libgphobos.so "$subpkgdir"/usr/lib/
+	mv "$pkgdir"/usr/lib/libgphobos.spec "$subpkgdir"/usr/lib/
+	mv "$pkgdir"/usr/bin/$CTARGET-gdc "$subpkgdir"/usr/bin/
+	mv "$pkgdir"/usr/bin/gdc "$subpkgdir"/usr/bin/
 }

 libgo() {
 	pkgdesc="Go runtime library for GCC"
 	depends=

-	amove usr/lib/libgo.so.*
+	mkdir -p "$subpkgdir"/usr/lib
+	mv "$pkgdir"/usr/lib/libgo.so.* "$subpkgdir"/usr/lib/
 }

 go() {
 	pkgdesc="GCC Go frontend (intended for bootstrapping community/go)"
 	depends="gcc=$_gccrel libgo=$_gccrel !go"
+	install="$pkgname-go.post-install"

-	amove usr/lib/go
-	amove usr/bin/*go
-	amove usr/bin/*gofmt
-	amove $_gcclibexec/go1
-	amove $_gcclibexec/cgo
-	amove $_gcclibexec/buildid
-	amove $_gcclibexec/test2json
-	amove $_gcclibexec/vet
-	amove usr/lib/libgo.a
-	amove usr/lib/libgo.so
-	amove usr/lib/libgobegin.a
-	amove usr/lib/libgolibbegin.a
+	# 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
+	mv "$pkgdir"/usr/lib/go "$subpkgdir"/usr/lib/
+	mv "$pkgdir"/usr/bin/*gccgo "$subpkgdir"/usr/bin/
+	mv "$pkgdir"/usr/bin/*go "$subpkgdir"/usr/bin
+	mv "$pkgdir"/usr/bin/*gofmt "$subpkgdir"/usr/bin
+	mv "$pkgdir"/$_gcclibexec/go1 "$subpkgdir"/$_gcclibexec/
+	mv "$pkgdir"/$_gcclibexec/cgo "$subpkgdir"/$_gcclibexec/
+	mv "$pkgdir"/$_gcclibexec/buildid "$subpkgdir"/$_gcclibexec/
+	mv "$pkgdir"/$_gcclibexec/test2json "$subpkgdir"/$_gcclibexec/
+	mv "$pkgdir"/$_gcclibexec/vet "$subpkgdir"/$_gcclibexec/
+	mv "$pkgdir"/usr/lib/libgo.a \
+		"$pkgdir"/usr/lib/libgo.so \
+		"$pkgdir"/usr/lib/libgobegin.a \
+		"$pkgdir"/usr/lib/libgolibbegin.a \
+		"$subpkgdir"/usr/lib/
 }

 libgfortran() {
 	pkgdesc="Fortran runtime library for GCC"
 	depends=

-	amove usr/lib/libgfortran.so.*
+	mkdir -p "$subpkgdir"/usr/lib
+	mv "$pkgdir"/usr/lib/libgfortran.so.* "$subpkgdir"/usr/lib/
 }

 libquadmath() {
@@ -690,7 +719,8 @@ libquadmath() {
 	pkgdesc="128-bit math library for GCC"
 	depends=

-	amove usr/lib/libquadmath.so.*
+	mkdir -p "$subpkgdir"/usr/lib
+	mv "$pkgdir"/usr/lib/libquadmath.so.* "$subpkgdir"/usr/lib/
 }

 gfortran() {
@@ -699,30 +729,38 @@ gfortran() {
 	$_libquadmath && depends="$depends libquadmath=$_gccrel"
 	replaces="gcc"

-	amove usr/bin/*gfortran
-	amove usr/lib/libgfortran.a
-	amove usr/lib/libgfortran.so
+	mkdir -p "$subpkgdir"/$_gcclibexec \
+		"$subpkgdir"/$_gcclibdir \
+		"$subpkgdir"/usr/lib \
+		"$subpkgdir"/usr/bin
+	mv "$pkgdir"/usr/bin/*gfortran "$subpkgdir"/usr/bin/
+	mv "$pkgdir"/usr/lib/libgfortran.a \
+		"$pkgdir"/usr/lib/libgfortran.so \
+		"$subpkgdir"/usr/lib/
 	if $_libquadmath; then
-		amove usr/lib/libquadmath.a
-		amove usr/lib/libquadmath.so
+		mv "$pkgdir"/usr/lib/libquadmath.a \
+			"$pkgdir"/usr/lib/libquadmath.so \
+			"$subpkgdir"/usr/lib/
 	fi
-	amove $_gcclibdir/finclude
-	amove $_gcclibexec/f951
-	mv -v "$pkgdir"/usr/lib/libgfortran.spec "$subpkgdir"/$_gcclibdir/
+	mv "$pkgdir"/$_gcclibdir/finclude "$subpkgdir"/$_gcclibdir/
+	mv "$pkgdir"/$_gcclibexec/f951 "$subpkgdir"/$_gcclibexec
+	mv "$pkgdir"/usr/lib/libgfortran.spec "$subpkgdir"/$_gcclibdir
 }

 libgnat() {
 	pkgdesc="GNU Ada runtime shared libraries"
 	depends=

-	amove usr/lib/libgna*.so
+	mkdir -p "$subpkgdir"/usr/lib
+	mv "$pkgdir"/usr/lib/libgna*.so "$subpkgdir"/usr/lib/
 }

 libgnatstatic() {
 	pkgdesc="GNU Ada static libraries"
 	depends=

-	amove usr/lib/libgna*.a
+	mkdir -p "$subpkgdir"/usr/lib
+	mv "$pkgdir"/usr/lib/libgna*.a "$subpkgdir"/usr/lib/
 }

 gnat() {
@@ -731,9 +769,12 @@ gnat() {
 	provides="$pkgname-gnat-bootstrap=$_gccrel"
 	[ "$CHOST" = "$CTARGET" ] && depends="$depends libgnat=$_gccrel"

-	amove $_gcclibexec/*gnat*
-	amove $_gcclibdir/*ada*
-	amove usr/bin/*gnat*
+	mkdir -p "$subpkgdir"/$_gcclibexec \
+		"$subpkgdir"/$_gcclibdir \
+		"$subpkgdir"/usr/bin
+	mv "$pkgdir"/$_gcclibexec/*gnat* "$subpkgdir"/$_gcclibexec/
+	mv "$pkgdir"/$_gcclibdir/*ada* "$subpkgdir"/$_gcclibdir/
+	mv "$pkgdir"/usr/bin/*gnat* "$subpkgdir"/usr/bin/
 }

 gdb() {
@@ -746,42 +787,40 @@ gdb() {
 }

 sha512sums="
-cb4e3259640721bbd275c723fe4df53d12f9b1673afb3db274c22c6aa457865dccf2d6ea20b4fd4c591f6152e6d4b87516c402015900f06ce9d43af66d3b7a93  gcc-14.3.0.tar.xz
+406673a62deba759fc0532a801b3f57cabf894ea328587b23e62a707ba5767b0e3ae9b3f86bf3c6fcf13e8a3c30bc470e6598b625c8231efb629034211c162c2  gcc-13-20231014.tar.xz
 1ecffba1b07d60e1b4422302b032bbea918b674c8e12b30aa6965b544d700ce86b61e9f7b8d402c6caf59257f491a394dd0912f0948565d6eae9335ee54f3b35  0001-posix_memalign.patch
-6dd1eecbc050e30e5a0493969a0e80507d971f4ca87c06466f725fa50c9106e18aef86453fc8a80cd277438b6e79695a99cdaf2eaeb2f1add7e28f7cffd0cd2f  0002-gcc-poison-system-directories.patch
-b6903b60b01187bfebc961e74d01ff5d8dc2852747663dff2b4a4f66df4b5aa412347fe92926cce1821fdd0c59d088404acbbced4b464aba9664d599a9e1bbce  0003-specs-turn-on-Wl-z-now-by-default.patch
-d41a519ea5014e9ab49f017d3793e2a0a82429c2b7ded2776f2df7a2d0ac02aa294e7dbe74e027fe7c844c87525d483e0eda3846cf16340eb02e934389cfd838  0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
-e34d7bb51c4c413b1a10bafcdfd5729fb5980b0288277ef44ed4779700d443d2fd22129b3b22d401def140851263e803160d2f3ed8825b0bf4f3fb8606db77bd  0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
-83665b6adb0b8080245b253abe3344ee5106ac2bc248aad9bef713b22b644a268d75c75fbab7554e0543836903a89bc4f0bec4b6d6d4e3d5ba355dddbc5ba190  0006-Enable-Wformat-and-Wformat-security-by-default.patch
-ca5757a32f02bb24bc5b42bb03dca49fb9f9e6f34776343f1c5580efd2bcacf8c5b59f4b61652fa3ea1506eb14bcd390f5fda7b4cbfd32f7d1a750d14add4739  0007-Enable-Wtrampolines-by-default.patch
-e476da4c2f29a941b7f4f1dfc9a37ba82b439badc47fc3fb72630ec5620f64849bdb66d339e0182674a0ee898a75564ffaf702986b770bfd793e7fbdcaa9f21b  0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
+163f282455b6a4df33f011bcd8b0440566ba0ffaeeab30d8ac52d39948980a56881ca0eff60687129d59556389a58b9d64e7768750bd70b1fe0fedbc9fc30dc2  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
-b40b6cbc3725ae88c506bc39a8ba10cfcdcc208fa26d667393bbb80e24346da2ccfac3ff914bb9fc4c374f022fa7f913e6873b9a66a96b79a1ac84959c9d5348  0012-libgcc_s.patch
-6cc2c00b15d259289fa9831b60b58f8afdf09858410bd08ab3d839a45c6f3fb9e8e214dab851d105c61df7965f1c10255c84b5b6301630a390b27b8929a25e1e  0013-nopie.patch
+9d43f844fad0ac6e1c35a2b6f461f9278ae09e468f2c9ae8adc43accbe6934994aa10d3a433644d1393a4a76e3caed69e3191db7f3c0c24b4e7a0a0a0cbac3f1  0012-libgcc_s.patch
+b2c4921c5eef33ee43a92ab5ec7f09d5d3adb49a2416595001e6376ffdf652ef9d0dc21778c3a86e45334290dbe467a4e891ed34a6522e0c72f746def22e8663  0013-nopie.patch
 0b50ad15115192699efa9fda3d4fb1c2fa95da06d7880ba34615b40c19a8256e1fe364da39f5c70dc22fbccf21db2de5900932afef68948722eeb25e435262f8  0014-ada-fix-shared-linking.patch
-7640e71cd957066e2e07ffcec1f8540cd6b1bdaf976c980693bf6f5d3afaf51ca7e41c62f92cb13c86c2dea9eb9cd799b2e3ea77d74926e82bf1e12bb7a4d64e  0015-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
+00097c7106625ccf02149a757366f434c48f2abe824bb8b4bf067d29308889cb6039a5e5b2d3bd2683617693b47707d549252c56eea6bc3cdc2450a8d14f46a7  0015-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
 7f0bc42b93a389b614054e700b851abfbc53db391aa10cbdf6990d41396b293af78980bb39f1cf0967184d3fbf3d46ac7c7f096717b8f193ea34cbf7f37d7e91  0016-add-fortify-headers-paths.patch
-8a8c9dc96f300f660f1a643c800352383f32db258dfcfa88a44159a38bb81a7298089a5dcb23906002c85cafc806caf6f3db0e1cb26fcac6192ae1e41d9ada3a  0017-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
-6c1cbfcf9e6f54b2173af39bbbfd97e7c18ae32a690fb4c6b1e35fa183992ea0f8046d479be57b6ac7d798bf2a6dade4f9ea3e3a839dc6fb8d47203de9c89e25  0018-DP-Use-push-state-pop-state-for-gold-as-well-when-li.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
-0ef65a344975b641343767e289578ba5b0fd381c7177ebe4558cb67d8b41e33e3b825478fa46852f1f40ec9119ff908cf75ee36307266aea13f39460e080b0b6  0023-riscv-disable-multilib-support.patch
-55438233a217dc1ee58990413b8782b9bd560a1532c1e6c860f377072ed1bdf75d5dc2458ed33194040ec5427c30df3fa68948dcd26de90e3803d3f7b784becd  0024-always-build-libgcc_eh.a.patch
+e0763083c31485e8ac0b3724376a28af01bb6f50e1a054780b61886e4e3de2a35d127e6e353eb8d8729964ada9b5751bf05bdd51df539667008216db38f228a3  0023-riscv-disable-multilib-support.patch
+ab88a2f63e3545bbc36537aa9a86f2c6c35e41bbf702d6e13743a405cdac4f901eed5737189b780da96647fea9f5d863fdc76373f25a00064106dcb5514d6d87  0024-always-build-libgcc_eh.a.patch
 8fdbe0c8bf4ca60f458a33e59027de03d15ac91933fe46d8ca62119346d20b9bc2447c0bf22bceb63d0cf8613ab61512d9197f4e6c2224af473b63ef9f254295  0025-ada-libgnarl-compatibility-for-musl.patch
-02e8358b8855fb49bbb2b3ef293cff67441c5fdf1f2fee4dcec86ef1fd4f701e899ea9c7e072d888b0f1e674d7874d3085138f3deb9845d1f2e35d4a1fe3f5ab  0026-ada-musl-support-fixes.patch
-8eff7679140f9e39f1a0ac2e4a6cc7e131efa3d5a669696dd28300eb5d75ef3be62f10c1b91d8f8c8ba2cba1ff9cf121228b6fcd3adafa28389ac63698e7d5a7  0027-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
+30369bea84020c32d514196ba3adb3d09d2d0359af5550bd3f9719aa357e44b2f695623c1d2a99416e120dc86896c196c5dd4f638183dced4799604137385367  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
-458c9b121e00cec4d0dbe1d18c5e5332342eb0a3429129e5a9d9ace3247c31d85571ad9f47046c4ed3bc62e5d8a4297f48744a30424a19acbdd9aa484e3ee715  0030-gdc-unconditionally-link-libgphobos-against-libucont.patch
-099103f4b0b4612ff4bd2e8721cf1593415b636bff74d4feba304bb610ced6f4951cb3ab89088111e58029a2f9bf4a5dcc91e2b2afe4dd9813d2fa6b0999a5a2  0031-druntime-link-against-libucontext-on-all-platforms.patch
-21ff4d55eec48ad4a9db0cd359e760cff548f7f6b1a67759a2e87fc7e16a262d82d2f980d309a3ce5e14097665beeb5516a5f2d98869a5d28345e685c6fe689d  0032-libgnat-time_t-is-always-64-bit-on-musl-libc.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
-06f64544fd8bc4b6c8b06410c5198aa8fb4e82c232afc0cad83b2c69ac5d39399968206defa78297222700cd18e7fd7e8244afa76d343406a01f657c86306453  0036-libphobos-add-riscv64-and-loongarch64-support.patch
-8870baf56550f7359d262f68904558bf9f95674a50324e86d121d0ca2cca7155e45fb023f467a46c96c30f4943f66ce104608c642b5378d1c4311a0959c444ed  0037-static-pie.patch
+cc1e10ac6e72db816f09325e301103109cc212a6f3de3ce0b9b038d149233c467319d203941695dbf3d7b9e2dcbbcd17609cdb056e831fcc323cd592423882d8  0036-PR110792-Early-clobber-issues-with-rot32di2-on-i386.patch
 "
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+cat 1>&2 <<EOF
+*
+* gcc-go is used in Alpine for bootstrapping Go.
+* It is currently discouraged to use it for other purposes.
+*
+EOF
@@ -25,9 +25,11 @@ Upstream-Status: Pending
 gcc/incpath.cc      | 21 +++++++++++++++++++++
 7 files changed, 68 insertions(+)

+diff --git a/gcc/common.opt b/gcc/common.opt
+index 862c474d3c8..64c4277c991 100644
 --- a/gcc/common.opt
 +++ b/gcc/common.opt
-@@ -715,6 +715,10 @@ Wreturn-local-addr
+@@ -711,6 +711,10 @@ Wreturn-local-addr
 Common Var(warn_return_local_addr) Init(1) Warning
 Warn about returning a pointer/reference to a local or temporary variable.
 
@@ -38,9 +40,11 @@ Upstream-Status: Pending
 Wshadow
 Common Var(warn_shadow) Warning
 Warn when one variable shadows another.  Same as -Wshadow=global.
+diff --git a/gcc/config.in b/gcc/config.in
+index 4cad077bfbe..0679fbbf4c6 100644
 --- a/gcc/config.in
 +++ b/gcc/config.in
-@@ -249,6 +249,12 @@
+@@ -236,6 +236,12 @@
 #endif
 
 
@@ -53,17 +57,19 @@ Upstream-Status: Pending
 /* Define if you want all operations on RTL (the basic data structure of the
    optimizer and back end) to be checked for dynamic type safety at runtime.
    This is quite expensive. */
+diff --git a/gcc/configure b/gcc/configure
+index c7b26d1927d..8c46369f73f 100755
 --- a/gcc/configure
 +++ b/gcc/configure
-@@ -1050,6 +1050,7 @@ enable_maintainer_mode
+@@ -1026,6 +1026,7 @@ enable_maintainer_mode
 enable_link_mutex
 enable_link_serialization
 enable_version_specific_runtime_libs
 +enable_poison_system_directories
 enable_plugin
 enable_host_shared
- enable_host_pie
-@@ -1823,6 +1824,8 @@ Optional Features:
+ enable_libquadmath_support
+@@ -1788,6 +1789,8 @@ Optional Features:
   --enable-version-specific-runtime-libs
                           specify that runtime libraries should be installed
                           in a compiler-specific directory
@@ -71,8 +77,8 @@ Upstream-Status: Pending
 +                          warn for use of native system header directories
   --enable-plugin         enable plugin support
   --enable-host-shared    build host code as shared libraries
-   --enable-host-pie       build host code as PIE
-@@ -34082,6 +34085,19 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then :
+   --disable-libquadmath-support
+@@ -31753,6 +31756,19 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then :
 fi
 
 
@@ -92,9 +98,11 @@ Upstream-Status: Pending
 # Substitute configuration variables
 
 
+diff --git a/gcc/configure.ac b/gcc/configure.ac
+index 09082e8ccae..5504bf6eb01 100644
 --- a/gcc/configure.ac
 +++ b/gcc/configure.ac
-@@ -7555,6 +7555,16 @@ AC_ARG_ENABLE(version-specific-runtime-libs,
+@@ -7292,6 +7292,16 @@ AC_ARG_ENABLE(version-specific-runtime-libs,
                 [specify that runtime libraries should be
                  installed in a compiler-specific directory])])
 
@@ -111,9 +119,11 @@ Upstream-Status: Pending
 # Substitute configuration variables
 AC_SUBST(subdirs)
 AC_SUBST(srcdir)
+diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
+index af0e5933fdb..b6731a4673c 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
-@@ -391,6 +391,7 @@ Objective-C and Objective-C++ Dialects}.
+@@ -384,6 +384,7 @@ Objective-C and Objective-C++ Dialects}.
 -Wpacked  -Wno-packed-bitfield-compat  -Wpacked-not-aligned  -Wpadded
 -Wparentheses  -Wno-pedantic-ms-format
 -Wpointer-arith  -Wno-pointer-compare  -Wno-pointer-to-int-cast
@@ -121,7 +131,7 @@ Upstream-Status: Pending
 -Wno-pragmas  -Wno-prio-ctor-dtor  -Wredundant-decls
 -Wrestrict  -Wno-return-local-addr  -Wreturn-type
 -Wno-scalar-storage-order  -Wsequence-point
-@@ -8861,6 +8862,14 @@ made up of data only and thus requires no special treatment.  But, for
+@@ -8426,6 +8427,14 @@ made up of data only and thus requires no special treatment.  But, for
 most targets, it is made up of code and thus requires the stack to be
 made executable in order for the program to work properly.
 
@@ -136,17 +146,21 @@ Upstream-Status: Pending
 @opindex Wfloat-equal
 @opindex Wno-float-equal
 @item -Wfloat-equal
+diff --git a/gcc/gcc.cc b/gcc/gcc.cc
+index 16bb07f2cdc..33b56e721d2 100644
 --- a/gcc/gcc.cc
 +++ b/gcc/gcc.cc
-@@ -1163,6 +1163,8 @@ proper position among the other output files.  */
+@@ -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
+index 4d44321183f..0f3f071b44c 100644
 --- a/gcc/incpath.cc
 +++ b/gcc/incpath.cc
@@ -26,6 +26,7 @@
@@ -184,3 +198,6 @@ Upstream-Status: Pending
 }
 
 /* Use given -I paths for #include "..." but not #include <...>, and
+-- 
+2.41.0
+
@@ -13,9 +13,11 @@ now by default.
 gcc/gcc.cc          | 1 +
 2 files changed, 4 insertions(+)

+diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
+index b6731a4673c..f393c7846c6 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
-@@ -18935,6 +18935,9 @@ For example, @option{-Wl,-Map,output.map} passes @option{-Map output.map} to the
+@@ -17961,6 +17961,9 @@ For example, @option{-Wl,-Map,output.map} passes @option{-Map output.map} to the
 linker.  When using the GNU linker, you can also get the same effect with
 @option{-Wl,-Map=output.map}.
 
@@ -25,9 +27,11 @@ now by default.
 @opindex u
 @item -u @var{symbol}
 Pretend the symbol @var{symbol} is undefined, to force linking of
+diff --git a/gcc/gcc.cc b/gcc/gcc.cc
+index 33b56e721d2..f82fae23c22 100644
 --- a/gcc/gcc.cc
 +++ b/gcc/gcc.cc
-@@ -1161,6 +1161,7 @@ proper position among the other output files.  */
+@@ -1144,6 +1144,7 @@ proper position among the other output files.  */
    "%{flto|flto=*:%<fcompare-debug*} \
     %{flto} %{fno-lto} %{flto=*} %l " LINK_PIE_SPEC \
    "%{fuse-ld=*:-fuse-ld=%*} " LINK_COMPRESS_DEBUG_SPEC \
@@ -35,3 +39,6 @@ now by default.
    "%X %{o*} %{e*} %{N} %{n} %{r}\
     %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!r:%{!nostartfiles:%S}}} \
     %{Wno-poison-system-directories:--no-poison-system-directories} \
+-- 
+2.41.0
+
@@ -9,9 +9,11 @@ Subject: [PATCH 04/35] Turn on -D_FORTIFY_SOURCE=2 by default for C, C++,
 gcc/doc/invoke.texi          | 6 ++++++
 2 files changed, 10 insertions(+)

+diff --git a/gcc/c-family/c-cppbuiltin.cc b/gcc/c-family/c-cppbuiltin.cc
+index 5d64625fcd7..868d69506e4 100644
 --- a/gcc/c-family/c-cppbuiltin.cc
 +++ b/gcc/c-family/c-cppbuiltin.cc
-@@ -1570,6 +1570,10 @@ c_cpp_builtins (cpp_reader *pfile)
+@@ -1546,6 +1546,10 @@ c_cpp_builtins (cpp_reader *pfile)
   builtin_define_with_value ("__REGISTER_PREFIX__", REGISTER_PREFIX, 0);
   builtin_define_with_value ("__USER_LABEL_PREFIX__", user_label_prefix, 0);
 
@@ -22,9 +24,11 @@ Subject: [PATCH 04/35] Turn on -D_FORTIFY_SOURCE=2 by default for C, C++,
   /* Misc.  */
   if (flag_gnu89_inline)
     cpp_define (pfile, "__GNUC_GNU_INLINE__");
+diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
+index f393c7846c6..ef3c14a189e 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
-@@ -12496,6 +12496,12 @@ also turns on the following optimization flags:
+@@ -11868,6 +11868,12 @@ also turns on the following optimization flags:
 Please note the warning under @option{-fgcse} about
 invoking @option{-O2} on programs that use computed gotos.
 
@@ -37,3 +41,6 @@ Subject: [PATCH 04/35] Turn on -D_FORTIFY_SOURCE=2 by default for C, C++,
 @opindex O3
 @item -O3
 Optimize yet more.  @option{-O3} turns on all optimizations specified
+-- 
+2.41.0
+
@@ -21,6 +21,8 @@ Subject: [PATCH 05/35] On linux targets pass --as-needed by default to the
 gcc/gcc.cc                         | 28 ++++++++++++++++++++--------
 14 files changed, 36 insertions(+), 19 deletions(-)

+diff --git a/gcc/config/aarch64/aarch64-linux.h b/gcc/config/aarch64/aarch64-linux.h
+index 4277f03da2a..b131983a546 100644
 --- a/gcc/config/aarch64/aarch64-linux.h
 +++ b/gcc/config/aarch64/aarch64-linux.h
@@ -35,6 +35,7 @@
@@ -31,6 +33,8 @@ Subject: [PATCH 05/35] On linux targets pass --as-needed by default to the
    %{static:-Bstatic}				\
    %{shared:-shared}				\
    %{symbolic:-Bsymbolic}			\
+diff --git a/gcc/config/alpha/linux-elf.h b/gcc/config/alpha/linux-elf.h
+index 03f783f2ad1..d946e700dda 100644
 --- a/gcc/config/alpha/linux-elf.h
 +++ b/gcc/config/alpha/linux-elf.h
@@ -37,7 +37,7 @@ along with GCC; see the file COPYING3.  If not see
@@ -42,6 +46,8 @@ Subject: [PATCH 05/35] On linux targets pass --as-needed by default to the
   %{O*:-O3} %{!O*:-O1}						\
   %{shared:-shared}						\
   %{!shared:							\
+diff --git a/gcc/config/arm/linux-elf.h b/gcc/config/arm/linux-elf.h
+index 7b7b7cbbe14..49c050c6f2c 100644
 --- a/gcc/config/arm/linux-elf.h
 +++ b/gcc/config/arm/linux-elf.h
@@ -70,6 +70,7 @@
@@ -52,6 +58,8 @@ Subject: [PATCH 05/35] On linux targets pass --as-needed by default to the
    %{mbig-endian:-EB} %{mlittle-endian:-EL}" \
    SUBTARGET_EXTRA_LINK_SPEC
 
+diff --git a/gcc/config/gnu-user.h b/gcc/config/gnu-user.h
+index eda8010b133..b26b17f2f2a 100644
 --- a/gcc/config/gnu-user.h
 +++ b/gcc/config/gnu-user.h
@@ -136,7 +136,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
@@ -78,6 +86,8 @@ Subject: [PATCH 05/35] On linux targets pass --as-needed by default to the
 #endif
 
 #undef TARGET_F951_OPTIONS
+diff --git a/gcc/config/i386/gnu-user.h b/gcc/config/i386/gnu-user.h
+index a79b739089d..e0752673dff 100644
 --- a/gcc/config/i386/gnu-user.h
 +++ b/gcc/config/i386/gnu-user.h
@@ -68,7 +68,7 @@ along with GCC; see the file COPYING3.  If not see
@@ -89,6 +99,8 @@ Subject: [PATCH 05/35] On linux targets pass --as-needed by default to the
   %{!shared: \
     %{!static: \
       %{!static-pie: \
+diff --git a/gcc/config/i386/gnu-user64.h b/gcc/config/i386/gnu-user64.h
+index 3b63b99acf6..759bf0db86f 100644
 --- a/gcc/config/i386/gnu-user64.h
 +++ b/gcc/config/i386/gnu-user64.h
@@ -56,6 +56,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
@@ -99,6 +111,8 @@ Subject: [PATCH 05/35] On linux targets pass --as-needed by default to the
   %{shared:-shared} \
   %{!shared: \
     %{!static: \
+diff --git a/gcc/config/ia64/linux.h b/gcc/config/ia64/linux.h
+index 5dfd428aa17..02656dad7fc 100644
 --- a/gcc/config/ia64/linux.h
 +++ b/gcc/config/ia64/linux.h
@@ -58,7 +58,7 @@ do {						\
@@ -110,6 +124,8 @@ Subject: [PATCH 05/35] On linux targets pass --as-needed by default to the
   %{shared:-shared} \
   %{!shared: \
     %{!static: \
+diff --git a/gcc/config/mips/gnu-user.h b/gcc/config/mips/gnu-user.h
+index a4e5380b589..3cc61bce69f 100644
 --- a/gcc/config/mips/gnu-user.h
 +++ b/gcc/config/mips/gnu-user.h
@@ -55,6 +55,7 @@ along with GCC; see the file COPYING3.  If not see
@@ -120,6 +136,8 @@ Subject: [PATCH 05/35] On linux targets pass --as-needed by default to the
   %{!shared: \
     %{!static: \
       %{rdynamic:-export-dynamic} \
+diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h
+index 3e625e0f867..f8c2c351e5a 100644
 --- a/gcc/config/riscv/linux.h
 +++ b/gcc/config/riscv/linux.h
@@ -48,6 +48,7 @@ along with GCC; see the file COPYING3.  If not see
@@ -129,10 +147,12 @@ Subject: [PATCH 05/35] On linux targets pass --as-needed by default to the
 +-as-needed \
 -melf" XLEN_SPEC DEFAULT_ENDIAN_SPEC "riscv" LD_EMUL_SUFFIX " \
 %{mno-relax:--no-relax} \
- -X \
+ %{mbig-endian:-EB} \
+diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h
+index 9e457033d11..08016bf224d 100644
 --- a/gcc/config/rs6000/linux64.h
 +++ b/gcc/config/rs6000/linux64.h
-@@ -378,13 +378,13 @@ extern int dot_symbols;
+@@ -377,13 +377,13 @@ extern int dot_symbols;
 					   " -m elf64ppc")
 #endif
 
@@ -148,9 +168,11 @@ Subject: [PATCH 05/35] On linux targets pass --as-needed by default to the
   %{!static-pie: \
     %{rdynamic:-export-dynamic} \
     -dynamic-linker " GNU_USER_DYNAMIC_LINKER64 "}}} \
+diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h
+index ae932fc22f0..c8ff0c6dc8e 100644
 --- a/gcc/config/rs6000/sysv4.h
 +++ b/gcc/config/rs6000/sysv4.h
-@@ -781,7 +781,7 @@ GNU_USER_TARGET_CC1_SPEC
+@@ -780,7 +780,7 @@ GNU_USER_TARGET_CC1_SPEC
 #define GNU_USER_DYNAMIC_LINKER GLIBC_DYNAMIC_LINKER
 #endif
 
@@ -159,6 +181,8 @@ Subject: [PATCH 05/35] On linux targets pass --as-needed by default to the
   %{rdynamic:-export-dynamic} \
   -dynamic-linker " GNU_USER_DYNAMIC_LINKER "}}"
 
+diff --git a/gcc/config/s390/linux.h b/gcc/config/s390/linux.h
+index 02aa1edaff8..64df5801134 100644
 --- a/gcc/config/s390/linux.h
 +++ b/gcc/config/s390/linux.h
@@ -82,7 +82,7 @@ along with GCC; see the file COPYING3.  If not see
@@ -170,6 +194,8 @@ Subject: [PATCH 05/35] On linux targets pass --as-needed by default to the
    %{shared:-shared} \
    %{!shared: \
       %{static:-static} \
+diff --git a/gcc/config/sparc/linux.h b/gcc/config/sparc/linux.h
+index 0e33b3cac2c..c2f44546e62 100644
 --- a/gcc/config/sparc/linux.h
 +++ b/gcc/config/sparc/linux.h
@@ -81,7 +81,7 @@ extern const char *host_detect_local_cpu (int argc, const char **argv);
@@ -181,9 +207,11 @@ Subject: [PATCH 05/35] On linux targets pass --as-needed by default to the
   %{!mno-relax:%{!r:-relax}} \
   %{!shared: \
     %{!static: \
+diff --git a/gcc/gcc.cc b/gcc/gcc.cc
+index f82fae23c22..da6417dd0d1 100644
 --- a/gcc/gcc.cc
 +++ b/gcc/gcc.cc
-@@ -771,8 +771,11 @@ proper position among the other output files.  */
+@@ -754,8 +754,11 @@ proper position among the other output files.  */
 #ifdef LIBASAN_EARLY_SPEC
 #define LIBASAN_SPEC STATIC_LIBASAN_LIBS
 #elif defined(HAVE_LD_STATIC_DYNAMIC)
@@ -197,7 +225,7 @@ Subject: [PATCH 05/35] On linux targets pass --as-needed by default to the
 		     STATIC_LIBASAN_LIBS
 #else
 #define LIBASAN_SPEC "-lasan" STATIC_LIBASAN_LIBS
-@@ -807,8 +810,11 @@ proper position among the other output files.  */
+@@ -790,8 +793,11 @@ proper position among the other output files.  */
 #ifdef LIBTSAN_EARLY_SPEC
 #define LIBTSAN_SPEC STATIC_LIBTSAN_LIBS
 #elif defined(HAVE_LD_STATIC_DYNAMIC)
@@ -211,7 +239,7 @@ Subject: [PATCH 05/35] On linux targets pass --as-needed by default to the
 		     STATIC_LIBTSAN_LIBS
 #else
 #define LIBTSAN_SPEC "-ltsan" STATIC_LIBTSAN_LIBS
-@@ -825,8 +831,11 @@ proper position among the other output files.  */
+@@ -808,8 +814,11 @@ proper position among the other output files.  */
 #ifdef LIBLSAN_EARLY_SPEC
 #define LIBLSAN_SPEC STATIC_LIBLSAN_LIBS
 #elif defined(HAVE_LD_STATIC_DYNAMIC)
@@ -225,7 +253,7 @@ Subject: [PATCH 05/35] On linux targets pass --as-needed by default to the
 		     STATIC_LIBLSAN_LIBS
 #else
 #define LIBLSAN_SPEC "-llsan" STATIC_LIBLSAN_LIBS
-@@ -841,8 +850,11 @@ proper position among the other output files.  */
+@@ -824,8 +833,11 @@ proper position among the other output files.  */
 #define STATIC_LIBUBSAN_LIBS \
   " %{static-libubsan|static:%:include(libsanitizer.spec)%(link_libubsan)}"
 #ifdef HAVE_LD_STATIC_DYNAMIC
@@ -239,3 +267,6 @@ Subject: [PATCH 05/35] On linux targets pass --as-needed by default to the
 		     STATIC_LIBUBSAN_LIBS
 #else
 #define LIBUBSAN_SPEC "-lubsan" STATIC_LIBUBSAN_LIBS
+-- 
+2.41.0
+
@@ -7,10 +7,12 @@ Subject: [PATCH 06/35] Enable -Wformat and -Wformat-security by default.
 gcc/c-family/c.opt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

+diff --git a/gcc/c-family/c.opt b/gcc/c-family/c.opt
+index a75038930ae..b98726f33ed 100644
 --- a/gcc/c-family/c.opt
 +++ b/gcc/c-family/c.opt
-@@ -774,7 +774,7 @@ Warn about function calls with format strings that write past the end
- of the destination region.
+@@ -704,7 +704,7 @@ Warn about function calls with format strings that write past the end
+ of the destination region.  Same as -Wformat-overflow=1.
 
 Wformat-security
 -C ObjC C++ ObjC++ Var(warn_format_security) Warning LangEnabledBy(C ObjC C++ ObjC++,Wformat=, warn_format >= 2, 0)
@@ -18,7 +20,7 @@ Subject: [PATCH 06/35] Enable -Wformat and -Wformat-security by default.
 Warn about possible security problems with format functions.
 
 Wformat-signedness
-@@ -799,7 +799,7 @@ C ObjC C++ ObjC++ Var(warn_format_zero_length) Warning LangEnabledBy(C ObjC C++
+@@ -725,7 +725,7 @@ C ObjC C++ ObjC++ Var(warn_format_zero_length) Warning LangEnabledBy(C ObjC C++
 Warn about zero-length formats.
 
 Wformat=
@@ -26,4 +28,7 @@ Subject: [PATCH 06/35] Enable -Wformat and -Wformat-security by default.
 +C ObjC C++ ObjC++ Joined RejectNegative UInteger Var(warn_format) Init(1) Warning LangEnabledBy(C ObjC C++ ObjC++,Wall, 1, 0) IntegerRange(0, 2)
 Warn about printf/scanf/strftime/strfmon format string anomalies.
 
- Wframe-address
+ Wformat-overflow=
+-- 
+2.41.0
+
@@ -7,9 +7,11 @@ Subject: [PATCH 07/35] Enable -Wtrampolines by default.
 gcc/common.opt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

+diff --git a/gcc/common.opt b/gcc/common.opt
+index 64c4277c991..c24839d32bc 100644
 --- a/gcc/common.opt
 +++ b/gcc/common.opt
-@@ -811,7 +811,7 @@ Common Var(warn_system_headers) Warning
+@@ -803,7 +803,7 @@ Common Var(warn_system_headers) Warning
 Do not suppress warnings from system headers.
 
 Wtrampolines
@@ -18,3 +20,6 @@ Subject: [PATCH 07/35] Enable -Wtrampolines by default.
 Warn whenever a trampoline is generated.
 
 Wtrivial-auto-var-init
+-- 
+2.41.0
+
@@ -9,9 +9,11 @@ Subject: [PATCH 08/35] Disable ssp on -nostdlib, -nodefaultlibs and
 gcc/params.opt | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

+diff --git a/gcc/gcc.cc b/gcc/gcc.cc
+index da6417dd0d1..b5a6f200635 100644
 --- a/gcc/gcc.cc
 +++ b/gcc/gcc.cc
-@@ -1000,6 +1000,12 @@ proper position among the other output files.  */
+@@ -983,6 +983,12 @@ proper position among the other output files.  */
 #define LINK_GCC_C_SEQUENCE_SPEC "%G %{!nolibc:%L %G}"
 #endif
 
@@ -24,18 +26,20 @@ Subject: [PATCH 08/35] Disable ssp on -nostdlib, -nodefaultlibs and
 #ifndef LINK_SSP_SPEC
 #ifdef TARGET_LIBC_PROVIDES_SSP
 #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
-@@ -1305,7 +1311,7 @@ static const char *cc1_options =
+@@ -1282,7 +1288,7 @@ static const char *cc1_options =
  %{-version:--version}\
  %{-help=*:--help=%*}\
  %{!fsyntax-only:%{S:%W{o*}%{!o*:-o %w%b.s}}}\
 - %{fsyntax-only:-o %j} %{-param*}\
 + %{fsyntax-only:-o %j} %{-param*} " NO_SSP_SPEC "\
  %{coverage:-fprofile-arcs -ftest-coverage}\
-  %{fprofile-arcs|fcondition-coverage|fprofile-generate*|coverage:\
+  %{fprofile-arcs|fprofile-generate*|coverage:\
    %{!fprofile-update=single:\
+diff --git a/gcc/params.opt b/gcc/params.opt
+index 823cdb2ff85..5b096899b40 100644
 --- a/gcc/params.opt
 +++ b/gcc/params.opt
-@@ -1013,7 +1013,7 @@ Common Joined UInteger Var(param_ssa_name_def_chain_limit) Init(512) Param Optim
+@@ -1006,7 +1006,7 @@ Common Joined UInteger Var(param_ssa_name_def_chain_limit) Init(512) Param Optim
 The maximum number of SSA_NAME assignments to follow in determining a value.
 
 -param=ssp-buffer-size=
@@ -44,3 +48,6 @@ Subject: [PATCH 08/35] Disable ssp on -nostdlib, -nodefaultlibs and
 The lower bound for a buffer to be considered for stack smashing protection.
 
 -param=stack-clash-protection-guard-size=
+-- 
+2.41.0
+
@@ -9,9 +9,11 @@ Subject: [PATCH 12/35] libgcc_s
 libgcc/config/i386/t-linux     | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

+diff --git a/gcc/config/i386/i386-expand.cc b/gcc/config/i386/i386-expand.cc
+index 0d817fc3f3b..2e99db00db9 100644
 --- a/gcc/config/i386/i386-expand.cc
 +++ b/gcc/config/i386/i386-expand.cc
-@@ -13089,10 +13089,10 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget,
+@@ -12691,10 +12691,10 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget,
     {
     case IX86_BUILTIN_CPU_INIT:
       {
@@ -24,6 +26,8 @@ Subject: [PATCH 12/35] libgcc_s
 	call_expr = build_call_expr (fndecl, 0);
 	return expand_expr (call_expr, target, mode, EXPAND_NORMAL);
       }
+diff --git a/libgcc/config/i386/cpuinfo.c b/libgcc/config/i386/cpuinfo.c
+index 50b6d8248a2..724ced402a1 100644
 --- a/libgcc/config/i386/cpuinfo.c
 +++ b/libgcc/config/i386/cpuinfo.c
@@ -63,7 +63,7 @@ __cpu_indicator_init (void)
@@ -37,6 +41,8 @@ Subject: [PATCH 12/35] libgcc_s
 +int __cpu_indicator_init_local (void)
 +  __attribute__ ((weak, alias ("__cpu_indicator_init")));
 #endif
+diff --git a/libgcc/config/i386/t-linux b/libgcc/config/i386/t-linux
+index 8506a635790..564296f788e 100644
 --- a/libgcc/config/i386/t-linux
 +++ b/libgcc/config/i386/t-linux
@@ -3,5 +3,5 @@
@@ -46,3 +52,6 @@ Subject: [PATCH 12/35] libgcc_s
 -HOST_LIBGCC2_CFLAGS += -mlong-double-80 -DUSE_ELF_SYMVER $(CET_FLAGS)
 +HOST_LIBGCC2_CFLAGS += -mlong-double-80 $(CET_FLAGS)
 CRTSTUFF_T_CFLAGS += $(CET_FLAGS)
+-- 
+2.41.0
+
@@ -4,25 +4,28 @@ Date: Sat, 7 Nov 2015 02:08:05 +0000
 Subject: [PATCH 13/35] nopie

 ---
- gcc/configure    | 25 +++++++++++++++++++++++++
- gcc/configure.ac | 11 +++++++++++
- 2 files changed, 36 insertions(+)
+ gcc/configure    | 27 +++++++++++++++++++++++++++
+ gcc/configure.ac | 13 +++++++++++++
+ 2 files changed, 40 insertions(+)

+diff --git a/gcc/configure b/gcc/configure
+index 8c46369f73f..e59cbee1767 100755
 --- a/gcc/configure
 +++ b/gcc/configure
-@@ -34606,6 +34606,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
@@ -33,46 +36,40 @@ Subject: [PATCH 13/35] nopie
 +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
-@@ -34623,6 +34646,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 5504bf6eb01..57268319de1 100644
 --- a/gcc/configure.ac
 +++ b/gcc/configure.ac
-@@ -7821,6 +7821,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
-@@ -7838,6 +7847,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
+
@@ -7,9 +7,11 @@ Subject: [PATCH 15/35] build: fix CXXFLAGS_FOR_BUILD passing
 Makefile.in | 1 +
 1 file changed, 1 insertion(+)

+diff --git a/Makefile.in b/Makefile.in
+index 06a9398e172..6ff2b3f9925 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -179,6 +179,7 @@ BUILD_EXPORTS = \
+@@ -178,6 +178,7 @@ BUILD_EXPORTS = \
 # built for the build system to override those in BASE_FLAGS_TO_PASS.
 EXTRA_BUILD_FLAGS = \
 	CFLAGS="$(CFLAGS_FOR_BUILD)" \
@@ -17,3 +19,6 @@ Subject: [PATCH 15/35] build: fix CXXFLAGS_FOR_BUILD passing
 	LDFLAGS="$(LDFLAGS_FOR_BUILD)"
 
 # This is the list of directories to built for the host system.
+-- 
+2.41.0
+
@@ -12,9 +12,11 @@ Subject: [PATCH 17/35] Alpine musl package provides libssp_nonshared.a. We
 gcc/gcc.cc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

+diff --git a/gcc/gcc.cc b/gcc/gcc.cc
+index b5a6f200635..6cbb726599b 100644
 --- a/gcc/gcc.cc
 +++ b/gcc/gcc.cc
-@@ -1008,8 +1008,7 @@ proper position among the other output files.  */
+@@ -991,8 +991,7 @@ proper position among the other output files.  */
 
 #ifndef LINK_SSP_SPEC
 #ifdef TARGET_LIBC_PROVIDES_SSP
@@ -24,3 +26,6 @@ Subject: [PATCH 17/35] Alpine musl package provides libssp_nonshared.a. We
 #else
 #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
 		       "|fstack-protector-strong|fstack-protector-explicit" \
+-- 
+2.41.0
+
@@ -8,9 +8,11 @@ Subject: [PATCH 18/35] DP: Use --push-state/--pop-state for gold as well when
 gcc/gcc.cc | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

+diff --git a/gcc/gcc.cc b/gcc/gcc.cc
+index 6cbb726599b..59390fd39d6 100644
 --- a/gcc/gcc.cc
 +++ b/gcc/gcc.cc
-@@ -772,10 +772,10 @@ proper position among the other output files.  */
+@@ -755,10 +755,10 @@ proper position among the other output files.  */
 #define LIBASAN_SPEC STATIC_LIBASAN_LIBS
 #elif defined(HAVE_LD_STATIC_DYNAMIC)
 #define LIBASAN_SPEC "%{static-libasan:" LD_STATIC_OPTION "}" \
@@ -23,7 +25,7 @@ Subject: [PATCH 18/35] DP: Use --push-state/--pop-state for gold as well when
 		     STATIC_LIBASAN_LIBS
 #else
 #define LIBASAN_SPEC "-lasan" STATIC_LIBASAN_LIBS
-@@ -811,10 +811,10 @@ proper position among the other output files.  */
+@@ -794,10 +794,10 @@ proper position among the other output files.  */
 #define LIBTSAN_SPEC STATIC_LIBTSAN_LIBS
 #elif defined(HAVE_LD_STATIC_DYNAMIC)
 #define LIBTSAN_SPEC "%{static-libtsan:" LD_STATIC_OPTION "}" \
@@ -36,7 +38,7 @@ Subject: [PATCH 18/35] DP: Use --push-state/--pop-state for gold as well when
 		     STATIC_LIBTSAN_LIBS
 #else
 #define LIBTSAN_SPEC "-ltsan" STATIC_LIBTSAN_LIBS
-@@ -832,10 +832,10 @@ proper position among the other output files.  */
+@@ -815,10 +815,10 @@ proper position among the other output files.  */
 #define LIBLSAN_SPEC STATIC_LIBLSAN_LIBS
 #elif defined(HAVE_LD_STATIC_DYNAMIC)
 #define LIBLSAN_SPEC "%{static-liblsan:" LD_STATIC_OPTION "}" \
@@ -49,7 +51,7 @@ Subject: [PATCH 18/35] DP: Use --push-state/--pop-state for gold as well when
 		     STATIC_LIBLSAN_LIBS
 #else
 #define LIBLSAN_SPEC "-llsan" STATIC_LIBLSAN_LIBS
-@@ -851,10 +851,10 @@ proper position among the other output files.  */
+@@ -834,10 +834,10 @@ proper position among the other output files.  */
   " %{static-libubsan|static:%:include(libsanitizer.spec)%(link_libubsan)}"
 #ifdef HAVE_LD_STATIC_DYNAMIC
 #define LIBUBSAN_SPEC "%{static-libubsan:" LD_STATIC_OPTION "}" \
@@ -62,3 +64,6 @@ Subject: [PATCH 18/35] DP: Use --push-state/--pop-state for gold as well when
 		     STATIC_LIBUBSAN_LIBS
 #else
 #define LIBUBSAN_SPEC "-lubsan" STATIC_LIBUBSAN_LIBS
+-- 
+2.41.0
+
@@ -42,12 +42,14 @@ library.
 gcc/config/riscv/t-linux | 7 +++++--
 2 files changed, 5 insertions(+), 10 deletions(-)

+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
@@ -61,11 +61,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}}"
+     %{static:-static}}"
+ 
+ #define TARGET_ASM_FILE_END file_end_indicate_exec_stack
 -
 -#define STARTFILE_PREFIX_SPEC 			\
 -   "/lib" XLEN_SPEC "/" ABI_SPEC "/ "		\
@@ -56,9 +58,11 @@ library.
 -   "/usr/lib/ "
 -
 -#define RISCV_USE_CUSTOMISED_MULTI_LIB select_by_abi
+diff --git a/gcc/config/riscv/t-linux b/gcc/config/riscv/t-linux
+index 216d2776a18..1a8a863853e 100644
 --- a/gcc/config/riscv/t-linux
 +++ b/gcc/config/riscv/t-linux
-@@ -1,5 +1,8 @@
+@@ -1,3 +1,6 @@
 -# Only XLEN and ABI affect Linux multilib dir names, e.g. /lib32/ilp32d/
 -MULTILIB_DIRNAMES := $(patsubst rv32%,lib32,$(patsubst rv64%,lib64,$(MULTILIB_DIRNAMES)))
 +MULTILIB_OPTIONS := march=rv64gc
@@ -67,5 +71,6 @@ library.
 +MULTILIB_DIRNAMES := $(patsubst rv32%,lib32,$(patsubst rv64%,lib,$(MULTILIB_DIRNAMES)))
 MULTILIB_OSDIRNAMES := $(patsubst lib%,../lib%,$(MULTILIB_DIRNAMES))
 +MULTILIB_MATCHES := march?rv64gc=march?rv64imafdc
- 
- MULTIARCH_DIRNAME := $(call if_multiarch,$(firstword $(subst -, ,$(target)))-linux-gnu)
+-- 
+2.41.0
+
@@ -9,9 +9,11 @@ highly inspired by:
 libgcc/Makefile.in | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

+diff --git a/libgcc/Makefile.in b/libgcc/Makefile.in
+index 6c4dc79ab71..023cede18a7 100644
 --- a/libgcc/Makefile.in
 +++ b/libgcc/Makefile.in
-@@ -967,8 +967,9 @@ ifneq ($(LIBUNWIND),)
+@@ -960,8 +960,9 @@ ifneq ($(LIBUNWIND),)
 all: libunwind.a
 endif
 
@@ -22,7 +24,7 @@ highly inspired by:
 ifneq ($(LIBUNWIND),)
 all: libunwind$(SHLIB_EXT)
 libgcc_s$(SHLIB_EXT): libunwind$(SHLIB_EXT)
-@@ -1173,10 +1174,6 @@ install-libunwind:
+@@ -1163,10 +1164,6 @@ install-libunwind:
 install-shared:
 	$(mkinstalldirs) $(DESTDIR)$(inst_libdir)
 
@@ -33,7 +35,7 @@ highly inspired by:
 	$(subst @multilib_dir@,$(MULTIDIR),$(subst \
 		@shlib_base_name@,libgcc_s,$(subst \
 		@shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(SHLIB_INSTALL))))
-@@ -1193,6 +1190,10 @@ ifeq ($(enable_gcov),yes)
+@@ -1183,6 +1180,10 @@ ifeq ($(enable_gcov),yes)
 	$(RANLIB) $(DESTDIR)$(inst_libdir)/libgcov.a
 endif
 
@@ -44,3 +46,6 @@ highly inspired by:
 	parts="$(INSTALL_PARTS)";				\
 	for file in $$parts; do					\
 	  rm -f $(DESTDIR)$(inst_libdir)/$$file;		\
+-- 
+2.41.0
+
@@ -4,15 +4,17 @@ Date: Fri, 21 Aug 2020 07:07:48 +0000
 Subject: [PATCH 26/35] ada: musl support fixes

 ---
- gcc/ada/Makefile.rtl | 16 ++++++++--------
+ gcc/ada/Makefile.rtl | 10 +++++-----
 gcc/ada/adaint.c     | 34 +++++++++++++++++++---------------
 gcc/ada/adaint.h     | 10 ++++------
 gcc/ada/terminals.c  |  8 ++++----
- 4 files changed, 35 insertions(+), 33 deletions(-)
+ 4 files changed, 32 insertions(+), 30 deletions(-)

+diff --git a/gcc/ada/Makefile.rtl b/gcc/ada/Makefile.rtl
+index 96306f8cc9a..090b6770ae5 100644
 --- a/gcc/ada/Makefile.rtl
 +++ b/gcc/ada/Makefile.rtl
-@@ -1558,7 +1558,7 @@ ifeq ($(strip $(filter-out %86 linux%,$(target_cpu) $(target_os))),)
+@@ -1549,7 +1549,7 @@ ifeq ($(strip $(filter-out %86 linux%,$(target_cpu) $(target_os))),)
   s-intman.adb<libgnarl/s-intman__posix.adb \
   s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \
   $(TRASYM_DWARF_UNIX_PAIRS) \
@@ -21,16 +23,7 @@ Subject: [PATCH 26/35] ada: musl support fixes
   a-exetim.adb<libgnarl/a-exetim__posix.adb \
   a-exetim.ads<libgnarl/a-exetim__default.ads \
   s-linux.ads<libgnarl/s-linux.ads \
-@@ -2145,7 +2145,7 @@ ifeq ($(strip $(filter-out loongarch% linux%,$(target_cpu) $(target_os))),)
-   g-sercom.adb<libgnat/g-sercom__linux.adb \
-   $(TRASYM_DWARF_UNIX_PAIRS) \
-   $(GNATRTL_128BIT_PAIRS) \
-  s-tsmona.adb<libgnat/s-tsmona__linux.adb \
-+  s-tsmona.adb<libgnat/s-tsmona.adb \
-   $(ATOMICS_TARGET_PAIRS) \
-   $(ATOMICS_BUILTINS_TARGET_PAIRS) \
-   system.ads<libgnat/system-linux-loongarch.ads
-@@ -2233,7 +2233,7 @@ ifeq ($(strip $(filter-out powerpc% linux%,$(target_cpu) $(target_os))),)
+@@ -2174,7 +2174,7 @@ ifeq ($(strip $(filter-out powerpc% linux%,$(target_cpu) $(target_os))),)
   s-tasinf.adb<libgnarl/s-tasinf__linux.adb \
   s-taspri.ads<libgnarl/s-taspri__posix.ads \
   $(TRASYM_DWARF_UNIX_PAIRS) \
@@ -39,7 +32,7 @@ Subject: [PATCH 26/35] ada: musl support fixes
   $(ATOMICS_TARGET_PAIRS) \
   $(ATOMICS_BUILTINS_TARGET_PAIRS) \
   system.ads<libgnat/system-linux-ppc.ads
-@@ -2268,7 +2268,7 @@ ifeq ($(strip $(filter-out powerpc% linux%,$(target_cpu) $(target_os))),)
+@@ -2205,7 +2205,7 @@ ifeq ($(strip $(filter-out powerpc% linux%,$(target_cpu) $(target_os))),)
 endif
 
 # ARM linux, GNU eabi
@@ -48,16 +41,7 @@ Subject: [PATCH 26/35] ada: musl support fixes
   LIBGNAT_TARGET_PAIRS = \
   a-intnam.ads<libgnarl/a-intnam__linux.ads \
   s-inmaop.adb<libgnarl/s-inmaop__posix.adb \
-@@ -2312,7 +2312,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 \
-@@ -2489,7 +2489,7 @@ ifeq ($(strip $(filter-out %ia64 linux%,$(target_cpu) $(target_os))),)
+@@ -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 \
   $(TRASYM_DWARF_UNIX_PAIRS) \
@@ -66,16 +50,7 @@ Subject: [PATCH 26/35] ada: musl support fixes
   $(ATOMICS_TARGET_PAIRS) \
   $(ATOMICS_BUILTINS_TARGET_PAIRS) \
   $(GNATRTL_128BIT_PAIRS) \
-@@ -2593,7 +2593,7 @@ ifeq ($(strip $(filter-out %x86_64 linux%,$(target_cpu) $(target_os))),)
-   s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \
-   s-taspri.ads<libgnarl/s-taspri__posix.ads \
-   $(TRASYM_DWARF_UNIX_PAIRS) \
-  s-tsmona.adb<libgnat/s-tsmona__linux.adb \
-+  s-tsmona.adb<libgnat/s-tsmona.adb \
-   $(ATOMICS_TARGET_PAIRS) \
-   $(X86_64_TARGET_PAIRS) \
-   $(SIMD_PATH_TARGET_PAIRS) \
-@@ -2638,7 +2638,7 @@ ifeq ($(strip $(filter-out %x32 linux%,$(target_cpu) $(target_os))),)
+@@ -2524,7 +2524,7 @@ ifeq ($(strip $(filter-out %x86_64 linux%,$(target_cpu) $(target_os))),)
   s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \
   s-taspri.ads<libgnarl/s-taspri__posix.ads \
   $(TRASYM_DWARF_UNIX_PAIRS) \
@@ -84,9 +59,11 @@ Subject: [PATCH 26/35] ada: musl support fixes
   $(ATOMICS_TARGET_PAIRS) \
   $(X86_64_TARGET_PAIRS) \
   $(SIMD_PATH_TARGET_PAIRS) \
+diff --git a/gcc/ada/adaint.c b/gcc/ada/adaint.c
+index 8522094164e..92b230a462b 100644
 --- a/gcc/ada/adaint.c
 +++ b/gcc/ada/adaint.c
-@@ -94,6 +94,11 @@
+@@ -91,6 +91,11 @@
 #include <sys/param.h>
 #include <sys/pstat.h>
 #endif
@@ -98,7 +75,7 @@ Subject: [PATCH 26/35] ada: musl support fixes
 
 #ifdef __PikeOS__
 #define __BSD_VISIBLE 1
-@@ -3465,7 +3470,6 @@ __gnat_lwp_self (void)
+@@ -3438,7 +3443,6 @@ __gnat_lwp_self (void)
 #endif
 
 #if defined (__linux__)
@@ -106,7 +83,7 @@ Subject: [PATCH 26/35] ada: musl support fixes
 
 /* glibc versions earlier than 2.7 do not define the routines to handle
    dynamically allocated CPU sets. For these targets, we use the static
-@@ -3475,7 +3479,7 @@ __gnat_lwp_self (void)
+@@ -3448,7 +3452,7 @@ __gnat_lwp_self (void)
 
 /* Dynamic cpu sets */
 
@@ -115,7 +92,7 @@ Subject: [PATCH 26/35] ada: musl support fixes
 __gnat_cpu_alloc (size_t count)
 {
   return CPU_ALLOC (count);
-@@ -3488,33 +3492,33 @@ __gnat_cpu_alloc_size (size_t count)
+@@ -3461,33 +3465,33 @@ __gnat_cpu_alloc_size (size_t count)
 }
 
 void
@@ -157,7 +134,7 @@ Subject: [PATCH 26/35] ada: musl support fixes
 }
 
 size_t
-@@ -3524,23 +3528,23 @@ __gnat_cpu_alloc_size (size_t count ATTRIBUTE_UNUSED)
+@@ -3497,23 +3501,23 @@ __gnat_cpu_alloc_size (size_t count ATTRIBUTE_UNUSED)
 }
 
 void
@@ -186,6 +163,8 @@ Subject: [PATCH 26/35] ada: musl support fixes
 }
 #endif /* !CPU_ALLOC */
 #endif /* __linux__ */
+diff --git a/gcc/ada/adaint.h b/gcc/ada/adaint.h
+index 987432c9307..4d782f07de9 100644
 --- a/gcc/ada/adaint.h
 +++ b/gcc/ada/adaint.h
@@ -319,13 +319,11 @@ extern void   *__gnat_lwp_self			   (void);
@@ -206,9 +185,11 @@ Subject: [PATCH 26/35] ada: musl support fixes
 #endif
 
 #if defined (_WIN32)
+diff --git a/gcc/ada/terminals.c b/gcc/ada/terminals.c
+index c0ee4a16bb1..ed796a48c1b 100644
 --- a/gcc/ada/terminals.c
 +++ b/gcc/ada/terminals.c
-@@ -1134,7 +1134,7 @@ __gnat_setup_winsize (void *desc ATTRIBUTE_UNUSED,
+@@ -1127,7 +1127,7 @@ __gnat_setup_winsize (void *desc ATTRIBUTE_UNUSED,
 /* POSIX does not specify how to open the master side of a terminal.Several
    methods are available (system specific):
       1- using a cloning device (USE_CLONE_DEVICE)
@@ -217,7 +198,7 @@ Subject: [PATCH 26/35] ada: musl support fixes
       3- openpty                (USE_OPENPTY)
 
    When using the cloning device method, the macro USE_CLONE_DEVICE should
-@@ -1148,7 +1148,7 @@ __gnat_setup_winsize (void *desc ATTRIBUTE_UNUSED,
+@@ -1141,7 +1141,7 @@ __gnat_setup_winsize (void *desc ATTRIBUTE_UNUSED,
 #if defined (__APPLE__) || defined (BSD)
 #define USE_OPENPTY
 #elif defined (__linux__)
@@ -226,7 +207,7 @@ Subject: [PATCH 26/35] ada: musl support fixes
 #elif defined (__sun__)
 #define USE_CLONE_DEVICE "/dev/ptmx"
 #elif defined (_AIX)
-@@ -1197,8 +1197,8 @@ allocate_pty_desc (pty_desc **desc) {
+@@ -1190,8 +1190,8 @@ allocate_pty_desc (pty_desc **desc) {
    int  master_fd   = -1;
    char *slave_name = NULL;
 
@@ -237,3 +218,6 @@ Subject: [PATCH 26/35] ada: musl support fixes
 #elif defined (USE_OPENPTY)
   status = openpty (&master_fd, &slave_fd, NULL, NULL, NULL);
 #elif defined (USE_CLONE_DEVICE)
+-- 
+2.41.0
+
@@ -7,8 +7,8 @@ Subject: [PATCH 27/35] configure: Add --enable-autolink-libatomic, use in
 This fixes issues with RISC-V.
 ---
 Makefile.in           |  1 +
- gcc/config/gnu-user.h | 12 +++++++++++-
 gcc/config.in         |  6 ++++++
+ gcc/config/gnu-user.h | 12 +++++++++++-
 gcc/configure         | 31 ++++++++++++++++++++++++++++++-
 gcc/configure.ac      | 21 +++++++++++++++++++++
 gcc/doc/install.texi  |  8 ++++++++
@@ -17,9 +17,11 @@ This fixes issues with RISC-V.
 gcc/gcc.cc            | 12 +++++++++++-
 9 files changed, 102 insertions(+), 5 deletions(-)

+diff --git a/Makefile.in b/Makefile.in
+index 6ff2b3f9925..394b105b271 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -237,6 +237,7 @@ HOST_EXPORTS = \
+@@ -235,6 +235,7 @@ HOST_EXPORTS = \
 	RANLIB_FOR_TARGET="$(RANLIB_FOR_TARGET)"; export RANLIB_FOR_TARGET; \
 	READELF_FOR_TARGET="$(READELF_FOR_TARGET)"; export READELF_FOR_TARGET; \
 	TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export TOPLEVEL_CONFIGURE_ARGUMENTS; \
@@ -27,6 +29,25 @@ This fixes issues with RISC-V.
 	HOST_LIBS="$(STAGE1_LIBS)"; export HOST_LIBS; \
 	GMPLIBS="$(HOST_GMPLIBS)"; export GMPLIBS; \
 	GMPINC="$(HOST_GMPINC)"; export GMPINC; \
+diff --git a/gcc/config.in b/gcc/config.in
+index 0679fbbf4c6..ee81139b385 100644
+--- a/gcc/config.in
+++ b/gcc/config.in
+@@ -118,6 +118,12 @@
+ #endif
+ 
+ 
+/* Define if libatomic should always be linked. */
+#ifndef USED_FOR_TARGET
+#undef ENABLE_AUTOLINK_LIBATOMIC
+#endif
+
+
+ /* Define to 1 to specify that we are using the BID decimal floating point
+    format instead of DPD */
+ #ifndef USED_FOR_TARGET
+diff --git a/gcc/config/gnu-user.h b/gcc/config/gnu-user.h
+index b26b17f2f2a..3f64ea46180 100644
 --- a/gcc/config/gnu-user.h
 +++ b/gcc/config/gnu-user.h
@@ -109,8 +109,18 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
@@ -49,24 +70,11 @@ This fixes issues with RISC-V.
    %{static|static-pie:--end-group}%{!static:%{!static-pie:%G}}"
 
 #undef LINK_GCC_C_SEQUENCE_SPEC
--- a/gcc/config.in
-+++ b/gcc/config.in
-@@ -131,6 +131,12 @@
- #endif
- 
- 
-+/* Define if libatomic should always be linked. */
-+#ifndef USED_FOR_TARGET
-+#undef ENABLE_AUTOLINK_LIBATOMIC
-+#endif
-+
-+
- /* Define to 1 to specify that we are using the BID decimal floating point
-    format instead of DPD */
- #ifndef USED_FOR_TARGET
+diff --git a/gcc/configure b/gcc/configure
+index e59cbee1767..787c35d4e25 100755
 --- a/gcc/configure
 +++ b/gcc/configure
-@@ -1002,6 +1002,7 @@ with_changes_root_url
+@@ -984,6 +984,7 @@ with_changes_root_url
 enable_languages
 with_multilib_list
 with_multilib_generator
@@ -74,7 +82,7 @@ This fixes issues with RISC-V.
 with_zstd
 with_zstd_include
 with_zstd_lib
-@@ -1739,6 +1740,9 @@ Optional Features:
+@@ -1713,6 +1714,9 @@ Optional Features:
   --disable-shared        don't provide a shared libgcc
   --disable-gcov          don't provide libgcov and related host tools
   --enable-languages=LIST specify which front-ends to build
@@ -84,7 +92,7 @@ This fixes issues with RISC-V.
   --disable-rpath         do not hardcode runtime library paths
   --enable-sjlj-exceptions
                           arrange to use setjmp/longjmp exception handling
-@@ -8380,7 +8384,6 @@ else
+@@ -8329,7 +8333,6 @@ else
 fi
 
 
@@ -92,7 +100,7 @@ This fixes issues with RISC-V.
 # Check whether --with-multilib-generator was given.
 if test "${with_multilib_generator+set}" = set; then :
   withval=$with_multilib_generator; :
-@@ -8388,6 +8391,32 @@ else
+@@ -8337,6 +8340,32 @@ else
   with_multilib_generator=default
 fi
 
@@ -125,9 +133,11 @@ This fixes issues with RISC-V.
 
 # -------------------------
 # Checks for other programs
+diff --git a/gcc/configure.ac b/gcc/configure.ac
+index 57268319de1..56bcaa87620 100644
 --- a/gcc/configure.ac
 +++ b/gcc/configure.ac
-@@ -1215,6 +1215,27 @@ AC_ARG_WITH(multilib-generator,
+@@ -1199,6 +1199,27 @@ AC_ARG_WITH(multilib-generator,
 :,
 with_multilib_generator=default)
 
@@ -155,9 +165,11 @@ This fixes issues with RISC-V.
 # -------------------------
 # Checks for other programs
 # -------------------------
+diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi
+index b30d3691fe6..ccc8e5dbb00 100644
 --- a/gcc/doc/install.texi
 +++ b/gcc/doc/install.texi
-@@ -2525,6 +2525,14 @@ files, but these changed header paths may conflict with some compilation
+@@ -2377,6 +2377,14 @@ files, but these changed header paths may conflict with some compilation
 environments.  Enabled by default, and may be disabled using
 @option{--disable-canonical-system-headers}.
 
@@ -172,9 +184,11 @@ This fixes issues with RISC-V.
 @item --with-glibc-version=@var{major}.@var{minor}
 Tell GCC that when the GNU C Library (glibc) is used on the target it
 will be version @var{major}.@var{minor} or later.  Normally this can
+diff --git a/gcc/doc/tm.texi b/gcc/doc/tm.texi
+index a660e33739b..6183c407a2b 100644
 --- a/gcc/doc/tm.texi
 +++ b/gcc/doc/tm.texi
-@@ -390,7 +390,13 @@ the argument @option{-lgcc} to tell the linker to do the search.
+@@ -381,7 +381,13 @@ the argument @option{-lgcc} to tell the linker to do the search.
 
 @defmac LINK_GCC_C_SEQUENCE_SPEC
 The sequence in which libgcc and libc are specified to the linker.
@@ -189,9 +203,11 @@ This fixes issues with RISC-V.
 @end defmac
 
 @defmac POST_LINK_SPEC
+diff --git a/gcc/doc/tm.texi.in b/gcc/doc/tm.texi.in
+index f7ab5d48a63..281540aba68 100644
 --- a/gcc/doc/tm.texi.in
 +++ b/gcc/doc/tm.texi.in
-@@ -390,7 +390,13 @@ the argument @option{-lgcc} to tell the linker to do the search.
+@@ -381,7 +381,13 @@ the argument @option{-lgcc} to tell the linker to do the search.
 
 @defmac LINK_GCC_C_SEQUENCE_SPEC
 The sequence in which libgcc and libc are specified to the linker.
@@ -206,9 +222,11 @@ This fixes issues with RISC-V.
 @end defmac
 
 @defmac POST_LINK_SPEC
+diff --git a/gcc/gcc.cc b/gcc/gcc.cc
+index 59390fd39d6..dae1dd4cf79 100644
 --- a/gcc/gcc.cc
 +++ b/gcc/gcc.cc
-@@ -991,13 +991,23 @@ proper position among the other output files.  */
+@@ -974,13 +974,23 @@ proper position among the other output files.  */
 # define ASM_DEBUG_OPTION_SPEC ""
 #endif
 
@@ -233,3 +251,6 @@ This fixes issues with RISC-V.
 #endif
 
 #ifdef ENABLE_DEFAULT_SSP
+-- 
+2.41.0
+
@@ -9,9 +9,11 @@ ref: alpine/aports#13422
 Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

+diff --git a/Makefile.in b/Makefile.in
+index 394b105b271..bc4a77fc300 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -54362,7 +54362,7 @@ configure-target-libphobos:
+@@ -52809,7 +52809,7 @@ configure-target-libphobos:
 	esac; \
 	module_srcdir=libphobos; \
 	rm -f no-such-file || : ; \
@@ -20,3 +22,6 @@ ref: alpine/aports#13422
 	  $$s/$$module_srcdir/configure \
 	  --srcdir=$${topdir}/$$module_srcdir \
 	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+-- 
+2.41.0
+
@@ -11,9 +11,11 @@ an external library for these functions.
 libphobos/m4/druntime/libraries.m4 | 8 --------
 2 files changed, 16 deletions(-)

+diff --git a/libphobos/configure b/libphobos/configure
+index 925c53c5f5e..60c2a0c11c6 100755
 --- a/libphobos/configure
 +++ b/libphobos/configure
-@@ -15375,14 +15375,6 @@ fi
+@@ -15216,14 +15216,6 @@ fi
   # Keep this in sync with core/thread.d, set druntime_fiber_asm_external to
   # "yes" for targets that have 'version = AsmExternal'.
   druntime_fiber_asm_external=no
@@ -28,6 +30,8 @@ an external library for these functions.
   if test "$druntime_fiber_asm_external" = no; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing swapcontext" >&5
 $as_echo_n "checking for library containing swapcontext... " >&6; }
+diff --git a/libphobos/m4/druntime/libraries.m4 b/libphobos/m4/druntime/libraries.m4
+index 45a56f6f76a..fef6e890b1e 100644
 --- a/libphobos/m4/druntime/libraries.m4
 +++ b/libphobos/m4/druntime/libraries.m4
@@ -220,14 +220,6 @@ AC_DEFUN([DRUNTIME_LIBRARIES_UCONTEXT],
@@ -45,3 +49,6 @@ an external library for these functions.
   if test "$druntime_fiber_asm_external" = no; then
     AC_SEARCH_LIBS([swapcontext], [c ucontext], [],
       AC_MSG_ERROR([swapcontext required but not found]))
+-- 
+2.41.0
+
@@ -7,9 +7,11 @@ Subject: [PATCH 32/35] libgnat: time_t is always 64-bit on musl libc
 gcc/ada/libgnat/s-parame.ads | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

+diff --git a/gcc/ada/libgnat/s-parame.ads b/gcc/ada/libgnat/s-parame.ads
+index 3d6e345a1ba..cfe0b4d3ca6 100644
 --- a/gcc/ada/libgnat/s-parame.ads
 +++ b/gcc/ada/libgnat/s-parame.ads
-@@ -100,7 +100,7 @@ package System.Parameters is
+@@ -102,7 +102,7 @@ package System.Parameters is
    -- Characteristics of time_t type --
    ------------------------------------
 
@@ -18,3 +20,6 @@ Subject: [PATCH 32/35] libgnat: time_t is always 64-bit on musl libc
    --  Number of bits in type time_t
 
    ----------------------------------------------
+-- 
+2.41.0
+