From 30241a7a65500aa72b6a07573e216b99eb3e32a4 Mon Sep 17 00:00:00 2001
From: Oliver Smith <ollieparanoid@postmarketos.org>
Date: Mon, 29 Nov 2021 08:07:20 +0100
Subject: [PATCH] cross/gcc-*: upgrade to 11.2.1_git20211128

---
 cross/gcc-aarch64/0001-posix_memalign.patch   |   4 +-
 .../0002-gcc-poison-system-directories.patch  |   4 +-
 ...-Turn-on-Wl-z-relro-z-now-by-default.patch |   4 +-
 ...Y_SOURCE-2-by-default-for-C-C-ObjC-O.patch |   4 +-
 ...-pass-as-needed-by-default-to-the-li.patch |   4 +-
 ...rmat-and-Wformat-security-by-default.patch |   4 +-
 .../0007-Enable-Wtrampolines-by-default.patch |   4 +-
 ...ostdlib-nodefaultlibs-and-ffreestand.patch |   4 +-
 ...mt-doesn-t-encounter-problems-during.patch |   4 +-
 ...clare-asprintf-if-defined-as-a-macro.patch |   4 +-
 ...opy-PIC-objects-during-build-process.patch |   4 +-
 .../0012-libitm-disable-FORTIFY.patch         |   4 +-
 cross/gcc-aarch64/0013-libgcc_s.patch         |   4 +-
 cross/gcc-aarch64/0014-nopie.patch            |   4 +-
 ...ux__-instead-of-__gnu_linux__-for-mu.patch |   4 +-
 .../0016-dlang-update-zlib-binding.patch      |   4 +-
 ...ix-fcntl-on-mips-add-libucontext-dep.patch |   4 +-
 .../0018-ada-fix-shared-linking.patch         |   4 +-
 ...build-fix-CXXFLAGS_FOR_BUILD-passing.patch |   4 +-
 .../0020-add-fortify-headers-paths.patch      |   4 +-
 ...age-provides-libssp_nonshared.a.-We-.patch |   4 +-
 ...e-pop-state-for-gold-as-well-when-li.patch |   4 +-
 cross/gcc-aarch64/0023-Pure-64-bit-MIPS.patch |   4 +-
 ...-bit-configuration-where-appropriate.patch |   4 +-
 .../0025-always-build-libgcc_eh.a.patch       |   4 +-
 ...-ada-libgnarl-compatibility-for-musl.patch |   4 +-
 .../0027-ada-musl-support-fixes.patch         |   4 +-
 ...0028-gcc-go-Fix-ucontext_t-on-PPC64.patch} |   4 +-
 ...o-Use-_off_t-type-instead-of-_loff_t.patch |  48 --------
 ...0029-gcc-go-Don-t-include-sys-user.h.patch |  30 -----
 ...o-Fix-handling-of-signal-34-on-musl.patch} |   4 +-
 ...an-one-st_-a-m-c-tim-fields-in-stru.patch} |   4 +-
 ...o-signal-34-is-special-on-musl-libc.patch} |   4 +-
 ...t64-type-as-offset-argument-for-mmap.patch |  38 ------
 ...f-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch} |   4 +-
 .../0033-gcc-go-link-to-libucontext.patch}    |   4 +-
 ...inting-of-unaccessible-ppc64-struct.patch} |   4 +-
 ...ic-errstr.go-implementation-on-musl.patch} |   4 +-
 ...5-gcc-go-Prefer-_off_t-over-_off64_t.patch |  30 -----
 ...ble-autolink-libatomic-use-in-LINK_.patch} |   4 +-
 ...ection-of-atomic-builtins-in-libato.patch} |   4 +-
 ...off64_t-and-loff_t-definitions-of-mu.patch |  84 +++++++++++++
 ...se-poisoned-calloc-error-in-libgccji.patch |  80 ++++++++++++
 ...pport-for-musl-typedef-macro-guards.patch} |   5 +-
 cross/gcc-aarch64/APKBUILD                    | 116 +++++++++---------
 cross/gcc-armhf/0001-posix_memalign.patch     |   4 +-
 .../0002-gcc-poison-system-directories.patch  |   4 +-
 ...-Turn-on-Wl-z-relro-z-now-by-default.patch |   4 +-
 ...Y_SOURCE-2-by-default-for-C-C-ObjC-O.patch |   4 +-
 ...-pass-as-needed-by-default-to-the-li.patch |   4 +-
 ...rmat-and-Wformat-security-by-default.patch |   4 +-
 .../0007-Enable-Wtrampolines-by-default.patch |   4 +-
 ...ostdlib-nodefaultlibs-and-ffreestand.patch |   4 +-
 ...mt-doesn-t-encounter-problems-during.patch |   4 +-
 ...clare-asprintf-if-defined-as-a-macro.patch |   4 +-
 ...opy-PIC-objects-during-build-process.patch |   4 +-
 .../0012-libitm-disable-FORTIFY.patch         |   4 +-
 cross/gcc-armhf/0013-libgcc_s.patch           |   4 +-
 cross/gcc-armhf/0014-nopie.patch              |   4 +-
 ...ux__-instead-of-__gnu_linux__-for-mu.patch |   4 +-
 .../0016-dlang-update-zlib-binding.patch      |   4 +-
 ...ix-fcntl-on-mips-add-libucontext-dep.patch |   4 +-
 .../0018-ada-fix-shared-linking.patch         |   4 +-
 ...build-fix-CXXFLAGS_FOR_BUILD-passing.patch |   4 +-
 .../0020-add-fortify-headers-paths.patch      |   4 +-
 ...age-provides-libssp_nonshared.a.-We-.patch |   4 +-
 ...e-pop-state-for-gold-as-well-when-li.patch |   4 +-
 cross/gcc-armhf/0023-Pure-64-bit-MIPS.patch   |   4 +-
 ...-bit-configuration-where-appropriate.patch |   4 +-
 .../0025-always-build-libgcc_eh.a.patch       |   4 +-
 ...-ada-libgnarl-compatibility-for-musl.patch |   4 +-
 .../0027-ada-musl-support-fixes.patch         |   4 +-
 ...0028-gcc-go-Fix-ucontext_t-on-PPC64.patch} |   4 +-
 ...o-Use-_off_t-type-instead-of-_loff_t.patch |  48 --------
 ...0029-gcc-go-Don-t-include-sys-user.h.patch |  30 -----
 ...o-Fix-handling-of-signal-34-on-musl.patch} |   4 +-
 ...an-one-st_-a-m-c-tim-fields-in-stru.patch} |   4 +-
 ...o-signal-34-is-special-on-musl-libc.patch} |   4 +-
 ...t64-type-as-offset-argument-for-mmap.patch |  38 ------
 ...f-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch} |   4 +-
 ... => 0033-gcc-go-link-to-libucontext.patch} |   4 +-
 ...inting-of-unaccessible-ppc64-struct.patch} |   4 +-
 ...ic-errstr.go-implementation-on-musl.patch} |   4 +-
 ...5-gcc-go-Prefer-_off_t-over-_off64_t.patch |  30 -----
 ...ble-autolink-libatomic-use-in-LINK_.patch} |   4 +-
 ...ection-of-atomic-builtins-in-libato.patch} |   4 +-
 ...off64_t-and-loff_t-definitions-of-mu.patch |  84 +++++++++++++
 ...se-poisoned-calloc-error-in-libgccji.patch |  80 ++++++++++++
 ...pport-for-musl-typedef-macro-guards.patch} |   5 +-
 cross/gcc-armhf/APKBUILD                      | 116 +++++++++---------
 cross/gcc-armv7/0001-posix_memalign.patch     |   4 +-
 .../0002-gcc-poison-system-directories.patch  |   4 +-
 ...-Turn-on-Wl-z-relro-z-now-by-default.patch |   4 +-
 ...Y_SOURCE-2-by-default-for-C-C-ObjC-O.patch |   4 +-
 ...-pass-as-needed-by-default-to-the-li.patch |   4 +-
 ...rmat-and-Wformat-security-by-default.patch |   4 +-
 .../0007-Enable-Wtrampolines-by-default.patch |   4 +-
 ...ostdlib-nodefaultlibs-and-ffreestand.patch |   4 +-
 ...mt-doesn-t-encounter-problems-during.patch |   4 +-
 ...clare-asprintf-if-defined-as-a-macro.patch |   4 +-
 ...opy-PIC-objects-during-build-process.patch |   4 +-
 .../0012-libitm-disable-FORTIFY.patch         |   4 +-
 cross/gcc-armv7/0013-libgcc_s.patch           |   4 +-
 cross/gcc-armv7/0014-nopie.patch              |   4 +-
 ...ux__-instead-of-__gnu_linux__-for-mu.patch |   4 +-
 .../0016-dlang-update-zlib-binding.patch      |   4 +-
 ...ix-fcntl-on-mips-add-libucontext-dep.patch |   4 +-
 .../0018-ada-fix-shared-linking.patch         |   4 +-
 ...build-fix-CXXFLAGS_FOR_BUILD-passing.patch |   4 +-
 .../0020-add-fortify-headers-paths.patch      |   4 +-
 ...age-provides-libssp_nonshared.a.-We-.patch |   4 +-
 ...e-pop-state-for-gold-as-well-when-li.patch |   4 +-
 cross/gcc-armv7/0023-Pure-64-bit-MIPS.patch   |   4 +-
 ...-bit-configuration-where-appropriate.patch |   4 +-
 .../0025-always-build-libgcc_eh.a.patch       |   4 +-
 ...-ada-libgnarl-compatibility-for-musl.patch |   4 +-
 .../0027-ada-musl-support-fixes.patch         |   4 +-
 ...0028-gcc-go-Fix-ucontext_t-on-PPC64.patch} |   4 +-
 ...o-Use-_off_t-type-instead-of-_loff_t.patch |  48 --------
 ...0029-gcc-go-Don-t-include-sys-user.h.patch |  30 -----
 ...o-Fix-handling-of-signal-34-on-musl.patch} |   4 +-
 ...an-one-st_-a-m-c-tim-fields-in-stru.patch} |   4 +-
 ...o-signal-34-is-special-on-musl-libc.patch} |   4 +-
 ...t64-type-as-offset-argument-for-mmap.patch |  38 ------
 ...f-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch} |   4 +-
 .../0033-gcc-go-link-to-libucontext.patch}    |   4 +-
 ...inting-of-unaccessible-ppc64-struct.patch} |   4 +-
 ...ic-errstr.go-implementation-on-musl.patch} |   4 +-
 ...5-gcc-go-Prefer-_off_t-over-_off64_t.patch |  30 -----
 ...ble-autolink-libatomic-use-in-LINK_.patch} |   4 +-
 ...ection-of-atomic-builtins-in-libato.patch} |   4 +-
 ...off64_t-and-loff_t-definitions-of-mu.patch |  84 +++++++++++++
 ...se-poisoned-calloc-error-in-libgccji.patch |  80 ++++++++++++
 ...pport-for-musl-typedef-macro-guards.patch} |   5 +-
 cross/gcc-armv7/APKBUILD                      | 116 +++++++++---------
 135 files changed, 894 insertions(+), 843 deletions(-)
 rename cross/{gcc-armv7/0030-gcc-go-Fix-ucontext_t-on-PPC64.patch => gcc-aarch64/0028-gcc-go-Fix-ucontext_t-on-PPC64.patch} (93%)
 delete mode 100644 cross/gcc-aarch64/0028-gcc-go-Use-_off_t-type-instead-of-_loff_t.patch
 delete mode 100644 cross/gcc-aarch64/0029-gcc-go-Don-t-include-sys-user.h.patch
 rename cross/{gcc-armhf/0031-gcc-go-Fix-handling-of-signal-34-on-musl.patch => gcc-aarch64/0029-gcc-go-Fix-handling-of-signal-34-on-musl.patch} (96%)
 rename cross/gcc-aarch64/{0033-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch => 0030-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch} (92%)
 rename cross/gcc-aarch64/{0034-gcc-go-signal-34-is-special-on-musl-libc.patch => 0031-gcc-go-signal-34-is-special-on-musl-libc.patch} (92%)
 delete mode 100644 cross/gcc-aarch64/0032-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
 rename cross/gcc-aarch64/{0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch => 0032-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch} (91%)
 rename cross/{gcc-armv7/0037-gcc-go-link-to-libucontext.patch => gcc-aarch64/0033-gcc-go-link-to-libucontext.patch} (90%)
 rename cross/{gcc-armv7/0038-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch => gcc-aarch64/0034-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch} (92%)
 rename cross/gcc-aarch64/{0039-Use-generic-errstr.go-implementation-on-musl.patch => 0035-Use-generic-errstr.go-implementation-on-musl.patch} (95%)
 delete mode 100644 cross/gcc-aarch64/0035-gcc-go-Prefer-_off_t-over-_off64_t.patch
 rename cross/gcc-aarch64/{0040-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch => 0036-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch} (99%)
 rename cross/gcc-aarch64/{0041-configure-fix-detection-of-atomic-builtins-in-libato.patch => 0037-configure-fix-detection-of-atomic-builtins-in-libato.patch} (96%)
 create mode 100644 cross/gcc-aarch64/0038-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch
 create mode 100644 cross/gcc-aarch64/0039-Fix-attempt-to-use-poisoned-calloc-error-in-libgccji.patch
 rename cross/{gcc-armv7/0042-stddef.h-add-support-for-musl-typedef-macro-guards.patch => gcc-aarch64/0040-stddef.h-add-support-for-musl-typedef-macro-guards.patch} (97%)
 rename cross/gcc-armhf/{0030-gcc-go-Fix-ucontext_t-on-PPC64.patch => 0028-gcc-go-Fix-ucontext_t-on-PPC64.patch} (93%)
 delete mode 100644 cross/gcc-armhf/0028-gcc-go-Use-_off_t-type-instead-of-_loff_t.patch
 delete mode 100644 cross/gcc-armhf/0029-gcc-go-Don-t-include-sys-user.h.patch
 rename cross/{gcc-armv7/0031-gcc-go-Fix-handling-of-signal-34-on-musl.patch => gcc-armhf/0029-gcc-go-Fix-handling-of-signal-34-on-musl.patch} (96%)
 rename cross/{gcc-armv7/0033-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch => gcc-armhf/0030-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch} (92%)
 rename cross/{gcc-armv7/0034-gcc-go-signal-34-is-special-on-musl-libc.patch => gcc-armhf/0031-gcc-go-signal-34-is-special-on-musl-libc.patch} (92%)
 delete mode 100644 cross/gcc-armhf/0032-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
 rename cross/gcc-armhf/{0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch => 0032-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch} (91%)
 rename cross/gcc-armhf/{0037-gcc-go-link-to-libucontext.patch => 0033-gcc-go-link-to-libucontext.patch} (90%)
 rename cross/gcc-armhf/{0038-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch => 0034-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch} (92%)
 rename cross/{gcc-armv7/0039-Use-generic-errstr.go-implementation-on-musl.patch => gcc-armhf/0035-Use-generic-errstr.go-implementation-on-musl.patch} (95%)
 delete mode 100644 cross/gcc-armhf/0035-gcc-go-Prefer-_off_t-over-_off64_t.patch
 rename cross/gcc-armhf/{0040-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch => 0036-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch} (99%)
 rename cross/gcc-armhf/{0041-configure-fix-detection-of-atomic-builtins-in-libato.patch => 0037-configure-fix-detection-of-atomic-builtins-in-libato.patch} (96%)
 create mode 100644 cross/gcc-armhf/0038-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch
 create mode 100644 cross/gcc-armhf/0039-Fix-attempt-to-use-poisoned-calloc-error-in-libgccji.patch
 rename cross/{gcc-aarch64/0042-stddef.h-add-support-for-musl-typedef-macro-guards.patch => gcc-armhf/0040-stddef.h-add-support-for-musl-typedef-macro-guards.patch} (97%)
 rename cross/{gcc-aarch64/0030-gcc-go-Fix-ucontext_t-on-PPC64.patch => gcc-armv7/0028-gcc-go-Fix-ucontext_t-on-PPC64.patch} (93%)
 delete mode 100644 cross/gcc-armv7/0028-gcc-go-Use-_off_t-type-instead-of-_loff_t.patch
 delete mode 100644 cross/gcc-armv7/0029-gcc-go-Don-t-include-sys-user.h.patch
 rename cross/{gcc-aarch64/0031-gcc-go-Fix-handling-of-signal-34-on-musl.patch => gcc-armv7/0029-gcc-go-Fix-handling-of-signal-34-on-musl.patch} (96%)
 rename cross/{gcc-armhf/0033-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch => gcc-armv7/0030-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch} (92%)
 rename cross/{gcc-armhf/0034-gcc-go-signal-34-is-special-on-musl-libc.patch => gcc-armv7/0031-gcc-go-signal-34-is-special-on-musl-libc.patch} (92%)
 delete mode 100644 cross/gcc-armv7/0032-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
 rename cross/gcc-armv7/{0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch => 0032-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch} (91%)
 rename cross/{gcc-aarch64/0037-gcc-go-link-to-libucontext.patch => gcc-armv7/0033-gcc-go-link-to-libucontext.patch} (90%)
 rename cross/{gcc-aarch64/0038-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch => gcc-armv7/0034-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch} (92%)
 rename cross/{gcc-armhf/0039-Use-generic-errstr.go-implementation-on-musl.patch => gcc-armv7/0035-Use-generic-errstr.go-implementation-on-musl.patch} (95%)
 delete mode 100644 cross/gcc-armv7/0035-gcc-go-Prefer-_off_t-over-_off64_t.patch
 rename cross/gcc-armv7/{0040-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch => 0036-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch} (99%)
 rename cross/gcc-armv7/{0041-configure-fix-detection-of-atomic-builtins-in-libato.patch => 0037-configure-fix-detection-of-atomic-builtins-in-libato.patch} (96%)
 create mode 100644 cross/gcc-armv7/0038-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch
 create mode 100644 cross/gcc-armv7/0039-Fix-attempt-to-use-poisoned-calloc-error-in-libgccji.patch
 rename cross/{gcc-armhf/0042-stddef.h-add-support-for-musl-typedef-macro-guards.patch => gcc-armv7/0040-stddef.h-add-support-for-musl-typedef-macro-guards.patch} (97%)

diff --git a/cross/gcc-aarch64/0001-posix_memalign.patch b/cross/gcc-aarch64/0001-posix_memalign.patch
index d14560674..f41493c81 100644
--- a/cross/gcc-aarch64/0001-posix_memalign.patch
+++ b/cross/gcc-aarch64/0001-posix_memalign.patch
@@ -1,4 +1,4 @@
-From 135cfe09a582b4076324a5f350f775c18164aa1f Mon Sep 17 00:00:00 2001
+From a858e4eb74d68ef1cf7a30d6a60fb32c621267c6 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 1b0bfe37852..d7b2b19bb3c 100644
    else
      return NULL;
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-aarch64/0002-gcc-poison-system-directories.patch b/cross/gcc-aarch64/0002-gcc-poison-system-directories.patch
index e0a2e77b4..a3c61fb0d 100644
--- a/cross/gcc-aarch64/0002-gcc-poison-system-directories.patch
+++ b/cross/gcc-aarch64/0002-gcc-poison-system-directories.patch
@@ -1,4 +1,4 @@
-From b0d26972848280c3035668a6caccf0ca5475f062 Mon Sep 17 00:00:00 2001
+From 6317101c9bb0616db0b919ed945466c4161ea7f1 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
@@ -199,5 +199,5 @@ index 446d280321d..fbfc0ce03b8 100644
  
  /* Use given -I paths for #include "..." but not #include <...>, and
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-aarch64/0003-Turn-on-Wl-z-relro-z-now-by-default.patch b/cross/gcc-aarch64/0003-Turn-on-Wl-z-relro-z-now-by-default.patch
index 242f34c08..5f45aeadb 100644
--- a/cross/gcc-aarch64/0003-Turn-on-Wl-z-relro-z-now-by-default.patch
+++ b/cross/gcc-aarch64/0003-Turn-on-Wl-z-relro-z-now-by-default.patch
@@ -1,4 +1,4 @@
-From d0e45e3e71b386dcd57fa807e0182b0c00a4f7af Mon Sep 17 00:00:00 2001
+From c23602c67fd4ca33eb1f819f28f03eef50905265 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.
@@ -35,5 +35,5 @@ index a83ba34ac4b..8c15de433ee 100644
      %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!r:%{!nostartfiles:%S}}} \
      %{Wno-poison-system-directories:--no-poison-system-directories} \
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-aarch64/0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch b/cross/gcc-aarch64/0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
index 0e7ca91b7..833f9d571 100644
--- a/cross/gcc-aarch64/0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
+++ b/cross/gcc-aarch64/0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
@@ -1,4 +1,4 @@
-From 0615d5fe72c9c23cd9d08f2a54eafb4ab46cbe11 Mon Sep 17 00:00:00 2001
+From abb8ccb0dcd381e9daeb43be2d32afd0ab7c83c5 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,
@@ -42,5 +42,5 @@ index 46e45274859..1b4a698a191 100644
  @opindex O3
  Optimize yet more.  @option{-O3} turns on all optimizations specified
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-aarch64/0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch b/cross/gcc-aarch64/0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
index d0e94637a..9f927abbd 100644
--- a/cross/gcc-aarch64/0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
+++ b/cross/gcc-aarch64/0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
@@ -1,4 +1,4 @@
-From 071d4ac4bacf555c61c7c44b54acee94e35d7c59 Mon Sep 17 00:00:00 2001
+From 22071923bf903a7bf851d1e59dcc1d07c6b0e876 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,
@@ -268,5 +268,5 @@ index 8c15de433ee..be1508e5abe 100644
  #else
  #define LIBUBSAN_SPEC "-lubsan" STATIC_LIBUBSAN_LIBS
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-aarch64/0006-Enable-Wformat-and-Wformat-security-by-default.patch b/cross/gcc-aarch64/0006-Enable-Wformat-and-Wformat-security-by-default.patch
index bc7a3ef2b..d8843fd18 100644
--- a/cross/gcc-aarch64/0006-Enable-Wformat-and-Wformat-security-by-default.patch
+++ b/cross/gcc-aarch64/0006-Enable-Wformat-and-Wformat-security-by-default.patch
@@ -1,4 +1,4 @@
-From a2c4ea1f97c358486316d0e8536b021faa4581a5 Mon Sep 17 00:00:00 2001
+From 622ce6893c48eaa87beb7399ecb73bdadc9b7b84 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 2005b783c68..c5c6af427cc 100644
  
  Wformat-overflow=
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-aarch64/0007-Enable-Wtrampolines-by-default.patch b/cross/gcc-aarch64/0007-Enable-Wtrampolines-by-default.patch
index 14941d2f6..cbfe46c49 100644
--- a/cross/gcc-aarch64/0007-Enable-Wtrampolines-by-default.patch
+++ b/cross/gcc-aarch64/0007-Enable-Wtrampolines-by-default.patch
@@ -1,4 +1,4 @@
-From 5cbd83abefc1f3cf93057383e6ff59196934dbf7 Mon Sep 17 00:00:00 2001
+From ad29ab28462968097dad017f03c4db40f4d83174 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.
@@ -21,5 +21,5 @@ index d15105a73f3..29f9504cb68 100644
  
  Wtype-limits
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-aarch64/0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch b/cross/gcc-aarch64/0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
index f82943127..39dc6400f 100644
--- a/cross/gcc-aarch64/0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
+++ b/cross/gcc-aarch64/0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
@@ -1,4 +1,4 @@
-From 02c1d7932c3c3b9813431937dd82971a3ca86088 Mon Sep 17 00:00:00 2001
+From 0fd84cfeabaf572f5f901fa7d13298286d84992b 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 8ba281b4cfa..bab39cdf8a2 100644
  
  -param=stack-clash-protection-guard-size=
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-aarch64/0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch b/cross/gcc-aarch64/0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
index 065972191..5093eefc9 100644
--- a/cross/gcc-aarch64/0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
+++ b/cross/gcc-aarch64/0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
@@ -1,4 +1,4 @@
-From a91c942466bed1046461500c00e0ee1c9a68481d Mon Sep 17 00:00:00 2001
+From b788f9a685522fdd615c2c9aa7feab974c6d6b09 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 8edd2e05639..63f61fcf96f 100644
  
  all-local: all-local-$(USE_NLS)
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-aarch64/0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch b/cross/gcc-aarch64/0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
index ec5f3fe31..1e7627544 100644
--- a/cross/gcc-aarch64/0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
+++ b/cross/gcc-aarch64/0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
@@ -1,4 +1,4 @@
-From 856b0c7ac4f4513af20e505b27e9fa19234b7fa9 Mon Sep 17 00:00:00 2001
+From 1f2c3d7a0d1c35cb8281c5d97eb8ecfe2987e8b3 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 f4c0fe11d6f..cf4b1043e4d 100644
  /* Like asprintf but allocates memory without fail. This works like
     xmalloc.  */
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-aarch64/0011-libiberty-copy-PIC-objects-during-build-process.patch b/cross/gcc-aarch64/0011-libiberty-copy-PIC-objects-during-build-process.patch
index 8378cebc6..4022561e9 100644
--- a/cross/gcc-aarch64/0011-libiberty-copy-PIC-objects-during-build-process.patch
+++ b/cross/gcc-aarch64/0011-libiberty-copy-PIC-objects-during-build-process.patch
@@ -1,4 +1,4 @@
-From 5fe2309817ce1cdad4183921faf890886ea34493 Mon Sep 17 00:00:00 2001
+From a110462c21bc26c6c3c8d3265d3f146d1b9bddae 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 4f1213b983b..d0224649d30 100644
  	else true; fi
  
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-aarch64/0012-libitm-disable-FORTIFY.patch b/cross/gcc-aarch64/0012-libitm-disable-FORTIFY.patch
index 42de37383..b118ad486 100644
--- a/cross/gcc-aarch64/0012-libitm-disable-FORTIFY.patch
+++ b/cross/gcc-aarch64/0012-libitm-disable-FORTIFY.patch
@@ -1,4 +1,4 @@
-From e0dfb9ef8b3a3ef3264847b030c9e38a3059ad24 Mon Sep 17 00:00:00 2001
+From e0ad9c8c39f35a47c6a4c34ae161d768bf2f6fcc 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
@@ -29,5 +29,5 @@ index a3d84896cc5..ecb281d5919 100644
  # work out any special compilation flags as necessary.
  case "${target_cpu}" in
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-aarch64/0013-libgcc_s.patch b/cross/gcc-aarch64/0013-libgcc_s.patch
index 9e4870122..4e1631d67 100644
--- a/cross/gcc-aarch64/0013-libgcc_s.patch
+++ b/cross/gcc-aarch64/0013-libgcc_s.patch
@@ -1,4 +1,4 @@
-From f2ff82d829d3d905a48fb877230ef5a096605cd4 Mon Sep 17 00:00:00 2001
+From 57309d5900d3bc974b9a3efff34fdc601014b386 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
@@ -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.34.0
 
diff --git a/cross/gcc-aarch64/0014-nopie.patch b/cross/gcc-aarch64/0014-nopie.patch
index 5a419c892..a51d4c693 100644
--- a/cross/gcc-aarch64/0014-nopie.patch
+++ b/cross/gcc-aarch64/0014-nopie.patch
@@ -1,4 +1,4 @@
-From ca92d7dea9d05e515e52048c74408652e12787a8 Mon Sep 17 00:00:00 2001
+From d10ec6f4bea9d3f07d3ada43da129a4b5812fd65 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
@@ -71,5 +71,5 @@ index 5461bab88a9..1577529ffb7 100644
  AC_SUBST([NO_PIE_FLAG])
  
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-aarch64/0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch b/cross/gcc-aarch64/0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch
index 1b1018bc6..699e09562 100644
--- a/cross/gcc-aarch64/0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch
+++ b/cross/gcc-aarch64/0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch
@@ -1,4 +1,4 @@
-From 96f17362cdc323db0d556cc13f2ac712ec03db62 Mon Sep 17 00:00:00 2001
+From 2640a3cf5ecfaf532448baa66ea138c3ef02dec1 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.34.0
 
diff --git a/cross/gcc-aarch64/0016-dlang-update-zlib-binding.patch b/cross/gcc-aarch64/0016-dlang-update-zlib-binding.patch
index 66b7ffdc9..37d4117aa 100644
--- a/cross/gcc-aarch64/0016-dlang-update-zlib-binding.patch
+++ b/cross/gcc-aarch64/0016-dlang-update-zlib-binding.patch
@@ -1,4 +1,4 @@
-From 20de5d928fc0b3738d62eb2ef0a697cd733a8bdd Mon Sep 17 00:00:00 2001
+From 60d97064fb53a99c6189f9cb81824a70d435d2d1 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.34.0
 
diff --git a/cross/gcc-aarch64/0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch b/cross/gcc-aarch64/0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch
index 3b8bb12d5..0b05c3564 100644
--- a/cross/gcc-aarch64/0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch
+++ b/cross/gcc-aarch64/0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch
@@ -1,4 +1,4 @@
-From 1c64f83b19fce8cf0bacff9e1ee3232513d2ef9e Mon Sep 17 00:00:00 2001
+From 8524e44401fa57f6bdf78f39fb60cbb76046d256 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 59df921ba41..9ee9f943948 100644
          static assert(0, "Platform not supported");
  
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-aarch64/0018-ada-fix-shared-linking.patch b/cross/gcc-aarch64/0018-ada-fix-shared-linking.patch
index 524001074..cbed48d66 100644
--- a/cross/gcc-aarch64/0018-ada-fix-shared-linking.patch
+++ b/cross/gcc-aarch64/0018-ada-fix-shared-linking.patch
@@ -1,4 +1,4 @@
-From 35c96f4e7ae99786e8f519bd7c1c6a3511dd18d1 Mon Sep 17 00:00:00 2001
+From 03810f135f7106da0b9fef6c60c9def8b1891940 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 5cd5ef64f56..1c611a82cab 100644
  unsigned char __gnat_objlist_file_supported = 1;
  const char *__gnat_object_library_extension = ".a";
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-aarch64/0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch b/cross/gcc-aarch64/0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
index eb291c62f..dbb474047 100644
--- a/cross/gcc-aarch64/0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
+++ b/cross/gcc-aarch64/0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
@@ -1,4 +1,4 @@
-From e9d428d711843b1ff735da53f81efaca5ed1e962 Mon Sep 17 00:00:00 2001
+From b0eafa664f78c3d3f5d9bf38ece54777119c8e6e 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 047be0255e2..426949aa91c 100644
  
  # This is the list of directories to built for the host system.
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-aarch64/0020-add-fortify-headers-paths.patch b/cross/gcc-aarch64/0020-add-fortify-headers-paths.patch
index d60b4f1ce..62c748eb8 100644
--- a/cross/gcc-aarch64/0020-add-fortify-headers-paths.patch
+++ b/cross/gcc-aarch64/0020-add-fortify-headers-paths.patch
@@ -1,4 +1,4 @@
-From 131337e43b77d251e6e0128fd95cf11ed1fa2c7d Mon Sep 17 00:00:00 2001
+From 8dda8a6e1bd6f49f687f9b6725e704eaa0b25873 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 4e1db60fced..7fcf402b416 100644
      { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 0 },
  #else
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-aarch64/0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch b/cross/gcc-aarch64/0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
index b51586e12..ff2c2be4b 100644
--- a/cross/gcc-aarch64/0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
+++ b/cross/gcc-aarch64/0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
@@ -1,4 +1,4 @@
-From 803acb891329bc74ac5c7ae99904dd0a0d04759a Mon Sep 17 00:00:00 2001
+From 06a8b9fd165032afd96facc5c4e608bfe09ecbea 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 e495b222095..ab8866f409f 100644
  #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
  		       "|fstack-protector-strong|fstack-protector-explicit" \
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-aarch64/0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch b/cross/gcc-aarch64/0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
index d47b38db2..198f47760 100644
--- a/cross/gcc-aarch64/0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
+++ b/cross/gcc-aarch64/0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
@@ -1,4 +1,4 @@
-From 41201c14bee1ece2c15435bc76cc07e5460e566b Mon Sep 17 00:00:00 2001
+From c279684da1a93b3009c24b7236e2a58c3eb2fe9c 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 ab8866f409f..5093e8bbfd2 100644
  #else
  #define LIBUBSAN_SPEC "-lubsan" STATIC_LIBUBSAN_LIBS
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-aarch64/0023-Pure-64-bit-MIPS.patch b/cross/gcc-aarch64/0023-Pure-64-bit-MIPS.patch
index f01e8c4d4..60571ddaa 100644
--- a/cross/gcc-aarch64/0023-Pure-64-bit-MIPS.patch
+++ b/cross/gcc-aarch64/0023-Pure-64-bit-MIPS.patch
@@ -1,4 +1,4 @@
-From 71e4e4a671201d777eda4607ce380ba429bd307b Mon Sep 17 00:00:00 2001
+From 249a08b7257fa09d572933142cc9146c92f38dd2 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 130e1f04707..a64ac2bbb5b 100644
 +        ../lib32 \
 +        ../lib
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-aarch64/0024-use-pure-64-bit-configuration-where-appropriate.patch b/cross/gcc-aarch64/0024-use-pure-64-bit-configuration-where-appropriate.patch
index 715e1f6d1..917e89344 100644
--- a/cross/gcc-aarch64/0024-use-pure-64-bit-configuration-where-appropriate.patch
+++ b/cross/gcc-aarch64/0024-use-pure-64-bit-configuration-where-appropriate.patch
@@ -1,4 +1,4 @@
-From 43a75f797d0f0217665889830e061dbe74ac69d0 Mon Sep 17 00:00:00 2001
+From 0c9502cb5db1f2898b531cfb1d3b733490045845 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.34.0
 
diff --git a/cross/gcc-aarch64/0025-always-build-libgcc_eh.a.patch b/cross/gcc-aarch64/0025-always-build-libgcc_eh.a.patch
index 913d1d127..bf8e0dc20 100644
--- a/cross/gcc-aarch64/0025-always-build-libgcc_eh.a.patch
+++ b/cross/gcc-aarch64/0025-always-build-libgcc_eh.a.patch
@@ -1,4 +1,4 @@
-From e8fa599cbaa9e0fe6ae8aaded7c0443807d695cb Mon Sep 17 00:00:00 2001
+From 338f65b9c13e8aaacf146e0fe2400566766f02e4 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 2c8be561eb5..c557750b1b3 100644
  	for file in $$parts; do					\
  	  rm -f $(DESTDIR)$(inst_libdir)/$$file;		\
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-aarch64/0026-ada-libgnarl-compatibility-for-musl.patch b/cross/gcc-aarch64/0026-ada-libgnarl-compatibility-for-musl.patch
index 9247f5409..3e6e8b394 100644
--- a/cross/gcc-aarch64/0026-ada-libgnarl-compatibility-for-musl.patch
+++ b/cross/gcc-aarch64/0026-ada-libgnarl-compatibility-for-musl.patch
@@ -1,4 +1,4 @@
-From eeb35a7b61205438613b344ab393b23bd54b14b5 Mon Sep 17 00:00:00 2001
+From 0703d9ad84cd92f8a08787a85536a98b3830bba0 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
@@ -131,5 +131,5 @@ index 757a6cdfdad..82df94f6a00 100644
  
              pragma Assert (Result in 0 | ENOMEM);
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-aarch64/0027-ada-musl-support-fixes.patch b/cross/gcc-aarch64/0027-ada-musl-support-fixes.patch
index e53e88897..3a7075f96 100644
--- a/cross/gcc-aarch64/0027-ada-musl-support-fixes.patch
+++ b/cross/gcc-aarch64/0027-ada-musl-support-fixes.patch
@@ -1,4 +1,4 @@
-From 7448ade62ac32dfe9802eb1d7a7a93b2f3702797 Mon Sep 17 00:00:00 2001
+From 0b879c9a3ef83b3b08a0d72bfe89816d52489408 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 ec9db3a6a4c..6f92e50dd67 100644
    status = openpty (&master_fd, &slave_fd, NULL, NULL, NULL);
  #elif defined (USE_CLONE_DEVICE)
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-armv7/0030-gcc-go-Fix-ucontext_t-on-PPC64.patch b/cross/gcc-aarch64/0028-gcc-go-Fix-ucontext_t-on-PPC64.patch
similarity index 93%
rename from cross/gcc-armv7/0030-gcc-go-Fix-ucontext_t-on-PPC64.patch
rename to cross/gcc-aarch64/0028-gcc-go-Fix-ucontext_t-on-PPC64.patch
index f9aa671c4..e684c26e6 100644
--- a/cross/gcc-armv7/0030-gcc-go-Fix-ucontext_t-on-PPC64.patch
+++ b/cross/gcc-aarch64/0028-gcc-go-Fix-ucontext_t-on-PPC64.patch
@@ -1,4 +1,4 @@
-From fe1480783664c5b3b9e073b2eb470b32438d392a Mon Sep 17 00:00:00 2001
+From abfd239e7f28b8076ae28e5dbb31fc7f39bfa5d7 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 d30d1603adc..57f6824eb9e 100644
  	ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.jmp_context.iar;
  #elif defined(__aarch64__) && defined(__linux__)
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-aarch64/0028-gcc-go-Use-_off_t-type-instead-of-_loff_t.patch b/cross/gcc-aarch64/0028-gcc-go-Use-_off_t-type-instead-of-_loff_t.patch
deleted file mode 100644
index 847f7f9a8..000000000
--- a/cross/gcc-aarch64/0028-gcc-go-Use-_off_t-type-instead-of-_loff_t.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 703545905411e5b597e4f462da93fa82c964f4d1 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
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Taken from Adélie Linux.
----
- libgo/go/syscall/libcall_linux.go | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/libgo/go/syscall/libcall_linux.go b/libgo/go/syscall/libcall_linux.go
-index 96974bd3269..ead47c0c39e 100644
---- a/libgo/go/syscall/libcall_linux.go
-+++ b/libgo/go/syscall/libcall_linux.go
-@@ -209,19 +209,19 @@ func Gettid() (tid int) {
- //sys	Setxattr(path string, attr string, data []byte, flags int) (err error)
- //setxattr(path *byte, name *byte, value *byte, size Size_t, flags _C_int) _C_int
- 
--//sys	splice(rfd int, roff *_loff_t, wfd int, woff *_loff_t, len int, flags int) (n int64, err error)
--//splice(rfd _C_int, roff *_loff_t, wfd _C_int, woff *_loff_t, len Size_t, flags _C_uint) Ssize_t
-+//sys	splice(rfd int, roff *_off_t, wfd int, woff *_off_t, len int, flags int) (n int64, err error)
-+//splice(rfd _C_int, roff *_off_t, wfd _C_int, woff *_off_t, len Size_t, flags _C_uint) Ssize_t
- func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error) {
--	var lroff _loff_t
--	var plroff *_loff_t
-+	var lroff _off_t
-+	var plroff *_off_t
- 	if roff != nil {
--		lroff = _loff_t(*roff)
-+		lroff = _off_t(*roff)
- 		plroff = &lroff
- 	}
--	var lwoff _loff_t
--	var plwoff *_loff_t
-+	var lwoff _off_t
-+	var plwoff *_off_t
- 	if woff != nil {
--		lwoff = _loff_t(*woff)
-+		lwoff = _off_t(*woff)
- 		plwoff = &lwoff
- 	}
- 	n, err = splice(rfd, plroff, wfd, plwoff, len, flags)
--- 
-2.33.1
-
diff --git a/cross/gcc-aarch64/0029-gcc-go-Don-t-include-sys-user.h.patch b/cross/gcc-aarch64/0029-gcc-go-Don-t-include-sys-user.h.patch
deleted file mode 100644
index 696a50cf4..000000000
--- a/cross/gcc-aarch64/0029-gcc-go-Don-t-include-sys-user.h.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 0cdfd9c48470d12a448e99f4fa7ce73f206bd42a 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
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Taken from Adélie Linux.
----
- libgo/sysinfo.c | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/libgo/sysinfo.c b/libgo/sysinfo.c
-index 8ce061e2f5f..4d5907a2da5 100644
---- a/libgo/sysinfo.c
-+++ b/libgo/sysinfo.c
-@@ -78,9 +78,6 @@
- #include <sys/times.h>
- #include <sys/wait.h>
- #include <sys/un.h>
--#if defined(HAVE_SYS_USER_H)
--#include <sys/user.h>
--#endif
- #if defined(HAVE_SYS_UTSNAME_H)
- #include <sys/utsname.h>
- #endif
--- 
-2.33.1
-
diff --git a/cross/gcc-armhf/0031-gcc-go-Fix-handling-of-signal-34-on-musl.patch b/cross/gcc-aarch64/0029-gcc-go-Fix-handling-of-signal-34-on-musl.patch
similarity index 96%
rename from cross/gcc-armhf/0031-gcc-go-Fix-handling-of-signal-34-on-musl.patch
rename to cross/gcc-aarch64/0029-gcc-go-Fix-handling-of-signal-34-on-musl.patch
index 9f420f531..30af57256 100644
--- a/cross/gcc-armhf/0031-gcc-go-Fix-handling-of-signal-34-on-musl.patch
+++ b/cross/gcc-aarch64/0029-gcc-go-Fix-handling-of-signal-34-on-musl.patch
@@ -1,4 +1,4 @@
-From f1bd71f7dbac1570c8fd9990e0ff632e33972584 Mon Sep 17 00:00:00 2001
+From 098c0bca8bd1f47e94c8368406973019bbe9bf55 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.34.0
 
diff --git a/cross/gcc-aarch64/0033-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch b/cross/gcc-aarch64/0030-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch
similarity index 92%
rename from cross/gcc-aarch64/0033-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch
rename to cross/gcc-aarch64/0030-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch
index 2ff4bea09..60ce845eb 100644
--- a/cross/gcc-aarch64/0033-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch
+++ b/cross/gcc-aarch64/0030-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch
@@ -1,4 +1,4 @@
-From 6412458c90450577dbead578cb38da0a0cb64024 Mon Sep 17 00:00:00 2001
+From 7ba79053336c8666d3f137ef106696926d3f7b31 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Thu, 25 Nov 2021 01:47:03 +0000
 Subject: [PATCH] There are more than one st_{a,m,c}tim fields in struct stat
@@ -23,5 +23,5 @@ index 0c52ea5d71a..6fef104cc1c 100755
      st_times='-e s/st_atim/Atimespec/ -e s/st_mtim/Mtimespec/ -e s/st_ctim/Ctimespec/'
  fi
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-aarch64/0034-gcc-go-signal-34-is-special-on-musl-libc.patch b/cross/gcc-aarch64/0031-gcc-go-signal-34-is-special-on-musl-libc.patch
similarity index 92%
rename from cross/gcc-aarch64/0034-gcc-go-signal-34-is-special-on-musl-libc.patch
rename to cross/gcc-aarch64/0031-gcc-go-signal-34-is-special-on-musl-libc.patch
index 30d5b7b4a..4c7bad8e6 100644
--- a/cross/gcc-aarch64/0034-gcc-go-signal-34-is-special-on-musl-libc.patch
+++ b/cross/gcc-aarch64/0031-gcc-go-signal-34-is-special-on-musl-libc.patch
@@ -1,4 +1,4 @@
-From 0d93aefad5acf36c4f5ef60f95683f106c21f38b Mon Sep 17 00:00:00 2001
+From 18ba9309687431399aabe54c0b758f69b01253e0 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 2eece687e35..e86490ce203 100644
  		}
  		throw("sigaction read failure")
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-aarch64/0032-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch b/cross/gcc-aarch64/0032-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
deleted file mode 100644
index 44b95aaa3..000000000
--- a/cross/gcc-aarch64/0032-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From c4fd6db3bd96974a726c41e08e42c242d442f689 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
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Taken from Adélie Linux.
----
- libgo/go/runtime/mem_gccgo.go | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libgo/go/runtime/mem_gccgo.go b/libgo/go/runtime/mem_gccgo.go
-index fa3389d857e..57bed97c710 100644
---- a/libgo/go/runtime/mem_gccgo.go
-+++ b/libgo/go/runtime/mem_gccgo.go
-@@ -15,7 +15,7 @@ import (
- //go:linkname sysFree
- 
- //extern mmap
--func sysMmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off uintptr) unsafe.Pointer
-+func sysMmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off int64) unsafe.Pointer
- 
- //extern munmap
- func munmap(addr unsafe.Pointer, length uintptr) int32
-@@ -37,7 +37,7 @@ func init() {
- 	}
- }
- 
--func mmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off uintptr) (unsafe.Pointer, int) {
-+func mmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off int64) (unsafe.Pointer, int) {
- 	p := sysMmap(addr, n, prot, flags, fd, off)
- 	if uintptr(p) == _MAP_FAILED {
- 		return nil, errno()
--- 
-2.33.1
-
diff --git a/cross/gcc-aarch64/0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch b/cross/gcc-aarch64/0032-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
similarity index 91%
rename from cross/gcc-aarch64/0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
rename to cross/gcc-aarch64/0032-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
index 075c749d8..5be5b32e6 100644
--- a/cross/gcc-aarch64/0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
+++ b/cross/gcc-aarch64/0032-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
@@ -1,4 +1,4 @@
-From b15fa407296fc03ad7549852a13aff790406f61d Mon Sep 17 00:00:00 2001
+From 1be822dcf1f9ffdba5c6508cef0374585e48cb18 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
@@ -23,5 +23,5 @@ index 38bf7a6b255..e50403b5a75 100644
  
  static inline void
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-armv7/0037-gcc-go-link-to-libucontext.patch b/cross/gcc-aarch64/0033-gcc-go-link-to-libucontext.patch
similarity index 90%
rename from cross/gcc-armv7/0037-gcc-go-link-to-libucontext.patch
rename to cross/gcc-aarch64/0033-gcc-go-link-to-libucontext.patch
index 3363bf249..283d562d9 100644
--- a/cross/gcc-armv7/0037-gcc-go-link-to-libucontext.patch
+++ b/cross/gcc-aarch64/0033-gcc-go-link-to-libucontext.patch
@@ -1,4 +1,4 @@
-From 566b272d5d7017e8ba72b5c52d06d7c5ed3165e8 Mon Sep 17 00:00:00 2001
+From 2fa393cd8ae6b25539cc7bd9998c603a3b33bc6e 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 426949aa91c..f97db1ef569 100644
  	  --srcdir=$${topdir}/$$module_srcdir \
  	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-armv7/0038-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch b/cross/gcc-aarch64/0034-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
similarity index 92%
rename from cross/gcc-armv7/0038-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
rename to cross/gcc-aarch64/0034-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
index 1f5141587..bd5876103 100644
--- a/cross/gcc-armv7/0038-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
+++ b/cross/gcc-aarch64/0034-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
@@ -1,4 +1,4 @@
-From 846b94beac2d176f6b22bbe73657657e31cc142c Mon Sep 17 00:00:00 2001
+From e94c28d8ee1876ddc9ae02a7a0cb1578e529260b 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 57f6824eb9e..fd03db420d4 100644
  		mcontext_t *m = &((ucontext_t*)(context))->uc_mcontext;
  		int i;
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-aarch64/0039-Use-generic-errstr.go-implementation-on-musl.patch b/cross/gcc-aarch64/0035-Use-generic-errstr.go-implementation-on-musl.patch
similarity index 95%
rename from cross/gcc-aarch64/0039-Use-generic-errstr.go-implementation-on-musl.patch
rename to cross/gcc-aarch64/0035-Use-generic-errstr.go-implementation-on-musl.patch
index 592ea8255..e6bcfa9a0 100644
--- a/cross/gcc-aarch64/0039-Use-generic-errstr.go-implementation-on-musl.patch
+++ b/cross/gcc-aarch64/0035-Use-generic-errstr.go-implementation-on-musl.patch
@@ -1,4 +1,4 @@
-From 45a69ebecc825636a069a34e9ee7f99075c383ec Mon Sep 17 00:00:00 2001
+From 23f7ad8b28284017c4f63e944bcb0321eb205e8a 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
@@ -44,5 +44,5 @@ index 5b19e6f202d..8dc60172186 100644
  package syscall
  
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-aarch64/0035-gcc-go-Prefer-_off_t-over-_off64_t.patch b/cross/gcc-aarch64/0035-gcc-go-Prefer-_off_t-over-_off64_t.patch
deleted file mode 100644
index 53e5e476a..000000000
--- a/cross/gcc-aarch64/0035-gcc-go-Prefer-_off_t-over-_off64_t.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From da6a868da00dd1a302c91181e6af2daf57aeb609 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
-
-musl does not seem to have _off64_t.
----
- libgo/mksysinfo.sh | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
-
-diff --git a/libgo/mksysinfo.sh b/libgo/mksysinfo.sh
-index 6fef104cc1c..5b8cb86eb9c 100755
---- a/libgo/mksysinfo.sh
-+++ b/libgo/mksysinfo.sh
-@@ -403,11 +403,7 @@ fi
- # Some basic types.
- echo 'type Size_t _size_t' >> ${OUT}
- echo "type Ssize_t _ssize_t" >> ${OUT}
--if grep '^const _HAVE_OFF64_T = ' gen-sysinfo.go > /dev/null 2>&1; then
--  echo "type Offset_t _off64_t" >> ${OUT}
--else
--  echo "type Offset_t _off_t" >> ${OUT}
--fi
-+echo "type Offset_t _off_t" >> ${OUT}
- echo "type Mode_t _mode_t" >> ${OUT}
- echo "type Pid_t _pid_t" >> ${OUT}
- echo "type Uid_t _uid_t" >> ${OUT}
--- 
-2.33.1
-
diff --git a/cross/gcc-aarch64/0040-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch b/cross/gcc-aarch64/0036-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
similarity index 99%
rename from cross/gcc-aarch64/0040-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
rename to cross/gcc-aarch64/0036-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
index 0ef50e10f..1895dd258 100644
--- a/cross/gcc-aarch64/0040-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
+++ b/cross/gcc-aarch64/0036-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
@@ -1,4 +1,4 @@
-From 8703cb765874411a83d568fde5c3b195c89c3de9 Mon Sep 17 00:00:00 2001
+From 7e123432a35fcaa25de85b4940daabcd70c1a6bd 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
@@ -271,5 +271,5 @@ index 5093e8bbfd2..1871b5ab6eb 100644
  
  #ifdef ENABLE_DEFAULT_SSP
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-aarch64/0041-configure-fix-detection-of-atomic-builtins-in-libato.patch b/cross/gcc-aarch64/0037-configure-fix-detection-of-atomic-builtins-in-libato.patch
similarity index 96%
rename from cross/gcc-aarch64/0041-configure-fix-detection-of-atomic-builtins-in-libato.patch
rename to cross/gcc-aarch64/0037-configure-fix-detection-of-atomic-builtins-in-libato.patch
index 804e63543..163b3ca3c 100644
--- a/cross/gcc-aarch64/0041-configure-fix-detection-of-atomic-builtins-in-libato.patch
+++ b/cross/gcc-aarch64/0037-configure-fix-detection-of-atomic-builtins-in-libato.patch
@@ -1,4 +1,4 @@
-From abe5e7af0cb74a10adad65122f8a0c75c3f15615 Mon Sep 17 00:00:00 2001
+From cb2472c05592e4a1b5f826d761d0ef221c0c9664 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
@@ -53,5 +53,5 @@ index 670b0d72cfe..38c2cd9345f 100644
    alpha*)
  	# fenv.c needs this option to generate inexact exceptions.
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-aarch64/0038-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch b/cross/gcc-aarch64/0038-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch
new file mode 100644
index 000000000..8f5df6b69
--- /dev/null
+++ b/cross/gcc-aarch64/0038-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch
@@ -0,0 +1,84 @@
+From 45b24f2bf7fa1b2b9d597bd065b6522f8d87cd3e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
+Date: Sun, 28 Nov 2021 00:54:37 +0100
+Subject: [PATCH] libgo: Recognize off64_t and loff_t definitions of musl libc
+
+Without this patch, both off64_t and loff_t are not recognized by
+-fdump-go-spec which causes a variety Go-related compilation errors on
+musl libc since the gcc-go frontend expects both off64_t and loff_t to
+be present.
+
+Also make sure that autoconf recognizes support for loff_t on musl, by
+compiling the relevant feature test code with -D_GNU_SOURCE and making
+it include fcntl.h which defines loff_t on musl.
+---
+ libgo/configure    |  4 +++-
+ libgo/configure.ac |  4 +++-
+ libgo/sysinfo.c    | 21 +++++++++++++++++++++
+ 3 files changed, 27 insertions(+), 2 deletions(-)
+
+diff --git a/libgo/configure b/libgo/configure
+index 70f64c974fd..69d15839e8c 100755
+--- a/libgo/configure
++++ b/libgo/configure
+@@ -15546,7 +15546,9 @@ _ACEOF
+ 
+ fi
+ 
+-ac_fn_c_check_type "$LINENO" "loff_t" "ac_cv_type_loff_t" "$ac_includes_default"
++CFLAGS_hold=$CFLAGS
++CFLAGS="$CFLAGS -D_GNU_SOURCE"
++ac_fn_c_check_type "$LINENO" "loff_t" "ac_cv_type_loff_t" "#include <fcntl.h>"
+ if test "x$ac_cv_type_loff_t" = xyes; then :
+ 
+ cat >>confdefs.h <<_ACEOF
+diff --git a/libgo/configure.ac b/libgo/configure.ac
+index ebab9d9de3e..a3d9d309aba 100644
+--- a/libgo/configure.ac
++++ b/libgo/configure.ac
+@@ -602,7 +602,9 @@ AC_STRUCT_DIRENT_D_TYPE
+ 
+ AC_CHECK_FUNCS(accept4 dup3 epoll_create1 faccessat fallocate fchmodat fchownat futimesat getxattr inotify_add_watch inotify_init inotify_init1 inotify_rm_watch listxattr mkdirat mknodat open64 openat pipe2 removexattr renameat setxattr sync_file_range splice syscall tee unlinkat unshare utimensat)
+ AC_TYPE_OFF_T
+-AC_CHECK_TYPES([loff_t])
++CFLAGS_hold=$CFLAGS
++CFLAGS="$CFLAGS -D_GNU_SOURCE" # musl does not define loff_t without this
++AC_CHECK_TYPES([loff_t], [], [], [[#include <fcntl.h>]])
+ 
+ LIBS_hold="$LIBS"
+ LIBS="$LIBS -lm"
+diff --git a/libgo/sysinfo.c b/libgo/sysinfo.c
+index 8ce061e2f5f..b85add15a7b 100644
+--- a/libgo/sysinfo.c
++++ b/libgo/sysinfo.c
+@@ -343,6 +343,27 @@ enum {
+ #endif
+ };
+ 
++// musl libc has both off64_t and loff_t. However, both of these types
++// are defined as CPP macros, not as C typedefs. Unfortunately, the GCC
++// -fdump-go-spec option, which is responsible for generating type
++// definitions for Go based on this file, only recognizes types defined
++// through typedefs.
++//
++// For this reason, we check here if either off64_t or loff_t are
++// defined as CPP macros and if so, we redefine them using a C typedef.
++#if defined(HAVE_OFF64_T) && defined(off64_t)
++typedef off64_t __musl_off64_t;
++#undef off64_t
++typedef __musl_off64_t off64_t;
++#endif
++
++// See comment regarding musl libc above.
++#if defined(HAVE_LOFF_T) && defined(loff_t)
++typedef loff_t __musl_loff_t;
++#undef loff_t
++typedef __musl_loff_t loff_t;
++#endif
++
+ // SIOCGIFMTU can't be added in the above enum as it might
+ // be signed in some OSes.
+ #ifdef SIOCGIFMTU
+-- 
+2.34.0
+
diff --git a/cross/gcc-aarch64/0039-Fix-attempt-to-use-poisoned-calloc-error-in-libgccji.patch b/cross/gcc-aarch64/0039-Fix-attempt-to-use-poisoned-calloc-error-in-libgccji.patch
new file mode 100644
index 000000000..f43cfb4ac
--- /dev/null
+++ b/cross/gcc-aarch64/0039-Fix-attempt-to-use-poisoned-calloc-error-in-libgccji.patch
@@ -0,0 +1,80 @@
+From 0b7a57f08abff72f8dd1f67de995c502e798513c Mon Sep 17 00:00:00 2001
+From: Alex McGrath <amk@amk.ie>
+Date: Wed, 13 Oct 2021 23:24:27 +0100
+Subject: [PATCH] Fix attempt to use poisoned calloc error in libgccjit
+
+This moves usages of pthread.h to above any usage of system.h as it
+included #pragma GCC poison calloc
+---
+ gcc/jit/jit-playback.c  | 4 ++--
+ gcc/jit/jit-recording.c | 4 ++--
+ gcc/jit/libgccjit.c     | 3 ++-
+ 3 files changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/gcc/jit/jit-playback.c b/gcc/jit/jit-playback.c
+index 50db23df159..1d42f057a84 100644
+--- a/gcc/jit/jit-playback.c
++++ b/gcc/jit/jit-playback.c
+@@ -18,6 +18,8 @@ You should have received a copy of the GNU General Public License
+ along with GCC; see the file COPYING3.  If not see
+ <http://www.gnu.org/licenses/>.  */
+ 
++#include <pthread.h>
++
+ #include "config.h"
+ #include "system.h"
+ #include "coretypes.h"
+@@ -41,8 +43,6 @@ along with GCC; see the file COPYING3.  If not see
+ #include "diagnostic.h"
+ #include "stmt.h"
+ 
+-#include <pthread.h>
+-
+ #include "jit-playback.h"
+ #include "jit-result.h"
+ #include "jit-builtins.h"
+diff --git a/gcc/jit/jit-recording.c b/gcc/jit/jit-recording.c
+index 117ff70114c..d2634a546b1 100644
+--- a/gcc/jit/jit-recording.c
++++ b/gcc/jit/jit-recording.c
+@@ -18,6 +18,8 @@ You should have received a copy of the GNU General Public License
+ along with GCC; see the file COPYING3.  If not see
+ <http://www.gnu.org/licenses/>.  */
+ 
++#include <pthread.h>
++
+ #include "config.h"
+ #include "system.h"
+ #include "coretypes.h"
+@@ -25,8 +27,6 @@ along with GCC; see the file COPYING3.  If not see
+ #include "pretty-print.h"
+ #include "toplev.h"
+ 
+-#include <pthread.h>
+-
+ #include "jit-builtins.h"
+ #include "jit-recording.h"
+ #include "jit-playback.h"
+diff --git a/gcc/jit/libgccjit.c b/gcc/jit/libgccjit.c
+index 0cc650f9810..2f44481eeb0 100644
+--- a/gcc/jit/libgccjit.c
++++ b/gcc/jit/libgccjit.c
+@@ -18,13 +18,14 @@ You should have received a copy of the GNU General Public License
+ along with GCC; see the file COPYING3.  If not see
+ <http://www.gnu.org/licenses/>.  */
+ 
++#include <pthread.h>
++
+ #include "config.h"
+ #include "system.h"
+ #include "coretypes.h"
+ #include "timevar.h"
+ #include "typed-splay-tree.h"
+ #include "cppbuiltin.h"
+-#include <pthread.h>
+ 
+ #include "libgccjit.h"
+ #include "jit-recording.h"
+-- 
+2.34.0
+
diff --git a/cross/gcc-armv7/0042-stddef.h-add-support-for-musl-typedef-macro-guards.patch b/cross/gcc-aarch64/0040-stddef.h-add-support-for-musl-typedef-macro-guards.patch
similarity index 97%
rename from cross/gcc-armv7/0042-stddef.h-add-support-for-musl-typedef-macro-guards.patch
rename to cross/gcc-aarch64/0040-stddef.h-add-support-for-musl-typedef-macro-guards.patch
index 8b714b4ba..c22f7f43f 100644
--- a/cross/gcc-armv7/0042-stddef.h-add-support-for-musl-typedef-macro-guards.patch
+++ b/cross/gcc-aarch64/0040-stddef.h-add-support-for-musl-typedef-macro-guards.patch
@@ -1,4 +1,4 @@
-From b9e9895826774d17d4bb81b165753816db562590 Mon Sep 17 00:00:00 2001
+From 5a76cf60df5c9ba274f1d0dcd79fc0cbad9d0fe0 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
 Date: Thu, 25 Nov 2021 17:44:04 +0100
 Subject: [PATCH] stddef.h: add support for musl typedef macro guards
@@ -101,3 +101,6 @@ index 66619fe43b1..50d710a5ab9 100644
  #endif /* _WCHAR_T_DECLARED */
  #endif /* _BSD_RUNE_T_DEFINED_ */
  #endif
+-- 
+2.34.0
+
diff --git a/cross/gcc-aarch64/APKBUILD b/cross/gcc-aarch64/APKBUILD
index d1477d533..191d1a557 100644
--- a/cross/gcc-aarch64/APKBUILD
+++ b/cross/gcc-aarch64/APKBUILD
@@ -25,13 +25,13 @@ _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"
 
 pkgname=gcc-aarch64
 _pkgbase=11.2.1
-pkgver=11.2.1_git20211125
+pkgver=11.2.1_git20211128
 [ "$BOOTSTRAP" = "nolibc" ] && pkgname="gcc-pass2"
 [ "$CBUILD" != "$CHOST" ] && _cross="-$CARCH" || _cross=""
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname=gcc-aarch64
-pkgrel=1
+pkgrel=0
 pkgdesc="Stage2 cross-compiler for aarch64"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -221,21 +221,19 @@ source="https://dev.alpinelinux.org/~nenolod/gcc-${pkgver}.tar.xz
 	0025-always-build-libgcc_eh.a.patch
 	0026-ada-libgnarl-compatibility-for-musl.patch
 	0027-ada-musl-support-fixes.patch
-	0028-gcc-go-Use-_off_t-type-instead-of-_loff_t.patch
-	0029-gcc-go-Don-t-include-sys-user.h.patch
-	0030-gcc-go-Fix-ucontext_t-on-PPC64.patch
-	0031-gcc-go-Fix-handling-of-signal-34-on-musl.patch
-	0032-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
-	0033-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch
-	0034-gcc-go-signal-34-is-special-on-musl-libc.patch
-	0035-gcc-go-Prefer-_off_t-over-_off64_t.patch
-	0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
-	0037-gcc-go-link-to-libucontext.patch
-	0038-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
-	0039-Use-generic-errstr.go-implementation-on-musl.patch
-	0040-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
-	0041-configure-fix-detection-of-atomic-builtins-in-libato.patch
-	0042-stddef.h-add-support-for-musl-typedef-macro-guards.patch
+	0028-gcc-go-Fix-ucontext_t-on-PPC64.patch
+	0029-gcc-go-Fix-handling-of-signal-34-on-musl.patch
+	0030-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch
+	0031-gcc-go-signal-34-is-special-on-musl-libc.patch
+	0032-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
+	0033-gcc-go-link-to-libucontext.patch
+	0034-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
+	0035-Use-generic-errstr.go-implementation-on-musl.patch
+	0036-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
+	0037-configure-fix-detection-of-atomic-builtins-in-libato.patch
+	0038-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch
+	0039-Fix-attempt-to-use-poisoned-calloc-error-in-libgccji.patch
+	0040-stddef.h-add-support-for-musl-typedef-macro-guards.patch
 	"
 
 # we build out-of-tree
@@ -681,47 +679,45 @@ gnat() {
 }
 
 sha512sums="
-2a682823f9b114c4288a3428dc658ce21679f48a5b901d4792fc4ea09f75e9c9516f8cdc7c70697e1be335d925f99eac01eaf20c117cd5ee685181d37fcc7290  gcc-11.2.1_git20211125.tar.xz
-14ef1a0b284c85859f4db03cb0750c4dcadb8821dd0ec1b04e6872ffd2fa55ae125a99fee986a160bce9448226d08daf05e1a7feda5220e746aaa5f338d78d69  0001-posix_memalign.patch
-950b04c8bf96810dfe4bd4c2ea5218dfacfae0f0b1be9e64cbb1f09bbf67d29565b59094aa4d5cca095355db8cce99c80c99f0463ef296a96faf6b13e38230e0  0002-gcc-poison-system-directories.patch
-1d9c1b028b07644da9182288a26762f294d1ef25804c0227bfd3419a2a8ba579bec7590aaac9a241242bb14e3e371eff81ad26a07d0183be821af59bd6abe4d4  0003-Turn-on-Wl-z-relro-z-now-by-default.patch
-5a705aa5ffdc5ab3fb417ddb494486156db4af3b7f9a1d29e1b3ac2e7095f924b2a3f73a73b4d7d20f6ba3c77b062f1b47e7b46c0a8e1992f349abe3cf7f6542  0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
-87573db27fd83fe9d7c40cefb5bd264e36500280ab2dd39c1763f87f4cfaef3e0d3115f4aadd3b3d65c93a13db17df469e038931335685dfad4adf6b48e96c66  0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
-4055d8b934c8a017bbba74b224c8da105668ea16fc9f244b0dacc9511a89088701b491daec09d95041f640b7f0e994feb17a0803d389818f104578bfaf433623  0006-Enable-Wformat-and-Wformat-security-by-default.patch
-0ffb348414468ea166d5875e0f20f77a813473a6823e26189b010eebb835c91e14b04f360b139fffbc50b30622476a625a5f567d26b6c18ddcbfc88e6d28e54f  0007-Enable-Wtrampolines-by-default.patch
-799117fc233f3172457024a71d4d964c6a367b7ae7246e208ba16192a533bdf484dc72b79eb7ee3629c0eb7fe202d32658a64219c03c9098120c899d9f832309  0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
-eb47d678ff9a14ad54833b1fdc2d04976e31db741cdf9ac6b213d56df3df3ea61514bdfa5bbe2577b82135517e184de53028663b7aad565613e90c0bafd6513f  0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
-e3d2241e3bb8e67bece8a322cdc707542586f7a1b5da9412eb38dbfa40508e618b8827e3574b21c86b9d263e8ed31941d8885618707c1947d07f86d18d34a9a8  0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
-e8976a1f1618e94d519852dee346bb787589637905451a6f02b4f8a1ffc5a6fa797a697b8c0964a72830aad32ba412986d45e9f88ae86e3d7c8007d3b1400692  0011-libiberty-copy-PIC-objects-during-build-process.patch
-2cc03796789b6680f43533d41a1966283b6e913b19080a00c4ec6653614f1af66754db7ffca05103bb398e389316c9fca525d2fe00965e1105b210d1d940d507  0012-libitm-disable-FORTIFY.patch
-8fe44a88f66f1d282c5c6db80642ac8ef52f89ccc8287f73eecd1c8d78ee3e5ac890065d173fc3ff00172b8b3984ca484debbf84b9ba649dc5939afdfc4a220a  0013-libgcc_s.patch
-1323a512d063f9a0679c68c9856ede8a6d48ae0c9c52ef14e63d34e6a2b6486fa02301d75554b2d623a369967c71ca35e7c93530c093f334f0cf666c7d1b4911  0014-nopie.patch
-1fb9fb420335d5e87245eb781960bc876a1d60bc69af2a8febad8ddd23cc064e28227a7b9f8389b4f2bb0211259102feaa6e2a7f64457fac06d60a59fdc1c2bb  0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch
-226e68c4561524ece4340107736f5f7f5a31fb725373a5ad472147f443a5fc037d0e0d93562c3e6d333ed43ceef7a2c6a2adad1ad10a464235d168a2dd4ed65e  0016-dlang-update-zlib-binding.patch
-9615d8844f4ffaab6dc61ad452ec9502acfe41029f2225b4b9fa10b034659447fb92b037918d52c615cae30acbb778b8a3d2197c705c90698221ae9e7bb30a32  0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch
-3008df8b4e4f582ced4976e640cb3329904bdefe9d454b13c8e61f3393fee21ec4e49cefc90e6049f85bacced500886681520b46b5063c948b7f5506c050b8cc  0018-ada-fix-shared-linking.patch
-3df7c1285a370e9741f649b26e31074177826b11da5172e5571c982ff1127ba83c6baf6b0666433ab7cd937217550ed2f083460d8ef8ed62531a98e63cbcc4c9  0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
-5235fbd6bb39c98f9ef702112d5bda05dcba03e897106ef864be606568e0c51e2fb5cadc5df93d162ceb8bf38a544adf9487ddd995ed0b936e86e3fbbc10512e  0020-add-fortify-headers-paths.patch
-9405ea49a6832ae7e2c81c00a9c0c7eeb03b2b4cb887ff2f6352b0f0a5de2c002208a12a6a61ec0e287b114c30090197e867be1a5ed8f462e6f74a63b87fd6f5  0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
-aa46e49551ff84654166927f62fc81a118dcec1934cf0a95bdbcfe0ed08fac21d6c4b123965d9e718936411e2935c6cd6b60dbba2853c01169fea8d0fa401464  0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
-62a743dea9f0b644876138f5d336726a32ad62ad1b49c308daf3a11c7122cef292e93fe580fc71aa1ec9c73bb234e485a3d447135f2d169b98af1900d304368e  0023-Pure-64-bit-MIPS.patch
-6959cf80dcceeee5d89eff1337bdf35d7a1d42fe3861a56bebd10ccfba1e5046837b63923a2f1b23109c8494d39a18a400f08342686271d539964ad85c83d2f1  0024-use-pure-64-bit-configuration-where-appropriate.patch
-1f160b42a88f1d6cdf2cf140323d5fb96233f82b5fbeb8efdb861820b25c1b0354e55202655bfb5f571e21fdb18e66a532b7278a014aab828e03b04e9345fe19  0025-always-build-libgcc_eh.a.patch
-fec758a6cbee1d468b966b90e35fe83742b2ebb2cc873634115ab4db599bd84a8c00f687ff18a2f37360126a75f4b8d85d9de3127d44b9076d931479cdd65ab1  0026-ada-libgnarl-compatibility-for-musl.patch
-e49720b5d78fca91bdc0dbc431b70e9e75bbd6a95ba2e856dce6764dd9759fc830bb445ce8aa8fc9aa6ace80c474e9c2a947c6b23a1178b2cb6bd8780447350a  0027-ada-musl-support-fixes.patch
-199b87e0844c361fc176755cd5846ea48f4a18382609633d0f4d1fb3e11a41ad93168f9b4f44ed993dca977354c0072637779658941cebe6adebfea28b28531c  0028-gcc-go-Use-_off_t-type-instead-of-_loff_t.patch
-17642cb9f179007b898f62cb4d6c9b436876cf667606c8003e02a782f09d29e17a301225efb94102094cc7f2b3efb413dd5ea2581e7e421e2b814f29f1b7e776  0029-gcc-go-Don-t-include-sys-user.h.patch
-08268c1ec6b6f0097ea15230f45f2a7231b8c5f9e6f90fcb102f86fe8e83c81a1755482a88415ab11a3de62e82769e4f0e3e029b812e477fcb6ddccb5f086734  0030-gcc-go-Fix-ucontext_t-on-PPC64.patch
-1345b99c20a9f7335c8af5e619c769f0555e46c18ba0f084d2655bce1581d11353f278dd9c94874edaceed1bf9d11a4a720b5263197c0cc9ce288f664e26eb01  0031-gcc-go-Fix-handling-of-signal-34-on-musl.patch
-ff8fb2cd67dd4723b271c2d1b6bca80e062d2fe31fe9f71aa1b83bab1c131decff4b4ddf8da9ce188cd28eee0fa1cf04d8ffc863033c5ce0096a6dd7b748e3b5  0032-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
-ce677dad505e56c67c79f7836888b6c28feaa4172d41c8c7573b931e6baff56ca0e5b9e6902b576d784735c5d278bc8a23e08a83597e3f41d11be9e14cf1dc59  0033-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch
-19743886041ed1fc8e3afebc48b5c196c032f4bd8d20a8deb99ba83ec7ffb3a5e18f1686a705a0578ce120f702493e444c599c9228f2b466abbcb8820f313d7a  0034-gcc-go-signal-34-is-special-on-musl-libc.patch
-150dba551824d99a3b58ea531c939237ce3aa642d04e5a2f774fe96bb27f1aa498d2b95d74369dd893da6142f9a8e5fe8966c72f38e21fc14ff614f90e7374ce  0035-gcc-go-Prefer-_off_t-over-_off64_t.patch
-2e09c90e5b9ba295949d5a9986ca4e13774981fb918d35098ab560139d34703b15924767bb54ffadf38b061b2b395c50f53c367c96959e5e9d1e7c65224171f4  0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
-01b3010bdfcec65d68f851ed425fa22c744e6744aaf4b0fe7699c7a678e970e11bc7b907188fbacababacadf520b515883944480e91262259e0a03a0966d7540  0037-gcc-go-link-to-libucontext.patch
-f7eefa7ae1f31fc7bc1721578d4c1642f2ef5feda37dec03264dde53717474437722ee646ab9a837d888eedbee4ea3c407f20cc4c7cb36d34a81e56b3ea02c79  0038-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
-83deca7a68c6e1ce934f79b5d1e1a4b8b8a25c7bc24c3ef934307c232e168d9b17048a00a040fe81ac0cf6d4a23beefb292369c35d9896dab440dda228c90b0a  0039-Use-generic-errstr.go-implementation-on-musl.patch
-4074c62c2ee0ed555f01bf0cc69e32ef275bc3ac74de1d428ba1a2ac59fae973fe6f9aab8b3796df4bda7ab7cf220e5e1cbfdf103f41e4cbea175067a947d08f  0040-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
-1fe1b1e9ec288f65cd0d80a74b0a060b29c40e501f666b01e2825b61949be4568aeaf7cf473142889a7fd5e011b096837a651582d64fce67500fcb2ba39e16ce  0041-configure-fix-detection-of-atomic-builtins-in-libato.patch
-0a66c5a567e15dafac0bcad5c9dd5e98c44c74cbe539340ad28cbf6d26b994bab46b355f3a3a57b830f802145cfd826ad8d87359ebc5d6a20ef41e968904c7dc  0042-stddef.h-add-support-for-musl-typedef-macro-guards.patch
+99c25b0cf5ae57806e3ecc76977c4b177e60660a289117506061243d3b492c76392cc47ba1165a04b1d46b932c1492db045edb29eab5460774be90243e984f22  gcc-11.2.1_git20211128.tar.xz
+a1b8ae8ba40ed0e384484590ca7c9328f922f6237c883d7a78ad16a5110f522280c577ede7ee65163ca8b9e2cb02d5eefa343d8a60a8d6a64d2fc3496b01b80a  0001-posix_memalign.patch
+79ad02ec110f485bc19364459f94d16556b4e178a029a538b9a448ce356950fcad99674d711edb012d8a28b4e39a865370dec1a12c86d6fd91160acf80135ee3  0002-gcc-poison-system-directories.patch
+fd8819d4b7ef3f3d32bd09f049098f04f7503556b65f1f85c91cd7f724770b3b8f16af580774e518310be83462070551cdc8ef78963e73760849de26d8a107f7  0003-Turn-on-Wl-z-relro-z-now-by-default.patch
+eeca973fb0f6a82203358cb8ce15cac256315e0e22ad00b579b73a3bb093da306f62d59f86f7f3d3c0194370dff6ee4b0a01026153a29933437b3c3ed758c34e  0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
+faa5bd16cb5d4c898dd1c7f9b88a12e1549d2f643c13cfe0413fdf8dccf9ce48489415de4f3786df86d9ca305fbeba650b4f9f2440f9800297bcd9fa5624f714  0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
+371ebf3a572fb1dce7756bde18dd116e3cff9c110c80e05e46d6d01a3b7545f28ec6e65a062226bfa1b4b3da8ab436835d03f5a14b33ada1a250c726ce8c45e4  0006-Enable-Wformat-and-Wformat-security-by-default.patch
+ed48ccf5733d0f988cc1838c3f5f8466e21b92390af8679e79447699fd8fae51cd2091233d15f77b44412f09f1b8266d68d1da669c6f9b409f4808fbb1e9a2ed  0007-Enable-Wtrampolines-by-default.patch
+9481738fb87f7c453569ba88aa7629d773d5d88185e67a412e3b06422868da0719b3d98f11f29f21a7e9948a6d598c34a7e9806bb60428734a3de724984f9de0  0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
+47650d47faa0d896179b11513171b10547b6a374a574cfdf923816c46adf643dda61abac56bd3ce971acccd9b2843b28b8fac8cc46e92e9f325a275113413771  0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
+4470ecbcfb1dbdcf5157d94178229b7e4f24c997a92f48b688f0850454bdf19ea1525d1ebbc541d5da203408e2d5d577ca9a769db8501ead4e4888fde21fb2ef  0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
+c324b0cfc83f90f65ffe2b09ced8248d907f8d3c7120491f1311601d76f1729e8728177b0b57db691c7b917265bf1e0c33f08a3f1360fc26f75aec057262e0d2  0011-libiberty-copy-PIC-objects-during-build-process.patch
+3a7ccaa7ef78a55b3d327c4c2e3474bc904192cc8d9f62ab4658ed75887301f5069af823aa9d01560a5047fe95c89ee0c1f98745722441d27ba544870af56c7c  0012-libitm-disable-FORTIFY.patch
+68442827a2335c40e9ea1979b64e026634497f076c21a8a9f11bf09f612ec72625c72e16ff6d50da659d0d5c49a7df266be4e99b2af3712fe84238b926ad14b2  0013-libgcc_s.patch
+b34a972b39f4b55d11ed2bfaa17181a353e721424f31c35892a0a7d16a680d017856d4679b1bcd6ebdee304d3e15aae5f545a59c5a5abf0e48d094e8fef52ae0  0014-nopie.patch
+03574bbbb8cc76ab3303862e68d19898b6b1971cbea0d8e3f8d0bef47c33376bc8d37d0a3aee9783e6f04ca3857fa6cfc054b24fafe5eed51a75215e61dde9ea  0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch
+5233ae40bf0e42f8c9cd379f776c6a5af11bf986c0e09b3032e02e5c4f257d12d8f2c27739775b48bd07fcf6c4062086465864b1ca11983126752fd46b85c658  0016-dlang-update-zlib-binding.patch
+627a24e669e408165c4b63c9a4e0a980373a4b801286f7b6e6a3a4c335e0c9160d164d23701c90170217ad333d0403b1aef7738ac90c4ed9f832d27c0eb4cd38  0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch
+482a8556fa7bf2ca14782ccce01465211ad476b83c3087668298d6078b32e1eae2138c0ea236c4b191f57171bc6ce64d51cac2dfea4f33d69283f12ecec9e9c6  0018-ada-fix-shared-linking.patch
+8fe388c533b687542aacda86c1ca04290a53123050e2700867895005aa34ec0b23f2c394c5710b1b87e85442fb976c47a95d10360984da13a82a3ff5307996d5  0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
+563d17f07468d412b46b012cff37d1c4acdee2bd1046b7ac817c1b35034c167e252a6067dd34b418770d3b0c170f8ae14a4ee9b2ab0df1b8b7d2581afec83731  0020-add-fortify-headers-paths.patch
+49ba07e45442651cd9610ca339035deb19d73744850149722c6da9a0e1b5081ab27e8e88f45e836de2a432770dcd7fd2073bc5379679921175a68627e9a0941f  0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
+a6d88c765aded0dcd0ecc0bf68a9ad3e4d0bb8f2fe1f7b1245db068d5cee154aec8c3bed47390d60b10809c224fbbafb5f36225a46fc6c8f143bd8317fa2d062  0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
+40fb955eaa10d2536acf99a716aed68cb587e94bdde8260581b2ba7026a9698058495f0b040a3909096b4102565b1c704c70e3b870e239366450df10d73a201c  0023-Pure-64-bit-MIPS.patch
+5ff7f3836a4ae7729bbe8fffe97956eeebb6cd40657214423e79a9ec42e85654491cb73fdb263ff70d4e37e14f42370f2a90ba2c97411c5ec4b2d967c6d70a85  0024-use-pure-64-bit-configuration-where-appropriate.patch
+e45369759649d0680b7c39512e20a5424706d2e7711d14076d893850105daba8b9bb5094db962813859d225e70e018a5667155d92827a918674961015f13eb95  0025-always-build-libgcc_eh.a.patch
+a16387cda58085fce4413db099e18c089d3e2f6603ba4d3add07fd4d31f3d254c91611ad4b8ee36135a364f12e0897bfd6d5998b95c0f431ca8b79d142f26958  0026-ada-libgnarl-compatibility-for-musl.patch
+3467decc5a090d82497a6b029ec6e34aac3876fadd23db2a3af385017e5cd992f82cf11b928e6b461248b60990fa50a469017a4646954f63974572c3a6fcaaec  0027-ada-musl-support-fixes.patch
+9960b164c608c47f35de2bf624cfe8782984e8d3ed23a72a456284e3082620f95501299b3e9e26b0f8c0d0796c68c353584bb5c48e85b101010abe29a46ccf5d  0028-gcc-go-Fix-ucontext_t-on-PPC64.patch
+c89f234df9a37cfe0c0d9ca891febe57b3ae0eb01416edaeb5d66738d3f5dcf5e62eedfa12a22e56aaef7cd833ecb9b85e72ae3636ef2dd0c6ec8654609ba3fe  0029-gcc-go-Fix-handling-of-signal-34-on-musl.patch
+df6447febdecabacadaeb9925830ee531a860ddd5a1970ff42f608a798eccce81e8beaa5caf2f121411c55361af1ca4e8352552f21809b4fcaffda36e870c69c  0030-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch
+5220d075b3882e235cbc5e00b22d5a314d986a078ef7242bc777b32e00891f65fa887ed4557aa5d5c712c4e8ab49d56560cfe2489e36fb02843f1ff892b0fcf7  0031-gcc-go-signal-34-is-special-on-musl-libc.patch
+09f5fc4fadf1e60a3766ad33bfaf8c1ce73cdaacb41734d31fb78583e9fcdb5ca7650c3e03c01c8c3239a81d6ed849f39d17e0a31a672cb15c7138ce58c82c1b  0032-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
+c0abc9a985a195612d9bd9d12ea7a18e5717723d23790a90610f03881f9dcf54911332be002cb79043575db3b2f82099ff927d7f761050a063601fbe2e04e8f1  0033-gcc-go-link-to-libucontext.patch
+d5722d15a3dd9669ee4da062a3e0a0a2049772f10224f7da615eb4093e5f24bca4372078c9282a457cba649b12c4f1180ec7523584410e5cba555f4612740186  0034-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
+afb7d25f10f23e3ac634a10424f43e9ebe737d4aec9d067c2ad42c1144d08208271f206cdf54582b97a15a0900e5d426ea2940850b9e67abbd2b03f5a30a1793  0035-Use-generic-errstr.go-implementation-on-musl.patch
+ca185b3e0644dab6a87bf524042c72069ffda0cde578e803bd59a9c5e40ba4d7d6f0be49836bc3aa622a4367606bdc71a6b90fcc2c377e045bbdbe1fb5ce6730  0036-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
+11f93cd928881264b2a2a78dd52001980dca26cb22d2207a3ff286d63deca81468daa649762ff27f1a6475c0334bc3135b7bb080ce1b152b0f1a1e8f81287c5f  0037-configure-fix-detection-of-atomic-builtins-in-libato.patch
+7541d57f7c04571b3d60a2e40038245b33e68c4b53373f64d2827d106349546834f06eb77227194f950b570e15f4fe9e259238458d5be8f10c41c56404f7cfff  0038-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch
+2c5edf9e3fe6822a322c1dc75218062afb56799c304aa583c4e1e80136c6262cbd9bb950843f167b40639c6623a33a0475990c4452e03307af434dc8760d437d  0039-Fix-attempt-to-use-poisoned-calloc-error-in-libgccji.patch
+8e44678fc77094a2c0cbc78575759ee51d50ea53189cf4d651c8501eb1b46210bb6d5969b81f5f63532914320971e7a1e2e80b32cb679ab41af86f21742b4c19  0040-stddef.h-add-support-for-musl-typedef-macro-guards.patch
 "
diff --git a/cross/gcc-armhf/0001-posix_memalign.patch b/cross/gcc-armhf/0001-posix_memalign.patch
index d14560674..f41493c81 100644
--- a/cross/gcc-armhf/0001-posix_memalign.patch
+++ b/cross/gcc-armhf/0001-posix_memalign.patch
@@ -1,4 +1,4 @@
-From 135cfe09a582b4076324a5f350f775c18164aa1f Mon Sep 17 00:00:00 2001
+From a858e4eb74d68ef1cf7a30d6a60fb32c621267c6 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 1b0bfe37852..d7b2b19bb3c 100644
    else
      return NULL;
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-armhf/0002-gcc-poison-system-directories.patch b/cross/gcc-armhf/0002-gcc-poison-system-directories.patch
index e0a2e77b4..a3c61fb0d 100644
--- a/cross/gcc-armhf/0002-gcc-poison-system-directories.patch
+++ b/cross/gcc-armhf/0002-gcc-poison-system-directories.patch
@@ -1,4 +1,4 @@
-From b0d26972848280c3035668a6caccf0ca5475f062 Mon Sep 17 00:00:00 2001
+From 6317101c9bb0616db0b919ed945466c4161ea7f1 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
@@ -199,5 +199,5 @@ index 446d280321d..fbfc0ce03b8 100644
  
  /* Use given -I paths for #include "..." but not #include <...>, and
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-armhf/0003-Turn-on-Wl-z-relro-z-now-by-default.patch b/cross/gcc-armhf/0003-Turn-on-Wl-z-relro-z-now-by-default.patch
index 242f34c08..5f45aeadb 100644
--- a/cross/gcc-armhf/0003-Turn-on-Wl-z-relro-z-now-by-default.patch
+++ b/cross/gcc-armhf/0003-Turn-on-Wl-z-relro-z-now-by-default.patch
@@ -1,4 +1,4 @@
-From d0e45e3e71b386dcd57fa807e0182b0c00a4f7af Mon Sep 17 00:00:00 2001
+From c23602c67fd4ca33eb1f819f28f03eef50905265 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.
@@ -35,5 +35,5 @@ index a83ba34ac4b..8c15de433ee 100644
      %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!r:%{!nostartfiles:%S}}} \
      %{Wno-poison-system-directories:--no-poison-system-directories} \
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-armhf/0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch b/cross/gcc-armhf/0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
index 0e7ca91b7..833f9d571 100644
--- a/cross/gcc-armhf/0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
+++ b/cross/gcc-armhf/0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
@@ -1,4 +1,4 @@
-From 0615d5fe72c9c23cd9d08f2a54eafb4ab46cbe11 Mon Sep 17 00:00:00 2001
+From abb8ccb0dcd381e9daeb43be2d32afd0ab7c83c5 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,
@@ -42,5 +42,5 @@ index 46e45274859..1b4a698a191 100644
  @opindex O3
  Optimize yet more.  @option{-O3} turns on all optimizations specified
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-armhf/0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch b/cross/gcc-armhf/0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
index d0e94637a..9f927abbd 100644
--- a/cross/gcc-armhf/0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
+++ b/cross/gcc-armhf/0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
@@ -1,4 +1,4 @@
-From 071d4ac4bacf555c61c7c44b54acee94e35d7c59 Mon Sep 17 00:00:00 2001
+From 22071923bf903a7bf851d1e59dcc1d07c6b0e876 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,
@@ -268,5 +268,5 @@ index 8c15de433ee..be1508e5abe 100644
  #else
  #define LIBUBSAN_SPEC "-lubsan" STATIC_LIBUBSAN_LIBS
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-armhf/0006-Enable-Wformat-and-Wformat-security-by-default.patch b/cross/gcc-armhf/0006-Enable-Wformat-and-Wformat-security-by-default.patch
index bc7a3ef2b..d8843fd18 100644
--- a/cross/gcc-armhf/0006-Enable-Wformat-and-Wformat-security-by-default.patch
+++ b/cross/gcc-armhf/0006-Enable-Wformat-and-Wformat-security-by-default.patch
@@ -1,4 +1,4 @@
-From a2c4ea1f97c358486316d0e8536b021faa4581a5 Mon Sep 17 00:00:00 2001
+From 622ce6893c48eaa87beb7399ecb73bdadc9b7b84 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 2005b783c68..c5c6af427cc 100644
  
  Wformat-overflow=
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-armhf/0007-Enable-Wtrampolines-by-default.patch b/cross/gcc-armhf/0007-Enable-Wtrampolines-by-default.patch
index 14941d2f6..cbfe46c49 100644
--- a/cross/gcc-armhf/0007-Enable-Wtrampolines-by-default.patch
+++ b/cross/gcc-armhf/0007-Enable-Wtrampolines-by-default.patch
@@ -1,4 +1,4 @@
-From 5cbd83abefc1f3cf93057383e6ff59196934dbf7 Mon Sep 17 00:00:00 2001
+From ad29ab28462968097dad017f03c4db40f4d83174 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.
@@ -21,5 +21,5 @@ index d15105a73f3..29f9504cb68 100644
  
  Wtype-limits
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-armhf/0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch b/cross/gcc-armhf/0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
index f82943127..39dc6400f 100644
--- a/cross/gcc-armhf/0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
+++ b/cross/gcc-armhf/0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
@@ -1,4 +1,4 @@
-From 02c1d7932c3c3b9813431937dd82971a3ca86088 Mon Sep 17 00:00:00 2001
+From 0fd84cfeabaf572f5f901fa7d13298286d84992b 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 8ba281b4cfa..bab39cdf8a2 100644
  
  -param=stack-clash-protection-guard-size=
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-armhf/0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch b/cross/gcc-armhf/0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
index 065972191..5093eefc9 100644
--- a/cross/gcc-armhf/0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
+++ b/cross/gcc-armhf/0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
@@ -1,4 +1,4 @@
-From a91c942466bed1046461500c00e0ee1c9a68481d Mon Sep 17 00:00:00 2001
+From b788f9a685522fdd615c2c9aa7feab974c6d6b09 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 8edd2e05639..63f61fcf96f 100644
  
  all-local: all-local-$(USE_NLS)
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-armhf/0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch b/cross/gcc-armhf/0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
index ec5f3fe31..1e7627544 100644
--- a/cross/gcc-armhf/0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
+++ b/cross/gcc-armhf/0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
@@ -1,4 +1,4 @@
-From 856b0c7ac4f4513af20e505b27e9fa19234b7fa9 Mon Sep 17 00:00:00 2001
+From 1f2c3d7a0d1c35cb8281c5d97eb8ecfe2987e8b3 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 f4c0fe11d6f..cf4b1043e4d 100644
  /* Like asprintf but allocates memory without fail. This works like
     xmalloc.  */
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-armhf/0011-libiberty-copy-PIC-objects-during-build-process.patch b/cross/gcc-armhf/0011-libiberty-copy-PIC-objects-during-build-process.patch
index 8378cebc6..4022561e9 100644
--- a/cross/gcc-armhf/0011-libiberty-copy-PIC-objects-during-build-process.patch
+++ b/cross/gcc-armhf/0011-libiberty-copy-PIC-objects-during-build-process.patch
@@ -1,4 +1,4 @@
-From 5fe2309817ce1cdad4183921faf890886ea34493 Mon Sep 17 00:00:00 2001
+From a110462c21bc26c6c3c8d3265d3f146d1b9bddae 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 4f1213b983b..d0224649d30 100644
  	else true; fi
  
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-armhf/0012-libitm-disable-FORTIFY.patch b/cross/gcc-armhf/0012-libitm-disable-FORTIFY.patch
index 42de37383..b118ad486 100644
--- a/cross/gcc-armhf/0012-libitm-disable-FORTIFY.patch
+++ b/cross/gcc-armhf/0012-libitm-disable-FORTIFY.patch
@@ -1,4 +1,4 @@
-From e0dfb9ef8b3a3ef3264847b030c9e38a3059ad24 Mon Sep 17 00:00:00 2001
+From e0ad9c8c39f35a47c6a4c34ae161d768bf2f6fcc 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
@@ -29,5 +29,5 @@ index a3d84896cc5..ecb281d5919 100644
  # work out any special compilation flags as necessary.
  case "${target_cpu}" in
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-armhf/0013-libgcc_s.patch b/cross/gcc-armhf/0013-libgcc_s.patch
index 9e4870122..4e1631d67 100644
--- a/cross/gcc-armhf/0013-libgcc_s.patch
+++ b/cross/gcc-armhf/0013-libgcc_s.patch
@@ -1,4 +1,4 @@
-From f2ff82d829d3d905a48fb877230ef5a096605cd4 Mon Sep 17 00:00:00 2001
+From 57309d5900d3bc974b9a3efff34fdc601014b386 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
@@ -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.34.0
 
diff --git a/cross/gcc-armhf/0014-nopie.patch b/cross/gcc-armhf/0014-nopie.patch
index 5a419c892..a51d4c693 100644
--- a/cross/gcc-armhf/0014-nopie.patch
+++ b/cross/gcc-armhf/0014-nopie.patch
@@ -1,4 +1,4 @@
-From ca92d7dea9d05e515e52048c74408652e12787a8 Mon Sep 17 00:00:00 2001
+From d10ec6f4bea9d3f07d3ada43da129a4b5812fd65 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
@@ -71,5 +71,5 @@ index 5461bab88a9..1577529ffb7 100644
  AC_SUBST([NO_PIE_FLAG])
  
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-armhf/0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch b/cross/gcc-armhf/0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch
index 1b1018bc6..699e09562 100644
--- a/cross/gcc-armhf/0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch
+++ b/cross/gcc-armhf/0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch
@@ -1,4 +1,4 @@
-From 96f17362cdc323db0d556cc13f2ac712ec03db62 Mon Sep 17 00:00:00 2001
+From 2640a3cf5ecfaf532448baa66ea138c3ef02dec1 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.34.0
 
diff --git a/cross/gcc-armhf/0016-dlang-update-zlib-binding.patch b/cross/gcc-armhf/0016-dlang-update-zlib-binding.patch
index 66b7ffdc9..37d4117aa 100644
--- a/cross/gcc-armhf/0016-dlang-update-zlib-binding.patch
+++ b/cross/gcc-armhf/0016-dlang-update-zlib-binding.patch
@@ -1,4 +1,4 @@
-From 20de5d928fc0b3738d62eb2ef0a697cd733a8bdd Mon Sep 17 00:00:00 2001
+From 60d97064fb53a99c6189f9cb81824a70d435d2d1 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.34.0
 
diff --git a/cross/gcc-armhf/0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch b/cross/gcc-armhf/0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch
index 3b8bb12d5..0b05c3564 100644
--- a/cross/gcc-armhf/0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch
+++ b/cross/gcc-armhf/0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch
@@ -1,4 +1,4 @@
-From 1c64f83b19fce8cf0bacff9e1ee3232513d2ef9e Mon Sep 17 00:00:00 2001
+From 8524e44401fa57f6bdf78f39fb60cbb76046d256 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 59df921ba41..9ee9f943948 100644
          static assert(0, "Platform not supported");
  
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-armhf/0018-ada-fix-shared-linking.patch b/cross/gcc-armhf/0018-ada-fix-shared-linking.patch
index 524001074..cbed48d66 100644
--- a/cross/gcc-armhf/0018-ada-fix-shared-linking.patch
+++ b/cross/gcc-armhf/0018-ada-fix-shared-linking.patch
@@ -1,4 +1,4 @@
-From 35c96f4e7ae99786e8f519bd7c1c6a3511dd18d1 Mon Sep 17 00:00:00 2001
+From 03810f135f7106da0b9fef6c60c9def8b1891940 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 5cd5ef64f56..1c611a82cab 100644
  unsigned char __gnat_objlist_file_supported = 1;
  const char *__gnat_object_library_extension = ".a";
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-armhf/0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch b/cross/gcc-armhf/0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
index eb291c62f..dbb474047 100644
--- a/cross/gcc-armhf/0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
+++ b/cross/gcc-armhf/0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
@@ -1,4 +1,4 @@
-From e9d428d711843b1ff735da53f81efaca5ed1e962 Mon Sep 17 00:00:00 2001
+From b0eafa664f78c3d3f5d9bf38ece54777119c8e6e 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 047be0255e2..426949aa91c 100644
  
  # This is the list of directories to built for the host system.
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-armhf/0020-add-fortify-headers-paths.patch b/cross/gcc-armhf/0020-add-fortify-headers-paths.patch
index d60b4f1ce..62c748eb8 100644
--- a/cross/gcc-armhf/0020-add-fortify-headers-paths.patch
+++ b/cross/gcc-armhf/0020-add-fortify-headers-paths.patch
@@ -1,4 +1,4 @@
-From 131337e43b77d251e6e0128fd95cf11ed1fa2c7d Mon Sep 17 00:00:00 2001
+From 8dda8a6e1bd6f49f687f9b6725e704eaa0b25873 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 4e1db60fced..7fcf402b416 100644
      { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 0 },
  #else
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-armhf/0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch b/cross/gcc-armhf/0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
index b51586e12..ff2c2be4b 100644
--- a/cross/gcc-armhf/0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
+++ b/cross/gcc-armhf/0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
@@ -1,4 +1,4 @@
-From 803acb891329bc74ac5c7ae99904dd0a0d04759a Mon Sep 17 00:00:00 2001
+From 06a8b9fd165032afd96facc5c4e608bfe09ecbea 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 e495b222095..ab8866f409f 100644
  #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
  		       "|fstack-protector-strong|fstack-protector-explicit" \
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-armhf/0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch b/cross/gcc-armhf/0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
index d47b38db2..198f47760 100644
--- a/cross/gcc-armhf/0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
+++ b/cross/gcc-armhf/0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
@@ -1,4 +1,4 @@
-From 41201c14bee1ece2c15435bc76cc07e5460e566b Mon Sep 17 00:00:00 2001
+From c279684da1a93b3009c24b7236e2a58c3eb2fe9c 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 ab8866f409f..5093e8bbfd2 100644
  #else
  #define LIBUBSAN_SPEC "-lubsan" STATIC_LIBUBSAN_LIBS
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-armhf/0023-Pure-64-bit-MIPS.patch b/cross/gcc-armhf/0023-Pure-64-bit-MIPS.patch
index f01e8c4d4..60571ddaa 100644
--- a/cross/gcc-armhf/0023-Pure-64-bit-MIPS.patch
+++ b/cross/gcc-armhf/0023-Pure-64-bit-MIPS.patch
@@ -1,4 +1,4 @@
-From 71e4e4a671201d777eda4607ce380ba429bd307b Mon Sep 17 00:00:00 2001
+From 249a08b7257fa09d572933142cc9146c92f38dd2 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 130e1f04707..a64ac2bbb5b 100644
 +        ../lib32 \
 +        ../lib
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-armhf/0024-use-pure-64-bit-configuration-where-appropriate.patch b/cross/gcc-armhf/0024-use-pure-64-bit-configuration-where-appropriate.patch
index 715e1f6d1..917e89344 100644
--- a/cross/gcc-armhf/0024-use-pure-64-bit-configuration-where-appropriate.patch
+++ b/cross/gcc-armhf/0024-use-pure-64-bit-configuration-where-appropriate.patch
@@ -1,4 +1,4 @@
-From 43a75f797d0f0217665889830e061dbe74ac69d0 Mon Sep 17 00:00:00 2001
+From 0c9502cb5db1f2898b531cfb1d3b733490045845 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.34.0
 
diff --git a/cross/gcc-armhf/0025-always-build-libgcc_eh.a.patch b/cross/gcc-armhf/0025-always-build-libgcc_eh.a.patch
index 913d1d127..bf8e0dc20 100644
--- a/cross/gcc-armhf/0025-always-build-libgcc_eh.a.patch
+++ b/cross/gcc-armhf/0025-always-build-libgcc_eh.a.patch
@@ -1,4 +1,4 @@
-From e8fa599cbaa9e0fe6ae8aaded7c0443807d695cb Mon Sep 17 00:00:00 2001
+From 338f65b9c13e8aaacf146e0fe2400566766f02e4 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 2c8be561eb5..c557750b1b3 100644
  	for file in $$parts; do					\
  	  rm -f $(DESTDIR)$(inst_libdir)/$$file;		\
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-armhf/0026-ada-libgnarl-compatibility-for-musl.patch b/cross/gcc-armhf/0026-ada-libgnarl-compatibility-for-musl.patch
index 9247f5409..3e6e8b394 100644
--- a/cross/gcc-armhf/0026-ada-libgnarl-compatibility-for-musl.patch
+++ b/cross/gcc-armhf/0026-ada-libgnarl-compatibility-for-musl.patch
@@ -1,4 +1,4 @@
-From eeb35a7b61205438613b344ab393b23bd54b14b5 Mon Sep 17 00:00:00 2001
+From 0703d9ad84cd92f8a08787a85536a98b3830bba0 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
@@ -131,5 +131,5 @@ index 757a6cdfdad..82df94f6a00 100644
  
              pragma Assert (Result in 0 | ENOMEM);
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-armhf/0027-ada-musl-support-fixes.patch b/cross/gcc-armhf/0027-ada-musl-support-fixes.patch
index e53e88897..3a7075f96 100644
--- a/cross/gcc-armhf/0027-ada-musl-support-fixes.patch
+++ b/cross/gcc-armhf/0027-ada-musl-support-fixes.patch
@@ -1,4 +1,4 @@
-From 7448ade62ac32dfe9802eb1d7a7a93b2f3702797 Mon Sep 17 00:00:00 2001
+From 0b879c9a3ef83b3b08a0d72bfe89816d52489408 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 ec9db3a6a4c..6f92e50dd67 100644
    status = openpty (&master_fd, &slave_fd, NULL, NULL, NULL);
  #elif defined (USE_CLONE_DEVICE)
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-armhf/0030-gcc-go-Fix-ucontext_t-on-PPC64.patch b/cross/gcc-armhf/0028-gcc-go-Fix-ucontext_t-on-PPC64.patch
similarity index 93%
rename from cross/gcc-armhf/0030-gcc-go-Fix-ucontext_t-on-PPC64.patch
rename to cross/gcc-armhf/0028-gcc-go-Fix-ucontext_t-on-PPC64.patch
index f9aa671c4..e684c26e6 100644
--- a/cross/gcc-armhf/0030-gcc-go-Fix-ucontext_t-on-PPC64.patch
+++ b/cross/gcc-armhf/0028-gcc-go-Fix-ucontext_t-on-PPC64.patch
@@ -1,4 +1,4 @@
-From fe1480783664c5b3b9e073b2eb470b32438d392a Mon Sep 17 00:00:00 2001
+From abfd239e7f28b8076ae28e5dbb31fc7f39bfa5d7 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 d30d1603adc..57f6824eb9e 100644
  	ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.jmp_context.iar;
  #elif defined(__aarch64__) && defined(__linux__)
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-armhf/0028-gcc-go-Use-_off_t-type-instead-of-_loff_t.patch b/cross/gcc-armhf/0028-gcc-go-Use-_off_t-type-instead-of-_loff_t.patch
deleted file mode 100644
index 847f7f9a8..000000000
--- a/cross/gcc-armhf/0028-gcc-go-Use-_off_t-type-instead-of-_loff_t.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 703545905411e5b597e4f462da93fa82c964f4d1 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
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Taken from Adélie Linux.
----
- libgo/go/syscall/libcall_linux.go | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/libgo/go/syscall/libcall_linux.go b/libgo/go/syscall/libcall_linux.go
-index 96974bd3269..ead47c0c39e 100644
---- a/libgo/go/syscall/libcall_linux.go
-+++ b/libgo/go/syscall/libcall_linux.go
-@@ -209,19 +209,19 @@ func Gettid() (tid int) {
- //sys	Setxattr(path string, attr string, data []byte, flags int) (err error)
- //setxattr(path *byte, name *byte, value *byte, size Size_t, flags _C_int) _C_int
- 
--//sys	splice(rfd int, roff *_loff_t, wfd int, woff *_loff_t, len int, flags int) (n int64, err error)
--//splice(rfd _C_int, roff *_loff_t, wfd _C_int, woff *_loff_t, len Size_t, flags _C_uint) Ssize_t
-+//sys	splice(rfd int, roff *_off_t, wfd int, woff *_off_t, len int, flags int) (n int64, err error)
-+//splice(rfd _C_int, roff *_off_t, wfd _C_int, woff *_off_t, len Size_t, flags _C_uint) Ssize_t
- func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error) {
--	var lroff _loff_t
--	var plroff *_loff_t
-+	var lroff _off_t
-+	var plroff *_off_t
- 	if roff != nil {
--		lroff = _loff_t(*roff)
-+		lroff = _off_t(*roff)
- 		plroff = &lroff
- 	}
--	var lwoff _loff_t
--	var plwoff *_loff_t
-+	var lwoff _off_t
-+	var plwoff *_off_t
- 	if woff != nil {
--		lwoff = _loff_t(*woff)
-+		lwoff = _off_t(*woff)
- 		plwoff = &lwoff
- 	}
- 	n, err = splice(rfd, plroff, wfd, plwoff, len, flags)
--- 
-2.33.1
-
diff --git a/cross/gcc-armhf/0029-gcc-go-Don-t-include-sys-user.h.patch b/cross/gcc-armhf/0029-gcc-go-Don-t-include-sys-user.h.patch
deleted file mode 100644
index 696a50cf4..000000000
--- a/cross/gcc-armhf/0029-gcc-go-Don-t-include-sys-user.h.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 0cdfd9c48470d12a448e99f4fa7ce73f206bd42a 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
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Taken from Adélie Linux.
----
- libgo/sysinfo.c | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/libgo/sysinfo.c b/libgo/sysinfo.c
-index 8ce061e2f5f..4d5907a2da5 100644
---- a/libgo/sysinfo.c
-+++ b/libgo/sysinfo.c
-@@ -78,9 +78,6 @@
- #include <sys/times.h>
- #include <sys/wait.h>
- #include <sys/un.h>
--#if defined(HAVE_SYS_USER_H)
--#include <sys/user.h>
--#endif
- #if defined(HAVE_SYS_UTSNAME_H)
- #include <sys/utsname.h>
- #endif
--- 
-2.33.1
-
diff --git a/cross/gcc-armv7/0031-gcc-go-Fix-handling-of-signal-34-on-musl.patch b/cross/gcc-armhf/0029-gcc-go-Fix-handling-of-signal-34-on-musl.patch
similarity index 96%
rename from cross/gcc-armv7/0031-gcc-go-Fix-handling-of-signal-34-on-musl.patch
rename to cross/gcc-armhf/0029-gcc-go-Fix-handling-of-signal-34-on-musl.patch
index 9f420f531..30af57256 100644
--- a/cross/gcc-armv7/0031-gcc-go-Fix-handling-of-signal-34-on-musl.patch
+++ b/cross/gcc-armhf/0029-gcc-go-Fix-handling-of-signal-34-on-musl.patch
@@ -1,4 +1,4 @@
-From f1bd71f7dbac1570c8fd9990e0ff632e33972584 Mon Sep 17 00:00:00 2001
+From 098c0bca8bd1f47e94c8368406973019bbe9bf55 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.34.0
 
diff --git a/cross/gcc-armv7/0033-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch b/cross/gcc-armhf/0030-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch
similarity index 92%
rename from cross/gcc-armv7/0033-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch
rename to cross/gcc-armhf/0030-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch
index 2ff4bea09..60ce845eb 100644
--- a/cross/gcc-armv7/0033-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch
+++ b/cross/gcc-armhf/0030-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch
@@ -1,4 +1,4 @@
-From 6412458c90450577dbead578cb38da0a0cb64024 Mon Sep 17 00:00:00 2001
+From 7ba79053336c8666d3f137ef106696926d3f7b31 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Thu, 25 Nov 2021 01:47:03 +0000
 Subject: [PATCH] There are more than one st_{a,m,c}tim fields in struct stat
@@ -23,5 +23,5 @@ index 0c52ea5d71a..6fef104cc1c 100755
      st_times='-e s/st_atim/Atimespec/ -e s/st_mtim/Mtimespec/ -e s/st_ctim/Ctimespec/'
  fi
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-armv7/0034-gcc-go-signal-34-is-special-on-musl-libc.patch b/cross/gcc-armhf/0031-gcc-go-signal-34-is-special-on-musl-libc.patch
similarity index 92%
rename from cross/gcc-armv7/0034-gcc-go-signal-34-is-special-on-musl-libc.patch
rename to cross/gcc-armhf/0031-gcc-go-signal-34-is-special-on-musl-libc.patch
index 30d5b7b4a..4c7bad8e6 100644
--- a/cross/gcc-armv7/0034-gcc-go-signal-34-is-special-on-musl-libc.patch
+++ b/cross/gcc-armhf/0031-gcc-go-signal-34-is-special-on-musl-libc.patch
@@ -1,4 +1,4 @@
-From 0d93aefad5acf36c4f5ef60f95683f106c21f38b Mon Sep 17 00:00:00 2001
+From 18ba9309687431399aabe54c0b758f69b01253e0 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 2eece687e35..e86490ce203 100644
  		}
  		throw("sigaction read failure")
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-armhf/0032-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch b/cross/gcc-armhf/0032-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
deleted file mode 100644
index 44b95aaa3..000000000
--- a/cross/gcc-armhf/0032-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From c4fd6db3bd96974a726c41e08e42c242d442f689 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
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Taken from Adélie Linux.
----
- libgo/go/runtime/mem_gccgo.go | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libgo/go/runtime/mem_gccgo.go b/libgo/go/runtime/mem_gccgo.go
-index fa3389d857e..57bed97c710 100644
---- a/libgo/go/runtime/mem_gccgo.go
-+++ b/libgo/go/runtime/mem_gccgo.go
-@@ -15,7 +15,7 @@ import (
- //go:linkname sysFree
- 
- //extern mmap
--func sysMmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off uintptr) unsafe.Pointer
-+func sysMmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off int64) unsafe.Pointer
- 
- //extern munmap
- func munmap(addr unsafe.Pointer, length uintptr) int32
-@@ -37,7 +37,7 @@ func init() {
- 	}
- }
- 
--func mmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off uintptr) (unsafe.Pointer, int) {
-+func mmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off int64) (unsafe.Pointer, int) {
- 	p := sysMmap(addr, n, prot, flags, fd, off)
- 	if uintptr(p) == _MAP_FAILED {
- 		return nil, errno()
--- 
-2.33.1
-
diff --git a/cross/gcc-armhf/0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch b/cross/gcc-armhf/0032-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
similarity index 91%
rename from cross/gcc-armhf/0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
rename to cross/gcc-armhf/0032-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
index 075c749d8..5be5b32e6 100644
--- a/cross/gcc-armhf/0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
+++ b/cross/gcc-armhf/0032-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
@@ -1,4 +1,4 @@
-From b15fa407296fc03ad7549852a13aff790406f61d Mon Sep 17 00:00:00 2001
+From 1be822dcf1f9ffdba5c6508cef0374585e48cb18 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
@@ -23,5 +23,5 @@ index 38bf7a6b255..e50403b5a75 100644
  
  static inline void
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-armhf/0037-gcc-go-link-to-libucontext.patch b/cross/gcc-armhf/0033-gcc-go-link-to-libucontext.patch
similarity index 90%
rename from cross/gcc-armhf/0037-gcc-go-link-to-libucontext.patch
rename to cross/gcc-armhf/0033-gcc-go-link-to-libucontext.patch
index 3363bf249..283d562d9 100644
--- a/cross/gcc-armhf/0037-gcc-go-link-to-libucontext.patch
+++ b/cross/gcc-armhf/0033-gcc-go-link-to-libucontext.patch
@@ -1,4 +1,4 @@
-From 566b272d5d7017e8ba72b5c52d06d7c5ed3165e8 Mon Sep 17 00:00:00 2001
+From 2fa393cd8ae6b25539cc7bd9998c603a3b33bc6e 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 426949aa91c..f97db1ef569 100644
  	  --srcdir=$${topdir}/$$module_srcdir \
  	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-armhf/0038-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch b/cross/gcc-armhf/0034-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
similarity index 92%
rename from cross/gcc-armhf/0038-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
rename to cross/gcc-armhf/0034-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
index 1f5141587..bd5876103 100644
--- a/cross/gcc-armhf/0038-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
+++ b/cross/gcc-armhf/0034-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
@@ -1,4 +1,4 @@
-From 846b94beac2d176f6b22bbe73657657e31cc142c Mon Sep 17 00:00:00 2001
+From e94c28d8ee1876ddc9ae02a7a0cb1578e529260b 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 57f6824eb9e..fd03db420d4 100644
  		mcontext_t *m = &((ucontext_t*)(context))->uc_mcontext;
  		int i;
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-armv7/0039-Use-generic-errstr.go-implementation-on-musl.patch b/cross/gcc-armhf/0035-Use-generic-errstr.go-implementation-on-musl.patch
similarity index 95%
rename from cross/gcc-armv7/0039-Use-generic-errstr.go-implementation-on-musl.patch
rename to cross/gcc-armhf/0035-Use-generic-errstr.go-implementation-on-musl.patch
index 592ea8255..e6bcfa9a0 100644
--- a/cross/gcc-armv7/0039-Use-generic-errstr.go-implementation-on-musl.patch
+++ b/cross/gcc-armhf/0035-Use-generic-errstr.go-implementation-on-musl.patch
@@ -1,4 +1,4 @@
-From 45a69ebecc825636a069a34e9ee7f99075c383ec Mon Sep 17 00:00:00 2001
+From 23f7ad8b28284017c4f63e944bcb0321eb205e8a 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
@@ -44,5 +44,5 @@ index 5b19e6f202d..8dc60172186 100644
  package syscall
  
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-armhf/0035-gcc-go-Prefer-_off_t-over-_off64_t.patch b/cross/gcc-armhf/0035-gcc-go-Prefer-_off_t-over-_off64_t.patch
deleted file mode 100644
index 53e5e476a..000000000
--- a/cross/gcc-armhf/0035-gcc-go-Prefer-_off_t-over-_off64_t.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From da6a868da00dd1a302c91181e6af2daf57aeb609 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
-
-musl does not seem to have _off64_t.
----
- libgo/mksysinfo.sh | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
-
-diff --git a/libgo/mksysinfo.sh b/libgo/mksysinfo.sh
-index 6fef104cc1c..5b8cb86eb9c 100755
---- a/libgo/mksysinfo.sh
-+++ b/libgo/mksysinfo.sh
-@@ -403,11 +403,7 @@ fi
- # Some basic types.
- echo 'type Size_t _size_t' >> ${OUT}
- echo "type Ssize_t _ssize_t" >> ${OUT}
--if grep '^const _HAVE_OFF64_T = ' gen-sysinfo.go > /dev/null 2>&1; then
--  echo "type Offset_t _off64_t" >> ${OUT}
--else
--  echo "type Offset_t _off_t" >> ${OUT}
--fi
-+echo "type Offset_t _off_t" >> ${OUT}
- echo "type Mode_t _mode_t" >> ${OUT}
- echo "type Pid_t _pid_t" >> ${OUT}
- echo "type Uid_t _uid_t" >> ${OUT}
--- 
-2.33.1
-
diff --git a/cross/gcc-armhf/0040-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch b/cross/gcc-armhf/0036-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
similarity index 99%
rename from cross/gcc-armhf/0040-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
rename to cross/gcc-armhf/0036-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
index 0ef50e10f..1895dd258 100644
--- a/cross/gcc-armhf/0040-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
+++ b/cross/gcc-armhf/0036-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
@@ -1,4 +1,4 @@
-From 8703cb765874411a83d568fde5c3b195c89c3de9 Mon Sep 17 00:00:00 2001
+From 7e123432a35fcaa25de85b4940daabcd70c1a6bd 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
@@ -271,5 +271,5 @@ index 5093e8bbfd2..1871b5ab6eb 100644
  
  #ifdef ENABLE_DEFAULT_SSP
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-armhf/0041-configure-fix-detection-of-atomic-builtins-in-libato.patch b/cross/gcc-armhf/0037-configure-fix-detection-of-atomic-builtins-in-libato.patch
similarity index 96%
rename from cross/gcc-armhf/0041-configure-fix-detection-of-atomic-builtins-in-libato.patch
rename to cross/gcc-armhf/0037-configure-fix-detection-of-atomic-builtins-in-libato.patch
index 804e63543..163b3ca3c 100644
--- a/cross/gcc-armhf/0041-configure-fix-detection-of-atomic-builtins-in-libato.patch
+++ b/cross/gcc-armhf/0037-configure-fix-detection-of-atomic-builtins-in-libato.patch
@@ -1,4 +1,4 @@
-From abe5e7af0cb74a10adad65122f8a0c75c3f15615 Mon Sep 17 00:00:00 2001
+From cb2472c05592e4a1b5f826d761d0ef221c0c9664 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
@@ -53,5 +53,5 @@ index 670b0d72cfe..38c2cd9345f 100644
    alpha*)
  	# fenv.c needs this option to generate inexact exceptions.
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-armhf/0038-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch b/cross/gcc-armhf/0038-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch
new file mode 100644
index 000000000..8f5df6b69
--- /dev/null
+++ b/cross/gcc-armhf/0038-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch
@@ -0,0 +1,84 @@
+From 45b24f2bf7fa1b2b9d597bd065b6522f8d87cd3e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
+Date: Sun, 28 Nov 2021 00:54:37 +0100
+Subject: [PATCH] libgo: Recognize off64_t and loff_t definitions of musl libc
+
+Without this patch, both off64_t and loff_t are not recognized by
+-fdump-go-spec which causes a variety Go-related compilation errors on
+musl libc since the gcc-go frontend expects both off64_t and loff_t to
+be present.
+
+Also make sure that autoconf recognizes support for loff_t on musl, by
+compiling the relevant feature test code with -D_GNU_SOURCE and making
+it include fcntl.h which defines loff_t on musl.
+---
+ libgo/configure    |  4 +++-
+ libgo/configure.ac |  4 +++-
+ libgo/sysinfo.c    | 21 +++++++++++++++++++++
+ 3 files changed, 27 insertions(+), 2 deletions(-)
+
+diff --git a/libgo/configure b/libgo/configure
+index 70f64c974fd..69d15839e8c 100755
+--- a/libgo/configure
++++ b/libgo/configure
+@@ -15546,7 +15546,9 @@ _ACEOF
+ 
+ fi
+ 
+-ac_fn_c_check_type "$LINENO" "loff_t" "ac_cv_type_loff_t" "$ac_includes_default"
++CFLAGS_hold=$CFLAGS
++CFLAGS="$CFLAGS -D_GNU_SOURCE"
++ac_fn_c_check_type "$LINENO" "loff_t" "ac_cv_type_loff_t" "#include <fcntl.h>"
+ if test "x$ac_cv_type_loff_t" = xyes; then :
+ 
+ cat >>confdefs.h <<_ACEOF
+diff --git a/libgo/configure.ac b/libgo/configure.ac
+index ebab9d9de3e..a3d9d309aba 100644
+--- a/libgo/configure.ac
++++ b/libgo/configure.ac
+@@ -602,7 +602,9 @@ AC_STRUCT_DIRENT_D_TYPE
+ 
+ AC_CHECK_FUNCS(accept4 dup3 epoll_create1 faccessat fallocate fchmodat fchownat futimesat getxattr inotify_add_watch inotify_init inotify_init1 inotify_rm_watch listxattr mkdirat mknodat open64 openat pipe2 removexattr renameat setxattr sync_file_range splice syscall tee unlinkat unshare utimensat)
+ AC_TYPE_OFF_T
+-AC_CHECK_TYPES([loff_t])
++CFLAGS_hold=$CFLAGS
++CFLAGS="$CFLAGS -D_GNU_SOURCE" # musl does not define loff_t without this
++AC_CHECK_TYPES([loff_t], [], [], [[#include <fcntl.h>]])
+ 
+ LIBS_hold="$LIBS"
+ LIBS="$LIBS -lm"
+diff --git a/libgo/sysinfo.c b/libgo/sysinfo.c
+index 8ce061e2f5f..b85add15a7b 100644
+--- a/libgo/sysinfo.c
++++ b/libgo/sysinfo.c
+@@ -343,6 +343,27 @@ enum {
+ #endif
+ };
+ 
++// musl libc has both off64_t and loff_t. However, both of these types
++// are defined as CPP macros, not as C typedefs. Unfortunately, the GCC
++// -fdump-go-spec option, which is responsible for generating type
++// definitions for Go based on this file, only recognizes types defined
++// through typedefs.
++//
++// For this reason, we check here if either off64_t or loff_t are
++// defined as CPP macros and if so, we redefine them using a C typedef.
++#if defined(HAVE_OFF64_T) && defined(off64_t)
++typedef off64_t __musl_off64_t;
++#undef off64_t
++typedef __musl_off64_t off64_t;
++#endif
++
++// See comment regarding musl libc above.
++#if defined(HAVE_LOFF_T) && defined(loff_t)
++typedef loff_t __musl_loff_t;
++#undef loff_t
++typedef __musl_loff_t loff_t;
++#endif
++
+ // SIOCGIFMTU can't be added in the above enum as it might
+ // be signed in some OSes.
+ #ifdef SIOCGIFMTU
+-- 
+2.34.0
+
diff --git a/cross/gcc-armhf/0039-Fix-attempt-to-use-poisoned-calloc-error-in-libgccji.patch b/cross/gcc-armhf/0039-Fix-attempt-to-use-poisoned-calloc-error-in-libgccji.patch
new file mode 100644
index 000000000..f43cfb4ac
--- /dev/null
+++ b/cross/gcc-armhf/0039-Fix-attempt-to-use-poisoned-calloc-error-in-libgccji.patch
@@ -0,0 +1,80 @@
+From 0b7a57f08abff72f8dd1f67de995c502e798513c Mon Sep 17 00:00:00 2001
+From: Alex McGrath <amk@amk.ie>
+Date: Wed, 13 Oct 2021 23:24:27 +0100
+Subject: [PATCH] Fix attempt to use poisoned calloc error in libgccjit
+
+This moves usages of pthread.h to above any usage of system.h as it
+included #pragma GCC poison calloc
+---
+ gcc/jit/jit-playback.c  | 4 ++--
+ gcc/jit/jit-recording.c | 4 ++--
+ gcc/jit/libgccjit.c     | 3 ++-
+ 3 files changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/gcc/jit/jit-playback.c b/gcc/jit/jit-playback.c
+index 50db23df159..1d42f057a84 100644
+--- a/gcc/jit/jit-playback.c
++++ b/gcc/jit/jit-playback.c
+@@ -18,6 +18,8 @@ You should have received a copy of the GNU General Public License
+ along with GCC; see the file COPYING3.  If not see
+ <http://www.gnu.org/licenses/>.  */
+ 
++#include <pthread.h>
++
+ #include "config.h"
+ #include "system.h"
+ #include "coretypes.h"
+@@ -41,8 +43,6 @@ along with GCC; see the file COPYING3.  If not see
+ #include "diagnostic.h"
+ #include "stmt.h"
+ 
+-#include <pthread.h>
+-
+ #include "jit-playback.h"
+ #include "jit-result.h"
+ #include "jit-builtins.h"
+diff --git a/gcc/jit/jit-recording.c b/gcc/jit/jit-recording.c
+index 117ff70114c..d2634a546b1 100644
+--- a/gcc/jit/jit-recording.c
++++ b/gcc/jit/jit-recording.c
+@@ -18,6 +18,8 @@ You should have received a copy of the GNU General Public License
+ along with GCC; see the file COPYING3.  If not see
+ <http://www.gnu.org/licenses/>.  */
+ 
++#include <pthread.h>
++
+ #include "config.h"
+ #include "system.h"
+ #include "coretypes.h"
+@@ -25,8 +27,6 @@ along with GCC; see the file COPYING3.  If not see
+ #include "pretty-print.h"
+ #include "toplev.h"
+ 
+-#include <pthread.h>
+-
+ #include "jit-builtins.h"
+ #include "jit-recording.h"
+ #include "jit-playback.h"
+diff --git a/gcc/jit/libgccjit.c b/gcc/jit/libgccjit.c
+index 0cc650f9810..2f44481eeb0 100644
+--- a/gcc/jit/libgccjit.c
++++ b/gcc/jit/libgccjit.c
+@@ -18,13 +18,14 @@ You should have received a copy of the GNU General Public License
+ along with GCC; see the file COPYING3.  If not see
+ <http://www.gnu.org/licenses/>.  */
+ 
++#include <pthread.h>
++
+ #include "config.h"
+ #include "system.h"
+ #include "coretypes.h"
+ #include "timevar.h"
+ #include "typed-splay-tree.h"
+ #include "cppbuiltin.h"
+-#include <pthread.h>
+ 
+ #include "libgccjit.h"
+ #include "jit-recording.h"
+-- 
+2.34.0
+
diff --git a/cross/gcc-aarch64/0042-stddef.h-add-support-for-musl-typedef-macro-guards.patch b/cross/gcc-armhf/0040-stddef.h-add-support-for-musl-typedef-macro-guards.patch
similarity index 97%
rename from cross/gcc-aarch64/0042-stddef.h-add-support-for-musl-typedef-macro-guards.patch
rename to cross/gcc-armhf/0040-stddef.h-add-support-for-musl-typedef-macro-guards.patch
index 8b714b4ba..c22f7f43f 100644
--- a/cross/gcc-aarch64/0042-stddef.h-add-support-for-musl-typedef-macro-guards.patch
+++ b/cross/gcc-armhf/0040-stddef.h-add-support-for-musl-typedef-macro-guards.patch
@@ -1,4 +1,4 @@
-From b9e9895826774d17d4bb81b165753816db562590 Mon Sep 17 00:00:00 2001
+From 5a76cf60df5c9ba274f1d0dcd79fc0cbad9d0fe0 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
 Date: Thu, 25 Nov 2021 17:44:04 +0100
 Subject: [PATCH] stddef.h: add support for musl typedef macro guards
@@ -101,3 +101,6 @@ index 66619fe43b1..50d710a5ab9 100644
  #endif /* _WCHAR_T_DECLARED */
  #endif /* _BSD_RUNE_T_DEFINED_ */
  #endif
+-- 
+2.34.0
+
diff --git a/cross/gcc-armhf/APKBUILD b/cross/gcc-armhf/APKBUILD
index ef630ab8b..23623b240 100644
--- a/cross/gcc-armhf/APKBUILD
+++ b/cross/gcc-armhf/APKBUILD
@@ -25,13 +25,13 @@ _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"
 
 pkgname=gcc-armhf
 _pkgbase=11.2.1
-pkgver=11.2.1_git20211125
+pkgver=11.2.1_git20211128
 [ "$BOOTSTRAP" = "nolibc" ] && pkgname="gcc-pass2"
 [ "$CBUILD" != "$CHOST" ] && _cross="-$CARCH" || _cross=""
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname=gcc-armhf
-pkgrel=1
+pkgrel=0
 pkgdesc="Stage2 cross-compiler for armhf"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -221,21 +221,19 @@ source="https://dev.alpinelinux.org/~nenolod/gcc-${pkgver}.tar.xz
 	0025-always-build-libgcc_eh.a.patch
 	0026-ada-libgnarl-compatibility-for-musl.patch
 	0027-ada-musl-support-fixes.patch
-	0028-gcc-go-Use-_off_t-type-instead-of-_loff_t.patch
-	0029-gcc-go-Don-t-include-sys-user.h.patch
-	0030-gcc-go-Fix-ucontext_t-on-PPC64.patch
-	0031-gcc-go-Fix-handling-of-signal-34-on-musl.patch
-	0032-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
-	0033-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch
-	0034-gcc-go-signal-34-is-special-on-musl-libc.patch
-	0035-gcc-go-Prefer-_off_t-over-_off64_t.patch
-	0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
-	0037-gcc-go-link-to-libucontext.patch
-	0038-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
-	0039-Use-generic-errstr.go-implementation-on-musl.patch
-	0040-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
-	0041-configure-fix-detection-of-atomic-builtins-in-libato.patch
-	0042-stddef.h-add-support-for-musl-typedef-macro-guards.patch
+	0028-gcc-go-Fix-ucontext_t-on-PPC64.patch
+	0029-gcc-go-Fix-handling-of-signal-34-on-musl.patch
+	0030-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch
+	0031-gcc-go-signal-34-is-special-on-musl-libc.patch
+	0032-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
+	0033-gcc-go-link-to-libucontext.patch
+	0034-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
+	0035-Use-generic-errstr.go-implementation-on-musl.patch
+	0036-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
+	0037-configure-fix-detection-of-atomic-builtins-in-libato.patch
+	0038-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch
+	0039-Fix-attempt-to-use-poisoned-calloc-error-in-libgccji.patch
+	0040-stddef.h-add-support-for-musl-typedef-macro-guards.patch
 	"
 
 # we build out-of-tree
@@ -681,47 +679,45 @@ gnat() {
 }
 
 sha512sums="
-2a682823f9b114c4288a3428dc658ce21679f48a5b901d4792fc4ea09f75e9c9516f8cdc7c70697e1be335d925f99eac01eaf20c117cd5ee685181d37fcc7290  gcc-11.2.1_git20211125.tar.xz
-14ef1a0b284c85859f4db03cb0750c4dcadb8821dd0ec1b04e6872ffd2fa55ae125a99fee986a160bce9448226d08daf05e1a7feda5220e746aaa5f338d78d69  0001-posix_memalign.patch
-950b04c8bf96810dfe4bd4c2ea5218dfacfae0f0b1be9e64cbb1f09bbf67d29565b59094aa4d5cca095355db8cce99c80c99f0463ef296a96faf6b13e38230e0  0002-gcc-poison-system-directories.patch
-1d9c1b028b07644da9182288a26762f294d1ef25804c0227bfd3419a2a8ba579bec7590aaac9a241242bb14e3e371eff81ad26a07d0183be821af59bd6abe4d4  0003-Turn-on-Wl-z-relro-z-now-by-default.patch
-5a705aa5ffdc5ab3fb417ddb494486156db4af3b7f9a1d29e1b3ac2e7095f924b2a3f73a73b4d7d20f6ba3c77b062f1b47e7b46c0a8e1992f349abe3cf7f6542  0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
-87573db27fd83fe9d7c40cefb5bd264e36500280ab2dd39c1763f87f4cfaef3e0d3115f4aadd3b3d65c93a13db17df469e038931335685dfad4adf6b48e96c66  0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
-4055d8b934c8a017bbba74b224c8da105668ea16fc9f244b0dacc9511a89088701b491daec09d95041f640b7f0e994feb17a0803d389818f104578bfaf433623  0006-Enable-Wformat-and-Wformat-security-by-default.patch
-0ffb348414468ea166d5875e0f20f77a813473a6823e26189b010eebb835c91e14b04f360b139fffbc50b30622476a625a5f567d26b6c18ddcbfc88e6d28e54f  0007-Enable-Wtrampolines-by-default.patch
-799117fc233f3172457024a71d4d964c6a367b7ae7246e208ba16192a533bdf484dc72b79eb7ee3629c0eb7fe202d32658a64219c03c9098120c899d9f832309  0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
-eb47d678ff9a14ad54833b1fdc2d04976e31db741cdf9ac6b213d56df3df3ea61514bdfa5bbe2577b82135517e184de53028663b7aad565613e90c0bafd6513f  0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
-e3d2241e3bb8e67bece8a322cdc707542586f7a1b5da9412eb38dbfa40508e618b8827e3574b21c86b9d263e8ed31941d8885618707c1947d07f86d18d34a9a8  0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
-e8976a1f1618e94d519852dee346bb787589637905451a6f02b4f8a1ffc5a6fa797a697b8c0964a72830aad32ba412986d45e9f88ae86e3d7c8007d3b1400692  0011-libiberty-copy-PIC-objects-during-build-process.patch
-2cc03796789b6680f43533d41a1966283b6e913b19080a00c4ec6653614f1af66754db7ffca05103bb398e389316c9fca525d2fe00965e1105b210d1d940d507  0012-libitm-disable-FORTIFY.patch
-8fe44a88f66f1d282c5c6db80642ac8ef52f89ccc8287f73eecd1c8d78ee3e5ac890065d173fc3ff00172b8b3984ca484debbf84b9ba649dc5939afdfc4a220a  0013-libgcc_s.patch
-1323a512d063f9a0679c68c9856ede8a6d48ae0c9c52ef14e63d34e6a2b6486fa02301d75554b2d623a369967c71ca35e7c93530c093f334f0cf666c7d1b4911  0014-nopie.patch
-1fb9fb420335d5e87245eb781960bc876a1d60bc69af2a8febad8ddd23cc064e28227a7b9f8389b4f2bb0211259102feaa6e2a7f64457fac06d60a59fdc1c2bb  0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch
-226e68c4561524ece4340107736f5f7f5a31fb725373a5ad472147f443a5fc037d0e0d93562c3e6d333ed43ceef7a2c6a2adad1ad10a464235d168a2dd4ed65e  0016-dlang-update-zlib-binding.patch
-9615d8844f4ffaab6dc61ad452ec9502acfe41029f2225b4b9fa10b034659447fb92b037918d52c615cae30acbb778b8a3d2197c705c90698221ae9e7bb30a32  0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch
-3008df8b4e4f582ced4976e640cb3329904bdefe9d454b13c8e61f3393fee21ec4e49cefc90e6049f85bacced500886681520b46b5063c948b7f5506c050b8cc  0018-ada-fix-shared-linking.patch
-3df7c1285a370e9741f649b26e31074177826b11da5172e5571c982ff1127ba83c6baf6b0666433ab7cd937217550ed2f083460d8ef8ed62531a98e63cbcc4c9  0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
-5235fbd6bb39c98f9ef702112d5bda05dcba03e897106ef864be606568e0c51e2fb5cadc5df93d162ceb8bf38a544adf9487ddd995ed0b936e86e3fbbc10512e  0020-add-fortify-headers-paths.patch
-9405ea49a6832ae7e2c81c00a9c0c7eeb03b2b4cb887ff2f6352b0f0a5de2c002208a12a6a61ec0e287b114c30090197e867be1a5ed8f462e6f74a63b87fd6f5  0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
-aa46e49551ff84654166927f62fc81a118dcec1934cf0a95bdbcfe0ed08fac21d6c4b123965d9e718936411e2935c6cd6b60dbba2853c01169fea8d0fa401464  0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
-62a743dea9f0b644876138f5d336726a32ad62ad1b49c308daf3a11c7122cef292e93fe580fc71aa1ec9c73bb234e485a3d447135f2d169b98af1900d304368e  0023-Pure-64-bit-MIPS.patch
-6959cf80dcceeee5d89eff1337bdf35d7a1d42fe3861a56bebd10ccfba1e5046837b63923a2f1b23109c8494d39a18a400f08342686271d539964ad85c83d2f1  0024-use-pure-64-bit-configuration-where-appropriate.patch
-1f160b42a88f1d6cdf2cf140323d5fb96233f82b5fbeb8efdb861820b25c1b0354e55202655bfb5f571e21fdb18e66a532b7278a014aab828e03b04e9345fe19  0025-always-build-libgcc_eh.a.patch
-fec758a6cbee1d468b966b90e35fe83742b2ebb2cc873634115ab4db599bd84a8c00f687ff18a2f37360126a75f4b8d85d9de3127d44b9076d931479cdd65ab1  0026-ada-libgnarl-compatibility-for-musl.patch
-e49720b5d78fca91bdc0dbc431b70e9e75bbd6a95ba2e856dce6764dd9759fc830bb445ce8aa8fc9aa6ace80c474e9c2a947c6b23a1178b2cb6bd8780447350a  0027-ada-musl-support-fixes.patch
-199b87e0844c361fc176755cd5846ea48f4a18382609633d0f4d1fb3e11a41ad93168f9b4f44ed993dca977354c0072637779658941cebe6adebfea28b28531c  0028-gcc-go-Use-_off_t-type-instead-of-_loff_t.patch
-17642cb9f179007b898f62cb4d6c9b436876cf667606c8003e02a782f09d29e17a301225efb94102094cc7f2b3efb413dd5ea2581e7e421e2b814f29f1b7e776  0029-gcc-go-Don-t-include-sys-user.h.patch
-08268c1ec6b6f0097ea15230f45f2a7231b8c5f9e6f90fcb102f86fe8e83c81a1755482a88415ab11a3de62e82769e4f0e3e029b812e477fcb6ddccb5f086734  0030-gcc-go-Fix-ucontext_t-on-PPC64.patch
-1345b99c20a9f7335c8af5e619c769f0555e46c18ba0f084d2655bce1581d11353f278dd9c94874edaceed1bf9d11a4a720b5263197c0cc9ce288f664e26eb01  0031-gcc-go-Fix-handling-of-signal-34-on-musl.patch
-ff8fb2cd67dd4723b271c2d1b6bca80e062d2fe31fe9f71aa1b83bab1c131decff4b4ddf8da9ce188cd28eee0fa1cf04d8ffc863033c5ce0096a6dd7b748e3b5  0032-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
-ce677dad505e56c67c79f7836888b6c28feaa4172d41c8c7573b931e6baff56ca0e5b9e6902b576d784735c5d278bc8a23e08a83597e3f41d11be9e14cf1dc59  0033-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch
-19743886041ed1fc8e3afebc48b5c196c032f4bd8d20a8deb99ba83ec7ffb3a5e18f1686a705a0578ce120f702493e444c599c9228f2b466abbcb8820f313d7a  0034-gcc-go-signal-34-is-special-on-musl-libc.patch
-150dba551824d99a3b58ea531c939237ce3aa642d04e5a2f774fe96bb27f1aa498d2b95d74369dd893da6142f9a8e5fe8966c72f38e21fc14ff614f90e7374ce  0035-gcc-go-Prefer-_off_t-over-_off64_t.patch
-2e09c90e5b9ba295949d5a9986ca4e13774981fb918d35098ab560139d34703b15924767bb54ffadf38b061b2b395c50f53c367c96959e5e9d1e7c65224171f4  0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
-01b3010bdfcec65d68f851ed425fa22c744e6744aaf4b0fe7699c7a678e970e11bc7b907188fbacababacadf520b515883944480e91262259e0a03a0966d7540  0037-gcc-go-link-to-libucontext.patch
-f7eefa7ae1f31fc7bc1721578d4c1642f2ef5feda37dec03264dde53717474437722ee646ab9a837d888eedbee4ea3c407f20cc4c7cb36d34a81e56b3ea02c79  0038-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
-83deca7a68c6e1ce934f79b5d1e1a4b8b8a25c7bc24c3ef934307c232e168d9b17048a00a040fe81ac0cf6d4a23beefb292369c35d9896dab440dda228c90b0a  0039-Use-generic-errstr.go-implementation-on-musl.patch
-4074c62c2ee0ed555f01bf0cc69e32ef275bc3ac74de1d428ba1a2ac59fae973fe6f9aab8b3796df4bda7ab7cf220e5e1cbfdf103f41e4cbea175067a947d08f  0040-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
-1fe1b1e9ec288f65cd0d80a74b0a060b29c40e501f666b01e2825b61949be4568aeaf7cf473142889a7fd5e011b096837a651582d64fce67500fcb2ba39e16ce  0041-configure-fix-detection-of-atomic-builtins-in-libato.patch
-0a66c5a567e15dafac0bcad5c9dd5e98c44c74cbe539340ad28cbf6d26b994bab46b355f3a3a57b830f802145cfd826ad8d87359ebc5d6a20ef41e968904c7dc  0042-stddef.h-add-support-for-musl-typedef-macro-guards.patch
+99c25b0cf5ae57806e3ecc76977c4b177e60660a289117506061243d3b492c76392cc47ba1165a04b1d46b932c1492db045edb29eab5460774be90243e984f22  gcc-11.2.1_git20211128.tar.xz
+a1b8ae8ba40ed0e384484590ca7c9328f922f6237c883d7a78ad16a5110f522280c577ede7ee65163ca8b9e2cb02d5eefa343d8a60a8d6a64d2fc3496b01b80a  0001-posix_memalign.patch
+79ad02ec110f485bc19364459f94d16556b4e178a029a538b9a448ce356950fcad99674d711edb012d8a28b4e39a865370dec1a12c86d6fd91160acf80135ee3  0002-gcc-poison-system-directories.patch
+fd8819d4b7ef3f3d32bd09f049098f04f7503556b65f1f85c91cd7f724770b3b8f16af580774e518310be83462070551cdc8ef78963e73760849de26d8a107f7  0003-Turn-on-Wl-z-relro-z-now-by-default.patch
+eeca973fb0f6a82203358cb8ce15cac256315e0e22ad00b579b73a3bb093da306f62d59f86f7f3d3c0194370dff6ee4b0a01026153a29933437b3c3ed758c34e  0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
+faa5bd16cb5d4c898dd1c7f9b88a12e1549d2f643c13cfe0413fdf8dccf9ce48489415de4f3786df86d9ca305fbeba650b4f9f2440f9800297bcd9fa5624f714  0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
+371ebf3a572fb1dce7756bde18dd116e3cff9c110c80e05e46d6d01a3b7545f28ec6e65a062226bfa1b4b3da8ab436835d03f5a14b33ada1a250c726ce8c45e4  0006-Enable-Wformat-and-Wformat-security-by-default.patch
+ed48ccf5733d0f988cc1838c3f5f8466e21b92390af8679e79447699fd8fae51cd2091233d15f77b44412f09f1b8266d68d1da669c6f9b409f4808fbb1e9a2ed  0007-Enable-Wtrampolines-by-default.patch
+9481738fb87f7c453569ba88aa7629d773d5d88185e67a412e3b06422868da0719b3d98f11f29f21a7e9948a6d598c34a7e9806bb60428734a3de724984f9de0  0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
+47650d47faa0d896179b11513171b10547b6a374a574cfdf923816c46adf643dda61abac56bd3ce971acccd9b2843b28b8fac8cc46e92e9f325a275113413771  0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
+4470ecbcfb1dbdcf5157d94178229b7e4f24c997a92f48b688f0850454bdf19ea1525d1ebbc541d5da203408e2d5d577ca9a769db8501ead4e4888fde21fb2ef  0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
+c324b0cfc83f90f65ffe2b09ced8248d907f8d3c7120491f1311601d76f1729e8728177b0b57db691c7b917265bf1e0c33f08a3f1360fc26f75aec057262e0d2  0011-libiberty-copy-PIC-objects-during-build-process.patch
+3a7ccaa7ef78a55b3d327c4c2e3474bc904192cc8d9f62ab4658ed75887301f5069af823aa9d01560a5047fe95c89ee0c1f98745722441d27ba544870af56c7c  0012-libitm-disable-FORTIFY.patch
+68442827a2335c40e9ea1979b64e026634497f076c21a8a9f11bf09f612ec72625c72e16ff6d50da659d0d5c49a7df266be4e99b2af3712fe84238b926ad14b2  0013-libgcc_s.patch
+b34a972b39f4b55d11ed2bfaa17181a353e721424f31c35892a0a7d16a680d017856d4679b1bcd6ebdee304d3e15aae5f545a59c5a5abf0e48d094e8fef52ae0  0014-nopie.patch
+03574bbbb8cc76ab3303862e68d19898b6b1971cbea0d8e3f8d0bef47c33376bc8d37d0a3aee9783e6f04ca3857fa6cfc054b24fafe5eed51a75215e61dde9ea  0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch
+5233ae40bf0e42f8c9cd379f776c6a5af11bf986c0e09b3032e02e5c4f257d12d8f2c27739775b48bd07fcf6c4062086465864b1ca11983126752fd46b85c658  0016-dlang-update-zlib-binding.patch
+627a24e669e408165c4b63c9a4e0a980373a4b801286f7b6e6a3a4c335e0c9160d164d23701c90170217ad333d0403b1aef7738ac90c4ed9f832d27c0eb4cd38  0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch
+482a8556fa7bf2ca14782ccce01465211ad476b83c3087668298d6078b32e1eae2138c0ea236c4b191f57171bc6ce64d51cac2dfea4f33d69283f12ecec9e9c6  0018-ada-fix-shared-linking.patch
+8fe388c533b687542aacda86c1ca04290a53123050e2700867895005aa34ec0b23f2c394c5710b1b87e85442fb976c47a95d10360984da13a82a3ff5307996d5  0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
+563d17f07468d412b46b012cff37d1c4acdee2bd1046b7ac817c1b35034c167e252a6067dd34b418770d3b0c170f8ae14a4ee9b2ab0df1b8b7d2581afec83731  0020-add-fortify-headers-paths.patch
+49ba07e45442651cd9610ca339035deb19d73744850149722c6da9a0e1b5081ab27e8e88f45e836de2a432770dcd7fd2073bc5379679921175a68627e9a0941f  0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
+a6d88c765aded0dcd0ecc0bf68a9ad3e4d0bb8f2fe1f7b1245db068d5cee154aec8c3bed47390d60b10809c224fbbafb5f36225a46fc6c8f143bd8317fa2d062  0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
+40fb955eaa10d2536acf99a716aed68cb587e94bdde8260581b2ba7026a9698058495f0b040a3909096b4102565b1c704c70e3b870e239366450df10d73a201c  0023-Pure-64-bit-MIPS.patch
+5ff7f3836a4ae7729bbe8fffe97956eeebb6cd40657214423e79a9ec42e85654491cb73fdb263ff70d4e37e14f42370f2a90ba2c97411c5ec4b2d967c6d70a85  0024-use-pure-64-bit-configuration-where-appropriate.patch
+e45369759649d0680b7c39512e20a5424706d2e7711d14076d893850105daba8b9bb5094db962813859d225e70e018a5667155d92827a918674961015f13eb95  0025-always-build-libgcc_eh.a.patch
+a16387cda58085fce4413db099e18c089d3e2f6603ba4d3add07fd4d31f3d254c91611ad4b8ee36135a364f12e0897bfd6d5998b95c0f431ca8b79d142f26958  0026-ada-libgnarl-compatibility-for-musl.patch
+3467decc5a090d82497a6b029ec6e34aac3876fadd23db2a3af385017e5cd992f82cf11b928e6b461248b60990fa50a469017a4646954f63974572c3a6fcaaec  0027-ada-musl-support-fixes.patch
+9960b164c608c47f35de2bf624cfe8782984e8d3ed23a72a456284e3082620f95501299b3e9e26b0f8c0d0796c68c353584bb5c48e85b101010abe29a46ccf5d  0028-gcc-go-Fix-ucontext_t-on-PPC64.patch
+c89f234df9a37cfe0c0d9ca891febe57b3ae0eb01416edaeb5d66738d3f5dcf5e62eedfa12a22e56aaef7cd833ecb9b85e72ae3636ef2dd0c6ec8654609ba3fe  0029-gcc-go-Fix-handling-of-signal-34-on-musl.patch
+df6447febdecabacadaeb9925830ee531a860ddd5a1970ff42f608a798eccce81e8beaa5caf2f121411c55361af1ca4e8352552f21809b4fcaffda36e870c69c  0030-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch
+5220d075b3882e235cbc5e00b22d5a314d986a078ef7242bc777b32e00891f65fa887ed4557aa5d5c712c4e8ab49d56560cfe2489e36fb02843f1ff892b0fcf7  0031-gcc-go-signal-34-is-special-on-musl-libc.patch
+09f5fc4fadf1e60a3766ad33bfaf8c1ce73cdaacb41734d31fb78583e9fcdb5ca7650c3e03c01c8c3239a81d6ed849f39d17e0a31a672cb15c7138ce58c82c1b  0032-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
+c0abc9a985a195612d9bd9d12ea7a18e5717723d23790a90610f03881f9dcf54911332be002cb79043575db3b2f82099ff927d7f761050a063601fbe2e04e8f1  0033-gcc-go-link-to-libucontext.patch
+d5722d15a3dd9669ee4da062a3e0a0a2049772f10224f7da615eb4093e5f24bca4372078c9282a457cba649b12c4f1180ec7523584410e5cba555f4612740186  0034-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
+afb7d25f10f23e3ac634a10424f43e9ebe737d4aec9d067c2ad42c1144d08208271f206cdf54582b97a15a0900e5d426ea2940850b9e67abbd2b03f5a30a1793  0035-Use-generic-errstr.go-implementation-on-musl.patch
+ca185b3e0644dab6a87bf524042c72069ffda0cde578e803bd59a9c5e40ba4d7d6f0be49836bc3aa622a4367606bdc71a6b90fcc2c377e045bbdbe1fb5ce6730  0036-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
+11f93cd928881264b2a2a78dd52001980dca26cb22d2207a3ff286d63deca81468daa649762ff27f1a6475c0334bc3135b7bb080ce1b152b0f1a1e8f81287c5f  0037-configure-fix-detection-of-atomic-builtins-in-libato.patch
+7541d57f7c04571b3d60a2e40038245b33e68c4b53373f64d2827d106349546834f06eb77227194f950b570e15f4fe9e259238458d5be8f10c41c56404f7cfff  0038-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch
+2c5edf9e3fe6822a322c1dc75218062afb56799c304aa583c4e1e80136c6262cbd9bb950843f167b40639c6623a33a0475990c4452e03307af434dc8760d437d  0039-Fix-attempt-to-use-poisoned-calloc-error-in-libgccji.patch
+8e44678fc77094a2c0cbc78575759ee51d50ea53189cf4d651c8501eb1b46210bb6d5969b81f5f63532914320971e7a1e2e80b32cb679ab41af86f21742b4c19  0040-stddef.h-add-support-for-musl-typedef-macro-guards.patch
 "
diff --git a/cross/gcc-armv7/0001-posix_memalign.patch b/cross/gcc-armv7/0001-posix_memalign.patch
index d14560674..f41493c81 100644
--- a/cross/gcc-armv7/0001-posix_memalign.patch
+++ b/cross/gcc-armv7/0001-posix_memalign.patch
@@ -1,4 +1,4 @@
-From 135cfe09a582b4076324a5f350f775c18164aa1f Mon Sep 17 00:00:00 2001
+From a858e4eb74d68ef1cf7a30d6a60fb32c621267c6 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 1b0bfe37852..d7b2b19bb3c 100644
    else
      return NULL;
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-armv7/0002-gcc-poison-system-directories.patch b/cross/gcc-armv7/0002-gcc-poison-system-directories.patch
index e0a2e77b4..a3c61fb0d 100644
--- a/cross/gcc-armv7/0002-gcc-poison-system-directories.patch
+++ b/cross/gcc-armv7/0002-gcc-poison-system-directories.patch
@@ -1,4 +1,4 @@
-From b0d26972848280c3035668a6caccf0ca5475f062 Mon Sep 17 00:00:00 2001
+From 6317101c9bb0616db0b919ed945466c4161ea7f1 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
@@ -199,5 +199,5 @@ index 446d280321d..fbfc0ce03b8 100644
  
  /* Use given -I paths for #include "..." but not #include <...>, and
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-armv7/0003-Turn-on-Wl-z-relro-z-now-by-default.patch b/cross/gcc-armv7/0003-Turn-on-Wl-z-relro-z-now-by-default.patch
index 242f34c08..5f45aeadb 100644
--- a/cross/gcc-armv7/0003-Turn-on-Wl-z-relro-z-now-by-default.patch
+++ b/cross/gcc-armv7/0003-Turn-on-Wl-z-relro-z-now-by-default.patch
@@ -1,4 +1,4 @@
-From d0e45e3e71b386dcd57fa807e0182b0c00a4f7af Mon Sep 17 00:00:00 2001
+From c23602c67fd4ca33eb1f819f28f03eef50905265 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.
@@ -35,5 +35,5 @@ index a83ba34ac4b..8c15de433ee 100644
      %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!r:%{!nostartfiles:%S}}} \
      %{Wno-poison-system-directories:--no-poison-system-directories} \
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-armv7/0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch b/cross/gcc-armv7/0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
index 0e7ca91b7..833f9d571 100644
--- a/cross/gcc-armv7/0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
+++ b/cross/gcc-armv7/0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
@@ -1,4 +1,4 @@
-From 0615d5fe72c9c23cd9d08f2a54eafb4ab46cbe11 Mon Sep 17 00:00:00 2001
+From abb8ccb0dcd381e9daeb43be2d32afd0ab7c83c5 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,
@@ -42,5 +42,5 @@ index 46e45274859..1b4a698a191 100644
  @opindex O3
  Optimize yet more.  @option{-O3} turns on all optimizations specified
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-armv7/0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch b/cross/gcc-armv7/0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
index d0e94637a..9f927abbd 100644
--- a/cross/gcc-armv7/0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
+++ b/cross/gcc-armv7/0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
@@ -1,4 +1,4 @@
-From 071d4ac4bacf555c61c7c44b54acee94e35d7c59 Mon Sep 17 00:00:00 2001
+From 22071923bf903a7bf851d1e59dcc1d07c6b0e876 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,
@@ -268,5 +268,5 @@ index 8c15de433ee..be1508e5abe 100644
  #else
  #define LIBUBSAN_SPEC "-lubsan" STATIC_LIBUBSAN_LIBS
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-armv7/0006-Enable-Wformat-and-Wformat-security-by-default.patch b/cross/gcc-armv7/0006-Enable-Wformat-and-Wformat-security-by-default.patch
index bc7a3ef2b..d8843fd18 100644
--- a/cross/gcc-armv7/0006-Enable-Wformat-and-Wformat-security-by-default.patch
+++ b/cross/gcc-armv7/0006-Enable-Wformat-and-Wformat-security-by-default.patch
@@ -1,4 +1,4 @@
-From a2c4ea1f97c358486316d0e8536b021faa4581a5 Mon Sep 17 00:00:00 2001
+From 622ce6893c48eaa87beb7399ecb73bdadc9b7b84 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 2005b783c68..c5c6af427cc 100644
  
  Wformat-overflow=
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-armv7/0007-Enable-Wtrampolines-by-default.patch b/cross/gcc-armv7/0007-Enable-Wtrampolines-by-default.patch
index 14941d2f6..cbfe46c49 100644
--- a/cross/gcc-armv7/0007-Enable-Wtrampolines-by-default.patch
+++ b/cross/gcc-armv7/0007-Enable-Wtrampolines-by-default.patch
@@ -1,4 +1,4 @@
-From 5cbd83abefc1f3cf93057383e6ff59196934dbf7 Mon Sep 17 00:00:00 2001
+From ad29ab28462968097dad017f03c4db40f4d83174 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.
@@ -21,5 +21,5 @@ index d15105a73f3..29f9504cb68 100644
  
  Wtype-limits
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-armv7/0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch b/cross/gcc-armv7/0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
index f82943127..39dc6400f 100644
--- a/cross/gcc-armv7/0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
+++ b/cross/gcc-armv7/0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
@@ -1,4 +1,4 @@
-From 02c1d7932c3c3b9813431937dd82971a3ca86088 Mon Sep 17 00:00:00 2001
+From 0fd84cfeabaf572f5f901fa7d13298286d84992b 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 8ba281b4cfa..bab39cdf8a2 100644
  
  -param=stack-clash-protection-guard-size=
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-armv7/0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch b/cross/gcc-armv7/0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
index 065972191..5093eefc9 100644
--- a/cross/gcc-armv7/0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
+++ b/cross/gcc-armv7/0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
@@ -1,4 +1,4 @@
-From a91c942466bed1046461500c00e0ee1c9a68481d Mon Sep 17 00:00:00 2001
+From b788f9a685522fdd615c2c9aa7feab974c6d6b09 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 8edd2e05639..63f61fcf96f 100644
  
  all-local: all-local-$(USE_NLS)
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-armv7/0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch b/cross/gcc-armv7/0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
index ec5f3fe31..1e7627544 100644
--- a/cross/gcc-armv7/0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
+++ b/cross/gcc-armv7/0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
@@ -1,4 +1,4 @@
-From 856b0c7ac4f4513af20e505b27e9fa19234b7fa9 Mon Sep 17 00:00:00 2001
+From 1f2c3d7a0d1c35cb8281c5d97eb8ecfe2987e8b3 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 f4c0fe11d6f..cf4b1043e4d 100644
  /* Like asprintf but allocates memory without fail. This works like
     xmalloc.  */
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-armv7/0011-libiberty-copy-PIC-objects-during-build-process.patch b/cross/gcc-armv7/0011-libiberty-copy-PIC-objects-during-build-process.patch
index 8378cebc6..4022561e9 100644
--- a/cross/gcc-armv7/0011-libiberty-copy-PIC-objects-during-build-process.patch
+++ b/cross/gcc-armv7/0011-libiberty-copy-PIC-objects-during-build-process.patch
@@ -1,4 +1,4 @@
-From 5fe2309817ce1cdad4183921faf890886ea34493 Mon Sep 17 00:00:00 2001
+From a110462c21bc26c6c3c8d3265d3f146d1b9bddae 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 4f1213b983b..d0224649d30 100644
  	else true; fi
  
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-armv7/0012-libitm-disable-FORTIFY.patch b/cross/gcc-armv7/0012-libitm-disable-FORTIFY.patch
index 42de37383..b118ad486 100644
--- a/cross/gcc-armv7/0012-libitm-disable-FORTIFY.patch
+++ b/cross/gcc-armv7/0012-libitm-disable-FORTIFY.patch
@@ -1,4 +1,4 @@
-From e0dfb9ef8b3a3ef3264847b030c9e38a3059ad24 Mon Sep 17 00:00:00 2001
+From e0ad9c8c39f35a47c6a4c34ae161d768bf2f6fcc 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
@@ -29,5 +29,5 @@ index a3d84896cc5..ecb281d5919 100644
  # work out any special compilation flags as necessary.
  case "${target_cpu}" in
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-armv7/0013-libgcc_s.patch b/cross/gcc-armv7/0013-libgcc_s.patch
index 9e4870122..4e1631d67 100644
--- a/cross/gcc-armv7/0013-libgcc_s.patch
+++ b/cross/gcc-armv7/0013-libgcc_s.patch
@@ -1,4 +1,4 @@
-From f2ff82d829d3d905a48fb877230ef5a096605cd4 Mon Sep 17 00:00:00 2001
+From 57309d5900d3bc974b9a3efff34fdc601014b386 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
@@ -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.34.0
 
diff --git a/cross/gcc-armv7/0014-nopie.patch b/cross/gcc-armv7/0014-nopie.patch
index 5a419c892..a51d4c693 100644
--- a/cross/gcc-armv7/0014-nopie.patch
+++ b/cross/gcc-armv7/0014-nopie.patch
@@ -1,4 +1,4 @@
-From ca92d7dea9d05e515e52048c74408652e12787a8 Mon Sep 17 00:00:00 2001
+From d10ec6f4bea9d3f07d3ada43da129a4b5812fd65 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
@@ -71,5 +71,5 @@ index 5461bab88a9..1577529ffb7 100644
  AC_SUBST([NO_PIE_FLAG])
  
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-armv7/0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch b/cross/gcc-armv7/0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch
index 1b1018bc6..699e09562 100644
--- a/cross/gcc-armv7/0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch
+++ b/cross/gcc-armv7/0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch
@@ -1,4 +1,4 @@
-From 96f17362cdc323db0d556cc13f2ac712ec03db62 Mon Sep 17 00:00:00 2001
+From 2640a3cf5ecfaf532448baa66ea138c3ef02dec1 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.34.0
 
diff --git a/cross/gcc-armv7/0016-dlang-update-zlib-binding.patch b/cross/gcc-armv7/0016-dlang-update-zlib-binding.patch
index 66b7ffdc9..37d4117aa 100644
--- a/cross/gcc-armv7/0016-dlang-update-zlib-binding.patch
+++ b/cross/gcc-armv7/0016-dlang-update-zlib-binding.patch
@@ -1,4 +1,4 @@
-From 20de5d928fc0b3738d62eb2ef0a697cd733a8bdd Mon Sep 17 00:00:00 2001
+From 60d97064fb53a99c6189f9cb81824a70d435d2d1 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.34.0
 
diff --git a/cross/gcc-armv7/0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch b/cross/gcc-armv7/0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch
index 3b8bb12d5..0b05c3564 100644
--- a/cross/gcc-armv7/0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch
+++ b/cross/gcc-armv7/0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch
@@ -1,4 +1,4 @@
-From 1c64f83b19fce8cf0bacff9e1ee3232513d2ef9e Mon Sep 17 00:00:00 2001
+From 8524e44401fa57f6bdf78f39fb60cbb76046d256 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 59df921ba41..9ee9f943948 100644
          static assert(0, "Platform not supported");
  
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-armv7/0018-ada-fix-shared-linking.patch b/cross/gcc-armv7/0018-ada-fix-shared-linking.patch
index 524001074..cbed48d66 100644
--- a/cross/gcc-armv7/0018-ada-fix-shared-linking.patch
+++ b/cross/gcc-armv7/0018-ada-fix-shared-linking.patch
@@ -1,4 +1,4 @@
-From 35c96f4e7ae99786e8f519bd7c1c6a3511dd18d1 Mon Sep 17 00:00:00 2001
+From 03810f135f7106da0b9fef6c60c9def8b1891940 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 5cd5ef64f56..1c611a82cab 100644
  unsigned char __gnat_objlist_file_supported = 1;
  const char *__gnat_object_library_extension = ".a";
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-armv7/0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch b/cross/gcc-armv7/0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
index eb291c62f..dbb474047 100644
--- a/cross/gcc-armv7/0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
+++ b/cross/gcc-armv7/0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
@@ -1,4 +1,4 @@
-From e9d428d711843b1ff735da53f81efaca5ed1e962 Mon Sep 17 00:00:00 2001
+From b0eafa664f78c3d3f5d9bf38ece54777119c8e6e 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 047be0255e2..426949aa91c 100644
  
  # This is the list of directories to built for the host system.
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-armv7/0020-add-fortify-headers-paths.patch b/cross/gcc-armv7/0020-add-fortify-headers-paths.patch
index d60b4f1ce..62c748eb8 100644
--- a/cross/gcc-armv7/0020-add-fortify-headers-paths.patch
+++ b/cross/gcc-armv7/0020-add-fortify-headers-paths.patch
@@ -1,4 +1,4 @@
-From 131337e43b77d251e6e0128fd95cf11ed1fa2c7d Mon Sep 17 00:00:00 2001
+From 8dda8a6e1bd6f49f687f9b6725e704eaa0b25873 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 4e1db60fced..7fcf402b416 100644
      { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 0 },
  #else
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-armv7/0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch b/cross/gcc-armv7/0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
index b51586e12..ff2c2be4b 100644
--- a/cross/gcc-armv7/0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
+++ b/cross/gcc-armv7/0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
@@ -1,4 +1,4 @@
-From 803acb891329bc74ac5c7ae99904dd0a0d04759a Mon Sep 17 00:00:00 2001
+From 06a8b9fd165032afd96facc5c4e608bfe09ecbea 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 e495b222095..ab8866f409f 100644
  #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
  		       "|fstack-protector-strong|fstack-protector-explicit" \
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-armv7/0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch b/cross/gcc-armv7/0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
index d47b38db2..198f47760 100644
--- a/cross/gcc-armv7/0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
+++ b/cross/gcc-armv7/0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
@@ -1,4 +1,4 @@
-From 41201c14bee1ece2c15435bc76cc07e5460e566b Mon Sep 17 00:00:00 2001
+From c279684da1a93b3009c24b7236e2a58c3eb2fe9c 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 ab8866f409f..5093e8bbfd2 100644
  #else
  #define LIBUBSAN_SPEC "-lubsan" STATIC_LIBUBSAN_LIBS
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-armv7/0023-Pure-64-bit-MIPS.patch b/cross/gcc-armv7/0023-Pure-64-bit-MIPS.patch
index f01e8c4d4..60571ddaa 100644
--- a/cross/gcc-armv7/0023-Pure-64-bit-MIPS.patch
+++ b/cross/gcc-armv7/0023-Pure-64-bit-MIPS.patch
@@ -1,4 +1,4 @@
-From 71e4e4a671201d777eda4607ce380ba429bd307b Mon Sep 17 00:00:00 2001
+From 249a08b7257fa09d572933142cc9146c92f38dd2 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 130e1f04707..a64ac2bbb5b 100644
 +        ../lib32 \
 +        ../lib
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-armv7/0024-use-pure-64-bit-configuration-where-appropriate.patch b/cross/gcc-armv7/0024-use-pure-64-bit-configuration-where-appropriate.patch
index 715e1f6d1..917e89344 100644
--- a/cross/gcc-armv7/0024-use-pure-64-bit-configuration-where-appropriate.patch
+++ b/cross/gcc-armv7/0024-use-pure-64-bit-configuration-where-appropriate.patch
@@ -1,4 +1,4 @@
-From 43a75f797d0f0217665889830e061dbe74ac69d0 Mon Sep 17 00:00:00 2001
+From 0c9502cb5db1f2898b531cfb1d3b733490045845 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.34.0
 
diff --git a/cross/gcc-armv7/0025-always-build-libgcc_eh.a.patch b/cross/gcc-armv7/0025-always-build-libgcc_eh.a.patch
index 913d1d127..bf8e0dc20 100644
--- a/cross/gcc-armv7/0025-always-build-libgcc_eh.a.patch
+++ b/cross/gcc-armv7/0025-always-build-libgcc_eh.a.patch
@@ -1,4 +1,4 @@
-From e8fa599cbaa9e0fe6ae8aaded7c0443807d695cb Mon Sep 17 00:00:00 2001
+From 338f65b9c13e8aaacf146e0fe2400566766f02e4 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 2c8be561eb5..c557750b1b3 100644
  	for file in $$parts; do					\
  	  rm -f $(DESTDIR)$(inst_libdir)/$$file;		\
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-armv7/0026-ada-libgnarl-compatibility-for-musl.patch b/cross/gcc-armv7/0026-ada-libgnarl-compatibility-for-musl.patch
index 9247f5409..3e6e8b394 100644
--- a/cross/gcc-armv7/0026-ada-libgnarl-compatibility-for-musl.patch
+++ b/cross/gcc-armv7/0026-ada-libgnarl-compatibility-for-musl.patch
@@ -1,4 +1,4 @@
-From eeb35a7b61205438613b344ab393b23bd54b14b5 Mon Sep 17 00:00:00 2001
+From 0703d9ad84cd92f8a08787a85536a98b3830bba0 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
@@ -131,5 +131,5 @@ index 757a6cdfdad..82df94f6a00 100644
  
              pragma Assert (Result in 0 | ENOMEM);
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-armv7/0027-ada-musl-support-fixes.patch b/cross/gcc-armv7/0027-ada-musl-support-fixes.patch
index e53e88897..3a7075f96 100644
--- a/cross/gcc-armv7/0027-ada-musl-support-fixes.patch
+++ b/cross/gcc-armv7/0027-ada-musl-support-fixes.patch
@@ -1,4 +1,4 @@
-From 7448ade62ac32dfe9802eb1d7a7a93b2f3702797 Mon Sep 17 00:00:00 2001
+From 0b879c9a3ef83b3b08a0d72bfe89816d52489408 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 ec9db3a6a4c..6f92e50dd67 100644
    status = openpty (&master_fd, &slave_fd, NULL, NULL, NULL);
  #elif defined (USE_CLONE_DEVICE)
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-aarch64/0030-gcc-go-Fix-ucontext_t-on-PPC64.patch b/cross/gcc-armv7/0028-gcc-go-Fix-ucontext_t-on-PPC64.patch
similarity index 93%
rename from cross/gcc-aarch64/0030-gcc-go-Fix-ucontext_t-on-PPC64.patch
rename to cross/gcc-armv7/0028-gcc-go-Fix-ucontext_t-on-PPC64.patch
index f9aa671c4..e684c26e6 100644
--- a/cross/gcc-aarch64/0030-gcc-go-Fix-ucontext_t-on-PPC64.patch
+++ b/cross/gcc-armv7/0028-gcc-go-Fix-ucontext_t-on-PPC64.patch
@@ -1,4 +1,4 @@
-From fe1480783664c5b3b9e073b2eb470b32438d392a Mon Sep 17 00:00:00 2001
+From abfd239e7f28b8076ae28e5dbb31fc7f39bfa5d7 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 d30d1603adc..57f6824eb9e 100644
  	ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.jmp_context.iar;
  #elif defined(__aarch64__) && defined(__linux__)
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-armv7/0028-gcc-go-Use-_off_t-type-instead-of-_loff_t.patch b/cross/gcc-armv7/0028-gcc-go-Use-_off_t-type-instead-of-_loff_t.patch
deleted file mode 100644
index 847f7f9a8..000000000
--- a/cross/gcc-armv7/0028-gcc-go-Use-_off_t-type-instead-of-_loff_t.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 703545905411e5b597e4f462da93fa82c964f4d1 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
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Taken from Adélie Linux.
----
- libgo/go/syscall/libcall_linux.go | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/libgo/go/syscall/libcall_linux.go b/libgo/go/syscall/libcall_linux.go
-index 96974bd3269..ead47c0c39e 100644
---- a/libgo/go/syscall/libcall_linux.go
-+++ b/libgo/go/syscall/libcall_linux.go
-@@ -209,19 +209,19 @@ func Gettid() (tid int) {
- //sys	Setxattr(path string, attr string, data []byte, flags int) (err error)
- //setxattr(path *byte, name *byte, value *byte, size Size_t, flags _C_int) _C_int
- 
--//sys	splice(rfd int, roff *_loff_t, wfd int, woff *_loff_t, len int, flags int) (n int64, err error)
--//splice(rfd _C_int, roff *_loff_t, wfd _C_int, woff *_loff_t, len Size_t, flags _C_uint) Ssize_t
-+//sys	splice(rfd int, roff *_off_t, wfd int, woff *_off_t, len int, flags int) (n int64, err error)
-+//splice(rfd _C_int, roff *_off_t, wfd _C_int, woff *_off_t, len Size_t, flags _C_uint) Ssize_t
- func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error) {
--	var lroff _loff_t
--	var plroff *_loff_t
-+	var lroff _off_t
-+	var plroff *_off_t
- 	if roff != nil {
--		lroff = _loff_t(*roff)
-+		lroff = _off_t(*roff)
- 		plroff = &lroff
- 	}
--	var lwoff _loff_t
--	var plwoff *_loff_t
-+	var lwoff _off_t
-+	var plwoff *_off_t
- 	if woff != nil {
--		lwoff = _loff_t(*woff)
-+		lwoff = _off_t(*woff)
- 		plwoff = &lwoff
- 	}
- 	n, err = splice(rfd, plroff, wfd, plwoff, len, flags)
--- 
-2.33.1
-
diff --git a/cross/gcc-armv7/0029-gcc-go-Don-t-include-sys-user.h.patch b/cross/gcc-armv7/0029-gcc-go-Don-t-include-sys-user.h.patch
deleted file mode 100644
index 696a50cf4..000000000
--- a/cross/gcc-armv7/0029-gcc-go-Don-t-include-sys-user.h.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 0cdfd9c48470d12a448e99f4fa7ce73f206bd42a 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
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Taken from Adélie Linux.
----
- libgo/sysinfo.c | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/libgo/sysinfo.c b/libgo/sysinfo.c
-index 8ce061e2f5f..4d5907a2da5 100644
---- a/libgo/sysinfo.c
-+++ b/libgo/sysinfo.c
-@@ -78,9 +78,6 @@
- #include <sys/times.h>
- #include <sys/wait.h>
- #include <sys/un.h>
--#if defined(HAVE_SYS_USER_H)
--#include <sys/user.h>
--#endif
- #if defined(HAVE_SYS_UTSNAME_H)
- #include <sys/utsname.h>
- #endif
--- 
-2.33.1
-
diff --git a/cross/gcc-aarch64/0031-gcc-go-Fix-handling-of-signal-34-on-musl.patch b/cross/gcc-armv7/0029-gcc-go-Fix-handling-of-signal-34-on-musl.patch
similarity index 96%
rename from cross/gcc-aarch64/0031-gcc-go-Fix-handling-of-signal-34-on-musl.patch
rename to cross/gcc-armv7/0029-gcc-go-Fix-handling-of-signal-34-on-musl.patch
index 9f420f531..30af57256 100644
--- a/cross/gcc-aarch64/0031-gcc-go-Fix-handling-of-signal-34-on-musl.patch
+++ b/cross/gcc-armv7/0029-gcc-go-Fix-handling-of-signal-34-on-musl.patch
@@ -1,4 +1,4 @@
-From f1bd71f7dbac1570c8fd9990e0ff632e33972584 Mon Sep 17 00:00:00 2001
+From 098c0bca8bd1f47e94c8368406973019bbe9bf55 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.34.0
 
diff --git a/cross/gcc-armhf/0033-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch b/cross/gcc-armv7/0030-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch
similarity index 92%
rename from cross/gcc-armhf/0033-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch
rename to cross/gcc-armv7/0030-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch
index 2ff4bea09..60ce845eb 100644
--- a/cross/gcc-armhf/0033-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch
+++ b/cross/gcc-armv7/0030-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch
@@ -1,4 +1,4 @@
-From 6412458c90450577dbead578cb38da0a0cb64024 Mon Sep 17 00:00:00 2001
+From 7ba79053336c8666d3f137ef106696926d3f7b31 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Thu, 25 Nov 2021 01:47:03 +0000
 Subject: [PATCH] There are more than one st_{a,m,c}tim fields in struct stat
@@ -23,5 +23,5 @@ index 0c52ea5d71a..6fef104cc1c 100755
      st_times='-e s/st_atim/Atimespec/ -e s/st_mtim/Mtimespec/ -e s/st_ctim/Ctimespec/'
  fi
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-armhf/0034-gcc-go-signal-34-is-special-on-musl-libc.patch b/cross/gcc-armv7/0031-gcc-go-signal-34-is-special-on-musl-libc.patch
similarity index 92%
rename from cross/gcc-armhf/0034-gcc-go-signal-34-is-special-on-musl-libc.patch
rename to cross/gcc-armv7/0031-gcc-go-signal-34-is-special-on-musl-libc.patch
index 30d5b7b4a..4c7bad8e6 100644
--- a/cross/gcc-armhf/0034-gcc-go-signal-34-is-special-on-musl-libc.patch
+++ b/cross/gcc-armv7/0031-gcc-go-signal-34-is-special-on-musl-libc.patch
@@ -1,4 +1,4 @@
-From 0d93aefad5acf36c4f5ef60f95683f106c21f38b Mon Sep 17 00:00:00 2001
+From 18ba9309687431399aabe54c0b758f69b01253e0 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 2eece687e35..e86490ce203 100644
  		}
  		throw("sigaction read failure")
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-armv7/0032-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch b/cross/gcc-armv7/0032-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
deleted file mode 100644
index 44b95aaa3..000000000
--- a/cross/gcc-armv7/0032-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From c4fd6db3bd96974a726c41e08e42c242d442f689 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
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Taken from Adélie Linux.
----
- libgo/go/runtime/mem_gccgo.go | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libgo/go/runtime/mem_gccgo.go b/libgo/go/runtime/mem_gccgo.go
-index fa3389d857e..57bed97c710 100644
---- a/libgo/go/runtime/mem_gccgo.go
-+++ b/libgo/go/runtime/mem_gccgo.go
-@@ -15,7 +15,7 @@ import (
- //go:linkname sysFree
- 
- //extern mmap
--func sysMmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off uintptr) unsafe.Pointer
-+func sysMmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off int64) unsafe.Pointer
- 
- //extern munmap
- func munmap(addr unsafe.Pointer, length uintptr) int32
-@@ -37,7 +37,7 @@ func init() {
- 	}
- }
- 
--func mmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off uintptr) (unsafe.Pointer, int) {
-+func mmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off int64) (unsafe.Pointer, int) {
- 	p := sysMmap(addr, n, prot, flags, fd, off)
- 	if uintptr(p) == _MAP_FAILED {
- 		return nil, errno()
--- 
-2.33.1
-
diff --git a/cross/gcc-armv7/0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch b/cross/gcc-armv7/0032-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
similarity index 91%
rename from cross/gcc-armv7/0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
rename to cross/gcc-armv7/0032-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
index 075c749d8..5be5b32e6 100644
--- a/cross/gcc-armv7/0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
+++ b/cross/gcc-armv7/0032-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
@@ -1,4 +1,4 @@
-From b15fa407296fc03ad7549852a13aff790406f61d Mon Sep 17 00:00:00 2001
+From 1be822dcf1f9ffdba5c6508cef0374585e48cb18 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
@@ -23,5 +23,5 @@ index 38bf7a6b255..e50403b5a75 100644
  
  static inline void
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-aarch64/0037-gcc-go-link-to-libucontext.patch b/cross/gcc-armv7/0033-gcc-go-link-to-libucontext.patch
similarity index 90%
rename from cross/gcc-aarch64/0037-gcc-go-link-to-libucontext.patch
rename to cross/gcc-armv7/0033-gcc-go-link-to-libucontext.patch
index 3363bf249..283d562d9 100644
--- a/cross/gcc-aarch64/0037-gcc-go-link-to-libucontext.patch
+++ b/cross/gcc-armv7/0033-gcc-go-link-to-libucontext.patch
@@ -1,4 +1,4 @@
-From 566b272d5d7017e8ba72b5c52d06d7c5ed3165e8 Mon Sep 17 00:00:00 2001
+From 2fa393cd8ae6b25539cc7bd9998c603a3b33bc6e 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 426949aa91c..f97db1ef569 100644
  	  --srcdir=$${topdir}/$$module_srcdir \
  	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-aarch64/0038-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch b/cross/gcc-armv7/0034-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
similarity index 92%
rename from cross/gcc-aarch64/0038-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
rename to cross/gcc-armv7/0034-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
index 1f5141587..bd5876103 100644
--- a/cross/gcc-aarch64/0038-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
+++ b/cross/gcc-armv7/0034-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
@@ -1,4 +1,4 @@
-From 846b94beac2d176f6b22bbe73657657e31cc142c Mon Sep 17 00:00:00 2001
+From e94c28d8ee1876ddc9ae02a7a0cb1578e529260b 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 57f6824eb9e..fd03db420d4 100644
  		mcontext_t *m = &((ucontext_t*)(context))->uc_mcontext;
  		int i;
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-armhf/0039-Use-generic-errstr.go-implementation-on-musl.patch b/cross/gcc-armv7/0035-Use-generic-errstr.go-implementation-on-musl.patch
similarity index 95%
rename from cross/gcc-armhf/0039-Use-generic-errstr.go-implementation-on-musl.patch
rename to cross/gcc-armv7/0035-Use-generic-errstr.go-implementation-on-musl.patch
index 592ea8255..e6bcfa9a0 100644
--- a/cross/gcc-armhf/0039-Use-generic-errstr.go-implementation-on-musl.patch
+++ b/cross/gcc-armv7/0035-Use-generic-errstr.go-implementation-on-musl.patch
@@ -1,4 +1,4 @@
-From 45a69ebecc825636a069a34e9ee7f99075c383ec Mon Sep 17 00:00:00 2001
+From 23f7ad8b28284017c4f63e944bcb0321eb205e8a 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
@@ -44,5 +44,5 @@ index 5b19e6f202d..8dc60172186 100644
  package syscall
  
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-armv7/0035-gcc-go-Prefer-_off_t-over-_off64_t.patch b/cross/gcc-armv7/0035-gcc-go-Prefer-_off_t-over-_off64_t.patch
deleted file mode 100644
index 53e5e476a..000000000
--- a/cross/gcc-armv7/0035-gcc-go-Prefer-_off_t-over-_off64_t.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From da6a868da00dd1a302c91181e6af2daf57aeb609 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
-
-musl does not seem to have _off64_t.
----
- libgo/mksysinfo.sh | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
-
-diff --git a/libgo/mksysinfo.sh b/libgo/mksysinfo.sh
-index 6fef104cc1c..5b8cb86eb9c 100755
---- a/libgo/mksysinfo.sh
-+++ b/libgo/mksysinfo.sh
-@@ -403,11 +403,7 @@ fi
- # Some basic types.
- echo 'type Size_t _size_t' >> ${OUT}
- echo "type Ssize_t _ssize_t" >> ${OUT}
--if grep '^const _HAVE_OFF64_T = ' gen-sysinfo.go > /dev/null 2>&1; then
--  echo "type Offset_t _off64_t" >> ${OUT}
--else
--  echo "type Offset_t _off_t" >> ${OUT}
--fi
-+echo "type Offset_t _off_t" >> ${OUT}
- echo "type Mode_t _mode_t" >> ${OUT}
- echo "type Pid_t _pid_t" >> ${OUT}
- echo "type Uid_t _uid_t" >> ${OUT}
--- 
-2.33.1
-
diff --git a/cross/gcc-armv7/0040-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch b/cross/gcc-armv7/0036-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
similarity index 99%
rename from cross/gcc-armv7/0040-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
rename to cross/gcc-armv7/0036-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
index 0ef50e10f..1895dd258 100644
--- a/cross/gcc-armv7/0040-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
+++ b/cross/gcc-armv7/0036-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
@@ -1,4 +1,4 @@
-From 8703cb765874411a83d568fde5c3b195c89c3de9 Mon Sep 17 00:00:00 2001
+From 7e123432a35fcaa25de85b4940daabcd70c1a6bd 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
@@ -271,5 +271,5 @@ index 5093e8bbfd2..1871b5ab6eb 100644
  
  #ifdef ENABLE_DEFAULT_SSP
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-armv7/0041-configure-fix-detection-of-atomic-builtins-in-libato.patch b/cross/gcc-armv7/0037-configure-fix-detection-of-atomic-builtins-in-libato.patch
similarity index 96%
rename from cross/gcc-armv7/0041-configure-fix-detection-of-atomic-builtins-in-libato.patch
rename to cross/gcc-armv7/0037-configure-fix-detection-of-atomic-builtins-in-libato.patch
index 804e63543..163b3ca3c 100644
--- a/cross/gcc-armv7/0041-configure-fix-detection-of-atomic-builtins-in-libato.patch
+++ b/cross/gcc-armv7/0037-configure-fix-detection-of-atomic-builtins-in-libato.patch
@@ -1,4 +1,4 @@
-From abe5e7af0cb74a10adad65122f8a0c75c3f15615 Mon Sep 17 00:00:00 2001
+From cb2472c05592e4a1b5f826d761d0ef221c0c9664 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
@@ -53,5 +53,5 @@ index 670b0d72cfe..38c2cd9345f 100644
    alpha*)
  	# fenv.c needs this option to generate inexact exceptions.
 -- 
-2.33.1
+2.34.0
 
diff --git a/cross/gcc-armv7/0038-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch b/cross/gcc-armv7/0038-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch
new file mode 100644
index 000000000..8f5df6b69
--- /dev/null
+++ b/cross/gcc-armv7/0038-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch
@@ -0,0 +1,84 @@
+From 45b24f2bf7fa1b2b9d597bd065b6522f8d87cd3e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
+Date: Sun, 28 Nov 2021 00:54:37 +0100
+Subject: [PATCH] libgo: Recognize off64_t and loff_t definitions of musl libc
+
+Without this patch, both off64_t and loff_t are not recognized by
+-fdump-go-spec which causes a variety Go-related compilation errors on
+musl libc since the gcc-go frontend expects both off64_t and loff_t to
+be present.
+
+Also make sure that autoconf recognizes support for loff_t on musl, by
+compiling the relevant feature test code with -D_GNU_SOURCE and making
+it include fcntl.h which defines loff_t on musl.
+---
+ libgo/configure    |  4 +++-
+ libgo/configure.ac |  4 +++-
+ libgo/sysinfo.c    | 21 +++++++++++++++++++++
+ 3 files changed, 27 insertions(+), 2 deletions(-)
+
+diff --git a/libgo/configure b/libgo/configure
+index 70f64c974fd..69d15839e8c 100755
+--- a/libgo/configure
++++ b/libgo/configure
+@@ -15546,7 +15546,9 @@ _ACEOF
+ 
+ fi
+ 
+-ac_fn_c_check_type "$LINENO" "loff_t" "ac_cv_type_loff_t" "$ac_includes_default"
++CFLAGS_hold=$CFLAGS
++CFLAGS="$CFLAGS -D_GNU_SOURCE"
++ac_fn_c_check_type "$LINENO" "loff_t" "ac_cv_type_loff_t" "#include <fcntl.h>"
+ if test "x$ac_cv_type_loff_t" = xyes; then :
+ 
+ cat >>confdefs.h <<_ACEOF
+diff --git a/libgo/configure.ac b/libgo/configure.ac
+index ebab9d9de3e..a3d9d309aba 100644
+--- a/libgo/configure.ac
++++ b/libgo/configure.ac
+@@ -602,7 +602,9 @@ AC_STRUCT_DIRENT_D_TYPE
+ 
+ AC_CHECK_FUNCS(accept4 dup3 epoll_create1 faccessat fallocate fchmodat fchownat futimesat getxattr inotify_add_watch inotify_init inotify_init1 inotify_rm_watch listxattr mkdirat mknodat open64 openat pipe2 removexattr renameat setxattr sync_file_range splice syscall tee unlinkat unshare utimensat)
+ AC_TYPE_OFF_T
+-AC_CHECK_TYPES([loff_t])
++CFLAGS_hold=$CFLAGS
++CFLAGS="$CFLAGS -D_GNU_SOURCE" # musl does not define loff_t without this
++AC_CHECK_TYPES([loff_t], [], [], [[#include <fcntl.h>]])
+ 
+ LIBS_hold="$LIBS"
+ LIBS="$LIBS -lm"
+diff --git a/libgo/sysinfo.c b/libgo/sysinfo.c
+index 8ce061e2f5f..b85add15a7b 100644
+--- a/libgo/sysinfo.c
++++ b/libgo/sysinfo.c
+@@ -343,6 +343,27 @@ enum {
+ #endif
+ };
+ 
++// musl libc has both off64_t and loff_t. However, both of these types
++// are defined as CPP macros, not as C typedefs. Unfortunately, the GCC
++// -fdump-go-spec option, which is responsible for generating type
++// definitions for Go based on this file, only recognizes types defined
++// through typedefs.
++//
++// For this reason, we check here if either off64_t or loff_t are
++// defined as CPP macros and if so, we redefine them using a C typedef.
++#if defined(HAVE_OFF64_T) && defined(off64_t)
++typedef off64_t __musl_off64_t;
++#undef off64_t
++typedef __musl_off64_t off64_t;
++#endif
++
++// See comment regarding musl libc above.
++#if defined(HAVE_LOFF_T) && defined(loff_t)
++typedef loff_t __musl_loff_t;
++#undef loff_t
++typedef __musl_loff_t loff_t;
++#endif
++
+ // SIOCGIFMTU can't be added in the above enum as it might
+ // be signed in some OSes.
+ #ifdef SIOCGIFMTU
+-- 
+2.34.0
+
diff --git a/cross/gcc-armv7/0039-Fix-attempt-to-use-poisoned-calloc-error-in-libgccji.patch b/cross/gcc-armv7/0039-Fix-attempt-to-use-poisoned-calloc-error-in-libgccji.patch
new file mode 100644
index 000000000..f43cfb4ac
--- /dev/null
+++ b/cross/gcc-armv7/0039-Fix-attempt-to-use-poisoned-calloc-error-in-libgccji.patch
@@ -0,0 +1,80 @@
+From 0b7a57f08abff72f8dd1f67de995c502e798513c Mon Sep 17 00:00:00 2001
+From: Alex McGrath <amk@amk.ie>
+Date: Wed, 13 Oct 2021 23:24:27 +0100
+Subject: [PATCH] Fix attempt to use poisoned calloc error in libgccjit
+
+This moves usages of pthread.h to above any usage of system.h as it
+included #pragma GCC poison calloc
+---
+ gcc/jit/jit-playback.c  | 4 ++--
+ gcc/jit/jit-recording.c | 4 ++--
+ gcc/jit/libgccjit.c     | 3 ++-
+ 3 files changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/gcc/jit/jit-playback.c b/gcc/jit/jit-playback.c
+index 50db23df159..1d42f057a84 100644
+--- a/gcc/jit/jit-playback.c
++++ b/gcc/jit/jit-playback.c
+@@ -18,6 +18,8 @@ You should have received a copy of the GNU General Public License
+ along with GCC; see the file COPYING3.  If not see
+ <http://www.gnu.org/licenses/>.  */
+ 
++#include <pthread.h>
++
+ #include "config.h"
+ #include "system.h"
+ #include "coretypes.h"
+@@ -41,8 +43,6 @@ along with GCC; see the file COPYING3.  If not see
+ #include "diagnostic.h"
+ #include "stmt.h"
+ 
+-#include <pthread.h>
+-
+ #include "jit-playback.h"
+ #include "jit-result.h"
+ #include "jit-builtins.h"
+diff --git a/gcc/jit/jit-recording.c b/gcc/jit/jit-recording.c
+index 117ff70114c..d2634a546b1 100644
+--- a/gcc/jit/jit-recording.c
++++ b/gcc/jit/jit-recording.c
+@@ -18,6 +18,8 @@ You should have received a copy of the GNU General Public License
+ along with GCC; see the file COPYING3.  If not see
+ <http://www.gnu.org/licenses/>.  */
+ 
++#include <pthread.h>
++
+ #include "config.h"
+ #include "system.h"
+ #include "coretypes.h"
+@@ -25,8 +27,6 @@ along with GCC; see the file COPYING3.  If not see
+ #include "pretty-print.h"
+ #include "toplev.h"
+ 
+-#include <pthread.h>
+-
+ #include "jit-builtins.h"
+ #include "jit-recording.h"
+ #include "jit-playback.h"
+diff --git a/gcc/jit/libgccjit.c b/gcc/jit/libgccjit.c
+index 0cc650f9810..2f44481eeb0 100644
+--- a/gcc/jit/libgccjit.c
++++ b/gcc/jit/libgccjit.c
+@@ -18,13 +18,14 @@ You should have received a copy of the GNU General Public License
+ along with GCC; see the file COPYING3.  If not see
+ <http://www.gnu.org/licenses/>.  */
+ 
++#include <pthread.h>
++
+ #include "config.h"
+ #include "system.h"
+ #include "coretypes.h"
+ #include "timevar.h"
+ #include "typed-splay-tree.h"
+ #include "cppbuiltin.h"
+-#include <pthread.h>
+ 
+ #include "libgccjit.h"
+ #include "jit-recording.h"
+-- 
+2.34.0
+
diff --git a/cross/gcc-armhf/0042-stddef.h-add-support-for-musl-typedef-macro-guards.patch b/cross/gcc-armv7/0040-stddef.h-add-support-for-musl-typedef-macro-guards.patch
similarity index 97%
rename from cross/gcc-armhf/0042-stddef.h-add-support-for-musl-typedef-macro-guards.patch
rename to cross/gcc-armv7/0040-stddef.h-add-support-for-musl-typedef-macro-guards.patch
index 8b714b4ba..c22f7f43f 100644
--- a/cross/gcc-armhf/0042-stddef.h-add-support-for-musl-typedef-macro-guards.patch
+++ b/cross/gcc-armv7/0040-stddef.h-add-support-for-musl-typedef-macro-guards.patch
@@ -1,4 +1,4 @@
-From b9e9895826774d17d4bb81b165753816db562590 Mon Sep 17 00:00:00 2001
+From 5a76cf60df5c9ba274f1d0dcd79fc0cbad9d0fe0 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
 Date: Thu, 25 Nov 2021 17:44:04 +0100
 Subject: [PATCH] stddef.h: add support for musl typedef macro guards
@@ -101,3 +101,6 @@ index 66619fe43b1..50d710a5ab9 100644
  #endif /* _WCHAR_T_DECLARED */
  #endif /* _BSD_RUNE_T_DEFINED_ */
  #endif
+-- 
+2.34.0
+
diff --git a/cross/gcc-armv7/APKBUILD b/cross/gcc-armv7/APKBUILD
index 40b826128..4541d111f 100644
--- a/cross/gcc-armv7/APKBUILD
+++ b/cross/gcc-armv7/APKBUILD
@@ -25,13 +25,13 @@ _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"
 
 pkgname=gcc-armv7
 _pkgbase=11.2.1
-pkgver=11.2.1_git20211125
+pkgver=11.2.1_git20211128
 [ "$BOOTSTRAP" = "nolibc" ] && pkgname="gcc-pass2"
 [ "$CBUILD" != "$CHOST" ] && _cross="-$CARCH" || _cross=""
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname=gcc-armv7
-pkgrel=1
+pkgrel=0
 pkgdesc="Stage2 cross-compiler for armv7"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -221,21 +221,19 @@ source="https://dev.alpinelinux.org/~nenolod/gcc-${pkgver}.tar.xz
 	0025-always-build-libgcc_eh.a.patch
 	0026-ada-libgnarl-compatibility-for-musl.patch
 	0027-ada-musl-support-fixes.patch
-	0028-gcc-go-Use-_off_t-type-instead-of-_loff_t.patch
-	0029-gcc-go-Don-t-include-sys-user.h.patch
-	0030-gcc-go-Fix-ucontext_t-on-PPC64.patch
-	0031-gcc-go-Fix-handling-of-signal-34-on-musl.patch
-	0032-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
-	0033-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch
-	0034-gcc-go-signal-34-is-special-on-musl-libc.patch
-	0035-gcc-go-Prefer-_off_t-over-_off64_t.patch
-	0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
-	0037-gcc-go-link-to-libucontext.patch
-	0038-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
-	0039-Use-generic-errstr.go-implementation-on-musl.patch
-	0040-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
-	0041-configure-fix-detection-of-atomic-builtins-in-libato.patch
-	0042-stddef.h-add-support-for-musl-typedef-macro-guards.patch
+	0028-gcc-go-Fix-ucontext_t-on-PPC64.patch
+	0029-gcc-go-Fix-handling-of-signal-34-on-musl.patch
+	0030-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch
+	0031-gcc-go-signal-34-is-special-on-musl-libc.patch
+	0032-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
+	0033-gcc-go-link-to-libucontext.patch
+	0034-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
+	0035-Use-generic-errstr.go-implementation-on-musl.patch
+	0036-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
+	0037-configure-fix-detection-of-atomic-builtins-in-libato.patch
+	0038-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch
+	0039-Fix-attempt-to-use-poisoned-calloc-error-in-libgccji.patch
+	0040-stddef.h-add-support-for-musl-typedef-macro-guards.patch
 	"
 
 # we build out-of-tree
@@ -681,47 +679,45 @@ gnat() {
 }
 
 sha512sums="
-2a682823f9b114c4288a3428dc658ce21679f48a5b901d4792fc4ea09f75e9c9516f8cdc7c70697e1be335d925f99eac01eaf20c117cd5ee685181d37fcc7290  gcc-11.2.1_git20211125.tar.xz
-14ef1a0b284c85859f4db03cb0750c4dcadb8821dd0ec1b04e6872ffd2fa55ae125a99fee986a160bce9448226d08daf05e1a7feda5220e746aaa5f338d78d69  0001-posix_memalign.patch
-950b04c8bf96810dfe4bd4c2ea5218dfacfae0f0b1be9e64cbb1f09bbf67d29565b59094aa4d5cca095355db8cce99c80c99f0463ef296a96faf6b13e38230e0  0002-gcc-poison-system-directories.patch
-1d9c1b028b07644da9182288a26762f294d1ef25804c0227bfd3419a2a8ba579bec7590aaac9a241242bb14e3e371eff81ad26a07d0183be821af59bd6abe4d4  0003-Turn-on-Wl-z-relro-z-now-by-default.patch
-5a705aa5ffdc5ab3fb417ddb494486156db4af3b7f9a1d29e1b3ac2e7095f924b2a3f73a73b4d7d20f6ba3c77b062f1b47e7b46c0a8e1992f349abe3cf7f6542  0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
-87573db27fd83fe9d7c40cefb5bd264e36500280ab2dd39c1763f87f4cfaef3e0d3115f4aadd3b3d65c93a13db17df469e038931335685dfad4adf6b48e96c66  0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
-4055d8b934c8a017bbba74b224c8da105668ea16fc9f244b0dacc9511a89088701b491daec09d95041f640b7f0e994feb17a0803d389818f104578bfaf433623  0006-Enable-Wformat-and-Wformat-security-by-default.patch
-0ffb348414468ea166d5875e0f20f77a813473a6823e26189b010eebb835c91e14b04f360b139fffbc50b30622476a625a5f567d26b6c18ddcbfc88e6d28e54f  0007-Enable-Wtrampolines-by-default.patch
-799117fc233f3172457024a71d4d964c6a367b7ae7246e208ba16192a533bdf484dc72b79eb7ee3629c0eb7fe202d32658a64219c03c9098120c899d9f832309  0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
-eb47d678ff9a14ad54833b1fdc2d04976e31db741cdf9ac6b213d56df3df3ea61514bdfa5bbe2577b82135517e184de53028663b7aad565613e90c0bafd6513f  0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
-e3d2241e3bb8e67bece8a322cdc707542586f7a1b5da9412eb38dbfa40508e618b8827e3574b21c86b9d263e8ed31941d8885618707c1947d07f86d18d34a9a8  0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
-e8976a1f1618e94d519852dee346bb787589637905451a6f02b4f8a1ffc5a6fa797a697b8c0964a72830aad32ba412986d45e9f88ae86e3d7c8007d3b1400692  0011-libiberty-copy-PIC-objects-during-build-process.patch
-2cc03796789b6680f43533d41a1966283b6e913b19080a00c4ec6653614f1af66754db7ffca05103bb398e389316c9fca525d2fe00965e1105b210d1d940d507  0012-libitm-disable-FORTIFY.patch
-8fe44a88f66f1d282c5c6db80642ac8ef52f89ccc8287f73eecd1c8d78ee3e5ac890065d173fc3ff00172b8b3984ca484debbf84b9ba649dc5939afdfc4a220a  0013-libgcc_s.patch
-1323a512d063f9a0679c68c9856ede8a6d48ae0c9c52ef14e63d34e6a2b6486fa02301d75554b2d623a369967c71ca35e7c93530c093f334f0cf666c7d1b4911  0014-nopie.patch
-1fb9fb420335d5e87245eb781960bc876a1d60bc69af2a8febad8ddd23cc064e28227a7b9f8389b4f2bb0211259102feaa6e2a7f64457fac06d60a59fdc1c2bb  0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch
-226e68c4561524ece4340107736f5f7f5a31fb725373a5ad472147f443a5fc037d0e0d93562c3e6d333ed43ceef7a2c6a2adad1ad10a464235d168a2dd4ed65e  0016-dlang-update-zlib-binding.patch
-9615d8844f4ffaab6dc61ad452ec9502acfe41029f2225b4b9fa10b034659447fb92b037918d52c615cae30acbb778b8a3d2197c705c90698221ae9e7bb30a32  0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch
-3008df8b4e4f582ced4976e640cb3329904bdefe9d454b13c8e61f3393fee21ec4e49cefc90e6049f85bacced500886681520b46b5063c948b7f5506c050b8cc  0018-ada-fix-shared-linking.patch
-3df7c1285a370e9741f649b26e31074177826b11da5172e5571c982ff1127ba83c6baf6b0666433ab7cd937217550ed2f083460d8ef8ed62531a98e63cbcc4c9  0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
-5235fbd6bb39c98f9ef702112d5bda05dcba03e897106ef864be606568e0c51e2fb5cadc5df93d162ceb8bf38a544adf9487ddd995ed0b936e86e3fbbc10512e  0020-add-fortify-headers-paths.patch
-9405ea49a6832ae7e2c81c00a9c0c7eeb03b2b4cb887ff2f6352b0f0a5de2c002208a12a6a61ec0e287b114c30090197e867be1a5ed8f462e6f74a63b87fd6f5  0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
-aa46e49551ff84654166927f62fc81a118dcec1934cf0a95bdbcfe0ed08fac21d6c4b123965d9e718936411e2935c6cd6b60dbba2853c01169fea8d0fa401464  0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
-62a743dea9f0b644876138f5d336726a32ad62ad1b49c308daf3a11c7122cef292e93fe580fc71aa1ec9c73bb234e485a3d447135f2d169b98af1900d304368e  0023-Pure-64-bit-MIPS.patch
-6959cf80dcceeee5d89eff1337bdf35d7a1d42fe3861a56bebd10ccfba1e5046837b63923a2f1b23109c8494d39a18a400f08342686271d539964ad85c83d2f1  0024-use-pure-64-bit-configuration-where-appropriate.patch
-1f160b42a88f1d6cdf2cf140323d5fb96233f82b5fbeb8efdb861820b25c1b0354e55202655bfb5f571e21fdb18e66a532b7278a014aab828e03b04e9345fe19  0025-always-build-libgcc_eh.a.patch
-fec758a6cbee1d468b966b90e35fe83742b2ebb2cc873634115ab4db599bd84a8c00f687ff18a2f37360126a75f4b8d85d9de3127d44b9076d931479cdd65ab1  0026-ada-libgnarl-compatibility-for-musl.patch
-e49720b5d78fca91bdc0dbc431b70e9e75bbd6a95ba2e856dce6764dd9759fc830bb445ce8aa8fc9aa6ace80c474e9c2a947c6b23a1178b2cb6bd8780447350a  0027-ada-musl-support-fixes.patch
-199b87e0844c361fc176755cd5846ea48f4a18382609633d0f4d1fb3e11a41ad93168f9b4f44ed993dca977354c0072637779658941cebe6adebfea28b28531c  0028-gcc-go-Use-_off_t-type-instead-of-_loff_t.patch
-17642cb9f179007b898f62cb4d6c9b436876cf667606c8003e02a782f09d29e17a301225efb94102094cc7f2b3efb413dd5ea2581e7e421e2b814f29f1b7e776  0029-gcc-go-Don-t-include-sys-user.h.patch
-08268c1ec6b6f0097ea15230f45f2a7231b8c5f9e6f90fcb102f86fe8e83c81a1755482a88415ab11a3de62e82769e4f0e3e029b812e477fcb6ddccb5f086734  0030-gcc-go-Fix-ucontext_t-on-PPC64.patch
-1345b99c20a9f7335c8af5e619c769f0555e46c18ba0f084d2655bce1581d11353f278dd9c94874edaceed1bf9d11a4a720b5263197c0cc9ce288f664e26eb01  0031-gcc-go-Fix-handling-of-signal-34-on-musl.patch
-ff8fb2cd67dd4723b271c2d1b6bca80e062d2fe31fe9f71aa1b83bab1c131decff4b4ddf8da9ce188cd28eee0fa1cf04d8ffc863033c5ce0096a6dd7b748e3b5  0032-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
-ce677dad505e56c67c79f7836888b6c28feaa4172d41c8c7573b931e6baff56ca0e5b9e6902b576d784735c5d278bc8a23e08a83597e3f41d11be9e14cf1dc59  0033-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch
-19743886041ed1fc8e3afebc48b5c196c032f4bd8d20a8deb99ba83ec7ffb3a5e18f1686a705a0578ce120f702493e444c599c9228f2b466abbcb8820f313d7a  0034-gcc-go-signal-34-is-special-on-musl-libc.patch
-150dba551824d99a3b58ea531c939237ce3aa642d04e5a2f774fe96bb27f1aa498d2b95d74369dd893da6142f9a8e5fe8966c72f38e21fc14ff614f90e7374ce  0035-gcc-go-Prefer-_off_t-over-_off64_t.patch
-2e09c90e5b9ba295949d5a9986ca4e13774981fb918d35098ab560139d34703b15924767bb54ffadf38b061b2b395c50f53c367c96959e5e9d1e7c65224171f4  0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
-01b3010bdfcec65d68f851ed425fa22c744e6744aaf4b0fe7699c7a678e970e11bc7b907188fbacababacadf520b515883944480e91262259e0a03a0966d7540  0037-gcc-go-link-to-libucontext.patch
-f7eefa7ae1f31fc7bc1721578d4c1642f2ef5feda37dec03264dde53717474437722ee646ab9a837d888eedbee4ea3c407f20cc4c7cb36d34a81e56b3ea02c79  0038-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
-83deca7a68c6e1ce934f79b5d1e1a4b8b8a25c7bc24c3ef934307c232e168d9b17048a00a040fe81ac0cf6d4a23beefb292369c35d9896dab440dda228c90b0a  0039-Use-generic-errstr.go-implementation-on-musl.patch
-4074c62c2ee0ed555f01bf0cc69e32ef275bc3ac74de1d428ba1a2ac59fae973fe6f9aab8b3796df4bda7ab7cf220e5e1cbfdf103f41e4cbea175067a947d08f  0040-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
-1fe1b1e9ec288f65cd0d80a74b0a060b29c40e501f666b01e2825b61949be4568aeaf7cf473142889a7fd5e011b096837a651582d64fce67500fcb2ba39e16ce  0041-configure-fix-detection-of-atomic-builtins-in-libato.patch
-0a66c5a567e15dafac0bcad5c9dd5e98c44c74cbe539340ad28cbf6d26b994bab46b355f3a3a57b830f802145cfd826ad8d87359ebc5d6a20ef41e968904c7dc  0042-stddef.h-add-support-for-musl-typedef-macro-guards.patch
+99c25b0cf5ae57806e3ecc76977c4b177e60660a289117506061243d3b492c76392cc47ba1165a04b1d46b932c1492db045edb29eab5460774be90243e984f22  gcc-11.2.1_git20211128.tar.xz
+a1b8ae8ba40ed0e384484590ca7c9328f922f6237c883d7a78ad16a5110f522280c577ede7ee65163ca8b9e2cb02d5eefa343d8a60a8d6a64d2fc3496b01b80a  0001-posix_memalign.patch
+79ad02ec110f485bc19364459f94d16556b4e178a029a538b9a448ce356950fcad99674d711edb012d8a28b4e39a865370dec1a12c86d6fd91160acf80135ee3  0002-gcc-poison-system-directories.patch
+fd8819d4b7ef3f3d32bd09f049098f04f7503556b65f1f85c91cd7f724770b3b8f16af580774e518310be83462070551cdc8ef78963e73760849de26d8a107f7  0003-Turn-on-Wl-z-relro-z-now-by-default.patch
+eeca973fb0f6a82203358cb8ce15cac256315e0e22ad00b579b73a3bb093da306f62d59f86f7f3d3c0194370dff6ee4b0a01026153a29933437b3c3ed758c34e  0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
+faa5bd16cb5d4c898dd1c7f9b88a12e1549d2f643c13cfe0413fdf8dccf9ce48489415de4f3786df86d9ca305fbeba650b4f9f2440f9800297bcd9fa5624f714  0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
+371ebf3a572fb1dce7756bde18dd116e3cff9c110c80e05e46d6d01a3b7545f28ec6e65a062226bfa1b4b3da8ab436835d03f5a14b33ada1a250c726ce8c45e4  0006-Enable-Wformat-and-Wformat-security-by-default.patch
+ed48ccf5733d0f988cc1838c3f5f8466e21b92390af8679e79447699fd8fae51cd2091233d15f77b44412f09f1b8266d68d1da669c6f9b409f4808fbb1e9a2ed  0007-Enable-Wtrampolines-by-default.patch
+9481738fb87f7c453569ba88aa7629d773d5d88185e67a412e3b06422868da0719b3d98f11f29f21a7e9948a6d598c34a7e9806bb60428734a3de724984f9de0  0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
+47650d47faa0d896179b11513171b10547b6a374a574cfdf923816c46adf643dda61abac56bd3ce971acccd9b2843b28b8fac8cc46e92e9f325a275113413771  0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
+4470ecbcfb1dbdcf5157d94178229b7e4f24c997a92f48b688f0850454bdf19ea1525d1ebbc541d5da203408e2d5d577ca9a769db8501ead4e4888fde21fb2ef  0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
+c324b0cfc83f90f65ffe2b09ced8248d907f8d3c7120491f1311601d76f1729e8728177b0b57db691c7b917265bf1e0c33f08a3f1360fc26f75aec057262e0d2  0011-libiberty-copy-PIC-objects-during-build-process.patch
+3a7ccaa7ef78a55b3d327c4c2e3474bc904192cc8d9f62ab4658ed75887301f5069af823aa9d01560a5047fe95c89ee0c1f98745722441d27ba544870af56c7c  0012-libitm-disable-FORTIFY.patch
+68442827a2335c40e9ea1979b64e026634497f076c21a8a9f11bf09f612ec72625c72e16ff6d50da659d0d5c49a7df266be4e99b2af3712fe84238b926ad14b2  0013-libgcc_s.patch
+b34a972b39f4b55d11ed2bfaa17181a353e721424f31c35892a0a7d16a680d017856d4679b1bcd6ebdee304d3e15aae5f545a59c5a5abf0e48d094e8fef52ae0  0014-nopie.patch
+03574bbbb8cc76ab3303862e68d19898b6b1971cbea0d8e3f8d0bef47c33376bc8d37d0a3aee9783e6f04ca3857fa6cfc054b24fafe5eed51a75215e61dde9ea  0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch
+5233ae40bf0e42f8c9cd379f776c6a5af11bf986c0e09b3032e02e5c4f257d12d8f2c27739775b48bd07fcf6c4062086465864b1ca11983126752fd46b85c658  0016-dlang-update-zlib-binding.patch
+627a24e669e408165c4b63c9a4e0a980373a4b801286f7b6e6a3a4c335e0c9160d164d23701c90170217ad333d0403b1aef7738ac90c4ed9f832d27c0eb4cd38  0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch
+482a8556fa7bf2ca14782ccce01465211ad476b83c3087668298d6078b32e1eae2138c0ea236c4b191f57171bc6ce64d51cac2dfea4f33d69283f12ecec9e9c6  0018-ada-fix-shared-linking.patch
+8fe388c533b687542aacda86c1ca04290a53123050e2700867895005aa34ec0b23f2c394c5710b1b87e85442fb976c47a95d10360984da13a82a3ff5307996d5  0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
+563d17f07468d412b46b012cff37d1c4acdee2bd1046b7ac817c1b35034c167e252a6067dd34b418770d3b0c170f8ae14a4ee9b2ab0df1b8b7d2581afec83731  0020-add-fortify-headers-paths.patch
+49ba07e45442651cd9610ca339035deb19d73744850149722c6da9a0e1b5081ab27e8e88f45e836de2a432770dcd7fd2073bc5379679921175a68627e9a0941f  0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
+a6d88c765aded0dcd0ecc0bf68a9ad3e4d0bb8f2fe1f7b1245db068d5cee154aec8c3bed47390d60b10809c224fbbafb5f36225a46fc6c8f143bd8317fa2d062  0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
+40fb955eaa10d2536acf99a716aed68cb587e94bdde8260581b2ba7026a9698058495f0b040a3909096b4102565b1c704c70e3b870e239366450df10d73a201c  0023-Pure-64-bit-MIPS.patch
+5ff7f3836a4ae7729bbe8fffe97956eeebb6cd40657214423e79a9ec42e85654491cb73fdb263ff70d4e37e14f42370f2a90ba2c97411c5ec4b2d967c6d70a85  0024-use-pure-64-bit-configuration-where-appropriate.patch
+e45369759649d0680b7c39512e20a5424706d2e7711d14076d893850105daba8b9bb5094db962813859d225e70e018a5667155d92827a918674961015f13eb95  0025-always-build-libgcc_eh.a.patch
+a16387cda58085fce4413db099e18c089d3e2f6603ba4d3add07fd4d31f3d254c91611ad4b8ee36135a364f12e0897bfd6d5998b95c0f431ca8b79d142f26958  0026-ada-libgnarl-compatibility-for-musl.patch
+3467decc5a090d82497a6b029ec6e34aac3876fadd23db2a3af385017e5cd992f82cf11b928e6b461248b60990fa50a469017a4646954f63974572c3a6fcaaec  0027-ada-musl-support-fixes.patch
+9960b164c608c47f35de2bf624cfe8782984e8d3ed23a72a456284e3082620f95501299b3e9e26b0f8c0d0796c68c353584bb5c48e85b101010abe29a46ccf5d  0028-gcc-go-Fix-ucontext_t-on-PPC64.patch
+c89f234df9a37cfe0c0d9ca891febe57b3ae0eb01416edaeb5d66738d3f5dcf5e62eedfa12a22e56aaef7cd833ecb9b85e72ae3636ef2dd0c6ec8654609ba3fe  0029-gcc-go-Fix-handling-of-signal-34-on-musl.patch
+df6447febdecabacadaeb9925830ee531a860ddd5a1970ff42f608a798eccce81e8beaa5caf2f121411c55361af1ca4e8352552f21809b4fcaffda36e870c69c  0030-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch
+5220d075b3882e235cbc5e00b22d5a314d986a078ef7242bc777b32e00891f65fa887ed4557aa5d5c712c4e8ab49d56560cfe2489e36fb02843f1ff892b0fcf7  0031-gcc-go-signal-34-is-special-on-musl-libc.patch
+09f5fc4fadf1e60a3766ad33bfaf8c1ce73cdaacb41734d31fb78583e9fcdb5ca7650c3e03c01c8c3239a81d6ed849f39d17e0a31a672cb15c7138ce58c82c1b  0032-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
+c0abc9a985a195612d9bd9d12ea7a18e5717723d23790a90610f03881f9dcf54911332be002cb79043575db3b2f82099ff927d7f761050a063601fbe2e04e8f1  0033-gcc-go-link-to-libucontext.patch
+d5722d15a3dd9669ee4da062a3e0a0a2049772f10224f7da615eb4093e5f24bca4372078c9282a457cba649b12c4f1180ec7523584410e5cba555f4612740186  0034-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
+afb7d25f10f23e3ac634a10424f43e9ebe737d4aec9d067c2ad42c1144d08208271f206cdf54582b97a15a0900e5d426ea2940850b9e67abbd2b03f5a30a1793  0035-Use-generic-errstr.go-implementation-on-musl.patch
+ca185b3e0644dab6a87bf524042c72069ffda0cde578e803bd59a9c5e40ba4d7d6f0be49836bc3aa622a4367606bdc71a6b90fcc2c377e045bbdbe1fb5ce6730  0036-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
+11f93cd928881264b2a2a78dd52001980dca26cb22d2207a3ff286d63deca81468daa649762ff27f1a6475c0334bc3135b7bb080ce1b152b0f1a1e8f81287c5f  0037-configure-fix-detection-of-atomic-builtins-in-libato.patch
+7541d57f7c04571b3d60a2e40038245b33e68c4b53373f64d2827d106349546834f06eb77227194f950b570e15f4fe9e259238458d5be8f10c41c56404f7cfff  0038-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch
+2c5edf9e3fe6822a322c1dc75218062afb56799c304aa583c4e1e80136c6262cbd9bb950843f167b40639c6623a33a0475990c4452e03307af434dc8760d437d  0039-Fix-attempt-to-use-poisoned-calloc-error-in-libgccji.patch
+8e44678fc77094a2c0cbc78575759ee51d50ea53189cf4d651c8501eb1b46210bb6d5969b81f5f63532914320971e7a1e2e80b32cb679ab41af86f21742b4c19  0040-stddef.h-add-support-for-musl-typedef-macro-guards.patch
 "