temp/plasma-workspace: rebuild against gpsd 3.23

[skip-ci]

.ci/testcases/test_firmware.py

@@ -1,45 +0,0 @@
-#!/usr/bin/env python3
-# Copyright 2021 Johannes Marbach
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-import glob
-import os
-
-import add_pmbootstrap_to_import_path
-import pmb.parse
-
-
-def test_aports_firmware(args):
-    """
-    Various tests performed on the /**/firmware-* aports.
-    """
-
-    excluded = [
-        "firmware-motorola-potter",  # Depends on soc-qcom-msm8916-ucm
-        "firmware-oneplus-msm8998",  # Depends on soc-qcom-sdm845-nonfree-firmware
-        "firmware-oneplus-sdm845",  # Depends on soc-qcom-sdm845-nonfree-firmware
-        "firmware-samsung-baffinlite",  # Depends on firmware-aosp-broadcom-wlan
-        "firmware-samsung-crespo",  # Depends on firmware-aosp-broadcom-wlan
-        "firmware-samsung-maguro",  # Depends on firmware-aosp-broadcom-wlan
-        "firmware-xiaomi-beryllium",  # Depends on soc-qcom-sdm845-nonfree-firmware
-        "firmware-xiaomi-ferrari",  # Depends on soc-qcom-msm8916
-        "firmware-xiaomi-willow",  # Doesn't build, source link is dead (pma#1212)
-    ]
-
-    for path in glob.iglob(f"{args.aports}/**/firmware-*/APKBUILD", recursive=True):
-        apkbuild = pmb.parse.apkbuild(path)
-        aport_name = os.path.basename(os.path.dirname(path))
-
-        if aport_name not in excluded:
-            if "pmb:cross-native" not in apkbuild["options"]:
-                raise RuntimeError(f"{aport_name}: \"pmb:cross-native\" missing in"
-                                   " options= line. The pmb:cross-native option is"
-                                   " preferred because it results in significantly"
-                                   " lower build times. If the package doesn't build"
-                                   " with the option, you can add an exemption in"
-                                   " .gitlab-ci/testcases/test_firmware.py.")
-
-        if "!tracedeps" not in apkbuild["options"]:
-            raise RuntimeError(f"{aport_name}: \"!tracedeps\" missing in"
-                               " options= line. The tracedeps option is superfluous"
-                               " for firmware packages.")

.ci/testcases/test_kernel.py

@@ -1,42 +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(f"{args.aports}/**/linux-*/APKBUILD", recursive=True):
-        apkbuild = pmb.parse.apkbuild(path)
-        aport_name = os.path.basename(os.path.dirname(path))
-
-        if "pmb:cross-native" not in apkbuild["options"]:
-            raise RuntimeError(f"{aport_name}: \"pmb:cross-native\" missing in"
-                               " options= line")
-
-        # cross-compilers should not be in makedepends
-        for ccc in ["gcc-armv7", "gcc-armhf", "gcc-aarch64",
-                    "gcc4-armv7", "gcc4-armhf", "gcc4-aarch64",
-                    "gcc6-armv7", "gcc6-armhf", "gcc6-aarch64"]:
-            if ccc in apkbuild["makedepends"]:
-                raise RuntimeError(f"{aport_name}: Cross-compiler ({ccc}) should"
-                                   " not be explicitly specified in makedepends!"
-                                   " pmbootstrap installs cross-compiler"
-                                   " automatically.")
-
-        # nftables support in kernels used by main and community devices
-        for dir in ["main", "device/main", "device/community"]:
-            if path.startswith(f"{args.aports}/{dir}"):
-                assert pmb.parse.kconfig.check(args,
-                                               aport_name.replace("linux-", ""),
-                                               force_nftables_check=True)

.gitignore

@@ -115,7 +115,7 @@ ENV/
 .idea
 
 # Sources as unpacked and built by abuild
-**/src/
+/*/*/src/
 
 # Allow having untracked packages in aports using a custom-something directory
 /custom-*/

.gitlab-ci.yml

@@ -3,7 +3,7 @@
 # global settings
 image: alpine:latest
 after_script:
-  - .ci/move_logs.sh $CI_PROJECT_DIR
+  - .gitlab-ci/move_logs.sh $CI_PROJECT_DIR
 stages:
   - lint
   - build
@@ -18,7 +18,7 @@ stages:
 # https://docs.gitlab.com/ee/ci/merge_request_pipelines/index.html#excluding-certain-jobs
 .only-default: &only-default
   only:
-    - v21.12
+    - v21.03
     - merge_requests
     - tags
 
@@ -34,7 +34,7 @@ wiki:
   before_script:
     - apk -q add python3
   script:
-    - .ci/check_devices_in_wiki.py --booting
+    - .gitlab-ci/check_devices_in_wiki.py --booting
 
 # testcases linting
 testcases-linting:
@@ -44,8 +44,8 @@ testcases-linting:
     refs:
       - merge_requests
     changes:
-      - .ci/*
-      - .ci/*/*
+      - .gitlab-ci/*
+      - .gitlab-ci/*/*
   before_script:
     - apk -q add py-flake8
   script:
@@ -57,9 +57,10 @@ shellcheck:
   <<: *only-default
   image: alpine:edge
   before_script:
+    - apk -q upgrade
     - apk -q add shellcheck
   script:
-    - .ci/shellcheck.sh
+    - .gitlab-ci/shellcheck.sh
 
 # aports checks (generic)
 aports-static:
@@ -69,8 +70,8 @@ aports-static:
     - wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
     - sh ./install_pmbootstrap.sh pytest
   script:
-    - su pmos -c ".ci/run_testcases.sh"
-    - su pmos -c ".ci/check_changed_aports_versions.py"
+    - su pmos -c ".gitlab-ci/run_testcases.sh"
+    - su pmos -c ".gitlab-ci/check_changed_aports_versions.py"
   artifacts:
     when: on_failure
     paths:
@@ -98,7 +99,7 @@ aport-lint:
     - wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
     - sh ./install_pmbootstrap.sh
   script:
-    - su pmos -c ".ci/apkbuild-linting.py"
+    - su pmos -c ".gitlab-ci/apkbuild-linting.py"
   only:
     - merge_requests
   allow_failure: true
@@ -108,7 +109,7 @@ kernel-kconfig:
   stage: lint
   only:
     refs:
-      - v21.12
+      - v21.03
       - merge_requests
     changes:
       - device/*/linux-*/config-*
@@ -139,7 +140,7 @@ mr-settings:
     - wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
     - sh ./install_pmbootstrap.sh
   script:
-    - .ci/build.sh
+    - .gitlab-ci/build.sh
     - cp -r /home/pmos/.local/var/pmbootstrap/packages/ packages/ || true
   artifacts:
     expire_in: 1 week

.gitlab-ci/apkbuild-linting.py

@@ -13,19 +13,20 @@ if __name__ == "__main__":
         print("No APKBUILDs to lint")
         sys.exit(0)
 
-    packages = []
+    issues = []
     for apkbuild in apkbuilds:
         if apkbuild.startswith("temp/") or apkbuild.startswith("cross/"):
             print(f"NOTE: Skipping linting of {apkbuild}")
             continue
-        packages.append(os.path.basename(os.path.dirname(apkbuild)))
-    if len(packages) < 1:
-        print("No APKBUILDs to lint")
-        sys.exit(0)
 
-    result = common.run_pmbootstrap(["-q", "lint"] + packages, output_return=True)
+        package = os.path.basename(os.path.dirname(apkbuild))
+        result = common.run_pmbootstrap(["-q", "lint", package], output_return=True)
+        if len(result) > 0:
+            issues.append([apkbuild, result])
 
-    if len(result) > 0:
+    if len(issues) > 0:
         print("Linting issues found:")
-        print(result)
+        for issue in issues:
+            print(issue[0] + ": " + issue[1])
+
         sys.exit(1)

.gitlab-ci/build.sh

@@ -5,4 +5,4 @@ export PYTHONUNBUFFERED=1
 JOB_ARCH="${CI_JOB_NAME#build-}"
 
 set -x
-su pmos -c ".ci/build_changed_aports.py $JOB_ARCH"
+su pmos -c ".gitlab-ci/build_changed_aports.py $JOB_ARCH"

.gitlab-ci/build_changed_aports.py

@@ -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):
@@ -67,7 +66,8 @@ if __name__ == "__main__":
     # (Iterate over copy of packages, because we modify it in this loop)
     for package in packages.copy():
         apkbuild_path = pmb.helpers.pmaports.find(args, package)
-        apkbuild = pmb.parse._apkbuild.apkbuild(f"{apkbuild_path}/APKBUILD")
+        apkbuild = pmb.parse._apkbuild.apkbuild(args,
+                                                f"{apkbuild_path}/APKBUILD")
 
         if not pmb.helpers.pmaports.check_arches(apkbuild["arch"], arch):
             print(f"{package}: not enabled for {arch}, skipping")

.gitlab-ci/check_changed_aports_versions.py

@@ -38,7 +38,7 @@ def get_package_version(args, package, revision, check=True):
     with tempfile.TemporaryDirectory() as tempdir:
         with open(tempdir + "/APKBUILD", "w", encoding="utf-8") as handle:
             handle.write(apkbuild_content)
-        parsed = pmb.parse.apkbuild(tempdir + "/APKBUILD", False, False)
+        parsed = pmb.parse.apkbuild(args, tempdir + "/APKBUILD", False, False)
 
     return parsed["pkgver"] + "-r" + parsed["pkgrel"]
 

.gitlab-ci/check_devices_in_wiki.py

@@ -53,13 +53,6 @@ def get_wiki_devices_html(path):
     return {"booting": split[0], "not_booting": split[1]}
 
 
-def get_wiki_renamed_devices_html():
-    """:returns: HTML of the page"""
-    # Download wiki page
-    url = "http://wiki.postmarketos.org/wiki/Renamed_Devices"
-    return urllib.request.urlopen(url).read().decode("utf-8")
-
-
 def check_device(device, html, is_booting):
     """:param is_booting: require the device to be in the booting section, not
                           just anywhere in the page (i.e. in the not booting
@@ -74,9 +67,6 @@ def check_device(device, html, is_booting):
                   " section already)")
             return False
         return True
-    if device in html["renamed"]:
-        print(f"WARNING: {device} was renamed in the wiki")
-        return True
 
     print(device + ": not in the wiki yet.")
     return False
@@ -97,7 +87,6 @@ def main():
 
     # Check all devices
     html = get_wiki_devices_html(args.path)
-    html["renamed"] = get_wiki_renamed_devices_html()
     error = False
     for device in get_devices():
         if not check_device(device, html, args.booting):

.gitlab-ci/common.py

@@ -162,7 +162,7 @@ def get_changed_packages():
 
         # Skip files:
         # * in the root dir of pmaports (e.g. README.md)
-        # * path with a dot (e.g. .ci/, device/.shared-patches/)
+        # * path with a dot (e.g. .gitlab-ci/, device/.shared-patches/)
         if not dirname or file.startswith(".") or "/." in file:
             continue
 

.gitlab-ci/run_testcases.sh

@@ -32,4 +32,4 @@ if ! [ -e $deviceinfo ]; then
 fi
 
 # Run testcases
-pytest -vv -x --tb=native "$pmaports/.ci/testcases" "$@"
+pytest -vv -x --tb=native "$pmaports/.gitlab-ci/testcases" "$@"

.gitlab-ci/shellcheck.sh

@@ -15,19 +15,15 @@ fi
 
 # Shell: shellcheck
 sh_files="
-	./main/mdss-fb-init-hack/mdss-fb-init-hack.sh
 	./main/postmarketos-base/rootfs-usr-lib-firmwareload.sh
-	./main/postmarketos-installkernel/installkernel-pmos
-	./main/postmarketos-mkinitfs/init.sh
+	./main/postmarketos-mkinitfs/init.sh.in
 	./main/postmarketos-mkinitfs/init_functions.sh
+	./main/postmarketos-mkinitfs/mkinitfs.sh
+	./main/postmarketos-mkinitfs/mkinitfs_functions.sh
+	./main/postmarketos-mkinitfs/mkinitfs_test.sh
 	./main/postmarketos-mkinitfs-hook-debug-shell/20-debug-shell.sh
 	./main/postmarketos-update-kernel/update-kernel.sh
-	./main/swclock-offset/swclock-offset-boot.sh
-	./main/swclock-offset/swclock-offset-shutdown.sh
-	./main/ttyescape/*.sh
-	./main/ttyescape/*.post-install
-	./main/msm-firmware-loader/*.sh
-	./main/msm-firmware-loader/*.post-install
+	./main/mdss-fb-init-hack/mdss-fb-init-hack.sh
 
 	$(find . -path './main/postmarketos-ui-*/*.sh')
 	$(find . -path './main/postmarketos-ui-*/*.pre-install')
@@ -41,7 +37,7 @@ sh_files="
 	$(find . -path './main/devicepkg-dev/*.sh')
 	$(find . -path './main/postmarketos-mvcfg/*.sh')
 
-	$(find . -path '.ci/*.sh')
+	$(find . -path '.gitlab-ci/*.sh')
 "
 for file in $sh_files; do
 	echo "Test with shellcheck: $file"

.gitlab-ci/testcases/conftest.py

@@ -21,5 +21,5 @@ def args(request):
 
     # Initialize logging
     pmb.helpers.logging.init(args)
-    request.addfinalizer(pmb.helpers.logging.logfd.close)
+    request.addfinalizer(args.logfd.close)
     return args

.gitlab-ci/testcases/test_device.py

@@ -37,7 +37,7 @@ 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(path)
+        apkbuild = pmb.parse.apkbuild(args, path)
 
         # Depends: Require "postmarketos-base"
         if "postmarketos-base" not in apkbuild["depends"]:
@@ -57,14 +57,6 @@ def test_aports_device(args):
         if "!archcheck" not in apkbuild["options"]:
             raise RuntimeError("!archcheck missing in options= line: " + path)
 
-        if deviceinfo["flash_kernel_on_update"] == "true" \
-                and "postmarketos-update-kernel" not in apkbuild["depends"]:
-            raise RuntimeError(
-                "Deviceinfo indicates this device supports automatic kernel"
-                " flashing on update, but doesn't depend on"
-                " 'postmarketos-update-kernel'. Please add the missing"
-                " dependency.")
-
 
 def test_aports_device_kernel(args):
     """
@@ -76,7 +68,7 @@ def test_aports_device_kernel(args):
     # Iterate over device aports
     for path in glob.glob(args.aports + "/device/*/device-*/APKBUILD"):
         # Parse apkbuild and kernels from subpackages
-        apkbuild = pmb.parse.apkbuild(path)
+        apkbuild = pmb.parse.apkbuild(args, path)
         device = apkbuild["pkgname"][len("device-"):]
         kernels_subpackages = pmb.parse._apkbuild.kernels(args, device)
 

.gitlab-ci/testcases/test_deviceinfo.py

@@ -34,16 +34,7 @@ def test_deviceinfo(args):
     for folder in glob.glob(args.aports + "/device/*/device-*"):
         device = folder[len(args.aports):].split("-", 1)[1]
 
-        f = open(folder[len(args.aports):][1:] + "/deviceinfo")
-        lines = f.read().split("\n")
-        f.close()
-
         try:
-            # variable can not be empty
-            for line in lines:
-                if '=""' in line:
-                    raise RuntimeError("Please remove the empty variable: " + line)
-
             # Successful deviceinfo parsing / obsolete options
             info = pmb.parse.deviceinfo(args, device)
             deviceinfo_obsolete(info)

.gitlab-ci/testcases/test_directory_structure.py

@@ -5,14 +5,16 @@ import os
 import stat
 
 expected_directories = [
+    "console",
     "cross",
     "device/community",
     "device/main",
     "device/testing",
     "device/unmaintained",
+    "kde",
+    "maemo",
     "main",
     "modem",
-    "non-free",
     "sxmo",
     "temp",
 ]
@@ -46,7 +48,7 @@ def test_executable_files():
 
 # Make sure files are either:
 #  - in root directory (README.md)
-#  - hidden (.ci/, device/.shared-patches/)
+#  - hidden (.gitlab-ci/, device/.shared-patches/)
 #  - or belong to a package (below a directory with APKBUILD)
 def test_files_belong_to_package():
     # Walk directories and set package_dir when we find an APKBUILD

.gitlab-ci/testcases/test_framework_versions.py

@@ -30,7 +30,7 @@ def get_categorized_packages(args):
 
     for path in glob.glob(args.aports + "/*/*/APKBUILD"):
         # Parse APKBUILD
-        apkbuild = pmb.parse.apkbuild(path)
+        apkbuild = pmb.parse.apkbuild(args, path)
         url = apkbuild["url"]
         pkgname = apkbuild["pkgname"]
         pkgver = apkbuild["pkgver"]

.gitlab-ci/testcases/test_kernel.py

@@ -0,0 +1,23 @@
+#!/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}")

.gitlab-ci/testcases/test_ui.py

@@ -17,7 +17,7 @@ def test_aports_ui(args):
     """
     for arch in pmb.config.build_device_architectures:
         for path in glob.iglob(args.aports + "/main/postmarketos-ui-*/APKBUILD"):
-            apkbuild = pmb.parse.apkbuild(path)
+            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

.gitlab-ci/testcases/test_unreferenced_files.py

@@ -63,7 +63,7 @@ def test_aports_unreferenced_files(args):
     Raise an error if an unreferenced file is found
     """
     for apkbuild_path in glob.iglob(args.aports + "/**/APKBUILD", recursive=True):
-        apkbuild = pmb.parse.apkbuild(apkbuild_path)
+        apkbuild = pmb.parse.apkbuild(args, apkbuild_path)
         sources_chk = parse_source_from_checksums(args, apkbuild_path)
 
         # Collect install files from subpackages

CODEOWNERS

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

README.md

@@ -3,6 +3,5 @@
 Helpful resources:
 * [How to create a package](https://wiki.postmarketos.org/wiki/Create_a_package)
 * [APKBUILD reference](https://wiki.alpinelinux.org/wiki/APKBUILD_Reference)
-* [Alpine Linux aports](https://gitlab.alpinelinux.org/alpine/aports/)
-* [Alpine Linux package search](https://pkgs.alpinelinux.org/packages)
-* [postmarketOS package search](https://pkgs.postmarketos.org/packages)
+* [Alpine Linux aports](https://git.alpinelinux.org/cgit/aports)
+* [Alpine Linux package search](https://pkgs.alpinelinux.org/packages)

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

@@ -1,24 +1,39 @@
-From bbf05b742fde518fb97c789b043fe0d3aaf549f0 Mon Sep 17 00:00:00 2001
+From b1faf99f3e546df2cd302bb1ad36a2078224fe8b Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Tue, 21 Sep 2021 14:53:13 +0000
+Date: Fri, 30 Oct 2020 16:59:48 -0600
 Subject: [PATCH] Revert "PR25882, .gnu.attributes are not checked for shared
  libraries"
 
-This revert is needed to avoid wrongly tagging objects with the incompatible
-IBM long double ABI, which is not supported by musl and will result in
-linking errors if used.
-
 This reverts commit a8acd6eeb6dc2cc5460ece90f90ebe36b56b20ba.
 ---
- bfd/elf32-tic6x.c |  3 ---
- ld/ldlang.c       | 10 ++++------
- 2 files changed, 4 insertions(+), 9 deletions(-)
+ bfd/ChangeLog     | 6 ------
+ bfd/elf32-tic6x.c | 3 ---
+ ld/ChangeLog      | 6 ------
+ ld/ldlang.c       | 9 ++++-----
+ 4 files changed, 4 insertions(+), 20 deletions(-)
 
+diff --git a/bfd/ChangeLog b/bfd/ChangeLog
+index 9fac12538a..b5461494e8 100644
+--- a/bfd/ChangeLog
++++ b/bfd/ChangeLog
+@@ -1422,12 +1422,6 @@
+ 	accessing root.u.def of symbols.  Also check root.u.def.section
+ 	is non-NULL.  Reverse tests so as to make the logic positive.
+ 
+-2020-05-01  Alan Modra  <amodra@gmail.com>
+-
+-	PR 25882
+-	* elf32-tic6x.c (elf32_tic6x_merge_attributes): Don't transfer
+-	Tag_ABI_PIC or Tag_ABI_PID from dynamic objects to the output.
+-
+ 2020-05-01  Alan Modra  <amodra@gmail.com>
+ 
+ 	PR 25882
 diff --git a/bfd/elf32-tic6x.c b/bfd/elf32-tic6x.c
-index 5754f3cb860..3ad1d612749 100644
+index b8b916bfd3..91bb6a10b1 100644
 --- a/bfd/elf32-tic6x.c
 +++ b/bfd/elf32-tic6x.c
-@@ -3735,9 +3735,6 @@ elf32_tic6x_merge_attributes (bfd *ibfd, struct bfd_link_info *info)
+@@ -3748,9 +3748,6 @@ elf32_tic6x_merge_attributes (bfd *ibfd, struct bfd_link_info *info)
  
  	case Tag_ABI_PIC:
  	case Tag_ABI_PID:
@@ -28,20 +43,36 @@ index 5754f3cb860..3ad1d612749 100644
  	  if (out_attr[i].i > in_attr[i].i)
  	    out_attr[i].i = in_attr[i].i;
  	  break;
+diff --git a/ld/ChangeLog b/ld/ChangeLog
+index 4eec7d2977..b93452f70c 100644
+--- a/ld/ChangeLog
++++ b/ld/ChangeLog
+@@ -1319,12 +1319,6 @@
+ 	* testsuite/ld-aarch64/farcall-group.d: New test driver.
+ 	* testsuite/ld-aarch64/aarch64-elf.exp: Run the new test.
+ 
+-2020-05-01  Alan Modra  <amodra@gmail.com>
+-
+-	PR 25882
+-	* ldlang.c (lang_check): Call bfd_merge_private_bfd_data for
+-	shared libraries.
+-
+ 2020-05-01  Alan Modra  <amodra@gmail.com>
+ 
+ 	* po/BLD-POTFILES.in: Regenerate.
 diff --git a/ld/ldlang.c b/ld/ldlang.c
-index 37b64c89ee1..f13beaef9d9 100644
+index 9977195074..173d8ec349 100644
 --- a/ld/ldlang.c
 +++ b/ld/ldlang.c
-@@ -7071,13 +7071,11 @@ lang_check (void)
+@@ -6972,12 +6972,11 @@ lang_check (void)
  		   bfd_printable_name (input_bfd), input_bfd,
  		   bfd_printable_name (link_info.output_bfd));
  	}
 -
 -      /* If the input bfd has no contents, it shouldn't set the
 -	 private data of the output bfd.  */
--      else if (!file->flags.just_syms
--	       && ((input_bfd->flags & DYNAMIC) != 0
--		   || bfd_count_sections (input_bfd) != 0))
+-      else if ((input_bfd->flags & DYNAMIC) != 0
+-	       || bfd_count_sections (input_bfd) != 0)
 +      else if (bfd_count_sections (input_bfd))
  	{
 +	  /* If the input bfd has no contents, it shouldn't set the
@@ -51,5 +82,5 @@ index 37b64c89ee1..f13beaef9d9 100644
  
  	  /* If we aren't supposed to warn about mismatched input
 -- 
-2.33.0
+2.29.2
 

cross/binutils-aarch64/APKBUILD

@@ -3,8 +3,8 @@
 # Based on: main/binutils
 
 pkgname=binutils-aarch64
-pkgver=2.37
-pkgrel=3
+pkgver=2.35.2
+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"
@@ -15,16 +15,10 @@ source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz
 	gold-mips.patch
 	ld-bfd-mips.patch
 	0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
-	binutils-mips-disable-assert.patch
-	bfd-close-file-desriptor-if-there-is-no-archive-fd.patch
-	defang-no-split.patch
+	CVE-2021-3487.patch
 	"
 builddir="$srcdir/binutils-$pkgver"
 
-if [ "$CHOST" = "$CBUILD" ] && [ "$CBUILD" = "$CTARGET" ] && [ "$CTARGET_ARCH" != "riscv64" ]; then
-	subpackages=""
-fi
-
 if [ "$CHOST" != "$CTARGET" ]; then
 	pkgname="binutils-$CTARGET_ARCH"
 	subpackages=""
@@ -65,20 +59,13 @@ package() {
 
 	# remove man, info folders
 	rm -rf "$pkgdir"/usr/share
-
-	# remove files that conflict with non-cross binutils
-	rm -rf "$pkgdir"/usr/lib/bfd-plugins
 }
 
 
 
-sha512sums="
-5c11aeef6935860a6819ed3a3c93371f052e52b4bdc5033da36037c1544d013b7f12cb8d561ec954fe7469a68f1b66f1a3cd53d5a3af7293635a90d69edd15e7  binutils-2.37.tar.xz
+sha512sums="9974ede5978d32e0d68fef23da48fa00bd06b0bff7ec45b00ca075c126d6bbe0cf2defc03ecc3f17bc6cc85b64271a13009c4049d7ba17de26e84e3a6e2c0348  binutils-2.35.2.tar.xz
 ecee33b0e435aa704af1c334e560f201638ff79e199aa11ed78a72f7c9b46f85fbb227af5748e735fd681d1965fcc42ac81b0c8824e540430ce0c706c81e8b49  binutils-ld-fix-static-linking.patch
 f55cf2e0bf82f97583a1abe10710e4013ecf7d64f1da2ef8659a44a06d0dd8beaf58dab98a183488ea137f03e32d62efc878d95f018f836f8cec870bc448556f  gold-mips.patch
 314d2ef9071c89940aa6c8118e8a1e2f191a5d0a4bf596da1ad9cc84f884d8bc7dea8bd7b9fc3f8f1bddd3fd41c6eb017e1e804044b3bf084df1ed9e6e095e2d  ld-bfd-mips.patch
-70ec22bd72ef6dddecfd970613387dd4a8cdc8730dd3cbf03d5a0c3a7c4d839383167bb06dad21bf7c235329fd44b5dc4aefe762f68544f17155cf002bf1be4a  0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
-609cd90d8b334eb309f586b17b9d335a08d3dbb6def7c3eb5c010028fcb681674031e5b9d853aa7a39a50304356a86afc184b85562b3f228f8197f4d29395c8f  binutils-mips-disable-assert.patch
-10a0074583d2cc4598710c7e434ba7088da074b105f4f5e951fc61af7150ad62adf60a7c98f6fd13b1771f169e45a5a1ef618240c6893d3f0f3d93fd768a03c6  bfd-close-file-desriptor-if-there-is-no-archive-fd.patch
-4652f092c9376f0cb7fd6c72cb37ff7c15c1c6e3408fac79329b7f41a7925c98eb35989a9a040682130988a36401901d6d95afa44f0ce50caa85ee478db6bf03  defang-no-split.patch
-"
+642c617db6c6e491f78f053d60f3aa369bad7bf8c1bc7ce267de6cf8fddf6c0d4cf63ce8c8f6e2f225dedbce7cb930d8e87e168fd8f72ca0837c77266ee2b5f8  0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
+b08384ed124a74ad3a424db370c107230f09a54378502ca4385deb738f7cf799857f2af0db52709c7eeab8fa6c0a3d972f891396cce1e2834a21f67682fc4355  CVE-2021-3487.patch"

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

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

cross/binutils-aarch64/bfd-close-file-desriptor-if-there-is-no-archive-fd.patch

@@ -1,234 +0,0 @@
-Upstream: yes
-URL: https://sourceware.org/bugzilla/show_bug.cgi?id=28138
-From 1c611b40e6bfc8029bff7696814330b5bc0ee5c0 Mon Sep 17 00:00:00 2001
-From: "H.J. Lu" <hjl.tools@gmail.com>
-Date: Mon, 26 Jul 2021 05:59:55 -0700
-Subject: [PATCH] bfd: Close the file descriptor if there is no archive fd
-
-Close the file descriptor if there is no archive plugin file descriptor
-to avoid running out of file descriptors on thin archives with many
-archive members.
-
-bfd/
-
-	PR ld/28138
-	* plugin.c (bfd_plugin_close_file_descriptor): Close the file
-	descriptor there is no archive plugin file descriptor.
-
-ld/
-
-	PR ld/28138
-	* testsuite/ld-plugin/lto.exp: Run tmpdir/pr28138 only for
-	native build.
-
-	PR ld/28138
-	* testsuite/ld-plugin/lto.exp: Run ld/28138 tests.
-	* testsuite/ld-plugin/pr28138.c: New file.
-	* testsuite/ld-plugin/pr28138-1.c: Likewise.
-	* testsuite/ld-plugin/pr28138-2.c: Likewise.
-	* testsuite/ld-plugin/pr28138-3.c: Likewise.
-	* testsuite/ld-plugin/pr28138-4.c: Likewise.
-	* testsuite/ld-plugin/pr28138-5.c: Likewise.
-	* testsuite/ld-plugin/pr28138-6.c: Likewise.
-	* testsuite/ld-plugin/pr28138-7.c: Likewise.
-
-(cherry picked from commit 5a98fb7513b559e20dfebdbaa2a471afda3b4742)
-(cherry picked from commit 7dc37e1e1209c80e0bab784df6b6bac335e836f2)
----
- bfd/plugin.c                       |  8 +++++++
- ld/testsuite/ld-plugin/lto.exp     | 34 ++++++++++++++++++++++++++++++
- ld/testsuite/ld-plugin/pr28138-1.c |  6 ++++++
- ld/testsuite/ld-plugin/pr28138-2.c |  6 ++++++
- ld/testsuite/ld-plugin/pr28138-3.c |  6 ++++++
- ld/testsuite/ld-plugin/pr28138-4.c |  6 ++++++
- ld/testsuite/ld-plugin/pr28138-5.c |  6 ++++++
- ld/testsuite/ld-plugin/pr28138-6.c |  6 ++++++
- ld/testsuite/ld-plugin/pr28138-7.c |  6 ++++++
- ld/testsuite/ld-plugin/pr28138.c   | 20 ++++++++++++++++++
- 10 files changed, 104 insertions(+)
- create mode 100644 ld/testsuite/ld-plugin/pr28138-1.c
- create mode 100644 ld/testsuite/ld-plugin/pr28138-2.c
- create mode 100644 ld/testsuite/ld-plugin/pr28138-3.c
- create mode 100644 ld/testsuite/ld-plugin/pr28138-4.c
- create mode 100644 ld/testsuite/ld-plugin/pr28138-5.c
- create mode 100644 ld/testsuite/ld-plugin/pr28138-6.c
- create mode 100644 ld/testsuite/ld-plugin/pr28138-7.c
- create mode 100644 ld/testsuite/ld-plugin/pr28138.c
-
-diff --git a/bfd/plugin.c b/bfd/plugin.c
-index 6cfa2b66470..3bab8febe88 100644
---- a/bfd/plugin.c
-+++ b/bfd/plugin.c
-@@ -291,6 +291,14 @@ bfd_plugin_close_file_descriptor (bfd *abfd, int fd)
- 	     && !bfd_is_thin_archive (abfd->my_archive))
- 	abfd = abfd->my_archive;
- 
-+      /* Close the file descriptor if there is no archive plugin file
-+	 descriptor.  */
-+      if (abfd->archive_plugin_fd == -1)
-+	{
-+	  close (fd);
-+	  return;
-+	}
-+
-       abfd->archive_plugin_fd_open_count--;
-       /* Dup the archive plugin file descriptor for later use, which
- 	 will be closed by _bfd_archive_close_and_cleanup.  */
-diff --git a/ld/testsuite/ld-plugin/lto.exp b/ld/testsuite/ld-plugin/lto.exp
-index def69e43ab3..999d911ce6a 100644
---- a/ld/testsuite/ld-plugin/lto.exp
-+++ b/ld/testsuite/ld-plugin/lto.exp
-@@ -687,6 +687,40 @@ if { [is_elf_format] && [check_lto_shared_available] } {
-     }
- }
- 
-+run_cc_link_tests [list \
-+    [list \
-+	"Build pr28138.a" \
-+	"-T" "" \
-+	{pr28138-1.c pr28138-2.c pr28138-3.c pr28138-4.c pr28138-5.c \
-+	 pr28138-6.c pr28138-7.c} {} "pr28138.a" \
-+    ] \
-+    [list \
-+	"Build pr28138.o" \
-+	"" "" \
-+	{pr28138.c} {} \
-+    ] \
-+]
-+
-+set exec_output [run_host_cmd "sh" \
-+			      "-c \"ulimit -n 20; \
-+			      $CC -Btmpdir/ld -o tmpdir/pr28138 \
-+			      tmpdir/pr28138.o tmpdir/pr28138.a\""]
-+set exec_output [prune_warnings $exec_output]
-+if [string match "" $exec_output] then {
-+    if { [isnative] } {
-+	set exec_output [run_host_cmd "tmpdir/pr28138" ""]
-+	if [string match "PASS" $exec_output] then {
-+	    pass "PR ld/28138"
-+	} else {
-+	    fail "PR ld/28138"
-+	}
-+    } else {
-+	pass "PR ld/28138"
-+    }
-+} else {
-+    fail "PR ld/28138"
-+}
-+
- set testname "Build liblto-11.a"
- remote_file host delete "tmpdir/liblto-11.a"
- set catch_output [run_host_cmd "$ar" "rc $plug_opt tmpdir/liblto-11.a tmpdir/lto-11a.o tmpdir/lto-11b.o tmpdir/lto-11c.o"]
-diff --git a/ld/testsuite/ld-plugin/pr28138-1.c b/ld/testsuite/ld-plugin/pr28138-1.c
-new file mode 100644
-index 00000000000..51d119e1642
---- /dev/null
-+++ b/ld/testsuite/ld-plugin/pr28138-1.c
-@@ -0,0 +1,6 @@
-+extern int a0(void);
-+int
-+a1(void)
-+{
-+  return 1 + a0();
-+}
-diff --git a/ld/testsuite/ld-plugin/pr28138-2.c b/ld/testsuite/ld-plugin/pr28138-2.c
-new file mode 100644
-index 00000000000..1120cd797e9
---- /dev/null
-+++ b/ld/testsuite/ld-plugin/pr28138-2.c
-@@ -0,0 +1,6 @@
-+extern int a1(void);
-+int
-+a2(void)
-+{
-+  return 1 + a1();
-+}
-diff --git a/ld/testsuite/ld-plugin/pr28138-3.c b/ld/testsuite/ld-plugin/pr28138-3.c
-new file mode 100644
-index 00000000000..ec464947ee6
---- /dev/null
-+++ b/ld/testsuite/ld-plugin/pr28138-3.c
-@@ -0,0 +1,6 @@
-+extern int a2(void);
-+int
-+a3(void)
-+{
-+  return 1 + a2();
-+}
-diff --git a/ld/testsuite/ld-plugin/pr28138-4.c b/ld/testsuite/ld-plugin/pr28138-4.c
-new file mode 100644
-index 00000000000..475701b2c5c
---- /dev/null
-+++ b/ld/testsuite/ld-plugin/pr28138-4.c
-@@ -0,0 +1,6 @@
-+extern int a3(void);
-+int
-+a4(void)
-+{
-+  return 1 + a3();
-+}
-diff --git a/ld/testsuite/ld-plugin/pr28138-5.c b/ld/testsuite/ld-plugin/pr28138-5.c
-new file mode 100644
-index 00000000000..e24f86c363e
---- /dev/null
-+++ b/ld/testsuite/ld-plugin/pr28138-5.c
-@@ -0,0 +1,6 @@
-+extern int a4(void);
-+int
-+a5(void)
-+{
-+  return 1 + a4();
-+}
-diff --git a/ld/testsuite/ld-plugin/pr28138-6.c b/ld/testsuite/ld-plugin/pr28138-6.c
-new file mode 100644
-index 00000000000..b5b938bdb21
---- /dev/null
-+++ b/ld/testsuite/ld-plugin/pr28138-6.c
-@@ -0,0 +1,6 @@
-+extern int a5(void);
-+int
-+a6(void)
-+{
-+  return 1 + a5();
-+}
-diff --git a/ld/testsuite/ld-plugin/pr28138-7.c b/ld/testsuite/ld-plugin/pr28138-7.c
-new file mode 100644
-index 00000000000..4ef75bf0f0c
---- /dev/null
-+++ b/ld/testsuite/ld-plugin/pr28138-7.c
-@@ -0,0 +1,6 @@
-+extern int a6(void);
-+int
-+a7(void)
-+{
-+  return 1 + a6();
-+}
-diff --git a/ld/testsuite/ld-plugin/pr28138.c b/ld/testsuite/ld-plugin/pr28138.c
-new file mode 100644
-index 00000000000..68252c9f382
---- /dev/null
-+++ b/ld/testsuite/ld-plugin/pr28138.c
-@@ -0,0 +1,20 @@
-+#include <stdio.h>
-+
-+extern int a7(void);
-+
-+int
-+a0(void)
-+{
-+  return 0;
-+}
-+
-+int
-+main()
-+{
-+  if (a7() == 7)
-+    {
-+      printf ("PASS\n");
-+      return 0;
-+    }
-+  return 1;
-+}
--- 
-2.27.0
-

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

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

cross/binutils-aarch64/defang-no-split.patch

@@ -1,38 +0,0 @@
-From 2dad02b6d46eef438cbd14d8511487b056628a38 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <siarheit@google.com>
-Date: Mon, 26 Jul 2021 22:51:18 +0100
-Subject: [PATCH 1/1] texi2pod.pl: add no-op --no-split option support
- [PR28144]
-
-Change 2faf902da ("generate single html manual page by default")
-added use of --no-split option to makeinfo. binutils reuses
-makeinfo options for texi2pod.pl wrapper. Unsupported option
-led to silent manpage truncation.
-
-The change adds no-op option support.
-
-etc/
-	PR 28144
-	* texi2pod.pl: Handle no-op --no-split option.
-
-(cherry picked from commit 96a7037cd8573cf065aa6b12baca68696f96d9ca)
----
- etc/texi2pod.pl | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/etc/texi2pod.pl b/etc/texi2pod.pl
-index 11f70d156be..dcf2b437640 100644
---- a/etc/texi2pod.pl
-+++ b/etc/texi2pod.pl
-@@ -59,6 +59,8 @@ while ($_ = shift) {
- 	    $flag = shift;
- 	}
-         push (@ipath, $flag);
-+    } elsif (/^--no-split$/) {
-+	# ignore option for makeinfo compatibility
-     } elsif (/^-/) {
- 	usage();
-     } else {
--- 
-2.27.0
-

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

@@ -1,24 +1,39 @@
-From bbf05b742fde518fb97c789b043fe0d3aaf549f0 Mon Sep 17 00:00:00 2001
+From b1faf99f3e546df2cd302bb1ad36a2078224fe8b Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Tue, 21 Sep 2021 14:53:13 +0000
+Date: Fri, 30 Oct 2020 16:59:48 -0600
 Subject: [PATCH] Revert "PR25882, .gnu.attributes are not checked for shared
  libraries"
 
-This revert is needed to avoid wrongly tagging objects with the incompatible
-IBM long double ABI, which is not supported by musl and will result in
-linking errors if used.
-
 This reverts commit a8acd6eeb6dc2cc5460ece90f90ebe36b56b20ba.
 ---
- bfd/elf32-tic6x.c |  3 ---
- ld/ldlang.c       | 10 ++++------
- 2 files changed, 4 insertions(+), 9 deletions(-)
+ bfd/ChangeLog     | 6 ------
+ bfd/elf32-tic6x.c | 3 ---
+ ld/ChangeLog      | 6 ------
+ ld/ldlang.c       | 9 ++++-----
+ 4 files changed, 4 insertions(+), 20 deletions(-)
 
+diff --git a/bfd/ChangeLog b/bfd/ChangeLog
+index 9fac12538a..b5461494e8 100644
+--- a/bfd/ChangeLog
++++ b/bfd/ChangeLog
+@@ -1422,12 +1422,6 @@
+ 	accessing root.u.def of symbols.  Also check root.u.def.section
+ 	is non-NULL.  Reverse tests so as to make the logic positive.
+ 
+-2020-05-01  Alan Modra  <amodra@gmail.com>
+-
+-	PR 25882
+-	* elf32-tic6x.c (elf32_tic6x_merge_attributes): Don't transfer
+-	Tag_ABI_PIC or Tag_ABI_PID from dynamic objects to the output.
+-
+ 2020-05-01  Alan Modra  <amodra@gmail.com>
+ 
+ 	PR 25882
 diff --git a/bfd/elf32-tic6x.c b/bfd/elf32-tic6x.c
-index 5754f3cb860..3ad1d612749 100644
+index b8b916bfd3..91bb6a10b1 100644
 --- a/bfd/elf32-tic6x.c
 +++ b/bfd/elf32-tic6x.c
-@@ -3735,9 +3735,6 @@ elf32_tic6x_merge_attributes (bfd *ibfd, struct bfd_link_info *info)
+@@ -3748,9 +3748,6 @@ elf32_tic6x_merge_attributes (bfd *ibfd, struct bfd_link_info *info)
  
  	case Tag_ABI_PIC:
  	case Tag_ABI_PID:
@@ -28,20 +43,36 @@ index 5754f3cb860..3ad1d612749 100644
  	  if (out_attr[i].i > in_attr[i].i)
  	    out_attr[i].i = in_attr[i].i;
  	  break;
+diff --git a/ld/ChangeLog b/ld/ChangeLog
+index 4eec7d2977..b93452f70c 100644
+--- a/ld/ChangeLog
++++ b/ld/ChangeLog
+@@ -1319,12 +1319,6 @@
+ 	* testsuite/ld-aarch64/farcall-group.d: New test driver.
+ 	* testsuite/ld-aarch64/aarch64-elf.exp: Run the new test.
+ 
+-2020-05-01  Alan Modra  <amodra@gmail.com>
+-
+-	PR 25882
+-	* ldlang.c (lang_check): Call bfd_merge_private_bfd_data for
+-	shared libraries.
+-
+ 2020-05-01  Alan Modra  <amodra@gmail.com>
+ 
+ 	* po/BLD-POTFILES.in: Regenerate.
 diff --git a/ld/ldlang.c b/ld/ldlang.c
-index 37b64c89ee1..f13beaef9d9 100644
+index 9977195074..173d8ec349 100644
 --- a/ld/ldlang.c
 +++ b/ld/ldlang.c
-@@ -7071,13 +7071,11 @@ lang_check (void)
+@@ -6972,12 +6972,11 @@ lang_check (void)
  		   bfd_printable_name (input_bfd), input_bfd,
  		   bfd_printable_name (link_info.output_bfd));
  	}
 -
 -      /* If the input bfd has no contents, it shouldn't set the
 -	 private data of the output bfd.  */
--      else if (!file->flags.just_syms
--	       && ((input_bfd->flags & DYNAMIC) != 0
--		   || bfd_count_sections (input_bfd) != 0))
+-      else if ((input_bfd->flags & DYNAMIC) != 0
+-	       || bfd_count_sections (input_bfd) != 0)
 +      else if (bfd_count_sections (input_bfd))
  	{
 +	  /* If the input bfd has no contents, it shouldn't set the
@@ -51,5 +82,5 @@ index 37b64c89ee1..f13beaef9d9 100644
  
  	  /* If we aren't supposed to warn about mismatched input
 -- 
-2.33.0
+2.29.2
 

cross/binutils-armv7/APKBUILD

@@ -3,8 +3,8 @@
 # Based on: main/binutils
 
 pkgname=binutils-armv7
-pkgver=2.37
-pkgrel=3
+pkgver=2.35.2
+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"
@@ -15,16 +15,10 @@ source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz
 	gold-mips.patch
 	ld-bfd-mips.patch
 	0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
-	binutils-mips-disable-assert.patch
-	bfd-close-file-desriptor-if-there-is-no-archive-fd.patch
-	defang-no-split.patch
+	CVE-2021-3487.patch
 	"
 builddir="$srcdir/binutils-$pkgver"
 
-if [ "$CHOST" = "$CBUILD" ] && [ "$CBUILD" = "$CTARGET" ] && [ "$CTARGET_ARCH" != "riscv64" ]; then
-	subpackages=""
-fi
-
 if [ "$CHOST" != "$CTARGET" ]; then
 	pkgname="binutils-$CTARGET_ARCH"
 	subpackages=""
@@ -65,20 +59,13 @@ package() {
 
 	# remove man, info folders
 	rm -rf "$pkgdir"/usr/share
-
-	# remove files that conflict with non-cross binutils
-	rm -rf "$pkgdir"/usr/lib/bfd-plugins
 }
 
 
 
-sha512sums="
-5c11aeef6935860a6819ed3a3c93371f052e52b4bdc5033da36037c1544d013b7f12cb8d561ec954fe7469a68f1b66f1a3cd53d5a3af7293635a90d69edd15e7  binutils-2.37.tar.xz
+sha512sums="9974ede5978d32e0d68fef23da48fa00bd06b0bff7ec45b00ca075c126d6bbe0cf2defc03ecc3f17bc6cc85b64271a13009c4049d7ba17de26e84e3a6e2c0348  binutils-2.35.2.tar.xz
 ecee33b0e435aa704af1c334e560f201638ff79e199aa11ed78a72f7c9b46f85fbb227af5748e735fd681d1965fcc42ac81b0c8824e540430ce0c706c81e8b49  binutils-ld-fix-static-linking.patch
 f55cf2e0bf82f97583a1abe10710e4013ecf7d64f1da2ef8659a44a06d0dd8beaf58dab98a183488ea137f03e32d62efc878d95f018f836f8cec870bc448556f  gold-mips.patch
 314d2ef9071c89940aa6c8118e8a1e2f191a5d0a4bf596da1ad9cc84f884d8bc7dea8bd7b9fc3f8f1bddd3fd41c6eb017e1e804044b3bf084df1ed9e6e095e2d  ld-bfd-mips.patch
-70ec22bd72ef6dddecfd970613387dd4a8cdc8730dd3cbf03d5a0c3a7c4d839383167bb06dad21bf7c235329fd44b5dc4aefe762f68544f17155cf002bf1be4a  0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
-609cd90d8b334eb309f586b17b9d335a08d3dbb6def7c3eb5c010028fcb681674031e5b9d853aa7a39a50304356a86afc184b85562b3f228f8197f4d29395c8f  binutils-mips-disable-assert.patch
-10a0074583d2cc4598710c7e434ba7088da074b105f4f5e951fc61af7150ad62adf60a7c98f6fd13b1771f169e45a5a1ef618240c6893d3f0f3d93fd768a03c6  bfd-close-file-desriptor-if-there-is-no-archive-fd.patch
-4652f092c9376f0cb7fd6c72cb37ff7c15c1c6e3408fac79329b7f41a7925c98eb35989a9a040682130988a36401901d6d95afa44f0ce50caa85ee478db6bf03  defang-no-split.patch
-"
+642c617db6c6e491f78f053d60f3aa369bad7bf8c1bc7ce267de6cf8fddf6c0d4cf63ce8c8f6e2f225dedbce7cb930d8e87e168fd8f72ca0837c77266ee2b5f8  0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
+b08384ed124a74ad3a424db370c107230f09a54378502ca4385deb738f7cf799857f2af0db52709c7eeab8fa6c0a3d972f891396cce1e2834a21f67682fc4355  CVE-2021-3487.patch"

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

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

cross/binutils-armv7/bfd-close-file-desriptor-if-there-is-no-archive-fd.patch

@@ -1,234 +0,0 @@
-Upstream: yes
-URL: https://sourceware.org/bugzilla/show_bug.cgi?id=28138
-From 1c611b40e6bfc8029bff7696814330b5bc0ee5c0 Mon Sep 17 00:00:00 2001
-From: "H.J. Lu" <hjl.tools@gmail.com>
-Date: Mon, 26 Jul 2021 05:59:55 -0700
-Subject: [PATCH] bfd: Close the file descriptor if there is no archive fd
-
-Close the file descriptor if there is no archive plugin file descriptor
-to avoid running out of file descriptors on thin archives with many
-archive members.
-
-bfd/
-
-	PR ld/28138
-	* plugin.c (bfd_plugin_close_file_descriptor): Close the file
-	descriptor there is no archive plugin file descriptor.
-
-ld/
-
-	PR ld/28138
-	* testsuite/ld-plugin/lto.exp: Run tmpdir/pr28138 only for
-	native build.
-
-	PR ld/28138
-	* testsuite/ld-plugin/lto.exp: Run ld/28138 tests.
-	* testsuite/ld-plugin/pr28138.c: New file.
-	* testsuite/ld-plugin/pr28138-1.c: Likewise.
-	* testsuite/ld-plugin/pr28138-2.c: Likewise.
-	* testsuite/ld-plugin/pr28138-3.c: Likewise.
-	* testsuite/ld-plugin/pr28138-4.c: Likewise.
-	* testsuite/ld-plugin/pr28138-5.c: Likewise.
-	* testsuite/ld-plugin/pr28138-6.c: Likewise.
-	* testsuite/ld-plugin/pr28138-7.c: Likewise.
-
-(cherry picked from commit 5a98fb7513b559e20dfebdbaa2a471afda3b4742)
-(cherry picked from commit 7dc37e1e1209c80e0bab784df6b6bac335e836f2)
----
- bfd/plugin.c                       |  8 +++++++
- ld/testsuite/ld-plugin/lto.exp     | 34 ++++++++++++++++++++++++++++++
- ld/testsuite/ld-plugin/pr28138-1.c |  6 ++++++
- ld/testsuite/ld-plugin/pr28138-2.c |  6 ++++++
- ld/testsuite/ld-plugin/pr28138-3.c |  6 ++++++
- ld/testsuite/ld-plugin/pr28138-4.c |  6 ++++++
- ld/testsuite/ld-plugin/pr28138-5.c |  6 ++++++
- ld/testsuite/ld-plugin/pr28138-6.c |  6 ++++++
- ld/testsuite/ld-plugin/pr28138-7.c |  6 ++++++
- ld/testsuite/ld-plugin/pr28138.c   | 20 ++++++++++++++++++
- 10 files changed, 104 insertions(+)
- create mode 100644 ld/testsuite/ld-plugin/pr28138-1.c
- create mode 100644 ld/testsuite/ld-plugin/pr28138-2.c
- create mode 100644 ld/testsuite/ld-plugin/pr28138-3.c
- create mode 100644 ld/testsuite/ld-plugin/pr28138-4.c
- create mode 100644 ld/testsuite/ld-plugin/pr28138-5.c
- create mode 100644 ld/testsuite/ld-plugin/pr28138-6.c
- create mode 100644 ld/testsuite/ld-plugin/pr28138-7.c
- create mode 100644 ld/testsuite/ld-plugin/pr28138.c
-
-diff --git a/bfd/plugin.c b/bfd/plugin.c
-index 6cfa2b66470..3bab8febe88 100644
---- a/bfd/plugin.c
-+++ b/bfd/plugin.c
-@@ -291,6 +291,14 @@ bfd_plugin_close_file_descriptor (bfd *abfd, int fd)
- 	     && !bfd_is_thin_archive (abfd->my_archive))
- 	abfd = abfd->my_archive;
- 
-+      /* Close the file descriptor if there is no archive plugin file
-+	 descriptor.  */
-+      if (abfd->archive_plugin_fd == -1)
-+	{
-+	  close (fd);
-+	  return;
-+	}
-+
-       abfd->archive_plugin_fd_open_count--;
-       /* Dup the archive plugin file descriptor for later use, which
- 	 will be closed by _bfd_archive_close_and_cleanup.  */
-diff --git a/ld/testsuite/ld-plugin/lto.exp b/ld/testsuite/ld-plugin/lto.exp
-index def69e43ab3..999d911ce6a 100644
---- a/ld/testsuite/ld-plugin/lto.exp
-+++ b/ld/testsuite/ld-plugin/lto.exp
-@@ -687,6 +687,40 @@ if { [is_elf_format] && [check_lto_shared_available] } {
-     }
- }
- 
-+run_cc_link_tests [list \
-+    [list \
-+	"Build pr28138.a" \
-+	"-T" "" \
-+	{pr28138-1.c pr28138-2.c pr28138-3.c pr28138-4.c pr28138-5.c \
-+	 pr28138-6.c pr28138-7.c} {} "pr28138.a" \
-+    ] \
-+    [list \
-+	"Build pr28138.o" \
-+	"" "" \
-+	{pr28138.c} {} \
-+    ] \
-+]
-+
-+set exec_output [run_host_cmd "sh" \
-+			      "-c \"ulimit -n 20; \
-+			      $CC -Btmpdir/ld -o tmpdir/pr28138 \
-+			      tmpdir/pr28138.o tmpdir/pr28138.a\""]
-+set exec_output [prune_warnings $exec_output]
-+if [string match "" $exec_output] then {
-+    if { [isnative] } {
-+	set exec_output [run_host_cmd "tmpdir/pr28138" ""]
-+	if [string match "PASS" $exec_output] then {
-+	    pass "PR ld/28138"
-+	} else {
-+	    fail "PR ld/28138"
-+	}
-+    } else {
-+	pass "PR ld/28138"
-+    }
-+} else {
-+    fail "PR ld/28138"
-+}
-+
- set testname "Build liblto-11.a"
- remote_file host delete "tmpdir/liblto-11.a"
- set catch_output [run_host_cmd "$ar" "rc $plug_opt tmpdir/liblto-11.a tmpdir/lto-11a.o tmpdir/lto-11b.o tmpdir/lto-11c.o"]
-diff --git a/ld/testsuite/ld-plugin/pr28138-1.c b/ld/testsuite/ld-plugin/pr28138-1.c
-new file mode 100644
-index 00000000000..51d119e1642
---- /dev/null
-+++ b/ld/testsuite/ld-plugin/pr28138-1.c
-@@ -0,0 +1,6 @@
-+extern int a0(void);
-+int
-+a1(void)
-+{
-+  return 1 + a0();
-+}
-diff --git a/ld/testsuite/ld-plugin/pr28138-2.c b/ld/testsuite/ld-plugin/pr28138-2.c
-new file mode 100644
-index 00000000000..1120cd797e9
---- /dev/null
-+++ b/ld/testsuite/ld-plugin/pr28138-2.c
-@@ -0,0 +1,6 @@
-+extern int a1(void);
-+int
-+a2(void)
-+{
-+  return 1 + a1();
-+}
-diff --git a/ld/testsuite/ld-plugin/pr28138-3.c b/ld/testsuite/ld-plugin/pr28138-3.c
-new file mode 100644
-index 00000000000..ec464947ee6
---- /dev/null
-+++ b/ld/testsuite/ld-plugin/pr28138-3.c
-@@ -0,0 +1,6 @@
-+extern int a2(void);
-+int
-+a3(void)
-+{
-+  return 1 + a2();
-+}
-diff --git a/ld/testsuite/ld-plugin/pr28138-4.c b/ld/testsuite/ld-plugin/pr28138-4.c
-new file mode 100644
-index 00000000000..475701b2c5c
---- /dev/null
-+++ b/ld/testsuite/ld-plugin/pr28138-4.c
-@@ -0,0 +1,6 @@
-+extern int a3(void);
-+int
-+a4(void)
-+{
-+  return 1 + a3();
-+}
-diff --git a/ld/testsuite/ld-plugin/pr28138-5.c b/ld/testsuite/ld-plugin/pr28138-5.c
-new file mode 100644
-index 00000000000..e24f86c363e
---- /dev/null
-+++ b/ld/testsuite/ld-plugin/pr28138-5.c
-@@ -0,0 +1,6 @@
-+extern int a4(void);
-+int
-+a5(void)
-+{
-+  return 1 + a4();
-+}
-diff --git a/ld/testsuite/ld-plugin/pr28138-6.c b/ld/testsuite/ld-plugin/pr28138-6.c
-new file mode 100644
-index 00000000000..b5b938bdb21
---- /dev/null
-+++ b/ld/testsuite/ld-plugin/pr28138-6.c
-@@ -0,0 +1,6 @@
-+extern int a5(void);
-+int
-+a6(void)
-+{
-+  return 1 + a5();
-+}
-diff --git a/ld/testsuite/ld-plugin/pr28138-7.c b/ld/testsuite/ld-plugin/pr28138-7.c
-new file mode 100644
-index 00000000000..4ef75bf0f0c
---- /dev/null
-+++ b/ld/testsuite/ld-plugin/pr28138-7.c
-@@ -0,0 +1,6 @@
-+extern int a6(void);
-+int
-+a7(void)
-+{
-+  return 1 + a6();
-+}
-diff --git a/ld/testsuite/ld-plugin/pr28138.c b/ld/testsuite/ld-plugin/pr28138.c
-new file mode 100644
-index 00000000000..68252c9f382
---- /dev/null
-+++ b/ld/testsuite/ld-plugin/pr28138.c
-@@ -0,0 +1,20 @@
-+#include <stdio.h>
-+
-+extern int a7(void);
-+
-+int
-+a0(void)
-+{
-+  return 0;
-+}
-+
-+int
-+main()
-+{
-+  if (a7() == 7)
-+    {
-+      printf ("PASS\n");
-+      return 0;
-+    }
-+  return 1;
-+}
--- 
-2.27.0
-

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

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

cross/binutils-armv7/defang-no-split.patch

@@ -1,38 +0,0 @@
-From 2dad02b6d46eef438cbd14d8511487b056628a38 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <siarheit@google.com>
-Date: Mon, 26 Jul 2021 22:51:18 +0100
-Subject: [PATCH 1/1] texi2pod.pl: add no-op --no-split option support
- [PR28144]
-
-Change 2faf902da ("generate single html manual page by default")
-added use of --no-split option to makeinfo. binutils reuses
-makeinfo options for texi2pod.pl wrapper. Unsupported option
-led to silent manpage truncation.
-
-The change adds no-op option support.
-
-etc/
-	PR 28144
-	* texi2pod.pl: Handle no-op --no-split option.
-
-(cherry picked from commit 96a7037cd8573cf065aa6b12baca68696f96d9ca)
----
- etc/texi2pod.pl | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/etc/texi2pod.pl b/etc/texi2pod.pl
-index 11f70d156be..dcf2b437640 100644
---- a/etc/texi2pod.pl
-+++ b/etc/texi2pod.pl
-@@ -59,6 +59,8 @@ while ($_ = shift) {
- 	    $flag = shift;
- 	}
-         push (@ipath, $flag);
-+    } elsif (/^--no-split$/) {
-+	# ignore option for makeinfo compatibility
-     } elsif (/^-/) {
- 	usage();
-     } else {
--- 
-2.27.0
-

cross/busybox-static-aarch64/APKBUILD

@@ -7,11 +7,11 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi
 
 pkgname=busybox-static-aarch64
-pkgver=1.34.1
+pkgver=1.32.1
 pkgrel=6
 
 _arch="aarch64"
-_mirror="http://dl-4.alpinelinux.org/alpine/"
+_mirror="http://dl-2.alpinelinux.org/alpine/"
 
 url="http://busybox.net"
 license="GPL2"
@@ -21,16 +21,14 @@ pkgdesc="Statically linked Busybox for $_arch"
 _target="$(arch_to_hostspec $_arch)"
 
 source="
-	busybox-static-$pkgver-r$pkgrel-$_arch-v3.15.apk::$_mirror/v3.15/main/$_arch/busybox-static-$pkgver-r$pkgrel.apk
+	busybox-static-$pkgver-r$pkgrel-$_arch-v3.13.apk::$_mirror/v3.13/main/$_arch/busybox-static-$pkgver-r$pkgrel.apk
 "
 
 package() {
 	mkdir -p "$pkgdir/usr/$_target"
 	cd "$pkgdir/usr/$_target"
-	tar -xf $srcdir/busybox-static-$pkgver-r$pkgrel-$_arch-v3.15.apk
+	tar -xf $srcdir/busybox-static-$pkgver-r$pkgrel-$_arch-v3.13.apk
 	rm .PKGINFO .SIGN.*
 }
 
-sha512sums="
-8c9251b0d81515e29a66ab037094e0a8107e4a0a64d680fe11bdb9cd1d418d2a1e610907cc423156cd5f759f83937230d24c7f03036bff81c57dc6f9759cf89e  busybox-static-1.34.1-r6-aarch64-v3.15.apk
-"
+sha512sums="7210d077e5efc5970fb6520cdd676ec8e98f888ac89bc40ef81ef3828a5da556e74fd096345a6c0d0fa286bac8b5ea9b3aaad4417f81233acd8dddc673f30371  busybox-static-1.32.1-r6-aarch64-v3.13.apk"

cross/busybox-static-armv7/APKBUILD

@@ -7,11 +7,11 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi
 
 pkgname=busybox-static-armv7
-pkgver=1.34.1
+pkgver=1.32.1
 pkgrel=6
 
 _arch="armv7"
-_mirror="http://dl-4.alpinelinux.org/alpine/"
+_mirror="http://dl-2.alpinelinux.org/alpine/"
 
 url="http://busybox.net"
 license="GPL2"
@@ -21,16 +21,14 @@ pkgdesc="Statically linked Busybox for $_arch"
 _target="$(arch_to_hostspec $_arch)"
 
 source="
-	busybox-static-$pkgver-r$pkgrel-$_arch-v3.15.apk::$_mirror/v3.15/main/$_arch/busybox-static-$pkgver-r$pkgrel.apk
+	busybox-static-$pkgver-r$pkgrel-$_arch-v3.13.apk::$_mirror/v3.13/main/$_arch/busybox-static-$pkgver-r$pkgrel.apk
 "
 
 package() {
 	mkdir -p "$pkgdir/usr/$_target"
 	cd "$pkgdir/usr/$_target"
-	tar -xf $srcdir/busybox-static-$pkgver-r$pkgrel-$_arch-v3.15.apk
+	tar -xf $srcdir/busybox-static-$pkgver-r$pkgrel-$_arch-v3.13.apk
 	rm .PKGINFO .SIGN.*
 }
 
-sha512sums="
-8761d49220d25c1fc6bbc8a69fd22cd1fce55c9c1606327af5bdaaba994960fed188d9694141c8000829ea53bf459fc625e48e7c4d93d63259ffa48ef1e02819  busybox-static-1.34.1-r6-armv7-v3.15.apk
-"
+sha512sums="2bc95e9b443f124835ff293e701d9e146aa3d074b28323cb0e8f03f7c5fc90c59796bcc69dbfdc430ed831cd5ca49393207ef41de1ff04fda3a3099603a5924c  busybox-static-1.32.1-r6-armv7-v3.13.apk"

cross/gcc-aarch64/0001-posix_memalign.patch

@@ -1,4 +1,4 @@
-From 3d818cf1e0a28d094ea415f6748fd1b7285519fc Mon Sep 17 00:00:00 2001
+From 61621c64caffb54ea82c5b573e55d16dcb732dea Mon Sep 17 00:00:00 2001
 From: Szabolcs Nagy <nsz@port70.net>
 Date: Fri, 26 Jan 2018 20:32:50 +0000
 Subject: [PATCH] posix_memalign
@@ -38,5 +38,5 @@ index 87344d9383f..ece428df487 100644
    else
      return NULL;
 -- 
-2.33.1
+2.29.2
 

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

@@ -1,4 +1,4 @@
-From 6fcb950659e4382067ff4b297547b178f0697a08 Mon Sep 17 00:00:00 2001
+From b6af6fd400def85c7f6933a991c888df16f12533 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Fri, 29 Mar 2013 08:59:00 +0400
 Subject: [PATCH] gcc: poison-system-directories
@@ -26,7 +26,7 @@ Upstream-Status: Pending
  7 files changed, 68 insertions(+)
 
 diff --git a/gcc/common.opt b/gcc/common.opt
-index ec5235c3a41..ca942863064 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 84e0ea21054..3bb7b5b318a 100755
+index b4088d8fd1e..793530e21cf 100755
 --- a/gcc/configure
 +++ b/gcc/configure
 @@ -1010,6 +1010,7 @@ with_system_zlib
@@ -78,7 +78,7 @@ index 84e0ea21054..3bb7b5b318a 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 84e0ea21054..3bb7b5b318a 100755
  
  
 diff --git a/gcc/configure.ac b/gcc/configure.ac
-index d068618bd8f..44ea4725620 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 d068618bd8f..44ea4725620 100644
  AC_SUBST(subdirs)
  AC_SUBST(srcdir)
 diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index 6d3cfcc664e..9d9a4b78ffd 100644
+index 7775bcc72eb..034d3066c2b 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
 @@ -348,6 +348,7 @@ Objective-C and Objective-C++ Dialects}.
@@ -131,7 +131,7 @@ index 6d3cfcc664e..9d9a4b78ffd 100644
  -Wno-pragmas  -Wno-prio-ctor-dtor  -Wredundant-decls @gol
  -Wrestrict  -Wno-return-local-addr  -Wreturn-type @gol
  -Wno-scalar-storage-order  -Wsequence-point @gol
-@@ -6927,6 +6928,14 @@ made up of data only and thus requires no special treatment.  But, for
+@@ -6926,6 +6927,14 @@ made up of data only and thus requires no special treatment.  But, for
  most targets, it is made up of code and thus requires the stack to be
  made executable in order for the program to work properly.
  
@@ -199,5 +199,5 @@ index 8a2bda00f80..9098ab044ab 100644
  
  /* Use given -I paths for #include "..." but not #include <...>, and
 -- 
-2.33.1
+2.29.2
 

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

@@ -1,4 +1,4 @@
-From 8e72eea50b282e77163cc3c907170a9da8a638e3 Mon Sep 17 00:00:00 2001
+From 8e8955cbd60155d131d3ac66cb2a1e7e41835278 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:45:49 +0000
 Subject: [PATCH] Turn on -Wl,-z,relro,-z,now by default.
@@ -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 9d9a4b78ffd..129dc5b11f3 100644
+index 034d3066c2b..4885efe3247 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
-@@ -14666,6 +14666,9 @@ For example, @option{-Wl,-Map,output.map} passes @option{-Map output.map} to the
+@@ -14663,6 +14663,9 @@ For example, @option{-Wl,-Map,output.map} passes @option{-Map output.map} to the
  linker.  When using the GNU linker, you can also get the same effect with
  @option{-Wl,-Map=output.map}.
  
@@ -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.33.1
+2.29.2
 

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

@@ -1,4 +1,4 @@
-From 43d2fb2068739661a61ded0a1124e98947773831 Mon Sep 17 00:00:00 2001
+From c5924988157b27b60c28d20d971179bbacbd2ae3 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:46:22 +0000
 Subject: [PATCH] Turn on -D_FORTIFY_SOURCE=2 by default for C, C++, ObjC,
@@ -25,10 +25,10 @@ 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 129dc5b11f3..1b7ef0c68c6 100644
+index 4885efe3247..a3e5e002fa5 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
-@@ -9231,6 +9231,12 @@ also turns on the following optimization flags:
+@@ -9230,6 +9230,12 @@ also turns on the following optimization flags:
  Please note the warning under @option{-fgcse} about
  invoking @option{-O2} on programs that use computed gotos.
  
@@ -42,5 +42,5 @@ index 129dc5b11f3..1b7ef0c68c6 100644
  @opindex O3
  Optimize yet more.  @option{-O3} turns on all optimizations specified
 -- 
-2.33.1
+2.29.2
 

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

@@ -1,4 +1,4 @@
-From ae3a276ae169a782fc114655343afef6bbc1a3ae Mon Sep 17 00:00:00 2001
+From 5b8de466aa959a6c929cee2c78e4159a0209b4f8 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:46:56 +0000
 Subject: [PATCH] On linux targets pass --as-needed by default to the linker,
@@ -265,5 +265,5 @@ index 625c9ab7902..7aec9d3a016 100644
  #else
  #define LIBUBSAN_SPEC "-lubsan" STATIC_LIBUBSAN_LIBS
 -- 
-2.33.1
+2.29.2
 

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

@@ -1,4 +1,4 @@
-From fe4ed38e850c9965482a28e16857dc4a451bbfc6 Mon Sep 17 00:00:00 2001
+From 7c79655102e756622211ca40384e8562be334973 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:47:43 +0000
 Subject: [PATCH] Enable -Wformat and -Wformat-security by default.
@@ -30,5 +30,5 @@ index c49da99d395..93f25319005 100644
  
  Wformat-overflow=
 -- 
-2.33.1
+2.29.2
 

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

@@ -1,4 +1,4 @@
-From 937c028663fa21fe9694a5725d1e96f3dbfb93fd Mon Sep 17 00:00:00 2001
+From 25eb9009f180c799647cfc81d27d8b67ba3f3b72 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:48:24 +0000
 Subject: [PATCH] Enable -Wtrampolines by default.
@@ -8,7 +8,7 @@ Subject: [PATCH] Enable -Wtrampolines by default.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/gcc/common.opt b/gcc/common.opt
-index ca942863064..0a0ab6195ee 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 ca942863064..0a0ab6195ee 100644
  
  Wtype-limits
 -- 
-2.33.1
+2.29.2
 

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

@@ -1,4 +1,4 @@
-From 43813024350c27cf11fc07dcd3d7a02f752bd0c7 Mon Sep 17 00:00:00 2001
+From cfa0c7a3154415fe0e0ab6bd373a8f2164024ff5 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:49:40 +0000
 Subject: [PATCH] Disable ssp on -nostdlib, -nodefaultlibs and -ffreestanding
@@ -49,5 +49,5 @@ index 4aec480798b..eaecfab37ad 100644
  
  -param=stack-clash-protection-guard-size=
 -- 
-2.33.1
+2.29.2
 

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

@@ -1,4 +1,4 @@
-From 506bda71fad5e51ffe5d1cfbf408f56a5e67afed Mon Sep 17 00:00:00 2001
+From 4733bb8115411c50028f7a583783ac10c63e8536 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:50:33 +0000
 Subject: [PATCH] Ensure that msgfmt doesn't encounter problems during gcc
@@ -50,5 +50,5 @@ index a0f84b0cfa0..ab24a47a2fd 100644
  
  all-local: all-local-$(USE_NLS)
 -- 
-2.33.1
+2.29.2
 

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

@@ -1,4 +1,4 @@
-From 311daa31ea5f1f0b410c58aeda7c2c4635ec0e2b Mon Sep 17 00:00:00 2001
+From 7d4ee7a90b87edd33a7f628ff89ce1b1e0576b4d Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:52:07 +0000
 Subject: [PATCH] Don't declare asprintf if defined as a macro.
@@ -24,5 +24,5 @@ index 141cb886a85..fa0e78eb62f 100644
  /* Like asprintf but allocates memory without fail. This works like
     xmalloc.  */
 -- 
-2.33.1
+2.29.2
 

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

@@ -1,4 +1,4 @@
-From 2146e96bc76ef7d1e6796f991b880ebd0302afa4 Mon Sep 17 00:00:00 2001
+From 84b959624e1371f1d02630b6e067f00f46dbe516 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:53:00 +0000
 Subject: [PATCH] libiberty: copy PIC objects during build process
@@ -20,5 +20,5 @@ index d6b302e02fd..fd39928546f 100644
  	else true; fi
  
 -- 
-2.33.1
+2.29.2
 

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

@@ -1,4 +1,4 @@
-From e3b5b8fc0ad9c7bf33930632060385fd340aafb7 Mon Sep 17 00:00:00 2001
+From 8ffd575380bc28aaf3c210ad838b205ce2403124 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:53:36 +0000
 Subject: [PATCH] libitm: disable FORTIFY
@@ -8,10 +8,10 @@ Subject: [PATCH] libitm: disable FORTIFY
  1 file changed, 10 insertions(+)
 
 diff --git a/libitm/configure.tgt b/libitm/configure.tgt
-index 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.33.1
+2.29.2
 

cross/gcc-aarch64/0013-libgcc_s.patch

@@ -1,4 +1,4 @@
-From 75c269d1783e1b83d9bc4f6c826f10f63a0f51a5 Mon Sep 17 00:00:00 2001
+From 0d83ea67b2e16658a88068ebce0e25cce22fe75e Mon Sep 17 00:00:00 2001
 From: Szabolcs Nagy <nsz@port70.net>
 Date: Sat, 24 Oct 2015 20:09:53 +0000
 Subject: [PATCH] libgcc_s
@@ -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:
        {
@@ -27,10 +27,10 @@ index 47d52550e5e..9cb8cc7950e 100644
  	return expand_expr (call_expr, target, mode, EXPAND_NORMAL);
        }
 diff --git a/libgcc/config/i386/cpuinfo.c b/libgcc/config/i386/cpuinfo.c
-index 83301a1445f..89fdc7eb587 100644
+index cf5f0884bb4..ed0381e7744 100644
 --- a/libgcc/config/i386/cpuinfo.c
 +++ b/libgcc/config/i386/cpuinfo.c
-@@ -516,7 +516,7 @@ __cpu_indicator_init (void)
+@@ -510,7 +510,7 @@ __cpu_indicator_init (void)
    return 0;
  }
  
@@ -53,5 +53,5 @@ index 8506a635790..564296f788e 100644
 +HOST_LIBGCC2_CFLAGS += -mlong-double-80 $(CET_FLAGS)
  CRTSTUFF_T_CFLAGS += $(CET_FLAGS)
 -- 
-2.33.1
+2.29.2
 

cross/gcc-aarch64/0014-nopie.patch

@@ -1,4 +1,4 @@
-From 94df93e5a0241488343d6002912dfbd680df8aba Mon Sep 17 00:00:00 2001
+From 99ccc2d68049c56519d49e21b6f13cf8d98ea163 Mon Sep 17 00:00:00 2001
 From: Szabolcs Nagy <nsz@port70.net>
 Date: Sat, 7 Nov 2015 02:08:05 +0000
 Subject: [PATCH] nopie
@@ -9,10 +9,10 @@ Subject: [PATCH] nopie
  2 files changed, 40 insertions(+)
 
 diff --git a/gcc/configure b/gcc/configure
-index 3bb7b5b318a..1632337439c 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 3bb7b5b318a..1632337439c 100755
  
  
 diff --git a/gcc/configure.ac b/gcc/configure.ac
-index 44ea4725620..6e4d4092af7 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 44ea4725620..6e4d4092af7 100644
  AC_SUBST([NO_PIE_FLAG])
  
 -- 
-2.33.1
+2.29.2
 

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

@@ -1,4 +1,4 @@
-From ac79c17450c4e3a84ad884583ae80f5949f7ffc0 Mon Sep 17 00:00:00 2001
+From a5a7decc1944cf6831eebc10d71a52ef8496bff5 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:57:09 +0000
 Subject: [PATCH] libffi: use __linux__ instead of __gnu_linux__ for musl
@@ -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.33.1
+2.29.2
 

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

@@ -1,4 +1,4 @@
-From ebd9bb4708ce923785eec4d3760536cdd4051e0a Mon Sep 17 00:00:00 2001
+From 3554a4b751acce2a4f432d1bb24d9fc69a916889 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:57:51 +0000
 Subject: [PATCH] dlang: update zlib binding
@@ -421,5 +421,5 @@ index e6cce240fd5..bd2fe37ebec 100644
  }
  
 -- 
-2.33.1
+2.29.2
 

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

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

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

@@ -1,4 +1,4 @@
-From 61ee4e71b7c6495afb6b5d71a3c3c3aef7e30bb7 Mon Sep 17 00:00:00 2001
+From 277c3317929f41e514632d29ff00354c511deb0e Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:59:16 +0000
 Subject: [PATCH] ada: fix shared linking
@@ -38,5 +38,5 @@ index 02c413a412f..f0e52a87d6e 100644
  unsigned char __gnat_objlist_file_supported = 1;
  const char *__gnat_object_library_extension = ".a";
 -- 
-2.33.1
+2.29.2
 

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

@@ -1,4 +1,4 @@
-From 891ef65973d5e72ccad2c55834c0d0371e7427a7 Mon Sep 17 00:00:00 2001
+From b1e3ea43462684675cc4f75c2ca4e984a6d511fb Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:59:43 +0000
 Subject: [PATCH] build: fix CXXFLAGS_FOR_BUILD passing
@@ -20,5 +20,5 @@ index 36e369df6e7..63627db68cf 100644
  
  # This is the list of directories to built for the host system.
 -- 
-2.33.1
+2.29.2
 

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

@@ -1,4 +1,4 @@
-From 17174b70ba34434fe93901d8a97f0890ece0fa5f Mon Sep 17 00:00:00 2001
+From ea75db47e243b59e7cf793623a87295c0d2aada2 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 07:01:06 +0000
 Subject: [PATCH] add fortify-headers paths
@@ -21,5 +21,5 @@ index 95654bcdb5a..d88df8f154a 100644
      { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 0 },
  #else
 -- 
-2.33.1
+2.29.2
 

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

@@ -1,4 +1,4 @@
-From 4c063fda21dc47d87d000995c8fbce46031eb5db Mon Sep 17 00:00:00 2001
+From 42637405a9cf90d96627406c72dbaf19cca34164 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
 Date: Fri, 21 Aug 2020 07:03:00 +0000
 Subject: [PATCH] Alpine musl package provides libssp_nonshared.a. We link to
@@ -27,5 +27,5 @@ index daeb4d0c8ea..6920bec0fa0 100644
  #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
  		       "|fstack-protector-strong|fstack-protector-explicit" \
 -- 
-2.33.1
+2.29.2
 

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

@@ -1,4 +1,4 @@
-From 613210b82caaafb36d7fe39514fa0c5adb363df8 Mon Sep 17 00:00:00 2001
+From 64f209a51a7277d778c196c31c58422a04a69238 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 07:03:42 +0000
 Subject: [PATCH] DP: Use --push-state/--pop-state for gold as well when
@@ -65,5 +65,5 @@ index 6920bec0fa0..40e07354b3d 100644
  #else
  #define LIBUBSAN_SPEC "-lubsan" STATIC_LIBUBSAN_LIBS
 -- 
-2.33.1
+2.29.2
 

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

@@ -1,4 +1,4 @@
-From ca9cae44a1a3b74a48d1370d077e1aea6d36d37f Mon Sep 17 00:00:00 2001
+From a57f530ace0ce215b1d6e2073223f05417ca2ed4 Mon Sep 17 00:00:00 2001
 From: Nils Andreas Svee <me@lochnair.net>
 Date: Thu, 21 Dec 2017 03:14:33 +0100
 Subject: [PATCH] Pure 64-bit MIPS
@@ -43,5 +43,5 @@ index ceb58d3b5f3..8116e23ebba 100644
 +        ../lib32 \
 +        ../lib
 -- 
-2.33.1
+2.29.2
 

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

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

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

@@ -1,4 +1,4 @@
-From fd531b1754dfa64791342c8e76001a509b3646ca Mon Sep 17 00:00:00 2001
+From a1fb957dd7fe9a8dd99d256d7b0a676f87a9d80c Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 07:05:41 +0000
 Subject: [PATCH] always build libgcc_eh.a
@@ -47,5 +47,5 @@ index 851e7657d07..99ec513a1a6 100644
  	for file in $$parts; do					\
  	  rm -f $(DESTDIR)$(inst_libdir)/$$file;		\
 -- 
-2.33.1
+2.29.2
 

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

@@ -1,4 +1,4 @@
-From 53958c5c47d20094e2d5b5d1376b45058241d3b4 Mon Sep 17 00:00:00 2001
+From 3a0a3d3843edd30ce72c96a40caa9e1334233558 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 07:06:30 +0000
 Subject: [PATCH] ada: libgnarl compatibility for musl
@@ -9,7 +9,7 @@ Subject: [PATCH] ada: libgnarl compatibility for musl
  2 files changed, 3 insertions(+), 61 deletions(-)
 
 diff --git a/gcc/ada/libgnarl/s-osinte__linux.ads b/gcc/ada/libgnarl/s-osinte__linux.ads
-index 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.33.1
+2.29.2
 

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

@@ -1,4 +1,4 @@
-From f55ddf45b97fc7f827349c3ffe0375353ae6bf59 Mon Sep 17 00:00:00 2001
+From d0716e14d5bd652a7e21d0e3c75ea8ed32e6b4c7 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 07:07:48 +0000
 Subject: [PATCH] ada: musl support fixes
@@ -219,5 +219,5 @@ index af4417fab90..bab6bf3ca87 100644
    status = openpty (&master_fd, &slave_fd, NULL, NULL, NULL);
  #elif defined (USE_CLONE_DEVICE)
 -- 
-2.33.1
+2.29.2
 

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-From 9bda07868553de7c877f504b9abce312abce4e92 Mon Sep 17 00:00:00 2001
+From e8162b88725980771aaf473353a7a684aa31e974 Mon Sep 17 00:00:00 2001
 From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
 Date: Sun, 30 Aug 2020 17:59:45 +0200
 Subject: [PATCH] gcc-go: Fix handling of signal 34 on musl
@@ -39,5 +39,5 @@ index 11e4ec436bd..fe866eacb27 100644
  
  if test "${GOOS}" = "aix"; then
 -- 
-2.33.1
+2.29.2
 

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

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

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

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

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

@@ -1,4 +1,4 @@
-From e01c6f439a22f683f953ddeaec4f02fb190d152e Mon Sep 17 00:00:00 2001
+From 03365f764ffe09acbfaa08ede12c48d5cbafe37f Mon Sep 17 00:00:00 2001
 From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
 Date: Sun, 30 Aug 2020 18:03:03 +0200
 Subject: [PATCH] gcc-go: signal 34 is special on musl libc
@@ -25,5 +25,5 @@ index c555712a03c..9e228580d37 100644
  		}
  		throw("sigaction read failure")
 -- 
-2.33.1
+2.29.2
 

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

@@ -1,4 +1,4 @@
-From d8e7e867a98058cfdd1f03ddfb18786687f85c88 Mon Sep 17 00:00:00 2001
+From 8f432a1e00956bc2fcb6242571860a69fb32131d Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
 Date: Sun, 30 Aug 2020 19:26:53 +0200
 Subject: [PATCH] gcc-go: Prefer _off_t over _off64_t
@@ -26,5 +26,5 @@ index 972e2c379bc..8d6da15f983 100755
  echo "type Pid_t _pid_t" >> ${OUT}
  echo "type Uid_t _uid_t" >> ${OUT}
 -- 
-2.33.1
+2.29.2
 

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

@@ -1,4 +1,4 @@
-From e4b21cb1e140c22a5183ebf0158bff2b655b15d6 Mon Sep 17 00:00:00 2001
+From 8438932b8a20156459589e9d6b3fcf11989db0e8 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
 Date: Sun, 30 Aug 2020 19:27:51 +0200
 Subject: [PATCH] gcc-go: undef SETCONTEXT_CLOBBERS_TLS in proc.c
@@ -8,7 +8,7 @@ Subject: [PATCH] gcc-go: undef SETCONTEXT_CLOBBERS_TLS in proc.c
  1 file changed, 4 insertions(+)
 
 diff --git a/libgo/runtime/proc.c b/libgo/runtime/proc.c
-index 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.33.1
+2.29.2
 

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

@@ -1,4 +1,4 @@
-From a69b517d61fccb5698fcdb3261386ce85ac84b5f Mon Sep 17 00:00:00 2001
+From 31375289a4c1a0f32c97ae3d73ab950014729392 Mon Sep 17 00:00:00 2001
 From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
 Date: Mon, 31 Aug 2020 08:59:40 +0200
 Subject: [PATCH] gcc-go: link to libucontext
@@ -21,5 +21,5 @@ index 63627db68cf..c7f1f84d683 100644
  	  --srcdir=$${topdir}/$$module_srcdir \
  	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
 -- 
-2.33.1
+2.29.2
 

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

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

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

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

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

@@ -1,269 +0,0 @@
-From 4785de483dcba1896da1014ddb1a8505ac559a15 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 1632337439c..77de20dcc23 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 6e4d4092af7..205f7d5e137 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.33.1
-

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

@@ -1,48 +0,0 @@
-From c96c9ead4baed0a69f7e4843e199958610c5deba Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
-Date: Mon, 19 Apr 2021 07:21:41 +0200
-Subject: [PATCH] Use generic errstr.go implementation on musl
-
-glibc provides two version of strerror_r() depending on a feature test
-macro. The first is the XSI-compliant version which returns an int, the
-second is GNU-specific and returns a char pointer.
-
-Similarity, gcc's libgo provides two implementations of Errstr() both of
-which use strerror_r(). On Linux, it is assumed that the GNU-specific
-strerror_r version is used. However, musl only provides the
-XSI-compliant version of strerror_r. This patch enables the generic
-Errstr() implementation which also uses the XSI-compliant version of
-strerror_r.
----
- libgo/go/syscall/errstr.go       | 1 -
- libgo/go/syscall/errstr_glibc.go | 2 +-
- 2 files changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/libgo/go/syscall/errstr.go b/libgo/go/syscall/errstr.go
-index 6c2441d364d..8f7c5538163 100644
---- a/libgo/go/syscall/errstr.go
-+++ b/libgo/go/syscall/errstr.go
-@@ -5,7 +5,6 @@
- // license that can be found in the LICENSE file.
- 
- // +build !hurd
--// +build !linux
- 
- package syscall
- 
-diff --git a/libgo/go/syscall/errstr_glibc.go b/libgo/go/syscall/errstr_glibc.go
-index 5b19e6f202d..8dc60172186 100644
---- a/libgo/go/syscall/errstr_glibc.go
-+++ b/libgo/go/syscall/errstr_glibc.go
-@@ -7,7 +7,7 @@
- // We use this rather than errstr.go because on GNU/Linux sterror_r
- // returns a pointer to the error message, and may not use buf at all.
- 
--// +build hurd linux
-+// +build hurd !linux
- 
- package syscall
- 
--- 
-2.33.1
-

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

@@ -1,57 +0,0 @@
-From df182f44e2e25e6c7ad70f7e90f246e2c8a1006b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
-Date: Sun, 29 Aug 2021 09:45:27 +0200
-Subject: [PATCH] configure: fix detection of atomic builtins in libatomic
- configure script
-
-Alpine's --enable-autolink-libatomic (which is enabled for riscv64 by
-default) causes the libatomic configure script to incorrectly detect
-which builtins are available on riscv64. This then causes incorrect code
-generation for libatomic since it assumes compiler builtins to be
-available which are not actually available on riscv64.
-
-This commit fixes this issue by disabling linking of libatomic configure
-test code entirely, thereby preventing linking against libatomic.
-
-See:
-
-* https://gitlab.alpinelinux.org/alpine/aports/-/issues/12948
-* https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101996#c6
----
- libatomic/configure.tgt | 20 ++++++++++++++++++++
- 1 file changed, 20 insertions(+)
-
-diff --git a/libatomic/configure.tgt b/libatomic/configure.tgt
-index 5dd0926d207..0b57a801e23 100644
---- a/libatomic/configure.tgt
-+++ b/libatomic/configure.tgt
-@@ -30,6 +30,26 @@
- # on ${target_cpu}.  For example to allow proper use of multilibs.
- configure_tgt_pre_target_cpu_XCFLAGS="${XCFLAGS}"
- 
-+# The libatomic configure script performs several checks to determine
-+# whether builtins for atomic operations are available. When compiling
-+# with --enable-autolink-libatomic the test code compiled by the
-+# configure script is also linked against libatomic. This causes it
-+# to think that builtins are available, even if there are not, since
-+# the tested symbols are provided by libatomic.
-+#
-+# This is a hack to ensure that we don't link against libatomic by not
-+# linking any configure test code at all when --enable-autolink-libatomic
-+# is given.
-+#
-+# See:
-+#
-+#   * https://gitlab.alpinelinux.org/alpine/aports/-/issues/12817
-+#   * https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101996#c4
-+#
-+if test x$enable_autolink_libatomic = xyes; then
-+	gcc_no_link=yes
-+fi
-+
- case "${target_cpu}" in
-   alpha*)
- 	# fenv.c needs this option to generate inexact exceptions.
--- 
-2.33.1
-

cross/gcc-aarch64/APKBUILD

@@ -24,21 +24,21 @@ CBUILDROOT="/"
 _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"
 
 pkgname=gcc-aarch64
-_pkgbase=10.3.1
-pkgver=10.3.1_git20211027
+_pkgbase=10.2.1
+pkgver=10.2.1_pre1
 [ "$BOOTSTRAP" = "nolibc" ] && pkgname="gcc-pass2"
 [ "$CBUILD" != "$CHOST" ] && _cross="-$CARCH" || _cross=""
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname=gcc-aarch64
-pkgrel=0
+pkgrel=3
 pkgdesc="Stage2 cross-compiler for aarch64"
 url="https://gcc.gnu.org"
 arch="x86_64"
 license="GPL-2.0-or-later LGPL-2.1-or-later"
 _gccrel=$pkgver-r$pkgrel
 depends="isl binutils-aarch64 mpc1"
-makedepends_build="gcc g++ bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev"
+makedepends_build="gcc g++ paxmark bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev"
 makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-dev-aarch64 binutils-aarch64"
 subpackages="g++-aarch64:gpp"
 [ "$CHOST" = "$CTARGET" ] && subpackages="gcc-doc$_target"
@@ -116,16 +116,12 @@ fi
 
 # GDC hasn't been ported to PowerPC
 # See libphobos/configure.tgt in GCC sources for supported targets
-# riscv fails with: error: static assert  "unimplemented"
-case "$CARCH" in
-ppc64le|riscv64)	LANG_D=false ;;
-esac
+[ "$CARCH" = ppc64le ] && LANG_D=false
 
 # libitm has TEXTRELs in ARM build, so disable for now
 case "$CTARGET_ARCH" in
 arm*)		_libitm=false ;;
 mips*)		_libitm=false ;;
-riscv64)	_libitm=false ;;
 esac
 
 # Internal libffi fails to build on MIPS at the moment, need to
@@ -152,11 +148,6 @@ if $_libgomp; then
 	subpackages="$subpackages libgomp::$CTARGET_ARCH"
 fi
 
-case "$CARCH" in
-riscv64)
-LANG_ADA=false;;
-esac
-
 _languages=c
 if $LANG_CXX; then
 	_languages="$_languages,c++"
@@ -179,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"
@@ -232,10 +223,7 @@ source="https://dev.alpinelinux.org/~nenolod/gcc-${pkgver}.tar.xz
 	0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
 	0037-gcc-go-link-to-libucontext.patch
 	0038-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
-	0039-CRuntime_Musl-Support-v1.2.0-for-32-bits.patch
-	0040-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
-	0041-Use-generic-errstr.go-implementation-on-musl.patch
-	0042-configure-fix-detection-of-atomic-builtins-in-libato.patch
+	0040-CRuntime_Musl-Support-v1.2.0-for-32-bits.patch
 	"
 
 # we build out-of-tree
@@ -289,7 +277,6 @@ build() {
 	i486-*-*-*)		_arch_configure="--with-arch=i486 --with-tune=generic --enable-cld";;
 	i586-*-*-*)		_arch_configure="--with-arch=i586 --with-tune=generic --enable-cld";;
 	s390x-*-*-*)		_arch_configure="--with-arch=z196 --with-tune=zEC12 --with-zarch --with-long-double-128 --enable-decimal-float";;
-	riscv64-*-*-*)		_arch_configure="--with-arch=rv64gc --with-abi=lp64d --enable-autolink-libatomic";;
 	esac
 
 	case "$CTARGET_ARCH" in
@@ -408,16 +395,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
@@ -502,6 +487,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/
@@ -658,14 +644,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"
@@ -680,48 +658,43 @@ gnat() {
 	mv "$pkgdir"/usr/bin/*gnat* "$subpkgdir"/usr/bin/
 }
 
-sha512sums="
-2cba43a26debf22fde6442fcc446b7a84ca18bc4281cee1f1f1b50c254eee2615360982d0502df63ed39d7e739e4715373bae75f1c9f226378c7d617478062d9  gcc-10.3.1_git20211027.tar.xz
-a098a33a9d5a0360341c41aec036bce9463a5b67046b19fb2f5bcecfb5fe2aeb58dbd087ec4f8831c503ce57445a7ecd45e500f11476f24d2f441b46cbb99d9c  0001-posix_memalign.patch
-a8da4611f43c0a1641b6f01c230aa706bd8e65ad367acea35051ab7ea821fb4622647c2ceadb6ec7c67388c9af70d06f3c134caa1af47c8542309898e9cd96ba  0002-gcc-poison-system-directories.patch
-e1b5858902dc719bef17d4d6704d66a9662173af57948240282a43b138633932216fa549ea73c54b377aeee4b2658650e756766493a2f2f30e26756b8f9b43da  0003-Turn-on-Wl-z-relro-z-now-by-default.patch
-ef6bcc83e17253f403029f23eae7f0075e41fbe8ec6d391545e32b77b0f5c0cb100a2d56be592ef14cb396a48c7c4a195ad211fd761bdd84d95db7f53e7f5e51  0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
-93023be3c1ce4a2b19f5d1ed0a074a5a93daf74329fb59d8e01cfafe69018053e48f842ecdcd61f58526ba213fac99c6cc6cde30b603897a74972f1c51347596  0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
-4f6f1f3aef017841dd42a131b686b55c777769aa23d4483660f6c852ab441b6d8eac2ee41c9f83cb62a31988851a57a303fe00a96c9e9f47017e67d2eb73c714  0006-Enable-Wformat-and-Wformat-security-by-default.patch
-5cf49b9be154e3f7f077ccb0737606018af5a660a35041ba0d6192082f7db423e7621874cf66af16e525670a75e7d555e0ddb44d2e5b664635267928497b9d09  0007-Enable-Wtrampolines-by-default.patch
-3af183d717288f8aa0b5206bae906b553448f723380932d2da1dc41d56db730c192ef4ec424cd4eba2052acf1b2c5f35f1a7b608fc17fb8100c4c0e1d27d5e1f  0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
-e92cd9e054601bcb6a16966ae378cb3d3ce0b584c0a179996faa3921fb60668298d200d923dc7ca419bd39c4077c55d57d9703252a0728410dc04d427c0206e8  0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
-8d094d1e8f90cf44f307ef1e8257138ff61b47aabf58b9ec78080e3ad202de31319436b04f6eff33af5bbf983a0814bb2b9d8b1c8dfdcfaafd48eef414f07b1a  0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
-dd06807fb9d02c6de37cb44f17ffea2c86d4f22aabf441ab015e8613f9f37068113d52cd00d57365d53b145799f6affdc008b6d8d0a7daebf500e82debc4f53f  0011-libiberty-copy-PIC-objects-during-build-process.patch
-6d9fe75cbb488e0ac6d85bddb4f6f06fa3424889d225d4c25352555dbd5aed7db0be6d276b6214380f3c8bff37e31a1a56da40066a090a46d727a5f68b9f92a8  0012-libitm-disable-FORTIFY.patch
-ccdacf75756dda9af59a7355a87645d39231e9bf6e9a2f1fa8b6351ca0466dccecaa97a263e67c7a95d71176b31ad6d991f665ef5b855d7134e28ba7a8d30c5f  0013-libgcc_s.patch
-5304f689f1016f0df3bfa580c2a8c72ac936faaaf4edd614eebbc9f1ffad40fe2e306cd46c079f4acb407b56335a4414a462001dcc9ef111afc034f1de4b956b  0014-nopie.patch
-3dec2f23a0b6e4ef183cb9ec8550ac2f59873dad3758dd25eac82c9bd10573c83cf429333b584613e272bd6b20825f164ae015902d93cd996d604d0af6e59220  0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch
-51c6ac1b3788a4a925873109e243b5cfbf081825b1890a05d1106ab1d73aead60863d80707b52dcfe75ccfe2ece7ae29a68338bb6a4142bc47d2678a10f60fb8  0016-dlang-update-zlib-binding.patch
-c2d32cd3b4765924d30e96216d5482b006fb9a56a281cc10177d09d04b545c77e81f201cc0218cec5345a2672aa69452236576f57ffdedea37d942db3eca7b33  0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch
-64836685eeb4c87a6f014f20eabe98e212b8082100827a0a3c25d8f0c8e8aa69594bbce0229d7b73fce06ab899030068f64388fa999ecd2914209c4ce7deb902  0018-ada-fix-shared-linking.patch
-e85463e664371e19ac49c4f603c18e2676b395c847fe1fc9969339533d6f9f929e54038a64636ad594f5b3ff53b8fe513b504e06644f5647581aa6b301c3a27e  0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
-c7e0eb5f426c613f025fe26af82dd16c7be06b944a4eea642440e2b010d3e8455658ec453ca82333823dc7a52c9bf039b2edcf0f3be6e141bf69618c449b0792  0020-add-fortify-headers-paths.patch
-fa2489368639203189f2ac5fd433cc4fb25c356dd21f560043aa7e2e3a94cbf13df3bd48cc9b2eb472876236f0bb807efa6b06506c2f5b51f71567e54004b430  0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
-bf693daf2fcf497c8a804eed2d039d42b2e95725f584d87bc3d9d5fc057693fbfb9b76fb4818399664014497b6dd9055df32e2e7ea29182eb0078cc76dc14839  0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
-3c339f40bf3d9059fb5ab14ddde239996d4aebe36e5eb10feecd2ba93ef3e88d56c78f719308458cac74175fd604d7125956568d68c49dbe011c6f8cb6c98c33  0023-Pure-64-bit-MIPS.patch
-43fb576d041698ecaa2f640d6dda8511408d0967d4dd26d597400aa307d0bf9f9a224d8d4d841703453be21c6a321485b84ba0200ae69e260ea043e71a57c0d2  0024-use-pure-64-bit-configuration-where-appropriate.patch
-4aab3f2319a926e25af6f4219001f2f0c250da7ff66bfc7a70c26c6489fffbd52232ec8104e79fb64dfe97e50c8914d333f44eb493629aa0014aa392e3585382  0025-always-build-libgcc_eh.a.patch
-2af7eaf89af20ba945fa8b64592f310632e75afef09f417d6c6efd49f3b9e4624f6659512dcdc077ebc2c38684fcf979a9b4a501e3a414902db2c44bc105eb4c  0026-ada-libgnarl-compatibility-for-musl.patch
-5ef42aa075b048592c6e22417dab5d07f78a7c13914fa1aa9e9c47f53b71bbbf27d3982201a74816b1347cd123048dd669b7c8da4ad4e481d915f67a3ae0f754  0027-ada-musl-support-fixes.patch
-9fbcb2addffa042e4791b715e156402d03b8f3703356d0b9570526df7b5b311595c1b772e5295328f56e05efc7f99e22f5e5b48c5ffb9bf71ebc56afe5321d11  0028-gcc-go-Use-_off_t-type-instead-of-_loff_t.patch
-88aa25ead0706b775a4ab4d31a2319cfdbb094490798f87f8272a74228683d6a295b42f9af7c57a646ea17b8d393e8b2e52bb57d10e0527c3fbfcad6e1c5e159  0029-gcc-go-Don-t-include-sys-user.h.patch
-9f38276188ae56d037b99df4a068fc71c94b5d17341d4131ef1252c42352a5029768ffdb4a8d12ef92bfd30b5d5f7a3c440ed91d334c85dc66b837d6d23897a9  0030-gcc-go-Fix-ucontext_t-on-PPC64.patch
-de6fac26c37ee3d5e55129620f6793d80e74db1d922e545591d3d2a1eabb0cd9a6f2f918800a1177a79a9aaea49263ee7b126ccd1a05ecab3f90304f1ce4db68  0031-gcc-go-Fix-handling-of-signal-34-on-musl.patch
-0c48d1acca7f33e796de0bd520f727ccc498530c86aa56e1bb1ceb68f2b751f2b265a5cd86ce142213906a4fbc4667e3d5bad07fb8613989ed6a77a7aaa11a29  0032-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
-bebd27d21d8b64011b3752fdc9ca03ebcda52ba452aae074a484ed204eac6056ac8ea46cb4413de810e0c3df05a4ccfbb2033582497426447f9c06bd784fbc56  0033-gcc-go-Fix-st_-a-m-c-tim-fields-in-generated-sysinfo.patch
-dfec489d78a0921cdd9a6a1b35a14566f565413e2f4f0467db37f0650e28be9482111bdfe93274280594ddac9c5ef7f50a9d0443c4f9393f71ef7195d1dd8166  0034-gcc-go-signal-34-is-special-on-musl-libc.patch
-89ac788b3a49ce46cf852e5396c9bac99155059700a07736794773291e43dd07c3693999e115e683fc6df110b2081c6d93226b31cced0eff905b58855ff986ce  0035-gcc-go-Prefer-_off_t-over-_off64_t.patch
-1473f977f2fc259a8d7abc29d554b0b44fb7d65b5e5cdddf1601505ba2cb3aa2f86e13691e8bdbe2f93c7ae866a6702ef7764adff8c535ccf2f6abf6f2e377dc  0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
-89c40e32ec0f02d294f4bc576c652b976d63ff8ab4dca9f3a7533bca40e3c267e8a4b02ff5099bf7534174d68e21044c38a9141cc7a9399573bab6fc4fb7ac8d  0037-gcc-go-link-to-libucontext.patch
-2742b50a629835577de5f3ac4a764770fd7a6f42e0e0da5d35673cecf4d24a2d1d4227f3f03745001947c5b69dae72fe0584941257333f916c4db3d240bcbbfa  0038-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
-70987dea8cbee832660d8a27e3ebf7b072974e6e8f5112c1365a6a4c84830bdff8342c7a4933486f5f4becabb81a89c46e3c3cde5602e172206c59965cdd5f3f  0039-CRuntime_Musl-Support-v1.2.0-for-32-bits.patch
-3963bac9cd0f8c442599a5e983f033798266e20e9f7ba72c023724e0917a0ae750856d15e0e9a527f6f60e735ddfa66f8f3e300de47e54cad6c440ddc0403081  0040-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
-9f82ce02f355ae38952d17512fc962886f485e06d9ae2ef57f13ccc3f7b298d7e9921f8867b86d7d1fee442df887ba4ee3983521bfa91248872110a1b6c070aa  0041-Use-generic-errstr.go-implementation-on-musl.patch
-40168210e381c329a7ff3e332dedadfa0c60e9da3251c29e660aeeae478da5c5988dc9144a9e6be178202d1d15e2dfa273f5034a861054786ef7cfd4f56c2745  0042-configure-fix-detection-of-atomic-builtins-in-libato.patch
-"
+sha512sums="172fd45e7274c36ebd22a7e12e44a7096ae3bf0e7f0b647da92cfd31ec406a69017df7ee6c1a6ee0822fbef4ff47855f83fab0a0cdb8f031713a14604af3900b  gcc-10.2.1_pre1.tar.xz
+429a92934e1c507c0320741ed5cdd98ba96c73412447c8df0704077e3f0fa6ee4cc4056fadeaa6bb55d237416b555408e97a1c1d21f47b6f6812f153bc36f181  0001-posix_memalign.patch
+a0a9445358f58a34ba0a605d142243d62873d4669ca811013a593e3d6e6640006b5ec23b7a5734ee72f71762d098d607749d6ecc98c85aa4f2074400aedd63ff  0002-gcc-poison-system-directories.patch
+9fb636d1f2ef5b8225082f44da3086b9f196d1c045d7319cea148ee630b92c164e80a3e9a70a221e616a65fc00da761e733f87e23e8575634e498728bce2c48b  0003-Turn-on-Wl-z-relro-z-now-by-default.patch
+e34086d5a46f963e43e9f2f9240e3fb4d935e49feb8edba5121a59192b5991103a8253a342fbc20cef8ac2aa4ae2bf9a7ceb62abf6676be16441fd2dbf3b05f2  0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
+ffd89376a743d29a16b4f38463076691cd3716bee2bca0dbb67c2c1da00773661fb362bcc4b2ffd94f57c6b4470ae7cf8f6abad95de5880e74adaa5c4da21426  0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
+e101b356589fb794f1c4224bba8d8c714a962bed7858a734badfe38a5d10f4e800155f1ed5edbae9da7134192dfd6a4d8a33a9dbe871becb9526810af535819c  0006-Enable-Wformat-and-Wformat-security-by-default.patch
+e6fbe275e8f4b1257271118bfea5d6c05b041439dde560775a7ee1a9457f442c3e0c8b1113c68bd54502b7d44e6e4b76315613bf2972898a981119f384106fde  0007-Enable-Wtrampolines-by-default.patch
+e2a6a0e3cb2c7a40f59432e0f633a3579bb320fc116290d4655766931c56fb78ce73b0f5e75a78c6aacf85155f3c508e84bfee259dba13cd36e77a601fd5d8f5  0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
+0f802f8d9d794a6515a7df7b8588eadc0fa49fdb0b7a5148036fa6fc6e74f35c97d79ed1e4ad225f8f46cca6801f49cbc041258494e4fdbad77a6a7020024d7d  0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
+ff99bc1d02ab07ca7d4c45ff5bfec555096b9a9eb6ef5c02d7e18de72ff3a02505d5e3dca6681caa23b8993049a4acf6a07f5a2e8b4481c4778a7a982851970e  0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
+cf4dc1bfe33250e4065d926d0a126eb87a43695e24a5efda1c383c4d78add0fa7884c378cd3fbb48d713503492d842758fed69c8b5e29774b3bc87c4abe65125  0011-libiberty-copy-PIC-objects-during-build-process.patch
+93f244dda3fa55a6016d511f526abf902f7902e876a2d813980d0ad0bf527e4c0fd6258293c90085c1e59056d827bf92aab2b9b92c6f17f776e0068e507d731a  0012-libitm-disable-FORTIFY.patch
+d6f409d8d9de3ff44e97046fed1b70ebbecebd5722e7c9bbb92d244ed37d43e77b5d398e39038c554945d022df6d2103b9d4c51fbe11e1d8a011bdfd9067b647  0013-libgcc_s.patch
+d380dc2f57bb2065e0c6d80c0837113c3feee2b2290b5747e922aa7dbcbc4463f55f1c22b39a1dcf88653ef5bbae9d29adbfc0f1002d5eaa523a7a31f980b7ab  0014-nopie.patch
+5db204edfcace211fd89eb16c358579d1534546a0245d2e11541078081d627e712a9ce372d838f152b4e361742696324929c4649d9b9ff6fb0678791bd898fca  0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch
+bb76853e79fbeb5c57f52739dff132abf0b80fc551fe83d82238f598ab5ec153b7ebb45aa33b05b24750ff1895cd77a52375bcfb9295c1a44683996ac34bd381  0016-dlang-update-zlib-binding.patch
+50916865c79d9a1305f2524f7051d04df46be925fc7385a3b3cb2c17f1becb8827de76c3e897d470ce1f3fc269f9051c9b478c4d022d7611bcf081782e8b4cba  0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch
+0de08138565d81d4b7bbd367f08e5a2bc637106c39736fbedc92401cf3c2cf18ff50c183c263354852bc03724f9353a9a357ed637b3f012ede2514d3c2ed3969  0018-ada-fix-shared-linking.patch
+82aa21e25fddb6ba6a4e1424c88cf5989f62bf3fe088b43bfaf2e624df0381c830b1f0d1e7f10afb2ec6bff07a2558c0464229a997420fe0435321d1d2117372  0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
+97cb91e95afccfa7fd020d10f48421745cf7afcbe903f17256fc1df05f5f07eaa675576b7eb340da1b5aa97854df4f1f003cb648d8c2e64d9e9c067a0acd2243  0020-add-fortify-headers-paths.patch
+3ffc3bbfbfd7ae3ddfef131d0731577aac0567c965d545a2ad7c9588430397748758990d2c449e4a4c66f11db6a3ea66fb3187d173c3581cda2093d25f3d90e6  0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
+fe3e098d71709bde04cc0a17dcf3bb6ce5bc14b51af1395db97afcb464ba5910dbf85be5d968beddf645e916241f9c6be243c24097c326d9bfebc58219f76118  0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
+7dc0c14cbdcab4aaa355568556e5263912ecc69301653602f99e7c70352d84431c6f931a27f4977de7bbd0d5a328c865f7717c8136e3ed6a12ef4448a107a1a6  0023-Pure-64-bit-MIPS.patch
+e4bbd675aea5f09d4aaa32990a88597bd070273754656575e9be74a172afd244aa15e58c2d6878606b652d56457b053c94213f3c0bbf63ebe1ede5fcfdedca25  0024-use-pure-64-bit-configuration-where-appropriate.patch
+f2bd09b05fb67544d0ef70ce14fd8ca2e2d21846d5396e4e53cdb95317ae122b3f121b8933e5784fc92e51e50d23812e4aa41f2fd07ae68ba1a21ca094a841ac  0025-always-build-libgcc_eh.a.patch
+0d49f5104e89a1269a286f7021dd32d0ac4f7aa427b36f40133bc8616ca87e92144d6cc36f958b3ab4ec683e12f946c3658bceada8fcd5114bdb7c197992eb4a  0026-ada-libgnarl-compatibility-for-musl.patch
+a09211cb007a9722ec95d046fbf317f63b362fb25f6d3ba285f278a33fe08ad5f5d51ba1e4ccf9ebe02c1ea3ca15f10b0721e7f65af5ced27ffc9380af7558b1  0027-ada-musl-support-fixes.patch
+35c1ee71725042fffded7e3189d96ace6cb730d95d83cd49fd4d8527eba72eb344c11d563d1c751a3934627e5aaa44525c58afd4d01c0bb99bab3b6222fa3040  0028-gcc-go-Use-_off_t-type-instead-of-_loff_t.patch
+26deab6006d46e2c8de4679cc7f598cfdd572b1b77c0595f0160fa693251669d324f47712c6faef481dc33a2c83878ec3fe385d54ab9bfd6fa2c576d84429d05  0029-gcc-go-Don-t-include-sys-user.h.patch
+dd9cc5c3c5368a210276ce4396be9cf120c5acfc65cae88508aebd7d4430a28d21b26b362f7f7456ae64c87dd06dfe7a615cd0c7ca13740b683e3a59c1c7bc8d  0030-gcc-go-Fix-ucontext_t-on-PPC64.patch
+c17f5088172babddbdb32830387487286f6106304cf07d49d0b2e59feacad62aa10a46bf1bf927f1f138fd1112da5bef7ae1227a26e7946082a6edc7f340b522  0031-gcc-go-Fix-handling-of-signal-34-on-musl.patch
+db67b346f3def6c004639df27cef32a6c4e9b4661634f43b62f4f3be852f5ae6d5dadef85116f816d5fd88cbdd80001d8f81cc8d554b9094744402ca3ae14725  0032-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
+438c165b8e217142b64a002e99b112fbdac9b2c4ced7b0a8c8fe9cff42e6a5ea6d5939cb40905d5a8570fc890de447fd0f5b49c9ee43c3a6e33446efdf2229bf  0033-gcc-go-Fix-st_-a-m-c-tim-fields-in-generated-sysinfo.patch
+85592117e6370ff8612a7a028194c6875c8df1f07299afa0188770bf9bdd82d9aeb322909ec980cf3bd10a54d90829fffb145c566d843027c11d49e78d3f0a9e  0034-gcc-go-signal-34-is-special-on-musl-libc.patch
+abc2ae2ea2ff270226c45321508c3641011b23172d043c55239a52fee9ed8451e8e23a2a65612c5f3a0d2e4d1a601a7e9a2c1d6c07f926e6cdf42164d23cff34  0035-gcc-go-Prefer-_off_t-over-_off64_t.patch
+21ff83b1f5f8c71c41e7c22ba59f194bc789c8e67a6be9e5185f215adf4ddb175551a261556e5c9bd57dd9c302e1f966de01ff90e097d7ace2c2e43208b6e0f9  0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
+5f0230f9e542bcbfa39f1a3da1f171229bd926971a924ec3e9f3ad8178645d3853659a58a89a48906ffdd77e9c5ff2af43dc54cfc4ac335a219267dddc4afad1  0037-gcc-go-link-to-libucontext.patch
+08ffdce5d1ef722364faf5e824b62d0e58655acbba99b58f24c609abb1d90577432863e769fbe269e4151c997b8bbb0cbed29032752b6e6c3356f8fb3086d607  0038-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
+81bcffde9635c9c4b3214afd8bb16048f15dc8c4ce82c5576b15ee552d6ca8eeee2c5444e2949fec3b938e69fc7a2a2259a07d437e004788ac232c43ae9a83d2  0040-CRuntime_Musl-Support-v1.2.0-for-32-bits.patch"

cross/gcc-armv7/0001-posix_memalign.patch

@@ -1,4 +1,4 @@
-From 3d818cf1e0a28d094ea415f6748fd1b7285519fc Mon Sep 17 00:00:00 2001
+From 61621c64caffb54ea82c5b573e55d16dcb732dea Mon Sep 17 00:00:00 2001
 From: Szabolcs Nagy <nsz@port70.net>
 Date: Fri, 26 Jan 2018 20:32:50 +0000
 Subject: [PATCH] posix_memalign
@@ -38,5 +38,5 @@ index 87344d9383f..ece428df487 100644
    else
      return NULL;
 -- 
-2.33.1
+2.29.2
 

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

@@ -1,4 +1,4 @@
-From 6fcb950659e4382067ff4b297547b178f0697a08 Mon Sep 17 00:00:00 2001
+From b6af6fd400def85c7f6933a991c888df16f12533 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Fri, 29 Mar 2013 08:59:00 +0400
 Subject: [PATCH] gcc: poison-system-directories
@@ -26,7 +26,7 @@ Upstream-Status: Pending
  7 files changed, 68 insertions(+)
 
 diff --git a/gcc/common.opt b/gcc/common.opt
-index ec5235c3a41..ca942863064 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 84e0ea21054..3bb7b5b318a 100755
+index b4088d8fd1e..793530e21cf 100755
 --- a/gcc/configure
 +++ b/gcc/configure
 @@ -1010,6 +1010,7 @@ with_system_zlib
@@ -78,7 +78,7 @@ index 84e0ea21054..3bb7b5b318a 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 84e0ea21054..3bb7b5b318a 100755
  
  
 diff --git a/gcc/configure.ac b/gcc/configure.ac
-index d068618bd8f..44ea4725620 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 d068618bd8f..44ea4725620 100644
  AC_SUBST(subdirs)
  AC_SUBST(srcdir)
 diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index 6d3cfcc664e..9d9a4b78ffd 100644
+index 7775bcc72eb..034d3066c2b 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
 @@ -348,6 +348,7 @@ Objective-C and Objective-C++ Dialects}.
@@ -131,7 +131,7 @@ index 6d3cfcc664e..9d9a4b78ffd 100644
  -Wno-pragmas  -Wno-prio-ctor-dtor  -Wredundant-decls @gol
  -Wrestrict  -Wno-return-local-addr  -Wreturn-type @gol
  -Wno-scalar-storage-order  -Wsequence-point @gol
-@@ -6927,6 +6928,14 @@ made up of data only and thus requires no special treatment.  But, for
+@@ -6926,6 +6927,14 @@ made up of data only and thus requires no special treatment.  But, for
  most targets, it is made up of code and thus requires the stack to be
  made executable in order for the program to work properly.
  
@@ -199,5 +199,5 @@ index 8a2bda00f80..9098ab044ab 100644
  
  /* Use given -I paths for #include "..." but not #include <...>, and
 -- 
-2.33.1
+2.29.2
 

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

@@ -1,4 +1,4 @@
-From 8e72eea50b282e77163cc3c907170a9da8a638e3 Mon Sep 17 00:00:00 2001
+From 8e8955cbd60155d131d3ac66cb2a1e7e41835278 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:45:49 +0000
 Subject: [PATCH] Turn on -Wl,-z,relro,-z,now by default.
@@ -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 9d9a4b78ffd..129dc5b11f3 100644
+index 034d3066c2b..4885efe3247 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
-@@ -14666,6 +14666,9 @@ For example, @option{-Wl,-Map,output.map} passes @option{-Map output.map} to the
+@@ -14663,6 +14663,9 @@ For example, @option{-Wl,-Map,output.map} passes @option{-Map output.map} to the
  linker.  When using the GNU linker, you can also get the same effect with
  @option{-Wl,-Map=output.map}.
  
@@ -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.33.1
+2.29.2
 

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

@@ -1,4 +1,4 @@
-From 43d2fb2068739661a61ded0a1124e98947773831 Mon Sep 17 00:00:00 2001
+From c5924988157b27b60c28d20d971179bbacbd2ae3 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:46:22 +0000
 Subject: [PATCH] Turn on -D_FORTIFY_SOURCE=2 by default for C, C++, ObjC,
@@ -25,10 +25,10 @@ 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 129dc5b11f3..1b7ef0c68c6 100644
+index 4885efe3247..a3e5e002fa5 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
-@@ -9231,6 +9231,12 @@ also turns on the following optimization flags:
+@@ -9230,6 +9230,12 @@ also turns on the following optimization flags:
  Please note the warning under @option{-fgcse} about
  invoking @option{-O2} on programs that use computed gotos.
  
@@ -42,5 +42,5 @@ index 129dc5b11f3..1b7ef0c68c6 100644
  @opindex O3
  Optimize yet more.  @option{-O3} turns on all optimizations specified
 -- 
-2.33.1
+2.29.2
 

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

@@ -1,4 +1,4 @@
-From ae3a276ae169a782fc114655343afef6bbc1a3ae Mon Sep 17 00:00:00 2001
+From 5b8de466aa959a6c929cee2c78e4159a0209b4f8 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:46:56 +0000
 Subject: [PATCH] On linux targets pass --as-needed by default to the linker,
@@ -265,5 +265,5 @@ index 625c9ab7902..7aec9d3a016 100644
  #else
  #define LIBUBSAN_SPEC "-lubsan" STATIC_LIBUBSAN_LIBS
 -- 
-2.33.1
+2.29.2
 

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

@@ -1,4 +1,4 @@
-From fe4ed38e850c9965482a28e16857dc4a451bbfc6 Mon Sep 17 00:00:00 2001
+From 7c79655102e756622211ca40384e8562be334973 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:47:43 +0000
 Subject: [PATCH] Enable -Wformat and -Wformat-security by default.
@@ -30,5 +30,5 @@ index c49da99d395..93f25319005 100644
  
  Wformat-overflow=
 -- 
-2.33.1
+2.29.2
 

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

@@ -1,4 +1,4 @@
-From 937c028663fa21fe9694a5725d1e96f3dbfb93fd Mon Sep 17 00:00:00 2001
+From 25eb9009f180c799647cfc81d27d8b67ba3f3b72 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:48:24 +0000
 Subject: [PATCH] Enable -Wtrampolines by default.
@@ -8,7 +8,7 @@ Subject: [PATCH] Enable -Wtrampolines by default.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/gcc/common.opt b/gcc/common.opt
-index ca942863064..0a0ab6195ee 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 ca942863064..0a0ab6195ee 100644
  
  Wtype-limits
 -- 
-2.33.1
+2.29.2
 

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

@@ -1,4 +1,4 @@
-From 43813024350c27cf11fc07dcd3d7a02f752bd0c7 Mon Sep 17 00:00:00 2001
+From cfa0c7a3154415fe0e0ab6bd373a8f2164024ff5 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:49:40 +0000
 Subject: [PATCH] Disable ssp on -nostdlib, -nodefaultlibs and -ffreestanding
@@ -49,5 +49,5 @@ index 4aec480798b..eaecfab37ad 100644
  
  -param=stack-clash-protection-guard-size=
 -- 
-2.33.1
+2.29.2
 

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

@@ -1,4 +1,4 @@
-From 506bda71fad5e51ffe5d1cfbf408f56a5e67afed Mon Sep 17 00:00:00 2001
+From 4733bb8115411c50028f7a583783ac10c63e8536 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:50:33 +0000
 Subject: [PATCH] Ensure that msgfmt doesn't encounter problems during gcc
@@ -50,5 +50,5 @@ index a0f84b0cfa0..ab24a47a2fd 100644
  
  all-local: all-local-$(USE_NLS)
 -- 
-2.33.1
+2.29.2
 

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

@@ -1,4 +1,4 @@
-From 311daa31ea5f1f0b410c58aeda7c2c4635ec0e2b Mon Sep 17 00:00:00 2001
+From 7d4ee7a90b87edd33a7f628ff89ce1b1e0576b4d Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:52:07 +0000
 Subject: [PATCH] Don't declare asprintf if defined as a macro.
@@ -24,5 +24,5 @@ index 141cb886a85..fa0e78eb62f 100644
  /* Like asprintf but allocates memory without fail. This works like
     xmalloc.  */
 -- 
-2.33.1
+2.29.2
 

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

@@ -1,4 +1,4 @@
-From 2146e96bc76ef7d1e6796f991b880ebd0302afa4 Mon Sep 17 00:00:00 2001
+From 84b959624e1371f1d02630b6e067f00f46dbe516 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:53:00 +0000
 Subject: [PATCH] libiberty: copy PIC objects during build process
@@ -20,5 +20,5 @@ index d6b302e02fd..fd39928546f 100644
  	else true; fi
  
 -- 
-2.33.1
+2.29.2
 

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

@@ -1,4 +1,4 @@
-From e3b5b8fc0ad9c7bf33930632060385fd340aafb7 Mon Sep 17 00:00:00 2001
+From 8ffd575380bc28aaf3c210ad838b205ce2403124 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:53:36 +0000
 Subject: [PATCH] libitm: disable FORTIFY
@@ -8,10 +8,10 @@ Subject: [PATCH] libitm: disable FORTIFY
  1 file changed, 10 insertions(+)
 
 diff --git a/libitm/configure.tgt b/libitm/configure.tgt
-index 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.33.1
+2.29.2
 

cross/gcc-armv7/0013-libgcc_s.patch

@@ -1,4 +1,4 @@
-From 75c269d1783e1b83d9bc4f6c826f10f63a0f51a5 Mon Sep 17 00:00:00 2001
+From 0d83ea67b2e16658a88068ebce0e25cce22fe75e Mon Sep 17 00:00:00 2001
 From: Szabolcs Nagy <nsz@port70.net>
 Date: Sat, 24 Oct 2015 20:09:53 +0000
 Subject: [PATCH] libgcc_s
@@ -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:
        {
@@ -27,10 +27,10 @@ index 47d52550e5e..9cb8cc7950e 100644
  	return expand_expr (call_expr, target, mode, EXPAND_NORMAL);
        }
 diff --git a/libgcc/config/i386/cpuinfo.c b/libgcc/config/i386/cpuinfo.c
-index 83301a1445f..89fdc7eb587 100644
+index cf5f0884bb4..ed0381e7744 100644
 --- a/libgcc/config/i386/cpuinfo.c
 +++ b/libgcc/config/i386/cpuinfo.c
-@@ -516,7 +516,7 @@ __cpu_indicator_init (void)
+@@ -510,7 +510,7 @@ __cpu_indicator_init (void)
    return 0;
  }
  
@@ -53,5 +53,5 @@ index 8506a635790..564296f788e 100644
 +HOST_LIBGCC2_CFLAGS += -mlong-double-80 $(CET_FLAGS)
  CRTSTUFF_T_CFLAGS += $(CET_FLAGS)
 -- 
-2.33.1
+2.29.2
 

cross/gcc-armv7/0014-nopie.patch

@@ -1,4 +1,4 @@
-From 94df93e5a0241488343d6002912dfbd680df8aba Mon Sep 17 00:00:00 2001
+From 99ccc2d68049c56519d49e21b6f13cf8d98ea163 Mon Sep 17 00:00:00 2001
 From: Szabolcs Nagy <nsz@port70.net>
 Date: Sat, 7 Nov 2015 02:08:05 +0000
 Subject: [PATCH] nopie
@@ -9,10 +9,10 @@ Subject: [PATCH] nopie
  2 files changed, 40 insertions(+)
 
 diff --git a/gcc/configure b/gcc/configure
-index 3bb7b5b318a..1632337439c 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 3bb7b5b318a..1632337439c 100755
  
  
 diff --git a/gcc/configure.ac b/gcc/configure.ac
-index 44ea4725620..6e4d4092af7 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 44ea4725620..6e4d4092af7 100644
  AC_SUBST([NO_PIE_FLAG])
  
 -- 
-2.33.1
+2.29.2
 

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

@@ -1,4 +1,4 @@
-From ac79c17450c4e3a84ad884583ae80f5949f7ffc0 Mon Sep 17 00:00:00 2001
+From a5a7decc1944cf6831eebc10d71a52ef8496bff5 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:57:09 +0000
 Subject: [PATCH] libffi: use __linux__ instead of __gnu_linux__ for musl
@@ -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.33.1
+2.29.2
 

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

@@ -1,4 +1,4 @@
-From ebd9bb4708ce923785eec4d3760536cdd4051e0a Mon Sep 17 00:00:00 2001
+From 3554a4b751acce2a4f432d1bb24d9fc69a916889 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:57:51 +0000
 Subject: [PATCH] dlang: update zlib binding
@@ -421,5 +421,5 @@ index e6cce240fd5..bd2fe37ebec 100644
  }
  
 -- 
-2.33.1
+2.29.2
 

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

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

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

@@ -1,4 +1,4 @@
-From 61ee4e71b7c6495afb6b5d71a3c3c3aef7e30bb7 Mon Sep 17 00:00:00 2001
+From 277c3317929f41e514632d29ff00354c511deb0e Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:59:16 +0000
 Subject: [PATCH] ada: fix shared linking
@@ -38,5 +38,5 @@ index 02c413a412f..f0e52a87d6e 100644
  unsigned char __gnat_objlist_file_supported = 1;
  const char *__gnat_object_library_extension = ".a";
 -- 
-2.33.1
+2.29.2
 

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

@@ -1,4 +1,4 @@
-From 891ef65973d5e72ccad2c55834c0d0371e7427a7 Mon Sep 17 00:00:00 2001
+From b1e3ea43462684675cc4f75c2ca4e984a6d511fb Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:59:43 +0000
 Subject: [PATCH] build: fix CXXFLAGS_FOR_BUILD passing
@@ -20,5 +20,5 @@ index 36e369df6e7..63627db68cf 100644
  
  # This is the list of directories to built for the host system.
 -- 
-2.33.1
+2.29.2