From 345a337e5b79cfdf5e6926da202bff8ae7f19fd5 Mon Sep 17 00:00:00 2001
From: Bart Ribbers <bribbers@disroot.org>
Date: Thu, 6 Jan 2022 16:11:38 +0100
Subject: [PATCH] cross/gcc-*: upgrade to 11.2.1_git20211128-r3

---
 cross/gcc-aarch64/0001-posix_memalign.patch   |   4 +-
 .../0002-gcc-poison-system-directories.patch  |   4 +-
 ...3-specs-turn-on-Wl-z-now-by-default.patch} |  19 ++-
 ...Y_SOURCE-2-by-default-for-C-C-ObjC-O.patch |   6 +-
 ...-pass-as-needed-by-default-to-the-li.patch |   6 +-
 ...rmat-and-Wformat-security-by-default.patch |   4 +-
 .../0007-Enable-Wtrampolines-by-default.patch |   4 +-
 ...ostdlib-nodefaultlibs-and-ffreestand.patch |   6 +-
 ...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 +-
 ...0017-dlang-use-libucontext-on-mips64.patch |  24 +++
 ...-define-fcntl.h-constants-for-mips6.patch} |  23 +--
 .../0019-ada-fix-shared-linking.patch}        |   4 +-
 ...uild-fix-CXXFLAGS_FOR_BUILD-passing.patch} |   4 +-
 .../0021-add-fortify-headers-paths.patch}     |   4 +-
 ...ge-provides-libssp_nonshared.a.-We-.patch} |   6 +-
 ...-pop-state-for-gold-as-well-when-li.patch} |   6 +-
 ...024-mips64-disable-multilib-support.patch} |   7 +-
 ...025-aarch64-disable-multilib-support.patch |  26 +++
 .../0026-s390x-disable-multilib-support.patch |  25 +++
 ...7-ppc64-le-disable-multilib-support.patch} |  60 ++-----
 .../0028-gcc-go-Fix-ucontext_t-on-PPC64.patch |  29 ----
 ...0028-x86_64-disable-multilib-support.patch |  26 +++
 .../0029-riscv-disable-multilib-support.patch |  74 +++++++++
 .../0030-always-build-libgcc_eh.a.patch}      |   4 +-
 ...ada-libgnarl-compatibility-for-musl.patch} |   4 +-
 .../0032-ada-musl-support-fixes.patch}        |   4 +-
 ...o-Fix-handling-of-signal-34-on-musl.patch} |   4 +-
 ...an-one-st_-a-m-c-tim-fields-in-stru.patch} |   4 +-
 ...rinting-of-unaccessible-ppc64-struct.patch |  26 ---
 ...o-signal-34-is-special-on-musl-libc.patch} |   4 +-
 ...f-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch} |   4 +-
 .../0037-gcc-go-link-to-libucontext.patch}    |   4 +-
 ...ic-errstr.go-implementation-on-musl.patch} |   4 +-
 ...ble-autolink-libatomic-use-in-LINK_.patch} |   6 +-
 ...ection-of-atomic-builtins-in-libato.patch} |   4 +-
 ...ff64_t-and-loff_t-definitions-of-mu.patch} |   4 +-
 ...e-poisoned-calloc-error-in-libgccji.patch} |   6 +-
 ...pport-for-musl-typedef-macro-guards.patch} |   4 +-
 ...64-type-as-offset-argument-for-mmap.patch} |   5 +-
 ...-stack-support-on-non-glibc-targets.patch} |   5 +-
 ...m-ptrace.h-for-pt_regs-definition-on.patch |  58 +++++++
 cross/gcc-aarch64/APKBUILD                    | 152 +++++++++---------
 cross/gcc-armhf/0001-posix_memalign.patch     |   4 +-
 .../0002-gcc-poison-system-directories.patch  |   4 +-
 ...3-specs-turn-on-Wl-z-now-by-default.patch} |  19 ++-
 ...Y_SOURCE-2-by-default-for-C-C-ObjC-O.patch |   6 +-
 ...-pass-as-needed-by-default-to-the-li.patch |   6 +-
 ...rmat-and-Wformat-security-by-default.patch |   4 +-
 .../0007-Enable-Wtrampolines-by-default.patch |   4 +-
 ...ostdlib-nodefaultlibs-and-ffreestand.patch |   6 +-
 ...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 +-
 ...0017-dlang-use-libucontext-on-mips64.patch |  24 +++
 ...-define-fcntl.h-constants-for-mips6.patch} |  23 +--
 .../0019-ada-fix-shared-linking.patch}        |   4 +-
 ...uild-fix-CXXFLAGS_FOR_BUILD-passing.patch} |   4 +-
 .../0021-add-fortify-headers-paths.patch}     |   4 +-
 ...ge-provides-libssp_nonshared.a.-We-.patch} |   6 +-
 ...-pop-state-for-gold-as-well-when-li.patch} |   6 +-
 ...024-mips64-disable-multilib-support.patch} |   7 +-
 ...025-aarch64-disable-multilib-support.patch |  26 +++
 .../0026-s390x-disable-multilib-support.patch |  25 +++
 ...7-ppc64-le-disable-multilib-support.patch} |  60 ++-----
 .../0028-gcc-go-Fix-ucontext_t-on-PPC64.patch |  29 ----
 ...0028-x86_64-disable-multilib-support.patch |  26 +++
 .../0029-riscv-disable-multilib-support.patch |  74 +++++++++
 ...ch => 0030-always-build-libgcc_eh.a.patch} |   4 +-
 ...ada-libgnarl-compatibility-for-musl.patch} |   4 +-
 .../0032-ada-musl-support-fixes.patch}        |   4 +-
 ...o-Fix-handling-of-signal-34-on-musl.patch} |   4 +-
 ...an-one-st_-a-m-c-tim-fields-in-stru.patch} |   4 +-
 ...rinting-of-unaccessible-ppc64-struct.patch |  26 ---
 ...o-signal-34-is-special-on-musl-libc.patch} |   4 +-
 ...f-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch} |   4 +-
 ... => 0037-gcc-go-link-to-libucontext.patch} |   4 +-
 ...ic-errstr.go-implementation-on-musl.patch} |   4 +-
 ...ble-autolink-libatomic-use-in-LINK_.patch} |   6 +-
 ...ection-of-atomic-builtins-in-libato.patch} |   4 +-
 ...ff64_t-and-loff_t-definitions-of-mu.patch} |   4 +-
 ...e-poisoned-calloc-error-in-libgccji.patch} |   6 +-
 ...pport-for-musl-typedef-macro-guards.patch} |   4 +-
 ...64-type-as-offset-argument-for-mmap.patch} |   5 +-
 ...-stack-support-on-non-glibc-targets.patch} |   5 +-
 ...m-ptrace.h-for-pt_regs-definition-on.patch |  58 +++++++
 cross/gcc-armhf/APKBUILD                      | 152 +++++++++---------
 cross/gcc-armv7/0001-posix_memalign.patch     |   4 +-
 .../0002-gcc-poison-system-directories.patch  |   4 +-
 ...3-specs-turn-on-Wl-z-now-by-default.patch} |  19 ++-
 ...Y_SOURCE-2-by-default-for-C-C-ObjC-O.patch |   6 +-
 ...-pass-as-needed-by-default-to-the-li.patch |   6 +-
 ...rmat-and-Wformat-security-by-default.patch |   4 +-
 .../0007-Enable-Wtrampolines-by-default.patch |   4 +-
 ...ostdlib-nodefaultlibs-and-ffreestand.patch |   6 +-
 ...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 +-
 ...0017-dlang-use-libucontext-on-mips64.patch |  24 +++
 ...-define-fcntl.h-constants-for-mips6.patch} |  23 +--
 .../0019-ada-fix-shared-linking.patch}        |   4 +-
 ...uild-fix-CXXFLAGS_FOR_BUILD-passing.patch} |   4 +-
 .../0021-add-fortify-headers-paths.patch}     |   4 +-
 ...ge-provides-libssp_nonshared.a.-We-.patch} |   6 +-
 ...-pop-state-for-gold-as-well-when-li.patch} |   6 +-
 ...024-mips64-disable-multilib-support.patch} |   7 +-
 ...025-aarch64-disable-multilib-support.patch |  26 +++
 .../0026-s390x-disable-multilib-support.patch |  25 +++
 ...7-ppc64-le-disable-multilib-support.patch} |  60 ++-----
 .../0028-gcc-go-Fix-ucontext_t-on-PPC64.patch |  29 ----
 ...0028-x86_64-disable-multilib-support.patch |  26 +++
 .../0029-riscv-disable-multilib-support.patch |  74 +++++++++
 .../0030-always-build-libgcc_eh.a.patch}      |   4 +-
 ...ada-libgnarl-compatibility-for-musl.patch} |   4 +-
 .../0032-ada-musl-support-fixes.patch}        |   4 +-
 ...o-Fix-handling-of-signal-34-on-musl.patch} |   4 +-
 ...an-one-st_-a-m-c-tim-fields-in-stru.patch} |   4 +-
 ...rinting-of-unaccessible-ppc64-struct.patch |  26 ---
 ...o-signal-34-is-special-on-musl-libc.patch} |   4 +-
 ...f-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch} |   4 +-
 .../0037-gcc-go-link-to-libucontext.patch}    |   4 +-
 ...ic-errstr.go-implementation-on-musl.patch} |   4 +-
 ...ble-autolink-libatomic-use-in-LINK_.patch} |   6 +-
 ...ection-of-atomic-builtins-in-libato.patch} |   4 +-
 ...ff64_t-and-loff_t-definitions-of-mu.patch} |   4 +-
 ...e-poisoned-calloc-error-in-libgccji.patch} |   6 +-
 ...pport-for-musl-typedef-macro-guards.patch} |   4 +-
 ...64-type-as-offset-argument-for-mmap.patch} |   5 +-
 ...-stack-support-on-non-glibc-targets.patch} |   5 +-
 ...m-ptrace.h-for-pt_regs-definition-on.patch |  58 +++++++
 cross/gcc-armv7/APKBUILD                      | 152 +++++++++---------
 147 files changed, 1281 insertions(+), 846 deletions(-)
 rename cross/gcc-aarch64/{0003-Turn-on-Wl-z-relro-z-now-by-default.patch => 0003-specs-turn-on-Wl-z-now-by-default.patch} (69%)
 create mode 100644 cross/gcc-aarch64/0017-dlang-use-libucontext-on-mips64.patch
 rename cross/{gcc-armhf/0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch => gcc-aarch64/0018-dlang-libdruntime-define-fcntl.h-constants-for-mips6.patch} (63%)
 rename cross/{gcc-armhf/0018-ada-fix-shared-linking.patch => gcc-aarch64/0019-ada-fix-shared-linking.patch} (95%)
 rename cross/{gcc-armv7/0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch => gcc-aarch64/0020-build-fix-CXXFLAGS_FOR_BUILD-passing.patch} (89%)
 rename cross/{gcc-armv7/0020-add-fortify-headers-paths.patch => gcc-aarch64/0021-add-fortify-headers-paths.patch} (91%)
 rename cross/{gcc-armv7/0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch => gcc-aarch64/0022-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch} (90%)
 rename cross/gcc-aarch64/{0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch => 0023-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch} (96%)
 rename cross/gcc-aarch64/{0023-Pure-64-bit-MIPS.patch => 0024-mips64-disable-multilib-support.patch} (91%)
 create mode 100644 cross/gcc-aarch64/0025-aarch64-disable-multilib-support.patch
 create mode 100644 cross/gcc-aarch64/0026-s390x-disable-multilib-support.patch
 rename cross/{gcc-armv7/0024-use-pure-64-bit-configuration-where-appropriate.patch => gcc-aarch64/0027-ppc64-le-disable-multilib-support.patch} (55%)
 delete mode 100644 cross/gcc-aarch64/0028-gcc-go-Fix-ucontext_t-on-PPC64.patch
 create mode 100644 cross/gcc-aarch64/0028-x86_64-disable-multilib-support.patch
 create mode 100644 cross/gcc-aarch64/0029-riscv-disable-multilib-support.patch
 rename cross/{gcc-armv7/0025-always-build-libgcc_eh.a.patch => gcc-aarch64/0030-always-build-libgcc_eh.a.patch} (95%)
 rename cross/{gcc-armv7/0026-ada-libgnarl-compatibility-for-musl.patch => gcc-aarch64/0031-ada-libgnarl-compatibility-for-musl.patch} (98%)
 rename cross/{gcc-armv7/0027-ada-musl-support-fixes.patch => gcc-aarch64/0032-ada-musl-support-fixes.patch} (99%)
 rename cross/{gcc-armv7/0029-gcc-go-Fix-handling-of-signal-34-on-musl.patch => gcc-aarch64/0033-gcc-go-Fix-handling-of-signal-34-on-musl.patch} (96%)
 rename cross/gcc-aarch64/{0030-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch => 0034-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch} (92%)
 delete mode 100644 cross/gcc-aarch64/0034-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
 rename cross/{gcc-armv7/0031-gcc-go-signal-34-is-special-on-musl-libc.patch => gcc-aarch64/0035-gcc-go-signal-34-is-special-on-musl-libc.patch} (92%)
 rename cross/{gcc-armv7/0032-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch => gcc-aarch64/0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch} (91%)
 rename cross/{gcc-armv7/0033-gcc-go-link-to-libucontext.patch => gcc-aarch64/0037-gcc-go-link-to-libucontext.patch} (90%)
 rename cross/{gcc-armhf/0035-Use-generic-errstr.go-implementation-on-musl.patch => gcc-aarch64/0038-Use-generic-errstr.go-implementation-on-musl.patch} (95%)
 rename cross/{gcc-armv7/0036-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch => gcc-aarch64/0039-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch} (98%)
 rename cross/{gcc-armv7/0037-configure-fix-detection-of-atomic-builtins-in-libato.patch => gcc-aarch64/0040-configure-fix-detection-of-atomic-builtins-in-libato.patch} (96%)
 rename cross/{gcc-armhf/0038-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch => gcc-aarch64/0041-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch} (97%)
 rename cross/{gcc-armhf/0039-Fix-attempt-to-use-poisoned-calloc-error-in-libgccji.patch => gcc-aarch64/0042-Fix-attempt-to-use-poisoned-calloc-error-in-libgccji.patch} (95%)
 rename cross/{gcc-armv7/0040-stddef.h-add-support-for-musl-typedef-macro-guards.patch => gcc-aarch64/0043-stddef.h-add-support-for-musl-typedef-macro-guards.patch} (98%)
 rename cross/gcc-aarch64/{0041-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch => 0044-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch} (95%)
 rename cross/gcc-aarch64/{0042-Disable-fsplit-stack-support-on-non-glibc-targets.patch => 0045-Disable-fsplit-stack-support-on-non-glibc-targets.patch} (98%)
 create mode 100644 cross/gcc-aarch64/0046-libgo-include-asm-ptrace.h-for-pt_regs-definition-on.patch
 rename cross/gcc-armhf/{0003-Turn-on-Wl-z-relro-z-now-by-default.patch => 0003-specs-turn-on-Wl-z-now-by-default.patch} (69%)
 create mode 100644 cross/gcc-armhf/0017-dlang-use-libucontext-on-mips64.patch
 rename cross/{gcc-aarch64/0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch => gcc-armhf/0018-dlang-libdruntime-define-fcntl.h-constants-for-mips6.patch} (63%)
 rename cross/{gcc-armv7/0018-ada-fix-shared-linking.patch => gcc-armhf/0019-ada-fix-shared-linking.patch} (95%)
 rename cross/gcc-armhf/{0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch => 0020-build-fix-CXXFLAGS_FOR_BUILD-passing.patch} (89%)
 rename cross/{gcc-aarch64/0020-add-fortify-headers-paths.patch => gcc-armhf/0021-add-fortify-headers-paths.patch} (91%)
 rename cross/gcc-armhf/{0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch => 0022-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch} (90%)
 rename cross/gcc-armhf/{0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch => 0023-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch} (96%)
 rename cross/gcc-armhf/{0023-Pure-64-bit-MIPS.patch => 0024-mips64-disable-multilib-support.patch} (91%)
 create mode 100644 cross/gcc-armhf/0025-aarch64-disable-multilib-support.patch
 create mode 100644 cross/gcc-armhf/0026-s390x-disable-multilib-support.patch
 rename cross/{gcc-aarch64/0024-use-pure-64-bit-configuration-where-appropriate.patch => gcc-armhf/0027-ppc64-le-disable-multilib-support.patch} (55%)
 delete mode 100644 cross/gcc-armhf/0028-gcc-go-Fix-ucontext_t-on-PPC64.patch
 create mode 100644 cross/gcc-armhf/0028-x86_64-disable-multilib-support.patch
 create mode 100644 cross/gcc-armhf/0029-riscv-disable-multilib-support.patch
 rename cross/gcc-armhf/{0025-always-build-libgcc_eh.a.patch => 0030-always-build-libgcc_eh.a.patch} (95%)
 rename cross/{gcc-aarch64/0026-ada-libgnarl-compatibility-for-musl.patch => gcc-armhf/0031-ada-libgnarl-compatibility-for-musl.patch} (98%)
 rename cross/{gcc-aarch64/0027-ada-musl-support-fixes.patch => gcc-armhf/0032-ada-musl-support-fixes.patch} (99%)
 rename cross/{gcc-aarch64/0029-gcc-go-Fix-handling-of-signal-34-on-musl.patch => gcc-armhf/0033-gcc-go-Fix-handling-of-signal-34-on-musl.patch} (96%)
 rename cross/gcc-armhf/{0030-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch => 0034-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch} (92%)
 delete mode 100644 cross/gcc-armhf/0034-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
 rename cross/gcc-armhf/{0031-gcc-go-signal-34-is-special-on-musl-libc.patch => 0035-gcc-go-signal-34-is-special-on-musl-libc.patch} (92%)
 rename cross/gcc-armhf/{0032-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch => 0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch} (91%)
 rename cross/gcc-armhf/{0033-gcc-go-link-to-libucontext.patch => 0037-gcc-go-link-to-libucontext.patch} (90%)
 rename cross/{gcc-armv7/0035-Use-generic-errstr.go-implementation-on-musl.patch => gcc-armhf/0038-Use-generic-errstr.go-implementation-on-musl.patch} (95%)
 rename cross/gcc-armhf/{0036-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch => 0039-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch} (98%)
 rename cross/{gcc-aarch64/0037-configure-fix-detection-of-atomic-builtins-in-libato.patch => gcc-armhf/0040-configure-fix-detection-of-atomic-builtins-in-libato.patch} (96%)
 rename cross/{gcc-armv7/0038-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch => gcc-armhf/0041-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch} (97%)
 rename cross/{gcc-armv7/0039-Fix-attempt-to-use-poisoned-calloc-error-in-libgccji.patch => gcc-armhf/0042-Fix-attempt-to-use-poisoned-calloc-error-in-libgccji.patch} (95%)
 rename cross/gcc-armhf/{0040-stddef.h-add-support-for-musl-typedef-macro-guards.patch => 0043-stddef.h-add-support-for-musl-typedef-macro-guards.patch} (98%)
 rename cross/{gcc-armv7/0041-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch => gcc-armhf/0044-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch} (95%)
 rename cross/{gcc-armv7/0042-Disable-fsplit-stack-support-on-non-glibc-targets.patch => gcc-armhf/0045-Disable-fsplit-stack-support-on-non-glibc-targets.patch} (98%)
 create mode 100644 cross/gcc-armhf/0046-libgo-include-asm-ptrace.h-for-pt_regs-definition-on.patch
 rename cross/gcc-armv7/{0003-Turn-on-Wl-z-relro-z-now-by-default.patch => 0003-specs-turn-on-Wl-z-now-by-default.patch} (69%)
 create mode 100644 cross/gcc-armv7/0017-dlang-use-libucontext-on-mips64.patch
 rename cross/gcc-armv7/{0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch => 0018-dlang-libdruntime-define-fcntl.h-constants-for-mips6.patch} (63%)
 rename cross/{gcc-aarch64/0018-ada-fix-shared-linking.patch => gcc-armv7/0019-ada-fix-shared-linking.patch} (95%)
 rename cross/{gcc-aarch64/0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch => gcc-armv7/0020-build-fix-CXXFLAGS_FOR_BUILD-passing.patch} (89%)
 rename cross/{gcc-armhf/0020-add-fortify-headers-paths.patch => gcc-armv7/0021-add-fortify-headers-paths.patch} (91%)
 rename cross/{gcc-aarch64/0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch => gcc-armv7/0022-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch} (90%)
 rename cross/gcc-armv7/{0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch => 0023-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch} (96%)
 rename cross/gcc-armv7/{0023-Pure-64-bit-MIPS.patch => 0024-mips64-disable-multilib-support.patch} (91%)
 create mode 100644 cross/gcc-armv7/0025-aarch64-disable-multilib-support.patch
 create mode 100644 cross/gcc-armv7/0026-s390x-disable-multilib-support.patch
 rename cross/{gcc-armhf/0024-use-pure-64-bit-configuration-where-appropriate.patch => gcc-armv7/0027-ppc64-le-disable-multilib-support.patch} (55%)
 delete mode 100644 cross/gcc-armv7/0028-gcc-go-Fix-ucontext_t-on-PPC64.patch
 create mode 100644 cross/gcc-armv7/0028-x86_64-disable-multilib-support.patch
 create mode 100644 cross/gcc-armv7/0029-riscv-disable-multilib-support.patch
 rename cross/{gcc-aarch64/0025-always-build-libgcc_eh.a.patch => gcc-armv7/0030-always-build-libgcc_eh.a.patch} (95%)
 rename cross/{gcc-armhf/0026-ada-libgnarl-compatibility-for-musl.patch => gcc-armv7/0031-ada-libgnarl-compatibility-for-musl.patch} (98%)
 rename cross/{gcc-armhf/0027-ada-musl-support-fixes.patch => gcc-armv7/0032-ada-musl-support-fixes.patch} (99%)
 rename cross/{gcc-armhf/0029-gcc-go-Fix-handling-of-signal-34-on-musl.patch => gcc-armv7/0033-gcc-go-Fix-handling-of-signal-34-on-musl.patch} (96%)
 rename cross/gcc-armv7/{0030-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch => 0034-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch} (92%)
 delete mode 100644 cross/gcc-armv7/0034-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
 rename cross/{gcc-aarch64/0031-gcc-go-signal-34-is-special-on-musl-libc.patch => gcc-armv7/0035-gcc-go-signal-34-is-special-on-musl-libc.patch} (92%)
 rename cross/{gcc-aarch64/0032-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch => gcc-armv7/0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch} (91%)
 rename cross/{gcc-aarch64/0033-gcc-go-link-to-libucontext.patch => gcc-armv7/0037-gcc-go-link-to-libucontext.patch} (90%)
 rename cross/{gcc-aarch64/0035-Use-generic-errstr.go-implementation-on-musl.patch => gcc-armv7/0038-Use-generic-errstr.go-implementation-on-musl.patch} (95%)
 rename cross/{gcc-aarch64/0036-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch => gcc-armv7/0039-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch} (98%)
 rename cross/{gcc-armhf/0037-configure-fix-detection-of-atomic-builtins-in-libato.patch => gcc-armv7/0040-configure-fix-detection-of-atomic-builtins-in-libato.patch} (96%)
 rename cross/{gcc-aarch64/0038-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch => gcc-armv7/0041-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch} (97%)
 rename cross/{gcc-aarch64/0039-Fix-attempt-to-use-poisoned-calloc-error-in-libgccji.patch => gcc-armv7/0042-Fix-attempt-to-use-poisoned-calloc-error-in-libgccji.patch} (95%)
 rename cross/{gcc-aarch64/0040-stddef.h-add-support-for-musl-typedef-macro-guards.patch => gcc-armv7/0043-stddef.h-add-support-for-musl-typedef-macro-guards.patch} (98%)
 rename cross/{gcc-armhf/0041-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch => gcc-armv7/0044-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch} (95%)
 rename cross/{gcc-armhf/0042-Disable-fsplit-stack-support-on-non-glibc-targets.patch => gcc-armv7/0045-Disable-fsplit-stack-support-on-non-glibc-targets.patch} (98%)
 create mode 100644 cross/gcc-armv7/0046-libgo-include-asm-ptrace.h-for-pt_regs-definition-on.patch

diff --git a/cross/gcc-aarch64/0001-posix_memalign.patch b/cross/gcc-aarch64/0001-posix_memalign.patch
index f41493c81..0be339ed1 100644
--- a/cross/gcc-aarch64/0001-posix_memalign.patch
+++ b/cross/gcc-aarch64/0001-posix_memalign.patch
@@ -1,4 +1,4 @@
-From a858e4eb74d68ef1cf7a30d6a60fb32c621267c6 Mon Sep 17 00:00:00 2001
+From 5ae72115463e483fab9bc5d46f6a5e56451cf30a 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.34.0
+2.34.1
 
diff --git a/cross/gcc-aarch64/0002-gcc-poison-system-directories.patch b/cross/gcc-aarch64/0002-gcc-poison-system-directories.patch
index a3c61fb0d..dcc3f34ba 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 6317101c9bb0616db0b919ed945466c4161ea7f1 Mon Sep 17 00:00:00 2001
+From 35d53206136617aeb91b54c37e9cbecf9e5c5f56 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.34.0
+2.34.1
 
diff --git a/cross/gcc-aarch64/0003-Turn-on-Wl-z-relro-z-now-by-default.patch b/cross/gcc-aarch64/0003-specs-turn-on-Wl-z-now-by-default.patch
similarity index 69%
rename from cross/gcc-aarch64/0003-Turn-on-Wl-z-relro-z-now-by-default.patch
rename to cross/gcc-aarch64/0003-specs-turn-on-Wl-z-now-by-default.patch
index 5f45aeadb..0f427269e 100644
--- a/cross/gcc-aarch64/0003-Turn-on-Wl-z-relro-z-now-by-default.patch
+++ b/cross/gcc-aarch64/0003-specs-turn-on-Wl-z-now-by-default.patch
@@ -1,15 +1,20 @@
-From c23602c67fd4ca33eb1f819f28f03eef50905265 Mon Sep 17 00:00:00 2001
+From 68c4bf98233cec77b2c66aa1fa1a2705b09e30b6 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:45:49 +0000
-Subject: [PATCH] Turn on -Wl,-z,relro,-z,now by default.
+Subject: [PATCH] specs: turn on -Wl,-z,now by default
 
+Previously, we also used to turn on -z relro here, but we now build
+binutils with --enable-relro, which is functionally equivalent.
+
+Binutils does not appear to have a similar option for enabling -z
+now by default.
 ---
  gcc/doc/invoke.texi | 3 +++
  gcc/gcc.c           | 1 +
  2 files changed, 4 insertions(+)
 
 diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index 9d1126e9751..46e45274859 100644
+index 9d1126e9751..4b8335bbd1f 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
 @@ -15920,6 +15920,9 @@ For example, @option{-Wl,-Map,output.map} passes @option{-Map output.map} to the
@@ -17,23 +22,23 @@ index 9d1126e9751..46e45274859 100644
  @option{-Wl,-Map=output.map}.
  
 +NOTE: In Alpine Linux, for LDFLAGS, the option
-+@option{-Wl,-z,relro,now} is used.  To disable, use @option{-Wl,-z,norelro}.
++@option{-Wl,-z,now} is used.  To disable, use @option{-Wl,-z,nonow}.
 +
  @item -u @var{symbol}
  @opindex u
  Pretend the symbol @var{symbol} is undefined, to force linking of
 diff --git a/gcc/gcc.c b/gcc/gcc.c
-index a83ba34ac4b..8c15de433ee 100644
+index a83ba34ac4b..faf9ce76b3d 100644
 --- a/gcc/gcc.c
 +++ b/gcc/gcc.c
 @@ -1150,6 +1150,7 @@ proper position among the other output files.  */
     "%{flto|flto=*:%<fcompare-debug*} \
      %{flto} %{fno-lto} %{flto=*} %l " LINK_PIE_SPEC \
     "%{fuse-ld=*:-fuse-ld=%*} " LINK_COMPRESS_DEBUG_SPEC \
-+   "-z relro -z now " \
++   "-z now " \
     "%X %{o*} %{e*} %{N} %{n} %{r}\
      %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!r:%{!nostartfiles:%S}}} \
      %{Wno-poison-system-directories:--no-poison-system-directories} \
 -- 
-2.34.0
+2.34.1
 
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 833f9d571..d76f6ec90 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 abb8ccb0dcd381e9daeb43be2d32afd0ab7c83c5 Mon Sep 17 00:00:00 2001
+From 36fde4108ebb872cbf0e45d815e76fc3ef69ded5 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:46:22 +0000
 Subject: [PATCH] Turn on -D_FORTIFY_SOURCE=2 by default for C, C++, ObjC,
@@ -25,7 +25,7 @@ index 9f993c4aff2..7db314195ff 100644
    if (flag_gnu89_inline)
      cpp_define (pfile, "__GNUC_GNU_INLINE__");
 diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index 46e45274859..1b4a698a191 100644
+index 4b8335bbd1f..833164e0a2b 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
 @@ -10224,6 +10224,12 @@ also turns on the following optimization flags:
@@ -42,5 +42,5 @@ index 46e45274859..1b4a698a191 100644
  @opindex O3
  Optimize yet more.  @option{-O3} turns on all optimizations specified
 -- 
-2.34.0
+2.34.1
 
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 9f927abbd..5dce434b8 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 22071923bf903a7bf851d1e59dcc1d07c6b0e876 Mon Sep 17 00:00:00 2001
+From 49c826ad1ccaf63569b25318990a531ebe6fbc9c 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,
@@ -208,7 +208,7 @@ index 2550d7ee8f0..7596d0b2757 100644
    %{!shared: \
      %{!static: \
 diff --git a/gcc/gcc.c b/gcc/gcc.c
-index 8c15de433ee..be1508e5abe 100644
+index faf9ce76b3d..1ad5da6d769 100644
 --- a/gcc/gcc.c
 +++ b/gcc/gcc.c
 @@ -737,8 +737,11 @@ proper position among the other output files.  */
@@ -268,5 +268,5 @@ index 8c15de433ee..be1508e5abe 100644
  #else
  #define LIBUBSAN_SPEC "-lubsan" STATIC_LIBUBSAN_LIBS
 -- 
-2.34.0
+2.34.1
 
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 d8843fd18..40af6af09 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 622ce6893c48eaa87beb7399ecb73bdadc9b7b84 Mon Sep 17 00:00:00 2001
+From c1a52e22d7ceef0f89a83ef2673f3d237c78e4dc 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.34.0
+2.34.1
 
diff --git a/cross/gcc-aarch64/0007-Enable-Wtrampolines-by-default.patch b/cross/gcc-aarch64/0007-Enable-Wtrampolines-by-default.patch
index cbfe46c49..fcf288188 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 ad29ab28462968097dad017f03c4db40f4d83174 Mon Sep 17 00:00:00 2001
+From 28102796795e8509cb798d59d1339a3d1c392eda 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.34.0
+2.34.1
 
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 39dc6400f..4660066d1 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 0fd84cfeabaf572f5f901fa7d13298286d84992b Mon Sep 17 00:00:00 2001
+From 7e7c1f8a11a36e286a00f2eca90f55b3a32917b5 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
@@ -10,7 +10,7 @@ Subject: [PATCH] Disable ssp on -nostdlib, -nodefaultlibs and -ffreestanding
  2 files changed, 8 insertions(+), 2 deletions(-)
 
 diff --git a/gcc/gcc.c b/gcc/gcc.c
-index be1508e5abe..e495b222095 100644
+index 1ad5da6d769..99314032ec2 100644
 --- a/gcc/gcc.c
 +++ b/gcc/gcc.c
 @@ -989,6 +989,12 @@ proper position among the other output files.  */
@@ -49,5 +49,5 @@ index 8ba281b4cfa..bab39cdf8a2 100644
  
  -param=stack-clash-protection-guard-size=
 -- 
-2.34.0
+2.34.1
 
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 5093eefc9..ebc1d061c 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 b788f9a685522fdd615c2c9aa7feab974c6d6b09 Mon Sep 17 00:00:00 2001
+From 8579d1acd984ecf29160c2925b8c0c16491083db 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.34.0
+2.34.1
 
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 1e7627544..5b32f18f8 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 1f2c3d7a0d1c35cb8281c5d97eb8ecfe2987e8b3 Mon Sep 17 00:00:00 2001
+From 9c288cea05c5fc3999f3ab0fbd207923a550450d 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.34.0
+2.34.1
 
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 4022561e9..73c1d32e2 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 a110462c21bc26c6c3c8d3265d3f146d1b9bddae Mon Sep 17 00:00:00 2001
+From b1fc0dcb018034d2440e7405bcb1e15f3d986fc4 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.34.0
+2.34.1
 
diff --git a/cross/gcc-aarch64/0012-libitm-disable-FORTIFY.patch b/cross/gcc-aarch64/0012-libitm-disable-FORTIFY.patch
index b118ad486..76b59d8b1 100644
--- a/cross/gcc-aarch64/0012-libitm-disable-FORTIFY.patch
+++ b/cross/gcc-aarch64/0012-libitm-disable-FORTIFY.patch
@@ -1,4 +1,4 @@
-From e0ad9c8c39f35a47c6a4c34ae161d768bf2f6fcc Mon Sep 17 00:00:00 2001
+From 9b6bffd441a7d747c13eb1b1c09ebc6bdb050b17 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.34.0
+2.34.1
 
diff --git a/cross/gcc-aarch64/0013-libgcc_s.patch b/cross/gcc-aarch64/0013-libgcc_s.patch
index 4e1631d67..af2881bc7 100644
--- a/cross/gcc-aarch64/0013-libgcc_s.patch
+++ b/cross/gcc-aarch64/0013-libgcc_s.patch
@@ -1,4 +1,4 @@
-From 57309d5900d3bc974b9a3efff34fdc601014b386 Mon Sep 17 00:00:00 2001
+From 028a4d00386b50bc20141bab7eebc6f9071d47fc 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.34.0
+2.34.1
 
diff --git a/cross/gcc-aarch64/0014-nopie.patch b/cross/gcc-aarch64/0014-nopie.patch
index a51d4c693..15362cd24 100644
--- a/cross/gcc-aarch64/0014-nopie.patch
+++ b/cross/gcc-aarch64/0014-nopie.patch
@@ -1,4 +1,4 @@
-From d10ec6f4bea9d3f07d3ada43da129a4b5812fd65 Mon Sep 17 00:00:00 2001
+From a66c4f80981aebf73779960f8fa8c91b6aa6c85f 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.34.0
+2.34.1
 
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 699e09562..6740c3310 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 2640a3cf5ecfaf532448baa66ea138c3ef02dec1 Mon Sep 17 00:00:00 2001
+From a0f248d4b4ccb787d4479229e9f5b0ba1b3aa7d5 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.34.0
+2.34.1
 
diff --git a/cross/gcc-aarch64/0016-dlang-update-zlib-binding.patch b/cross/gcc-aarch64/0016-dlang-update-zlib-binding.patch
index 37d4117aa..223078f65 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 60d97064fb53a99c6189f9cb81824a70d435d2d1 Mon Sep 17 00:00:00 2001
+From 9aa0f7fc3b563246014f0a26cd1b8426d310046d 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.34.0
+2.34.1
 
diff --git a/cross/gcc-aarch64/0017-dlang-use-libucontext-on-mips64.patch b/cross/gcc-aarch64/0017-dlang-use-libucontext-on-mips64.patch
new file mode 100644
index 000000000..223b35f7b
--- /dev/null
+++ b/cross/gcc-aarch64/0017-dlang-use-libucontext-on-mips64.patch
@@ -0,0 +1,24 @@
+From b103cbe23f697c81922fa027d467622e0d2fc8a8 Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Thu, 6 Jan 2022 03:18:32 +0000
+Subject: [PATCH] dlang: use libucontext on mips64
+
+---
+ libphobos/configure.tgt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libphobos/configure.tgt b/libphobos/configure.tgt
+index 0643daeb613..b74d9fb3f25 100644
+--- a/libphobos/configure.tgt
++++ b/libphobos/configure.tgt
+@@ -38,6 +38,7 @@ case "${target}" in
+ 	;;
+   mips*-*-linux*)
+ 	LIBPHOBOS_SUPPORTED=yes
++	LIBDRUNTIME_NEEDS_UCONTEXT=yes
+ 	;;
+   power*-*-freebsd*)
+ 	LIBPHOBOS_SUPPORTED=yes
+-- 
+2.34.1
+
diff --git a/cross/gcc-armhf/0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch b/cross/gcc-aarch64/0018-dlang-libdruntime-define-fcntl.h-constants-for-mips6.patch
similarity index 63%
rename from cross/gcc-armhf/0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch
rename to cross/gcc-aarch64/0018-dlang-libdruntime-define-fcntl.h-constants-for-mips6.patch
index 0b05c3564..b51fcacec 100644
--- a/cross/gcc-armhf/0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch
+++ b/cross/gcc-aarch64/0018-dlang-libdruntime-define-fcntl.h-constants-for-mips6.patch
@@ -1,25 +1,12 @@
-From 8524e44401fa57f6bdf78f39fb60cbb76046d256 Mon Sep 17 00:00:00 2001
+From 37194c8f82652477eeea81c62628309896fefcfd 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
+Date: Thu, 6 Jan 2022 03:19:12 +0000
+Subject: [PATCH] dlang: libdruntime: define fcntl.h constants for mips64
 
 ---
- libphobos/configure.tgt                      |  1 +
  libphobos/libdruntime/core/sys/posix/fcntl.d | 15 +++++++++++++++
- 2 files changed, 16 insertions(+)
+ 1 file changed, 15 insertions(+)
 
-diff --git a/libphobos/configure.tgt b/libphobos/configure.tgt
-index 88c027d0c28..48ef12aaa5e 100644
---- a/libphobos/configure.tgt
-+++ b/libphobos/configure.tgt
-@@ -38,6 +38,7 @@ case "${target}" in
- 	;;
-   mips*-*-linux*)
- 	LIBPHOBOS_SUPPORTED=yes
-+	LIBDRUNTIME_NEEDS_UCONTEXT=yes
- 	;;
-   power*-*-linux*)
- 	LIBPHOBOS_SUPPORTED=yes
 diff --git a/libphobos/libdruntime/core/sys/posix/fcntl.d b/libphobos/libdruntime/core/sys/posix/fcntl.d
 index 59df921ba41..9ee9f943948 100644
 --- a/libphobos/libdruntime/core/sys/posix/fcntl.d
@@ -47,5 +34,5 @@ index 59df921ba41..9ee9f943948 100644
          static assert(0, "Platform not supported");
  
 -- 
-2.34.0
+2.34.1
 
diff --git a/cross/gcc-armhf/0018-ada-fix-shared-linking.patch b/cross/gcc-aarch64/0019-ada-fix-shared-linking.patch
similarity index 95%
rename from cross/gcc-armhf/0018-ada-fix-shared-linking.patch
rename to cross/gcc-aarch64/0019-ada-fix-shared-linking.patch
index cbed48d66..7a71e35ec 100644
--- a/cross/gcc-armhf/0018-ada-fix-shared-linking.patch
+++ b/cross/gcc-aarch64/0019-ada-fix-shared-linking.patch
@@ -1,4 +1,4 @@
-From 03810f135f7106da0b9fef6c60c9def8b1891940 Mon Sep 17 00:00:00 2001
+From faa76d0bb79553be27fe82b1e85194e7a5284885 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.34.0
+2.34.1
 
diff --git a/cross/gcc-armv7/0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch b/cross/gcc-aarch64/0020-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
similarity index 89%
rename from cross/gcc-armv7/0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
rename to cross/gcc-aarch64/0020-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
index dbb474047..3047c9b32 100644
--- a/cross/gcc-armv7/0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
+++ b/cross/gcc-aarch64/0020-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
@@ -1,4 +1,4 @@
-From b0eafa664f78c3d3f5d9bf38ece54777119c8e6e Mon Sep 17 00:00:00 2001
+From 322c11faac7212b3302d941ae96ff19b47930d16 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.34.0
+2.34.1
 
diff --git a/cross/gcc-armv7/0020-add-fortify-headers-paths.patch b/cross/gcc-aarch64/0021-add-fortify-headers-paths.patch
similarity index 91%
rename from cross/gcc-armv7/0020-add-fortify-headers-paths.patch
rename to cross/gcc-aarch64/0021-add-fortify-headers-paths.patch
index 62c748eb8..32bc021d7 100644
--- a/cross/gcc-armv7/0020-add-fortify-headers-paths.patch
+++ b/cross/gcc-aarch64/0021-add-fortify-headers-paths.patch
@@ -1,4 +1,4 @@
-From 8dda8a6e1bd6f49f687f9b6725e704eaa0b25873 Mon Sep 17 00:00:00 2001
+From 510963f7eeb031182c1c986365cc65bd4ddc5885 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.34.0
+2.34.1
 
diff --git a/cross/gcc-armv7/0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch b/cross/gcc-aarch64/0022-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
similarity index 90%
rename from cross/gcc-armv7/0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
rename to cross/gcc-aarch64/0022-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
index ff2c2be4b..be9e67f06 100644
--- a/cross/gcc-armv7/0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
+++ b/cross/gcc-aarch64/0022-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
@@ -1,4 +1,4 @@
-From 06a8b9fd165032afd96facc5c4e608bfe09ecbea Mon Sep 17 00:00:00 2001
+From b5235a7f62974f3eee20cb511d91c2629f198b69 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
@@ -13,7 +13,7 @@ Subject: [PATCH] Alpine musl package provides libssp_nonshared.a. We link to
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 diff --git a/gcc/gcc.c b/gcc/gcc.c
-index e495b222095..ab8866f409f 100644
+index 99314032ec2..6e91767efe8 100644
 --- a/gcc/gcc.c
 +++ b/gcc/gcc.c
 @@ -997,8 +997,7 @@ proper position among the other output files.  */
@@ -27,5 +27,5 @@ index e495b222095..ab8866f409f 100644
  #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
  		       "|fstack-protector-strong|fstack-protector-explicit" \
 -- 
-2.34.0
+2.34.1
 
diff --git a/cross/gcc-aarch64/0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch b/cross/gcc-aarch64/0023-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
similarity index 96%
rename from cross/gcc-aarch64/0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
rename to cross/gcc-aarch64/0023-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
index 198f47760..2a55e5c57 100644
--- a/cross/gcc-aarch64/0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
+++ b/cross/gcc-aarch64/0023-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
@@ -1,4 +1,4 @@
-From c279684da1a93b3009c24b7236e2a58c3eb2fe9c Mon Sep 17 00:00:00 2001
+From 0edc38fb81111b5719043d2fbdd4f55e43bcacf0 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
@@ -9,7 +9,7 @@ Subject: [PATCH] DP: Use --push-state/--pop-state for gold as well when
  1 file changed, 8 insertions(+), 8 deletions(-)
 
 diff --git a/gcc/gcc.c b/gcc/gcc.c
-index ab8866f409f..5093e8bbfd2 100644
+index 6e91767efe8..22dbbf85850 100644
 --- a/gcc/gcc.c
 +++ b/gcc/gcc.c
 @@ -738,10 +738,10 @@ proper position among the other output files.  */
@@ -65,5 +65,5 @@ index ab8866f409f..5093e8bbfd2 100644
  #else
  #define LIBUBSAN_SPEC "-lubsan" STATIC_LIBUBSAN_LIBS
 -- 
-2.34.0
+2.34.1
 
diff --git a/cross/gcc-aarch64/0023-Pure-64-bit-MIPS.patch b/cross/gcc-aarch64/0024-mips64-disable-multilib-support.patch
similarity index 91%
rename from cross/gcc-aarch64/0023-Pure-64-bit-MIPS.patch
rename to cross/gcc-aarch64/0024-mips64-disable-multilib-support.patch
index 60571ddaa..20a55f862 100644
--- a/cross/gcc-aarch64/0023-Pure-64-bit-MIPS.patch
+++ b/cross/gcc-aarch64/0024-mips64-disable-multilib-support.patch
@@ -1,8 +1,9 @@
-From 249a08b7257fa09d572933142cc9146c92f38dd2 Mon Sep 17 00:00:00 2001
+From e87872e7ba3c3d7cec1a77b49a7367902958d483 Mon Sep 17 00:00:00 2001
 From: Nils Andreas Svee <me@lochnair.net>
 Date: Thu, 21 Dec 2017 03:14:33 +0100
-Subject: [PATCH] Pure 64-bit MIPS
+Subject: [PATCH] mips64: disable multilib support
 
+multilib is not supported by Alpine GCC
 ---
  gcc/config/mips/mips.h    | 8 ++++----
  gcc/config/mips/t-linux64 | 6 +++---
@@ -43,5 +44,5 @@ index 130e1f04707..a64ac2bbb5b 100644
 +        ../lib32 \
 +        ../lib
 -- 
-2.34.0
+2.34.1
 
diff --git a/cross/gcc-aarch64/0025-aarch64-disable-multilib-support.patch b/cross/gcc-aarch64/0025-aarch64-disable-multilib-support.patch
new file mode 100644
index 000000000..b88fa60ba
--- /dev/null
+++ b/cross/gcc-aarch64/0025-aarch64-disable-multilib-support.patch
@@ -0,0 +1,26 @@
+From 61d47862caefd2709aed78fec8fc3b472aa3a98b Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Thu, 6 Jan 2022 03:12:55 +0000
+Subject: [PATCH] aarch64: disable multilib support
+
+multilib is unsupported on Alpine GCC
+---
+ gcc/config/aarch64/t-aarch64-linux | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gcc/config/aarch64/t-aarch64-linux b/gcc/config/aarch64/t-aarch64-linux
+index 241b0ef20b6..18e63b34d8b 100644
+--- a/gcc/config/aarch64/t-aarch64-linux
++++ b/gcc/config/aarch64/t-aarch64-linux
+@@ -22,7 +22,7 @@ LIB1ASMSRC   = aarch64/lib1funcs.asm
+ LIB1ASMFUNCS = _aarch64_sync_cache_range
+ 
+ AARCH_BE = $(if $(findstring TARGET_BIG_ENDIAN_DEFAULT=1, $(tm_defines)),_be)
+-MULTILIB_OSDIRNAMES = mabi.lp64=../lib64$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu)
++MULTILIB_OSDIRNAMES = mabi.lp64=../lib
+ MULTIARCH_DIRNAME = $(call if_multiarch,aarch64$(AARCH_BE)-linux-gnu)
+ 
+ MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu_ilp32)
+-- 
+2.34.1
+
diff --git a/cross/gcc-aarch64/0026-s390x-disable-multilib-support.patch b/cross/gcc-aarch64/0026-s390x-disable-multilib-support.patch
new file mode 100644
index 000000000..9dd66f866
--- /dev/null
+++ b/cross/gcc-aarch64/0026-s390x-disable-multilib-support.patch
@@ -0,0 +1,25 @@
+From 00fa0519dd9d6d4702999d245f80362dc0c60ea0 Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Thu, 6 Jan 2022 03:13:59 +0000
+Subject: [PATCH] s390x: disable multilib support
+
+multilib is not supported on Alpine GCC at present
+---
+ gcc/config/s390/t-linux64 | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gcc/config/s390/t-linux64 b/gcc/config/s390/t-linux64
+index cc6ab367072..7f498ee1cdc 100644
+--- a/gcc/config/s390/t-linux64
++++ b/gcc/config/s390/t-linux64
+@@ -7,5 +7,5 @@
+ 
+ MULTILIB_OPTIONS = m64/m31
+ MULTILIB_DIRNAMES = 64 32
+-MULTILIB_OSDIRNAMES = ../lib64$(call if_multiarch,:s390x-linux-gnu)
+-MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:s390-linux-gnu)
++MULTILIB_OSDIRNAMES = m64=../lib
++MULTILIB_OSDIRNAMES+= m32=../lib32
+-- 
+2.34.1
+
diff --git a/cross/gcc-armv7/0024-use-pure-64-bit-configuration-where-appropriate.patch b/cross/gcc-aarch64/0027-ppc64-le-disable-multilib-support.patch
similarity index 55%
rename from cross/gcc-armv7/0024-use-pure-64-bit-configuration-where-appropriate.patch
rename to cross/gcc-aarch64/0027-ppc64-le-disable-multilib-support.patch
index 917e89344..89dc4e279 100644
--- a/cross/gcc-armv7/0024-use-pure-64-bit-configuration-where-appropriate.patch
+++ b/cross/gcc-aarch64/0027-ppc64-le-disable-multilib-support.patch
@@ -1,44 +1,16 @@
-From 0c9502cb5db1f2898b531cfb1d3b733490045845 Mon Sep 17 00:00:00 2001
+From 9d762381527aed2c271ea983f54fabd634863701 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
+Date: Thu, 6 Jan 2022 03:14:33 +0000
+Subject: [PATCH] ppc64[le]: disable multilib support
 
+multilib is not presently supported on Alpine GCC
 ---
- gcc/config/aarch64/t-aarch64-linux | 2 +-
- gcc/config/i386/t-linux64          | 4 ++--
- gcc/config/rs6000/t-linux          | 6 ++++--
- gcc/config/rs6000/t-linux64        | 4 ++--
- gcc/config/rs6000/t-linux64bele    | 4 ++--
- gcc/config/rs6000/t-linux64lebe    | 4 ++--
- gcc/config/s390/t-linux64          | 4 ++--
- 7 files changed, 15 insertions(+), 13 deletions(-)
+ gcc/config/rs6000/t-linux       | 6 ++++--
+ gcc/config/rs6000/t-linux64     | 4 ++--
+ gcc/config/rs6000/t-linux64bele | 4 ++--
+ gcc/config/rs6000/t-linux64lebe | 4 ++--
+ 4 files changed, 10 insertions(+), 8 deletions(-)
 
-diff --git a/gcc/config/aarch64/t-aarch64-linux b/gcc/config/aarch64/t-aarch64-linux
-index 241b0ef20b6..18e63b34d8b 100644
---- a/gcc/config/aarch64/t-aarch64-linux
-+++ b/gcc/config/aarch64/t-aarch64-linux
-@@ -22,7 +22,7 @@ LIB1ASMSRC   = aarch64/lib1funcs.asm
- LIB1ASMFUNCS = _aarch64_sync_cache_range
- 
- AARCH_BE = $(if $(findstring TARGET_BIG_ENDIAN_DEFAULT=1, $(tm_defines)),_be)
--MULTILIB_OSDIRNAMES = mabi.lp64=../lib64$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu)
-+MULTILIB_OSDIRNAMES = mabi.lp64=../lib
- MULTIARCH_DIRNAME = $(call if_multiarch,aarch64$(AARCH_BE)-linux-gnu)
- 
- MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu_ilp32)
-diff --git a/gcc/config/i386/t-linux64 b/gcc/config/i386/t-linux64
-index d288b093522..2949033aa04 100644
---- a/gcc/config/i386/t-linux64
-+++ b/gcc/config/i386/t-linux64
-@@ -33,6 +33,6 @@
- comma=,
- MULTILIB_OPTIONS    = $(subst $(comma),/,$(TM_MULTILIB_CONFIG))
- MULTILIB_DIRNAMES   = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS)))
--MULTILIB_OSDIRNAMES = m64=../lib64$(call if_multiarch,:x86_64-linux-gnu)
--MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:i386-linux-gnu)
-+MULTILIB_OSDIRNAMES = m64=../lib
-+MULTILIB_OSDIRNAMES+= m32=../lib32
- MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32)
 diff --git a/gcc/config/rs6000/t-linux b/gcc/config/rs6000/t-linux
 index aeb7440c492..ab14c455d8d 100644
 --- a/gcc/config/rs6000/t-linux
@@ -104,18 +76,6 @@ index 2e63bdb9fc9..c6e1c5db65d 100644
 +MULTILIB_OSDIRNAMES := m64=../lib
 +MULTILIB_OSDIRNAMES += m32=../lib32
  MULTILIB_MATCHES    := ${MULTILIB_MATCHES_ENDIAN}
-diff --git a/gcc/config/s390/t-linux64 b/gcc/config/s390/t-linux64
-index cc6ab367072..7f498ee1cdc 100644
---- a/gcc/config/s390/t-linux64
-+++ b/gcc/config/s390/t-linux64
-@@ -7,5 +7,5 @@
- 
- MULTILIB_OPTIONS = m64/m31
- MULTILIB_DIRNAMES = 64 32
--MULTILIB_OSDIRNAMES = ../lib64$(call if_multiarch,:s390x-linux-gnu)
--MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:s390-linux-gnu)
-+MULTILIB_OSDIRNAMES = m64=../lib
-+MULTILIB_OSDIRNAMES+= m32=../lib32
 -- 
-2.34.0
+2.34.1
 
diff --git a/cross/gcc-aarch64/0028-gcc-go-Fix-ucontext_t-on-PPC64.patch b/cross/gcc-aarch64/0028-gcc-go-Fix-ucontext_t-on-PPC64.patch
deleted file mode 100644
index e684c26e6..000000000
--- a/cross/gcc-aarch64/0028-gcc-go-Fix-ucontext_t-on-PPC64.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Taken from Adélie Linux.
----
- libgo/runtime/go-signal.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libgo/runtime/go-signal.c b/libgo/runtime/go-signal.c
-index d30d1603adc..57f6824eb9e 100644
---- a/libgo/runtime/go-signal.c
-+++ b/libgo/runtime/go-signal.c
-@@ -224,7 +224,7 @@ getSiginfo(siginfo_t *info, void *context __attribute__((unused)))
- #elif defined(__alpha__) && defined(__linux__)
- 	ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.sc_pc;
- #elif defined(__PPC__) && defined(__linux__)
--	ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.regs->nip;
-+	ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.gp_regs[32];
- #elif defined(__PPC__) && defined(_AIX)
- 	ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.jmp_context.iar;
- #elif defined(__aarch64__) && defined(__linux__)
--- 
-2.34.0
-
diff --git a/cross/gcc-aarch64/0028-x86_64-disable-multilib-support.patch b/cross/gcc-aarch64/0028-x86_64-disable-multilib-support.patch
new file mode 100644
index 000000000..4bb28803e
--- /dev/null
+++ b/cross/gcc-aarch64/0028-x86_64-disable-multilib-support.patch
@@ -0,0 +1,26 @@
+From c98b08105a8d28db3ee011f0d0841b235df9f89b Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Thu, 6 Jan 2022 03:14:54 +0000
+Subject: [PATCH] x86_64: disable multilib support
+
+multilib is not presently supported on Alpine GCC
+---
+ gcc/config/i386/t-linux64 | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gcc/config/i386/t-linux64 b/gcc/config/i386/t-linux64
+index d288b093522..2949033aa04 100644
+--- a/gcc/config/i386/t-linux64
++++ b/gcc/config/i386/t-linux64
+@@ -33,6 +33,6 @@
+ comma=,
+ MULTILIB_OPTIONS    = $(subst $(comma),/,$(TM_MULTILIB_CONFIG))
+ MULTILIB_DIRNAMES   = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS)))
+-MULTILIB_OSDIRNAMES = m64=../lib64$(call if_multiarch,:x86_64-linux-gnu)
+-MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:i386-linux-gnu)
++MULTILIB_OSDIRNAMES = m64=../lib
++MULTILIB_OSDIRNAMES+= m32=../lib32
+ MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32)
+-- 
+2.34.1
+
diff --git a/cross/gcc-aarch64/0029-riscv-disable-multilib-support.patch b/cross/gcc-aarch64/0029-riscv-disable-multilib-support.patch
new file mode 100644
index 000000000..639f95cc6
--- /dev/null
+++ b/cross/gcc-aarch64/0029-riscv-disable-multilib-support.patch
@@ -0,0 +1,74 @@
+From ac2cf2b6ef9a496f5d6eeb07338384dc38778782 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
+Date: Mon, 3 Jan 2022 07:14:48 +0100
+Subject: [PATCH] riscv: disable multilib support
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From the musl wiki [1]:
+
+	musl does not support sharing an include directory between archs
+	[…], and thus is not compatible with GCC-style multilib. It is
+	recommended that distributions build GCC with multilib disabled,
+	and use library directories named lib, not lib64 or lib32.
+
+For this reason, we patch existing GCC configuration files (gcc/config)
+to pin MULTILIB_OSDIRNAMES to lib, there is also a corresponding GCC
+upstream bug about this issue [2]. Avoiding the use of lib64 and lib32
+directories is a bit more difficult on the RISC-V architecture. This is
+due to the fact that the default RISC-V configuration does not only use
+the lib64 and lib32 directories but also subdirectories within these
+directories for different RISC-V ABIs (e.g. lp64d, lp64, …) [3].
+
+This patch aligns the RISC-V configuration with other architectures by
+pinning MULTILIB_OSDIRNAMES to lib for rv64gc (our default RISC-V
+-march). Furthermore, this patch removes the ABI-specific startfile
+prefix spec. Since both of these impact the default LIBRARY_PATH [4]
+this patch thereby aligns the default RISC-V LIBRARY_PATH with that from
+other Alpine architectures and thereby fixes #13369 [5].
+
+Incidentally, this also fixes gccgo on riscv64, as without this patch
+gccgo is otherwise not able to find the *.gox files for the Go standard
+library.
+
+[1]: https://wiki.musl-libc.org/guidelines-for-distributions.html#Multilib/multi_arch
+[2]: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90077
+[3]: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=103889#c14
+[4]: https://gcc.gnu.org/git/?p=gcc.git;a=blob;f=gcc/gcc.c;h=d4c8746b0aa322286decf92aa72a12f0a393b655;hb=HEAD#l9122
+[5]: https://gitlab.alpinelinux.org/alpine/aports/-/issues/13369
+---
+ gcc/config/riscv/linux.h | 6 ------
+ gcc/config/riscv/t-linux | 7 +++++--
+ 2 files changed, 5 insertions(+), 8 deletions(-)
+
+diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h
+index ee29979dd34..fe8a82d6702 100644
+--- a/gcc/config/riscv/linux.h
++++ b/gcc/config/riscv/linux.h
+@@ -71,9 +71,3 @@ along with GCC; see the file COPYING3.  If not see
+     %{static:-static}}"
+ 
+ #define TARGET_ASM_FILE_END file_end_indicate_exec_stack
+-
+-#define STARTFILE_PREFIX_SPEC 			\
+-   "/lib" XLEN_SPEC "/" ABI_SPEC "/ "		\
+-   "/usr/lib" XLEN_SPEC "/" ABI_SPEC "/ "	\
+-   "/lib/ "					\
+-   "/usr/lib/ "
+diff --git a/gcc/config/riscv/t-linux b/gcc/config/riscv/t-linux
+index 216d2776a18..1a8a863853e 100644
+--- a/gcc/config/riscv/t-linux
++++ b/gcc/config/riscv/t-linux
+@@ -1,3 +1,6 @@
+-# Only XLEN and ABI affect Linux multilib dir names, e.g. /lib32/ilp32d/
+-MULTILIB_DIRNAMES := $(patsubst rv32%,lib32,$(patsubst rv64%,lib64,$(MULTILIB_DIRNAMES)))
++MULTILIB_OPTIONS := march=rv64gc
++MULTILIB_DIRNAMES := rv64gc
++
++MULTILIB_DIRNAMES := $(patsubst rv32%,lib32,$(patsubst rv64%,lib,$(MULTILIB_DIRNAMES)))
+ MULTILIB_OSDIRNAMES := $(patsubst lib%,../lib%,$(MULTILIB_DIRNAMES))
++MULTILIB_MATCHES := march?rv64gc=march?rv64imafdc
+-- 
+2.34.1
+
diff --git a/cross/gcc-armv7/0025-always-build-libgcc_eh.a.patch b/cross/gcc-aarch64/0030-always-build-libgcc_eh.a.patch
similarity index 95%
rename from cross/gcc-armv7/0025-always-build-libgcc_eh.a.patch
rename to cross/gcc-aarch64/0030-always-build-libgcc_eh.a.patch
index bf8e0dc20..d05bb9376 100644
--- a/cross/gcc-armv7/0025-always-build-libgcc_eh.a.patch
+++ b/cross/gcc-aarch64/0030-always-build-libgcc_eh.a.patch
@@ -1,4 +1,4 @@
-From 338f65b9c13e8aaacf146e0fe2400566766f02e4 Mon Sep 17 00:00:00 2001
+From 119e2461840821ae3bbf00190f908cb649368384 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.34.0
+2.34.1
 
diff --git a/cross/gcc-armv7/0026-ada-libgnarl-compatibility-for-musl.patch b/cross/gcc-aarch64/0031-ada-libgnarl-compatibility-for-musl.patch
similarity index 98%
rename from cross/gcc-armv7/0026-ada-libgnarl-compatibility-for-musl.patch
rename to cross/gcc-aarch64/0031-ada-libgnarl-compatibility-for-musl.patch
index 3e6e8b394..a6450526a 100644
--- a/cross/gcc-armv7/0026-ada-libgnarl-compatibility-for-musl.patch
+++ b/cross/gcc-aarch64/0031-ada-libgnarl-compatibility-for-musl.patch
@@ -1,4 +1,4 @@
-From 0703d9ad84cd92f8a08787a85536a98b3830bba0 Mon Sep 17 00:00:00 2001
+From a797880afb2876812d972fcb4e26b6c856cdf97a 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.34.0
+2.34.1
 
diff --git a/cross/gcc-armv7/0027-ada-musl-support-fixes.patch b/cross/gcc-aarch64/0032-ada-musl-support-fixes.patch
similarity index 99%
rename from cross/gcc-armv7/0027-ada-musl-support-fixes.patch
rename to cross/gcc-aarch64/0032-ada-musl-support-fixes.patch
index 3a7075f96..eaa523650 100644
--- a/cross/gcc-armv7/0027-ada-musl-support-fixes.patch
+++ b/cross/gcc-aarch64/0032-ada-musl-support-fixes.patch
@@ -1,4 +1,4 @@
-From 0b879c9a3ef83b3b08a0d72bfe89816d52489408 Mon Sep 17 00:00:00 2001
+From 55f41483ea3d40c5b790a8b70e3662511c1bcc45 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.34.0
+2.34.1
 
diff --git a/cross/gcc-armv7/0029-gcc-go-Fix-handling-of-signal-34-on-musl.patch b/cross/gcc-aarch64/0033-gcc-go-Fix-handling-of-signal-34-on-musl.patch
similarity index 96%
rename from cross/gcc-armv7/0029-gcc-go-Fix-handling-of-signal-34-on-musl.patch
rename to cross/gcc-aarch64/0033-gcc-go-Fix-handling-of-signal-34-on-musl.patch
index 30af57256..3d6033aee 100644
--- a/cross/gcc-armv7/0029-gcc-go-Fix-handling-of-signal-34-on-musl.patch
+++ b/cross/gcc-aarch64/0033-gcc-go-Fix-handling-of-signal-34-on-musl.patch
@@ -1,4 +1,4 @@
-From 098c0bca8bd1f47e94c8368406973019bbe9bf55 Mon Sep 17 00:00:00 2001
+From e6fe77d1aef59373675f61a102c511529b1f5125 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.34.0
+2.34.1
 
diff --git a/cross/gcc-aarch64/0030-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch b/cross/gcc-aarch64/0034-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch
similarity index 92%
rename from cross/gcc-aarch64/0030-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch
rename to cross/gcc-aarch64/0034-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch
index 60ce845eb..80ef879f9 100644
--- a/cross/gcc-aarch64/0030-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch
+++ b/cross/gcc-aarch64/0034-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch
@@ -1,4 +1,4 @@
-From 7ba79053336c8666d3f137ef106696926d3f7b31 Mon Sep 17 00:00:00 2001
+From a385ececbc3f01007ad62002d994e35ce3e2e2b9 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.34.0
+2.34.1
 
diff --git a/cross/gcc-aarch64/0034-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch b/cross/gcc-aarch64/0034-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
deleted file mode 100644
index bd5876103..000000000
--- a/cross/gcc-aarch64/0034-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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
-
-These struct members do not seem to exist on musl.
----
- libgo/runtime/go-signal.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libgo/runtime/go-signal.c b/libgo/runtime/go-signal.c
-index 57f6824eb9e..fd03db420d4 100644
---- a/libgo/runtime/go-signal.c
-+++ b/libgo/runtime/go-signal.c
-@@ -335,7 +335,7 @@ dumpregs(siginfo_t *info __attribute__((unused)), void *context __attribute__((u
- 		runtime_printf("sp  %X\n", m->sc_regs[30]);
- 		runtime_printf("pc  %X\n", m->sc_pc);
- 	  }
--#elif defined(__PPC__) && defined(__LITTLE_ENDIAN__) && defined(__linux__)
-+#elif defined(__PPC__) && defined(__LITTLE_ENDIAN__) && defined(__GLIBC__)
- 	  {
- 		mcontext_t *m = &((ucontext_t*)(context))->uc_mcontext;
- 		int i;
--- 
-2.34.0
-
diff --git a/cross/gcc-armv7/0031-gcc-go-signal-34-is-special-on-musl-libc.patch b/cross/gcc-aarch64/0035-gcc-go-signal-34-is-special-on-musl-libc.patch
similarity index 92%
rename from cross/gcc-armv7/0031-gcc-go-signal-34-is-special-on-musl-libc.patch
rename to cross/gcc-aarch64/0035-gcc-go-signal-34-is-special-on-musl-libc.patch
index 4c7bad8e6..ccfad98c5 100644
--- a/cross/gcc-armv7/0031-gcc-go-signal-34-is-special-on-musl-libc.patch
+++ b/cross/gcc-aarch64/0035-gcc-go-signal-34-is-special-on-musl-libc.patch
@@ -1,4 +1,4 @@
-From 18ba9309687431399aabe54c0b758f69b01253e0 Mon Sep 17 00:00:00 2001
+From 399c8ce9bce85e84fd0430403a04a38ff75a9e71 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.34.0
+2.34.1
 
diff --git a/cross/gcc-armv7/0032-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch b/cross/gcc-aarch64/0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
similarity index 91%
rename from cross/gcc-armv7/0032-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
rename to cross/gcc-aarch64/0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
index 5be5b32e6..1bb983ee4 100644
--- a/cross/gcc-armv7/0032-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
+++ b/cross/gcc-aarch64/0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
@@ -1,4 +1,4 @@
-From 1be822dcf1f9ffdba5c6508cef0374585e48cb18 Mon Sep 17 00:00:00 2001
+From c380a283946cbe5a2d76aec0a6b19bba085305bc 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.34.0
+2.34.1
 
diff --git a/cross/gcc-armv7/0033-gcc-go-link-to-libucontext.patch b/cross/gcc-aarch64/0037-gcc-go-link-to-libucontext.patch
similarity index 90%
rename from cross/gcc-armv7/0033-gcc-go-link-to-libucontext.patch
rename to cross/gcc-aarch64/0037-gcc-go-link-to-libucontext.patch
index 283d562d9..62c487a45 100644
--- a/cross/gcc-armv7/0033-gcc-go-link-to-libucontext.patch
+++ b/cross/gcc-aarch64/0037-gcc-go-link-to-libucontext.patch
@@ -1,4 +1,4 @@
-From 2fa393cd8ae6b25539cc7bd9998c603a3b33bc6e Mon Sep 17 00:00:00 2001
+From 7a9168eb92cce811ce87767a6d79b525a2d484ab 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.34.0
+2.34.1
 
diff --git a/cross/gcc-armhf/0035-Use-generic-errstr.go-implementation-on-musl.patch b/cross/gcc-aarch64/0038-Use-generic-errstr.go-implementation-on-musl.patch
similarity index 95%
rename from cross/gcc-armhf/0035-Use-generic-errstr.go-implementation-on-musl.patch
rename to cross/gcc-aarch64/0038-Use-generic-errstr.go-implementation-on-musl.patch
index e6bcfa9a0..0836be002 100644
--- a/cross/gcc-armhf/0035-Use-generic-errstr.go-implementation-on-musl.patch
+++ b/cross/gcc-aarch64/0038-Use-generic-errstr.go-implementation-on-musl.patch
@@ -1,4 +1,4 @@
-From 23f7ad8b28284017c4f63e944bcb0321eb205e8a Mon Sep 17 00:00:00 2001
+From 442c3400a3ffd45c0a78a61ae233f7049fdad2fb 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.34.0
+2.34.1
 
diff --git a/cross/gcc-armv7/0036-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch b/cross/gcc-aarch64/0039-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
similarity index 98%
rename from cross/gcc-armv7/0036-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
rename to cross/gcc-aarch64/0039-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
index 1895dd258..7c3483837 100644
--- a/cross/gcc-armv7/0036-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
+++ b/cross/gcc-aarch64/0039-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
@@ -1,4 +1,4 @@
-From 7e123432a35fcaa25de85b4940daabcd70c1a6bd Mon Sep 17 00:00:00 2001
+From 0d69ddbca85c13aba7c5c9aca57a801d5cdb7548 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
@@ -242,7 +242,7 @@ index 2974dae2701..80e003a38ce 100644
  
  @defmac POST_LINK_SPEC
 diff --git a/gcc/gcc.c b/gcc/gcc.c
-index 5093e8bbfd2..1871b5ab6eb 100644
+index 22dbbf85850..90aa576037a 100644
 --- a/gcc/gcc.c
 +++ b/gcc/gcc.c
 @@ -980,13 +980,23 @@ proper position among the other output files.  */
@@ -271,5 +271,5 @@ index 5093e8bbfd2..1871b5ab6eb 100644
  
  #ifdef ENABLE_DEFAULT_SSP
 -- 
-2.34.0
+2.34.1
 
diff --git a/cross/gcc-armv7/0037-configure-fix-detection-of-atomic-builtins-in-libato.patch b/cross/gcc-aarch64/0040-configure-fix-detection-of-atomic-builtins-in-libato.patch
similarity index 96%
rename from cross/gcc-armv7/0037-configure-fix-detection-of-atomic-builtins-in-libato.patch
rename to cross/gcc-aarch64/0040-configure-fix-detection-of-atomic-builtins-in-libato.patch
index 163b3ca3c..27ce265fb 100644
--- a/cross/gcc-armv7/0037-configure-fix-detection-of-atomic-builtins-in-libato.patch
+++ b/cross/gcc-aarch64/0040-configure-fix-detection-of-atomic-builtins-in-libato.patch
@@ -1,4 +1,4 @@
-From cb2472c05592e4a1b5f826d761d0ef221c0c9664 Mon Sep 17 00:00:00 2001
+From 20a7e6fd41f1f2382bda3fa9b9171188a02a4dc5 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.34.0
+2.34.1
 
diff --git a/cross/gcc-armhf/0038-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch b/cross/gcc-aarch64/0041-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch
similarity index 97%
rename from cross/gcc-armhf/0038-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch
rename to cross/gcc-aarch64/0041-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch
index 8f5df6b69..ff2be3c7e 100644
--- a/cross/gcc-armhf/0038-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch
+++ b/cross/gcc-aarch64/0041-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch
@@ -1,4 +1,4 @@
-From 45b24f2bf7fa1b2b9d597bd065b6522f8d87cd3e Mon Sep 17 00:00:00 2001
+From ce22a6e1b6cde3237a733b9fb04c113de429b3a9 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
@@ -80,5 +80,5 @@ index 8ce061e2f5f..b85add15a7b 100644
  // be signed in some OSes.
  #ifdef SIOCGIFMTU
 -- 
-2.34.0
+2.34.1
 
diff --git a/cross/gcc-armhf/0039-Fix-attempt-to-use-poisoned-calloc-error-in-libgccji.patch b/cross/gcc-aarch64/0042-Fix-attempt-to-use-poisoned-calloc-error-in-libgccji.patch
similarity index 95%
rename from cross/gcc-armhf/0039-Fix-attempt-to-use-poisoned-calloc-error-in-libgccji.patch
rename to cross/gcc-aarch64/0042-Fix-attempt-to-use-poisoned-calloc-error-in-libgccji.patch
index f43cfb4ac..9c8be4ae7 100644
--- a/cross/gcc-armhf/0039-Fix-attempt-to-use-poisoned-calloc-error-in-libgccji.patch
+++ b/cross/gcc-aarch64/0042-Fix-attempt-to-use-poisoned-calloc-error-in-libgccji.patch
@@ -1,4 +1,4 @@
-From 0b7a57f08abff72f8dd1f67de995c502e798513c Mon Sep 17 00:00:00 2001
+From 55a6814dd32978e88c5be7f023ac9d88d6287b59 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
@@ -12,7 +12,7 @@ included #pragma GCC poison calloc
  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
+index cee9daa8220..a5600084933 100644
 --- a/gcc/jit/jit-playback.c
 +++ b/gcc/jit/jit-playback.c
 @@ -18,6 +18,8 @@ You should have received a copy of the GNU General Public License
@@ -76,5 +76,5 @@ index 0cc650f9810..2f44481eeb0 100644
  #include "libgccjit.h"
  #include "jit-recording.h"
 -- 
-2.34.0
+2.34.1
 
diff --git a/cross/gcc-armv7/0040-stddef.h-add-support-for-musl-typedef-macro-guards.patch b/cross/gcc-aarch64/0043-stddef.h-add-support-for-musl-typedef-macro-guards.patch
similarity index 98%
rename from cross/gcc-armv7/0040-stddef.h-add-support-for-musl-typedef-macro-guards.patch
rename to cross/gcc-aarch64/0043-stddef.h-add-support-for-musl-typedef-macro-guards.patch
index c22f7f43f..09acb7160 100644
--- a/cross/gcc-armv7/0040-stddef.h-add-support-for-musl-typedef-macro-guards.patch
+++ b/cross/gcc-aarch64/0043-stddef.h-add-support-for-musl-typedef-macro-guards.patch
@@ -1,4 +1,4 @@
-From 5a76cf60df5c9ba274f1d0dcd79fc0cbad9d0fe0 Mon Sep 17 00:00:00 2001
+From 5b03488537d53ee1265ff9129b4d9a9e4f353777 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
@@ -102,5 +102,5 @@ index 66619fe43b1..50d710a5ab9 100644
  #endif /* _BSD_RUNE_T_DEFINED_ */
  #endif
 -- 
-2.34.0
+2.34.1
 
diff --git a/cross/gcc-aarch64/0041-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch b/cross/gcc-aarch64/0044-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
similarity index 95%
rename from cross/gcc-aarch64/0041-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
rename to cross/gcc-aarch64/0044-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
index 41e67843f..ebb64f51f 100644
--- a/cross/gcc-aarch64/0041-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
+++ b/cross/gcc-aarch64/0044-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
@@ -1,4 +1,4 @@
-From f042000a3113524554f5565f147735caf15dd42f Mon Sep 17 00:00:00 2001
+From 55c3e771c17a41ec1654074b7eef23594f07126e Mon Sep 17 00:00:00 2001
 From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
 Date: Sun, 30 Aug 2020 18:33:49 +0200
 Subject: [PATCH] gcc-go: Use int64 type as offset argument for mmap
@@ -58,3 +58,6 @@ index fa3389d857e..57bed97c710 100644
  	p := sysMmap(addr, n, prot, flags, fd, off)
  	if uintptr(p) == _MAP_FAILED {
  		return nil, errno()
+-- 
+2.34.1
+
diff --git a/cross/gcc-aarch64/0042-Disable-fsplit-stack-support-on-non-glibc-targets.patch b/cross/gcc-aarch64/0045-Disable-fsplit-stack-support-on-non-glibc-targets.patch
similarity index 98%
rename from cross/gcc-aarch64/0042-Disable-fsplit-stack-support-on-non-glibc-targets.patch
rename to cross/gcc-aarch64/0045-Disable-fsplit-stack-support-on-non-glibc-targets.patch
index c6ec2dfa6..9a6a80d7f 100644
--- a/cross/gcc-aarch64/0042-Disable-fsplit-stack-support-on-non-glibc-targets.patch
+++ b/cross/gcc-aarch64/0045-Disable-fsplit-stack-support-on-non-glibc-targets.patch
@@ -1,4 +1,4 @@
-From 5b7b256eafc888a3be2dcee1e01f8dc6a814d1a6 Mon Sep 17 00:00:00 2001
+From 653555dafe2b720bc76db22691c9e1383bbb7da2 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
 Date: Wed, 15 Dec 2021 00:14:19 +0100
 Subject: [PATCH] Disable -fsplit-stack support on non-glibc targets
@@ -93,3 +93,6 @@ index 25fbc07f58c..895a7369816 100644
  
  /* i386 glibc provides __stack_chk_guard in %gs:0x14.  */
  #define TARGET_THREAD_SSP_OFFSET        0x14
+-- 
+2.34.1
+
diff --git a/cross/gcc-aarch64/0046-libgo-include-asm-ptrace.h-for-pt_regs-definition-on.patch b/cross/gcc-aarch64/0046-libgo-include-asm-ptrace.h-for-pt_regs-definition-on.patch
new file mode 100644
index 000000000..abc60cc98
--- /dev/null
+++ b/cross/gcc-aarch64/0046-libgo-include-asm-ptrace.h-for-pt_regs-definition-on.patch
@@ -0,0 +1,58 @@
+From b9399209363da18b79890a88ed8dcbe1e15c9bfc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren@soeren-tempel.net>
+Date: Sun, 2 Jan 2022 01:07:03 +0100
+Subject: [PATCH] libgo: include asm/ptrace.h for pt_regs definition on PowerPC
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Both glibc and musl libc declare pt_regs as an incomplete type. This
+type has to be completed by inclusion of another header. On Linux, the
+asm/ptrace.h header file provides this type definition. Without
+including this header file, it is not possible to access the regs member
+of the mcontext_t struct as done in libgo/runtime/go-signal.c. On glibc,
+other headers (e.g. sys/user.h) include asm/ptrace.h but on musl
+asm/ptrace.h is not included by other headers and thus the
+aforementioned files do not compile without an explicit include of
+asm/ptrace.h:
+
+	libgo/runtime/go-signal.c: In function 'getSiginfo':
+	libgo/runtime/go-signal.c:227:63: error: invalid use of undefined type 'struct pt_regs'
+	  227 |         ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.regs->nip;
+	      |
+
+Instead of including the asm/ptrace.h header conditionally on PowerPC
+only it would alternatively also be possible to include it
+unconditionally.
+
+See also:
+
+* https://git.musl-libc.org/cgit/musl/commit/?id=c2518a8efb6507f1b41c3b12e03b06f8f2317a1f
+* https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=d57cb31910ca5c200e4172276749a7f8bd17ae3c
+* https://github.com/kaniini/libucontext/issues/36
+
+Signed-off-by: Sören Tempel <soeren@soeren-tempel.net>
+---
+ libgo/runtime/go-signal.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/libgo/runtime/go-signal.c b/libgo/runtime/go-signal.c
+index d30d1603adc..fc01e04e4a1 100644
+--- a/libgo/runtime/go-signal.c
++++ b/libgo/runtime/go-signal.c
+@@ -10,6 +10,12 @@
+ #include <sys/time.h>
+ #include <ucontext.h>
+ 
++// On PowerPC, ucontext.h uses a pt_regs struct as an incomplete
++// type. This type must be completed by including asm/ptrace.h.
++#ifdef __PPC__
++#include <asm/ptrace.h>
++#endif
++
+ #include "runtime.h"
+ 
+ #ifndef SA_RESTART
+-- 
+2.34.1
+
diff --git a/cross/gcc-aarch64/APKBUILD b/cross/gcc-aarch64/APKBUILD
index e32aacfcd..209db35a2 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_git20211128
+pkgver=11.2.1_git20220106
 [ "$BOOTSTRAP" = "nolibc" ] && pkgname="gcc-pass2"
 [ "$CBUILD" != "$CHOST" ] && _cross="-$CARCH" || _cross=""
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname=gcc-aarch64
-pkgrel=3
+pkgrel=0
 pkgdesc="Stage2 cross-compiler for aarch64"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -203,7 +203,7 @@ makedepends="$makedepends_build $makedepends_host"
 source="https://dev.alpinelinux.org/~nenolod/gcc-${pkgver}.tar.xz
 	0001-posix_memalign.patch
 	0002-gcc-poison-system-directories.patch
-	0003-Turn-on-Wl-z-relro-z-now-by-default.patch
+	0003-specs-turn-on-Wl-z-now-by-default.patch
 	0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
 	0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
 	0006-Enable-Wformat-and-Wformat-security-by-default.patch
@@ -217,32 +217,36 @@ source="https://dev.alpinelinux.org/~nenolod/gcc-${pkgver}.tar.xz
 	0014-nopie.patch
 	0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch
 	0016-dlang-update-zlib-binding.patch
-	0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch
-	0018-ada-fix-shared-linking.patch
-	0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
-	0020-add-fortify-headers-paths.patch
-	0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
-	0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
-	0023-Pure-64-bit-MIPS.patch
-	0024-use-pure-64-bit-configuration-where-appropriate.patch
-	0025-always-build-libgcc_eh.a.patch
-	0026-ada-libgnarl-compatibility-for-musl.patch
-	0027-ada-musl-support-fixes.patch
-	0028-gcc-go-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
-	0041-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
-	0042-Disable-fsplit-stack-support-on-non-glibc-targets.patch
+	0017-dlang-use-libucontext-on-mips64.patch
+	0018-dlang-libdruntime-define-fcntl.h-constants-for-mips6.patch
+	0019-ada-fix-shared-linking.patch
+	0020-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
+	0021-add-fortify-headers-paths.patch
+	0022-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
+	0023-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
+	0024-mips64-disable-multilib-support.patch
+	0025-aarch64-disable-multilib-support.patch
+	0026-s390x-disable-multilib-support.patch
+	0027-ppc64-le-disable-multilib-support.patch
+	0028-x86_64-disable-multilib-support.patch
+	0029-riscv-disable-multilib-support.patch
+	0030-always-build-libgcc_eh.a.patch
+	0031-ada-libgnarl-compatibility-for-musl.patch
+	0032-ada-musl-support-fixes.patch
+	0033-gcc-go-Fix-handling-of-signal-34-on-musl.patch
+	0034-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch
+	0035-gcc-go-signal-34-is-special-on-musl-libc.patch
+	0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
+	0037-gcc-go-link-to-libucontext.patch
+	0038-Use-generic-errstr.go-implementation-on-musl.patch
+	0039-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
+	0040-configure-fix-detection-of-atomic-builtins-in-libato.patch
+	0041-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch
+	0042-Fix-attempt-to-use-poisoned-calloc-error-in-libgccji.patch
+	0043-stddef.h-add-support-for-musl-typedef-macro-guards.patch
+	0044-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
+	0045-Disable-fsplit-stack-support-on-non-glibc-targets.patch
+	0046-libgo-include-asm-ptrace.h-for-pt_regs-definition-on.patch
 	"
 
 # we build out-of-tree
@@ -704,47 +708,51 @@ gnat() {
 }
 
 sha512sums="
-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
-e4d2466191b4acde115917506c285b617d6210bf3603e705ca3d905e4e28b12e399b16898f6ab9996b1d4fbfa3aed554e86931ed7f13fc13a9459af7f29f4393  0041-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
-5e04b9a6d39b708daedcef494e4aed59b1a97d2052ed7eb8d1e3da5faa70dc5e1fa3ee249c685e820109d5605ee2b66154856b0ffccf7b8a49af1a1da9350ebf  0042-Disable-fsplit-stack-support-on-non-glibc-targets.patch
+f0f073a05ec9bf93e4d85707282f0b75b8e783f86c16b5ed118444e7b362be2122a10233baa822efcb52c7bc353c6ca06951db0e93c030372275baa922939c3f  gcc-11.2.1_git20220106.tar.xz
+c81a5ddd7699320129813529c12afb81744491a2df32922ee9816413d5fcb2857abf7641381ecb5e5748ac8335ab8e2ac27e7c56262e82c42f57adbb655328a1  0001-posix_memalign.patch
+3adf23e255343ef1ead10b0312f506e722aab6218b35b1f92a855b3e5a1e63cddb45fb568f19d2e2443e1dad647f6d9429830004b45371a07e7098d430e1cecf  0002-gcc-poison-system-directories.patch
+f1de78496e0caeefe7441be04a8c78e83fada8adcdaa4abda607b7b83ca51ecb6f3cdbb9290c38a3fefe32f7980c47779687726ad9f557471978313eea1f99d3  0003-specs-turn-on-Wl-z-now-by-default.patch
+3959ebad795264ddd00640a2ff7ce511d69adc5683e25760d4741fbc99f56a7243545ccfce29578a3790138afa1e6ea6b232faf39f7904a17d7f3aeaa8080b61  0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
+4cabe468a1b138fed597d6bb946200da77e127022032fb5adb0955d64c6aad34ed1861aee11563b6555bd9d48721ac762b4a1e5c1d604274146ce8f989beee24  0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
+a686ac11781236bfbc793e124fe842a1c4311884b9aec39e79673ef6d65fc8f36aacdbe6410b9a80ca9245a3bc49ee71babd1ffcde1b816cb385ff771175fd7c  0006-Enable-Wformat-and-Wformat-security-by-default.patch
+83b2d4dcad924cbddc8d8a2569d6e5ca59b63b8b5a30fef176acac48622eaf8237ba649f55bc23327456508df3d3a1f2aad20536eb151d831c6b1cfeb3b33f76  0007-Enable-Wtrampolines-by-default.patch
+69ba40c718458f466f43e7f4450c1c774f27a7ac36bb794ee653e7aabc2f21de7596a5d410efbe093ff1416951c547fa73b92980677b04fa7f371390281109f6  0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
+2adef312e5b89764176451b3d184f85f309f8f8bfadc1ed7a3c43a27ca5032de39e10d2881284f49ee0d1e719782542cd008bf11504122b96987e3fd45ca022c  0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
+a3952e27b39c737563daedba609960f4e7237e52988d1cec757526e4ed3887aee563cfc87925e6840619182c1c9876cd483ee3cc83747015f758c2421b3f1ba4  0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
+46b073319937bdaaffe6a97a935a4b328f5fcbc10f91f88de20d7b1ffc7bd6321671c34fdcfb0ec59ca01033249f607715cfc154b57e195a55cea7ea6950c54d  0011-libiberty-copy-PIC-objects-during-build-process.patch
+c56526a61daa35dc72447aa9d947987f2ed124c6cf3b2cd82981f934cd4b032555402306a87a2667359f6670e9a4531e98c7b48ca4b0ecbfb019c551c87b24ee  0012-libitm-disable-FORTIFY.patch
+5b2f39fee095947827625480994abe929cea90f95eda7849a3d7802990bc8dab501543d3f15b1d987bed10f69f868b15cd4af7cf3e1c4fc2d2495a2e3adfbd1d  0013-libgcc_s.patch
+4a1043e95a14e95d7f6081f82e7004c9ad11165be67d20c7e03d0eb46e2aebe2b8d65cf95a29945463bd51fbc233ad322784f19804bd47e7425ec59a17314e45  0014-nopie.patch
+bdba6d04f9e77a00e407a70393aec0d668087be3bf6bd2db7e18b1ce20eae640346958a108ed65087bcf0d4250be168034ccfc72115afbe2dec9b2968218926c  0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch
+b5703c0a200a10bb84226fafc8d0fc3bdefecfd705d87b115368265aef4664b8cf158a21e59f1f32c842b3c665c3a009bb25b2b0003eb08914f0e0be81cec733  0016-dlang-update-zlib-binding.patch
+925641f72bccc471f092108699cd9c4610430e7f829c65d800e592d47ae6ddbe57581a91e94ccd6b3fb5c481048a697d0c72826903fedd03780368519fab70d3  0017-dlang-use-libucontext-on-mips64.patch
+363b166776e8f756e07554146fc4f33bad0f906bd57dfc794bb816c6bfb9bb9cc1d5950f53a03c11ccabab3528398d9df79e88cc02aa39e94809675540ab967f  0018-dlang-libdruntime-define-fcntl.h-constants-for-mips6.patch
+2431ec336ed1c353f210be336fd3ce7e5ab11ed2e76bd87a32bc46fc7845c5accb6483fd7b37fd703a83449859622ab3ed7598ef9442f9e7a34b5f9aa7a5e00e  0019-ada-fix-shared-linking.patch
+b1bb85a34bab62b3fd1a8aef744bb48234bb6ec18454fed8ae068434fd820ddceaf27a372df90af53f95c8a86aec2fd6d49278e85d062c6e7bf96a64352b626b  0020-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
+8174615ddeb4300799e8fb29db1a38ff48ae62cecd50359af238c16f0b17ea0b642f0efa6c5898c06a0d019723438beb3cc252de95c26739da3e99ad6299be22  0021-add-fortify-headers-paths.patch
+a46ed9e4e4b96e7912b2fd4a2cf94bac8eaed68b64bc8bd86914176aa0107eee83a0a5e330ab0524c7f838cdd660a52fcf206033373fc4ff3b3af3a95801efa8  0022-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
+751eb9a4caa32232d9d0916465b5932cae2b05ab989c7019eb4bdc3fdadcec0103b5a6fca789c1886ea76c179a2568ea47de44931b1af4d9f13692c0617a1b48  0023-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
+c9af403da0068f8d93eb74e345d06a43ac103ffd28514fb16ab31517e5172e5ed13451b8b20e87e80adf21b0ce3daca37e335a309d88c403f68377d75ff30a64  0024-mips64-disable-multilib-support.patch
+7504757907b95e474d283876eaef08a4d03ad3308470d9130a7ac221ad1cc204de03520a5fa7ec42f9035af6edf84cb09b2f5b134d2ac744494f4cf385c70ae7  0025-aarch64-disable-multilib-support.patch
+10106ccaa20a6c04c718cdf242c1ba16210d2ffd75febef0a4488023c9aa8d1086fad9c96416a82bf104188ab7542c925b2bbe277935f5c34967321fd358c022  0026-s390x-disable-multilib-support.patch
+1152d020a3da61fd697fad6fc5cf6eeadb1225ebc8d8d9e81b9f63f34073876451b90e93d3fd334eeb68f6702498e335076e35a8020c2cd2443236e222cc73fe  0027-ppc64-le-disable-multilib-support.patch
+1adc2daacbdb0a38ed2aaacc7864cfb38841fba16640af1053892fb63fcc2b56711a6ee3722e45cd17239b5793f612514130d24bc6588d4f884a353f70da3076  0028-x86_64-disable-multilib-support.patch
+cbebee40ad722be52e359853afaf4667e52fbf62e24b6f1b8a96b7b82984bf05a67903122dd5c19f90d477aed7daacdbc409f79a5981493f2457f0f16bef370f  0029-riscv-disable-multilib-support.patch
+46c3089eaf48897de801849744e7094f829f521051345a6465e3a433e6f383298b0b2b4004a9d8277e7108a3e5be274d8aad01ab1ac23e76d3a8d07d396c2e10  0030-always-build-libgcc_eh.a.patch
+1ee9524247041e3cd5d87868431156b9fee4429519508e2d05109c5dd8ba881d2964fe667dd4752cc98575b35a485e2a66b00a8fe2c75a86cd182ff0d706afd5  0031-ada-libgnarl-compatibility-for-musl.patch
+e6ae6f63ead4890ac3761f6d14383f5c5a995cca62d5432e2e12f5dda46d93dadd7298be98010c674533b2793415b0f0c37b54daabd74ef6f5e9f93cadb084b3  0032-ada-musl-support-fixes.patch
+bca91a9369e0a32bb824eff9ee92d7a9bf50273fd304784c04e9ee3d06382a821e6485d180d477c5a2c447ee6c1efe3f7e22014b30c5e3299af923a5c1471091  0033-gcc-go-Fix-handling-of-signal-34-on-musl.patch
+4dd546fbdc73a276e15b0ca27db735ff0145240cf8bf627b267c77ee45d119e29c5346acba83335e0344a01ea9e730a28c5038666a35bfa886332cc63975c1af  0034-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch
+de8b5368f83988526f00c58f81fcb796baf1e2e6823fb70977092236225e859abcccee08373c59bfb944076af2791a549d94da47c4f4816216f6f708706b9f2b  0035-gcc-go-signal-34-is-special-on-musl-libc.patch
+9c87c2f82ce9ab67b8ff4aa2cd5722badfd432292443c7901141479282ff29596ded3dc3508bfd3172544d1c160a6f32de61c801d831ff950236553727c7db19  0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
+c091bc56ced7fc3c5f9a879f42237cb60fbc3da8a2d9742ff0e4e93a3f97f20a620a8f16af23183ed3d14ddaeaf1207e1840fd015a622acb79959dd766aba9bc  0037-gcc-go-link-to-libucontext.patch
+0694338a2fc12a903b979d45e9b4a92dc9e441e9c377e63b36cd900a0cc664e0f0493c797ea4c45478e60a3d70da5ff971e10460a3cbf64c2a940a4327fd87a6  0038-Use-generic-errstr.go-implementation-on-musl.patch
+49c30829a80acf386fd5c14c630f9f0e5161264c1504121da749ae3e06fb54c36280e81b9760378edc3627cb29965da01f8d03c9d473a854d6294200b372da28  0039-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
+ec78df0cd34fe838d9364fdfe3f3d9a068c256b7a507fea9d315c92dc21b0af3675210586e57be93aa096ed7c08645cdc6eb2184e6b18ab0dd900b98847acda5  0040-configure-fix-detection-of-atomic-builtins-in-libato.patch
+0cdfcf11234be520a3b8ddcd0ed2efb9b4606da7135cea918e68a7655ebf43edb01eb291b9b226a0a44cf15f52c714f80884c0128b9d13771df3a6da991f2cbe  0041-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch
+c2a67dc1853682e0c72d721572e29dae93560b2c7d1fa932e4ee38f420b9bc21f187128498e094f7aaf6520f64b707f50c9aa6c260c269abb8e6f00c39be87c3  0042-Fix-attempt-to-use-poisoned-calloc-error-in-libgccji.patch
+9a419b4b0cc3c80871b3b852f5d5fbd37d3e377ddcdf35273c4c543544d575f59762f0dcffa24ec2c74de29aaf07e4e8339474733e7b39558dc1481ad1f2b3ca  0043-stddef.h-add-support-for-musl-typedef-macro-guards.patch
+801cf2e3f08fc6e0d1bd615361d7bb7541d468282ddf4357f9e276336bc4d4151a6cfdd413503dd7576d9c50191e60a8da9f38daa605c48f5f5d047360e882d4  0044-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
+bc05c96a2cfa57ab9c12ef834cf5158991b4dd63baf98ea1558060b966fb959865ce659ea9095307df8c59136f999b7d6ebeb72a4bc1235a458849e227ead900  0045-Disable-fsplit-stack-support-on-non-glibc-targets.patch
+a2c3821998a5e457b6241f88a7015199c7d7abce698ab888ea7df2970866121b02393a70b79cb5862469a5286e9ad91a18fa113e308612baa62a52b839e8eea9  0046-libgo-include-asm-ptrace.h-for-pt_regs-definition-on.patch
 "
diff --git a/cross/gcc-armhf/0001-posix_memalign.patch b/cross/gcc-armhf/0001-posix_memalign.patch
index f41493c81..0be339ed1 100644
--- a/cross/gcc-armhf/0001-posix_memalign.patch
+++ b/cross/gcc-armhf/0001-posix_memalign.patch
@@ -1,4 +1,4 @@
-From a858e4eb74d68ef1cf7a30d6a60fb32c621267c6 Mon Sep 17 00:00:00 2001
+From 5ae72115463e483fab9bc5d46f6a5e56451cf30a 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.34.0
+2.34.1
 
diff --git a/cross/gcc-armhf/0002-gcc-poison-system-directories.patch b/cross/gcc-armhf/0002-gcc-poison-system-directories.patch
index a3c61fb0d..dcc3f34ba 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 6317101c9bb0616db0b919ed945466c4161ea7f1 Mon Sep 17 00:00:00 2001
+From 35d53206136617aeb91b54c37e9cbecf9e5c5f56 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.34.0
+2.34.1
 
diff --git a/cross/gcc-armhf/0003-Turn-on-Wl-z-relro-z-now-by-default.patch b/cross/gcc-armhf/0003-specs-turn-on-Wl-z-now-by-default.patch
similarity index 69%
rename from cross/gcc-armhf/0003-Turn-on-Wl-z-relro-z-now-by-default.patch
rename to cross/gcc-armhf/0003-specs-turn-on-Wl-z-now-by-default.patch
index 5f45aeadb..0f427269e 100644
--- a/cross/gcc-armhf/0003-Turn-on-Wl-z-relro-z-now-by-default.patch
+++ b/cross/gcc-armhf/0003-specs-turn-on-Wl-z-now-by-default.patch
@@ -1,15 +1,20 @@
-From c23602c67fd4ca33eb1f819f28f03eef50905265 Mon Sep 17 00:00:00 2001
+From 68c4bf98233cec77b2c66aa1fa1a2705b09e30b6 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:45:49 +0000
-Subject: [PATCH] Turn on -Wl,-z,relro,-z,now by default.
+Subject: [PATCH] specs: turn on -Wl,-z,now by default
 
+Previously, we also used to turn on -z relro here, but we now build
+binutils with --enable-relro, which is functionally equivalent.
+
+Binutils does not appear to have a similar option for enabling -z
+now by default.
 ---
  gcc/doc/invoke.texi | 3 +++
  gcc/gcc.c           | 1 +
  2 files changed, 4 insertions(+)
 
 diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index 9d1126e9751..46e45274859 100644
+index 9d1126e9751..4b8335bbd1f 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
 @@ -15920,6 +15920,9 @@ For example, @option{-Wl,-Map,output.map} passes @option{-Map output.map} to the
@@ -17,23 +22,23 @@ index 9d1126e9751..46e45274859 100644
  @option{-Wl,-Map=output.map}.
  
 +NOTE: In Alpine Linux, for LDFLAGS, the option
-+@option{-Wl,-z,relro,now} is used.  To disable, use @option{-Wl,-z,norelro}.
++@option{-Wl,-z,now} is used.  To disable, use @option{-Wl,-z,nonow}.
 +
  @item -u @var{symbol}
  @opindex u
  Pretend the symbol @var{symbol} is undefined, to force linking of
 diff --git a/gcc/gcc.c b/gcc/gcc.c
-index a83ba34ac4b..8c15de433ee 100644
+index a83ba34ac4b..faf9ce76b3d 100644
 --- a/gcc/gcc.c
 +++ b/gcc/gcc.c
 @@ -1150,6 +1150,7 @@ proper position among the other output files.  */
     "%{flto|flto=*:%<fcompare-debug*} \
      %{flto} %{fno-lto} %{flto=*} %l " LINK_PIE_SPEC \
     "%{fuse-ld=*:-fuse-ld=%*} " LINK_COMPRESS_DEBUG_SPEC \
-+   "-z relro -z now " \
++   "-z now " \
     "%X %{o*} %{e*} %{N} %{n} %{r}\
      %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!r:%{!nostartfiles:%S}}} \
      %{Wno-poison-system-directories:--no-poison-system-directories} \
 -- 
-2.34.0
+2.34.1
 
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 833f9d571..d76f6ec90 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 abb8ccb0dcd381e9daeb43be2d32afd0ab7c83c5 Mon Sep 17 00:00:00 2001
+From 36fde4108ebb872cbf0e45d815e76fc3ef69ded5 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:46:22 +0000
 Subject: [PATCH] Turn on -D_FORTIFY_SOURCE=2 by default for C, C++, ObjC,
@@ -25,7 +25,7 @@ index 9f993c4aff2..7db314195ff 100644
    if (flag_gnu89_inline)
      cpp_define (pfile, "__GNUC_GNU_INLINE__");
 diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index 46e45274859..1b4a698a191 100644
+index 4b8335bbd1f..833164e0a2b 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
 @@ -10224,6 +10224,12 @@ also turns on the following optimization flags:
@@ -42,5 +42,5 @@ index 46e45274859..1b4a698a191 100644
  @opindex O3
  Optimize yet more.  @option{-O3} turns on all optimizations specified
 -- 
-2.34.0
+2.34.1
 
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 9f927abbd..5dce434b8 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 22071923bf903a7bf851d1e59dcc1d07c6b0e876 Mon Sep 17 00:00:00 2001
+From 49c826ad1ccaf63569b25318990a531ebe6fbc9c 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,
@@ -208,7 +208,7 @@ index 2550d7ee8f0..7596d0b2757 100644
    %{!shared: \
      %{!static: \
 diff --git a/gcc/gcc.c b/gcc/gcc.c
-index 8c15de433ee..be1508e5abe 100644
+index faf9ce76b3d..1ad5da6d769 100644
 --- a/gcc/gcc.c
 +++ b/gcc/gcc.c
 @@ -737,8 +737,11 @@ proper position among the other output files.  */
@@ -268,5 +268,5 @@ index 8c15de433ee..be1508e5abe 100644
  #else
  #define LIBUBSAN_SPEC "-lubsan" STATIC_LIBUBSAN_LIBS
 -- 
-2.34.0
+2.34.1
 
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 d8843fd18..40af6af09 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 622ce6893c48eaa87beb7399ecb73bdadc9b7b84 Mon Sep 17 00:00:00 2001
+From c1a52e22d7ceef0f89a83ef2673f3d237c78e4dc 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.34.0
+2.34.1
 
diff --git a/cross/gcc-armhf/0007-Enable-Wtrampolines-by-default.patch b/cross/gcc-armhf/0007-Enable-Wtrampolines-by-default.patch
index cbfe46c49..fcf288188 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 ad29ab28462968097dad017f03c4db40f4d83174 Mon Sep 17 00:00:00 2001
+From 28102796795e8509cb798d59d1339a3d1c392eda 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.34.0
+2.34.1
 
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 39dc6400f..4660066d1 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 0fd84cfeabaf572f5f901fa7d13298286d84992b Mon Sep 17 00:00:00 2001
+From 7e7c1f8a11a36e286a00f2eca90f55b3a32917b5 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
@@ -10,7 +10,7 @@ Subject: [PATCH] Disable ssp on -nostdlib, -nodefaultlibs and -ffreestanding
  2 files changed, 8 insertions(+), 2 deletions(-)
 
 diff --git a/gcc/gcc.c b/gcc/gcc.c
-index be1508e5abe..e495b222095 100644
+index 1ad5da6d769..99314032ec2 100644
 --- a/gcc/gcc.c
 +++ b/gcc/gcc.c
 @@ -989,6 +989,12 @@ proper position among the other output files.  */
@@ -49,5 +49,5 @@ index 8ba281b4cfa..bab39cdf8a2 100644
  
  -param=stack-clash-protection-guard-size=
 -- 
-2.34.0
+2.34.1
 
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 5093eefc9..ebc1d061c 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 b788f9a685522fdd615c2c9aa7feab974c6d6b09 Mon Sep 17 00:00:00 2001
+From 8579d1acd984ecf29160c2925b8c0c16491083db 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.34.0
+2.34.1
 
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 1e7627544..5b32f18f8 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 1f2c3d7a0d1c35cb8281c5d97eb8ecfe2987e8b3 Mon Sep 17 00:00:00 2001
+From 9c288cea05c5fc3999f3ab0fbd207923a550450d 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.34.0
+2.34.1
 
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 4022561e9..73c1d32e2 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 a110462c21bc26c6c3c8d3265d3f146d1b9bddae Mon Sep 17 00:00:00 2001
+From b1fc0dcb018034d2440e7405bcb1e15f3d986fc4 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.34.0
+2.34.1
 
diff --git a/cross/gcc-armhf/0012-libitm-disable-FORTIFY.patch b/cross/gcc-armhf/0012-libitm-disable-FORTIFY.patch
index b118ad486..76b59d8b1 100644
--- a/cross/gcc-armhf/0012-libitm-disable-FORTIFY.patch
+++ b/cross/gcc-armhf/0012-libitm-disable-FORTIFY.patch
@@ -1,4 +1,4 @@
-From e0ad9c8c39f35a47c6a4c34ae161d768bf2f6fcc Mon Sep 17 00:00:00 2001
+From 9b6bffd441a7d747c13eb1b1c09ebc6bdb050b17 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.34.0
+2.34.1
 
diff --git a/cross/gcc-armhf/0013-libgcc_s.patch b/cross/gcc-armhf/0013-libgcc_s.patch
index 4e1631d67..af2881bc7 100644
--- a/cross/gcc-armhf/0013-libgcc_s.patch
+++ b/cross/gcc-armhf/0013-libgcc_s.patch
@@ -1,4 +1,4 @@
-From 57309d5900d3bc974b9a3efff34fdc601014b386 Mon Sep 17 00:00:00 2001
+From 028a4d00386b50bc20141bab7eebc6f9071d47fc 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.34.0
+2.34.1
 
diff --git a/cross/gcc-armhf/0014-nopie.patch b/cross/gcc-armhf/0014-nopie.patch
index a51d4c693..15362cd24 100644
--- a/cross/gcc-armhf/0014-nopie.patch
+++ b/cross/gcc-armhf/0014-nopie.patch
@@ -1,4 +1,4 @@
-From d10ec6f4bea9d3f07d3ada43da129a4b5812fd65 Mon Sep 17 00:00:00 2001
+From a66c4f80981aebf73779960f8fa8c91b6aa6c85f 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.34.0
+2.34.1
 
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 699e09562..6740c3310 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 2640a3cf5ecfaf532448baa66ea138c3ef02dec1 Mon Sep 17 00:00:00 2001
+From a0f248d4b4ccb787d4479229e9f5b0ba1b3aa7d5 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.34.0
+2.34.1
 
diff --git a/cross/gcc-armhf/0016-dlang-update-zlib-binding.patch b/cross/gcc-armhf/0016-dlang-update-zlib-binding.patch
index 37d4117aa..223078f65 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 60d97064fb53a99c6189f9cb81824a70d435d2d1 Mon Sep 17 00:00:00 2001
+From 9aa0f7fc3b563246014f0a26cd1b8426d310046d 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.34.0
+2.34.1
 
diff --git a/cross/gcc-armhf/0017-dlang-use-libucontext-on-mips64.patch b/cross/gcc-armhf/0017-dlang-use-libucontext-on-mips64.patch
new file mode 100644
index 000000000..223b35f7b
--- /dev/null
+++ b/cross/gcc-armhf/0017-dlang-use-libucontext-on-mips64.patch
@@ -0,0 +1,24 @@
+From b103cbe23f697c81922fa027d467622e0d2fc8a8 Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Thu, 6 Jan 2022 03:18:32 +0000
+Subject: [PATCH] dlang: use libucontext on mips64
+
+---
+ libphobos/configure.tgt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libphobos/configure.tgt b/libphobos/configure.tgt
+index 0643daeb613..b74d9fb3f25 100644
+--- a/libphobos/configure.tgt
++++ b/libphobos/configure.tgt
+@@ -38,6 +38,7 @@ case "${target}" in
+ 	;;
+   mips*-*-linux*)
+ 	LIBPHOBOS_SUPPORTED=yes
++	LIBDRUNTIME_NEEDS_UCONTEXT=yes
+ 	;;
+   power*-*-freebsd*)
+ 	LIBPHOBOS_SUPPORTED=yes
+-- 
+2.34.1
+
diff --git a/cross/gcc-aarch64/0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch b/cross/gcc-armhf/0018-dlang-libdruntime-define-fcntl.h-constants-for-mips6.patch
similarity index 63%
rename from cross/gcc-aarch64/0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch
rename to cross/gcc-armhf/0018-dlang-libdruntime-define-fcntl.h-constants-for-mips6.patch
index 0b05c3564..b51fcacec 100644
--- a/cross/gcc-aarch64/0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch
+++ b/cross/gcc-armhf/0018-dlang-libdruntime-define-fcntl.h-constants-for-mips6.patch
@@ -1,25 +1,12 @@
-From 8524e44401fa57f6bdf78f39fb60cbb76046d256 Mon Sep 17 00:00:00 2001
+From 37194c8f82652477eeea81c62628309896fefcfd 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
+Date: Thu, 6 Jan 2022 03:19:12 +0000
+Subject: [PATCH] dlang: libdruntime: define fcntl.h constants for mips64
 
 ---
- libphobos/configure.tgt                      |  1 +
  libphobos/libdruntime/core/sys/posix/fcntl.d | 15 +++++++++++++++
- 2 files changed, 16 insertions(+)
+ 1 file changed, 15 insertions(+)
 
-diff --git a/libphobos/configure.tgt b/libphobos/configure.tgt
-index 88c027d0c28..48ef12aaa5e 100644
---- a/libphobos/configure.tgt
-+++ b/libphobos/configure.tgt
-@@ -38,6 +38,7 @@ case "${target}" in
- 	;;
-   mips*-*-linux*)
- 	LIBPHOBOS_SUPPORTED=yes
-+	LIBDRUNTIME_NEEDS_UCONTEXT=yes
- 	;;
-   power*-*-linux*)
- 	LIBPHOBOS_SUPPORTED=yes
 diff --git a/libphobos/libdruntime/core/sys/posix/fcntl.d b/libphobos/libdruntime/core/sys/posix/fcntl.d
 index 59df921ba41..9ee9f943948 100644
 --- a/libphobos/libdruntime/core/sys/posix/fcntl.d
@@ -47,5 +34,5 @@ index 59df921ba41..9ee9f943948 100644
          static assert(0, "Platform not supported");
  
 -- 
-2.34.0
+2.34.1
 
diff --git a/cross/gcc-armv7/0018-ada-fix-shared-linking.patch b/cross/gcc-armhf/0019-ada-fix-shared-linking.patch
similarity index 95%
rename from cross/gcc-armv7/0018-ada-fix-shared-linking.patch
rename to cross/gcc-armhf/0019-ada-fix-shared-linking.patch
index cbed48d66..7a71e35ec 100644
--- a/cross/gcc-armv7/0018-ada-fix-shared-linking.patch
+++ b/cross/gcc-armhf/0019-ada-fix-shared-linking.patch
@@ -1,4 +1,4 @@
-From 03810f135f7106da0b9fef6c60c9def8b1891940 Mon Sep 17 00:00:00 2001
+From faa76d0bb79553be27fe82b1e85194e7a5284885 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.34.0
+2.34.1
 
diff --git a/cross/gcc-armhf/0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch b/cross/gcc-armhf/0020-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
similarity index 89%
rename from cross/gcc-armhf/0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
rename to cross/gcc-armhf/0020-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
index dbb474047..3047c9b32 100644
--- a/cross/gcc-armhf/0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
+++ b/cross/gcc-armhf/0020-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
@@ -1,4 +1,4 @@
-From b0eafa664f78c3d3f5d9bf38ece54777119c8e6e Mon Sep 17 00:00:00 2001
+From 322c11faac7212b3302d941ae96ff19b47930d16 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.34.0
+2.34.1
 
diff --git a/cross/gcc-aarch64/0020-add-fortify-headers-paths.patch b/cross/gcc-armhf/0021-add-fortify-headers-paths.patch
similarity index 91%
rename from cross/gcc-aarch64/0020-add-fortify-headers-paths.patch
rename to cross/gcc-armhf/0021-add-fortify-headers-paths.patch
index 62c748eb8..32bc021d7 100644
--- a/cross/gcc-aarch64/0020-add-fortify-headers-paths.patch
+++ b/cross/gcc-armhf/0021-add-fortify-headers-paths.patch
@@ -1,4 +1,4 @@
-From 8dda8a6e1bd6f49f687f9b6725e704eaa0b25873 Mon Sep 17 00:00:00 2001
+From 510963f7eeb031182c1c986365cc65bd4ddc5885 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.34.0
+2.34.1
 
diff --git a/cross/gcc-armhf/0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch b/cross/gcc-armhf/0022-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
similarity index 90%
rename from cross/gcc-armhf/0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
rename to cross/gcc-armhf/0022-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
index ff2c2be4b..be9e67f06 100644
--- a/cross/gcc-armhf/0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
+++ b/cross/gcc-armhf/0022-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
@@ -1,4 +1,4 @@
-From 06a8b9fd165032afd96facc5c4e608bfe09ecbea Mon Sep 17 00:00:00 2001
+From b5235a7f62974f3eee20cb511d91c2629f198b69 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
@@ -13,7 +13,7 @@ Subject: [PATCH] Alpine musl package provides libssp_nonshared.a. We link to
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 diff --git a/gcc/gcc.c b/gcc/gcc.c
-index e495b222095..ab8866f409f 100644
+index 99314032ec2..6e91767efe8 100644
 --- a/gcc/gcc.c
 +++ b/gcc/gcc.c
 @@ -997,8 +997,7 @@ proper position among the other output files.  */
@@ -27,5 +27,5 @@ index e495b222095..ab8866f409f 100644
  #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
  		       "|fstack-protector-strong|fstack-protector-explicit" \
 -- 
-2.34.0
+2.34.1
 
diff --git a/cross/gcc-armhf/0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch b/cross/gcc-armhf/0023-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
similarity index 96%
rename from cross/gcc-armhf/0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
rename to cross/gcc-armhf/0023-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
index 198f47760..2a55e5c57 100644
--- a/cross/gcc-armhf/0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
+++ b/cross/gcc-armhf/0023-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
@@ -1,4 +1,4 @@
-From c279684da1a93b3009c24b7236e2a58c3eb2fe9c Mon Sep 17 00:00:00 2001
+From 0edc38fb81111b5719043d2fbdd4f55e43bcacf0 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
@@ -9,7 +9,7 @@ Subject: [PATCH] DP: Use --push-state/--pop-state for gold as well when
  1 file changed, 8 insertions(+), 8 deletions(-)
 
 diff --git a/gcc/gcc.c b/gcc/gcc.c
-index ab8866f409f..5093e8bbfd2 100644
+index 6e91767efe8..22dbbf85850 100644
 --- a/gcc/gcc.c
 +++ b/gcc/gcc.c
 @@ -738,10 +738,10 @@ proper position among the other output files.  */
@@ -65,5 +65,5 @@ index ab8866f409f..5093e8bbfd2 100644
  #else
  #define LIBUBSAN_SPEC "-lubsan" STATIC_LIBUBSAN_LIBS
 -- 
-2.34.0
+2.34.1
 
diff --git a/cross/gcc-armhf/0023-Pure-64-bit-MIPS.patch b/cross/gcc-armhf/0024-mips64-disable-multilib-support.patch
similarity index 91%
rename from cross/gcc-armhf/0023-Pure-64-bit-MIPS.patch
rename to cross/gcc-armhf/0024-mips64-disable-multilib-support.patch
index 60571ddaa..20a55f862 100644
--- a/cross/gcc-armhf/0023-Pure-64-bit-MIPS.patch
+++ b/cross/gcc-armhf/0024-mips64-disable-multilib-support.patch
@@ -1,8 +1,9 @@
-From 249a08b7257fa09d572933142cc9146c92f38dd2 Mon Sep 17 00:00:00 2001
+From e87872e7ba3c3d7cec1a77b49a7367902958d483 Mon Sep 17 00:00:00 2001
 From: Nils Andreas Svee <me@lochnair.net>
 Date: Thu, 21 Dec 2017 03:14:33 +0100
-Subject: [PATCH] Pure 64-bit MIPS
+Subject: [PATCH] mips64: disable multilib support
 
+multilib is not supported by Alpine GCC
 ---
  gcc/config/mips/mips.h    | 8 ++++----
  gcc/config/mips/t-linux64 | 6 +++---
@@ -43,5 +44,5 @@ index 130e1f04707..a64ac2bbb5b 100644
 +        ../lib32 \
 +        ../lib
 -- 
-2.34.0
+2.34.1
 
diff --git a/cross/gcc-armhf/0025-aarch64-disable-multilib-support.patch b/cross/gcc-armhf/0025-aarch64-disable-multilib-support.patch
new file mode 100644
index 000000000..b88fa60ba
--- /dev/null
+++ b/cross/gcc-armhf/0025-aarch64-disable-multilib-support.patch
@@ -0,0 +1,26 @@
+From 61d47862caefd2709aed78fec8fc3b472aa3a98b Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Thu, 6 Jan 2022 03:12:55 +0000
+Subject: [PATCH] aarch64: disable multilib support
+
+multilib is unsupported on Alpine GCC
+---
+ gcc/config/aarch64/t-aarch64-linux | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gcc/config/aarch64/t-aarch64-linux b/gcc/config/aarch64/t-aarch64-linux
+index 241b0ef20b6..18e63b34d8b 100644
+--- a/gcc/config/aarch64/t-aarch64-linux
++++ b/gcc/config/aarch64/t-aarch64-linux
+@@ -22,7 +22,7 @@ LIB1ASMSRC   = aarch64/lib1funcs.asm
+ LIB1ASMFUNCS = _aarch64_sync_cache_range
+ 
+ AARCH_BE = $(if $(findstring TARGET_BIG_ENDIAN_DEFAULT=1, $(tm_defines)),_be)
+-MULTILIB_OSDIRNAMES = mabi.lp64=../lib64$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu)
++MULTILIB_OSDIRNAMES = mabi.lp64=../lib
+ MULTIARCH_DIRNAME = $(call if_multiarch,aarch64$(AARCH_BE)-linux-gnu)
+ 
+ MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu_ilp32)
+-- 
+2.34.1
+
diff --git a/cross/gcc-armhf/0026-s390x-disable-multilib-support.patch b/cross/gcc-armhf/0026-s390x-disable-multilib-support.patch
new file mode 100644
index 000000000..9dd66f866
--- /dev/null
+++ b/cross/gcc-armhf/0026-s390x-disable-multilib-support.patch
@@ -0,0 +1,25 @@
+From 00fa0519dd9d6d4702999d245f80362dc0c60ea0 Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Thu, 6 Jan 2022 03:13:59 +0000
+Subject: [PATCH] s390x: disable multilib support
+
+multilib is not supported on Alpine GCC at present
+---
+ gcc/config/s390/t-linux64 | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gcc/config/s390/t-linux64 b/gcc/config/s390/t-linux64
+index cc6ab367072..7f498ee1cdc 100644
+--- a/gcc/config/s390/t-linux64
++++ b/gcc/config/s390/t-linux64
+@@ -7,5 +7,5 @@
+ 
+ MULTILIB_OPTIONS = m64/m31
+ MULTILIB_DIRNAMES = 64 32
+-MULTILIB_OSDIRNAMES = ../lib64$(call if_multiarch,:s390x-linux-gnu)
+-MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:s390-linux-gnu)
++MULTILIB_OSDIRNAMES = m64=../lib
++MULTILIB_OSDIRNAMES+= m32=../lib32
+-- 
+2.34.1
+
diff --git a/cross/gcc-aarch64/0024-use-pure-64-bit-configuration-where-appropriate.patch b/cross/gcc-armhf/0027-ppc64-le-disable-multilib-support.patch
similarity index 55%
rename from cross/gcc-aarch64/0024-use-pure-64-bit-configuration-where-appropriate.patch
rename to cross/gcc-armhf/0027-ppc64-le-disable-multilib-support.patch
index 917e89344..89dc4e279 100644
--- a/cross/gcc-aarch64/0024-use-pure-64-bit-configuration-where-appropriate.patch
+++ b/cross/gcc-armhf/0027-ppc64-le-disable-multilib-support.patch
@@ -1,44 +1,16 @@
-From 0c9502cb5db1f2898b531cfb1d3b733490045845 Mon Sep 17 00:00:00 2001
+From 9d762381527aed2c271ea983f54fabd634863701 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
+Date: Thu, 6 Jan 2022 03:14:33 +0000
+Subject: [PATCH] ppc64[le]: disable multilib support
 
+multilib is not presently supported on Alpine GCC
 ---
- gcc/config/aarch64/t-aarch64-linux | 2 +-
- gcc/config/i386/t-linux64          | 4 ++--
- gcc/config/rs6000/t-linux          | 6 ++++--
- gcc/config/rs6000/t-linux64        | 4 ++--
- gcc/config/rs6000/t-linux64bele    | 4 ++--
- gcc/config/rs6000/t-linux64lebe    | 4 ++--
- gcc/config/s390/t-linux64          | 4 ++--
- 7 files changed, 15 insertions(+), 13 deletions(-)
+ gcc/config/rs6000/t-linux       | 6 ++++--
+ gcc/config/rs6000/t-linux64     | 4 ++--
+ gcc/config/rs6000/t-linux64bele | 4 ++--
+ gcc/config/rs6000/t-linux64lebe | 4 ++--
+ 4 files changed, 10 insertions(+), 8 deletions(-)
 
-diff --git a/gcc/config/aarch64/t-aarch64-linux b/gcc/config/aarch64/t-aarch64-linux
-index 241b0ef20b6..18e63b34d8b 100644
---- a/gcc/config/aarch64/t-aarch64-linux
-+++ b/gcc/config/aarch64/t-aarch64-linux
-@@ -22,7 +22,7 @@ LIB1ASMSRC   = aarch64/lib1funcs.asm
- LIB1ASMFUNCS = _aarch64_sync_cache_range
- 
- AARCH_BE = $(if $(findstring TARGET_BIG_ENDIAN_DEFAULT=1, $(tm_defines)),_be)
--MULTILIB_OSDIRNAMES = mabi.lp64=../lib64$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu)
-+MULTILIB_OSDIRNAMES = mabi.lp64=../lib
- MULTIARCH_DIRNAME = $(call if_multiarch,aarch64$(AARCH_BE)-linux-gnu)
- 
- MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu_ilp32)
-diff --git a/gcc/config/i386/t-linux64 b/gcc/config/i386/t-linux64
-index d288b093522..2949033aa04 100644
---- a/gcc/config/i386/t-linux64
-+++ b/gcc/config/i386/t-linux64
-@@ -33,6 +33,6 @@
- comma=,
- MULTILIB_OPTIONS    = $(subst $(comma),/,$(TM_MULTILIB_CONFIG))
- MULTILIB_DIRNAMES   = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS)))
--MULTILIB_OSDIRNAMES = m64=../lib64$(call if_multiarch,:x86_64-linux-gnu)
--MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:i386-linux-gnu)
-+MULTILIB_OSDIRNAMES = m64=../lib
-+MULTILIB_OSDIRNAMES+= m32=../lib32
- MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32)
 diff --git a/gcc/config/rs6000/t-linux b/gcc/config/rs6000/t-linux
 index aeb7440c492..ab14c455d8d 100644
 --- a/gcc/config/rs6000/t-linux
@@ -104,18 +76,6 @@ index 2e63bdb9fc9..c6e1c5db65d 100644
 +MULTILIB_OSDIRNAMES := m64=../lib
 +MULTILIB_OSDIRNAMES += m32=../lib32
  MULTILIB_MATCHES    := ${MULTILIB_MATCHES_ENDIAN}
-diff --git a/gcc/config/s390/t-linux64 b/gcc/config/s390/t-linux64
-index cc6ab367072..7f498ee1cdc 100644
---- a/gcc/config/s390/t-linux64
-+++ b/gcc/config/s390/t-linux64
-@@ -7,5 +7,5 @@
- 
- MULTILIB_OPTIONS = m64/m31
- MULTILIB_DIRNAMES = 64 32
--MULTILIB_OSDIRNAMES = ../lib64$(call if_multiarch,:s390x-linux-gnu)
--MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:s390-linux-gnu)
-+MULTILIB_OSDIRNAMES = m64=../lib
-+MULTILIB_OSDIRNAMES+= m32=../lib32
 -- 
-2.34.0
+2.34.1
 
diff --git a/cross/gcc-armhf/0028-gcc-go-Fix-ucontext_t-on-PPC64.patch b/cross/gcc-armhf/0028-gcc-go-Fix-ucontext_t-on-PPC64.patch
deleted file mode 100644
index e684c26e6..000000000
--- a/cross/gcc-armhf/0028-gcc-go-Fix-ucontext_t-on-PPC64.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Taken from Adélie Linux.
----
- libgo/runtime/go-signal.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libgo/runtime/go-signal.c b/libgo/runtime/go-signal.c
-index d30d1603adc..57f6824eb9e 100644
---- a/libgo/runtime/go-signal.c
-+++ b/libgo/runtime/go-signal.c
-@@ -224,7 +224,7 @@ getSiginfo(siginfo_t *info, void *context __attribute__((unused)))
- #elif defined(__alpha__) && defined(__linux__)
- 	ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.sc_pc;
- #elif defined(__PPC__) && defined(__linux__)
--	ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.regs->nip;
-+	ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.gp_regs[32];
- #elif defined(__PPC__) && defined(_AIX)
- 	ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.jmp_context.iar;
- #elif defined(__aarch64__) && defined(__linux__)
--- 
-2.34.0
-
diff --git a/cross/gcc-armhf/0028-x86_64-disable-multilib-support.patch b/cross/gcc-armhf/0028-x86_64-disable-multilib-support.patch
new file mode 100644
index 000000000..4bb28803e
--- /dev/null
+++ b/cross/gcc-armhf/0028-x86_64-disable-multilib-support.patch
@@ -0,0 +1,26 @@
+From c98b08105a8d28db3ee011f0d0841b235df9f89b Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Thu, 6 Jan 2022 03:14:54 +0000
+Subject: [PATCH] x86_64: disable multilib support
+
+multilib is not presently supported on Alpine GCC
+---
+ gcc/config/i386/t-linux64 | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gcc/config/i386/t-linux64 b/gcc/config/i386/t-linux64
+index d288b093522..2949033aa04 100644
+--- a/gcc/config/i386/t-linux64
++++ b/gcc/config/i386/t-linux64
+@@ -33,6 +33,6 @@
+ comma=,
+ MULTILIB_OPTIONS    = $(subst $(comma),/,$(TM_MULTILIB_CONFIG))
+ MULTILIB_DIRNAMES   = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS)))
+-MULTILIB_OSDIRNAMES = m64=../lib64$(call if_multiarch,:x86_64-linux-gnu)
+-MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:i386-linux-gnu)
++MULTILIB_OSDIRNAMES = m64=../lib
++MULTILIB_OSDIRNAMES+= m32=../lib32
+ MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32)
+-- 
+2.34.1
+
diff --git a/cross/gcc-armhf/0029-riscv-disable-multilib-support.patch b/cross/gcc-armhf/0029-riscv-disable-multilib-support.patch
new file mode 100644
index 000000000..639f95cc6
--- /dev/null
+++ b/cross/gcc-armhf/0029-riscv-disable-multilib-support.patch
@@ -0,0 +1,74 @@
+From ac2cf2b6ef9a496f5d6eeb07338384dc38778782 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
+Date: Mon, 3 Jan 2022 07:14:48 +0100
+Subject: [PATCH] riscv: disable multilib support
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From the musl wiki [1]:
+
+	musl does not support sharing an include directory between archs
+	[…], and thus is not compatible with GCC-style multilib. It is
+	recommended that distributions build GCC with multilib disabled,
+	and use library directories named lib, not lib64 or lib32.
+
+For this reason, we patch existing GCC configuration files (gcc/config)
+to pin MULTILIB_OSDIRNAMES to lib, there is also a corresponding GCC
+upstream bug about this issue [2]. Avoiding the use of lib64 and lib32
+directories is a bit more difficult on the RISC-V architecture. This is
+due to the fact that the default RISC-V configuration does not only use
+the lib64 and lib32 directories but also subdirectories within these
+directories for different RISC-V ABIs (e.g. lp64d, lp64, …) [3].
+
+This patch aligns the RISC-V configuration with other architectures by
+pinning MULTILIB_OSDIRNAMES to lib for rv64gc (our default RISC-V
+-march). Furthermore, this patch removes the ABI-specific startfile
+prefix spec. Since both of these impact the default LIBRARY_PATH [4]
+this patch thereby aligns the default RISC-V LIBRARY_PATH with that from
+other Alpine architectures and thereby fixes #13369 [5].
+
+Incidentally, this also fixes gccgo on riscv64, as without this patch
+gccgo is otherwise not able to find the *.gox files for the Go standard
+library.
+
+[1]: https://wiki.musl-libc.org/guidelines-for-distributions.html#Multilib/multi_arch
+[2]: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90077
+[3]: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=103889#c14
+[4]: https://gcc.gnu.org/git/?p=gcc.git;a=blob;f=gcc/gcc.c;h=d4c8746b0aa322286decf92aa72a12f0a393b655;hb=HEAD#l9122
+[5]: https://gitlab.alpinelinux.org/alpine/aports/-/issues/13369
+---
+ gcc/config/riscv/linux.h | 6 ------
+ gcc/config/riscv/t-linux | 7 +++++--
+ 2 files changed, 5 insertions(+), 8 deletions(-)
+
+diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h
+index ee29979dd34..fe8a82d6702 100644
+--- a/gcc/config/riscv/linux.h
++++ b/gcc/config/riscv/linux.h
+@@ -71,9 +71,3 @@ along with GCC; see the file COPYING3.  If not see
+     %{static:-static}}"
+ 
+ #define TARGET_ASM_FILE_END file_end_indicate_exec_stack
+-
+-#define STARTFILE_PREFIX_SPEC 			\
+-   "/lib" XLEN_SPEC "/" ABI_SPEC "/ "		\
+-   "/usr/lib" XLEN_SPEC "/" ABI_SPEC "/ "	\
+-   "/lib/ "					\
+-   "/usr/lib/ "
+diff --git a/gcc/config/riscv/t-linux b/gcc/config/riscv/t-linux
+index 216d2776a18..1a8a863853e 100644
+--- a/gcc/config/riscv/t-linux
++++ b/gcc/config/riscv/t-linux
+@@ -1,3 +1,6 @@
+-# Only XLEN and ABI affect Linux multilib dir names, e.g. /lib32/ilp32d/
+-MULTILIB_DIRNAMES := $(patsubst rv32%,lib32,$(patsubst rv64%,lib64,$(MULTILIB_DIRNAMES)))
++MULTILIB_OPTIONS := march=rv64gc
++MULTILIB_DIRNAMES := rv64gc
++
++MULTILIB_DIRNAMES := $(patsubst rv32%,lib32,$(patsubst rv64%,lib,$(MULTILIB_DIRNAMES)))
+ MULTILIB_OSDIRNAMES := $(patsubst lib%,../lib%,$(MULTILIB_DIRNAMES))
++MULTILIB_MATCHES := march?rv64gc=march?rv64imafdc
+-- 
+2.34.1
+
diff --git a/cross/gcc-armhf/0025-always-build-libgcc_eh.a.patch b/cross/gcc-armhf/0030-always-build-libgcc_eh.a.patch
similarity index 95%
rename from cross/gcc-armhf/0025-always-build-libgcc_eh.a.patch
rename to cross/gcc-armhf/0030-always-build-libgcc_eh.a.patch
index bf8e0dc20..d05bb9376 100644
--- a/cross/gcc-armhf/0025-always-build-libgcc_eh.a.patch
+++ b/cross/gcc-armhf/0030-always-build-libgcc_eh.a.patch
@@ -1,4 +1,4 @@
-From 338f65b9c13e8aaacf146e0fe2400566766f02e4 Mon Sep 17 00:00:00 2001
+From 119e2461840821ae3bbf00190f908cb649368384 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.34.0
+2.34.1
 
diff --git a/cross/gcc-aarch64/0026-ada-libgnarl-compatibility-for-musl.patch b/cross/gcc-armhf/0031-ada-libgnarl-compatibility-for-musl.patch
similarity index 98%
rename from cross/gcc-aarch64/0026-ada-libgnarl-compatibility-for-musl.patch
rename to cross/gcc-armhf/0031-ada-libgnarl-compatibility-for-musl.patch
index 3e6e8b394..a6450526a 100644
--- a/cross/gcc-aarch64/0026-ada-libgnarl-compatibility-for-musl.patch
+++ b/cross/gcc-armhf/0031-ada-libgnarl-compatibility-for-musl.patch
@@ -1,4 +1,4 @@
-From 0703d9ad84cd92f8a08787a85536a98b3830bba0 Mon Sep 17 00:00:00 2001
+From a797880afb2876812d972fcb4e26b6c856cdf97a 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.34.0
+2.34.1
 
diff --git a/cross/gcc-aarch64/0027-ada-musl-support-fixes.patch b/cross/gcc-armhf/0032-ada-musl-support-fixes.patch
similarity index 99%
rename from cross/gcc-aarch64/0027-ada-musl-support-fixes.patch
rename to cross/gcc-armhf/0032-ada-musl-support-fixes.patch
index 3a7075f96..eaa523650 100644
--- a/cross/gcc-aarch64/0027-ada-musl-support-fixes.patch
+++ b/cross/gcc-armhf/0032-ada-musl-support-fixes.patch
@@ -1,4 +1,4 @@
-From 0b879c9a3ef83b3b08a0d72bfe89816d52489408 Mon Sep 17 00:00:00 2001
+From 55f41483ea3d40c5b790a8b70e3662511c1bcc45 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.34.0
+2.34.1
 
diff --git a/cross/gcc-aarch64/0029-gcc-go-Fix-handling-of-signal-34-on-musl.patch b/cross/gcc-armhf/0033-gcc-go-Fix-handling-of-signal-34-on-musl.patch
similarity index 96%
rename from cross/gcc-aarch64/0029-gcc-go-Fix-handling-of-signal-34-on-musl.patch
rename to cross/gcc-armhf/0033-gcc-go-Fix-handling-of-signal-34-on-musl.patch
index 30af57256..3d6033aee 100644
--- a/cross/gcc-aarch64/0029-gcc-go-Fix-handling-of-signal-34-on-musl.patch
+++ b/cross/gcc-armhf/0033-gcc-go-Fix-handling-of-signal-34-on-musl.patch
@@ -1,4 +1,4 @@
-From 098c0bca8bd1f47e94c8368406973019bbe9bf55 Mon Sep 17 00:00:00 2001
+From e6fe77d1aef59373675f61a102c511529b1f5125 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.34.0
+2.34.1
 
diff --git a/cross/gcc-armhf/0030-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch b/cross/gcc-armhf/0034-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch
similarity index 92%
rename from cross/gcc-armhf/0030-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch
rename to cross/gcc-armhf/0034-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch
index 60ce845eb..80ef879f9 100644
--- a/cross/gcc-armhf/0030-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch
+++ b/cross/gcc-armhf/0034-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch
@@ -1,4 +1,4 @@
-From 7ba79053336c8666d3f137ef106696926d3f7b31 Mon Sep 17 00:00:00 2001
+From a385ececbc3f01007ad62002d994e35ce3e2e2b9 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.34.0
+2.34.1
 
diff --git a/cross/gcc-armhf/0034-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch b/cross/gcc-armhf/0034-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
deleted file mode 100644
index bd5876103..000000000
--- a/cross/gcc-armhf/0034-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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
-
-These struct members do not seem to exist on musl.
----
- libgo/runtime/go-signal.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libgo/runtime/go-signal.c b/libgo/runtime/go-signal.c
-index 57f6824eb9e..fd03db420d4 100644
---- a/libgo/runtime/go-signal.c
-+++ b/libgo/runtime/go-signal.c
-@@ -335,7 +335,7 @@ dumpregs(siginfo_t *info __attribute__((unused)), void *context __attribute__((u
- 		runtime_printf("sp  %X\n", m->sc_regs[30]);
- 		runtime_printf("pc  %X\n", m->sc_pc);
- 	  }
--#elif defined(__PPC__) && defined(__LITTLE_ENDIAN__) && defined(__linux__)
-+#elif defined(__PPC__) && defined(__LITTLE_ENDIAN__) && defined(__GLIBC__)
- 	  {
- 		mcontext_t *m = &((ucontext_t*)(context))->uc_mcontext;
- 		int i;
--- 
-2.34.0
-
diff --git a/cross/gcc-armhf/0031-gcc-go-signal-34-is-special-on-musl-libc.patch b/cross/gcc-armhf/0035-gcc-go-signal-34-is-special-on-musl-libc.patch
similarity index 92%
rename from cross/gcc-armhf/0031-gcc-go-signal-34-is-special-on-musl-libc.patch
rename to cross/gcc-armhf/0035-gcc-go-signal-34-is-special-on-musl-libc.patch
index 4c7bad8e6..ccfad98c5 100644
--- a/cross/gcc-armhf/0031-gcc-go-signal-34-is-special-on-musl-libc.patch
+++ b/cross/gcc-armhf/0035-gcc-go-signal-34-is-special-on-musl-libc.patch
@@ -1,4 +1,4 @@
-From 18ba9309687431399aabe54c0b758f69b01253e0 Mon Sep 17 00:00:00 2001
+From 399c8ce9bce85e84fd0430403a04a38ff75a9e71 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.34.0
+2.34.1
 
diff --git a/cross/gcc-armhf/0032-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch b/cross/gcc-armhf/0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
similarity index 91%
rename from cross/gcc-armhf/0032-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
rename to cross/gcc-armhf/0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
index 5be5b32e6..1bb983ee4 100644
--- a/cross/gcc-armhf/0032-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
+++ b/cross/gcc-armhf/0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
@@ -1,4 +1,4 @@
-From 1be822dcf1f9ffdba5c6508cef0374585e48cb18 Mon Sep 17 00:00:00 2001
+From c380a283946cbe5a2d76aec0a6b19bba085305bc 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.34.0
+2.34.1
 
diff --git a/cross/gcc-armhf/0033-gcc-go-link-to-libucontext.patch b/cross/gcc-armhf/0037-gcc-go-link-to-libucontext.patch
similarity index 90%
rename from cross/gcc-armhf/0033-gcc-go-link-to-libucontext.patch
rename to cross/gcc-armhf/0037-gcc-go-link-to-libucontext.patch
index 283d562d9..62c487a45 100644
--- a/cross/gcc-armhf/0033-gcc-go-link-to-libucontext.patch
+++ b/cross/gcc-armhf/0037-gcc-go-link-to-libucontext.patch
@@ -1,4 +1,4 @@
-From 2fa393cd8ae6b25539cc7bd9998c603a3b33bc6e Mon Sep 17 00:00:00 2001
+From 7a9168eb92cce811ce87767a6d79b525a2d484ab 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.34.0
+2.34.1
 
diff --git a/cross/gcc-armv7/0035-Use-generic-errstr.go-implementation-on-musl.patch b/cross/gcc-armhf/0038-Use-generic-errstr.go-implementation-on-musl.patch
similarity index 95%
rename from cross/gcc-armv7/0035-Use-generic-errstr.go-implementation-on-musl.patch
rename to cross/gcc-armhf/0038-Use-generic-errstr.go-implementation-on-musl.patch
index e6bcfa9a0..0836be002 100644
--- a/cross/gcc-armv7/0035-Use-generic-errstr.go-implementation-on-musl.patch
+++ b/cross/gcc-armhf/0038-Use-generic-errstr.go-implementation-on-musl.patch
@@ -1,4 +1,4 @@
-From 23f7ad8b28284017c4f63e944bcb0321eb205e8a Mon Sep 17 00:00:00 2001
+From 442c3400a3ffd45c0a78a61ae233f7049fdad2fb 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.34.0
+2.34.1
 
diff --git a/cross/gcc-armhf/0036-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch b/cross/gcc-armhf/0039-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
similarity index 98%
rename from cross/gcc-armhf/0036-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
rename to cross/gcc-armhf/0039-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
index 1895dd258..7c3483837 100644
--- a/cross/gcc-armhf/0036-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
+++ b/cross/gcc-armhf/0039-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
@@ -1,4 +1,4 @@
-From 7e123432a35fcaa25de85b4940daabcd70c1a6bd Mon Sep 17 00:00:00 2001
+From 0d69ddbca85c13aba7c5c9aca57a801d5cdb7548 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
@@ -242,7 +242,7 @@ index 2974dae2701..80e003a38ce 100644
  
  @defmac POST_LINK_SPEC
 diff --git a/gcc/gcc.c b/gcc/gcc.c
-index 5093e8bbfd2..1871b5ab6eb 100644
+index 22dbbf85850..90aa576037a 100644
 --- a/gcc/gcc.c
 +++ b/gcc/gcc.c
 @@ -980,13 +980,23 @@ proper position among the other output files.  */
@@ -271,5 +271,5 @@ index 5093e8bbfd2..1871b5ab6eb 100644
  
  #ifdef ENABLE_DEFAULT_SSP
 -- 
-2.34.0
+2.34.1
 
diff --git a/cross/gcc-aarch64/0037-configure-fix-detection-of-atomic-builtins-in-libato.patch b/cross/gcc-armhf/0040-configure-fix-detection-of-atomic-builtins-in-libato.patch
similarity index 96%
rename from cross/gcc-aarch64/0037-configure-fix-detection-of-atomic-builtins-in-libato.patch
rename to cross/gcc-armhf/0040-configure-fix-detection-of-atomic-builtins-in-libato.patch
index 163b3ca3c..27ce265fb 100644
--- a/cross/gcc-aarch64/0037-configure-fix-detection-of-atomic-builtins-in-libato.patch
+++ b/cross/gcc-armhf/0040-configure-fix-detection-of-atomic-builtins-in-libato.patch
@@ -1,4 +1,4 @@
-From cb2472c05592e4a1b5f826d761d0ef221c0c9664 Mon Sep 17 00:00:00 2001
+From 20a7e6fd41f1f2382bda3fa9b9171188a02a4dc5 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.34.0
+2.34.1
 
diff --git a/cross/gcc-armv7/0038-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch b/cross/gcc-armhf/0041-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch
similarity index 97%
rename from cross/gcc-armv7/0038-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch
rename to cross/gcc-armhf/0041-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch
index 8f5df6b69..ff2be3c7e 100644
--- a/cross/gcc-armv7/0038-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch
+++ b/cross/gcc-armhf/0041-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch
@@ -1,4 +1,4 @@
-From 45b24f2bf7fa1b2b9d597bd065b6522f8d87cd3e Mon Sep 17 00:00:00 2001
+From ce22a6e1b6cde3237a733b9fb04c113de429b3a9 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
@@ -80,5 +80,5 @@ index 8ce061e2f5f..b85add15a7b 100644
  // be signed in some OSes.
  #ifdef SIOCGIFMTU
 -- 
-2.34.0
+2.34.1
 
diff --git a/cross/gcc-armv7/0039-Fix-attempt-to-use-poisoned-calloc-error-in-libgccji.patch b/cross/gcc-armhf/0042-Fix-attempt-to-use-poisoned-calloc-error-in-libgccji.patch
similarity index 95%
rename from cross/gcc-armv7/0039-Fix-attempt-to-use-poisoned-calloc-error-in-libgccji.patch
rename to cross/gcc-armhf/0042-Fix-attempt-to-use-poisoned-calloc-error-in-libgccji.patch
index f43cfb4ac..9c8be4ae7 100644
--- a/cross/gcc-armv7/0039-Fix-attempt-to-use-poisoned-calloc-error-in-libgccji.patch
+++ b/cross/gcc-armhf/0042-Fix-attempt-to-use-poisoned-calloc-error-in-libgccji.patch
@@ -1,4 +1,4 @@
-From 0b7a57f08abff72f8dd1f67de995c502e798513c Mon Sep 17 00:00:00 2001
+From 55a6814dd32978e88c5be7f023ac9d88d6287b59 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
@@ -12,7 +12,7 @@ included #pragma GCC poison calloc
  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
+index cee9daa8220..a5600084933 100644
 --- a/gcc/jit/jit-playback.c
 +++ b/gcc/jit/jit-playback.c
 @@ -18,6 +18,8 @@ You should have received a copy of the GNU General Public License
@@ -76,5 +76,5 @@ index 0cc650f9810..2f44481eeb0 100644
  #include "libgccjit.h"
  #include "jit-recording.h"
 -- 
-2.34.0
+2.34.1
 
diff --git a/cross/gcc-armhf/0040-stddef.h-add-support-for-musl-typedef-macro-guards.patch b/cross/gcc-armhf/0043-stddef.h-add-support-for-musl-typedef-macro-guards.patch
similarity index 98%
rename from cross/gcc-armhf/0040-stddef.h-add-support-for-musl-typedef-macro-guards.patch
rename to cross/gcc-armhf/0043-stddef.h-add-support-for-musl-typedef-macro-guards.patch
index c22f7f43f..09acb7160 100644
--- a/cross/gcc-armhf/0040-stddef.h-add-support-for-musl-typedef-macro-guards.patch
+++ b/cross/gcc-armhf/0043-stddef.h-add-support-for-musl-typedef-macro-guards.patch
@@ -1,4 +1,4 @@
-From 5a76cf60df5c9ba274f1d0dcd79fc0cbad9d0fe0 Mon Sep 17 00:00:00 2001
+From 5b03488537d53ee1265ff9129b4d9a9e4f353777 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
@@ -102,5 +102,5 @@ index 66619fe43b1..50d710a5ab9 100644
  #endif /* _BSD_RUNE_T_DEFINED_ */
  #endif
 -- 
-2.34.0
+2.34.1
 
diff --git a/cross/gcc-armv7/0041-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch b/cross/gcc-armhf/0044-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
similarity index 95%
rename from cross/gcc-armv7/0041-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
rename to cross/gcc-armhf/0044-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
index 41e67843f..ebb64f51f 100644
--- a/cross/gcc-armv7/0041-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
+++ b/cross/gcc-armhf/0044-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
@@ -1,4 +1,4 @@
-From f042000a3113524554f5565f147735caf15dd42f Mon Sep 17 00:00:00 2001
+From 55c3e771c17a41ec1654074b7eef23594f07126e Mon Sep 17 00:00:00 2001
 From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
 Date: Sun, 30 Aug 2020 18:33:49 +0200
 Subject: [PATCH] gcc-go: Use int64 type as offset argument for mmap
@@ -58,3 +58,6 @@ index fa3389d857e..57bed97c710 100644
  	p := sysMmap(addr, n, prot, flags, fd, off)
  	if uintptr(p) == _MAP_FAILED {
  		return nil, errno()
+-- 
+2.34.1
+
diff --git a/cross/gcc-armv7/0042-Disable-fsplit-stack-support-on-non-glibc-targets.patch b/cross/gcc-armhf/0045-Disable-fsplit-stack-support-on-non-glibc-targets.patch
similarity index 98%
rename from cross/gcc-armv7/0042-Disable-fsplit-stack-support-on-non-glibc-targets.patch
rename to cross/gcc-armhf/0045-Disable-fsplit-stack-support-on-non-glibc-targets.patch
index c6ec2dfa6..9a6a80d7f 100644
--- a/cross/gcc-armv7/0042-Disable-fsplit-stack-support-on-non-glibc-targets.patch
+++ b/cross/gcc-armhf/0045-Disable-fsplit-stack-support-on-non-glibc-targets.patch
@@ -1,4 +1,4 @@
-From 5b7b256eafc888a3be2dcee1e01f8dc6a814d1a6 Mon Sep 17 00:00:00 2001
+From 653555dafe2b720bc76db22691c9e1383bbb7da2 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
 Date: Wed, 15 Dec 2021 00:14:19 +0100
 Subject: [PATCH] Disable -fsplit-stack support on non-glibc targets
@@ -93,3 +93,6 @@ index 25fbc07f58c..895a7369816 100644
  
  /* i386 glibc provides __stack_chk_guard in %gs:0x14.  */
  #define TARGET_THREAD_SSP_OFFSET        0x14
+-- 
+2.34.1
+
diff --git a/cross/gcc-armhf/0046-libgo-include-asm-ptrace.h-for-pt_regs-definition-on.patch b/cross/gcc-armhf/0046-libgo-include-asm-ptrace.h-for-pt_regs-definition-on.patch
new file mode 100644
index 000000000..abc60cc98
--- /dev/null
+++ b/cross/gcc-armhf/0046-libgo-include-asm-ptrace.h-for-pt_regs-definition-on.patch
@@ -0,0 +1,58 @@
+From b9399209363da18b79890a88ed8dcbe1e15c9bfc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren@soeren-tempel.net>
+Date: Sun, 2 Jan 2022 01:07:03 +0100
+Subject: [PATCH] libgo: include asm/ptrace.h for pt_regs definition on PowerPC
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Both glibc and musl libc declare pt_regs as an incomplete type. This
+type has to be completed by inclusion of another header. On Linux, the
+asm/ptrace.h header file provides this type definition. Without
+including this header file, it is not possible to access the regs member
+of the mcontext_t struct as done in libgo/runtime/go-signal.c. On glibc,
+other headers (e.g. sys/user.h) include asm/ptrace.h but on musl
+asm/ptrace.h is not included by other headers and thus the
+aforementioned files do not compile without an explicit include of
+asm/ptrace.h:
+
+	libgo/runtime/go-signal.c: In function 'getSiginfo':
+	libgo/runtime/go-signal.c:227:63: error: invalid use of undefined type 'struct pt_regs'
+	  227 |         ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.regs->nip;
+	      |
+
+Instead of including the asm/ptrace.h header conditionally on PowerPC
+only it would alternatively also be possible to include it
+unconditionally.
+
+See also:
+
+* https://git.musl-libc.org/cgit/musl/commit/?id=c2518a8efb6507f1b41c3b12e03b06f8f2317a1f
+* https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=d57cb31910ca5c200e4172276749a7f8bd17ae3c
+* https://github.com/kaniini/libucontext/issues/36
+
+Signed-off-by: Sören Tempel <soeren@soeren-tempel.net>
+---
+ libgo/runtime/go-signal.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/libgo/runtime/go-signal.c b/libgo/runtime/go-signal.c
+index d30d1603adc..fc01e04e4a1 100644
+--- a/libgo/runtime/go-signal.c
++++ b/libgo/runtime/go-signal.c
+@@ -10,6 +10,12 @@
+ #include <sys/time.h>
+ #include <ucontext.h>
+ 
++// On PowerPC, ucontext.h uses a pt_regs struct as an incomplete
++// type. This type must be completed by including asm/ptrace.h.
++#ifdef __PPC__
++#include <asm/ptrace.h>
++#endif
++
+ #include "runtime.h"
+ 
+ #ifndef SA_RESTART
+-- 
+2.34.1
+
diff --git a/cross/gcc-armhf/APKBUILD b/cross/gcc-armhf/APKBUILD
index 5ed9dcd91..0f85efc71 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_git20211128
+pkgver=11.2.1_git20220106
 [ "$BOOTSTRAP" = "nolibc" ] && pkgname="gcc-pass2"
 [ "$CBUILD" != "$CHOST" ] && _cross="-$CARCH" || _cross=""
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname=gcc-armhf
-pkgrel=3
+pkgrel=0
 pkgdesc="Stage2 cross-compiler for armhf"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -203,7 +203,7 @@ makedepends="$makedepends_build $makedepends_host"
 source="https://dev.alpinelinux.org/~nenolod/gcc-${pkgver}.tar.xz
 	0001-posix_memalign.patch
 	0002-gcc-poison-system-directories.patch
-	0003-Turn-on-Wl-z-relro-z-now-by-default.patch
+	0003-specs-turn-on-Wl-z-now-by-default.patch
 	0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
 	0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
 	0006-Enable-Wformat-and-Wformat-security-by-default.patch
@@ -217,32 +217,36 @@ source="https://dev.alpinelinux.org/~nenolod/gcc-${pkgver}.tar.xz
 	0014-nopie.patch
 	0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch
 	0016-dlang-update-zlib-binding.patch
-	0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch
-	0018-ada-fix-shared-linking.patch
-	0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
-	0020-add-fortify-headers-paths.patch
-	0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
-	0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
-	0023-Pure-64-bit-MIPS.patch
-	0024-use-pure-64-bit-configuration-where-appropriate.patch
-	0025-always-build-libgcc_eh.a.patch
-	0026-ada-libgnarl-compatibility-for-musl.patch
-	0027-ada-musl-support-fixes.patch
-	0028-gcc-go-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
-	0041-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
-	0042-Disable-fsplit-stack-support-on-non-glibc-targets.patch
+	0017-dlang-use-libucontext-on-mips64.patch
+	0018-dlang-libdruntime-define-fcntl.h-constants-for-mips6.patch
+	0019-ada-fix-shared-linking.patch
+	0020-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
+	0021-add-fortify-headers-paths.patch
+	0022-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
+	0023-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
+	0024-mips64-disable-multilib-support.patch
+	0025-aarch64-disable-multilib-support.patch
+	0026-s390x-disable-multilib-support.patch
+	0027-ppc64-le-disable-multilib-support.patch
+	0028-x86_64-disable-multilib-support.patch
+	0029-riscv-disable-multilib-support.patch
+	0030-always-build-libgcc_eh.a.patch
+	0031-ada-libgnarl-compatibility-for-musl.patch
+	0032-ada-musl-support-fixes.patch
+	0033-gcc-go-Fix-handling-of-signal-34-on-musl.patch
+	0034-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch
+	0035-gcc-go-signal-34-is-special-on-musl-libc.patch
+	0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
+	0037-gcc-go-link-to-libucontext.patch
+	0038-Use-generic-errstr.go-implementation-on-musl.patch
+	0039-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
+	0040-configure-fix-detection-of-atomic-builtins-in-libato.patch
+	0041-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch
+	0042-Fix-attempt-to-use-poisoned-calloc-error-in-libgccji.patch
+	0043-stddef.h-add-support-for-musl-typedef-macro-guards.patch
+	0044-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
+	0045-Disable-fsplit-stack-support-on-non-glibc-targets.patch
+	0046-libgo-include-asm-ptrace.h-for-pt_regs-definition-on.patch
 	"
 
 # we build out-of-tree
@@ -704,47 +708,51 @@ gnat() {
 }
 
 sha512sums="
-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
-e4d2466191b4acde115917506c285b617d6210bf3603e705ca3d905e4e28b12e399b16898f6ab9996b1d4fbfa3aed554e86931ed7f13fc13a9459af7f29f4393  0041-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
-5e04b9a6d39b708daedcef494e4aed59b1a97d2052ed7eb8d1e3da5faa70dc5e1fa3ee249c685e820109d5605ee2b66154856b0ffccf7b8a49af1a1da9350ebf  0042-Disable-fsplit-stack-support-on-non-glibc-targets.patch
+f0f073a05ec9bf93e4d85707282f0b75b8e783f86c16b5ed118444e7b362be2122a10233baa822efcb52c7bc353c6ca06951db0e93c030372275baa922939c3f  gcc-11.2.1_git20220106.tar.xz
+c81a5ddd7699320129813529c12afb81744491a2df32922ee9816413d5fcb2857abf7641381ecb5e5748ac8335ab8e2ac27e7c56262e82c42f57adbb655328a1  0001-posix_memalign.patch
+3adf23e255343ef1ead10b0312f506e722aab6218b35b1f92a855b3e5a1e63cddb45fb568f19d2e2443e1dad647f6d9429830004b45371a07e7098d430e1cecf  0002-gcc-poison-system-directories.patch
+f1de78496e0caeefe7441be04a8c78e83fada8adcdaa4abda607b7b83ca51ecb6f3cdbb9290c38a3fefe32f7980c47779687726ad9f557471978313eea1f99d3  0003-specs-turn-on-Wl-z-now-by-default.patch
+3959ebad795264ddd00640a2ff7ce511d69adc5683e25760d4741fbc99f56a7243545ccfce29578a3790138afa1e6ea6b232faf39f7904a17d7f3aeaa8080b61  0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
+4cabe468a1b138fed597d6bb946200da77e127022032fb5adb0955d64c6aad34ed1861aee11563b6555bd9d48721ac762b4a1e5c1d604274146ce8f989beee24  0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
+a686ac11781236bfbc793e124fe842a1c4311884b9aec39e79673ef6d65fc8f36aacdbe6410b9a80ca9245a3bc49ee71babd1ffcde1b816cb385ff771175fd7c  0006-Enable-Wformat-and-Wformat-security-by-default.patch
+83b2d4dcad924cbddc8d8a2569d6e5ca59b63b8b5a30fef176acac48622eaf8237ba649f55bc23327456508df3d3a1f2aad20536eb151d831c6b1cfeb3b33f76  0007-Enable-Wtrampolines-by-default.patch
+69ba40c718458f466f43e7f4450c1c774f27a7ac36bb794ee653e7aabc2f21de7596a5d410efbe093ff1416951c547fa73b92980677b04fa7f371390281109f6  0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
+2adef312e5b89764176451b3d184f85f309f8f8bfadc1ed7a3c43a27ca5032de39e10d2881284f49ee0d1e719782542cd008bf11504122b96987e3fd45ca022c  0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
+a3952e27b39c737563daedba609960f4e7237e52988d1cec757526e4ed3887aee563cfc87925e6840619182c1c9876cd483ee3cc83747015f758c2421b3f1ba4  0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
+46b073319937bdaaffe6a97a935a4b328f5fcbc10f91f88de20d7b1ffc7bd6321671c34fdcfb0ec59ca01033249f607715cfc154b57e195a55cea7ea6950c54d  0011-libiberty-copy-PIC-objects-during-build-process.patch
+c56526a61daa35dc72447aa9d947987f2ed124c6cf3b2cd82981f934cd4b032555402306a87a2667359f6670e9a4531e98c7b48ca4b0ecbfb019c551c87b24ee  0012-libitm-disable-FORTIFY.patch
+5b2f39fee095947827625480994abe929cea90f95eda7849a3d7802990bc8dab501543d3f15b1d987bed10f69f868b15cd4af7cf3e1c4fc2d2495a2e3adfbd1d  0013-libgcc_s.patch
+4a1043e95a14e95d7f6081f82e7004c9ad11165be67d20c7e03d0eb46e2aebe2b8d65cf95a29945463bd51fbc233ad322784f19804bd47e7425ec59a17314e45  0014-nopie.patch
+bdba6d04f9e77a00e407a70393aec0d668087be3bf6bd2db7e18b1ce20eae640346958a108ed65087bcf0d4250be168034ccfc72115afbe2dec9b2968218926c  0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch
+b5703c0a200a10bb84226fafc8d0fc3bdefecfd705d87b115368265aef4664b8cf158a21e59f1f32c842b3c665c3a009bb25b2b0003eb08914f0e0be81cec733  0016-dlang-update-zlib-binding.patch
+925641f72bccc471f092108699cd9c4610430e7f829c65d800e592d47ae6ddbe57581a91e94ccd6b3fb5c481048a697d0c72826903fedd03780368519fab70d3  0017-dlang-use-libucontext-on-mips64.patch
+363b166776e8f756e07554146fc4f33bad0f906bd57dfc794bb816c6bfb9bb9cc1d5950f53a03c11ccabab3528398d9df79e88cc02aa39e94809675540ab967f  0018-dlang-libdruntime-define-fcntl.h-constants-for-mips6.patch
+2431ec336ed1c353f210be336fd3ce7e5ab11ed2e76bd87a32bc46fc7845c5accb6483fd7b37fd703a83449859622ab3ed7598ef9442f9e7a34b5f9aa7a5e00e  0019-ada-fix-shared-linking.patch
+b1bb85a34bab62b3fd1a8aef744bb48234bb6ec18454fed8ae068434fd820ddceaf27a372df90af53f95c8a86aec2fd6d49278e85d062c6e7bf96a64352b626b  0020-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
+8174615ddeb4300799e8fb29db1a38ff48ae62cecd50359af238c16f0b17ea0b642f0efa6c5898c06a0d019723438beb3cc252de95c26739da3e99ad6299be22  0021-add-fortify-headers-paths.patch
+a46ed9e4e4b96e7912b2fd4a2cf94bac8eaed68b64bc8bd86914176aa0107eee83a0a5e330ab0524c7f838cdd660a52fcf206033373fc4ff3b3af3a95801efa8  0022-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
+751eb9a4caa32232d9d0916465b5932cae2b05ab989c7019eb4bdc3fdadcec0103b5a6fca789c1886ea76c179a2568ea47de44931b1af4d9f13692c0617a1b48  0023-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
+c9af403da0068f8d93eb74e345d06a43ac103ffd28514fb16ab31517e5172e5ed13451b8b20e87e80adf21b0ce3daca37e335a309d88c403f68377d75ff30a64  0024-mips64-disable-multilib-support.patch
+7504757907b95e474d283876eaef08a4d03ad3308470d9130a7ac221ad1cc204de03520a5fa7ec42f9035af6edf84cb09b2f5b134d2ac744494f4cf385c70ae7  0025-aarch64-disable-multilib-support.patch
+10106ccaa20a6c04c718cdf242c1ba16210d2ffd75febef0a4488023c9aa8d1086fad9c96416a82bf104188ab7542c925b2bbe277935f5c34967321fd358c022  0026-s390x-disable-multilib-support.patch
+1152d020a3da61fd697fad6fc5cf6eeadb1225ebc8d8d9e81b9f63f34073876451b90e93d3fd334eeb68f6702498e335076e35a8020c2cd2443236e222cc73fe  0027-ppc64-le-disable-multilib-support.patch
+1adc2daacbdb0a38ed2aaacc7864cfb38841fba16640af1053892fb63fcc2b56711a6ee3722e45cd17239b5793f612514130d24bc6588d4f884a353f70da3076  0028-x86_64-disable-multilib-support.patch
+cbebee40ad722be52e359853afaf4667e52fbf62e24b6f1b8a96b7b82984bf05a67903122dd5c19f90d477aed7daacdbc409f79a5981493f2457f0f16bef370f  0029-riscv-disable-multilib-support.patch
+46c3089eaf48897de801849744e7094f829f521051345a6465e3a433e6f383298b0b2b4004a9d8277e7108a3e5be274d8aad01ab1ac23e76d3a8d07d396c2e10  0030-always-build-libgcc_eh.a.patch
+1ee9524247041e3cd5d87868431156b9fee4429519508e2d05109c5dd8ba881d2964fe667dd4752cc98575b35a485e2a66b00a8fe2c75a86cd182ff0d706afd5  0031-ada-libgnarl-compatibility-for-musl.patch
+e6ae6f63ead4890ac3761f6d14383f5c5a995cca62d5432e2e12f5dda46d93dadd7298be98010c674533b2793415b0f0c37b54daabd74ef6f5e9f93cadb084b3  0032-ada-musl-support-fixes.patch
+bca91a9369e0a32bb824eff9ee92d7a9bf50273fd304784c04e9ee3d06382a821e6485d180d477c5a2c447ee6c1efe3f7e22014b30c5e3299af923a5c1471091  0033-gcc-go-Fix-handling-of-signal-34-on-musl.patch
+4dd546fbdc73a276e15b0ca27db735ff0145240cf8bf627b267c77ee45d119e29c5346acba83335e0344a01ea9e730a28c5038666a35bfa886332cc63975c1af  0034-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch
+de8b5368f83988526f00c58f81fcb796baf1e2e6823fb70977092236225e859abcccee08373c59bfb944076af2791a549d94da47c4f4816216f6f708706b9f2b  0035-gcc-go-signal-34-is-special-on-musl-libc.patch
+9c87c2f82ce9ab67b8ff4aa2cd5722badfd432292443c7901141479282ff29596ded3dc3508bfd3172544d1c160a6f32de61c801d831ff950236553727c7db19  0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
+c091bc56ced7fc3c5f9a879f42237cb60fbc3da8a2d9742ff0e4e93a3f97f20a620a8f16af23183ed3d14ddaeaf1207e1840fd015a622acb79959dd766aba9bc  0037-gcc-go-link-to-libucontext.patch
+0694338a2fc12a903b979d45e9b4a92dc9e441e9c377e63b36cd900a0cc664e0f0493c797ea4c45478e60a3d70da5ff971e10460a3cbf64c2a940a4327fd87a6  0038-Use-generic-errstr.go-implementation-on-musl.patch
+49c30829a80acf386fd5c14c630f9f0e5161264c1504121da749ae3e06fb54c36280e81b9760378edc3627cb29965da01f8d03c9d473a854d6294200b372da28  0039-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
+ec78df0cd34fe838d9364fdfe3f3d9a068c256b7a507fea9d315c92dc21b0af3675210586e57be93aa096ed7c08645cdc6eb2184e6b18ab0dd900b98847acda5  0040-configure-fix-detection-of-atomic-builtins-in-libato.patch
+0cdfcf11234be520a3b8ddcd0ed2efb9b4606da7135cea918e68a7655ebf43edb01eb291b9b226a0a44cf15f52c714f80884c0128b9d13771df3a6da991f2cbe  0041-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch
+c2a67dc1853682e0c72d721572e29dae93560b2c7d1fa932e4ee38f420b9bc21f187128498e094f7aaf6520f64b707f50c9aa6c260c269abb8e6f00c39be87c3  0042-Fix-attempt-to-use-poisoned-calloc-error-in-libgccji.patch
+9a419b4b0cc3c80871b3b852f5d5fbd37d3e377ddcdf35273c4c543544d575f59762f0dcffa24ec2c74de29aaf07e4e8339474733e7b39558dc1481ad1f2b3ca  0043-stddef.h-add-support-for-musl-typedef-macro-guards.patch
+801cf2e3f08fc6e0d1bd615361d7bb7541d468282ddf4357f9e276336bc4d4151a6cfdd413503dd7576d9c50191e60a8da9f38daa605c48f5f5d047360e882d4  0044-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
+bc05c96a2cfa57ab9c12ef834cf5158991b4dd63baf98ea1558060b966fb959865ce659ea9095307df8c59136f999b7d6ebeb72a4bc1235a458849e227ead900  0045-Disable-fsplit-stack-support-on-non-glibc-targets.patch
+a2c3821998a5e457b6241f88a7015199c7d7abce698ab888ea7df2970866121b02393a70b79cb5862469a5286e9ad91a18fa113e308612baa62a52b839e8eea9  0046-libgo-include-asm-ptrace.h-for-pt_regs-definition-on.patch
 "
diff --git a/cross/gcc-armv7/0001-posix_memalign.patch b/cross/gcc-armv7/0001-posix_memalign.patch
index f41493c81..0be339ed1 100644
--- a/cross/gcc-armv7/0001-posix_memalign.patch
+++ b/cross/gcc-armv7/0001-posix_memalign.patch
@@ -1,4 +1,4 @@
-From a858e4eb74d68ef1cf7a30d6a60fb32c621267c6 Mon Sep 17 00:00:00 2001
+From 5ae72115463e483fab9bc5d46f6a5e56451cf30a 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.34.0
+2.34.1
 
diff --git a/cross/gcc-armv7/0002-gcc-poison-system-directories.patch b/cross/gcc-armv7/0002-gcc-poison-system-directories.patch
index a3c61fb0d..dcc3f34ba 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 6317101c9bb0616db0b919ed945466c4161ea7f1 Mon Sep 17 00:00:00 2001
+From 35d53206136617aeb91b54c37e9cbecf9e5c5f56 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.34.0
+2.34.1
 
diff --git a/cross/gcc-armv7/0003-Turn-on-Wl-z-relro-z-now-by-default.patch b/cross/gcc-armv7/0003-specs-turn-on-Wl-z-now-by-default.patch
similarity index 69%
rename from cross/gcc-armv7/0003-Turn-on-Wl-z-relro-z-now-by-default.patch
rename to cross/gcc-armv7/0003-specs-turn-on-Wl-z-now-by-default.patch
index 5f45aeadb..0f427269e 100644
--- a/cross/gcc-armv7/0003-Turn-on-Wl-z-relro-z-now-by-default.patch
+++ b/cross/gcc-armv7/0003-specs-turn-on-Wl-z-now-by-default.patch
@@ -1,15 +1,20 @@
-From c23602c67fd4ca33eb1f819f28f03eef50905265 Mon Sep 17 00:00:00 2001
+From 68c4bf98233cec77b2c66aa1fa1a2705b09e30b6 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:45:49 +0000
-Subject: [PATCH] Turn on -Wl,-z,relro,-z,now by default.
+Subject: [PATCH] specs: turn on -Wl,-z,now by default
 
+Previously, we also used to turn on -z relro here, but we now build
+binutils with --enable-relro, which is functionally equivalent.
+
+Binutils does not appear to have a similar option for enabling -z
+now by default.
 ---
  gcc/doc/invoke.texi | 3 +++
  gcc/gcc.c           | 1 +
  2 files changed, 4 insertions(+)
 
 diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index 9d1126e9751..46e45274859 100644
+index 9d1126e9751..4b8335bbd1f 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
 @@ -15920,6 +15920,9 @@ For example, @option{-Wl,-Map,output.map} passes @option{-Map output.map} to the
@@ -17,23 +22,23 @@ index 9d1126e9751..46e45274859 100644
  @option{-Wl,-Map=output.map}.
  
 +NOTE: In Alpine Linux, for LDFLAGS, the option
-+@option{-Wl,-z,relro,now} is used.  To disable, use @option{-Wl,-z,norelro}.
++@option{-Wl,-z,now} is used.  To disable, use @option{-Wl,-z,nonow}.
 +
  @item -u @var{symbol}
  @opindex u
  Pretend the symbol @var{symbol} is undefined, to force linking of
 diff --git a/gcc/gcc.c b/gcc/gcc.c
-index a83ba34ac4b..8c15de433ee 100644
+index a83ba34ac4b..faf9ce76b3d 100644
 --- a/gcc/gcc.c
 +++ b/gcc/gcc.c
 @@ -1150,6 +1150,7 @@ proper position among the other output files.  */
     "%{flto|flto=*:%<fcompare-debug*} \
      %{flto} %{fno-lto} %{flto=*} %l " LINK_PIE_SPEC \
     "%{fuse-ld=*:-fuse-ld=%*} " LINK_COMPRESS_DEBUG_SPEC \
-+   "-z relro -z now " \
++   "-z now " \
     "%X %{o*} %{e*} %{N} %{n} %{r}\
      %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!r:%{!nostartfiles:%S}}} \
      %{Wno-poison-system-directories:--no-poison-system-directories} \
 -- 
-2.34.0
+2.34.1
 
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 833f9d571..d76f6ec90 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 abb8ccb0dcd381e9daeb43be2d32afd0ab7c83c5 Mon Sep 17 00:00:00 2001
+From 36fde4108ebb872cbf0e45d815e76fc3ef69ded5 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:46:22 +0000
 Subject: [PATCH] Turn on -D_FORTIFY_SOURCE=2 by default for C, C++, ObjC,
@@ -25,7 +25,7 @@ index 9f993c4aff2..7db314195ff 100644
    if (flag_gnu89_inline)
      cpp_define (pfile, "__GNUC_GNU_INLINE__");
 diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index 46e45274859..1b4a698a191 100644
+index 4b8335bbd1f..833164e0a2b 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
 @@ -10224,6 +10224,12 @@ also turns on the following optimization flags:
@@ -42,5 +42,5 @@ index 46e45274859..1b4a698a191 100644
  @opindex O3
  Optimize yet more.  @option{-O3} turns on all optimizations specified
 -- 
-2.34.0
+2.34.1
 
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 9f927abbd..5dce434b8 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 22071923bf903a7bf851d1e59dcc1d07c6b0e876 Mon Sep 17 00:00:00 2001
+From 49c826ad1ccaf63569b25318990a531ebe6fbc9c 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,
@@ -208,7 +208,7 @@ index 2550d7ee8f0..7596d0b2757 100644
    %{!shared: \
      %{!static: \
 diff --git a/gcc/gcc.c b/gcc/gcc.c
-index 8c15de433ee..be1508e5abe 100644
+index faf9ce76b3d..1ad5da6d769 100644
 --- a/gcc/gcc.c
 +++ b/gcc/gcc.c
 @@ -737,8 +737,11 @@ proper position among the other output files.  */
@@ -268,5 +268,5 @@ index 8c15de433ee..be1508e5abe 100644
  #else
  #define LIBUBSAN_SPEC "-lubsan" STATIC_LIBUBSAN_LIBS
 -- 
-2.34.0
+2.34.1
 
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 d8843fd18..40af6af09 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 622ce6893c48eaa87beb7399ecb73bdadc9b7b84 Mon Sep 17 00:00:00 2001
+From c1a52e22d7ceef0f89a83ef2673f3d237c78e4dc 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.34.0
+2.34.1
 
diff --git a/cross/gcc-armv7/0007-Enable-Wtrampolines-by-default.patch b/cross/gcc-armv7/0007-Enable-Wtrampolines-by-default.patch
index cbfe46c49..fcf288188 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 ad29ab28462968097dad017f03c4db40f4d83174 Mon Sep 17 00:00:00 2001
+From 28102796795e8509cb798d59d1339a3d1c392eda 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.34.0
+2.34.1
 
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 39dc6400f..4660066d1 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 0fd84cfeabaf572f5f901fa7d13298286d84992b Mon Sep 17 00:00:00 2001
+From 7e7c1f8a11a36e286a00f2eca90f55b3a32917b5 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
@@ -10,7 +10,7 @@ Subject: [PATCH] Disable ssp on -nostdlib, -nodefaultlibs and -ffreestanding
  2 files changed, 8 insertions(+), 2 deletions(-)
 
 diff --git a/gcc/gcc.c b/gcc/gcc.c
-index be1508e5abe..e495b222095 100644
+index 1ad5da6d769..99314032ec2 100644
 --- a/gcc/gcc.c
 +++ b/gcc/gcc.c
 @@ -989,6 +989,12 @@ proper position among the other output files.  */
@@ -49,5 +49,5 @@ index 8ba281b4cfa..bab39cdf8a2 100644
  
  -param=stack-clash-protection-guard-size=
 -- 
-2.34.0
+2.34.1
 
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 5093eefc9..ebc1d061c 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 b788f9a685522fdd615c2c9aa7feab974c6d6b09 Mon Sep 17 00:00:00 2001
+From 8579d1acd984ecf29160c2925b8c0c16491083db 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.34.0
+2.34.1
 
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 1e7627544..5b32f18f8 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 1f2c3d7a0d1c35cb8281c5d97eb8ecfe2987e8b3 Mon Sep 17 00:00:00 2001
+From 9c288cea05c5fc3999f3ab0fbd207923a550450d 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.34.0
+2.34.1
 
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 4022561e9..73c1d32e2 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 a110462c21bc26c6c3c8d3265d3f146d1b9bddae Mon Sep 17 00:00:00 2001
+From b1fc0dcb018034d2440e7405bcb1e15f3d986fc4 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.34.0
+2.34.1
 
diff --git a/cross/gcc-armv7/0012-libitm-disable-FORTIFY.patch b/cross/gcc-armv7/0012-libitm-disable-FORTIFY.patch
index b118ad486..76b59d8b1 100644
--- a/cross/gcc-armv7/0012-libitm-disable-FORTIFY.patch
+++ b/cross/gcc-armv7/0012-libitm-disable-FORTIFY.patch
@@ -1,4 +1,4 @@
-From e0ad9c8c39f35a47c6a4c34ae161d768bf2f6fcc Mon Sep 17 00:00:00 2001
+From 9b6bffd441a7d747c13eb1b1c09ebc6bdb050b17 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.34.0
+2.34.1
 
diff --git a/cross/gcc-armv7/0013-libgcc_s.patch b/cross/gcc-armv7/0013-libgcc_s.patch
index 4e1631d67..af2881bc7 100644
--- a/cross/gcc-armv7/0013-libgcc_s.patch
+++ b/cross/gcc-armv7/0013-libgcc_s.patch
@@ -1,4 +1,4 @@
-From 57309d5900d3bc974b9a3efff34fdc601014b386 Mon Sep 17 00:00:00 2001
+From 028a4d00386b50bc20141bab7eebc6f9071d47fc 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.34.0
+2.34.1
 
diff --git a/cross/gcc-armv7/0014-nopie.patch b/cross/gcc-armv7/0014-nopie.patch
index a51d4c693..15362cd24 100644
--- a/cross/gcc-armv7/0014-nopie.patch
+++ b/cross/gcc-armv7/0014-nopie.patch
@@ -1,4 +1,4 @@
-From d10ec6f4bea9d3f07d3ada43da129a4b5812fd65 Mon Sep 17 00:00:00 2001
+From a66c4f80981aebf73779960f8fa8c91b6aa6c85f 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.34.0
+2.34.1
 
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 699e09562..6740c3310 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 2640a3cf5ecfaf532448baa66ea138c3ef02dec1 Mon Sep 17 00:00:00 2001
+From a0f248d4b4ccb787d4479229e9f5b0ba1b3aa7d5 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.34.0
+2.34.1
 
diff --git a/cross/gcc-armv7/0016-dlang-update-zlib-binding.patch b/cross/gcc-armv7/0016-dlang-update-zlib-binding.patch
index 37d4117aa..223078f65 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 60d97064fb53a99c6189f9cb81824a70d435d2d1 Mon Sep 17 00:00:00 2001
+From 9aa0f7fc3b563246014f0a26cd1b8426d310046d 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.34.0
+2.34.1
 
diff --git a/cross/gcc-armv7/0017-dlang-use-libucontext-on-mips64.patch b/cross/gcc-armv7/0017-dlang-use-libucontext-on-mips64.patch
new file mode 100644
index 000000000..223b35f7b
--- /dev/null
+++ b/cross/gcc-armv7/0017-dlang-use-libucontext-on-mips64.patch
@@ -0,0 +1,24 @@
+From b103cbe23f697c81922fa027d467622e0d2fc8a8 Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Thu, 6 Jan 2022 03:18:32 +0000
+Subject: [PATCH] dlang: use libucontext on mips64
+
+---
+ libphobos/configure.tgt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libphobos/configure.tgt b/libphobos/configure.tgt
+index 0643daeb613..b74d9fb3f25 100644
+--- a/libphobos/configure.tgt
++++ b/libphobos/configure.tgt
+@@ -38,6 +38,7 @@ case "${target}" in
+ 	;;
+   mips*-*-linux*)
+ 	LIBPHOBOS_SUPPORTED=yes
++	LIBDRUNTIME_NEEDS_UCONTEXT=yes
+ 	;;
+   power*-*-freebsd*)
+ 	LIBPHOBOS_SUPPORTED=yes
+-- 
+2.34.1
+
diff --git a/cross/gcc-armv7/0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch b/cross/gcc-armv7/0018-dlang-libdruntime-define-fcntl.h-constants-for-mips6.patch
similarity index 63%
rename from cross/gcc-armv7/0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch
rename to cross/gcc-armv7/0018-dlang-libdruntime-define-fcntl.h-constants-for-mips6.patch
index 0b05c3564..b51fcacec 100644
--- a/cross/gcc-armv7/0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch
+++ b/cross/gcc-armv7/0018-dlang-libdruntime-define-fcntl.h-constants-for-mips6.patch
@@ -1,25 +1,12 @@
-From 8524e44401fa57f6bdf78f39fb60cbb76046d256 Mon Sep 17 00:00:00 2001
+From 37194c8f82652477eeea81c62628309896fefcfd 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
+Date: Thu, 6 Jan 2022 03:19:12 +0000
+Subject: [PATCH] dlang: libdruntime: define fcntl.h constants for mips64
 
 ---
- libphobos/configure.tgt                      |  1 +
  libphobos/libdruntime/core/sys/posix/fcntl.d | 15 +++++++++++++++
- 2 files changed, 16 insertions(+)
+ 1 file changed, 15 insertions(+)
 
-diff --git a/libphobos/configure.tgt b/libphobos/configure.tgt
-index 88c027d0c28..48ef12aaa5e 100644
---- a/libphobos/configure.tgt
-+++ b/libphobos/configure.tgt
-@@ -38,6 +38,7 @@ case "${target}" in
- 	;;
-   mips*-*-linux*)
- 	LIBPHOBOS_SUPPORTED=yes
-+	LIBDRUNTIME_NEEDS_UCONTEXT=yes
- 	;;
-   power*-*-linux*)
- 	LIBPHOBOS_SUPPORTED=yes
 diff --git a/libphobos/libdruntime/core/sys/posix/fcntl.d b/libphobos/libdruntime/core/sys/posix/fcntl.d
 index 59df921ba41..9ee9f943948 100644
 --- a/libphobos/libdruntime/core/sys/posix/fcntl.d
@@ -47,5 +34,5 @@ index 59df921ba41..9ee9f943948 100644
          static assert(0, "Platform not supported");
  
 -- 
-2.34.0
+2.34.1
 
diff --git a/cross/gcc-aarch64/0018-ada-fix-shared-linking.patch b/cross/gcc-armv7/0019-ada-fix-shared-linking.patch
similarity index 95%
rename from cross/gcc-aarch64/0018-ada-fix-shared-linking.patch
rename to cross/gcc-armv7/0019-ada-fix-shared-linking.patch
index cbed48d66..7a71e35ec 100644
--- a/cross/gcc-aarch64/0018-ada-fix-shared-linking.patch
+++ b/cross/gcc-armv7/0019-ada-fix-shared-linking.patch
@@ -1,4 +1,4 @@
-From 03810f135f7106da0b9fef6c60c9def8b1891940 Mon Sep 17 00:00:00 2001
+From faa76d0bb79553be27fe82b1e85194e7a5284885 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.34.0
+2.34.1
 
diff --git a/cross/gcc-aarch64/0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch b/cross/gcc-armv7/0020-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
similarity index 89%
rename from cross/gcc-aarch64/0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
rename to cross/gcc-armv7/0020-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
index dbb474047..3047c9b32 100644
--- a/cross/gcc-aarch64/0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
+++ b/cross/gcc-armv7/0020-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
@@ -1,4 +1,4 @@
-From b0eafa664f78c3d3f5d9bf38ece54777119c8e6e Mon Sep 17 00:00:00 2001
+From 322c11faac7212b3302d941ae96ff19b47930d16 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.34.0
+2.34.1
 
diff --git a/cross/gcc-armhf/0020-add-fortify-headers-paths.patch b/cross/gcc-armv7/0021-add-fortify-headers-paths.patch
similarity index 91%
rename from cross/gcc-armhf/0020-add-fortify-headers-paths.patch
rename to cross/gcc-armv7/0021-add-fortify-headers-paths.patch
index 62c748eb8..32bc021d7 100644
--- a/cross/gcc-armhf/0020-add-fortify-headers-paths.patch
+++ b/cross/gcc-armv7/0021-add-fortify-headers-paths.patch
@@ -1,4 +1,4 @@
-From 8dda8a6e1bd6f49f687f9b6725e704eaa0b25873 Mon Sep 17 00:00:00 2001
+From 510963f7eeb031182c1c986365cc65bd4ddc5885 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.34.0
+2.34.1
 
diff --git a/cross/gcc-aarch64/0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch b/cross/gcc-armv7/0022-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
similarity index 90%
rename from cross/gcc-aarch64/0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
rename to cross/gcc-armv7/0022-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
index ff2c2be4b..be9e67f06 100644
--- a/cross/gcc-aarch64/0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
+++ b/cross/gcc-armv7/0022-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
@@ -1,4 +1,4 @@
-From 06a8b9fd165032afd96facc5c4e608bfe09ecbea Mon Sep 17 00:00:00 2001
+From b5235a7f62974f3eee20cb511d91c2629f198b69 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
@@ -13,7 +13,7 @@ Subject: [PATCH] Alpine musl package provides libssp_nonshared.a. We link to
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 diff --git a/gcc/gcc.c b/gcc/gcc.c
-index e495b222095..ab8866f409f 100644
+index 99314032ec2..6e91767efe8 100644
 --- a/gcc/gcc.c
 +++ b/gcc/gcc.c
 @@ -997,8 +997,7 @@ proper position among the other output files.  */
@@ -27,5 +27,5 @@ index e495b222095..ab8866f409f 100644
  #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
  		       "|fstack-protector-strong|fstack-protector-explicit" \
 -- 
-2.34.0
+2.34.1
 
diff --git a/cross/gcc-armv7/0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch b/cross/gcc-armv7/0023-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
similarity index 96%
rename from cross/gcc-armv7/0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
rename to cross/gcc-armv7/0023-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
index 198f47760..2a55e5c57 100644
--- a/cross/gcc-armv7/0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
+++ b/cross/gcc-armv7/0023-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
@@ -1,4 +1,4 @@
-From c279684da1a93b3009c24b7236e2a58c3eb2fe9c Mon Sep 17 00:00:00 2001
+From 0edc38fb81111b5719043d2fbdd4f55e43bcacf0 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
@@ -9,7 +9,7 @@ Subject: [PATCH] DP: Use --push-state/--pop-state for gold as well when
  1 file changed, 8 insertions(+), 8 deletions(-)
 
 diff --git a/gcc/gcc.c b/gcc/gcc.c
-index ab8866f409f..5093e8bbfd2 100644
+index 6e91767efe8..22dbbf85850 100644
 --- a/gcc/gcc.c
 +++ b/gcc/gcc.c
 @@ -738,10 +738,10 @@ proper position among the other output files.  */
@@ -65,5 +65,5 @@ index ab8866f409f..5093e8bbfd2 100644
  #else
  #define LIBUBSAN_SPEC "-lubsan" STATIC_LIBUBSAN_LIBS
 -- 
-2.34.0
+2.34.1
 
diff --git a/cross/gcc-armv7/0023-Pure-64-bit-MIPS.patch b/cross/gcc-armv7/0024-mips64-disable-multilib-support.patch
similarity index 91%
rename from cross/gcc-armv7/0023-Pure-64-bit-MIPS.patch
rename to cross/gcc-armv7/0024-mips64-disable-multilib-support.patch
index 60571ddaa..20a55f862 100644
--- a/cross/gcc-armv7/0023-Pure-64-bit-MIPS.patch
+++ b/cross/gcc-armv7/0024-mips64-disable-multilib-support.patch
@@ -1,8 +1,9 @@
-From 249a08b7257fa09d572933142cc9146c92f38dd2 Mon Sep 17 00:00:00 2001
+From e87872e7ba3c3d7cec1a77b49a7367902958d483 Mon Sep 17 00:00:00 2001
 From: Nils Andreas Svee <me@lochnair.net>
 Date: Thu, 21 Dec 2017 03:14:33 +0100
-Subject: [PATCH] Pure 64-bit MIPS
+Subject: [PATCH] mips64: disable multilib support
 
+multilib is not supported by Alpine GCC
 ---
  gcc/config/mips/mips.h    | 8 ++++----
  gcc/config/mips/t-linux64 | 6 +++---
@@ -43,5 +44,5 @@ index 130e1f04707..a64ac2bbb5b 100644
 +        ../lib32 \
 +        ../lib
 -- 
-2.34.0
+2.34.1
 
diff --git a/cross/gcc-armv7/0025-aarch64-disable-multilib-support.patch b/cross/gcc-armv7/0025-aarch64-disable-multilib-support.patch
new file mode 100644
index 000000000..b88fa60ba
--- /dev/null
+++ b/cross/gcc-armv7/0025-aarch64-disable-multilib-support.patch
@@ -0,0 +1,26 @@
+From 61d47862caefd2709aed78fec8fc3b472aa3a98b Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Thu, 6 Jan 2022 03:12:55 +0000
+Subject: [PATCH] aarch64: disable multilib support
+
+multilib is unsupported on Alpine GCC
+---
+ gcc/config/aarch64/t-aarch64-linux | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gcc/config/aarch64/t-aarch64-linux b/gcc/config/aarch64/t-aarch64-linux
+index 241b0ef20b6..18e63b34d8b 100644
+--- a/gcc/config/aarch64/t-aarch64-linux
++++ b/gcc/config/aarch64/t-aarch64-linux
+@@ -22,7 +22,7 @@ LIB1ASMSRC   = aarch64/lib1funcs.asm
+ LIB1ASMFUNCS = _aarch64_sync_cache_range
+ 
+ AARCH_BE = $(if $(findstring TARGET_BIG_ENDIAN_DEFAULT=1, $(tm_defines)),_be)
+-MULTILIB_OSDIRNAMES = mabi.lp64=../lib64$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu)
++MULTILIB_OSDIRNAMES = mabi.lp64=../lib
+ MULTIARCH_DIRNAME = $(call if_multiarch,aarch64$(AARCH_BE)-linux-gnu)
+ 
+ MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu_ilp32)
+-- 
+2.34.1
+
diff --git a/cross/gcc-armv7/0026-s390x-disable-multilib-support.patch b/cross/gcc-armv7/0026-s390x-disable-multilib-support.patch
new file mode 100644
index 000000000..9dd66f866
--- /dev/null
+++ b/cross/gcc-armv7/0026-s390x-disable-multilib-support.patch
@@ -0,0 +1,25 @@
+From 00fa0519dd9d6d4702999d245f80362dc0c60ea0 Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Thu, 6 Jan 2022 03:13:59 +0000
+Subject: [PATCH] s390x: disable multilib support
+
+multilib is not supported on Alpine GCC at present
+---
+ gcc/config/s390/t-linux64 | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gcc/config/s390/t-linux64 b/gcc/config/s390/t-linux64
+index cc6ab367072..7f498ee1cdc 100644
+--- a/gcc/config/s390/t-linux64
++++ b/gcc/config/s390/t-linux64
+@@ -7,5 +7,5 @@
+ 
+ MULTILIB_OPTIONS = m64/m31
+ MULTILIB_DIRNAMES = 64 32
+-MULTILIB_OSDIRNAMES = ../lib64$(call if_multiarch,:s390x-linux-gnu)
+-MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:s390-linux-gnu)
++MULTILIB_OSDIRNAMES = m64=../lib
++MULTILIB_OSDIRNAMES+= m32=../lib32
+-- 
+2.34.1
+
diff --git a/cross/gcc-armhf/0024-use-pure-64-bit-configuration-where-appropriate.patch b/cross/gcc-armv7/0027-ppc64-le-disable-multilib-support.patch
similarity index 55%
rename from cross/gcc-armhf/0024-use-pure-64-bit-configuration-where-appropriate.patch
rename to cross/gcc-armv7/0027-ppc64-le-disable-multilib-support.patch
index 917e89344..89dc4e279 100644
--- a/cross/gcc-armhf/0024-use-pure-64-bit-configuration-where-appropriate.patch
+++ b/cross/gcc-armv7/0027-ppc64-le-disable-multilib-support.patch
@@ -1,44 +1,16 @@
-From 0c9502cb5db1f2898b531cfb1d3b733490045845 Mon Sep 17 00:00:00 2001
+From 9d762381527aed2c271ea983f54fabd634863701 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
+Date: Thu, 6 Jan 2022 03:14:33 +0000
+Subject: [PATCH] ppc64[le]: disable multilib support
 
+multilib is not presently supported on Alpine GCC
 ---
- gcc/config/aarch64/t-aarch64-linux | 2 +-
- gcc/config/i386/t-linux64          | 4 ++--
- gcc/config/rs6000/t-linux          | 6 ++++--
- gcc/config/rs6000/t-linux64        | 4 ++--
- gcc/config/rs6000/t-linux64bele    | 4 ++--
- gcc/config/rs6000/t-linux64lebe    | 4 ++--
- gcc/config/s390/t-linux64          | 4 ++--
- 7 files changed, 15 insertions(+), 13 deletions(-)
+ gcc/config/rs6000/t-linux       | 6 ++++--
+ gcc/config/rs6000/t-linux64     | 4 ++--
+ gcc/config/rs6000/t-linux64bele | 4 ++--
+ gcc/config/rs6000/t-linux64lebe | 4 ++--
+ 4 files changed, 10 insertions(+), 8 deletions(-)
 
-diff --git a/gcc/config/aarch64/t-aarch64-linux b/gcc/config/aarch64/t-aarch64-linux
-index 241b0ef20b6..18e63b34d8b 100644
---- a/gcc/config/aarch64/t-aarch64-linux
-+++ b/gcc/config/aarch64/t-aarch64-linux
-@@ -22,7 +22,7 @@ LIB1ASMSRC   = aarch64/lib1funcs.asm
- LIB1ASMFUNCS = _aarch64_sync_cache_range
- 
- AARCH_BE = $(if $(findstring TARGET_BIG_ENDIAN_DEFAULT=1, $(tm_defines)),_be)
--MULTILIB_OSDIRNAMES = mabi.lp64=../lib64$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu)
-+MULTILIB_OSDIRNAMES = mabi.lp64=../lib
- MULTIARCH_DIRNAME = $(call if_multiarch,aarch64$(AARCH_BE)-linux-gnu)
- 
- MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu_ilp32)
-diff --git a/gcc/config/i386/t-linux64 b/gcc/config/i386/t-linux64
-index d288b093522..2949033aa04 100644
---- a/gcc/config/i386/t-linux64
-+++ b/gcc/config/i386/t-linux64
-@@ -33,6 +33,6 @@
- comma=,
- MULTILIB_OPTIONS    = $(subst $(comma),/,$(TM_MULTILIB_CONFIG))
- MULTILIB_DIRNAMES   = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS)))
--MULTILIB_OSDIRNAMES = m64=../lib64$(call if_multiarch,:x86_64-linux-gnu)
--MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:i386-linux-gnu)
-+MULTILIB_OSDIRNAMES = m64=../lib
-+MULTILIB_OSDIRNAMES+= m32=../lib32
- MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32)
 diff --git a/gcc/config/rs6000/t-linux b/gcc/config/rs6000/t-linux
 index aeb7440c492..ab14c455d8d 100644
 --- a/gcc/config/rs6000/t-linux
@@ -104,18 +76,6 @@ index 2e63bdb9fc9..c6e1c5db65d 100644
 +MULTILIB_OSDIRNAMES := m64=../lib
 +MULTILIB_OSDIRNAMES += m32=../lib32
  MULTILIB_MATCHES    := ${MULTILIB_MATCHES_ENDIAN}
-diff --git a/gcc/config/s390/t-linux64 b/gcc/config/s390/t-linux64
-index cc6ab367072..7f498ee1cdc 100644
---- a/gcc/config/s390/t-linux64
-+++ b/gcc/config/s390/t-linux64
-@@ -7,5 +7,5 @@
- 
- MULTILIB_OPTIONS = m64/m31
- MULTILIB_DIRNAMES = 64 32
--MULTILIB_OSDIRNAMES = ../lib64$(call if_multiarch,:s390x-linux-gnu)
--MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:s390-linux-gnu)
-+MULTILIB_OSDIRNAMES = m64=../lib
-+MULTILIB_OSDIRNAMES+= m32=../lib32
 -- 
-2.34.0
+2.34.1
 
diff --git a/cross/gcc-armv7/0028-gcc-go-Fix-ucontext_t-on-PPC64.patch b/cross/gcc-armv7/0028-gcc-go-Fix-ucontext_t-on-PPC64.patch
deleted file mode 100644
index e684c26e6..000000000
--- a/cross/gcc-armv7/0028-gcc-go-Fix-ucontext_t-on-PPC64.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Taken from Adélie Linux.
----
- libgo/runtime/go-signal.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libgo/runtime/go-signal.c b/libgo/runtime/go-signal.c
-index d30d1603adc..57f6824eb9e 100644
---- a/libgo/runtime/go-signal.c
-+++ b/libgo/runtime/go-signal.c
-@@ -224,7 +224,7 @@ getSiginfo(siginfo_t *info, void *context __attribute__((unused)))
- #elif defined(__alpha__) && defined(__linux__)
- 	ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.sc_pc;
- #elif defined(__PPC__) && defined(__linux__)
--	ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.regs->nip;
-+	ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.gp_regs[32];
- #elif defined(__PPC__) && defined(_AIX)
- 	ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.jmp_context.iar;
- #elif defined(__aarch64__) && defined(__linux__)
--- 
-2.34.0
-
diff --git a/cross/gcc-armv7/0028-x86_64-disable-multilib-support.patch b/cross/gcc-armv7/0028-x86_64-disable-multilib-support.patch
new file mode 100644
index 000000000..4bb28803e
--- /dev/null
+++ b/cross/gcc-armv7/0028-x86_64-disable-multilib-support.patch
@@ -0,0 +1,26 @@
+From c98b08105a8d28db3ee011f0d0841b235df9f89b Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Thu, 6 Jan 2022 03:14:54 +0000
+Subject: [PATCH] x86_64: disable multilib support
+
+multilib is not presently supported on Alpine GCC
+---
+ gcc/config/i386/t-linux64 | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gcc/config/i386/t-linux64 b/gcc/config/i386/t-linux64
+index d288b093522..2949033aa04 100644
+--- a/gcc/config/i386/t-linux64
++++ b/gcc/config/i386/t-linux64
+@@ -33,6 +33,6 @@
+ comma=,
+ MULTILIB_OPTIONS    = $(subst $(comma),/,$(TM_MULTILIB_CONFIG))
+ MULTILIB_DIRNAMES   = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS)))
+-MULTILIB_OSDIRNAMES = m64=../lib64$(call if_multiarch,:x86_64-linux-gnu)
+-MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:i386-linux-gnu)
++MULTILIB_OSDIRNAMES = m64=../lib
++MULTILIB_OSDIRNAMES+= m32=../lib32
+ MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32)
+-- 
+2.34.1
+
diff --git a/cross/gcc-armv7/0029-riscv-disable-multilib-support.patch b/cross/gcc-armv7/0029-riscv-disable-multilib-support.patch
new file mode 100644
index 000000000..639f95cc6
--- /dev/null
+++ b/cross/gcc-armv7/0029-riscv-disable-multilib-support.patch
@@ -0,0 +1,74 @@
+From ac2cf2b6ef9a496f5d6eeb07338384dc38778782 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
+Date: Mon, 3 Jan 2022 07:14:48 +0100
+Subject: [PATCH] riscv: disable multilib support
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From the musl wiki [1]:
+
+	musl does not support sharing an include directory between archs
+	[…], and thus is not compatible with GCC-style multilib. It is
+	recommended that distributions build GCC with multilib disabled,
+	and use library directories named lib, not lib64 or lib32.
+
+For this reason, we patch existing GCC configuration files (gcc/config)
+to pin MULTILIB_OSDIRNAMES to lib, there is also a corresponding GCC
+upstream bug about this issue [2]. Avoiding the use of lib64 and lib32
+directories is a bit more difficult on the RISC-V architecture. This is
+due to the fact that the default RISC-V configuration does not only use
+the lib64 and lib32 directories but also subdirectories within these
+directories for different RISC-V ABIs (e.g. lp64d, lp64, …) [3].
+
+This patch aligns the RISC-V configuration with other architectures by
+pinning MULTILIB_OSDIRNAMES to lib for rv64gc (our default RISC-V
+-march). Furthermore, this patch removes the ABI-specific startfile
+prefix spec. Since both of these impact the default LIBRARY_PATH [4]
+this patch thereby aligns the default RISC-V LIBRARY_PATH with that from
+other Alpine architectures and thereby fixes #13369 [5].
+
+Incidentally, this also fixes gccgo on riscv64, as without this patch
+gccgo is otherwise not able to find the *.gox files for the Go standard
+library.
+
+[1]: https://wiki.musl-libc.org/guidelines-for-distributions.html#Multilib/multi_arch
+[2]: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90077
+[3]: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=103889#c14
+[4]: https://gcc.gnu.org/git/?p=gcc.git;a=blob;f=gcc/gcc.c;h=d4c8746b0aa322286decf92aa72a12f0a393b655;hb=HEAD#l9122
+[5]: https://gitlab.alpinelinux.org/alpine/aports/-/issues/13369
+---
+ gcc/config/riscv/linux.h | 6 ------
+ gcc/config/riscv/t-linux | 7 +++++--
+ 2 files changed, 5 insertions(+), 8 deletions(-)
+
+diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h
+index ee29979dd34..fe8a82d6702 100644
+--- a/gcc/config/riscv/linux.h
++++ b/gcc/config/riscv/linux.h
+@@ -71,9 +71,3 @@ along with GCC; see the file COPYING3.  If not see
+     %{static:-static}}"
+ 
+ #define TARGET_ASM_FILE_END file_end_indicate_exec_stack
+-
+-#define STARTFILE_PREFIX_SPEC 			\
+-   "/lib" XLEN_SPEC "/" ABI_SPEC "/ "		\
+-   "/usr/lib" XLEN_SPEC "/" ABI_SPEC "/ "	\
+-   "/lib/ "					\
+-   "/usr/lib/ "
+diff --git a/gcc/config/riscv/t-linux b/gcc/config/riscv/t-linux
+index 216d2776a18..1a8a863853e 100644
+--- a/gcc/config/riscv/t-linux
++++ b/gcc/config/riscv/t-linux
+@@ -1,3 +1,6 @@
+-# Only XLEN and ABI affect Linux multilib dir names, e.g. /lib32/ilp32d/
+-MULTILIB_DIRNAMES := $(patsubst rv32%,lib32,$(patsubst rv64%,lib64,$(MULTILIB_DIRNAMES)))
++MULTILIB_OPTIONS := march=rv64gc
++MULTILIB_DIRNAMES := rv64gc
++
++MULTILIB_DIRNAMES := $(patsubst rv32%,lib32,$(patsubst rv64%,lib,$(MULTILIB_DIRNAMES)))
+ MULTILIB_OSDIRNAMES := $(patsubst lib%,../lib%,$(MULTILIB_DIRNAMES))
++MULTILIB_MATCHES := march?rv64gc=march?rv64imafdc
+-- 
+2.34.1
+
diff --git a/cross/gcc-aarch64/0025-always-build-libgcc_eh.a.patch b/cross/gcc-armv7/0030-always-build-libgcc_eh.a.patch
similarity index 95%
rename from cross/gcc-aarch64/0025-always-build-libgcc_eh.a.patch
rename to cross/gcc-armv7/0030-always-build-libgcc_eh.a.patch
index bf8e0dc20..d05bb9376 100644
--- a/cross/gcc-aarch64/0025-always-build-libgcc_eh.a.patch
+++ b/cross/gcc-armv7/0030-always-build-libgcc_eh.a.patch
@@ -1,4 +1,4 @@
-From 338f65b9c13e8aaacf146e0fe2400566766f02e4 Mon Sep 17 00:00:00 2001
+From 119e2461840821ae3bbf00190f908cb649368384 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.34.0
+2.34.1
 
diff --git a/cross/gcc-armhf/0026-ada-libgnarl-compatibility-for-musl.patch b/cross/gcc-armv7/0031-ada-libgnarl-compatibility-for-musl.patch
similarity index 98%
rename from cross/gcc-armhf/0026-ada-libgnarl-compatibility-for-musl.patch
rename to cross/gcc-armv7/0031-ada-libgnarl-compatibility-for-musl.patch
index 3e6e8b394..a6450526a 100644
--- a/cross/gcc-armhf/0026-ada-libgnarl-compatibility-for-musl.patch
+++ b/cross/gcc-armv7/0031-ada-libgnarl-compatibility-for-musl.patch
@@ -1,4 +1,4 @@
-From 0703d9ad84cd92f8a08787a85536a98b3830bba0 Mon Sep 17 00:00:00 2001
+From a797880afb2876812d972fcb4e26b6c856cdf97a 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.34.0
+2.34.1
 
diff --git a/cross/gcc-armhf/0027-ada-musl-support-fixes.patch b/cross/gcc-armv7/0032-ada-musl-support-fixes.patch
similarity index 99%
rename from cross/gcc-armhf/0027-ada-musl-support-fixes.patch
rename to cross/gcc-armv7/0032-ada-musl-support-fixes.patch
index 3a7075f96..eaa523650 100644
--- a/cross/gcc-armhf/0027-ada-musl-support-fixes.patch
+++ b/cross/gcc-armv7/0032-ada-musl-support-fixes.patch
@@ -1,4 +1,4 @@
-From 0b879c9a3ef83b3b08a0d72bfe89816d52489408 Mon Sep 17 00:00:00 2001
+From 55f41483ea3d40c5b790a8b70e3662511c1bcc45 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.34.0
+2.34.1
 
diff --git a/cross/gcc-armhf/0029-gcc-go-Fix-handling-of-signal-34-on-musl.patch b/cross/gcc-armv7/0033-gcc-go-Fix-handling-of-signal-34-on-musl.patch
similarity index 96%
rename from cross/gcc-armhf/0029-gcc-go-Fix-handling-of-signal-34-on-musl.patch
rename to cross/gcc-armv7/0033-gcc-go-Fix-handling-of-signal-34-on-musl.patch
index 30af57256..3d6033aee 100644
--- a/cross/gcc-armhf/0029-gcc-go-Fix-handling-of-signal-34-on-musl.patch
+++ b/cross/gcc-armv7/0033-gcc-go-Fix-handling-of-signal-34-on-musl.patch
@@ -1,4 +1,4 @@
-From 098c0bca8bd1f47e94c8368406973019bbe9bf55 Mon Sep 17 00:00:00 2001
+From e6fe77d1aef59373675f61a102c511529b1f5125 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.34.0
+2.34.1
 
diff --git a/cross/gcc-armv7/0030-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch b/cross/gcc-armv7/0034-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch
similarity index 92%
rename from cross/gcc-armv7/0030-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch
rename to cross/gcc-armv7/0034-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch
index 60ce845eb..80ef879f9 100644
--- a/cross/gcc-armv7/0030-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch
+++ b/cross/gcc-armv7/0034-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch
@@ -1,4 +1,4 @@
-From 7ba79053336c8666d3f137ef106696926d3f7b31 Mon Sep 17 00:00:00 2001
+From a385ececbc3f01007ad62002d994e35ce3e2e2b9 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.34.0
+2.34.1
 
diff --git a/cross/gcc-armv7/0034-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch b/cross/gcc-armv7/0034-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
deleted file mode 100644
index bd5876103..000000000
--- a/cross/gcc-armv7/0034-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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
-
-These struct members do not seem to exist on musl.
----
- libgo/runtime/go-signal.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libgo/runtime/go-signal.c b/libgo/runtime/go-signal.c
-index 57f6824eb9e..fd03db420d4 100644
---- a/libgo/runtime/go-signal.c
-+++ b/libgo/runtime/go-signal.c
-@@ -335,7 +335,7 @@ dumpregs(siginfo_t *info __attribute__((unused)), void *context __attribute__((u
- 		runtime_printf("sp  %X\n", m->sc_regs[30]);
- 		runtime_printf("pc  %X\n", m->sc_pc);
- 	  }
--#elif defined(__PPC__) && defined(__LITTLE_ENDIAN__) && defined(__linux__)
-+#elif defined(__PPC__) && defined(__LITTLE_ENDIAN__) && defined(__GLIBC__)
- 	  {
- 		mcontext_t *m = &((ucontext_t*)(context))->uc_mcontext;
- 		int i;
--- 
-2.34.0
-
diff --git a/cross/gcc-aarch64/0031-gcc-go-signal-34-is-special-on-musl-libc.patch b/cross/gcc-armv7/0035-gcc-go-signal-34-is-special-on-musl-libc.patch
similarity index 92%
rename from cross/gcc-aarch64/0031-gcc-go-signal-34-is-special-on-musl-libc.patch
rename to cross/gcc-armv7/0035-gcc-go-signal-34-is-special-on-musl-libc.patch
index 4c7bad8e6..ccfad98c5 100644
--- a/cross/gcc-aarch64/0031-gcc-go-signal-34-is-special-on-musl-libc.patch
+++ b/cross/gcc-armv7/0035-gcc-go-signal-34-is-special-on-musl-libc.patch
@@ -1,4 +1,4 @@
-From 18ba9309687431399aabe54c0b758f69b01253e0 Mon Sep 17 00:00:00 2001
+From 399c8ce9bce85e84fd0430403a04a38ff75a9e71 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.34.0
+2.34.1
 
diff --git a/cross/gcc-aarch64/0032-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch b/cross/gcc-armv7/0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
similarity index 91%
rename from cross/gcc-aarch64/0032-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
rename to cross/gcc-armv7/0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
index 5be5b32e6..1bb983ee4 100644
--- a/cross/gcc-aarch64/0032-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
+++ b/cross/gcc-armv7/0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
@@ -1,4 +1,4 @@
-From 1be822dcf1f9ffdba5c6508cef0374585e48cb18 Mon Sep 17 00:00:00 2001
+From c380a283946cbe5a2d76aec0a6b19bba085305bc 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.34.0
+2.34.1
 
diff --git a/cross/gcc-aarch64/0033-gcc-go-link-to-libucontext.patch b/cross/gcc-armv7/0037-gcc-go-link-to-libucontext.patch
similarity index 90%
rename from cross/gcc-aarch64/0033-gcc-go-link-to-libucontext.patch
rename to cross/gcc-armv7/0037-gcc-go-link-to-libucontext.patch
index 283d562d9..62c487a45 100644
--- a/cross/gcc-aarch64/0033-gcc-go-link-to-libucontext.patch
+++ b/cross/gcc-armv7/0037-gcc-go-link-to-libucontext.patch
@@ -1,4 +1,4 @@
-From 2fa393cd8ae6b25539cc7bd9998c603a3b33bc6e Mon Sep 17 00:00:00 2001
+From 7a9168eb92cce811ce87767a6d79b525a2d484ab 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.34.0
+2.34.1
 
diff --git a/cross/gcc-aarch64/0035-Use-generic-errstr.go-implementation-on-musl.patch b/cross/gcc-armv7/0038-Use-generic-errstr.go-implementation-on-musl.patch
similarity index 95%
rename from cross/gcc-aarch64/0035-Use-generic-errstr.go-implementation-on-musl.patch
rename to cross/gcc-armv7/0038-Use-generic-errstr.go-implementation-on-musl.patch
index e6bcfa9a0..0836be002 100644
--- a/cross/gcc-aarch64/0035-Use-generic-errstr.go-implementation-on-musl.patch
+++ b/cross/gcc-armv7/0038-Use-generic-errstr.go-implementation-on-musl.patch
@@ -1,4 +1,4 @@
-From 23f7ad8b28284017c4f63e944bcb0321eb205e8a Mon Sep 17 00:00:00 2001
+From 442c3400a3ffd45c0a78a61ae233f7049fdad2fb 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.34.0
+2.34.1
 
diff --git a/cross/gcc-aarch64/0036-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch b/cross/gcc-armv7/0039-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
similarity index 98%
rename from cross/gcc-aarch64/0036-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
rename to cross/gcc-armv7/0039-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
index 1895dd258..7c3483837 100644
--- a/cross/gcc-aarch64/0036-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
+++ b/cross/gcc-armv7/0039-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
@@ -1,4 +1,4 @@
-From 7e123432a35fcaa25de85b4940daabcd70c1a6bd Mon Sep 17 00:00:00 2001
+From 0d69ddbca85c13aba7c5c9aca57a801d5cdb7548 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
@@ -242,7 +242,7 @@ index 2974dae2701..80e003a38ce 100644
  
  @defmac POST_LINK_SPEC
 diff --git a/gcc/gcc.c b/gcc/gcc.c
-index 5093e8bbfd2..1871b5ab6eb 100644
+index 22dbbf85850..90aa576037a 100644
 --- a/gcc/gcc.c
 +++ b/gcc/gcc.c
 @@ -980,13 +980,23 @@ proper position among the other output files.  */
@@ -271,5 +271,5 @@ index 5093e8bbfd2..1871b5ab6eb 100644
  
  #ifdef ENABLE_DEFAULT_SSP
 -- 
-2.34.0
+2.34.1
 
diff --git a/cross/gcc-armhf/0037-configure-fix-detection-of-atomic-builtins-in-libato.patch b/cross/gcc-armv7/0040-configure-fix-detection-of-atomic-builtins-in-libato.patch
similarity index 96%
rename from cross/gcc-armhf/0037-configure-fix-detection-of-atomic-builtins-in-libato.patch
rename to cross/gcc-armv7/0040-configure-fix-detection-of-atomic-builtins-in-libato.patch
index 163b3ca3c..27ce265fb 100644
--- a/cross/gcc-armhf/0037-configure-fix-detection-of-atomic-builtins-in-libato.patch
+++ b/cross/gcc-armv7/0040-configure-fix-detection-of-atomic-builtins-in-libato.patch
@@ -1,4 +1,4 @@
-From cb2472c05592e4a1b5f826d761d0ef221c0c9664 Mon Sep 17 00:00:00 2001
+From 20a7e6fd41f1f2382bda3fa9b9171188a02a4dc5 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.34.0
+2.34.1
 
diff --git a/cross/gcc-aarch64/0038-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch b/cross/gcc-armv7/0041-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch
similarity index 97%
rename from cross/gcc-aarch64/0038-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch
rename to cross/gcc-armv7/0041-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch
index 8f5df6b69..ff2be3c7e 100644
--- a/cross/gcc-aarch64/0038-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch
+++ b/cross/gcc-armv7/0041-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch
@@ -1,4 +1,4 @@
-From 45b24f2bf7fa1b2b9d597bd065b6522f8d87cd3e Mon Sep 17 00:00:00 2001
+From ce22a6e1b6cde3237a733b9fb04c113de429b3a9 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
@@ -80,5 +80,5 @@ index 8ce061e2f5f..b85add15a7b 100644
  // be signed in some OSes.
  #ifdef SIOCGIFMTU
 -- 
-2.34.0
+2.34.1
 
diff --git a/cross/gcc-aarch64/0039-Fix-attempt-to-use-poisoned-calloc-error-in-libgccji.patch b/cross/gcc-armv7/0042-Fix-attempt-to-use-poisoned-calloc-error-in-libgccji.patch
similarity index 95%
rename from cross/gcc-aarch64/0039-Fix-attempt-to-use-poisoned-calloc-error-in-libgccji.patch
rename to cross/gcc-armv7/0042-Fix-attempt-to-use-poisoned-calloc-error-in-libgccji.patch
index f43cfb4ac..9c8be4ae7 100644
--- a/cross/gcc-aarch64/0039-Fix-attempt-to-use-poisoned-calloc-error-in-libgccji.patch
+++ b/cross/gcc-armv7/0042-Fix-attempt-to-use-poisoned-calloc-error-in-libgccji.patch
@@ -1,4 +1,4 @@
-From 0b7a57f08abff72f8dd1f67de995c502e798513c Mon Sep 17 00:00:00 2001
+From 55a6814dd32978e88c5be7f023ac9d88d6287b59 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
@@ -12,7 +12,7 @@ included #pragma GCC poison calloc
  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
+index cee9daa8220..a5600084933 100644
 --- a/gcc/jit/jit-playback.c
 +++ b/gcc/jit/jit-playback.c
 @@ -18,6 +18,8 @@ You should have received a copy of the GNU General Public License
@@ -76,5 +76,5 @@ index 0cc650f9810..2f44481eeb0 100644
  #include "libgccjit.h"
  #include "jit-recording.h"
 -- 
-2.34.0
+2.34.1
 
diff --git a/cross/gcc-aarch64/0040-stddef.h-add-support-for-musl-typedef-macro-guards.patch b/cross/gcc-armv7/0043-stddef.h-add-support-for-musl-typedef-macro-guards.patch
similarity index 98%
rename from cross/gcc-aarch64/0040-stddef.h-add-support-for-musl-typedef-macro-guards.patch
rename to cross/gcc-armv7/0043-stddef.h-add-support-for-musl-typedef-macro-guards.patch
index c22f7f43f..09acb7160 100644
--- a/cross/gcc-aarch64/0040-stddef.h-add-support-for-musl-typedef-macro-guards.patch
+++ b/cross/gcc-armv7/0043-stddef.h-add-support-for-musl-typedef-macro-guards.patch
@@ -1,4 +1,4 @@
-From 5a76cf60df5c9ba274f1d0dcd79fc0cbad9d0fe0 Mon Sep 17 00:00:00 2001
+From 5b03488537d53ee1265ff9129b4d9a9e4f353777 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
@@ -102,5 +102,5 @@ index 66619fe43b1..50d710a5ab9 100644
  #endif /* _BSD_RUNE_T_DEFINED_ */
  #endif
 -- 
-2.34.0
+2.34.1
 
diff --git a/cross/gcc-armhf/0041-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch b/cross/gcc-armv7/0044-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
similarity index 95%
rename from cross/gcc-armhf/0041-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
rename to cross/gcc-armv7/0044-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
index 41e67843f..ebb64f51f 100644
--- a/cross/gcc-armhf/0041-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
+++ b/cross/gcc-armv7/0044-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
@@ -1,4 +1,4 @@
-From f042000a3113524554f5565f147735caf15dd42f Mon Sep 17 00:00:00 2001
+From 55c3e771c17a41ec1654074b7eef23594f07126e Mon Sep 17 00:00:00 2001
 From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
 Date: Sun, 30 Aug 2020 18:33:49 +0200
 Subject: [PATCH] gcc-go: Use int64 type as offset argument for mmap
@@ -58,3 +58,6 @@ index fa3389d857e..57bed97c710 100644
  	p := sysMmap(addr, n, prot, flags, fd, off)
  	if uintptr(p) == _MAP_FAILED {
  		return nil, errno()
+-- 
+2.34.1
+
diff --git a/cross/gcc-armhf/0042-Disable-fsplit-stack-support-on-non-glibc-targets.patch b/cross/gcc-armv7/0045-Disable-fsplit-stack-support-on-non-glibc-targets.patch
similarity index 98%
rename from cross/gcc-armhf/0042-Disable-fsplit-stack-support-on-non-glibc-targets.patch
rename to cross/gcc-armv7/0045-Disable-fsplit-stack-support-on-non-glibc-targets.patch
index c6ec2dfa6..9a6a80d7f 100644
--- a/cross/gcc-armhf/0042-Disable-fsplit-stack-support-on-non-glibc-targets.patch
+++ b/cross/gcc-armv7/0045-Disable-fsplit-stack-support-on-non-glibc-targets.patch
@@ -1,4 +1,4 @@
-From 5b7b256eafc888a3be2dcee1e01f8dc6a814d1a6 Mon Sep 17 00:00:00 2001
+From 653555dafe2b720bc76db22691c9e1383bbb7da2 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
 Date: Wed, 15 Dec 2021 00:14:19 +0100
 Subject: [PATCH] Disable -fsplit-stack support on non-glibc targets
@@ -93,3 +93,6 @@ index 25fbc07f58c..895a7369816 100644
  
  /* i386 glibc provides __stack_chk_guard in %gs:0x14.  */
  #define TARGET_THREAD_SSP_OFFSET        0x14
+-- 
+2.34.1
+
diff --git a/cross/gcc-armv7/0046-libgo-include-asm-ptrace.h-for-pt_regs-definition-on.patch b/cross/gcc-armv7/0046-libgo-include-asm-ptrace.h-for-pt_regs-definition-on.patch
new file mode 100644
index 000000000..abc60cc98
--- /dev/null
+++ b/cross/gcc-armv7/0046-libgo-include-asm-ptrace.h-for-pt_regs-definition-on.patch
@@ -0,0 +1,58 @@
+From b9399209363da18b79890a88ed8dcbe1e15c9bfc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren@soeren-tempel.net>
+Date: Sun, 2 Jan 2022 01:07:03 +0100
+Subject: [PATCH] libgo: include asm/ptrace.h for pt_regs definition on PowerPC
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Both glibc and musl libc declare pt_regs as an incomplete type. This
+type has to be completed by inclusion of another header. On Linux, the
+asm/ptrace.h header file provides this type definition. Without
+including this header file, it is not possible to access the regs member
+of the mcontext_t struct as done in libgo/runtime/go-signal.c. On glibc,
+other headers (e.g. sys/user.h) include asm/ptrace.h but on musl
+asm/ptrace.h is not included by other headers and thus the
+aforementioned files do not compile without an explicit include of
+asm/ptrace.h:
+
+	libgo/runtime/go-signal.c: In function 'getSiginfo':
+	libgo/runtime/go-signal.c:227:63: error: invalid use of undefined type 'struct pt_regs'
+	  227 |         ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.regs->nip;
+	      |
+
+Instead of including the asm/ptrace.h header conditionally on PowerPC
+only it would alternatively also be possible to include it
+unconditionally.
+
+See also:
+
+* https://git.musl-libc.org/cgit/musl/commit/?id=c2518a8efb6507f1b41c3b12e03b06f8f2317a1f
+* https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=d57cb31910ca5c200e4172276749a7f8bd17ae3c
+* https://github.com/kaniini/libucontext/issues/36
+
+Signed-off-by: Sören Tempel <soeren@soeren-tempel.net>
+---
+ libgo/runtime/go-signal.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/libgo/runtime/go-signal.c b/libgo/runtime/go-signal.c
+index d30d1603adc..fc01e04e4a1 100644
+--- a/libgo/runtime/go-signal.c
++++ b/libgo/runtime/go-signal.c
+@@ -10,6 +10,12 @@
+ #include <sys/time.h>
+ #include <ucontext.h>
+ 
++// On PowerPC, ucontext.h uses a pt_regs struct as an incomplete
++// type. This type must be completed by including asm/ptrace.h.
++#ifdef __PPC__
++#include <asm/ptrace.h>
++#endif
++
+ #include "runtime.h"
+ 
+ #ifndef SA_RESTART
+-- 
+2.34.1
+
diff --git a/cross/gcc-armv7/APKBUILD b/cross/gcc-armv7/APKBUILD
index 1b0959012..42f769a55 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_git20211128
+pkgver=11.2.1_git20220106
 [ "$BOOTSTRAP" = "nolibc" ] && pkgname="gcc-pass2"
 [ "$CBUILD" != "$CHOST" ] && _cross="-$CARCH" || _cross=""
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname=gcc-armv7
-pkgrel=3
+pkgrel=0
 pkgdesc="Stage2 cross-compiler for armv7"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -203,7 +203,7 @@ makedepends="$makedepends_build $makedepends_host"
 source="https://dev.alpinelinux.org/~nenolod/gcc-${pkgver}.tar.xz
 	0001-posix_memalign.patch
 	0002-gcc-poison-system-directories.patch
-	0003-Turn-on-Wl-z-relro-z-now-by-default.patch
+	0003-specs-turn-on-Wl-z-now-by-default.patch
 	0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
 	0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
 	0006-Enable-Wformat-and-Wformat-security-by-default.patch
@@ -217,32 +217,36 @@ source="https://dev.alpinelinux.org/~nenolod/gcc-${pkgver}.tar.xz
 	0014-nopie.patch
 	0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch
 	0016-dlang-update-zlib-binding.patch
-	0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch
-	0018-ada-fix-shared-linking.patch
-	0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
-	0020-add-fortify-headers-paths.patch
-	0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
-	0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
-	0023-Pure-64-bit-MIPS.patch
-	0024-use-pure-64-bit-configuration-where-appropriate.patch
-	0025-always-build-libgcc_eh.a.patch
-	0026-ada-libgnarl-compatibility-for-musl.patch
-	0027-ada-musl-support-fixes.patch
-	0028-gcc-go-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
-	0041-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
-	0042-Disable-fsplit-stack-support-on-non-glibc-targets.patch
+	0017-dlang-use-libucontext-on-mips64.patch
+	0018-dlang-libdruntime-define-fcntl.h-constants-for-mips6.patch
+	0019-ada-fix-shared-linking.patch
+	0020-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
+	0021-add-fortify-headers-paths.patch
+	0022-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
+	0023-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
+	0024-mips64-disable-multilib-support.patch
+	0025-aarch64-disable-multilib-support.patch
+	0026-s390x-disable-multilib-support.patch
+	0027-ppc64-le-disable-multilib-support.patch
+	0028-x86_64-disable-multilib-support.patch
+	0029-riscv-disable-multilib-support.patch
+	0030-always-build-libgcc_eh.a.patch
+	0031-ada-libgnarl-compatibility-for-musl.patch
+	0032-ada-musl-support-fixes.patch
+	0033-gcc-go-Fix-handling-of-signal-34-on-musl.patch
+	0034-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch
+	0035-gcc-go-signal-34-is-special-on-musl-libc.patch
+	0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
+	0037-gcc-go-link-to-libucontext.patch
+	0038-Use-generic-errstr.go-implementation-on-musl.patch
+	0039-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
+	0040-configure-fix-detection-of-atomic-builtins-in-libato.patch
+	0041-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch
+	0042-Fix-attempt-to-use-poisoned-calloc-error-in-libgccji.patch
+	0043-stddef.h-add-support-for-musl-typedef-macro-guards.patch
+	0044-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
+	0045-Disable-fsplit-stack-support-on-non-glibc-targets.patch
+	0046-libgo-include-asm-ptrace.h-for-pt_regs-definition-on.patch
 	"
 
 # we build out-of-tree
@@ -704,47 +708,51 @@ gnat() {
 }
 
 sha512sums="
-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
-e4d2466191b4acde115917506c285b617d6210bf3603e705ca3d905e4e28b12e399b16898f6ab9996b1d4fbfa3aed554e86931ed7f13fc13a9459af7f29f4393  0041-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
-5e04b9a6d39b708daedcef494e4aed59b1a97d2052ed7eb8d1e3da5faa70dc5e1fa3ee249c685e820109d5605ee2b66154856b0ffccf7b8a49af1a1da9350ebf  0042-Disable-fsplit-stack-support-on-non-glibc-targets.patch
+f0f073a05ec9bf93e4d85707282f0b75b8e783f86c16b5ed118444e7b362be2122a10233baa822efcb52c7bc353c6ca06951db0e93c030372275baa922939c3f  gcc-11.2.1_git20220106.tar.xz
+c81a5ddd7699320129813529c12afb81744491a2df32922ee9816413d5fcb2857abf7641381ecb5e5748ac8335ab8e2ac27e7c56262e82c42f57adbb655328a1  0001-posix_memalign.patch
+3adf23e255343ef1ead10b0312f506e722aab6218b35b1f92a855b3e5a1e63cddb45fb568f19d2e2443e1dad647f6d9429830004b45371a07e7098d430e1cecf  0002-gcc-poison-system-directories.patch
+f1de78496e0caeefe7441be04a8c78e83fada8adcdaa4abda607b7b83ca51ecb6f3cdbb9290c38a3fefe32f7980c47779687726ad9f557471978313eea1f99d3  0003-specs-turn-on-Wl-z-now-by-default.patch
+3959ebad795264ddd00640a2ff7ce511d69adc5683e25760d4741fbc99f56a7243545ccfce29578a3790138afa1e6ea6b232faf39f7904a17d7f3aeaa8080b61  0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
+4cabe468a1b138fed597d6bb946200da77e127022032fb5adb0955d64c6aad34ed1861aee11563b6555bd9d48721ac762b4a1e5c1d604274146ce8f989beee24  0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
+a686ac11781236bfbc793e124fe842a1c4311884b9aec39e79673ef6d65fc8f36aacdbe6410b9a80ca9245a3bc49ee71babd1ffcde1b816cb385ff771175fd7c  0006-Enable-Wformat-and-Wformat-security-by-default.patch
+83b2d4dcad924cbddc8d8a2569d6e5ca59b63b8b5a30fef176acac48622eaf8237ba649f55bc23327456508df3d3a1f2aad20536eb151d831c6b1cfeb3b33f76  0007-Enable-Wtrampolines-by-default.patch
+69ba40c718458f466f43e7f4450c1c774f27a7ac36bb794ee653e7aabc2f21de7596a5d410efbe093ff1416951c547fa73b92980677b04fa7f371390281109f6  0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
+2adef312e5b89764176451b3d184f85f309f8f8bfadc1ed7a3c43a27ca5032de39e10d2881284f49ee0d1e719782542cd008bf11504122b96987e3fd45ca022c  0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
+a3952e27b39c737563daedba609960f4e7237e52988d1cec757526e4ed3887aee563cfc87925e6840619182c1c9876cd483ee3cc83747015f758c2421b3f1ba4  0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
+46b073319937bdaaffe6a97a935a4b328f5fcbc10f91f88de20d7b1ffc7bd6321671c34fdcfb0ec59ca01033249f607715cfc154b57e195a55cea7ea6950c54d  0011-libiberty-copy-PIC-objects-during-build-process.patch
+c56526a61daa35dc72447aa9d947987f2ed124c6cf3b2cd82981f934cd4b032555402306a87a2667359f6670e9a4531e98c7b48ca4b0ecbfb019c551c87b24ee  0012-libitm-disable-FORTIFY.patch
+5b2f39fee095947827625480994abe929cea90f95eda7849a3d7802990bc8dab501543d3f15b1d987bed10f69f868b15cd4af7cf3e1c4fc2d2495a2e3adfbd1d  0013-libgcc_s.patch
+4a1043e95a14e95d7f6081f82e7004c9ad11165be67d20c7e03d0eb46e2aebe2b8d65cf95a29945463bd51fbc233ad322784f19804bd47e7425ec59a17314e45  0014-nopie.patch
+bdba6d04f9e77a00e407a70393aec0d668087be3bf6bd2db7e18b1ce20eae640346958a108ed65087bcf0d4250be168034ccfc72115afbe2dec9b2968218926c  0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch
+b5703c0a200a10bb84226fafc8d0fc3bdefecfd705d87b115368265aef4664b8cf158a21e59f1f32c842b3c665c3a009bb25b2b0003eb08914f0e0be81cec733  0016-dlang-update-zlib-binding.patch
+925641f72bccc471f092108699cd9c4610430e7f829c65d800e592d47ae6ddbe57581a91e94ccd6b3fb5c481048a697d0c72826903fedd03780368519fab70d3  0017-dlang-use-libucontext-on-mips64.patch
+363b166776e8f756e07554146fc4f33bad0f906bd57dfc794bb816c6bfb9bb9cc1d5950f53a03c11ccabab3528398d9df79e88cc02aa39e94809675540ab967f  0018-dlang-libdruntime-define-fcntl.h-constants-for-mips6.patch
+2431ec336ed1c353f210be336fd3ce7e5ab11ed2e76bd87a32bc46fc7845c5accb6483fd7b37fd703a83449859622ab3ed7598ef9442f9e7a34b5f9aa7a5e00e  0019-ada-fix-shared-linking.patch
+b1bb85a34bab62b3fd1a8aef744bb48234bb6ec18454fed8ae068434fd820ddceaf27a372df90af53f95c8a86aec2fd6d49278e85d062c6e7bf96a64352b626b  0020-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
+8174615ddeb4300799e8fb29db1a38ff48ae62cecd50359af238c16f0b17ea0b642f0efa6c5898c06a0d019723438beb3cc252de95c26739da3e99ad6299be22  0021-add-fortify-headers-paths.patch
+a46ed9e4e4b96e7912b2fd4a2cf94bac8eaed68b64bc8bd86914176aa0107eee83a0a5e330ab0524c7f838cdd660a52fcf206033373fc4ff3b3af3a95801efa8  0022-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
+751eb9a4caa32232d9d0916465b5932cae2b05ab989c7019eb4bdc3fdadcec0103b5a6fca789c1886ea76c179a2568ea47de44931b1af4d9f13692c0617a1b48  0023-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
+c9af403da0068f8d93eb74e345d06a43ac103ffd28514fb16ab31517e5172e5ed13451b8b20e87e80adf21b0ce3daca37e335a309d88c403f68377d75ff30a64  0024-mips64-disable-multilib-support.patch
+7504757907b95e474d283876eaef08a4d03ad3308470d9130a7ac221ad1cc204de03520a5fa7ec42f9035af6edf84cb09b2f5b134d2ac744494f4cf385c70ae7  0025-aarch64-disable-multilib-support.patch
+10106ccaa20a6c04c718cdf242c1ba16210d2ffd75febef0a4488023c9aa8d1086fad9c96416a82bf104188ab7542c925b2bbe277935f5c34967321fd358c022  0026-s390x-disable-multilib-support.patch
+1152d020a3da61fd697fad6fc5cf6eeadb1225ebc8d8d9e81b9f63f34073876451b90e93d3fd334eeb68f6702498e335076e35a8020c2cd2443236e222cc73fe  0027-ppc64-le-disable-multilib-support.patch
+1adc2daacbdb0a38ed2aaacc7864cfb38841fba16640af1053892fb63fcc2b56711a6ee3722e45cd17239b5793f612514130d24bc6588d4f884a353f70da3076  0028-x86_64-disable-multilib-support.patch
+cbebee40ad722be52e359853afaf4667e52fbf62e24b6f1b8a96b7b82984bf05a67903122dd5c19f90d477aed7daacdbc409f79a5981493f2457f0f16bef370f  0029-riscv-disable-multilib-support.patch
+46c3089eaf48897de801849744e7094f829f521051345a6465e3a433e6f383298b0b2b4004a9d8277e7108a3e5be274d8aad01ab1ac23e76d3a8d07d396c2e10  0030-always-build-libgcc_eh.a.patch
+1ee9524247041e3cd5d87868431156b9fee4429519508e2d05109c5dd8ba881d2964fe667dd4752cc98575b35a485e2a66b00a8fe2c75a86cd182ff0d706afd5  0031-ada-libgnarl-compatibility-for-musl.patch
+e6ae6f63ead4890ac3761f6d14383f5c5a995cca62d5432e2e12f5dda46d93dadd7298be98010c674533b2793415b0f0c37b54daabd74ef6f5e9f93cadb084b3  0032-ada-musl-support-fixes.patch
+bca91a9369e0a32bb824eff9ee92d7a9bf50273fd304784c04e9ee3d06382a821e6485d180d477c5a2c447ee6c1efe3f7e22014b30c5e3299af923a5c1471091  0033-gcc-go-Fix-handling-of-signal-34-on-musl.patch
+4dd546fbdc73a276e15b0ca27db735ff0145240cf8bf627b267c77ee45d119e29c5346acba83335e0344a01ea9e730a28c5038666a35bfa886332cc63975c1af  0034-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch
+de8b5368f83988526f00c58f81fcb796baf1e2e6823fb70977092236225e859abcccee08373c59bfb944076af2791a549d94da47c4f4816216f6f708706b9f2b  0035-gcc-go-signal-34-is-special-on-musl-libc.patch
+9c87c2f82ce9ab67b8ff4aa2cd5722badfd432292443c7901141479282ff29596ded3dc3508bfd3172544d1c160a6f32de61c801d831ff950236553727c7db19  0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
+c091bc56ced7fc3c5f9a879f42237cb60fbc3da8a2d9742ff0e4e93a3f97f20a620a8f16af23183ed3d14ddaeaf1207e1840fd015a622acb79959dd766aba9bc  0037-gcc-go-link-to-libucontext.patch
+0694338a2fc12a903b979d45e9b4a92dc9e441e9c377e63b36cd900a0cc664e0f0493c797ea4c45478e60a3d70da5ff971e10460a3cbf64c2a940a4327fd87a6  0038-Use-generic-errstr.go-implementation-on-musl.patch
+49c30829a80acf386fd5c14c630f9f0e5161264c1504121da749ae3e06fb54c36280e81b9760378edc3627cb29965da01f8d03c9d473a854d6294200b372da28  0039-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
+ec78df0cd34fe838d9364fdfe3f3d9a068c256b7a507fea9d315c92dc21b0af3675210586e57be93aa096ed7c08645cdc6eb2184e6b18ab0dd900b98847acda5  0040-configure-fix-detection-of-atomic-builtins-in-libato.patch
+0cdfcf11234be520a3b8ddcd0ed2efb9b4606da7135cea918e68a7655ebf43edb01eb291b9b226a0a44cf15f52c714f80884c0128b9d13771df3a6da991f2cbe  0041-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch
+c2a67dc1853682e0c72d721572e29dae93560b2c7d1fa932e4ee38f420b9bc21f187128498e094f7aaf6520f64b707f50c9aa6c260c269abb8e6f00c39be87c3  0042-Fix-attempt-to-use-poisoned-calloc-error-in-libgccji.patch
+9a419b4b0cc3c80871b3b852f5d5fbd37d3e377ddcdf35273c4c543544d575f59762f0dcffa24ec2c74de29aaf07e4e8339474733e7b39558dc1481ad1f2b3ca  0043-stddef.h-add-support-for-musl-typedef-macro-guards.patch
+801cf2e3f08fc6e0d1bd615361d7bb7541d468282ddf4357f9e276336bc4d4151a6cfdd413503dd7576d9c50191e60a8da9f38daa605c48f5f5d047360e882d4  0044-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
+bc05c96a2cfa57ab9c12ef834cf5158991b4dd63baf98ea1558060b966fb959865ce659ea9095307df8c59136f999b7d6ebeb72a4bc1235a458849e227ead900  0045-Disable-fsplit-stack-support-on-non-glibc-targets.patch
+a2c3821998a5e457b6241f88a7015199c7d7abce698ab888ea7df2970866121b02393a70b79cb5862469a5286e9ad91a18fa113e308612baa62a52b839e8eea9  0046-libgo-include-asm-ptrace.h-for-pt_regs-definition-on.patch
 "