DO NOT MERGE: apk-tools: workaround apk-tools upgrade failure

see https://gitlab.com/postmarketOS/pmaports/-/issues/3075
apk-tools: fix triggers maybe (MR 5513)
2024-08-21 14:32:52 -07:00 · 2024-08-19 17:15:47 -07:00 · 2024-08-19 16:00:20 -07:00 · 2024-08-19 15:20:58 -07:00 · 2024-08-19 15:20:58 -07:00 · 2024-08-19 15:20:57 -07:00
2034 changed files with 45921 additions and 99813 deletions
@@ -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
@@ -1,18 +1,24 @@
 #!/bin/sh -e
+# Description: update a list of packages
+# Options: native slow
+# https://postmarketos.org/pmb-ci

 if [ "$(id -u)" = 0 ]; then
 	set -x
 	apk add git openssh-keygen grep curl
-	wget "https://gitlab.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

 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"
+# pmaports
+# The email address is the username of the bot (from the GitLab group members page) @noreply.gitlab.com
+git config --global user.email "project_8065375_bot_13cf44ca4cd2c938688af6e3d500d9cb@noreply.gitlab.com"
+
+# For testing with pmaports-autoupdate-test repo
+# git config --global user.email "project_58002231_bot_be2d4e9e7aba929855726aafe12940d6@noreply.gitlab.com"

 # Configure SSH key for signing
 mkdir -p ~/.ssh
@@ -43,7 +49,7 @@ update_linux_next() {
 	# 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
+	curl -s "https://gitlab.com/linux-kernel/linux-next/-/tags?format=atom" | grep -oP "(?<=<title>)[^<]+" | tail -n +2 > /tmp/tags

 	latest=$(grep -v "v" < /tmp/tags | head -n1)
 	if [ -z "$latest" ]; then
@@ -71,7 +77,6 @@ update_linux_next() {

 	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
@@ -85,9 +90,9 @@ update_linux_next() {
 }

 # 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.com/postmarketOS/pmaports-autoupdate-test.git

-git remote add gitlab https://pmos-ci:"$PMAPORTS_PUSH_TOKEN"@gitlab.postmarketos.org/postmarketOS/pmaports.git
+git remote add gitlab https://pmos-ci:"$PMAPORTS_PUSH_TOKEN"@gitlab.com/postmarketOS/pmaports.git
 git fetch gitlab
 git checkout --track gitlab/master

@@ -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"
@@ -57,7 +57,7 @@ fi

 POSTMARKETOS_WALLPAPER_PATH='/usr/share/wallpapers/postmarketos.jpg'
 # The excluded devices are "grandfathered in". New devices should not be added here.
-# See https://gitlab.postmarketos.org/postmarketOS/pmaports/-/issues/2529
+# See https://gitlab.com/postmarketOS/pmaports/-/issues/2529
 if grep -qr $POSTMARKETOS_WALLPAPER_PATH \
 	--exclude-dir='device-pine64-pinetab' \
 	--exclude-dir='device-oneplus-kebab' \
@@ -87,11 +87,4 @@ if grep -qEr 'PMOS_NO_OUTPUT_REDIRECT' -- *; then
 	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,8 @@

 if [ "$(id -u)" = 0 ]; then
 	set -x
-	wget "https://gitlab.postmarketos.org/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
+	export PMBOOTSTRAP_TAG=master
+	wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
 	sh ./install_pmbootstrap.sh
 	exec su "${TESTUSER:-pmos}" -c "sh -e $0"
 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,23 +2,22 @@
 # 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):
    common.run_pmbootstrap(["build_init"])
+    common.run_pmbootstrap(["config", "mirrors_postmarketos",
+                            "http://mirror.postmarketos.org/postmarketos/staging/systemd/"])
+    common.run_pmbootstrap(["config", "systemd", "always"])
    common.run_pmbootstrap(["--details-to-stdout", "--no-ccache", "build",
                            "--strict", "--force",
                            "--arch", arch, ] + list(packages))
@@ -55,36 +54,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")
@@ -93,49 +79,8 @@ if __name__ == "__main__":
    # No packages: skip build
    if len(packages) == 0:
        print(f"no packages changed, which can be built for {arch}")
+        sys.exit(0)

-    else:
-        verify_only = common.commit_message_has_string("[ci:skip-build]")
-        if verify_only:
-            # [ci:skip-build]: verify checksums and stop
-            print("WARNING: not building changed packages ([ci:skip-build])!")
-            print("verifying checksums: " + ", ".join(packages))
-            verify_checksums(packages, arch)
-        else:
-            # 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}")
-
-        else:
-            verify_only = common.commit_message_has_string("[ci:skip-build]")
-            if verify_only:
-                # [ci:skip-build]: verify checksums
-                print("WARNING: not building changed packages for extra-repos/systemd: ([ci:skip-build])!")
-                print("verifying checksums: " + ", ".join(systemd_pkgs))
-                verify_checksums(systemd_pkgs, arch)
-            else:
-                # Build packages
-                print(f"building in strict mode for {arch}, from extra-repos/systemd: {', '.join(systemd_pkgs)}")
-                build_strict(systemd_pkgs, arch)
+    # Build packages
+    print(f"building in strict mode for {arch}: {', '.join(packages)}")
+    build_strict(packages, 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,8 @@ 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_contents(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,16 +37,15 @@ 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):
+def get_package_version(args, package, revision, check=True):
    """ returns version in the format "{pkgver}-r{pkgrel}", or None if no 
        matching package is found """
-    parsed = get_package_contents(package, revision, check)
+    parsed = get_package_contents(args, package, revision, check)
    if parsed is None:
        return None
    return parsed["pkgver"] + "-r" + parsed["pkgrel"]
@@ -94,7 +91,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
@@ -113,8 +110,8 @@ def check_versions(packages):

    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]")
@@ -132,8 +129,8 @@ def check_versions(packages):

        # 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)
+            head_parsed = get_package_contents(args, package, "HEAD", False)
+            upstream_parsed = get_package_contents(args, package, commit, False)

            # checksums did not change
            if head_parsed["sha512sums"] == upstream_parsed["sha512sums"]:
@@ -194,12 +191,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)
@@ -36,7 +36,7 @@ def run_git(parameters, check=True, stderr=None):
 def add_upstream_git_remote():
    """ Add a remote pointing to postmarketOS/pmaports. """
    run_git(["remote", "add", "upstream",
-             "https://gitlab.postmarketos.org/postmarketOS/pmaports.git"], False)
+             "https://gitlab.com/postmarketOS/pmaports.git"], False)
    run_git(["fetch", "-q", "upstream"])


@@ -44,10 +44,14 @@ def commit_message_has_string(needle):
    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():
@@ -56,34 +60,8 @@ def get_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"]
-
-    # Get channel (e.g. "stable") from pmaports.cfg
-    # https://postmarketos.org/pmaports.cfg
-    pmaports_dir = get_pmaports_dir()
-    pmaports_cfg = configparser.ConfigParser()
-    pmaports_cfg.read(f"{pmaports_dir}/pmaports.cfg")
-    channel = pmaports_cfg["pmaports"]["channel"]
-
-    # Get branch_pmaports (e.g. "v20.05") from channels.cfg
-    # https://postmarketos.org/channels.cfg
-    channels_cfg_str = run_git(["show", "upstream/master:channels.cfg"])
-    channels_cfg = configparser.ConfigParser()
-    channels_cfg.read_string(channels_cfg_str)
-    assert channel in channels_cfg, \
-        f"Channel '{channel}' from pmaports.cfg in your branch is unknown." \
-        " This appears to be an old branch, consider recreating your change" \
-        " on top of master."
-
-    ret = channels_cfg[channel]["branch_pmaports"]
-    cache["upstream_branch"] = ret
-    return ret
+    # HACK for master_staging_systemd branch
+    return "master_staging_systemd"


 def get_changed_files(removed=True):
@@ -96,7 +74,7 @@ def get_changed_files(removed=True):
    commit_head = run_git(["rev-parse", "HEAD"])[:-1]
    commit_upstream = run_git(["rev-parse", branch_upstream])[:-1]
    print("commit HEAD: " + commit_head)
-    print(f"commit {branch_upstream}: {commit_upstream}")
+    print(f"commit {branch_upstream}: f{commit_upstream}")

    # Check if we are HEAD on the upstream branch
    if commit_head == commit_upstream:
@@ -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)
@@ -21,10 +21,12 @@ sh_files="
 	./main/postmarketos-installkernel/installkernel-pmos
 	./main/postmarketos-initramfs/init.sh
 	./main/postmarketos-initramfs/init_functions.sh
+	./main/postmarketos-mkinitfs-hook-debug-shell/setup_usb_storage.sh
 	./main/postmarketos-mkinitfs-hook-netboot/netboot.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')
@@ -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
@@ -11,8 +11,9 @@ import sys
 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
+
+# Cache for codeowners_parse
+codeowners_parsed = {}

 # Don't complain if these nicknames are the only maintainers of an APKBUILD,
 # because they are actually a group of people
@@ -31,11 +32,11 @@ def device_dependency_check(apkbuild, path):
                               " 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,7 +45,8 @@ 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
        for depend in apkbuild["depends"]:
@@ -52,27 +54,27 @@ def test_aports_device():

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


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

-    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"
+        require_enough_codeowners_entries(args, path, maintainers)

-    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"
+        require_enough_codeowners_entries(args, path, maintainers)


-def test_aports_unmaintained():
+def test_aports_unmaintained(args):
    """
    Ensure that aports in /device/unmaintained have an "Unmaintained:" comment
    that describes why the aport is unmaintained.
    """
-
-    for path in pkgrepo_iglob("device/unmaintained/*/APKBUILD"):
+    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,16 +62,16 @@ 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"):
                raise RuntimeError("Please add the manufacturer in front of"
@@ -29,7 +29,7 @@ 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):
        if os.path.isdir(file) or os.path.islink(file):
@@ -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!")
@@ -11,15 +11,14 @@ 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))

@@ -41,15 +40,14 @@ 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 bool(re.search("make z?install", Path(path).read_text(encoding="utf-8"))):
            if "postmarketos-installkernel" not in apkbuild["makedepends"]:
                raise RuntimeError(f"{aport_name}: \"postmarketos-installkernel\" missing in"
                                   " makedepends, required when using make install/zinstall.")
@@ -10,7 +10,6 @@ import sys
 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):
@@ -66,14 +65,13 @@ def apkbuild_check_provides(path, apkbuild, version, pkgname, subpkgname=None):
    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 = []
@@ -109,7 +105,7 @@ def test_aports_unreferenced_files():
                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
@@ -119,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
@@ -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}'")
@@ -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
@@ -10,12 +10,7 @@ stages:
  - lint
  - build
  - autoupdate
-variables:
-  # Default of 20 is pretty small, sometimes MRs have >20 commits in them. 100
-  # seems like a reasonable balance. If this is too low, git merge-base (from ci/
-  # common.py) can fail
-  GIT_DEPTH: 100
-  
+
 # This defines the rules for when a pipeline should run.
 workflow:
  rules:
@@ -31,7 +26,7 @@ workflow:
 wiki:
  stage: lint
  rules:
-    - if: &mr_rule $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
      changes:
        - .ci/**/*
        - .gitlab-ci.yml
@@ -44,7 +39,7 @@ wiki:
 ruff:
  stage: lint
  rules:
-    - if: *mr_rule
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
      changes:
        - .ci/*
        - .ci/*/*
@@ -58,7 +53,7 @@ shellcheck-grep:
  stage: lint
  image: alpine:edge
  rules:
-    - if: *mr_rule
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
  script:
    - .ci/lib/gitlab_prepare_ci.sh
    - .ci/shellcheck.sh
@@ -69,7 +64,7 @@ editor-config:
  stage: lint
  image: alpine:edge
  rules:
-    - if: *mr_rule
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
  script:
    - .ci/lib/gitlab_prepare_ci.sh
    - .ci/ec.sh
@@ -78,7 +73,7 @@ editor-config:
 pytest-commits:
  stage: lint
  rules:
-    - if: *mr_rule
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
  script:
    - .ci/lib/gitlab_prepare_ci.sh
    - .ci/pytest.sh
@@ -95,7 +90,7 @@ pytest-commits:
 aport-lint:
  stage: lint
  rules:
-    - if: *mr_rule
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
  script:
    - .ci/lib/gitlab_prepare_ci.sh
    - .ci/apkbuild-lint.sh
@@ -105,13 +100,11 @@ aport-lint:
 kernel-kconfig:
  stage: lint
  rules:
-    - if: *mr_rule
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
      changes:
        - kconfigcheck.toml
-      allow_failure: true
-    - if: *mr_rule
-      changes:
        - device/*/linux-*/config-*
+        - main/linux-*/config-*
  script:
    - .ci/lib/gitlab_prepare_ci.sh
    - .ci/kconfig.sh
@@ -126,14 +119,16 @@ mr-settings:
    - *global_before_scripts
    - 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

 # build changed aports
 .build:
  stage: build
+  tags:
+    - saas-linux-large-amd64
  rules:
-    - if: *mr_rule
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
  before_script:
    - *global_before_scripts
    - .ci/lib/gitlab_prepare_ci.sh
@@ -150,37 +145,23 @@ build-x86_64:
  script:
    - .ci/build-x86_64.sh

-build-x86:
-  extends: .build
-  script:
-    - .ci/build-x86.sh
-
 build-aarch64:
  extends: .build
-  tags: [arm64]
+  tags:
+    - saas-linux-large-arm64
  script:
    - .ci/build-aarch64.sh

 build-armv7:
  extends: .build
-  tags: [qemu]
  script:
    - .ci/build-armv7.sh

-build-armhf:
-  extends: .build
-  tags: [qemu]
-  script:
-    - .ci/build-armhf.sh
-
-build-riscv64:
-  extends: .build
-  tags: [qemu]
-  script:
-    - .ci/build-riscv64.sh
-
 auto-update:
  stage: autoupdate
+  # We build packages before merging too
+  tags:
+    - saas-linux-large-amd64
  rules:
    # This variable is set in the scheduled pipeline configuration. It should be a space separated list of
    # package names to update.
@@ -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"
@@ -27,8 +27,7 @@
 	Replace space inside `[ ]` with `x` to fill the checkbox
 -->
 * [ ] edge (`master` branch)
-* [ ] `v24.12`
-* [ ] `v24.06` (supported until 2025-01-23)
+* [ ] `v24.06`

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

@@ -39,9 +38,6 @@
 * [ ] 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
@@ -1,10 +1,14 @@
 {
    "subject_format": {
        "pass": [
-            "^(([a-z]+\\/\\)?\\([a-z\\-0-9*{}]+),?)+: [a-z][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+\\)|)$"
+            "^(([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
@@ -31,53 +31,38 @@ device/*/*-pine64-pinephonepro/			@PsychoGame
 device/*/*-pine64-rockpro64/			@PureTryOut
 device/*/*-purism-librem5/			@craftyguy @alistair23 @Newbyte
 device/*/*-qcom-msm8916/			@Minecrell @TravMurav
-device/*/*-qcom-msm8953/			@barni2000 @alikates @vipaoL @jiaxyga
-device/*/*-qcom-sdm670/				@flamingradian
 device/*/*-qcom-sdm845/				@sdm845-mainline
-device/*/*-qcom-sm7150/				@Adrian @jiaxyga @ungeskriptet
-device/*/*-qcom-sm8250/				@jianhua
-device/*/*-qcom/					@calebccff
+device/*/*-qcom-sm6350/				@z3ntu
 device/*/*-samsung-a3/				@Mis012 @TravMurav @Minecrell
 device/*/*-samsung-a5/				@Minecrell @minlexx
-device/*/*-samsung-a51/				@manoedinata
 device/*/*-samsung-e7/				@wonderfulShrineMaidenOfParadise
 device/*/*-samsung-espresso10/			@MightyM17
 device/*/*-samsung-espresso7/			@MightyM17 @antoni.aloytorrens
-device/*/*-samsung-fortuna/			@wonderfulShrineMaidenOfParadise
-device/*/*-samsung-fortunaltezt/		@bolilingmeng89006
 device/*/*-samsung-grandmax/			@wonderfulShrineMaidenOfParadise
 device/*/*-samsung-gt510/			@TravMurav
 device/*/*-samsung-gt58/			@TravMurav
-device/*/*-samsung-j3ltetw/		@bolilingmeng89006
-device/*/*-samsung-j4lte/			@manoedinata
 device/*/*-samsung-j5/				@wonderfulShrineMaidenOfParadise
 device/*/*-samsung-j5x/				@wonderfulShrineMaidenOfParadise
-device/*/*-samsung-rossa/			@wonderfulShrineMaidenOfParadise
 device/*/*-samsung-serranove/			@Minecrell
 device/*/*-tolino-shine2hd/			@akemnade
 device/*/*-videostrong-kii-pro/			@funderscore
 device/*/*-wileyfox-crackling/			@TravMurav @Minecrell
 device/*/*-xiaomi-beryllium/			@joelselvaraj
 device/*/*-xiaomi-daisy/			@joelselvaraj @alikates
-device/*/*-xiaomi-davinci/			@Adrian @ArianK16a
-device/*/*-xiaomi-elish/			@jianhua
 device/*/*-xiaomi-markw/			@vipaoL
 device/*/*-xiaomi-mido/				@barni2000
 device/*/*-xiaomi-scorpio/			@Tooniis
-device/*/*-xiaomi-surya/			@jiaxyga @ungeskriptet
 device/*/*-xiaomi-tissot/			@jiaxyga @barni2000
 device/*/*-xiaomi-vince/			@M0Rf30
 device/*/*-xiaomi-wt88047/			@Minecrell
 device/*/*-xiaomi-ysl/				@barni2000
 device/*/alsa-ucm-conf-cros/			@WeirdTreeThing
-device/*/alsa-ucm-conf-qcom-sdm670/		@flamingradian
-device/*/device-apple-n61/			@JustSoup321
+device/*/device-fairphone-*/			@z3ntu
 device/*/device-generic-x86_64/			@craftyguy @ollieparanoid
 device/*/device-google-nyan-big/		@jenneron
 device/*/device-google-nyan-blaze/		@jenneron
 device/*/device-google-peach-pi/		@jenneron
 device/*/device-google-peach-pit/		@jenneron
-device/*/device-google-sargo/			@flamingradian
 device/*/device-google-snow/			@jenneron
 device/*/device-huawei-plank/			@gtrxAC
 device/*/device-lg-judyln/			@Newbyte
@@ -91,21 +76,17 @@ device/*/device-postmarketos-trailblazer/	@calebccff
 device/*/device-qcom-msm8909/			@wonderfulShrineMaidenOfParadise
 device/*/device-qemu-aarch64/			@Minecrell @ollieparanoid
 device/*/device-qemu-amd64/			@Minecrell @ollieparanoid
-device/*/device-qemu-riscv64/			@Minecrell
+device/*/device-qemu-riscv64/			@Minecrell @z3ntu
 device/*/device-qualcomm-sdm845/		@calebccff
-device/*/device-raspberry-pi3/			@fossdd
 device/*/device-samsung-chagallwifi/		@Grimler
 device/*/device-samsung-coreprimevelte/		@legolivesmatter @balejk
-device/*/device-samsung-j5y17lte/		@andrisas
+device/*/device-samsung-j5y17lte/	@andrisas
 device/*/device-samsung-klimtlte/		@Grimler
 device/*/device-samsung-lt01/			@knuxify
 device/*/device-samsung-m0/			@Newbyte
 device/*/device-samsung-manta/			@jenneron @alexmrqt
 device/*/device-shift-axolotl/			@amartinz @calebccff @dylanvanassche
-device/*/device-solidrun-cubox/			@longnoserob
-device/*/firmware-google-sargo/			@flamingradian
 device/*/firmware-google-veyron-brcm/		@jenneron
-device/*/firmware-motorola-osprey/		@Minecrell
 device/*/firmware-odroid-xu4/			@Grimler
 device/*/firmware-oneplus-sdm845/		@calebccff
 device/*/firmware-powervr-gx6250/		@jenneron
@@ -116,16 +97,13 @@ device/*/linux-huawei-plank/			@gtrxAC
 device/*/linux-next/				@calebccff
 device/*/linux-postmarketos-allwinner/		@Arnavion @PsychoGame
 device/*/linux-postmarketos-amlogic/		@funderscore @exkc
-device/*/linux-postmarketos-apple/		@JustSoup321
 device/*/linux-postmarketos-exynos4/		@Newbyte @Grimler @knuxify
 device/*/linux-postmarketos-exynos5/		@jenneron @Grimler
 device/*/linux-postmarketos-grate/		@clamor-s @jenneron @jethrob
 device/*/linux-postmarketos-imx-ereader/	@akemnade
-device/*/linux-postmarketos-marvell/		@longnoserob @exkc
 device/*/linux-postmarketos-mediatek-mt8173/	@jenneron @adamthiede
 device/*/linux-postmarketos-mediatek-mt8183/	@jenneron @binarycraft
 device/*/linux-postmarketos-omap/		@MightyM17 @Sicelo
-device/*/linux-postmarketos-qcom-laptop/	@craftyguy @calebccff
 device/*/linux-postmarketos-qcom-msm8939/	@Newbyte
 device/*/linux-postmarketos-qcom-msm8953/	@M0Rf30 @Ultra-azu @barni2000
 device/*/linux-postmarketos-qcom-msm8996/	@Tooniis
@@ -134,7 +112,7 @@ device/*/linux-postmarketos-rockchip/		@QC8086
 device/*/linux-postmarketos-stericsson/		@Newbyte
 device/*/linux-samsung-chagallwifi/		@Grimler
 device/*/linux-samsung-coreprimevelte/		@legolivesmatter @balejk
-device/*/linux-samsung-j5y17lte/		@andrisas
+device/*/linux-samsung-j5y17lte/	@andrisas
 device/*/linux-samsung-klimtlte/		@Grimler
 device/*/oem-amd/				@craftyguy
 device/*/oem-intel/				@craftyguy
@@ -149,12 +127,10 @@ device/*/u-boot-librem5/			@craftyguy @alistair23 @Newbyte
 device/*/u-boot-pinebookpro/			@QC8086
 device/*/u-boot-pinephone/			@Arnavion @PsychoGame
 device/*/wl1251-cal/				@Danct12
-main/postmarketos*gnome*/			@pabloyoyoista @Newbyte @fossdd
+main/postmarketos*gnome*/			@pabloyoyoista @Newbyte
 main/postmarketos-initramfs/			@calebccff @craftyguy
 main/postmarketos-ui-i3wm/			@fossdd
-main/postmarketos-ui-phosh/			@pabloyoyoista @Newbyte @fossdd
-main/postmarketos-ui-plasma-bigscreen/		@PureTryOut
-main/postmarketos-ui-plasma-desktop/		@PureTryOut
+main/postmarketos-ui-phosh/			@pabloyoyoista @Newbyte
 main/postmarketos-ui-plasma-mobile/		@PureTryOut
 main/shutdown-clear-rtc-wakealarm/		@Arnavion
 main/ttyescape/					@calebccff
@@ -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,14 +8,8 @@ branch_pmaports=master
 branch_aports=master
 mirrordir_alpine=edge

-[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)
+description=Latest release / Recommended for best stability
 branch_pmaports=v24.06
 branch_aports=3.20-stable
 mirrordir_alpine=v3.20
@@ -7,8 +7,8 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi

 pkgname=busybox-static-aarch64
-pkgver=1.37.0
-pkgrel=14
+pkgver=1.36.1
+pkgrel=31

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

 sha512sums="
-8f1f521eceb24a5f66e18e022b1151e96b40378051aaed911dc22e68dbffc5998c8f2bac3935423371c7e707f8931e97873c91c39d56dc2e34292567b3caceaf  busybox-static-1.37.0-r14-aarch64-edge.apk
+c34906bb0a5d7e268ab43ca1e3e2f9c75c06f3f5de8d41671396bcd7d585a79a66e25ad43e80a3e107a1de0ecaf83ac7198163d3e775edbd6d626ef014307ec5  busybox-static-1.36.1-r31-aarch64-edge.apk
 "
@@ -7,8 +7,8 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi

 pkgname=busybox-static-armhf
-pkgver=1.37.0
-pkgrel=14
+pkgver=1.36.1
+pkgrel=31

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

 sha512sums="
-ce7dfd41a149faed98ae5ae08695223b57e8104a47c9c4c0e956a8c7cbd7fbc6b53b247f2c0f0633d72aa0aba8688f6ecfdd9784722b655f3c29dc1a2557f3e1  busybox-static-1.37.0-r14-armhf-edge.apk
+7e6a961a0adcbc2912f5b261ce84a62b9189dce49c5dd3d2bcbdae407645dec72c27af8804c1d5446d50e78ea938a4d812c477db199ed83cac7c647c4b41f3fe  busybox-static-1.36.1-r31-armhf-edge.apk
 "
@@ -7,8 +7,8 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi

 pkgname=busybox-static-armv7
-pkgver=1.37.0
-pkgrel=14
+pkgver=1.36.1
+pkgrel=31

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

 sha512sums="
-2f7003d0de894299a0260efd97bddfabd8d14d0e4b624445a77367036ad33c7ad65a85ee758969e671599ded5ee5674bda755c570ca4d9e95bba9c02b5788b8f  busybox-static-1.37.0-r14-armv7-edge.apk
+b9736dc7df4230196bf05de3bd76b61fc689c56861bc7c5194cd310e23f513cec649c1b3e3f338266b8d58540468d97e8525948a3efc2d1af53e288cd525e836  busybox-static-1.36.1-r31-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();
 		}
 	}

@@ -4,17 +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 32cbdb692..463028fbe 100644
+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) \
@@ -23,16 +23,7 @@ index 32cbdb692..463028fbe 100644
   a-exetim.adb<libgnarl/a-exetim__posix.adb \
   a-exetim.ads<libgnarl/a-exetim__default.ads \
   s-linux.ads<libgnarl/s-linux.ads \
-@@ -2144,7 +2144,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
-@@ -2232,7 +2232,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) \
@@ -41,7 +32,7 @@ index 32cbdb692..463028fbe 100644
   $(ATOMICS_TARGET_PAIRS) \
   $(ATOMICS_BUILTINS_TARGET_PAIRS) \
   system.ads<libgnat/system-linux-ppc.ads
-@@ -2267,7 +2267,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
@@ -59,7 +50,7 @@ index 32cbdb692..463028fbe 100644
   s-mudido.adb<libgnarl/s-mudido__affinity.adb \
   s-osinte.ads<libgnarl/s-osinte__linux.ads \
   s-osinte.adb<libgnarl/s-osinte__posix.adb \
-@@ -2488,7 +2488,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) \
@@ -68,16 +59,7 @@ index 32cbdb692..463028fbe 100644
   $(ATOMICS_TARGET_PAIRS) \
   $(ATOMICS_BUILTINS_TARGET_PAIRS) \
   $(GNATRTL_128BIT_PAIRS) \
-@@ -2592,7 +2592,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) \
-@@ -2637,7 +2637,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) \
@@ -87,10 +69,10 @@ index 32cbdb692..463028fbe 100644
   $(X86_64_TARGET_PAIRS) \
   $(SIMD_PATH_TARGET_PAIRS) \
 diff --git a/gcc/ada/adaint.c b/gcc/ada/adaint.c
-index 74aa3c412..ef6118f37 100644
+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
@@ -102,7 +84,7 @@ index 74aa3c412..ef6118f37 100644
 
 #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__)
@@ -110,7 +92,7 @@ index 74aa3c412..ef6118f37 100644
 
 /* 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 */
 
@@ -119,7 +101,7 @@ index 74aa3c412..ef6118f37 100644
 __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
@@ -161,7 +143,7 @@ index 74aa3c412..ef6118f37 100644
 }
 
 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
@@ -191,7 +173,7 @@ index 74aa3c412..ef6118f37 100644
 #endif /* !CPU_ALLOC */
 #endif /* __linux__ */
 diff --git a/gcc/ada/adaint.h b/gcc/ada/adaint.h
-index 0cbfd0e15..f97ed905b 100644
+index 987432c9307..4d782f07de9 100644
 --- a/gcc/ada/adaint.h
 +++ b/gcc/ada/adaint.h
@@ -319,13 +319,11 @@ extern void   *__gnat_lwp_self			   (void);
@@ -213,10 +195,10 @@ index 0cbfd0e15..f97ed905b 100644
 
 #if defined (_WIN32)
 diff --git a/gcc/ada/terminals.c b/gcc/ada/terminals.c
-index 05af82c27..626ac35bc 100644
+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)
@@ -225,7 +207,7 @@ index 05af82c27..626ac35bc 100644
       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__)
@@ -234,7 +216,7 @@ index 05af82c27..626ac35bc 100644
 #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;
 
@@ -245,3 +227,6 @@ index 05af82c27..626ac35bc 100644
 #elif defined (USE_OPENPTY)
   status = openpty (&master_fd, &slave_fd, NULL, NULL, NULL);
 #elif defined (USE_CLONE_DEVICE)
+-- 
+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
-         {
@@ -34,19 +34,19 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""

 pkgname=gcc-aarch64
-pkgrel=5
+pkgrel=1
 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"
+options="!strip"

 : "${LANG_CXX:=true}"
 : "${LANG_D:=true}"
@@ -64,7 +64,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 +73,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 +115,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,14 +136,15 @@ 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"
-ppc64le|riscv64)	LANG_D=false ;;
+ppc64le|riscv64|loongarch64)	LANG_D=false ;;
 # GDC does currently not work on 32-bit musl architectures.
 # This is a known upstream issue.
 # See: https://github.com/dlang/druntime/pull/3383
@@ -169,7 +171,7 @@ esac
 # currently on x86, x86_64 and ia64
 _libquadmath=$LANG_FORTRAN
 case "$CTARGET_ARCH" in
-x86 | x86_64 | ppc64le) ;;
+x86 | x86_64)	_libquadmath=$LANG_FORTRAN ;;
 *)		_libquadmath=false ;;
 esac

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

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

@@ -192,17 +199,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,12 +216,13 @@ 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
@@ -232,7 +232,7 @@ 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
@@ -242,7 +242,7 @@ makedepends="$makedepends_build $makedepends_host"
 # PLEASE submit all patches to gcc to https://gitlab.alpinelinux.org/kaniini/alpine-gcc-patches,
 # so that they can be properly tracked and easily rebased if needed.
 #source="https://dev.alpinelinux.org/archive/gcc/${_pkgbase%%.*}-$_pkgsnap/gcc-${_pkgbase%%.*}-$_pkgsnap.tar.xz
-source="https://gcc.gnu.org/pub/gcc/releases/gcc-$_pkgbase/gcc-$_pkgbase.tar.xz
+source="https://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$pkgver}/gcc-${_pkgbase:-$pkgver}.tar.xz
 	0001-posix_memalign.patch
 	0002-gcc-poison-system-directories.patch
 	0003-specs-turn-on-Wl-z-now-by-default.patch
@@ -278,10 +278,7 @@ source="https://gcc.gnu.org/pub/gcc/releases/gcc-$_pkgbase/gcc-$_pkgbase.tar.xz
 	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
 	fix-arm64.patch
-	ppc64le-quadmath.patch
-	riscv64-improve-build-time.patch
 	"

 # secfixes:
@@ -289,21 +286,44 @@ 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
+_gccdir="$srcdir"/gcc-${_pkgbase:-$pkgver}
+_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";;
@@ -319,7 +339,7 @@ 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";;
+	loongarch64-*-*-*)      _arch_configure="--with-arch=loongarch64 --with-abi=lp64d";;
 	esac

 	case "$CTARGET_ARCH" in
@@ -327,28 +347,33 @@ 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"
 	$_libatomic	|| _bootstrap_configure="$_bootstrap_configure --disable-libatomic"
 	$_libitm	|| _bootstrap_configure="$_bootstrap_configure --disable-libitm"
-	$_libquadmath	|| _arch_configure="$_arch_configure --disable-libquadmath"
+	if ! $_libquadmath; then
+		_arch_configure="$_arch_configure --disable-libquadmath"
+		# ppc64le needs both --disable-libquadmath{,-support}
+		# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=116007
+		[ "$CARCH" = "ppc64le" ] &&
+			_arch_configure="$_arch_configure
+				--disable-libquadmath-support"
+	fi

 	msg "Building the following:"
 	echo ""
@@ -356,8 +381,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"
@@ -378,7 +405,7 @@ build() {
 		--disable-multilib
 		--disable-nls
 		--disable-werror
-		--disable-symvers
+		$_symvers
 		--enable-__cxa_atexit
 		--enable-default-pie
 		--enable-default-ssp
@@ -386,8 +413,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
@@ -397,14 +423,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
@@ -413,7 +435,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 \
@@ -428,7 +450,7 @@ 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

 	if $LANG_JIT; then
@@ -472,22 +494,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
@@ -536,7 +561,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() {
@@ -549,7 +575,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() {
@@ -567,13 +594,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() {
@@ -592,26 +621,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() {
@@ -619,43 +652,49 @@ 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() {
@@ -663,25 +702,31 @@ 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
+	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() {
@@ -689,7 +734,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() {
@@ -698,30 +744,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() {
@@ -730,9 +784,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() {
@@ -771,7 +828,7 @@ f382eb5f7c2c60c5a23fac587c9629a3059d7be0898e97a1feaf9b9cbe1ef4693cc1177eb29333e8
 abf845792433a21fed5dd06167b9f6cf5e8f8026a409acce93824e466c5148e192bf5f404a271931fe4b65283499329bf67bb01019f2f3e02501f20619404e6c  0023-riscv-disable-multilib-support.patch
 ab88a2f63e3545bbc36537aa9a86f2c6c35e41bbf702d6e13743a405cdac4f901eed5737189b780da96647fea9f5d863fdc76373f25a00064106dcb5514d6d87  0024-always-build-libgcc_eh.a.patch
 8fdbe0c8bf4ca60f458a33e59027de03d15ac91933fe46d8ca62119346d20b9bc2447c0bf22bceb63d0cf8613ab61512d9197f4e6c2224af473b63ef9f254295  0025-ada-libgnarl-compatibility-for-musl.patch
-684bf2db12aa45e8db7a895ab0f227b4e4351f611b4fcc6e1745d7ad94d31b3554f39d8cf9e2203520b3c6ee35cf309b417d4a842e7a8cd55a2b2accb23f2f24  0026-ada-musl-support-fixes.patch
+5fd23a506b55c88d4f000e01c539eb25d6da2516949c9d7a1c9ee20f4c6b627e4788541284d9c14c33bafa7cb43ce2e0469dd91006152f00e30815107150320f  0026-ada-musl-support-fixes.patch
 3f9a406d7d2ce34951215ffbcadb49a45e55ad5c24ab9097c0e5e92383e43b876872ccd2a7e7def2833ab204975ee5733f8bcf90934db9fa9c4f6f56c62081f6  0027-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
 720a4001f9a1fa4122e456077ecff8d3eb8af7c83d0a81f9da6a6cca05b23664206a82a349e34482c48bfe40e99aa5f21567613d0913f6a24f282bc84a994496  0028-configure-fix-detection-of-atomic-builtins-in-libato.patch
 2044c23b23726965c0a6fd39f616cc464badd650947cb40495eeabd906a3af629878c1d28b403b8eb46b30a1a0ba39083023290d62f0c99ccf070063226e3f8f  0029-libstdc-do-not-throw-exceptions-for-non-C-locales-on.patch
@@ -781,8 +838,5 @@ b325035cb7122d79c6b42ca6d3fc9e02319ed2f7cddb0639dff25d2798d2ce63812cd623462cdf95
 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
 00319c9770362520e8e93bd03fda1769dfa3622eba77d620e11d8af45a38e6d804a5e924046ae388e1cfaea605696e89c343fca507aaaa5edd58d80744fff14f  fix-arm64.patch
-815265826742400f86336f0c2d3e4edc37398dbc6505ee81107c0103c13ac0f406cff851438d2323033c6c6d0c0323765ee15b975eab8d1dd465f9e988168fb9  ppc64le-quadmath.patch
-ea55e0fa6813fc95c4ca2e87f059182edc54dc61515ebb92bf6eb31dbbd176d0fe81edcc7ea28d32f84ca37e8d48a544623d3d9bc94aa41ffc0859326a616aa2  riscv64-improve-build-time.patch
 "
@@ -1,56 +0,0 @@
-Patch-Source: https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=3fe5720430a9ba61ed7562aac4d758cc77d49a28
--
-From 3fe5720430a9ba61ed7562aac4d758cc77d49a28 Mon Sep 17 00:00:00 2001
-From: Jakub Jelinek <jakub@redhat.com>
-Date: Sat, 3 Aug 2024 20:37:54 +0200
-Subject: [PATCH] libquadmath: Fix up libquadmath/math/sqrtq.c compilation in
- some powerpc* configurations [PR116007]
-
-My PR114623 change started using soft-fp.h and quad.h for the sqrtq implementation.
-Unfortunately, that seems to fail building in some powerpc* configurations, where
-TFmode isn't available.
-quad.h has:
- #ifndef TFtype
- typedef float TFtype __attribute__ ((mode (TF)));
- #endif
-and uses TFtype.  quad.h has:
- /* Define the complex type corresponding to __float128
-    ("_Complex __float128" is not allowed) */
- #if (!defined(_ARCH_PPC)) || defined(__LONG_DOUBLE_IEEE128__)
- typedef _Complex float __attribute__((mode(TC))) __complex128;
- #else
- typedef _Complex float __attribute__((mode(KC))) __complex128;
- #endif
-with the conditional and KCmode use added during porting of libquadmath
-to powerpc*, so I've just defined TFtype for powerpc when __LONG_DOUBLE_IEEE128__
-isn't defined; I could define it to float __attribute__ ((mode (KF))) but it
-seemed easier to just define it to __float128 which should do the same thing.
-
-2024-08-03  Jakub Jelinek  <jakub@redhat.com>
-
-	PR target/116007
-	* math/sqrtq.c (TFtype): For PowerPC without __LONG_DOUBLE_IEEE128__
-	define to __float128 before including soft-fp.h and quad.h.
-
-(cherry picked from commit 3ac02e67503ccffa3dfeeffc0a60fce6bdaca43b)
---
- libquadmath/math/sqrtq.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/libquadmath/math/sqrtq.c b/libquadmath/math/sqrtq.c
-index 8ca2828d42ce..a58998a06670 100644
--- a/libquadmath/math/sqrtq.c
-+++ b/libquadmath/math/sqrtq.c
-@@ -9,6 +9,9 @@
-     && defined(FE_TOWARDZERO) \
-     && defined(FE_INEXACT)
- #define USE_SOFT_FP 1
-+#if defined(_ARCH_PPC) && !defined(__LONG_DOUBLE_IEEE128__)
-+#define TFtype __float128
-+#endif
- #include "../../libgcc/soft-fp/soft-fp.h"
- #include "../../libgcc/soft-fp/quad.h"
- #endif
-- 
-2.43.5
-
@@ -1,149 +0,0 @@
-Patch-Source: https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=2cf89ae83225f932b226cd57ef2d083a59bcf8a3
--
-From 2cf89ae83225f932b226cd57ef2d083a59bcf8a3 Mon Sep 17 00:00:00 2001
-From: Richard Biener <rguenther@suse.de>
-Date: Tue, 6 Aug 2024 14:56:26 +0200
-Subject: [PATCH] tree-optimization/116166 - forward jump-threading going wild
-
-Currently the forward threader isn't limited as to the search space
-it explores and with it now using path-ranger for simplifying
-conditions it runs into it became pretty slow for degenerate cases
-like compiling insn-emit.cc for RISC-V esp. when compiling for
-a host with LOGICAL_OP_NON_SHORT_CIRCUIT disabled.
-
-The following makes the forward threader honor the search space
-limit I introduced for the backward threader.  This reduces
-compile-time from minutes to seconds for the testcase in PR116166.
-
-Note this wasn't necessary before we had ranger but with ranger
-the work we do is quadatic in the length of the threading path
-we build up (the same is true for the backwards threader).
-
-	PR tree-optimization/116166
-	* tree-ssa-threadedge.h (jump_threader::thread_around_empty_blocks):
-	Add limit parameter.
-	(jump_threader::thread_through_normal_block): Likewise.
-	* tree-ssa-threadedge.cc (jump_threader::thread_around_empty_blocks):
-	Honor and decrement limit parameter.
-	(jump_threader::thread_through_normal_block): Likewise.
-	(jump_threader::thread_across_edge): Initialize limit from
-	param_max_jump_thread_paths and pass it down to workers.
---
- gcc/tree-ssa-threadedge.cc | 30 ++++++++++++++++++++++--------
- gcc/tree-ssa-threadedge.h  |  4 ++--
- 2 files changed, 24 insertions(+), 10 deletions(-)
-
-diff --git a/gcc/tree-ssa-threadedge.cc b/gcc/tree-ssa-threadedge.cc
-index 7f82639b8ecc..0aa2aa851430 100644
--- a/gcc/tree-ssa-threadedge.cc
-+++ b/gcc/tree-ssa-threadedge.cc
-@@ -786,13 +786,17 @@ propagate_threaded_block_debug_into (basic_block dest, basic_block src)
- bool
- jump_threader::thread_around_empty_blocks (vec<jump_thread_edge *> *path,
- 					   edge taken_edge,
-					   bitmap visited)
-+					   bitmap visited, unsigned &limit)
- {
-   basic_block bb = taken_edge->dest;
-   gimple_stmt_iterator gsi;
-   gimple *stmt;
-   tree cond;
- 
-+  if (limit == 0)
-+    return false;
-+  --limit;
-+
-   /* The key property of these blocks is that they need not be duplicated
-      when threading.  Thus they cannot have visible side effects such
-      as PHI nodes.  */
-@@ -830,7 +834,8 @@ jump_threader::thread_around_empty_blocks (vec<jump_thread_edge *> *path,
- 	      m_registry->push_edge (path, taken_edge, EDGE_NO_COPY_SRC_BLOCK);
- 	      m_state->append_path (taken_edge->dest);
- 	      bitmap_set_bit (visited, taken_edge->dest->index);
-	      return thread_around_empty_blocks (path, taken_edge, visited);
-+	      return thread_around_empty_blocks (path, taken_edge, visited,
-+						 limit);
- 	    }
- 	}
- 
-@@ -872,7 +877,7 @@ jump_threader::thread_around_empty_blocks (vec<jump_thread_edge *> *path,
-       m_registry->push_edge (path, taken_edge, EDGE_NO_COPY_SRC_BLOCK);
-       m_state->append_path (taken_edge->dest);
- 
-      thread_around_empty_blocks (path, taken_edge, visited);
-+      thread_around_empty_blocks (path, taken_edge, visited, limit);
-       return true;
-     }
- 
-@@ -899,8 +904,13 @@ jump_threader::thread_around_empty_blocks (vec<jump_thread_edge *> *path,
- 
- int
- jump_threader::thread_through_normal_block (vec<jump_thread_edge *> *path,
-					    edge e, bitmap visited)
-+					    edge e, bitmap visited,
-+					    unsigned &limit)
- {
-+  if (limit == 0)
-+    return 0;
-+  limit--;
-+
-   m_state->register_equivs_edge (e);
- 
-   /* PHIs create temporary equivalences.
-@@ -989,7 +999,7 @@ jump_threader::thread_through_normal_block (vec<jump_thread_edge *> *path,
-  	     visited.  This may be overly conservative.  */
- 	  bitmap_set_bit (visited, dest->index);
- 	  bitmap_set_bit (visited, e->dest->index);
-	  thread_around_empty_blocks (path, taken_edge, visited);
-+	  thread_around_empty_blocks (path, taken_edge, visited, limit);
- 	  return 1;
- 	}
-     }
-@@ -1075,9 +1085,12 @@ jump_threader::thread_across_edge (edge e)
-   bitmap_set_bit (visited, e->src->index);
-   bitmap_set_bit (visited, e->dest->index);
- 
-+  /* Limit search space.  */
-+  unsigned limit = param_max_jump_thread_paths;
-+
-   int threaded = 0;
-   if ((e->flags & EDGE_DFS_BACK) == 0)
-    threaded = thread_through_normal_block (path, e, visited);
-+    threaded = thread_through_normal_block (path, e, visited, limit);
- 
-   if (threaded > 0)
-     {
-@@ -1148,11 +1161,12 @@ jump_threader::thread_across_edge (edge e)
- 	m_registry->push_edge (path, e, EDGE_START_JUMP_THREAD);
- 	m_registry->push_edge (path, taken_edge, EDGE_COPY_SRC_JOINER_BLOCK);
- 
-	found = thread_around_empty_blocks (path, taken_edge, visited);
-+	found = thread_around_empty_blocks (path, taken_edge, visited, limit);
- 
- 	if (!found)
- 	  found = thread_through_normal_block (path,
-					       path->last ()->e, visited) > 0;
-+					       path->last ()->e, visited,
-+					       limit) > 0;
- 
- 	/* If we were able to thread through a successor of E->dest, then
- 	   record the jump threading opportunity.  */
-diff --git a/gcc/tree-ssa-threadedge.h b/gcc/tree-ssa-threadedge.h
-index 9f6cbfe93307..245b3506a550 100644
--- a/gcc/tree-ssa-threadedge.h
-+++ b/gcc/tree-ssa-threadedge.h
-@@ -101,9 +101,9 @@ private:
- 					  unsigned limit);
- 
-   bool thread_around_empty_blocks (vec<class jump_thread_edge *> *path,
-				   edge, bitmap visited);
-+				   edge, bitmap visited, unsigned &limit);
-   int thread_through_normal_block (vec<jump_thread_edge *> *path,
-				   edge, bitmap visited);
-+				   edge, bitmap visited, unsigned &limit);
-   void thread_across_edge (edge);
-   bool record_temporary_equivalences_from_phis (edge);
-   gimple *record_temporary_equivalences_from_stmts_at_dest (edge);
-- 
-2.43.5
-
@@ -4,17 +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 32cbdb692..463028fbe 100644
+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) \
@@ -23,16 +23,7 @@ index 32cbdb692..463028fbe 100644
   a-exetim.adb<libgnarl/a-exetim__posix.adb \
   a-exetim.ads<libgnarl/a-exetim__default.ads \
   s-linux.ads<libgnarl/s-linux.ads \
-@@ -2144,7 +2144,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
-@@ -2232,7 +2232,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) \
@@ -41,7 +32,7 @@ index 32cbdb692..463028fbe 100644
   $(ATOMICS_TARGET_PAIRS) \
   $(ATOMICS_BUILTINS_TARGET_PAIRS) \
   system.ads<libgnat/system-linux-ppc.ads
-@@ -2267,7 +2267,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
@@ -59,7 +50,7 @@ index 32cbdb692..463028fbe 100644
   s-mudido.adb<libgnarl/s-mudido__affinity.adb \
   s-osinte.ads<libgnarl/s-osinte__linux.ads \
   s-osinte.adb<libgnarl/s-osinte__posix.adb \
-@@ -2488,7 +2488,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) \
@@ -68,16 +59,7 @@ index 32cbdb692..463028fbe 100644
   $(ATOMICS_TARGET_PAIRS) \
   $(ATOMICS_BUILTINS_TARGET_PAIRS) \
   $(GNATRTL_128BIT_PAIRS) \
-@@ -2592,7 +2592,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) \
-@@ -2637,7 +2637,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) \
@@ -87,10 +69,10 @@ index 32cbdb692..463028fbe 100644
   $(X86_64_TARGET_PAIRS) \
   $(SIMD_PATH_TARGET_PAIRS) \
 diff --git a/gcc/ada/adaint.c b/gcc/ada/adaint.c
-index 74aa3c412..ef6118f37 100644
+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
@@ -102,7 +84,7 @@ index 74aa3c412..ef6118f37 100644
 
 #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__)
@@ -110,7 +92,7 @@ index 74aa3c412..ef6118f37 100644
 
 /* 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 */
 
@@ -119,7 +101,7 @@ index 74aa3c412..ef6118f37 100644
 __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
@@ -161,7 +143,7 @@ index 74aa3c412..ef6118f37 100644
 }
 
 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
@@ -191,7 +173,7 @@ index 74aa3c412..ef6118f37 100644
 #endif /* !CPU_ALLOC */
 #endif /* __linux__ */
 diff --git a/gcc/ada/adaint.h b/gcc/ada/adaint.h
-index 0cbfd0e15..f97ed905b 100644
+index 987432c9307..4d782f07de9 100644
 --- a/gcc/ada/adaint.h
 +++ b/gcc/ada/adaint.h
@@ -319,13 +319,11 @@ extern void   *__gnat_lwp_self			   (void);
@@ -213,10 +195,10 @@ index 0cbfd0e15..f97ed905b 100644
 
 #if defined (_WIN32)
 diff --git a/gcc/ada/terminals.c b/gcc/ada/terminals.c
-index 05af82c27..626ac35bc 100644
+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)
@@ -225,7 +207,7 @@ index 05af82c27..626ac35bc 100644
       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__)
@@ -234,7 +216,7 @@ index 05af82c27..626ac35bc 100644
 #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;
 
@@ -245,3 +227,6 @@ index 05af82c27..626ac35bc 100644
 #elif defined (USE_OPENPTY)
   status = openpty (&master_fd, &slave_fd, NULL, NULL, NULL);
 #elif defined (USE_CLONE_DEVICE)
+-- 
+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
-         {
@@ -34,19 +34,19 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""

 pkgname=gcc-armhf
-pkgrel=5
+pkgrel=1
 pkgdesc="Stage2 cross-compiler for armhf"
 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-armhf 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-armhf mpc1"
 makedepends_build="gcc g++ bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev"
 makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-dev-armhf binutils-armhf"
 subpackages="g++-armhf:gpp libstdc++-dev-armhf:libcxx_dev"
-[ "$CHOST" = "$CTARGET" ] && subpackages="gcc-gdb gcc-doc"
+[ "$CHOST" = "$CTARGET" ] && subpackages="gcc-gdb gcc-doc$_target"
 replaces="libstdc++ binutils"
-options="!strip !tracedeps"
+options="!strip"

 : "${LANG_CXX:=true}"
 : "${LANG_D:=true}"
@@ -64,7 +64,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 +73,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 +115,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,14 +136,15 @@ 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"
-ppc64le|riscv64)	LANG_D=false ;;
+ppc64le|riscv64|loongarch64)	LANG_D=false ;;
 # GDC does currently not work on 32-bit musl architectures.
 # This is a known upstream issue.
 # See: https://github.com/dlang/druntime/pull/3383
@@ -169,7 +171,7 @@ esac
 # currently on x86, x86_64 and ia64
 _libquadmath=$LANG_FORTRAN
 case "$CTARGET_ARCH" in
-x86 | x86_64 | ppc64le) ;;
+x86 | x86_64)	_libquadmath=$LANG_FORTRAN ;;
 *)		_libquadmath=false ;;
 esac

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

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

@@ -192,17 +199,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,12 +216,13 @@ 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
@@ -232,7 +232,7 @@ 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
@@ -242,7 +242,7 @@ makedepends="$makedepends_build $makedepends_host"
 # PLEASE submit all patches to gcc to https://gitlab.alpinelinux.org/kaniini/alpine-gcc-patches,
 # so that they can be properly tracked and easily rebased if needed.
 #source="https://dev.alpinelinux.org/archive/gcc/${_pkgbase%%.*}-$_pkgsnap/gcc-${_pkgbase%%.*}-$_pkgsnap.tar.xz
-source="https://gcc.gnu.org/pub/gcc/releases/gcc-$_pkgbase/gcc-$_pkgbase.tar.xz
+source="https://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$pkgver}/gcc-${_pkgbase:-$pkgver}.tar.xz
 	0001-posix_memalign.patch
 	0002-gcc-poison-system-directories.patch
 	0003-specs-turn-on-Wl-z-now-by-default.patch
@@ -278,10 +278,7 @@ source="https://gcc.gnu.org/pub/gcc/releases/gcc-$_pkgbase/gcc-$_pkgbase.tar.xz
 	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
 	fix-arm64.patch
-	ppc64le-quadmath.patch
-	riscv64-improve-build-time.patch
 	"

 # secfixes:
@@ -289,21 +286,44 @@ 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
+_gccdir="$srcdir"/gcc-${_pkgbase:-$pkgver}
+_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";;
@@ -319,7 +339,7 @@ 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";;
+	loongarch64-*-*-*)      _arch_configure="--with-arch=loongarch64 --with-abi=lp64d";;
 	esac

 	case "$CTARGET_ARCH" in
@@ -327,28 +347,33 @@ 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"
 	$_libatomic	|| _bootstrap_configure="$_bootstrap_configure --disable-libatomic"
 	$_libitm	|| _bootstrap_configure="$_bootstrap_configure --disable-libitm"
-	$_libquadmath	|| _arch_configure="$_arch_configure --disable-libquadmath"
+	if ! $_libquadmath; then
+		_arch_configure="$_arch_configure --disable-libquadmath"
+		# ppc64le needs both --disable-libquadmath{,-support}
+		# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=116007
+		[ "$CARCH" = "ppc64le" ] &&
+			_arch_configure="$_arch_configure
+				--disable-libquadmath-support"
+	fi

 	msg "Building the following:"
 	echo ""
@@ -356,8 +381,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"
@@ -378,7 +405,7 @@ build() {
 		--disable-multilib
 		--disable-nls
 		--disable-werror
-		--disable-symvers
+		$_symvers
 		--enable-__cxa_atexit
 		--enable-default-pie
 		--enable-default-ssp
@@ -386,8 +413,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
@@ -397,14 +423,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
@@ -413,7 +435,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 \
@@ -428,7 +450,7 @@ 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

 	if $LANG_JIT; then
@@ -472,22 +494,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
@@ -536,7 +561,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() {
@@ -549,7 +575,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() {
@@ -567,13 +594,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() {
@@ -592,26 +621,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() {
@@ -619,43 +652,49 @@ 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() {
@@ -663,25 +702,31 @@ 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
+	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() {
@@ -689,7 +734,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() {
@@ -698,30 +744,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() {
@@ -730,9 +784,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() {
@@ -771,7 +828,7 @@ f382eb5f7c2c60c5a23fac587c9629a3059d7be0898e97a1feaf9b9cbe1ef4693cc1177eb29333e8
 abf845792433a21fed5dd06167b9f6cf5e8f8026a409acce93824e466c5148e192bf5f404a271931fe4b65283499329bf67bb01019f2f3e02501f20619404e6c  0023-riscv-disable-multilib-support.patch
 ab88a2f63e3545bbc36537aa9a86f2c6c35e41bbf702d6e13743a405cdac4f901eed5737189b780da96647fea9f5d863fdc76373f25a00064106dcb5514d6d87  0024-always-build-libgcc_eh.a.patch
 8fdbe0c8bf4ca60f458a33e59027de03d15ac91933fe46d8ca62119346d20b9bc2447c0bf22bceb63d0cf8613ab61512d9197f4e6c2224af473b63ef9f254295  0025-ada-libgnarl-compatibility-for-musl.patch
-684bf2db12aa45e8db7a895ab0f227b4e4351f611b4fcc6e1745d7ad94d31b3554f39d8cf9e2203520b3c6ee35cf309b417d4a842e7a8cd55a2b2accb23f2f24  0026-ada-musl-support-fixes.patch
+5fd23a506b55c88d4f000e01c539eb25d6da2516949c9d7a1c9ee20f4c6b627e4788541284d9c14c33bafa7cb43ce2e0469dd91006152f00e30815107150320f  0026-ada-musl-support-fixes.patch
 3f9a406d7d2ce34951215ffbcadb49a45e55ad5c24ab9097c0e5e92383e43b876872ccd2a7e7def2833ab204975ee5733f8bcf90934db9fa9c4f6f56c62081f6  0027-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
 720a4001f9a1fa4122e456077ecff8d3eb8af7c83d0a81f9da6a6cca05b23664206a82a349e34482c48bfe40e99aa5f21567613d0913f6a24f282bc84a994496  0028-configure-fix-detection-of-atomic-builtins-in-libato.patch
 2044c23b23726965c0a6fd39f616cc464badd650947cb40495eeabd906a3af629878c1d28b403b8eb46b30a1a0ba39083023290d62f0c99ccf070063226e3f8f  0029-libstdc-do-not-throw-exceptions-for-non-C-locales-on.patch
@@ -781,8 +838,5 @@ b325035cb7122d79c6b42ca6d3fc9e02319ed2f7cddb0639dff25d2798d2ce63812cd623462cdf95
 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
 00319c9770362520e8e93bd03fda1769dfa3622eba77d620e11d8af45a38e6d804a5e924046ae388e1cfaea605696e89c343fca507aaaa5edd58d80744fff14f  fix-arm64.patch
-815265826742400f86336f0c2d3e4edc37398dbc6505ee81107c0103c13ac0f406cff851438d2323033c6c6d0c0323765ee15b975eab8d1dd465f9e988168fb9  ppc64le-quadmath.patch
-ea55e0fa6813fc95c4ca2e87f059182edc54dc61515ebb92bf6eb31dbbd176d0fe81edcc7ea28d32f84ca37e8d48a544623d3d9bc94aa41ffc0859326a616aa2  riscv64-improve-build-time.patch
 "
@@ -1,56 +0,0 @@
-Patch-Source: https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=3fe5720430a9ba61ed7562aac4d758cc77d49a28
--
-From 3fe5720430a9ba61ed7562aac4d758cc77d49a28 Mon Sep 17 00:00:00 2001
-From: Jakub Jelinek <jakub@redhat.com>
-Date: Sat, 3 Aug 2024 20:37:54 +0200
-Subject: [PATCH] libquadmath: Fix up libquadmath/math/sqrtq.c compilation in
- some powerpc* configurations [PR116007]
-
-My PR114623 change started using soft-fp.h and quad.h for the sqrtq implementation.
-Unfortunately, that seems to fail building in some powerpc* configurations, where
-TFmode isn't available.
-quad.h has:
- #ifndef TFtype
- typedef float TFtype __attribute__ ((mode (TF)));
- #endif
-and uses TFtype.  quad.h has:
- /* Define the complex type corresponding to __float128
-    ("_Complex __float128" is not allowed) */
- #if (!defined(_ARCH_PPC)) || defined(__LONG_DOUBLE_IEEE128__)
- typedef _Complex float __attribute__((mode(TC))) __complex128;
- #else
- typedef _Complex float __attribute__((mode(KC))) __complex128;
- #endif
-with the conditional and KCmode use added during porting of libquadmath
-to powerpc*, so I've just defined TFtype for powerpc when __LONG_DOUBLE_IEEE128__
-isn't defined; I could define it to float __attribute__ ((mode (KF))) but it
-seemed easier to just define it to __float128 which should do the same thing.
-
-2024-08-03  Jakub Jelinek  <jakub@redhat.com>
-
-	PR target/116007
-	* math/sqrtq.c (TFtype): For PowerPC without __LONG_DOUBLE_IEEE128__
-	define to __float128 before including soft-fp.h and quad.h.
-
-(cherry picked from commit 3ac02e67503ccffa3dfeeffc0a60fce6bdaca43b)
---
- libquadmath/math/sqrtq.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/libquadmath/math/sqrtq.c b/libquadmath/math/sqrtq.c
-index 8ca2828d42ce..a58998a06670 100644
--- a/libquadmath/math/sqrtq.c
-+++ b/libquadmath/math/sqrtq.c
-@@ -9,6 +9,9 @@
-     && defined(FE_TOWARDZERO) \
-     && defined(FE_INEXACT)
- #define USE_SOFT_FP 1
-+#if defined(_ARCH_PPC) && !defined(__LONG_DOUBLE_IEEE128__)
-+#define TFtype __float128
-+#endif
- #include "../../libgcc/soft-fp/soft-fp.h"
- #include "../../libgcc/soft-fp/quad.h"
- #endif
-- 
-2.43.5
-
@@ -1,149 +0,0 @@
-Patch-Source: https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=2cf89ae83225f932b226cd57ef2d083a59bcf8a3
--
-From 2cf89ae83225f932b226cd57ef2d083a59bcf8a3 Mon Sep 17 00:00:00 2001
-From: Richard Biener <rguenther@suse.de>
-Date: Tue, 6 Aug 2024 14:56:26 +0200
-Subject: [PATCH] tree-optimization/116166 - forward jump-threading going wild
-
-Currently the forward threader isn't limited as to the search space
-it explores and with it now using path-ranger for simplifying
-conditions it runs into it became pretty slow for degenerate cases
-like compiling insn-emit.cc for RISC-V esp. when compiling for
-a host with LOGICAL_OP_NON_SHORT_CIRCUIT disabled.
-
-The following makes the forward threader honor the search space
-limit I introduced for the backward threader.  This reduces
-compile-time from minutes to seconds for the testcase in PR116166.
-
-Note this wasn't necessary before we had ranger but with ranger
-the work we do is quadatic in the length of the threading path
-we build up (the same is true for the backwards threader).
-
-	PR tree-optimization/116166
-	* tree-ssa-threadedge.h (jump_threader::thread_around_empty_blocks):
-	Add limit parameter.
-	(jump_threader::thread_through_normal_block): Likewise.
-	* tree-ssa-threadedge.cc (jump_threader::thread_around_empty_blocks):
-	Honor and decrement limit parameter.
-	(jump_threader::thread_through_normal_block): Likewise.
-	(jump_threader::thread_across_edge): Initialize limit from
-	param_max_jump_thread_paths and pass it down to workers.
---
- gcc/tree-ssa-threadedge.cc | 30 ++++++++++++++++++++++--------
- gcc/tree-ssa-threadedge.h  |  4 ++--
- 2 files changed, 24 insertions(+), 10 deletions(-)
-
-diff --git a/gcc/tree-ssa-threadedge.cc b/gcc/tree-ssa-threadedge.cc
-index 7f82639b8ecc..0aa2aa851430 100644
--- a/gcc/tree-ssa-threadedge.cc
-+++ b/gcc/tree-ssa-threadedge.cc
-@@ -786,13 +786,17 @@ propagate_threaded_block_debug_into (basic_block dest, basic_block src)
- bool
- jump_threader::thread_around_empty_blocks (vec<jump_thread_edge *> *path,
- 					   edge taken_edge,
-					   bitmap visited)
-+					   bitmap visited, unsigned &limit)
- {
-   basic_block bb = taken_edge->dest;
-   gimple_stmt_iterator gsi;
-   gimple *stmt;
-   tree cond;
- 
-+  if (limit == 0)
-+    return false;
-+  --limit;
-+
-   /* The key property of these blocks is that they need not be duplicated
-      when threading.  Thus they cannot have visible side effects such
-      as PHI nodes.  */
-@@ -830,7 +834,8 @@ jump_threader::thread_around_empty_blocks (vec<jump_thread_edge *> *path,
- 	      m_registry->push_edge (path, taken_edge, EDGE_NO_COPY_SRC_BLOCK);
- 	      m_state->append_path (taken_edge->dest);
- 	      bitmap_set_bit (visited, taken_edge->dest->index);
-	      return thread_around_empty_blocks (path, taken_edge, visited);
-+	      return thread_around_empty_blocks (path, taken_edge, visited,
-+						 limit);
- 	    }
- 	}
- 
-@@ -872,7 +877,7 @@ jump_threader::thread_around_empty_blocks (vec<jump_thread_edge *> *path,
-       m_registry->push_edge (path, taken_edge, EDGE_NO_COPY_SRC_BLOCK);
-       m_state->append_path (taken_edge->dest);
- 
-      thread_around_empty_blocks (path, taken_edge, visited);
-+      thread_around_empty_blocks (path, taken_edge, visited, limit);
-       return true;
-     }
- 
-@@ -899,8 +904,13 @@ jump_threader::thread_around_empty_blocks (vec<jump_thread_edge *> *path,
- 
- int
- jump_threader::thread_through_normal_block (vec<jump_thread_edge *> *path,
-					    edge e, bitmap visited)
-+					    edge e, bitmap visited,
-+					    unsigned &limit)
- {
-+  if (limit == 0)
-+    return 0;
-+  limit--;
-+
-   m_state->register_equivs_edge (e);
- 
-   /* PHIs create temporary equivalences.
-@@ -989,7 +999,7 @@ jump_threader::thread_through_normal_block (vec<jump_thread_edge *> *path,
-  	     visited.  This may be overly conservative.  */
- 	  bitmap_set_bit (visited, dest->index);
- 	  bitmap_set_bit (visited, e->dest->index);
-	  thread_around_empty_blocks (path, taken_edge, visited);
-+	  thread_around_empty_blocks (path, taken_edge, visited, limit);
- 	  return 1;
- 	}
-     }
-@@ -1075,9 +1085,12 @@ jump_threader::thread_across_edge (edge e)
-   bitmap_set_bit (visited, e->src->index);
-   bitmap_set_bit (visited, e->dest->index);
- 
-+  /* Limit search space.  */
-+  unsigned limit = param_max_jump_thread_paths;
-+
-   int threaded = 0;
-   if ((e->flags & EDGE_DFS_BACK) == 0)
-    threaded = thread_through_normal_block (path, e, visited);
-+    threaded = thread_through_normal_block (path, e, visited, limit);
- 
-   if (threaded > 0)
-     {
-@@ -1148,11 +1161,12 @@ jump_threader::thread_across_edge (edge e)
- 	m_registry->push_edge (path, e, EDGE_START_JUMP_THREAD);
- 	m_registry->push_edge (path, taken_edge, EDGE_COPY_SRC_JOINER_BLOCK);
- 
-	found = thread_around_empty_blocks (path, taken_edge, visited);
-+	found = thread_around_empty_blocks (path, taken_edge, visited, limit);
- 
- 	if (!found)
- 	  found = thread_through_normal_block (path,
-					       path->last ()->e, visited) > 0;
-+					       path->last ()->e, visited,
-+					       limit) > 0;
- 
- 	/* If we were able to thread through a successor of E->dest, then
- 	   record the jump threading opportunity.  */
-diff --git a/gcc/tree-ssa-threadedge.h b/gcc/tree-ssa-threadedge.h
-index 9f6cbfe93307..245b3506a550 100644
--- a/gcc/tree-ssa-threadedge.h
-+++ b/gcc/tree-ssa-threadedge.h
-@@ -101,9 +101,9 @@ private:
- 					  unsigned limit);
- 
-   bool thread_around_empty_blocks (vec<class jump_thread_edge *> *path,
-				   edge, bitmap visited);
-+				   edge, bitmap visited, unsigned &limit);
-   int thread_through_normal_block (vec<jump_thread_edge *> *path,
-				   edge, bitmap visited);
-+				   edge, bitmap visited, unsigned &limit);
-   void thread_across_edge (edge);
-   bool record_temporary_equivalences_from_phis (edge);
-   gimple *record_temporary_equivalences_from_stmts_at_dest (edge);
-- 
-2.43.5
-
@@ -4,17 +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 32cbdb692..463028fbe 100644
+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) \
@@ -23,16 +23,7 @@ index 32cbdb692..463028fbe 100644
   a-exetim.adb<libgnarl/a-exetim__posix.adb \
   a-exetim.ads<libgnarl/a-exetim__default.ads \
   s-linux.ads<libgnarl/s-linux.ads \
-@@ -2144,7 +2144,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
-@@ -2232,7 +2232,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) \
@@ -41,7 +32,7 @@ index 32cbdb692..463028fbe 100644
   $(ATOMICS_TARGET_PAIRS) \
   $(ATOMICS_BUILTINS_TARGET_PAIRS) \
   system.ads<libgnat/system-linux-ppc.ads
-@@ -2267,7 +2267,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
@@ -59,7 +50,7 @@ index 32cbdb692..463028fbe 100644
   s-mudido.adb<libgnarl/s-mudido__affinity.adb \
   s-osinte.ads<libgnarl/s-osinte__linux.ads \
   s-osinte.adb<libgnarl/s-osinte__posix.adb \
-@@ -2488,7 +2488,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) \
@@ -68,16 +59,7 @@ index 32cbdb692..463028fbe 100644
   $(ATOMICS_TARGET_PAIRS) \
   $(ATOMICS_BUILTINS_TARGET_PAIRS) \
   $(GNATRTL_128BIT_PAIRS) \
-@@ -2592,7 +2592,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) \
-@@ -2637,7 +2637,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) \
@@ -87,10 +69,10 @@ index 32cbdb692..463028fbe 100644
   $(X86_64_TARGET_PAIRS) \
   $(SIMD_PATH_TARGET_PAIRS) \
 diff --git a/gcc/ada/adaint.c b/gcc/ada/adaint.c
-index 74aa3c412..ef6118f37 100644
+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
@@ -102,7 +84,7 @@ index 74aa3c412..ef6118f37 100644
 
 #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__)
@@ -110,7 +92,7 @@ index 74aa3c412..ef6118f37 100644
 
 /* 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 */
 
@@ -119,7 +101,7 @@ index 74aa3c412..ef6118f37 100644
 __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
@@ -161,7 +143,7 @@ index 74aa3c412..ef6118f37 100644
 }
 
 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
@@ -191,7 +173,7 @@ index 74aa3c412..ef6118f37 100644
 #endif /* !CPU_ALLOC */
 #endif /* __linux__ */
 diff --git a/gcc/ada/adaint.h b/gcc/ada/adaint.h
-index 0cbfd0e15..f97ed905b 100644
+index 987432c9307..4d782f07de9 100644
 --- a/gcc/ada/adaint.h
 +++ b/gcc/ada/adaint.h
@@ -319,13 +319,11 @@ extern void   *__gnat_lwp_self			   (void);
@@ -213,10 +195,10 @@ index 0cbfd0e15..f97ed905b 100644
 
 #if defined (_WIN32)
 diff --git a/gcc/ada/terminals.c b/gcc/ada/terminals.c
-index 05af82c27..626ac35bc 100644
+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)
@@ -225,7 +207,7 @@ index 05af82c27..626ac35bc 100644
       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__)
@@ -234,7 +216,7 @@ index 05af82c27..626ac35bc 100644
 #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;
 
@@ -245,3 +227,6 @@ index 05af82c27..626ac35bc 100644
 #elif defined (USE_OPENPTY)
   status = openpty (&master_fd, &slave_fd, NULL, NULL, NULL);
 #elif defined (USE_CLONE_DEVICE)
+-- 
+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
-         {
@@ -34,19 +34,19 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""

 pkgname=gcc-armv7
-pkgrel=5
+pkgrel=1
 pkgdesc="Stage2 cross-compiler for armv7"
 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-armv7 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-armv7 mpc1"
 makedepends_build="gcc g++ bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev"
 makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-dev-armv7 binutils-armv7"
 subpackages="g++-armv7:gpp libstdc++-dev-armv7:libcxx_dev"
-[ "$CHOST" = "$CTARGET" ] && subpackages="gcc-gdb gcc-doc"
+[ "$CHOST" = "$CTARGET" ] && subpackages="gcc-gdb gcc-doc$_target"
 replaces="libstdc++ binutils"
-options="!strip !tracedeps"
+options="!strip"

 : "${LANG_CXX:=true}"
 : "${LANG_D:=true}"
@@ -64,7 +64,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 +73,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 +115,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,14 +136,15 @@ 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"
-ppc64le|riscv64)	LANG_D=false ;;
+ppc64le|riscv64|loongarch64)	LANG_D=false ;;
 # GDC does currently not work on 32-bit musl architectures.
 # This is a known upstream issue.
 # See: https://github.com/dlang/druntime/pull/3383
@@ -169,7 +171,7 @@ esac
 # currently on x86, x86_64 and ia64
 _libquadmath=$LANG_FORTRAN
 case "$CTARGET_ARCH" in
-x86 | x86_64 | ppc64le) ;;
+x86 | x86_64)	_libquadmath=$LANG_FORTRAN ;;
 *)		_libquadmath=false ;;
 esac

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

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

@@ -192,17 +199,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,12 +216,13 @@ 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
@@ -232,7 +232,7 @@ 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
@@ -242,7 +242,7 @@ makedepends="$makedepends_build $makedepends_host"
 # PLEASE submit all patches to gcc to https://gitlab.alpinelinux.org/kaniini/alpine-gcc-patches,
 # so that they can be properly tracked and easily rebased if needed.
 #source="https://dev.alpinelinux.org/archive/gcc/${_pkgbase%%.*}-$_pkgsnap/gcc-${_pkgbase%%.*}-$_pkgsnap.tar.xz
-source="https://gcc.gnu.org/pub/gcc/releases/gcc-$_pkgbase/gcc-$_pkgbase.tar.xz
+source="https://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$pkgver}/gcc-${_pkgbase:-$pkgver}.tar.xz
 	0001-posix_memalign.patch
 	0002-gcc-poison-system-directories.patch
 	0003-specs-turn-on-Wl-z-now-by-default.patch
@@ -278,10 +278,7 @@ source="https://gcc.gnu.org/pub/gcc/releases/gcc-$_pkgbase/gcc-$_pkgbase.tar.xz
 	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
 	fix-arm64.patch
-	ppc64le-quadmath.patch
-	riscv64-improve-build-time.patch
 	"

 # secfixes:
@@ -289,21 +286,44 @@ 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
+_gccdir="$srcdir"/gcc-${_pkgbase:-$pkgver}
+_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";;
@@ -319,7 +339,7 @@ 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";;
+	loongarch64-*-*-*)      _arch_configure="--with-arch=loongarch64 --with-abi=lp64d";;
 	esac

 	case "$CTARGET_ARCH" in
@@ -327,28 +347,33 @@ 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"
 	$_libatomic	|| _bootstrap_configure="$_bootstrap_configure --disable-libatomic"
 	$_libitm	|| _bootstrap_configure="$_bootstrap_configure --disable-libitm"
-	$_libquadmath	|| _arch_configure="$_arch_configure --disable-libquadmath"
+	if ! $_libquadmath; then
+		_arch_configure="$_arch_configure --disable-libquadmath"
+		# ppc64le needs both --disable-libquadmath{,-support}
+		# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=116007
+		[ "$CARCH" = "ppc64le" ] &&
+			_arch_configure="$_arch_configure
+				--disable-libquadmath-support"
+	fi

 	msg "Building the following:"
 	echo ""
@@ -356,8 +381,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"
@@ -378,7 +405,7 @@ build() {
 		--disable-multilib
 		--disable-nls
 		--disable-werror
-		--disable-symvers
+		$_symvers
 		--enable-__cxa_atexit
 		--enable-default-pie
 		--enable-default-ssp
@@ -386,8 +413,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
@@ -397,14 +423,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
@@ -413,7 +435,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 \
@@ -428,7 +450,7 @@ 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

 	if $LANG_JIT; then
@@ -472,22 +494,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
@@ -536,7 +561,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() {
@@ -549,7 +575,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() {
@@ -567,13 +594,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() {
@@ -592,26 +621,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() {
@@ -619,43 +652,49 @@ 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() {
@@ -663,25 +702,31 @@ 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
+	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() {
@@ -689,7 +734,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() {
@@ -698,30 +744,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() {
@@ -730,9 +784,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() {
@@ -771,7 +828,7 @@ f382eb5f7c2c60c5a23fac587c9629a3059d7be0898e97a1feaf9b9cbe1ef4693cc1177eb29333e8
 abf845792433a21fed5dd06167b9f6cf5e8f8026a409acce93824e466c5148e192bf5f404a271931fe4b65283499329bf67bb01019f2f3e02501f20619404e6c  0023-riscv-disable-multilib-support.patch
 ab88a2f63e3545bbc36537aa9a86f2c6c35e41bbf702d6e13743a405cdac4f901eed5737189b780da96647fea9f5d863fdc76373f25a00064106dcb5514d6d87  0024-always-build-libgcc_eh.a.patch
 8fdbe0c8bf4ca60f458a33e59027de03d15ac91933fe46d8ca62119346d20b9bc2447c0bf22bceb63d0cf8613ab61512d9197f4e6c2224af473b63ef9f254295  0025-ada-libgnarl-compatibility-for-musl.patch
-684bf2db12aa45e8db7a895ab0f227b4e4351f611b4fcc6e1745d7ad94d31b3554f39d8cf9e2203520b3c6ee35cf309b417d4a842e7a8cd55a2b2accb23f2f24  0026-ada-musl-support-fixes.patch
+5fd23a506b55c88d4f000e01c539eb25d6da2516949c9d7a1c9ee20f4c6b627e4788541284d9c14c33bafa7cb43ce2e0469dd91006152f00e30815107150320f  0026-ada-musl-support-fixes.patch
 3f9a406d7d2ce34951215ffbcadb49a45e55ad5c24ab9097c0e5e92383e43b876872ccd2a7e7def2833ab204975ee5733f8bcf90934db9fa9c4f6f56c62081f6  0027-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
 720a4001f9a1fa4122e456077ecff8d3eb8af7c83d0a81f9da6a6cca05b23664206a82a349e34482c48bfe40e99aa5f21567613d0913f6a24f282bc84a994496  0028-configure-fix-detection-of-atomic-builtins-in-libato.patch
 2044c23b23726965c0a6fd39f616cc464badd650947cb40495eeabd906a3af629878c1d28b403b8eb46b30a1a0ba39083023290d62f0c99ccf070063226e3f8f  0029-libstdc-do-not-throw-exceptions-for-non-C-locales-on.patch
@@ -781,8 +838,5 @@ b325035cb7122d79c6b42ca6d3fc9e02319ed2f7cddb0639dff25d2798d2ce63812cd623462cdf95
 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
 00319c9770362520e8e93bd03fda1769dfa3622eba77d620e11d8af45a38e6d804a5e924046ae388e1cfaea605696e89c343fca507aaaa5edd58d80744fff14f  fix-arm64.patch
-815265826742400f86336f0c2d3e4edc37398dbc6505ee81107c0103c13ac0f406cff851438d2323033c6c6d0c0323765ee15b975eab8d1dd465f9e988168fb9  ppc64le-quadmath.patch
-ea55e0fa6813fc95c4ca2e87f059182edc54dc61515ebb92bf6eb31dbbd176d0fe81edcc7ea28d32f84ca37e8d48a544623d3d9bc94aa41ffc0859326a616aa2  riscv64-improve-build-time.patch
 "
@@ -1,56 +0,0 @@
-Patch-Source: https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=3fe5720430a9ba61ed7562aac4d758cc77d49a28
--
-From 3fe5720430a9ba61ed7562aac4d758cc77d49a28 Mon Sep 17 00:00:00 2001
-From: Jakub Jelinek <jakub@redhat.com>
-Date: Sat, 3 Aug 2024 20:37:54 +0200
-Subject: [PATCH] libquadmath: Fix up libquadmath/math/sqrtq.c compilation in
- some powerpc* configurations [PR116007]
-
-My PR114623 change started using soft-fp.h and quad.h for the sqrtq implementation.
-Unfortunately, that seems to fail building in some powerpc* configurations, where
-TFmode isn't available.
-quad.h has:
- #ifndef TFtype
- typedef float TFtype __attribute__ ((mode (TF)));
- #endif
-and uses TFtype.  quad.h has:
- /* Define the complex type corresponding to __float128
-    ("_Complex __float128" is not allowed) */
- #if (!defined(_ARCH_PPC)) || defined(__LONG_DOUBLE_IEEE128__)
- typedef _Complex float __attribute__((mode(TC))) __complex128;
- #else
- typedef _Complex float __attribute__((mode(KC))) __complex128;
- #endif
-with the conditional and KCmode use added during porting of libquadmath
-to powerpc*, so I've just defined TFtype for powerpc when __LONG_DOUBLE_IEEE128__
-isn't defined; I could define it to float __attribute__ ((mode (KF))) but it
-seemed easier to just define it to __float128 which should do the same thing.
-
-2024-08-03  Jakub Jelinek  <jakub@redhat.com>
-
-	PR target/116007
-	* math/sqrtq.c (TFtype): For PowerPC without __LONG_DOUBLE_IEEE128__
-	define to __float128 before including soft-fp.h and quad.h.
-
-(cherry picked from commit 3ac02e67503ccffa3dfeeffc0a60fce6bdaca43b)
---
- libquadmath/math/sqrtq.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/libquadmath/math/sqrtq.c b/libquadmath/math/sqrtq.c
-index 8ca2828d42ce..a58998a06670 100644
--- a/libquadmath/math/sqrtq.c
-+++ b/libquadmath/math/sqrtq.c
-@@ -9,6 +9,9 @@
-     && defined(FE_TOWARDZERO) \
-     && defined(FE_INEXACT)
- #define USE_SOFT_FP 1
-+#if defined(_ARCH_PPC) && !defined(__LONG_DOUBLE_IEEE128__)
-+#define TFtype __float128
-+#endif
- #include "../../libgcc/soft-fp/soft-fp.h"
- #include "../../libgcc/soft-fp/quad.h"
- #endif
-- 
-2.43.5
-
@@ -1,149 +0,0 @@
-Patch-Source: https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=2cf89ae83225f932b226cd57ef2d083a59bcf8a3
--
-From 2cf89ae83225f932b226cd57ef2d083a59bcf8a3 Mon Sep 17 00:00:00 2001
-From: Richard Biener <rguenther@suse.de>
-Date: Tue, 6 Aug 2024 14:56:26 +0200
-Subject: [PATCH] tree-optimization/116166 - forward jump-threading going wild
-
-Currently the forward threader isn't limited as to the search space
-it explores and with it now using path-ranger for simplifying
-conditions it runs into it became pretty slow for degenerate cases
-like compiling insn-emit.cc for RISC-V esp. when compiling for
-a host with LOGICAL_OP_NON_SHORT_CIRCUIT disabled.
-
-The following makes the forward threader honor the search space
-limit I introduced for the backward threader.  This reduces
-compile-time from minutes to seconds for the testcase in PR116166.
-
-Note this wasn't necessary before we had ranger but with ranger
-the work we do is quadatic in the length of the threading path
-we build up (the same is true for the backwards threader).
-
-	PR tree-optimization/116166
-	* tree-ssa-threadedge.h (jump_threader::thread_around_empty_blocks):
-	Add limit parameter.
-	(jump_threader::thread_through_normal_block): Likewise.
-	* tree-ssa-threadedge.cc (jump_threader::thread_around_empty_blocks):
-	Honor and decrement limit parameter.
-	(jump_threader::thread_through_normal_block): Likewise.
-	(jump_threader::thread_across_edge): Initialize limit from
-	param_max_jump_thread_paths and pass it down to workers.
---
- gcc/tree-ssa-threadedge.cc | 30 ++++++++++++++++++++++--------
- gcc/tree-ssa-threadedge.h  |  4 ++--
- 2 files changed, 24 insertions(+), 10 deletions(-)
-
-diff --git a/gcc/tree-ssa-threadedge.cc b/gcc/tree-ssa-threadedge.cc
-index 7f82639b8ecc..0aa2aa851430 100644
--- a/gcc/tree-ssa-threadedge.cc
-+++ b/gcc/tree-ssa-threadedge.cc
-@@ -786,13 +786,17 @@ propagate_threaded_block_debug_into (basic_block dest, basic_block src)
- bool
- jump_threader::thread_around_empty_blocks (vec<jump_thread_edge *> *path,
- 					   edge taken_edge,
-					   bitmap visited)
-+					   bitmap visited, unsigned &limit)
- {
-   basic_block bb = taken_edge->dest;
-   gimple_stmt_iterator gsi;
-   gimple *stmt;
-   tree cond;
- 
-+  if (limit == 0)
-+    return false;
-+  --limit;
-+
-   /* The key property of these blocks is that they need not be duplicated
-      when threading.  Thus they cannot have visible side effects such
-      as PHI nodes.  */
-@@ -830,7 +834,8 @@ jump_threader::thread_around_empty_blocks (vec<jump_thread_edge *> *path,
- 	      m_registry->push_edge (path, taken_edge, EDGE_NO_COPY_SRC_BLOCK);
- 	      m_state->append_path (taken_edge->dest);
- 	      bitmap_set_bit (visited, taken_edge->dest->index);
-	      return thread_around_empty_blocks (path, taken_edge, visited);
-+	      return thread_around_empty_blocks (path, taken_edge, visited,
-+						 limit);
- 	    }
- 	}
- 
-@@ -872,7 +877,7 @@ jump_threader::thread_around_empty_blocks (vec<jump_thread_edge *> *path,
-       m_registry->push_edge (path, taken_edge, EDGE_NO_COPY_SRC_BLOCK);
-       m_state->append_path (taken_edge->dest);
- 
-      thread_around_empty_blocks (path, taken_edge, visited);
-+      thread_around_empty_blocks (path, taken_edge, visited, limit);
-       return true;
-     }
- 
-@@ -899,8 +904,13 @@ jump_threader::thread_around_empty_blocks (vec<jump_thread_edge *> *path,
- 
- int
- jump_threader::thread_through_normal_block (vec<jump_thread_edge *> *path,
-					    edge e, bitmap visited)
-+					    edge e, bitmap visited,
-+					    unsigned &limit)
- {
-+  if (limit == 0)
-+    return 0;
-+  limit--;
-+
-   m_state->register_equivs_edge (e);
- 
-   /* PHIs create temporary equivalences.
-@@ -989,7 +999,7 @@ jump_threader::thread_through_normal_block (vec<jump_thread_edge *> *path,
-  	     visited.  This may be overly conservative.  */
- 	  bitmap_set_bit (visited, dest->index);
- 	  bitmap_set_bit (visited, e->dest->index);
-	  thread_around_empty_blocks (path, taken_edge, visited);
-+	  thread_around_empty_blocks (path, taken_edge, visited, limit);
- 	  return 1;
- 	}
-     }
-@@ -1075,9 +1085,12 @@ jump_threader::thread_across_edge (edge e)
-   bitmap_set_bit (visited, e->src->index);
-   bitmap_set_bit (visited, e->dest->index);
- 
-+  /* Limit search space.  */
-+  unsigned limit = param_max_jump_thread_paths;
-+
-   int threaded = 0;
-   if ((e->flags & EDGE_DFS_BACK) == 0)
-    threaded = thread_through_normal_block (path, e, visited);
-+    threaded = thread_through_normal_block (path, e, visited, limit);
- 
-   if (threaded > 0)
-     {
-@@ -1148,11 +1161,12 @@ jump_threader::thread_across_edge (edge e)
- 	m_registry->push_edge (path, e, EDGE_START_JUMP_THREAD);
- 	m_registry->push_edge (path, taken_edge, EDGE_COPY_SRC_JOINER_BLOCK);
- 
-	found = thread_around_empty_blocks (path, taken_edge, visited);
-+	found = thread_around_empty_blocks (path, taken_edge, visited, limit);
- 
- 	if (!found)
- 	  found = thread_through_normal_block (path,
-					       path->last ()->e, visited) > 0;
-+					       path->last ()->e, visited,
-+					       limit) > 0;
- 
- 	/* If we were able to thread through a successor of E->dest, then
- 	   record the jump threading opportunity.  */
-diff --git a/gcc/tree-ssa-threadedge.h b/gcc/tree-ssa-threadedge.h
-index 9f6cbfe93307..245b3506a550 100644
--- a/gcc/tree-ssa-threadedge.h
-+++ b/gcc/tree-ssa-threadedge.h
-@@ -101,9 +101,9 @@ private:
- 					  unsigned limit);
- 
-   bool thread_around_empty_blocks (vec<class jump_thread_edge *> *path,
-				   edge, bitmap visited);
-+				   edge, bitmap visited, unsigned &limit);
-   int thread_through_normal_block (vec<jump_thread_edge *> *path,
-				   edge, bitmap visited);
-+				   edge, bitmap visited, unsigned &limit);
-   void thread_across_edge (edge);
-   bool record_temporary_equivalences_from_phis (edge);
-   gimple *record_temporary_equivalences_from_stmts_at_dest (edge);
-- 
-2.43.5
-
@@ -4,17 +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 32cbdb692..463028fbe 100644
+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) \
@@ -23,16 +23,7 @@ index 32cbdb692..463028fbe 100644
   a-exetim.adb<libgnarl/a-exetim__posix.adb \
   a-exetim.ads<libgnarl/a-exetim__default.ads \
   s-linux.ads<libgnarl/s-linux.ads \
-@@ -2144,7 +2144,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
-@@ -2232,7 +2232,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) \
@@ -41,7 +32,7 @@ index 32cbdb692..463028fbe 100644
   $(ATOMICS_TARGET_PAIRS) \
   $(ATOMICS_BUILTINS_TARGET_PAIRS) \
   system.ads<libgnat/system-linux-ppc.ads
-@@ -2267,7 +2267,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
@@ -59,7 +50,7 @@ index 32cbdb692..463028fbe 100644
   s-mudido.adb<libgnarl/s-mudido__affinity.adb \
   s-osinte.ads<libgnarl/s-osinte__linux.ads \
   s-osinte.adb<libgnarl/s-osinte__posix.adb \
-@@ -2488,7 +2488,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) \
@@ -68,16 +59,7 @@ index 32cbdb692..463028fbe 100644
   $(ATOMICS_TARGET_PAIRS) \
   $(ATOMICS_BUILTINS_TARGET_PAIRS) \
   $(GNATRTL_128BIT_PAIRS) \
-@@ -2592,7 +2592,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) \
-@@ -2637,7 +2637,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) \
@@ -87,10 +69,10 @@ index 32cbdb692..463028fbe 100644
   $(X86_64_TARGET_PAIRS) \
   $(SIMD_PATH_TARGET_PAIRS) \
 diff --git a/gcc/ada/adaint.c b/gcc/ada/adaint.c
-index 74aa3c412..ef6118f37 100644
+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
@@ -102,7 +84,7 @@ index 74aa3c412..ef6118f37 100644
 
 #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__)
@@ -110,7 +92,7 @@ index 74aa3c412..ef6118f37 100644
 
 /* 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 */
 
@@ -119,7 +101,7 @@ index 74aa3c412..ef6118f37 100644
 __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
@@ -161,7 +143,7 @@ index 74aa3c412..ef6118f37 100644
 }
 
 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
@@ -191,7 +173,7 @@ index 74aa3c412..ef6118f37 100644
 #endif /* !CPU_ALLOC */
 #endif /* __linux__ */
 diff --git a/gcc/ada/adaint.h b/gcc/ada/adaint.h
-index 0cbfd0e15..f97ed905b 100644
+index 987432c9307..4d782f07de9 100644
 --- a/gcc/ada/adaint.h
 +++ b/gcc/ada/adaint.h
@@ -319,13 +319,11 @@ extern void   *__gnat_lwp_self			   (void);
@@ -213,10 +195,10 @@ index 0cbfd0e15..f97ed905b 100644
 
 #if defined (_WIN32)
 diff --git a/gcc/ada/terminals.c b/gcc/ada/terminals.c
-index 05af82c27..626ac35bc 100644
+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)
@@ -225,7 +207,7 @@ index 05af82c27..626ac35bc 100644
       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__)
@@ -234,7 +216,7 @@ index 05af82c27..626ac35bc 100644
 #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;
 
@@ -245,3 +227,6 @@ index 05af82c27..626ac35bc 100644
 #elif defined (USE_OPENPTY)
   status = openpty (&master_fd, &slave_fd, NULL, NULL, NULL);
 #elif defined (USE_CLONE_DEVICE)
+-- 
+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
-         {
@@ -34,19 +34,19 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""

 pkgname=gcc-riscv64
-pkgrel=5
+pkgrel=1
 pkgdesc="Stage2 cross-compiler for riscv64"
 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-riscv64 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-riscv64 mpc1"
 makedepends_build="gcc g++ bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev"
 makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-dev-riscv64 binutils-riscv64"
 subpackages="g++-riscv64:gpp libstdc++-dev-riscv64:libcxx_dev"
-[ "$CHOST" = "$CTARGET" ] && subpackages="gcc-gdb gcc-doc"
+[ "$CHOST" = "$CTARGET" ] && subpackages="gcc-gdb gcc-doc$_target"
 replaces="libstdc++ binutils"
-options="!strip !tracedeps"
+options="!strip"

 : "${LANG_CXX:=true}"
 : "${LANG_D:=true}"
@@ -64,7 +64,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 +73,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 +115,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,14 +136,15 @@ 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"
-ppc64le|riscv64)	LANG_D=false ;;
+ppc64le|riscv64|loongarch64)	LANG_D=false ;;
 # GDC does currently not work on 32-bit musl architectures.
 # This is a known upstream issue.
 # See: https://github.com/dlang/druntime/pull/3383
@@ -169,7 +171,7 @@ esac
 # currently on x86, x86_64 and ia64
 _libquadmath=$LANG_FORTRAN
 case "$CTARGET_ARCH" in
-x86 | x86_64 | ppc64le) ;;
+x86 | x86_64)	_libquadmath=$LANG_FORTRAN ;;
 *)		_libquadmath=false ;;
 esac

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

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

@@ -192,17 +199,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,12 +216,13 @@ 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
@@ -232,7 +232,7 @@ 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
@@ -242,7 +242,7 @@ makedepends="$makedepends_build $makedepends_host"
 # PLEASE submit all patches to gcc to https://gitlab.alpinelinux.org/kaniini/alpine-gcc-patches,
 # so that they can be properly tracked and easily rebased if needed.
 #source="https://dev.alpinelinux.org/archive/gcc/${_pkgbase%%.*}-$_pkgsnap/gcc-${_pkgbase%%.*}-$_pkgsnap.tar.xz
-source="https://gcc.gnu.org/pub/gcc/releases/gcc-$_pkgbase/gcc-$_pkgbase.tar.xz
+source="https://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$pkgver}/gcc-${_pkgbase:-$pkgver}.tar.xz
 	0001-posix_memalign.patch
 	0002-gcc-poison-system-directories.patch
 	0003-specs-turn-on-Wl-z-now-by-default.patch
@@ -278,10 +278,7 @@ source="https://gcc.gnu.org/pub/gcc/releases/gcc-$_pkgbase/gcc-$_pkgbase.tar.xz
 	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
 	fix-arm64.patch
-	ppc64le-quadmath.patch
-	riscv64-improve-build-time.patch
 	"

 # secfixes:
@@ -289,21 +286,44 @@ 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
+_gccdir="$srcdir"/gcc-${_pkgbase:-$pkgver}
+_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";;
@@ -319,7 +339,7 @@ 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";;
+	loongarch64-*-*-*)      _arch_configure="--with-arch=loongarch64 --with-abi=lp64d";;
 	esac

 	case "$CTARGET_ARCH" in
@@ -327,28 +347,33 @@ 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"
 	$_libatomic	|| _bootstrap_configure="$_bootstrap_configure --disable-libatomic"
 	$_libitm	|| _bootstrap_configure="$_bootstrap_configure --disable-libitm"
-	$_libquadmath	|| _arch_configure="$_arch_configure --disable-libquadmath"
+	if ! $_libquadmath; then
+		_arch_configure="$_arch_configure --disable-libquadmath"
+		# ppc64le needs both --disable-libquadmath{,-support}
+		# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=116007
+		[ "$CARCH" = "ppc64le" ] &&
+			_arch_configure="$_arch_configure
+				--disable-libquadmath-support"
+	fi

 	msg "Building the following:"
 	echo ""
@@ -356,8 +381,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"
@@ -378,7 +405,7 @@ build() {
 		--disable-multilib
 		--disable-nls
 		--disable-werror
-		--disable-symvers
+		$_symvers
 		--enable-__cxa_atexit
 		--enable-default-pie
 		--enable-default-ssp
@@ -386,8 +413,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
@@ -397,14 +423,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
@@ -413,7 +435,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 \
@@ -428,7 +450,7 @@ 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

 	if $LANG_JIT; then
@@ -472,22 +494,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
@@ -536,7 +561,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() {
@@ -549,7 +575,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() {
@@ -567,13 +594,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() {
@@ -592,26 +621,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() {
@@ -619,43 +652,49 @@ 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() {
@@ -663,25 +702,31 @@ 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
+	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() {
@@ -689,7 +734,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() {
@@ -698,30 +744,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() {
@@ -730,9 +784,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() {
@@ -771,7 +828,7 @@ f382eb5f7c2c60c5a23fac587c9629a3059d7be0898e97a1feaf9b9cbe1ef4693cc1177eb29333e8
 abf845792433a21fed5dd06167b9f6cf5e8f8026a409acce93824e466c5148e192bf5f404a271931fe4b65283499329bf67bb01019f2f3e02501f20619404e6c  0023-riscv-disable-multilib-support.patch
 ab88a2f63e3545bbc36537aa9a86f2c6c35e41bbf702d6e13743a405cdac4f901eed5737189b780da96647fea9f5d863fdc76373f25a00064106dcb5514d6d87  0024-always-build-libgcc_eh.a.patch
 8fdbe0c8bf4ca60f458a33e59027de03d15ac91933fe46d8ca62119346d20b9bc2447c0bf22bceb63d0cf8613ab61512d9197f4e6c2224af473b63ef9f254295  0025-ada-libgnarl-compatibility-for-musl.patch
-684bf2db12aa45e8db7a895ab0f227b4e4351f611b4fcc6e1745d7ad94d31b3554f39d8cf9e2203520b3c6ee35cf309b417d4a842e7a8cd55a2b2accb23f2f24  0026-ada-musl-support-fixes.patch
+5fd23a506b55c88d4f000e01c539eb25d6da2516949c9d7a1c9ee20f4c6b627e4788541284d9c14c33bafa7cb43ce2e0469dd91006152f00e30815107150320f  0026-ada-musl-support-fixes.patch
 3f9a406d7d2ce34951215ffbcadb49a45e55ad5c24ab9097c0e5e92383e43b876872ccd2a7e7def2833ab204975ee5733f8bcf90934db9fa9c4f6f56c62081f6  0027-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
 720a4001f9a1fa4122e456077ecff8d3eb8af7c83d0a81f9da6a6cca05b23664206a82a349e34482c48bfe40e99aa5f21567613d0913f6a24f282bc84a994496  0028-configure-fix-detection-of-atomic-builtins-in-libato.patch
 2044c23b23726965c0a6fd39f616cc464badd650947cb40495eeabd906a3af629878c1d28b403b8eb46b30a1a0ba39083023290d62f0c99ccf070063226e3f8f  0029-libstdc-do-not-throw-exceptions-for-non-C-locales-on.patch
@@ -781,8 +838,5 @@ b325035cb7122d79c6b42ca6d3fc9e02319ed2f7cddb0639dff25d2798d2ce63812cd623462cdf95
 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
 00319c9770362520e8e93bd03fda1769dfa3622eba77d620e11d8af45a38e6d804a5e924046ae388e1cfaea605696e89c343fca507aaaa5edd58d80744fff14f  fix-arm64.patch
-815265826742400f86336f0c2d3e4edc37398dbc6505ee81107c0103c13ac0f406cff851438d2323033c6c6d0c0323765ee15b975eab8d1dd465f9e988168fb9  ppc64le-quadmath.patch
-ea55e0fa6813fc95c4ca2e87f059182edc54dc61515ebb92bf6eb31dbbd176d0fe81edcc7ea28d32f84ca37e8d48a544623d3d9bc94aa41ffc0859326a616aa2  riscv64-improve-build-time.patch
 "
@@ -1,56 +0,0 @@
-Patch-Source: https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=3fe5720430a9ba61ed7562aac4d758cc77d49a28
--
-From 3fe5720430a9ba61ed7562aac4d758cc77d49a28 Mon Sep 17 00:00:00 2001
-From: Jakub Jelinek <jakub@redhat.com>
-Date: Sat, 3 Aug 2024 20:37:54 +0200
-Subject: [PATCH] libquadmath: Fix up libquadmath/math/sqrtq.c compilation in
- some powerpc* configurations [PR116007]
-
-My PR114623 change started using soft-fp.h and quad.h for the sqrtq implementation.
-Unfortunately, that seems to fail building in some powerpc* configurations, where
-TFmode isn't available.
-quad.h has:
- #ifndef TFtype
- typedef float TFtype __attribute__ ((mode (TF)));
- #endif
-and uses TFtype.  quad.h has:
- /* Define the complex type corresponding to __float128
-    ("_Complex __float128" is not allowed) */
- #if (!defined(_ARCH_PPC)) || defined(__LONG_DOUBLE_IEEE128__)
- typedef _Complex float __attribute__((mode(TC))) __complex128;
- #else
- typedef _Complex float __attribute__((mode(KC))) __complex128;
- #endif
-with the conditional and KCmode use added during porting of libquadmath
-to powerpc*, so I've just defined TFtype for powerpc when __LONG_DOUBLE_IEEE128__
-isn't defined; I could define it to float __attribute__ ((mode (KF))) but it
-seemed easier to just define it to __float128 which should do the same thing.
-
-2024-08-03  Jakub Jelinek  <jakub@redhat.com>
-
-	PR target/116007
-	* math/sqrtq.c (TFtype): For PowerPC without __LONG_DOUBLE_IEEE128__
-	define to __float128 before including soft-fp.h and quad.h.
-
-(cherry picked from commit 3ac02e67503ccffa3dfeeffc0a60fce6bdaca43b)
---
- libquadmath/math/sqrtq.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/libquadmath/math/sqrtq.c b/libquadmath/math/sqrtq.c
-index 8ca2828d42ce..a58998a06670 100644
--- a/libquadmath/math/sqrtq.c
-+++ b/libquadmath/math/sqrtq.c
-@@ -9,6 +9,9 @@
-     && defined(FE_TOWARDZERO) \
-     && defined(FE_INEXACT)
- #define USE_SOFT_FP 1
-+#if defined(_ARCH_PPC) && !defined(__LONG_DOUBLE_IEEE128__)
-+#define TFtype __float128
-+#endif
- #include "../../libgcc/soft-fp/soft-fp.h"
- #include "../../libgcc/soft-fp/quad.h"
- #endif
-- 
-2.43.5
-
@@ -1,149 +0,0 @@
-Patch-Source: https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=2cf89ae83225f932b226cd57ef2d083a59bcf8a3
--
-From 2cf89ae83225f932b226cd57ef2d083a59bcf8a3 Mon Sep 17 00:00:00 2001
-From: Richard Biener <rguenther@suse.de>
-Date: Tue, 6 Aug 2024 14:56:26 +0200
-Subject: [PATCH] tree-optimization/116166 - forward jump-threading going wild
-
-Currently the forward threader isn't limited as to the search space
-it explores and with it now using path-ranger for simplifying
-conditions it runs into it became pretty slow for degenerate cases
-like compiling insn-emit.cc for RISC-V esp. when compiling for
-a host with LOGICAL_OP_NON_SHORT_CIRCUIT disabled.
-
-The following makes the forward threader honor the search space
-limit I introduced for the backward threader.  This reduces
-compile-time from minutes to seconds for the testcase in PR116166.
-
-Note this wasn't necessary before we had ranger but with ranger
-the work we do is quadatic in the length of the threading path
-we build up (the same is true for the backwards threader).
-
-	PR tree-optimization/116166
-	* tree-ssa-threadedge.h (jump_threader::thread_around_empty_blocks):
-	Add limit parameter.
-	(jump_threader::thread_through_normal_block): Likewise.
-	* tree-ssa-threadedge.cc (jump_threader::thread_around_empty_blocks):
-	Honor and decrement limit parameter.
-	(jump_threader::thread_through_normal_block): Likewise.
-	(jump_threader::thread_across_edge): Initialize limit from
-	param_max_jump_thread_paths and pass it down to workers.
---
- gcc/tree-ssa-threadedge.cc | 30 ++++++++++++++++++++++--------
- gcc/tree-ssa-threadedge.h  |  4 ++--
- 2 files changed, 24 insertions(+), 10 deletions(-)
-
-diff --git a/gcc/tree-ssa-threadedge.cc b/gcc/tree-ssa-threadedge.cc
-index 7f82639b8ecc..0aa2aa851430 100644
--- a/gcc/tree-ssa-threadedge.cc
-+++ b/gcc/tree-ssa-threadedge.cc
-@@ -786,13 +786,17 @@ propagate_threaded_block_debug_into (basic_block dest, basic_block src)
- bool
- jump_threader::thread_around_empty_blocks (vec<jump_thread_edge *> *path,
- 					   edge taken_edge,
-					   bitmap visited)
-+					   bitmap visited, unsigned &limit)
- {
-   basic_block bb = taken_edge->dest;
-   gimple_stmt_iterator gsi;
-   gimple *stmt;
-   tree cond;
- 
-+  if (limit == 0)
-+    return false;
-+  --limit;
-+
-   /* The key property of these blocks is that they need not be duplicated
-      when threading.  Thus they cannot have visible side effects such
-      as PHI nodes.  */
-@@ -830,7 +834,8 @@ jump_threader::thread_around_empty_blocks (vec<jump_thread_edge *> *path,
- 	      m_registry->push_edge (path, taken_edge, EDGE_NO_COPY_SRC_BLOCK);
- 	      m_state->append_path (taken_edge->dest);
- 	      bitmap_set_bit (visited, taken_edge->dest->index);
-	      return thread_around_empty_blocks (path, taken_edge, visited);
-+	      return thread_around_empty_blocks (path, taken_edge, visited,
-+						 limit);
- 	    }
- 	}
- 
-@@ -872,7 +877,7 @@ jump_threader::thread_around_empty_blocks (vec<jump_thread_edge *> *path,
-       m_registry->push_edge (path, taken_edge, EDGE_NO_COPY_SRC_BLOCK);
-       m_state->append_path (taken_edge->dest);
- 
-      thread_around_empty_blocks (path, taken_edge, visited);
-+      thread_around_empty_blocks (path, taken_edge, visited, limit);
-       return true;
-     }
- 
-@@ -899,8 +904,13 @@ jump_threader::thread_around_empty_blocks (vec<jump_thread_edge *> *path,
- 
- int
- jump_threader::thread_through_normal_block (vec<jump_thread_edge *> *path,
-					    edge e, bitmap visited)
-+					    edge e, bitmap visited,
-+					    unsigned &limit)
- {
-+  if (limit == 0)
-+    return 0;
-+  limit--;
-+
-   m_state->register_equivs_edge (e);
- 
-   /* PHIs create temporary equivalences.
-@@ -989,7 +999,7 @@ jump_threader::thread_through_normal_block (vec<jump_thread_edge *> *path,
-  	     visited.  This may be overly conservative.  */
- 	  bitmap_set_bit (visited, dest->index);
- 	  bitmap_set_bit (visited, e->dest->index);
-	  thread_around_empty_blocks (path, taken_edge, visited);
-+	  thread_around_empty_blocks (path, taken_edge, visited, limit);
- 	  return 1;
- 	}
-     }
-@@ -1075,9 +1085,12 @@ jump_threader::thread_across_edge (edge e)
-   bitmap_set_bit (visited, e->src->index);
-   bitmap_set_bit (visited, e->dest->index);
- 
-+  /* Limit search space.  */
-+  unsigned limit = param_max_jump_thread_paths;
-+
-   int threaded = 0;
-   if ((e->flags & EDGE_DFS_BACK) == 0)
-    threaded = thread_through_normal_block (path, e, visited);
-+    threaded = thread_through_normal_block (path, e, visited, limit);
- 
-   if (threaded > 0)
-     {
-@@ -1148,11 +1161,12 @@ jump_threader::thread_across_edge (edge e)
- 	m_registry->push_edge (path, e, EDGE_START_JUMP_THREAD);
- 	m_registry->push_edge (path, taken_edge, EDGE_COPY_SRC_JOINER_BLOCK);
- 
-	found = thread_around_empty_blocks (path, taken_edge, visited);
-+	found = thread_around_empty_blocks (path, taken_edge, visited, limit);
- 
- 	if (!found)
- 	  found = thread_through_normal_block (path,
-					       path->last ()->e, visited) > 0;
-+					       path->last ()->e, visited,
-+					       limit) > 0;
- 
- 	/* If we were able to thread through a successor of E->dest, then
- 	   record the jump threading opportunity.  */
-diff --git a/gcc/tree-ssa-threadedge.h b/gcc/tree-ssa-threadedge.h
-index 9f6cbfe93307..245b3506a550 100644
--- a/gcc/tree-ssa-threadedge.h
-+++ b/gcc/tree-ssa-threadedge.h
-@@ -101,9 +101,9 @@ private:
- 					  unsigned limit);
- 
-   bool thread_around_empty_blocks (vec<class jump_thread_edge *> *path,
-				   edge, bitmap visited);
-+				   edge, bitmap visited, unsigned &limit);
-   int thread_through_normal_block (vec<jump_thread_edge *> *path,
-				   edge, bitmap visited);
-+				   edge, bitmap visited, unsigned &limit);
-   void thread_across_edge (edge);
-   bool record_temporary_equivalences_from_phis (edge);
-   gimple *record_temporary_equivalences_from_stmts_at_dest (edge);
-- 
-2.43.5
-
@@ -4,17 +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 32cbdb692..463028fbe 100644
+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) \
@@ -23,16 +23,7 @@ index 32cbdb692..463028fbe 100644
   a-exetim.adb<libgnarl/a-exetim__posix.adb \
   a-exetim.ads<libgnarl/a-exetim__default.ads \
   s-linux.ads<libgnarl/s-linux.ads \
-@@ -2144,7 +2144,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
-@@ -2232,7 +2232,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) \
@@ -41,7 +32,7 @@ index 32cbdb692..463028fbe 100644
   $(ATOMICS_TARGET_PAIRS) \
   $(ATOMICS_BUILTINS_TARGET_PAIRS) \
   system.ads<libgnat/system-linux-ppc.ads
-@@ -2267,7 +2267,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
@@ -59,7 +50,7 @@ index 32cbdb692..463028fbe 100644
   s-mudido.adb<libgnarl/s-mudido__affinity.adb \
   s-osinte.ads<libgnarl/s-osinte__linux.ads \
   s-osinte.adb<libgnarl/s-osinte__posix.adb \
-@@ -2488,7 +2488,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) \
@@ -68,16 +59,7 @@ index 32cbdb692..463028fbe 100644
   $(ATOMICS_TARGET_PAIRS) \
   $(ATOMICS_BUILTINS_TARGET_PAIRS) \
   $(GNATRTL_128BIT_PAIRS) \
-@@ -2592,7 +2592,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) \
-@@ -2637,7 +2637,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) \
@@ -87,10 +69,10 @@ index 32cbdb692..463028fbe 100644
   $(X86_64_TARGET_PAIRS) \
   $(SIMD_PATH_TARGET_PAIRS) \
 diff --git a/gcc/ada/adaint.c b/gcc/ada/adaint.c
-index 74aa3c412..ef6118f37 100644
+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
@@ -102,7 +84,7 @@ index 74aa3c412..ef6118f37 100644
 
 #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__)
@@ -110,7 +92,7 @@ index 74aa3c412..ef6118f37 100644
 
 /* 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 */
 
@@ -119,7 +101,7 @@ index 74aa3c412..ef6118f37 100644
 __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
@@ -161,7 +143,7 @@ index 74aa3c412..ef6118f37 100644
 }
 
 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
@@ -191,7 +173,7 @@ index 74aa3c412..ef6118f37 100644
 #endif /* !CPU_ALLOC */
 #endif /* __linux__ */
 diff --git a/gcc/ada/adaint.h b/gcc/ada/adaint.h
-index 0cbfd0e15..f97ed905b 100644
+index 987432c9307..4d782f07de9 100644
 --- a/gcc/ada/adaint.h
 +++ b/gcc/ada/adaint.h
@@ -319,13 +319,11 @@ extern void   *__gnat_lwp_self			   (void);
@@ -213,10 +195,10 @@ index 0cbfd0e15..f97ed905b 100644
 
 #if defined (_WIN32)
 diff --git a/gcc/ada/terminals.c b/gcc/ada/terminals.c
-index 05af82c27..626ac35bc 100644
+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)
@@ -225,7 +207,7 @@ index 05af82c27..626ac35bc 100644
       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__)
@@ -234,7 +216,7 @@ index 05af82c27..626ac35bc 100644
 #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;
 
@@ -245,3 +227,6 @@ index 05af82c27..626ac35bc 100644
 #elif defined (USE_OPENPTY)
   status = openpty (&master_fd, &slave_fd, NULL, NULL, NULL);
 #elif defined (USE_CLONE_DEVICE)
+-- 
+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
-         {
@@ -34,19 +34,19 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""

 pkgname=gcc-x86
-pkgrel=5
+pkgrel=1
 pkgdesc="Stage2 cross-compiler for x86"
 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-x86 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-x86 mpc1"
 makedepends_build="gcc g++ bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev"
 makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-dev-x86 binutils-x86"
 subpackages="g++-x86:gpp libstdc++-dev-x86:libcxx_dev"
-[ "$CHOST" = "$CTARGET" ] && subpackages="gcc-gdb gcc-doc"
+[ "$CHOST" = "$CTARGET" ] && subpackages="gcc-gdb gcc-doc$_target"
 replaces="libstdc++ binutils"
-options="!strip !tracedeps"
+options="!strip"

 : "${LANG_CXX:=true}"
 : "${LANG_D:=true}"
@@ -64,7 +64,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 +73,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 +115,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,14 +136,15 @@ 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"
-ppc64le|riscv64)	LANG_D=false ;;
+ppc64le|riscv64|loongarch64)	LANG_D=false ;;
 # GDC does currently not work on 32-bit musl architectures.
 # This is a known upstream issue.
 # See: https://github.com/dlang/druntime/pull/3383
@@ -169,7 +171,7 @@ esac
 # currently on x86, x86_64 and ia64
 _libquadmath=$LANG_FORTRAN
 case "$CTARGET_ARCH" in
-x86 | x86_64 | ppc64le) ;;
+x86 | x86_64)	_libquadmath=$LANG_FORTRAN ;;
 *)		_libquadmath=false ;;
 esac

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

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

@@ -192,17 +199,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,12 +216,13 @@ 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
@@ -232,7 +232,7 @@ 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
@@ -242,7 +242,7 @@ makedepends="$makedepends_build $makedepends_host"
 # PLEASE submit all patches to gcc to https://gitlab.alpinelinux.org/kaniini/alpine-gcc-patches,
 # so that they can be properly tracked and easily rebased if needed.
 #source="https://dev.alpinelinux.org/archive/gcc/${_pkgbase%%.*}-$_pkgsnap/gcc-${_pkgbase%%.*}-$_pkgsnap.tar.xz
-source="https://gcc.gnu.org/pub/gcc/releases/gcc-$_pkgbase/gcc-$_pkgbase.tar.xz
+source="https://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$pkgver}/gcc-${_pkgbase:-$pkgver}.tar.xz
 	0001-posix_memalign.patch
 	0002-gcc-poison-system-directories.patch
 	0003-specs-turn-on-Wl-z-now-by-default.patch
@@ -278,10 +278,7 @@ source="https://gcc.gnu.org/pub/gcc/releases/gcc-$_pkgbase/gcc-$_pkgbase.tar.xz
 	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
 	fix-arm64.patch
-	ppc64le-quadmath.patch
-	riscv64-improve-build-time.patch
 	"

 # secfixes:
@@ -289,21 +286,44 @@ 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
+_gccdir="$srcdir"/gcc-${_pkgbase:-$pkgver}
+_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";;
@@ -319,7 +339,7 @@ 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";;
+	loongarch64-*-*-*)      _arch_configure="--with-arch=loongarch64 --with-abi=lp64d";;
 	esac

 	case "$CTARGET_ARCH" in
@@ -327,28 +347,33 @@ 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"
 	$_libatomic	|| _bootstrap_configure="$_bootstrap_configure --disable-libatomic"
 	$_libitm	|| _bootstrap_configure="$_bootstrap_configure --disable-libitm"
-	$_libquadmath	|| _arch_configure="$_arch_configure --disable-libquadmath"
+	if ! $_libquadmath; then
+		_arch_configure="$_arch_configure --disable-libquadmath"
+		# ppc64le needs both --disable-libquadmath{,-support}
+		# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=116007
+		[ "$CARCH" = "ppc64le" ] &&
+			_arch_configure="$_arch_configure
+				--disable-libquadmath-support"
+	fi

 	msg "Building the following:"
 	echo ""
@@ -356,8 +381,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"
@@ -378,7 +405,7 @@ build() {
 		--disable-multilib
 		--disable-nls
 		--disable-werror
-		--disable-symvers
+		$_symvers
 		--enable-__cxa_atexit
 		--enable-default-pie
 		--enable-default-ssp
@@ -386,8 +413,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
@@ -397,14 +423,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
@@ -413,7 +435,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 \
@@ -428,7 +450,7 @@ 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

 	if $LANG_JIT; then
@@ -472,22 +494,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
@@ -536,7 +561,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() {
@@ -549,7 +575,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() {
@@ -567,13 +594,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() {
@@ -592,26 +621,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() {
@@ -619,43 +652,49 @@ 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() {
@@ -663,25 +702,31 @@ 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
+	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() {
@@ -689,7 +734,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() {
@@ -698,30 +744,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() {
@@ -730,9 +784,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() {
@@ -771,7 +828,7 @@ f382eb5f7c2c60c5a23fac587c9629a3059d7be0898e97a1feaf9b9cbe1ef4693cc1177eb29333e8
 abf845792433a21fed5dd06167b9f6cf5e8f8026a409acce93824e466c5148e192bf5f404a271931fe4b65283499329bf67bb01019f2f3e02501f20619404e6c  0023-riscv-disable-multilib-support.patch
 ab88a2f63e3545bbc36537aa9a86f2c6c35e41bbf702d6e13743a405cdac4f901eed5737189b780da96647fea9f5d863fdc76373f25a00064106dcb5514d6d87  0024-always-build-libgcc_eh.a.patch
 8fdbe0c8bf4ca60f458a33e59027de03d15ac91933fe46d8ca62119346d20b9bc2447c0bf22bceb63d0cf8613ab61512d9197f4e6c2224af473b63ef9f254295  0025-ada-libgnarl-compatibility-for-musl.patch
-684bf2db12aa45e8db7a895ab0f227b4e4351f611b4fcc6e1745d7ad94d31b3554f39d8cf9e2203520b3c6ee35cf309b417d4a842e7a8cd55a2b2accb23f2f24  0026-ada-musl-support-fixes.patch
+5fd23a506b55c88d4f000e01c539eb25d6da2516949c9d7a1c9ee20f4c6b627e4788541284d9c14c33bafa7cb43ce2e0469dd91006152f00e30815107150320f  0026-ada-musl-support-fixes.patch
 3f9a406d7d2ce34951215ffbcadb49a45e55ad5c24ab9097c0e5e92383e43b876872ccd2a7e7def2833ab204975ee5733f8bcf90934db9fa9c4f6f56c62081f6  0027-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
 720a4001f9a1fa4122e456077ecff8d3eb8af7c83d0a81f9da6a6cca05b23664206a82a349e34482c48bfe40e99aa5f21567613d0913f6a24f282bc84a994496  0028-configure-fix-detection-of-atomic-builtins-in-libato.patch
 2044c23b23726965c0a6fd39f616cc464badd650947cb40495eeabd906a3af629878c1d28b403b8eb46b30a1a0ba39083023290d62f0c99ccf070063226e3f8f  0029-libstdc-do-not-throw-exceptions-for-non-C-locales-on.patch
@@ -781,8 +838,5 @@ b325035cb7122d79c6b42ca6d3fc9e02319ed2f7cddb0639dff25d2798d2ce63812cd623462cdf95
 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
 00319c9770362520e8e93bd03fda1769dfa3622eba77d620e11d8af45a38e6d804a5e924046ae388e1cfaea605696e89c343fca507aaaa5edd58d80744fff14f  fix-arm64.patch
-815265826742400f86336f0c2d3e4edc37398dbc6505ee81107c0103c13ac0f406cff851438d2323033c6c6d0c0323765ee15b975eab8d1dd465f9e988168fb9  ppc64le-quadmath.patch
-ea55e0fa6813fc95c4ca2e87f059182edc54dc61515ebb92bf6eb31dbbd176d0fe81edcc7ea28d32f84ca37e8d48a544623d3d9bc94aa41ffc0859326a616aa2  riscv64-improve-build-time.patch
 "
@@ -1,56 +0,0 @@
-Patch-Source: https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=3fe5720430a9ba61ed7562aac4d758cc77d49a28
--
-From 3fe5720430a9ba61ed7562aac4d758cc77d49a28 Mon Sep 17 00:00:00 2001
-From: Jakub Jelinek <jakub@redhat.com>
-Date: Sat, 3 Aug 2024 20:37:54 +0200
-Subject: [PATCH] libquadmath: Fix up libquadmath/math/sqrtq.c compilation in
- some powerpc* configurations [PR116007]
-
-My PR114623 change started using soft-fp.h and quad.h for the sqrtq implementation.
-Unfortunately, that seems to fail building in some powerpc* configurations, where
-TFmode isn't available.
-quad.h has:
- #ifndef TFtype
- typedef float TFtype __attribute__ ((mode (TF)));
- #endif
-and uses TFtype.  quad.h has:
- /* Define the complex type corresponding to __float128
-    ("_Complex __float128" is not allowed) */
- #if (!defined(_ARCH_PPC)) || defined(__LONG_DOUBLE_IEEE128__)
- typedef _Complex float __attribute__((mode(TC))) __complex128;
- #else
- typedef _Complex float __attribute__((mode(KC))) __complex128;
- #endif
-with the conditional and KCmode use added during porting of libquadmath
-to powerpc*, so I've just defined TFtype for powerpc when __LONG_DOUBLE_IEEE128__
-isn't defined; I could define it to float __attribute__ ((mode (KF))) but it
-seemed easier to just define it to __float128 which should do the same thing.
-
-2024-08-03  Jakub Jelinek  <jakub@redhat.com>
-
-	PR target/116007
-	* math/sqrtq.c (TFtype): For PowerPC without __LONG_DOUBLE_IEEE128__
-	define to __float128 before including soft-fp.h and quad.h.
-
-(cherry picked from commit 3ac02e67503ccffa3dfeeffc0a60fce6bdaca43b)
---
- libquadmath/math/sqrtq.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/libquadmath/math/sqrtq.c b/libquadmath/math/sqrtq.c
-index 8ca2828d42ce..a58998a06670 100644
--- a/libquadmath/math/sqrtq.c
-+++ b/libquadmath/math/sqrtq.c
-@@ -9,6 +9,9 @@
-     && defined(FE_TOWARDZERO) \
-     && defined(FE_INEXACT)
- #define USE_SOFT_FP 1
-+#if defined(_ARCH_PPC) && !defined(__LONG_DOUBLE_IEEE128__)
-+#define TFtype __float128
-+#endif
- #include "../../libgcc/soft-fp/soft-fp.h"
- #include "../../libgcc/soft-fp/quad.h"
- #endif
-- 
-2.43.5
-
@@ -1,149 +0,0 @@
-Patch-Source: https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=2cf89ae83225f932b226cd57ef2d083a59bcf8a3
--
-From 2cf89ae83225f932b226cd57ef2d083a59bcf8a3 Mon Sep 17 00:00:00 2001
-From: Richard Biener <rguenther@suse.de>
-Date: Tue, 6 Aug 2024 14:56:26 +0200
-Subject: [PATCH] tree-optimization/116166 - forward jump-threading going wild
-
-Currently the forward threader isn't limited as to the search space
-it explores and with it now using path-ranger for simplifying
-conditions it runs into it became pretty slow for degenerate cases
-like compiling insn-emit.cc for RISC-V esp. when compiling for
-a host with LOGICAL_OP_NON_SHORT_CIRCUIT disabled.
-
-The following makes the forward threader honor the search space
-limit I introduced for the backward threader.  This reduces
-compile-time from minutes to seconds for the testcase in PR116166.
-
-Note this wasn't necessary before we had ranger but with ranger
-the work we do is quadatic in the length of the threading path
-we build up (the same is true for the backwards threader).
-
-	PR tree-optimization/116166
-	* tree-ssa-threadedge.h (jump_threader::thread_around_empty_blocks):
-	Add limit parameter.
-	(jump_threader::thread_through_normal_block): Likewise.
-	* tree-ssa-threadedge.cc (jump_threader::thread_around_empty_blocks):
-	Honor and decrement limit parameter.
-	(jump_threader::thread_through_normal_block): Likewise.
-	(jump_threader::thread_across_edge): Initialize limit from
-	param_max_jump_thread_paths and pass it down to workers.
---
- gcc/tree-ssa-threadedge.cc | 30 ++++++++++++++++++++++--------
- gcc/tree-ssa-threadedge.h  |  4 ++--
- 2 files changed, 24 insertions(+), 10 deletions(-)
-
-diff --git a/gcc/tree-ssa-threadedge.cc b/gcc/tree-ssa-threadedge.cc
-index 7f82639b8ecc..0aa2aa851430 100644
--- a/gcc/tree-ssa-threadedge.cc
-+++ b/gcc/tree-ssa-threadedge.cc
-@@ -786,13 +786,17 @@ propagate_threaded_block_debug_into (basic_block dest, basic_block src)
- bool
- jump_threader::thread_around_empty_blocks (vec<jump_thread_edge *> *path,
- 					   edge taken_edge,
-					   bitmap visited)
-+					   bitmap visited, unsigned &limit)
- {
-   basic_block bb = taken_edge->dest;
-   gimple_stmt_iterator gsi;
-   gimple *stmt;
-   tree cond;
- 
-+  if (limit == 0)
-+    return false;
-+  --limit;
-+
-   /* The key property of these blocks is that they need not be duplicated
-      when threading.  Thus they cannot have visible side effects such
-      as PHI nodes.  */
-@@ -830,7 +834,8 @@ jump_threader::thread_around_empty_blocks (vec<jump_thread_edge *> *path,
- 	      m_registry->push_edge (path, taken_edge, EDGE_NO_COPY_SRC_BLOCK);
- 	      m_state->append_path (taken_edge->dest);
- 	      bitmap_set_bit (visited, taken_edge->dest->index);
-	      return thread_around_empty_blocks (path, taken_edge, visited);
-+	      return thread_around_empty_blocks (path, taken_edge, visited,
-+						 limit);
- 	    }
- 	}
- 
-@@ -872,7 +877,7 @@ jump_threader::thread_around_empty_blocks (vec<jump_thread_edge *> *path,
-       m_registry->push_edge (path, taken_edge, EDGE_NO_COPY_SRC_BLOCK);
-       m_state->append_path (taken_edge->dest);
- 
-      thread_around_empty_blocks (path, taken_edge, visited);
-+      thread_around_empty_blocks (path, taken_edge, visited, limit);
-       return true;
-     }
- 
-@@ -899,8 +904,13 @@ jump_threader::thread_around_empty_blocks (vec<jump_thread_edge *> *path,
- 
- int
- jump_threader::thread_through_normal_block (vec<jump_thread_edge *> *path,
-					    edge e, bitmap visited)
-+					    edge e, bitmap visited,
-+					    unsigned &limit)
- {
-+  if (limit == 0)
-+    return 0;
-+  limit--;
-+
-   m_state->register_equivs_edge (e);
- 
-   /* PHIs create temporary equivalences.
-@@ -989,7 +999,7 @@ jump_threader::thread_through_normal_block (vec<jump_thread_edge *> *path,
-  	     visited.  This may be overly conservative.  */
- 	  bitmap_set_bit (visited, dest->index);
- 	  bitmap_set_bit (visited, e->dest->index);
-	  thread_around_empty_blocks (path, taken_edge, visited);
-+	  thread_around_empty_blocks (path, taken_edge, visited, limit);
- 	  return 1;
- 	}
-     }
-@@ -1075,9 +1085,12 @@ jump_threader::thread_across_edge (edge e)
-   bitmap_set_bit (visited, e->src->index);
-   bitmap_set_bit (visited, e->dest->index);
- 
-+  /* Limit search space.  */
-+  unsigned limit = param_max_jump_thread_paths;
-+
-   int threaded = 0;
-   if ((e->flags & EDGE_DFS_BACK) == 0)
-    threaded = thread_through_normal_block (path, e, visited);
-+    threaded = thread_through_normal_block (path, e, visited, limit);
- 
-   if (threaded > 0)
-     {
-@@ -1148,11 +1161,12 @@ jump_threader::thread_across_edge (edge e)
- 	m_registry->push_edge (path, e, EDGE_START_JUMP_THREAD);
- 	m_registry->push_edge (path, taken_edge, EDGE_COPY_SRC_JOINER_BLOCK);
- 
-	found = thread_around_empty_blocks (path, taken_edge, visited);
-+	found = thread_around_empty_blocks (path, taken_edge, visited, limit);
- 
- 	if (!found)
- 	  found = thread_through_normal_block (path,
-					       path->last ()->e, visited) > 0;
-+					       path->last ()->e, visited,
-+					       limit) > 0;
- 
- 	/* If we were able to thread through a successor of E->dest, then
- 	   record the jump threading opportunity.  */
-diff --git a/gcc/tree-ssa-threadedge.h b/gcc/tree-ssa-threadedge.h
-index 9f6cbfe93307..245b3506a550 100644
--- a/gcc/tree-ssa-threadedge.h
-+++ b/gcc/tree-ssa-threadedge.h
-@@ -101,9 +101,9 @@ private:
- 					  unsigned limit);
- 
-   bool thread_around_empty_blocks (vec<class jump_thread_edge *> *path,
-				   edge, bitmap visited);
-+				   edge, bitmap visited, unsigned &limit);
-   int thread_through_normal_block (vec<jump_thread_edge *> *path,
-				   edge, bitmap visited);
-+				   edge, bitmap visited, unsigned &limit);
-   void thread_across_edge (edge);
-   bool record_temporary_equivalences_from_phis (edge);
-   gimple *record_temporary_equivalences_from_stmts_at_dest (edge);
-- 
-2.43.5
-
@@ -4,17 +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 32cbdb692..463028fbe 100644
+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) \
@@ -23,16 +23,7 @@ index 32cbdb692..463028fbe 100644
   a-exetim.adb<libgnarl/a-exetim__posix.adb \
   a-exetim.ads<libgnarl/a-exetim__default.ads \
   s-linux.ads<libgnarl/s-linux.ads \
-@@ -2144,7 +2144,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
-@@ -2232,7 +2232,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) \
@@ -41,7 +32,7 @@ index 32cbdb692..463028fbe 100644
   $(ATOMICS_TARGET_PAIRS) \
   $(ATOMICS_BUILTINS_TARGET_PAIRS) \
   system.ads<libgnat/system-linux-ppc.ads
-@@ -2267,7 +2267,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
@@ -59,7 +50,7 @@ index 32cbdb692..463028fbe 100644
   s-mudido.adb<libgnarl/s-mudido__affinity.adb \
   s-osinte.ads<libgnarl/s-osinte__linux.ads \
   s-osinte.adb<libgnarl/s-osinte__posix.adb \
-@@ -2488,7 +2488,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) \
@@ -68,16 +59,7 @@ index 32cbdb692..463028fbe 100644
   $(ATOMICS_TARGET_PAIRS) \
   $(ATOMICS_BUILTINS_TARGET_PAIRS) \
   $(GNATRTL_128BIT_PAIRS) \
-@@ -2592,7 +2592,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) \
-@@ -2637,7 +2637,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) \
@@ -87,10 +69,10 @@ index 32cbdb692..463028fbe 100644
   $(X86_64_TARGET_PAIRS) \
   $(SIMD_PATH_TARGET_PAIRS) \
 diff --git a/gcc/ada/adaint.c b/gcc/ada/adaint.c
-index 74aa3c412..ef6118f37 100644
+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
@@ -102,7 +84,7 @@ index 74aa3c412..ef6118f37 100644
 
 #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__)
@@ -110,7 +92,7 @@ index 74aa3c412..ef6118f37 100644
 
 /* 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 */
 
@@ -119,7 +101,7 @@ index 74aa3c412..ef6118f37 100644
 __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
@@ -161,7 +143,7 @@ index 74aa3c412..ef6118f37 100644
 }
 
 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
@@ -191,7 +173,7 @@ index 74aa3c412..ef6118f37 100644
 #endif /* !CPU_ALLOC */
 #endif /* __linux__ */
 diff --git a/gcc/ada/adaint.h b/gcc/ada/adaint.h
-index 0cbfd0e15..f97ed905b 100644
+index 987432c9307..4d782f07de9 100644
 --- a/gcc/ada/adaint.h
 +++ b/gcc/ada/adaint.h
@@ -319,13 +319,11 @@ extern void   *__gnat_lwp_self			   (void);
@@ -213,10 +195,10 @@ index 0cbfd0e15..f97ed905b 100644
 
 #if defined (_WIN32)
 diff --git a/gcc/ada/terminals.c b/gcc/ada/terminals.c
-index 05af82c27..626ac35bc 100644
+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)
@@ -225,7 +207,7 @@ index 05af82c27..626ac35bc 100644
       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__)
@@ -234,7 +216,7 @@ index 05af82c27..626ac35bc 100644
 #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;
 
@@ -245,3 +227,6 @@ index 05af82c27..626ac35bc 100644
 #elif defined (USE_OPENPTY)
   status = openpty (&master_fd, &slave_fd, NULL, NULL, NULL);
 #elif defined (USE_CLONE_DEVICE)
+-- 
+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
-         {
@@ -34,19 +34,19 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""

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

 : "${LANG_CXX:=true}"
 : "${LANG_D:=true}"
@@ -64,7 +64,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 +73,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 +115,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,14 +136,15 @@ 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"
-ppc64le|riscv64)	LANG_D=false ;;
+ppc64le|riscv64|loongarch64)	LANG_D=false ;;
 # GDC does currently not work on 32-bit musl architectures.
 # This is a known upstream issue.
 # See: https://github.com/dlang/druntime/pull/3383
@@ -169,7 +171,7 @@ esac
 # currently on x86, x86_64 and ia64
 _libquadmath=$LANG_FORTRAN
 case "$CTARGET_ARCH" in
-x86 | x86_64 | ppc64le) ;;
+x86 | x86_64)	_libquadmath=$LANG_FORTRAN ;;
 *)		_libquadmath=false ;;
 esac

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

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

@@ -192,17 +199,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,12 +216,13 @@ 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
@@ -232,7 +232,7 @@ 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
@@ -242,7 +242,7 @@ makedepends="$makedepends_build $makedepends_host"
 # PLEASE submit all patches to gcc to https://gitlab.alpinelinux.org/kaniini/alpine-gcc-patches,
 # so that they can be properly tracked and easily rebased if needed.
 #source="https://dev.alpinelinux.org/archive/gcc/${_pkgbase%%.*}-$_pkgsnap/gcc-${_pkgbase%%.*}-$_pkgsnap.tar.xz
-source="https://gcc.gnu.org/pub/gcc/releases/gcc-$_pkgbase/gcc-$_pkgbase.tar.xz
+source="https://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$pkgver}/gcc-${_pkgbase:-$pkgver}.tar.xz
 	0001-posix_memalign.patch
 	0002-gcc-poison-system-directories.patch
 	0003-specs-turn-on-Wl-z-now-by-default.patch
@@ -278,10 +278,7 @@ source="https://gcc.gnu.org/pub/gcc/releases/gcc-$_pkgbase/gcc-$_pkgbase.tar.xz
 	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
 	fix-arm64.patch
-	ppc64le-quadmath.patch
-	riscv64-improve-build-time.patch
 	"

 # secfixes:
@@ -289,21 +286,44 @@ 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
+_gccdir="$srcdir"/gcc-${_pkgbase:-$pkgver}
+_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";;
@@ -319,7 +339,7 @@ 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";;
+	loongarch64-*-*-*)      _arch_configure="--with-arch=loongarch64 --with-abi=lp64d";;
 	esac

 	case "$CTARGET_ARCH" in
@@ -327,28 +347,33 @@ 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"
 	$_libatomic	|| _bootstrap_configure="$_bootstrap_configure --disable-libatomic"
 	$_libitm	|| _bootstrap_configure="$_bootstrap_configure --disable-libitm"
-	$_libquadmath	|| _arch_configure="$_arch_configure --disable-libquadmath"
+	if ! $_libquadmath; then
+		_arch_configure="$_arch_configure --disable-libquadmath"
+		# ppc64le needs both --disable-libquadmath{,-support}
+		# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=116007
+		[ "$CARCH" = "ppc64le" ] &&
+			_arch_configure="$_arch_configure
+				--disable-libquadmath-support"
+	fi

 	msg "Building the following:"
 	echo ""
@@ -356,8 +381,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"
@@ -378,7 +405,7 @@ build() {
 		--disable-multilib
 		--disable-nls
 		--disable-werror
-		--disable-symvers
+		$_symvers
 		--enable-__cxa_atexit
 		--enable-default-pie
 		--enable-default-ssp
@@ -386,8 +413,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
@@ -397,14 +423,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
@@ -413,7 +435,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 \
@@ -428,7 +450,7 @@ 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

 	if $LANG_JIT; then
@@ -472,22 +494,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
@@ -536,7 +561,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() {
@@ -549,7 +575,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() {
@@ -567,13 +594,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-aarch64.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libz.so.1"
+	mv "$pkgdir/$_gcclibexec/cc1plus" "$subpkgdir/$_gcclibexec/"

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

 jit() {
@@ -592,26 +621,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() {
@@ -619,43 +652,49 @@ 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() {
@@ -663,25 +702,31 @@ 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
+	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() {
@@ -689,7 +734,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() {
@@ -698,30 +744,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() {
@@ -730,9 +784,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() {
@@ -771,7 +828,7 @@ f382eb5f7c2c60c5a23fac587c9629a3059d7be0898e97a1feaf9b9cbe1ef4693cc1177eb29333e8
 abf845792433a21fed5dd06167b9f6cf5e8f8026a409acce93824e466c5148e192bf5f404a271931fe4b65283499329bf67bb01019f2f3e02501f20619404e6c  0023-riscv-disable-multilib-support.patch
 ab88a2f63e3545bbc36537aa9a86f2c6c35e41bbf702d6e13743a405cdac4f901eed5737189b780da96647fea9f5d863fdc76373f25a00064106dcb5514d6d87  0024-always-build-libgcc_eh.a.patch
 8fdbe0c8bf4ca60f458a33e59027de03d15ac91933fe46d8ca62119346d20b9bc2447c0bf22bceb63d0cf8613ab61512d9197f4e6c2224af473b63ef9f254295  0025-ada-libgnarl-compatibility-for-musl.patch
-684bf2db12aa45e8db7a895ab0f227b4e4351f611b4fcc6e1745d7ad94d31b3554f39d8cf9e2203520b3c6ee35cf309b417d4a842e7a8cd55a2b2accb23f2f24  0026-ada-musl-support-fixes.patch
+5fd23a506b55c88d4f000e01c539eb25d6da2516949c9d7a1c9ee20f4c6b627e4788541284d9c14c33bafa7cb43ce2e0469dd91006152f00e30815107150320f  0026-ada-musl-support-fixes.patch
 3f9a406d7d2ce34951215ffbcadb49a45e55ad5c24ab9097c0e5e92383e43b876872ccd2a7e7def2833ab204975ee5733f8bcf90934db9fa9c4f6f56c62081f6  0027-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
 720a4001f9a1fa4122e456077ecff8d3eb8af7c83d0a81f9da6a6cca05b23664206a82a349e34482c48bfe40e99aa5f21567613d0913f6a24f282bc84a994496  0028-configure-fix-detection-of-atomic-builtins-in-libato.patch
 2044c23b23726965c0a6fd39f616cc464badd650947cb40495eeabd906a3af629878c1d28b403b8eb46b30a1a0ba39083023290d62f0c99ccf070063226e3f8f  0029-libstdc-do-not-throw-exceptions-for-non-C-locales-on.patch
@@ -781,8 +838,5 @@ b325035cb7122d79c6b42ca6d3fc9e02319ed2f7cddb0639dff25d2798d2ce63812cd623462cdf95
 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
 00319c9770362520e8e93bd03fda1769dfa3622eba77d620e11d8af45a38e6d804a5e924046ae388e1cfaea605696e89c343fca507aaaa5edd58d80744fff14f  fix-arm64.patch
-815265826742400f86336f0c2d3e4edc37398dbc6505ee81107c0103c13ac0f406cff851438d2323033c6c6d0c0323765ee15b975eab8d1dd465f9e988168fb9  ppc64le-quadmath.patch
-ea55e0fa6813fc95c4ca2e87f059182edc54dc61515ebb92bf6eb31dbbd176d0fe81edcc7ea28d32f84ca37e8d48a544623d3d9bc94aa41ffc0859326a616aa2  riscv64-improve-build-time.patch
 "
@@ -1,56 +0,0 @@
-Patch-Source: https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=3fe5720430a9ba61ed7562aac4d758cc77d49a28
--
-From 3fe5720430a9ba61ed7562aac4d758cc77d49a28 Mon Sep 17 00:00:00 2001
-From: Jakub Jelinek <jakub@redhat.com>
-Date: Sat, 3 Aug 2024 20:37:54 +0200
-Subject: [PATCH] libquadmath: Fix up libquadmath/math/sqrtq.c compilation in
- some powerpc* configurations [PR116007]
-
-My PR114623 change started using soft-fp.h and quad.h for the sqrtq implementation.
-Unfortunately, that seems to fail building in some powerpc* configurations, where
-TFmode isn't available.
-quad.h has:
- #ifndef TFtype
- typedef float TFtype __attribute__ ((mode (TF)));
- #endif
-and uses TFtype.  quad.h has:
- /* Define the complex type corresponding to __float128
-    ("_Complex __float128" is not allowed) */
- #if (!defined(_ARCH_PPC)) || defined(__LONG_DOUBLE_IEEE128__)
- typedef _Complex float __attribute__((mode(TC))) __complex128;
- #else
- typedef _Complex float __attribute__((mode(KC))) __complex128;
- #endif
-with the conditional and KCmode use added during porting of libquadmath
-to powerpc*, so I've just defined TFtype for powerpc when __LONG_DOUBLE_IEEE128__
-isn't defined; I could define it to float __attribute__ ((mode (KF))) but it
-seemed easier to just define it to __float128 which should do the same thing.
-
-2024-08-03  Jakub Jelinek  <jakub@redhat.com>
-
-	PR target/116007
-	* math/sqrtq.c (TFtype): For PowerPC without __LONG_DOUBLE_IEEE128__
-	define to __float128 before including soft-fp.h and quad.h.
-
-(cherry picked from commit 3ac02e67503ccffa3dfeeffc0a60fce6bdaca43b)
---
- libquadmath/math/sqrtq.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/libquadmath/math/sqrtq.c b/libquadmath/math/sqrtq.c
-index 8ca2828d42ce..a58998a06670 100644
--- a/libquadmath/math/sqrtq.c
-+++ b/libquadmath/math/sqrtq.c
-@@ -9,6 +9,9 @@
-     && defined(FE_TOWARDZERO) \
-     && defined(FE_INEXACT)
- #define USE_SOFT_FP 1
-+#if defined(_ARCH_PPC) && !defined(__LONG_DOUBLE_IEEE128__)
-+#define TFtype __float128
-+#endif
- #include "../../libgcc/soft-fp/soft-fp.h"
- #include "../../libgcc/soft-fp/quad.h"
- #endif
-- 
-2.43.5
-
@@ -1,149 +0,0 @@
-Patch-Source: https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=2cf89ae83225f932b226cd57ef2d083a59bcf8a3
--
-From 2cf89ae83225f932b226cd57ef2d083a59bcf8a3 Mon Sep 17 00:00:00 2001
-From: Richard Biener <rguenther@suse.de>
-Date: Tue, 6 Aug 2024 14:56:26 +0200
-Subject: [PATCH] tree-optimization/116166 - forward jump-threading going wild
-
-Currently the forward threader isn't limited as to the search space
-it explores and with it now using path-ranger for simplifying
-conditions it runs into it became pretty slow for degenerate cases
-like compiling insn-emit.cc for RISC-V esp. when compiling for
-a host with LOGICAL_OP_NON_SHORT_CIRCUIT disabled.
-
-The following makes the forward threader honor the search space
-limit I introduced for the backward threader.  This reduces
-compile-time from minutes to seconds for the testcase in PR116166.
-
-Note this wasn't necessary before we had ranger but with ranger
-the work we do is quadatic in the length of the threading path
-we build up (the same is true for the backwards threader).
-
-	PR tree-optimization/116166
-	* tree-ssa-threadedge.h (jump_threader::thread_around_empty_blocks):
-	Add limit parameter.
-	(jump_threader::thread_through_normal_block): Likewise.
-	* tree-ssa-threadedge.cc (jump_threader::thread_around_empty_blocks):
-	Honor and decrement limit parameter.
-	(jump_threader::thread_through_normal_block): Likewise.
-	(jump_threader::thread_across_edge): Initialize limit from
-	param_max_jump_thread_paths and pass it down to workers.
---
- gcc/tree-ssa-threadedge.cc | 30 ++++++++++++++++++++++--------
- gcc/tree-ssa-threadedge.h  |  4 ++--
- 2 files changed, 24 insertions(+), 10 deletions(-)
-
-diff --git a/gcc/tree-ssa-threadedge.cc b/gcc/tree-ssa-threadedge.cc
-index 7f82639b8ecc..0aa2aa851430 100644
--- a/gcc/tree-ssa-threadedge.cc
-+++ b/gcc/tree-ssa-threadedge.cc
-@@ -786,13 +786,17 @@ propagate_threaded_block_debug_into (basic_block dest, basic_block src)
- bool
- jump_threader::thread_around_empty_blocks (vec<jump_thread_edge *> *path,
- 					   edge taken_edge,
-					   bitmap visited)
-+					   bitmap visited, unsigned &limit)
- {
-   basic_block bb = taken_edge->dest;
-   gimple_stmt_iterator gsi;
-   gimple *stmt;
-   tree cond;
- 
-+  if (limit == 0)
-+    return false;
-+  --limit;
-+
-   /* The key property of these blocks is that they need not be duplicated
-      when threading.  Thus they cannot have visible side effects such
-      as PHI nodes.  */
-@@ -830,7 +834,8 @@ jump_threader::thread_around_empty_blocks (vec<jump_thread_edge *> *path,
- 	      m_registry->push_edge (path, taken_edge, EDGE_NO_COPY_SRC_BLOCK);
- 	      m_state->append_path (taken_edge->dest);
- 	      bitmap_set_bit (visited, taken_edge->dest->index);
-	      return thread_around_empty_blocks (path, taken_edge, visited);
-+	      return thread_around_empty_blocks (path, taken_edge, visited,
-+						 limit);
- 	    }
- 	}
- 
-@@ -872,7 +877,7 @@ jump_threader::thread_around_empty_blocks (vec<jump_thread_edge *> *path,
-       m_registry->push_edge (path, taken_edge, EDGE_NO_COPY_SRC_BLOCK);
-       m_state->append_path (taken_edge->dest);
- 
-      thread_around_empty_blocks (path, taken_edge, visited);
-+      thread_around_empty_blocks (path, taken_edge, visited, limit);
-       return true;
-     }
- 
-@@ -899,8 +904,13 @@ jump_threader::thread_around_empty_blocks (vec<jump_thread_edge *> *path,
- 
- int
- jump_threader::thread_through_normal_block (vec<jump_thread_edge *> *path,
-					    edge e, bitmap visited)
-+					    edge e, bitmap visited,
-+					    unsigned &limit)
- {
-+  if (limit == 0)
-+    return 0;
-+  limit--;
-+
-   m_state->register_equivs_edge (e);
- 
-   /* PHIs create temporary equivalences.
-@@ -989,7 +999,7 @@ jump_threader::thread_through_normal_block (vec<jump_thread_edge *> *path,
-  	     visited.  This may be overly conservative.  */
- 	  bitmap_set_bit (visited, dest->index);
- 	  bitmap_set_bit (visited, e->dest->index);
-	  thread_around_empty_blocks (path, taken_edge, visited);
-+	  thread_around_empty_blocks (path, taken_edge, visited, limit);
- 	  return 1;
- 	}
-     }
-@@ -1075,9 +1085,12 @@ jump_threader::thread_across_edge (edge e)
-   bitmap_set_bit (visited, e->src->index);
-   bitmap_set_bit (visited, e->dest->index);
- 
-+  /* Limit search space.  */
-+  unsigned limit = param_max_jump_thread_paths;
-+
-   int threaded = 0;
-   if ((e->flags & EDGE_DFS_BACK) == 0)
-    threaded = thread_through_normal_block (path, e, visited);
-+    threaded = thread_through_normal_block (path, e, visited, limit);
- 
-   if (threaded > 0)
-     {
-@@ -1148,11 +1161,12 @@ jump_threader::thread_across_edge (edge e)
- 	m_registry->push_edge (path, e, EDGE_START_JUMP_THREAD);
- 	m_registry->push_edge (path, taken_edge, EDGE_COPY_SRC_JOINER_BLOCK);
- 
-	found = thread_around_empty_blocks (path, taken_edge, visited);
-+	found = thread_around_empty_blocks (path, taken_edge, visited, limit);
- 
- 	if (!found)
- 	  found = thread_through_normal_block (path,
-					       path->last ()->e, visited) > 0;
-+					       path->last ()->e, visited,
-+					       limit) > 0;
- 
- 	/* If we were able to thread through a successor of E->dest, then
- 	   record the jump threading opportunity.  */
-diff --git a/gcc/tree-ssa-threadedge.h b/gcc/tree-ssa-threadedge.h
-index 9f6cbfe93307..245b3506a550 100644
--- a/gcc/tree-ssa-threadedge.h
-+++ b/gcc/tree-ssa-threadedge.h
-@@ -101,9 +101,9 @@ private:
- 					  unsigned limit);
- 
-   bool thread_around_empty_blocks (vec<class jump_thread_edge *> *path,
-				   edge, bitmap visited);
-+				   edge, bitmap visited, unsigned &limit);
-   int thread_through_normal_block (vec<jump_thread_edge *> *path,
-				   edge, bitmap visited);
-+				   edge, bitmap visited, unsigned &limit);
-   void thread_across_edge (edge);
-   bool record_temporary_equivalences_from_phis (edge);
-   gimple *record_temporary_equivalences_from_stmts_at_dest (edge);
-- 
-2.43.5
-
@@ -3,7 +3,7 @@

 pkgname=grub-efi-x86
 pkgver=2.12
-pkgrel=7
+pkgrel=6

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

 sha512sums="
-8a44b4d48c804fb2c62c3d75c85f86a108f1446d3b1f194cde3c1b3ce7653825379d5733fdf8e08013afcea0d9c879438556d8cbbfb7d5cd6c41b98ab7216492  grub-efi-2.12-r7-x86-edge.apk
+bad54187b4fbb9f78f2d619ff9a652a4927c557070c2c39334fd9900ae5aeb956144055602ca56295d7966c2d10090ef142a073dd67eb14f7b41ba0d54c78d4d  grub-efi-2.12-r6-x86-edge.apk
 "
@@ -8,7 +8,7 @@ fi

 pkgname=musl-aarch64
 pkgver=1.2.5
-pkgrel=10
+pkgrel=2
 arch="x86_64"
 subpackages="musl-dev-aarch64:package_dev"

@@ -57,6 +57,6 @@ package_dev() {
 }

 sha512sums="
-8276aa0ce7368b87bf97f37d600639d475c059b984061125c6b648d2fecb838d87c8de9f19af32bad5862845c05368ccec0b328af3beb0fedc89a7ec0fb3babb  musl-1.2.5-r10-aarch64-edge.apk
-2da7a285fee8a1f2386d4a75cbf3c75cfbbaf88c617d50af0e0440fcd5d9825183772bb13f55f885137d6519c606791d3a8c576c5202818b2289f0db4c98720d  musl-dev-1.2.5-r10-aarch64-edge.apk
+a3c660153e2cd1859a83e692c4d1c9f92bb442948ec4ed63412ac1d75502fa40a5a383bb548c8ac98d83fdd27f067304e876be1e15f41eaa09f1414cf5d4e189  musl-1.2.5-r2-aarch64-edge.apk
+6e921c1a761125e768e78e072585b226180c1447f04a4d5fc50564787b30f9c1520b3bfe90d835cfba1716fc4672d3df95a0883187adb50627eed9a3c4249a04  musl-dev-1.2.5-r2-aarch64-edge.apk
 "
@@ -8,7 +8,7 @@ fi

 pkgname=musl-armhf
 pkgver=1.2.5
-pkgrel=10
+pkgrel=2
 arch="x86_64"
 subpackages="musl-dev-armhf:package_dev"

@@ -57,6 +57,6 @@ package_dev() {
 }

 sha512sums="
-18e90cbe16c8084cbf8d91b36decde0d520778946258d4c84908e639741843d21b7e9e610f007e5126dcc6a3ba2289a862bc18cfd9b21d3bc64161483a5704cf  musl-1.2.5-r10-armhf-edge.apk
-7b46a6eb791beb511d9d40c5de3fc08d9b2fbf82b0538dfb171cdafd16d719687d3bb55e718a0f1eefcd0a8342d81fcb258928a3209ab1a874015054f5ffe501  musl-dev-1.2.5-r10-armhf-edge.apk
+20f07f25e5267acac97f7f7bf98763869c9a193bf44d1ef2b79f46f2e854aeabe2baa74d0311057541fb99179addbd43c08c56d1361ed349ae22973141f639c5  musl-1.2.5-r2-armhf-edge.apk
+4afb4520885704849bec649f5488add0a3a7b25005172d69f03337cf5b0a82d9f564cba11bbfa84a43a9386e027a8516fcc4573210b4e1fe340cc295a7f52499  musl-dev-1.2.5-r2-armhf-edge.apk
 "
@@ -8,7 +8,7 @@ fi

 pkgname=musl-armv7
 pkgver=1.2.5
-pkgrel=10
+pkgrel=2
 arch="x86_64"
 subpackages="musl-dev-armv7:package_dev"

@@ -57,6 +57,6 @@ package_dev() {
 }

 sha512sums="
-cfd51c4655b612815af1e888228244640a4516dd8edd7a75131d6634c96d8ea6028e780b3c3e870dd22c4f89788f9f12594b4900a8df287161059687f1630857  musl-1.2.5-r10-armv7-edge.apk
-88f482c389479817700a5b2c8609bae9d152303b92b1a9c7bd464aa990975b7bd0990c7b185d6c66ecd0c3c0c5f7579fc52a618d4393e511e112c8992d682693  musl-dev-1.2.5-r10-armv7-edge.apk
+0a542c678cfc7ed0cc4246985bd1ecce63247ca4db0ea9fde7c1ee2b30f683b46d7c4011b21931d19fc7c3faeb787413d243580417ec90f745b77534277a6f68  musl-1.2.5-r2-armv7-edge.apk
+26516f5ffc1f04223cce8bae2122a2eab17ec59ce1ef0c1d2382394d9dd0e014ac77336639592f24d15f0ec5120ea7b8329febab1bbbaf3dfecb777b944d6337  musl-dev-1.2.5-r2-armv7-edge.apk
 "
@@ -8,7 +8,7 @@ fi

 pkgname=musl-riscv64
 pkgver=1.2.5
-pkgrel=10
+pkgrel=2
 arch="x86_64"
 subpackages="musl-dev-riscv64:package_dev"

@@ -57,6 +57,6 @@ package_dev() {
 }

 sha512sums="
-4c76e3c4e94ab96d49c51ad01205e846280f851cff06b8c6ab8269d2ac99bbede29da9600fa60130c266d95da21bccdb00ad4b18123964774835e8014611e53e  musl-1.2.5-r10-riscv64-edge.apk
-27e6923fb43b1cd87b15e42edec6c658b7983b4e8c001bb67f5fc79cb124a46af92440e75676460eb3bed3a7acdd5ad142f03ba7dd040aae056431b8cc56818d  musl-dev-1.2.5-r10-riscv64-edge.apk
+ebc1f6759f73c492c00429fd735bd1f3f67bb5a1530156f0c0a821f693b415ba7b8807c22134ce8bd4043f18b12356151c4bfaff59946d059cd0523ebc8aad57  musl-1.2.5-r2-riscv64-edge.apk
+d5209392baedcee71455faa51f6a2e60a90b2bc51c1f5f2c9fb03ff6692b246225d8db7dd5f9165d76bd9d2463e797c9b3c805e04887a4b4b90ec55e96ced627  musl-dev-1.2.5-r2-riscv64-edge.apk
 "
@@ -8,7 +8,7 @@ fi

 pkgname=musl-x86
 pkgver=1.2.5
-pkgrel=10
+pkgrel=2
 arch="x86_64"
 subpackages="musl-dev-x86:package_dev"

@@ -57,6 +57,6 @@ package_dev() {
 }

 sha512sums="
-7d53c9b8d328860e09e5e5835be9632e9ee6effb6ce4203817b12139a1c4c69ac71495bb575e696b16e9a1dde830729af1b5b4d9308bf2e4be0995f2d7e2843b  musl-1.2.5-r10-x86-edge.apk
-5d048109d3360c526216a6f47446c5e9315fed76ae24bc8238d08dcac80edd22ac3de9ae4fda8fc42fd2c70c676e8673811eddb991bf08ea500bf4ccd10e2a3e  musl-dev-1.2.5-r10-x86-edge.apk
+bde9b17b3f8b696dd863509713113b720bdff8d125e98eed5165f5fa0934d3a8adc317ffb319e3c045b99389ebb0ac08896c0bedd6d0e7461c9f2d98ffee62f9  musl-1.2.5-r2-x86-edge.apk
+cfd0b502e1237024736b6215ac944299664f4b44802533f5cf6b5239a15c22bdc7782004e1485e15d8184ca0cc9afbf704c12cc39d4fe93611f65c8915d595a7  musl-dev-1.2.5-r2-x86-edge.apk
 "
@@ -8,7 +8,7 @@ fi

 pkgname=musl-x86_64
 pkgver=1.2.5
-pkgrel=10
+pkgrel=2
 arch="aarch64"
 subpackages="musl-dev-x86_64:package_dev"

@@ -57,6 +57,6 @@ package_dev() {
 }

 sha512sums="
-5d8ee4ca49019bf728f855cd296e36ac8ba9c16dc85f56c7b8bb6804788656584464ed9828f1eb5a14c1da1ca77906fae9d93174c44d03e003b6e1c2d1f445a6  musl-1.2.5-r10-x86_64-edge.apk
-788290a474910e15611f8a9165470fd5a633a579ca3a6f89f5f550864303949dedb286c6f0108db5490e8e05d0ce0dcfd749555b63b624ea8fcaffd9a0b201b9  musl-dev-1.2.5-r10-x86_64-edge.apk
+2554e2ac0b3f02904197de5317db836e5dbd2631d2ab6e59c3453eeff9b1647b9110005cfe7922470512e7d8b561c94769bf348f7f959754fdb1ca05b403d99b  musl-1.2.5-r2-x86_64-edge.apk
+9a29dcb8cd82da7eb929269c75d2c6637a0ce457526c4960164bcff424f6a0cf581b5a4b2f0020624360d1e5c71b10042dbe59db21df4cd6ffa14b0845c71802  musl-dev-1.2.5-r2-x86_64-edge.apk
 "
@@ -1,25 +0,0 @@
-It seems that newer versions of GNU Make do not allow to use variables before
-defining it.
-
-diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
-index 844bc9da..911c6ba1 100644
--- a/scripts/kconfig/Makefile
-+++ b/scripts/kconfig/Makefile
-@@ -192,6 +192,8 @@ clean-files	+= zconf.tab.c zconf.lex.c zconf.hash.c gconf.glade.h
- clean-files     += mconf qconf gconf nconf
- clean-files     += config.pot linux.pot
- 
-+HOSTLOADLIBES_mconf   = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))
-+
- # Check that we have the required ncurses stuff installed for lxdialog (menuconfig)
- PHONY += $(obj)/dochecklxdialog
- $(addprefix $(obj)/,$(lxdialog)): $(obj)/dochecklxdialog
-@@ -217,8 +219,6 @@ HOSTLOADLIBES_gconf	= `pkg-config --libs gtk+-2.0 gmodule-2.0 libglade-2.0`
- HOSTCFLAGS_gconf.o	= `pkg-config --cflags gtk+-2.0 gmodule-2.0 libglade-2.0` \
-                           -Wno-missing-prototypes
- 
-HOSTLOADLIBES_mconf   = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))
-
- HOSTLOADLIBES_nconf	= $(shell \
- 				pkg-config --libs menu panel ncurses 2>/dev/null \
- 				|| echo "-lmenu -lpanel -lncurses"  )
@@ -1,15 +0,0 @@
-Fix pre-ANSI C code in check-lxdialog.sh.
-
-diff --git a/scripts/kconfig/lxdialog/check-lxdialog.sh b/scripts/kconfig/lxdialog/check-lxdialog.sh
-index 9d2a4c58..364eaecb 100644
--- a/scripts/kconfig/lxdialog/check-lxdialog.sh
-+++ b/scripts/kconfig/lxdialog/check-lxdialog.sh
-@@ -43,7 +43,7 @@ trap "rm -f $tmp" 0 1 2 3 15
- check() {
-         $cc -x c - -o $tmp 2>/dev/null <<'EOF'
- #include CURSES_LOC
-main() {}
-+int main() { return 0; }
- EOF
- 	if [ $? != 0 ]; then
- 	    echo " *** Unable to find the ncurses libraries or the"       1>&2
@@ -1,51 +0,0 @@
-From 4cbffcd4f146ccceafccd9fa9d522640d1f0f519 Mon Sep 17 00:00:00 2001
-From: Oliver Smith <ollieparanoid@postmarketos.org>
-Date: Tue, 10 Dec 2024 08:33:54 +0100
-Subject: [PATCH] libfdt.i_shipped: use SWIG_AppendOutput
-
-Fix this build error with modern SWIG:
-
-  scripts/dtc/pylibfdt/libfdt_wrap.c: In function '_wrap_fdt_next_node':
-  scripts/dtc/pylibfdt/libfdt_wrap.c:5578:17: error: too few arguments to function 'SWIG_Python_AppendOutput'
-   5578 |     resultobj = SWIG_Python_AppendOutput(resultobj, val);
-
-Patch is based on:
-https://github.com/dgibson/dtc/pull/154
---
- scripts/dtc/pylibfdt/libfdt.i_shipped | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/scripts/dtc/pylibfdt/libfdt.i_shipped b/scripts/dtc/pylibfdt/libfdt.i_shipped
-index 27c29ea260..3bbbfb3c9f 100644
--- a/scripts/dtc/pylibfdt/libfdt.i_shipped
-+++ b/scripts/dtc/pylibfdt/libfdt.i_shipped
-@@ -1033,7 +1033,7 @@ typedef uint32_t fdt32_t;
- 			fdt_string(fdt1, fdt32_to_cpu($1->nameoff)));
- 		buff = PyByteArray_FromStringAndSize(
- 			(const char *)($1 + 1), fdt32_to_cpu($1->len));
-		resultobj = SWIG_Python_AppendOutput(resultobj, buff);
-+		resultobj = SWIG_AppendOutput(resultobj, buff);
- 	}
- }
- 
-@@ -1072,7 +1072,7 @@ typedef uint32_t fdt32_t;
- 
- %typemap(argout) int *depth {
-         PyObject *val = Py_BuildValue("i", *arg$argnum);
-        resultobj = SWIG_Python_AppendOutput(resultobj, val);
-+        resultobj = SWIG_AppendOutput(resultobj, val);
- }
- 
- %apply int *depth { int *depth };
-@@ -1088,7 +1088,7 @@ typedef uint32_t fdt32_t;
-            if (PyTuple_GET_SIZE(resultobj) == 0)
-               resultobj = val;
-            else
-              resultobj = SWIG_Python_AppendOutput(resultobj, val);
-+              resultobj = SWIG_AppendOutput(resultobj, val);
-         }
- }
- 
-- 
-2.47.1
-
@@ -2,8 +2,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-alcatel-idol347-downstream
 pkgdesc="Alcatel OneTouch Idol 3 (4.7) (Downstream)"
-pkgver=2
-pkgrel=0
+pkgver=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -21,5 +21,5 @@ package() {
 }

 sha512sums="
-131bddf782050fd8301ebd242a5b19cd70c520f03fe2e8a2f0b7afba60cc3dc0330f3765395de70553fc172a116a02a9512c3fc189303cb09609e4adac76a799  deviceinfo
+2b6ba0e6e6d8f90d907a7a8089718c8a1ff8ee3ad0ea17f204e2e9fa2a514a06af9c2b91b7bfb0b8b8362ba2d44b53aad52fd88d506682f1f61b9fe6c19d206e  deviceinfo
 "
@@ -20,6 +20,7 @@ deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline="console=ttyHSL0,115200,n8 androidboot.console=ttyHSL0 androidboot.hardware=qcom msm_rtb.filter=0x237 ehci-hcd.park=3 androidboot.bootdevice=7824900.sdhci lpm_levels.sleep_disabled=1 earlyprintk androidboot.bootloader=L1BGC0C0BG00"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
+deviceinfo_bootimg_mtk_mkimage="false"
 deviceinfo_bootimg_dtb_second="false"
 deviceinfo_flash_offset_base="0x80000000"
 deviceinfo_flash_offset_kernel="0x00008000"
@@ -1,2 +0,0 @@
-msm
-panel_lenovo_kuntao_549
@@ -2,8 +2,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-a5lte-downstream
 pkgdesc="Samsung Galaxy A5 (SM-A500F)"
-pkgver=2
-pkgrel=0
+pkgver=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -21,5 +21,5 @@ package() {
 }

 sha512sums="
-410b5caac31e2af65ebfe1f3312fc2106c681430b75dfa8f4412f5727cd7db669dc3f46b1b2c20ece1b438052c36cbd3ff7b212ea03d9fea5af0b3c5bb14ff9b  deviceinfo
+09f28323fac82a8f8495af89de94449100e0f9233e22e33af807e559803bf3d9114aedc6d21626c7d5d736e93025de812292a0ee47c3639ac704696995c3d675  deviceinfo
 "
@@ -17,7 +17,7 @@ deviceinfo_screen_height="1280"

 # Bootloader related
 deviceinfo_flash_method="fastboot"
-deviceinfo_kernel_cmdline="quiet loglevel=2 androidboot.hardware=qcom user_debug=23 msm_rtb.filter=0x3F ehci-hcd.park=3 androidboot.bootdevice=7824900.sdhci"
+deviceinfo_kernel_cmdline="console=null androidboot.hardware=qcom user_debug=23 msm_rtb.filter=0x3F ehci-hcd.park=3 androidboot.bootdevice=7824900.sdhci"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="true"
 deviceinfo_bootimg_dtb_second="false"
@@ -2,8 +2,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-a5ulte-downstream
 pkgdesc="Samsung Galaxy A5 (SM-A500FU)"
-pkgver=2
-pkgrel=0
+pkgver=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -21,5 +21,5 @@ package() {
 }

 sha512sums="
-8c08854b664866087f3df1dccbe39ee0aba4563e9fc2cb38567bbbb9f54a74e3a9ed7a574bc18930ecf595d8beda32dd301cd757b6788d24cdd819c8c9cc5c52  deviceinfo
+1e7fe5a6788c1b635ab5c63083da5c1f353440567b8f86948092202ce026cbbae000ea047e65fae543f13092f97626ce227bc3f329477fbd7521df1b31f30bc8  deviceinfo
 "
@@ -17,7 +17,7 @@ deviceinfo_screen_height="1280"

 # Bootloader related
 deviceinfo_flash_method="fastboot"
-deviceinfo_kernel_cmdline="quiet loglevel=2 androidboot.hardware=qcom user_debug=23 msm_rtb.filter=0x3F ehci-hcd.park=3 androidboot.bootdevice=7824900.sdhci"
+deviceinfo_kernel_cmdline="console=null androidboot.hardware=qcom user_debug=23 msm_rtb.filter=0x3F ehci-hcd.park=3 androidboot.bootdevice=7824900.sdhci"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="true"
 deviceinfo_bootimg_dtb_second="false"
@@ -3,13 +3,13 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-coreprimevelte-downstream
 pkgdesc="Samsung Galaxy Core Prime VE LTE downstream"
-pkgver=3
-pkgrel=0
+pkgver=1
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
-depends="mkbootimg linux-samsung-coreprimevelte-downstream postmarketos-base pxa-mkbootimg u-boot-tools"
+depends="mkbootimg linux-samsung-coreprimevelte-downstream postmarketos-base postmarketos-initramfs-minimal pxa-mkbootimg u-boot-tools"
 makedepends="devicepkg-dev"
 _pmb_recommends="firmware-samsung-pxa1908-downstream"
 source="deviceinfo 90-coreprimevelte.conf"
@@ -24,6 +24,6 @@ package() {
 }

 sha512sums="
-00c8780dbc77e62e7d57a2b3e879881076204f3e58d50555778aa68feb0157f5b4207fdabbb4627888eeeda6a35182e8e199e49e4050244a60ce4e9e2d84bd99  deviceinfo
+741f46736c2742d4a6f118a924eee89954fb14e5b1dc00f372bda41b63ec975cf960909f915fcb31ad965f136a712905bc8626cd7e530f40e110885f7c861790  deviceinfo
 4854cc57b86e1199dbc165110514e672dabf45044fe9f7ebbde5b2b24768fb5497273b5f38612cf2dfeffc9bf0648c725114b4fa01165bf7fb02f7d741ee5806  90-coreprimevelte.conf
 "
@@ -14,12 +14,12 @@ deviceinfo_keyboard="false"
 deviceinfo_external_storage="true"
 deviceinfo_screen_width="480"
 deviceinfo_screen_height="800"
-deviceinfo_create_initfs_extra="true"

 # Bootloader relate
 deviceinfo_flash_method="heimdall-bootimg"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="true"
+deviceinfo_bootimg_mtk_mkimage="false"
 deviceinfo_bootimg_dtb_second="false"
 deviceinfo_bootimg_pxa="true"
 deviceinfo_flash_offset_base="0x10000000"
@@ -1,39 +0,0 @@
-# Reference: <https://postmarketos.org/devicepkg>
-pkgname=device-samsung-j6lte-downstream
-pkgdesc="Samsung Galaxy J6 (2018)"
-pkgver=1
-pkgrel=0
-url="https://postmarketos.org"
-license="MIT"
-arch="aarch64"
-options="!check !archcheck"
-depends="
-	linux-samsung-j6lte-downstream
-	mkbootimg
-	postmarketos-base
-	postmarketos-base-downstream
-	msm-fb-refresher
-"
-makedepends="devicepkg-dev"
-source="
-	deviceinfo
-"
-subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
-
-build() {
-	devicepkg_build $startdir $pkgname
-}
-
-package() {
-	devicepkg_package $startdir $pkgname
-}
-
-nonfree_firmware() {
-	pkgdesc="$pkgdesc (WiFi firmware)"
-	depends="firmware-samsung-j6lte-downstream"
-	mkdir "$subpkgdir"
-}
-
-sha512sums="
-5bbe8f6840d75c4d8693fbe62afaf071cddaef750aee2f9cae31187489a2b05873369ee06bf5292ec484a70f6d5ac7aea7862fc27f7fc3057205afda52996d7e  deviceinfo
-"
@@ -1,32 +0,0 @@
-# Reference: <https://postmarketos.org/deviceinfo>
-# Please use double quotes only. You can source this file in shell
-# scripts.
-
-deviceinfo_format_version="0"
-deviceinfo_name="Samsung Galaxy J6"
-deviceinfo_manufacturer="Samsung"
-deviceinfo_codename="samsung-j6lte-downstream"
-deviceinfo_year="2018"
-deviceinfo_arch="aarch64"
-
-# Device related
-deviceinfo_chassis="handset"
-deviceinfo_keyboard="false"
-deviceinfo_external_storage="true"
-deviceinfo_screen_width="720"
-deviceinfo_screen_height="1480"
-
-# Bootloader related
-deviceinfo_flash_method="heimdall-bootimg"
-deviceinfo_kernel_cmdline="androidboot.selinux=permissive androidboot.selinux=permissive"
-deviceinfo_generate_bootimg="true"
-deviceinfo_bootimg_qcdt="true"
-deviceinfo_bootimg_dtb_second="false"
-deviceinfo_flash_pagesize="2048"
-deviceinfo_flash_offset_base="0x10000000"
-deviceinfo_flash_offset_kernel="0x00008000"
-deviceinfo_flash_offset_ramdisk="0x01000000"
-deviceinfo_flash_offset_second="0x00f00000"
-deviceinfo_flash_offset_tags="0x00000100"
-deviceinfo_flash_heimdall_partition_kernel="BOOT"
-deviceinfo_flash_heimdall_partition_rootfs="SYSTEM"
@@ -2,14 +2,15 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-lt01wifi-downstream
 pkgdesc="Samsung Galaxy Tab 3 8.0"
-pkgver=2
-pkgrel=0
+pkgver=1
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
 options="!check !archcheck"
 depends="
 	postmarketos-base
+	postmarketos-initramfs-minimal
 	linux-samsung-lt01wifi-downstream
 	mkbootimg
 "
@@ -34,7 +35,7 @@ nonfree_firmware() {
 }

 sha512sums="
-ea36813341c6843fa3b9c8a4ca330b92beb61e7c62de6a1d095c66f044237be2557bacdcc82912c48290d958128bef1771cd0d8c747758a5a98de759ecbb5778  deviceinfo
+b6d8953f5717b81fd1cb6d34e0f5539480b348a52194bbd3e6d83c3ae9e77bc2d948b05303c93ecbd7121f7affd476a9522c32c1a55fd7cee4ae0ca1bc0b88a0  deviceinfo
 af036fe35011db078379dbb2e8c16c86546f0a4fcb3d1bcee3502bb1ea5b38f3ec5a9fa8cd1ca8ed8b89592a7f572d6072781289845303e0bf85fc2de4ead9fb  modules-load.conf
 594d6059ba1b06bce65538d26ce80cf2ce840786605b86e993ffaef858837507c033c0f95b7bcd9914ae7ea3cd2a9e43e32ec879db7c908219ad62d38b4e426a  modprobe.conf
 "
@@ -14,7 +14,6 @@ deviceinfo_keyboard="false"
 deviceinfo_external_storage="true"
 deviceinfo_screen_width="800"
 deviceinfo_screen_height="1280"
-deviceinfo_create_initfs_extra="true"

 # Bootloader related
 deviceinfo_flash_method="heimdall-bootimg"
@@ -2,8 +2,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-m0-downstream
 pkgdesc="Samsung Galaxy S III"
-pkgver=5
-pkgrel=0
+pkgver=3
+pkgrel=4
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -12,6 +12,7 @@ depends="
 	linux-samsung-m0-downstream
 	mkbootimg
 	postmarketos-base
+	postmarketos-initramfs-minimal
 	"
 makedepends="devicepkg-dev"
 install="$pkgname.post-install"
@@ -39,6 +40,6 @@ nonfree_firmware() {
 }

 sha512sums="
-e43ad5a25aa5b0c499a8f7001feb236e428a185df0e51bf0b72f82550965e3050d10f8a4e6b0f92b11feec6f4bee734fac78bcbe8f55d8290d2544bd7ec3e811  deviceinfo
+e89b2287780aa94e93ee8cba472ec78b14a0de0089c3ee8c278175ace459d84a58a9278f473d917dd569b114874fb76931b404f810220d328c7e3f6148dac485  deviceinfo
 1376f0eb7c6ba459ca5c44b3eb7e9919d9c5f48d71ec30c006d1b4843e31cdade9f980415a166e977b2567b26f4e87d4554ee1143fdc62453d60a93bed129d06  90-android-touch-dev.rules
 "
@@ -14,13 +14,13 @@ deviceinfo_keyboard="false"
 deviceinfo_external_storage="true"
 deviceinfo_screen_width="720"
 deviceinfo_screen_height="1280"
-deviceinfo_create_initfs_extra="true"

 # Bootloader related
 deviceinfo_flash_method="heimdall-bootimg"
 deviceinfo_kernel_cmdline="console=ttySAC2,115200 buildvariant=userdebug"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
+deviceinfo_bootimg_mtk_mkimage="false"
 deviceinfo_bootimg_dtb_second="false"
 deviceinfo_flash_offset_base="0x10000000"
 deviceinfo_flash_offset_kernel="0x00008000"
@@ -2,14 +2,14 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-on7xelte-downstream
 pkgdesc="Samsung Galaxy J7 Prime"
-pkgver=2
+pkgver=1
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="
-	linux-samsung-on7xelte-downstream
+	linux-samsung-on7xelte
 	mkbootimg
 	msm-fb-refresher
 	postmarketos-base
@@ -52,7 +52,7 @@ lightdm() {
 }

 sha512sums="
-eb8a2cfc57044f901b3ce75eda0001b58d5132ea52155d5e4bfa7361c1a19021759c0182c5ac01100145902dbebaaaf7965ded45487c6b4d0860a7d799d4cf94  deviceinfo
+d342e7d79922d2e4a313e6c0ad20172e841886aa9517522460699da0dc66cd83cfeab986e468b0427ebcd64d54ffbc39cf3ba56c5d839b560e34cbe6e36526f1  deviceinfo
 baee319b6d2f49a15680b0f322ec3e398a071d73fbf7713d14f26a1d027f8950457a482ac3f019605af3dfcf25bbb33ebaa0ffde181f7f96d911d56251c81eef  lightdm.conf
 efbe3d6217854c0131e61f9f3722100d349cb0673f4923bc3d56dae30a6346b0c33e676a39fc4c080150f6ea9457bf268abf870eea916a7d5daae1a22642a2b8  mount-efs.rc-init
 3e5bb764529010d2b6b1f2759a7799f665d140aebcee2dd63433e68cd4282e09b5d3b34fb7c21e737595b406501e7f02ece4592651c60e4c2b9419de4aedb438  samsungipcd.rc-conf
@@ -21,6 +21,7 @@ deviceinfo_flash_method="heimdall-bootimg"
 deviceinfo_kernel_cmdline="androidboot.selinux=permissive androidboot.selinux=permissive"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="true"
+deviceinfo_bootimg_mtk_mkimage="false"
 deviceinfo_bootimg_dtb_second="false"
 deviceinfo_flash_pagesize="2048"
 deviceinfo_flash_offset_base="0x10000000"
@@ -2,7 +2,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-xiaomi-cepheus-downstream
 pkgdesc="Xiaomi Mi 9"
-pkgver=2
+pkgver=1
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -25,5 +25,5 @@ package() {
 }

 sha512sums="
-f71fef16c5a10a49b5ff56971a50224bc4a3c59075276ce2c4fc4f94307d3e39e006942d9f5fe4711058b0ce83b1df44e491efb9b67781662e042878556fe03d  deviceinfo
+ee52ac16542a599f397fba5ddbb82028d666dec7f509a4b9298df248ac98a129c7f2eb4452282c5de38f7f97516da6ba70ea027a0fea075881f6a7f5d2ca10c7  deviceinfo
 "
@@ -22,6 +22,7 @@ deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline="console=ttyMSM0,115200n8 earlycon=msm_geni_serial,0xa90000 androidboot.hardware=qcom androidboot.console=ttyMSM0 androidboot.memcg=1 lpm_levels.sleep_disabled=1 video=vfb:640x400,bpp=32,memsize=3072000 msm_rtb.filter=0x237 service_locator.enable=1 swiotlb=2048 loop.max_part=7 androidboot.usbcontroller=a600000.dwc3 buildvariant=user"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
+deviceinfo_bootimg_mtk_mkimage="false"
 deviceinfo_bootimg_dtb_second="false"
 deviceinfo_flash_pagesize="4096"
 deviceinfo_flash_offset_base="0x00000000"
@@ -2,8 +2,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-xiaomi-wt88047-downstream
 pkgdesc="Xiaomi Redmi 2 (Downstream)"
-pkgver=2
-pkgrel=0
+pkgver=1
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -21,5 +21,5 @@ package() {
 }

 sha512sums="
-2b101a3143cf3201bb20e8896ecf432bb4b7e6127eb82dd598f9e225338f7b510fe6658701656a5eed5969d691ff699424bda5f27b8a112115f3ab7e33439a68  deviceinfo
+30d1e79a3cafe22a307ace6a4897077e21e93a3433a8c2c636368fb037328d82a22009f6631c8c74481fe030fff9fef846b90a93ecadbc44484558ceb1a4b78f  deviceinfo
 "
@@ -21,6 +21,7 @@ deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline="console=ttyHSL0,115200,n8 androidboot.console=ttyHSL0 androidboot.hardware=qcom msm_rtb.filter=0x237 ehci-hcd.park=3 androidboot.bootdevice=7824900.sdhci lpm_levels.sleep_disabled=1 loop.max_part=7 phy-msm-usb.floated_charger_enable=1 buildvariant=userdebug"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="true"
+deviceinfo_bootimg_mtk_mkimage="false"
 deviceinfo_bootimg_dtb_second="false"
 deviceinfo_flash_offset_base="0x80000000"
 deviceinfo_flash_offset_kernel="0x00008000"
@@ -1,37 +0,0 @@
-pkgname=firmware-samsung-j6lte-downstream
-pkgver=1
-pkgrel=0
-pkgdesc="Firmware files for Samsung Galaxy J6 (2018)"
-url="https://github.com/samsungexynos7870/android_vendor_samsung_j6lte"
-arch="aarch64"
-license="proprietary"
-options="!strip !check !archcheck !spdx !tracedeps pmb:cross-native"
-
-# Source
-_commit="0ace47cab223eb50ef39a2725f3974ed43918b29"
-builddir="$srcdir/android_vendor_samsung_j6lte-$_commit"
-_raw_wifi_path="$url/raw/$_commit/proprietary/vendor/etc/wifi"
-_install_wifi_path="/lib/firmware/postmarketos/wifi/"
-source="
-	bcmdhd_apsta.bin_36::$_raw_wifi_path/bcmdhd_apsta.bin_36
-	bcmdhd_clm.blob::$_raw_wifi_path/bcmdhd_clm.blob
-	bcmdhd_mfg.bin_36::$_raw_wifi_path/bcmdhd_mfg.bin_36
-	bcmdhd_sta.bin_36::$_raw_wifi_path/bcmdhd_sta.bin_36
-	nvram.txt_36::$_raw_wifi_path/nvram.txt_36
-"
-
-package() {
-	install -Dm644 "$srcdir/bcmdhd_apsta.bin_36" "$pkgdir$_install_wifi_path/bcmdhd_apsta.bin_36"
-	install -Dm644 "$srcdir/bcmdhd_clm.blob" "$pkgdir$_install_wifi_path/bcmdhd_clm.blob"
-	install -Dm644 "$srcdir/bcmdhd_mfg.bin_36" "$pkgdir$_install_wifi_path/bcmdhd_mfg.bin_36"
-	install -Dm644 "$srcdir/bcmdhd_sta.bin_36" "$pkgdir$_install_wifi_path/bcmdhd_sta.bin_36"
-	install -Dm644 "$srcdir/nvram.txt_36" "$pkgdir$_install_wifi_path/nvram.txt_36"
-}
-
-sha512sums="
-678c30e5e64ba216fca0e0121eb9b2f6ad22f6e10c19138b3fa4af52bbce91f0a22886e7282062a44a4ded79bb675893556c5a193e56a8bd9979a0b0a679f008  bcmdhd_apsta.bin_36
-e2d1ca4f6a5f3649c1ab0fc9a7dca34077d5a4c5ea8465c3da92845141145e5f19d06c1bcb5f7d683bdce6c15675f41506bb9fbff0076ec58defa27114b2ad52  bcmdhd_clm.blob
-fbe0c453088efc5318fc80cdd6b6b9855ea21ce6619ca7f40fdf007d0dd9c8f4f821fe9356dd3492506223bfdb67eb6821347a2d0b420e06a8fadaf9166a947c  bcmdhd_mfg.bin_36
-706cb7f4eda0bba5069cb3635033a34d7155a4e60dc2fd1d5a724c387da77865d5a960f1c8b08546e1715470fe71bebbad29404207c62cdbfd3bbbdce26fa60d  bcmdhd_sta.bin_36
-6ff097c0895d39c576ec70b1e5a6ba37dddef1e2f9a5f22f077033d08c9c94dd62c4e482210105d38f639b45564b54b5919f52af3eecd6961af1fb2eb600fa5f  nvram.txt_36
-"
@@ -1,26 +0,0 @@
-# Maintainer: Danila Tikhonov <danila@jiaxyga.com>
-# Co-Maintainer: Jens Reidel <adrian@travitia.xyz>
-
-pkgname=alsa-ucm-conf-qcom-sm7150
-pkgver=1.2.11_git20240810
-pkgrel=0
-pkgdesc="ALSA UCM configuration for SM7150 devices"
-url="https://github.com/sm7150-mainline/alsa-ucm-conf"
-arch="aarch64"
-license="BSD-3-Clause"
-provides="alsa-ucm-conf"
-provider_priority=1
-_commit="dedbb209ed983a869b7aaceb883f8896c82d2296"
-source="$pkgname-$_commit.tar.gz::https://github.com/sm7150-mainline/alsa-ucm-conf/archive/$_commit.tar.gz"
-options="!check"
-builddir="$srcdir/alsa-ucm-conf-$_commit"
-
-package() {
-	# install audio config files
-	mkdir -p "$pkgdir"/usr/share/alsa
-	cp -r ucm2 "$pkgdir"/usr/share/alsa/
-}
-
-sha512sums="
-4c873c3e5b372f7075a38b8fd33723b47cf0ed2013b5ddccec64a4edc587d2f121eb80b930fa6d1ce98dd9ad55043eb1e3e152f1451f4491bc667353548acee7  alsa-ucm-conf-qcom-sm7150-dedbb209ed983a869b7aaceb883f8896c82d2296.tar.gz
-"