Migrate kconfig

.ci/autoupdate.sh

@@ -82,7 +82,7 @@ update_linux_next() {
 	pmbootstrap checksum linux-next
 
 	# Ensure it builds
-	pmbootstrap --details-to-stdout build linux-next
+	pmbootstrap build linux-next
 
 	# Commit
 	git add device/testing/linux-next/APKBUILD

.ci/kconfig.sh

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

.ci/lib/build_changed_aports.py

@@ -2,7 +2,6 @@
 # Copyright 2021 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later
 import sys
-import pathlib
 
 # Same dir
 import common
@@ -12,7 +11,6 @@ import add_pmbootstrap_to_import_path
 import pmb.parse
 import pmb.parse._apkbuild
 import pmb.helpers.pmaports
-from pmb.core.context import get_context
 
 
 def build_strict(packages, arch):
@@ -61,16 +59,15 @@ if __name__ == "__main__":
         verify_checksums(packages, arch)
         sys.exit(0)
 
-    # Load context
-    sys.argv = ["pmbootstrap.py", "chroot"]
+    # Prepare "args" to use pmbootstrap code
+    sys.argv = ["pmbootstrap", "chroot"]
     args = pmb.parse.arguments()
-    context = get_context()
 
     # 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():
-        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")

.ci/lib/check_changed_aports_versions.py

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

.ci/pytest.sh

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

.ci/testcases/conftest.py

@@ -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

.ci/testcases/test_device.py

@@ -11,8 +11,6 @@ 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 = {}
@@ -34,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"
@@ -56,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("!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 = []
@@ -87,29 +85,29 @@ 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)
 
 
-def codeowners_parse():
+def codeowners_parse(args):
     global codeowners_parsed
 
     pattern_prev = None
-    aports = pkgrepo_default_path()
 
-    with open(aports / "CODEOWNERS") as h:
+    with open(f"{args.aports}/CODEOWNERS") as h:
         for line in h:
             line = line.rstrip()
             if not line or line.startswith("#"):
@@ -133,13 +131,12 @@ def codeowners_parse():
             pattern_prev = pattern
 
 
-def require_enough_codeowners_entries(path, maintainers):
+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 = pkgrepo_relative_path(path)
+    path = os.path.relpath(path, args.aports)
 
     nicks = set()
     for pattern, pattern_nicks in codeowners_parsed.items():
@@ -161,38 +158,36 @@ def require_enough_codeowners_entries(path, maintainers):
         f"{path}: make sure that each maintainer is listed in CODEOWNERS!"
 
 
-# @pytest.mark.xfail # Not all aports have been updated yet
-def test_aports_maintained():
+def test_aports_maintained(args):
     """
     Ensure that aports in /device/{main,community} have "Maintainer:" and
     "Co-Maintainer:" (only required for main) listed in their APKBUILDs. Also
     check that at least as many are listed in CODEOWNERS.
     """
-    codeowners_parse()
+    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(path, maintainers)
+        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(path, maintainers)
+        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"

.ci/testcases/test_deviceinfo.py

@@ -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,13 +22,13 @@ 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.
     """
@@ -38,10 +37,10 @@ def test_deviceinfo():
     count = 0
     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()
 
@@ -67,12 +66,12 @@ def test_deviceinfo():
                                        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"

.ci/testcases/test_firmware.py

@@ -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.
     """
@@ -27,9 +26,9 @@ def test_aports_firmware():
         "firmware-xiaomi-willow",  # Doesn't build, source link is dead (pma#1212)
     ]
 
-    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"]:

.ci/testcases/test_framework_versions.py

@@ -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!")

.ci/testcases/test_kernel.py

@@ -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))
 
@@ -38,15 +37,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.")

.ci/testcases/test_provides.py

@@ -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():

.ci/testcases/test_source.py

@@ -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

.ci/testcases/test_ui.py

@@ -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}'")

.gitlab-ci.yml

@@ -125,6 +125,8 @@ mr-settings:
 # build changed aports
 .build:
   stage: build
+  tags:
+    - saas-linux-large-amd64
   rules:
     - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
   before_script:
@@ -150,6 +152,8 @@ build-x86:
 
 build-aarch64:
   extends: .build
+  tags:
+    - saas-linux-large-arm64
   script:
     - .ci/build-aarch64.sh
 

.gitlab/issue_templates/Change_Kernel_Config.md

@@ -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"

CODEOWNERS

@@ -31,7 +31,6 @@ device/*/*-pine64-pinephonepro/			@PsychoGame
 device/*/*-pine64-rockpro64/			@PureTryOut
 device/*/*-purism-librem5/			@craftyguy @alistair23 @Newbyte
 device/*/*-qcom-msm8916/			@Minecrell @TravMurav
-device/*/*-qcom-sdm670/				@flamingradian
 device/*/*-qcom-sdm845/				@sdm845-mainline
 device/*/*-qcom-sm6350/				@z3ntu
 device/*/*-samsung-a3/				@Mis012 @TravMurav @Minecrell
@@ -58,14 +57,12 @@ 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-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
@@ -81,7 +78,6 @@ device/*/device-qemu-aarch64/			@Minecrell @ollieparanoid
 device/*/device-qemu-amd64/			@Minecrell @ollieparanoid
 device/*/device-qemu-riscv64/			@Minecrell @z3ntu
 device/*/device-qualcomm-sdm845/		@calebccff
-device/*/device-raspberry-pi3/			@fossdd
 device/*/device-samsung-chagallwifi/		@Grimler
 device/*/device-samsung-coreprimevelte/		@legolivesmatter @balejk
 device/*/device-samsung-j5y17lte/	@andrisas
@@ -90,7 +86,6 @@ device/*/device-samsung-lt01/			@knuxify
 device/*/device-samsung-m0/			@Newbyte
 device/*/device-samsung-manta/			@jenneron @alexmrqt
 device/*/device-shift-axolotl/			@amartinz @calebccff @dylanvanassche
-device/*/firmware-google-sargo/			@flamingradian
 device/*/firmware-google-veyron-brcm/		@jenneron
 device/*/firmware-odroid-xu4/			@Grimler
 device/*/firmware-oneplus-sdm845/		@calebccff

cross/busybox-static-aarch64/APKBUILD

@@ -8,7 +8,7 @@ fi
 
 pkgname=busybox-static-aarch64
 pkgver=1.36.1
-pkgrel=32
+pkgrel=31
 
 _arch="aarch64"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }
 
 sha512sums="
-88f07677919711bb577f60e1861f4fa555168a8703a0a3b904550e24d4045135bb0296e00464899fc6231df07db09bb11f1bc81cdf593a71a8f74dfc3333c29e  busybox-static-1.36.1-r32-aarch64-edge.apk
+c34906bb0a5d7e268ab43ca1e3e2f9c75c06f3f5de8d41671396bcd7d585a79a66e25ad43e80a3e107a1de0ecaf83ac7198163d3e775edbd6d626ef014307ec5  busybox-static-1.36.1-r31-aarch64-edge.apk
 "

cross/busybox-static-armhf/APKBUILD

@@ -8,7 +8,7 @@ fi
 
 pkgname=busybox-static-armhf
 pkgver=1.36.1
-pkgrel=32
+pkgrel=31
 
 _arch="armhf"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }
 
 sha512sums="
-b0985e2f62df8f1d4e1b7a1206dc3e462df1e6b2a8aae662e57cc497ca3f474f37cc952de0d3bbaad6532d569bf540f17ad4eccc9cabfdc3c9f95f8feaf08049  busybox-static-1.36.1-r32-armhf-edge.apk
+7e6a961a0adcbc2912f5b261ce84a62b9189dce49c5dd3d2bcbdae407645dec72c27af8804c1d5446d50e78ea938a4d812c477db199ed83cac7c647c4b41f3fe  busybox-static-1.36.1-r31-armhf-edge.apk
 "

cross/busybox-static-armv7/APKBUILD

@@ -8,7 +8,7 @@ fi
 
 pkgname=busybox-static-armv7
 pkgver=1.36.1
-pkgrel=32
+pkgrel=31
 
 _arch="armv7"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }
 
 sha512sums="
-f383286e58183232b41a0d299528734cb29b11e51112eab1fe513322a269a2cdf90a1341d7e329ed7cd58e2d158e3a80bc3a5290ef93de2b28aaf7a25b78bfd7  busybox-static-1.36.1-r32-armv7-edge.apk
+b9736dc7df4230196bf05de3bd76b61fc689c56861bc7c5194cd310e23f513cec649c1b3e3f338266b8d58540468d97e8525948a3efc2d1af53e288cd525e836  busybox-static-1.36.1-r31-armv7-edge.apk
 "

cross/gcc-aarch64/0026-ada-musl-support-fixes.patch

@@ -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
+

cross/gcc-aarch64/0036-libphobos-add-riscv64-and-loongarch64-support.patch

@@ -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
-         {

cross/gcc-aarch64/APKBUILD

@@ -34,7 +34,7 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname=gcc-aarch64
-pkgrel=3
+pkgrel=1
 pkgdesc="Stage2 cross-compiler for aarch64"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -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
@@ -139,11 +140,11 @@ else
 	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
@@ -170,7 +171,7 @@ esac
 # currently on x86, x86_64 and ia64
 _libquadmath=$LANG_FORTRAN
 case "$CTARGET_ARCH" in
-x86 | x86_64 | ppc64le)	_libquadmath=$LANG_FORTRAN ;;
+x86 | x86_64)	_libquadmath=$LANG_FORTRAN ;;
 *)		_libquadmath=false ;;
 esac
 
@@ -183,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
 
@@ -193,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"
@@ -280,9 +278,7 @@ source="https://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$pkgver}/gcc-${_pkg
 	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
 	"
 
 # secfixes:
@@ -364,23 +360,20 @@ build() {
 
 	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 ""
@@ -434,10 +427,6 @@ build() {
 		--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
@@ -678,9 +667,9 @@ libgphobos() {
 
 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/ \
@@ -691,25 +680,13 @@ gdc() {
 	# without installing the compiler
 	mv "$pkgdir/$_gcclibexec/d21" "$subpkgdir/$_gcclibexec/"
 	mv "$pkgdir"/$_gcclibdir/include/d/* "$subpkgdir"/$_gcclibdir/include/d/
-	if [ "$CBUILD" = "$CTARGET" ]; then
-		mv "$pkgdir"/usr/lib/libgdruntime.so "$subpkgdir"/usr/lib/
-		mv "$pkgdir"/usr/lib/libgphobos.so "$subpkgdir"/usr/lib/
-	fi
-	if [ "$CHOST" = "$CTARGET" ]; then
-		mv "$pkgdir"/usr/lib/libgdruntime.a "$subpkgdir"/usr/lib/
-		mv "$pkgdir"/usr/lib/libgphobos.a "$subpkgdir"/usr/lib/
-		mv "$pkgdir"/usr/lib/libgphobos.spec "$subpkgdir"/usr/lib/
-		mv "$pkgdir"/usr/bin/gdc "$subpkgdir"/usr/bin/
-	else
-		mkdir -p "$subpkgdir"/usr/$CTARGET/lib/
-		mv "$pkgdir"/usr/$CTARGET/lib/libgdruntime.a \
-			"$subpkgdir"/usr/$CTARGET/lib/
-		mv "$pkgdir"/usr/$CTARGET/lib/libgphobos.a \
-			"$subpkgdir"/usr/$CTARGET/lib/
-		mv "$pkgdir"/usr/$CTARGET/lib/libgphobos.spec \
-			"$subpkgdir"/usr/$CTARGET/lib/
-	fi
+	mv "$pkgdir"/usr/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() {
@@ -851,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
@@ -861,7 +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
 "

cross/gcc-aarch64/ppc64le-quadmath.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
-

cross/gcc-armhf/0026-ada-musl-support-fixes.patch

@@ -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
+

cross/gcc-armhf/0036-libphobos-add-riscv64-and-loongarch64-support.patch

@@ -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
-         {

cross/gcc-armhf/APKBUILD

@@ -34,7 +34,7 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname=gcc-armhf
-pkgrel=3
+pkgrel=1
 pkgdesc="Stage2 cross-compiler for armhf"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -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
@@ -139,11 +140,11 @@ else
 	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
@@ -170,7 +171,7 @@ esac
 # currently on x86, x86_64 and ia64
 _libquadmath=$LANG_FORTRAN
 case "$CTARGET_ARCH" in
-x86 | x86_64 | ppc64le)	_libquadmath=$LANG_FORTRAN ;;
+x86 | x86_64)	_libquadmath=$LANG_FORTRAN ;;
 *)		_libquadmath=false ;;
 esac
 
@@ -183,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
 
@@ -193,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"
@@ -280,9 +278,7 @@ source="https://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$pkgver}/gcc-${_pkg
 	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
 	"
 
 # secfixes:
@@ -364,23 +360,20 @@ build() {
 
 	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 ""
@@ -434,10 +427,6 @@ build() {
 		--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
@@ -678,9 +667,9 @@ libgphobos() {
 
 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/ \
@@ -691,25 +680,13 @@ gdc() {
 	# without installing the compiler
 	mv "$pkgdir/$_gcclibexec/d21" "$subpkgdir/$_gcclibexec/"
 	mv "$pkgdir"/$_gcclibdir/include/d/* "$subpkgdir"/$_gcclibdir/include/d/
-	if [ "$CBUILD" = "$CTARGET" ]; then
-		mv "$pkgdir"/usr/lib/libgdruntime.so "$subpkgdir"/usr/lib/
-		mv "$pkgdir"/usr/lib/libgphobos.so "$subpkgdir"/usr/lib/
-	fi
-	if [ "$CHOST" = "$CTARGET" ]; then
-		mv "$pkgdir"/usr/lib/libgdruntime.a "$subpkgdir"/usr/lib/
-		mv "$pkgdir"/usr/lib/libgphobos.a "$subpkgdir"/usr/lib/
-		mv "$pkgdir"/usr/lib/libgphobos.spec "$subpkgdir"/usr/lib/
-		mv "$pkgdir"/usr/bin/gdc "$subpkgdir"/usr/bin/
-	else
-		mkdir -p "$subpkgdir"/usr/$CTARGET/lib/
-		mv "$pkgdir"/usr/$CTARGET/lib/libgdruntime.a \
-			"$subpkgdir"/usr/$CTARGET/lib/
-		mv "$pkgdir"/usr/$CTARGET/lib/libgphobos.a \
-			"$subpkgdir"/usr/$CTARGET/lib/
-		mv "$pkgdir"/usr/$CTARGET/lib/libgphobos.spec \
-			"$subpkgdir"/usr/$CTARGET/lib/
-	fi
+	mv "$pkgdir"/usr/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() {
@@ -851,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
@@ -861,7 +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
 "

cross/gcc-armhf/ppc64le-quadmath.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
-

cross/gcc-armv7/0026-ada-musl-support-fixes.patch

@@ -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
+

cross/gcc-armv7/0036-libphobos-add-riscv64-and-loongarch64-support.patch

@@ -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
-         {

cross/gcc-armv7/APKBUILD

@@ -34,7 +34,7 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname=gcc-armv7
-pkgrel=3
+pkgrel=1
 pkgdesc="Stage2 cross-compiler for armv7"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -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
@@ -139,11 +140,11 @@ else
 	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
@@ -170,7 +171,7 @@ esac
 # currently on x86, x86_64 and ia64
 _libquadmath=$LANG_FORTRAN
 case "$CTARGET_ARCH" in
-x86 | x86_64 | ppc64le)	_libquadmath=$LANG_FORTRAN ;;
+x86 | x86_64)	_libquadmath=$LANG_FORTRAN ;;
 *)		_libquadmath=false ;;
 esac
 
@@ -183,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
 
@@ -193,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"
@@ -280,9 +278,7 @@ source="https://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$pkgver}/gcc-${_pkg
 	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
 	"
 
 # secfixes:
@@ -364,23 +360,20 @@ build() {
 
 	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 ""
@@ -434,10 +427,6 @@ build() {
 		--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
@@ -678,9 +667,9 @@ libgphobos() {
 
 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/ \
@@ -691,25 +680,13 @@ gdc() {
 	# without installing the compiler
 	mv "$pkgdir/$_gcclibexec/d21" "$subpkgdir/$_gcclibexec/"
 	mv "$pkgdir"/$_gcclibdir/include/d/* "$subpkgdir"/$_gcclibdir/include/d/
-	if [ "$CBUILD" = "$CTARGET" ]; then
-		mv "$pkgdir"/usr/lib/libgdruntime.so "$subpkgdir"/usr/lib/
-		mv "$pkgdir"/usr/lib/libgphobos.so "$subpkgdir"/usr/lib/
-	fi
-	if [ "$CHOST" = "$CTARGET" ]; then
-		mv "$pkgdir"/usr/lib/libgdruntime.a "$subpkgdir"/usr/lib/
-		mv "$pkgdir"/usr/lib/libgphobos.a "$subpkgdir"/usr/lib/
-		mv "$pkgdir"/usr/lib/libgphobos.spec "$subpkgdir"/usr/lib/
-		mv "$pkgdir"/usr/bin/gdc "$subpkgdir"/usr/bin/
-	else
-		mkdir -p "$subpkgdir"/usr/$CTARGET/lib/
-		mv "$pkgdir"/usr/$CTARGET/lib/libgdruntime.a \
-			"$subpkgdir"/usr/$CTARGET/lib/
-		mv "$pkgdir"/usr/$CTARGET/lib/libgphobos.a \
-			"$subpkgdir"/usr/$CTARGET/lib/
-		mv "$pkgdir"/usr/$CTARGET/lib/libgphobos.spec \
-			"$subpkgdir"/usr/$CTARGET/lib/
-	fi
+	mv "$pkgdir"/usr/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() {
@@ -851,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
@@ -861,7 +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
 "

cross/gcc-armv7/ppc64le-quadmath.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
-

cross/gcc-riscv64/0026-ada-musl-support-fixes.patch

@@ -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
+

cross/gcc-riscv64/0036-libphobos-add-riscv64-and-loongarch64-support.patch

@@ -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
-         {

cross/gcc-riscv64/APKBUILD

@@ -34,7 +34,7 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname=gcc-riscv64
-pkgrel=3
+pkgrel=1
 pkgdesc="Stage2 cross-compiler for riscv64"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -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
@@ -139,11 +140,11 @@ else
 	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
@@ -170,7 +171,7 @@ esac
 # currently on x86, x86_64 and ia64
 _libquadmath=$LANG_FORTRAN
 case "$CTARGET_ARCH" in
-x86 | x86_64 | ppc64le)	_libquadmath=$LANG_FORTRAN ;;
+x86 | x86_64)	_libquadmath=$LANG_FORTRAN ;;
 *)		_libquadmath=false ;;
 esac
 
@@ -183,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
 
@@ -193,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"
@@ -280,9 +278,7 @@ source="https://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$pkgver}/gcc-${_pkg
 	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
 	"
 
 # secfixes:
@@ -364,23 +360,20 @@ build() {
 
 	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 ""
@@ -434,10 +427,6 @@ build() {
 		--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
@@ -678,9 +667,9 @@ libgphobos() {
 
 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/ \
@@ -691,25 +680,13 @@ gdc() {
 	# without installing the compiler
 	mv "$pkgdir/$_gcclibexec/d21" "$subpkgdir/$_gcclibexec/"
 	mv "$pkgdir"/$_gcclibdir/include/d/* "$subpkgdir"/$_gcclibdir/include/d/
-	if [ "$CBUILD" = "$CTARGET" ]; then
-		mv "$pkgdir"/usr/lib/libgdruntime.so "$subpkgdir"/usr/lib/
-		mv "$pkgdir"/usr/lib/libgphobos.so "$subpkgdir"/usr/lib/
-	fi
-	if [ "$CHOST" = "$CTARGET" ]; then
-		mv "$pkgdir"/usr/lib/libgdruntime.a "$subpkgdir"/usr/lib/
-		mv "$pkgdir"/usr/lib/libgphobos.a "$subpkgdir"/usr/lib/
-		mv "$pkgdir"/usr/lib/libgphobos.spec "$subpkgdir"/usr/lib/
-		mv "$pkgdir"/usr/bin/gdc "$subpkgdir"/usr/bin/
-	else
-		mkdir -p "$subpkgdir"/usr/$CTARGET/lib/
-		mv "$pkgdir"/usr/$CTARGET/lib/libgdruntime.a \
-			"$subpkgdir"/usr/$CTARGET/lib/
-		mv "$pkgdir"/usr/$CTARGET/lib/libgphobos.a \
-			"$subpkgdir"/usr/$CTARGET/lib/
-		mv "$pkgdir"/usr/$CTARGET/lib/libgphobos.spec \
-			"$subpkgdir"/usr/$CTARGET/lib/
-	fi
+	mv "$pkgdir"/usr/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() {
@@ -851,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
@@ -861,7 +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
 "

cross/gcc-riscv64/ppc64le-quadmath.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
-

cross/gcc-x86/0026-ada-musl-support-fixes.patch

@@ -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
+

cross/gcc-x86/0036-libphobos-add-riscv64-and-loongarch64-support.patch

@@ -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
-         {

cross/gcc-x86/APKBUILD

@@ -34,7 +34,7 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname=gcc-x86
-pkgrel=3
+pkgrel=1
 pkgdesc="Stage2 cross-compiler for x86"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -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
@@ -139,11 +140,11 @@ else
 	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
@@ -170,7 +171,7 @@ esac
 # currently on x86, x86_64 and ia64
 _libquadmath=$LANG_FORTRAN
 case "$CTARGET_ARCH" in
-x86 | x86_64 | ppc64le)	_libquadmath=$LANG_FORTRAN ;;
+x86 | x86_64)	_libquadmath=$LANG_FORTRAN ;;
 *)		_libquadmath=false ;;
 esac
 
@@ -183,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
 
@@ -193,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"
@@ -280,9 +278,7 @@ source="https://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$pkgver}/gcc-${_pkg
 	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
 	"
 
 # secfixes:
@@ -364,23 +360,20 @@ build() {
 
 	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 ""
@@ -434,10 +427,6 @@ build() {
 		--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
@@ -678,9 +667,9 @@ libgphobos() {
 
 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/ \
@@ -691,25 +680,13 @@ gdc() {
 	# without installing the compiler
 	mv "$pkgdir/$_gcclibexec/d21" "$subpkgdir/$_gcclibexec/"
 	mv "$pkgdir"/$_gcclibdir/include/d/* "$subpkgdir"/$_gcclibdir/include/d/
-	if [ "$CBUILD" = "$CTARGET" ]; then
-		mv "$pkgdir"/usr/lib/libgdruntime.so "$subpkgdir"/usr/lib/
-		mv "$pkgdir"/usr/lib/libgphobos.so "$subpkgdir"/usr/lib/
-	fi
-	if [ "$CHOST" = "$CTARGET" ]; then
-		mv "$pkgdir"/usr/lib/libgdruntime.a "$subpkgdir"/usr/lib/
-		mv "$pkgdir"/usr/lib/libgphobos.a "$subpkgdir"/usr/lib/
-		mv "$pkgdir"/usr/lib/libgphobos.spec "$subpkgdir"/usr/lib/
-		mv "$pkgdir"/usr/bin/gdc "$subpkgdir"/usr/bin/
-	else
-		mkdir -p "$subpkgdir"/usr/$CTARGET/lib/
-		mv "$pkgdir"/usr/$CTARGET/lib/libgdruntime.a \
-			"$subpkgdir"/usr/$CTARGET/lib/
-		mv "$pkgdir"/usr/$CTARGET/lib/libgphobos.a \
-			"$subpkgdir"/usr/$CTARGET/lib/
-		mv "$pkgdir"/usr/$CTARGET/lib/libgphobos.spec \
-			"$subpkgdir"/usr/$CTARGET/lib/
-	fi
+	mv "$pkgdir"/usr/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() {
@@ -851,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
@@ -861,7 +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
 "

cross/gcc-x86/ppc64le-quadmath.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
-

cross/gcc-x86_64/0026-ada-musl-support-fixes.patch

@@ -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
+

cross/gcc-x86_64/0036-libphobos-add-riscv64-and-loongarch64-support.patch

@@ -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
-         {

cross/gcc-x86_64/APKBUILD

@@ -34,7 +34,7 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname=gcc-x86_64
-pkgrel=3
+pkgrel=1
 pkgdesc="Stage2 cross-compiler for x86_64"
 url="https://gcc.gnu.org"
 arch="aarch64"
@@ -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
@@ -139,11 +140,11 @@ else
 	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
@@ -170,7 +171,7 @@ esac
 # currently on x86, x86_64 and ia64
 _libquadmath=$LANG_FORTRAN
 case "$CTARGET_ARCH" in
-x86 | x86_64 | ppc64le)	_libquadmath=$LANG_FORTRAN ;;
+x86 | x86_64)	_libquadmath=$LANG_FORTRAN ;;
 *)		_libquadmath=false ;;
 esac
 
@@ -183,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
 
@@ -193,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"
@@ -280,9 +278,7 @@ source="https://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$pkgver}/gcc-${_pkg
 	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
 	"
 
 # secfixes:
@@ -364,23 +360,20 @@ build() {
 
 	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 ""
@@ -434,10 +427,6 @@ build() {
 		--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
@@ -678,9 +667,9 @@ libgphobos() {
 
 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/ \
@@ -691,25 +680,13 @@ gdc() {
 	# without installing the compiler
 	mv "$pkgdir/$_gcclibexec/d21" "$subpkgdir/$_gcclibexec/"
 	mv "$pkgdir"/$_gcclibdir/include/d/* "$subpkgdir"/$_gcclibdir/include/d/
-	if [ "$CBUILD" = "$CTARGET" ]; then
-		mv "$pkgdir"/usr/lib/libgdruntime.so "$subpkgdir"/usr/lib/
-		mv "$pkgdir"/usr/lib/libgphobos.so "$subpkgdir"/usr/lib/
-	fi
-	if [ "$CHOST" = "$CTARGET" ]; then
-		mv "$pkgdir"/usr/lib/libgdruntime.a "$subpkgdir"/usr/lib/
-		mv "$pkgdir"/usr/lib/libgphobos.a "$subpkgdir"/usr/lib/
-		mv "$pkgdir"/usr/lib/libgphobos.spec "$subpkgdir"/usr/lib/
-		mv "$pkgdir"/usr/bin/gdc "$subpkgdir"/usr/bin/
-	else
-		mkdir -p "$subpkgdir"/usr/$CTARGET/lib/
-		mv "$pkgdir"/usr/$CTARGET/lib/libgdruntime.a \
-			"$subpkgdir"/usr/$CTARGET/lib/
-		mv "$pkgdir"/usr/$CTARGET/lib/libgphobos.a \
-			"$subpkgdir"/usr/$CTARGET/lib/
-		mv "$pkgdir"/usr/$CTARGET/lib/libgphobos.spec \
-			"$subpkgdir"/usr/$CTARGET/lib/
-	fi
+	mv "$pkgdir"/usr/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() {
@@ -851,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
@@ -861,7 +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
 "

cross/gcc-x86_64/ppc64le-quadmath.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
-

cross/musl-aarch64/APKBUILD

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

cross/musl-armhf/APKBUILD

@@ -8,7 +8,7 @@ fi
 
 pkgname=musl-armhf
 pkgver=1.2.5
-pkgrel=3
+pkgrel=1
 arch="x86_64"
 subpackages="musl-dev-armhf:package_dev"
 
@@ -57,6 +57,6 @@ package_dev() {
 }
 
 sha512sums="
-b98e17b30e5968ca8f6c963e8752544112337b641186c269dbc4dd4b0a9496de9f4a549deb1bbf03e419b145b86b0c48fd22db1b8dff188bd3b451632b8c2b3f  musl-1.2.5-r3-armhf-edge.apk
-0e9fa461b75f3a9832e26f8086c9397b9d5dbea9c5821cf7898c0ccf64281f603137265606ee97810cba988fdff967ea7ec240e4e59c1d87da7e001cd4bf719a  musl-dev-1.2.5-r3-armhf-edge.apk
+148883dfd80bb670df4c6a919aaf3334d203a87fac98df8046a920a2e4c1c3439347f5653abc2994e9a9fe2946764395cd83e2f2437ab903e37f8ad3fcc6637a  musl-1.2.5-r1-armhf-edge.apk
+052f4f3ff6974aadbe90c1a69c4b29a1fefc25d2f2f794b3d55ed49b79a94dab900592a65b3c80ae9824580eab4fb99cb2cfdf9399354e74a1804871d97774a0  musl-dev-1.2.5-r1-armhf-edge.apk
 "

cross/musl-armv7/APKBUILD

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

cross/musl-riscv64/APKBUILD

@@ -8,7 +8,7 @@ fi
 
 pkgname=musl-riscv64
 pkgver=1.2.5
-pkgrel=3
+pkgrel=1
 arch="x86_64"
 subpackages="musl-dev-riscv64:package_dev"
 
@@ -57,6 +57,6 @@ package_dev() {
 }
 
 sha512sums="
-d9adef7c000203504c357db8b84008f95f97fa68e3944103c345e0bc511f84bff7175ea1afd029de81dd2acce64795c55f100b7abfed3a5bad464c654e620ac3  musl-1.2.5-r3-riscv64-edge.apk
-51a20229c477c691429d2fb800ff441f0181e98879996c0fede94a39e37d66fd2bddd50f663c85090837b8cfaf41ed65c2d2142eaa0ce503b2c5bf6fd2d0194e  musl-dev-1.2.5-r3-riscv64-edge.apk
+822f24faaf2285174742788da0dceef3bada4dbd0db9f67362876b3c0ab6bc647a0f2f0cc70e2e28dbb90121f08b65640a344e7cae8416a84bfb389db32e7d9c  musl-1.2.5-r1-riscv64-edge.apk
+04ac4a81d713f71b68082767ce2afab3ce458730664c140f49a0b33f257666a6b4289c5b53935fe16345f8445a458e5307511773651c4574526cfaaf232c239a  musl-dev-1.2.5-r1-riscv64-edge.apk
 "

cross/musl-x86/APKBUILD

@@ -8,7 +8,7 @@ fi
 
 pkgname=musl-x86
 pkgver=1.2.5
-pkgrel=3
+pkgrel=1
 arch="x86_64"
 subpackages="musl-dev-x86:package_dev"
 
@@ -57,6 +57,6 @@ package_dev() {
 }
 
 sha512sums="
-68f290b5c1a8e8c1b5b70e34c4be391fa49fc8f91902a6dd432a3c34317788c69d5a31f9fedeec51a4d12509aee735d8875f0c4349d3d9cab1d9789a50a78bf8  musl-1.2.5-r3-x86-edge.apk
-2115a6da3ac624872a8e4d764aed69c0e729853d3b74643da83bef1083d20147de2f2f181df82d0bb273fad0597d37b719048bd66e23ed072982018ecf07b8fc  musl-dev-1.2.5-r3-x86-edge.apk
+53a30a57f0db29e8d73d7190590fce18a19bcd358f9b0f3d4fa0b8821dad4ed5f1065c3c07dbc373a23cbd98c9a9dc1c2c2d864ac88eefd53dc5f89d8e57ed67  musl-1.2.5-r1-x86-edge.apk
+e9178fcfe27bdc7568c35889cff8cf20829f67460fd6dc22a6ca0465063a809081ee1267b4275432d23d1e7d457a4b207a0ff11c678233c4e430a1173d4ccea8  musl-dev-1.2.5-r1-x86-edge.apk
 "

cross/musl-x86_64/APKBUILD

@@ -8,7 +8,7 @@ fi
 
 pkgname=musl-x86_64
 pkgver=1.2.5
-pkgrel=3
+pkgrel=1
 arch="aarch64"
 subpackages="musl-dev-x86_64:package_dev"
 
@@ -57,6 +57,6 @@ package_dev() {
 }
 
 sha512sums="
-c4667bf824340766c2b6c41e88e4dc76a7e51b7247ece8f85e8e9347769fce6bd4459d94fcdc82ea12e0a67f7160d68cf2a1ed322eee7d6ca9d075036c17e193  musl-1.2.5-r3-x86_64-edge.apk
-a64220117e1614e585be89fcb00e387b4ea2f4251ce2b6af38c576787093b4ce6a0bed3e4d7bc86517369ee5c4f11db63c6f572e16f336a1178fa99dfa394aff  musl-dev-1.2.5-r3-x86_64-edge.apk
+5506970c66b6da294d32961e94cadc6926a7405915a3d4dd519ed8c2aae829f2fbfaab2ccc8d0794f4aa102aa3e8cbd62099aa54668a11ac0c5072f59befece6  musl-1.2.5-r1-x86_64-edge.apk
+bd2602e59831ba860a548c8281bb62be3382b4035f18c9e36350be644db61a762a413e1d696697d402a57d4bc565faf86c2a212e27c9b9a890d765f794bbe829  musl-dev-1.2.5-r1-x86_64-edge.apk
 "

device/.shared-patches/linux/fix-check-lxdialog-makefile.patch

@@ -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"  )

device/.shared-patches/linux/fix-check-lxdialog.patch

@@ -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

device/community/device-generic-x86_64/30-gpu-i915-firmware.files

@@ -1,4 +0,0 @@
-# Newer integrated and discrete Intel GPUs won't work without GUC fw,
-# and older GPUs need DMC firmware for lower power states, so let's
-# include everything:
-/lib/firmware/i915

device/community/device-generic-x86_64/APKBUILD

@@ -2,7 +2,7 @@
 # Co-Maintainer: Oliver Smith <ollieparanoid@postmarketos.org>
 pkgname=device-generic-x86_64
 pkgdesc="Generic x86_64 system, with EFI"
-pkgver=16
+pkgver=14
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -17,11 +17,9 @@ makedepends="devicepkg-dev"
 source="
 	deviceinfo
 	modules-initfs
-	30-gpu-i915-firmware.files
 "
 install="$pkgname.post-install $pkgname.post-upgrade"
 subpackages="
-	$pkgname-intel
 	$pkgname-kernel-edge:kernel_edge
 	$pkgname-kernel-lts:kernel_lts
 "
@@ -44,14 +42,6 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
-intel() {
-	pkgdesc="Intel-specific configuration"
-	install_if="$pkgname=$pkgver-r$pkgrel oem-intel"
-
-	install -Dm644 "$srcdir"/30-gpu-i915-firmware.files \
-		-t "$subpkgdir"/usr/share/mkinitfs/files/
-}
-
 kernel_edge() {
 	pkgdesc="Alpine Edge kernel"
 	provides="device-tablet-x64uefi-kernel-edge=$pkgver-r$pkgrel device-tablet-x86uefi-kernel-edge=$pkgver-r$pkgrel"
@@ -71,5 +61,4 @@ kernel_lts() {
 sha512sums="
 e9dfcd70ccfb9a0fdaa0cdc52faf3be96d6de8af8c60a758bb703c515b0648cec4552e0eaf56e5168b0004cd3fc4b28118abb05dad2c581d3579a2e9134862cb  deviceinfo
 e464ef0ad4a4c34d2d53f69c4612b612ea878a77c9efdef69b0f842edf701036c8218809fd63aac286d6a08ae07f39e568199fc3e38d145e716c1723e7215019  modules-initfs
-9599a10679a43929e4ed2ea22269a0716219163817574d48db4dc1cb21a0fcf17ea54d77d5fd8efd034905c421ecb3eaa600a72927d683983ce48d1159329881  30-gpu-i915-firmware.files
 "

device/community/device-google-gru/APKBUILD

@@ -2,7 +2,7 @@
 # Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=device-google-gru
 pkgdesc="Google Gru Chromebooks"
-pkgver=7
+pkgver=6
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -53,6 +53,6 @@ nonfree_firmware() {
 
 
 sha512sums="
-7815e3a164720b5ad0df7ce8d12b12fe85cc4bb7bf4a09ccc0eb831a58a920026fd92d545f4d6fb459a688e15b9d542e360fd597cd5d3b01a3ea338c3928d2a3  deviceinfo
+6a8aba7e13f864a223a658f724ad8ff6c04ed986a747439cf88a6365c5fa037da9fb4950fa94794eff64937979f988015af9d0a6359deb041d1a2b128baac75e  deviceinfo
 a750a0c41068082e0b82351d5aec91715e1a5215b09b26fec644dfe259cea2d662e878433a732a8c06dab2a9b420baec2bcc6161d8357cf3ed770239c5165090  modules-initfs
 "

device/community/device-google-gru/deviceinfo

@@ -25,6 +25,5 @@ deviceinfo_cgpt_kpart="/boot/vmlinuz.kpart"
 deviceinfo_cgpt_kpart_start="8192"
 deviceinfo_cgpt_kpart_size="65536"
 deviceinfo_depthcharge_board="gru"
-deviceinfo_depthcharge_compression="lzma"
 deviceinfo_generate_depthcharge_image="true"
 deviceinfo_generate_extlinux_config="true"

device/community/device-google-kukui/APKBUILD

@@ -2,7 +2,7 @@
 # Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=device-google-kukui
 pkgdesc="Google Kukui Chromebooks"
-pkgver=8
+pkgver=7
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -14,6 +14,7 @@ depends="
 	linux-postmarketos-mediatek-mt8183>=6.1.28-r0
 	postmarketos-base
 	postmarketos-cros-common
+	postmarketos-initramfs-minimal
 	soc-mediatek-mt8183
 "
 makedepends="devicepkg-dev"
@@ -73,6 +74,6 @@ nonfree_firmware() {
 }
 
 sha512sums="
-ecd503069ecf272ddc238bd49dc257a1f3e0f4c20b322238e2da83104b94b331c22886d1591b6fe0b78c986e15ac6251e364ec1b750f9125ea722a6b1a79e2b8  deviceinfo
+e1c88545563aa40b69f79ed1d86b4da0d7ad65dfff07dce05f56d51b442ad9bae27ae2d27afa2f5131309072a9ea4f3b026d498ab067b315ed0719a3dded4b2c  deviceinfo
 8e95624610dae7d18684056396c9e82635ddce7303d6770e965f9372ffa101fdfd5f8337bc7368004890e9836798663a98c142c52ed63795877ea37ac8da56af  modules-initfs
 "

device/community/device-google-kukui/deviceinfo

@@ -32,5 +32,4 @@ deviceinfo_cgpt_kpart_size="65536"
 # dtbs from deviceinfo_dtb variable and nothing more, so use "mt8183"
 # board here.
 deviceinfo_depthcharge_board="mt8183"
-deviceinfo_depthcharge_compression="lzma"
 deviceinfo_generate_depthcharge_image="true"

device/community/device-google-oak/APKBUILD

@@ -3,7 +3,7 @@
 # Co-Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=device-google-oak
 pkgdesc="Google Oak Chromebooks"
-pkgver=6
+pkgver=5
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -40,6 +40,6 @@ nonfree_firmware() {
 }
 
 sha512sums="
-d082e6c155347f662403f611f44c3eddb2a0548397bec4f29b882f371a18efa9c2628a88599b19c0c58c1886d0c25035367f02651a60fb6c3293faa1449b83d5  deviceinfo
+ebf7ed07ffcfe30c01c717db00c255e2c650339bace70afffcac4566267da8b6d3e22f819601be2ee355d2c1f56b01e37fca5566a2517fc1ffb642e530b674fb  deviceinfo
 4b0197eacfeeb4b13f5abc26950f570ee762742547674ce10110ccea63eb46630a2e3b5f87e9c9a1f9deda21baf05bec248ab7a65656687ec94d296b5657dafa  modules-initfs
 "

device/community/device-google-oak/deviceinfo

@@ -33,5 +33,4 @@ deviceinfo_cgpt_kpart_size="65536"
 # dtbs from deviceinfo_dtb variable and nothing more, so use "mt8173"
 # board here.
 deviceinfo_depthcharge_board="mt8173"
-deviceinfo_depthcharge_compression="lzma"
 deviceinfo_generate_depthcharge_image="true"

device/community/device-google-trogdor/APKBUILD

@@ -2,7 +2,7 @@
 # Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=device-google-trogdor
 pkgdesc="Google Trogdor Chromebooks"
-pkgver=3
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -44,6 +44,6 @@ nonfree_firmware() {
 
 
 sha512sums="
-0a40c43eda1dbb159da59c00b3a1e51fff299a29add210de4d9a16c060da523c358b6d821aa1dd16523bb912d00e1a1837193cce52415f329ac2e171d220f6d3  deviceinfo
+e2eee558c89272358b4531ef9d7b7cefc937702c17985c3067181029a7f2c8545f68c3634d515fee6d12229d09f52b6f2b4ae804449f37c11b3aa9e5bcfaaced  deviceinfo
 ef0257928f28aff25e6c625fabfd0942b01d4d86f1b523212ca825cf80f8b7a6c20ff17bfb02cb19f2a5d8787326ba22ad560a957c8d3c38b9ec70f1e16f9117  modules-initfs
 "

device/community/device-google-trogdor/deviceinfo

@@ -33,5 +33,4 @@ deviceinfo_cgpt_kpart_size="262144"
 # dtbs from deviceinfo_dtb variable and nothing more, so use "qc7180"
 # board here.
 deviceinfo_depthcharge_board="qc7180"
-deviceinfo_depthcharge_compression="lzma"
 deviceinfo_generate_depthcharge_image="true"

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

@@ -5,7 +5,7 @@
 pkgname=device-lenovo-21bx
 pkgdesc="Lenovo ThinkPad X13s"
 pkgver=10
-pkgrel=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -18,6 +18,8 @@ depends="
 	linux-firmware-qca
 	linux-firmware-qcom
 	linux-lenovo-21bx
+	pd-mapper
+	pd-mapper-openrc
 	postmarketos-base
 	qmi-utils
 	systemd-boot
@@ -34,6 +36,7 @@ subpackages="
 	$pkgname-usbguard
 	$pkgname-vulkan
 "
+install="$pkgname.post-install"
 
 build() {
 	devicepkg_build $startdir $pkgname

device/community/device-lenovo-21bx/device-lenovo-21bx.post-install

@@ -0,0 +1,3 @@
+#!/bin/sh -e
+
+rc-update add -q pd-mapper boot

device/community/device-nokia-n900/APKBUILD

@@ -2,7 +2,7 @@
 # Maintainer: Sicelo <absicsz@gmail.com>
 # Co-Maintainer: Danct12 <danct12@disroot.org>
 pkgname=device-nokia-n900
-pkgver=29
+pkgver=28
 pkgrel=0
 pkgdesc="Nokia N900"
 url="https://postmarketos.org"
@@ -238,7 +238,7 @@ e440ed7a3070c17e003b86b72dbe6d8194d01b577ca8dd56dd066f216b6dda32bb965c780950f178
 134f51d20decc0c63ab08010931a0b410b70d2f85bf6899f2ff137b1680f59f706a6287d01f5fbb41fa5309125df75a430d0783149bd1a6a1bca07d22f4f6a21  proxishot.sh
 fc21e3b7e045055c080a7f7ffb0cd4140b63a02690e92c8370dbccbef506fe271ee9584ac9f14725b8bc9fd6e74e7fafde589d2360f44491c614837472d8ad53  deviceprofile.sh
 5dab895c34599bf233635463271ea8308d434c97789efe931eec24870c3b4688fe48ca3b7cdc66e5c1a705940d042b9f18f26420b60f22e1cfad1854e97f8687  start_hook.sh
-42f916d87dd305111028992a1107bf6fe108bebbd782ae8edd065e76505db2b3a75e57515970c3e40cb0d1b7e83097a1bba92785be13df7c3fd80959a8d9c5c1  uboot-script.cmd
+7bd9dd2468ba6a0fc8e5e7118ecfc4b4ca2f0691190473e12770a857e4082ab2958d0a3a8ee2f0276ed83776aff3b5fff0099980c265d674b90d2ff3108f660d  uboot-script.cmd
 9e72035c88632d12895534e5aa5746f2c130c7dcdafa8702748d62b71ed0e1b5911b6e1f07f9b9e39b6072bbb662f66aead585baa1dcacb7d8c8953ca89b6762  10-nokia-modem.rules
 03079030237440080e833dbfeff80327c1ad6a8129c6c730b401a3052cd00a986783ec3473a526b14ae73ba1f20653b4c7b2a6590839bfe6cc156bbbc3b7bb74  80-feedbackd-twl4030.rules
 c6012aef28b096141b924fced226ec99fb93eb53b69c064a8887d8fecdf8dc08a3ba3db399e18d88374c6ef4c59013a30699c7e4d76e5cb771040582573a0527  90-touchscreen-dev.rules

device/community/device-nokia-n900/uboot-script.cmd

@@ -2,7 +2,7 @@ setenv mmcnum 0
 setenv mmcpart 1
 setenv mmctype ext2
 setenv setup_omap_atag 1
-setenv bootargs init=/init.sh rw console=tty0 PMOS_FORCE_PARTITION_RESIZE
+setenv bootargs init=/init.sh rw console=tty0 console=ttyS2 PMOS_FORCE_PARTITION_RESIZE
 setenv mmckernfile /uImage
 setenv mmcinitrdfile /uInitrd
 setenv mmcscriptfile

device/community/device-oneplus-enchilada/APKBUILD

@@ -4,7 +4,7 @@
 pkgname=device-oneplus-enchilada
 pkgdesc="OnePlus 6"
 pkgver=14
-pkgrel=2
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -26,11 +26,7 @@ source="
 	q6voiced.conf
 	81-libssc-oneplus-enchilada.rules
 "
-subpackages="
-	$pkgname-nonfree-firmware-openrc:nonfree_firmware_openrc
-	$pkgname-nonfree-firmware:nonfree_firmware
-	$pkgname-pmtest
-"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware $pkgname-pmtest"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -51,16 +47,12 @@ nonfree_firmware() {
 		soc-qcom-sdm845-nonfree-firmware
 		soc-qcom-sdm845-modem
 	"
-
-	install -Dm644 "$srcdir"/81-libssc-oneplus-enchilada.rules -t "$subpkgdir"/usr/lib/udev/rules.d/
-}
-
-nonfree_firmware_openrc() {
-	install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel openrc"
 	replaces="hexagonrpcd-openrc"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
+	mkdir "$subpkgdir"
 
 	install -Dm644 q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced
+	install -Dm644 "$srcdir"/81-libssc-oneplus-enchilada.rules -t "$subpkgdir"/usr/lib/udev/rules.d/
 	install -Dm644 "$srcdir"/hexagonrpcd.confd "$subpkgdir"/etc/conf.d/hexagonrpcd-sdsp
 }
 

device/community/device-oneplus-enchilada/device-oneplus-enchilada-nonfree-firmware-openrc.post-upgrade

@@ -1 +0,0 @@
-device-oneplus-enchilada-nonfree-firmware-openrc.post-install

device/community/device-oneplus-enchilada/device-oneplus-enchilada-nonfree-firmware.post-upgrade

@@ -0,0 +1 @@
+device-oneplus-enchilada-nonfree-firmware.post-install

device/community/device-shift-axolotl/APKBUILD

@@ -5,7 +5,7 @@
 pkgname=device-shift-axolotl
 pkgdesc="SHIFT6mq"
 pkgver=15
-pkgrel=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -30,7 +30,6 @@ source="
 "
 subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
-	$pkgname-nonfree-firmware-openrc:nonfree_firmware_openrc
 	$pkgname-pmtest
 "
 
@@ -50,16 +49,12 @@ nonfree_firmware() {
 		soc-qcom-sdm845-nonfree-firmware
 		soc-qcom-sdm845-modem
 	"
-
-	install -Dm644 "$srcdir"/81-libssc-shift-axolotl.rules -t "$subpkgdir"/usr/lib/udev/rules.d/
-}
-
-nonfree_firmware_openrc() {
-	install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel openrc"
 	replaces="hexagonrpcd-openrc"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
+	mkdir "$subpkgdir"
 
 	install -Dm644 q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced
+	install -Dm644 "$srcdir"/81-libssc-shift-axolotl.rules -t "$subpkgdir"/usr/lib/udev/rules.d/
 	install -Dm644 "$srcdir"/hexagonrpcd.confd "$subpkgdir"/etc/conf.d/hexagonrpcd-sdsp
 }
 

device/community/device-shift-axolotl/device-shift-axolotl-nonfree-firmware-openrc.post-upgrade

@@ -1 +0,0 @@
-device-shift-axolotl-nonfree-firmware-openrc.post-install

device/community/device-shift-axolotl/device-shift-axolotl-nonfree-firmware.post-upgrade

@@ -0,0 +1 @@
+device-shift-axolotl-nonfree-firmware.post-install

device/community/device-xiaomi-daisy/APKBUILD

@@ -2,8 +2,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-xiaomi-daisy
 pkgdesc="Xiaomi Mi A2 Lite"
-pkgver=12
-pkgrel=0
+pkgver=11
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -43,7 +43,7 @@ fake_goodix() {
 }
 
 sha512sums="
-a958e29c8ba4c079ee64a9882fe14ad03e7751ba4c2416a4bda07b0ee4e0342d5d6e3d43c95b05f47dabe06ff5be759401287da3c58ef0ecb31c8cba515cd560  deviceinfo
+327d6b49c6bc26725ed566ee968220cd7bbd5c8fd31b91705b6a02635daf5ce02567ba493a5bd431e0438339e004d42c7f4a57d4ed683274b94dc78668771d8d  deviceinfo
 7202f0a55dfe43348940412fc38e59c855594b070db8742419feadb2299086d5810107201a228b7137b7cc7a97c94afac95d81c0cd65c52f31dbcb619b0a4279  modules-initfs
 a2608b01b7b6e2dade694af355ff4f0f26cad49cf54bc332c77eb75d19fdc985f7f996fedb72753de447be0391deabf5fcea52406791d1e6e0d165703b63f145  90-device-xiaomi-daisy.rules
 "

device/community/device-xiaomi-daisy/deviceinfo

@@ -25,6 +25,7 @@ deviceinfo_swap_size_recommended="1024"
 deviceinfo_flash_method="fastboot"
 deviceinfo_generate_bootimg="true"
 deviceinfo_generate_extlinux_config="true"
+deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200"
 deviceinfo_bootimg_qcdt="false"
 deviceinfo_bootimg_dtb_second="false"
 deviceinfo_flash_offset_base="0x80000000"

device/community/device-xiaomi-markw/APKBUILD

@@ -2,8 +2,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-xiaomi-markw
 pkgdesc="Xiaomi Redmi 4 Prime"
-pkgver=7
-pkgrel=0
+pkgver=6
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -31,6 +31,6 @@ package() {
 }
 
 sha512sums="
-d5ecef8983110624e0cd69feed5f105204f8323e718435b19ffafa37cbe73d1c37a4d1d1cfb53d338dfeffa91ade137b3cf7c7b9f48408002c04260bbd3b5e65  deviceinfo
+dd33fe1f043da42f935a66b2d7bcf909bb65b737289574018917f3a5bb385f826c5ff441a808e442957ff9d3fdd1391e7f6381720c55062adcdc404d40754c1c  deviceinfo
 0cba88d7ede62dc7c47feefb27d10e58e4c93498bec97cd274a1d10c4f16dff06c5472ed555170e0392a57c9269cc50bf550523f41bf1ba6c600af533302574b  modules-initfs
 "

device/community/device-xiaomi-markw/deviceinfo

@@ -17,9 +17,11 @@ deviceinfo_keyboard="false"
 deviceinfo_external_storage="true"
 deviceinfo_screen_width="1080"
 deviceinfo_screen_height="1920"
+deviceinfo_getty="ttyMSM0;115200"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
+deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200"
 deviceinfo_generate_bootimg="true"
 deviceinfo_generate_extlinux_config="true"
 deviceinfo_flash_offset_base="0x80000000"

device/community/device-xiaomi-mido/APKBUILD

@@ -1,8 +1,8 @@
 # Maintainer: Barnabas Czeman <trabarni@gmail.com>
 pkgname=device-xiaomi-mido
 pkgdesc="Xiaomi Redmi Note 4X"
-pkgver=8
-pkgrel=0
+pkgver=7
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -30,6 +30,6 @@ package() {
 }
 
 sha512sums="
-3424c103cc2878480527f57d75e122cfc5c95ffa66bf7133067dd691e664fee14ba43a626f70c5b2ffb70cd24a08b026e0571e99e390c0a485a3491e28883cda  deviceinfo
+22dd70e5730b46bfdb257eb5e577da2d91d72d0335e2f591af66dfb318169ccdf813d800c2c7adb12cbf8063fc35bb33519577cc33b6322104cd52f75e035e99  deviceinfo
 9f534c76689728c3fa699ac8c854ca82815d5158a3675a70ef879ddbf140460977187dc3c1a799dadd0ab53d5a08b6275a1594a7b976eda983f3e78b2738a8be  modules-initfs
 "

device/community/device-xiaomi-mido/deviceinfo

@@ -17,9 +17,11 @@ deviceinfo_keyboard="false"
 deviceinfo_external_storage="true"
 deviceinfo_screen_width="1080"
 deviceinfo_screen_height="1920"
+deviceinfo_getty="ttyMSM0;115200"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
+deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200"
 deviceinfo_generate_bootimg="true"
 deviceinfo_generate_extlinux_config="true"
 deviceinfo_bootimg_qcdt="false"

device/community/device-xiaomi-scorpio/APKBUILD

@@ -4,7 +4,7 @@
 pkgname=device-xiaomi-scorpio
 pkgdesc="Xiaomi Mi Note 2"
 pkgver=3
-pkgrel=13
+pkgrel=12
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -12,7 +12,6 @@ options="!check !archcheck"
 depends="
 	linux-postmarketos-qcom-msm8996
 	mesa-egl
-	megapixels
 	mkbootimg
 	postmarketos-base
 	soc-qcom-msm8996
@@ -20,6 +19,7 @@ depends="
 	"
 makedepends="devicepkg-dev"
 subpackages="
+	$pkgname-camera
 	$pkgname-phosh
 	$pkgname-nonfree-firmware:nonfree_firmware
 	"
@@ -68,6 +68,11 @@ phosh() {
 		"$subpkgdir"/etc/phosh/phoc.ini
 }
 
+camera() {
+	install_if="$pkgname=$pkgver-r$pkgrel postmarketos-default-camera"
+	depends="megapixels"
+	mkdir -p "$subpkgdir"
+}
 
 sha512sums="
 b033e7357c4ef91ba84f6f715e96e67637c2631d4746402f8a92333ba8974bbee7736a7bc081b0f84a84dc5b555a7db4dbb4f14f628bbfc42cbfa501c4f0ed36  30-gpu-firmware.files

device/community/device-xiaomi-vince/APKBUILD

@@ -2,8 +2,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-xiaomi-vince
 pkgdesc="Xiaomi Redmi 5 Plus"
-pkgver=14
-pkgrel=0
+pkgver=13
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -34,6 +34,6 @@ package() {
 }
 
 sha512sums="
-902eea9986467553e129c11a387919f21aed496d09475e6fd3b8fa44b036c79f2705b9ccda9caa0e2954b62cc5bafe761bdf734de871463020926c7263032e44  deviceinfo
+e8cc57aa54f3564baf44e2d813a3573d999354ec81732de2a97ac7f0ebb32827c54ef1d4bb4e1149109c426cc1b4faad379b3bd16d0a72ef8f9be532f93ae7f8  deviceinfo
 69cfc8db6ea497576085e1b5861c766b5c6cfbd493e4d66aa0bfa29a0e80eeaeb8a465c4841c6a7959796f5a2325e621d60f2c35ccb0741d7934ab310abe807f  modules-initfs
 "

device/community/device-xiaomi-vince/deviceinfo

@@ -21,9 +21,11 @@ deviceinfo_external_storage="true"
 deviceinfo_screen_width="1080"
 deviceinfo_screen_height="2160"
 deviceinfo_swap_size_recommended="1024"
+deviceinfo_getty="ttyMSM0;115200"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
+deviceinfo_kernel_cmdline="console=ttyMSM0,115200"
 deviceinfo_generate_bootimg="true"
 deviceinfo_generate_extlinux_config="true"
 deviceinfo_bootimg_qcdt="false"

device/community/linux-google-veyron/APKBUILD

@@ -1,7 +1,7 @@
 # Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=linux-google-veyron
-pkgver=6.1.39
-pkgrel=4
+pkgver=6.6.26
+pkgrel=0
 pkgdesc="Mainline kernel for Google Veyron devices"
 arch="armv7"
 _carch="arm"
@@ -67,11 +67,11 @@ package() {
 }
 
 sha512sums="
-20d468ae89b57dda82d7c7b814c3d8b1b510e1623775b09a8a0b0a8a0431461e0a1d2df2bfa01f3102932c8eef91405546898b50ec3e6f30015098bb39722b41  linux-6.1.39.tar.xz
-3251546c093d41c3cd832d864a5f24b0de6da1e8ab2856bc7b168d450c450d66c82a141c0c4550ed124a3cf59745bdaef28eab6cef220e3fa8295889d222e1d3  config-google-veyron.armv7
-2912c675c1e07f7e91e2edcaa82738643907ed46614e4b871565930ff4ffece468d47db7905c2c081f936c020ea78db4a9d9f33b76c110125a0e68a1bd57f9fd  veyron.better_clock_selection_logic_and_dts_rate_list.patch
-b16da0e0b1da9f074a773300e954aa5e0da6c2113e20c0b594a7a4875e9addb10efcf5be694467fb00cd8d7c2e3cc83e6d7aac618047775dc0bb354245cf7c35  veyron.dts_allow_dedicating_npll_to_vop.patch
-b7bda162526abdb61c0223f1aac31893526d3d1d21d79ebd3e707be8d9b5dc464f6b4fa20b74444c44fda987352728433913f6f50b9b860c2621d11ae2306e1b  veyron.dts_do_dedicate_npll_to_vop.patch
+7559f5bc1384c223f1d63ec87215d91835db49a477fd9948524fb6bb8bc4fee38e99aac7824f849043ef2fd39e490da8ca698e65b4ae0cedd48b8758df5fa4cd  linux-6.6.26.tar.xz
+dabc7a7970c0bf39f1e939cd25a49b5523632595eafa9e86c5cdadc57b563b75638d0c46d740592bb8c646dc3e955e3e2c30cf2cc12285fb4be2b39e004f5d61  config-google-veyron.armv7
+48debab56aa7e655ea7d8af6da5fa83065939f23471d3366958c924bd54f0cb8aa20f104b6d14e6b531b67e8c9320342aaf211a19c6e890105fe0302f6cd4c8a  veyron.better_clock_selection_logic_and_dts_rate_list.patch
+cec81f88da19dc928c54780bf1d39efdf23dee481bc1a3a81cb17f506328103221ef47ee020f5e5b393f20fc20242937698cb733aa376e5d79a75b98c486e513  veyron.dts_allow_dedicating_npll_to_vop.patch
+f4336cc18991a01a7d532610758c640d633d1f7ac05e42c229da418eeed109c67c721d6ed5eea593d36178fb8b420dcbd2c0759876358081c669919192330cec  veyron.dts_do_dedicate_npll_to_vop.patch
 67f49d49457eed7ae2de4582d53602743dc9c785720527d713e9b14a027a4716c755cf56e5188641cb69b35c5a561f298fa4cf2b37751696768e76e534139f40  veyron.ignore-gpt-ignoreme.patch
 30e78435b3ef7a1e2ca304297f3bb446e12acd416158707b98b4e38aa31871acac24a6671317bae752a25732534e3f273cd9ab5bf909d920b4b277a69aa11da2  veyron.support_dedicating_npll_to_vop.patch
 "

device/community/linux-google-veyron/veyron.better_clock_selection_logic_and_dts_rate_list.patch

@@ -49,7 +49,7 @@ index c14f88893868..cb7a302497a5 100644
  static struct rockchip_hdmi *to_rockchip_hdmi(struct drm_encoder *encoder)
  {
  	struct rockchip_encoder *rkencoder = to_rockchip_encoder(encoder);
-@@ -89,118 +94,132 @@ static struct rockchip_hdmi *to_rockchip_hdmi(struct drm_encoder *encoder)
+@@ -89,126 +94,132 @@ static struct rockchip_hdmi *to_rockchip_hdmi(struct drm_encoder *encoder)
  	return container_of(rkencoder, struct rockchip_hdmi, encoder);
  }
  
@@ -194,11 +194,13 @@ index c14f88893868..cb7a302497a5 100644
 -			{ 0x0051, 0x0003},
 -			{ 0x214c, 0x0003},
 -			{ 0x4064, 0x0003}
+-		},
+-	}, {
 +	},  {
-+		340000000, {
-+			{ 0x0040, 0x0003 },
-+			{ 0x3b4c, 0x0003 },
-+			{ 0x5a64, 0x0003 },
+ 		340000000, {
+ 			{ 0x0040, 0x0003 },
+ 			{ 0x3b4c, 0x0003 },
+ 			{ 0x5a64, 0x0003 },
  		},
 -	}, {
 +	},  {
@@ -234,10 +236,11 @@ index c14f88893868..cb7a302497a5 100644
 -		83500000,  { 0x0028, 0x0038, 0x0038 },
 -	}, {
 -		146250000, { 0x0038, 0x0038, 0x0038 },
-+		600000000,  { 0x0000, 0x0000, 0x0000 },
- 	}, {
+-	}, {
 -		148500000, { 0x0000, 0x0038, 0x0038 },
 -	}, {
+ 		600000000, { 0x0000, 0x0000, 0x0000 },
+ 	}, {
 -		~0UL,      { 0x0000, 0x0000, 0x0000},
 +		~0UL,       { 0x0000, 0x0000, 0x0000},
  	}
@@ -263,7 +266,7 @@ index c14f88893868..cb7a302497a5 100644
  
  	hdmi->regmap = syscon_regmap_lookup_by_phandle(np, "rockchip,grf");
  	if (IS_ERR(hdmi->regmap)) {
-@@ -237,27 +256,55 @@ static int rockchip_hdmi_parse_dt(struct rockchip_hdmi *hdmi)
+@@ -237,39 +256,51 @@ static int rockchip_hdmi_parse_dt(struct rockchip_hdmi *hdmi)
  	if (IS_ERR(hdmi->avdd_1v8))
  		return PTR_ERR(hdmi->avdd_1v8);
  
@@ -291,23 +294,25 @@ index c14f88893868..cb7a302497a5 100644
  }
  
  static enum drm_mode_status
--dw_hdmi_rockchip_mode_valid(struct dw_hdmi *hdmi, void *data,
+-dw_hdmi_rockchip_mode_valid(struct dw_hdmi *dw_hdmi, void *data,
 -			    const struct drm_display_info *info,
 +dw_hdmi_rockchip_encoder_mode_valid(struct drm_encoder *encoder,
  			    const struct drm_display_mode *mode)
  {
--	const struct dw_hdmi_mpll_config *mpll_cfg = rockchip_mpll_cfg;
+-	struct rockchip_hdmi *hdmi = data;
 +	struct rockchip_hdmi *hdmi = to_rockchip_hdmi(encoder);
+-	const struct dw_hdmi_mpll_config *mpll_cfg = rockchip_mpll_cfg;
  	int pclk = mode->clock * 1000;
--	bool valid = false;
+-	bool exact_match = hdmi->plat_data->phy_force_vendor;
 +	int num_rates = hdmi->rates_cnt;
  	int i;
  
--	for (i = 0; mpll_cfg[i].mpixelclock != (~0UL); i++) {
--		if (pclk == mpll_cfg[i].mpixelclock) {
--			valid = true;
--			break;
--		}
+-	if (hdmi->ref_clk) {
+-		int rpclk = clk_round_rate(hdmi->ref_clk, pclk);
+-
+-		if (abs(rpclk - pclk) > pclk / 1000)
+-			return MODE_NOCLOCK;
+-	}
 +	/*
 +	 * Pixel clocks we support are always < 2GHz and so fit in an
 +	 * int.  We should make sure source rate does too so we don't get
@@ -315,20 +320,27 @@ index c14f88893868..cb7a302497a5 100644
 +	 */
 +	if (mode->clock > INT_MAX / 1000)
 +		return MODE_BAD;
-+
+ 
+-	for (i = 0; mpll_cfg[i].mpixelclock != (~0UL); i++) {
+-		/*
+-		 * For vendor specific phys force an exact match of the pixelclock
+-		 * to preserve the original behaviour of the driver.
+-		 */
+-		if (exact_match && pclk == mpll_cfg[i].mpixelclock)
+-			return MODE_OK;
+-		/*
+-		 * The Synopsys phy can work with pixelclocks up to the value given
+-		 * in the corresponding mpll_cfg entry.
+-		 */
+-		if (!exact_match && pclk <= mpll_cfg[i].mpixelclock)
 +	for (i = 0; i < num_rates; i++) {
 +		int slop = CLK_SLOP(pclk);
 +
 +		if ((pclk >= hdmi->rates[i] - slop) &&
 +		    (pclk <= hdmi->rates[i] + slop))
-+			return MODE_OK;
+ 			return MODE_OK;
  	}
  
--	return (valid) ? MODE_OK : MODE_BAD;
-+	return MODE_BAD;
- }
- 
- static void dw_hdmi_rockchip_encoder_disable(struct drm_encoder *encoder)
 @@ -269,7 +316,39 @@ dw_hdmi_rockchip_encoder_mode_fixup(struct drm_encoder *encoder,
  				    const struct drm_display_mode *mode,
  				    struct drm_display_mode *adj_mode)

device/community/linux-google-veyron/veyron.dts_allow_dedicating_npll_to_vop.patch

@@ -14,8 +14,8 @@ Signed-off-by: Urja Rannikko <urjaman@gmail.com>
 
 diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
 index aaaa61875701d..e8cb4dc8c27da 100644
---- a/arch/arm/boot/dts/rk3288.dtsi
-+++ b/arch/arm/boot/dts/rk3288.dtsi
+--- a/arch/arm/boot/dts/rockchip/rk3288.dtsi
++++ b/arch/arm/boot/dts/rockchip/rk3288.dtsi
 @@ -865,12 +865,14 @@
  		rockchip,grf = <&grf>;
  		#clock-cells = <1>;

device/community/linux-google-veyron/veyron.dts_do_dedicate_npll_to_vop.patch

@@ -16,8 +16,8 @@ Signed-off-by: Urja Rannikko <urjaman@gmail.com>
 
 diff --git a/arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi b/arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi
 index 05112c25176d3..4d972bd6741c1 100644
---- a/arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi
-+++ b/arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi
+--- a/arch/arm/boot/dts/rockchip/rk3288-veyron-chromebook.dtsi
++++ b/arch/arm/boot/dts/rockchip/rk3288-veyron-chromebook.dtsi
 @@ -83,6 +83,68 @@
  	};
  };

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

@@ -2,9 +2,9 @@
 # Co-Maintainer: jane400 <jane400@postmarketos.org>
 # Contributor: Konrad Dybcio <konradybcio@kernel.org>
 pkgname=linux-lenovo-21bx
-pkgver=6.11
+pkgver=6.10
 pkgrel=0
-_commit="c8032fa3062e04cbb68f070959fc746b91abb16e"
+_commit="f0239008542ebdcd4a94755124b5700649df5c39"
 pkgdesc="Lenovo ThinkPad X13s kernel fork"
 arch="aarch64"
 _carch="arm64"
@@ -67,6 +67,6 @@ package() {
 }
 
 sha512sums="
-ed4429c4db569f7a7d06b1cf776d6ab02e17a4d66e1f7a90a69456036a4540be073876108a7ee89c91e66e4f8f4fa0d5e67a5849bdb2221a6323630dfa70ddce  linux-lenovo-21bx-c8032fa3062e04cbb68f070959fc746b91abb16e.tar.gz
-6bbdb466eb7f080868154fc38a5265f64d6f404c88b23925dd0b7bf18277f08dec94f0f52eb884910e79cccd98ef40ae640905ea8694f078426219a6da45913e  config-lenovo-21bx.aarch64
+efbf5fdaba513098c9c0f8eb2a559e58c6fd1180bcdf897514b2104480f0d2de2065f073d12204989804b61b083c2b3f9d605493ca6e89bb25e0beeae8545273  linux-lenovo-21bx-f0239008542ebdcd4a94755124b5700649df5c39.tar.gz
+4ce995e9f5d71d9e1037072d5f05166cfb1b03d95bfb9a88269e9e2be9960894e9a2ca29f8a25855777291b676e423ce2ee56386372692820ea1722e5b3e9c9e  config-lenovo-21bx.aarch64
 "

device/community/linux-lenovo-21bx/config-lenovo-21bx.aarch64

@@ -1,21 +1,21 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.11.0 Kernel Configuration
+# Linux/arm64 6.10.0 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="gcc (Alpine 14.2.0) 14.2.0"
+CONFIG_CC_VERSION_TEXT="gcc (Alpine 13.2.1_git20240309) 13.2.1 20240309"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=140200
+CONFIG_GCC_VERSION=130201
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
-CONFIG_AS_VERSION=24301
+CONFIG_AS_VERSION=24200
 CONFIG_LD_IS_BFD=y
-CONFIG_LD_VERSION=24301
+CONFIG_LD_VERSION=24200
 CONFIG_LLD_VERSION=0
 CONFIG_CC_CAN_LINK=y
 CONFIG_CC_CAN_LINK_STATIC=y
 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
 CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
-CONFIG_TOOLS_SUPPORT_RELR=y
+CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=y
 CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
 CONFIG_PAHOLE_VERSION=0
@@ -190,7 +190,7 @@ CONFIG_CGROUPS=y
 CONFIG_PAGE_COUNTER=y
 # CONFIG_CGROUP_FAVOR_DYNMODS is not set
 CONFIG_MEMCG=y
-# CONFIG_MEMCG_V1 is not set
+CONFIG_MEMCG_KMEM=y
 CONFIG_BLK_CGROUP=y
 CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
@@ -266,6 +266,7 @@ CONFIG_CACHESTAT_SYSCALL=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_SELFTEST is not set
 # CONFIG_KALLSYMS_ALL is not set
+CONFIG_KALLSYMS_BASE_RELATIVE=y
 CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
 CONFIG_HAVE_PERF_EVENTS=y
 CONFIG_GUEST_PERF_EVENTS=y
@@ -401,7 +402,9 @@ CONFIG_ARM64_ERRATUM_2645198=y
 CONFIG_ARM64_WORKAROUND_SPECULATIVE_UNPRIV_LOAD=y
 CONFIG_ARM64_ERRATUM_2966298=y
 CONFIG_ARM64_ERRATUM_3117295=y
+CONFIG_ARM64_WORKAROUND_SPECULATIVE_SSBS=y
 CONFIG_ARM64_ERRATUM_3194386=y
+CONFIG_ARM64_ERRATUM_3312417=y
 CONFIG_CAVIUM_ERRATUM_22375=y
 CONFIG_CAVIUM_ERRATUM_23144=y
 CONFIG_CAVIUM_ERRATUM_23154=y
@@ -541,7 +544,6 @@ CONFIG_ARM64_CONTPTE=y
 CONFIG_CMDLINE=""
 CONFIG_EFI_STUB=y
 CONFIG_EFI=y
-CONFIG_COMPRESSED_INSTALL=y
 CONFIG_DMI=y
 # end of Boot options
 
@@ -762,7 +764,6 @@ CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y
 CONFIG_ARCH_USE_MEMREMAP_PROT=y
 # CONFIG_LOCK_EVENT_COUNTS is not set
 CONFIG_ARCH_HAS_RELR=y
-CONFIG_RELR=y
 CONFIG_HAVE_PREEMPT_DYNAMIC=y
 CONFIG_HAVE_PREEMPT_DYNAMIC_KEY=y
 CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y
@@ -785,8 +786,6 @@ CONFIG_GCC_PLUGINS=y
 CONFIG_FUNCTION_ALIGNMENT_4B=y
 CONFIG_FUNCTION_ALIGNMENT_8B=y
 CONFIG_FUNCTION_ALIGNMENT=8
-CONFIG_CC_HAS_MIN_FUNCTION_ALIGNMENT=y
-CONFIG_CC_HAS_SANE_FUNCTION_ALIGNMENT=y
 # end of General architecture-dependent options
 
 CONFIG_RT_MUTEXES=y
@@ -813,7 +812,7 @@ CONFIG_BLK_CGROUP_RWSTAT=y
 CONFIG_BLK_CGROUP_PUNT_BIO=y
 CONFIG_BLK_DEV_BSG_COMMON=y
 # CONFIG_BLK_DEV_BSGLIB is not set
-CONFIG_BLK_DEV_INTEGRITY=y
+# CONFIG_BLK_DEV_INTEGRITY is not set
 CONFIG_BLK_DEV_WRITE_MOUNTED=y
 # CONFIG_BLK_DEV_ZONED is not set
 CONFIG_BLK_DEV_THROTTLING=y
@@ -884,7 +883,6 @@ CONFIG_COREDUMP=y
 #
 CONFIG_SWAP=y
 # CONFIG_ZSWAP is not set
-CONFIG_HAVE_ZSMALLOC=y
 CONFIG_ZSMALLOC=y
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_ZSMALLOC_CHAIN_SIZE=8
@@ -896,7 +894,6 @@ CONFIG_SLUB=y
 CONFIG_SLAB_MERGE_DEFAULT=y
 # CONFIG_SLAB_FREELIST_RANDOM is not set
 # CONFIG_SLAB_FREELIST_HARDENED is not set
-# CONFIG_SLAB_BUCKETS is not set
 # CONFIG_SLUB_STATS is not set
 CONFIG_SLUB_CPU_PARTIAL=y
 # CONFIG_RANDOM_KMALLOC_CACHES is not set
@@ -1191,8 +1188,8 @@ CONFIG_NETFILTER_XT_MATCH_IPVS=y
 # CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
 # CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
 # CONFIG_NETFILTER_XT_MATCH_MAC is not set
-CONFIG_NETFILTER_XT_MATCH_MARK=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+# CONFIG_NETFILTER_XT_MATCH_MARK is not set
+# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
 # CONFIG_NETFILTER_XT_MATCH_NFACCT is not set
 # CONFIG_NETFILTER_XT_MATCH_OSF is not set
 # CONFIG_NETFILTER_XT_MATCH_OWNER is not set
@@ -1581,6 +1578,7 @@ CONFIG_VGA_ARB_MAX_GPUS=16
 # CONFIG_PCI_HOST_THUNDER_ECAM is not set
 # CONFIG_PCI_FTPCI100 is not set
 # CONFIG_PCI_HOST_GENERIC is not set
+# CONFIG_PCIE_MICROCHIP_HOST is not set
 # CONFIG_PCI_XGENE is not set
 # CONFIG_PCIE_XILINX is not set
 
@@ -1607,12 +1605,6 @@ CONFIG_PCIE_QCOM=m
 # Mobiveil-based PCIe controllers
 #
 # end of Mobiveil-based PCIe controllers
-
-#
-# PLDA-based PCIe controllers
-#
-# CONFIG_PCIE_MICROCHIP_HOST is not set
-# end of PLDA-based PCIe controllers
 # end of PCI controller drivers
 
 #
@@ -1627,9 +1619,6 @@ CONFIG_PCIE_QCOM=m
 # CONFIG_PCI_SW_SWITCHTEC is not set
 # end of PCI switch controller drivers
 
-CONFIG_HAVE_PWRCTL=y
-CONFIG_PCI_PWRCTL=m
-CONFIG_PCI_PWRCTL_PWRSEQ=m
 # CONFIG_CXL_BUS is not set
 # CONFIG_PCCARD is not set
 # CONFIG_RAPIDIO is not set
@@ -1769,9 +1758,6 @@ CONFIG_ARM_PSCI_FW=y
 # Qualcomm firmware drivers
 #
 CONFIG_QCOM_SCM=y
-CONFIG_QCOM_TZMEM=y
-CONFIG_QCOM_TZMEM_MODE_GENERIC=y
-# CONFIG_QCOM_TZMEM_MODE_SHMBRIDGE is not set
 # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
 CONFIG_QCOM_QSEECOM=y
 CONFIG_QCOM_QSEECOM_UEFISECAPP=y
@@ -1908,7 +1894,6 @@ CONFIG_SRAM=y
 # CONFIG_UACCE is not set
 # CONFIG_PVPANIC is not set
 # CONFIG_GP_PCI1XXXX is not set
-# CONFIG_KEBA_CP500 is not set
 # end of Misc devices
 
 #
@@ -1981,8 +1966,8 @@ CONFIG_DM_THIN_PROVISIONING=m
 # CONFIG_DM_VERITY is not set
 # CONFIG_DM_SWITCH is not set
 # CONFIG_DM_LOG_WRITES is not set
-CONFIG_DM_INTEGRITY=m
-CONFIG_DM_AUDIT=y
+# CONFIG_DM_INTEGRITY is not set
+# CONFIG_DM_AUDIT is not set
 # CONFIG_DM_VDO is not set
 # CONFIG_TARGET_CORE is not set
 # CONFIG_FUSION is not set
@@ -2143,7 +2128,6 @@ CONFIG_NET_VENDOR_MELLANOX=y
 # CONFIG_MLX5_CORE is not set
 # CONFIG_MLXSW_CORE is not set
 # CONFIG_MLXFW is not set
-CONFIG_NET_VENDOR_META=y
 CONFIG_NET_VENDOR_MICREL=y
 # CONFIG_KS8842 is not set
 # CONFIG_KS8851 is not set
@@ -2227,7 +2211,6 @@ CONFIG_NET_VENDOR_SYNOPSYS=y
 # CONFIG_DWC_XLGMAC is not set
 CONFIG_NET_VENDOR_TEHUTI=y
 # CONFIG_TEHUTI is not set
-# CONFIG_TEHUTI_TN40 is not set
 CONFIG_NET_VENDOR_TI=y
 # CONFIG_TI_CPSW_PHY_SEL is not set
 # CONFIG_TLAN is not set
@@ -2340,7 +2323,6 @@ CONFIG_MDIO_DEVRES=y
 #
 # PCS device drivers
 #
-# CONFIG_PCS_XPCS is not set
 # end of PCS device drivers
 
 # CONFIG_PPP is not set
@@ -2455,7 +2437,7 @@ CONFIG_MHI_WWAN_MBIM=m
 #
 CONFIG_INPUT=y
 CONFIG_INPUT_LEDS=m
-CONFIG_INPUT_FF_MEMLESS=m
+# CONFIG_INPUT_FF_MEMLESS is not set
 # CONFIG_INPUT_SPARSEKMAP is not set
 # CONFIG_INPUT_MATRIXKMAP is not set
 
@@ -2503,38 +2485,7 @@ CONFIG_KEYBOARD_GPIO=y
 # CONFIG_KEYBOARD_BCM is not set
 # CONFIG_KEYBOARD_CYPRESS_SF is not set
 # CONFIG_INPUT_MOUSE is not set
-CONFIG_INPUT_JOYSTICK=y
-# CONFIG_JOYSTICK_ANALOG is not set
-# CONFIG_JOYSTICK_A3D is not set
-# CONFIG_JOYSTICK_ADC is not set
-# CONFIG_JOYSTICK_ADI is not set
-# CONFIG_JOYSTICK_COBRA is not set
-# CONFIG_JOYSTICK_GF2K is not set
-# CONFIG_JOYSTICK_GRIP is not set
-# CONFIG_JOYSTICK_GRIP_MP is not set
-# CONFIG_JOYSTICK_GUILLEMOT is not set
-# CONFIG_JOYSTICK_INTERACT is not set
-# CONFIG_JOYSTICK_SIDEWINDER is not set
-# CONFIG_JOYSTICK_TMDC is not set
-# CONFIG_JOYSTICK_IFORCE is not set
-# CONFIG_JOYSTICK_WARRIOR is not set
-# CONFIG_JOYSTICK_MAGELLAN is not set
-# CONFIG_JOYSTICK_SPACEORB is not set
-# CONFIG_JOYSTICK_SPACEBALL is not set
-# CONFIG_JOYSTICK_STINGER is not set
-# CONFIG_JOYSTICK_TWIDJOY is not set
-# CONFIG_JOYSTICK_ZHENHUA is not set
-# CONFIG_JOYSTICK_AS5011 is not set
-# CONFIG_JOYSTICK_JOYDUMP is not set
-CONFIG_JOYSTICK_XPAD=m
-CONFIG_JOYSTICK_XPAD_FF=y
-CONFIG_JOYSTICK_XPAD_LEDS=y
-# CONFIG_JOYSTICK_PSXPAD_SPI is not set
-# CONFIG_JOYSTICK_PXRC is not set
-# CONFIG_JOYSTICK_QWIIC is not set
-# CONFIG_JOYSTICK_FSIA6B is not set
-# CONFIG_JOYSTICK_SENSEHAT is not set
-# CONFIG_JOYSTICK_SEESAW is not set
+# CONFIG_INPUT_JOYSTICK is not set
 # CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 CONFIG_INPUT_MISC=y
@@ -2763,7 +2714,6 @@ CONFIG_SPI_MASTER=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_CADENCE is not set
 # CONFIG_SPI_CADENCE_QUADSPI is not set
-# CONFIG_SPI_CH341 is not set
 # CONFIG_SPI_DESIGNWARE is not set
 # CONFIG_SPI_GPIO is not set
 # CONFIG_SPI_FSL_SPI is not set
@@ -2827,7 +2777,6 @@ CONFIG_GENERIC_PINCONF=y
 # CONFIG_PINCTRL_SCMI is not set
 CONFIG_PINCTRL_SINGLE=y
 # CONFIG_PINCTRL_STMFX is not set
-# CONFIG_PINCTRL_IMX_SCMI is not set
 CONFIG_PINCTRL_MSM=y
 # CONFIG_PINCTRL_IPQ5018 is not set
 # CONFIG_PINCTRL_IPQ5332 is not set
@@ -2870,7 +2819,6 @@ CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
 # CONFIG_PINCTRL_QCOM_SSBI_PMIC is not set
 CONFIG_PINCTRL_LPASS_LPI=m
 # CONFIG_PINCTRL_SC7280_LPASS_LPI is not set
-# CONFIG_PINCTRL_SM4250_LPASS_LPI is not set
 # CONFIG_PINCTRL_SM6115_LPASS_LPI is not set
 # CONFIG_PINCTRL_SM8250_LPASS_LPI is not set
 # CONFIG_PINCTRL_SM8350_LPASS_LPI is not set
@@ -2969,12 +2917,6 @@ CONFIG_GPIO_CDEV_V1=y
 # CONFIG_GPIO_SIM is not set
 # end of Virtual GPIO drivers
 
-#
-# GPIO Debugging utilities
-#
-# CONFIG_GPIO_VIRTUSER is not set
-# end of GPIO Debugging utilities
-
 # CONFIG_W1 is not set
 CONFIG_POWER_RESET=y
 # CONFIG_POWER_RESET_GPIO is not set
@@ -2990,8 +2932,6 @@ CONFIG_POWER_RESET_QCOM_PON=m
 CONFIG_REBOOT_MODE=m
 # CONFIG_SYSCON_REBOOT_MODE is not set
 # CONFIG_NVMEM_REBOOT_MODE is not set
-CONFIG_POWER_SEQUENCING=m
-CONFIG_POWER_SEQUENCING_QCOM_WCN=m
 CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
 CONFIG_POWER_SUPPLY_HWMON=y
@@ -3011,7 +2951,6 @@ CONFIG_BATTERY_QCOM_BATTMGR=m
 # CONFIG_BATTERY_BQ27XXX is not set
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
-# CONFIG_BATTERY_MAX1720X is not set
 # CONFIG_CHARGER_MAX8903 is not set
 # CONFIG_CHARGER_LP8727 is not set
 # CONFIG_CHARGER_GPIO is not set
@@ -3052,6 +2991,7 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_AD7314 is not set
 # CONFIG_SENSORS_AD7414 is not set
 # CONFIG_SENSORS_AD7418 is not set
+# CONFIG_SENSORS_ADM1021 is not set
 # CONFIG_SENSORS_ADM1025 is not set
 # CONFIG_SENSORS_ADM1026 is not set
 # CONFIG_SENSORS_ADM1029 is not set
@@ -3123,6 +3063,7 @@ CONFIG_SENSORS_ARM_SCPI=y
 # CONFIG_SENSORS_MAX6620 is not set
 # CONFIG_SENSORS_MAX6621 is not set
 # CONFIG_SENSORS_MAX6639 is not set
+# CONFIG_SENSORS_MAX6642 is not set
 # CONFIG_SENSORS_MAX6650 is not set
 # CONFIG_SENSORS_MAX6697 is not set
 # CONFIG_SENSORS_MAX31790 is not set
@@ -3192,7 +3133,6 @@ CONFIG_SENSORS_ARM_SCPI=y
 # CONFIG_SENSORS_INA2XX is not set
 # CONFIG_SENSORS_INA238 is not set
 # CONFIG_SENSORS_INA3221 is not set
-# CONFIG_SENSORS_SPD5118 is not set
 # CONFIG_SENSORS_TC74 is not set
 # CONFIG_SENSORS_THMC50 is not set
 # CONFIG_SENSORS_TMP102 is not set
@@ -3387,8 +3327,6 @@ CONFIG_MFD_SYSCON=y
 # CONFIG_MFD_STMFX is not set
 # CONFIG_MFD_ATC260X_I2C is not set
 CONFIG_MFD_QCOM_PM8008=m
-# CONFIG_MFD_CS40L50_I2C is not set
-# CONFIG_MFD_CS40L50_SPI is not set
 # CONFIG_RAVE_SP_CORE is not set
 # CONFIG_MFD_INTEL_M10_BMC_SPI is not set
 # CONFIG_MFD_RSMU_I2C is not set
@@ -3587,7 +3525,6 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y
 #
 # Chips&Media media platform drivers
 #
-# CONFIG_VIDEO_E5010_JPEG_ENC is not set
 
 #
 # Intel media platform drivers
@@ -3624,11 +3561,6 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y
 CONFIG_VIDEO_QCOM_CAMSS=m
 CONFIG_VIDEO_QCOM_VENUS=m
 
-#
-# Raspberry Pi media platform drivers
-#
-# CONFIG_VIDEO_RASPBERRYPI_PISP_BE is not set
-
 #
 # Renesas media platform drivers
 #
@@ -3683,8 +3615,6 @@ CONFIG_VIDEO_CAMERA_SENSOR=y
 # CONFIG_VIDEO_ALVIUM_CSI2 is not set
 # CONFIG_VIDEO_AR0521 is not set
 # CONFIG_VIDEO_GC0308 is not set
-# CONFIG_VIDEO_GC05A2 is not set
-# CONFIG_VIDEO_GC08A3 is not set
 # CONFIG_VIDEO_GC2145 is not set
 # CONFIG_VIDEO_HI556 is not set
 # CONFIG_VIDEO_HI846 is not set
@@ -3694,7 +3624,6 @@ CONFIG_VIDEO_CAMERA_SENSOR=y
 # CONFIG_VIDEO_IMX219 is not set
 # CONFIG_VIDEO_IMX258 is not set
 # CONFIG_VIDEO_IMX274 is not set
-# CONFIG_VIDEO_IMX283 is not set
 # CONFIG_VIDEO_IMX290 is not set
 # CONFIG_VIDEO_IMX296 is not set
 # CONFIG_VIDEO_IMX319 is not set
@@ -3750,7 +3679,7 @@ CONFIG_VIDEO_OV5675=m
 # CONFIG_VIDEO_S5C73M3 is not set
 # CONFIG_VIDEO_S5K5BAF is not set
 # CONFIG_VIDEO_S5K6A3 is not set
-# CONFIG_VIDEO_VGXY61 is not set
+# CONFIG_VIDEO_ST_VGXY61 is not set
 # CONFIG_VIDEO_CCS is not set
 # CONFIG_VIDEO_ET8EK8 is not set
 
@@ -3793,8 +3722,6 @@ CONFIG_VIDEO_OV5675=m
 # CONFIG_VIDEO_DS90UB913 is not set
 # CONFIG_VIDEO_DS90UB953 is not set
 # CONFIG_VIDEO_DS90UB960 is not set
-# CONFIG_VIDEO_MAX96714 is not set
-# CONFIG_VIDEO_MAX96717 is not set
 # end of Video serializers and deserializers
 
 #
@@ -3821,14 +3748,11 @@ CONFIG_DRM_KMS_HELPER=m
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
 # CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
-CONFIG_DRM_DISPLAY_DP_AUX_BUS=m
 CONFIG_DRM_DISPLAY_HELPER=m
-CONFIG_DRM_BRIDGE_CONNECTOR=y
+CONFIG_DRM_DISPLAY_DP_AUX_BUS=m
 # CONFIG_DRM_DISPLAY_DP_AUX_CEC is not set
 # CONFIG_DRM_DISPLAY_DP_AUX_CHARDEV is not set
 CONFIG_DRM_DISPLAY_DP_HELPER=y
-CONFIG_DRM_DISPLAY_HDMI_HELPER=y
-CONFIG_DRM_DISPLAY_HDMI_STATE_HELPER=y
 CONFIG_DRM_EXEC=m
 CONFIG_DRM_GEM_DMA_HELPER=m
 CONFIG_DRM_SCHED=m
@@ -4060,7 +3984,6 @@ CONFIG_BACKLIGHT_PWM=m
 # CONFIG_BACKLIGHT_QCOM_WLED is not set
 # CONFIG_BACKLIGHT_ADP8860 is not set
 # CONFIG_BACKLIGHT_ADP8870 is not set
-# CONFIG_BACKLIGHT_LM3509 is not set
 # CONFIG_BACKLIGHT_LM3630A is not set
 # CONFIG_BACKLIGHT_LM3639 is not set
 # CONFIG_BACKLIGHT_LP855X is not set
@@ -4230,7 +4153,6 @@ CONFIG_SND_SOC_I2C_AND_SPI=m
 # CONFIG_SND_SOC_AK4458 is not set
 # CONFIG_SND_SOC_AK4554 is not set
 # CONFIG_SND_SOC_AK4613 is not set
-# CONFIG_SND_SOC_AK4619 is not set
 # CONFIG_SND_SOC_AK4642 is not set
 # CONFIG_SND_SOC_AK5386 is not set
 # CONFIG_SND_SOC_AK5558 is not set
@@ -4273,14 +4195,12 @@ CONFIG_SND_SOC_I2C_AND_SPI=m
 # CONFIG_SND_SOC_CS4341 is not set
 # CONFIG_SND_SOC_CS4349 is not set
 # CONFIG_SND_SOC_CS53L30 is not set
-# CONFIG_SND_SOC_CS530X_I2C is not set
 # CONFIG_SND_SOC_CX2072X is not set
 # CONFIG_SND_SOC_DA7213 is not set
 # CONFIG_SND_SOC_DMIC is not set
 CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_ES7134 is not set
 # CONFIG_SND_SOC_ES7241 is not set
-# CONFIG_SND_SOC_ES8311 is not set
 # CONFIG_SND_SOC_ES8316 is not set
 # CONFIG_SND_SOC_ES8326 is not set
 # CONFIG_SND_SOC_ES8328_I2C is not set
@@ -4324,7 +4244,6 @@ CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_RT1308_SDW is not set
 # CONFIG_SND_SOC_RT1316_SDW is not set
 # CONFIG_SND_SOC_RT1318_SDW is not set
-# CONFIG_SND_SOC_RT1320_SDW is not set
 # CONFIG_SND_SOC_RT5616 is not set
 # CONFIG_SND_SOC_RT5631 is not set
 # CONFIG_SND_SOC_RT5640 is not set
@@ -4384,7 +4303,6 @@ CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_UDA1334 is not set
 CONFIG_SND_SOC_WCD_CLASSH=m
 CONFIG_SND_SOC_WCD_MBHC=m
-# CONFIG_SND_SOC_WCD937X_SDW is not set
 CONFIG_SND_SOC_WCD938X=m
 CONFIG_SND_SOC_WCD938X_SDW=m
 # CONFIG_SND_SOC_WCD939X_SDW is not set
@@ -4570,7 +4488,7 @@ CONFIG_HID_MULTITOUCH=m
 #
 CONFIG_USB_HID=y
 # CONFIG_HID_PID is not set
-CONFIG_USB_HIDDEV=y
+# CONFIG_USB_HIDDEV is not set
 # end of USB HID support
 
 CONFIG_I2C_HID=m
@@ -4587,7 +4505,7 @@ CONFIG_USB_COMMON=y
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB=y
 # CONFIG_USB_PCI is not set
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
 
 #
 # Miscellaneous USB options
@@ -4825,7 +4743,7 @@ CONFIG_USB_CONFIGFS_NCM=y
 CONFIG_USB_CONFIGFS_ECM_SUBSET=y
 CONFIG_USB_CONFIGFS_RNDIS=y
 CONFIG_USB_CONFIGFS_EEM=y
-CONFIG_USB_CONFIGFS_MASS_STORAGE=y
+# CONFIG_USB_CONFIGFS_MASS_STORAGE is not set
 # CONFIG_USB_CONFIGFS_F_LB_SS is not set
 CONFIG_USB_CONFIGFS_F_FS=y
 # CONFIG_USB_CONFIGFS_F_UAC1 is not set
@@ -5028,7 +4946,6 @@ CONFIG_LEDS_TRIGGER_PANIC=y
 # CONFIG_LEDS_TRIGGER_NETDEV is not set
 CONFIG_LEDS_TRIGGER_PATTERN=y
 # CONFIG_LEDS_TRIGGER_TTY is not set
-# CONFIG_LEDS_TRIGGER_INPUT_EVENTS is not set
 
 #
 # Simple LED drivers
@@ -5193,7 +5110,7 @@ CONFIG_DMA_OF=y
 #
 CONFIG_SYNC_FILE=y
 # CONFIG_SW_SYNC is not set
-CONFIG_UDMABUF=y
+# CONFIG_UDMABUF is not set
 # CONFIG_DMABUF_MOVE_NOTIFY is not set
 # CONFIG_DMABUF_DEBUG is not set
 # CONFIG_DMABUF_SELFTESTS is not set
@@ -5223,12 +5140,10 @@ CONFIG_VIRTIO=y
 # CONFIG_STAGING is not set
 # CONFIG_GOLDFISH is not set
 # CONFIG_CHROME_PLATFORMS is not set
-# CONFIG_CZNIC_PLATFORMS is not set
 # CONFIG_MELLANOX_PLATFORM is not set
 # CONFIG_SURFACE_PLATFORMS is not set
 CONFIG_ARM64_PLATFORM_DEVICES=y
 # CONFIG_EC_ACER_ASPIRE1 is not set
-# CONFIG_EC_LENOVO_YOGA_C630 is not set
 CONFIG_HAVE_CLK=y
 CONFIG_HAVE_CLK_PREPARE=y
 CONFIG_COMMON_CLK=y
@@ -5262,13 +5177,13 @@ CONFIG_COMMON_CLK_SCPI=m
 # CONFIG_COMMON_CLK_VC7 is not set
 # CONFIG_COMMON_CLK_FIXED_MMIO is not set
 CONFIG_QCOM_GDSC=y
+CONFIG_QCOM_RPMCC=y
 CONFIG_COMMON_CLK_QCOM=y
 # CONFIG_CLK_X1E80100_CAMCC is not set
 # CONFIG_CLK_X1E80100_DISPCC is not set
 # CONFIG_CLK_X1E80100_GCC is not set
 # CONFIG_CLK_X1E80100_GPUCC is not set
 # CONFIG_CLK_X1E80100_TCSRCC is not set
-# CONFIG_CLK_QCM2290_GPUCC is not set
 # CONFIG_QCOM_A53PLL is not set
 # CONFIG_QCOM_A7PLL is not set
 # CONFIG_QCOM_CLK_APCS_MSM8916 is not set
@@ -5283,7 +5198,6 @@ CONFIG_QCOM_CLK_RPMH=y
 # CONFIG_IPQ_GCC_6018 is not set
 # CONFIG_IPQ_GCC_8074 is not set
 # CONFIG_IPQ_GCC_9574 is not set
-# CONFIG_IPQ_NSSCC_QCA8K is not set
 # CONFIG_MSM_GCC_8916 is not set
 # CONFIG_MSM_GCC_8917 is not set
 # CONFIG_MSM_GCC_8939 is not set
@@ -5335,11 +5249,9 @@ CONFIG_SC_LPASSCC_8280XP=m
 # CONFIG_SDM_LPASSCC_845 is not set
 # CONFIG_SDX_GCC_75 is not set
 # CONFIG_SM_CAMCC_6350 is not set
-# CONFIG_SM_CAMCC_7150 is not set
 # CONFIG_SM_CAMCC_8250 is not set
 # CONFIG_SM_CAMCC_8450 is not set
 # CONFIG_SM_CAMCC_8550 is not set
-# CONFIG_SM_CAMCC_8650 is not set
 # CONFIG_SM_DISPCC_8250 is not set
 # CONFIG_SM_DISPCC_8650 is not set
 # CONFIG_SM_GCC_4450 is not set
@@ -5366,7 +5278,6 @@ CONFIG_SM_GCC_8350=m
 # CONFIG_SM_GPUCC_8650 is not set
 # CONFIG_SM_TCSRCC_8550 is not set
 # CONFIG_SM_TCSRCC_8650 is not set
-# CONFIG_SM_VIDEOCC_7150 is not set
 # CONFIG_SM_VIDEOCC_8150 is not set
 # CONFIG_SM_VIDEOCC_8250 is not set
 CONFIG_SM_VIDEOCC_8350=m
@@ -5403,7 +5314,6 @@ CONFIG_ARM_MHU_V3=m
 # CONFIG_ALTERA_MBOX is not set
 # CONFIG_MAILBOX_TEST is not set
 CONFIG_QCOM_APCS_IPC=m
-# CONFIG_QCOM_CPUCP_MBOX is not set
 CONFIG_QCOM_IPCC=y
 CONFIG_IOMMU_IOVA=y
 CONFIG_IOMMU_API=y
@@ -5522,9 +5432,7 @@ CONFIG_QCOM_GENI_SE=y
 CONFIG_QCOM_LLCC=m
 CONFIG_QCOM_MDT_LOADER=m
 # CONFIG_QCOM_OCMEM is not set
-CONFIG_QCOM_PD_MAPPER=m
 CONFIG_QCOM_PDR_HELPERS=m
-CONFIG_QCOM_PDR_MSG=m
 # CONFIG_QCOM_PMIC_PDCHARGER_ULOG is not set
 CONFIG_QCOM_PMIC_GLINK=m
 CONFIG_QCOM_QMI_HELPERS=m
@@ -5687,7 +5595,6 @@ CONFIG_IIO=m
 # CONFIG_AD7291 is not set
 # CONFIG_AD7292 is not set
 # CONFIG_AD7298 is not set
-# CONFIG_AD7380 is not set
 # CONFIG_AD7476 is not set
 # CONFIG_AD7606_IFACE_PARALLEL is not set
 # CONFIG_AD7606_IFACE_SPI is not set
@@ -5702,6 +5609,7 @@ CONFIG_IIO=m
 # CONFIG_AD7949 is not set
 # CONFIG_AD799X is not set
 # CONFIG_AD9467 is not set
+# CONFIG_ADI_AXI_ADC is not set
 # CONFIG_CC10001_ADC is not set
 # CONFIG_ENVELOPE_DETECTOR is not set
 # CONFIG_HI8435 is not set
@@ -5742,7 +5650,6 @@ CONFIG_QCOM_SPMI_ADC5=m
 # CONFIG_TI_ADC128S052 is not set
 # CONFIG_TI_ADC161S626 is not set
 # CONFIG_TI_ADS1015 is not set
-# CONFIG_TI_ADS1119 is not set
 # CONFIG_TI_ADS7924 is not set
 # CONFIG_TI_ADS1100 is not set
 # CONFIG_TI_ADS1298 is not set
@@ -5794,7 +5701,6 @@ CONFIG_QCOM_SPMI_ADC5=m
 # CONFIG_ATLAS_EZO_SENSOR is not set
 # CONFIG_BME680 is not set
 # CONFIG_CCS811 is not set
-# CONFIG_ENS160 is not set
 # CONFIG_IAQCORE is not set
 # CONFIG_PMS7003 is not set
 # CONFIG_SCD30_CORE is not set
@@ -5839,6 +5745,7 @@ CONFIG_QCOM_SPMI_ADC5=m
 # CONFIG_AD5504 is not set
 # CONFIG_AD5624R_SPI is not set
 # CONFIG_AD9739A is not set
+# CONFIG_ADI_AXI_DAC is not set
 # CONFIG_LTC2688 is not set
 # CONFIG_AD5686_SPI is not set
 # CONFIG_AD5696_I2C is not set
@@ -6027,7 +5934,6 @@ CONFIG_QCOM_SPMI_ADC5=m
 # CONFIG_VCNL4000 is not set
 # CONFIG_VCNL4035 is not set
 # CONFIG_VEML6030 is not set
-# CONFIG_VEML6040 is not set
 # CONFIG_VEML6070 is not set
 # CONFIG_VEML6075 is not set
 # CONFIG_VL6180 is not set
@@ -6175,7 +6081,6 @@ CONFIG_PWM=y
 # CONFIG_PWM_CLK is not set
 # CONFIG_PWM_DWC is not set
 # CONFIG_PWM_FSL_FTM is not set
-# CONFIG_PWM_GPIO is not set
 # CONFIG_PWM_PCA9685 is not set
 # CONFIG_PWM_XILINX is not set
 
@@ -6189,9 +6094,7 @@ CONFIG_ARM_GIC_V2M=y
 CONFIG_ARM_GIC_V3=y
 CONFIG_ARM_GIC_V3_ITS=y
 CONFIG_ARM_GIC_V3_ITS_PCI=y
-CONFIG_IRQ_MSI_LIB=y
 # CONFIG_AL_FIC is not set
-# CONFIG_LAN966X_OIC is not set
 # CONFIG_XILINX_INTC is not set
 CONFIG_PARTITION_PERCPU=y
 CONFIG_QCOM_PDC=y
@@ -6285,7 +6188,6 @@ CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder"
 # CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # end of Android
 
-CONFIG_TRACE_GPU_MEM=y
 # CONFIG_LIBNVDIMM is not set
 # CONFIG_DAX is not set
 CONFIG_NVMEM=y
@@ -6324,7 +6226,6 @@ CONFIG_INTERCONNECT_QCOM_BCM_VOTER=y
 # CONFIG_INTERCONNECT_QCOM_MSM8909 is not set
 # CONFIG_INTERCONNECT_QCOM_MSM8916 is not set
 # CONFIG_INTERCONNECT_QCOM_MSM8939 is not set
-# CONFIG_INTERCONNECT_QCOM_MSM8953 is not set
 # CONFIG_INTERCONNECT_QCOM_MSM8974 is not set
 # CONFIG_INTERCONNECT_QCOM_MSM8996 is not set
 CONFIG_INTERCONNECT_QCOM_OSM_L3=m
@@ -6354,7 +6255,6 @@ CONFIG_INTERCONNECT_QCOM_SC8280XP=y
 # CONFIG_INTERCONNECT_QCOM_SM8550 is not set
 # CONFIG_INTERCONNECT_QCOM_SM8650 is not set
 # CONFIG_INTERCONNECT_QCOM_X1E80100 is not set
-CONFIG_INTERCONNECT_CLK=y
 # CONFIG_COUNTER is not set
 # CONFIG_MOST is not set
 # CONFIG_PECI is not set
@@ -6383,15 +6283,7 @@ CONFIG_JBD2=y
 CONFIG_FS_MBCACHE=y
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
-CONFIG_XFS_FS=m
-CONFIG_XFS_SUPPORT_V4=y
-CONFIG_XFS_SUPPORT_ASCII_CI=y
-# CONFIG_XFS_QUOTA is not set
-# CONFIG_XFS_POSIX_ACL is not set
-# CONFIG_XFS_RT is not set
-# CONFIG_XFS_ONLINE_SCRUB is not set
-# CONFIG_XFS_WARN is not set
-# CONFIG_XFS_DEBUG is not set
+# CONFIG_XFS_FS is not set
 # CONFIG_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
 CONFIG_BTRFS_FS=y
@@ -6446,7 +6338,6 @@ CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
 #
 CONFIG_NETFS_SUPPORT=y
 # CONFIG_NETFS_STATS is not set
-# CONFIG_NETFS_DEBUG is not set
 # CONFIG_FSCACHE is not set
 # end of Caches
 
@@ -6454,7 +6345,7 @@ CONFIG_NETFS_SUPPORT=y
 # CD-ROM/DVD Filesystems
 #
 # CONFIG_ISO9660_FS is not set
-CONFIG_UDF_FS=m
+# CONFIG_UDF_FS is not set
 # end of CD-ROM/DVD Filesystems
 
 #
@@ -6674,8 +6565,6 @@ CONFIG_RANDSTRUCT_NONE=y
 # end of Security options
 
 CONFIG_XOR_BLOCKS=y
-CONFIG_ASYNC_CORE=m
-CONFIG_ASYNC_XOR=m
 CONFIG_CRYPTO=y
 
 #
@@ -6721,6 +6610,7 @@ CONFIG_CRYPTO_ECC=m
 CONFIG_CRYPTO_ECDH=m
 # CONFIG_CRYPTO_ECDSA is not set
 # CONFIG_CRYPTO_ECRDSA is not set
+# CONFIG_CRYPTO_SM2 is not set
 # CONFIG_CRYPTO_CURVE25519 is not set
 # end of Public-key cryptography
 
@@ -6805,8 +6695,7 @@ CONFIG_CRYPTO_XXHASH=y
 #
 CONFIG_CRYPTO_CRC32C=y
 CONFIG_CRYPTO_CRC32=y
-CONFIG_CRYPTO_CRCT10DIF=y
-CONFIG_CRYPTO_CRC64_ROCKSOFT=y
+# CONFIG_CRYPTO_CRCT10DIF is not set
 # end of CRCs (cyclic redundancy checks)
 
 #
@@ -6876,7 +6765,6 @@ CONFIG_CRYPTO_AES_ARM64_BS=y
 CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
 # CONFIG_CRYPTO_SM4_ARM64_CE_CCM is not set
 # CONFIG_CRYPTO_SM4_ARM64_CE_GCM is not set
-# CONFIG_CRYPTO_CRCT10DIF_ARM64_CE is not set
 # end of Accelerated Cryptographic Algorithms for CPU (arm64)
 
 CONFIG_CRYPTO_HW=y
@@ -6966,16 +6854,16 @@ CONFIG_CRYPTO_LIB_SHA256=y
 
 # CONFIG_CRC_CCITT is not set
 CONFIG_CRC16=y
-CONFIG_CRC_T10DIF=y
-CONFIG_CRC64_ROCKSOFT=y
-CONFIG_CRC_ITU_T=m
+# CONFIG_CRC_T10DIF is not set
+# CONFIG_CRC64_ROCKSOFT is not set
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
 # CONFIG_CRC32_SELFTEST is not set
 CONFIG_CRC32_SLICEBY8=y
 # CONFIG_CRC32_SLICEBY4 is not set
 # CONFIG_CRC32_SARWATE is not set
 # CONFIG_CRC32_BIT is not set
-CONFIG_CRC64=y
+# CONFIG_CRC64 is not set
 # CONFIG_CRC4 is not set
 # CONFIG_CRC7 is not set
 CONFIG_LIBCRC32C=y
@@ -7059,7 +6947,6 @@ CONFIG_NLATTR=y
 CONFIG_CLZ_TAB=y
 # CONFIG_IRQ_POLL is not set
 CONFIG_MPILIB=y
-CONFIG_DIMLIB=y
 CONFIG_LIBFDT=y
 CONFIG_OID_REGISTRY=y
 CONFIG_UCS2_STRING=y
@@ -7126,9 +7013,7 @@ CONFIG_FRAME_POINTER=y
 #
 # Generic Kernel Debugging Instruments
 #
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
-# CONFIG_MAGIC_SYSRQ_SERIAL is not set
+# CONFIG_MAGIC_SYSRQ is not set
 CONFIG_DEBUG_FS=y
 CONFIG_DEBUG_FS_ALLOW_ALL=y
 # CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set

device/community/linux-pine64-pinephonepro/APKBUILD

@@ -3,7 +3,7 @@ pkgname=linux-pine64-pinephonepro
 pkgver=6.6.0
 _pkgver=6.6
 _tagdate=20231104-22589
-pkgrel=5
+pkgrel=3
 pkgdesc="Mainline kernel for the pinephone pro"
 arch="aarch64"
 _flavor="${pkgname#linux-}"
@@ -72,5 +72,5 @@ package() {
 
 sha512sums="
 d59c410ecc1a824b7b9a38f36b224693812003320220a3464a648084152023ed8be48d0448eb8054cd2b1d42befd5e8958d3ad243e50138e1c9d0269ac2917ea  linux-ppp-6.6-20231104-22589.tar.gz
-e3a80abf986226d753b64d57893781a12a2e04e0fa19d4de8d3b4732f709aadd1c317d0a9ecf33a828975f15e7c43fb8cae9f66136886699867bbee1a679ca4e  config-pine64-pinephonepro.aarch64
+0806ec3859bb71739c59108e66fe0f45c9db384f0beab9b736627e79b45363e2c0bc466e6b584c00f91ce262bd7a4a2d14c8f14eee1bb8158c7deddd18452bda  config-pine64-pinephonepro.aarch64
 "

device/community/linux-pine64-pinephonepro/config-pine64-pinephonepro.aarch64

@@ -2,9 +2,9 @@
 # Automatically generated file; DO NOT EDIT.
 # Linux/arm64 6.6.0 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 14.2.0) 14.2.0"
+CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 13.2.1_git20240309) 13.2.1 20240309"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=140200
+CONFIG_GCC_VERSION=130201
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
 CONFIG_AS_VERSION=24200
@@ -1277,8 +1277,8 @@ CONFIG_NETFILTER_XT_MATCH_IPVS=y
 # CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
 # CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
 # CONFIG_NETFILTER_XT_MATCH_MAC is not set
-CONFIG_NETFILTER_XT_MATCH_MARK=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+# CONFIG_NETFILTER_XT_MATCH_MARK is not set
+# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
 # CONFIG_NETFILTER_XT_MATCH_NFACCT is not set
 # CONFIG_NETFILTER_XT_MATCH_OSF is not set
 # CONFIG_NETFILTER_XT_MATCH_OWNER is not set
@@ -2131,9 +2131,9 @@ CONFIG_DM_UEVENT=y
 # CONFIG_DM_VERITY is not set
 # CONFIG_DM_SWITCH is not set
 # CONFIG_DM_LOG_WRITES is not set
-CONFIG_DM_INTEGRITY=m
+# CONFIG_DM_INTEGRITY is not set
 # CONFIG_DM_ZONED is not set
-CONFIG_DM_AUDIT=y
+# CONFIG_DM_AUDIT is not set
 CONFIG_TARGET_CORE=m
 CONFIG_TCM_IBLOCK=m
 CONFIG_TCM_FILEIO=m
@@ -2478,37 +2478,7 @@ CONFIG_KEYBOARD_PINEPHONE=m
 # CONFIG_KEYBOARD_BCM is not set
 # CONFIG_KEYBOARD_CYPRESS_SF is not set
 # CONFIG_INPUT_MOUSE is not set
-CONFIG_INPUT_JOYSTICK=y
-# CONFIG_JOYSTICK_ANALOG is not set
-# CONFIG_JOYSTICK_A3D is not set
-# CONFIG_JOYSTICK_ADC is not set
-# CONFIG_JOYSTICK_ADI is not set
-# CONFIG_JOYSTICK_COBRA is not set
-# CONFIG_JOYSTICK_GF2K is not set
-# CONFIG_JOYSTICK_GRIP is not set
-# CONFIG_JOYSTICK_GRIP_MP is not set
-# CONFIG_JOYSTICK_GUILLEMOT is not set
-# CONFIG_JOYSTICK_INTERACT is not set
-# CONFIG_JOYSTICK_SIDEWINDER is not set
-# CONFIG_JOYSTICK_TMDC is not set
-# CONFIG_JOYSTICK_IFORCE is not set
-# CONFIG_JOYSTICK_WARRIOR is not set
-# CONFIG_JOYSTICK_MAGELLAN is not set
-# CONFIG_JOYSTICK_SPACEORB is not set
-# CONFIG_JOYSTICK_SPACEBALL is not set
-# CONFIG_JOYSTICK_STINGER is not set
-# CONFIG_JOYSTICK_TWIDJOY is not set
-# CONFIG_JOYSTICK_ZHENHUA is not set
-# CONFIG_JOYSTICK_AS5011 is not set
-# CONFIG_JOYSTICK_JOYDUMP is not set
-CONFIG_JOYSTICK_XPAD=m
-CONFIG_JOYSTICK_XPAD_FF=y
-CONFIG_JOYSTICK_XPAD_LEDS=y
-# CONFIG_JOYSTICK_PSXPAD_SPI is not set
-# CONFIG_JOYSTICK_PXRC is not set
-# CONFIG_JOYSTICK_QWIIC is not set
-# CONFIG_JOYSTICK_FSIA6B is not set
-# CONFIG_JOYSTICK_SENSEHAT is not set
+# CONFIG_INPUT_JOYSTICK is not set
 CONFIG_INPUT_TABLET=y
 # CONFIG_TABLET_USB_ACECAD is not set
 # CONFIG_TABLET_USB_AIPTEK is not set
@@ -4958,7 +4928,7 @@ CONFIG_USB_F_MASS_STORAGE=y
 CONFIG_USB_F_TCM=m
 CONFIG_USB_CONFIGFS=y
 # CONFIG_USB_CONFIGFS_SERIAL is not set
-CONFIG_USB_CONFIGFS_ACM=y
+# CONFIG_USB_CONFIGFS_ACM is not set
 # CONFIG_USB_CONFIGFS_OBEX is not set
 CONFIG_USB_CONFIGFS_NCM=y
 CONFIG_USB_CONFIGFS_ECM=y

device/community/linux-postmarketos-exynos4/APKBUILD

@@ -4,8 +4,8 @@
 # Kernel config based on: arch/arm/configs/exynos_defconfig
 
 pkgname=linux-postmarketos-exynos4
-pkgver=6.10.0
-pkgrel=3
+pkgver=6.7.6
+pkgrel=6
 pkgdesc="Mainline kernel fork for Samsung Exynos4 devices"
 arch="armv7"
 _carch="arm"
@@ -19,6 +19,7 @@ options="!strip !check !tracedeps
 makedepends="
 	bash
 	bison
+	busybox-static-armv7
 	findutils
 	flex
 	gmp-dev
@@ -28,7 +29,6 @@ makedepends="
 	perl
 	postmarketos-installkernel
 	xz
-	zstd
 "
 
 # Source
@@ -41,11 +41,23 @@ _tag="v${pkgver//_/-}-exynos4"
 source="
 	$pkgname-$_tag.tar.bz2::$url/-/archive/$_tag/linux-$_tag.tar.bz2
 	$_config
+	initramfs.list
+	init
+	tab3-limit-memory.patch
 "
 builddir="$srcdir/linux-$_tag"
 
+prepare_isorec() {
+	# https://wiki.postmarketos.org/wiki/Boot_process#isorec
+	cp -v /usr/$(arch_to_hostspec $arch)/bin/busybox.static \
+		"$builddir"/usr/
+	cp -v "$srcdir"/init "$builddir"/usr/
+	cp -v "$srcdir"/initramfs.list "$builddir"/usr/
+}
+
 prepare() {
 	default_prepare
+	prepare_isorec
 	cp -v "$srcdir/$_config" .config
 }
 
@@ -69,6 +81,9 @@ package() {
 }
 
 sha512sums="
-a320d0be4532f469be015e2a6706e507e89daaa55ad50d57a56451dca04b6bbea56f62d15877ef000027ce887ecd04257f9c71d7c9d80aab55607494205fa5c7  linux-postmarketos-exynos4-v6.10.0-exynos4.tar.bz2
-0a4ff7edb445bc20604e4e4d615a96ecac7d93174aa42d74b3d120b34890319262954e977748accc0c64302e79829b39216dc4f82d27a02ad672ddb775ea41ca  config-postmarketos-exynos4.armv7
+705cd617d135900cb25c8b6da7177d507e6a179b521e04aeae18080995514cbd69381a21f942ebf4d8cee427e3c60d53e6a06ed918ddcaacc243ca585ef61c11  linux-postmarketos-exynos4-v6.7.6-exynos4.tar.bz2
+4de127f68b56c380455f77610fcd6b0fd2ed8b79355fa9050ac90b0b2a9d5ad9fe3f5e81f304f8e3327e0203866ded2d6eae083847670eaa9fbdb156b50db9b8  config-postmarketos-exynos4.armv7
+aaff0332b90e1f9f62de1128cace934717336e54ab09de46477369fa808302482d97334e43a85ee8597c1bcab64d3484750103559fea2ce8cd51776156bf7591  initramfs.list
+09f1f214a24300696809727a7b04378887c06ca6f40803ca51a12bf2176a360b2eb8632139d6a0722094e05cb2038bdb04018a1e3d33fc2697674552ade03bee  init
+aea665e80dee318ec3be23d3f28b88e87eb551d2756e14d896781a0861a4387920f6969990eb171e8c7d6f86c36cef63a89337d63bfee7e44b9de7a8efb36c73  tab3-limit-memory.patch
 "

device/community/linux-postmarketos-exynos4/init

@@ -0,0 +1,20 @@
+#!/bin/busybox sh
+
+# Samsung kernels come with their own initramfs, which extract and load another
+# initramfs. Usually that depends on the recovery key combination being pressed
+# or not. For simplicity, we always boot the recovery image (from the recovery
+# partition) here.
+echo "### isorec initramfs ###"
+busybox mount -t proc proc /proc
+busybox mount -t sysfs sysfs /sys
+
+# always use the "isorec"-style lzop compressed initramfs
+# from the recovery partition
+load_image=/isorec.cpio
+busybox lzop -dc /dev/block/mmcblk0p6 > ${load_image}
+busybox cpio -iu < ${load_image}
+busybox rm ${load_image}
+
+busybox umount /sys
+busybox umount /proc
+exec /init

device/community/linux-postmarketos-exynos4/initramfs.list

@@ -0,0 +1,21 @@
+dir /dev 755 0 0
+dir /dev/block 755 0 0
+nod /dev/block/mmcblk0 600 0 0 b 179 0
+nod /dev/block/mmcblk0p1 600 0 0 b 179 1
+nod /dev/block/mmcblk0p2 600 0 0 b 179 2
+nod /dev/block/mmcblk0p3 600 0 0 b 179 3
+nod /dev/block/mmcblk0p4 600 0 0 b 179 4
+nod /dev/block/mmcblk0p5 600 0 0 b 179 5
+nod /dev/block/mmcblk0p6 600 0 0 b 179 6
+nod /dev/block/mmcblk0p7 600 0 0 b 179 7
+nod /dev/block/mmcblk0p8 600 0 0 b 179 8
+nod /dev/block/mmcblk0p9 600 0 0 b 179 9
+nod /dev/block/mmcblk0p10 600 0 0 b 179 10
+nod /dev/block/mmcblk0p11 600 0 0 b 179 11
+nod /dev/block/mmcblk0p12 600 0 0 b 179 12
+nod /dev/console 600 0 0 c 5 1
+dir /bin 755 0 0
+dir /proc 755 0 0
+dir /sys 755 0 0
+file /bin/busybox usr/busybox.static 755 0 0
+file /init usr/init 755 0 0

device/community/linux-postmarketos-exynos4/tab3-limit-memory.patch

@@ -0,0 +1,36 @@
+From 57ae04aa40be1e83e2da2fdf92de749f694ea5f8 Mon Sep 17 00:00:00 2001
+From: Artur Weber <aweber.kernel@gmail.com>
+Date: Sat, 17 Feb 2024 12:34:46 +0100
+Link: https://gitlab.com/exynos4-mainline/linux/-/merge_requests/13
+Subject: [PATCH] ARM: dts: exynos4212-tab3: Limit usable memory range
+
+The stock bootloader on the Samsung Galaxy Tab 3 8.0 provides an
+incorrect available memory range over ATAG_MEM. Limit the usable
+memory in the DTS to prevent it from doing so, without having to
+disable ATAG support.
+
+Signed-off-by: Artur Weber <aweber.kernel@gmail.com>
+---
+ arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi b/arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi
+index 87a1317f9220..996cd5cb0c07 100644
+--- a/arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi
++++ b/arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi
+@@ -45,6 +45,12 @@ chosen {
+ 		/* Default S-BOOT bootloader loads initramfs here */
+ 		linux,initrd-start = <0x42000000>;
+ 		linux,initrd-end = <0x42800000>;
++
++		/*
++		 * S-BOOT provides incorrect memory size in bootloader;
++		 * override it here
++		 */
++		linux,usable-memory-range = <0x40000000 0x3fc00000>;
+ 	};
+ 
+ 	firmware@204f000 {
+-- 
+2.44.0
+

device/community/linux-postmarketos-exynos5/APKBUILD

@@ -5,7 +5,7 @@
 
 pkgname=linux-postmarketos-exynos5
 pkgver=6.6.41
-pkgrel=3
+pkgrel=1
 pkgdesc="Mainline kernel fork for Samsung Exynos5 devices"
 arch="armv7"
 _carch="arm"
@@ -70,5 +70,5 @@ package() {
 
 sha512sums="
 f82cebbe5683baca5f1e2f7c51d3132d84e52dc553170ed21229b8c2e3d46aa5abd06b5059f8fc336034d39a9040ad96b35c704f6d027b8cd32ead0f3d9e6036  linux-postmarketos-exynos5-v6.6.41-exynos5-lts.tar.bz2
-7c35ceb606c2eb8af6e9f594d61f2cf055488bfd788602ee000da6575bb7c9cae3d6be93ebb0d2f8371acc5f357990c35e0f53bb5c597b6fc6c972a0f68bb6a4  config-postmarketos-exynos5.armv7
+ade407b0743c9411c5adea994fa6281f8cde943e42ac4229be2fc32ca96f9f59c86d211734845adcaa92a35c526996c221a590394e922e97e9e226ccc0086f38  config-postmarketos-exynos5.armv7
 "

device/community/linux-postmarketos-exynos5/config-postmarketos-exynos5.armv7

@@ -2,9 +2,9 @@
 # Automatically generated file; DO NOT EDIT.
 # Linux/arm 6.6.41 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="armv7-alpine-linux-musleabihf-gcc (Alpine 14.2.0) 14.2.0"
+CONFIG_CC_VERSION_TEXT="armv7-alpine-linux-musleabihf-gcc (Alpine 13.2.1_git20240309) 13.2.1 20240309"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=140200
+CONFIG_GCC_VERSION=130201
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
 CONFIG_AS_VERSION=24200
@@ -13,6 +13,7 @@ CONFIG_LD_VERSION=24200
 CONFIG_LLD_VERSION=0
 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
 CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
+CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=y
 CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
 CONFIG_PAHOLE_VERSION=0
@@ -139,7 +140,6 @@ CONFIG_TREE_SRCU=y
 CONFIG_NEED_SRCU_NMI_SAFE=y
 CONFIG_TASKS_RCU_GENERIC=y
 CONFIG_TASKS_RCU=y
-CONFIG_TASKS_RUDE_RCU=y
 CONFIG_TASKS_TRACE_RCU=y
 CONFIG_RCU_STALL_COMMON=y
 CONFIG_RCU_NEED_SEGCBLIST=y
@@ -5010,14 +5010,14 @@ CONFIG_USB_F_RNDIS=y
 CONFIG_USB_F_MASS_STORAGE=m
 CONFIG_USB_CONFIGFS=y
 # CONFIG_USB_CONFIGFS_SERIAL is not set
-CONFIG_USB_CONFIGFS_ACM=y
+# CONFIG_USB_CONFIGFS_ACM is not set
 # CONFIG_USB_CONFIGFS_OBEX is not set
 CONFIG_USB_CONFIGFS_NCM=y
 # CONFIG_USB_CONFIGFS_ECM is not set
 # CONFIG_USB_CONFIGFS_ECM_SUBSET is not set
 CONFIG_USB_CONFIGFS_RNDIS=y
 # CONFIG_USB_CONFIGFS_EEM is not set
-CONFIG_USB_CONFIGFS_MASS_STORAGE=y
+# CONFIG_USB_CONFIGFS_MASS_STORAGE is not set
 # CONFIG_USB_CONFIGFS_F_LB_SS is not set
 # CONFIG_USB_CONFIGFS_F_FS is not set
 # CONFIG_USB_CONFIGFS_F_UAC1 is not set
@@ -7200,21 +7200,15 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
 CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
 CONFIG_HAVE_C_RECORDMCOUNT=y
 CONFIG_HAVE_BUILDTIME_MCOUNT_SORT=y
-CONFIG_BUILDTIME_MCOUNT_SORT=y
 CONFIG_TRACE_CLOCK=y
 CONFIG_RING_BUFFER=y
 CONFIG_EVENT_TRACING=y
 CONFIG_CONTEXT_SWITCH_TRACER=y
 CONFIG_TRACING=y
-CONFIG_GENERIC_TRACER=y
 CONFIG_TRACING_SUPPORT=y
 CONFIG_FTRACE=y
 # CONFIG_BOOTTIME_TRACING is not set
-CONFIG_FUNCTION_TRACER=y
-CONFIG_FUNCTION_GRAPH_TRACER=y
-CONFIG_DYNAMIC_FTRACE=y
-CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
-# CONFIG_FUNCTION_PROFILER is not set
+# CONFIG_FUNCTION_TRACER is not set
 # CONFIG_STACK_TRACER is not set
 # CONFIG_IRQSOFF_TRACER is not set
 # CONFIG_PREEMPT_TRACER is not set
@@ -7222,6 +7216,7 @@ CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
 # CONFIG_HWLAT_TRACER is not set
 # CONFIG_OSNOISE_TRACER is not set
 # CONFIG_TIMERLAT_TRACER is not set
+CONFIG_ENABLE_DEFAULT_TRACERS=y
 # CONFIG_FTRACE_SYSCALLS is not set
 # CONFIG_TRACER_SNAPSHOT is not set
 CONFIG_BRANCH_PROFILE_NONE=y
@@ -7232,8 +7227,6 @@ CONFIG_UPROBE_EVENTS=y
 CONFIG_BPF_EVENTS=y
 CONFIG_DYNAMIC_EVENTS=y
 CONFIG_PROBE_EVENTS=y
-CONFIG_FTRACE_MCOUNT_RECORD=y
-CONFIG_FTRACE_MCOUNT_USE_RECORDMCOUNT=y
 # CONFIG_SYNTH_EVENTS is not set
 # CONFIG_USER_EVENTS is not set
 # CONFIG_HIST_TRIGGERS is not set
@@ -7241,9 +7234,6 @@ CONFIG_FTRACE_MCOUNT_USE_RECORDMCOUNT=y
 # CONFIG_TRACEPOINT_BENCHMARK is not set
 # CONFIG_RING_BUFFER_BENCHMARK is not set
 # CONFIG_TRACE_EVAL_MAP_FILE is not set
-# CONFIG_FTRACE_RECORD_RECURSION is not set
-# CONFIG_FTRACE_STARTUP_TEST is not set
-# CONFIG_FTRACE_SORT_STARTUP_TEST is not set
 # CONFIG_RING_BUFFER_STARTUP_TEST is not set
 # CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS is not set
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set

device/community/linux-postmarketos-grate/APKBUILD

@@ -4,7 +4,7 @@
 
 pkgname=linux-postmarketos-grate
 pkgver=6.6.22
-pkgrel=5
+pkgrel=3
 pkgdesc="Linux kernel with experimental patches for Tegra"
 arch="armv7"
 url="https://gitlab.com/grate-driver/linux"
@@ -49,5 +49,5 @@ package() {
 
 sha512sums="
 db25898c5c4103e12ace113de7f7eba91b41f94a4dae270c9424341e8f796a98dee8676d1d02b229b0c4b11cc79b31454a13f9f2b7b1277b5ca9bb7328d54a39  linux-postmarketos-grate-v6.6.22-lts.tar.bz2
-ecc0336c289646ad55fbf5020a9bbb3a6ed67bc27ad7f06e6ee097fb645c822d8a9d57bba72464abf141405282573791f7e53adad833e19be82e6667f0cb42ac  config-postmarketos-grate.armv7
+a8f00af80d245c3ba0fb1b755d2114817dd3659f64dc7fed8ff5d4e0f48f303dbce68f2ab3642aaf8d71caa63b83d69e828cd2bb4e71d32ad4f837cb85c9b68b  config-postmarketos-grate.armv7
 "