temp/calamares-extensions: fork, increase timeout (MR 3280)

Increase the timeout for the PartitionJob from 2 min to 10 min, so it
works on the PinePhone Pro with its 128 GiB eMMC.

Related: https://github.com/calamares/calamares-extensions/pull/20
[ci:skip-vercheck]: forked pkg intentionally not having pkgrel=0

.ci/apkbuild-lint.sh

@@ -1,22 +0,0 @@
-#!/bin/sh -e
-# Description: run apkbuild-lint on modified APKBUILDs
-# Options: native
-# Use 'native' because it requires git commit history.
-# https://postmarketos.org/pmb-ci
-
-if [ "$(id -u)" = 0 ]; then
-	set -x
-	wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
-	sh ./install_pmbootstrap.sh
-	exec su "${TESTUSER:-pmos}" -c "sh -e $0"
-fi
-
-# Wrap pmbootstrap to use this repository for --aports
-pmaports="$(cd "$(dirname "$0")"/..; pwd -P)"
-_pmbootstrap="$(command -v pmbootstrap)"
-pmbootstrap() {
-	"$_pmbootstrap" --aports="$pmaports" "$@"
-}
-
-.ci/lib/apkbuild_linting.py
-

.ci/build-aarch64.sh

@@ -1 +0,0 @@
-lib/build_changed_aports.sh

.ci/build-armv7.sh

@@ -1 +0,0 @@
-lib/build_changed_aports.sh

.ci/build-x86_64.sh

@@ -1 +0,0 @@
-lib/build_changed_aports.sh

.ci/build.sh

@@ -0,0 +1,8 @@
+#!/bin/sh -e
+# Convenience wrapper for short arch-specific build jobs in .gitlab-ci.yml
+
+export PYTHONUNBUFFERED=1
+JOB_ARCH="${CI_JOB_NAME#build-}"
+
+set -x
+su pmos -c ".ci/build_changed_aports.py $JOB_ARCH"

.ci/build_changed_aports.py

@@ -7,7 +7,7 @@ import sys
 import common
 
 # pmbootstrap
-import add_pmbootstrap_to_import_path
+import testcases.add_pmbootstrap_to_import_path
 import pmb.parse
 import pmb.parse._apkbuild
 import pmb.helpers.pmaports

.ci/check_changed_aports_versions.py

@@ -11,7 +11,7 @@ import subprocess
 import common
 
 # pmbootstrap
-import add_pmbootstrap_to_import_path  # noqa
+import testcases.add_pmbootstrap_to_import_path  # noqa
 import pmb.parse
 import pmb.parse.version
 import pmb.helpers.logging

.ci/check_devices_in_wiki.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright 2022 Oliver Smith
+# Copyright 2021 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 import argparse
@@ -13,7 +13,7 @@ def get_devices():
     """:returns: list of all devices"""
     ret = []
     pmaports = (os.path.realpath(os.path.join(os.path.dirname(__file__) +
-                "/../..")))
+                "/..")))
     for path in glob.glob(pmaports + "/device/*/device-*/"):
         device = os.path.dirname(path).split("device-", 1)[1]
 
@@ -110,7 +110,7 @@ def main():
         print("")
         print("Now it's time to add some documentation:")
         print("1) Create a device specific wiki page as described here:")
-        print("   https://wiki.postmarketos.org/wiki/Help:Device_Page")
+        print("   <https://wiki.postmarketos.org/wiki/Help:Device_Page>")
         print("2) Set 'booting = yes' in the infobox of your device page.")
         print("3) Run these tests again with an empty commit in your MR:")
         print("   $ git commit --allow-empty -m 'run tests again'")

.ci/commits.sh

@@ -1,20 +0,0 @@
-#!/bin/sh -e
-# Copyright 2022 Oliver Smith
-# SPDX-License-Identifier: GPL-3.0-or-later
-# Description: check pkgver/pkgrel bumps, amount of changed pkgs etc
-# Options: native
-# Use 'native' because it requires git commit history.
-# https://postmarketos.org/pmb-ci
-
-if [ "$(id -u)" = 0 ]; then
-	set -x
-	# In .gitlab-ci.yml currently .ci/pytest.sh runs before this and
-	# already downloads and runs install_pmbootstrap.sh.
-	if ! [ -e install_pmbootstrap.sh ]; then
-		wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
-		sh ./install_pmbootstrap.sh
-	fi
-	exec su "${TESTUSER:-pmos}" -c "sh -e $0"
-fi
-
-.ci/lib/check_changed_aports_versions.py

.ci/common.py

@@ -17,7 +17,7 @@ def get_pmaports_dir():
     global cache
     if "pmaports_dir" in cache:
         return cache["pmaports_dir"]
-    ret = os.path.realpath(os.path.join(os.path.dirname(__file__) + "/../.."))
+    ret = os.path.realpath(os.path.join(os.path.dirname(__file__) + "/.."))
     cache["pmaports_dir"] = ret
     return ret
 
@@ -190,11 +190,3 @@ def get_changed_packages():
         ret.add(os.path.basename(dirname))
 
     return ret
-
-
-def get_changed_kernels():
-    ret = []
-    for pkgname in get_changed_packages():
-        if pkgname.startswith("linux-"):
-            ret += [pkgname]
-    return ret

.ci/ec.sh

@@ -1,13 +0,0 @@
-#!/bin/sh -e
-# Description: editorconfig-checker: lint for trailing whitespaces etc.
-# https://postmarketos.org/pmb-ci
-
-if [ "$(id -u)" = 0 ]; then
-	set -x
-	apk -q add \
-		editorconfig-checker
-	exec su "${TESTUSER:-build}" -c "sh -e $0"
-fi
-
-set -x
-ec

.ci/flake8.sh

@@ -1,14 +0,0 @@
-#!/bin/sh -e
-# Description: lint CI related python scripts/tests
-# https://postmarketos.org/pmb-ci
-
-if [ "$(id -u)" = 0 ]; then
-	set -x
-	apk -q add py3-flake8
-	exec su "${TESTUSER:-build}" -c "sh -e $0"
-fi
-
-set -x
-
-# shellcheck disable=SC2046
-flake8 --ignore E501,F401,E722,W504,W605 $(find .ci -name '*.py')

.ci/grep.sh

@@ -1,24 +0,0 @@
-#!/bin/sh -e
-# Description: check various bad patterns with grep
-# https://postmarketos.org/pmb-ci
-
-if [ "$(id -u)" = 0 ]; then
-	set -x
-	apk -q add grep
-	exec su "${TESTUSER:-build}" -c "sh -e $0"
-fi
-
-# Find CHANGEMEs in APKBUILDs
-if grep -qr '(CHANGEME!)' -- *; then
-	echo "ERROR: Please replace '(CHANGEME!)' in the following files:"
-	grep --color=always -r '(CHANGEME!)' -- *
-	exit 1
-fi
-
-# DTBs installed to /usr/share/db
-# FIXME: doesn't pass currently, fix it and enable it afterwards
-# if grep -r 'INSTALL_DTBS_PATH="$pkgdir"/usr/share/dtb'; then
-# 	echo 'Please do not install dtbs to /usr/share/dtb!'
-# 	echo 'Unless you have a good reason not to, please put them in /boot/dtbs'
-# 	exit 1
-# fi

.ci/kconfig.sh

@@ -1,16 +0,0 @@
-#!/bin/sh -e
-# Description: check modified kernel configs
-# Options: native
-# Use 'native' because it requires running pmbootstrap.
-# https://postmarketos.org/pmb-ci
-
-if [ "$(id -u)" = 0 ]; then
-	set -x
-	wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
-	sh ./install_pmbootstrap.sh
-	exec su "${TESTUSER:-pmos}" -c "sh -e $0"
-fi
-
-export PYTHONUNBUFFERED=1
-
-.ci/lib/check_changed_kernels.py

.ci/lib/add_pmbootstrap_to_import_path

@@ -1 +0,0 @@
-../testcases/add_pmbootstrap_to_import_path

.ci/lib/build_changed_aports.sh

@@ -1,19 +0,0 @@
-#!/bin/sh -e
-# Description: build modified packages for this architecture
-# Options: native slow
-# https://postmarketos.org/pmb-ci
-
-if [ "$(id -u)" = 0 ]; then
-	set -x
-	wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
-	sh ./install_pmbootstrap.sh
-	exec su "${TESTUSER:-pmos}" -c "sh -e $0"
-fi
-
-export PYTHONUNBUFFERED=1
-
-# Get the architecture from the symlink we are running
-arch="$(echo "$0" | cut -d '-' -f 2 | cut -d '.' -f 1)"
-
-set -x
-.ci/lib/build_changed_aports.py "$arch"

.ci/lib/check_changed_kernels.py

@@ -1,83 +0,0 @@
-#!/usr/bin/env python3
-# Copyright 2023 Oliver Smith
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-import glob
-import tempfile
-import sys
-import subprocess
-
-# Same dir
-import common
-
-# pmbootstrap
-import add_pmbootstrap_to_import_path  # noqa
-import pmb.parse
-import pmb.helpers.logging
-
-
-def check_kconfig(args, pkgnames):
-    last_failed = None
-    for i in range(len(pkgnames)):
-        pkgname = pkgnames[i]
-        print(f"  ({i+1}/{len(pkgnames)}) {pkgname}")
-
-        apkbuild_path = pmb.helpers.pmaports.find(args, pkgname)
-        apkbuild = pmb.parse._apkbuild.apkbuild(f"{apkbuild_path}/APKBUILD")
-
-        options = []
-
-        for opt in apkbuild["options"]:
-            if "pmb:kconfigcheck" in opt:
-                options += [opt]
-
-        if len(options):
-            options.sort()
-            print(f'options="{" ".join(options)}"')
-
-        if "!pmb:kconfigcheck" in apkbuild["options"]:
-            print("skipped (!pmb:kconfigcheck)")
-            continue
-
-        if not pmb.parse.kconfig.check(args, pkgname, details=True):
-            last_failed = pkgname
-
-    return last_failed
-
-
-def show_error(last_failed):
-    print("")
-    print("Please adjust your kernel config. This is required for getting your"
-          " patch merged.")
-    print("")
-    print("Edit your kernel config:")
-    print(f"  pmbootstrap kconfig edit {last_failed}")
-    print("")
-    print("Test this kernel config again:")
-    print(f"  pmbootstrap kconfig check {last_failed}")
-    print("")
-    print("Run this check again (on all kernels you modified):")
-    print("  pmbootstrap ci kconfig")
-    print("")
-
-
-if __name__ == "__main__":
-    common.add_upstream_git_remote()
-    pkgnames = common.get_changed_kernels()
-    print(f"Changed kernels: {pkgnames}")
-
-    if len(pkgnames) == 0:
-        print("No kernels changed in this branch")
-        exit(0)
-
-    # Initialize args (so we can use pmbootstrap's kconfig parsing)
-    sys.argv = ["pmbootstrap", "kconfig", "check"]
-    args = pmb.parse.arguments()
-    pmb.helpers.logging.init(args)
-
-    print("Running kconfig check on changed kernels...")
-    last_failed = check_kconfig(args, pkgnames)
-
-    if last_failed:
-        show_error(last_failed)
-        exit(1)

.ci/lib/gitlab_prepare_ci.sh

@@ -1,17 +0,0 @@
-#!/bin/sh -e
-# Copyright 2022 Oliver Smith
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-if ! mount | grep -q /proc/sys/fs/binfmt_misc; then
-	echo "Mounting binfmt_misc"
-	mount -t binfmt_misc none /proc/sys/fs/binfmt_misc
-fi
-
-if id "build" > /dev/null 2>&1; then
-	echo "User 'build' exists already"
-else
-	echo "Creating build user"
-	adduser -D build
-	chown -R build:build .
-	echo 'build ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers
-fi

.ci/move_logs.sh

@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 if [ -z "$1" ]; then
-	echo "usage: $(basename "$0") \$CI_PROJECT_DIR"
+	echo "usage: $(basename $0) \$CI_PROJECT_DIR"
 	exit 1
 fi
 

.ci/run_testcases.sh

@@ -1,26 +1,15 @@
 #!/bin/sh -e
-# Copyright 2022 Oliver Smith
+# Copyright 2021 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later
-# Description: lint with various python tests
-# Options: native
-# Use 'native' because it requires pmbootstrap.
-# https://postmarketos.org/pmb-ci
 
-if [ "$(id -u)" = 0 ]; then
-	set -x
-	wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
-	sh ./install_pmbootstrap.sh pytest
-	exec su "${TESTUSER:-pmos}" -c "sh -e $0"
-fi
-
-# Require pytest to be installed on the host system
-if [ -z "$(command -v pytest)" ]; then
-	echo "ERROR: pytest command not found, make sure it is in your PATH."
+# Require pmbootstrap
+if ! command -v pmbootstrap > /dev/null; then
+	echo "ERROR: pmbootstrap needs to be installed."
 	exit 1
 fi
 
 # Wrap pmbootstrap to use this repository for --aports
-pmaports="$(cd "$(dirname "$0")"/..; pwd -P)"
+pmaports="$(cd $(dirname $0)/..; pwd -P)"
 _pmbootstrap="$(command -v pmbootstrap)"
 pmbootstrap() {
 	"$_pmbootstrap" --aports="$pmaports" "$@"
@@ -34,7 +23,6 @@ pmbootstrap -q shutdown
 # Make sure we have a valid device (pmbootstrap#1128)
 device="$(pmbootstrap config device)"
 deviceinfo="$pmaports/device/*/device-$device/deviceinfo"
-# shellcheck disable=SC2086
 if ! [ -e $deviceinfo ]; then
 	echo "ERROR: Could not find deviceinfo file for selected device '$device'."
 	echo "Expected path: $deviceinfo"

.ci/shellcheck.sh

@@ -1,15 +1,16 @@
 #!/bin/sh -e
-# Copyright 2022 Oliver Smith
+# Copyright 2021 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later
-# Description: lint all shell scripts
-# https://postmarketos.org/pmb-ci
 
-DIR="$(cd "$(dirname "$0")/.." && pwd -P)"
+set -e
+DIR="$(cd "$(dirname "$0")" && pwd -P)"
+cd "$DIR/.."
 
-if [ "$(id -u)" = 0 ]; then
-	set -x
-	apk -q add shellcheck
-	exec su "${TESTUSER:-build}" -c "sh -e $0"
+# Find CHANGEMEs in APKBUILDs
+if grep -qr '(CHANGEME!)' *; then
+	echo "ERROR: Please replace '(CHANGEME!)' in the following files:"
+	grep --color=always -r '(CHANGEME!)' *
+	exit 1
 fi
 
 # Shell: shellcheck
@@ -23,10 +24,12 @@ sh_files="
 	./main/postmarketos-mkinitfs-hook-debug-shell/20-debug-shell.sh
 	./main/postmarketos-mkinitfs-hook-netboot/netboot.sh
 	./main/postmarketos-update-kernel/update-kernel.sh
+	./main/swclock-offset/swclock-offset-boot.sh
+	./main/swclock-offset/swclock-offset-shutdown.sh
 	./main/ttyescape/*.post-install
 	./main/unl0kr/unlock.sh
+	./main/msm-firmware-loader/*.sh
 	./main/msm-firmware-loader/*.post-install
-	./device/community/soc-qcom-sdm845/call_audio_idle_suspend_workaround.sh
 
 	$(find . -path './main/postmarketos-ui-*/*.sh')
 	$(find . -path './main/postmarketos-ui-*/*.pre-install')
@@ -42,9 +45,8 @@ sh_files="
 
 	$(find . -path '.ci/*.sh')
 "
-
 for file in $sh_files; do
 	echo "Test with shellcheck: $file"
-	cd "$DIR/$(dirname "$file")"
+	cd "$DIR/../$(dirname "$file")"
 	shellcheck -e SC1008 -x "$(basename "$file")"
 done

.ci/testcases/test_device.py

@@ -16,18 +16,20 @@ def device_dependency_check(apkbuild, path):
     """ Raise an error if a device package has a dependency that is not allowed
         (e.g. because it should be in a subpackage instead). """
 
+    # asus-me176c: without this, the device will simply run the broken ACPI
+    #              DSDT table, so we might as well update it. See pmaports!699.
+    firmware_ok = {"device-asus-me176c": ["firmware-asus-me176c-acpi"]}
+
+    pkgname = apkbuild["pkgname"]
     for depend in apkbuild["depends"]:
-        if depend == "linux-firmware-none":
-            continue
         if (depend.startswith("firmware-") or
                 depend.startswith("linux-firmware")):
+            if pkgname in firmware_ok and depend in firmware_ok[pkgname]:
+                continue
             raise RuntimeError("Firmware package '" + depend + "' found in"
                                " depends of " + path + ". These go into"
                                " subpackages now, see"
                                " <https://postmarketos.org/devicepkg>.")
-        if depend == "mesa-dri-gallium":
-            raise RuntimeError(f"{path}: mesa-dri-gallium shouldn't be in"
-                               " depends anymore (see pmaports!3478)")
 
 
 def test_aports_device(args):
@@ -81,7 +83,7 @@ def test_aports_device_kernel(args):
         # Parse kernels from depends
         kernels_depends = []
         for depend in apkbuild["depends"]:
-            if not depend.startswith("linux-") or depend.startswith("linux-firmware-"):
+            if not depend.startswith("linux-"):
                 continue
             kernels_depends.append(depend)
 

.ci/testcases/test_deviceinfo.py

@@ -3,10 +3,9 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 import glob
-import os
 import pytest
-import re
 import sys
+import os
 
 import add_pmbootstrap_to_import_path
 import pmb.parse
@@ -17,15 +16,12 @@ def deviceinfo_obsolete(info):
     Test for obsolete options used in the deviceinfo file. They must still be
     defined in pmbootstrap's config/__init__.py.
     """
-    obsolete_options = [
-        "usb_rndis_function",
-        "weston_pixman_type",
-    ]
+    obsolete_options = ["weston_pixman_type"]
     for option in obsolete_options:
-        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)")
+        if info[option]:
+            raise RuntimeError("option '" + option + "' is obsolete, please"
+                               " remove it (reasons for removal are at"
+                               " <https://postmarketos.org/deviceinfo>)")
 
 
 def test_deviceinfo(args):
@@ -35,8 +31,6 @@ def test_deviceinfo(args):
     # Iterate over all devices
     last_exception = None
     count = 0
-    pattern = re.compile("^deviceinfo_[a-zA-Z0-9_]*=\".*\"$")
-
     for folder in glob.glob(args.aports + "/device/*/device-*"):
         device = folder[len(args.aports):].split("-", 1)[1]
 
@@ -45,26 +39,11 @@ def test_deviceinfo(args):
         f.close()
 
         try:
+            # variable can not be empty
             for line in lines:
-                # Require space after # for comments
-                if line.startswith("#") and not line.startswith("# "):
-                    raise RuntimeError("Comment style: please change '#' to"
-                                       f" '# ': {line}")
-
-                # Skip empty lines and comments
-                if not line or line.startswith("# "):
-                    continue
-
-                # Variable can not be empty
                 if '=""' in line:
                     raise RuntimeError("Please remove the empty variable: " + line)
 
-                # Check line against regex (can't use multiple lines etc.)
-                if not pattern.match(line) or line.endswith("\\\""):
-                    raise RuntimeError("Line looks invalid, maybe missing"
-                                       " quotes/multi-line string/comment next"
-                                       f" to line instead of above? {line}")
-
             # Successful deviceinfo parsing / obsolete options
             info = pmb.parse.deviceinfo(args, device)
             deviceinfo_obsolete(info)

.ci/testcases/test_firmware.py

@@ -15,10 +15,8 @@ def test_aports_firmware(args):
     """
 
     excluded = [
-        "firmware-motorola-ali",  # Depends on firmware-qcom-adreno-a530
         "firmware-motorola-potter",  # Depends on soc-qcom-msm8916-ucm
         "firmware-oneplus-msm8998",  # Depends on soc-qcom-sdm845-nonfree-firmware
-        "firmware-xiaomi-sagit",  # Depends on soc-qcom-sdm845-nonfree-firmware
         "firmware-samsung-baffinlite",  # Depends on firmware-aosp-broadcom-wlan
         "firmware-samsung-crespo",  # Depends on firmware-aosp-broadcom-wlan
         "firmware-samsung-maguro",  # Depends on firmware-aosp-broadcom-wlan
@@ -43,8 +41,3 @@ def test_aports_firmware(args):
             raise RuntimeError(f"{aport_name}: \"!tracedeps\" missing in"
                                " options= line. The tracedeps option is superfluous"
                                " for firmware packages.")
-
-        if "noarch" in apkbuild["arch"]:
-            raise RuntimeError(f"{aport_name}: \"arch\" must not be \"noarch\"!"
-                               " Please limit this firmware package to the"
-                               " required architectures only!")

.ci/testcases/test_kernel.py

@@ -34,9 +34,9 @@ def test_aports_kernel(args):
                                    " pmbootstrap installs cross-compiler"
                                    " automatically.")
 
-        # check some options only for main and community devices
+        # nftables support in kernels used by main and community devices
         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.")
+                assert pmb.parse.kconfig.check(args,
+                                               aport_name.replace("linux-", ""),
+                                               force_nftables_check=True)

.ci/testcases/test_provides.py

@@ -1,87 +0,0 @@
-#!/usr/bin/env python3
-# Copyright 2022 Oliver Smith
-# SPDX-License-Identifier: GPL-3.0-or-later
-import glob
-import logging
-import os
-import pytest
-import sys
-
-import add_pmbootstrap_to_import_path
-import pmb.parse
-import pmb.parse._apkbuild
-
-
-def apkbuild_check_provides(path, apkbuild, version, pkgname, subpkgname=None):
-    """
-    Verify that a package or subpackage is using provides correctly.
-
-    :param path: to the APKBUILD for the error message
-    :param apkbuild: either the full return of pmb.parse.apkbuild() or a
-                     subpackage of it (apkbuild["subpackages"][$subpkgname])
-    :param version: like 1.0.0-r3 so we can check against it
-    :param pkgname: package name
-    :param subpkgname: subpackage name, if we are looking at a subpackage
-    :returns: list of error strings
-    """
-    name = pkgname
-    if subpkgname:
-        name = f"{pkgname}:{subpkgname}"
-
-    logging.info(f"{name}: checking provides")
-    ret = []
-
-    if not apkbuild["provides"]:
-        return ret
-
-    for provide in apkbuild["provides"]:
-        # Having provides entries without version is valid if the
-        # provider_priorty is also set (pma#1766)
-        if apkbuild["provider_priority"]:
-            continue
-        # Otherwise the version =$pkgver-r$pkgrel needs to be set. pmbootstrap
-        # already replaces the variables, so we check against the inserted
-        # values here.
-        if not provide.endswith(f"={version}"):
-            provide_no_ver = provide.split("=", 1)[0]
-
-            error = f"error in {path}:\n"
-            if subpkgname:
-                error += f"in subpackage:\n  {subpkgname}\n"
-            else:
-                error += f"in package:\n  {pkgname}\n"
-            error += f"broken provides entry:\n  {provide_no_ver}\n"
-            error += "\n"
-            error += "This provides entry needs to be changed to"
-            error += f" '{provide_no_ver}=$pkgver-r$pkgrel'"
-            error += " (do not replace the variables, without '').\n"
-            error += "\n"
-            error += "If you know what you are doing and didn't add the"
-            error += " version on purpose, you also need to set a"
-            error += " provider_priority (pma#1766).\n"
-            error += "Reference:"
-            error += " https://wiki.alpinelinux.org/wiki/APKBUILD_Reference#provides"
-            ret += [error]
-    return ret
-
-
-def test_provides(args):
-    errors = []
-    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 = os.path.relpath(path, args.aports)
-        errors += apkbuild_check_provides(path_rel, apkbuild, version, pkgname)
-
-        for subpkg, subpkg_data in apkbuild["subpackages"].items():
-            if not subpkg_data:
-                # default packaging function like -doc
-                continue
-            errors += apkbuild_check_provides(path_rel, subpkg_data, version,
-                                              pkgname, subpkg)
-
-    if errors:
-        for error in errors:
-            logging.error(error)
-        raise RuntimeError(f"test_provides failed with {len(errors)} errors")

.ci/testcases/test_source.py

@@ -1,152 +0,0 @@
-#!/usr/bin/env python3
-# Copyright 2022 Oliver Smith
-# SPDX-License-Identifier: GPL-3.0-or-later
-# Various checks on source= in the APKBUILDs
-
-import glob
-import logging
-import os
-import pytest
-import sys
-
-import add_pmbootstrap_to_import_path
-import pmb.parse
-import pmb.parse._apkbuild
-import pmb.parse.apkindex
-import pmb.helpers.repo
-
-
-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
-    to parse shell code (like in postmarketos-base).
-
-    :param apkbuild_path: full path to the APKBUILD
-    :returns: dict of parsed "source" filenames and checksums, e.g.:
-              {"first.patch": "b4dc4f3…",
-               "second.patch": "b4dc4f3…"}
-    """
-    start = 'sha512sums="'
-    in_block = False
-    ret = {}
-
-    with open(apkbuild_path, encoding="utf-8") as handle:
-        for line in handle.readlines():
-            # Find start
-            if not in_block:
-                if line.startswith(start):
-                    in_block = True
-                else:
-                    continue
-
-            # sha512sums may have lines without checksums:
-            # https://gitlab.alpinelinux.org/alpine/abuild/-/merge_requests/73
-            if "  " not in line:
-                continue
-
-            try:
-                checksum, filename = line.rstrip().split("  ", 2)
-            except ValueError:
-                raise ValueError("Failed to parse checksums. Try to delete the"
-                                 " checksums and generate them again with"
-                                 f" 'pmbootstrap checksum': {apkbuild_path}")
-
-            # Cut off 'sha512sums="' if the first checksum is in that line
-            if checksum.startswith(start):
-                checksum = checksum[len(start):]
-
-            # Find end
-            if filename.endswith('"'):
-                filename = filename[:-1]
-
-            ret[filename] = checksum
-    return ret
-
-
-def test_aports_unreferenced_files(args):
-    """
-    Raise an error if an unreferenced file is found
-    """
-    for apkbuild_path in glob.iglob(args.aports + "/**/APKBUILD", recursive=True):
-        # pmbootstrap parser has some issues with complicated APKBUILDs, skip those.
-        if apkbuild_path.startswith(args.aports + "/cross/"):
-            continue
-
-        apkbuild = pmb.parse.apkbuild(apkbuild_path)
-        sources_chk = parse_source_from_checksums(args, apkbuild_path)
-
-        # Collect files from subpackages
-        subpackage_installs = []
-        subpackage_triggers = []
-        if apkbuild["subpackages"]:
-            for subpackage in apkbuild["subpackages"].values():
-                if not subpackage:
-                    continue
-                subpackage_installs += subpackage.get("install", [])
-                subpackage_triggers += subpackage.get("triggers", [])
-
-        # Collect trigger files
-        trigger_sources = []
-        for trigger in apkbuild["triggers"] + subpackage_triggers:
-            trigger_sources.append(trigger.split("=")[0])
-
-        dirname = os.path.dirname(apkbuild_path)
-        for file in glob.iglob(dirname + "/**", recursive=True):
-            rel_file_path = os.path.relpath(file, dirname)
-            # Skip APKBUILDs and directories
-            if rel_file_path == "APKBUILD" or os.path.isdir(file):
-                continue
-
-            if os.path.basename(rel_file_path) not in sources_chk \
-                    and rel_file_path not in apkbuild["install"] \
-                    and rel_file_path not in subpackage_installs \
-                    and rel_file_path not in trigger_sources:
-                raise RuntimeError(f"{apkbuild_path}: found unreferenced file: {rel_file_path}")
-
-
-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
-    downloaded source files in a flat distfiles directory. So if two APKBUILDs
-    both download a file with the same filename but different checksum, and the
-    user builds both after each other, abuild will fail on the second build
-    with a checksum error.
-    """
-    source_all = {}
-    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 = 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
-            # iglob, because we don't want an iterator.
-            if glob.glob(f"{dir_path}/**/{filename}", recursive=True):
-                continue
-
-            # First time seeing this file
-            if filename not in source_all:
-                source_all[filename] = {"checksum": checksum,
-                                        "apkbuild_rel": apkbuild_rel}
-                continue
-
-            # Saw this file already with same checksum
-            if checksum == source_all[filename]["checksum"]:
-                continue
-
-            # Saw this file already with different checksum
-            logging.error("")
-            logging.error(f"ERROR: the source file '{filename}' has different"
-                          " checksums in the following files:")
-            logging.error(f"- {source_all[filename]['apkbuild_rel']}:")
-            logging.error(f"  {source_all[filename]['checksum']}")
-            logging.error(f"- {apkbuild_rel}:")
-            logging.error(f"  {checksum}")
-            logging.error("")
-            logging.error("Fix this by setting a different target filename in"
-                          " the package you modified:")
-            logging.error("https://wiki.alpinelinux.org/wiki/APKBUILD_Reference#source")
-            logging.error("")
-            raise RuntimeError(f"Conflict with source file '{filename}'")

.ci/testcases/test_unreferenced_files.py

@@ -0,0 +1,97 @@
+#!/usr/bin/env python3
+# Copyright 2021 Oliver Smith
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+import glob
+import pytest
+import sys
+import os
+
+import add_pmbootstrap_to_import_path
+import pmb.parse
+import pmb.parse._apkbuild
+import pmb.parse.apkindex
+import pmb.helpers.repo
+
+
+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
+    to parse shell code (like in postmarketos-base).
+
+    :param apkbuild_path: full path to the APKBUILD
+    :returns: list of parsed "source" files, e.g.:
+              ["first.patch", "second.patch"]
+    """
+    start = 'sha512sums="'
+    in_block = False
+    ret = []
+
+    with open(apkbuild_path, encoding="utf-8") as handle:
+        for line in handle.readlines():
+            # Find start
+            if not in_block:
+                if line.startswith(start):
+                    in_block = True
+                else:
+                    continue
+
+            # sha512sums may have lines without checksums:
+            # https://gitlab.alpinelinux.org/alpine/abuild/-/merge_requests/73
+            if "  " not in line:
+                continue
+
+            try:
+                _, filename = line.rstrip().split("  ", 2)
+            except ValueError:
+                raise ValueError("Failed to parse checksums. Try to delete the"
+                                 " checksums and generate them again with"
+                                 f" 'pmbootstrap checksum': {apkbuild_path}")
+
+            # Find end
+            if filename.endswith('"'):
+                ret += [filename[:-1]]
+                break
+
+            ret += [filename]
+    return ret
+
+
+def test_aports_unreferenced_files(args):
+    """
+    Raise an error if an unreferenced file is found
+    """
+    for apkbuild_path in glob.iglob(args.aports + "/**/APKBUILD", recursive=True):
+        apkbuild = pmb.parse.apkbuild(apkbuild_path)
+        sources_chk = parse_source_from_checksums(args, apkbuild_path)
+
+        # Collect install files from subpackages
+        subpackage_installs = []
+        if apkbuild["subpackages"]:
+            for subpackage in apkbuild["subpackages"].values():
+                if not subpackage:
+                    continue
+                try:
+                    subpackage_installs += subpackage["install"]
+                except KeyError:
+                    continue
+
+        # Collect trigger files
+        trigger_sources = []
+        if apkbuild["triggers"]:
+            for trigger in apkbuild["triggers"]:
+                trigger_sources.append(trigger.split("=")[0])
+
+        dirname = os.path.dirname(apkbuild_path)
+        for file in glob.iglob(dirname + "/**", recursive=True):
+            rel_file_path = os.path.relpath(file, dirname)
+            # Skip APKBUILDs and directories
+            if rel_file_path == "APKBUILD" or os.path.isdir(file):
+                continue
+
+            if os.path.basename(rel_file_path) not in sources_chk \
+                    and rel_file_path not in apkbuild["install"] \
+                    and rel_file_path not in subpackage_installs \
+                    and rel_file_path not in trigger_sources:
+                raise RuntimeError(f"{apkbuild_path}: found unreferenced file: {rel_file_path}")

.ci/wiki.sh

@@ -1,15 +0,0 @@
-#!/bin/sh -e
-# Description: verify devices are documented in the wiki
-# Options: native
-# Run natively so we don't need to set up a chroot, python3 is the only dep.
-# https://postmarketos.org/pmb-ci
-
-if [ "$(id -u)" = 0 ]; then
-	set -x
-	apk -q add \
-		python3
-	exec su "${TESTUSER:-build}" -c "sh -e $0"
-fi
-
-set -x
-.ci/lib/check_devices_in_wiki.py --booting

.ecrc

@@ -1,4 +0,0 @@
-{
-  "Version": "2.6.0",
-  "SpacesAftertabs": true
-}

.editorconfig

@@ -7,8 +7,8 @@
 # Top-most EditorConfig file.
 root = true
 
-[{**.{md,ini,sh,rules,nft},**/APKBUILD}]
+[**/APKBUILD]
 indent_style = tab
 end_of_line = lf
-trim_trailing_whitespace = true
 insert_final_newline = true
+trim_trailing_whitespace = true

.gitignore

@@ -20,6 +20,7 @@ dist/
 downloads/
 eggs/
 .eggs/
+lib/
 lib64/
 parts/
 sdist/

.gitlab-ci.yml

@@ -3,7 +3,7 @@
 # global settings
 image: alpine:latest
 after_script:
-  - .ci/lib/move_logs.sh $CI_PROJECT_DIR
+  - .ci/move_logs.sh $CI_PROJECT_DIR
 stages:
   - lint
   - build
@@ -14,11 +14,11 @@ stages:
 # merge request ID is not available. This means, we must set the "only"
 # variable accordingly - and if we only do it for one job, all other jobs will
 # not get executed. So have the defaults here, and use them in all jobs that
-# should run on both the v22.12 branch, and in merge requests.
+# should run on both the v22.06 branch, and in merge requests.
 # https://docs.gitlab.com/ee/ci/merge_request_pipelines/index.html#excluding-certain-jobs
 .only-default: &only-default
   only:
-    - v22.12
+    - v22.06
     - merge_requests
     - tags
 
@@ -31,12 +31,13 @@ wiki:
       - merge_requests
     changes:
       - device/*/device-*/*
+  before_script:
+    - apk -q add python3
   script:
-    - .ci/lib/gitlab_prepare_ci.sh
-    - .ci/wiki.sh
+    - .ci/check_devices_in_wiki.py --booting
 
 # testcases linting
-flake8:
+testcases-linting:
   stage: lint
   <<: *only-default
   only:
@@ -48,36 +49,28 @@ flake8:
   before_script:
     - apk -q add py-flake8
   script:
-    - .ci/lib/gitlab_prepare_ci.sh
-    - .ci/flake8.sh
+    - flake8 --ignore E501,F401,E722,W504,W605
 
-# shellcheck and various grep checks
-shellcheck-grep:
+# shellcheck
+shellcheck:
   stage: lint
   <<: *only-default
   image: alpine:edge
+  before_script:
+    - apk -q add shellcheck
   script:
-    - .ci/lib/gitlab_prepare_ci.sh
     - .ci/shellcheck.sh
-    - .ci/grep.sh
-
-editor-config:
-  stage: lint
-  <<: *only-default
-  image: alpine:edge
-  script:
-    - .ci/lib/gitlab_prepare_ci.sh
-    - .ci/ec.sh
-  allow_failure: true
 
 # aports checks (generic)
-pytest-commits:
+aports-static:
   stage: lint
   <<: *only-default
+  before_script:
+    - wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
+    - sh ./install_pmbootstrap.sh pytest
   script:
-    - .ci/lib/gitlab_prepare_ci.sh
-    - .ci/pytest.sh
-    - .ci/commits.sh
+    - su pmos -c ".ci/run_testcases.sh"
+    - su pmos -c ".ci/check_changed_aports_versions.py"
   artifacts:
     when: on_failure
     paths:
@@ -86,12 +79,26 @@ pytest-commits:
       - pmbootstrap.cfg
     expire_in: 1 week
 
+distfile-check:
+  stage: lint
+  <<: *only-default
+  before_script:
+    - apk -q add make findutils
+    - wget "https://gitlab.com/postmarketOS/ci-common/-/archive/master/ci-common-master.tar.bz2"
+    - tar -xf ci-common-master.tar.bz2
+    - mv ci-common-master/distfile-check/*.sh ci-common-master/distfile-check/Makefile .
+    - rm -r ci-common-master ci-common-master.tar.bz2
+  script:
+    - make -j999
+
 # APKBUILD linting
 aport-lint:
   stage: lint
+  before_script:
+    - wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
+    - sh ./install_pmbootstrap.sh
   script:
-    - .ci/lib/gitlab_prepare_ci.sh
-    - .ci/apkbuild-lint.sh
+    - su pmos -c ".ci/apkbuild-linting.py"
   only:
     - merge_requests
   allow_failure: true
@@ -101,14 +108,16 @@ kernel-kconfig:
   stage: lint
   only:
     refs:
-      - v22.12
+      - v22.06
       - merge_requests
     changes:
       - device/*/linux-*/config-*
       - main/linux-*/config-*
+  before_script:
+    - wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
+    - sh ./install_pmbootstrap.sh pytest
   script:
-    - .ci/lib/gitlab_prepare_ci.sh
-    - .ci/kconfig.sh
+    - su pmos -c "pmbootstrap kconfig check"
 
 # MR settings
 # (Checks for "Allow commits from members who can merge to the target branch")
@@ -127,26 +136,21 @@ mr-settings:
   stage: build
   <<: *only-default
   before_script:
-    - .ci/lib/gitlab_prepare_ci.sh
-  after_script:
+    - wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
+    - sh ./install_pmbootstrap.sh
+  script:
+    - .ci/build.sh
     - cp -r /home/pmos/.local/var/pmbootstrap/packages/ packages/ || true
   artifacts:
     expire_in: 1 week
     paths:
       - packages/
-  timeout: 10 h
 
 build-x86_64:
   extends: .build
-  script:
-    - .ci/build-x86_64.sh
 
 build-aarch64:
   extends: .build
-  script:
-    - .ci/build-aarch64.sh
 
 build-armv7:
   extends: .build
-  script:
-    - .ci/build-armv7.sh

CODEOWNERS

@@ -1,77 +1,14 @@
 # https://docs.gitlab.com/ee/user/project/code_owners.html
 
-device/*/*-htc-golfu/				@Newbyte
-device/*/*-pine64-pinephone/			@craftyguy @milesalan @bshah @proycon @anjandev @StacyHarper
-device/*/*-htc-m8qlul/				@Newbyte
-device/*/*-purism-librem5/			@craftyguy @bshah
-device/*/device-lg-judyln/			@Newbyte
-device/*/device-samsung-m0/			@Newbyte
-device/*/linux-postmarketos-exynos4/		@Newbyte
-device/*/linux-postmarketos-msm8939/		@Newbyte
-device/*/linux-postmarketos-stericsson/		@Newbyte
-device/*/*-qcom-sdm845/				@sdm845-mainline
-device/*/*-xiaomi-berrylium/ 			@joelselvaraj
-device/*/device-oneplus-enchilada/		@calebccff
-device/*/device-oneplus-fajita/			@calebccff
-device/*/firmware-oneplus-sdm845/		@calebccff
-device/*/device-shift-axolotl/			@amartinz @calebccff @dylanvanassche
-device/*/*-lenovo-a6010/			@jenneron
-device/*/*-lenovo-a6000/			@jenneron
-device/*/device-microsoft-surface-rt/		@jenneron
-device/*/device-google-fennel/			@jenneron
-device/*/device-google-veyron-minnie/		@jenneron
-device/*/device-google-burnet/			@jenneron
-device/*/device-google-elm/			@jenneron
-device/*/device-google-nyan-big/		@jenneron
-device/*/device-google-peach-pi/		@jenneron
-device/*/device-google-veyron-speedy/		@jenneron
-device/*/linux-google-veyron/			@jenneron
-device/*/u-boot-peach-pi/			@jenneron
-device/*/device-google-cozmo/			@jenneron
-device/*/u-boot-veyron-speedy/			@jenneron
-device/*/device-google-juniper/			@jenneron @binarycraft
-device/*/u-boot-peach-pit/			@jenneron
-device/*/device-google-damu/			@jenneron
-device/*/u-boot-nyan-4gb/			@jenneron
-device/*/device-google-kenzo/			@jenneron
-device/*/device-google-kodama/			@jenneron
-device/*/u-boot-snow/				@jenneron
-device/*/device-google-kevin/			@jenneron
-device/*/linux-postmarketos-exynos5/		@jenneron
-device/*/device-google-krane/			@jenneron
-device/*/soc-mediatek-mt8183/			@jenneron
-device/*/u-boot-veyron-minnie/			@jenneron
-device/*/device-google-fennel14/		@jenneron
-device/*/linux-google-nyan/			@jenneron
-device/*/device-google-willow/			@jenneron
-device/*/linux-postmarketos-mediatek-mt8173/	@jenneron
-device/*/linux-postmarketos-mediatek-mt8183/	@jenneron @binarycraft
-device/*/device-google-nyan-blaze/		@jenneron
-device/*/firmware-powervr-gx6250/		@jenneron
-device/*/device-google-hana/			@jenneron
-device/*/device-google-snow/			@jenneron
-device/*/device-google-kappa/			@jenneron
-device/*/u-boot-nyan-2gb/			@jenneron
-device/*/device-google-veyron-jerry/		@jenneron
-device/*/device-google-kakadu/			@jenneron
-device/*/firmware-google-veyron-brcm/		@jenneron
-device/*/device-google-peach-pit/		@jenneron
-device/*/device-lg-judyp/			@jenneron
-device/*/device-asus-tf201/			@clamor95
-device/*/device-asus-tf300t/			@clamor95
-device/*/device-asus-tf300tg/			@clamor95
-device/*/device-asus-tf700t/			@clamor95
-device/*/device-lg-p895/			@clamor95
-device/*/firmware-asus-transformer/		@clamor95 @jenneron
-device/*/firmware-lg-x3/			@clamor95
-device/*/linux-postmarketos-grate/		@clamor95 @jenneron
+device/*/*-pine64-pinephone/        @craftyguy @milesalan @bshah @proycon @anjandev @StacyHarper
+device/*/*-purism-librem5/          @craftyguy @bshah
+main/osk-sdl/                       @craftyguy
+main/postmarketos-ui-plasma-mobile/ @bshah
+temp/u-boot-librem5/                @craftyguy @bshah
+device/community/*-qcom-sdm845      @calebccff @joelselvaraj
+device/community/device-oneplus-enchilada   @calebccff
+device/community/device-oneplus-fajita      @calebccff
+main/ttyescape                      @calebccff
+device/community/*-xiaomi-berrylium @joelselvaraj
 
-main/postmarketos-update-depthcharge-kernel/	@jenneron
-main/osk-sdl/					@craftyguy
-main/postmarketos-ui-plasma-mobile/ 		@bshah
-main/ttyescape					@calebccff
-temp/u-boot-librem5/				@craftyguy @bshah
-temp/alsa-ucm-conf-google-kukui/		@jenneron @binarycraft
-temp/alsa-ucm-conf-google-gru/			@jenneron
-
-# vim: ts=8 sw=4 et
+# vim: ts=4 sw=4 et

README.md

@@ -5,4 +5,4 @@ Helpful resources:
 * [APKBUILD reference](https://wiki.alpinelinux.org/wiki/APKBUILD_Reference)
 * [Alpine Linux aports](https://gitlab.alpinelinux.org/alpine/aports/)
 * [Alpine Linux package search](https://pkgs.alpinelinux.org/packages)
-* [postmarketOS package search](https://pkgs.postmarketos.org/packages)
+* [postmarketOS package search](https://pkgs.postmarketos.org/packages)

cross/binutils-aarch64/APKBUILD

@@ -2,33 +2,28 @@
 # Generator: pmbootstrap aportgen binutils-aarch64
 # Based on: main/binutils
 
-
-CTARGET_ARCH=aarch64
-CTARGET="$(arch_to_hostspec $CTARGET_ARCH)"
-
 pkgname=binutils-aarch64
-pkgver=2.39
+pkgver=2.38
 pkgrel=2
 pkgdesc="Tools necessary to build programs for aarch64 targets"
 url="https://www.gnu.org/software/binutils/"
-makedepends_build="bison flex texinfo"
-makedepends_host="zlib-dev"
-makedepends="$makedepends_build $makedepends_host"
+makedepends="gettext libtool autoconf automake bison texinfo"
 arch="x86_64"
 license="GPL-2.0 GPL-3.0-or-later LGPL-2.0 BSD"
-subpackages="binutils-dev binutils-doc"
 source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz
 	binutils-ld-fix-static-linking.patch
 	gold-mips.patch
 	ld-bfd-mips.patch
 	0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
 	binutils-mips-disable-assert.patch
-	CVE-2022-38533.patch
+	binutils-ppc-fix-machine-options.patch
+	binutils-s390x-1.patch
+	binutils-s390x-2.patch
 	"
 builddir="$srcdir/binutils-$pkgver"
 
 if [ "$CHOST" = "$CBUILD" ] && [ "$CBUILD" = "$CTARGET" ] && [ "$CTARGET_ARCH" != "riscv64" ]; then
-	subpackages="$subpackages binutils-gold"
+	subpackages=""
 fi
 
 if [ "$CHOST" != "$CTARGET" ]; then
@@ -38,10 +33,6 @@ if [ "$CHOST" != "$CTARGET" ]; then
 fi
 
 # secfixes:
-#   2.39-r2:
-#     - CVE-2022-38533
-#   2.39-r0:
-#     - CVE-2022-38126
 #   2.35.2-r1:
 #     - CVE-2021-3487
 #   2.32-r0:
@@ -53,103 +44,43 @@ fi
 #     - CVE-2017-7614
 
 build() {
-	local _sysroot=/
-	local _cross_configure="--enable-install-libiberty --enable-shared"
-	local _arch_configure=""
-	local _gold_configure="--disable-gold"
-	local _plugin_configure="--enable-plugins"
-
-	if [ "$CHOST" != "$CTARGET" ]; then
-		_sysroot="$CBUILDROOT"
-		_cross_configure="--disable-install-libiberty"
-		_plugin_configure="--disable-plugins"
-	fi
-
-	if [ "$CHOST" = "$CBUILD" ] && [ "$CBUILD" = "$CTARGET" ] && [ "$CTARGET_ARCH" != "riscv64" ]; then
-		_gold_configure="--enable-gold"
-	fi
-
-	if [ "$CTARGET_ARCH" = "x86_64" ]; then
-		_arch_configure="--enable-targets=x86_64-pep"
-	fi
-
-	if [ "$CTARGET_ARCH" = "riscv64" ]; then
-		_gold_configure="--disable-gold"
-	fi
-
-	case "$CTARGET_ARCH" in
-	mips*)  _hash_style_configure="--enable-default-hash-style=sysv" ;;
-	*)      _hash_style_configure="--enable-default-hash-style=gnu"	;;
-	esac
-
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--target=$CTARGET \
-		--with-build-sysroot="$CBUILDROOT" \
-		--with-sysroot=$_sysroot \
+	_target="$(arch_to_hostspec aarch64)"
+	"$builddir"/configure \
+		--build="$CBUILD" \
+		--target=$_target \
+		--with-lib-path=/usr/lib \
 		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--disable-multilib \
-		--disable-gprofng \
+		--with-sysroot=/usr/$_target \
 		--enable-ld=default \
-		$_gold_configure \
-		--enable-64-bit-bfd \
-		$_plugin_configure \
-		--enable-relro \
+		--enable-gold=yes \
+		--enable-plugins \
 		--enable-deterministic-archives \
-		--enable-default-execstack=no \
-		$_cross_configure \
-		$_arch_configure \
-		$_hash_style_configure \
-		--with-pic \
+		--disable-multilib \
 		--disable-werror \
-		--disable-nls \
-		--with-mmap \
-		--with-system-zlib
+		--disable-nls
 	make
 }
 
 package() {
 	make install DESTDIR="$pkgdir"
-	if [ -d "$pkgdir"/usr/lib64 ]; then
-		mv "$pkgdir"/usr/lib64/* "$pkgdir"/usr/lib/
-		rmdir "$pkgdir"/usr/lib64
-	fi
-	if [ "$CHOST" != "$CTARGET" ]; then
-		# creating cross tools: remove any files that would conflict
-		# with the native tools, or other cross tools
-		rm -r "${pkgdir:?}"/usr/share
-		rm -f "$pkgdir"/usr/lib/libiberty.a
-		rm -r "${pkgdir:?}"/usr/lib/bfd-plugins
-	fi
+
+	# remove man, info folders
+	rm -rf "$pkgdir"/usr/share
+
+	# remove files that conflict with non-cross binutils
+	rm -rf "$pkgdir"/usr/lib/bfd-plugins
 }
 
-libs() {
-	pkgdesc="Runtime libraries from binutils - libbfd and libopcodes"
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/lib*.so "$subpkgdir"/usr/lib/
-}
-
-gold() {
-	pkgdesc="GNU binutils - gold linker"
-
-	if [ -e "$pkgdir"/usr/bin/ld.gold ]; then
-		mkdir -p "$subpkgdir"/usr/bin
-		mv "$pkgdir"/usr/bin/ld.gold "$subpkgdir"/usr/bin
-	fi
-	mkdir -p "$subpkgdir"/usr/$CTARGET/bin
-	mv "$pkgdir"/usr/$CTARGET/bin/ld.gold "$subpkgdir"/usr/$CTARGET/bin/ld.gold
-}
 
 sha512sums="
-68e038f339a8c21faa19a57bbc447a51c817f47c2e06d740847c6e9cc3396c025d35d5369fa8c3f8b70414757c89f0e577939ddc0d70f283182504920f53b0a3  binutils-2.39.tar.xz
+8bf0b0d193c9c010e0518ee2b2e5a830898af206510992483b427477ed178396cd210235e85fd7bd99a96fc6d5eedbeccbd48317a10f752b7336ada8b2bb826d  binutils-2.38.tar.xz
 ecee33b0e435aa704af1c334e560f201638ff79e199aa11ed78a72f7c9b46f85fbb227af5748e735fd681d1965fcc42ac81b0c8824e540430ce0c706c81e8b49  binutils-ld-fix-static-linking.patch
 f55cf2e0bf82f97583a1abe10710e4013ecf7d64f1da2ef8659a44a06d0dd8beaf58dab98a183488ea137f03e32d62efc878d95f018f836f8cec870bc448556f  gold-mips.patch
 314d2ef9071c89940aa6c8118e8a1e2f191a5d0a4bf596da1ad9cc84f884d8bc7dea8bd7b9fc3f8f1bddd3fd41c6eb017e1e804044b3bf084df1ed9e6e095e2d  ld-bfd-mips.patch
 70ec22bd72ef6dddecfd970613387dd4a8cdc8730dd3cbf03d5a0c3a7c4d839383167bb06dad21bf7c235329fd44b5dc4aefe762f68544f17155cf002bf1be4a  0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
 609cd90d8b334eb309f586b17b9d335a08d3dbb6def7c3eb5c010028fcb681674031e5b9d853aa7a39a50304356a86afc184b85562b3f228f8197f4d29395c8f  binutils-mips-disable-assert.patch
-631726e557524633ace39c597acbc5ac39bfd25f7b292eee1f0b2a80a503f4ff799f027757d12d5a24b2fa3c07c7e14602d8a86d96e19876d6d0d5d1a02817e7  CVE-2022-38533.patch
+27ea91e0e406e2ed464fd692cf92a07e338781789f2d968c8b95d9d5545985056a6f7f500df3952e5ab42165db28b741aa33d6b717e880b11a2e41fe406b13c4  binutils-ppc-fix-machine-options.patch
+a9efe2689624865f0ff33d4776a5bd295bcad6484bdd38d0ca490fea43691c4933ab33d17478851998eef12922dbf83d6c3225bb1f8faf92a1367d086390f7d3  binutils-s390x-1.patch
+0e291df80ad279005265634014d0935d2c115a5ed708d25407094b7ad4ddf267d1fb7fcbcb2d9ad73bd305b4e3974628b820bd1f249f56c095e4896872434cc9  binutils-s390x-2.patch
 "

cross/binutils-aarch64/CVE-2022-38533.patch

@@ -1,22 +0,0 @@
-X-Git-Url: https://sourceware.org/git/?p=binutils-gdb.git;a=blobdiff_plain;f=bfd%2Fcoffcode.h;h=52027981c3f052d98e043cd0c877f0bb5da97c7f;hp=67aaf158ca1829fe63f0065f31a0b1009b227b36;hb=ef186fe54aa6d281a3ff8a9528417e5cc614c797;hpb=80075150727d653c39e9d037e15c6b87dcef08cd
-
-diff --git a/bfd/coffcode.h b/bfd/coffcode.h
-index 67aaf158ca1..52027981c3f 100644
---- a/bfd/coffcode.h
-+++ b/bfd/coffcode.h
-@@ -4302,10 +4302,13 @@ coff_set_section_contents (bfd * abfd,
- 
- 	rec = (bfd_byte *) location;
- 	recend = rec + count;
--	while (rec < recend)
-+	while (recend - rec >= 4)
- 	  {
-+	    size_t len = bfd_get_32 (abfd, rec);
-+	    if (len == 0 || len > (size_t) (recend - rec) / 4)
-+	      break;
-+	    rec += len * 4;
- 	    ++section->lma;
--	    rec += bfd_get_32 (abfd, rec) * 4;
- 	  }
- 
- 	BFD_ASSERT (rec == recend);

cross/binutils-aarch64/binutils-ppc-fix-machine-options.patch

@@ -0,0 +1,41 @@
+Fix for DARN opcode error during ppc64le compilation of rng-tools which
+occurs with binutils 2.38 but not with binutils 2.37..
+
+https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=cebc89b9328;hp=9cbed90ee623d75e31994e7943960c997ba565f2
+
+
+diff -aur a/gas/config/tc-ppc.c b/gas/config/tc-ppc.c
+--- a/gas/config/tc-ppc.c
++++ b/gas/config/tc-ppc.c
+@@ -5965,7 +5965,30 @@
+ 	     options do not count as a new machine, instead they add
+ 	     to currently selected opcodes.  */
+ 	  ppc_cpu_t machine_sticky = 0;
+-	  new_cpu = ppc_parse_cpu (ppc_cpu, &machine_sticky, cpu_string);
++	  /* Unfortunately, some versions of gcc emit a .machine
++	     directive very near the start of the compiler's assembly
++	     output file.  This is bad because it overrides user -Wa
++	     cpu selection.  Worse, there are versions of gcc that
++	     emit the *wrong* cpu, not even respecting the -mcpu given
++	     to gcc.  See gcc pr101393.  And to compound the problem,
++	     as of 20220222 gcc doesn't pass the correct cpu option to
++	     gas on the command line.  See gcc pr59828.  Hack around
++	     this by keeping sticky options for an early .machine.  */
++	  asection *sec;
++	  for (sec = stdoutput->sections; sec != NULL; sec = sec->next)
++	    {
++	      segment_info_type *info = seg_info (sec);
++	      /* Are the frags for this section perturbed from their
++	         initial state?  Even .align will count here.  */
++	      if (info != NULL
++	          && (info->frchainP->frch_root != info->frchainP->frch_last
++	              || info->frchainP->frch_root->fr_type != rs_fill
++	              || info->frchainP->frch_root->fr_fix != 0))
++	        break;
++	    }
++	  new_cpu = ppc_parse_cpu (ppc_cpu,
++	                           sec == NULL ? &sticky : &machine_sticky,
++	                           cpu_string);
+ 	  if (new_cpu != 0)
+ 	    ppc_cpu = new_cpu;
+ 	  else

cross/binutils-aarch64/binutils-s390x-1.patch

@@ -0,0 +1,147 @@
+From 82a5bb730a16f8c7962568030268e784b4fb42c8 Mon Sep 17 00:00:00 2001
+From: Stefan Liebler <stli@linux.ibm.com>
+Date: Thu, 28 Apr 2022 14:29:58 +0200
+Subject: [PATCH] s390: Avoid dynamic TLS relocs in PIE
+
+No dynamic relocs are needed for TLS defined in an executable, the
+TP relative offset is known at link time.
+
+Fixes
+FAIL: Build pr22263-1
+
+bfd/
+	PR ld/22263
+	* elf64-s390.c (elf_s390_tls_transition): Use bfd_link_dll
+	instead of bfd_link_pic for TLS.
+	(elf_s390_check_relocs): Likewise.
+	(allocate_dynrelocs): Likewise.
+	(elf_s390_relocate_section): Likewise.
+
+(cherry picked from commit 26b1426577b5dcb32d149c64cca3e603b81948a9)
+---
+ bfd/elf64-s390.c | 26 +++++++++++++-------------
+ 1 file changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/bfd/elf64-s390.c b/bfd/elf64-s390.c
+index e780efa7181..00ee386baab 100644
+--- a/bfd/elf64-s390.c
++++ b/bfd/elf64-s390.c
+@@ -774,7 +774,7 @@ elf_s390_tls_transition (struct bfd_link_info *info,
+ 			 int r_type,
+ 			 int is_local)
+ {
+-  if (bfd_link_pic (info))
++  if (bfd_link_dll (info))
+     return r_type;
+ 
+   switch (r_type)
+@@ -1026,7 +1026,7 @@ elf_s390_check_relocs (bfd *abfd,
+ 	case R_390_TLS_GOTIE20:
+ 	case R_390_TLS_GOTIE64:
+ 	case R_390_TLS_IEENT:
+-	  if (bfd_link_pic (info))
++	  if (bfd_link_dll (info))
+ 	    info->flags |= DF_STATIC_TLS;
+ 	  /* Fall through */
+ 
+@@ -1107,7 +1107,7 @@ elf_s390_check_relocs (bfd *abfd,
+ 	  if (r_type == R_390_TLS_LE64 && bfd_link_pie (info))
+ 	    break;
+ 
+-	  if (!bfd_link_pic (info))
++	  if (!bfd_link_dll (info))
+ 	    break;
+ 	  info->flags |= DF_STATIC_TLS;
+ 	  /* Fall through */
+@@ -1571,7 +1571,7 @@ allocate_dynrelocs (struct elf_link_hash_entry *h,
+      to R_390_TLS_LE64 requiring no TLS entry. For GOTIE12 and IEENT
+      we can save the dynamic TLS relocation.  */
+   if (h->got.refcount > 0
+-      && !bfd_link_pic (info)
++      && !bfd_link_dll (info)
+       && h->dynindx == -1
+       && elf_s390_hash_entry(h)->tls_type >= GOT_TLS_IE)
+     {
+@@ -2662,7 +2662,7 @@ elf_s390_relocate_section (bfd *output_bfd,
+ 
+ 	  /* Relocations for tls literal pool entries.  */
+ 	case R_390_TLS_IE64:
+-	  if (bfd_link_pic (info))
++	  if (bfd_link_dll (info))
+ 	    {
+ 	      Elf_Internal_Rela outrel;
+ 	      asection *sreloc;
+@@ -2690,7 +2690,7 @@ elf_s390_relocate_section (bfd *output_bfd,
+ 	  else if (h != NULL)
+ 	    {
+ 	      tls_type = elf_s390_hash_entry(h)->tls_type;
+-	      if (!bfd_link_pic (info) && h->dynindx == -1 && tls_type >= GOT_TLS_IE)
++	      if (!bfd_link_dll (info) && h->dynindx == -1 && tls_type >= GOT_TLS_IE)
+ 		r_type = R_390_TLS_LE64;
+ 	    }
+ 	  if (r_type == R_390_TLS_GD64 && tls_type >= GOT_TLS_IE)
+@@ -2801,14 +2801,14 @@ elf_s390_relocate_section (bfd *output_bfd,
+ 	      if (local_got_offsets == NULL)
+ 		abort();
+ 	      off = local_got_offsets[r_symndx];
+-	      if (bfd_link_pic (info))
++	      if (bfd_link_dll (info))
+ 		goto emit_tls_relocs;
+ 	    }
+ 	  else
+ 	    {
+ 	      off = h->got.offset;
+ 	      tls_type = elf_s390_hash_entry(h)->tls_type;
+-	      if (bfd_link_pic (info) || h->dynindx != -1 || tls_type < GOT_TLS_IE)
++	      if (bfd_link_dll (info) || h->dynindx != -1 || tls_type < GOT_TLS_IE)
+ 		goto emit_tls_relocs;
+ 	    }
+ 
+@@ -2825,7 +2825,7 @@ elf_s390_relocate_section (bfd *output_bfd,
+ 	  break;
+ 
+ 	case R_390_TLS_LDM64:
+-	  if (! bfd_link_pic (info))
++	  if (! bfd_link_dll (info))
+ 	    /* The literal pool entry this relocation refers to gets ignored
+ 	       by the optimized code of the local exec model. Do nothing
+ 	       and the value will turn out zero.  */
+@@ -2900,7 +2900,7 @@ elf_s390_relocate_section (bfd *output_bfd,
+ 	  continue;
+ 
+ 	case R_390_TLS_LDO64:
+-	  if (bfd_link_pic (info) || (input_section->flags & SEC_DEBUGGING))
++	  if (bfd_link_dll (info) || (input_section->flags & SEC_DEBUGGING))
+ 	    relocation -= dtpoff_base (info);
+ 	  else
+ 	    /* When converting LDO to LE, we must negate.  */
+@@ -2922,7 +2922,7 @@ elf_s390_relocate_section (bfd *output_bfd,
+ 
+ 	  if (r_type == R_390_TLS_LOAD)
+ 	    {
+-	      if (!bfd_link_pic (info) && (h == NULL || h->dynindx == -1))
++	      if (!bfd_link_dll (info) && (h == NULL || h->dynindx == -1))
+ 		{
+ 		  /* IE->LE transition. Four valid cases:
+ 		     lg %rx,(0,%ry)    -> sllg %rx,%ry,0
+@@ -2972,7 +2972,7 @@ elf_s390_relocate_section (bfd *output_bfd,
+ 		  invalid_tls_insn (input_bfd, input_section, rel);
+ 		  return false;
+ 		}
+-	      if (!bfd_link_pic (info) && (h == NULL || h->dynindx == -1))
++	      if (!bfd_link_dll (info) && (h == NULL || h->dynindx == -1))
+ 		{
+ 		  /* GD->LE transition.
+ 		     brasl %r14,__tls_get_addr@plt -> brcl 0,. */
+@@ -2991,7 +2991,7 @@ elf_s390_relocate_section (bfd *output_bfd,
+ 	    }
+ 	  else if (r_type == R_390_TLS_LDCALL)
+ 	    {
+-	      if (!bfd_link_pic (info))
++	      if (!bfd_link_dll (info))
+ 		{
+ 		  unsigned int insn0, insn1;
+ 
+-- 
+2.27.0
+

cross/binutils-aarch64/binutils-s390x-2.patch

@@ -0,0 +1,51 @@
+From 9a01457e02e7bb594ff9a9ac62a38c909e2e3083 Mon Sep 17 00:00:00 2001
+From: Stefan Liebler <stli@linux.ibm.com>
+Date: Thu, 28 Apr 2022 14:30:55 +0200
+Subject: [PATCH] s390: Add DT_JMPREL pointing to .rela.[i]plt with static-pie
+
+In static-pie case, there are IRELATIVE-relocs in
+.rela.iplt (htab->irelplt), which will later be grouped
+to .rela.plt.  On s390, the IRELATIVE relocations are
+always located in .rela.iplt - even for non-static case.
+Ensure that DT_JMPREL, DT_PLTRELA, DT_PLTRELASZ is added
+to the dynamic section even if htab->srelplt->size == 0.
+See _bfd_elf_add_dynamic_tags in bfd/elflink.c.
+
+bfd/
+	elf64-s390.c (elf_s390_size_dynamic_sections):
+	Enforce DT_JMPREL via htab->elf.dt_jmprel_required.
+
+(cherry picked from commit d942d8db12adf4c9e5c7d9ed6496a779ece7149e)
+---
+ bfd/elf64-s390.c | 15 ++++++++++++++-
+ 1 file changed, 14 insertions(+), 1 deletion(-)
+
+diff --git a/bfd/elf64-s390.c b/bfd/elf64-s390.c
+index 00ee386baab..0b851f7ac0e 100644
+--- a/bfd/elf64-s390.c
++++ b/bfd/elf64-s390.c
+@@ -1876,7 +1876,20 @@ elf_s390_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
+       else if (startswith (bfd_section_name (s), ".rela"))
+ 	{
+ 	  if (s->size != 0 && s != htab->elf.srelplt)
+-	    relocs = true;
++	    {
++	      relocs = true;
++	      if (s == htab->elf.irelplt)
++		{
++		  /* In static-pie case, there are IRELATIVE-relocs in
++		     .rela.iplt (htab->irelplt), which will later be grouped
++		     to .rela.plt.  On s390, the IRELATIVE relocations are
++		     always located in .rela.iplt - even for non-static case.
++		     Ensure that DT_JMPREL, DT_PLTRELA, DT_PLTRELASZ is added
++		     to the dynamic section even if htab->srelplt->size == 0.
++		     See _bfd_elf_add_dynamic_tags in bfd/elflink.c.  */
++		  htab->elf.dt_jmprel_required = true;
++		}
++	    }
+ 
+ 	  /* We use the reloc_count field as a counter if we need
+ 	     to copy relocs into the output file.  */
+-- 
+2.27.0
+

cross/binutils-armv7/APKBUILD

@@ -2,33 +2,28 @@
 # Generator: pmbootstrap aportgen binutils-armv7
 # Based on: main/binutils
 
-
-CTARGET_ARCH=armv7
-CTARGET="$(arch_to_hostspec $CTARGET_ARCH)"
-
 pkgname=binutils-armv7
-pkgver=2.39
+pkgver=2.38
 pkgrel=2
 pkgdesc="Tools necessary to build programs for armv7 targets"
 url="https://www.gnu.org/software/binutils/"
-makedepends_build="bison flex texinfo"
-makedepends_host="zlib-dev"
-makedepends="$makedepends_build $makedepends_host"
+makedepends="gettext libtool autoconf automake bison texinfo"
 arch="x86_64"
 license="GPL-2.0 GPL-3.0-or-later LGPL-2.0 BSD"
-subpackages="binutils-dev binutils-doc"
 source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz
 	binutils-ld-fix-static-linking.patch
 	gold-mips.patch
 	ld-bfd-mips.patch
 	0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
 	binutils-mips-disable-assert.patch
-	CVE-2022-38533.patch
+	binutils-ppc-fix-machine-options.patch
+	binutils-s390x-1.patch
+	binutils-s390x-2.patch
 	"
 builddir="$srcdir/binutils-$pkgver"
 
 if [ "$CHOST" = "$CBUILD" ] && [ "$CBUILD" = "$CTARGET" ] && [ "$CTARGET_ARCH" != "riscv64" ]; then
-	subpackages="$subpackages binutils-gold"
+	subpackages=""
 fi
 
 if [ "$CHOST" != "$CTARGET" ]; then
@@ -38,10 +33,6 @@ if [ "$CHOST" != "$CTARGET" ]; then
 fi
 
 # secfixes:
-#   2.39-r2:
-#     - CVE-2022-38533
-#   2.39-r0:
-#     - CVE-2022-38126
 #   2.35.2-r1:
 #     - CVE-2021-3487
 #   2.32-r0:
@@ -53,103 +44,43 @@ fi
 #     - CVE-2017-7614
 
 build() {
-	local _sysroot=/
-	local _cross_configure="--enable-install-libiberty --enable-shared"
-	local _arch_configure=""
-	local _gold_configure="--disable-gold"
-	local _plugin_configure="--enable-plugins"
-
-	if [ "$CHOST" != "$CTARGET" ]; then
-		_sysroot="$CBUILDROOT"
-		_cross_configure="--disable-install-libiberty"
-		_plugin_configure="--disable-plugins"
-	fi
-
-	if [ "$CHOST" = "$CBUILD" ] && [ "$CBUILD" = "$CTARGET" ] && [ "$CTARGET_ARCH" != "riscv64" ]; then
-		_gold_configure="--enable-gold"
-	fi
-
-	if [ "$CTARGET_ARCH" = "x86_64" ]; then
-		_arch_configure="--enable-targets=x86_64-pep"
-	fi
-
-	if [ "$CTARGET_ARCH" = "riscv64" ]; then
-		_gold_configure="--disable-gold"
-	fi
-
-	case "$CTARGET_ARCH" in
-	mips*)  _hash_style_configure="--enable-default-hash-style=sysv" ;;
-	*)      _hash_style_configure="--enable-default-hash-style=gnu"	;;
-	esac
-
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--target=$CTARGET \
-		--with-build-sysroot="$CBUILDROOT" \
-		--with-sysroot=$_sysroot \
+	_target="$(arch_to_hostspec armv7)"
+	"$builddir"/configure \
+		--build="$CBUILD" \
+		--target=$_target \
+		--with-lib-path=/usr/lib \
 		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--disable-multilib \
-		--disable-gprofng \
+		--with-sysroot=/usr/$_target \
 		--enable-ld=default \
-		$_gold_configure \
-		--enable-64-bit-bfd \
-		$_plugin_configure \
-		--enable-relro \
+		--enable-gold=yes \
+		--enable-plugins \
 		--enable-deterministic-archives \
-		--enable-default-execstack=no \
-		$_cross_configure \
-		$_arch_configure \
-		$_hash_style_configure \
-		--with-pic \
+		--disable-multilib \
 		--disable-werror \
-		--disable-nls \
-		--with-mmap \
-		--with-system-zlib
+		--disable-nls
 	make
 }
 
 package() {
 	make install DESTDIR="$pkgdir"
-	if [ -d "$pkgdir"/usr/lib64 ]; then
-		mv "$pkgdir"/usr/lib64/* "$pkgdir"/usr/lib/
-		rmdir "$pkgdir"/usr/lib64
-	fi
-	if [ "$CHOST" != "$CTARGET" ]; then
-		# creating cross tools: remove any files that would conflict
-		# with the native tools, or other cross tools
-		rm -r "${pkgdir:?}"/usr/share
-		rm -f "$pkgdir"/usr/lib/libiberty.a
-		rm -r "${pkgdir:?}"/usr/lib/bfd-plugins
-	fi
+
+	# remove man, info folders
+	rm -rf "$pkgdir"/usr/share
+
+	# remove files that conflict with non-cross binutils
+	rm -rf "$pkgdir"/usr/lib/bfd-plugins
 }
 
-libs() {
-	pkgdesc="Runtime libraries from binutils - libbfd and libopcodes"
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/lib*.so "$subpkgdir"/usr/lib/
-}
-
-gold() {
-	pkgdesc="GNU binutils - gold linker"
-
-	if [ -e "$pkgdir"/usr/bin/ld.gold ]; then
-		mkdir -p "$subpkgdir"/usr/bin
-		mv "$pkgdir"/usr/bin/ld.gold "$subpkgdir"/usr/bin
-	fi
-	mkdir -p "$subpkgdir"/usr/$CTARGET/bin
-	mv "$pkgdir"/usr/$CTARGET/bin/ld.gold "$subpkgdir"/usr/$CTARGET/bin/ld.gold
-}
 
 sha512sums="
-68e038f339a8c21faa19a57bbc447a51c817f47c2e06d740847c6e9cc3396c025d35d5369fa8c3f8b70414757c89f0e577939ddc0d70f283182504920f53b0a3  binutils-2.39.tar.xz
+8bf0b0d193c9c010e0518ee2b2e5a830898af206510992483b427477ed178396cd210235e85fd7bd99a96fc6d5eedbeccbd48317a10f752b7336ada8b2bb826d  binutils-2.38.tar.xz
 ecee33b0e435aa704af1c334e560f201638ff79e199aa11ed78a72f7c9b46f85fbb227af5748e735fd681d1965fcc42ac81b0c8824e540430ce0c706c81e8b49  binutils-ld-fix-static-linking.patch
 f55cf2e0bf82f97583a1abe10710e4013ecf7d64f1da2ef8659a44a06d0dd8beaf58dab98a183488ea137f03e32d62efc878d95f018f836f8cec870bc448556f  gold-mips.patch
 314d2ef9071c89940aa6c8118e8a1e2f191a5d0a4bf596da1ad9cc84f884d8bc7dea8bd7b9fc3f8f1bddd3fd41c6eb017e1e804044b3bf084df1ed9e6e095e2d  ld-bfd-mips.patch
 70ec22bd72ef6dddecfd970613387dd4a8cdc8730dd3cbf03d5a0c3a7c4d839383167bb06dad21bf7c235329fd44b5dc4aefe762f68544f17155cf002bf1be4a  0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
 609cd90d8b334eb309f586b17b9d335a08d3dbb6def7c3eb5c010028fcb681674031e5b9d853aa7a39a50304356a86afc184b85562b3f228f8197f4d29395c8f  binutils-mips-disable-assert.patch
-631726e557524633ace39c597acbc5ac39bfd25f7b292eee1f0b2a80a503f4ff799f027757d12d5a24b2fa3c07c7e14602d8a86d96e19876d6d0d5d1a02817e7  CVE-2022-38533.patch
+27ea91e0e406e2ed464fd692cf92a07e338781789f2d968c8b95d9d5545985056a6f7f500df3952e5ab42165db28b741aa33d6b717e880b11a2e41fe406b13c4  binutils-ppc-fix-machine-options.patch
+a9efe2689624865f0ff33d4776a5bd295bcad6484bdd38d0ca490fea43691c4933ab33d17478851998eef12922dbf83d6c3225bb1f8faf92a1367d086390f7d3  binutils-s390x-1.patch
+0e291df80ad279005265634014d0935d2c115a5ed708d25407094b7ad4ddf267d1fb7fcbcb2d9ad73bd305b4e3974628b820bd1f249f56c095e4896872434cc9  binutils-s390x-2.patch
 "

cross/binutils-armv7/CVE-2022-38533.patch

@@ -1,22 +0,0 @@
-X-Git-Url: https://sourceware.org/git/?p=binutils-gdb.git;a=blobdiff_plain;f=bfd%2Fcoffcode.h;h=52027981c3f052d98e043cd0c877f0bb5da97c7f;hp=67aaf158ca1829fe63f0065f31a0b1009b227b36;hb=ef186fe54aa6d281a3ff8a9528417e5cc614c797;hpb=80075150727d653c39e9d037e15c6b87dcef08cd
-
-diff --git a/bfd/coffcode.h b/bfd/coffcode.h
-index 67aaf158ca1..52027981c3f 100644
---- a/bfd/coffcode.h
-+++ b/bfd/coffcode.h
-@@ -4302,10 +4302,13 @@ coff_set_section_contents (bfd * abfd,
- 
- 	rec = (bfd_byte *) location;
- 	recend = rec + count;
--	while (rec < recend)
-+	while (recend - rec >= 4)
- 	  {
-+	    size_t len = bfd_get_32 (abfd, rec);
-+	    if (len == 0 || len > (size_t) (recend - rec) / 4)
-+	      break;
-+	    rec += len * 4;
- 	    ++section->lma;
--	    rec += bfd_get_32 (abfd, rec) * 4;
- 	  }
- 
- 	BFD_ASSERT (rec == recend);

cross/binutils-armv7/binutils-ppc-fix-machine-options.patch

@@ -0,0 +1,41 @@
+Fix for DARN opcode error during ppc64le compilation of rng-tools which
+occurs with binutils 2.38 but not with binutils 2.37..
+
+https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=cebc89b9328;hp=9cbed90ee623d75e31994e7943960c997ba565f2
+
+
+diff -aur a/gas/config/tc-ppc.c b/gas/config/tc-ppc.c
+--- a/gas/config/tc-ppc.c
++++ b/gas/config/tc-ppc.c
+@@ -5965,7 +5965,30 @@
+ 	     options do not count as a new machine, instead they add
+ 	     to currently selected opcodes.  */
+ 	  ppc_cpu_t machine_sticky = 0;
+-	  new_cpu = ppc_parse_cpu (ppc_cpu, &machine_sticky, cpu_string);
++	  /* Unfortunately, some versions of gcc emit a .machine
++	     directive very near the start of the compiler's assembly
++	     output file.  This is bad because it overrides user -Wa
++	     cpu selection.  Worse, there are versions of gcc that
++	     emit the *wrong* cpu, not even respecting the -mcpu given
++	     to gcc.  See gcc pr101393.  And to compound the problem,
++	     as of 20220222 gcc doesn't pass the correct cpu option to
++	     gas on the command line.  See gcc pr59828.  Hack around
++	     this by keeping sticky options for an early .machine.  */
++	  asection *sec;
++	  for (sec = stdoutput->sections; sec != NULL; sec = sec->next)
++	    {
++	      segment_info_type *info = seg_info (sec);
++	      /* Are the frags for this section perturbed from their
++	         initial state?  Even .align will count here.  */
++	      if (info != NULL
++	          && (info->frchainP->frch_root != info->frchainP->frch_last
++	              || info->frchainP->frch_root->fr_type != rs_fill
++	              || info->frchainP->frch_root->fr_fix != 0))
++	        break;
++	    }
++	  new_cpu = ppc_parse_cpu (ppc_cpu,
++	                           sec == NULL ? &sticky : &machine_sticky,
++	                           cpu_string);
+ 	  if (new_cpu != 0)
+ 	    ppc_cpu = new_cpu;
+ 	  else

cross/binutils-armv7/binutils-s390x-1.patch

@@ -0,0 +1,147 @@
+From 82a5bb730a16f8c7962568030268e784b4fb42c8 Mon Sep 17 00:00:00 2001
+From: Stefan Liebler <stli@linux.ibm.com>
+Date: Thu, 28 Apr 2022 14:29:58 +0200
+Subject: [PATCH] s390: Avoid dynamic TLS relocs in PIE
+
+No dynamic relocs are needed for TLS defined in an executable, the
+TP relative offset is known at link time.
+
+Fixes
+FAIL: Build pr22263-1
+
+bfd/
+	PR ld/22263
+	* elf64-s390.c (elf_s390_tls_transition): Use bfd_link_dll
+	instead of bfd_link_pic for TLS.
+	(elf_s390_check_relocs): Likewise.
+	(allocate_dynrelocs): Likewise.
+	(elf_s390_relocate_section): Likewise.
+
+(cherry picked from commit 26b1426577b5dcb32d149c64cca3e603b81948a9)
+---
+ bfd/elf64-s390.c | 26 +++++++++++++-------------
+ 1 file changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/bfd/elf64-s390.c b/bfd/elf64-s390.c
+index e780efa7181..00ee386baab 100644
+--- a/bfd/elf64-s390.c
++++ b/bfd/elf64-s390.c
+@@ -774,7 +774,7 @@ elf_s390_tls_transition (struct bfd_link_info *info,
+ 			 int r_type,
+ 			 int is_local)
+ {
+-  if (bfd_link_pic (info))
++  if (bfd_link_dll (info))
+     return r_type;
+ 
+   switch (r_type)
+@@ -1026,7 +1026,7 @@ elf_s390_check_relocs (bfd *abfd,
+ 	case R_390_TLS_GOTIE20:
+ 	case R_390_TLS_GOTIE64:
+ 	case R_390_TLS_IEENT:
+-	  if (bfd_link_pic (info))
++	  if (bfd_link_dll (info))
+ 	    info->flags |= DF_STATIC_TLS;
+ 	  /* Fall through */
+ 
+@@ -1107,7 +1107,7 @@ elf_s390_check_relocs (bfd *abfd,
+ 	  if (r_type == R_390_TLS_LE64 && bfd_link_pie (info))
+ 	    break;
+ 
+-	  if (!bfd_link_pic (info))
++	  if (!bfd_link_dll (info))
+ 	    break;
+ 	  info->flags |= DF_STATIC_TLS;
+ 	  /* Fall through */
+@@ -1571,7 +1571,7 @@ allocate_dynrelocs (struct elf_link_hash_entry *h,
+      to R_390_TLS_LE64 requiring no TLS entry. For GOTIE12 and IEENT
+      we can save the dynamic TLS relocation.  */
+   if (h->got.refcount > 0
+-      && !bfd_link_pic (info)
++      && !bfd_link_dll (info)
+       && h->dynindx == -1
+       && elf_s390_hash_entry(h)->tls_type >= GOT_TLS_IE)
+     {
+@@ -2662,7 +2662,7 @@ elf_s390_relocate_section (bfd *output_bfd,
+ 
+ 	  /* Relocations for tls literal pool entries.  */
+ 	case R_390_TLS_IE64:
+-	  if (bfd_link_pic (info))
++	  if (bfd_link_dll (info))
+ 	    {
+ 	      Elf_Internal_Rela outrel;
+ 	      asection *sreloc;
+@@ -2690,7 +2690,7 @@ elf_s390_relocate_section (bfd *output_bfd,
+ 	  else if (h != NULL)
+ 	    {
+ 	      tls_type = elf_s390_hash_entry(h)->tls_type;
+-	      if (!bfd_link_pic (info) && h->dynindx == -1 && tls_type >= GOT_TLS_IE)
++	      if (!bfd_link_dll (info) && h->dynindx == -1 && tls_type >= GOT_TLS_IE)
+ 		r_type = R_390_TLS_LE64;
+ 	    }
+ 	  if (r_type == R_390_TLS_GD64 && tls_type >= GOT_TLS_IE)
+@@ -2801,14 +2801,14 @@ elf_s390_relocate_section (bfd *output_bfd,
+ 	      if (local_got_offsets == NULL)
+ 		abort();
+ 	      off = local_got_offsets[r_symndx];
+-	      if (bfd_link_pic (info))
++	      if (bfd_link_dll (info))
+ 		goto emit_tls_relocs;
+ 	    }
+ 	  else
+ 	    {
+ 	      off = h->got.offset;
+ 	      tls_type = elf_s390_hash_entry(h)->tls_type;
+-	      if (bfd_link_pic (info) || h->dynindx != -1 || tls_type < GOT_TLS_IE)
++	      if (bfd_link_dll (info) || h->dynindx != -1 || tls_type < GOT_TLS_IE)
+ 		goto emit_tls_relocs;
+ 	    }
+ 
+@@ -2825,7 +2825,7 @@ elf_s390_relocate_section (bfd *output_bfd,
+ 	  break;
+ 
+ 	case R_390_TLS_LDM64:
+-	  if (! bfd_link_pic (info))
++	  if (! bfd_link_dll (info))
+ 	    /* The literal pool entry this relocation refers to gets ignored
+ 	       by the optimized code of the local exec model. Do nothing
+ 	       and the value will turn out zero.  */
+@@ -2900,7 +2900,7 @@ elf_s390_relocate_section (bfd *output_bfd,
+ 	  continue;
+ 
+ 	case R_390_TLS_LDO64:
+-	  if (bfd_link_pic (info) || (input_section->flags & SEC_DEBUGGING))
++	  if (bfd_link_dll (info) || (input_section->flags & SEC_DEBUGGING))
+ 	    relocation -= dtpoff_base (info);
+ 	  else
+ 	    /* When converting LDO to LE, we must negate.  */
+@@ -2922,7 +2922,7 @@ elf_s390_relocate_section (bfd *output_bfd,
+ 
+ 	  if (r_type == R_390_TLS_LOAD)
+ 	    {
+-	      if (!bfd_link_pic (info) && (h == NULL || h->dynindx == -1))
++	      if (!bfd_link_dll (info) && (h == NULL || h->dynindx == -1))
+ 		{
+ 		  /* IE->LE transition. Four valid cases:
+ 		     lg %rx,(0,%ry)    -> sllg %rx,%ry,0
+@@ -2972,7 +2972,7 @@ elf_s390_relocate_section (bfd *output_bfd,
+ 		  invalid_tls_insn (input_bfd, input_section, rel);
+ 		  return false;
+ 		}
+-	      if (!bfd_link_pic (info) && (h == NULL || h->dynindx == -1))
++	      if (!bfd_link_dll (info) && (h == NULL || h->dynindx == -1))
+ 		{
+ 		  /* GD->LE transition.
+ 		     brasl %r14,__tls_get_addr@plt -> brcl 0,. */
+@@ -2991,7 +2991,7 @@ elf_s390_relocate_section (bfd *output_bfd,
+ 	    }
+ 	  else if (r_type == R_390_TLS_LDCALL)
+ 	    {
+-	      if (!bfd_link_pic (info))
++	      if (!bfd_link_dll (info))
+ 		{
+ 		  unsigned int insn0, insn1;
+ 
+-- 
+2.27.0
+

cross/binutils-armv7/binutils-s390x-2.patch

@@ -0,0 +1,51 @@
+From 9a01457e02e7bb594ff9a9ac62a38c909e2e3083 Mon Sep 17 00:00:00 2001
+From: Stefan Liebler <stli@linux.ibm.com>
+Date: Thu, 28 Apr 2022 14:30:55 +0200
+Subject: [PATCH] s390: Add DT_JMPREL pointing to .rela.[i]plt with static-pie
+
+In static-pie case, there are IRELATIVE-relocs in
+.rela.iplt (htab->irelplt), which will later be grouped
+to .rela.plt.  On s390, the IRELATIVE relocations are
+always located in .rela.iplt - even for non-static case.
+Ensure that DT_JMPREL, DT_PLTRELA, DT_PLTRELASZ is added
+to the dynamic section even if htab->srelplt->size == 0.
+See _bfd_elf_add_dynamic_tags in bfd/elflink.c.
+
+bfd/
+	elf64-s390.c (elf_s390_size_dynamic_sections):
+	Enforce DT_JMPREL via htab->elf.dt_jmprel_required.
+
+(cherry picked from commit d942d8db12adf4c9e5c7d9ed6496a779ece7149e)
+---
+ bfd/elf64-s390.c | 15 ++++++++++++++-
+ 1 file changed, 14 insertions(+), 1 deletion(-)
+
+diff --git a/bfd/elf64-s390.c b/bfd/elf64-s390.c
+index 00ee386baab..0b851f7ac0e 100644
+--- a/bfd/elf64-s390.c
++++ b/bfd/elf64-s390.c
+@@ -1876,7 +1876,20 @@ elf_s390_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
+       else if (startswith (bfd_section_name (s), ".rela"))
+ 	{
+ 	  if (s->size != 0 && s != htab->elf.srelplt)
+-	    relocs = true;
++	    {
++	      relocs = true;
++	      if (s == htab->elf.irelplt)
++		{
++		  /* In static-pie case, there are IRELATIVE-relocs in
++		     .rela.iplt (htab->irelplt), which will later be grouped
++		     to .rela.plt.  On s390, the IRELATIVE relocations are
++		     always located in .rela.iplt - even for non-static case.
++		     Ensure that DT_JMPREL, DT_PLTRELA, DT_PLTRELASZ is added
++		     to the dynamic section even if htab->srelplt->size == 0.
++		     See _bfd_elf_add_dynamic_tags in bfd/elflink.c.  */
++		  htab->elf.dt_jmprel_required = true;
++		}
++	    }
+ 
+ 	  /* We use the reloc_count field as a counter if we need
+ 	     to copy relocs into the output file.  */
+-- 
+2.27.0
+

cross/busybox-static-aarch64/APKBUILD

@@ -8,7 +8,7 @@ fi
 
 pkgname=busybox-static-aarch64
 pkgver=1.35.0
-pkgrel=29
+pkgrel=14
 
 _arch="aarch64"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -21,16 +21,16 @@ pkgdesc="Statically linked Busybox for $_arch"
 _target="$(arch_to_hostspec $_arch)"
 
 source="
-	busybox-static-$pkgver-r$pkgrel-$_arch-v3.17.apk::$_mirror/v3.17/main/$_arch/busybox-static-$pkgver-r$pkgrel.apk
+	busybox-static-$pkgver-r$pkgrel-$_arch-v3.16.apk::$_mirror/v3.16/main/$_arch/busybox-static-$pkgver-r$pkgrel.apk
 "
 
 package() {
 	mkdir -p "$pkgdir/usr/$_target"
 	cd "$pkgdir/usr/$_target"
-	tar -xf $srcdir/busybox-static-$pkgver-r$pkgrel-$_arch-v3.17.apk
+	tar -xf $srcdir/busybox-static-$pkgver-r$pkgrel-$_arch-v3.16.apk
 	rm .PKGINFO .SIGN.*
 }
 
 sha512sums="
-adda6bef9a786e2019979b3002e9f9791a6054bc2cda54c5c82d69c47da1d71f32d50af9bbfa9fbd118ec10ea2e0c5c68db96068b61cee3a7b23c002efa5dba7  busybox-static-1.35.0-r29-aarch64-v3.17.apk
+c7c242c2954aaa4367d176ffc27fed92b87015206f62094656cb146b75081e4ffd42d939568df87dd03a79ba12bae933901f01347aa8c32b2320f4cdd537f2f5  busybox-static-1.35.0-r14-aarch64-v3.16.apk
 "

cross/busybox-static-armv7/APKBUILD

@@ -8,7 +8,7 @@ fi
 
 pkgname=busybox-static-armv7
 pkgver=1.35.0
-pkgrel=29
+pkgrel=14
 
 _arch="armv7"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -21,16 +21,16 @@ pkgdesc="Statically linked Busybox for $_arch"
 _target="$(arch_to_hostspec $_arch)"
 
 source="
-	busybox-static-$pkgver-r$pkgrel-$_arch-v3.17.apk::$_mirror/v3.17/main/$_arch/busybox-static-$pkgver-r$pkgrel.apk
+	busybox-static-$pkgver-r$pkgrel-$_arch-v3.16.apk::$_mirror/v3.16/main/$_arch/busybox-static-$pkgver-r$pkgrel.apk
 "
 
 package() {
 	mkdir -p "$pkgdir/usr/$_target"
 	cd "$pkgdir/usr/$_target"
-	tar -xf $srcdir/busybox-static-$pkgver-r$pkgrel-$_arch-v3.17.apk
+	tar -xf $srcdir/busybox-static-$pkgver-r$pkgrel-$_arch-v3.16.apk
 	rm .PKGINFO .SIGN.*
 }
 
 sha512sums="
-b9ea4746ad9e0b1fd41c6112998deab350c6bb383ea60802608eba1e4997d2c7c5a37ef8bdb8307783f5dd5491885f2bcd8c6a467cd44f8d1e080b37f95bf16b  busybox-static-1.35.0-r29-armv7-v3.17.apk
+8fe3a2c6583c90907fdd09e0a54e60ca070a49b75d486d43606b674ba465f4dec63d404463db38427fe44eac1edc40ee41329cb7eb5fd3b1fb8ca400a94c1267  busybox-static-1.35.0-r14-armv7-v3.16.apk
 "

cross/gcc-aarch64/0001-posix_memalign.patch

@@ -1,4 +1,4 @@
-From 74c7b0df9971b6bc75d7d172c2819ffd21d51050 Mon Sep 17 00:00:00 2001
+From feb04e50d907683385cc4dc0163cf1d82258073a Mon Sep 17 00:00:00 2001
 From: Szabolcs Nagy <nsz@port70.net>
 Date: Fri, 26 Jan 2018 20:32:50 +0000
 Subject: [PATCH] posix_memalign
@@ -8,7 +8,7 @@ Subject: [PATCH] posix_memalign
  1 file changed, 5 insertions(+), 4 deletions(-)
 
 diff --git a/gcc/config/i386/pmm_malloc.h b/gcc/config/i386/pmm_malloc.h
-index 3b2e4f47915..20f790904a2 100644
+index 1b0bfe37852..d7b2b19bb3c 100644
 --- a/gcc/config/i386/pmm_malloc.h
 +++ b/gcc/config/i386/pmm_malloc.h
 @@ -27,12 +27,13 @@
@@ -37,3 +37,6 @@ index 3b2e4f47915..20f790904a2 100644
      return __ptr;
    else
      return NULL;
+-- 
+2.35.1
+

cross/gcc-aarch64/0002-gcc-poison-system-directories.patch

@@ -1,4 +1,4 @@
-From dd1e75ff4ecda96957465b34681f245e818928bd Mon Sep 17 00:00:00 2001
+From d64825212f807435a4b2f8e068c0f65195c8e2e6 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Fri, 29 Mar 2013 08:59:00 +0400
 Subject: [PATCH] gcc: poison-system-directories
@@ -21,15 +21,15 @@ Upstream-Status: Pending
  gcc/configure       | 16 ++++++++++++++++
  gcc/configure.ac    | 10 ++++++++++
  gcc/doc/invoke.texi |  9 +++++++++
- gcc/gcc.cc          |  2 ++
- gcc/incpath.cc      | 21 +++++++++++++++++++++
+ gcc/gcc.c           |  2 ++
+ gcc/incpath.c       | 21 +++++++++++++++++++++
  7 files changed, 68 insertions(+)
 
 diff --git a/gcc/common.opt b/gcc/common.opt
-index 8a0dafc522d..0357868e22c 100644
+index a75b44ee47e..d15105a73f3 100644
 --- a/gcc/common.opt
 +++ b/gcc/common.opt
-@@ -710,6 +710,10 @@ Wreturn-local-addr
+@@ -683,6 +683,10 @@ Wreturn-local-addr
  Common Var(warn_return_local_addr) Init(1) Warning
  Warn about returning a pointer/reference to a local or temporary variable.
  
@@ -41,10 +41,10 @@ index 8a0dafc522d..0357868e22c 100644
  Common Var(warn_shadow) Warning
  Warn when one variable shadows another.  Same as -Wshadow=global.
 diff --git a/gcc/config.in b/gcc/config.in
-index 64c27c9cfac..f0fbf123aa8 100644
+index 2de5a463315..059c818c895 100644
 --- a/gcc/config.in
 +++ b/gcc/config.in
-@@ -230,6 +230,12 @@
+@@ -218,6 +218,12 @@
  #endif
  
  
@@ -58,10 +58,10 @@ index 64c27c9cfac..f0fbf123aa8 100644
     optimizer and back end) to be checked for dynamic type safety at runtime.
     This is quite expensive. */
 diff --git a/gcc/configure b/gcc/configure
-index 5ce0557719a..e9060112384 100755
+index 708328e1670..4b977e313b5 100755
 --- a/gcc/configure
 +++ b/gcc/configure
-@@ -1023,6 +1023,7 @@ enable_maintainer_mode
+@@ -1020,6 +1020,7 @@ enable_maintainer_mode
  enable_link_mutex
  enable_link_serialization
  enable_version_specific_runtime_libs
@@ -69,7 +69,7 @@ index 5ce0557719a..e9060112384 100755
  enable_plugin
  enable_host_shared
  enable_libquadmath_support
-@@ -1785,6 +1786,8 @@ Optional Features:
+@@ -1782,6 +1783,8 @@ Optional Features:
    --enable-version-specific-runtime-libs
                            specify that runtime libraries should be installed
                            in a compiler-specific directory
@@ -78,7 +78,7 @@ index 5ce0557719a..e9060112384 100755
    --enable-plugin         enable plugin support
    --enable-host-shared    build host code as shared libraries
    --disable-libquadmath-support
-@@ -31982,6 +31985,19 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then :
+@@ -31790,6 +31793,19 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then :
  fi
  
  
@@ -99,10 +99,10 @@ index 5ce0557719a..e9060112384 100755
  
  
 diff --git a/gcc/configure.ac b/gcc/configure.ac
-index 23bee7010a3..75a7048045c 100644
+index df1c9cc3200..5461bab88a9 100644
 --- a/gcc/configure.ac
 +++ b/gcc/configure.ac
-@@ -7421,6 +7421,16 @@ AC_ARG_ENABLE(version-specific-runtime-libs,
+@@ -7311,6 +7311,16 @@ AC_ARG_ENABLE(version-specific-runtime-libs,
                  [specify that runtime libraries should be
                   installed in a compiler-specific directory])])
  
@@ -120,10 +120,10 @@ index 23bee7010a3..75a7048045c 100644
  AC_SUBST(subdirs)
  AC_SUBST(srcdir)
 diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index 07b440190c3..b2de464798a 100644
+index cf536a15116..7d3f1ccddf3 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
-@@ -379,6 +379,7 @@ Objective-C and Objective-C++ Dialects}.
+@@ -369,6 +369,7 @@ Objective-C and Objective-C++ Dialects}.
  -Wpacked  -Wno-packed-bitfield-compat  -Wpacked-not-aligned  -Wpadded @gol
  -Wparentheses  -Wno-pedantic-ms-format @gol
  -Wpointer-arith  -Wno-pointer-compare  -Wno-pointer-to-int-cast @gol
@@ -131,7 +131,7 @@ index 07b440190c3..b2de464798a 100644
  -Wno-pragmas  -Wno-prio-ctor-dtor  -Wredundant-decls @gol
  -Wrestrict  -Wno-return-local-addr  -Wreturn-type @gol
  -Wno-scalar-storage-order  -Wsequence-point @gol
-@@ -8029,6 +8030,14 @@ made up of data only and thus requires no special treatment.  But, for
+@@ -7728,6 +7729,14 @@ made up of data only and thus requires no special treatment.  But, for
  most targets, it is made up of code and thus requires the stack to be
  made executable in order for the program to work properly.
  
@@ -146,11 +146,11 @@ index 07b440190c3..b2de464798a 100644
  @item -Wfloat-equal
  @opindex Wfloat-equal
  @opindex Wno-float-equal
-diff --git a/gcc/gcc.cc b/gcc/gcc.cc
-index bb07cc244e3..47fb5802194 100644
---- a/gcc/gcc.cc
-+++ b/gcc/gcc.cc
-@@ -1159,6 +1159,8 @@ proper position among the other output files.  */
+diff --git a/gcc/gcc.c b/gcc/gcc.c
+index 8ba410c9e17..a83ba34ac4b 100644
+--- a/gcc/gcc.c
++++ b/gcc/gcc.c
+@@ -1152,6 +1152,8 @@ proper position among the other output files.  */
     "%{fuse-ld=*:-fuse-ld=%*} " LINK_COMPRESS_DEBUG_SPEC \
     "%X %{o*} %{e*} %{N} %{n} %{r}\
      %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!r:%{!nostartfiles:%S}}} \
@@ -159,10 +159,10 @@ index bb07cc244e3..47fb5802194 100644
      %{static|no-pie|static-pie:} %@{L*} %(mfwrap) %(link_libgcc) " \
      VTABLE_VERIFICATION_SPEC " " SANITIZER_EARLY_SPEC " %o "" \
      %{fopenacc|fopenmp|%:gt(%{ftree-parallelize-loops=*:%*} 1):\
-diff --git a/gcc/incpath.cc b/gcc/incpath.cc
-index bd2a97938eb..c80f100f476 100644
---- a/gcc/incpath.cc
-+++ b/gcc/incpath.cc
+diff --git a/gcc/incpath.c b/gcc/incpath.c
+index 446d280321d..fbfc0ce03b8 100644
+--- a/gcc/incpath.c
++++ b/gcc/incpath.c
 @@ -26,6 +26,7 @@
  #include "intl.h"
  #include "incpath.h"
@@ -171,7 +171,7 @@ index bd2a97938eb..c80f100f476 100644
  
  /* Microsoft Windows does not natively support inodes.
     VMS has non-numeric inodes.  */
-@@ -399,6 +400,26 @@ merge_include_chains (const char *sysroot, cpp_reader *pfile, int verbose)
+@@ -395,6 +396,26 @@ merge_include_chains (const char *sysroot, cpp_reader *pfile, int verbose)
  	}
        fprintf (stderr, _("End of search list.\n"));
      }
@@ -198,3 +198,6 @@ index bd2a97938eb..c80f100f476 100644
  }
  
  /* Use given -I paths for #include "..." but not #include <...>, and
+-- 
+2.35.1
+

cross/gcc-aarch64/0003-specs-turn-on-Wl-z-now-by-default.patch

@@ -1,4 +1,4 @@
-From 40e45739e7d3787acd13b5b9a4c27d843de0ffe2 Mon Sep 17 00:00:00 2001
+From 9675297b3a46b65a54e9df97f26ea445d53c67c6 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:45:49 +0000
 Subject: [PATCH] specs: turn on -Wl,-z,now by default
@@ -10,14 +10,14 @@ Binutils does not appear to have a similar option for enabling -z
 now by default.
 ---
  gcc/doc/invoke.texi | 3 +++
- gcc/gcc.cc          | 1 +
+ gcc/gcc.c           | 1 +
  2 files changed, 4 insertions(+)
 
 diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index b2de464798a..83bd1bde433 100644
+index 7d3f1ccddf3..485d2d6b742 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
-@@ -16872,6 +16872,9 @@ For example, @option{-Wl,-Map,output.map} passes @option{-Map output.map} to the
+@@ -15921,6 +15921,9 @@ For example, @option{-Wl,-Map,output.map} passes @option{-Map output.map} to the
  linker.  When using the GNU linker, you can also get the same effect with
  @option{-Wl,-Map=output.map}.
  
@@ -27,11 +27,11 @@ index b2de464798a..83bd1bde433 100644
  @item -u @var{symbol}
  @opindex u
  Pretend the symbol @var{symbol} is undefined, to force linking of
-diff --git a/gcc/gcc.cc b/gcc/gcc.cc
-index 47fb5802194..d18b5d7b59a 100644
---- a/gcc/gcc.cc
-+++ b/gcc/gcc.cc
-@@ -1157,6 +1157,7 @@ proper position among the other output files.  */
+diff --git a/gcc/gcc.c b/gcc/gcc.c
+index a83ba34ac4b..faf9ce76b3d 100644
+--- a/gcc/gcc.c
++++ b/gcc/gcc.c
+@@ -1150,6 +1150,7 @@ proper position among the other output files.  */
     "%{flto|flto=*:%<fcompare-debug*} \
      %{flto} %{fno-lto} %{flto=*} %l " LINK_PIE_SPEC \
     "%{fuse-ld=*:-fuse-ld=%*} " LINK_COMPRESS_DEBUG_SPEC \
@@ -39,3 +39,6 @@ index 47fb5802194..d18b5d7b59a 100644
     "%X %{o*} %{e*} %{N} %{n} %{r}\
      %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!r:%{!nostartfiles:%S}}} \
      %{Wno-poison-system-directories:--no-poison-system-directories} \
+-- 
+2.35.1
+

cross/gcc-aarch64/0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch

@@ -1,19 +1,19 @@
-From 666d0aeb808ac9c10d065ae7b196695c81a25a20 Mon Sep 17 00:00:00 2001
+From 4eb1b3849325b77c4cb66b675119299de35125bb Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:46:22 +0000
 Subject: [PATCH] Turn on -D_FORTIFY_SOURCE=2 by default for C, C++, ObjC,
  ObjC++, if the optimization level is > 0
 
 ---
- gcc/c-family/c-cppbuiltin.cc | 4 ++++
- gcc/doc/invoke.texi          | 6 ++++++
+ gcc/c-family/c-cppbuiltin.c | 4 ++++
+ gcc/doc/invoke.texi         | 6 ++++++
  2 files changed, 10 insertions(+)
 
-diff --git a/gcc/c-family/c-cppbuiltin.cc b/gcc/c-family/c-cppbuiltin.cc
-index 4672ae8486a..573c021e1e8 100644
---- a/gcc/c-family/c-cppbuiltin.cc
-+++ b/gcc/c-family/c-cppbuiltin.cc
-@@ -1510,6 +1510,10 @@ c_cpp_builtins (cpp_reader *pfile)
+diff --git a/gcc/c-family/c-cppbuiltin.c b/gcc/c-family/c-cppbuiltin.c
+index 11e015bdb87..de8b7bf246f 100644
+--- a/gcc/c-family/c-cppbuiltin.c
++++ b/gcc/c-family/c-cppbuiltin.c
+@@ -1427,6 +1427,10 @@ c_cpp_builtins (cpp_reader *pfile)
    builtin_define_with_value ("__REGISTER_PREFIX__", REGISTER_PREFIX, 0);
    builtin_define_with_value ("__USER_LABEL_PREFIX__", user_label_prefix, 0);
  
@@ -25,10 +25,10 @@ index 4672ae8486a..573c021e1e8 100644
    if (flag_gnu89_inline)
      cpp_define (pfile, "__GNUC_GNU_INLINE__");
 diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index 83bd1bde433..dda299a9987 100644
+index 485d2d6b742..164929f7583 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
-@@ -10896,6 +10896,12 @@ also turns on the following optimization flags:
+@@ -10225,6 +10225,12 @@ also turns on the following optimization flags:
  Please note the warning under @option{-fgcse} about
  invoking @option{-O2} on programs that use computed gotos.
  
@@ -41,3 +41,6 @@ index 83bd1bde433..dda299a9987 100644
  @item -O3
  @opindex O3
  Optimize yet more.  @option{-O3} turns on all optimizations specified
+-- 
+2.35.1
+

cross/gcc-aarch64/0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch

@@ -1,4 +1,4 @@
-From 75d1a35180cf0967f062765314bf091a64032062 Mon Sep 17 00:00:00 2001
+From 8de5d46c530ceca9f4add46d5cae3cd52c38eba3 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:46:56 +0000
 Subject: [PATCH] On linux targets pass --as-needed by default to the linker,
@@ -18,11 +18,11 @@ Subject: [PATCH] On linux targets pass --as-needed by default to the linker,
  gcc/config/rs6000/sysv4.h          |  2 +-
  gcc/config/s390/linux.h            |  2 +-
  gcc/config/sparc/linux.h           |  2 +-
- gcc/gcc.cc                         | 28 ++++++++++++++++++++--------
+ gcc/gcc.c                          | 28 ++++++++++++++++++++--------
  14 files changed, 36 insertions(+), 19 deletions(-)
 
 diff --git a/gcc/config/aarch64/aarch64-linux.h b/gcc/config/aarch64/aarch64-linux.h
-index 5e4553d79f5..b516f3ef97f 100644
+index 7f2529a2a1d..b097e1688aa 100644
 --- a/gcc/config/aarch64/aarch64-linux.h
 +++ b/gcc/config/aarch64/aarch64-linux.h
 @@ -35,6 +35,7 @@
@@ -34,7 +34,7 @@ index 5e4553d79f5..b516f3ef97f 100644
     %{shared:-shared}				\
     %{symbolic:-Bsymbolic}			\
 diff --git a/gcc/config/alpha/linux-elf.h b/gcc/config/alpha/linux-elf.h
-index 17f16a55910..9ec667e9a5e 100644
+index c1dae8ca2cf..a87dc740171 100644
 --- a/gcc/config/alpha/linux-elf.h
 +++ b/gcc/config/alpha/linux-elf.h
 @@ -37,7 +37,7 @@ along with GCC; see the file COPYING3.  If not see
@@ -47,7 +47,7 @@ index 17f16a55910..9ec667e9a5e 100644
    %{shared:-shared}						\
    %{!shared:							\
 diff --git a/gcc/config/arm/linux-elf.h b/gcc/config/arm/linux-elf.h
-index df3da67c4f0..7532bc29f9b 100644
+index 0c1c4e70b6b..8b581afacdd 100644
 --- a/gcc/config/arm/linux-elf.h
 +++ b/gcc/config/arm/linux-elf.h
 @@ -70,6 +70,7 @@
@@ -59,7 +59,7 @@ index df3da67c4f0..7532bc29f9b 100644
     SUBTARGET_EXTRA_LINK_SPEC
  
 diff --git a/gcc/config/gnu-user.h b/gcc/config/gnu-user.h
-index 857c0e077bf..8433e56c3e1 100644
+index 5ebbf42a13d..902378e1bad 100644
 --- a/gcc/config/gnu-user.h
 +++ b/gcc/config/gnu-user.h
 @@ -136,7 +136,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
@@ -87,7 +87,7 @@ index 857c0e077bf..8433e56c3e1 100644
  
  #undef TARGET_F951_OPTIONS
 diff --git a/gcc/config/i386/gnu-user.h b/gcc/config/i386/gnu-user.h
-index 0102b2a6f3b..994414c1845 100644
+index a23e7ab3eb7..12ac8cb93a9 100644
 --- a/gcc/config/i386/gnu-user.h
 +++ b/gcc/config/i386/gnu-user.h
 @@ -68,7 +68,7 @@ along with GCC; see the file COPYING3.  If not see
@@ -100,7 +100,7 @@ index 0102b2a6f3b..994414c1845 100644
      %{!static: \
        %{!static-pie: \
 diff --git a/gcc/config/i386/gnu-user64.h b/gcc/config/i386/gnu-user64.h
-index abc8cf624ca..fe656aeae27 100644
+index f3e25b1412a..712b0f1c30e 100644
 --- a/gcc/config/i386/gnu-user64.h
 +++ b/gcc/config/i386/gnu-user64.h
 @@ -56,6 +56,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
@@ -112,7 +112,7 @@ index abc8cf624ca..fe656aeae27 100644
    %{!shared: \
      %{!static: \
 diff --git a/gcc/config/ia64/linux.h b/gcc/config/ia64/linux.h
-index 93510098ccc..3813e536423 100644
+index ac40c3dfd3f..6e19e25c35a 100644
 --- a/gcc/config/ia64/linux.h
 +++ b/gcc/config/ia64/linux.h
 @@ -58,7 +58,7 @@ do {						\
@@ -125,7 +125,7 @@ index 93510098ccc..3813e536423 100644
    %{!shared: \
      %{!static: \
 diff --git a/gcc/config/mips/gnu-user.h b/gcc/config/mips/gnu-user.h
-index 6aad7192e69..e1256a55add 100644
+index a390bcece83..be0ee289367 100644
 --- a/gcc/config/mips/gnu-user.h
 +++ b/gcc/config/mips/gnu-user.h
 @@ -55,6 +55,7 @@ along with GCC; see the file COPYING3.  If not see
@@ -137,7 +137,7 @@ index 6aad7192e69..e1256a55add 100644
      %{!static: \
        %{rdynamic:-export-dynamic} \
 diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h
-index 38803723ba9..3067ed6eac8 100644
+index fce5b896e6e..ee29979dd34 100644
 --- a/gcc/config/riscv/linux.h
 +++ b/gcc/config/riscv/linux.h
 @@ -58,6 +58,7 @@ along with GCC; see the file COPYING3.  If not see
@@ -149,10 +149,10 @@ index 38803723ba9..3067ed6eac8 100644
  %{mno-relax:--no-relax} \
  %{mbig-endian:-EB} \
 diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h
-index b2a7afabc73..34ceb4e4fce 100644
+index e3f2cd254f6..43499ed29cf 100644
 --- a/gcc/config/rs6000/linux64.h
 +++ b/gcc/config/rs6000/linux64.h
-@@ -377,13 +377,13 @@ extern int dot_symbols;
+@@ -374,13 +374,13 @@ extern int dot_symbols;
  					   " -m elf64ppc")
  #endif
  
@@ -169,10 +169,10 @@ index b2a7afabc73..34ceb4e4fce 100644
      %{rdynamic:-export-dynamic} \
      -dynamic-linker " GNU_USER_DYNAMIC_LINKER64 "}}} \
 diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h
-index 7e2519de5d4..61215a7a1b3 100644
+index 510abe169c5..3c1f3a8ec5d 100644
 --- a/gcc/config/rs6000/sysv4.h
 +++ b/gcc/config/rs6000/sysv4.h
-@@ -788,7 +788,7 @@ GNU_USER_TARGET_CC1_SPEC
+@@ -789,7 +789,7 @@ GNU_USER_TARGET_CC1_SPEC
  #define GNU_USER_DYNAMIC_LINKER GLIBC_DYNAMIC_LINKER
  #endif
  
@@ -182,7 +182,7 @@ index 7e2519de5d4..61215a7a1b3 100644
    -dynamic-linker " GNU_USER_DYNAMIC_LINKER "}}"
  
 diff --git a/gcc/config/s390/linux.h b/gcc/config/s390/linux.h
-index d7b7e7a7b02..d2287f14f2e 100644
+index daa48fdfc2b..2fcfc5d770f 100644
 --- a/gcc/config/s390/linux.h
 +++ b/gcc/config/s390/linux.h
 @@ -82,7 +82,7 @@ along with GCC; see the file COPYING3.  If not see
@@ -195,7 +195,7 @@ index d7b7e7a7b02..d2287f14f2e 100644
     %{!shared: \
        %{static:-static} \
 diff --git a/gcc/config/sparc/linux.h b/gcc/config/sparc/linux.h
-index 6a809e9092d..93bfb92d3ff 100644
+index 2550d7ee8f0..7596d0b2757 100644
 --- a/gcc/config/sparc/linux.h
 +++ b/gcc/config/sparc/linux.h
 @@ -81,7 +81,7 @@ extern const char *host_detect_local_cpu (int argc, const char **argv);
@@ -207,11 +207,11 @@ index 6a809e9092d..93bfb92d3ff 100644
    %{!mno-relax:%{!r:-relax}} \
    %{!shared: \
      %{!static: \
-diff --git a/gcc/gcc.cc b/gcc/gcc.cc
-index d18b5d7b59a..3b76311b544 100644
---- a/gcc/gcc.cc
-+++ b/gcc/gcc.cc
-@@ -744,8 +744,11 @@ proper position among the other output files.  */
+diff --git a/gcc/gcc.c b/gcc/gcc.c
+index faf9ce76b3d..1ad5da6d769 100644
+--- a/gcc/gcc.c
++++ b/gcc/gcc.c
+@@ -737,8 +737,11 @@ proper position among the other output files.  */
  #ifdef LIBASAN_EARLY_SPEC
  #define LIBASAN_SPEC STATIC_LIBASAN_LIBS
  #elif defined(HAVE_LD_STATIC_DYNAMIC)
@@ -225,7 +225,7 @@ index d18b5d7b59a..3b76311b544 100644
  		     STATIC_LIBASAN_LIBS
  #else
  #define LIBASAN_SPEC "-lasan" STATIC_LIBASAN_LIBS
-@@ -780,8 +783,11 @@ proper position among the other output files.  */
+@@ -773,8 +776,11 @@ proper position among the other output files.  */
  #ifdef LIBTSAN_EARLY_SPEC
  #define LIBTSAN_SPEC STATIC_LIBTSAN_LIBS
  #elif defined(HAVE_LD_STATIC_DYNAMIC)
@@ -239,7 +239,7 @@ index d18b5d7b59a..3b76311b544 100644
  		     STATIC_LIBTSAN_LIBS
  #else
  #define LIBTSAN_SPEC "-ltsan" STATIC_LIBTSAN_LIBS
-@@ -798,8 +804,11 @@ proper position among the other output files.  */
+@@ -791,8 +797,11 @@ proper position among the other output files.  */
  #ifdef LIBLSAN_EARLY_SPEC
  #define LIBLSAN_SPEC STATIC_LIBLSAN_LIBS
  #elif defined(HAVE_LD_STATIC_DYNAMIC)
@@ -253,7 +253,7 @@ index d18b5d7b59a..3b76311b544 100644
  		     STATIC_LIBLSAN_LIBS
  #else
  #define LIBLSAN_SPEC "-llsan" STATIC_LIBLSAN_LIBS
-@@ -814,8 +823,11 @@ proper position among the other output files.  */
+@@ -807,8 +816,11 @@ proper position among the other output files.  */
  #define STATIC_LIBUBSAN_LIBS \
    " %{static-libubsan|static:%:include(libsanitizer.spec)%(link_libubsan)}"
  #ifdef HAVE_LD_STATIC_DYNAMIC
@@ -267,3 +267,6 @@ index d18b5d7b59a..3b76311b544 100644
  		     STATIC_LIBUBSAN_LIBS
  #else
  #define LIBUBSAN_SPEC "-lubsan" STATIC_LIBUBSAN_LIBS
+-- 
+2.35.1
+

cross/gcc-aarch64/0006-Enable-Wformat-and-Wformat-security-by-default.patch

@@ -1,4 +1,4 @@
-From c664283dd30949c5299d1c45bd5740bcfe993d22 Mon Sep 17 00:00:00 2001
+From 85e12e3d32a44c3fd10b5327edd542972a179eec Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:47:43 +0000
 Subject: [PATCH] Enable -Wformat and -Wformat-security by default.
@@ -8,10 +8,10 @@ Subject: [PATCH] Enable -Wformat and -Wformat-security by default.
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/gcc/c-family/c.opt b/gcc/c-family/c.opt
-index 07da40ef43b..8683f706426 100644
+index 2005b783c68..c5c6af427cc 100644
 --- a/gcc/c-family/c.opt
 +++ b/gcc/c-family/c.opt
-@@ -692,7 +692,7 @@ Warn about function calls with format strings that write past the end
+@@ -637,7 +637,7 @@ Warn about function calls with format strings that write past the end
  of the destination region.  Same as -Wformat-overflow=1.
  
  Wformat-security
@@ -20,7 +20,7 @@ index 07da40ef43b..8683f706426 100644
  Warn about possible security problems with format functions.
  
  Wformat-signedness
-@@ -713,7 +713,7 @@ C ObjC C++ ObjC++ Var(warn_format_zero_length) Warning LangEnabledBy(C ObjC C++
+@@ -658,7 +658,7 @@ C ObjC C++ ObjC++ Var(warn_format_zero_length) Warning LangEnabledBy(C ObjC C++
  Warn about zero-length formats.
  
  Wformat=
@@ -29,3 +29,6 @@ index 07da40ef43b..8683f706426 100644
  Warn about printf/scanf/strftime/strfmon format string anomalies.
  
  Wformat-overflow=
+-- 
+2.35.1
+

cross/gcc-aarch64/0007-Enable-Wtrampolines-by-default.patch

@@ -1,4 +1,4 @@
-From e4d0ec43e772b6dc7c3708aed5309897df26a125 Mon Sep 17 00:00:00 2001
+From f1e92f5f3576779776c9f3d6aeef76e1569e719a Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:48:24 +0000
 Subject: [PATCH] Enable -Wtrampolines by default.
@@ -8,10 +8,10 @@ Subject: [PATCH] Enable -Wtrampolines by default.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/gcc/common.opt b/gcc/common.opt
-index 0357868e22c..6d5e5eebe60 100644
+index d15105a73f3..29f9504cb68 100644
 --- a/gcc/common.opt
 +++ b/gcc/common.opt
-@@ -802,7 +802,7 @@ Common Var(warn_system_headers) Warning
+@@ -775,7 +775,7 @@ Common Var(warn_system_headers) Warning
  Do not suppress warnings from system headers.
  
  Wtrampolines
@@ -19,4 +19,7 @@ index 0357868e22c..6d5e5eebe60 100644
 +Common Var(warn_trampolines) Init(1) Warning
  Warn whenever a trampoline is generated.
  
- Wtrivial-auto-var-init
+ Wtype-limits
+-- 
+2.35.1
+

cross/gcc-aarch64/0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch

@@ -1,19 +1,19 @@
-From 27e5d5bd3fed9006a2958d2b09750d15ad07383b Mon Sep 17 00:00:00 2001
+From 3503fd734a33b67ec6a9fdc2c52bb8310864b119 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:49:40 +0000
 Subject: [PATCH] Disable ssp on -nostdlib, -nodefaultlibs and -ffreestanding
  Change the buffer size.
 
 ---
- gcc/gcc.cc     | 8 +++++++-
+ gcc/gcc.c      | 8 +++++++-
  gcc/params.opt | 2 +-
  2 files changed, 8 insertions(+), 2 deletions(-)
 
-diff --git a/gcc/gcc.cc b/gcc/gcc.cc
-index 3b76311b544..cc99d0b7aa1 100644
---- a/gcc/gcc.cc
-+++ b/gcc/gcc.cc
-@@ -996,6 +996,12 @@ proper position among the other output files.  */
+diff --git a/gcc/gcc.c b/gcc/gcc.c
+index 1ad5da6d769..99314032ec2 100644
+--- a/gcc/gcc.c
++++ b/gcc/gcc.c
+@@ -989,6 +989,12 @@ proper position among the other output files.  */
  #define LINK_GCC_C_SEQUENCE_SPEC "%G %{!nolibc:%L %G}"
  #endif
  
@@ -26,7 +26,7 @@ index 3b76311b544..cc99d0b7aa1 100644
  #ifndef LINK_SSP_SPEC
  #ifdef TARGET_LIBC_PROVIDES_SSP
  #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
-@@ -1295,7 +1301,7 @@ static const char *cc1_options =
+@@ -1288,7 +1294,7 @@ static const char *cc1_options =
   %{-version:--version}\
   %{-help=*:--help=%*}\
   %{!fsyntax-only:%{S:%W{o*}%{!o*:-o %w%b.s}}}\
@@ -36,10 +36,10 @@ index 3b76311b544..cc99d0b7aa1 100644
   %{fprofile-arcs|fprofile-generate*|coverage:\
     %{!fprofile-update=single:\
 diff --git a/gcc/params.opt b/gcc/params.opt
-index b88e1372005..82a7e25dd2f 100644
+index 8ba281b4cfa..bab39cdf8a2 100644
 --- a/gcc/params.opt
 +++ b/gcc/params.opt
-@@ -1012,7 +1012,7 @@ Common Joined UInteger Var(param_ssa_name_def_chain_limit) Init(512) Param Optim
+@@ -946,7 +946,7 @@ Common Joined UInteger Var(param_ssa_name_def_chain_limit) Init(512) Param Optim
  The maximum number of SSA_NAME assignments to follow in determining a value.
  
  -param=ssp-buffer-size=
@@ -48,3 +48,6 @@ index b88e1372005..82a7e25dd2f 100644
  The lower bound for a buffer to be considered for stack smashing protection.
  
  -param=stack-clash-protection-guard-size=
+-- 
+2.35.1
+

cross/gcc-aarch64/0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch

@@ -1,4 +1,4 @@
-From 83bf2a316222e2fe0b72968cadf4e334d41173f6 Mon Sep 17 00:00:00 2001
+From c4dd51fe15a938fdd76d781a4eede2a9205eacbc Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:50:33 +0000
 Subject: [PATCH] Ensure that msgfmt doesn't encounter problems during gcc
@@ -26,7 +26,7 @@ https://bugs.gentoo.org/295480
  2 files changed, 2 insertions(+)
 
 diff --git a/libstdc++-v3/po/Makefile.am b/libstdc++-v3/po/Makefile.am
-index 8f51544989e..5329804d136 100644
+index ab716ff04ea..e595268d9fc 100644
 --- a/libstdc++-v3/po/Makefile.am
 +++ b/libstdc++-v3/po/Makefile.am
 @@ -38,6 +38,7 @@ MSGFMT = msgfmt
@@ -38,10 +38,10 @@ index 8f51544989e..5329804d136 100644
  
  all-local: all-local-$(USE_NLS)
 diff --git a/libstdc++-v3/po/Makefile.in b/libstdc++-v3/po/Makefile.in
-index 243f3db7b72..822210781fa 100644
+index 8edd2e05639..63f61fcf96f 100644
 --- a/libstdc++-v3/po/Makefile.in
 +++ b/libstdc++-v3/po/Makefile.in
-@@ -561,6 +561,7 @@ uninstall-am:
+@@ -553,6 +553,7 @@ uninstall-am:
  
  
  .po.mo:
@@ -49,3 +49,6 @@ index 243f3db7b72..822210781fa 100644
  	$(MSGFMT) -o $@ $<
  
  all-local: all-local-$(USE_NLS)
+-- 
+2.35.1
+

cross/gcc-aarch64/0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch

@@ -1,4 +1,4 @@
-From 190064993cd8ddbd48015c1fc1916e4110a97733 Mon Sep 17 00:00:00 2001
+From 0a1fd78184f00fb77dac00dabe98eb025620efc2 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:52:07 +0000
 Subject: [PATCH] Don't declare asprintf if defined as a macro.
@@ -8,7 +8,7 @@ Subject: [PATCH] Don't declare asprintf if defined as a macro.
  1 file changed, 3 insertions(+)
 
 diff --git a/include/libiberty.h b/include/libiberty.h
-index a65ced9c820..eb20ab0f95f 100644
+index f4c0fe11d6f..cf4b1043e4d 100644
 --- a/include/libiberty.h
 +++ b/include/libiberty.h
 @@ -652,8 +652,11 @@ extern void *bsearch_r (const void *, const void *,
@@ -23,3 +23,6 @@ index a65ced9c820..eb20ab0f95f 100644
  
  /* Like asprintf but allocates memory without fail. This works like
     xmalloc.  */
+-- 
+2.35.1
+

cross/gcc-aarch64/0011-libiberty-copy-PIC-objects-during-build-process.patch

@@ -1,4 +1,4 @@
-From 838e1daa955d9013c462be3471497cb39641e951 Mon Sep 17 00:00:00 2001
+From f81d67f6fe1f1066642606209c882b333d937cb7 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:53:00 +0000
 Subject: [PATCH] libiberty: copy PIC objects during build process
@@ -8,10 +8,10 @@ Subject: [PATCH] libiberty: copy PIC objects during build process
  1 file changed, 1 insertion(+)
 
 diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
-index 1b17c2e3a47..8db1176df2e 100644
+index 4f1213b983b..d0224649d30 100644
 --- a/libiberty/Makefile.in
 +++ b/libiberty/Makefile.in
-@@ -265,6 +265,7 @@ $(TARGETLIB): $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS)
+@@ -264,6 +264,7 @@ $(TARGETLIB): $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS)
  	  $(AR) $(AR_FLAGS) $(TARGETLIB) \
  	    $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS); \
  	  $(RANLIB) $(TARGETLIB); \
@@ -19,3 +19,6 @@ index 1b17c2e3a47..8db1176df2e 100644
  	  cd ..; \
  	else true; fi
  
+-- 
+2.35.1
+

cross/gcc-aarch64/0012-libitm-disable-FORTIFY.patch

@@ -1,4 +1,4 @@
-From 717346fbbd6642ba6b0c3af2deb3771794346507 Mon Sep 17 00:00:00 2001
+From 3b732288ce771348cbcc9fb633a36b7aff2b4ad4 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:53:36 +0000
 Subject: [PATCH] libitm: disable FORTIFY
@@ -8,7 +8,7 @@ Subject: [PATCH] libitm: disable FORTIFY
  1 file changed, 10 insertions(+)
 
 diff --git a/libitm/configure.tgt b/libitm/configure.tgt
-index 06e90973ef3..669e64236c3 100644
+index a3d84896cc5..ecb281d5919 100644
 --- a/libitm/configure.tgt
 +++ b/libitm/configure.tgt
 @@ -47,6 +47,16 @@ if test "$gcc_cv_have_tls" = yes ; then
@@ -28,3 +28,6 @@ index 06e90973ef3..669e64236c3 100644
  # Map the target cpu to an ARCH sub-directory.  At the same time,
  # work out any special compilation flags as necessary.
  case "${target_cpu}" in
+-- 
+2.35.1
+

cross/gcc-aarch64/0013-libgcc_s.patch

@@ -1,33 +1,33 @@
-From 048c394eb709bfd216e307c1b92ac7f8a7e7758b Mon Sep 17 00:00:00 2001
+From a3e556187d0a8e9d39544f023960eca0f07d3e83 Mon Sep 17 00:00:00 2001
 From: Szabolcs Nagy <nsz@port70.net>
 Date: Sat, 24 Oct 2015 20:09:53 +0000
 Subject: [PATCH] libgcc_s
 
 ---
- gcc/config/i386/i386-expand.cc | 4 ++--
- libgcc/config/i386/cpuinfo.c   | 6 +++---
- libgcc/config/i386/t-linux     | 2 +-
+ gcc/config/i386/i386-expand.c | 4 ++--
+ libgcc/config/i386/cpuinfo.c  | 6 +++---
+ libgcc/config/i386/t-linux    | 2 +-
  3 files changed, 6 insertions(+), 6 deletions(-)
 
-diff --git a/gcc/config/i386/i386-expand.cc b/gcc/config/i386/i386-expand.cc
-index 31780b6daf7..d89898846e1 100644
---- a/gcc/config/i386/i386-expand.cc
-+++ b/gcc/config/i386/i386-expand.cc
-@@ -12338,10 +12338,10 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget,
+diff --git a/gcc/config/i386/i386-expand.c b/gcc/config/i386/i386-expand.c
+index 1772fb16c9a..77e04b0c2df 100644
+--- a/gcc/config/i386/i386-expand.c
++++ b/gcc/config/i386/i386-expand.c
+@@ -11066,10 +11066,10 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget,
      {
      case IX86_BUILTIN_CPU_INIT:
        {
--	/* Make it call __cpu_indicator_init in libgcc.  */
-+	/* Make it call __cpu_indicator_init in libgcc.a.  */
+-	/* Make it call __cpu_indicator_init in libgcc. */
++	/* Make it call __cpu_indicator_init_local in libgcc.a. */
  	tree call_expr, fndecl, type;
- 	type = build_function_type_list (integer_type_node, NULL_TREE);
+         type = build_function_type_list (integer_type_node, NULL_TREE); 
 -	fndecl = build_fn_decl ("__cpu_indicator_init", type);
 +	fndecl = build_fn_decl ("__cpu_indicator_init_local", type);
- 	call_expr = build_call_expr (fndecl, 0);
+ 	call_expr = build_call_expr (fndecl, 0); 
  	return expand_expr (call_expr, target, mode, EXPAND_NORMAL);
        }
 diff --git a/libgcc/config/i386/cpuinfo.c b/libgcc/config/i386/cpuinfo.c
-index dab1d98060f..cf824b4114a 100644
+index ef463848f9d..1a3de052c80 100644
 --- a/libgcc/config/i386/cpuinfo.c
 +++ b/libgcc/config/i386/cpuinfo.c
 @@ -63,7 +63,7 @@ __cpu_indicator_init (void)
@@ -52,3 +52,6 @@ index 8506a635790..564296f788e 100644
 -HOST_LIBGCC2_CFLAGS += -mlong-double-80 -DUSE_ELF_SYMVER $(CET_FLAGS)
 +HOST_LIBGCC2_CFLAGS += -mlong-double-80 $(CET_FLAGS)
  CRTSTUFF_T_CFLAGS += $(CET_FLAGS)
+-- 
+2.35.1
+

cross/gcc-aarch64/0014-nopie.patch

@@ -1,4 +1,4 @@
-From db28b1e0f3b06325026ec5b5e7cdca4e9992e05c Mon Sep 17 00:00:00 2001
+From f520e67fba621f213146271408ff3210b3527176 Mon Sep 17 00:00:00 2001
 From: Szabolcs Nagy <nsz@port70.net>
 Date: Sat, 7 Nov 2015 02:08:05 +0000
 Subject: [PATCH] nopie
@@ -9,10 +9,10 @@ Subject: [PATCH] nopie
  2 files changed, 40 insertions(+)
 
 diff --git a/gcc/configure b/gcc/configure
-index e9060112384..2f6b3265a6c 100755
+index 4b977e313b5..592e81e40f6 100755
 --- a/gcc/configure
 +++ b/gcc/configure
-@@ -32497,6 +32497,33 @@ fi
+@@ -32300,6 +32300,33 @@ fi
  $as_echo "$gcc_cv_no_pie" >&6; }
  if test "$gcc_cv_no_pie" = "yes"; then
    NO_PIE_FLAG="-no-pie"
@@ -47,10 +47,10 @@ index e9060112384..2f6b3265a6c 100755
  
  
 diff --git a/gcc/configure.ac b/gcc/configure.ac
-index 75a7048045c..e683d3a7a5f 100644
+index 5461bab88a9..1577529ffb7 100644
 --- a/gcc/configure.ac
 +++ b/gcc/configure.ac
-@@ -7681,6 +7681,19 @@ AC_CACHE_CHECK([for -no-pie option],
+@@ -7571,6 +7571,19 @@ AC_CACHE_CHECK([for -no-pie option],
     LDFLAGS="$saved_LDFLAGS"])
  if test "$gcc_cv_no_pie" = "yes"; then
    NO_PIE_FLAG="-no-pie"
@@ -70,3 +70,6 @@ index 75a7048045c..e683d3a7a5f 100644
  fi
  AC_SUBST([NO_PIE_FLAG])
  
+-- 
+2.35.1
+

cross/gcc-aarch64/0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch

@@ -0,0 +1,25 @@
+From 37310cabb8bc7256899c4d45cc68a47ca2a3232b Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Fri, 21 Aug 2020 06:57:09 +0000
+Subject: [PATCH] libffi: use __linux__ instead of __gnu_linux__ for musl
+
+---
+ libffi/src/closures.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libffi/src/closures.c b/libffi/src/closures.c
+index 721ff00ea43..22a699c6340 100644
+--- a/libffi/src/closures.c
++++ b/libffi/src/closures.c
+@@ -34,7 +34,7 @@
+ #include <ffi_common.h>
+ 
+ #if !FFI_MMAP_EXEC_WRIT && !FFI_EXEC_TRAMPOLINE_TABLE
+-# if __gnu_linux__ && !defined(__ANDROID__)
++# if __linux__ && !defined(__ANDROID__)
+ /* This macro indicates it may be forbidden to map anonymous memory
+    with both write and execute permission.  Code compiled when this
+    option is defined will attempt to map such pages once, but if it
+-- 
+2.35.1
+

cross/gcc-aarch64/0016-dlang-update-zlib-binding.patch

@@ -0,0 +1,425 @@
+From 586e82425a024d85d1bd9952ca51d8a671aa9b5d Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Fri, 21 Aug 2020 06:57:51 +0000
+Subject: [PATCH] dlang: update zlib binding
+
+---
+ libphobos/src/std/zlib.d | 266 ++++++++++++++++++++++++++++-----------
+ 1 file changed, 196 insertions(+), 70 deletions(-)
+
+diff --git a/libphobos/src/std/zlib.d b/libphobos/src/std/zlib.d
+index e6cce240fd5..bd2fe37ebec 100644
+--- a/libphobos/src/std/zlib.d
++++ b/libphobos/src/std/zlib.d
+@@ -1,7 +1,7 @@
+ // Written in the D programming language.
+ 
+ /**
+- * Compress/decompress data using the $(HTTP www._zlib.net, _zlib library).
++ * Compress/decompress data using the $(HTTP www.zlib.net, zlib library).
+  *
+  * Examples:
+  *
+@@ -43,12 +43,12 @@
+  * References:
+  *  $(HTTP en.wikipedia.org/wiki/Zlib, Wikipedia)
+  *
+- * Copyright: Copyright Digital Mars 2000 - 2011.
++ * Copyright: Copyright The D Language Foundation 2000 - 2011.
+  * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+  * Authors:   $(HTTP digitalmars.com, Walter Bright)
+- * Source:    $(PHOBOSSRC std/_zlib.d)
++ * Source:    $(PHOBOSSRC std/zlib.d)
+  */
+-/*          Copyright Digital Mars 2000 - 2011.
++/*          Copyright The D Language Foundation 2000 - 2011.
+  * Distributed under the Boost Software License, Version 1.0.
+  *    (See accompanying file LICENSE_1_0.txt or copy at
+  *          http://www.boost.org/LICENSE_1_0.txt)
+@@ -75,9 +75,9 @@ enum
+ 
+ class ZlibException : Exception
+ {
+-    this(int errnum)
+-    {   string msg;
+-
++    private static string getmsg(int errnum) nothrow @nogc pure @safe
++    {
++        string msg;
+         switch (errnum)
+         {
+             case Z_STREAM_END:      msg = "stream end"; break;
+@@ -90,7 +90,12 @@ class ZlibException : Exception
+             case Z_VERSION_ERROR:   msg = "version error"; break;
+             default:                msg = "unknown error";  break;
+         }
+-        super(msg);
++        return msg;
++    }
++
++    this(int errnum)
++    {
++        super(getmsg(errnum));
+     }
+ }
+ 
+@@ -104,7 +109,7 @@ class ZlibException : Exception
+  *     buf = buffer containing input data
+  *
+  * Returns:
+- *     A $(D uint) checksum for the provided input data and starting checksum
++ *     A `uint` checksum for the provided input data and starting checksum
+  *
+  * See_Also:
+  *     $(LINK http://en.wikipedia.org/wiki/Adler-32)
+@@ -147,7 +152,7 @@ uint adler32(uint adler, const(void)[] buf)
+  *     buf = buffer containing input data
+  *
+  * Returns:
+- *     A $(D uint) checksum for the provided input data and starting checksum
++ *     A `uint` checksum for the provided input data and starting checksum
+  *
+  * See_Also:
+  *     $(LINK http://en.wikipedia.org/wiki/Cyclic_redundancy_check)
+@@ -191,13 +196,14 @@ uint crc32(uint crc, const(void)[] buf)
+ ubyte[] compress(const(void)[] srcbuf, int level)
+ in
+ {
+-    assert(-1 <= level && level <= 9);
++    assert(-1 <= level && level <= 9, "Compression level needs to be within [-1, 9].");
+ }
+-body
++do
+ {
+     import core.memory : GC;
++    import std.array : uninitializedArray;
+     auto destlen = srcbuf.length + ((srcbuf.length + 1023) / 1024) + 12;
+-    auto destbuf = new ubyte[destlen];
++    auto destbuf = uninitializedArray!(ubyte[])(destlen);
+     auto err = etc.c.zlib.compress2(destbuf.ptr, &destlen, cast(ubyte *) srcbuf.ptr, srcbuf.length, level);
+     if (err)
+     {
+@@ -276,7 +282,7 @@ void[] uncompress(const(void)[] srcbuf, size_t destlen = 0u, int winbits = 15)
+                 throw new ZlibException(err);
+         }
+     }
+-    assert(0);
++    assert(0, "Unreachable code");
+ }
+ 
+ @system unittest
+@@ -370,9 +376,9 @@ class Compress
+     this(int level, HeaderFormat header = HeaderFormat.deflate)
+     in
+     {
+-        assert(1 <= level && level <= 9);
++        assert(1 <= level && level <= 9, "Legal compression level are in [1, 9].");
+     }
+-    body
++    do
+     {
+         this.level = level;
+         this.gzip = header == HeaderFormat.gzip;
+@@ -406,6 +412,7 @@ class Compress
+     const(void)[] compress(const(void)[] buf)
+     {
+         import core.memory : GC;
++        import std.array : uninitializedArray;
+         int err;
+         ubyte[] destbuf;
+ 
+@@ -420,7 +427,7 @@ class Compress
+             inited = 1;
+         }
+ 
+-        destbuf = new ubyte[zs.avail_in + buf.length];
++        destbuf = uninitializedArray!(ubyte[])(zs.avail_in + buf.length);
+         zs.next_out = destbuf.ptr;
+         zs.avail_out = to!uint(destbuf.length);
+ 
+@@ -461,9 +468,10 @@ class Compress
+     void[] flush(int mode = Z_FINISH)
+     in
+     {
+-        assert(mode == Z_FINISH || mode == Z_SYNC_FLUSH || mode == Z_FULL_FLUSH);
++        assert(mode == Z_FINISH || mode == Z_SYNC_FLUSH || mode == Z_FULL_FLUSH,
++                "Mode must be either Z_FINISH, Z_SYNC_FLUSH or Z_FULL_FLUSH.");
+     }
+-    body
++    do
+     {
+         import core.memory : GC;
+         ubyte[] destbuf;
+@@ -523,6 +531,7 @@ class UnCompress
+     z_stream zs;
+     int inited;
+     int done;
++    bool inputEnded;
+     size_t destbufsize;
+ 
+     HeaderFormat format;
+@@ -571,16 +580,16 @@ class UnCompress
+     const(void)[] uncompress(const(void)[] buf)
+     in
+     {
+-        assert(!done);
++        assert(!done, "Buffer has been flushed.");
+     }
+-    body
++    do
+     {
++        if (inputEnded || !buf.length)
++            return null;
++
+         import core.memory : GC;
++        import std.array : uninitializedArray;
+         int err;
+-        ubyte[] destbuf;
+-
+-        if (buf.length == 0)
+-            return null;
+ 
+         if (!inited)
+         {
+@@ -598,26 +607,152 @@ class UnCompress
+ 
+         if (!destbufsize)
+             destbufsize = to!uint(buf.length) * 2;
+-        destbuf = new ubyte[zs.avail_in * 2 + destbufsize];
+-        zs.next_out = destbuf.ptr;
+-        zs.avail_out = to!uint(destbuf.length);
+-
+-        if (zs.avail_in)
+-            buf = zs.next_in[0 .. zs.avail_in] ~ cast(ubyte[]) buf;
++        auto destbuf = uninitializedArray!(ubyte[])(destbufsize);
++        size_t destFill;
+ 
+         zs.next_in = cast(ubyte*) buf.ptr;
+         zs.avail_in = to!uint(buf.length);
+ 
+-        err = inflate(&zs, Z_NO_FLUSH);
+-        if (err != Z_STREAM_END && err != Z_OK)
++        while (true)
+         {
+-            GC.free(destbuf.ptr);
+-            error(err);
++            auto oldAvailIn = zs.avail_in;
++
++            zs.next_out = destbuf[destFill .. $].ptr;
++            zs.avail_out = to!uint(destbuf.length - destFill);
++
++            err = inflate(&zs, Z_NO_FLUSH);
++            if (err == Z_STREAM_END)
++            {
++                inputEnded = true;
++                break;
++            }
++            else if (err != Z_OK)
++            {
++                GC.free(destbuf.ptr);
++                error(err);
++            }
++            else if (!zs.avail_in)
++                break;
++
++            /*
++                According to the zlib manual inflate() stops when either there's
++                no more data to uncompress or the output buffer is full
++                So at this point, the output buffer is too full
++            */
++
++            destFill = destbuf.length;
++
++            if (destbuf.capacity)
++            {
++                if (destbuf.length < destbuf.capacity)
++                    destbuf.length = destbuf.capacity;
++                else
++                {
++                    auto newLength = GC.extend(destbuf.ptr, destbufsize, destbufsize);
++
++                    if (newLength && destbuf.length < destbuf.capacity)
++                        destbuf.length = destbuf.capacity;
++                    else
++                        destbuf.length += destbufsize;
++                }
++            }
++            else
++                destbuf.length += destbufsize;
+         }
++
+         destbuf.length = destbuf.length - zs.avail_out;
+         return destbuf;
+     }
+ 
++    // Test for issues 3191 and 9505
++    @system unittest
++    {
++        import std.algorithm.comparison;
++        import std.array;
++        import std.file;
++        import std.zlib;
++
++        // Data that can be easily compressed
++        ubyte[1024] originalData;
++
++        // This should yield a compression ratio of at least 1/2
++        auto compressedData = compress(originalData, 9);
++        assert(compressedData.length < originalData.length / 2,
++                "The compression ratio is too low to accurately test this situation");
++
++        auto chunkSize = compressedData.length / 4;
++        assert(chunkSize < compressedData.length,
++                "The length of the compressed data is too small to accurately test this situation");
++
++        auto decompressor = new UnCompress();
++        ubyte[originalData.length] uncompressedData;
++        ubyte[] reusedBuf;
++        int progress;
++
++        reusedBuf.length = chunkSize;
++
++        for (int i = 0; i < compressedData.length; i += chunkSize)
++        {
++            auto len = min(chunkSize, compressedData.length - i);
++            // simulate reading from a stream in small chunks
++            reusedBuf[0 .. len] = compressedData[i .. i + len];
++
++            // decompress using same input buffer
++            auto chunk = decompressor.uncompress(reusedBuf);
++            assert(progress + chunk.length <= originalData.length,
++                    "The uncompressed result is bigger than the original data");
++
++            uncompressedData[progress .. progress + chunk.length] = cast(const ubyte[]) chunk[];
++            progress += chunk.length;
++        }
++
++        auto chunk = decompressor.flush();
++        assert(progress + chunk.length <= originalData.length,
++                "The uncompressed result is bigger than the original data");
++
++        uncompressedData[progress .. progress + chunk.length] = cast(const ubyte[]) chunk[];
++        progress += chunk.length;
++
++        assert(progress == originalData.length,
++                "The uncompressed and the original data sizes differ");
++        assert(originalData[] == uncompressedData[],
++                "The uncompressed and the original data differ");
++    }
++
++    @system unittest
++    {
++        ubyte[1024] invalidData;
++        auto decompressor = new UnCompress();
++
++        try
++        {
++            auto uncompressedData = decompressor.uncompress(invalidData);
++        }
++        catch (ZlibException e)
++        {
++            assert(e.msg == "data error");
++            return;
++        }
++
++        assert(false, "Corrupted data didn't result in an error");
++    }
++
++    @system unittest
++    {
++        ubyte[2014] originalData = void;
++        auto compressedData = compress(originalData, 9);
++
++        auto decompressor = new UnCompress();
++        auto uncompressedData = decompressor.uncompress(compressedData ~ cast(ubyte[]) "whatever");
++
++        assert(originalData.length == uncompressedData.length,
++                "The uncompressed and the original data sizes differ");
++        assert(originalData[] == uncompressedData[],
++                "The uncompressed and the original data differ");
++        assert(!decompressor.uncompress("whatever").length,
++                "Compression continued after the end");
++    }
++
+     /**
+      * Decompress and return any remaining data.
+      * The returned data should be appended to that returned by uncompress().
+@@ -626,49 +761,40 @@ class UnCompress
+     void[] flush()
+     in
+     {
+-        assert(!done);
++        assert(!done, "Buffer has been flushed before.");
+     }
+     out
+     {
+-        assert(done);
++        assert(done, "Flushing failed.");
+     }
+-    body
++    do
+     {
+-        import core.memory : GC;
+-        ubyte[] extra;
+-        ubyte[] destbuf;
+-        int err;
+-
+         done = 1;
+-        if (!inited)
+-            return null;
++        return null;
++    }
+ 
+-      L1:
+-        destbuf = new ubyte[zs.avail_in * 2 + 100];
+-        zs.next_out = destbuf.ptr;
+-        zs.avail_out = to!uint(destbuf.length);
++    /// Returns true if all input data has been decompressed and no further data
++    /// can be decompressed (inflate() returned Z_STREAM_END)
++    @property bool empty() const
++    {
++        return inputEnded;
++    }
+ 
+-        err = etc.c.zlib.inflate(&zs, Z_NO_FLUSH);
+-        if (err == Z_OK && zs.avail_out == 0)
+-        {
+-            extra ~= destbuf;
+-            goto L1;
+-        }
+-        if (err != Z_STREAM_END)
+-        {
+-            GC.free(destbuf.ptr);
+-            if (err == Z_OK)
+-                err = Z_BUF_ERROR;
+-            error(err);
+-        }
+-        destbuf = destbuf.ptr[0 .. zs.next_out - destbuf.ptr];
+-        err = etc.c.zlib.inflateEnd(&zs);
+-        inited = 0;
+-        if (err)
+-            error(err);
+-        if (extra.length)
+-            destbuf = extra ~ destbuf;
+-        return destbuf;
++    ///
++    @system unittest
++    {
++        // some random data
++        ubyte[1024] originalData = void;
++
++        // append garbage data (or don't, this works in both cases)
++        auto compressedData = cast(ubyte[]) compress(originalData) ~ cast(ubyte[]) "whatever";
++
++        auto decompressor = new UnCompress();
++        auto uncompressedData = decompressor.uncompress(compressedData);
++
++        assert(uncompressedData[] == originalData[],
++                "The uncompressed and the original data differ");
++        assert(decompressor.empty, "The UnCompressor reports not being done");
+     }
+ }
+ 
+-- 
+2.35.1
+

cross/gcc-aarch64/0017-dlang-use-libucontext-on-mips64.patch

@@ -1,4 +1,4 @@
-From 686e85d8a05f9f9e6c983afb13f937bd88fe84dd Mon Sep 17 00:00:00 2001
+From 26daa73d678b87a6950df1d79d171ba40ecbce15 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Thu, 6 Jan 2022 03:18:32 +0000
 Subject: [PATCH] dlang: use libucontext on mips64
@@ -8,7 +8,7 @@ Subject: [PATCH] dlang: use libucontext on mips64
  1 file changed, 1 insertion(+)
 
 diff --git a/libphobos/configure.tgt b/libphobos/configure.tgt
-index 0063dd23249..c5e782a1238 100644
+index 0643daeb613..b74d9fb3f25 100644
 --- a/libphobos/configure.tgt
 +++ b/libphobos/configure.tgt
 @@ -38,6 +38,7 @@ case "${target}" in
@@ -19,3 +19,6 @@ index 0063dd23249..c5e782a1238 100644
  	;;
    power*-*-freebsd*)
  	LIBPHOBOS_SUPPORTED=yes
+-- 
+2.35.1
+

cross/gcc-aarch64/0018-dlang-libdruntime-define-fcntl.h-constants-for-mips6.patch

@@ -0,0 +1,38 @@
+From caeae8288593dbd5a1a6d93508d875eb0d8fdf49 Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Thu, 6 Jan 2022 03:19:12 +0000
+Subject: [PATCH] dlang: libdruntime: define fcntl.h constants for mips64
+
+---
+ libphobos/libdruntime/core/sys/posix/fcntl.d | 15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
+
+diff --git a/libphobos/libdruntime/core/sys/posix/fcntl.d b/libphobos/libdruntime/core/sys/posix/fcntl.d
+index 59df921ba41..9ee9f943948 100644
+--- a/libphobos/libdruntime/core/sys/posix/fcntl.d
++++ b/libphobos/libdruntime/core/sys/posix/fcntl.d
+@@ -871,6 +871,21 @@ else version (CRuntime_Musl)
+             F_SETLKW       = 7,
+         }
+     }
++    else version (MIPS_Any)
++    {
++        enum 
++        {
++            O_DIRECTORY     = 0x010000, // octal   0200000
++            O_NOFOLLOW      = 0x020000, // octal   0400000
++            O_DIRECT        = 0x008000, // octal   0100000
++            O_LARGEFILE     = 0x002000, // octal   0020000
++            O_TMPFILE       = 0x410000, // octal 020200000
++
++            F_GETLK        = 33,
++            F_SETLK        = 34,
++            F_SETLKW       = 35,
++        }
++    }
+     else
+         static assert(0, "Platform not supported");
+ 
+-- 
+2.35.1
+

cross/gcc-aarch64/0019-ada-fix-shared-linking.patch

@@ -1,4 +1,4 @@
-From fd642f8cd61849a9dc169588be5562ceda96a889 Mon Sep 17 00:00:00 2001
+From 374a19de60fcd5c31321c3f4d26dcc4b631e8c3f Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:59:16 +0000
 Subject: [PATCH] ada: fix shared linking
@@ -8,7 +8,7 @@ Subject: [PATCH] ada: fix shared linking
  1 file changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/gcc/ada/link.c b/gcc/ada/link.c
-index a7574efb472..0ad0d66463c 100644
+index 5cd5ef64f56..1c611a82cab 100644
 --- a/gcc/ada/link.c
 +++ b/gcc/ada/link.c
 @@ -107,9 +107,9 @@ const char *__gnat_default_libgcc_subdir = "lib";
@@ -37,3 +37,6 @@ index a7574efb472..0ad0d66463c 100644
  int __gnat_link_max = 8192;
  unsigned char __gnat_objlist_file_supported = 1;
  const char *__gnat_object_library_extension = ".a";
+-- 
+2.35.1
+

cross/gcc-aarch64/0020-build-fix-CXXFLAGS_FOR_BUILD-passing.patch

@@ -1,4 +1,4 @@
-From a547632f5c7caec4a164e8d5e5b568fb7a461365 Mon Sep 17 00:00:00 2001
+From ad053bc46b535e78397f992e3c2c1d28c1ebd1f4 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:59:43 +0000
 Subject: [PATCH] build: fix CXXFLAGS_FOR_BUILD passing
@@ -8,10 +8,10 @@ Subject: [PATCH] build: fix CXXFLAGS_FOR_BUILD passing
  1 file changed, 1 insertion(+)
 
 diff --git a/Makefile.in b/Makefile.in
-index 593495e1650..b96f60e33e2 100644
+index 047be0255e2..426949aa91c 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -176,6 +176,7 @@ BUILD_EXPORTS = \
+@@ -170,6 +170,7 @@ BUILD_EXPORTS = \
  # built for the build system to override those in BASE_FLAGS_TO_PASS.
  EXTRA_BUILD_FLAGS = \
  	CFLAGS="$(CFLAGS_FOR_BUILD)" \
@@ -19,3 +19,6 @@ index 593495e1650..b96f60e33e2 100644
  	LDFLAGS="$(LDFLAGS_FOR_BUILD)"
  
  # This is the list of directories to built for the host system.
+-- 
+2.35.1
+

cross/gcc-aarch64/0021-add-fortify-headers-paths.patch

@@ -1,4 +1,4 @@
-From 5bd37f8ee93a0fe1a3f841f48ed6626e7e0aa19d Mon Sep 17 00:00:00 2001
+From 18d44a7f8d801cc6926a73e2dda2f0ce859dc561 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 07:01:06 +0000
 Subject: [PATCH] add fortify-headers paths
@@ -8,10 +8,10 @@ Subject: [PATCH] add fortify-headers paths
  1 file changed, 2 insertions(+)
 
 diff --git a/gcc/config/linux.h b/gcc/config/linux.h
-index 74f70793d90..61b07f319f6 100644
+index 4e1db60fced..7fcf402b416 100644
 --- a/gcc/config/linux.h
 +++ b/gcc/config/linux.h
-@@ -172,6 +172,8 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+@@ -167,6 +167,8 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
  
  #ifdef NATIVE_SYSTEM_HEADER_DIR
  #define INCLUDE_DEFAULTS_MUSL_NATIVE			\
@@ -20,3 +20,6 @@ index 74f70793d90..61b07f319f6 100644
      { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 2 },	\
      { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 0 },
  #else
+-- 
+2.35.1
+

cross/gcc-aarch64/0022-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch

@@ -1,4 +1,4 @@
-From d2577dc78a1f159e5c41fd0b53e73fa0e264cb52 Mon Sep 17 00:00:00 2001
+From 38d27ebdcc5a8bea0807b5d56203f0ea5e16868f Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
 Date: Fri, 21 Aug 2020 07:03:00 +0000
 Subject: [PATCH] Alpine musl package provides libssp_nonshared.a. We link to
@@ -9,14 +9,14 @@ Subject: [PATCH] Alpine musl package provides libssp_nonshared.a. We link to
  stack-protector flag usage.
 
 ---
- gcc/gcc.cc | 3 +--
+ gcc/gcc.c | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
 
-diff --git a/gcc/gcc.cc b/gcc/gcc.cc
-index cc99d0b7aa1..c60a75371f8 100644
---- a/gcc/gcc.cc
-+++ b/gcc/gcc.cc
-@@ -1004,8 +1004,7 @@ proper position among the other output files.  */
+diff --git a/gcc/gcc.c b/gcc/gcc.c
+index 99314032ec2..6e91767efe8 100644
+--- a/gcc/gcc.c
++++ b/gcc/gcc.c
+@@ -997,8 +997,7 @@ proper position among the other output files.  */
  
  #ifndef LINK_SSP_SPEC
  #ifdef TARGET_LIBC_PROVIDES_SSP
@@ -26,3 +26,6 @@ index cc99d0b7aa1..c60a75371f8 100644
  #else
  #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
  		       "|fstack-protector-strong|fstack-protector-explicit" \
+-- 
+2.35.1
+

cross/gcc-aarch64/0023-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch

@@ -1,18 +1,18 @@
-From bbd5c529ef878c2d6096fd4949616714eb82683a Mon Sep 17 00:00:00 2001
+From 0cc2a1befaf343e5ce1cbc15bd247eee812bdf33 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 07:03:42 +0000
 Subject: [PATCH] DP: Use --push-state/--pop-state for gold as well when
  linking libtsan.
 
 ---
- gcc/gcc.cc | 16 ++++++++--------
+ gcc/gcc.c | 16 ++++++++--------
  1 file changed, 8 insertions(+), 8 deletions(-)
 
-diff --git a/gcc/gcc.cc b/gcc/gcc.cc
-index c60a75371f8..735b2b1bba1 100644
---- a/gcc/gcc.cc
-+++ b/gcc/gcc.cc
-@@ -745,10 +745,10 @@ proper position among the other output files.  */
+diff --git a/gcc/gcc.c b/gcc/gcc.c
+index 6e91767efe8..22dbbf85850 100644
+--- a/gcc/gcc.c
++++ b/gcc/gcc.c
+@@ -738,10 +738,10 @@ proper position among the other output files.  */
  #define LIBASAN_SPEC STATIC_LIBASAN_LIBS
  #elif defined(HAVE_LD_STATIC_DYNAMIC)
  #define LIBASAN_SPEC "%{static-libasan:" LD_STATIC_OPTION "}" \
@@ -25,7 +25,7 @@ index c60a75371f8..735b2b1bba1 100644
  		     STATIC_LIBASAN_LIBS
  #else
  #define LIBASAN_SPEC "-lasan" STATIC_LIBASAN_LIBS
-@@ -784,10 +784,10 @@ proper position among the other output files.  */
+@@ -777,10 +777,10 @@ proper position among the other output files.  */
  #define LIBTSAN_SPEC STATIC_LIBTSAN_LIBS
  #elif defined(HAVE_LD_STATIC_DYNAMIC)
  #define LIBTSAN_SPEC "%{static-libtsan:" LD_STATIC_OPTION "}" \
@@ -38,7 +38,7 @@ index c60a75371f8..735b2b1bba1 100644
  		     STATIC_LIBTSAN_LIBS
  #else
  #define LIBTSAN_SPEC "-ltsan" STATIC_LIBTSAN_LIBS
-@@ -805,10 +805,10 @@ proper position among the other output files.  */
+@@ -798,10 +798,10 @@ proper position among the other output files.  */
  #define LIBLSAN_SPEC STATIC_LIBLSAN_LIBS
  #elif defined(HAVE_LD_STATIC_DYNAMIC)
  #define LIBLSAN_SPEC "%{static-liblsan:" LD_STATIC_OPTION "}" \
@@ -51,7 +51,7 @@ index c60a75371f8..735b2b1bba1 100644
  		     STATIC_LIBLSAN_LIBS
  #else
  #define LIBLSAN_SPEC "-llsan" STATIC_LIBLSAN_LIBS
-@@ -824,10 +824,10 @@ proper position among the other output files.  */
+@@ -817,10 +817,10 @@ proper position among the other output files.  */
    " %{static-libubsan|static:%:include(libsanitizer.spec)%(link_libubsan)}"
  #ifdef HAVE_LD_STATIC_DYNAMIC
  #define LIBUBSAN_SPEC "%{static-libubsan:" LD_STATIC_OPTION "}" \
@@ -64,3 +64,6 @@ index c60a75371f8..735b2b1bba1 100644
  		     STATIC_LIBUBSAN_LIBS
  #else
  #define LIBUBSAN_SPEC "-lubsan" STATIC_LIBUBSAN_LIBS
+-- 
+2.35.1
+

cross/gcc-aarch64/0024-mips64-disable-multilib-support.patch

@@ -1,4 +1,4 @@
-From 714ed6d9649bf9ed42e34fef9c41169921e63921 Mon Sep 17 00:00:00 2001
+From feea6f782e83a53487ad633608484dfa3483be1b Mon Sep 17 00:00:00 2001
 From: Nils Andreas Svee <me@lochnair.net>
 Date: Thu, 21 Dec 2017 03:14:33 +0100
 Subject: [PATCH] mips64: disable multilib support
@@ -10,10 +10,10 @@ multilib is not supported by Alpine GCC
  2 files changed, 7 insertions(+), 7 deletions(-)
 
 diff --git a/gcc/config/mips/mips.h b/gcc/config/mips/mips.h
-index 858bbba3a36..2d4f553e652 100644
+index 47aac9d3d61..4ad81059a86 100644
 --- a/gcc/config/mips/mips.h
 +++ b/gcc/config/mips/mips.h
-@@ -3447,11 +3447,11 @@ struct GTY(())  machine_function {
+@@ -3425,11 +3425,11 @@ struct GTY(())  machine_function {
  /* If we are *not* using multilibs and the default ABI is not ABI_32 we
     need to change these from /lib and /usr/lib.  */
  #if MIPS_ABI_DEFAULT == ABI_N32
@@ -30,7 +30,7 @@ index 858bbba3a36..2d4f553e652 100644
  
  /* Load store bonding is not supported by micromips and fix_24k.  The
 diff --git a/gcc/config/mips/t-linux64 b/gcc/config/mips/t-linux64
-index 2fdd8e00407..406a3676289 100644
+index 130e1f04707..a64ac2bbb5b 100644
 --- a/gcc/config/mips/t-linux64
 +++ b/gcc/config/mips/t-linux64
 @@ -21,6 +21,6 @@ MULTILIB_DIRNAMES = n32 32 64
@@ -43,3 +43,6 @@ index 2fdd8e00407..406a3676289 100644
 +        ../lib \
 +        ../lib32 \
 +        ../lib
+-- 
+2.35.1
+

cross/gcc-aarch64/0025-aarch64-disable-multilib-support.patch

@@ -1,4 +1,4 @@
-From 8fc8d6c26a2a45945182e211bc3ac2eae4d6a11b Mon Sep 17 00:00:00 2001
+From cbd96a32dc2aaa61f6adcb3643e1da21f185f80e Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Thu, 6 Jan 2022 03:12:55 +0000
 Subject: [PATCH] aarch64: disable multilib support
@@ -9,7 +9,7 @@ multilib is unsupported on Alpine GCC
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/gcc/config/aarch64/t-aarch64-linux b/gcc/config/aarch64/t-aarch64-linux
-index d0cd546002a..b63a77f4969 100644
+index 241b0ef20b6..18e63b34d8b 100644
 --- a/gcc/config/aarch64/t-aarch64-linux
 +++ b/gcc/config/aarch64/t-aarch64-linux
 @@ -22,7 +22,7 @@ LIB1ASMSRC   = aarch64/lib1funcs.asm
@@ -21,3 +21,6 @@ index d0cd546002a..b63a77f4969 100644
  MULTIARCH_DIRNAME = $(call if_multiarch,aarch64$(AARCH_BE)-linux-gnu)
  
  MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu_ilp32)
+-- 
+2.35.1
+

cross/gcc-aarch64/0026-s390x-disable-multilib-support.patch

@@ -1,4 +1,4 @@
-From 65ad898df141261a1ccd891a99133ad8f9847133 Mon Sep 17 00:00:00 2001
+From e87e415e9a88dbce68ed7b9d8386c3c2d0c0d6b6 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Thu, 6 Jan 2022 03:13:59 +0000
 Subject: [PATCH] s390x: disable multilib support
@@ -20,3 +20,6 @@ index cc6ab367072..7f498ee1cdc 100644
 -MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:s390-linux-gnu)
 +MULTILIB_OSDIRNAMES = m64=../lib
 +MULTILIB_OSDIRNAMES+= m32=../lib32
+-- 
+2.35.1
+

cross/gcc-aarch64/0027-ppc64-le-disable-multilib-support.patch

@@ -1,4 +1,4 @@
-From 3263d8634da6d7e1edb1bfd88e1b2627ce0aa1be Mon Sep 17 00:00:00 2001
+From 5c24869c9bc1a552f8bb5c32a8538c6e065a4db8 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Thu, 6 Jan 2022 03:14:33 +0000
 Subject: [PATCH] ppc64[le]: disable multilib support
@@ -12,7 +12,7 @@ multilib is not presently supported on Alpine GCC
  4 files changed, 10 insertions(+), 8 deletions(-)
 
 diff --git a/gcc/config/rs6000/t-linux b/gcc/config/rs6000/t-linux
-index 4e371255533..128c75c7d39 100644
+index aeb7440c492..ab14c455d8d 100644
 --- a/gcc/config/rs6000/t-linux
 +++ b/gcc/config/rs6000/t-linux
 @@ -2,7 +2,8 @@
@@ -36,7 +36,7 @@ index 4e371255533..128c75c7d39 100644
  endif
  
 diff --git a/gcc/config/rs6000/t-linux64 b/gcc/config/rs6000/t-linux64
-index 47e0efd5764..f89729af64f 100644
+index e11a118cb5f..df81dc04a32 100644
 --- a/gcc/config/rs6000/t-linux64
 +++ b/gcc/config/rs6000/t-linux64
 @@ -28,8 +28,8 @@
@@ -48,7 +48,7 @@ index 47e0efd5764..f89729af64f 100644
 +MULTILIB_OSDIRNAMES := m64=../lib
 +MULTILIB_OSDIRNAMES += m32=../lib32
  
- rs6000-linux.o: $(srcdir)/config/rs6000/rs6000-linux.cc
+ rs6000-linux.o: $(srcdir)/config/rs6000/rs6000-linux.c
  	$(COMPILE) $<
 diff --git a/gcc/config/rs6000/t-linux64bele b/gcc/config/rs6000/t-linux64bele
 index 97c1ee6fb4d..08d72639cb6 100644
@@ -76,3 +76,6 @@ index 2e63bdb9fc9..c6e1c5db65d 100644
 +MULTILIB_OSDIRNAMES := m64=../lib
 +MULTILIB_OSDIRNAMES += m32=../lib32
  MULTILIB_MATCHES    := ${MULTILIB_MATCHES_ENDIAN}
+-- 
+2.35.1
+

cross/gcc-aarch64/0028-x86_64-disable-multilib-support.patch

@@ -1,4 +1,4 @@
-From bf63353ea679e0bbf2c2f17bb64c75ebd590c6e7 Mon Sep 17 00:00:00 2001
+From 25927f8106583ee594e7bcdf92dd1387e0fd024c Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Thu, 6 Jan 2022 03:14:54 +0000
 Subject: [PATCH] x86_64: disable multilib support
@@ -9,7 +9,7 @@ multilib is not presently supported on Alpine GCC
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/gcc/config/i386/t-linux64 b/gcc/config/i386/t-linux64
-index 5526ad0e6cc..78866afab36 100644
+index d288b093522..2949033aa04 100644
 --- a/gcc/config/i386/t-linux64
 +++ b/gcc/config/i386/t-linux64
 @@ -33,6 +33,6 @@
@@ -21,3 +21,6 @@ index 5526ad0e6cc..78866afab36 100644
 +MULTILIB_OSDIRNAMES = m64=../lib
 +MULTILIB_OSDIRNAMES+= m32=../lib32
  MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32)
+-- 
+2.35.1
+

cross/gcc-aarch64/0029-riscv-disable-multilib-support.patch

@@ -1,4 +1,4 @@
-From 2eed19787020ce52cf07b76a5d167c420ec42b61 Mon Sep 17 00:00:00 2001
+From 18bcf23cae4069ffe9d9f64e851193d29dd4814f Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
 Date: Mon, 3 Jan 2022 07:14:48 +0100
 Subject: [PATCH] riscv: disable multilib support
@@ -43,7 +43,7 @@ library.
  2 files changed, 5 insertions(+), 8 deletions(-)
 
 diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h
-index 3067ed6eac8..4c8c85e3285 100644
+index ee29979dd34..fe8a82d6702 100644
 --- a/gcc/config/riscv/linux.h
 +++ b/gcc/config/riscv/linux.h
 @@ -71,9 +71,3 @@ along with GCC; see the file COPYING3.  If not see
@@ -69,3 +69,6 @@ index 216d2776a18..1a8a863853e 100644
 +MULTILIB_DIRNAMES := $(patsubst rv32%,lib32,$(patsubst rv64%,lib,$(MULTILIB_DIRNAMES)))
  MULTILIB_OSDIRNAMES := $(patsubst lib%,../lib%,$(MULTILIB_DIRNAMES))
 +MULTILIB_MATCHES := march?rv64gc=march?rv64imafdc
+-- 
+2.35.1
+

cross/gcc-aarch64/0030-always-build-libgcc_eh.a.patch

@@ -1,4 +1,4 @@
-From 51a35c0fa0e793c6a2c64ae1449c0cfd681d8f8a Mon Sep 17 00:00:00 2001
+From a46c8d6cb9428db29fbf8a80609ff449354ce111 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 07:05:41 +0000
 Subject: [PATCH] always build libgcc_eh.a
@@ -10,7 +10,7 @@ highly inspired by:
  1 file changed, 6 insertions(+), 5 deletions(-)
 
 diff --git a/libgcc/Makefile.in b/libgcc/Makefile.in
-index 09b3ec8bc2e..c9ca58c64cc 100644
+index 2c8be561eb5..c557750b1b3 100644
 --- a/libgcc/Makefile.in
 +++ b/libgcc/Makefile.in
 @@ -957,8 +957,9 @@ ifneq ($(LIBUNWIND),)
@@ -46,3 +46,6 @@ index 09b3ec8bc2e..c9ca58c64cc 100644
  	parts="$(INSTALL_PARTS)";				\
  	for file in $$parts; do					\
  	  rm -f $(DESTDIR)$(inst_libdir)/$$file;		\
+-- 
+2.35.1
+

cross/gcc-aarch64/0031-ada-libgnarl-compatibility-for-musl.patch

@@ -1,4 +1,4 @@
-From 64a1c5f57e278869f41c43ee56cc5defb3dd55c5 Mon Sep 17 00:00:00 2001
+From d7064ab25a561bb99c3d0b35663154656013aed2 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 07:06:30 +0000
 Subject: [PATCH] ada: libgnarl compatibility for musl
@@ -9,10 +9,10 @@ Subject: [PATCH] ada: libgnarl compatibility for musl
  2 files changed, 3 insertions(+), 61 deletions(-)
 
 diff --git a/gcc/ada/libgnarl/s-osinte__linux.ads b/gcc/ada/libgnarl/s-osinte__linux.ads
-index 7c9e7ca4518..caafc4aa68f 100644
+index 2272f83d68d..1d78456544a 100644
 --- a/gcc/ada/libgnarl/s-osinte__linux.ads
 +++ b/gcc/ada/libgnarl/s-osinte__linux.ads
-@@ -403,12 +403,6 @@ package System.OS_Interface is
+@@ -401,12 +401,6 @@ package System.OS_Interface is
     PTHREAD_RWLOCK_PREFER_WRITER_NP              : constant := 1;
     PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP : constant := 2;
  
@@ -25,7 +25,7 @@ index 7c9e7ca4518..caafc4aa68f 100644
     function pthread_rwlock_init
       (mutex : access pthread_rwlock_t;
        attr  : access pthread_rwlockattr_t) return int;
-@@ -470,11 +464,6 @@ package System.OS_Interface is
+@@ -468,11 +462,6 @@ package System.OS_Interface is
        protocol : int) return int;
     pragma Import (C, pthread_mutexattr_setprotocol);
  
@@ -38,7 +38,7 @@ index 7c9e7ca4518..caafc4aa68f 100644
        sched_priority : int;  --  scheduling priority
     end record;
 diff --git a/gcc/ada/libgnarl/s-taprop__linux.adb b/gcc/ada/libgnarl/s-taprop__linux.adb
-index 4ff784f0ea7..b34a12802c6 100644
+index 757a6cdfdad..82df94f6a00 100644
 --- a/gcc/ada/libgnarl/s-taprop__linux.adb
 +++ b/gcc/ada/libgnarl/s-taprop__linux.adb
 @@ -198,9 +198,6 @@ package body System.Task_Primitives.Operations is
@@ -130,3 +130,6 @@ index 4ff784f0ea7..b34a12802c6 100644
              Result := pthread_rwlock_init (L.RW'Access, RWlock_Attr'Access);
  
              pragma Assert (Result in 0 | ENOMEM);
+-- 
+2.35.1
+

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

@@ -1,4 +1,4 @@
-From 82addb1312f4f58a412a664228944009aa5cb569 Mon Sep 17 00:00:00 2001
+From 5193de0a6c96fefe0c46fc9a6b8c27623ad85640 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 07:07:48 +0000
 Subject: [PATCH] ada: musl support fixes
@@ -11,10 +11,10 @@ Subject: [PATCH] ada: musl support fixes
  4 files changed, 32 insertions(+), 30 deletions(-)
 
 diff --git a/gcc/ada/Makefile.rtl b/gcc/ada/Makefile.rtl
-index aaf853e3a2a..e2dd3587ed5 100644
+index b5b8b573ea4..6fce40d1e98 100644
 --- a/gcc/ada/Makefile.rtl
 +++ b/gcc/ada/Makefile.rtl
-@@ -1633,7 +1633,7 @@ ifeq ($(strip $(filter-out %86 linux%,$(target_cpu) $(target_os))),)
+@@ -1748,7 +1748,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,7 +23,7 @@ index aaf853e3a2a..e2dd3587ed5 100644
    a-exetim.adb<libgnarl/a-exetim__posix.adb \
    a-exetim.ads<libgnarl/a-exetim__default.ads \
    s-linux.ads<libgnarl/s-linux.ads \
-@@ -2258,7 +2258,7 @@ ifeq ($(strip $(filter-out powerpc% linux%,$(target_cpu) $(target_os))),)
+@@ -2355,7 +2355,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) \
@@ -32,7 +32,7 @@ index aaf853e3a2a..e2dd3587ed5 100644
    $(ATOMICS_TARGET_PAIRS) \
    $(ATOMICS_BUILTINS_TARGET_PAIRS) \
    system.ads<libgnat/system-linux-ppc.ads
-@@ -2289,7 +2289,7 @@ ifeq ($(strip $(filter-out powerpc% linux%,$(target_cpu) $(target_os))),)
+@@ -2386,7 +2386,7 @@ ifeq ($(strip $(filter-out powerpc% linux%,$(target_cpu) $(target_os))),)
  endif
  
  # ARM linux, GNU eabi
@@ -41,7 +41,7 @@ index aaf853e3a2a..e2dd3587ed5 100644
    LIBGNAT_TARGET_PAIRS = \
    a-intnam.ads<libgnarl/a-intnam__linux.ads \
    s-inmaop.adb<libgnarl/s-inmaop__posix.adb \
-@@ -2504,7 +2504,7 @@ ifeq ($(strip $(filter-out %ia64 linux%,$(target_cpu) $(target_os))),)
+@@ -2597,7 +2597,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) \
@@ -50,7 +50,7 @@ index aaf853e3a2a..e2dd3587ed5 100644
    $(ATOMICS_TARGET_PAIRS) \
    $(ATOMICS_BUILTINS_TARGET_PAIRS) \
    $(GNATRTL_128BIT_PAIRS) \
-@@ -2608,7 +2608,7 @@ ifeq ($(strip $(filter-out %x86_64 linux%,$(target_cpu) $(target_os))),)
+@@ -2700,7 +2700,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) \
@@ -60,7 +60,7 @@ index aaf853e3a2a..e2dd3587ed5 100644
    $(X86_64_TARGET_PAIRS) \
    $(GNATRTL_128BIT_PAIRS) \
 diff --git a/gcc/ada/adaint.c b/gcc/ada/adaint.c
-index 591d033fbca..a485cbf15b9 100644
+index 2e54e69643a..e7e6507e2e0 100644
 --- a/gcc/ada/adaint.c
 +++ b/gcc/ada/adaint.c
 @@ -91,6 +91,11 @@
@@ -75,7 +75,7 @@ index 591d033fbca..a485cbf15b9 100644
  
  #ifdef __PikeOS__
  #define __BSD_VISIBLE 1
-@@ -3446,7 +3451,6 @@ __gnat_lwp_self (void)
+@@ -3442,7 +3447,6 @@ __gnat_lwp_self (void)
  #endif
  
  #if defined (__linux__)
@@ -83,7 +83,7 @@ index 591d033fbca..a485cbf15b9 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
-@@ -3456,7 +3460,7 @@ __gnat_lwp_self (void)
+@@ -3452,7 +3456,7 @@ __gnat_lwp_self (void)
  
  /* Dynamic cpu sets */
  
@@ -92,7 +92,7 @@ index 591d033fbca..a485cbf15b9 100644
  __gnat_cpu_alloc (size_t count)
  {
    return CPU_ALLOC (count);
-@@ -3469,33 +3473,33 @@ __gnat_cpu_alloc_size (size_t count)
+@@ -3465,33 +3469,33 @@ __gnat_cpu_alloc_size (size_t count)
  }
  
  void
@@ -134,7 +134,7 @@ index 591d033fbca..a485cbf15b9 100644
  }
  
  size_t
-@@ -3505,23 +3509,23 @@ __gnat_cpu_alloc_size (size_t count ATTRIBUTE_UNUSED)
+@@ -3501,23 +3505,23 @@ __gnat_cpu_alloc_size (size_t count ATTRIBUTE_UNUSED)
  }
  
  void
@@ -164,10 +164,10 @@ index 591d033fbca..a485cbf15b9 100644
  #endif /* !CPU_ALLOC */
  #endif /* __linux__ */
 diff --git a/gcc/ada/adaint.h b/gcc/ada/adaint.h
-index 2631be5ad3e..d442f4bd6cd 100644
+index 85997b9ba68..fd10e5b5589 100644
 --- a/gcc/ada/adaint.h
 +++ b/gcc/ada/adaint.h
-@@ -321,13 +321,11 @@ extern void   *__gnat_lwp_self			   (void);
+@@ -325,13 +325,11 @@ extern void   *__gnat_lwp_self			   (void);
  
  /* Routines for interface to required CPU set primitives */
  
@@ -186,7 +186,7 @@ index 2631be5ad3e..d442f4bd6cd 100644
  
  #if defined (_WIN32)
 diff --git a/gcc/ada/terminals.c b/gcc/ada/terminals.c
-index 32d30a49c7e..d960e32e2d0 100644
+index ec9db3a6a4c..6f92e50dd67 100644
 --- a/gcc/ada/terminals.c
 +++ b/gcc/ada/terminals.c
 @@ -1132,7 +1132,7 @@ __gnat_setup_winsize (void *desc ATTRIBUTE_UNUSED,
@@ -218,3 +218,6 @@ index 32d30a49c7e..d960e32e2d0 100644
  #elif defined (USE_OPENPTY)
    status = openpty (&master_fd, &slave_fd, NULL, NULL, NULL);
  #elif defined (USE_CLONE_DEVICE)
+-- 
+2.35.1
+

cross/gcc-aarch64/0033-gcc-go-Fix-handling-of-signal-34-on-musl.patch

@@ -0,0 +1,43 @@
+From 8a42d93247c375f199f3079538d659f95b9ff2a0 Mon Sep 17 00:00:00 2001
+From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
+Date: Sun, 30 Aug 2020 17:59:45 +0200
+Subject: [PATCH] gcc-go: Fix handling of signal 34 on musl
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Taken from Adélie Linux.
+---
+ libgo/mksigtab.sh | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/libgo/mksigtab.sh b/libgo/mksigtab.sh
+index 11e4ec436bd..fe866eacb27 100644
+--- a/libgo/mksigtab.sh
++++ b/libgo/mksigtab.sh
+@@ -82,7 +82,7 @@ checksig _SIGPWR     '{_SigNotify, "SIGPWR: power failure restart"}'
+ checksig _SIGEMT     '{_SigThrow, "SIGEMT: emulate instruction executed"}'
+ checksig _SIGINFO    '{_SigNotify, "SIGINFO: status request from keyboard"}'
+ checksig _SIGTHR     '{_SigNotify, "SIGTHR: reserved"}'
+-checksig _SIGPOLL    '{_SigNotify, "SIGPOLL: pollable event occurred"}'
++#checksig _SIGPOLL    '{_SigNotify, "SIGPOLL: pollable event occurred"}'
+ checksig _SIGWAITING '{_SigNotify, "SIGWAITING: reserved signal no longer used by"}'
+ checksig _SIGLWP     '{_SigNotify, "SIGLWP: reserved signal no longer used by"}'
+ checksig _SIGFREEZE  '{_SigNotify, "SIGFREEZE: special signal used by CPR"}'
+@@ -95,10 +95,12 @@ checksig _SIGLOST '   {_SigNotify, "SIGLOST: resource lost (Sun); server died (G
+ 
+ # Special handling of signals 32 and 33 on GNU/Linux systems,
+ # because they are special to glibc.
++# Signal 34 is additionally special to Linux systems with musl.
+ if test "${GOOS}" = "linux"; then
+-    SIGLIST=$SIGLIST"_32__33_"
++    SIGLIST=$SIGLIST"_32__33__34_"
+     echo '	32: {_SigSetStack + _SigUnblock, "signal 32"}, /* SIGCANCEL; see issue 6997 */'
+     echo '	33: {_SigSetStack + _SigUnblock, "signal 33"}, /* SIGSETXID; see issues 3871, 9400, 12498 */'
++    echo '	34: {_SigSetStack + _SigUnblock, "signal 34"}, /* see issue 30062 */'
+ fi
+ 
+ if test "${GOOS}" = "aix"; then
+-- 
+2.35.1
+

cross/gcc-aarch64/0033-gcc-go-link-to-libucontext.patch

@@ -1,42 +0,0 @@
-From 0631e2b9453b33c42e12a14c11e8257d470016c5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
-Date: Sun, 30 Aug 2020 19:17:42 +0200
-Subject: [PATCH] gcc-go: support libucontext
-
-This patch allows using gcc-go with libucontext. For this purpose,
-it unconditionally links gcc-go against -lucontext. Furthermore,
-it undefines SETCONTEXT_CLOBBERS_TLS in proc.c to prevent usage
-of makecontext/swapcontext feature that are not support by libucontext.
----
- Makefile.in          | 2 +-
- libgo/runtime/proc.c | 4 ++++
- 2 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 593495e1650..c3e5d489bc0 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -52801,7 +52801,7 @@ configure-target-libgo:
- 	esac; \
- 	module_srcdir=libgo; \
- 	rm -f no-such-file || : ; \
--	CONFIG_SITE=no-such-file $(SHELL) \
-+	CONFIG_SITE=no-such-file LIBS="-lucontext $$LIBS" $(SHELL) \
- 	  $$s/$$module_srcdir/configure \
- 	  --srcdir=$${topdir}/$$module_srcdir \
- 	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-diff --git a/libgo/runtime/proc.c b/libgo/runtime/proc.c
-index 3a30748d329..a987678fa84 100644
---- a/libgo/runtime/proc.c
-+++ b/libgo/runtime/proc.c
-@@ -66,6 +66,10 @@ static void gscanstack(G*);
- 
- __thread G *g __asm__(GOSYM_PREFIX "runtime.g");
- 
-+/* libucontext does not seem to support tlsbase, undef the macro
-+ * here to make sure we define initcontext and fixcontext as dummies. */
-+#undef SETCONTEXT_CLOBBERS_TLS
-+
- #ifndef SETCONTEXT_CLOBBERS_TLS
- 
- static inline void

cross/gcc-aarch64/0034-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch

@@ -0,0 +1,27 @@
+From c205f79c18add13247a06cfd843f5eb44c4c3cb4 Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Thu, 25 Nov 2021 01:47:03 +0000
+Subject: [PATCH] There are more than one st_{a,m,c}tim fields in struct stat
+ on time64 machines.
+
+Run the Go-isation on all of them.
+---
+ libgo/mksysinfo.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libgo/mksysinfo.sh b/libgo/mksysinfo.sh
+index 0c52ea5d71a..6fef104cc1c 100755
+--- a/libgo/mksysinfo.sh
++++ b/libgo/mksysinfo.sh
+@@ -510,7 +510,7 @@ fi
+ 
+ # For historical reasons Go uses the suffix "timespec" instead of "tim" for
+ # stat_t's time fields on NetBSD.
+-st_times='-e s/st_atim/Atim/ -e s/st_mtim/Mtim/ -e s/st_ctim/Ctim/'
++st_times='-e s/st_atim/Atim/g -e s/st_mtim/Mtim/g -e s/st_ctim/Ctim/g'
+ if test "${GOOS}" = "netbsd"; then
+     st_times='-e s/st_atim/Atimespec/ -e s/st_mtim/Mtimespec/ -e s/st_ctim/Ctimespec/'
+ fi
+-- 
+2.35.1
+

cross/gcc-aarch64/0035-gcc-go-signal-34-is-special-on-musl-libc.patch

@@ -0,0 +1,29 @@
+From af64f915a4717036a7f1fe637308b455c94e0f1e Mon Sep 17 00:00:00 2001
+From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
+Date: Sun, 30 Aug 2020 18:03:03 +0200
+Subject: [PATCH] gcc-go: signal 34 is special on musl libc
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Taken from Adélie Linux.
+---
+ libgo/go/runtime/signal_gccgo.go | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libgo/go/runtime/signal_gccgo.go b/libgo/go/runtime/signal_gccgo.go
+index 2eece687e35..e86490ce203 100644
+--- a/libgo/go/runtime/signal_gccgo.go
++++ b/libgo/go/runtime/signal_gccgo.go
+@@ -106,7 +106,7 @@ func getsig(i uint32) uintptr {
+ 	if sigaction(i, nil, &sa) < 0 {
+ 		// On GNU/Linux glibc rejects attempts to call
+ 		// sigaction with signal 32 (SIGCANCEL) or 33 (SIGSETXID).
+-		if GOOS == "linux" && (i == 32 || i == 33) {
++		if GOOS == "linux" && (i == 32 || i == 33 || i == 34) {
+ 			return _SIG_DFL
+ 		}
+ 		throw("sigaction read failure")
+-- 
+2.35.1
+

cross/gcc-aarch64/0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch

@@ -0,0 +1,27 @@
+From 6e41b6753af412388e9259fe791904146695e84e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
+Date: Sun, 30 Aug 2020 19:27:51 +0200
+Subject: [PATCH] gcc-go: undef SETCONTEXT_CLOBBERS_TLS in proc.c
+
+---
+ libgo/runtime/proc.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/libgo/runtime/proc.c b/libgo/runtime/proc.c
+index 38bf7a6b255..e50403b5a75 100644
+--- a/libgo/runtime/proc.c
++++ b/libgo/runtime/proc.c
+@@ -66,6 +66,10 @@ static void gscanstack(G*);
+ 
+ __thread G *g __asm__(GOSYM_PREFIX "runtime.g");
+ 
++/* libucontext does not seem to support tlsbase, undef the macro
++ * here to make sure we define initcontext and fixcontext as dummies. */
++#undef SETCONTEXT_CLOBBERS_TLS
++
+ #ifndef SETCONTEXT_CLOBBERS_TLS
+ 
+ static inline void
+-- 
+2.35.1
+

cross/gcc-aarch64/0037-gcc-go-link-to-libucontext.patch

@@ -0,0 +1,25 @@
+From cc89c078ffc58a7f6675a60fbca24224effcb7e3 Mon Sep 17 00:00:00 2001
+From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
+Date: Mon, 31 Aug 2020 08:59:40 +0200
+Subject: [PATCH] gcc-go: link to libucontext
+
+---
+ Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 426949aa91c..f97db1ef569 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -50331,7 +50331,7 @@ configure-target-libgo:
+ 	esac; \
+ 	module_srcdir=libgo; \
+ 	rm -f no-such-file || : ; \
+-	CONFIG_SITE=no-such-file $(SHELL) \
++	CONFIG_SITE=no-such-file LIBS="-lucontext $$LIBS" $(SHELL) \
+ 	  $$s/$$module_srcdir/configure \
+ 	  --srcdir=$${topdir}/$$module_srcdir \
+ 	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+-- 
+2.35.1
+

cross/gcc-aarch64/0037-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch

@@ -1,199 +0,0 @@
-From 3b9243b891cc06373639a23ed5717b0d1c2d8ea6 Mon Sep 17 00:00:00 2001
-From: Ian Lance Taylor <iant@golang.org>
-Date: Tue, 14 Jun 2022 06:13:43 -0700
-Subject: [PATCH] libgo: permit loff_t and off_t to be macros
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-They are macros in musl libc, rather than typedefs, and -fgo-dump-spec
-doesn't handle that case.
-
-Based on patch by Sören Tempel.
-
-Change-Id: Ic9a608fd964a6f78e754aa8e3100aff06ab3dade
-Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/412075
-Reviewed-by: Ian Lance Taylor <iant@google.com>
-Reviewed-by: Cherry Mui <cherryyz@google.com>
-
-libgo: #include <sys/types.h> when checking for loff_t
-
-Fixes https://gcc.gnu.org/PR106033
-Fixes golang/go#53469
-
-Change-Id: I060021b7bb9334949b567442448abb6822fd6d35
-Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/413214
-Reviewed-by: Cherry Mui <cherryyz@google.com>
-Reviewed-by: Than McIntosh <thanm@google.com>
----
- libgo/config.h.in                 |  3 +++
- libgo/configure                   | 12 ++++++++++--
- libgo/configure.ac                | 11 +++++++++--
- libgo/go/syscall/libcall_linux.go | 17 +++++++++--------
- libgo/mksysinfo.sh                |  6 +-----
- libgo/sysinfo.c                   | 15 ++++++++++++++-
- 6 files changed, 46 insertions(+), 18 deletions(-)
-
-diff --git a/libgo/config.h.in b/libgo/config.h.in
-index 25b8ab8f9ee..2c3c7469675 100644
---- a/libgo/config.h.in
-+++ b/libgo/config.h.in
-@@ -70,6 +70,9 @@
- /* Define to 1 if you have the `fchownat' function. */
- #undef HAVE_FCHOWNAT
- 
-+/* Define to 1 if you have the <fcntl.h> header file. */
-+#undef HAVE_FCNTL_H
-+
- /* Define to 1 if you have the `futimesat' function. */
- #undef HAVE_FUTIMESAT
- 
-diff --git a/libgo/configure b/libgo/configure
-index ffe17c9be55..61a49947eb9 100755
---- a/libgo/configure
-+++ b/libgo/configure
-@@ -15249,7 +15249,7 @@ $as_echo "#define HAVE_GETIPINFO 1" >>confdefs.h
-   fi
- 
- 
--for ac_header in port.h sched.h semaphore.h sys/file.h sys/mman.h syscall.h sys/epoll.h sys/event.h sys/inotify.h sys/ptrace.h sys/syscall.h sys/sysctl.h sys/user.h sys/utsname.h sys/select.h sys/socket.h net/bpf.h net/if.h net/if_arp.h net/route.h netpacket/packet.h sys/prctl.h sys/mount.h sys/vfs.h sys/statfs.h sys/timex.h sys/sysinfo.h utime.h linux/ether.h linux/fs.h linux/ptrace.h linux/reboot.h netinet/in_syst.h netinet/ip.h netinet/ip_mroute.h netinet/if_ether.h lwp.h
-+for ac_header in fcntl.h port.h sched.h semaphore.h sys/file.h sys/mman.h syscall.h sys/epoll.h sys/event.h sys/inotify.h sys/ptrace.h sys/syscall.h sys/sysctl.h sys/user.h sys/utsname.h sys/select.h sys/socket.h net/bpf.h net/if.h net/if_arp.h net/route.h netpacket/packet.h sys/prctl.h sys/mount.h sys/vfs.h sys/statfs.h sys/timex.h sys/sysinfo.h utime.h linux/ether.h linux/fs.h linux/ptrace.h linux/reboot.h netinet/in_syst.h netinet/ip.h netinet/ip_mroute.h netinet/if_ether.h lwp.h
- do :
-   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
- ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-@@ -15546,7 +15546,14 @@ _ACEOF
- 
- fi
- 
--ac_fn_c_check_type "$LINENO" "loff_t" "ac_cv_type_loff_t" "$ac_includes_default"
-+
-+CFLAGS_hold="$CFLAGS"
-+CFLAGS="$OSCFLAGS $CFLAGS"
-+ac_fn_c_check_type "$LINENO" "loff_t" "ac_cv_type_loff_t" "
-+#include <sys/types.h>
-+#include <fcntl.h>
-+
-+"
- if test "x$ac_cv_type_loff_t" = xyes; then :
- 
- cat >>confdefs.h <<_ACEOF
-@@ -15556,6 +15563,7 @@ _ACEOF
- 
- fi
- 
-+CFLAGS="$CFLAGS_hold"
- 
- LIBS_hold="$LIBS"
- LIBS="$LIBS -lm"
-diff --git a/libgo/configure.ac b/libgo/configure.ac
-index 7e2b98ba67c..274fcfc35c7 100644
---- a/libgo/configure.ac
-+++ b/libgo/configure.ac
-@@ -579,7 +579,7 @@ AC_C_BIGENDIAN
- 
- GCC_CHECK_UNWIND_GETIPINFO
- 
--AC_CHECK_HEADERS(port.h sched.h semaphore.h sys/file.h sys/mman.h syscall.h sys/epoll.h sys/event.h sys/inotify.h sys/ptrace.h sys/syscall.h sys/sysctl.h sys/user.h sys/utsname.h sys/select.h sys/socket.h net/bpf.h net/if.h net/if_arp.h net/route.h netpacket/packet.h sys/prctl.h sys/mount.h sys/vfs.h sys/statfs.h sys/timex.h sys/sysinfo.h utime.h linux/ether.h linux/fs.h linux/ptrace.h linux/reboot.h netinet/in_syst.h netinet/ip.h netinet/ip_mroute.h netinet/if_ether.h lwp.h)
-+AC_CHECK_HEADERS(fcntl.h port.h sched.h semaphore.h sys/file.h sys/mman.h syscall.h sys/epoll.h sys/event.h sys/inotify.h sys/ptrace.h sys/syscall.h sys/sysctl.h sys/user.h sys/utsname.h sys/select.h sys/socket.h net/bpf.h net/if.h net/if_arp.h net/route.h netpacket/packet.h sys/prctl.h sys/mount.h sys/vfs.h sys/statfs.h sys/timex.h sys/sysinfo.h utime.h linux/ether.h linux/fs.h linux/ptrace.h linux/reboot.h netinet/in_syst.h netinet/ip.h netinet/ip_mroute.h netinet/if_ether.h lwp.h)
- 
- AC_CHECK_HEADERS([netinet/icmp6.h], [], [],
- [#include <netinet/in.h>
-@@ -601,7 +601,14 @@ AC_STRUCT_DIRENT_D_TYPE
- 
- AC_CHECK_FUNCS(accept4 dup3 epoll_create1 faccessat fallocate fchmodat fchownat futimesat getxattr inotify_add_watch inotify_init inotify_init1 inotify_rm_watch listxattr mkdirat mknodat open64 openat pipe2 removexattr renameat setxattr sync_file_range splice syscall tee unlinkat unshare utimensat)
- AC_TYPE_OFF_T
--AC_CHECK_TYPES([loff_t])
-+
-+CFLAGS_hold="$CFLAGS"
-+CFLAGS="$OSCFLAGS $CFLAGS"
-+AC_CHECK_TYPES([loff_t], [], [], [[
-+#include <sys/types.h>
-+#include <fcntl.h>
-+]])
-+CFLAGS="$CFLAGS_hold"
- 
- LIBS_hold="$LIBS"
- LIBS="$LIBS -lm"
-diff --git a/libgo/go/syscall/libcall_linux.go b/libgo/go/syscall/libcall_linux.go
-index 96974bd3269..65eb1a745f7 100644
---- a/libgo/go/syscall/libcall_linux.go
-+++ b/libgo/go/syscall/libcall_linux.go
-@@ -209,19 +209,20 @@ func Gettid() (tid int) {
- //sys	Setxattr(path string, attr string, data []byte, flags int) (err error)
- //setxattr(path *byte, name *byte, value *byte, size Size_t, flags _C_int) _C_int
- 
--//sys	splice(rfd int, roff *_loff_t, wfd int, woff *_loff_t, len int, flags int) (n int64, err error)
--//splice(rfd _C_int, roff *_loff_t, wfd _C_int, woff *_loff_t, len Size_t, flags _C_uint) Ssize_t
-+//sys	splice(rfd int, roff *_libgo_loff_t_type, wfd int, woff *_libgo_loff_t_type, len int, flags int) (n int64, err error)
-+//splice(rfd _C_int, roff *_libgo_loff_t_type, wfd _C_int, woff *_libgo_loff_t_type, len Size_t, flags _C_uint) Ssize_t
-+
- func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error) {
--	var lroff _loff_t
--	var plroff *_loff_t
-+	var lroff _libgo_loff_t_type
-+	var plroff *_libgo_loff_t_type
- 	if roff != nil {
--		lroff = _loff_t(*roff)
-+		lroff = _libgo_loff_t_type(*roff)
- 		plroff = &lroff
- 	}
--	var lwoff _loff_t
--	var plwoff *_loff_t
-+	var lwoff _libgo_loff_t_type
-+	var plwoff *_libgo_loff_t_type
- 	if woff != nil {
--		lwoff = _loff_t(*woff)
-+		lwoff = _libgo_loff_t_type(*woff)
- 		plwoff = &lwoff
- 	}
- 	n, err = splice(rfd, plroff, wfd, plwoff, len, flags)
-diff --git a/libgo/mksysinfo.sh b/libgo/mksysinfo.sh
-index 0c52ea5d71a..5aa309155c3 100755
---- a/libgo/mksysinfo.sh
-+++ b/libgo/mksysinfo.sh
-@@ -403,11 +403,7 @@ fi
- # Some basic types.
- echo 'type Size_t _size_t' >> ${OUT}
- echo "type Ssize_t _ssize_t" >> ${OUT}
--if grep '^const _HAVE_OFF64_T = ' gen-sysinfo.go > /dev/null 2>&1; then
--  echo "type Offset_t _off64_t" >> ${OUT}
--else
--  echo "type Offset_t _off_t" >> ${OUT}
--fi
-+echo "type Offset_t _libgo_off_t_type" >> ${OUT}
- echo "type Mode_t _mode_t" >> ${OUT}
- echo "type Pid_t _pid_t" >> ${OUT}
- echo "type Uid_t _uid_t" >> ${OUT}
-diff --git a/libgo/sysinfo.c b/libgo/sysinfo.c
-index 336a5983750..fc0210992fa 100644
---- a/libgo/sysinfo.c
-+++ b/libgo/sysinfo.c
-@@ -354,6 +354,18 @@ enum {
- };
- #endif
- 
-+#if defined(HAVE_LOFF_T)
-+// loff_t can be defined as a macro; for -fgo-dump-spec make sure we
-+// see a typedef.
-+typedef loff_t libgo_loff_t_type;
-+#endif
-+
-+#if defined(HAVE_OFF64_T)
-+typedef off64_t libgo_off_t_type;
-+#else
-+typedef off_t libgo_off_t_type;
-+#endif
-+
- // The following section introduces explicit references to types and
- // constants of interest to support bootstrapping libgo using a
- // compiler that doesn't support -fdump-go-spec (e.g., clang), via
-@@ -534,7 +546,8 @@ SREF(timex);
- // From sys/types.h
- TREF(pid_t);
- TREF(off_t);
--TREF(loff_t);
-+TREF(libgo_loff_t_type);
-+TREF(libgo_off_t_type);
- TREF(size_t);
- TREF(ssize_t);
- TREF(mode_t);

cross/gcc-aarch64/0038-Use-generic-errstr.go-implementation-on-musl.patch

@@ -1,4 +1,4 @@
-From 5093aa99f9cdded2e1ddf67b7139da6fac36b0a6 Mon Sep 17 00:00:00 2001
+From 3fb914ca83ac18287ee24aa75aba9149e35487ad Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
 Date: Mon, 19 Apr 2021 07:21:41 +0200
 Subject: [PATCH] Use generic errstr.go implementation on musl
@@ -43,3 +43,6 @@ index 5b19e6f202d..8dc60172186 100644
  
  package syscall
  
+-- 
+2.35.1
+

cross/gcc-aarch64/0039-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch

@@ -1,4 +1,4 @@
-From 573a66e4146c9a65d895af9081a4d3d49cfc9e7a Mon Sep 17 00:00:00 2001
+From 52ce9c86c0c89ae45e0d08cc232682e1811aa8f2 Mon Sep 17 00:00:00 2001
 From: Drew DeVault <sir@cmpwn.com>
 Date: Wed, 9 Dec 2020 16:07:26 +0000
 Subject: [PATCH] configure: Add --enable-autolink-libatomic, use in
@@ -9,19 +9,19 @@ This fixes issues with RISC-V.
  Makefile.in           |  1 +
  gcc/config.in         |  6 ++++++
  gcc/config/gnu-user.h | 12 +++++++++++-
- gcc/configure         | 32 ++++++++++++++++++++++++++++++--
+ gcc/configure         | 34 +++++++++++++++++++++++++++++++---
  gcc/configure.ac      | 22 +++++++++++++++++++++-
  gcc/doc/install.texi  |  8 ++++++++
  gcc/doc/tm.texi       |  8 +++++++-
  gcc/doc/tm.texi.in    |  8 +++++++-
- gcc/gcc.cc            | 12 +++++++++++-
- 9 files changed, 102 insertions(+), 7 deletions(-)
+ gcc/gcc.c             | 12 +++++++++++-
+ 9 files changed, 103 insertions(+), 8 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index b564ddbf792..a95c7407d16 100644
+index f97db1ef569..7e577ed3dbb 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -232,6 +232,7 @@ HOST_EXPORTS = \
+@@ -222,6 +222,7 @@ HOST_EXPORTS = \
  	RANLIB_FOR_TARGET="$(RANLIB_FOR_TARGET)"; export RANLIB_FOR_TARGET; \
  	READELF_FOR_TARGET="$(READELF_FOR_TARGET)"; export READELF_FOR_TARGET; \
  	TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export TOPLEVEL_CONFIGURE_ARGUMENTS; \
@@ -30,10 +30,10 @@ index b564ddbf792..a95c7407d16 100644
  	GMPLIBS="$(HOST_GMPLIBS)"; export GMPLIBS; \
  	GMPINC="$(HOST_GMPINC)"; export GMPINC; \
 diff --git a/gcc/config.in b/gcc/config.in
-index f0fbf123aa8..af84efc4f9e 100644
+index 059c818c895..2a560417440 100644
 --- a/gcc/config.in
 +++ b/gcc/config.in
-@@ -118,6 +118,12 @@
+@@ -106,6 +106,12 @@
  #endif
  
  
@@ -47,7 +47,7 @@ index f0fbf123aa8..af84efc4f9e 100644
     format instead of DPD */
  #ifndef USED_FOR_TARGET
 diff --git a/gcc/config/gnu-user.h b/gcc/config/gnu-user.h
-index 8433e56c3e1..0347f10da8b 100644
+index 902378e1bad..daf7727a01a 100644
 --- a/gcc/config/gnu-user.h
 +++ b/gcc/config/gnu-user.h
 @@ -109,8 +109,18 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
@@ -71,10 +71,10 @@ index 8433e56c3e1..0347f10da8b 100644
  
  #undef LINK_GCC_C_SEQUENCE_SPEC
 diff --git a/gcc/configure b/gcc/configure
-index 2f6b3265a6c..6dc65bf4ccb 100755
+index 592e81e40f6..8672298f23f 100755
 --- a/gcc/configure
 +++ b/gcc/configure
-@@ -981,6 +981,7 @@ with_changes_root_url
+@@ -978,6 +978,7 @@ with_changes_root_url
  enable_languages
  with_multilib_list
  with_multilib_generator
@@ -82,7 +82,7 @@ index 2f6b3265a6c..6dc65bf4ccb 100755
  with_zstd
  with_zstd_include
  with_zstd_lib
-@@ -1710,6 +1711,9 @@ Optional Features:
+@@ -1707,6 +1708,9 @@ Optional Features:
    --disable-shared        don't provide a shared libgcc
    --disable-gcov          don't provide libgcov and related host tools
    --enable-languages=LIST specify which front-ends to build
@@ -92,7 +92,7 @@ index 2f6b3265a6c..6dc65bf4ccb 100755
    --disable-rpath         do not hardcode runtime library paths
    --enable-sjlj-exceptions
                            arrange to use setjmp/longjmp exception handling
-@@ -8324,7 +8328,6 @@ else
+@@ -8070,7 +8074,6 @@ else
  fi
  
  
@@ -100,7 +100,7 @@ index 2f6b3265a6c..6dc65bf4ccb 100755
  # Check whether --with-multilib-generator was given.
  if test "${with_multilib_generator+set}" = set; then :
    withval=$with_multilib_generator; :
-@@ -8332,6 +8335,32 @@ else
+@@ -8078,6 +8081,32 @@ else
    with_multilib_generator=default
  fi
  
@@ -133,16 +133,25 @@ index 2f6b3265a6c..6dc65bf4ccb 100755
  
  # -------------------------
  # Checks for other programs
-@@ -34296,4 +34325,3 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+@@ -19501,7 +19530,7 @@ else
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 19501 "configure"
++#line 19158 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -34068,4 +34097,3 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
  $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
  fi
  
 -
 diff --git a/gcc/configure.ac b/gcc/configure.ac
-index e683d3a7a5f..07c81c78336 100644
+index 1577529ffb7..e96691f69ba 100644
 --- a/gcc/configure.ac
 +++ b/gcc/configure.ac
-@@ -1205,6 +1205,27 @@ AC_ARG_WITH(multilib-generator,
+@@ -1149,6 +1149,27 @@ AC_ARG_WITH(multilib-generator,
  :,
  with_multilib_generator=default)
  
@@ -170,16 +179,16 @@ index e683d3a7a5f..07c81c78336 100644
  # -------------------------
  # Checks for other programs
  # -------------------------
-@@ -7839,4 +7860,3 @@ done
+@@ -7729,4 +7750,3 @@ done
  ], 
  [subdirs='$subdirs'])
  AC_OUTPUT
 -
 diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi
-index 48408d842db..c90be0ee750 100644
+index 4c38244ae58..4a544e6a4ee 100644
 --- a/gcc/doc/install.texi
 +++ b/gcc/doc/install.texi
-@@ -2295,6 +2295,14 @@ files, but these changed header paths may conflict with some compilation
+@@ -2213,6 +2213,14 @@ files, but these changed header paths may conflict with some compilation
  environments.  Enabled by default, and may be disabled using
  @option{--disable-canonical-system-headers}.
  
@@ -195,7 +204,7 @@ index 48408d842db..c90be0ee750 100644
  Tell GCC that when the GNU C Library (glibc) is used on the target it
  will be version @var{major}.@var{minor} or later.  Normally this can
 diff --git a/gcc/doc/tm.texi b/gcc/doc/tm.texi
-index c5006afc00d..56b62c69ae8 100644
+index b370bc76b25..acc78273983 100644
 --- a/gcc/doc/tm.texi
 +++ b/gcc/doc/tm.texi
 @@ -381,7 +381,13 @@ the argument @option{-lgcc} to tell the linker to do the search.
@@ -214,7 +223,7 @@ index c5006afc00d..56b62c69ae8 100644
  
  @defmac POST_LINK_SPEC
 diff --git a/gcc/doc/tm.texi.in b/gcc/doc/tm.texi.in
-index f869ddd5e5b..57c93f24ac3 100644
+index 2974dae2701..80e003a38ce 100644
 --- a/gcc/doc/tm.texi.in
 +++ b/gcc/doc/tm.texi.in
 @@ -381,7 +381,13 @@ the argument @option{-lgcc} to tell the linker to do the search.
@@ -232,11 +241,11 @@ index f869ddd5e5b..57c93f24ac3 100644
  @end defmac
  
  @defmac POST_LINK_SPEC
-diff --git a/gcc/gcc.cc b/gcc/gcc.cc
-index 735b2b1bba1..f10f3c91aa7 100644
---- a/gcc/gcc.cc
-+++ b/gcc/gcc.cc
-@@ -987,13 +987,23 @@ proper position among the other output files.  */
+diff --git a/gcc/gcc.c b/gcc/gcc.c
+index 22dbbf85850..90aa576037a 100644
+--- a/gcc/gcc.c
++++ b/gcc/gcc.c
+@@ -980,13 +980,23 @@ proper position among the other output files.  */
  # define ASM_DEBUG_OPTION_SPEC ""
  #endif
  
@@ -261,3 +270,6 @@ index 735b2b1bba1..f10f3c91aa7 100644
  #endif
  
  #ifdef ENABLE_DEFAULT_SSP
+-- 
+2.35.1
+

cross/gcc-aarch64/0039-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch

@@ -1,39 +0,0 @@
-From 4b6240d5301ce04b8bbc3e2152915cbc7da80584 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
-Date: Wed, 28 Sep 2022 17:30:14 +0200
-Subject: [PATCH] libgo: use _off_t for mmap offset argument
-
-On glibc-based systems, off_t is a 32-bit type on 32-bit systems and a
-64-bit type on 64-bit systems by default. However, on systems using musl
-libc off_t is unconditionally a 64-bit type. As such, it is insufficient
-to use a uintptr type for the mmap offset parameter.
-
-Presently, the (incorrect) mmap declaration causes a libgo run-time
-failure on 32-bit musl systems (fatal error: runtime: cannot allocate
-memory). This commit fixes this run-time error.
----
- libgo/go/runtime/mem_gccgo.go | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libgo/go/runtime/mem_gccgo.go b/libgo/go/runtime/mem_gccgo.go
-index fa3389d8..07bf325a 100644
---- a/libgo/go/runtime/mem_gccgo.go
-+++ b/libgo/go/runtime/mem_gccgo.go
-@@ -15,7 +15,7 @@ import (
- //go:linkname sysFree
- 
- //extern mmap
--func sysMmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off uintptr) unsafe.Pointer
-+func sysMmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off _off_t) unsafe.Pointer
- 
- //extern munmap
- func munmap(addr unsafe.Pointer, length uintptr) int32
-@@ -38,7 +38,7 @@ func init() {
- }
- 
- func mmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off uintptr) (unsafe.Pointer, int) {
--	p := sysMmap(addr, n, prot, flags, fd, off)
-+	p := sysMmap(addr, n, prot, flags, fd, _off_t(off))
- 	if uintptr(p) == _MAP_FAILED {
- 		return nil, errno()
- 	}

cross/gcc-aarch64/0040-configure-fix-detection-of-atomic-builtins-in-libato.patch

@@ -1,4 +1,4 @@
-From 4baaeb9661fa4015d9701e3616ce1ad4e8a07fd8 Mon Sep 17 00:00:00 2001
+From 5010fa237897bca92291ba8835123125d4af933a Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
 Date: Sun, 29 Aug 2021 09:45:27 +0200
 Subject: [PATCH] configure: fix detection of atomic builtins in libatomic
@@ -22,7 +22,7 @@ See:
  1 file changed, 20 insertions(+)
 
 diff --git a/libatomic/configure.tgt b/libatomic/configure.tgt
-index 33f8c91ce77..3999db2cf8a 100644
+index 670b0d72cfe..38c2cd9345f 100644
 --- a/libatomic/configure.tgt
 +++ b/libatomic/configure.tgt
 @@ -30,6 +30,26 @@
@@ -52,3 +52,6 @@ index 33f8c91ce77..3999db2cf8a 100644
  case "${target_cpu}" in
    alpha*)
  	# fenv.c needs this option to generate inexact exceptions.
+-- 
+2.35.1
+

cross/gcc-aarch64/0041-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch

@@ -0,0 +1,84 @@
+From 2d924c522dde7426afbb8096d9301b17d0e73121 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
+Date: Sun, 28 Nov 2021 00:54:37 +0100
+Subject: [PATCH] libgo: Recognize off64_t and loff_t definitions of musl libc
+
+Without this patch, both off64_t and loff_t are not recognized by
+-fdump-go-spec which causes a variety Go-related compilation errors on
+musl libc since the gcc-go frontend expects both off64_t and loff_t to
+be present.
+
+Also make sure that autoconf recognizes support for loff_t on musl, by
+compiling the relevant feature test code with -D_GNU_SOURCE and making
+it include fcntl.h which defines loff_t on musl.
+---
+ libgo/configure    |  4 +++-
+ libgo/configure.ac |  4 +++-
+ libgo/sysinfo.c    | 21 +++++++++++++++++++++
+ 3 files changed, 27 insertions(+), 2 deletions(-)
+
+diff --git a/libgo/configure b/libgo/configure
+index 70f64c974fd..69d15839e8c 100755
+--- a/libgo/configure
++++ b/libgo/configure
+@@ -15546,7 +15546,9 @@ _ACEOF
+ 
+ fi
+ 
+-ac_fn_c_check_type "$LINENO" "loff_t" "ac_cv_type_loff_t" "$ac_includes_default"
++CFLAGS_hold=$CFLAGS
++CFLAGS="$CFLAGS -D_GNU_SOURCE"
++ac_fn_c_check_type "$LINENO" "loff_t" "ac_cv_type_loff_t" "#include <fcntl.h>"
+ if test "x$ac_cv_type_loff_t" = xyes; then :
+ 
+ cat >>confdefs.h <<_ACEOF
+diff --git a/libgo/configure.ac b/libgo/configure.ac
+index ebab9d9de3e..a3d9d309aba 100644
+--- a/libgo/configure.ac
++++ b/libgo/configure.ac
+@@ -602,7 +602,9 @@ AC_STRUCT_DIRENT_D_TYPE
+ 
+ AC_CHECK_FUNCS(accept4 dup3 epoll_create1 faccessat fallocate fchmodat fchownat futimesat getxattr inotify_add_watch inotify_init inotify_init1 inotify_rm_watch listxattr mkdirat mknodat open64 openat pipe2 removexattr renameat setxattr sync_file_range splice syscall tee unlinkat unshare utimensat)
+ AC_TYPE_OFF_T
+-AC_CHECK_TYPES([loff_t])
++CFLAGS_hold=$CFLAGS
++CFLAGS="$CFLAGS -D_GNU_SOURCE" # musl does not define loff_t without this
++AC_CHECK_TYPES([loff_t], [], [], [[#include <fcntl.h>]])
+ 
+ LIBS_hold="$LIBS"
+ LIBS="$LIBS -lm"
+diff --git a/libgo/sysinfo.c b/libgo/sysinfo.c
+index 8ce061e2f5f..b85add15a7b 100644
+--- a/libgo/sysinfo.c
++++ b/libgo/sysinfo.c
+@@ -343,6 +343,27 @@ enum {
+ #endif
+ };
+ 
++// musl libc has both off64_t and loff_t. However, both of these types
++// are defined as CPP macros, not as C typedefs. Unfortunately, the GCC
++// -fdump-go-spec option, which is responsible for generating type
++// definitions for Go based on this file, only recognizes types defined
++// through typedefs.
++//
++// For this reason, we check here if either off64_t or loff_t are
++// defined as CPP macros and if so, we redefine them using a C typedef.
++#if defined(HAVE_OFF64_T) && defined(off64_t)
++typedef off64_t __musl_off64_t;
++#undef off64_t
++typedef __musl_off64_t off64_t;
++#endif
++
++// See comment regarding musl libc above.
++#if defined(HAVE_LOFF_T) && defined(loff_t)
++typedef loff_t __musl_loff_t;
++#undef loff_t
++typedef __musl_loff_t loff_t;
++#endif
++
+ // SIOCGIFMTU can't be added in the above enum as it might
+ // be signed in some OSes.
+ #ifdef SIOCGIFMTU
+-- 
+2.35.1
+

cross/gcc-aarch64/0042-Fix-attempt-to-use-poisoned-calloc-error-in-libgccji.patch

@@ -0,0 +1,80 @@
+From 72f32e3383129ad139df76d9a063fac9b03079b1 Mon Sep 17 00:00:00 2001
+From: Alex McGrath <amk@amk.ie>
+Date: Wed, 13 Oct 2021 23:24:27 +0100
+Subject: [PATCH] Fix attempt to use poisoned calloc error in libgccjit
+
+This moves usages of pthread.h to above any usage of system.h as it
+included #pragma GCC poison calloc
+---
+ gcc/jit/jit-playback.c  | 4 ++--
+ gcc/jit/jit-recording.c | 4 ++--
+ gcc/jit/libgccjit.c     | 3 ++-
+ 3 files changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/gcc/jit/jit-playback.c b/gcc/jit/jit-playback.c
+index cee9daa8220..a5600084933 100644
+--- a/gcc/jit/jit-playback.c
++++ b/gcc/jit/jit-playback.c
+@@ -18,6 +18,8 @@ You should have received a copy of the GNU General Public License
+ along with GCC; see the file COPYING3.  If not see
+ <http://www.gnu.org/licenses/>.  */
+ 
++#include <pthread.h>
++
+ #include "config.h"
+ #include "system.h"
+ #include "coretypes.h"
+@@ -41,8 +43,6 @@ along with GCC; see the file COPYING3.  If not see
+ #include "diagnostic.h"
+ #include "stmt.h"
+ 
+-#include <pthread.h>
+-
+ #include "jit-playback.h"
+ #include "jit-result.h"
+ #include "jit-builtins.h"
+diff --git a/gcc/jit/jit-recording.c b/gcc/jit/jit-recording.c
+index 117ff70114c..d2634a546b1 100644
+--- a/gcc/jit/jit-recording.c
++++ b/gcc/jit/jit-recording.c
+@@ -18,6 +18,8 @@ You should have received a copy of the GNU General Public License
+ along with GCC; see the file COPYING3.  If not see
+ <http://www.gnu.org/licenses/>.  */
+ 
++#include <pthread.h>
++
+ #include "config.h"
+ #include "system.h"
+ #include "coretypes.h"
+@@ -25,8 +27,6 @@ along with GCC; see the file COPYING3.  If not see
+ #include "pretty-print.h"
+ #include "toplev.h"
+ 
+-#include <pthread.h>
+-
+ #include "jit-builtins.h"
+ #include "jit-recording.h"
+ #include "jit-playback.h"
+diff --git a/gcc/jit/libgccjit.c b/gcc/jit/libgccjit.c
+index 0cc650f9810..2f44481eeb0 100644
+--- a/gcc/jit/libgccjit.c
++++ b/gcc/jit/libgccjit.c
+@@ -18,13 +18,14 @@ You should have received a copy of the GNU General Public License
+ along with GCC; see the file COPYING3.  If not see
+ <http://www.gnu.org/licenses/>.  */
+ 
++#include <pthread.h>
++
+ #include "config.h"
+ #include "system.h"
+ #include "coretypes.h"
+ #include "timevar.h"
+ #include "typed-splay-tree.h"
+ #include "cppbuiltin.h"
+-#include <pthread.h>
+ 
+ #include "libgccjit.h"
+ #include "jit-recording.h"
+-- 
+2.35.1
+

cross/gcc-aarch64/0042-gcc-go-fix-build-error-with-SYS_SECCOMP.patch

@@ -1,41 +0,0 @@
-From 548720bca6bff21ebc9aba22249d9ce45bbd90c7 Mon Sep 17 00:00:00 2001
-From: Ian Lance Taylor <iant@golang.org>
-Date: Wed, 29 Jun 2022 15:32:04 -0700
-Subject: [PATCH] libgo: handle stat st_atim32 field and SYS_SECCOMP
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Patches for musl support, from Sören Tempel.
-
-Fixes https://gcc.gnu.org/PR105225
-
-Change-Id: If396877d4a4c7d27962226d7a6e3bb91b1344413
-Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/415294
-Reviewed-by: Than McIntosh <thanm@google.com>
-Reviewed-by: Ian Lance Taylor <iant@google.com>
----
- libgo/mksysinfo.sh | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/libgo/mksysinfo.sh b/libgo/mksysinfo.sh
-index 5aa30915..ea1fa17d 100755
---- a/libgo/mksysinfo.sh
-+++ b/libgo/mksysinfo.sh
-@@ -127,6 +127,7 @@ fi
- 
- # The syscall numbers.  We force the names to upper case.
- grep '^const _SYS_' gen-sysinfo.go | \
-+  grep -v '^const _SYS_SECCOMP = ' | \
-   sed -e 's/const _\(SYS_[^= ]*\).*$/\1/' | \
-   while read sys; do
-     sup=`echo $sys | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`
-@@ -506,7 +507,7 @@ fi
- 
- # For historical reasons Go uses the suffix "timespec" instead of "tim" for
- # stat_t's time fields on NetBSD.
--st_times='-e s/st_atim/Atim/ -e s/st_mtim/Mtim/ -e s/st_ctim/Ctim/'
-+st_times='-e s/st_atim/Atim/g -e s/st_mtim/Mtim/g -e s/st_ctim/Ctim/g'
- if test "${GOOS}" = "netbsd"; then
-     st_times='-e s/st_atim/Atimespec/ -e s/st_mtim/Mtimespec/ -e s/st_ctim/Ctimespec/'
- fi

cross/gcc-aarch64/0043-libstdc-do-not-throw-exceptions-for-non-C-locales-on.patch

@@ -1,24 +0,0 @@
-From 20c84de53efcb86993f1a1909e65a97240d6123e Mon Sep 17 00:00:00 2001
-From: Samuel Holland <samuel@sholland.org>
-Date: Thu, 30 Jun 2022 17:08:36 +0000
-Subject: [PATCH] libstdc++: do not throw exceptions for non-C locales on musl
- targets
-
----
- libstdc++-v3/config/locale/generic/c_locale.cc | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/libstdc++-v3/config/locale/generic/c_locale.cc b/libstdc++-v3/config/locale/generic/c_locale.cc
-index 1e4db8d4415..9b79bc3c5dd 100644
---- a/libstdc++-v3/config/locale/generic/c_locale.cc
-+++ b/libstdc++-v3/config/locale/generic/c_locale.cc
-@@ -242,9 +242,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
-     // Currently, the generic model only supports the "C" locale.
-     // See http://gcc.gnu.org/ml/libstdc++/2003-02/msg00345.html
-     __cloc = 0;
--    if (strcmp(__s, "C"))
--      __throw_runtime_error(__N("locale::facet::_S_create_c_locale "
--			    "name not valid"));
-   }
- 
-   void

cross/gcc-aarch64/0043-stddef.h-add-support-for-musl-typedef-macro-guards.patch

@@ -0,0 +1,106 @@
+From aeef0ee2aac43d89ae26c6a3559aae4f8a1d53da Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
+Date: Thu, 25 Nov 2021 17:44:04 +0100
+Subject: [PATCH] stddef.h: add support for musl typedef macro guards
+
+The stddef.h header checks/sets various hardcoded toolchain/os specific
+macro guards to prevent redefining types such as ptrdiff_t, wchar_t, or
+size_t. However, without this patch, the file does not check/set the
+typedef macro guards for musl libc. This causes types such as size_t to
+be defined twice for files which include both musl's stddef.h as well as
+GCC's ginclude/stddef.h. This is, for example, the case for
+libgo/sysinfo.c. If libgo/sysinfo.c has multiple typedefs for size_t
+this confuses -fdump-go-spec and causes size_t not to be included in the
+generated type definitions thereby causing a gcc-go compilation failure
+on musl with the following error message:
+
+	sysinfo.go:7765:13: error: use of undefined type '_size_t'
+	 7765 | type Size_t _size_t
+	      |             ^
+	libcall_posix.go:49:35: error: non-integer len argument in make
+	   49 |                 b := make([]byte, len)
+	      |
+
+This commit fixes this issue by ensuring that ptrdiff_t, wchar_t, and size_t
+are only defined once in the pre-processed libgo/sysinfo.c file by enhancing
+gcc/ginclude/stddef.h with musl-specific typedef macro guards.
+---
+ gcc/ginclude/stddef.h | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/gcc/ginclude/stddef.h b/gcc/ginclude/stddef.h
+index 66619fe43b1..50d710a5ab9 100644
+--- a/gcc/ginclude/stddef.h
++++ b/gcc/ginclude/stddef.h
+@@ -128,6 +128,7 @@ _TYPE_wchar_t;
+ #ifndef ___int_ptrdiff_t_h
+ #ifndef _GCC_PTRDIFF_T
+ #ifndef _PTRDIFF_T_DECLARED /* DragonFly */
++#ifndef __DEFINED_ptrdiff_t /* musl libc */
+ #define _PTRDIFF_T
+ #define _T_PTRDIFF_
+ #define _T_PTRDIFF
+@@ -137,10 +138,12 @@ _TYPE_wchar_t;
+ #define ___int_ptrdiff_t_h
+ #define _GCC_PTRDIFF_T
+ #define _PTRDIFF_T_DECLARED
++#define __DEFINED_ptrdiff_t
+ #ifndef __PTRDIFF_TYPE__
+ #define __PTRDIFF_TYPE__ long int
+ #endif
+ typedef __PTRDIFF_TYPE__ ptrdiff_t;
++#endif /* __DEFINED_ptrdiff_t */
+ #endif /* _PTRDIFF_T_DECLARED */
+ #endif /* _GCC_PTRDIFF_T */
+ #endif /* ___int_ptrdiff_t_h */
+@@ -174,6 +177,7 @@ typedef __PTRDIFF_TYPE__ ptrdiff_t;
+ #ifndef _SIZE_T_DEFINED
+ #ifndef _BSD_SIZE_T_DEFINED_	/* Darwin */
+ #ifndef _SIZE_T_DECLARED	/* FreeBSD 5 */
++#ifndef __DEFINED_size_t	/* musl libc */
+ #ifndef ___int_size_t_h
+ #ifndef _GCC_SIZE_T
+ #ifndef _SIZET_
+@@ -191,6 +195,7 @@ typedef __PTRDIFF_TYPE__ ptrdiff_t;
+ #define _SIZE_T_DEFINED
+ #define _BSD_SIZE_T_DEFINED_	/* Darwin */
+ #define _SIZE_T_DECLARED	/* FreeBSD 5 */
++#define __DEFINED_size_t	/* musl libc */
+ #define ___int_size_t_h
+ #define _GCC_SIZE_T
+ #define _SIZET_
+@@ -215,6 +220,7 @@ typedef long ssize_t;
+ #endif /* _SIZET_ */
+ #endif /* _GCC_SIZE_T */
+ #endif /* ___int_size_t_h */
++#endif /* __DEFINED_size_t */
+ #endif /* _SIZE_T_DECLARED */
+ #endif /* _BSD_SIZE_T_DEFINED_ */
+ #endif /* _SIZE_T_DEFINED */
+@@ -251,6 +257,7 @@ typedef long ssize_t;
+ #ifndef _BSD_WCHAR_T_DEFINED_    /* Darwin */
+ #ifndef _BSD_RUNE_T_DEFINED_	/* Darwin */
+ #ifndef _WCHAR_T_DECLARED /* FreeBSD 5 */
++#ifndef __DEFINED_wchar_t /* musl libc */
+ #ifndef _WCHAR_T_DEFINED_
+ #ifndef _WCHAR_T_DEFINED
+ #ifndef _WCHAR_T_H
+@@ -272,6 +279,7 @@ typedef long ssize_t;
+ #define __INT_WCHAR_T_H
+ #define _GCC_WCHAR_T
+ #define _WCHAR_T_DECLARED
++#define __DEFINED_wchar_t
+ 
+ /* On BSD/386 1.1, at least, machine/ansi.h defines _BSD_WCHAR_T_
+    instead of _WCHAR_T_, and _BSD_RUNE_T_ (which, unlike the other
+@@ -326,6 +334,7 @@ typedef __WCHAR_TYPE__ wchar_t;
+ #endif
+ #endif
+ #endif
++#endif /* __DEFINED_wchar_t */
+ #endif /* _WCHAR_T_DECLARED */
+ #endif /* _BSD_RUNE_T_DEFINED_ */
+ #endif
+-- 
+2.35.1
+

cross/gcc-aarch64/0044-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch

@@ -0,0 +1,63 @@
+From 36c79820c1085590f272ef1afcad4744125d96d0 Mon Sep 17 00:00:00 2001
+From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
+Date: Sun, 30 Aug 2020 18:33:49 +0200
+Subject: [PATCH] gcc-go: Use int64 type as offset argument for mmap
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Without this patch, Go run-time memory allocation fails on 32-bit architectures:
+
+	fatal error: runtime: cannot allocate memory
+	runtime stack:
+	runtime.dopanic__m
+		:0
+	runtime.throw
+		:0
+		:0
+		:0
+	runtime.systemstack
+		:0
+	runtime.addrRanges.init
+		:0
+	runtime.pageAlloc.init
+		:0
+	runtime.mheap.init
+		:0
+	runtime.schedinit
+		:0
+		:0
+		:0
+
+Taken from Adélie Linux [1].
+
+[1]: https://git.adelielinux.org/adelie/packages/-/commit/63b5fb12c3d75e460799c672bbbdd5d29c3cc33c
+---
+ libgo/go/runtime/mem_gccgo.go | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libgo/go/runtime/mem_gccgo.go b/libgo/go/runtime/mem_gccgo.go
+index fa3389d857e..57bed97c710 100644
+--- a/libgo/go/runtime/mem_gccgo.go
++++ b/libgo/go/runtime/mem_gccgo.go
+@@ -15,7 +15,7 @@ import (
+ //go:linkname sysFree
+ 
+ //extern mmap
+-func sysMmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off uintptr) unsafe.Pointer
++func sysMmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off int64) unsafe.Pointer
+ 
+ //extern munmap
+ func munmap(addr unsafe.Pointer, length uintptr) int32
+@@ -37,7 +37,7 @@ func init() {
+ 	}
+ }
+ 
+-func mmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off uintptr) (unsafe.Pointer, int) {
++func mmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off int64) (unsafe.Pointer, int) {
+ 	p := sysMmap(addr, n, prot, flags, fd, off)
+ 	if uintptr(p) == _MAP_FAILED {
+ 		return nil, errno()
+-- 
+2.35.1
+

cross/gcc-aarch64/0045-druntime-link-against-libucontext-on-all-platforms.patch

@@ -1,51 +0,0 @@
-From 39f5c9a850917a3c19630c0115ef0d5b0f151c72 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
-Date: Sat, 16 Jul 2022 13:26:49 +0200
-Subject: [PATCH] druntime: link against libucontext on all platforms
-
-On musl-based Linux distributions, swapcontext etc. are not provided by
-musl but instead by libucontext. Hence, we _always_ need to link against
-an external library for these functions.
----
- libphobos/configure                | 8 --------
- libphobos/m4/druntime/libraries.m4 | 8 --------
- 2 files changed, 16 deletions(-)
-
-diff --git a/libphobos/configure b/libphobos/configure
-index 9da06f087d0..0db0acfb9c2 100755
---- a/libphobos/configure
-+++ b/libphobos/configure
-@@ -15192,14 +15192,6 @@ fi
-   # Keep this in sync with core/thread.d, set druntime_fiber_asm_external to
-   # "yes" for targets that have 'version = AsmExternal'.
-   druntime_fiber_asm_external=no
--  case "$target_cpu" in
--    aarch64* | \
--    arm* | \
--    i[34567]86|x86_64 | \
--    powerpc)
--      druntime_fiber_asm_external=yes
--      ;;
--  esac
-   if test "$druntime_fiber_asm_external" = no; then
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing swapcontext" >&5
- $as_echo_n "checking for library containing swapcontext... " >&6; }
-diff --git a/libphobos/m4/druntime/libraries.m4 b/libphobos/m4/druntime/libraries.m4
-index 45a56f6f76a..fef6e890b1e 100644
---- a/libphobos/m4/druntime/libraries.m4
-+++ b/libphobos/m4/druntime/libraries.m4
-@@ -220,14 +220,6 @@ AC_DEFUN([DRUNTIME_LIBRARIES_UCONTEXT],
-   # Keep this in sync with core/thread.d, set druntime_fiber_asm_external to
-   # "yes" for targets that have 'version = AsmExternal'.
-   druntime_fiber_asm_external=no
--  case "$target_cpu" in
--    aarch64* | \
--    arm* | \
--    i[[34567]]86|x86_64 | \
--    powerpc)
--      druntime_fiber_asm_external=yes
--      ;;
--  esac
-   if test "$druntime_fiber_asm_external" = no; then
-     AC_SEARCH_LIBS([swapcontext], [c ucontext], [],
-       AC_MSG_ERROR([swapcontext required but not found]))

cross/gcc-aarch64/0045-libgo-include-asm-ptrace.h-for-pt_regs-definition-on.patch

@@ -0,0 +1,58 @@
+From 353c8abdc34a294c89c24423ef0c4182189117f6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren@soeren-tempel.net>
+Date: Sun, 2 Jan 2022 01:07:03 +0100
+Subject: [PATCH] libgo: include asm/ptrace.h for pt_regs definition on PowerPC
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Both glibc and musl libc declare pt_regs as an incomplete type. This
+type has to be completed by inclusion of another header. On Linux, the
+asm/ptrace.h header file provides this type definition. Without
+including this header file, it is not possible to access the regs member
+of the mcontext_t struct as done in libgo/runtime/go-signal.c. On glibc,
+other headers (e.g. sys/user.h) include asm/ptrace.h but on musl
+asm/ptrace.h is not included by other headers and thus the
+aforementioned files do not compile without an explicit include of
+asm/ptrace.h:
+
+	libgo/runtime/go-signal.c: In function 'getSiginfo':
+	libgo/runtime/go-signal.c:227:63: error: invalid use of undefined type 'struct pt_regs'
+	  227 |         ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.regs->nip;
+	      |
+
+Instead of including the asm/ptrace.h header conditionally on PowerPC
+only it would alternatively also be possible to include it
+unconditionally.
+
+See also:
+
+* https://git.musl-libc.org/cgit/musl/commit/?id=c2518a8efb6507f1b41c3b12e03b06f8f2317a1f
+* https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=d57cb31910ca5c200e4172276749a7f8bd17ae3c
+* https://github.com/kaniini/libucontext/issues/36
+
+Signed-off-by: Sören Tempel <soeren@soeren-tempel.net>
+---
+ libgo/runtime/go-signal.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/libgo/runtime/go-signal.c b/libgo/runtime/go-signal.c
+index d30d1603adc..fc01e04e4a1 100644
+--- a/libgo/runtime/go-signal.c
++++ b/libgo/runtime/go-signal.c
+@@ -10,6 +10,12 @@
+ #include <sys/time.h>
+ #include <ucontext.h>
+ 
++// On PowerPC, ucontext.h uses a pt_regs struct as an incomplete
++// type. This type must be completed by including asm/ptrace.h.
++#ifdef __PPC__
++#include <asm/ptrace.h>
++#endif
++
+ #include "runtime.h"
+ 
+ #ifndef SA_RESTART
+-- 
+2.35.1
+

cross/gcc-aarch64/0046-Disable-fsplit-stack-support-on-non-glibc-targets.patch

@@ -0,0 +1,115 @@
+From 2c6bf28619c9b3bf713f7f5319c5d750a6c297ae Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren@soeren-tempel.net>
+Date: Fri, 21 Jan 2022 19:22:46 +0000
+Subject: [PATCH] Disable -fsplit-stack support on non-glibc targets
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The -fsplit-stack option requires the pthread_t TCB definition in the
+libc to provide certain struct fields at specific hardcoded offsets. As
+far as I know, only glibc provides these fields at the required offsets.
+Most notably, musl libc does not have these fields. However, since gcc
+accesses the fields using a fixed offset, this does not cause a
+compile-time error, but instead results in a silent memory corruption at
+run-time with musl libc. For example, on s390x libgcc's
+__stack_split_initialize CTOR will overwrite the cancel field in the
+pthread_t TCB on musl.
+
+The -fsplit-stack option is used within the gcc code base itself by
+gcc-go (if available). On musl-based systems with split-stack support
+(i.e. s390x or x86) this causes Go programs compiled with gcc-go to
+misbehave at run-time.
+
+This patch fixes gcc-go on musl by disabling -fsplit-stack in gcc itself
+since it is not supported on non-glibc targets anyhow. This is achieved
+by checking if gcc targets a glibc-based system. This check has been
+added for x86 and s390x, the rs6000 config already checks for
+TARGET_GLIBC_MAJOR. Other architectures do not have split-stack
+support. With this patch applied, the gcc-go configure script will
+detect that -fsplit-stack support is not available and will not use it.
+
+See https://www.openwall.com/lists/musl/2012/10/16/12
+
+This patch was written under the assumption that glibc is the only libc
+implementation which supports the required fields at the required
+offsets in the pthread_t TCB. The patch has been tested on Alpine Linux
+Edge on the s390x and x86 architectures by bootstrapping Google's Go
+implementation with gcc-go.
+
+Signed-off-by: Sören Tempel <soeren@soeren-tempel.net>
+
+gcc/ChangeLog:
+
+	* common/config/s390/s390-common.c (s390_supports_split_stack):
+	Only support split-stack on glibc targets.
+	* config/i386/gnu-user-common.h (STACK_CHECK_STATIC_BUILTIN): Ditto.
+	* config/i386/gnu.h (defined): Ditto.
+---
+ gcc/common/config/s390/s390-common.c | 14 ++++++++++----
+ gcc/config/i386/gnu-user-common.h    |  5 +++--
+ gcc/config/i386/gnu.h                |  5 ++++-
+ 3 files changed, 17 insertions(+), 7 deletions(-)
+
+diff --git a/gcc/common/config/s390/s390-common.c b/gcc/common/config/s390/s390-common.c
+index b6bc8501742..8c1e590322d 100644
+--- a/gcc/common/config/s390/s390-common.c
++++ b/gcc/common/config/s390/s390-common.c
+@@ -116,13 +116,19 @@ s390_handle_option (struct gcc_options *opts ATTRIBUTE_UNUSED,
+ 
+ /* -fsplit-stack uses a field in the TCB, available with glibc-2.23.
+    We don't verify it, since earlier versions just have padding at
+-   its place, which works just as well.  */
++   its place, which works just as well.  For other libc implementations
++   we disable the feature entirely to avoid corrupting the TCB.  */
+ 
+ static bool
+-s390_supports_split_stack (bool report ATTRIBUTE_UNUSED,
+-			   struct gcc_options *opts ATTRIBUTE_UNUSED)
++s390_supports_split_stack (bool report,
++			   struct gcc_options *opts)
+ {
+-  return true;
++  if (opts->x_linux_libc == LIBC_GLIBC)
++    return true;
++
++  if (report)
++    error ("%<-fsplit-stack%> currently only supported on GNU/Linux");
++  return false;
+ }
+ 
+ #undef TARGET_DEFAULT_TARGET_FLAGS
+diff --git a/gcc/config/i386/gnu-user-common.h b/gcc/config/i386/gnu-user-common.h
+index 00226f5a455..6e13315b5a3 100644
+--- a/gcc/config/i386/gnu-user-common.h
++++ b/gcc/config/i386/gnu-user-common.h
+@@ -66,7 +66,8 @@ along with GCC; see the file COPYING3.  If not see
+ #define STACK_CHECK_STATIC_BUILTIN 1
+ 
+ /* We only build the -fsplit-stack support in libgcc if the
+-   assembler has full support for the CFI directives.  */
+-#if HAVE_GAS_CFI_PERSONALITY_DIRECTIVE
++   assembler has full support for the CFI directives and
++   targets glibc.  */
++#if HAVE_GAS_CFI_PERSONALITY_DIRECTIVE && OPTION_GLIBC
+ #define TARGET_CAN_SPLIT_STACK
+ #endif
+diff --git a/gcc/config/i386/gnu.h b/gcc/config/i386/gnu.h
+index 25fbc07f58c..afd3e8e8841 100644
+--- a/gcc/config/i386/gnu.h
++++ b/gcc/config/i386/gnu.h
+@@ -35,7 +35,10 @@ along with GCC.  If not, see <http://www.gnu.org/licenses/>.
+    crti.o%s %{static:crtbeginT.o%s;shared|pie:crtbeginS.o%s;:crtbegin.o%s}"
+ #endif
+ 
+-#ifdef TARGET_LIBC_PROVIDES_SSP
++/* -fsplit-stack uses a field in the TCB at a fixed offset. This
++   field is only available for glibc.  Disable -fsplit-stack for
++   other libc implementations to avoid silent TCB corruptions.  */
++#if defined (TARGET_LIBC_PROVIDES_SSP) && OPTION_GLIBC
+ 
+ /* i386 glibc provides __stack_chk_guard in %gs:0x14.  */
+ #define TARGET_THREAD_SSP_OFFSET        0x14
+-- 
+2.35.1
+