Force reboot on kernel panic

2020-12-05 01:36:47 +01:00
1130 changed files with 32488 additions and 101406 deletions
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright 2021 Oliver Smith
+# Copyright 2020 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later
 import sys

@@ -15,9 +15,8 @@ import pmb.helpers.pmaports

 def build_strict(packages, arch):
    common.run_pmbootstrap(["build_init"])
-    common.run_pmbootstrap(["--details-to-stdout", "--no-ccache", "build",
-                            "--strict", "--force",
-                            "--arch", arch, ] + list(packages))
+    common.run_pmbootstrap(["--details-to-stdout", "build", "--strict",
+                            "--force", "--arch", arch] + list(packages))


 def verify_checksums(packages, arch):
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright 2021 Oliver Smith
+# Copyright 2020 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later

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

 import argparse
@@ -16,14 +16,6 @@ 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)

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

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

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

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

 set -e
@@ -15,7 +15,8 @@ fi

 # Shell: shellcheck
 sh_files="
-	./main/postmarketos-base/rootfs-usr-lib-firmwareload.sh
+	./main/postmarketos-base/firmwareload.sh
+	./main/postmarketos-base/elogind-system-suspend-disable-conditions.hook
 	./main/postmarketos-mkinitfs/init.sh.in
 	./main/postmarketos-mkinitfs/init_functions.sh
 	./main/postmarketos-mkinitfs/mkinitfs.sh
@@ -35,7 +36,6 @@ sh_files="

 	$(find . -name '*.trigger')
 	$(find . -path './main/devicepkg-dev/*.sh')
-	$(find . -path './main/postmarketos-mvcfg/*.sh')

 	$(find . -path '.gitlab-ci/*.sh')
 "
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright 2021 Oliver Smith
+# Copyright 2020 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later

 import shutil
@@ -1,25 +0,0 @@
-#!/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(args.logfd.close)
-    return args
@@ -0,0 +1,244 @@
+#!/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
+    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 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 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):
+        print(f"Checking {apkbuild_path}...")
+        apkbuild = pmb.parse.apkbuild(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 rel_file_path not in apkbuild["source"] \
+                    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}'")
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright 2021 Oliver Smith
+# Copyright 2020 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later

 """ Make sure that components of frameworks (Qt, KDE, ...) have the same
@@ -17,6 +17,21 @@ 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.
@@ -1,128 +0,0 @@
-#!/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)
-
-
-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"
@@ -1,60 +0,0 @@
-#!/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
@@ -10,12 +10,10 @@ expected_directories = [
    "device/community",
    "device/main",
    "device/testing",
-    "device/unmaintained",
    "kde",
    "maemo",
    "main",
    "modem",
-    "non-free",
    "sxmo",
    "temp",
 ]
@@ -1,23 +0,0 @@
-#!/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(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}")
@@ -1,40 +0,0 @@
-#!/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}'")
@@ -1,97 +0,0 @@
-#!/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}")
@@ -1,9 +0,0 @@
-# https://docs.gitlab.com/ee/user/project/code_owners.html
-
-device/*/*-pine64-pinephone/        @craftyguy @milesalan
-device/*/*-purism-librem5/          @craftyguy
-main/osk-sdl/                       @craftyguy
-main/mesa-pvr-dri-classic/          @xc-racer99
-temp/u-boot-librem5/                @craftyguy
-
-# vim: ts=4 sw=4 et
@@ -13,9 +13,3 @@ description=Stable release channel (first beta v20.05, does not have many device
 branch_pmaports=v20.05
 branch_aports=3.12-stable
 mirrordir_alpine=v3.12
-
-[stable-next]
-description=Upcoming second beta v21.03. DO NOT USE.
-branch_pmaports=v21.03
-branch_aports=3.13-stable
-mirrordir_alpine=v3.13
@@ -3,8 +3,8 @@
 # Based on: main/binutils

 pkgname=binutils-aarch64
-pkgver=2.35.2
-pkgrel=0
+pkgver=2.35.1
+pkgrel=1
 pkgdesc="Tools necessary to build programs for aarch64 targets"
 url="https://www.gnu.org/software/binutils/"
 makedepends="gettext libtool autoconf automake bison texinfo"
@@ -60,7 +60,7 @@ package() {



-sha512sums="9974ede5978d32e0d68fef23da48fa00bd06b0bff7ec45b00ca075c126d6bbe0cf2defc03ecc3f17bc6cc85b64271a13009c4049d7ba17de26e84e3a6e2c0348  binutils-2.35.2.tar.xz
+sha512sums="94ff72708403413b70b247f3af4099ebaa882b6659249869f1ed9941a0f1912e313f08357d470f9fd2359e7f5e5b0eb86285e5eaf883fa8187789d6b1bd304eb  binutils-2.35.1.tar.xz
 ecee33b0e435aa704af1c334e560f201638ff79e199aa11ed78a72f7c9b46f85fbb227af5748e735fd681d1965fcc42ac81b0c8824e540430ce0c706c81e8b49  binutils-ld-fix-static-linking.patch
 f55cf2e0bf82f97583a1abe10710e4013ecf7d64f1da2ef8659a44a06d0dd8beaf58dab98a183488ea137f03e32d62efc878d95f018f836f8cec870bc448556f  gold-mips.patch
 314d2ef9071c89940aa6c8118e8a1e2f191a5d0a4bf596da1ad9cc84f884d8bc7dea8bd7b9fc3f8f1bddd3fd41c6eb017e1e804044b3bf084df1ed9e6e095e2d  ld-bfd-mips.patch
@@ -3,8 +3,8 @@
 # Based on: main/binutils

 pkgname=binutils-armhf
-pkgver=2.35.2
-pkgrel=0
+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"
@@ -60,7 +60,7 @@ package() {



-sha512sums="9974ede5978d32e0d68fef23da48fa00bd06b0bff7ec45b00ca075c126d6bbe0cf2defc03ecc3f17bc6cc85b64271a13009c4049d7ba17de26e84e3a6e2c0348  binutils-2.35.2.tar.xz
+sha512sums="94ff72708403413b70b247f3af4099ebaa882b6659249869f1ed9941a0f1912e313f08357d470f9fd2359e7f5e5b0eb86285e5eaf883fa8187789d6b1bd304eb  binutils-2.35.1.tar.xz
 ecee33b0e435aa704af1c334e560f201638ff79e199aa11ed78a72f7c9b46f85fbb227af5748e735fd681d1965fcc42ac81b0c8824e540430ce0c706c81e8b49  binutils-ld-fix-static-linking.patch
 f55cf2e0bf82f97583a1abe10710e4013ecf7d64f1da2ef8659a44a06d0dd8beaf58dab98a183488ea137f03e32d62efc878d95f018f836f8cec870bc448556f  gold-mips.patch
 314d2ef9071c89940aa6c8118e8a1e2f191a5d0a4bf596da1ad9cc84f884d8bc7dea8bd7b9fc3f8f1bddd3fd41c6eb017e1e804044b3bf084df1ed9e6e095e2d  ld-bfd-mips.patch
@@ -3,8 +3,8 @@
 # Based on: main/binutils

 pkgname=binutils-armv7
-pkgver=2.35.2
-pkgrel=0
+pkgver=2.35.1
+pkgrel=1
 pkgdesc="Tools necessary to build programs for armv7 targets"
 url="https://www.gnu.org/software/binutils/"
 makedepends="gettext libtool autoconf automake bison texinfo"
@@ -60,7 +60,7 @@ package() {



-sha512sums="9974ede5978d32e0d68fef23da48fa00bd06b0bff7ec45b00ca075c126d6bbe0cf2defc03ecc3f17bc6cc85b64271a13009c4049d7ba17de26e84e3a6e2c0348  binutils-2.35.2.tar.xz
+sha512sums="94ff72708403413b70b247f3af4099ebaa882b6659249869f1ed9941a0f1912e313f08357d470f9fd2359e7f5e5b0eb86285e5eaf883fa8187789d6b1bd304eb  binutils-2.35.1.tar.xz
 ecee33b0e435aa704af1c334e560f201638ff79e199aa11ed78a72f7c9b46f85fbb227af5748e735fd681d1965fcc42ac81b0c8824e540430ce0c706c81e8b49  binutils-ld-fix-static-linking.patch
 f55cf2e0bf82f97583a1abe10710e4013ecf7d64f1da2ef8659a44a06d0dd8beaf58dab98a183488ea137f03e32d62efc878d95f018f836f8cec870bc448556f  gold-mips.patch
 314d2ef9071c89940aa6c8118e8a1e2f191a5d0a4bf596da1ad9cc84f884d8bc7dea8bd7b9fc3f8f1bddd3fd41c6eb017e1e804044b3bf084df1ed9e6e095e2d  ld-bfd-mips.patch
@@ -7,7 +7,7 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi

 pkgname=busybox-static-aarch64
-pkgver=1.33.0
+pkgver=1.32.0
 pkgrel=4

 _arch="aarch64"
@@ -31,4 +31,4 @@ package() {
 	rm .PKGINFO .SIGN.*
 }

-sha512sums="22c84dbba288a1021acbeed751042bbad20a77b23c480f2d6f71911ca0c504e292e65a23051473ee852ce361c941a4192f84ed76dd25884e1b9bf50fe1ba4025  busybox-static-1.33.0-r4-aarch64-edge.apk"
+sha512sums="c101e490becccf14381bece807738bf29827d53f7d803b198068f7ecf420d46b77701185da98faa3cc19ea2b6a2ac6b564665e0dedb5aa56cb59f1a4931f278b  busybox-static-1.32.0-r4-aarch64-edge.apk"
@@ -7,7 +7,7 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi

 pkgname=busybox-static-armhf
-pkgver=1.33.0
+pkgver=1.32.0
 pkgrel=4

 _arch="armhf"
@@ -31,4 +31,4 @@ package() {
 	rm .PKGINFO .SIGN.*
 }

-sha512sums="29922227f76047bb0569aeafed82257eb55e29f7242976feaa887fa61b968654dad32c321cb3b0e628b35da3dc3203ab450192627327fa4a9a8203053c0ebb07  busybox-static-1.33.0-r4-armhf-edge.apk"
+sha512sums="52acbc4b39adf80b5c31cc221aee96666327803c1b5eb70377e245b3cdc4da05bd81d095b4a8e7d01a8c2e379198e5ae4df0c7d21dc7fa6a7843b3e64460b382  busybox-static-1.32.0-r4-armhf-edge.apk"
@@ -7,7 +7,7 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi

 pkgname=busybox-static-armv7
-pkgver=1.33.0
+pkgver=1.32.0
 pkgrel=4

 _arch="armv7"
@@ -31,4 +31,4 @@ package() {
 	rm .PKGINFO .SIGN.*
 }

-sha512sums="949c0e3198e6a135df1959d0aa339c9eab06897fe920656d1f0ba23adca927dc233480d2a33e49dda6a100d1775f8e39fcc664d7716c02f362f8be18d261cd92  busybox-static-1.33.0-r4-armv7-edge.apk"
+sha512sums="fcc7619f591b44992b03268dff2c0cfade24577bcb277006794c628f8de7093107a0c191f320e7d2e307aa0680be3b93d2e433a1d1527c035f966ecdb8ed7b0f  busybox-static-1.32.0-r4-armv7-edge.apk"
@@ -1,7 +1,7 @@
-From 56ba7da205f1ec49b1379ab40d533c2e2d70a1a7 Mon Sep 17 00:00:00 2001
+From 4ed2cc3054f444c683f54954c32e586a54066337 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
+Subject: [PATCH 01/40] posix_memalign

 ---
 gcc/config/i386/pmm_malloc.h | 9 +++++----
@@ -38,5 +38,5 @@ index 87344d9383f..ece428df487 100644
   else
     return NULL;
 -- 
-2.31.0
+2.29.2

@@ -1,7 +1,7 @@
-From 4c53f798c9823dcfc7fe8e2dd26de0077545069d Mon Sep 17 00:00:00 2001
+From 09a32a40b34477cd787deb12833c063a09dea7b2 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
+Subject: [PATCH 02/40] 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
@@ -26,7 +26,7 @@ Upstream-Status: Pending
 7 files changed, 68 insertions(+)

 diff --git a/gcc/common.opt b/gcc/common.opt
-index 9cc47b16cac..d8b2e237d89 100644
+index dfed6ec76ba..8bb65e0e1af 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 8fe9c91fd7c..17b878e4b4e 100755
+index b4088d8fd1e..793530e21cf 100755
 --- a/gcc/configure
 +++ b/gcc/configure
@@ -1010,6 +1010,7 @@ with_system_zlib
@@ -78,7 +78,7 @@ index 8fe9c91fd7c..17b878e4b4e 100755
   --enable-plugin         enable plugin support
   --enable-host-shared    build host code as shared libraries
   --disable-libquadmath-support
-@@ -30276,6 +30279,19 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then :
+@@ -30271,6 +30274,19 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then :
 fi
 
 
@@ -99,10 +99,10 @@ index 8fe9c91fd7c..17b878e4b4e 100755
 
 
 diff --git a/gcc/configure.ac b/gcc/configure.ac
-index 84dceb8074a..bf64ffbe46f 100644
+index 070b9c6c497..0fd438e39e5 100644
 --- a/gcc/configure.ac
 +++ b/gcc/configure.ac
-@@ -6608,6 +6608,16 @@ AC_ARG_ENABLE(version-specific-runtime-libs,
+@@ -6605,6 +6605,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 84dceb8074a..bf64ffbe46f 100644
 AC_SUBST(subdirs)
 AC_SUBST(srcdir)
 diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index 0c1b5975e6b..ede239a0ccd 100644
+index 0d532a64bfe..86e57038042 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.31.0
+2.29.2

@@ -1,7 +1,7 @@
-From caf66e830299ba0a865041800ea9b32a3091f141 Mon Sep 17 00:00:00 2001
+From 77e75a23e9bdf8863823225567c509b6fed49e6e 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.
+Subject: [PATCH 03/40] Turn on -Wl,-z,relro,-z,now by default.

 ---
 gcc/doc/invoke.texi | 3 +++
@@ -9,10 +9,10 @@ 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 ede239a0ccd..43d02c26a1a 100644
+index 86e57038042..87ff404bc20 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
+@@ -14645,6 +14645,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}.
 
@@ -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.31.0
+2.29.2

@@ -1,8 +1,8 @@
-From 48413b53fb7c9d780b55b84eaf6c70f154719907 Mon Sep 17 00:00:00 2001
+From 3b76b0c848746d4adbc4e8db408efd41aefb829c 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
+Subject: [PATCH 04/40] 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 ++++
@@ -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 43d02c26a1a..78469ebe55d 100644
+index 87ff404bc20..01e67e97491 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 43d02c26a1a..78469ebe55d 100644
 @opindex O3
 Optimize yet more.  @option{-O3} turns on all optimizations specified
 -- 
-2.31.0
+2.29.2

@@ -1,8 +1,8 @@
-From 31ec8fceef33284c4ed3ca4bb97e4a24eb088265 Mon Sep 17 00:00:00 2001
+From 483912c560424ee8b5cc996990d45802671fc73f 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.
+Subject: [PATCH 05/40] 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 +
@@ -265,5 +265,5 @@ index 625c9ab7902..7aec9d3a016 100644
 #else
 #define LIBUBSAN_SPEC "-lubsan" STATIC_LIBUBSAN_LIBS
 -- 
-2.31.0
+2.29.2

@@ -1,7 +1,7 @@
-From 1a17780987ee63da34d330e9a2b186751c929c46 Mon Sep 17 00:00:00 2001
+From c57a8b43401ca9a1b889fa9fd421ac49c3dbd380 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.
+Subject: [PATCH 06/40] Enable -Wformat and -Wformat-security by default.

 ---
 gcc/c-family/c.opt | 4 ++--
@@ -30,5 +30,5 @@ index c49da99d395..93f25319005 100644
 
 Wformat-overflow=
 -- 
-2.31.0
+2.29.2

@@ -1,14 +1,14 @@
-From 901acffb0caae749c5b830d01a6e858f34311cd5 Mon Sep 17 00:00:00 2001
+From a58dad2c52639422671ac6986c36e48499fc2f20 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.
+Subject: [PATCH 07/40] 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 d8b2e237d89..5087ae84d49 100644
+index 8bb65e0e1af..ace932b300d 100644
 --- a/gcc/common.opt
 +++ b/gcc/common.opt
@@ -774,7 +774,7 @@ Common Var(warn_system_headers) Warning
@@ -21,5 +21,5 @@ index d8b2e237d89..5087ae84d49 100644
 
 Wtype-limits
 -- 
-2.31.0
+2.29.2

@@ -1,8 +1,8 @@
-From 4d09aa762edd682ffb7665b21f7ecd6e1cf90a3f Mon Sep 17 00:00:00 2001
+From 98b2b8f7de60ed1b6b7602124ef6db278cf3c212 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.
+Subject: [PATCH 08/40] Disable ssp on -nostdlib, -nodefaultlibs and
+ -ffreestanding Change the buffer size.

 ---
 gcc/gcc.c      | 8 +++++++-
@@ -49,5 +49,5 @@ index 4aec480798b..eaecfab37ad 100644
 
 -param=stack-clash-protection-guard-size=
 -- 
-2.31.0
+2.29.2

@@ -1,8 +1,8 @@
-From e9b5aa5bb3788b2600a719d3b5ed56e3397ec0ad Mon Sep 17 00:00:00 2001
+From 035775ef38206ed2859500efe5fb42ceec2e858d 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.
+Subject: [PATCH 09/40] Ensure that msgfmt doesn't encounter problems during
+ gcc bootstrapping.

 Solves error messages like the following:

@@ -50,5 +50,5 @@ index a0f84b0cfa0..ab24a47a2fd 100644
 
 all-local: all-local-$(USE_NLS)
 -- 
-2.31.0
+2.29.2

@@ -1,7 +1,7 @@
-From d87e3805d5f308798e82008b9b3c3440958b6f20 Mon Sep 17 00:00:00 2001
+From e9875d74e75c601b95dba677bc9e58c869150212 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.
+Subject: [PATCH 10/40] Don't declare asprintf if defined as a macro.

 ---
 include/libiberty.h | 3 +++
@@ -24,5 +24,5 @@ index 141cb886a85..fa0e78eb62f 100644
 /* Like asprintf but allocates memory without fail. This works like
    xmalloc.  */
 -- 
-2.31.0
+2.29.2

@@ -1,7 +1,7 @@
-From 33b3fa0e5bc57219de066c04beaf4fcd09054812 Mon Sep 17 00:00:00 2001
+From 764e64bba73a7b7eb5154c8537781412252ed33e 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
+Subject: [PATCH 11/40] libiberty: copy PIC objects during build process

 ---
 libiberty/Makefile.in | 1 +
@@ -20,5 +20,5 @@ index d6b302e02fd..fd39928546f 100644
 	else true; fi
 
 -- 
-2.31.0
+2.29.2

@@ -1,17 +1,17 @@
-From 0538fa07136fefd76a0b958db48cd6a06eaf630c Mon Sep 17 00:00:00 2001
+From da46d99b1b7661a98064a45bdccf08c1867582b0 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
+Subject: [PATCH 12/40] libitm: disable FORTIFY

 ---
 libitm/configure.tgt | 10 ++++++++++
 1 file changed, 10 insertions(+)

 diff --git a/libitm/configure.tgt b/libitm/configure.tgt
-index d1beb5c9ec8..c2b50b95c01 100644
+index 04109160e91..107b957ece3 100644
 --- a/libitm/configure.tgt
 +++ b/libitm/configure.tgt
-@@ -47,6 +47,16 @@ if test "$gcc_cv_have_tls" = yes ; then
+@@ -46,6 +46,16 @@ if test "$gcc_cv_have_tls" = yes ; then
   esac
 fi
 
@@ -29,5 +29,5 @@ index d1beb5c9ec8..c2b50b95c01 100644
 # work out any special compilation flags as necessary.
 case "${target_cpu}" in
 -- 
-2.31.0
+2.29.2

@@ -1,7 +1,7 @@
-From 7f4a2e2f3ab6b649538f3fd775a6f7a5507de543 Mon Sep 17 00:00:00 2001
+From 354f2a8ceb70f9f6e1688ba41c1cc1c17ac87329 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
+Subject: [PATCH 13/40] libgcc_s

 ---
 gcc/config/i386/i386-expand.c | 4 ++--
@@ -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 47d52550e5e..9cb8cc7950e 100644
+index c6033688f51..a60e5162995 100644
 --- a/gcc/config/i386/i386-expand.c
 +++ b/gcc/config/i386/i386-expand.c
-@@ -10976,10 +10976,10 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget,
+@@ -10966,10 +10966,10 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget,
     {
     case IX86_BUILTIN_CPU_INIT:
       {
@@ -53,5 +53,5 @@ index 8506a635790..564296f788e 100644
 +HOST_LIBGCC2_CFLAGS += -mlong-double-80 $(CET_FLAGS)
 CRTSTUFF_T_CFLAGS += $(CET_FLAGS)
 -- 
-2.31.0
+2.29.2

@@ -1,7 +1,7 @@
-From 6c3e5f01e4ac338e85b1a6b5956699d882705882 Mon Sep 17 00:00:00 2001
+From 7fb84007ff62309abffdbddfa751e69c331e82c3 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
+Subject: [PATCH 14/40] nopie

 ---
 gcc/configure    | 27 +++++++++++++++++++++++++++
@@ -9,10 +9,10 @@ Subject: [PATCH] nopie
 2 files changed, 40 insertions(+)

 diff --git a/gcc/configure b/gcc/configure
-index 17b878e4b4e..808570b6c99 100755
+index 793530e21cf..2d874d3defe 100755
 --- a/gcc/configure
 +++ b/gcc/configure
-@@ -30784,6 +30784,33 @@ fi
+@@ -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"
@@ -47,10 +47,10 @@ index 17b878e4b4e..808570b6c99 100755
 
 
 diff --git a/gcc/configure.ac b/gcc/configure.ac
-index bf64ffbe46f..9c2571de709 100644
+index 0fd438e39e5..0b257e687ee 100644
 --- a/gcc/configure.ac
 +++ b/gcc/configure.ac
-@@ -6866,6 +6866,19 @@ AC_CACHE_CHECK([for -no-pie option],
+@@ -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"
@@ -71,5 +71,5 @@ index bf64ffbe46f..9c2571de709 100644
 AC_SUBST([NO_PIE_FLAG])
 
 -- 
-2.31.0
+2.29.2

@@ -1,7 +1,7 @@
-From 66657865719efb0a86ea2ab75511cb326e8aa46f Mon Sep 17 00:00:00 2001
+From 3f764eb6dc371cc48cfdf231cbd40e64b1f2a671 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
+Subject: [PATCH 15/40] libffi: use __linux__ instead of __gnu_linux__ for musl

 ---
 libffi/src/closures.c | 2 +-
@@ -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.31.0
+2.29.2

@@ -1,7 +1,7 @@
-From b8a954b1e4033ff559e312d693c74e90e3f13210 Mon Sep 17 00:00:00 2001
+From b78dea0f8f09d4092bec52b7ada719ead2552dd2 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
+Subject: [PATCH 16/40] dlang: update zlib binding

 ---
 libphobos/src/std/zlib.d | 266 ++++++++++++++++++++++++++++-----------
@@ -421,5 +421,5 @@ index e6cce240fd5..bd2fe37ebec 100644
 }
 
 -- 
-2.31.0
+2.29.2

@@ -1,7 +1,7 @@
-From 4d1fe9d5df3ab850df21d68c73d2d3c601910288 Mon Sep 17 00:00:00 2001
+From 58c529af8a9673b90dc7137065ab788c25b358a8 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
+Subject: [PATCH 17/40] dlang: fix fcntl on mips, add libucontext dep

 ---
 libphobos/configure.tgt                      |  1 +
@@ -47,5 +47,5 @@ index 9febcff849b..cb34e2108bd 100644
         static assert(0, "Platform not supported");
 
 -- 
-2.31.0
+2.29.2

@@ -1,7 +1,7 @@
-From 04d8d2c7052c0e92825b4246da0df9ac8753701e Mon Sep 17 00:00:00 2001
+From 2a614f9b702b02c312cd513eddb1fc6745f9a3ad 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
+Subject: [PATCH 18/40] ada: fix shared linking

 ---
 gcc/ada/link.c | 12 ++++++------
@@ -38,5 +38,5 @@ index 02c413a412f..f0e52a87d6e 100644
 unsigned char __gnat_objlist_file_supported = 1;
 const char *__gnat_object_library_extension = ".a";
 -- 
-2.31.0
+2.29.2

@@ -1,7 +1,7 @@
-From 3da9a00035f6052926918200fdbeff478ff88d28 Mon Sep 17 00:00:00 2001
+From dab36b973223e0d6853f564e845bc22dadcc4d2d 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
+Subject: [PATCH 19/40] build: fix CXXFLAGS_FOR_BUILD passing

 ---
 Makefile.in | 1 +
@@ -20,5 +20,5 @@ index 36e369df6e7..63627db68cf 100644
 
 # This is the list of directories to built for the host system.
 -- 
-2.31.0
+2.29.2

@@ -0,0 +1,32 @@
+From c2efb7703c2ef381a8b1d1cd751222e0a7e10665 Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Fri, 21 Aug 2020 07:00:17 +0000
+Subject: [PATCH 20/40] libstdc++: futex: add time64 compatibility
+
+---
+ libstdc++-v3/src/c++11/futex.cc | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/libstdc++-v3/src/c++11/futex.cc b/libstdc++-v3/src/c++11/futex.cc
+index c9de11a7ec7..7be702dbeda 100644
+--- a/libstdc++-v3/src/c++11/futex.cc
+++ b/libstdc++-v3/src/c++11/futex.cc
+@@ -61,7 +61,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
+ 	struct timeval tv;
+ 	gettimeofday (&tv, NULL);
+ 	// Convert the absolute timeout value to a relative timeout
+#if defined(SYS_futex_time64)
+	struct
+	  {
+	    long tv_sec;
+	    long tv_nsec;
+	  } rt;
+#else
+ 	struct timespec rt;
+#endif
+ 	rt.tv_sec = __s.count() - tv.tv_sec;
+ 	rt.tv_nsec = __ns.count() - tv.tv_usec * 1000;
+ 	if (rt.tv_nsec < 0)
+-- 
+2.29.2
+
@@ -1,7 +1,7 @@
-From 1274452fed850d4910aac101aa50c26a2011e15f Mon Sep 17 00:00:00 2001
+From ca8a8331acef15d0b3b095b8c63539acd1d93e8b 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
+Subject: [PATCH 21/40] add fortify-headers paths

 ---
 gcc/config/linux.h | 2 ++
@@ -21,5 +21,5 @@ index 95654bcdb5a..d88df8f154a 100644
     { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 0 },
 #else
 -- 
-2.31.0
+2.29.2

@@ -1,9 +1,9 @@
-From 427c95f4cd889f97983d2b5ac4de6501bcf53166 Mon Sep 17 00:00:00 2001
+From 23468db70f830e99ac138826d28cc33fa71d3405 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.
+Subject: [PATCH 22/40] 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.
@@ -27,5 +27,5 @@ index daeb4d0c8ea..6920bec0fa0 100644
 #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
 		       "|fstack-protector-strong|fstack-protector-explicit" \
 -- 
-2.31.0
+2.29.2

@@ -1,7 +1,7 @@
-From d3440b3e7d5d9448309b4c3f74487f4c05726a5a Mon Sep 17 00:00:00 2001
+From 67513cb76a43014172f54384c3bad0c41e949c8a 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
+Subject: [PATCH 23/40] DP: Use --push-state/--pop-state for gold as well when
 linking libtsan.

 ---
@@ -65,5 +65,5 @@ index 6920bec0fa0..40e07354b3d 100644
 #else
 #define LIBUBSAN_SPEC "-lubsan" STATIC_LIBUBSAN_LIBS
 -- 
-2.31.0
+2.29.2

@@ -1,7 +1,7 @@
-From 5b1bffa6323f1e9f981f1db2b574a876ebcf2bd6 Mon Sep 17 00:00:00 2001
+From 5d9d38da4f523c052a5bcd2562d79809b4136f2c 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
+Subject: [PATCH 24/40] Pure 64-bit MIPS

 ---
 gcc/config/mips/mips.h    | 8 ++++----
@@ -43,5 +43,5 @@ index ceb58d3b5f3..8116e23ebba 100644
 +        ../lib32 \
 +        ../lib
 -- 
-2.31.0
+2.29.2

@@ -1,7 +1,7 @@
-From 7a38f81aa9cc5ed4a39b54480209e29615bd6594 Mon Sep 17 00:00:00 2001
+From ac0eeb3237ac2cf75c19be92afe3335c9a0d83bb 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
+Subject: [PATCH 25/40] use pure 64-bit configuration where appropriate

 ---
 gcc/config/aarch64/t-aarch64-linux | 2 +-
@@ -117,5 +117,5 @@ index cc6ab367072..7f498ee1cdc 100644
 +MULTILIB_OSDIRNAMES = m64=../lib
 +MULTILIB_OSDIRNAMES+= m32=../lib32
 -- 
-2.31.0
+2.29.2

@@ -1,7 +1,7 @@
-From eb4c45fb32845cf9ed5e3627380d889f972dbb02 Mon Sep 17 00:00:00 2001
+From 3f35cf750117fa7cbceaf33e4bea008d0688bd93 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
+Subject: [PATCH 26/40] always build libgcc_eh.a

 highly inspired by:
  http://landley.net/hg/aboriginal/file/7e0747a665ab/sources/patches/gcc-core-libgcceh.patch
@@ -47,5 +47,5 @@ index 851e7657d07..99ec513a1a6 100644
 	for file in $$parts; do					\
 	  rm -f $(DESTDIR)$(inst_libdir)/$$file;		\
 -- 
-2.31.0
+2.29.2

@@ -1,7 +1,7 @@
-From f06868abe42037e8a97fb1e724df56a81b6d3b36 Mon Sep 17 00:00:00 2001
+From 48342d154084bb9610b8f02f93fcfc2aa606595a 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
+Subject: [PATCH 27/40] ada: libgnarl compatibility for musl

 ---
 gcc/ada/libgnarl/s-osinte__linux.ads | 11 ------
@@ -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 ef449af33d1..bd7312e6686 100644
+index 80cb2b2a793..701b7a3aeab 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.31.0
+2.29.2

@@ -1,7 +1,7 @@
-From b87099f99e9b97efa684d59a63a7585bc0ae7c34 Mon Sep 17 00:00:00 2001
+From 0d517a7c90f9e21616c8ad0c66e24c1554f6658c 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
+Subject: [PATCH 28/40] ada: musl support fixes

 ---
 gcc/ada/Makefile.rtl | 10 +++++-----
@@ -219,5 +219,5 @@ index af4417fab90..bab6bf3ca87 100644
   status = openpty (&master_fd, &slave_fd, NULL, NULL, NULL);
 #elif defined (USE_CLONE_DEVICE)
 -- 
-2.31.0
+2.29.2

@@ -1,7 +1,7 @@
-From ebfdc1ed30206086a1f59c0e45d11b735ca22181 Mon Sep 17 00:00:00 2001
+From 3d86ab883c2a67dc9828f73a3d84c9fdb202ec32 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
+Subject: [PATCH 29/40] gcc-go: Use _off_t type instead of _loff_t
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -44,5 +44,5 @@ index 88286c07b6e..f8f5cfb5011 100644
 	}
 	n, err = splice(rfd, plroff, wfd, plwoff, len, flags)
 -- 
-2.31.0
+2.29.2

@@ -1,7 +1,7 @@
-From 53c8bd07ef19cefadfd5ca6e2b845862ba9c4d14 Mon Sep 17 00:00:00 2001
+From da63b5262701f91a2261812332f2850be0180634 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
+Subject: [PATCH 30/40] gcc-go: Don't include sys/user.h
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -26,5 +26,5 @@ index 0692fd41eb7..c8d987358d9 100644
 #include <sys/utsname.h>
 #endif
 -- 
-2.31.0
+2.29.2

@@ -1,7 +1,7 @@
-From 4ebf1f48bae799d4d9c0d3de88c5d8e0f1f2900e Mon Sep 17 00:00:00 2001
+From 18d6d2d1f62a4232340696fb7d68d248c751e416 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
+Subject: [PATCH 31/40] gcc-go: Fix ucontext_t on PPC64
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -25,5 +25,5 @@ index b429fdb2403..fd1c885f043 100644
 	ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.jmp_context.iar;
 #elif defined(__aarch64__) && defined(__linux__)
 -- 
-2.31.0
+2.29.2

@@ -1,7 +1,7 @@
-From 2ea8b4f0d7cd8e96436ca14ef7f08615496d6d38 Mon Sep 17 00:00:00 2001
+From d9942a2e54f69dee9c03e5e4339a6c62473e6845 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
+Subject: [PATCH 32/40] gcc-go: Fix handling of signal 34 on musl
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -39,5 +39,5 @@ index 11e4ec436bd..fe866eacb27 100644
 
 if test "${GOOS}" = "aix"; then
 -- 
-2.31.0
+2.29.2

@@ -1,7 +1,7 @@
-From 65212bcce99563e6fa7a0334f1a82bde47ade70c Mon Sep 17 00:00:00 2001
+From 38e7c12086acae4507f9d5067f947431a28c34db 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
+Subject: [PATCH 33/40] gcc-go: Use int64 type as offset argument for mmap
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -34,5 +34,5 @@ index ba38ebaa9ab..3c9e5ce9461 100644
 	if uintptr(p) == _MAP_FAILED {
 		return nil, errno()
 -- 
-2.31.0
+2.29.2

@@ -1,7 +1,8 @@
-From 1fa468989614c5ada2d2a0fac67cc542900ff5de Mon Sep 17 00:00:00 2001
+From a4e800081081b00539bbb6fd8b5cf6b66504cfaa 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
+Subject: [PATCH 34/40] gcc-go: Fix st_{a,m,c}tim fields in generated
+ sysinfo.go
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -33,5 +34,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.31.0
+2.29.2

@@ -1,7 +1,7 @@
-From 1e401424a24c4d09890c498e9cf37dd65f98fd40 Mon Sep 17 00:00:00 2001
+From 57ccf0ad7f0c4b1f998ebfb6cdaa7d1876012d66 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
+Subject: [PATCH 35/40] gcc-go: signal 34 is special on musl libc
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -25,5 +25,5 @@ index c555712a03c..9e228580d37 100644
 		}
 		throw("sigaction read failure")
 -- 
-2.31.0
+2.29.2

@@ -1,7 +1,7 @@
-From c32a6473e0b51b02401c403b4fa104a82b2c6147 Mon Sep 17 00:00:00 2001
+From e6d4cdd4d03cceb01e8ed03bbe7d35b5798abc88 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
+Subject: [PATCH 36/40] gcc-go: Prefer _off_t over _off64_t

 musl does not seem to have _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.31.0
+2.29.2

@@ -1,14 +1,14 @@
-From 87b7fd27b0b2cc041e2cc989e77a7eda8fc330a2 Mon Sep 17 00:00:00 2001
+From ac54a2afa01a3ebb06346f8dac505f0babbbe1a7 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
+Subject: [PATCH 37/40] gcc-go: undef SETCONTEXT_CLOBBERS_TLS in proc.c

 ---
 libgo/runtime/proc.c | 4 ++++
 1 file changed, 4 insertions(+)

 diff --git a/libgo/runtime/proc.c b/libgo/runtime/proc.c
-index 6f7d2e27996..5afd7902497 100644
+index 274ce01c0bf..92a540bdde9 100644
 --- a/libgo/runtime/proc.c
 +++ b/libgo/runtime/proc.c
@@ -66,6 +66,10 @@ static void gscanstack(G*);
@@ -23,5 +23,5 @@ index 6f7d2e27996..5afd7902497 100644
 
 static inline void
 -- 
-2.31.0
+2.29.2

@@ -1,7 +1,7 @@
-From 16fd7a533bba015aca4d1c08c7a18f7a6d07ad26 Mon Sep 17 00:00:00 2001
+From e456a63af7f0bd1f519de98e74f864be0f73572a 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
+Subject: [PATCH 38/40] gcc-go: link to libucontext

 ---
 Makefile.in | 2 +-
@@ -21,5 +21,5 @@ index 63627db68cf..c7f1f84d683 100644
 	  --srcdir=$${topdir}/$$module_srcdir \
 	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
 -- 
-2.31.0
+2.29.2

@@ -1,7 +1,8 @@
-From a56c34c3ca3b83f5481dad3888d936f859788614 Mon Sep 17 00:00:00 2001
+From f3a1e98d6d4d546bfb749b91c1f3639df905c1d0 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
+Subject: [PATCH 39/40] gcc-go: Disable printing of unaccessible ppc64 struct
+ members

 These struct members do not seem to exist on musl.
 ---
@@ -22,5 +23,5 @@ index fd1c885f043..e845e453332 100644
 		mcontext_t *m = &((ucontext_t*)(context))->uc_mcontext;
 		int i;
 -- 
-2.31.0
+2.29.2

@@ -1,269 +0,0 @@
-From 8108772b5430b8d7a4fef8cd9d917a11fbb26fab 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
-
@@ -0,0 +1,66 @@
+From b36fd572e6cbe63dca6fbedd91f17d2797524eaa Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Tue, 17 Nov 2020 10:35:40 +0000
+Subject: [PATCH 40/40] opts: move -fpartial-inlining from -O2 to -O3 or
+ higher.
+
+We have observed strange behavior from the inliner on mips and on
+s390x when the new partial inlining feature is enabled.
+---
+ gcc/doc/invoke.texi | 5 +++--
+ gcc/opts.c          | 2 +-
+ 2 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
+index 01e67e97491..6c4c2937b8f 100644
+--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
+@@ -9212,7 +9212,6 @@ also turns on the following optimization flags:
+ -flra-remat @gol
+ -foptimize-sibling-calls @gol
+ -foptimize-strlen @gol
+--fpartial-inlining @gol
+ -fpeephole2 @gol
+ -freorder-blocks-algorithm=stc @gol
+ -freorder-blocks-and-partition  -freorder-functions @gol
+@@ -9234,7 +9233,8 @@ 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}.
+@option{-D_FORTIFY_SOURCE=0}.  Additionally, @option{-fpartial-inlining}
+is only activated when @option{-O} is set to 3 or higher.
+ 
+ @item -O3
+ @opindex O3
+@@ -9246,6 +9246,7 @@ by @option{-O2} and also turns on the following optimization flags:
+ -fipa-cp-clone
+ -floop-interchange @gol
+ -floop-unroll-and-jam @gol
+-fpartial-inlining @gol
+ -fpeel-loops @gol
+ -fpredictive-commoning @gol
+ -fsplit-loops @gol
+diff --git a/gcc/opts.c b/gcc/opts.c
+index 73162528938..1d0d997eda2 100644
+--- a/gcc/opts.c
+++ b/gcc/opts.c
+@@ -492,7 +492,6 @@ static const struct default_options default_options_table[] =
+     { OPT_LEVELS_2_PLUS, OPT_fisolate_erroneous_paths_dereference, NULL, 1 },
+     { OPT_LEVELS_2_PLUS, OPT_flra_remat, NULL, 1 },
+     { OPT_LEVELS_2_PLUS, OPT_foptimize_sibling_calls, NULL, 1 },
+-    { OPT_LEVELS_2_PLUS, OPT_fpartial_inlining, NULL, 1 },
+     { OPT_LEVELS_2_PLUS, OPT_fpeephole2, NULL, 1 },
+     { OPT_LEVELS_2_PLUS, OPT_freorder_functions, NULL, 1 },
+     { OPT_LEVELS_2_PLUS, OPT_frerun_cse_after_loop, NULL, 1 },
+@@ -530,6 +529,7 @@ static const struct default_options default_options_table[] =
+     { OPT_LEVELS_3_PLUS, OPT_fipa_cp_clone, NULL, 1 },
+     { OPT_LEVELS_3_PLUS, OPT_floop_interchange, NULL, 1 },
+     { OPT_LEVELS_3_PLUS, OPT_floop_unroll_and_jam, NULL, 1 },
+    { OPT_LEVELS_3_PLUS, OPT_fpartial_inlining, NULL, 1 },
+     { OPT_LEVELS_3_PLUS, OPT_fpeel_loops, NULL, 1 },
+     { OPT_LEVELS_3_PLUS, OPT_fpredictive_commoning, NULL, 1 },
+     { OPT_LEVELS_3_PLUS, OPT_fsplit_loops, NULL, 1 },
+-- 
+2.29.2
+
@@ -1,4 +1,4 @@
-From 7b2278e6d857f68c9cb956865c5037d73be69fc6 Mon Sep 17 00:00:00 2001
+From ca0b670b87284afa341f1bef57f5614d88aecb4b 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
@@ -6,14 +6,14 @@ Subject: [PATCH] CRuntime_Musl: Support v1.2.0 for 32 bits
 As explained in the comment, `time_t` on Musl is now always 64 bits,
 but used to be 32 bits on 32 bits systems.
 ---
- .../libdruntime/core/sys/posix/sys/types.d    | 25 ++++++++++++++++++-
- 1 file changed, 24 insertions(+), 1 deletion(-)
+ libphobos/libdruntime/core/sys/posix/sys/types.d | 25 ++++++++++++++++++++++++-
+ 1 files changed, 25 insertions(+), 1 deletion(-)

 diff --git a/libphobos/libdruntime/core/sys/posix/sys/types.d b/libphobos/libdruntime/core/sys/posix/sys/types.d
-index 451c8b4fccc..ca654fbe424 100644
+index fcf39b5b..aacd0df0 100644
 --- a/libphobos/libdruntime/core/sys/posix/sys/types.d
 +++ b/libphobos/libdruntime/core/sys/posix/sys/types.d
-@@ -139,10 +139,33 @@ else version (CRuntime_Musl)
+@@ -140,10 +140,33 @@ else version (CRuntime_Musl)
     alias int        pid_t;
     alias uint       uid_t;
     alias uint       gid_t;
@@ -48,6 +48,3 @@ index 451c8b4fccc..ca654fbe424 100644
     alias c_long     clock_t;
     alias c_ulong    pthread_t;
     version (D_LP64)
-- 
-2.31.0
-
@@ -25,13 +25,13 @@ _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"

 pkgname=gcc-aarch64
 _pkgbase=10.2.1
-pkgver=10.2.1_git20210328
+pkgver=10.2.1_pre0
 [ "$BOOTSTRAP" = "nolibc" ] && pkgname="gcc-pass2"
 [ "$CBUILD" != "$CHOST" ] && _cross="-$CARCH" || _cross=""
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""

 pkgname=gcc-aarch64
-pkgrel=0
+pkgrel=2
 pkgdesc="Stage2 cross-compiler for aarch64"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -170,7 +170,7 @@ if $LANG_FORTRAN; then
 	_languages="$_languages,fortran"
 fi
 if $LANG_ADA; then
-	subpackages="$subpackages libgnat-static:libgnatstatic:$CTARGET_ARCH libgnat::$CTARGET_ARCH gcc-gnat$_target:gnat"
+	subpackages="$subpackages 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"
@@ -180,11 +180,8 @@ makedepends="$makedepends_build $makedepends_host"
 # when using upstream releases, use this URI template
 # https://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$pkgver}/gcc-${_pkgbase:-$pkgver}.tar.xz
 #
-# right now, we are using a git snapshot.
-#
-# PLEASE submit all patches to gcc to https://gitlab.alpinelinux.org/kaniini/alpine-gcc-patches,
-# so that they can be properly tracked and easily rebased if needed.
-source="https://dev.alpinelinux.org/~nenolod/gcc-${pkgver}.tar.xz
+# right now, we are using a git snapshot
+source="https://dev.alpinelinux.org/~nenolod/gcc-10.2.1.tar.xz
 	0001-posix_memalign.patch
 	0002-gcc-poison-system-directories.patch
 	0003-Turn-on-Wl-z-relro-z-now-by-default.patch
@@ -204,31 +201,34 @@ source="https://dev.alpinelinux.org/~nenolod/gcc-${pkgver}.tar.xz
 	0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch
 	0018-ada-fix-shared-linking.patch
 	0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
-	0020-add-fortify-headers-paths.patch
-	0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
-	0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
-	0023-Pure-64-bit-MIPS.patch
-	0024-use-pure-64-bit-configuration-where-appropriate.patch
-	0025-always-build-libgcc_eh.a.patch
-	0026-ada-libgnarl-compatibility-for-musl.patch
-	0027-ada-musl-support-fixes.patch
-	0028-gcc-go-Use-_off_t-type-instead-of-_loff_t.patch
-	0029-gcc-go-Don-t-include-sys-user.h.patch
-	0030-gcc-go-Fix-ucontext_t-on-PPC64.patch
-	0031-gcc-go-Fix-handling-of-signal-34-on-musl.patch
-	0032-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
-	0033-gcc-go-Fix-st_-a-m-c-tim-fields-in-generated-sysinfo.patch
-	0034-gcc-go-signal-34-is-special-on-musl-libc.patch
-	0035-gcc-go-Prefer-_off_t-over-_off64_t.patch
-	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
-	0039-CRuntime_Musl-Support-v1.2.0-for-32-bits.patch
-	0040-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
+	0020-libstdc-futex-add-time64-compatibility.patch
+	0021-add-fortify-headers-paths.patch
+	0022-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
+	0023-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
+	0024-Pure-64-bit-MIPS.patch
+	0025-use-pure-64-bit-configuration-where-appropriate.patch
+	0026-always-build-libgcc_eh.a.patch
+	0027-ada-libgnarl-compatibility-for-musl.patch
+	0028-ada-musl-support-fixes.patch
+	0029-gcc-go-Use-_off_t-type-instead-of-_loff_t.patch
+	0030-gcc-go-Don-t-include-sys-user.h.patch
+	0031-gcc-go-Fix-ucontext_t-on-PPC64.patch
+	0032-gcc-go-Fix-handling-of-signal-34-on-musl.patch
+	0033-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
+	0034-gcc-go-Fix-st_-a-m-c-tim-fields-in-generated-sysinfo.patch
+	0035-gcc-go-signal-34-is-special-on-musl-libc.patch
+	0036-gcc-go-Prefer-_off_t-over-_off64_t.patch
+	0037-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
+	0038-gcc-go-link-to-libucontext.patch
+	0039-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
+	0040-opts-move-fpartial-inlining-from-O2-to-O3-or-higher.patch
+	0041-dlang-support-musl-1.2.0.patch
 	"

+#	gcc-4.8-build-args.patch
+
 # we build out-of-tree
-_gccdir="$srcdir"/gcc-$pkgver
+_gccdir="$srcdir"/gcc-${_pkgbase:-$pkgver}
 _gcclibdir="/usr/lib/gcc/$CTARGET/${_pkgbase:-$pkgver}"
 _gcclibexec="/usr/libexec/gcc/$CTARGET/${_pkgbase:-$pkgver}"

@@ -396,16 +396,14 @@ 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
@@ -490,6 +488,7 @@ 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/
@@ -646,14 +645,6 @@ 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"
@@ -668,44 +659,45 @@ gnat() {
 	mv "$pkgdir"/usr/bin/*gnat* "$subpkgdir"/usr/bin/
 }

-sha512sums="44d785af0f7aa321487f23b7656877e8112ca2e0b93df538508031d6541db6f7e92ddefb40e44870f4f86adc8dd0efbca3b1748539d62c46f18ac667e134c7f6  gcc-10.2.1_git20210328.tar.xz
-3b26000b0ffb3467d8d1b37782a4ba03564813ca33a2842ec2f86213e4ad8f0eba4dd55c43fe965fb90ab21bfecb7c8abd174b5faf09aad128ee25bfd1f48578  0001-posix_memalign.patch
-9b6e01b6c61c6d30a5965a16f9057495b6e73387085ecff3db87ad4153305fdcec132ade9f13229539cf35c29e0ceaac38a0eeb9f9598e1a30a4f67a2352c0b6  0002-gcc-poison-system-directories.patch
-eee255b920cfe35cb1df1c62a44f17c81479573308df87c12c0971a1dca82dd1c73a0544cc6ab9974cd75d212e19450fc855eaf794843f0d5541e9ba7985af2f  0003-Turn-on-Wl-z-relro-z-now-by-default.patch
-b1967302576ede18efbfd7de6c191b7503bc43f205a6c22787823d1bd66f03d197bb2f0e674594707a9958932605b4b524568b2383fa62117bd5d80ecacce29c  0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
-45c21abd2153541959352ed75ec322038c0950351c164d5540b61070fcaf158feee3ee82fd6dd9aea03d846edb99f487f76a312d442d70de16371c783fe3704b  0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
-16a7b2a1e5c2191694131f2eee06adf3e45d59de83e1b5fa1dff43210b9a7f13234cf27a95d9a1d799bcd944aa2af8dc33396d518b574b8773ad52ebc6e80edc  0006-Enable-Wformat-and-Wformat-security-by-default.patch
-daef4ebe907027b9ed2a4d940bb729355c86146dedd963f19b6f3e293e9e9807312c457a76c8599cc759283e7c35b85b721a60cabfc3026538efcbce212e10ea  0007-Enable-Wtrampolines-by-default.patch
-f67ca64ef00350404a4db016e605a255e1669c9d05c86061816905348ddc9ffe260ae8d05d0fd1b9c9c2268b2943b2507a95e63ced39a4c5dfb791964f6f4a16  0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
-a7867b548b54ac81eedfda56679ee6658e690bb47528f9c437538c09bfeb5c8f0051788d61b480ddef3b3d16c4b2c35669741d5f99b2e68a89c7aec6280bc65f  0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
-3d21fae6c58aabf7f05caabcc54635650e178d87d3816cfd367f14dfcfb0fa971526ce06d0c5f84557ce66220c2859b66897ede76c7e5d59cb72789b3b4edcae  0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
-da4005b10d0222ebddc44dc9334933d80064583dc9f4e949ceef5b9739556d01ed91513a1a26758bf1211fd7a941d4e0d7cd1093b2f03cd00950981b8be87c1a  0011-libiberty-copy-PIC-objects-during-build-process.patch
-f9acc3d4691525b6f64344485b9566a5e916572159c2b779f79324c56d6a3d9acb9c8dd79c0cf4d067737ca9c966aa1ba6b22c0eb6a4aadf91c54a3455a2bcd9  0012-libitm-disable-FORTIFY.patch
-78fa151c0121455d52b7499b1e94761c4bb1150acaa751275df8e26ee27be785c78e2f7c7ec6fd3fda8cba431f2c151c79d61f9c00d51f55b2ae0ea588f3880c  0013-libgcc_s.patch
-01afd5aab0f73ad2ee59459520d0fd93e772e954907e453ffc853e2b03f0c963f04abaea4479b202f79fa5c535b3a5b95f3ecde727ddfefb2c3e02e269ab39cc  0014-nopie.patch
-1da8e1e5124e480b29b35c0401298d4c9a15b871e7bfede525df33e0ebaf56dc63d0854c28876d3ea77438353641c9ff5d4050698bca9fb91765ab92f9208359  0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch
-79853461889abccf810f70c8b6de5bb8a201681957dfeb1e7f0bc6acc3e939958f3e4012ff76ff01f7004398170566f100e49fa2ad3187dde4cdee60ac28a00d  0016-dlang-update-zlib-binding.patch
-bbd954ac46d52d1fa8dcc731714424e026189d93eb6da6e632da997b3555b22dcff341626975d7acb795b655355ca493ebcffb925ba8b95e6dc3682a1c1e3fcf  0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch
-e6cd2ff6c03cad621bfd8b6c50bd7f9280a8a944096d0994cb11a7689c40cecffb2efc813db39e040c064ed1a8fa8bbd60ff51ab3bb69485faa216f4d9bab17d  0018-ada-fix-shared-linking.patch
-a16631492e020f54fe19dc41ab831df881c96903d7ae9beaf9cfaed8c3bb65fdabea2ed0fc0945736a21432032623acb4403e9dc96d6020bd08b3836669719be  0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
-1313e45ea2a9f8118d86a68e0942afc85840bbcc0154683f19660a09b7d51448f87ceb2e04fa9e70d84b7494467855f3062bb6be896cfbccb4ffb33dc3f836dd  0020-add-fortify-headers-paths.patch
-a7f159ee2719cf16df666c58cac7266c6d14531076c719e3723f74b022c30338b7a53b0580aa373bcef8ccf607e7e54d4fb8d4da92da9ed82046797d8d4530e0  0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
-b2d84e116538be203b10b795eb2ec11cd5aac3dc4b6d9216118b61de417929c68f3f961ae9c6edbb86a4f74305dabc26619aac1fe1ad289b274e4c546eeeb2dc  0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
-72bb76b5e039c341c01d23dd503faaf290efd7389c748696ef058f9534d96bbfea8e56c52be4737a4ef7ab6bef8806c729d35175f5f55fddced42b3317ab223d  0023-Pure-64-bit-MIPS.patch
-775fd10e51e80f22b21158c64cab69fbf7783dba784904a364614f319dca9c227d219714ddf4bb8c84d5e226322ce46739313f85e8b564df73f6ee91d54cfd82  0024-use-pure-64-bit-configuration-where-appropriate.patch
-1fb0f5b812045f485051b16f5e7f4cf9785471a1c6069f88086edd41c65db4eb35681cc52916ef36586224ce7f5a66fc4e548076525afe6a6b56e21668fa5c81  0025-always-build-libgcc_eh.a.patch
-84eb567250c6cc3c4dc00fb5a0de32648eb81b8bc50fb5b0fdcc7208118c887c7274677aafdc8e2400be4d44346ddaccc0b2a3eb99b000f06cc446e90e6c760d  0026-ada-libgnarl-compatibility-for-musl.patch
-d6ea8bba98cca5cb9ef952c344f063d126dab7f7d30fbf411334be29e9aae611af85e137c92c16e6e72410fe7fed26d984d8807f0469770cae85f98f7b4d8eac  0027-ada-musl-support-fixes.patch
-551da64e652effcb3b8bab8f4fee27d83665505ebe4207f891fd0149a04d601bd0ca60b232e58dc2190a7b9469e47a628e4b0b9986a260535aa3416e662c2fcc  0028-gcc-go-Use-_off_t-type-instead-of-_loff_t.patch
-156c9f987f9579a05509dcdf0575559692be337a1412b4eb0a5eb3a0662ecf8ea2feed8a581741ff637b8dcb186769f54ae2e1b0e4dcace8ac7bb9eb9dd4e918  0029-gcc-go-Don-t-include-sys-user.h.patch
-835be5d6477613def7866d2c9392d3327fe09564890d955db7dd0e77c6aacc234f4a8881b1fb15abae20b0b490fd6cebc5211562629166dc546b33b4f3207a24  0030-gcc-go-Fix-ucontext_t-on-PPC64.patch
-e0f2b85c4ef4bc83a450e48badc879f67b582d08d9bebad0f466393c9bda9e1898da2af30f90019d65e42bcdbd9fd30540dc3f307bb564470e9b8cae1a8a1e57  0031-gcc-go-Fix-handling-of-signal-34-on-musl.patch
-0e6b051452f5f70a279eb323700b933cc856a7a7ec402f822af9cb3d57327fca9ebdeb253e6d87b76098bfd7da9a29591a051f57756ce5a2111da64886b066b4  0032-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
-5df836874e41ce132a385f8b407f53feaa7854c7e3ecd5bbebc73622d9f0dfdd5000fa1f1545c4c4126d1d83e5d78d203180aec1f09d05369776c5b70f7ffddc  0033-gcc-go-Fix-st_-a-m-c-tim-fields-in-generated-sysinfo.patch
-a49b175ac231ae683bfbd8e422ac61e55f8ed265ec6bfa5b5a32800ba0605fde48088c12bf5b4ed29c9e202dea93c9443c67c61c2f2eecd709e6aefb3f1ffd32  0034-gcc-go-signal-34-is-special-on-musl-libc.patch
-70d8725a3969e7b153db01c84dac5accb911d1b595072eda3bf0e2f24037ebcba478b7c2e80ab105ba3f06b404fd47deb8b509e1f5e652f40bf3b6eafef6f0d0  0035-gcc-go-Prefer-_off_t-over-_off64_t.patch
-eeb75092443f65e4da76293be1d1a742a0e951c763b5a59ffce056b4a7a84b33dade0e1c96a9887474d16571c797d916c7357ad7fb8004ddbe5195175ca55954  0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
-c6dbba1ae7e11ab0ff58f4c001b5b76c776bf42f17591bc035b42bd7c4e473d837e7daf58e71949889cd1631a88ef5da7058e5d65292090d844077fbb2f6ae02  0037-gcc-go-link-to-libucontext.patch
-11e017e82c9e3a8216703972a2d5195eb9153f224d43aeda0aa63519f39212d735b9018ea1c28a214e1eaac31339b5b48273d46a009d82c16a5041d1c0462b2f  0038-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
-f83a53fefcadcae65fbda5e7d7f3dc3ee949596056ac1b4fbd3117af469a2ea306cacb4f58c345018c12868f64d63d82b1de63a65fcba21749a0a85c6dcaa95a  0039-CRuntime_Musl-Support-v1.2.0-for-32-bits.patch
-b19533749ca4048a2956eab18b99fb2e1c5e4cffe9bf4a77d628b0e167af1f9dbb08a747d7888b365789ab9c6e5ce8cd6c09ef171e33f08c136ef6d4b5f05192  0040-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch"
+sha512sums="30c3e36c6e001d172b6219dbf5f0383655d29cbed8a197e1d6139213aacbfdb7cbca63553eedf3a4b35bd445a87ee0f555838d8b2cd7a46ab6bba7951a6b60c5  gcc-10.2.1.tar.xz
+70cfaed5960c5c9fa542d4f491be9c3291e7b0bf89f3e08212b6f490b8e9daa0474717c95e06454ff3c3258fe54a9ed13db35dbb316db161837b2a7f5fdeab7e  0001-posix_memalign.patch
+b821d95f0279564fad1c504f2d6968a38e518828643bb88466cc5eb2ff5a968ab998c12ef24d9ae4bee5663bf912fe751985a52483b86e09b3825fd3aa5e9bc2  0002-gcc-poison-system-directories.patch
+04f60941b5bed089be6e38d38346caaa9e91bc7b91a3e805df2661e728e43c276595efa4c2e40f99b4528d699121f12a0f1a59efd66d20f8b18908ce6f80ead3  0003-Turn-on-Wl-z-relro-z-now-by-default.patch
+97aff34931460d341cc0af337da783409139d520910cb1f8c68a54981fc68028161274d4ac3c7f264e3c87fa5222e439321fbe02a01d79b0470b644c118aa3e9  0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
+b58f3ae0d22009bc13d9f9cabf74a42db8019bfb5da8a31f5f5bf3042782bcb736d555a7ab8439d65894627094b8e0e65ba077b501f939b6f5171e435e77b3fd  0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
+67226e4f49cde2e5b27b987d1b89b903fdb4127d1339754e85eb135d99601b0718448f9decd3d36a27ba8bde92c50a886f0f6853d44206dba0f0d5d0de126c02  0006-Enable-Wformat-and-Wformat-security-by-default.patch
+0756f53b630e8211cb278a8d91859de5bf4758d04e6f3b7e105633aaa1e319c87ab3f63cda0debb97fce430c44aa2d2c744f41c400711cae5187601e9280e8d6  0007-Enable-Wtrampolines-by-default.patch
+1db23c64e29d7c373a57df6ed6935557bc7e5e7627e5df3604ee179907fc663421c3c9e9c16fd406b80533bd653e5388669619a908e30c799e8bd25201a7352e  0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
+e7ac9b12bc66b72cbab02dba17d7bed8aa6365dbe800ce46ba3428d66004f9308f4d26c97f2c2575cf787ee265a343a05c52f1f90e4257d3e97de281c3d14bf9  0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
+a62736b28b667b53419a433aa9b73a89a28079639b0fd45dae37faa1eae5dbc8c4f81ccad56c5076d1fab50460512114478bd0d20af58216827632da13109d67  0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
+afe3a9733c972c90d8d303c7f7308afb016a012d7f61ac62a23a37e98932d87c3d6d8999688c45e1d664f8e793155691f66465651888db3d9ad48d595fb7ceb4  0011-libiberty-copy-PIC-objects-during-build-process.patch
+62bf455a214586ef8be20d998971df77a198df3638197638634ee0dca972f5cc302f8ff3ac7763af0e92f59398fe109520f8ffab143678ed4517fa62de0bd2e5  0012-libitm-disable-FORTIFY.patch
+55877b8b81d6a58ca1d02d207469b03d8fdb197b932ef389a393249091ac9619d4d80467232ff521dac733fdb2fd62eb1bd475d54025c74b03afc5ab411a98e4  0013-libgcc_s.patch
+ec75812674114c48e44eb6330d7e79a0155351377c928ca374b9c577af3ca3b19b435ece2d5ae41c6f32ac7410257a518f0d917775f6e0a6fa272ef8f8915921  0014-nopie.patch
+c6b04ffcf1d55de9a44cc09b8d9258bd9d3d479e629defb19d42631180b37f57b16d05bbbdac29e98d1d3aff02758baef43203882e46e38f00df118d7d4eef37  0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch
+d800abe3ec4db542ed9a87af7c714338156be98e013e547e201111b390b0018e3f107c494cc1c8b7c75b7409b8560d14320b6dfd1bf6714c1aa887602060ae31  0016-dlang-update-zlib-binding.patch
+478250c9462f61540b202a17c91f30c8e0a8bef380f473a7828f327773dbc6c8d7d2df9d510289eedfad66d14d661620f358d4e2248a6a3176535368743ef16f  0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch
+74076bafd154d4af206cecb5e338ebb5c8ff4098e7ded862f92e87b66a5c2d8abc20ea7acfe967a969e1a575c9686ba444e0d7f03e5020a8f846fda00cce0bce  0018-ada-fix-shared-linking.patch
+1eb3a2a762194daccdac2494ddac59cc60257999532685faa5606fdb5b6965945e6c199cd2218ee5b9e11b54c2f59b81519692956a06f7af1ff500efa5d22a5e  0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
+785d6441eccd4323ed0c787a0fc71a8699bddca6f080ff2bfa2eaf3a3e55450076323d01893cf9ff3aa49ee19267611f27b5f725b822af17eeb05aa6a5745f63  0020-libstdc-futex-add-time64-compatibility.patch
+4df558cd8c2311cf0b84f481c14b2381134ca8bbcdd2a34c289edd0dd24c8732b7b05bdea9a3f1d328f42f8df30f2131100d50b151b60ff64b71a14e09fcf8e1  0021-add-fortify-headers-paths.patch
+061980a1ed749ca305e0577ed9f9c80f7e1c49a133dd59d1598c553a6e1e577ad2a28daf117f7ff6210e625b2408ea1430477036f2212bdbe9100af9158b5951  0022-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
+3100aa94fdcf616e635bce1e711a4f93f39ddfff92021e1446764e95a24f4dfc71d36614138ba407bb1221456658ec51fc0d40d4ac696e9931cb10492da75c06  0023-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
+bcc546f087e84a9b806fcf8f0efdc354dc89a9d93dcd7dab2a9b29a1a88d233eb827b10bd76ca910c0d114772135368d7565a3e7b3440b500e9609a4db4bff8b  0024-Pure-64-bit-MIPS.patch
+f2b852c8799064305ebf7b5c9dd0edada0a534c9e4664fe06f3e25efba83afda12e8b147f7a28e812ef6e7a587565da9ee51b2a8990a110975f7b8d8345007f6  0025-use-pure-64-bit-configuration-where-appropriate.patch
+5b47adaa008020d0d42273ff5da646ace84a7c196aff0529dbabe75c1c03cdd89fe63a8f02904d58fa02d1b1a639923a111f4007d4e7c2cc2cdecceba28a0c74  0026-always-build-libgcc_eh.a.patch
+4cd8309e60e1bab29f2d5150f9cda8a6a2da9c14010d5f33fd4bb25318f031d36bb5650c69d7c4a0ff077e222229ad59f36d74a27f22f96321f0893b556e83c6  0027-ada-libgnarl-compatibility-for-musl.patch
+6e307a0b575284c0d4e99a134ac681cd58ed07a31411d43060184f1a1c9ed27af27396afca415a37120fecb3393ce10daeac9312f82d7d0e83be3c2c744a1eea  0028-ada-musl-support-fixes.patch
+121e297b1b0b2cc9cc2c4785c1e1d33995db050f428d92d8327d9720fe10319cf35592ad6e18e4c98d6f68a2ce6a2ccb172ad7ace26d0e4ad450229e673c2c40  0029-gcc-go-Use-_off_t-type-instead-of-_loff_t.patch
+c0217653d19c2495fa3aeda18e40251531e64d5aa67221451a9e86fbd7a696ff063d6aaa01c8662c07bf85512ac8397592df2e4f622933438bf43b2915247d20  0030-gcc-go-Don-t-include-sys-user.h.patch
+70727dc46af7c0c46d7fcb58edc210f7b2be3fab91263e0b65458fc0073fe7c25c937f00fcb4dcd1a76d44d3b3895fd96853ed16f03daeb7786945bcb7391a76  0031-gcc-go-Fix-ucontext_t-on-PPC64.patch
+7058a1f8ce66a69e987a308e5b2521234ee3712955f46ab3bccb5c87b0bf6f666e3df585f0323e9494588b51e8300ed9b5d53e7d6229a03f9743892e1b88560b  0032-gcc-go-Fix-handling-of-signal-34-on-musl.patch
+ae4fc6ee120376902adb90aa7aea2d6fff35dfcafd75aea3ab62be7ffd72364ef0db2584134d48bc7f7fb6392bb8ca44c2970cd75a82a3e0ff12ad9f292fe61a  0033-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
+d6d28d4e22129cf585d4481302b2f304c38568008a23c111a1d02544519bfcde7a5c26802861973c95669f2854c2f4e4670b480f6884bacab27c356d360e7054  0034-gcc-go-Fix-st_-a-m-c-tim-fields-in-generated-sysinfo.patch
+f7582eaa9b6f421652b6705e28a22ba68210ea7e32d3c468e86b481a26bf391c86146e1a3ee4dda51c5cd4bdf4f167d2284c2ac47c97e02b9e5bb755b68cd6d6  0035-gcc-go-signal-34-is-special-on-musl-libc.patch
+85a5759fe0c736cd637b009b4d42a20c836c54435e90d3fa34b3e1a24a7e703e9e18470c2f7a4d6b2a0c5361b5de75b2467415647cb3d232ee67691e82e7f47c  0036-gcc-go-Prefer-_off_t-over-_off64_t.patch
+c7d48b3657d37fbaef0696c96f858819bbe5469d7387e99db890eb925703dbeaf11858fdf2ecd556ac85d766c739374d71c5509f5e2fba88eb427cf93e9fdcc0  0037-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
+1e85dd650a43ce96d489f77e37fd247186e4e1fe2d088be991c3ff8233c923408137d94b72788ebc2ddcac8873c6f326a92138790ab0281722c67cce400f76cc  0038-gcc-go-link-to-libucontext.patch
+c93e8b0797c54483174b77f942e932eeb832c0784af9948ead7d8d95ca6392ffe3edee0740e835cf3d9310904718384e846a882284c21ccf26a055f8f940a874  0039-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
+ff74dbf6a3e10f6abececdce57672e76cca8f8a92f67ed495ae2631265402fed74e9b567fc35ad16d2a62449ca4074b6868ebbc56c68b9cecf8e686018f26554  0040-opts-move-fpartial-inlining-from-O2-to-O3-or-higher.patch
+eb2d8e432206250a4c4682305390883343e3c8285ac26701a910c1418b6ba5b3681612db846eb298fd47f0163772403340a348b719af751afe410742d6e92472  0041-dlang-support-musl-1.2.0.patch"
@@ -1,7 +1,7 @@
-From 56ba7da205f1ec49b1379ab40d533c2e2d70a1a7 Mon Sep 17 00:00:00 2001
+From 4ed2cc3054f444c683f54954c32e586a54066337 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
+Subject: [PATCH 01/40] posix_memalign

 ---
 gcc/config/i386/pmm_malloc.h | 9 +++++----
@@ -38,5 +38,5 @@ index 87344d9383f..ece428df487 100644
   else
     return NULL;
 -- 
-2.31.0
+2.29.2

@@ -1,7 +1,7 @@
-From 4c53f798c9823dcfc7fe8e2dd26de0077545069d Mon Sep 17 00:00:00 2001
+From 09a32a40b34477cd787deb12833c063a09dea7b2 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
+Subject: [PATCH 02/40] 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
@@ -26,7 +26,7 @@ Upstream-Status: Pending
 7 files changed, 68 insertions(+)

 diff --git a/gcc/common.opt b/gcc/common.opt
-index 9cc47b16cac..d8b2e237d89 100644
+index dfed6ec76ba..8bb65e0e1af 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 8fe9c91fd7c..17b878e4b4e 100755
+index b4088d8fd1e..793530e21cf 100755
 --- a/gcc/configure
 +++ b/gcc/configure
@@ -1010,6 +1010,7 @@ with_system_zlib
@@ -78,7 +78,7 @@ index 8fe9c91fd7c..17b878e4b4e 100755
   --enable-plugin         enable plugin support
   --enable-host-shared    build host code as shared libraries
   --disable-libquadmath-support
-@@ -30276,6 +30279,19 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then :
+@@ -30271,6 +30274,19 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then :
 fi
 
 
@@ -99,10 +99,10 @@ index 8fe9c91fd7c..17b878e4b4e 100755
 
 
 diff --git a/gcc/configure.ac b/gcc/configure.ac
-index 84dceb8074a..bf64ffbe46f 100644
+index 070b9c6c497..0fd438e39e5 100644
 --- a/gcc/configure.ac
 +++ b/gcc/configure.ac
-@@ -6608,6 +6608,16 @@ AC_ARG_ENABLE(version-specific-runtime-libs,
+@@ -6605,6 +6605,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 84dceb8074a..bf64ffbe46f 100644
 AC_SUBST(subdirs)
 AC_SUBST(srcdir)
 diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index 0c1b5975e6b..ede239a0ccd 100644
+index 0d532a64bfe..86e57038042 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.31.0
+2.29.2

@@ -1,7 +1,7 @@
-From caf66e830299ba0a865041800ea9b32a3091f141 Mon Sep 17 00:00:00 2001
+From 77e75a23e9bdf8863823225567c509b6fed49e6e 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.
+Subject: [PATCH 03/40] Turn on -Wl,-z,relro,-z,now by default.

 ---
 gcc/doc/invoke.texi | 3 +++
@@ -9,10 +9,10 @@ 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 ede239a0ccd..43d02c26a1a 100644
+index 86e57038042..87ff404bc20 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
+@@ -14645,6 +14645,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}.
 
@@ -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.31.0
+2.29.2

@@ -1,8 +1,8 @@
-From 48413b53fb7c9d780b55b84eaf6c70f154719907 Mon Sep 17 00:00:00 2001
+From 3b76b0c848746d4adbc4e8db408efd41aefb829c 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
+Subject: [PATCH 04/40] 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 ++++
@@ -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 43d02c26a1a..78469ebe55d 100644
+index 87ff404bc20..01e67e97491 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 43d02c26a1a..78469ebe55d 100644
 @opindex O3
 Optimize yet more.  @option{-O3} turns on all optimizations specified
 -- 
-2.31.0
+2.29.2

@@ -1,8 +1,8 @@
-From 31ec8fceef33284c4ed3ca4bb97e4a24eb088265 Mon Sep 17 00:00:00 2001
+From 483912c560424ee8b5cc996990d45802671fc73f 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.
+Subject: [PATCH 05/40] 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 +
@@ -265,5 +265,5 @@ index 625c9ab7902..7aec9d3a016 100644
 #else
 #define LIBUBSAN_SPEC "-lubsan" STATIC_LIBUBSAN_LIBS
 -- 
-2.31.0
+2.29.2

@@ -1,7 +1,7 @@
-From 1a17780987ee63da34d330e9a2b186751c929c46 Mon Sep 17 00:00:00 2001
+From c57a8b43401ca9a1b889fa9fd421ac49c3dbd380 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.
+Subject: [PATCH 06/40] Enable -Wformat and -Wformat-security by default.

 ---
 gcc/c-family/c.opt | 4 ++--
@@ -30,5 +30,5 @@ index c49da99d395..93f25319005 100644
 
 Wformat-overflow=
 -- 
-2.31.0
+2.29.2

@@ -1,14 +1,14 @@
-From 901acffb0caae749c5b830d01a6e858f34311cd5 Mon Sep 17 00:00:00 2001
+From a58dad2c52639422671ac6986c36e48499fc2f20 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.
+Subject: [PATCH 07/40] 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 d8b2e237d89..5087ae84d49 100644
+index 8bb65e0e1af..ace932b300d 100644
 --- a/gcc/common.opt
 +++ b/gcc/common.opt
@@ -774,7 +774,7 @@ Common Var(warn_system_headers) Warning
@@ -21,5 +21,5 @@ index d8b2e237d89..5087ae84d49 100644
 
 Wtype-limits
 -- 
-2.31.0
+2.29.2

@@ -1,8 +1,8 @@
-From 4d09aa762edd682ffb7665b21f7ecd6e1cf90a3f Mon Sep 17 00:00:00 2001
+From 98b2b8f7de60ed1b6b7602124ef6db278cf3c212 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.
+Subject: [PATCH 08/40] Disable ssp on -nostdlib, -nodefaultlibs and
+ -ffreestanding Change the buffer size.

 ---
 gcc/gcc.c      | 8 +++++++-
@@ -49,5 +49,5 @@ index 4aec480798b..eaecfab37ad 100644
 
 -param=stack-clash-protection-guard-size=
 -- 
-2.31.0
+2.29.2

@@ -1,8 +1,8 @@
-From e9b5aa5bb3788b2600a719d3b5ed56e3397ec0ad Mon Sep 17 00:00:00 2001
+From 035775ef38206ed2859500efe5fb42ceec2e858d 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.
+Subject: [PATCH 09/40] Ensure that msgfmt doesn't encounter problems during
+ gcc bootstrapping.

 Solves error messages like the following:

@@ -50,5 +50,5 @@ index a0f84b0cfa0..ab24a47a2fd 100644
 
 all-local: all-local-$(USE_NLS)
 -- 
-2.31.0
+2.29.2

@@ -1,7 +1,7 @@
-From d87e3805d5f308798e82008b9b3c3440958b6f20 Mon Sep 17 00:00:00 2001
+From e9875d74e75c601b95dba677bc9e58c869150212 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.
+Subject: [PATCH 10/40] Don't declare asprintf if defined as a macro.

 ---
 include/libiberty.h | 3 +++
@@ -24,5 +24,5 @@ index 141cb886a85..fa0e78eb62f 100644
 /* Like asprintf but allocates memory without fail. This works like
    xmalloc.  */
 -- 
-2.31.0
+2.29.2

@@ -1,7 +1,7 @@
-From 33b3fa0e5bc57219de066c04beaf4fcd09054812 Mon Sep 17 00:00:00 2001
+From 764e64bba73a7b7eb5154c8537781412252ed33e 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
+Subject: [PATCH 11/40] libiberty: copy PIC objects during build process

 ---
 libiberty/Makefile.in | 1 +
@@ -20,5 +20,5 @@ index d6b302e02fd..fd39928546f 100644
 	else true; fi
 
 -- 
-2.31.0
+2.29.2

@@ -1,17 +1,17 @@
-From 0538fa07136fefd76a0b958db48cd6a06eaf630c Mon Sep 17 00:00:00 2001
+From da46d99b1b7661a98064a45bdccf08c1867582b0 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
+Subject: [PATCH 12/40] libitm: disable FORTIFY

 ---
 libitm/configure.tgt | 10 ++++++++++
 1 file changed, 10 insertions(+)

 diff --git a/libitm/configure.tgt b/libitm/configure.tgt
-index d1beb5c9ec8..c2b50b95c01 100644
+index 04109160e91..107b957ece3 100644
 --- a/libitm/configure.tgt
 +++ b/libitm/configure.tgt
-@@ -47,6 +47,16 @@ if test "$gcc_cv_have_tls" = yes ; then
+@@ -46,6 +46,16 @@ if test "$gcc_cv_have_tls" = yes ; then
   esac
 fi
 
@@ -29,5 +29,5 @@ index d1beb5c9ec8..c2b50b95c01 100644
 # work out any special compilation flags as necessary.
 case "${target_cpu}" in
 -- 
-2.31.0
+2.29.2

@@ -1,7 +1,7 @@
-From 7f4a2e2f3ab6b649538f3fd775a6f7a5507de543 Mon Sep 17 00:00:00 2001
+From 354f2a8ceb70f9f6e1688ba41c1cc1c17ac87329 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
+Subject: [PATCH 13/40] libgcc_s

 ---
 gcc/config/i386/i386-expand.c | 4 ++--
@@ -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 47d52550e5e..9cb8cc7950e 100644
+index c6033688f51..a60e5162995 100644
 --- a/gcc/config/i386/i386-expand.c
 +++ b/gcc/config/i386/i386-expand.c
-@@ -10976,10 +10976,10 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget,
+@@ -10966,10 +10966,10 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget,
     {
     case IX86_BUILTIN_CPU_INIT:
       {
@@ -53,5 +53,5 @@ index 8506a635790..564296f788e 100644
 +HOST_LIBGCC2_CFLAGS += -mlong-double-80 $(CET_FLAGS)
 CRTSTUFF_T_CFLAGS += $(CET_FLAGS)
 -- 
-2.31.0
+2.29.2

@@ -1,7 +1,7 @@
-From 6c3e5f01e4ac338e85b1a6b5956699d882705882 Mon Sep 17 00:00:00 2001
+From 7fb84007ff62309abffdbddfa751e69c331e82c3 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
+Subject: [PATCH 14/40] nopie

 ---
 gcc/configure    | 27 +++++++++++++++++++++++++++
@@ -9,10 +9,10 @@ Subject: [PATCH] nopie
 2 files changed, 40 insertions(+)

 diff --git a/gcc/configure b/gcc/configure
-index 17b878e4b4e..808570b6c99 100755
+index 793530e21cf..2d874d3defe 100755
 --- a/gcc/configure
 +++ b/gcc/configure
-@@ -30784,6 +30784,33 @@ fi
+@@ -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"
@@ -47,10 +47,10 @@ index 17b878e4b4e..808570b6c99 100755
 
 
 diff --git a/gcc/configure.ac b/gcc/configure.ac
-index bf64ffbe46f..9c2571de709 100644
+index 0fd438e39e5..0b257e687ee 100644
 --- a/gcc/configure.ac
 +++ b/gcc/configure.ac
-@@ -6866,6 +6866,19 @@ AC_CACHE_CHECK([for -no-pie option],
+@@ -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"
@@ -71,5 +71,5 @@ index bf64ffbe46f..9c2571de709 100644
 AC_SUBST([NO_PIE_FLAG])
 
 -- 
-2.31.0
+2.29.2

@@ -1,7 +1,7 @@
-From 66657865719efb0a86ea2ab75511cb326e8aa46f Mon Sep 17 00:00:00 2001
+From 3f764eb6dc371cc48cfdf231cbd40e64b1f2a671 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
+Subject: [PATCH 15/40] libffi: use __linux__ instead of __gnu_linux__ for musl

 ---
 libffi/src/closures.c | 2 +-
@@ -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.31.0
+2.29.2

@@ -1,7 +1,7 @@
-From b8a954b1e4033ff559e312d693c74e90e3f13210 Mon Sep 17 00:00:00 2001
+From b78dea0f8f09d4092bec52b7ada719ead2552dd2 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
+Subject: [PATCH 16/40] dlang: update zlib binding

 ---
 libphobos/src/std/zlib.d | 266 ++++++++++++++++++++++++++++-----------
@@ -421,5 +421,5 @@ index e6cce240fd5..bd2fe37ebec 100644
 }
 
 -- 
-2.31.0
+2.29.2

@@ -1,7 +1,7 @@
-From 4d1fe9d5df3ab850df21d68c73d2d3c601910288 Mon Sep 17 00:00:00 2001
+From 58c529af8a9673b90dc7137065ab788c25b358a8 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
+Subject: [PATCH 17/40] dlang: fix fcntl on mips, add libucontext dep

 ---
 libphobos/configure.tgt                      |  1 +
@@ -47,5 +47,5 @@ index 9febcff849b..cb34e2108bd 100644
         static assert(0, "Platform not supported");
 
 -- 
-2.31.0
+2.29.2

@@ -1,7 +1,7 @@
-From 04d8d2c7052c0e92825b4246da0df9ac8753701e Mon Sep 17 00:00:00 2001
+From 2a614f9b702b02c312cd513eddb1fc6745f9a3ad 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
+Subject: [PATCH 18/40] ada: fix shared linking

 ---
 gcc/ada/link.c | 12 ++++++------
@@ -38,5 +38,5 @@ index 02c413a412f..f0e52a87d6e 100644
 unsigned char __gnat_objlist_file_supported = 1;
 const char *__gnat_object_library_extension = ".a";
 -- 
-2.31.0
+2.29.2

@@ -1,7 +1,7 @@
-From 3da9a00035f6052926918200fdbeff478ff88d28 Mon Sep 17 00:00:00 2001
+From dab36b973223e0d6853f564e845bc22dadcc4d2d 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
+Subject: [PATCH 19/40] build: fix CXXFLAGS_FOR_BUILD passing

 ---
 Makefile.in | 1 +
@@ -20,5 +20,5 @@ index 36e369df6e7..63627db68cf 100644
 
 # This is the list of directories to built for the host system.
 -- 
-2.31.0
+2.29.2

@@ -0,0 +1,32 @@
+From c2efb7703c2ef381a8b1d1cd751222e0a7e10665 Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Fri, 21 Aug 2020 07:00:17 +0000
+Subject: [PATCH 20/40] libstdc++: futex: add time64 compatibility
+
+---
+ libstdc++-v3/src/c++11/futex.cc | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/libstdc++-v3/src/c++11/futex.cc b/libstdc++-v3/src/c++11/futex.cc
+index c9de11a7ec7..7be702dbeda 100644
+--- a/libstdc++-v3/src/c++11/futex.cc
+++ b/libstdc++-v3/src/c++11/futex.cc
+@@ -61,7 +61,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
+ 	struct timeval tv;
+ 	gettimeofday (&tv, NULL);
+ 	// Convert the absolute timeout value to a relative timeout
+#if defined(SYS_futex_time64)
+	struct
+	  {
+	    long tv_sec;
+	    long tv_nsec;
+	  } rt;
+#else
+ 	struct timespec rt;
+#endif
+ 	rt.tv_sec = __s.count() - tv.tv_sec;
+ 	rt.tv_nsec = __ns.count() - tv.tv_usec * 1000;
+ 	if (rt.tv_nsec < 0)
+-- 
+2.29.2
+
@@ -1,7 +1,7 @@
-From 1274452fed850d4910aac101aa50c26a2011e15f Mon Sep 17 00:00:00 2001
+From ca8a8331acef15d0b3b095b8c63539acd1d93e8b 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
+Subject: [PATCH 21/40] add fortify-headers paths

 ---
 gcc/config/linux.h | 2 ++
@@ -21,5 +21,5 @@ index 95654bcdb5a..d88df8f154a 100644
     { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 0 },
 #else
 -- 
-2.31.0
+2.29.2

@@ -1,9 +1,9 @@
-From 427c95f4cd889f97983d2b5ac4de6501bcf53166 Mon Sep 17 00:00:00 2001
+From 23468db70f830e99ac138826d28cc33fa71d3405 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.
+Subject: [PATCH 22/40] 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.
@@ -27,5 +27,5 @@ index daeb4d0c8ea..6920bec0fa0 100644
 #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
 		       "|fstack-protector-strong|fstack-protector-explicit" \
 -- 
-2.31.0
+2.29.2

@@ -1,7 +1,7 @@
-From d3440b3e7d5d9448309b4c3f74487f4c05726a5a Mon Sep 17 00:00:00 2001
+From 67513cb76a43014172f54384c3bad0c41e949c8a 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
+Subject: [PATCH 23/40] DP: Use --push-state/--pop-state for gold as well when
 linking libtsan.

 ---
@@ -65,5 +65,5 @@ index 6920bec0fa0..40e07354b3d 100644
 #else
 #define LIBUBSAN_SPEC "-lubsan" STATIC_LIBUBSAN_LIBS
 -- 
-2.31.0
+2.29.2

@@ -1,7 +1,7 @@
-From 5b1bffa6323f1e9f981f1db2b574a876ebcf2bd6 Mon Sep 17 00:00:00 2001
+From 5d9d38da4f523c052a5bcd2562d79809b4136f2c 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
+Subject: [PATCH 24/40] Pure 64-bit MIPS

 ---
 gcc/config/mips/mips.h    | 8 ++++----
@@ -43,5 +43,5 @@ index ceb58d3b5f3..8116e23ebba 100644
 +        ../lib32 \
 +        ../lib
 -- 
-2.31.0
+2.29.2

@@ -1,7 +1,7 @@
-From 7a38f81aa9cc5ed4a39b54480209e29615bd6594 Mon Sep 17 00:00:00 2001
+From ac0eeb3237ac2cf75c19be92afe3335c9a0d83bb 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
+Subject: [PATCH 25/40] use pure 64-bit configuration where appropriate

 ---
 gcc/config/aarch64/t-aarch64-linux | 2 +-
@@ -117,5 +117,5 @@ index cc6ab367072..7f498ee1cdc 100644
 +MULTILIB_OSDIRNAMES = m64=../lib
 +MULTILIB_OSDIRNAMES+= m32=../lib32
 -- 
-2.31.0
+2.29.2

@@ -1,7 +1,7 @@
-From eb4c45fb32845cf9ed5e3627380d889f972dbb02 Mon Sep 17 00:00:00 2001
+From 3f35cf750117fa7cbceaf33e4bea008d0688bd93 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
+Subject: [PATCH 26/40] always build libgcc_eh.a

 highly inspired by:
  http://landley.net/hg/aboriginal/file/7e0747a665ab/sources/patches/gcc-core-libgcceh.patch
@@ -47,5 +47,5 @@ index 851e7657d07..99ec513a1a6 100644
 	for file in $$parts; do					\
 	  rm -f $(DESTDIR)$(inst_libdir)/$$file;		\
 -- 
-2.31.0
+2.29.2

@@ -1,7 +1,7 @@
-From f06868abe42037e8a97fb1e724df56a81b6d3b36 Mon Sep 17 00:00:00 2001
+From 48342d154084bb9610b8f02f93fcfc2aa606595a 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
+Subject: [PATCH 27/40] ada: libgnarl compatibility for musl

 ---
 gcc/ada/libgnarl/s-osinte__linux.ads | 11 ------
@@ -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 ef449af33d1..bd7312e6686 100644
+index 80cb2b2a793..701b7a3aeab 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.31.0
+2.29.2

@@ -1,7 +1,7 @@
-From b87099f99e9b97efa684d59a63a7585bc0ae7c34 Mon Sep 17 00:00:00 2001
+From 0d517a7c90f9e21616c8ad0c66e24c1554f6658c 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
+Subject: [PATCH 28/40] ada: musl support fixes

 ---
 gcc/ada/Makefile.rtl | 10 +++++-----
@@ -219,5 +219,5 @@ index af4417fab90..bab6bf3ca87 100644
   status = openpty (&master_fd, &slave_fd, NULL, NULL, NULL);
 #elif defined (USE_CLONE_DEVICE)
 -- 
-2.31.0
+2.29.2

@@ -1,7 +1,7 @@
-From ebfdc1ed30206086a1f59c0e45d11b735ca22181 Mon Sep 17 00:00:00 2001
+From 3d86ab883c2a67dc9828f73a3d84c9fdb202ec32 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
+Subject: [PATCH 29/40] gcc-go: Use _off_t type instead of _loff_t
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -44,5 +44,5 @@ index 88286c07b6e..f8f5cfb5011 100644
 	}
 	n, err = splice(rfd, plroff, wfd, plwoff, len, flags)
 -- 
-2.31.0
+2.29.2

@@ -1,7 +1,7 @@
-From 53c8bd07ef19cefadfd5ca6e2b845862ba9c4d14 Mon Sep 17 00:00:00 2001
+From da63b5262701f91a2261812332f2850be0180634 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
+Subject: [PATCH 30/40] gcc-go: Don't include sys/user.h
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -26,5 +26,5 @@ index 0692fd41eb7..c8d987358d9 100644
 #include <sys/utsname.h>
 #endif
 -- 
-2.31.0
+2.29.2

@@ -1,7 +1,7 @@
-From 4ebf1f48bae799d4d9c0d3de88c5d8e0f1f2900e Mon Sep 17 00:00:00 2001
+From 18d6d2d1f62a4232340696fb7d68d248c751e416 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
+Subject: [PATCH 31/40] gcc-go: Fix ucontext_t on PPC64
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -25,5 +25,5 @@ index b429fdb2403..fd1c885f043 100644
 	ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.jmp_context.iar;
 #elif defined(__aarch64__) && defined(__linux__)
 -- 
-2.31.0
+2.29.2

@@ -1,7 +1,7 @@
-From 2ea8b4f0d7cd8e96436ca14ef7f08615496d6d38 Mon Sep 17 00:00:00 2001
+From d9942a2e54f69dee9c03e5e4339a6c62473e6845 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
+Subject: [PATCH 32/40] gcc-go: Fix handling of signal 34 on musl
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -39,5 +39,5 @@ index 11e4ec436bd..fe866eacb27 100644
 
 if test "${GOOS}" = "aix"; then
 -- 
-2.31.0
+2.29.2