cross/busybox-static-*: upgrade to 1.33.1-r6

Let postmarketos-ui-phosh depend on modemmanager and
modemmanager-openrc, so we ensure both get installed before the
post-install script runs. The post-install script will not be able to
enable the modemmanager openrc service otherwise.

Related: issue 1287
Backport of MR 2675 from edge

.gitlab-ci.yml

@@ -18,7 +18,7 @@ stages:
 # https://docs.gitlab.com/ee/ci/merge_request_pipelines/index.html#excluding-certain-jobs
 .only-default: &only-default
   only:
-    - master
+    - v21.06
     - merge_requests
     - tags
 
@@ -56,11 +56,8 @@ shellcheck:
   stage: lint
   <<: *only-default
   image: alpine:edge
-  before_script:
-    - apk -q upgrade
-    - apk -q add shellcheck
   script:
-    - .gitlab-ci/shellcheck.sh
+    - DOWNLOAD_SHELLCHECK=1 .gitlab-ci/shellcheck.sh
 
 # aports checks (generic)
 aports-static:
@@ -109,7 +106,7 @@ kernel-kconfig:
   stage: lint
   only:
     refs:
-      - master
+      - v21.06
       - merge_requests
     changes:
       - device/*/linux-*/config-*
@@ -150,14 +147,8 @@ mr-settings:
 build-x86_64:
   extends: .build
 
-build-x86:
-  extends: .build
-
 build-aarch64:
   extends: .build
 
 build-armv7:
   extends: .build
-
-build-armhf:
-  extends: .build

.gitlab-ci/build_changed_aports.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright 2020 Oliver Smith
+# Copyright 2021 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later
 import sys
 
@@ -15,8 +15,9 @@ import pmb.helpers.pmaports
 
 def build_strict(packages, arch):
     common.run_pmbootstrap(["build_init"])
-    common.run_pmbootstrap(["--details-to-stdout", "build", "--strict",
-                            "--force", "--arch", arch] + list(packages))
+    common.run_pmbootstrap(["--details-to-stdout", "--no-ccache", "build",
+                            "--strict", "--force",
+                            "--arch", arch, ] + list(packages))
 
 
 def verify_checksums(packages, arch):

.gitlab-ci/check_changed_aports_versions.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright 2020 Oliver Smith
+# Copyright 2021 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 import glob

.gitlab-ci/check_devices_in_wiki.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright 2020 Oliver Smith
+# Copyright 2021 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 import argparse
@@ -16,6 +16,14 @@ def get_devices():
                 "/..")))
     for path in glob.glob(pmaports + "/device/*/device-*/"):
         device = os.path.dirname(path).split("device-", 1)[1]
+
+        # -downstream suffix is used when packaging the downstream kernel for
+        # devices that have a working mainline kernel. Those are usually
+        # unmaintained and therefore might not appear in the wiki. However,
+        # the main device should be documented (remove the -downstream suffix).
+        if device.endswith('-downstream'):
+            device = device[:-len('-downstream')]
+
         ret.append(device)
     return sorted(ret)
 
@@ -45,6 +53,13 @@ def get_wiki_devices_html(path):
     return {"booting": split[0], "not_booting": split[1]}
 
 
+def get_wiki_renamed_devices_html():
+    """:returns: HTML of the page"""
+    # Download wiki page
+    url = "http://wiki.postmarketos.org/wiki/Renamed_Devices"
+    return urllib.request.urlopen(url).read().decode("utf-8")
+
+
 def check_device(device, html, is_booting):
     """:param is_booting: require the device to be in the booting section, not
                           just anywhere in the page (i.e. in the not booting
@@ -59,6 +74,9 @@ def check_device(device, html, is_booting):
                   " section already)")
             return False
         return True
+    if device in html["renamed"]:
+        print(f"WARNING: {device} was renamed in the wiki")
+        return True
 
     print(device + ": not in the wiki yet.")
     return False
@@ -79,6 +97,7 @@ def main():
 
     # Check all devices
     html = get_wiki_devices_html(args.path)
+    html["renamed"] = get_wiki_renamed_devices_html()
     error = False
     for device in get_devices():
         if not check_device(device, html, args.booting):

.gitlab-ci/common.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright 2020 Oliver Smith
+# Copyright 2021 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 # Various functions used in CI scripts

.gitlab-ci/move_logs.sh

@@ -1,5 +1,5 @@
 #!/bin/sh -e
-# Copyright 2020 Oliver Smith
+# Copyright 2021 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 if [ -z "$1" ]; then

.gitlab-ci/run_testcases.sh

@@ -1,5 +1,5 @@
 #!/bin/sh -e
-# Copyright 2020 Oliver Smith
+# Copyright 2021 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 # Require pmbootstrap

.gitlab-ci/shellcheck.sh

@@ -1,5 +1,5 @@
 #!/bin/sh -e
-# Copyright 2020 Oliver Smith
+# Copyright 2021 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 set -e
@@ -13,10 +13,25 @@ if grep -qr '(CHANGEME!)' *; then
 	exit 1
 fi
 
+# Shellcheck isn't in Alpine anymore, so just download the static binary in CI
+# Related: https://gitlab.alpinelinux.org/alpine/aports/-/issues/10902
+if [ "$DOWNLOAD_SHELLCHECK" = 1 ]; then
+	pkgver="0.7.2"
+	tmpdir="/tmp/shellcheck-$pkgver"
+	url="https://github.com/koalaman/shellcheck/releases/download/v$pkgver/shellcheck-v$pkgver.linux.x86_64.tar.xz"
+	mkdir -p "$tmpdir"
+	if ! [ -e "$tmpdir"/rel.tar.xz ]; then
+		echo "Downloading $url"
+		wget -q -O "$tmpdir"/rel.tar.xz "$url"
+	fi
+	tar -C "$tmpdir" -xf "$tmpdir"/rel.tar.xz
+	export PATH="$tmpdir/shellcheck-v$pkgver/:$PATH"
+fi
+
 # Shell: shellcheck
 sh_files="
+	./main/mdss-fb-init-hack/mdss-fb-init-hack.sh
 	./main/postmarketos-base/rootfs-usr-lib-firmwareload.sh
-	./main/postmarketos-base/rootfs-usr-libexec-elogind-system-sleep-suspend-disable-conditions.hook
 	./main/postmarketos-mkinitfs/init.sh.in
 	./main/postmarketos-mkinitfs/init_functions.sh
 	./main/postmarketos-mkinitfs/mkinitfs.sh
@@ -24,7 +39,8 @@ sh_files="
 	./main/postmarketos-mkinitfs/mkinitfs_test.sh
 	./main/postmarketos-mkinitfs-hook-debug-shell/20-debug-shell.sh
 	./main/postmarketos-update-kernel/update-kernel.sh
-	./main/mdss-fb-init-hack/mdss-fb-init-hack.sh
+	./main/swclock-offset/swclock-offset-boot.sh
+	./main/swclock-offset/swclock-offset-shutdown.sh
 
 	$(find . -path './main/postmarketos-ui-*/*.sh')
 	$(find . -path './main/postmarketos-ui-*/*.pre-install')

.gitlab-ci/testcases/add_pmbootstrap_to_import_path/__init__.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright 2020 Oliver Smith
+# Copyright 2021 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 import shutil

.gitlab-ci/testcases/conftest.py

@@ -0,0 +1,25 @@
+#!/usr/bin/env python3
+# Copyright 2021 Oliver Smith
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+import add_pmbootstrap_to_import_path
+import pmb.parse
+import pytest
+import sys
+import os
+
+
+@pytest.fixture
+def args(request):
+    # Initialize args
+    pmaports = os.path.realpath(f"{os.path.dirname(__file__)}/../..")
+    sys.argv = ["pmbootstrap",
+                "--aports", pmaports,
+                "--log", "$WORK/log_testsuite_pmaports.txt"
+                "chroot"]
+    args = pmb.parse.arguments()
+
+    # Initialize logging
+    pmb.helpers.logging.init(args)
+    request.addfinalizer(pmb.helpers.logging.logfd.close)
+    return args

.gitlab-ci/testcases/test_aports.py

@@ -1,289 +0,0 @@
-#!/usr/bin/env python3
-# Copyright 2020 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
-
-
-@pytest.fixture
-def args(request):
-    # Initialize args
-    pmaports = os.path.realpath(f"{os.path.dirname(__file__)}/../..")
-    sys.argv = ["pmbootstrap",
-                "--aports", pmaports,
-                "--log", "$WORK/log_testsuite_pmaports.txt"
-                "chroot"]
-    args = pmb.parse.arguments()
-
-    # Initialize logging
-    pmb.helpers.logging.init(args)
-    request.addfinalizer(args.logfd.close)
-    return args
-
-
-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 = ["weston_pixman_type"]
-    for option in obsolete_options:
-        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):
-    """
-    Parse all deviceinfo files successfully and run checks on the parsed data.
-    """
-    # Iterate over all devices
-    last_exception = None
-    count = 0
-    for folder in glob.glob(args.aports + "/device/*/device-*"):
-        device = folder[len(args.aports):].split("-", 1)[1]
-
-        try:
-            # Successful deviceinfo parsing / obsolete options
-            info = pmb.parse.deviceinfo(args, device)
-            deviceinfo_obsolete(info)
-
-            # deviceinfo_name must start with manufacturer
-            name = info["name"]
-            manufacturer = info["manufacturer"]
-            if not name.startswith(manufacturer) and \
-                    not name.startswith("Google"):
-                raise RuntimeError("Please add the manufacturer in front of"
-                                   " the deviceinfo_name, e.g.: '" +
-                                   manufacturer + " " + name + "'")
-
-        # Don't abort on first error
-        except Exception as e:
-            last_exception = e
-            count += 1
-            print(device + ": " + str(e))
-
-    # Raise the last exception
-    if last_exception:
-        print("deviceinfo error count: " + str(count))
-        raise last_exception
-
-
-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.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>.")
-
-
-def test_aports_kernel(args):
-    """
-    Various tests performed on the /**/linux-* aports.
-    """
-    for path in glob.iglob(args.aports + "**/linux-*/APKBUILD", recursive=True):
-        apkbuild = pmb.parse.apkbuild(args, path)
-
-        if "pmb:cross-native" not in apkbuild["options"]:
-            raise RuntimeError("\"pmb:cross-native\" missing in"
-                               f" options= line: {path}")
-
-
-def test_aports_device(args):
-    """
-    Various tests performed on the /device/*/device-* aports.
-    """
-    for path in glob.iglob(args.aports + "/device/*/device-*/APKBUILD"):
-        apkbuild = pmb.parse.apkbuild(args, path)
-
-        # Depends: Require "postmarketos-base"
-        if "postmarketos-base" not in apkbuild["depends"]:
-            raise RuntimeError("Missing 'postmarketos-base' in depends of " +
-                               path)
-
-        # Depends: Must not have firmware packages
-        for depend in apkbuild["depends"]:
-            device_dependency_check(apkbuild, path)
-
-        # Architecture
-        device = apkbuild["pkgname"][len("device-"):]
-        deviceinfo = pmb.parse.deviceinfo(args, device)
-        if "".join(apkbuild["arch"]) != deviceinfo["arch"]:
-            raise RuntimeError("wrong architecture, please change to arch=\"" +
-                               deviceinfo["arch"] + "\": " + path)
-        if "!archcheck" not in apkbuild["options"]:
-            raise RuntimeError("!archcheck missing in options= line: " + path)
-
-
-def test_aports_device_kernel(args):
-    """
-    Verify the kernels specified in the device packages:
-    * Kernel must not be in depends when kernels are in subpackages
-    * Check if only one kernel is defined in depends
-    """
-
-    # Iterate over device aports
-    for path in glob.glob(args.aports + "/device/*/device-*/APKBUILD"):
-        # Parse apkbuild and kernels from subpackages
-        apkbuild = pmb.parse.apkbuild(args, path)
-        device = apkbuild["pkgname"][len("device-"):]
-        kernels_subpackages = pmb.parse._apkbuild.kernels(args, device)
-
-        # Parse kernels from depends
-        kernels_depends = []
-        for depend in apkbuild["depends"]:
-            if not depend.startswith("linux-"):
-                continue
-            kernels_depends.append(depend)
-
-            # Kernel in subpackages *and* depends
-            if kernels_subpackages:
-                raise RuntimeError("Kernel package '" + depend + "' needs to"
-                                   " be removed when using kernel" +
-                                   " subpackages: " + path)
-
-        # No kernel
-        if not kernels_depends and not kernels_subpackages:
-            raise RuntimeError("Device doesn't have a kernel in depends or"
-                               " subpackages: " + path)
-
-        # Multiple kernels in depends
-        if len(kernels_depends) > 1:
-            raise RuntimeError("Please use kernel subpackages instead of"
-                               " multiple kernels in depends (see"
-                               " <https://postmarketos.org/devicepkg>): " +
-                               path)
-
-
-def parse_source_from_checksums(args, apkbuild_path):
-    """
-    Read the APKBUILD file and parse source files from the checksums at the
-    bottom. This has always the same format, even if $source is built with hard
-    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(args, 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}")
-
-
-def test_aports_ui(args):
-    """
-    Raise an error if package in _pmb_recommends is not found
-    """
-    for arch in pmb.config.build_device_architectures:
-        for path in glob.iglob(args.aports + "/main/postmarketos-ui-*/APKBUILD"):
-            apkbuild = pmb.parse.apkbuild(args, path)
-            # Skip if arch isn't enabled
-            if not pmb.helpers.package.check_arch(args, apkbuild["pkgname"], arch, False):
-                continue
-
-            for package in apkbuild["_pmb_recommends"]:
-                depend = pmb.helpers.package.get(args, package,
-                                                 arch, must_exist=False)
-                if depend is None or not pmb.helpers.package.check_arch(args, package, arch):
-                    raise RuntimeError(f"{path}: package '{package}' from"
-                                       f" _pmb_recommends not found for arch '{arch}'")
-
-            # Check packages from "_pmb_recommends" of -extras subpackage if one exists
-            if f"{apkbuild['pkgname']}-extras" in apkbuild["subpackages"]:
-                apkbuild = apkbuild["subpackages"][f"{apkbuild['pkgname']}-extras"]
-                for package in apkbuild["_pmb_recommends"]:
-                    depend = pmb.helpers.package.get(args, package,
-                                                     arch, must_exist=False)
-                    if depend is None or not pmb.helpers.package.check_arch(args, package, arch):
-                        raise RuntimeError(f"{path}: package '{package}' from _pmb_recommends "
-                                           f"of -extras subpackage is not found for arch '{arch}'")

.gitlab-ci/testcases/test_device.py

@@ -0,0 +1,136 @@
+#!/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
+
+
+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.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>.")
+
+
+def test_aports_device(args):
+    """
+    Various tests performed on the /device/*/device-* aports.
+    """
+    for path in glob.iglob(args.aports + "/device/*/device-*/APKBUILD"):
+        apkbuild = pmb.parse.apkbuild(args, path)
+
+        # Depends: Require "postmarketos-base"
+        if "postmarketos-base" not in apkbuild["depends"]:
+            raise RuntimeError("Missing 'postmarketos-base' in depends of " +
+                               path)
+
+        # Depends: Must not have firmware packages
+        for depend in apkbuild["depends"]:
+            device_dependency_check(apkbuild, path)
+
+        # Architecture
+        device = apkbuild["pkgname"][len("device-"):]
+        deviceinfo = pmb.parse.deviceinfo(args, device)
+        if "".join(apkbuild["arch"]) != deviceinfo["arch"]:
+            raise RuntimeError("wrong architecture, please change to arch=\"" +
+                               deviceinfo["arch"] + "\": " + path)
+        if "!archcheck" not in apkbuild["options"]:
+            raise RuntimeError("!archcheck missing in options= line: " + path)
+
+        if deviceinfo["flash_kernel_on_update"] == "true" \
+                and "postmarketos-update-kernel" not in apkbuild["depends"]:
+            raise RuntimeError(
+                "Deviceinfo indicates this device supports automatic kernel"
+                " flashing on update, but doesn't depend on"
+                " 'postmarketos-update-kernel'. Please add the missing"
+                " dependency.")
+
+
+def test_aports_device_kernel(args):
+    """
+    Verify the kernels specified in the device packages:
+    * Kernel must not be in depends when kernels are in subpackages
+    * Check if only one kernel is defined in depends
+    """
+
+    # Iterate over device aports
+    for path in glob.glob(args.aports + "/device/*/device-*/APKBUILD"):
+        # Parse apkbuild and kernels from subpackages
+        apkbuild = pmb.parse.apkbuild(args, path)
+        device = apkbuild["pkgname"][len("device-"):]
+        kernels_subpackages = pmb.parse._apkbuild.kernels(args, device)
+
+        # Parse kernels from depends
+        kernels_depends = []
+        for depend in apkbuild["depends"]:
+            if not depend.startswith("linux-"):
+                continue
+            kernels_depends.append(depend)
+
+            # Kernel in subpackages *and* depends
+            if kernels_subpackages:
+                raise RuntimeError("Kernel package '" + depend + "' needs to"
+                                   " be removed when using kernel" +
+                                   " subpackages: " + path)
+
+        # No kernel
+        if not kernels_depends and not kernels_subpackages:
+            raise RuntimeError("Device doesn't have a kernel in depends or"
+                               " subpackages: " + path)
+
+        # Multiple kernels in depends
+        if len(kernels_depends) > 1:
+            raise RuntimeError("Please use kernel subpackages instead of"
+                               " multiple kernels in depends (see"
+                               " <https://postmarketos.org/devicepkg>): " +
+                               path)
+
+
+def test_aports_maintained(args):
+    """
+    Ensure that aports in /device/{main,community} have "Maintainer:" and
+    "Co-Maintainer:" (only required for main) listed in their APKBUILDs.
+    """
+    for path in glob.iglob(f"{args.aports}/device/main/*/APKBUILD"):
+        if '/firmware-' in path:
+            continue
+        maintainers = pmb.parse._apkbuild.maintainers(path)
+        assert maintainers and len(maintainers) >= 2, \
+            f"{path} in main needs at least 1 Maintainer and 1 Co-Maintainer"
+
+    for path in glob.iglob(f"{args.aports}/device/community/*/APKBUILD"):
+        if '/firmware-' in path:
+            continue
+        maintainers = pmb.parse._apkbuild.maintainers(path)
+        assert maintainers, f"{path} in community needs at least 1 Maintainer"
+
+
+def test_aports_unmaintained(args):
+    """
+    Ensure that aports in /device/unmaintained have an "Unmaintained:" comment
+    that describes why the aport is unmaintained.
+    """
+    for path in glob.iglob(f"{args.aports}/device/unmaintained/*/APKBUILD"):
+        unmaintained = pmb.parse._apkbuild.unmaintained(path)
+        assert unmaintained, f"{path} should have an Unmaintained: " +\
+            "comment that describes why the package is unmaintained"

.gitlab-ci/testcases/test_deviceinfo.py

@@ -0,0 +1,60 @@
+#!/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
+
+
+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 = ["weston_pixman_type"]
+    for option in obsolete_options:
+        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):
+    """
+    Parse all deviceinfo files successfully and run checks on the parsed data.
+    """
+    # Iterate over all devices
+    last_exception = None
+    count = 0
+    for folder in glob.glob(args.aports + "/device/*/device-*"):
+        device = folder[len(args.aports):].split("-", 1)[1]
+
+        try:
+            # Successful deviceinfo parsing / obsolete options
+            info = pmb.parse.deviceinfo(args, device)
+            deviceinfo_obsolete(info)
+
+            # deviceinfo_name must start with manufacturer
+            name = info["name"]
+            manufacturer = info["manufacturer"]
+            if not name.startswith(manufacturer) and \
+                    not name.startswith("Google"):
+                raise RuntimeError("Please add the manufacturer in front of"
+                                   " the deviceinfo_name, e.g.: '" +
+                                   manufacturer + " " + name + "'")
+
+        # Don't abort on first error
+        except Exception as e:
+            last_exception = e
+            count += 1
+            print(device + ": " + str(e))
+
+    # Raise the last exception
+    if last_exception:
+        print("deviceinfo error count: " + str(count))
+        raise last_exception

.gitlab-ci/testcases/test_directory_structure.py

@@ -5,15 +5,14 @@ import os
 import stat
 
 expected_directories = [
-    "console",
     "cross",
     "device/community",
     "device/main",
     "device/testing",
-    "kde",
-    "maemo",
+    "device/unmaintained",
     "main",
     "modem",
+    "non-free",
     "sxmo",
     "temp",
 ]

.gitlab-ci/testcases/test_framework_versions.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright 2020 Oliver Smith
+# Copyright 2021 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 """ Make sure that components of frameworks (Qt, KDE, ...) have the same
@@ -17,21 +17,6 @@ import pmb.config
 import pmb.parse
 
 
-@pytest.fixture
-def args(request):
-    # Initialize args
-    sys.argv = ["pmbootstrap",
-                "--aports", os.path.dirname(__file__) + "/../..",
-                "--log", "$WORK/log_testsuite_pmaports.txt"
-                "chroot"]
-    args = pmb.parse.arguments()
-
-    # Initialize logging
-    pmb.helpers.logging.init(args)
-    request.addfinalizer(args.logfd.close)
-    return args
-
-
 def get_categorized_packages(args):
     """
     Parse all aports and categorize them.

.gitlab-ci/testcases/test_kernel.py

@@ -0,0 +1,42 @@
+#!/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
+
+
+def test_aports_kernel(args):
+    """
+    Various tests performed on the /**/linux-* aports.
+    """
+
+    for path in glob.iglob(f"{args.aports}/**/linux-*/APKBUILD", recursive=True):
+        apkbuild = pmb.parse.apkbuild(args, path)
+        aport_name = os.path.basename(os.path.dirname(path))
+
+        if "pmb:cross-native" not in apkbuild["options"]:
+            raise RuntimeError(f"{aport_name}: \"pmb:cross-native\" missing in"
+                               " options= line")
+
+        # cross-compilers should not be in makedepends
+        for ccc in ["gcc-armv7", "gcc-armhf", "gcc-aarch64",
+                    "gcc4-armv7", "gcc4-armhf", "gcc4-aarch64",
+                    "gcc6-armv7", "gcc6-armhf", "gcc6-aarch64"]:
+            if ccc in apkbuild["makedepends"]:
+                raise RuntimeError(f"{aport_name}: Cross-compiler ({ccc}) should"
+                                   " not be explicitly specified in makedepends!"
+                                   " pmbootstrap installs cross-compiler"
+                                   " automatically.")
+
+        # 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}"):
+                assert pmb.parse.kconfig.check(args,
+                                               aport_name.replace("linux-", ""),
+                                               force_nftables_check=True)

.gitlab-ci/testcases/test_ui.py

@@ -0,0 +1,40 @@
+#!/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
+
+
+def test_aports_ui(args):
+    """
+    Raise an error if package in _pmb_recommends is not found
+    """
+    for arch in pmb.config.build_device_architectures:
+        for path in glob.iglob(args.aports + "/main/postmarketos-ui-*/APKBUILD"):
+            apkbuild = pmb.parse.apkbuild(args, path)
+            # Skip if arch isn't enabled
+            if not pmb.helpers.package.check_arch(args, apkbuild["pkgname"], arch, False):
+                continue
+
+            for package in apkbuild["_pmb_recommends"]:
+                depend = pmb.helpers.package.get(args, package,
+                                                 arch, must_exist=False)
+                if depend is None or not pmb.helpers.package.check_arch(args, package, arch):
+                    raise RuntimeError(f"{path}: package '{package}' from"
+                                       f" _pmb_recommends not found for arch '{arch}'")
+
+            # Check packages from "_pmb_recommends" of -extras subpackage if one exists
+            if f"{apkbuild['pkgname']}-extras" in apkbuild["subpackages"]:
+                apkbuild = apkbuild["subpackages"][f"{apkbuild['pkgname']}-extras"]
+                for package in apkbuild["_pmb_recommends"]:
+                    depend = pmb.helpers.package.get(args, package,
+                                                     arch, must_exist=False)
+                    if depend is None or not pmb.helpers.package.check_arch(args, package, arch):
+                        raise RuntimeError(f"{path}: package '{package}' from _pmb_recommends "
+                                           f"of -extras subpackage is not found for arch '{arch}'")

.gitlab-ci/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(args, 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}")

CODEOWNERS

@@ -1,8 +1,10 @@
 # https://docs.gitlab.com/ee/user/project/code_owners.html
 
-device/*/*-pine64-pinephone/        @craftyguy
-device/*/*-purism-librem5/          @craftyguy
+device/*/*-pine64-pinephone/        @craftyguy @milesalan @bshah @proycon @anjandev @StacyHarper
+device/*/*-purism-librem5/          @craftyguy @bshah
 main/osk-sdl/                       @craftyguy
-temp/u-boot-librem5/                @craftyguy
+main/mesa-pvr-dri-classic/          @xc-racer99
+main/postmarketos-ui-plasma-mobile/ @bshah
+temp/u-boot-librem5/                @craftyguy @bshah
 
 # vim: ts=4 sw=4 et

channels.cfg

@@ -1,15 +0,0 @@
-# Reference: https://postmarketos.org/channels.cfg
-[channels.cfg]
-recommended=edge
-
-[edge]
-description=Rolling release channel
-branch_pmaports=master
-branch_aports=master
-mirrordir_alpine=edge
-
-[stable]
-description=Stable release channel (first beta v20.05, does not have many devices yet)
-branch_pmaports=v20.05
-branch_aports=3.12-stable
-mirrordir_alpine=v3.12

cross/binutils-aarch64/APKBUILD

@@ -3,8 +3,8 @@
 # Based on: main/binutils
 
 pkgname=binutils-aarch64
-pkgver=2.35.1
-pkgrel=1
+pkgver=2.35.2
+pkgrel=2
 pkgdesc="Tools necessary to build programs for aarch64 targets"
 url="https://www.gnu.org/software/binutils/"
 makedepends="gettext libtool autoconf automake bison texinfo"
@@ -15,9 +15,15 @@ source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz
 	gold-mips.patch
 	ld-bfd-mips.patch
 	0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
+	CVE-2021-3487.patch
+	binutils-mips-disable-assert.patch
 	"
 builddir="$srcdir/binutils-$pkgver"
 
+if [ "$CHOST" = "$CBUILD" ] && [ "$CBUILD" = "$CTARGET" ] && [ "$CTARGET_ARCH" != "riscv64" ]; then
+	subpackages=""
+fi
+
 if [ "$CHOST" != "$CTARGET" ]; then
 	pkgname="binutils-$CTARGET_ARCH"
 	subpackages=""
@@ -25,6 +31,8 @@ if [ "$CHOST" != "$CTARGET" ]; then
 fi
 
 # secfixes:
+#   2.35.2-r1:
+#     - CVE-2021-3487
 #   2.32-r0:
 #     - CVE-2018-19931
 #     - CVE-2018-19932
@@ -60,8 +68,12 @@ package() {
 
 
 
-sha512sums="94ff72708403413b70b247f3af4099ebaa882b6659249869f1ed9941a0f1912e313f08357d470f9fd2359e7f5e5b0eb86285e5eaf883fa8187789d6b1bd304eb  binutils-2.35.1.tar.xz
+sha512sums="
+9974ede5978d32e0d68fef23da48fa00bd06b0bff7ec45b00ca075c126d6bbe0cf2defc03ecc3f17bc6cc85b64271a13009c4049d7ba17de26e84e3a6e2c0348  binutils-2.35.2.tar.xz
 ecee33b0e435aa704af1c334e560f201638ff79e199aa11ed78a72f7c9b46f85fbb227af5748e735fd681d1965fcc42ac81b0c8824e540430ce0c706c81e8b49  binutils-ld-fix-static-linking.patch
 f55cf2e0bf82f97583a1abe10710e4013ecf7d64f1da2ef8659a44a06d0dd8beaf58dab98a183488ea137f03e32d62efc878d95f018f836f8cec870bc448556f  gold-mips.patch
 314d2ef9071c89940aa6c8118e8a1e2f191a5d0a4bf596da1ad9cc84f884d8bc7dea8bd7b9fc3f8f1bddd3fd41c6eb017e1e804044b3bf084df1ed9e6e095e2d  ld-bfd-mips.patch
-642c617db6c6e491f78f053d60f3aa369bad7bf8c1bc7ce267de6cf8fddf6c0d4cf63ce8c8f6e2f225dedbce7cb930d8e87e168fd8f72ca0837c77266ee2b5f8  0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch"
+642c617db6c6e491f78f053d60f3aa369bad7bf8c1bc7ce267de6cf8fddf6c0d4cf63ce8c8f6e2f225dedbce7cb930d8e87e168fd8f72ca0837c77266ee2b5f8  0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
+b08384ed124a74ad3a424db370c107230f09a54378502ca4385deb738f7cf799857f2af0db52709c7eeab8fa6c0a3d972f891396cce1e2834a21f67682fc4355  CVE-2021-3487.patch
+609cd90d8b334eb309f586b17b9d335a08d3dbb6def7c3eb5c010028fcb681674031e5b9d853aa7a39a50304356a86afc184b85562b3f228f8197f4d29395c8f  binutils-mips-disable-assert.patch
+"

cross/binutils-aarch64/CVE-2021-3487.patch

@@ -0,0 +1,72 @@
+From 647cebce12a6b0a26960220caff96ff38978cf24 Mon Sep 17 00:00:00 2001
+From: Nick Clifton <nickc@redhat.com>
+Date: Thu, 26 Nov 2020 17:08:33 +0000
+Subject: [PATCH] Prevent a memory allocation failure when parsing corrupt
+ DWARF debug sections.
+
+	PR 26946
+	* dwarf2.c (read_section): Check for debug sections with excessive
+	sizes.
+
+diff --git a/bfd/dwarf2.c b/bfd/dwarf2.c
+index 977bf43a6a1..8bbfc81d3e7 100644
+--- a/bfd/dwarf2.c
++++ b/bfd/dwarf2.c
+@@ -531,22 +531,24 @@ read_section (bfd *	      abfd,
+ 	      bfd_byte **     section_buffer,
+ 	      bfd_size_type * section_size)
+ {
+-  asection *msec;
+   const char *section_name = sec->uncompressed_name;
+   bfd_byte *contents = *section_buffer;
+-  bfd_size_type amt;
+ 
+   /* The section may have already been read.  */
+   if (contents == NULL)
+     {
++      bfd_size_type amt;
++      asection *msec;
++      ufile_ptr filesize;
++
+       msec = bfd_get_section_by_name (abfd, section_name);
+-      if (! msec)
++      if (msec == NULL)
+ 	{
+ 	  section_name = sec->compressed_name;
+ 	  if (section_name != NULL)
+ 	    msec = bfd_get_section_by_name (abfd, section_name);
+ 	}
+-      if (! msec)
++      if (msec == NULL)
+ 	{
+ 	  _bfd_error_handler (_("DWARF error: can't find %s section."),
+ 			      sec->uncompressed_name);
+@@ -554,12 +556,23 @@ read_section (bfd *	      abfd,
+ 	  return FALSE;
+ 	}
+ 
+-      *section_size = msec->rawsize ? msec->rawsize : msec->size;
++      amt = bfd_get_section_limit_octets (abfd, msec);
++      filesize = bfd_get_file_size (abfd);
++      if (amt >= filesize)
++	{
++	  /* PR 26946 */
++	  _bfd_error_handler (_("DWARF error: section %s is larger than its filesize! (0x%lx vs 0x%lx)"),
++			      section_name, (long) amt, (long) filesize);
++	  bfd_set_error (bfd_error_bad_value);
++	  return FALSE;
++	}
++      *section_size = amt;
+       /* Paranoia - alloc one extra so that we can make sure a string
+ 	 section is NUL terminated.  */
+-      amt = *section_size + 1;
++      amt += 1;
+       if (amt == 0)
+ 	{
++	  /* Paranoia - this should never happen.  */
+ 	  bfd_set_error (bfd_error_no_memory);
+ 	  return FALSE;
+ 	}
+-- 
+2.27.0
+

cross/binutils-aarch64/binutils-mips-disable-assert.patch

@@ -0,0 +1,14 @@
+diff -urN binutils-2.35.2.orig/bfd/elfxx-mips.c binutils-2.35.2/bfd/elfxx-mips.c
+--- binutils-2.35.2.orig/bfd/elfxx-mips.c	2021-01-30 01:38:03.000000000 -0700
++++ binutils-2.35.2/bfd/elfxx-mips.c	2021-05-13 17:35:34.706913601 -0600
+@@ -6744,8 +6744,10 @@
+      in the relocation.  */
+   if (h != NULL && ! SYMBOL_REFERENCES_LOCAL (info, &h->root))
+     {
++#if 0
+       BFD_ASSERT (htab->root.target_os == is_vxworks
+ 		  || h->global_got_area != GGA_NONE);
++#endif
+       indx = h->root.dynindx;
+       if (SGI_COMPAT (output_bfd))
+ 	defined_p = h->root.def_regular;

cross/binutils-armhf/0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch

@@ -1,86 +0,0 @@
-From b1faf99f3e546df2cd302bb1ad36a2078224fe8b Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Fri, 30 Oct 2020 16:59:48 -0600
-Subject: [PATCH] Revert "PR25882, .gnu.attributes are not checked for shared
- libraries"
-
-This reverts commit a8acd6eeb6dc2cc5460ece90f90ebe36b56b20ba.
----
- bfd/ChangeLog     | 6 ------
- bfd/elf32-tic6x.c | 3 ---
- ld/ChangeLog      | 6 ------
- ld/ldlang.c       | 9 ++++-----
- 4 files changed, 4 insertions(+), 20 deletions(-)
-
-diff --git a/bfd/ChangeLog b/bfd/ChangeLog
-index 9fac12538a..b5461494e8 100644
---- a/bfd/ChangeLog
-+++ b/bfd/ChangeLog
-@@ -1422,12 +1422,6 @@
- 	accessing root.u.def of symbols.  Also check root.u.def.section
- 	is non-NULL.  Reverse tests so as to make the logic positive.
- 
--2020-05-01  Alan Modra  <amodra@gmail.com>
--
--	PR 25882
--	* elf32-tic6x.c (elf32_tic6x_merge_attributes): Don't transfer
--	Tag_ABI_PIC or Tag_ABI_PID from dynamic objects to the output.
--
- 2020-05-01  Alan Modra  <amodra@gmail.com>
- 
- 	PR 25882
-diff --git a/bfd/elf32-tic6x.c b/bfd/elf32-tic6x.c
-index b8b916bfd3..91bb6a10b1 100644
---- a/bfd/elf32-tic6x.c
-+++ b/bfd/elf32-tic6x.c
-@@ -3748,9 +3748,6 @@ elf32_tic6x_merge_attributes (bfd *ibfd, struct bfd_link_info *info)
- 
- 	case Tag_ABI_PIC:
- 	case Tag_ABI_PID:
--	  /* Don't transfer these tags from dynamic objects.  */
--	  if ((ibfd->flags & DYNAMIC) != 0)
--	    continue;
- 	  if (out_attr[i].i > in_attr[i].i)
- 	    out_attr[i].i = in_attr[i].i;
- 	  break;
-diff --git a/ld/ChangeLog b/ld/ChangeLog
-index 4eec7d2977..b93452f70c 100644
---- a/ld/ChangeLog
-+++ b/ld/ChangeLog
-@@ -1319,12 +1319,6 @@
- 	* testsuite/ld-aarch64/farcall-group.d: New test driver.
- 	* testsuite/ld-aarch64/aarch64-elf.exp: Run the new test.
- 
--2020-05-01  Alan Modra  <amodra@gmail.com>
--
--	PR 25882
--	* ldlang.c (lang_check): Call bfd_merge_private_bfd_data for
--	shared libraries.
--
- 2020-05-01  Alan Modra  <amodra@gmail.com>
- 
- 	* po/BLD-POTFILES.in: Regenerate.
-diff --git a/ld/ldlang.c b/ld/ldlang.c
-index 9977195074..173d8ec349 100644
---- a/ld/ldlang.c
-+++ b/ld/ldlang.c
-@@ -6972,12 +6972,11 @@ lang_check (void)
- 		   bfd_printable_name (input_bfd), input_bfd,
- 		   bfd_printable_name (link_info.output_bfd));
- 	}
--
--      /* If the input bfd has no contents, it shouldn't set the
--	 private data of the output bfd.  */
--      else if ((input_bfd->flags & DYNAMIC) != 0
--	       || bfd_count_sections (input_bfd) != 0)
-+      else if (bfd_count_sections (input_bfd))
- 	{
-+	  /* If the input bfd has no contents, it shouldn't set the
-+	     private data of the output bfd.  */
-+
- 	  bfd_error_handler_type pfn = NULL;
- 
- 	  /* If we aren't supposed to warn about mismatched input
--- 
-2.29.2
-

cross/binutils-armhf/APKBUILD

@@ -1,67 +0,0 @@
-# Automatically generated aport, do not edit!
-# Generator: pmbootstrap aportgen binutils-armhf
-# Based on: main/binutils
-
-pkgname=binutils-armhf
-pkgver=2.35.1
-pkgrel=1
-pkgdesc="Tools necessary to build programs for armhf targets"
-url="https://www.gnu.org/software/binutils/"
-makedepends="gettext libtool autoconf automake bison texinfo"
-arch="x86_64"
-license="GPL-2.0 GPL-3.0-or-later LGPL-2.0 BSD"
-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
-	"
-builddir="$srcdir/binutils-$pkgver"
-
-if [ "$CHOST" != "$CTARGET" ]; then
-	pkgname="binutils-$CTARGET_ARCH"
-	subpackages=""
-	sonameprefix="binutils:"
-fi
-
-# secfixes:
-#   2.32-r0:
-#     - CVE-2018-19931
-#     - CVE-2018-19932
-#     - CVE-2018-20002
-#     - CVE-2018-20712
-#   2.28-r1:
-#     - CVE-2017-7614
-
-build() {
-	_target="$(arch_to_hostspec armhf)"
-	"$builddir"/configure \
-		--build="$CBUILD" \
-		--target=$_target \
-		--with-lib-path=/usr/lib \
-		--prefix=/usr \
-		--with-sysroot=/usr/$_target \
-		--enable-ld=default \
-		--enable-gold=yes \
-		--enable-plugins \
-		--enable-deterministic-archives \
-		--disable-multilib \
-		--disable-werror \
-		--disable-nls
-	make
-}
-
-package() {
-	make install DESTDIR="$pkgdir"
-
-	# remove man, info folders
-	rm -rf "$pkgdir"/usr/share
-}
-
-
-
-sha512sums="94ff72708403413b70b247f3af4099ebaa882b6659249869f1ed9941a0f1912e313f08357d470f9fd2359e7f5e5b0eb86285e5eaf883fa8187789d6b1bd304eb  binutils-2.35.1.tar.xz
-ecee33b0e435aa704af1c334e560f201638ff79e199aa11ed78a72f7c9b46f85fbb227af5748e735fd681d1965fcc42ac81b0c8824e540430ce0c706c81e8b49  binutils-ld-fix-static-linking.patch
-f55cf2e0bf82f97583a1abe10710e4013ecf7d64f1da2ef8659a44a06d0dd8beaf58dab98a183488ea137f03e32d62efc878d95f018f836f8cec870bc448556f  gold-mips.patch
-314d2ef9071c89940aa6c8118e8a1e2f191a5d0a4bf596da1ad9cc84f884d8bc7dea8bd7b9fc3f8f1bddd3fd41c6eb017e1e804044b3bf084df1ed9e6e095e2d  ld-bfd-mips.patch
-642c617db6c6e491f78f053d60f3aa369bad7bf8c1bc7ce267de6cf8fddf6c0d4cf63ce8c8f6e2f225dedbce7cb930d8e87e168fd8f72ca0837c77266ee2b5f8  0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch"

cross/binutils-armhf/binutils-ld-fix-static-linking.patch

@@ -1,46 +0,0 @@
-This fixes static linking for our hardened toolchain
-diff --git a/ld/scripttempl/elf.sc b/ld/scripttempl/elf.sc
-index e8126cb..9532bfb 100644
---- a/ld/scripttempl/elf.sc
-+++ b/ld/scripttempl/elf.sc
-@@ -235,8 +235,8 @@ test "${LARGE_SECTIONS}" = "yes" && LARGE_SECTIONS="
- if test "${ENABLE_INITFINI_ARRAY}" = "yes"; then
-   SORT_INIT_ARRAY="KEEP (*(SORT_BY_INIT_PRIORITY(.init_array.*) SORT_BY_INIT_PRIORITY(.ctors.*)))"
-   SORT_FINI_ARRAY="KEEP (*(SORT_BY_INIT_PRIORITY(.fini_array.*) SORT_BY_INIT_PRIORITY(.dtors.*)))"
--  CTORS_IN_INIT_ARRAY="EXCLUDE_FILE (*crtbegin.o *crtbegin?.o *crtend.o *crtend?.o $OTHER_EXCLUDE_FILES) .ctors"
--  DTORS_IN_FINI_ARRAY="EXCLUDE_FILE (*crtbegin.o *crtbegin?.o *crtend.o *crtend?.o $OTHER_EXCLUDE_FILES) .dtors"
-+  CTORS_IN_INIT_ARRAY="EXCLUDE_FILE (*crtbegin*.o *crtend*.o $OTHER_EXCLUDE_FILES) .ctors"
-+  DTORS_IN_FINI_ARRAY="EXCLUDE_FILE (*crtbegin*.o *crtend*.o $OTHER_EXCLUDE_FILES) .dtors"
- else
-   SORT_INIT_ARRAY="KEEP (*(SORT(.init_array.*)))"
-   SORT_FINI_ARRAY="KEEP (*(SORT(.fini_array.*)))"
-@@ -270,15 +270,14 @@ CTOR=".ctors        ${CONSTRUCTING-0} :
-        doesn't matter which directory crtbegin.o
-        is in.  */
- 
--    KEEP (*crtbegin.o(.ctors))
--    KEEP (*crtbegin?.o(.ctors))
-+    KEEP (*crtbegin*.o(.ctors))
- 
-     /* We don't want to include the .ctor section from
-        the crtend.o file until after the sorted ctors.
-        The .ctor section from the crtend file contains the
-        end of ctors marker and it must be last */
- 
--    KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o $OTHER_EXCLUDE_FILES) .ctors))
-+    KEEP (*(EXCLUDE_FILE (*crtend*.o $OTHER_EXCLUDE_FILES) .ctors))
-     KEEP (*(SORT(.ctors.*)))
-     KEEP (*(.ctors))
-     ${CONSTRUCTING+${CTOR_END}}
-@@ -286,9 +285,8 @@ CTOR=".ctors        ${CONSTRUCTING-0} :
- DTOR=".dtors        ${CONSTRUCTING-0} :
-   {
-     ${CONSTRUCTING+${DTOR_START}}
--    KEEP (*crtbegin.o(.dtors))
--    KEEP (*crtbegin?.o(.dtors))
--    KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o $OTHER_EXCLUDE_FILES) .dtors))
-+    KEEP (*crtbegin*.o(.dtors))
-+    KEEP (*(EXCLUDE_FILE (*crtend*.o $OTHER_EXCLUDE_FILES) .dtors))
-     KEEP (*(SORT(.dtors.*)))
-     KEEP (*(.dtors))
-     ${CONSTRUCTING+${DTOR_END}}

cross/binutils-armhf/gold-mips.patch

@@ -1,39 +0,0 @@
-# DP: Fix gold on mips64 targets.
-
-gold/
-
-2016-08-09  Aurelien Jarno  <aurelien@aurel32.net>
-
-	* configure.tgt: Add mips64el*-*-*|mips64le*-*-* and mips64*-*-*.
-
- 
---- a/gold/configure.tgt
-+++ b/gold/configure.tgt
-@@ -153,6 +153,13 @@ aarch64*-*)
-  targ_big_endian=false
-  targ_extra_big_endian=true
-  ;;
-+mips*64*el*-*-*|mips*64*le*-*-*)
-+ targ_obj=mips
-+ targ_machine=EM_MIPS_RS3_LE
-+ targ_size=64
-+ targ_big_endian=false
-+ targ_extra_big_endian=true
-+ ;;
- mips*el*-*-*|mips*le*-*-*)
-  targ_obj=mips
-  targ_machine=EM_MIPS_RS3_LE
-@@ -160,6 +167,13 @@ mips*el*-*-*|mips*le*-*-*)
-  targ_big_endian=false
-  targ_extra_big_endian=true
-  ;;
-+mips*64*-*-*)
-+ targ_obj=mips
-+ targ_machine=EM_MIPS
-+ targ_size=64
-+ targ_big_endian=true
-+ targ_extra_big_endian=false
-+ ;;
- mips*-*-*)
-  targ_obj=mips
-  targ_machine=EM_MIPS

cross/binutils-armhf/ld-bfd-mips.patch

@@ -1,19 +0,0 @@
---- ./ld/configure.tgt.orig
-+++ ./ld/configure.tgt
-@@ -541,12 +541,12 @@
- 			;;
- mips*-*-windiss)	targ_emul=elf32mipswindiss
- 			;;
--mips64*el-*-linux-*)	targ_emul=elf32ltsmipn32
--			targ_extra_emuls="elf32btsmipn32 elf32ltsmip elf32btsmip elf64ltsmip elf64btsmip"
-+mips64*el-*-linux-*)	targ_emul=elf64ltsmip
-+			targ_extra_emuls="elf32ltsmipn32 elf32btsmipn32 elf32ltsmip elf32btsmip elf64btsmip"
- 			targ_extra_libpath=$targ_extra_emuls
- 			;;
--mips64*-*-linux-*)	targ_emul=elf32btsmipn32
--			targ_extra_emuls="elf32ltsmipn32 elf32btsmip elf32ltsmip elf64btsmip elf64ltsmip"
-+mips64*-*-linux-*)	targ_emul=elf64btsmip
-+			targ_extra_emuls="elf32btsmipn32 elf32ltsmipn32 elf32btsmip elf32ltsmip elf64ltsmip"
- 			targ_extra_libpath=$targ_extra_emuls
- 			;;
- mips*el-*-linux-*)	targ_emul=elf32ltsmip

cross/binutils-armv7/APKBUILD

@@ -3,8 +3,8 @@
 # Based on: main/binutils
 
 pkgname=binutils-armv7
-pkgver=2.35.1
-pkgrel=1
+pkgver=2.35.2
+pkgrel=2
 pkgdesc="Tools necessary to build programs for armv7 targets"
 url="https://www.gnu.org/software/binutils/"
 makedepends="gettext libtool autoconf automake bison texinfo"
@@ -15,9 +15,15 @@ source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz
 	gold-mips.patch
 	ld-bfd-mips.patch
 	0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
+	CVE-2021-3487.patch
+	binutils-mips-disable-assert.patch
 	"
 builddir="$srcdir/binutils-$pkgver"
 
+if [ "$CHOST" = "$CBUILD" ] && [ "$CBUILD" = "$CTARGET" ] && [ "$CTARGET_ARCH" != "riscv64" ]; then
+	subpackages=""
+fi
+
 if [ "$CHOST" != "$CTARGET" ]; then
 	pkgname="binutils-$CTARGET_ARCH"
 	subpackages=""
@@ -25,6 +31,8 @@ if [ "$CHOST" != "$CTARGET" ]; then
 fi
 
 # secfixes:
+#   2.35.2-r1:
+#     - CVE-2021-3487
 #   2.32-r0:
 #     - CVE-2018-19931
 #     - CVE-2018-19932
@@ -60,8 +68,12 @@ package() {
 
 
 
-sha512sums="94ff72708403413b70b247f3af4099ebaa882b6659249869f1ed9941a0f1912e313f08357d470f9fd2359e7f5e5b0eb86285e5eaf883fa8187789d6b1bd304eb  binutils-2.35.1.tar.xz
+sha512sums="
+9974ede5978d32e0d68fef23da48fa00bd06b0bff7ec45b00ca075c126d6bbe0cf2defc03ecc3f17bc6cc85b64271a13009c4049d7ba17de26e84e3a6e2c0348  binutils-2.35.2.tar.xz
 ecee33b0e435aa704af1c334e560f201638ff79e199aa11ed78a72f7c9b46f85fbb227af5748e735fd681d1965fcc42ac81b0c8824e540430ce0c706c81e8b49  binutils-ld-fix-static-linking.patch
 f55cf2e0bf82f97583a1abe10710e4013ecf7d64f1da2ef8659a44a06d0dd8beaf58dab98a183488ea137f03e32d62efc878d95f018f836f8cec870bc448556f  gold-mips.patch
 314d2ef9071c89940aa6c8118e8a1e2f191a5d0a4bf596da1ad9cc84f884d8bc7dea8bd7b9fc3f8f1bddd3fd41c6eb017e1e804044b3bf084df1ed9e6e095e2d  ld-bfd-mips.patch
-642c617db6c6e491f78f053d60f3aa369bad7bf8c1bc7ce267de6cf8fddf6c0d4cf63ce8c8f6e2f225dedbce7cb930d8e87e168fd8f72ca0837c77266ee2b5f8  0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch"
+642c617db6c6e491f78f053d60f3aa369bad7bf8c1bc7ce267de6cf8fddf6c0d4cf63ce8c8f6e2f225dedbce7cb930d8e87e168fd8f72ca0837c77266ee2b5f8  0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
+b08384ed124a74ad3a424db370c107230f09a54378502ca4385deb738f7cf799857f2af0db52709c7eeab8fa6c0a3d972f891396cce1e2834a21f67682fc4355  CVE-2021-3487.patch
+609cd90d8b334eb309f586b17b9d335a08d3dbb6def7c3eb5c010028fcb681674031e5b9d853aa7a39a50304356a86afc184b85562b3f228f8197f4d29395c8f  binutils-mips-disable-assert.patch
+"

cross/binutils-armv7/CVE-2021-3487.patch

@@ -0,0 +1,72 @@
+From 647cebce12a6b0a26960220caff96ff38978cf24 Mon Sep 17 00:00:00 2001
+From: Nick Clifton <nickc@redhat.com>
+Date: Thu, 26 Nov 2020 17:08:33 +0000
+Subject: [PATCH] Prevent a memory allocation failure when parsing corrupt
+ DWARF debug sections.
+
+	PR 26946
+	* dwarf2.c (read_section): Check for debug sections with excessive
+	sizes.
+
+diff --git a/bfd/dwarf2.c b/bfd/dwarf2.c
+index 977bf43a6a1..8bbfc81d3e7 100644
+--- a/bfd/dwarf2.c
++++ b/bfd/dwarf2.c
+@@ -531,22 +531,24 @@ read_section (bfd *	      abfd,
+ 	      bfd_byte **     section_buffer,
+ 	      bfd_size_type * section_size)
+ {
+-  asection *msec;
+   const char *section_name = sec->uncompressed_name;
+   bfd_byte *contents = *section_buffer;
+-  bfd_size_type amt;
+ 
+   /* The section may have already been read.  */
+   if (contents == NULL)
+     {
++      bfd_size_type amt;
++      asection *msec;
++      ufile_ptr filesize;
++
+       msec = bfd_get_section_by_name (abfd, section_name);
+-      if (! msec)
++      if (msec == NULL)
+ 	{
+ 	  section_name = sec->compressed_name;
+ 	  if (section_name != NULL)
+ 	    msec = bfd_get_section_by_name (abfd, section_name);
+ 	}
+-      if (! msec)
++      if (msec == NULL)
+ 	{
+ 	  _bfd_error_handler (_("DWARF error: can't find %s section."),
+ 			      sec->uncompressed_name);
+@@ -554,12 +556,23 @@ read_section (bfd *	      abfd,
+ 	  return FALSE;
+ 	}
+ 
+-      *section_size = msec->rawsize ? msec->rawsize : msec->size;
++      amt = bfd_get_section_limit_octets (abfd, msec);
++      filesize = bfd_get_file_size (abfd);
++      if (amt >= filesize)
++	{
++	  /* PR 26946 */
++	  _bfd_error_handler (_("DWARF error: section %s is larger than its filesize! (0x%lx vs 0x%lx)"),
++			      section_name, (long) amt, (long) filesize);
++	  bfd_set_error (bfd_error_bad_value);
++	  return FALSE;
++	}
++      *section_size = amt;
+       /* Paranoia - alloc one extra so that we can make sure a string
+ 	 section is NUL terminated.  */
+-      amt = *section_size + 1;
++      amt += 1;
+       if (amt == 0)
+ 	{
++	  /* Paranoia - this should never happen.  */
+ 	  bfd_set_error (bfd_error_no_memory);
+ 	  return FALSE;
+ 	}
+-- 
+2.27.0
+

cross/binutils-armv7/binutils-mips-disable-assert.patch

@@ -0,0 +1,14 @@
+diff -urN binutils-2.35.2.orig/bfd/elfxx-mips.c binutils-2.35.2/bfd/elfxx-mips.c
+--- binutils-2.35.2.orig/bfd/elfxx-mips.c	2021-01-30 01:38:03.000000000 -0700
++++ binutils-2.35.2/bfd/elfxx-mips.c	2021-05-13 17:35:34.706913601 -0600
+@@ -6744,8 +6744,10 @@
+      in the relocation.  */
+   if (h != NULL && ! SYMBOL_REFERENCES_LOCAL (info, &h->root))
+     {
++#if 0
+       BFD_ASSERT (htab->root.target_os == is_vxworks
+ 		  || h->global_got_area != GGA_NONE);
++#endif
+       indx = h->root.dynindx;
+       if (SGI_COMPAT (output_bfd))
+ 	defined_p = h->root.def_regular;

cross/busybox-static-aarch64/APKBUILD

@@ -7,11 +7,11 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi
 
 pkgname=busybox-static-aarch64
-pkgver=1.32.0
-pkgrel=7
+pkgver=1.33.1
+pkgrel=6
 
 _arch="aarch64"
-_mirror="http://dl-2.alpinelinux.org/alpine/"
+_mirror="http://dl-4.alpinelinux.org/alpine/"
 
 url="http://busybox.net"
 license="GPL2"
@@ -21,14 +21,16 @@ pkgdesc="Statically linked Busybox for $_arch"
 _target="$(arch_to_hostspec $_arch)"
 
 source="
-	busybox-static-$pkgver-r$pkgrel-$_arch-edge.apk::$_mirror/edge/main/$_arch/busybox-static-$pkgver-r$pkgrel.apk
+	busybox-static-$pkgver-r$pkgrel-$_arch-v3.14.apk::$_mirror/v3.14/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-edge.apk
+	tar -xf $srcdir/busybox-static-$pkgver-r$pkgrel-$_arch-v3.14.apk
 	rm .PKGINFO .SIGN.*
 }
 
-sha512sums="1eb1f0950d50d53848c63cf03481486435cb7b3b504307412e54e92361f8b103d0c57a97b003ba5c74e615cbd01118e4c25f419f195db345c94242cbad363dc5  busybox-static-1.32.0-r7-aarch64-edge.apk"
+sha512sums="
+399e8f54a17da7a53dad793fe4b006802add2eda33fd09ed41ae7caf57fddc8143855d0b740c1244356b7284882e37843ed240722042257d9b9e8d9220e0c6e4  busybox-static-1.33.1-r6-aarch64-v3.14.apk
+"

cross/busybox-static-armhf/APKBUILD

@@ -1,34 +0,0 @@
-# Automatically generated aport, do not edit!
-# Generator: pmbootstrap aportgen busybox-static-armhf
-
-# Stub for apkbuild-lint
-if [ -z "$(type -t arch_to_hostspec)" ]; then
-	arch_to_hostspec() { :; }
-fi
-
-pkgname=busybox-static-armhf
-pkgver=1.32.0
-pkgrel=7
-
-_arch="armhf"
-_mirror="http://dl-2.alpinelinux.org/alpine/"
-
-url="http://busybox.net"
-license="GPL2"
-arch="x86_64"
-options="!check !strip"
-pkgdesc="Statically linked Busybox for $_arch"
-_target="$(arch_to_hostspec $_arch)"
-
-source="
-	busybox-static-$pkgver-r$pkgrel-$_arch-edge.apk::$_mirror/edge/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-edge.apk
-	rm .PKGINFO .SIGN.*
-}
-
-sha512sums="f5ccbc2a5f46dabebccb68b5a2fa86bc225f4c243a755abb0673e2a5723962edf359f0d75acd20d0bae17f5e58a14cb00c60b6a22092face054c6105878b149b  busybox-static-1.32.0-r7-armhf-edge.apk"

cross/busybox-static-armv7/APKBUILD

@@ -7,11 +7,11 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi
 
 pkgname=busybox-static-armv7
-pkgver=1.32.0
-pkgrel=7
+pkgver=1.33.1
+pkgrel=6
 
 _arch="armv7"
-_mirror="http://dl-2.alpinelinux.org/alpine/"
+_mirror="http://dl-4.alpinelinux.org/alpine/"
 
 url="http://busybox.net"
 license="GPL2"
@@ -21,14 +21,16 @@ pkgdesc="Statically linked Busybox for $_arch"
 _target="$(arch_to_hostspec $_arch)"
 
 source="
-	busybox-static-$pkgver-r$pkgrel-$_arch-edge.apk::$_mirror/edge/main/$_arch/busybox-static-$pkgver-r$pkgrel.apk
+	busybox-static-$pkgver-r$pkgrel-$_arch-v3.14.apk::$_mirror/v3.14/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-edge.apk
+	tar -xf $srcdir/busybox-static-$pkgver-r$pkgrel-$_arch-v3.14.apk
 	rm .PKGINFO .SIGN.*
 }
 
-sha512sums="96db60049d4c7cd8d98dab7ff6a00243f44ccf17dfd85f55d763d3ac0276eb82a6e34e90129985ebdff5ac74ed8c8814b4b8750a41e1f2cc654b2ee7ee7650d0  busybox-static-1.32.0-r7-armv7-edge.apk"
+sha512sums="
+0fba79273b6f4c0a71a871600c96b23790379a72c4cd55b30fc07b438271495352deb6db031f535052f207fde19f35d2c540f0dd03b76ba4a8b1724e06afe625  busybox-static-1.33.1-r6-armv7-v3.14.apk
+"

cross/gcc-aarch64/0001-posix_memalign.patch

@@ -1,4 +1,4 @@
-From 61621c64caffb54ea82c5b573e55d16dcb732dea Mon Sep 17 00:00:00 2001
+From 00951a574e9698d8549cc5ea1793059849cab47f 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
@@ -38,5 +38,5 @@ index 87344d9383f..ece428df487 100644
    else
      return NULL;
 -- 
-2.29.2
+2.31.0
 

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

@@ -1,4 +1,4 @@
-From b6af6fd400def85c7f6933a991c888df16f12533 Mon Sep 17 00:00:00 2001
+From 0cd08ecfaf79062115dd12744068970502b99c01 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
@@ -26,7 +26,7 @@ Upstream-Status: Pending
  7 files changed, 68 insertions(+)
 
 diff --git a/gcc/common.opt b/gcc/common.opt
-index dfed6ec76ba..8bb65e0e1af 100644
+index ec5235c3a41..ca942863064 100644
 --- a/gcc/common.opt
 +++ b/gcc/common.opt
 @@ -682,6 +682,10 @@ Wreturn-local-addr
@@ -58,7 +58,7 @@ index 364eba47737..9551c0dfdf9 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 b4088d8fd1e..793530e21cf 100755
+index 8fe9c91fd7c..17b878e4b4e 100755
 --- a/gcc/configure
 +++ b/gcc/configure
 @@ -1010,6 +1010,7 @@ with_system_zlib
@@ -78,7 +78,7 @@ index b4088d8fd1e..793530e21cf 100755
    --enable-plugin         enable plugin support
    --enable-host-shared    build host code as shared libraries
    --disable-libquadmath-support
-@@ -30271,6 +30274,19 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then :
+@@ -30276,6 +30279,19 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then :
  fi
  
  
@@ -99,10 +99,10 @@ index b4088d8fd1e..793530e21cf 100755
  
  
 diff --git a/gcc/configure.ac b/gcc/configure.ac
-index 070b9c6c497..0fd438e39e5 100644
+index 84dceb8074a..bf64ffbe46f 100644
 --- a/gcc/configure.ac
 +++ b/gcc/configure.ac
-@@ -6605,6 +6605,16 @@ AC_ARG_ENABLE(version-specific-runtime-libs,
+@@ -6608,6 +6608,16 @@ AC_ARG_ENABLE(version-specific-runtime-libs,
                  [specify that runtime libraries should be
                   installed in a compiler-specific directory])])
  
@@ -120,7 +120,7 @@ index 070b9c6c497..0fd438e39e5 100644
  AC_SUBST(subdirs)
  AC_SUBST(srcdir)
 diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index 7775bcc72eb..034d3066c2b 100644
+index eabeec944e7..cd31b522e42 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
 @@ -348,6 +348,7 @@ Objective-C and Objective-C++ Dialects}.
@@ -199,5 +199,5 @@ index 8a2bda00f80..9098ab044ab 100644
  
  /* Use given -I paths for #include "..." but not #include <...>, and
 -- 
-2.29.2
+2.31.0
 

cross/gcc-aarch64/0003-Turn-on-Wl-z-relro-z-now-by-default.patch

@@ -1,4 +1,4 @@
-From 8e8955cbd60155d131d3ac66cb2a1e7e41835278 Mon Sep 17 00:00:00 2001
+From f0338445838d12a82c803c1579653332e2710157 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:45:49 +0000
 Subject: [PATCH] Turn on -Wl,-z,relro,-z,now by default.
@@ -9,7 +9,7 @@ Subject: [PATCH] Turn on -Wl,-z,relro,-z,now by default.
  2 files changed, 4 insertions(+)
 
 diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index 034d3066c2b..4885efe3247 100644
+index cd31b522e42..17d371ef432 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
 @@ -14663,6 +14663,9 @@ For example, @option{-Wl,-Map,output.map} passes @option{-Map output.map} to the
@@ -35,5 +35,5 @@ index b2200c5185a..625c9ab7902 100644
      %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!r:%{!nostartfiles:%S}}} \
      %{Wno-poison-system-directories:--no-poison-system-directories} \
 -- 
-2.29.2
+2.31.0
 

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

@@ -1,4 +1,4 @@
-From c5924988157b27b60c28d20d971179bbacbd2ae3 Mon Sep 17 00:00:00 2001
+From 6aa52d7bf25389177c389ea77eb477e7952d1154 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,
@@ -25,7 +25,7 @@ index db91a36794a..ed976c71404 100644
    if (flag_gnu89_inline)
      cpp_define (pfile, "__GNUC_GNU_INLINE__");
 diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index 4885efe3247..a3e5e002fa5 100644
+index 17d371ef432..fe793ac08db 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
 @@ -9230,6 +9230,12 @@ also turns on the following optimization flags:
@@ -42,5 +42,5 @@ index 4885efe3247..a3e5e002fa5 100644
  @opindex O3
  Optimize yet more.  @option{-O3} turns on all optimizations specified
 -- 
-2.29.2
+2.31.0
 

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

@@ -1,4 +1,4 @@
-From 5b8de466aa959a6c929cee2c78e4159a0209b4f8 Mon Sep 17 00:00:00 2001
+From 7b624ee24d9299889c35c84303811012f8b8f1d2 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,
@@ -265,5 +265,5 @@ index 625c9ab7902..7aec9d3a016 100644
  #else
  #define LIBUBSAN_SPEC "-lubsan" STATIC_LIBUBSAN_LIBS
 -- 
-2.29.2
+2.31.0
 

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

@@ -1,4 +1,4 @@
-From 7c79655102e756622211ca40384e8562be334973 Mon Sep 17 00:00:00 2001
+From 7eed1ed7399593864a097360f778e2409deb663c 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.
@@ -30,5 +30,5 @@ index c49da99d395..93f25319005 100644
  
  Wformat-overflow=
 -- 
-2.29.2
+2.31.0
 

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

@@ -1,4 +1,4 @@
-From 25eb9009f180c799647cfc81d27d8b67ba3f3b72 Mon Sep 17 00:00:00 2001
+From 63c5bf27194fbc27c6630f325b5d976aad87c5d5 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,7 +8,7 @@ Subject: [PATCH] Enable -Wtrampolines by default.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/gcc/common.opt b/gcc/common.opt
-index 8bb65e0e1af..ace932b300d 100644
+index ca942863064..0a0ab6195ee 100644
 --- a/gcc/common.opt
 +++ b/gcc/common.opt
 @@ -774,7 +774,7 @@ Common Var(warn_system_headers) Warning
@@ -21,5 +21,5 @@ index 8bb65e0e1af..ace932b300d 100644
  
  Wtype-limits
 -- 
-2.29.2
+2.31.0
 

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

@@ -1,4 +1,4 @@
-From cfa0c7a3154415fe0e0ab6bd373a8f2164024ff5 Mon Sep 17 00:00:00 2001
+From c28375576bd7ab89389c9208447a490596aa759f 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
@@ -49,5 +49,5 @@ index 4aec480798b..eaecfab37ad 100644
  
  -param=stack-clash-protection-guard-size=
 -- 
-2.29.2
+2.31.0
 

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

@@ -1,4 +1,4 @@
-From 4733bb8115411c50028f7a583783ac10c63e8536 Mon Sep 17 00:00:00 2001
+From 85baea39858509dacfc235396f6fbd79ac23d50d 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
@@ -50,5 +50,5 @@ index a0f84b0cfa0..ab24a47a2fd 100644
  
  all-local: all-local-$(USE_NLS)
 -- 
-2.29.2
+2.31.0
 

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

@@ -1,4 +1,4 @@
-From 7d4ee7a90b87edd33a7f628ff89ce1b1e0576b4d Mon Sep 17 00:00:00 2001
+From fb7d03c7ea97fc785327fd00b302c7ac17779837 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.
@@ -24,5 +24,5 @@ index 141cb886a85..fa0e78eb62f 100644
  /* Like asprintf but allocates memory without fail. This works like
     xmalloc.  */
 -- 
-2.29.2
+2.31.0
 

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

@@ -1,4 +1,4 @@
-From 84b959624e1371f1d02630b6e067f00f46dbe516 Mon Sep 17 00:00:00 2001
+From 07467a2a24bd15a6a28154a33441adc1291789d6 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
@@ -20,5 +20,5 @@ index d6b302e02fd..fd39928546f 100644
  	else true; fi
  
 -- 
-2.29.2
+2.31.0
 

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

@@ -1,4 +1,4 @@
-From 8ffd575380bc28aaf3c210ad838b205ce2403124 Mon Sep 17 00:00:00 2001
+From 07517ed455bf3f03b1be7a5c72d3705b22780a15 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,10 +8,10 @@ Subject: [PATCH] libitm: disable FORTIFY
  1 file changed, 10 insertions(+)
 
 diff --git a/libitm/configure.tgt b/libitm/configure.tgt
-index 04109160e91..107b957ece3 100644
+index d1beb5c9ec8..c2b50b95c01 100644
 --- a/libitm/configure.tgt
 +++ b/libitm/configure.tgt
-@@ -46,6 +46,16 @@ if test "$gcc_cv_have_tls" = yes ; then
+@@ -47,6 +47,16 @@ if test "$gcc_cv_have_tls" = yes ; then
    esac
  fi
  
@@ -29,5 +29,5 @@ index 04109160e91..107b957ece3 100644
  # work out any special compilation flags as necessary.
  case "${target_cpu}" in
 -- 
-2.29.2
+2.31.0
 

cross/gcc-aarch64/0013-libgcc_s.patch

@@ -1,4 +1,4 @@
-From 0d83ea67b2e16658a88068ebce0e25cce22fe75e Mon Sep 17 00:00:00 2001
+From b74afde10094923279a408ff56ea99cff6c259ae 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
@@ -10,10 +10,10 @@ Subject: [PATCH] libgcc_s
  3 files changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/gcc/config/i386/i386-expand.c b/gcc/config/i386/i386-expand.c
-index c6033688f51..a60e5162995 100644
+index 47d52550e5e..9cb8cc7950e 100644
 --- a/gcc/config/i386/i386-expand.c
 +++ b/gcc/config/i386/i386-expand.c
-@@ -10966,10 +10966,10 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget,
+@@ -10976,10 +10976,10 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget,
      {
      case IX86_BUILTIN_CPU_INIT:
        {
@@ -27,10 +27,10 @@ index c6033688f51..a60e5162995 100644
  	return expand_expr (call_expr, target, mode, EXPAND_NORMAL);
        }
 diff --git a/libgcc/config/i386/cpuinfo.c b/libgcc/config/i386/cpuinfo.c
-index cf5f0884bb4..ed0381e7744 100644
+index 83301a1445f..89fdc7eb587 100644
 --- a/libgcc/config/i386/cpuinfo.c
 +++ b/libgcc/config/i386/cpuinfo.c
-@@ -510,7 +510,7 @@ __cpu_indicator_init (void)
+@@ -516,7 +516,7 @@ __cpu_indicator_init (void)
    return 0;
  }
  
@@ -53,5 +53,5 @@ index 8506a635790..564296f788e 100644
 +HOST_LIBGCC2_CFLAGS += -mlong-double-80 $(CET_FLAGS)
  CRTSTUFF_T_CFLAGS += $(CET_FLAGS)
 -- 
-2.29.2
+2.31.0
 

cross/gcc-aarch64/0014-nopie.patch

@@ -1,4 +1,4 @@
-From 99ccc2d68049c56519d49e21b6f13cf8d98ea163 Mon Sep 17 00:00:00 2001
+From e73096ae33c1ebf2833deab647ca825229c533f1 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 793530e21cf..2d874d3defe 100755
+index 17b878e4b4e..808570b6c99 100755
 --- a/gcc/configure
 +++ b/gcc/configure
-@@ -30779,6 +30779,33 @@ fi
+@@ -30784,6 +30784,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 793530e21cf..2d874d3defe 100755
  
  
 diff --git a/gcc/configure.ac b/gcc/configure.ac
-index 0fd438e39e5..0b257e687ee 100644
+index bf64ffbe46f..9c2571de709 100644
 --- a/gcc/configure.ac
 +++ b/gcc/configure.ac
-@@ -6863,6 +6863,19 @@ AC_CACHE_CHECK([for -no-pie option],
+@@ -6866,6 +6866,19 @@ AC_CACHE_CHECK([for -no-pie option],
     LDFLAGS="$saved_LDFLAGS"])
  if test "$gcc_cv_no_pie" = "yes"; then
    NO_PIE_FLAG="-no-pie"
@@ -71,5 +71,5 @@ index 0fd438e39e5..0b257e687ee 100644
  AC_SUBST([NO_PIE_FLAG])
  
 -- 
-2.29.2
+2.31.0
 

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

@@ -1,4 +1,4 @@
-From a5a7decc1944cf6831eebc10d71a52ef8496bff5 Mon Sep 17 00:00:00 2001
+From d56bf713ed0d248fccb445ac475ad69d9430bb96 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
@@ -21,5 +21,5 @@ index 721ff00ea43..22a699c6340 100644
     with both write and execute permission.  Code compiled when this
     option is defined will attempt to map such pages once, but if it
 -- 
-2.29.2
+2.31.0
 

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

@@ -1,4 +1,4 @@
-From 3554a4b751acce2a4f432d1bb24d9fc69a916889 Mon Sep 17 00:00:00 2001
+From 6175b540b25a9d899772a7354a6ac2ae77c311ae 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
@@ -421,5 +421,5 @@ index e6cce240fd5..bd2fe37ebec 100644
  }
  
 -- 
-2.29.2
+2.31.0
 

cross/gcc-aarch64/0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch

@@ -1,4 +1,4 @@
-From abf18c3f7d908f8f4a365bd4d8f9a4743f1d8f0c Mon Sep 17 00:00:00 2001
+From 578f3d719c1154a38a5cf84217e3cb124da45ad8 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:58:22 +0000
 Subject: [PATCH] dlang: fix fcntl on mips, add libucontext dep
@@ -47,5 +47,5 @@ index 9febcff849b..cb34e2108bd 100644
          static assert(0, "Platform not supported");
  
 -- 
-2.29.2
+2.31.0
 

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

@@ -1,4 +1,4 @@
-From 277c3317929f41e514632d29ff00354c511deb0e Mon Sep 17 00:00:00 2001
+From b3bcc4fc43170f9914772c543778560c5e473fae 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
@@ -38,5 +38,5 @@ index 02c413a412f..f0e52a87d6e 100644
  unsigned char __gnat_objlist_file_supported = 1;
  const char *__gnat_object_library_extension = ".a";
 -- 
-2.29.2
+2.31.0
 

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

@@ -1,4 +1,4 @@
-From b1e3ea43462684675cc4f75c2ca4e984a6d511fb Mon Sep 17 00:00:00 2001
+From e85513f5bb1884b60d0e261e23366c3291b50d67 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
@@ -20,5 +20,5 @@ index 36e369df6e7..63627db68cf 100644
  
  # This is the list of directories to built for the host system.
 -- 
-2.29.2
+2.31.0
 

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

@@ -1,4 +1,4 @@
-From ea75db47e243b59e7cf793623a87295c0d2aada2 Mon Sep 17 00:00:00 2001
+From ba67e2205fb47afeb91c7c2ee575e426c0629845 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
@@ -21,5 +21,5 @@ index 95654bcdb5a..d88df8f154a 100644
      { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 0 },
  #else
 -- 
-2.29.2
+2.31.0
 

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

@@ -1,4 +1,4 @@
-From 42637405a9cf90d96627406c72dbaf19cca34164 Mon Sep 17 00:00:00 2001
+From 76a7d4998303fe4229c814ea87621af94cb26f08 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
@@ -27,5 +27,5 @@ index daeb4d0c8ea..6920bec0fa0 100644
  #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
  		       "|fstack-protector-strong|fstack-protector-explicit" \
 -- 
-2.29.2
+2.31.0
 

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

@@ -1,4 +1,4 @@
-From 64f209a51a7277d778c196c31c58422a04a69238 Mon Sep 17 00:00:00 2001
+From 81735c7800b3369361c40103d6d479239fa779d7 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
@@ -65,5 +65,5 @@ index 6920bec0fa0..40e07354b3d 100644
  #else
  #define LIBUBSAN_SPEC "-lubsan" STATIC_LIBUBSAN_LIBS
 -- 
-2.29.2
+2.31.0
 

cross/gcc-aarch64/0023-Pure-64-bit-MIPS.patch

@@ -1,4 +1,4 @@
-From a57f530ace0ce215b1d6e2073223f05417ca2ed4 Mon Sep 17 00:00:00 2001
+From bd3e178619a7d45b2b22141a2b83f67bc27b229a 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] Pure 64-bit MIPS
@@ -43,5 +43,5 @@ index ceb58d3b5f3..8116e23ebba 100644
 +        ../lib32 \
 +        ../lib
 -- 
-2.29.2
+2.31.0
 

cross/gcc-aarch64/0024-use-pure-64-bit-configuration-where-appropriate.patch

@@ -1,4 +1,4 @@
-From 4571e0787fc992d647991e64a64d2b9c82e9a0e6 Mon Sep 17 00:00:00 2001
+From d5e2025be98fd345549d41067eac3fd3fe201a4e Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 07:04:40 +0000
 Subject: [PATCH] use pure 64-bit configuration where appropriate
@@ -117,5 +117,5 @@ index cc6ab367072..7f498ee1cdc 100644
 +MULTILIB_OSDIRNAMES = m64=../lib
 +MULTILIB_OSDIRNAMES+= m32=../lib32
 -- 
-2.29.2
+2.31.0
 

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

@@ -1,4 +1,4 @@
-From a1fb957dd7fe9a8dd99d256d7b0a676f87a9d80c Mon Sep 17 00:00:00 2001
+From 6a51ad76380daed31a4eadcee844647452ce6dfd 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
@@ -47,5 +47,5 @@ index 851e7657d07..99ec513a1a6 100644
  	for file in $$parts; do					\
  	  rm -f $(DESTDIR)$(inst_libdir)/$$file;		\
 -- 
-2.29.2
+2.31.0
 

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

@@ -1,4 +1,4 @@
-From 3a0a3d3843edd30ce72c96a40caa9e1334233558 Mon Sep 17 00:00:00 2001
+From 4ce9b92262575e2484836fb9bffca08be99b9a4b 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,7 +9,7 @@ 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 80cb2b2a793..701b7a3aeab 100644
+index ef449af33d1..bd7312e6686 100644
 --- a/gcc/ada/libgnarl/s-osinte__linux.ads
 +++ b/gcc/ada/libgnarl/s-osinte__linux.ads
 @@ -399,12 +399,6 @@ package System.OS_Interface is
@@ -131,5 +131,5 @@ index c45559e5ba0..0b0f173e7d4 100644
  
              pragma Assert (Result in 0 | ENOMEM);
 -- 
-2.29.2
+2.31.0
 

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

@@ -1,4 +1,4 @@
-From d0716e14d5bd652a7e21d0e3c75ea8ed32e6b4c7 Mon Sep 17 00:00:00 2001
+From 61c266f5703b9032fc2afaa98756f89cfe62d897 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
@@ -219,5 +219,5 @@ index af4417fab90..bab6bf3ca87 100644
    status = openpty (&master_fd, &slave_fd, NULL, NULL, NULL);
  #elif defined (USE_CLONE_DEVICE)
 -- 
-2.29.2
+2.31.0
 

cross/gcc-aarch64/0028-gcc-go-Use-_off_t-type-instead-of-_loff_t.patch

@@ -1,4 +1,4 @@
-From e30511caa0046a09e09d08e01541ee89ebbf56f3 Mon Sep 17 00:00:00 2001
+From e4d804bdeb899b4a1d6539a3ad1404ad417f6abc Mon Sep 17 00:00:00 2001
 From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
 Date: Sun, 30 Aug 2020 17:58:08 +0200
 Subject: [PATCH] gcc-go: Use _off_t type instead of _loff_t
@@ -44,5 +44,5 @@ index 88286c07b6e..f8f5cfb5011 100644
  	}
  	n, err = splice(rfd, plroff, wfd, plwoff, len, flags)
 -- 
-2.29.2
+2.31.0
 

cross/gcc-aarch64/0029-gcc-go-Don-t-include-sys-user.h.patch

@@ -1,4 +1,4 @@
-From dd4c21ab43314e9dd6853f4157c0b2f530b46a3e Mon Sep 17 00:00:00 2001
+From e04850ade73b4e9de9e95438f80bb4c0325168d8 Mon Sep 17 00:00:00 2001
 From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
 Date: Sun, 30 Aug 2020 17:58:21 +0200
 Subject: [PATCH] gcc-go: Don't include sys/user.h
@@ -26,5 +26,5 @@ index 0692fd41eb7..c8d987358d9 100644
  #include <sys/utsname.h>
  #endif
 -- 
-2.29.2
+2.31.0
 

cross/gcc-aarch64/0030-gcc-go-Fix-ucontext_t-on-PPC64.patch

@@ -1,4 +1,4 @@
-From 9f85680c5e156d7ac95260e43bc06fe52468bb6e Mon Sep 17 00:00:00 2001
+From dee0f4faec19854beee5e258e91e40544fead83d Mon Sep 17 00:00:00 2001
 From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
 Date: Sun, 30 Aug 2020 17:59:22 +0200
 Subject: [PATCH] gcc-go: Fix ucontext_t on PPC64
@@ -25,5 +25,5 @@ index b429fdb2403..fd1c885f043 100644
  	ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.jmp_context.iar;
  #elif defined(__aarch64__) && defined(__linux__)
 -- 
-2.29.2
+2.31.0
 

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

@@ -1,4 +1,4 @@
-From e8162b88725980771aaf473353a7a684aa31e974 Mon Sep 17 00:00:00 2001
+From 7c91fa8d1061a7dfe29081449cab03b8a3eae27f 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
@@ -39,5 +39,5 @@ index 11e4ec436bd..fe866eacb27 100644
  
  if test "${GOOS}" = "aix"; then
 -- 
-2.29.2
+2.31.0
 

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

@@ -1,4 +1,4 @@
-From e52442cf9860963ce5d896436efaa032f9d03d86 Mon Sep 17 00:00:00 2001
+From 2b990c08be4548705261e067233f798520a6ace0 Mon Sep 17 00:00:00 2001
 From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
 Date: Sun, 30 Aug 2020 18:01:03 +0200
 Subject: [PATCH] gcc-go: Use int64 type as offset argument for mmap
@@ -34,5 +34,5 @@ index ba38ebaa9ab..3c9e5ce9461 100644
  	if uintptr(p) == _MAP_FAILED {
  		return nil, errno()
 -- 
-2.29.2
+2.31.0
 

cross/gcc-aarch64/0033-gcc-go-Fix-st_-a-m-c-tim-fields-in-generated-sysinfo.patch

@@ -1,4 +1,4 @@
-From d374c7d1d9f6fab654a5ece60a7ea74aeaf90970 Mon Sep 17 00:00:00 2001
+From d42dbc871f149f658b6c3379bbc531efe427253b Mon Sep 17 00:00:00 2001
 From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
 Date: Sun, 30 Aug 2020 18:02:28 +0200
 Subject: [PATCH] gcc-go: Fix st_{a,m,c}tim fields in generated sysinfo.go
@@ -33,5 +33,5 @@ index bd2ba32cba1..972e2c379bc 100755
           -e 's/\([^a-zA-Z0-9_]\)_timespec_t\([^a-zA-Z0-9_]\)/\1Timespec\2/g' \
           -e 's/\([^a-zA-Z0-9_]\)_st_timespec_t\([^a-zA-Z0-9_]\)/\1StTimespec\2/g' \
 -- 
-2.29.2
+2.31.0
 

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

@@ -1,4 +1,4 @@
-From 03365f764ffe09acbfaa08ede12c48d5cbafe37f Mon Sep 17 00:00:00 2001
+From aecc0619fab1b89a88bda30080417c0ddbb5d2aa 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
@@ -25,5 +25,5 @@ index c555712a03c..9e228580d37 100644
  		}
  		throw("sigaction read failure")
 -- 
-2.29.2
+2.31.0
 

cross/gcc-aarch64/0035-gcc-go-Prefer-_off_t-over-_off64_t.patch

@@ -1,4 +1,4 @@
-From 8f432a1e00956bc2fcb6242571860a69fb32131d Mon Sep 17 00:00:00 2001
+From c988692ec6b151541088b1b48a29d6a54269f55c 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:26:53 +0200
 Subject: [PATCH] gcc-go: Prefer _off_t over _off64_t
@@ -26,5 +26,5 @@ index 972e2c379bc..8d6da15f983 100755
  echo "type Pid_t _pid_t" >> ${OUT}
  echo "type Uid_t _uid_t" >> ${OUT}
 -- 
-2.29.2
+2.31.0
 

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

@@ -1,4 +1,4 @@
-From 8438932b8a20156459589e9d6b3fcf11989db0e8 Mon Sep 17 00:00:00 2001
+From f634ef3142f759c8220830b77487fe9686ee0f61 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
@@ -8,7 +8,7 @@ Subject: [PATCH] gcc-go: undef SETCONTEXT_CLOBBERS_TLS in proc.c
  1 file changed, 4 insertions(+)
 
 diff --git a/libgo/runtime/proc.c b/libgo/runtime/proc.c
-index 274ce01c0bf..92a540bdde9 100644
+index 6f7d2e27996..5afd7902497 100644
 --- a/libgo/runtime/proc.c
 +++ b/libgo/runtime/proc.c
 @@ -66,6 +66,10 @@ static void gscanstack(G*);
@@ -23,5 +23,5 @@ index 274ce01c0bf..92a540bdde9 100644
  
  static inline void
 -- 
-2.29.2
+2.31.0
 

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

@@ -1,4 +1,4 @@
-From 31375289a4c1a0f32c97ae3d73ab950014729392 Mon Sep 17 00:00:00 2001
+From 13f05ade4843b355a96d72cf3464694e5eca641e 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
@@ -21,5 +21,5 @@ index 63627db68cf..c7f1f84d683 100644
  	  --srcdir=$${topdir}/$$module_srcdir \
  	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
 -- 
-2.29.2
+2.31.0
 

cross/gcc-aarch64/0038-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch

@@ -1,4 +1,4 @@
-From 84fb75f5e30bfde3a076564f566d2f85caf5e6dd Mon Sep 17 00:00:00 2001
+From 6fb1014e9a20deb8c634fc12dd9a146a800e6b70 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
 Date: Mon, 31 Aug 2020 20:26:56 +0200
 Subject: [PATCH] gcc-go: Disable printing of unaccessible ppc64 struct members
@@ -22,5 +22,5 @@ index fd1c885f043..e845e453332 100644
  		mcontext_t *m = &((ucontext_t*)(context))->uc_mcontext;
  		int i;
 -- 
-2.29.2
+2.31.0
 

cross/gcc-aarch64/0039-CRuntime_Musl-Support-v1.2.0-for-32-bits.patch

@@ -1,4 +1,4 @@
-From a3ed90c4579725a21f3375a8fe0abb626be7c250 Mon Sep 17 00:00:00 2001
+From ae168d35da22feaa01f9f77f7b578aa05cd50c96 Mon Sep 17 00:00:00 2001
 From: Geod24 <pro.mathias.lang@gmail.com>
 Date: Mon, 16 Nov 2020 18:40:46 +0100
 Subject: [PATCH] CRuntime_Musl: Support v1.2.0 for 32 bits
@@ -49,5 +49,5 @@ index 451c8b4fccc..ca654fbe424 100644
      alias c_ulong    pthread_t;
      version (D_LP64)
 -- 
-2.29.2
+2.31.0
 

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

@@ -0,0 +1,269 @@
+From bfb6df1638635136c4fd8960575331476fb68d04 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
+ LINK_GCC_C_SEQUENCE_SPEC [PR81358]
+
+This fixes issues with RISC-V.
+---
+ Makefile.in           |  1 +
+ gcc/config.in         |  6 ++++++
+ gcc/config/gnu-user.h | 12 +++++++++++-
+ gcc/configure         | 34 ++++++++++++++++++++++++++++++++--
+ gcc/configure.ac      | 23 ++++++++++++++++++++++-
+ gcc/doc/install.texi  |  8 ++++++++
+ gcc/doc/tm.texi       |  8 +++++++-
+ gcc/doc/tm.texi.in    |  8 +++++++-
+ gcc/gcc.c             | 12 +++++++++++-
+ 9 files changed, 105 insertions(+), 7 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index c7f1f84d683..cb3983ca547 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -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; \
++	TARGET_CONFIGDIRS="$(TARGET_CONFIGDIRS)"; export TARGET_CONFIGDIRS; \
+ 	HOST_LIBS="$(STAGE1_LIBS)"; export HOST_LIBS; \
+ 	GMPLIBS="$(HOST_GMPLIBS)"; export GMPLIBS; \
+ 	GMPINC="$(HOST_GMPINC)"; export GMPINC; \
+diff --git a/gcc/config.in b/gcc/config.in
+index 9551c0dfdf9..c8ca910df8a 100644
+--- a/gcc/config.in
++++ b/gcc/config.in
+@@ -106,6 +106,12 @@
+ #endif
+ 
+ 
++/* Define if libatomic should always be linked. */
++#ifndef USED_FOR_TARGET
++#undef ENABLE_AUTOLINK_LIBATOMIC
++#endif
++
++
+ /* Define to 1 to specify that we are using the BID decimal floating point
+    format instead of DPD */
+ #ifndef USED_FOR_TARGET
+diff --git a/gcc/config/gnu-user.h b/gcc/config/gnu-user.h
+index 7f30c363e4a..246698bfea5 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
+ #define LINK_EH_SPEC "%{!static|static-pie:--eh-frame-hdr} "
+ #endif
+ 
++#if !defined(LINK_LIBATOMIC_SPEC) && defined(ENABLE_AUTOLINK_LIBATOMIC)
++#  ifdef LD_AS_NEEDED_OPTION
++#    define LINK_LIBATOMIC_SPEC LD_AS_NEEDED_OPTION " -latomic " LD_NO_AS_NEEDED_OPTION
++#  else
++#    define LINK_LIBATOMIC_SPEC "-latomic"
++#  endif
++#elif !defined(LINK_LIBATOMIC_SPEC)
++#  define LINK_LIBATOMIC_SPEC ""
++#endif
++
+ #define GNU_USER_TARGET_LINK_GCC_C_SEQUENCE_SPEC \
+-  "%{static|static-pie:--start-group} %G %{!nolibc:%L} \
++  "%{static|static-pie:--start-group} %G %{!nolibc:" LINK_LIBATOMIC_SPEC " %L} \
+    %{static|static-pie:--end-group}%{!static:%{!static-pie:%G}}"
+ 
+ #undef LINK_GCC_C_SEQUENCE_SPEC
+diff --git a/gcc/configure b/gcc/configure
+index 808570b6c99..6c1e95e0444 100755
+--- a/gcc/configure
++++ b/gcc/configure
+@@ -969,6 +969,7 @@ with_documentation_root_url
+ with_changes_root_url
+ enable_languages
+ with_multilib_list
++enable_autolink_libatomic
+ with_zstd
+ with_zstd_include
+ with_zstd_lib
+@@ -1695,6 +1696,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
++  --enable-autolink-libatomic
++                          enable automatic linking of libatomic (ignored if
++                          not built)
+   --disable-rpath         do not hardcode runtime library paths
+   --enable-sjlj-exceptions
+                           arrange to use setjmp/longjmp exception handling
+@@ -8009,6 +8013,33 @@ else
+ fi
+ 
+ 
++# If libatomic is available, whether it should be linked automatically
++# Check whether --enable-autolink-libatomic was given.
++if test "${enable_autolink_libatomic+set}" = set; then :
++  enableval=$enable_autolink_libatomic;
++  case $enable_autolink_libatomic in
++    yes | no) ;;
++    *) as_fn_error $? "'$enable_autolink_libatomic' is an invalid value for
++--enable-autolink-libatomic.  Valid choices are 'yes' and 'no'." "$LINENO" 5 ;;
++  esac
++
++else
++  enable_autolink_libatomic=''
++fi
++
++
++if test x$enable_autolink_libatomic = xyes; then
++  if echo " ${TARGET_CONFIGDIRS} " | grep " libatomic " > /dev/null 2>&1 ; then
++
++$as_echo "#define ENABLE_AUTOLINK_LIBATOMIC 1" >>confdefs.h
++
++  else
++    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libatomic is not build for this target, --enable-autolink-libatomic ignored" >&5
++$as_echo "$as_me: WARNING: libatomic is not build for this target, --enable-autolink-libatomic ignored" >&2;}
++  fi
++fi
++
++
+ # -------------------------
+ # Checks for other programs
+ # -------------------------
+@@ -19131,7 +19162,7 @@ else
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 19131 "configure"
++#line 19158 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -32267,4 +32298,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 9c2571de709..52fd6d8fe06 100644
+--- a/gcc/configure.ac
++++ b/gcc/configure.ac
+@@ -1110,6 +1110,28 @@ AC_ARG_WITH(multilib-list,
+ :,
+ with_multilib_list=default)
+ 
++# If libatomic is available, whether it should be linked automatically
++AC_ARG_ENABLE(autolink-libatomic,
++[AS_HELP_STRING([--enable-autolink-libatomic],
++		[enable automatic linking of libatomic (ignored if not built)])],
++[
++  case $enable_autolink_libatomic in
++    yes | no) ;;
++    *) AC_MSG_ERROR(['$enable_autolink_libatomic' is an invalid value for
++--enable-autolink-libatomic.  Valid choices are 'yes' and 'no'.]) ;;
++  esac
++], [enable_autolink_libatomic=''])
++
++if test x$enable_autolink_libatomic = xyes; then
++  if echo " ${TARGET_CONFIGDIRS} " | grep " libatomic " > /dev/null 2>&1 ; then
++    AC_DEFINE(ENABLE_AUTOLINK_LIBATOMIC, 1,
++	[Define if libatomic should always be linked.])
++  else
++    AC_MSG_WARN([libatomic is not build for this target, --enable-autolink-libatomic ignored])
++  fi
++fi
++
++
+ # -------------------------
+ # Checks for other programs
+ # -------------------------
+@@ -6945,4 +6967,3 @@ done
+ ], 
+ [subdirs='$subdirs'])
+ AC_OUTPUT
+-
+diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi
+index 7d98ec4190a..a58d5a05be2 100644
+--- a/gcc/doc/install.texi
++++ b/gcc/doc/install.texi
+@@ -2169,6 +2169,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}.
+ 
++@item --enable-autolink-libatomic
++@itemx --disable-autolink-libatomic
++Tell GCC that it should automatically link libatomic; if supported by
++the linker, the file is only linked as needed. This flag is ignored
++when libatomic is not built. Note that this conigure flag is in particular
++useful when building an offloading-target compiler; as for those, a
++user had to specify @code{-foffload=target=-latomic} otherwise.
++
+ @item --with-glibc-version=@var{major}.@var{minor}
+ Tell GCC that when the GNU C Library (glibc) is used on the target it
+ will be version @var{major}.@var{minor} or later.  Normally this can
+diff --git a/gcc/doc/tm.texi b/gcc/doc/tm.texi
+index fcb7245e95c..67b485e8d0c 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.
+ 
+ @defmac LINK_GCC_C_SEQUENCE_SPEC
+ The sequence in which libgcc and libc are specified to the linker.
+-By default this is @code{%G %L %G}.
++By default this is @code{%G LINK_LIBATOMIC_SPEC %L %G}.
++@end defmac
++
++@defmac LINK_LIBATOMIC_SPEC
++This macro is used in the default @code{LINK_GCC_C_SEQUENCE_SPEC} to link
++libatomic. By default, it is unset unless @code{ENABLE_AUTOLINK_LIBATOMIC}
++is set.
+ @end defmac
+ 
+ @defmac POST_LINK_SPEC
+diff --git a/gcc/doc/tm.texi.in b/gcc/doc/tm.texi.in
+index c17209daa51..3ec63f6d091 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.
+ 
+ @defmac LINK_GCC_C_SEQUENCE_SPEC
+ The sequence in which libgcc and libc are specified to the linker.
+-By default this is @code{%G %L %G}.
++By default this is @code{%G LINK_LIBATOMIC_SPEC %L %G}.
++@end defmac
++
++@defmac LINK_LIBATOMIC_SPEC
++This macro is used in the default @code{LINK_GCC_C_SEQUENCE_SPEC} to link
++libatomic. By default, it is unset unless @code{ENABLE_AUTOLINK_LIBATOMIC}
++is set.
+ @end defmac
+ 
+ @defmac POST_LINK_SPEC
+diff --git a/gcc/gcc.c b/gcc/gcc.c
+index 40e07354b3d..81bd50b4d7c 100644
+--- a/gcc/gcc.c
++++ b/gcc/gcc.c
+@@ -877,13 +877,23 @@ proper position among the other output files.  */
+ # define ASM_DEBUG_SPEC ""
+ #endif
+ 
++#if !defined(LINK_LIBATOMIC_SPEC) && defined(ENABLE_AUTOLINK_LIBATOMIC)
++#  ifdef LD_AS_NEEDED_OPTION
++#    define LINK_LIBATOMIC_SPEC LD_AS_NEEDED_OPTION " -latomic " LD_NO_AS_NEEDED_OPTION
++#  else
++#    define LINK_LIBATOMIC_SPEC "-latomic"
++#  endif
++#elif !defined(LINK_LIBATOMIC_SPEC)
++#  define LINK_LIBATOMIC_SPEC ""
++#endif
++
+ /* Here is the spec for running the linker, after compiling all files.  */
+ 
+ /* This is overridable by the target in case they need to specify the
+    -lgcc and -lc order specially, yet not require them to override all
+    of LINK_COMMAND_SPEC.  */
+ #ifndef LINK_GCC_C_SEQUENCE_SPEC
+-#define LINK_GCC_C_SEQUENCE_SPEC "%G %{!nolibc:%L %G}"
++#define LINK_GCC_C_SEQUENCE_SPEC "%G %{!nolibc:" LINK_LIBATOMIC_SPEC " %L %G}"
+ #endif
+ 
+ #ifdef ENABLE_DEFAULT_SSP
+-- 
+2.31.0
+

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

@@ -0,0 +1,48 @@
+From 3bc47945dab0108423dbaa211332817c4784b3db 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
+
+glibc provides two version of strerror_r() depending on a feature test
+macro. The first is the XSI-compliant version which returns an int, the
+second is GNU-specific and returns a char pointer.
+
+Similarity, gcc's libgo provides two implementations of Errstr() both of
+which use strerror_r(). On Linux, it is assumed that the GNU-specific
+strerror_r version is used. However, musl only provides the
+XSI-compliant version of strerror_r. This patch enables the generic
+Errstr() implementation which also uses the XSI-compliant version of
+strerror_r.
+---
+ libgo/go/syscall/errstr.go       | 1 -
+ libgo/go/syscall/errstr_glibc.go | 2 +-
+ 2 files changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/libgo/go/syscall/errstr.go b/libgo/go/syscall/errstr.go
+index 6c2441d364d..8f7c5538163 100644
+--- a/libgo/go/syscall/errstr.go
++++ b/libgo/go/syscall/errstr.go
+@@ -5,7 +5,6 @@
+ // license that can be found in the LICENSE file.
+ 
+ // +build !hurd
+-// +build !linux
+ 
+ package syscall
+ 
+diff --git a/libgo/go/syscall/errstr_glibc.go b/libgo/go/syscall/errstr_glibc.go
+index 5b19e6f202d..8dc60172186 100644
+--- a/libgo/go/syscall/errstr_glibc.go
++++ b/libgo/go/syscall/errstr_glibc.go
+@@ -7,7 +7,7 @@
+ // We use this rather than errstr.go because on GNU/Linux sterror_r
+ // returns a pointer to the error message, and may not use buf at all.
+ 
+-// +build hurd linux
++// +build hurd !linux
+ 
+ package syscall
+ 
+-- 
+2.31.0
+

cross/gcc-aarch64/APKBUILD

@@ -24,14 +24,14 @@ CBUILDROOT="/"
 _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"
 
 pkgname=gcc-aarch64
-_pkgbase=10.2.1
-pkgver=10.2.1_pre1
+_pkgbase=10.3.1
+pkgver=10.3.1_git20210424
 [ "$BOOTSTRAP" = "nolibc" ] && pkgname="gcc-pass2"
 [ "$CBUILD" != "$CHOST" ] && _cross="-$CARCH" || _cross=""
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname=gcc-aarch64
-pkgrel=1
+pkgrel=2
 pkgdesc="Stage2 cross-compiler for aarch64"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -116,12 +116,16 @@ fi
 
 # GDC hasn't been ported to PowerPC
 # See libphobos/configure.tgt in GCC sources for supported targets
-[ "$CARCH" = ppc64le ] && LANG_D=false
+# riscv fails with: error: static assert  "unimplemented"
+case "$CARCH" in
+ppc64le|riscv64)	LANG_D=false ;;
+esac
 
 # libitm has TEXTRELs in ARM build, so disable for now
 case "$CTARGET_ARCH" in
 arm*)		_libitm=false ;;
 mips*)		_libitm=false ;;
+riscv64)	_libitm=false ;;
 esac
 
 # Internal libffi fails to build on MIPS at the moment, need to
@@ -148,6 +152,11 @@ if $_libgomp; then
 	subpackages="$subpackages libgomp::$CTARGET_ARCH"
 fi
 
+case "$CARCH" in
+riscv64)
+LANG_ADA=false;;
+esac
+
 _languages=c
 if $LANG_CXX; then
 	_languages="$_languages,c++"
@@ -170,7 +179,7 @@ if $LANG_FORTRAN; then
 	_languages="$_languages,fortran"
 fi
 if $LANG_ADA; then
-	subpackages="$subpackages libgnat::$CTARGET_ARCH gcc-gnat$_target:gnat"
+	subpackages="$subpackages libgnat-static:libgnatstatic:$CTARGET_ARCH libgnat::$CTARGET_ARCH gcc-gnat$_target:gnat"
 	_languages="$_languages,ada"
 	[ "$CBUILD" = "$CTARGET" ] && makedepends_build="$makedepends_build gcc-gnat-bootstrap"
 	[ "$CBUILD" != "$CTARGET" ] && makedepends_build="$makedepends_build gcc-gnat gcc-gnat$_cross"
@@ -223,7 +232,9 @@ source="https://dev.alpinelinux.org/~nenolod/gcc-${pkgver}.tar.xz
 	0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
 	0037-gcc-go-link-to-libucontext.patch
 	0038-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
-	0040-CRuntime_Musl-Support-v1.2.0-for-32-bits.patch
+	0039-CRuntime_Musl-Support-v1.2.0-for-32-bits.patch
+	0040-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
+	0041-Use-generic-errstr.go-implementation-on-musl.patch
 	"
 
 # we build out-of-tree
@@ -277,6 +288,7 @@ build() {
 	i486-*-*-*)		_arch_configure="--with-arch=i486 --with-tune=generic --enable-cld";;
 	i586-*-*-*)		_arch_configure="--with-arch=i586 --with-tune=generic --enable-cld";;
 	s390x-*-*-*)		_arch_configure="--with-arch=z196 --with-tune=zEC12 --with-zarch --with-long-double-128 --enable-decimal-float";;
+	riscv64-*-*-*)		_arch_configure="--with-arch=rv64gc --with-abi=lp64d --enable-autolink-libatomic";;
 	esac
 
 	case "$CTARGET_ARCH" in
@@ -395,14 +407,16 @@ package() {
 		done
 	fi
 
-	paxmark -pmrs "$pkgdir"/$_gcclibexec/cc1
-
 	# move ada runtime libs
 	if $LANG_ADA; then
 		for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 -name "libgna*.so"); do
 			mv "$i" "$pkgdir"/usr/lib/
 			ln -s ../../../../${i##*/} $i
 		done
+		for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 -name "libgna*.a"); do
+			mv "$i" "$pkgdir"/usr/lib/
+			ln -s ../../../../${i##*/} $i
+		done
 	fi
 
 	if [ "$CHOST" != "$CTARGET" ]; then
@@ -487,7 +501,6 @@ gpp() {
 		"$subpkgdir"/usr/${_target:+$CTARGET/}lib \
 
 	mv "$pkgdir/$_gcclibexec/cc1plus" "$subpkgdir/$_gcclibexec/"
-	paxmark -pmrs "$subpkgdir/$_gcclibexec/cc1plus"
 
 	mv "$pkgdir"/usr/${_target:+$CTARGET/}lib/*++* "$subpkgdir"/usr/${_target:+$CTARGET/}lib/
 	mv "$pkgdir"/usr/${_target:+$CTARGET/}include/c++ "$subpkgdir"/usr/${_target:+$CTARGET/}include/
@@ -644,6 +657,14 @@ libgnat() {
 	mv "$pkgdir"/usr/lib/libgna*.so "$subpkgdir"/usr/lib/
 }
 
+libgnatstatic() {
+	pkgdesc="GNU Ada static libraries"
+	depends=
+
+	mkdir -p "$subpkgdir"/usr/lib
+	mv "$pkgdir"/usr/lib/libgna*.a "$subpkgdir"/usr/lib/
+}
+
 gnat() {
 	pkgdesc="Ada support for GCC"
 	depends="gcc=$_gccrel"
@@ -658,43 +679,45 @@ gnat() {
 	mv "$pkgdir"/usr/bin/*gnat* "$subpkgdir"/usr/bin/
 }
 
-sha512sums="172fd45e7274c36ebd22a7e12e44a7096ae3bf0e7f0b647da92cfd31ec406a69017df7ee6c1a6ee0822fbef4ff47855f83fab0a0cdb8f031713a14604af3900b  gcc-10.2.1_pre1.tar.xz
-429a92934e1c507c0320741ed5cdd98ba96c73412447c8df0704077e3f0fa6ee4cc4056fadeaa6bb55d237416b555408e97a1c1d21f47b6f6812f153bc36f181  0001-posix_memalign.patch
-a0a9445358f58a34ba0a605d142243d62873d4669ca811013a593e3d6e6640006b5ec23b7a5734ee72f71762d098d607749d6ecc98c85aa4f2074400aedd63ff  0002-gcc-poison-system-directories.patch
-9fb636d1f2ef5b8225082f44da3086b9f196d1c045d7319cea148ee630b92c164e80a3e9a70a221e616a65fc00da761e733f87e23e8575634e498728bce2c48b  0003-Turn-on-Wl-z-relro-z-now-by-default.patch
-e34086d5a46f963e43e9f2f9240e3fb4d935e49feb8edba5121a59192b5991103a8253a342fbc20cef8ac2aa4ae2bf9a7ceb62abf6676be16441fd2dbf3b05f2  0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
-ffd89376a743d29a16b4f38463076691cd3716bee2bca0dbb67c2c1da00773661fb362bcc4b2ffd94f57c6b4470ae7cf8f6abad95de5880e74adaa5c4da21426  0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
-e101b356589fb794f1c4224bba8d8c714a962bed7858a734badfe38a5d10f4e800155f1ed5edbae9da7134192dfd6a4d8a33a9dbe871becb9526810af535819c  0006-Enable-Wformat-and-Wformat-security-by-default.patch
-e6fbe275e8f4b1257271118bfea5d6c05b041439dde560775a7ee1a9457f442c3e0c8b1113c68bd54502b7d44e6e4b76315613bf2972898a981119f384106fde  0007-Enable-Wtrampolines-by-default.patch
-e2a6a0e3cb2c7a40f59432e0f633a3579bb320fc116290d4655766931c56fb78ce73b0f5e75a78c6aacf85155f3c508e84bfee259dba13cd36e77a601fd5d8f5  0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
-0f802f8d9d794a6515a7df7b8588eadc0fa49fdb0b7a5148036fa6fc6e74f35c97d79ed1e4ad225f8f46cca6801f49cbc041258494e4fdbad77a6a7020024d7d  0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
-ff99bc1d02ab07ca7d4c45ff5bfec555096b9a9eb6ef5c02d7e18de72ff3a02505d5e3dca6681caa23b8993049a4acf6a07f5a2e8b4481c4778a7a982851970e  0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
-cf4dc1bfe33250e4065d926d0a126eb87a43695e24a5efda1c383c4d78add0fa7884c378cd3fbb48d713503492d842758fed69c8b5e29774b3bc87c4abe65125  0011-libiberty-copy-PIC-objects-during-build-process.patch
-93f244dda3fa55a6016d511f526abf902f7902e876a2d813980d0ad0bf527e4c0fd6258293c90085c1e59056d827bf92aab2b9b92c6f17f776e0068e507d731a  0012-libitm-disable-FORTIFY.patch
-d6f409d8d9de3ff44e97046fed1b70ebbecebd5722e7c9bbb92d244ed37d43e77b5d398e39038c554945d022df6d2103b9d4c51fbe11e1d8a011bdfd9067b647  0013-libgcc_s.patch
-d380dc2f57bb2065e0c6d80c0837113c3feee2b2290b5747e922aa7dbcbc4463f55f1c22b39a1dcf88653ef5bbae9d29adbfc0f1002d5eaa523a7a31f980b7ab  0014-nopie.patch
-5db204edfcace211fd89eb16c358579d1534546a0245d2e11541078081d627e712a9ce372d838f152b4e361742696324929c4649d9b9ff6fb0678791bd898fca  0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch
-bb76853e79fbeb5c57f52739dff132abf0b80fc551fe83d82238f598ab5ec153b7ebb45aa33b05b24750ff1895cd77a52375bcfb9295c1a44683996ac34bd381  0016-dlang-update-zlib-binding.patch
-50916865c79d9a1305f2524f7051d04df46be925fc7385a3b3cb2c17f1becb8827de76c3e897d470ce1f3fc269f9051c9b478c4d022d7611bcf081782e8b4cba  0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch
-0de08138565d81d4b7bbd367f08e5a2bc637106c39736fbedc92401cf3c2cf18ff50c183c263354852bc03724f9353a9a357ed637b3f012ede2514d3c2ed3969  0018-ada-fix-shared-linking.patch
-82aa21e25fddb6ba6a4e1424c88cf5989f62bf3fe088b43bfaf2e624df0381c830b1f0d1e7f10afb2ec6bff07a2558c0464229a997420fe0435321d1d2117372  0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
-97cb91e95afccfa7fd020d10f48421745cf7afcbe903f17256fc1df05f5f07eaa675576b7eb340da1b5aa97854df4f1f003cb648d8c2e64d9e9c067a0acd2243  0020-add-fortify-headers-paths.patch
-3ffc3bbfbfd7ae3ddfef131d0731577aac0567c965d545a2ad7c9588430397748758990d2c449e4a4c66f11db6a3ea66fb3187d173c3581cda2093d25f3d90e6  0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
-fe3e098d71709bde04cc0a17dcf3bb6ce5bc14b51af1395db97afcb464ba5910dbf85be5d968beddf645e916241f9c6be243c24097c326d9bfebc58219f76118  0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
-7dc0c14cbdcab4aaa355568556e5263912ecc69301653602f99e7c70352d84431c6f931a27f4977de7bbd0d5a328c865f7717c8136e3ed6a12ef4448a107a1a6  0023-Pure-64-bit-MIPS.patch
-e4bbd675aea5f09d4aaa32990a88597bd070273754656575e9be74a172afd244aa15e58c2d6878606b652d56457b053c94213f3c0bbf63ebe1ede5fcfdedca25  0024-use-pure-64-bit-configuration-where-appropriate.patch
-f2bd09b05fb67544d0ef70ce14fd8ca2e2d21846d5396e4e53cdb95317ae122b3f121b8933e5784fc92e51e50d23812e4aa41f2fd07ae68ba1a21ca094a841ac  0025-always-build-libgcc_eh.a.patch
-0d49f5104e89a1269a286f7021dd32d0ac4f7aa427b36f40133bc8616ca87e92144d6cc36f958b3ab4ec683e12f946c3658bceada8fcd5114bdb7c197992eb4a  0026-ada-libgnarl-compatibility-for-musl.patch
-a09211cb007a9722ec95d046fbf317f63b362fb25f6d3ba285f278a33fe08ad5f5d51ba1e4ccf9ebe02c1ea3ca15f10b0721e7f65af5ced27ffc9380af7558b1  0027-ada-musl-support-fixes.patch
-35c1ee71725042fffded7e3189d96ace6cb730d95d83cd49fd4d8527eba72eb344c11d563d1c751a3934627e5aaa44525c58afd4d01c0bb99bab3b6222fa3040  0028-gcc-go-Use-_off_t-type-instead-of-_loff_t.patch
-26deab6006d46e2c8de4679cc7f598cfdd572b1b77c0595f0160fa693251669d324f47712c6faef481dc33a2c83878ec3fe385d54ab9bfd6fa2c576d84429d05  0029-gcc-go-Don-t-include-sys-user.h.patch
-dd9cc5c3c5368a210276ce4396be9cf120c5acfc65cae88508aebd7d4430a28d21b26b362f7f7456ae64c87dd06dfe7a615cd0c7ca13740b683e3a59c1c7bc8d  0030-gcc-go-Fix-ucontext_t-on-PPC64.patch
-c17f5088172babddbdb32830387487286f6106304cf07d49d0b2e59feacad62aa10a46bf1bf927f1f138fd1112da5bef7ae1227a26e7946082a6edc7f340b522  0031-gcc-go-Fix-handling-of-signal-34-on-musl.patch
-db67b346f3def6c004639df27cef32a6c4e9b4661634f43b62f4f3be852f5ae6d5dadef85116f816d5fd88cbdd80001d8f81cc8d554b9094744402ca3ae14725  0032-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
-438c165b8e217142b64a002e99b112fbdac9b2c4ced7b0a8c8fe9cff42e6a5ea6d5939cb40905d5a8570fc890de447fd0f5b49c9ee43c3a6e33446efdf2229bf  0033-gcc-go-Fix-st_-a-m-c-tim-fields-in-generated-sysinfo.patch
-85592117e6370ff8612a7a028194c6875c8df1f07299afa0188770bf9bdd82d9aeb322909ec980cf3bd10a54d90829fffb145c566d843027c11d49e78d3f0a9e  0034-gcc-go-signal-34-is-special-on-musl-libc.patch
-abc2ae2ea2ff270226c45321508c3641011b23172d043c55239a52fee9ed8451e8e23a2a65612c5f3a0d2e4d1a601a7e9a2c1d6c07f926e6cdf42164d23cff34  0035-gcc-go-Prefer-_off_t-over-_off64_t.patch
-21ff83b1f5f8c71c41e7c22ba59f194bc789c8e67a6be9e5185f215adf4ddb175551a261556e5c9bd57dd9c302e1f966de01ff90e097d7ace2c2e43208b6e0f9  0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
-5f0230f9e542bcbfa39f1a3da1f171229bd926971a924ec3e9f3ad8178645d3853659a58a89a48906ffdd77e9c5ff2af43dc54cfc4ac335a219267dddc4afad1  0037-gcc-go-link-to-libucontext.patch
-08ffdce5d1ef722364faf5e824b62d0e58655acbba99b58f24c609abb1d90577432863e769fbe269e4151c997b8bbb0cbed29032752b6e6c3356f8fb3086d607  0038-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
-81bcffde9635c9c4b3214afd8bb16048f15dc8c4ce82c5576b15ee552d6ca8eeee2c5444e2949fec3b938e69fc7a2a2259a07d437e004788ac232c43ae9a83d2  0040-CRuntime_Musl-Support-v1.2.0-for-32-bits.patch"
+sha512sums="0ef281e6633b8bef7ce24d1448ec7b96aef66e414f90821a9a021dcd98eca8895d217d9d95b70fd9c96113689cd026aec951edc356462e439a9350edb4009df6  gcc-10.3.1_git20210424.tar.xz
+d1e10db83a04c02d99f9f6ce03f949b83ccd013674773dcb08992c604048df6a08bf9bd16f74e3c60ea85fd861fb08c1fa9fe17c304af9bfc9a032b81f1ac9eb  0001-posix_memalign.patch
+a77c7ebd994b5780cc5209f33ace24fc4d04353638dcdb14af192b0be5b0e5be397218ddba40e577af889a267af1aa69c1def474207a6661a37c3f5c15002bcb  0002-gcc-poison-system-directories.patch
+108ad63f61e61f627a75613605962021c08bbde584f3c0507d6a07c6112487847ce89699d1d80efb9201c4eab3440ba66f2eeb781bd259fdfc9c87b3baee1e27  0003-Turn-on-Wl-z-relro-z-now-by-default.patch
+dc28895223fe7ce531648225da3cd15e20c26a9be0248fdd66f11efb153647776bdbe8109097d87a087c4443e809a0d425848bdeae1442135c52a13bdd06ef75  0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
+ce7a5f243072284e767510083c57250dd5f1dcdcae102cf1ecbb06f36ea286b00b1f84dc32e5fdb76bac77b52ef3e4e650cff7cc0d14d94487a40ca9d5605bbd  0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
+f5458adfd23f51fa54fb690ec322552d7cadc3afa5773e13e73832c56832854ff14a73ff480c9990731ce929c5a4df35bc20247239268221b9af40ba37331228  0006-Enable-Wformat-and-Wformat-security-by-default.patch
+2601b0de5fe402cdd9a3d87c2a3e959154c2ee413989db21fbc232f169b20d94807a1f89ff5ebb650a143d59b4b48187b338832d8de577fa47bfdd1b76313114  0007-Enable-Wtrampolines-by-default.patch
+3eedfe70c85d963845a658444d8692792a34af8b5e0fa800991bf1e0e2c9ff3196c50f11a284cfaca5d48b4c78b614febf38339918c7fa7a7f4723a1f6bdad16  0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
+6a4b6843cb27b560ac4327b17718806bac4b602903f696222617148a52e9918144648cc45642293beb7c8fd48eba325c115e1dcaa4adec85e1caff0ea33d2a8a  0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
+af174250b4fbcc3664bed51d919695511b538f2f3b65532383591f511bede3d13a1ade29aea66598d6df17f2e931a2d171f01c4e7008b4f468cfb13dc5f2b4cf  0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
+aabac76659e3fa96fa7b4ee2571672c840c3dd37314f16516038d3934333a42b20442a967afce5a35a326685c3c8ef384fc97dc8f4dae57479038f5431e33c19  0011-libiberty-copy-PIC-objects-during-build-process.patch
+36702acf0c9b34adb0b23b74167e5358c706246cc88ce569d4462555bb48288d5d633298aa447ef023c6f75de86dfa7d4ebbf3c43593e1279837ebd47061be0f  0012-libitm-disable-FORTIFY.patch
+79912633ee707c60c66abf6ee16159db3357e4e75d4254f7f38cbc0119c2adfcfa2b8c6b1df3885526d68e49f88e2a0c87969a784ed8a1025a680a4f18acd06c  0013-libgcc_s.patch
+c8c6f4e967afb5d4a9eccd917f6338a61547cc2fabbf56b25e27220b4f3c85f5002477bf2f9d05a911185cee8dcba3a12d3ad24c0d7b1d3b67a3a53bfea702c6  0014-nopie.patch
+d8d8556a6192d7695e1aeb1e64bf98a02b068c427442dd9c23d2b9a863c504e577f35e0890b5f0a184c687ce9315cecff3d2e0bb82f19531a493efb72b54cfe7  0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch
+b3fb29187561fef84b6eb0b35a582c79833203f689e5bf884146cd9a71ec407e0e3b27b0bd4953143d00879ce32331e92741e1c7229ca291ebf13dfd8f5d409c  0016-dlang-update-zlib-binding.patch
+2a03683d5e00cc65f8ebc83638953dff89981069943169874df03f4f3a22348b960780250d9240505acf5b1bfbe154d57d14f310f29a94b76404f50611da9000  0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch
+3df60839e5337fccdd228ebf753fb0dbf672aefca5f3f16329b99c813b907f44e1ce4948ce7f692dca316eb307b83ae9f5028cf1875eb3c9fee85b2dee7bfe83  0018-ada-fix-shared-linking.patch
+bd60be22341b508b4b5cb66eb48723d0f48770745352c60cfe146efa4d18ec58cccbb37f85b98dc0432e52bb5dc8dc1f28b3a3ca50d1ca6db68eb38df970e5aa  0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
+333f9c7a1935dc4f29783fa31c254bda6339c30ee770eb30d585ac422cd0f69701b5d988f9493471e4c83cf20937050f33320852a83ed6dfb2e739ee3539ca0e  0020-add-fortify-headers-paths.patch
+053b0339936cc0469e8708ccc086fa1dabe8572199530e1e78a93551340dd35467a07273e19d2cbc7fe915b7a5bdf95c128718ba0518b67b9668ef0316b7aa06  0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
+7b3d849cdbdee5855918db4114de8f989ec5d612cddc7551eb63ca2878e69e3566353bbfafa9205a161ffd51c5aedd367de6ad82cd5ebf6cb28c716a8d447bb5  0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
+6b3c0fa81cebaf32948657bddaac99024f45c2fc19ac8bc504f3773b6458099b9907e310e162952973bdd41c9fc011e7a50bc8fa86cc0ebec9dd4c69830a012b  0023-Pure-64-bit-MIPS.patch
+da634721fa9cba18e4f527b2cdbe6896c0251ce43865c6fbf29a7281d766c3a8f98e2ddd345b801c25b7ceb85880150ae9cc422aa8891b1fc28a3dc40bcd3114  0024-use-pure-64-bit-configuration-where-appropriate.patch
+64b58a273993224f93c68cddfacc1b3da6b0900b2983f27f8db39b4375afa97cce564739c8fc320666821f6de526e54acbc4920c7e16612303b3d25aed34d5f1  0025-always-build-libgcc_eh.a.patch
+6004be7d683993c175f819e1d62767b6ca2b80643917bb584ffffe2aee9fd5ad9745f91651ad5d1d00aed390e7346262b5c28bec356efd9ff1c85e4b54bcfe2e  0026-ada-libgnarl-compatibility-for-musl.patch
+7a3ce107cc55356ac46f3a217eea1cf9cdddd43fd3fede048a26e5da2280f0af9f806392942d2896a0f841ca0b0b0eaceb4e20f09edee7a743b515d3553fc8b3  0027-ada-musl-support-fixes.patch
+0cd8303456ec5479942970679352fe8bcd259b8b04bffba458545abdfac87163a8fb8e55c3aa505c516af8fd0a1bfb5f2ee4c6027ec9bcb0b0d3564469a18e23  0028-gcc-go-Use-_off_t-type-instead-of-_loff_t.patch
+6cc82829bb8bf8ffb473e4f2f9c2f657a4078290fc7c3208d199c0b07c2c3a7575a0c423e52fc02fd96c81158ab2e7ad33ccb651523ba80e00dee9e503d19c6d  0029-gcc-go-Don-t-include-sys-user.h.patch
+868e0cf5d32412c557d7835e03eb23621745179e77c87d69b810f8ec968cf80606cb5cb8085e5e125f08e809d5e3ff50c4de869d94caca5f4257669237a29b92  0030-gcc-go-Fix-ucontext_t-on-PPC64.patch
+257814e2dc39bf01dedc3efe9f50029bdc230e112a0e739d0547896212b87bcdb9d40d4632a237137c91e2d9605b2256ebd45ee005920a5c4e401e699ce69f46  0031-gcc-go-Fix-handling-of-signal-34-on-musl.patch
+0e33205e6ef0b58d12eb80d3fd6ce7361e9e3a86ba2ae781745133be1f0fea6a1e95fd58331765f6bb599f4ad355224c954db4fbaf804b9e4c0ea01dbaae1638  0032-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
+bb1e3bbea65644435134910e04b8d4de27642026371b19f4faf51b90e32af08e7181b3198e936b3626cba2126f8f9182ce39f6b8c8849b6b27f56a1c45e4f8c5  0033-gcc-go-Fix-st_-a-m-c-tim-fields-in-generated-sysinfo.patch
+0758417ab682ee6d4b75f1ba2d0c1f568e115a16625eb664066c1862178a43ae717396c5d61a355a08fc01929041abebbf33bc58176a0b78ab384aba7d2ed8ba  0034-gcc-go-signal-34-is-special-on-musl-libc.patch
+d0b132d1bb9a455af23829a9da4ff89c27eff3f642e2280712667753d552fc214424470cad4cecd0ae39052553b6a22d7dc7a20eebfd1cb976d98552b00b9dcd  0035-gcc-go-Prefer-_off_t-over-_off64_t.patch
+a21844975ff13317ed7985b5f5b257a0bc1dd961360b6a6f36bf52151b8edf5ecf38fbdd47cb2c28c13ed3dfbf4ca112d91d81373fd3e2c5992aba35296645af  0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
+0217263fc1fcfbde92fcebfc626b2cf0ba30e704b4fbe5a11f55d9ca5b579cceac3ba9ec45e7f53cd8805678b69fb6e5ab1295e67938b9c83f82e44ddebd0a85  0037-gcc-go-link-to-libucontext.patch
+8a90ce84d493bfcdcad4cb1a02a320dca18e8178e717451087501b059ca00ab8f6b73d628bcb3f49c5c6702b7222b063d3c0803d093e2c6f58820b6aa578969e  0038-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
+a3e7362fa95d5ffa56b0d8ea73f6f8e867409ae3b85d041aa0591dba093c5bb1d30f3294151c5142e8d1df91f4d138e9f4484009b8a675c8fc3b754a34c7648e  0039-CRuntime_Musl-Support-v1.2.0-for-32-bits.patch
+dc7a8f6dc885dc34229128a716531b375ec4e8247a8522adb623c5a6b39db60ff471436b360a25f0310ee16fe1a6ec85ff64398cbae2677534626972ac01db22  0040-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
+046bfe95d6de9df148e6c410b5d23a49c488ab41d95e599fc381a2b7d190e6d7d99de59fa8cd8c3a711ee2310426f3cdcd323cf887c8d11543e119d205659b6a  0041-Use-generic-errstr.go-implementation-on-musl.patch"

cross/gcc-armhf/0001-posix_memalign.patch

@@ -1,42 +0,0 @@
-From 61621c64caffb54ea82c5b573e55d16dcb732dea 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
-
----
- gcc/config/i386/pmm_malloc.h | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/gcc/config/i386/pmm_malloc.h b/gcc/config/i386/pmm_malloc.h
-index 87344d9383f..ece428df487 100644
---- a/gcc/config/i386/pmm_malloc.h
-+++ b/gcc/config/i386/pmm_malloc.h
-@@ -27,12 +27,13 @@
- #include <stdlib.h>
- 
- /* We can't depend on <stdlib.h> since the prototype of posix_memalign
--   may not be visible.  */
-+   may not be visible and we can't pollute the namespace either.  */
- #ifndef __cplusplus
--extern int posix_memalign (void **, size_t, size_t);
-+extern int _mm_posix_memalign (void **, size_t, size_t)
- #else
--extern "C" int posix_memalign (void **, size_t, size_t) throw ();
-+extern "C" int _mm_posix_memalign (void **, size_t, size_t) throw ()
- #endif
-+__asm__("posix_memalign");
- 
- static __inline void *
- _mm_malloc (size_t __size, size_t __alignment)
-@@ -42,7 +43,7 @@ _mm_malloc (size_t __size, size_t __alignment)
-     return malloc (__size);
-   if (__alignment == 2 || (sizeof (void *) == 8 && __alignment == 4))
-     __alignment = sizeof (void *);
--  if (posix_memalign (&__ptr, __alignment, __size) == 0)
-+  if (_mm_posix_memalign (&__ptr, __alignment, __size) == 0)
-     return __ptr;
-   else
-     return NULL;
--- 
-2.29.2
-

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

@@ -1,203 +0,0 @@
-From b6af6fd400def85c7f6933a991c888df16f12533 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
-
-Add /sw/include and /opt/include based on the original
-zecke-no-host-includes.patch patch.  The original patch checked for
-/usr/include, /sw/include and /opt/include and then triggered a failure and
-aborted.
-
-Instead, we add the two missing items to the current scan.  If the user
-wants this to be a failure, they can add "-Werror=poison-system-directories".
-
-Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-Upstream-Status: Pending
----
- gcc/common.opt      |  4 ++++
- gcc/config.in       |  6 ++++++
- gcc/configure       | 16 ++++++++++++++++
- gcc/configure.ac    | 10 ++++++++++
- gcc/doc/invoke.texi |  9 +++++++++
- gcc/gcc.c           |  2 ++
- gcc/incpath.c       | 21 +++++++++++++++++++++
- 7 files changed, 68 insertions(+)
-
-diff --git a/gcc/common.opt b/gcc/common.opt
-index dfed6ec76ba..8bb65e0e1af 100644
---- a/gcc/common.opt
-+++ b/gcc/common.opt
-@@ -682,6 +682,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.
- 
-+Wpoison-system-directories
-+Common Var(flag_poison_system_directories) Init(1) Warning
-+Warn for -I and -L options using system directories if cross compiling
-+
- Wshadow
- Common Var(warn_shadow) Warning
- Warn when one variable shadows another.  Same as -Wshadow=global.
-diff --git a/gcc/config.in b/gcc/config.in
-index 364eba47737..9551c0dfdf9 100644
---- a/gcc/config.in
-+++ b/gcc/config.in
-@@ -224,6 +224,12 @@
- #endif
- 
- 
-+/* Define to warn for use of native system header directories */
-+#ifndef USED_FOR_TARGET
-+#undef ENABLE_POISON_SYSTEM_DIRECTORIES
-+#endif
-+
-+
- /* Define if you want all operations on RTL (the basic data structure of the
-    optimizer and back end) to be checked for dynamic type safety at runtime.
-    This is quite expensive. */
-diff --git a/gcc/configure b/gcc/configure
-index b4088d8fd1e..793530e21cf 100755
---- a/gcc/configure
-+++ b/gcc/configure
-@@ -1010,6 +1010,7 @@ with_system_zlib
- enable_maintainer_mode
- enable_link_mutex
- enable_version_specific_runtime_libs
-+enable_poison_system_directories
- enable_plugin
- enable_host_shared
- enable_libquadmath_support
-@@ -1766,6 +1767,8 @@ Optional Features:
-   --enable-version-specific-runtime-libs
-                           specify that runtime libraries should be installed
-                           in a compiler-specific directory
-+  --enable-poison-system-directories
-+                          warn for use of native system header directories
-   --enable-plugin         enable plugin support
-   --enable-host-shared    build host code as shared libraries
-   --disable-libquadmath-support
-@@ -30271,6 +30274,19 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then :
- fi
- 
- 
-+# Check whether --enable-poison-system-directories was given.
-+if test "${enable_poison_system_directories+set}" = set; then :
-+  enableval=$enable_poison_system_directories;
-+else
-+  enable_poison_system_directories=no
-+fi
-+
-+if test "x${enable_poison_system_directories}" = "xyes"; then
-+
-+$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h
-+
-+fi
-+
- # Substitute configuration variables
- 
- 
-diff --git a/gcc/configure.ac b/gcc/configure.ac
-index 070b9c6c497..0fd438e39e5 100644
---- a/gcc/configure.ac
-+++ b/gcc/configure.ac
-@@ -6605,6 +6605,16 @@ AC_ARG_ENABLE(version-specific-runtime-libs,
-                 [specify that runtime libraries should be
-                  installed in a compiler-specific directory])])
- 
-+AC_ARG_ENABLE([poison-system-directories],
-+             AS_HELP_STRING([--enable-poison-system-directories],
-+                            [warn for use of native system header directories]),,
-+             [enable_poison_system_directories=no])
-+if test "x${enable_poison_system_directories}" = "xyes"; then
-+  AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES],
-+           [1],
-+           [Define to warn for use of native system header directories])
-+fi
-+
- # Substitute configuration variables
- AC_SUBST(subdirs)
- AC_SUBST(srcdir)
-diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index 7775bcc72eb..034d3066c2b 100644
---- a/gcc/doc/invoke.texi
-+++ b/gcc/doc/invoke.texi
-@@ -348,6 +348,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
-+-Wno-poison-system-directories @gol
- -Wno-pragmas  -Wno-prio-ctor-dtor  -Wredundant-decls @gol
- -Wrestrict  -Wno-return-local-addr  -Wreturn-type @gol
- -Wno-scalar-storage-order  -Wsequence-point @gol
-@@ -6926,6 +6927,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.
- 
-+@item -Wno-poison-system-directories
-+@opindex Wno-poison-system-directories
-+Do not warn for @option{-I} or @option{-L} options using system
-+directories such as @file{/usr/include} when cross compiling.  This
-+option is intended for use in chroot environments when such
-+directories contain the correct headers and libraries for the target
-+system rather than the host.
-+
- @item -Wfloat-equal
- @opindex Wfloat-equal
- @opindex Wno-float-equal
-diff --git a/gcc/gcc.c b/gcc/gcc.c
-index 9f790db0daf..b2200c5185a 100644
---- a/gcc/gcc.c
-+++ b/gcc/gcc.c
-@@ -1041,6 +1041,8 @@ proper position among the other output files.  */
-    "%{fuse-ld=*:-fuse-ld=%*} " LINK_COMPRESS_DEBUG_SPEC \
-    "%X %{o*} %{e*} %{N} %{n} %{r}\
-     %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!r:%{!nostartfiles:%S}}} \
-+    %{Wno-poison-system-directories:--no-poison-system-directories} \
-+    %{Werror=poison-system-directories:--error-poison-system-directories} \
-     %{static|no-pie|static-pie:} %@{L*} %(mfwrap) %(link_libgcc) " \
-     VTABLE_VERIFICATION_SPEC " " SANITIZER_EARLY_SPEC " %o "" \
-     %{fopenacc|fopenmp|%:gt(%{ftree-parallelize-loops=*:%*} 1):\
-diff --git a/gcc/incpath.c b/gcc/incpath.c
-index 8a2bda00f80..9098ab044ab 100644
---- a/gcc/incpath.c
-+++ b/gcc/incpath.c
-@@ -26,6 +26,7 @@
- #include "intl.h"
- #include "incpath.h"
- #include "cppdefault.h"
-+#include "diagnostic-core.h"
- 
- /* Microsoft Windows does not natively support inodes.
-    VMS has non-numeric inodes.  */
-@@ -393,6 +394,26 @@ merge_include_chains (const char *sysroot, cpp_reader *pfile, int verbose)
- 	}
-       fprintf (stderr, _("End of search list.\n"));
-     }
-+
-+#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES
-+  if (flag_poison_system_directories)
-+    {
-+       struct cpp_dir *p;
-+
-+       for (p = heads[INC_QUOTE]; p; p = p->next)
-+         {
-+          if ((!strncmp (p->name, "/usr/include", 12))
-+              || (!strncmp (p->name, "/usr/local/include", 18))
-+              || (!strncmp (p->name, "/usr/X11R6/include", 18))
-+              || (!strncmp (p->name, "/sw/include", 11))
-+              || (!strncmp (p->name, "/opt/include", 12)))
-+            warning (OPT_Wpoison_system_directories,
-+                     "include location \"%s\" is unsafe for "
-+                     "cross-compilation",
-+                     p->name);
-+         }
-+    }
-+#endif
- }
- 
- /* Use given -I paths for #include "..." but not #include <...>, and
--- 
-2.29.2
-

cross/gcc-armhf/0003-Turn-on-Wl-z-relro-z-now-by-default.patch

@@ -1,39 +0,0 @@
-From 8e8955cbd60155d131d3ac66cb2a1e7e41835278 Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Fri, 21 Aug 2020 06:45:49 +0000
-Subject: [PATCH] Turn on -Wl,-z,relro,-z,now by default.
-
----
- gcc/doc/invoke.texi | 3 +++
- gcc/gcc.c           | 1 +
- 2 files changed, 4 insertions(+)
-
-diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index 034d3066c2b..4885efe3247 100644
---- a/gcc/doc/invoke.texi
-+++ b/gcc/doc/invoke.texi
-@@ -14663,6 +14663,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}.
- 
-+NOTE: In Alpine Linux, for LDFLAGS, the option
-+@option{-Wl,-z,relro,now} is used.  To disable, use @option{-Wl,-z,norelro}.
-+
- @item -u @var{symbol}
- @opindex u
- Pretend the symbol @var{symbol} is undefined, to force linking of
-diff --git a/gcc/gcc.c b/gcc/gcc.c
-index b2200c5185a..625c9ab7902 100644
---- a/gcc/gcc.c
-+++ b/gcc/gcc.c
-@@ -1039,6 +1039,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 \
-+   "-z relro -z now " \
-    "%X %{o*} %{e*} %{N} %{n} %{r}\
-     %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!r:%{!nostartfiles:%S}}} \
-     %{Wno-poison-system-directories:--no-poison-system-directories} \
--- 
-2.29.2
-

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

@@ -1,46 +0,0 @@
-From c5924988157b27b60c28d20d971179bbacbd2ae3 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.c | 4 ++++
- gcc/doc/invoke.texi         | 6 ++++++
- 2 files changed, 10 insertions(+)
-
-diff --git a/gcc/c-family/c-cppbuiltin.c b/gcc/c-family/c-cppbuiltin.c
-index db91a36794a..ed976c71404 100644
---- a/gcc/c-family/c-cppbuiltin.c
-+++ b/gcc/c-family/c-cppbuiltin.c
-@@ -1385,6 +1385,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);
- 
-+  /* Fortify Source enabled by default for optimization levels > 0 */
-+  if (optimize)
-+    builtin_define_with_int_value ("_FORTIFY_SOURCE", 2);
-+
-   /* Misc.  */
-   if (flag_gnu89_inline)
-     cpp_define (pfile, "__GNUC_GNU_INLINE__");
-diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index 4885efe3247..a3e5e002fa5 100644
---- a/gcc/doc/invoke.texi
-+++ b/gcc/doc/invoke.texi
-@@ -9230,6 +9230,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.
- 
-+NOTE: In Alpine Linux, @option{-D_FORTIFY_SOURCE=2} is
-+set by default, and is activated when @option{-O} is set to 2 or higher.
-+This enables additional compile-time and run-time checks for several libc
-+functions.  To disable, specify either @option{-U_FORTIFY_SOURCE} or
-+@option{-D_FORTIFY_SOURCE=0}.
-+
- @item -O3
- @opindex O3
- Optimize yet more.  @option{-O3} turns on all optimizations specified
--- 
-2.29.2
-

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

@@ -1,269 +0,0 @@
-From 5b8de466aa959a6c929cee2c78e4159a0209b4f8 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,
- but always link the sanitizer libraries with --no-as-needed.
-
----
- gcc/config/aarch64/aarch64-linux.h |  1 +
- gcc/config/alpha/linux-elf.h       |  2 +-
- gcc/config/arm/linux-elf.h         |  1 +
- gcc/config/gnu-user.h              |  6 +++---
- gcc/config/i386/gnu-user.h         |  2 +-
- gcc/config/i386/gnu-user64.h       |  1 +
- gcc/config/ia64/linux.h            |  2 +-
- gcc/config/mips/gnu-user.h         |  1 +
- gcc/config/riscv/linux.h           |  1 +
- gcc/config/rs6000/linux64.h        |  4 ++--
- gcc/config/rs6000/sysv4.h          |  2 +-
- gcc/config/s390/linux.h            |  2 +-
- gcc/config/sparc/linux.h           |  2 +-
- 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 e587e2e9ad6..1d1017aa523 100644
---- a/gcc/config/aarch64/aarch64-linux.h
-+++ b/gcc/config/aarch64/aarch64-linux.h
-@@ -35,6 +35,7 @@
- #define CPP_SPEC "%{pthread:-D_REENTRANT}"
- 
- #define LINUX_TARGET_LINK_SPEC  "%{h*}		\
-+   --as-needed					\
-    %{static:-Bstatic}				\
-    %{shared:-shared}				\
-    %{symbolic:-Bsymbolic}			\
-diff --git a/gcc/config/alpha/linux-elf.h b/gcc/config/alpha/linux-elf.h
-index e25fcac3c59..22b2f7b0d14 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
- 
- #define ELF_DYNAMIC_LINKER	GNU_USER_DYNAMIC_LINKER
- 
--#define LINK_SPEC "-m elf64alpha %{G*} %{relax:-relax}		\
-+#define LINK_SPEC "-m elf64alpha --as-needed %{G*} %{relax:-relax}		\
-   %{O*:-O3} %{!O*:-O1}						\
-   %{shared:-shared}						\
-   %{!shared:							\
-diff --git a/gcc/config/arm/linux-elf.h b/gcc/config/arm/linux-elf.h
-index 0ec3aa53189..f8bda84de2a 100644
---- a/gcc/config/arm/linux-elf.h
-+++ b/gcc/config/arm/linux-elf.h
-@@ -70,6 +70,7 @@
-      %{rdynamic:-export-dynamic} \
-      %{!shared:-dynamic-linker " GNU_USER_DYNAMIC_LINKER "}} \
-    -X \
-+   --as-needed \
-    %{mbig-endian:-EB} %{mlittle-endian:-EL}" \
-    SUBTARGET_EXTRA_LINK_SPEC
- 
-diff --git a/gcc/config/gnu-user.h b/gcc/config/gnu-user.h
-index ff2e880b1fa..7f30c363e4a 100644
---- a/gcc/config/gnu-user.h
-+++ b/gcc/config/gnu-user.h
-@@ -136,17 +136,17 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
- #define LIBASAN_EARLY_SPEC "%{!shared:libasan_preinit%O%s} " \
-   "%{static-libasan:%{!shared:" \
-   LD_STATIC_OPTION " --whole-archive -lasan --no-whole-archive " \
--  LD_DYNAMIC_OPTION "}}%{!static-libasan:-lasan}"
-+  LD_DYNAMIC_OPTION "}}%{!static-libasan:%{!fuse-ld=gold:--push-state} --no-as-needed -lasan %{fuse-ld=gold:--as-needed;:--pop-state}}"
- #undef LIBTSAN_EARLY_SPEC
- #define LIBTSAN_EARLY_SPEC "%{!shared:libtsan_preinit%O%s} " \
-   "%{static-libtsan:%{!shared:" \
-   LD_STATIC_OPTION " --whole-archive -ltsan --no-whole-archive " \
--  LD_DYNAMIC_OPTION "}}%{!static-libtsan:-ltsan}"
-+  LD_DYNAMIC_OPTION "}}%{!static-libtsan:%{!fuse-ld=gold:--push-state} --no-as-needed -ltsan %{fuse-ld=gold:--as-needed;:--pop-state}}"
- #undef LIBLSAN_EARLY_SPEC
- #define LIBLSAN_EARLY_SPEC "%{!shared:liblsan_preinit%O%s} " \
-   "%{static-liblsan:%{!shared:" \
-   LD_STATIC_OPTION " --whole-archive -llsan --no-whole-archive " \
--  LD_DYNAMIC_OPTION "}}%{!static-liblsan:-llsan}"
-+  LD_DYNAMIC_OPTION "}}%{!static-liblsan:%{!fuse-ld=gold:--push-state} --no-as-needed -llsan %{fuse-ld=gold:--as-needed;:--pop-state}}"
- #endif
- 
- #undef TARGET_F951_OPTIONS
-diff --git a/gcc/config/i386/gnu-user.h b/gcc/config/i386/gnu-user.h
-index ae4aa844f02..54b91c0492a 100644
---- a/gcc/config/i386/gnu-user.h
-+++ b/gcc/config/i386/gnu-user.h
-@@ -74,7 +74,7 @@ along with GCC; see the file COPYING3.  If not see
-   { "link_emulation", GNU_USER_LINK_EMULATION },\
-   { "dynamic_linker", GNU_USER_DYNAMIC_LINKER }
- 
--#define GNU_USER_TARGET_LINK_SPEC "-m %(link_emulation) %{shared:-shared} \
-+#define GNU_USER_TARGET_LINK_SPEC "-m %(link_emulation) --as-needed %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
-       %{!static-pie: \
-diff --git a/gcc/config/i386/gnu-user64.h b/gcc/config/i386/gnu-user64.h
-index 785c68220b8..21dd66b412a 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
-                   "%{" SPEC_64 ":-m " GNU_USER_LINK_EMULATION64 "} \
-                    %{" SPEC_32 ":-m " GNU_USER_LINK_EMULATION32 "} \
-                    %{" SPEC_X32 ":-m " GNU_USER_LINK_EMULATIONX32 "} \
-+  --as-needed \
-   %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
-diff --git a/gcc/config/ia64/linux.h b/gcc/config/ia64/linux.h
-index ee38e218aec..0325971d818 100644
---- a/gcc/config/ia64/linux.h
-+++ b/gcc/config/ia64/linux.h
-@@ -58,7 +58,7 @@ do {						\
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2"
- 
- #undef LINK_SPEC
--#define LINK_SPEC "\
-+#define LINK_SPEC " --as-needed \
-   %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
-diff --git a/gcc/config/mips/gnu-user.h b/gcc/config/mips/gnu-user.h
-index 5d0782100bb..4be5fbb2191 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
- #undef GNU_USER_TARGET_LINK_SPEC
- #define GNU_USER_TARGET_LINK_SPEC "\
-   %{G*} %{EB} %{EL} %{mips*} %{shared} \
-+ -as-needed \
-   %{!shared: \
-     %{!static: \
-       %{rdynamic:-export-dynamic} \
-diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h
-index 4afef7c228c..ba1a6e60e05 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
-   "%{mabi=ilp32:_ilp32}"
- 
- #define LINK_SPEC "\
-+-as-needed \
- -melf" XLEN_SPEC "lriscv" LD_EMUL_SUFFIX " \
- %{mno-relax:--no-relax} \
- %{shared} \
-diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h
-index 2ded3301282..a1e44ddcc0d 100644
---- a/gcc/config/rs6000/linux64.h
-+++ b/gcc/config/rs6000/linux64.h
-@@ -457,13 +457,13 @@ extern int dot_symbols;
- 					   " -m elf64ppc")
- #endif
- 
--#define LINK_OS_LINUX_SPEC32 LINK_OS_LINUX_EMUL32 " %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC32 LINK_OS_LINUX_EMUL32 " --as-needed %{!shared: %{!static: \
-   %{!static-pie: \
-     %{rdynamic:-export-dynamic} \
-     -dynamic-linker " GNU_USER_DYNAMIC_LINKER32 "}}} \
-   %(link_os_extra_spec32)"
- 
--#define LINK_OS_LINUX_SPEC64 LINK_OS_LINUX_EMUL64 " %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC64 LINK_OS_LINUX_EMUL64 " --as-needed %{!shared: %{!static: \
-   %{!static-pie: \
-     %{rdynamic:-export-dynamic} \
-     -dynamic-linker " GNU_USER_DYNAMIC_LINKER64 "}}} \
-diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h
-index 9ade72114e9..9490b84a153 100644
---- a/gcc/config/rs6000/sysv4.h
-+++ b/gcc/config/rs6000/sysv4.h
-@@ -789,7 +789,7 @@ GNU_USER_TARGET_CC1_SPEC
- #define GNU_USER_DYNAMIC_LINKER GLIBC_DYNAMIC_LINKER
- #endif
- 
--#define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC "-m elf32ppclinux --as-needed %{!shared: %{!static: \
-   %{rdynamic:-export-dynamic} \
-   -dynamic-linker " GNU_USER_DYNAMIC_LINKER "}}"
- 
-diff --git a/gcc/config/s390/linux.h b/gcc/config/s390/linux.h
-index 6919b468f06..56d52d41b31 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
- 
- #undef  LINK_SPEC
- #define LINK_SPEC \
--  "%{m31:-m elf_s390}%{m64:-m elf64_s390} \
-+  "%{m31:-m elf_s390}%{m64:-m elf64_s390} --as-needed \
-    %{shared:-shared} \
-    %{!shared: \
-       %{static:-static} \
-diff --git a/gcc/config/sparc/linux.h b/gcc/config/sparc/linux.h
-index 63853e60c03..de6d8675456 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);
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
- 
- #undef  LINK_SPEC
--#define LINK_SPEC "-m elf32_sparc %{shared:-shared} \
-+#define LINK_SPEC "-m elf32_sparc --as-needed %{shared:-shared} \
-   %{!mno-relax:%{!r:-relax}} \
-   %{!shared: \
-     %{!static: \
-diff --git a/gcc/gcc.c b/gcc/gcc.c
-index 625c9ab7902..7aec9d3a016 100644
---- a/gcc/gcc.c
-+++ b/gcc/gcc.c
-@@ -695,8 +695,11 @@ proper position among the other output files.  */
- #ifdef LIBASAN_EARLY_SPEC
- #define LIBASAN_SPEC STATIC_LIBASAN_LIBS
- #elif defined(HAVE_LD_STATIC_DYNAMIC)
--#define LIBASAN_SPEC "%{static-libasan:" LD_STATIC_OPTION \
--		     "} -lasan %{static-libasan:" LD_DYNAMIC_OPTION "}" \
-+#define LIBASAN_SPEC "%{static-libasan:" LD_STATIC_OPTION "}" \
-+		     " %{!static-libasan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
-+		     " -lasan " \
-+		     " %{static-libasan:" LD_DYNAMIC_OPTION "}" \
-+		     " %{!static-libasan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
- 		     STATIC_LIBASAN_LIBS
- #else
- #define LIBASAN_SPEC "-lasan" STATIC_LIBASAN_LIBS
-@@ -713,8 +716,11 @@ proper position among the other output files.  */
- #ifdef LIBTSAN_EARLY_SPEC
- #define LIBTSAN_SPEC STATIC_LIBTSAN_LIBS
- #elif defined(HAVE_LD_STATIC_DYNAMIC)
--#define LIBTSAN_SPEC "%{static-libtsan:" LD_STATIC_OPTION \
--		     "} -ltsan %{static-libtsan:" LD_DYNAMIC_OPTION "}" \
-+#define LIBTSAN_SPEC "%{static-libtsan:" LD_STATIC_OPTION "}" \
-+		     " %{!static-libtsan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
-+		     " -ltsan " \
-+		     " %{static-libtsan:" LD_DYNAMIC_OPTION "}" \
-+		     " %{!static-libtsan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
- 		     STATIC_LIBTSAN_LIBS
- #else
- #define LIBTSAN_SPEC "-ltsan" STATIC_LIBTSAN_LIBS
-@@ -731,8 +737,11 @@ proper position among the other output files.  */
- #ifdef LIBLSAN_EARLY_SPEC
- #define LIBLSAN_SPEC STATIC_LIBLSAN_LIBS
- #elif defined(HAVE_LD_STATIC_DYNAMIC)
--#define LIBLSAN_SPEC "%{static-liblsan:" LD_STATIC_OPTION \
--		     "} -llsan %{static-liblsan:" LD_DYNAMIC_OPTION "}" \
-+#define LIBLSAN_SPEC "%{static-liblsan:" LD_STATIC_OPTION "}" \
-+		     " %{!static-liblsan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
-+		     " -llsan " \
-+		     " %{static-liblsan:" LD_DYNAMIC_OPTION "}" \
-+		     " %{!static-liblsan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
- 		     STATIC_LIBLSAN_LIBS
- #else
- #define LIBLSAN_SPEC "-llsan" STATIC_LIBLSAN_LIBS
-@@ -747,8 +756,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
--#define LIBUBSAN_SPEC "%{static-libubsan:" LD_STATIC_OPTION \
--		     "} -lubsan %{static-libubsan:" LD_DYNAMIC_OPTION "}" \
-+#define LIBUBSAN_SPEC "%{static-libubsan:" LD_STATIC_OPTION "}" \
-+		     " %{!static-libubsan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
-+		     " -lubsan " \
-+		     " %{static-libubsan:" LD_DYNAMIC_OPTION "}" \
-+		     " %{!static-libubsan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
- 		     STATIC_LIBUBSAN_LIBS
- #else
- #define LIBUBSAN_SPEC "-lubsan" STATIC_LIBUBSAN_LIBS
--- 
-2.29.2
-

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

@@ -1,34 +0,0 @@
-From 7c79655102e756622211ca40384e8562be334973 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.
-
----
- gcc/c-family/c.opt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gcc/c-family/c.opt b/gcc/c-family/c.opt
-index c49da99d395..93f25319005 100644
---- a/gcc/c-family/c.opt
-+++ b/gcc/c-family/c.opt
-@@ -599,7 +599,7 @@ Warn about function calls with format strings that write past the end
- of the destination region.  Same as -Wformat-overflow=1.
- 
- Wformat-security
--C ObjC C++ ObjC++ Var(warn_format_security) Warning LangEnabledBy(C ObjC C++ ObjC++,Wformat=, warn_format >= 2, 0)
-+C ObjC C++ ObjC++ Var(warn_format_security) Init(1) Warning LangEnabledBy(C ObjC C++ ObjC++,Wformat=, warn_format >= 2, 0)
- Warn about possible security problems with format functions.
- 
- Wformat-signedness
-@@ -620,7 +620,7 @@ C ObjC C++ ObjC++ Var(warn_format_zero_length) Warning LangEnabledBy(C ObjC C++
- Warn about zero-length formats.
- 
- Wformat=
--C ObjC C++ ObjC++ Joined RejectNegative UInteger Var(warn_format) Warning LangEnabledBy(C ObjC C++ ObjC++,Wall, 1, 0) IntegerRange(0, 2)
-+C ObjC C++ ObjC++ Joined RejectNegative UInteger Var(warn_format) Init(1) Warning LangEnabledBy(C ObjC C++ ObjC++,Wall, 1, 0) IntegerRange(0, 2)
- Warn about printf/scanf/strftime/strfmon format string anomalies.
- 
- Wformat-overflow=
--- 
-2.29.2
-

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

@@ -1,25 +0,0 @@
-From 25eb9009f180c799647cfc81d27d8b67ba3f3b72 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.
-
----
- gcc/common.opt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gcc/common.opt b/gcc/common.opt
-index 8bb65e0e1af..ace932b300d 100644
---- a/gcc/common.opt
-+++ b/gcc/common.opt
-@@ -774,7 +774,7 @@ Common Var(warn_system_headers) Warning
- Do not suppress warnings from system headers.
- 
- Wtrampolines
--Common Var(warn_trampolines) Warning
-+Common Var(warn_trampolines) Init(1) Warning
- Warn whenever a trampoline is generated.
- 
- Wtype-limits
--- 
-2.29.2
-

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

@@ -1,53 +0,0 @@
-From cfa0c7a3154415fe0e0ab6bd373a8f2164024ff5 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.c      | 8 +++++++-
- gcc/params.opt | 2 +-
- 2 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/gcc/gcc.c b/gcc/gcc.c
-index 7aec9d3a016..daeb4d0c8ea 100644
---- a/gcc/gcc.c
-+++ b/gcc/gcc.c
-@@ -886,6 +886,12 @@ proper position among the other output files.  */
- #define LINK_GCC_C_SEQUENCE_SPEC "%G %{!nolibc:%L %G}"
- #endif
- 
-+#ifdef ENABLE_DEFAULT_SSP
-+#define NO_SSP_SPEC "%{nostdlib|nodefaultlibs|ffreestanding:-fno-stack-protector} "
-+#else
-+#define NO_SSP_SPEC ""
-+#endif
-+
- #ifndef LINK_SSP_SPEC
- #ifdef TARGET_LIBC_PROVIDES_SSP
- #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
-@@ -1170,7 +1176,7 @@ static const char *cc1_options =
-  %{-version:--version}\
-  %{-help=*:--help=%*}\
-  %{!fsyntax-only:%{S:%W{o*}%{!o*:-o %b.s}}}\
-- %{fsyntax-only:-o %j} %{-param*}\
-+ %{fsyntax-only:-o %j} %{-param*} " NO_SSP_SPEC "\
-  %{coverage:-fprofile-arcs -ftest-coverage}\
-  %{fprofile-arcs|fprofile-generate*|coverage:\
-    %{!fprofile-update=single:\
-diff --git a/gcc/params.opt b/gcc/params.opt
-index 4aec480798b..eaecfab37ad 100644
---- a/gcc/params.opt
-+++ b/gcc/params.opt
-@@ -853,7 +853,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=
--Common Joined UInteger Var(param_ssp_buffer_size) Init(8) IntegerRange(1, 65536) Param Optimization
-+Common Joined UInteger Var(param_ssp_buffer_size) Init(4) IntegerRange(1, 65536) Param Optimization
- The lower bound for a buffer to be considered for stack smashing protection.
- 
- -param=stack-clash-protection-guard-size=
--- 
-2.29.2
-

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

@@ -1,54 +0,0 @@
-From 4733bb8115411c50028f7a583783ac10c63e8536 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
- bootstrapping.
-
-Solves error messages like the following:
-
-msgfmt: /var/tmp/portage/sys-devel/gcc-4.1.2/work/build/./gcc/libgcc_s.so.1: version `GCC_4.2.0' not found (required by /usr/lib/gcc/x86_64-pc-linux-gnu/4.5.3/libstdc++.so.6)
-
-The libgcc_s.so used during build doesn't satisfy the needs of the
-libstdc++.so that msgfmt is linked against. On the other hand, msgfmt
-is used as a stand-alone application here, and what library it uses
-behind the scenes is of no concern to the gcc build process.
-Therefore, simply invoking it "as usual", i.e. without any special
-library path, will make it work as expected here.
-
-2011-09-19 Martin von Gagern
-
-References:
-https://bugs.gentoo.org/372377
-https://bugs.gentoo.org/295480
----
- libstdc++-v3/po/Makefile.am | 1 +
- libstdc++-v3/po/Makefile.in | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/libstdc++-v3/po/Makefile.am b/libstdc++-v3/po/Makefile.am
-index a9391d8d167..f7eee24dc8c 100644
---- a/libstdc++-v3/po/Makefile.am
-+++ b/libstdc++-v3/po/Makefile.am
-@@ -38,6 +38,7 @@ MSGFMT = msgfmt
- EXTRA_DIST = string_literals.cc POTFILES.in $(PACKAGE).pot $(LOCALE_IN)
- 
- .po.mo:
-+	env --unset=LD_LIBRARY_PATH \
- 	$(MSGFMT) -o $@ $<
- 
- all-local: all-local-$(USE_NLS)
-diff --git a/libstdc++-v3/po/Makefile.in b/libstdc++-v3/po/Makefile.in
-index a0f84b0cfa0..ab24a47a2fd 100644
---- a/libstdc++-v3/po/Makefile.in
-+++ b/libstdc++-v3/po/Makefile.in
-@@ -548,6 +548,7 @@ uninstall-am:
- 
- 
- .po.mo:
-+	env --unset=LD_LIBRARY_PATH \
- 	$(MSGFMT) -o $@ $<
- 
- all-local: all-local-$(USE_NLS)
--- 
-2.29.2
-

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

@@ -1,28 +0,0 @@
-From 7d4ee7a90b87edd33a7f628ff89ce1b1e0576b4d 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.
-
----
- include/libiberty.h | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/include/libiberty.h b/include/libiberty.h
-index 141cb886a85..fa0e78eb62f 100644
---- a/include/libiberty.h
-+++ b/include/libiberty.h
-@@ -645,8 +645,11 @@ extern int pwait (int, int *, int);
- /* Like sprintf but provides a pointer to malloc'd storage, which must
-    be freed by the caller.  */
- 
-+/* asprintf may be declared as a macro by glibc with __USE_FORTIFY_LEVEL.  */
-+#ifndef asprintf
- extern int asprintf (char **, const char *, ...) ATTRIBUTE_PRINTF_2;
- #endif
-+#endif
- 
- /* Like asprintf but allocates memory without fail. This works like
-    xmalloc.  */
--- 
-2.29.2
-

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

@@ -1,24 +0,0 @@
-From 84b959624e1371f1d02630b6e067f00f46dbe516 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
-
----
- libiberty/Makefile.in | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
-index d6b302e02fd..fd39928546f 100644
---- a/libiberty/Makefile.in
-+++ b/libiberty/Makefile.in
-@@ -263,6 +263,7 @@ $(TARGETLIB): $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS)
- 	  $(AR) $(AR_FLAGS) $(TARGETLIB) \
- 	    $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS); \
- 	  $(RANLIB) $(TARGETLIB); \
-+	  cp $(TARGETLIB) ../ ; \
- 	  cd ..; \
- 	else true; fi
- 
--- 
-2.29.2
-

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

@@ -1,33 +0,0 @@
-From 8ffd575380bc28aaf3c210ad838b205ce2403124 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
-
----
- libitm/configure.tgt | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/libitm/configure.tgt b/libitm/configure.tgt
-index 04109160e91..107b957ece3 100644
---- a/libitm/configure.tgt
-+++ b/libitm/configure.tgt
-@@ -46,6 +46,16 @@ if test "$gcc_cv_have_tls" = yes ; then
-   esac
- fi
- 
-+# FIXME: error: inlining failed in call to always_inline 
-+# ‘int vfprintf(FILE*, const char*, __va_list_tag*)’
-+# : function body can be overwritten at link time
-+# Disable Fortify in libitm for now. #508852
-+case "${target}" in
-+    *-*-linux*)
-+	XCFLAGS="${XCFLAGS} -U_FORTIFY_SOURCE"
-+	;;
-+esac
-+
- # 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.29.2
-

cross/gcc-armhf/0013-libgcc_s.patch

@@ -1,57 +0,0 @@
-From 0d83ea67b2e16658a88068ebce0e25cce22fe75e 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.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.c b/gcc/config/i386/i386-expand.c
-index c6033688f51..a60e5162995 100644
---- a/gcc/config/i386/i386-expand.c
-+++ b/gcc/config/i386/i386-expand.c
-@@ -10966,10 +10966,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_local in libgcc.a. */
- 	tree call_expr, fndecl, type;
-         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); 
- 	return expand_expr (call_expr, target, mode, EXPAND_NORMAL);
-       }
-diff --git a/libgcc/config/i386/cpuinfo.c b/libgcc/config/i386/cpuinfo.c
-index cf5f0884bb4..ed0381e7744 100644
---- a/libgcc/config/i386/cpuinfo.c
-+++ b/libgcc/config/i386/cpuinfo.c
-@@ -510,7 +510,7 @@ __cpu_indicator_init (void)
-   return 0;
- }
- 
--#if defined SHARED && defined USE_ELF_SYMVER
--__asm__ (".symver __cpu_indicator_init, __cpu_indicator_init@GCC_4.8.0");
--__asm__ (".symver __cpu_model, __cpu_model@GCC_4.8.0");
-+#ifndef SHARED
-+int __cpu_indicator_init_local (void)
-+  __attribute__ ((weak, alias ("__cpu_indicator_init")));
- #endif
-diff --git a/libgcc/config/i386/t-linux b/libgcc/config/i386/t-linux
-index 8506a635790..564296f788e 100644
---- a/libgcc/config/i386/t-linux
-+++ b/libgcc/config/i386/t-linux
-@@ -3,5 +3,5 @@
- # t-slibgcc-elf-ver and t-linux
- SHLIB_MAPFILES = libgcc-std.ver $(srcdir)/config/i386/libgcc-glibc.ver
- 
--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.29.2
-

cross/gcc-armhf/0014-nopie.patch

@@ -1,75 +0,0 @@
-From 99ccc2d68049c56519d49e21b6f13cf8d98ea163 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
-
----
- gcc/configure    | 27 +++++++++++++++++++++++++++
- gcc/configure.ac | 13 +++++++++++++
- 2 files changed, 40 insertions(+)
-
-diff --git a/gcc/configure b/gcc/configure
-index 793530e21cf..2d874d3defe 100755
---- a/gcc/configure
-+++ b/gcc/configure
-@@ -30779,6 +30779,33 @@ fi
- $as_echo "$gcc_cv_no_pie" >&6; }
- if test "$gcc_cv_no_pie" = "yes"; then
-   NO_PIE_FLAG="-no-pie"
-+else
-+  # Check if -nopie works.
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -nopie option" >&5
-+$as_echo_n "checking for -nopie option... " >&6; }
-+if test "${gcc_cv_nopie+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  saved_LDFLAGS="$LDFLAGS"
-+     LDFLAGS="$LDFLAGS -nopie"
-+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+int main(void) {return 0;}
-+_ACEOF
-+if ac_fn_cxx_try_link "$LINENO"; then :
-+  gcc_cv_nopie=yes
-+else
-+  gcc_cv_nopie=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+     LDFLAGS="$saved_LDFLAGS"
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_nopie" >&5
-+$as_echo "$gcc_cv_nopie" >&6; }
-+  if test "$gcc_cv_nopie" = "yes"; then
-+    NO_PIE_FLAG="-nopie"
-+  fi
- fi
- 
- 
-diff --git a/gcc/configure.ac b/gcc/configure.ac
-index 0fd438e39e5..0b257e687ee 100644
---- a/gcc/configure.ac
-+++ b/gcc/configure.ac
-@@ -6863,6 +6863,19 @@ AC_CACHE_CHECK([for -no-pie option],
-    LDFLAGS="$saved_LDFLAGS"])
- if test "$gcc_cv_no_pie" = "yes"; then
-   NO_PIE_FLAG="-no-pie"
-+else
-+  # Check if -nopie works.
-+  AC_CACHE_CHECK([for -nopie option],
-+    [gcc_cv_nopie],
-+    [saved_LDFLAGS="$LDFLAGS"
-+     LDFLAGS="$LDFLAGS -nopie"
-+     AC_LINK_IFELSE([int main(void) {return 0;}],
-+       [gcc_cv_nopie=yes],
-+       [gcc_cv_nopie=no])
-+     LDFLAGS="$saved_LDFLAGS"])
-+  if test "$gcc_cv_nopie" = "yes"; then
-+    NO_PIE_FLAG="-nopie"
-+  fi
- fi
- AC_SUBST([NO_PIE_FLAG])
- 
--- 
-2.29.2
-

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

@@ -1,25 +0,0 @@
-From a5a7decc1944cf6831eebc10d71a52ef8496bff5 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.29.2
-

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

@@ -1,425 +0,0 @@
-From 3554a4b751acce2a4f432d1bb24d9fc69a916889 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.29.2
-

cross/gcc-armhf/0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch

@@ -1,51 +0,0 @@
-From abf18c3f7d908f8f4a365bd4d8f9a4743f1d8f0c Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Fri, 21 Aug 2020 06:58:22 +0000
-Subject: [PATCH] dlang: fix fcntl on mips, add libucontext dep
-
----
- libphobos/configure.tgt                      |  1 +
- libphobos/libdruntime/core/sys/posix/fcntl.d | 15 +++++++++++++++
- 2 files changed, 16 insertions(+)
-
-diff --git a/libphobos/configure.tgt b/libphobos/configure.tgt
-index 94e42bf5509..73f2e4b7f01 100644
---- a/libphobos/configure.tgt
-+++ b/libphobos/configure.tgt
-@@ -35,6 +35,7 @@ case "${target}" in
- 	;;
-   mips*-*-linux*)
- 	LIBPHOBOS_SUPPORTED=yes
-+	LIBDRUNTIME_NEEDS_UCONTEXT=yes
- 	;;
-   power*-*-linux*)
- 	LIBPHOBOS_SUPPORTED=yes
-diff --git a/libphobos/libdruntime/core/sys/posix/fcntl.d b/libphobos/libdruntime/core/sys/posix/fcntl.d
-index 9febcff849b..cb34e2108bd 100644
---- a/libphobos/libdruntime/core/sys/posix/fcntl.d
-+++ b/libphobos/libdruntime/core/sys/posix/fcntl.d
-@@ -870,6 +870,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.29.2
-

cross/gcc-armhf/0018-ada-fix-shared-linking.patch

@@ -1,42 +0,0 @@
-From 277c3317929f41e514632d29ff00354c511deb0e 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
-
----
- gcc/ada/link.c | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/gcc/ada/link.c b/gcc/ada/link.c
-index 02c413a412f..f0e52a87d6e 100644
---- a/gcc/ada/link.c
-+++ b/gcc/ada/link.c
-@@ -107,9 +107,9 @@ const char *__gnat_default_libgcc_subdir = "lib";
-    || defined (__NetBSD__) || defined (__OpenBSD__) \
-    || defined (__QNX__)
- const char *__gnat_object_file_option = "-Wl,@";
--const char *__gnat_run_path_option = "-Wl,-rpath,";
--char __gnat_shared_libgnat_default = STATIC;
--char __gnat_shared_libgcc_default = STATIC;
-+const char *__gnat_run_path_option = "";
-+char __gnat_shared_libgnat_default = SHARED;
-+char __gnat_shared_libgcc_default = SHARED;
- int __gnat_link_max = 8192;
- unsigned char __gnat_objlist_file_supported = 1;
- const char *__gnat_object_library_extension = ".a";
-@@ -129,9 +129,9 @@ const char *__gnat_default_libgcc_subdir = "lib";
- 
- #elif defined (__linux__) || defined (__GLIBC__)
- const char *__gnat_object_file_option = "-Wl,@";
--const char *__gnat_run_path_option = "-Wl,-rpath,";
--char __gnat_shared_libgnat_default = STATIC;
--char __gnat_shared_libgcc_default = STATIC;
-+const char *__gnat_run_path_option = "";
-+char __gnat_shared_libgnat_default = SHARED;
-+char __gnat_shared_libgcc_default = SHARED;
- int __gnat_link_max = 8192;
- unsigned char __gnat_objlist_file_supported = 1;
- const char *__gnat_object_library_extension = ".a";
--- 
-2.29.2
-

cross/gcc-armhf/0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch

@@ -1,24 +0,0 @@
-From b1e3ea43462684675cc4f75c2ca4e984a6d511fb 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
-
----
- Makefile.in | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Makefile.in b/Makefile.in
-index 36e369df6e7..63627db68cf 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -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)" \
-+	CXXFLAGS="$(CXXFLAGS_FOR_BUILD)" \
- 	LDFLAGS="$(LDFLAGS_FOR_BUILD)"
- 
- # This is the list of directories to built for the host system.
--- 
-2.29.2
-

cross/gcc-armhf/0020-add-fortify-headers-paths.patch

@@ -1,25 +0,0 @@
-From ea75db47e243b59e7cf793623a87295c0d2aada2 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
-
----
- gcc/config/linux.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/gcc/config/linux.h b/gcc/config/linux.h
-index 95654bcdb5a..d88df8f154a 100644
---- a/gcc/config/linux.h
-+++ b/gcc/config/linux.h
-@@ -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			\
-+    { NATIVE_SYSTEM_HEADER_DIR "/fortify", 0, 0, 0, 1, 2 },	\
-+    { NATIVE_SYSTEM_HEADER_DIR "/fortify", 0, 0, 0, 1, 0 },	\
-     { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 2 },	\
-     { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 0 },
- #else
--- 
-2.29.2
-

cross/gcc-armhf/0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch

@@ -1,31 +0,0 @@
-From 42637405a9cf90d96627406c72dbaf19cca34164 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
- it unconditionally, as otherwise we get link failures if some objects are
- -fstack-protector built and final link happens with -fno-stack-protector.
- This seems to be the common case when bootstrapping gcc, the piepatches do
- not seem to fully fix the crosstoolchain and  bootstrap sequence wrt.
- stack-protector flag usage.
-
----
- gcc/gcc.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/gcc/gcc.c b/gcc/gcc.c
-index daeb4d0c8ea..6920bec0fa0 100644
---- a/gcc/gcc.c
-+++ b/gcc/gcc.c
-@@ -894,8 +894,7 @@ proper position among the other output files.  */
- 
- #ifndef LINK_SSP_SPEC
- #ifdef TARGET_LIBC_PROVIDES_SSP
--#define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
--		       "|fstack-protector-strong|fstack-protector-explicit:}"
-+#define LINK_SSP_SPEC "-lssp_nonshared"
- #else
- #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
- 		       "|fstack-protector-strong|fstack-protector-explicit" \
--- 
-2.29.2
-

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

@@ -1,69 +0,0 @@
-From 64f209a51a7277d778c196c31c58422a04a69238 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.c | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/gcc/gcc.c b/gcc/gcc.c
-index 6920bec0fa0..40e07354b3d 100644
---- a/gcc/gcc.c
-+++ b/gcc/gcc.c
-@@ -696,10 +696,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 "}" \
--		     " %{!static-libasan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
-+		     " %{!static-libasan:--push-state --no-as-needed}" \
- 		     " -lasan " \
- 		     " %{static-libasan:" LD_DYNAMIC_OPTION "}" \
--		     " %{!static-libasan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
-+		     " %{!static-libasan:--pop-state}" \
- 		     STATIC_LIBASAN_LIBS
- #else
- #define LIBASAN_SPEC "-lasan" STATIC_LIBASAN_LIBS
-@@ -717,10 +717,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 "}" \
--		     " %{!static-libtsan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
-+		     " %{!static-libtsan:--push-state --no-as-needed}" \
- 		     " -ltsan " \
- 		     " %{static-libtsan:" LD_DYNAMIC_OPTION "}" \
--		     " %{!static-libtsan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
-+		     " %{!static-libtsan:--pop-state}" \
- 		     STATIC_LIBTSAN_LIBS
- #else
- #define LIBTSAN_SPEC "-ltsan" STATIC_LIBTSAN_LIBS
-@@ -738,10 +738,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 "}" \
--		     " %{!static-liblsan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
-+		     " %{!static-liblsan:--push-state --no-as-needed}" \
- 		     " -llsan " \
- 		     " %{static-liblsan:" LD_DYNAMIC_OPTION "}" \
--		     " %{!static-liblsan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
-+		     " %{!static-liblsan:--pop-state}" \
- 		     STATIC_LIBLSAN_LIBS
- #else
- #define LIBLSAN_SPEC "-llsan" STATIC_LIBLSAN_LIBS
-@@ -757,10 +757,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 "}" \
--		     " %{!static-libubsan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
-+		     " %{!static-libubsan:--push-state --no-as-needed}" \
- 		     " -lubsan " \
- 		     " %{static-libubsan:" LD_DYNAMIC_OPTION "}" \
--		     " %{!static-libubsan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
-+		     " %{!static-libubsan:--pop-state}" \
- 		     STATIC_LIBUBSAN_LIBS
- #else
- #define LIBUBSAN_SPEC "-lubsan" STATIC_LIBUBSAN_LIBS
--- 
-2.29.2
-

cross/gcc-armhf/0023-Pure-64-bit-MIPS.patch

@@ -1,47 +0,0 @@
-From a57f530ace0ce215b1d6e2073223f05417ca2ed4 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] Pure 64-bit MIPS
-
----
- gcc/config/mips/mips.h    | 8 ++++----
- gcc/config/mips/t-linux64 | 6 +++---
- 2 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/gcc/config/mips/mips.h b/gcc/config/mips/mips.h
-index 3ce0c19a29a..b9920b49167 100644
---- a/gcc/config/mips/mips.h
-+++ b/gcc/config/mips/mips.h
-@@ -3424,11 +3424,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
--#define STANDARD_STARTFILE_PREFIX_1 "/lib32/"
--#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib32/"
-+#define STANDARD_STARTFILE_PREFIX_1 "/lib/"
-+#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/"
- #elif MIPS_ABI_DEFAULT == ABI_64
--#define STANDARD_STARTFILE_PREFIX_1 "/lib64/"
--#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib64/"
-+#define STANDARD_STARTFILE_PREFIX_1 "/lib/"
-+#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/"
- #endif
- 
- /* 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 ceb58d3b5f3..8116e23ebba 100644
---- a/gcc/config/mips/t-linux64
-+++ b/gcc/config/mips/t-linux64
-@@ -21,6 +21,6 @@ MULTILIB_DIRNAMES = n32 32 64
- MIPS_EL = $(if $(filter %el, $(firstword $(subst -, ,$(target)))),el)
- MIPS_SOFT = $(if $(strip $(filter MASK_SOFT_FLOAT_ABI, $(target_cpu_default)) $(filter soft, $(with_float))),soft)
- MULTILIB_OSDIRNAMES = \
--	../lib32$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabin32$(MIPS_SOFT)) \
--	../lib$(call if_multiarch,:mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \
--	../lib64$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT))
-+        ../lib \
-+        ../lib32 \
-+        ../lib
--- 
-2.29.2
-

cross/gcc-armhf/0024-use-pure-64-bit-configuration-where-appropriate.patch

@@ -1,121 +0,0 @@
-From 4571e0787fc992d647991e64a64d2b9c82e9a0e6 Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Fri, 21 Aug 2020 07:04:40 +0000
-Subject: [PATCH] use pure 64-bit configuration where appropriate
-
----
- gcc/config/aarch64/t-aarch64-linux | 2 +-
- gcc/config/i386/t-linux64          | 4 ++--
- gcc/config/rs6000/t-linux          | 6 ++++--
- gcc/config/rs6000/t-linux64        | 4 ++--
- gcc/config/rs6000/t-linux64bele    | 4 ++--
- gcc/config/rs6000/t-linux64lebe    | 4 ++--
- gcc/config/s390/t-linux64          | 4 ++--
- 7 files changed, 15 insertions(+), 13 deletions(-)
-
-diff --git a/gcc/config/aarch64/t-aarch64-linux b/gcc/config/aarch64/t-aarch64-linux
-index 83e59e33b85..6ec56fdf6a8 100644
---- a/gcc/config/aarch64/t-aarch64-linux
-+++ b/gcc/config/aarch64/t-aarch64-linux
-@@ -22,7 +22,7 @@ LIB1ASMSRC   = aarch64/lib1funcs.asm
- LIB1ASMFUNCS = _aarch64_sync_cache_range
- 
- AARCH_BE = $(if $(findstring TARGET_BIG_ENDIAN_DEFAULT=1, $(tm_defines)),_be)
--MULTILIB_OSDIRNAMES = mabi.lp64=../lib64$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu)
-+MULTILIB_OSDIRNAMES = mabi.lp64=../lib
- MULTIARCH_DIRNAME = $(call if_multiarch,aarch64$(AARCH_BE)-linux-gnu)
- 
- MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu_ilp32)
-diff --git a/gcc/config/i386/t-linux64 b/gcc/config/i386/t-linux64
-index 1171e218578..256f8c079ba 100644
---- a/gcc/config/i386/t-linux64
-+++ b/gcc/config/i386/t-linux64
-@@ -33,6 +33,6 @@
- comma=,
- MULTILIB_OPTIONS    = $(subst $(comma),/,$(TM_MULTILIB_CONFIG))
- MULTILIB_DIRNAMES   = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS)))
--MULTILIB_OSDIRNAMES = m64=../lib64$(call if_multiarch,:x86_64-linux-gnu)
--MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:i386-linux-gnu)
-+MULTILIB_OSDIRNAMES = m64=../lib
-+MULTILIB_OSDIRNAMES+= m32=../lib32
- MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32)
-diff --git a/gcc/config/rs6000/t-linux b/gcc/config/rs6000/t-linux
-index aeb7440c492..ab14c455d8d 100644
---- a/gcc/config/rs6000/t-linux
-+++ b/gcc/config/rs6000/t-linux
-@@ -2,7 +2,8 @@
- # or soft-float.
- ifeq (,$(filter $(with_cpu),$(SOFT_FLOAT_CPUS))$(findstring soft,$(with_float)))
- ifneq (,$(findstring powerpc64,$(target)))
--MULTILIB_OSDIRNAMES := .=../lib64$(call if_multiarch,:powerpc64-linux-gnu)
-+MULTILIB_OSDIRNAMES := m64=../lib
-+MULTILIB_OSDIRNAMES += m32=../lib32
- else
- MULTIARCH_DIRNAME := $(call if_multiarch,powerpc-linux-gnu)
- endif
-@@ -10,7 +11,8 @@ ifneq (,$(findstring powerpcle,$(target)))
- MULTIARCH_DIRNAME := $(subst -linux,le-linux,$(MULTIARCH_DIRNAME))
- endif
- ifneq (,$(findstring powerpc64le,$(target)))
--MULTILIB_OSDIRNAMES := $(subst -linux,le-linux,$(MULTILIB_OSDIRNAMES))
-+MULTILIB_OSDIRNAMES := m64=../lib
-+MULTILIB_OSDIRNAMES += m32=../lib32
- endif
- endif
- 
-diff --git a/gcc/config/rs6000/t-linux64 b/gcc/config/rs6000/t-linux64
-index 264a7e27524..d1e460811cc 100644
---- a/gcc/config/rs6000/t-linux64
-+++ b/gcc/config/rs6000/t-linux64
-@@ -28,8 +28,8 @@
- MULTILIB_OPTIONS    := m64/m32
- MULTILIB_DIRNAMES   := 64 32
- MULTILIB_EXTRA_OPTS := 
--MULTILIB_OSDIRNAMES := m64=../lib64$(call if_multiarch,:powerpc64-linux-gnu)
--MULTILIB_OSDIRNAMES += m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:powerpc-linux-gnu)
-+MULTILIB_OSDIRNAMES := m64=../lib
-+MULTILIB_OSDIRNAMES += m32=../lib32
- 
- 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
---- a/gcc/config/rs6000/t-linux64bele
-+++ b/gcc/config/rs6000/t-linux64bele
-@@ -2,6 +2,6 @@
- 
- MULTILIB_OPTIONS    += mlittle
- MULTILIB_DIRNAMES   += le
--MULTILIB_OSDIRNAMES += $(subst =,.mlittle=,$(subst lible32,lib32le,$(subst lible64,lib64le,$(subst lib,lible,$(subst -linux,le-linux,$(MULTILIB_OSDIRNAMES))))))
--MULTILIB_OSDIRNAMES += $(subst $(if $(findstring 64,$(target)),m64,m32).,,$(filter $(if $(findstring 64,$(target)),m64,m32).mlittle%,$(MULTILIB_OSDIRNAMES)))
-+MULTILIB_OSDIRNAMES = m64=../lib
-+MULTILIB_OSDIRNAMES+= m32=../lib32
- MULTILIB_MATCHES    := ${MULTILIB_MATCHES_ENDIAN}
-diff --git a/gcc/config/rs6000/t-linux64lebe b/gcc/config/rs6000/t-linux64lebe
-index 2e63bdb9fc9..c6e1c5db65d 100644
---- a/gcc/config/rs6000/t-linux64lebe
-+++ b/gcc/config/rs6000/t-linux64lebe
-@@ -2,6 +2,6 @@
- 
- MULTILIB_OPTIONS    += mbig
- MULTILIB_DIRNAMES   += be
--MULTILIB_OSDIRNAMES += $(subst =,.mbig=,$(subst libbe32,lib32be,$(subst libbe64,lib64be,$(subst lib,libbe,$(subst le-linux,-linux,$(MULTILIB_OSDIRNAMES))))))
--MULTILIB_OSDIRNAMES += $(subst $(if $(findstring 64,$(target)),m64,m32).,,$(filter $(if $(findstring 64,$(target)),m64,m32).mbig%,$(MULTILIB_OSDIRNAMES)))
-+MULTILIB_OSDIRNAMES := m64=../lib
-+MULTILIB_OSDIRNAMES += m32=../lib32
- MULTILIB_MATCHES    := ${MULTILIB_MATCHES_ENDIAN}
-diff --git a/gcc/config/s390/t-linux64 b/gcc/config/s390/t-linux64
-index cc6ab367072..7f498ee1cdc 100644
---- a/gcc/config/s390/t-linux64
-+++ b/gcc/config/s390/t-linux64
-@@ -7,5 +7,5 @@
- 
- MULTILIB_OPTIONS = m64/m31
- MULTILIB_DIRNAMES = 64 32
--MULTILIB_OSDIRNAMES = ../lib64$(call if_multiarch,:s390x-linux-gnu)
--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.29.2
-