device-oneplus-lemonade: use boot image header v1

Using header v1 and appended dtb simplifies a lot of things. It now requires flashing dtbo with an empty file of at least 2 bytes, erasing it might also work. As well as erasing vendor_boot. It may still be necessary to flash vbmeta. Signed-off-by: Caleb Connolly <caleb@connolly.tech>
DONTPUSH: axolotl dev stuff
2023-07-31 21:57:46 +01:00 · 2023-07-31 17:46:47 +01:00 · 2023-07-25 22:19:00 +02:00 · 2023-07-24 08:32:10 +02:00 · 2023-07-24 08:24:57 +02:00 · 2023-07-23 14:21:35 -07:00
632 changed files with 54719 additions and 7006 deletions
@@ -38,3 +38,10 @@ if grep -qr '/usr/share/postmarketos-mkinitfs' -- *; then
 	grep --color=always -r '/usr/share/postmarketos-mkinitfs' -- *
 	exit 1
 fi
+
+# Direct sourcing of deviceinfo
+if grep --exclude='source_deviceinfo' -qEr 'source /etc/deviceinfo|\. /etc/deviceinfo' -- *; then
+	echo 'ERROR: Please source the source_deviceinfo script instead of sourcing deviceinfo directly!'
+	grep --color=always --exclude='rootfs-usr-share-misc-source_deviceinfo' -Er 'source /etc/deviceinfo|\. /etc/deviceinfo' -- *
+	exit 1
+fi
@@ -134,7 +134,7 @@ def get_changed_packages_sanity_check(count):
    print("ERROR: Too many packages have changed!")
    print()
    print("This is a sanity check, so we don't end up building packages that")
-    print("have not been modified. CI won't run for more than one hour")
+    print("have not been modified. CI won't run for more than three hours")
    print("anyway.")
    print()
    print("Your options:")
@@ -17,8 +17,8 @@ sh_files="
 	./main/mdss-fb-init-hack/mdss-fb-init-hack.sh
 	./main/osk-sdl/unlock.sh
 	./main/postmarketos-base/rootfs-usr-lib-firmwareload.sh
-	./main/postmarketos-base-ui/rootfs-etc-NetworkManager-dispatcher.d-99-dns-filter.sh
-	./main/postmarketos-base-ui/rootfs-etc-NetworkManager-dispatcher.d-85-tethering
+	./main/postmarketos-base-ui/rootfs-usr-lib-NetworkManager-dispatcher.d-50-dns-filter.sh
+	./main/postmarketos-base-ui/rootfs-usr-lib-NetworkManager-dispatcher.d-50-tethering.sh
 	./main/postmarketos-installkernel/installkernel-pmos
 	./main/postmarketos-initramfs/init.sh
 	./main/postmarketos-initramfs/init_functions.sh
@@ -21,12 +21,14 @@
 	Replace space inside `[ ]` with `x` to fill the checkbox
 -->
 * [ ] edge (`master` branch)
-* [ ] `v22.12`
+* [ ] `v23.06`
+* [ ] `v22.12` (Supported until 2023-07-06)

 * [ ] I confirm that the issue still is present after running `sudo apk upgrade -a`

 ### On what environment did you encounter the issue?
 #### Environments
+* [ ] GNOME Shell on Mobile
 * [ ] Phosh
 * [ ] Plasma Mobile
 * [ ] Sxmo (Wayland/Sway) **Please post the output of `sxmo_version.sh`**
@@ -8,8 +8,14 @@ branch_pmaports=master
 branch_aports=master
 mirrordir_alpine=edge

-[v22.12]
+[v23.06]
 description=Latest release / Recommended for best stability
+branch_pmaports=v23.06
+branch_aports=3.18-stable
+mirrordir_alpine=v3.18
+
+[v22.12]
+description=Old release (unsupported)
 branch_pmaports=v22.12
 branch_aports=3.17-stable
 mirrordir_alpine=v3.17
@@ -1,55 +0,0 @@
-From bbf05b742fde518fb97c789b043fe0d3aaf549f0 Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Tue, 21 Sep 2021 14:53:13 +0000
-Subject: [PATCH] Revert "PR25882, .gnu.attributes are not checked for shared
- libraries"
-
-This revert is needed to avoid wrongly tagging objects with the incompatible
-IBM long double ABI, which is not supported by musl and will result in
-linking errors if used.
-
-This reverts commit a8acd6eeb6dc2cc5460ece90f90ebe36b56b20ba.
---
- bfd/elf32-tic6x.c |  3 ---
- ld/ldlang.c       | 10 ++++------
- 2 files changed, 4 insertions(+), 9 deletions(-)
-
-diff --git a/bfd/elf32-tic6x.c b/bfd/elf32-tic6x.c
-index 5754f3cb860..3ad1d612749 100644
--- a/bfd/elf32-tic6x.c
-+++ b/bfd/elf32-tic6x.c
-@@ -3735,9 +3735,6 @@ elf32_tic6x_merge_attributes (bfd *ibfd, struct bfd_link_info *info)
- 
- 	case Tag_ABI_PIC:
- 	case Tag_ABI_PID:
-	  /* Don't transfer these tags from dynamic objects.  */
-	  if ((ibfd->flags & DYNAMIC) != 0)
-	    continue;
- 	  if (out_attr[i].i > in_attr[i].i)
- 	    out_attr[i].i = in_attr[i].i;
- 	  break;
-diff --git a/ld/ldlang.c b/ld/ldlang.c
-index 37b64c89ee1..f13beaef9d9 100644
--- a/ld/ldlang.c
-+++ b/ld/ldlang.c
-@@ -7071,13 +7071,11 @@ lang_check (void)
- 		   bfd_printable_name (input_bfd), input_bfd,
- 		   bfd_printable_name (link_info.output_bfd));
- 	}
-
-      /* If the input bfd has no contents, it shouldn't set the
-	 private data of the output bfd.  */
-      else if (!file->flags.just_syms
-	       && ((input_bfd->flags & DYNAMIC) != 0
-		   || bfd_count_sections (input_bfd) != 0))
-+      else if (bfd_count_sections (input_bfd))
- 	{
-+	  /* If the input bfd has no contents, it shouldn't set the
-+	     private data of the output bfd.  */
-+
- 	  bfd_error_handler_type pfn = NULL;
- 
- 	  /* If we aren't supposed to warn about mismatched input
-- 
-2.33.0
-
@@ -1,144 +0,0 @@
-# Automatically generated aport, do not edit!
-# Generator: pmbootstrap aportgen binutils-aarch64
-# Based on: main/binutils
-
-
-CTARGET_ARCH=aarch64
-CTARGET="$(arch_to_hostspec $CTARGET_ARCH)"
-
-pkgname=binutils-aarch64
-pkgver=2.40
-pkgrel=8
-pkgdesc="Tools necessary to build programs for aarch64 targets"
-url="https://www.gnu.org/software/binutils/"
-makedepends_build="bison flex texinfo"
-makedepends_host="zlib-dev jansson-dev zstd-dev"
-makedepends="$makedepends_build $makedepends_host"
-arch="x86_64"
-license="GPL-2.0-or-later AND LGPL-2.1-or-later AND BSD-3-Clause"
-subpackages="binutils-dev binutils-doc"
-source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz
-	binutils-ld-fix-static-linking.patch
-	0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
-	"
-builddir="$srcdir/binutils-$pkgver"
-
-if [ -z "$BOOTSTRAP" ]; then
-	makedepends_host="$makedepends_host jansson-dev zstd-dev"
-fi
-
-if [ "$CHOST" = "$CBUILD" ] && [ "$CBUILD" = "$CTARGET" ] && [ "$CTARGET_ARCH" != "riscv64" ]; then
-	subpackages="$subpackages binutils-gold"
-fi
-
-if [ "$CHOST" != "$CTARGET" ]; then
-	pkgname="binutils-$CTARGET_ARCH"
-	subpackages=""
-	sonameprefix="binutils:"
-fi
-
-# secfixes:
-#   2.40-r0:
-#     - CVE-2023-1579
-#   2.39-r2:
-#     - CVE-2022-38533
-#   2.39-r0:
-#     - CVE-2022-38126
-#   2.35.2-r1:
-#     - CVE-2021-3487
-#   2.32-r0:
-#     - CVE-2018-19931
-#     - CVE-2018-19932
-#     - CVE-2018-20002
-#     - CVE-2018-20712
-#   2.28-r1:
-#     - CVE-2017-7614
-
-build() {
-	local _sysroot=/
-	local _cross_configure="--enable-install-libiberty --enable-shared"
-	local _arch_configure=""
-	local _gold_configure="--disable-gold"
-	local _plugin_configure="--enable-plugins"
-
-	if [ "$CHOST" != "$CTARGET" ]; then
-		_sysroot="$CBUILDROOT"
-		_cross_configure="--disable-install-libiberty"
-		_plugin_configure="--disable-plugins"
-	fi
-
-	if [ "$CHOST" = "$CBUILD" ] && [ "$CBUILD" = "$CTARGET" ] && [ "$CTARGET_ARCH" != "riscv64" ]; then
-		_gold_configure="--enable-gold"
-	fi
-
-	if [ "$CTARGET_ARCH" = "x86_64" ]; then
-		_arch_configure="--enable-targets=x86_64-pep"
-	fi
-
-	if [ "$CTARGET_ARCH" = "riscv64" ]; then
-		_gold_configure="--disable-gold"
-	fi
-
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--target=$CTARGET \
-		--with-build-sysroot="$CBUILDROOT" \
-		--with-sysroot=$_sysroot \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--sysconfdir=/etc \
-		$_arch_configure \
-		$_cross_configure \
-		$_gold_configure \
-		$_plugin_configure \
-		--disable-gprofng \
-		--disable-multilib \
-		--disable-nls \
-		--disable-werror \
-		--enable-64-bit-bfd \
-		--enable-colored-disassembly \
-		--enable-default-execstack=no \
-		--enable-default-hash-style=gnu \
-		--enable-deterministic-archives \
-		--enable-ld=default \
-		--enable-new-dtags \
-		--enable-relro \
-		--enable-threads \
-		--with-bugurl="https://postmarketos.org/issues" \
-		--with-mmap \
-		--with-pic \
-		--with-system-zlib
-	make
-}
-
-package() {
-	make install DESTDIR="$pkgdir"
-	if [ -d "$pkgdir"/usr/lib64 ]; then
-		mv "$pkgdir"/usr/lib64/* "$pkgdir"/usr/lib/
-		rmdir "$pkgdir"/usr/lib64
-	fi
-	if [ "$CHOST" != "$CTARGET" ]; then
-		# creating cross tools: remove any files that would conflict
-		# with the native tools, or other cross tools
-		rm -r "${pkgdir:?}"/usr/share
-		rm -f "$pkgdir"/usr/lib/libiberty.a
-		rm -r "${pkgdir:?}"/usr/lib/bfd-plugins
-	fi
-}
-
-gold() {
-	pkgdesc="GNU binutils - gold linker"
-
-	if [ -e "$pkgdir"/usr/bin/ld.gold ]; then
-		amove usr/bin/ld.gold
-	fi
-	amove usr/$CTARGET/bin/ld.gold
-}
-
-sha512sums="
-a37e042523bc46494d99d5637c3f3d8f9956d9477b748b3b1f6d7dfbb8d968ed52c932e88a4e946c6f77b8f48f1e1b360ca54c3d298f17193f3b4963472f6925  binutils-2.40.tar.xz
-ecee33b0e435aa704af1c334e560f201638ff79e199aa11ed78a72f7c9b46f85fbb227af5748e735fd681d1965fcc42ac81b0c8824e540430ce0c706c81e8b49  binutils-ld-fix-static-linking.patch
-70ec22bd72ef6dddecfd970613387dd4a8cdc8730dd3cbf03d5a0c3a7c4d839383167bb06dad21bf7c235329fd44b5dc4aefe762f68544f17155cf002bf1be4a  0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
-"
@@ -1,46 +0,0 @@
-This fixes static linking for our hardened toolchain
-diff --git a/ld/scripttempl/elf.sc b/ld/scripttempl/elf.sc
-index e8126cb..9532bfb 100644
--- a/ld/scripttempl/elf.sc
-+++ b/ld/scripttempl/elf.sc
-@@ -235,8 +235,8 @@ test "${LARGE_SECTIONS}" = "yes" && LARGE_SECTIONS="
- if test "${ENABLE_INITFINI_ARRAY}" = "yes"; then
-   SORT_INIT_ARRAY="KEEP (*(SORT_BY_INIT_PRIORITY(.init_array.*) SORT_BY_INIT_PRIORITY(.ctors.*)))"
-   SORT_FINI_ARRAY="KEEP (*(SORT_BY_INIT_PRIORITY(.fini_array.*) SORT_BY_INIT_PRIORITY(.dtors.*)))"
-  CTORS_IN_INIT_ARRAY="EXCLUDE_FILE (*crtbegin.o *crtbegin?.o *crtend.o *crtend?.o $OTHER_EXCLUDE_FILES) .ctors"
-  DTORS_IN_FINI_ARRAY="EXCLUDE_FILE (*crtbegin.o *crtbegin?.o *crtend.o *crtend?.o $OTHER_EXCLUDE_FILES) .dtors"
-+  CTORS_IN_INIT_ARRAY="EXCLUDE_FILE (*crtbegin*.o *crtend*.o $OTHER_EXCLUDE_FILES) .ctors"
-+  DTORS_IN_FINI_ARRAY="EXCLUDE_FILE (*crtbegin*.o *crtend*.o $OTHER_EXCLUDE_FILES) .dtors"
- else
-   SORT_INIT_ARRAY="KEEP (*(SORT(.init_array.*)))"
-   SORT_FINI_ARRAY="KEEP (*(SORT(.fini_array.*)))"
-@@ -270,15 +270,14 @@ CTOR=".ctors        ${CONSTRUCTING-0} :
-        doesn't matter which directory crtbegin.o
-        is in.  */
- 
-    KEEP (*crtbegin.o(.ctors))
-    KEEP (*crtbegin?.o(.ctors))
-+    KEEP (*crtbegin*.o(.ctors))
- 
-     /* We don't want to include the .ctor section from
-        the crtend.o file until after the sorted ctors.
-        The .ctor section from the crtend file contains the
-        end of ctors marker and it must be last */
- 
-    KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o $OTHER_EXCLUDE_FILES) .ctors))
-+    KEEP (*(EXCLUDE_FILE (*crtend*.o $OTHER_EXCLUDE_FILES) .ctors))
-     KEEP (*(SORT(.ctors.*)))
-     KEEP (*(.ctors))
-     ${CONSTRUCTING+${CTOR_END}}
-@@ -286,9 +285,8 @@ CTOR=".ctors        ${CONSTRUCTING-0} :
- DTOR=".dtors        ${CONSTRUCTING-0} :
-   {
-     ${CONSTRUCTING+${DTOR_START}}
-    KEEP (*crtbegin.o(.dtors))
-    KEEP (*crtbegin?.o(.dtors))
-    KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o $OTHER_EXCLUDE_FILES) .dtors))
-+    KEEP (*crtbegin*.o(.dtors))
-+    KEEP (*(EXCLUDE_FILE (*crtend*.o $OTHER_EXCLUDE_FILES) .dtors))
-     KEEP (*(SORT(.dtors.*)))
-     KEEP (*(.dtors))
-     ${CONSTRUCTING+${DTOR_END}}
@@ -1,55 +0,0 @@
-From bbf05b742fde518fb97c789b043fe0d3aaf549f0 Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Tue, 21 Sep 2021 14:53:13 +0000
-Subject: [PATCH] Revert "PR25882, .gnu.attributes are not checked for shared
- libraries"
-
-This revert is needed to avoid wrongly tagging objects with the incompatible
-IBM long double ABI, which is not supported by musl and will result in
-linking errors if used.
-
-This reverts commit a8acd6eeb6dc2cc5460ece90f90ebe36b56b20ba.
---
- bfd/elf32-tic6x.c |  3 ---
- ld/ldlang.c       | 10 ++++------
- 2 files changed, 4 insertions(+), 9 deletions(-)
-
-diff --git a/bfd/elf32-tic6x.c b/bfd/elf32-tic6x.c
-index 5754f3cb860..3ad1d612749 100644
--- a/bfd/elf32-tic6x.c
-+++ b/bfd/elf32-tic6x.c
-@@ -3735,9 +3735,6 @@ elf32_tic6x_merge_attributes (bfd *ibfd, struct bfd_link_info *info)
- 
- 	case Tag_ABI_PIC:
- 	case Tag_ABI_PID:
-	  /* Don't transfer these tags from dynamic objects.  */
-	  if ((ibfd->flags & DYNAMIC) != 0)
-	    continue;
- 	  if (out_attr[i].i > in_attr[i].i)
- 	    out_attr[i].i = in_attr[i].i;
- 	  break;
-diff --git a/ld/ldlang.c b/ld/ldlang.c
-index 37b64c89ee1..f13beaef9d9 100644
--- a/ld/ldlang.c
-+++ b/ld/ldlang.c
-@@ -7071,13 +7071,11 @@ lang_check (void)
- 		   bfd_printable_name (input_bfd), input_bfd,
- 		   bfd_printable_name (link_info.output_bfd));
- 	}
-
-      /* If the input bfd has no contents, it shouldn't set the
-	 private data of the output bfd.  */
-      else if (!file->flags.just_syms
-	       && ((input_bfd->flags & DYNAMIC) != 0
-		   || bfd_count_sections (input_bfd) != 0))
-+      else if (bfd_count_sections (input_bfd))
- 	{
-+	  /* If the input bfd has no contents, it shouldn't set the
-+	     private data of the output bfd.  */
-+
- 	  bfd_error_handler_type pfn = NULL;
- 
- 	  /* If we aren't supposed to warn about mismatched input
-- 
-2.33.0
-
@@ -1,144 +0,0 @@
-# Automatically generated aport, do not edit!
-# Generator: pmbootstrap aportgen binutils-armhf
-# Based on: main/binutils
-
-
-CTARGET_ARCH=armhf
-CTARGET="$(arch_to_hostspec $CTARGET_ARCH)"
-
-pkgname=binutils-armhf
-pkgver=2.40
-pkgrel=8
-pkgdesc="Tools necessary to build programs for armhf targets"
-url="https://www.gnu.org/software/binutils/"
-makedepends_build="bison flex texinfo"
-makedepends_host="zlib-dev jansson-dev zstd-dev"
-makedepends="$makedepends_build $makedepends_host"
-arch="x86_64"
-license="GPL-2.0-or-later AND LGPL-2.1-or-later AND BSD-3-Clause"
-subpackages="binutils-dev binutils-doc"
-source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz
-	binutils-ld-fix-static-linking.patch
-	0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
-	"
-builddir="$srcdir/binutils-$pkgver"
-
-if [ -z "$BOOTSTRAP" ]; then
-	makedepends_host="$makedepends_host jansson-dev zstd-dev"
-fi
-
-if [ "$CHOST" = "$CBUILD" ] && [ "$CBUILD" = "$CTARGET" ] && [ "$CTARGET_ARCH" != "riscv64" ]; then
-	subpackages="$subpackages binutils-gold"
-fi
-
-if [ "$CHOST" != "$CTARGET" ]; then
-	pkgname="binutils-$CTARGET_ARCH"
-	subpackages=""
-	sonameprefix="binutils:"
-fi
-
-# secfixes:
-#   2.40-r0:
-#     - CVE-2023-1579
-#   2.39-r2:
-#     - CVE-2022-38533
-#   2.39-r0:
-#     - CVE-2022-38126
-#   2.35.2-r1:
-#     - CVE-2021-3487
-#   2.32-r0:
-#     - CVE-2018-19931
-#     - CVE-2018-19932
-#     - CVE-2018-20002
-#     - CVE-2018-20712
-#   2.28-r1:
-#     - CVE-2017-7614
-
-build() {
-	local _sysroot=/
-	local _cross_configure="--enable-install-libiberty --enable-shared"
-	local _arch_configure=""
-	local _gold_configure="--disable-gold"
-	local _plugin_configure="--enable-plugins"
-
-	if [ "$CHOST" != "$CTARGET" ]; then
-		_sysroot="$CBUILDROOT"
-		_cross_configure="--disable-install-libiberty"
-		_plugin_configure="--disable-plugins"
-	fi
-
-	if [ "$CHOST" = "$CBUILD" ] && [ "$CBUILD" = "$CTARGET" ] && [ "$CTARGET_ARCH" != "riscv64" ]; then
-		_gold_configure="--enable-gold"
-	fi
-
-	if [ "$CTARGET_ARCH" = "x86_64" ]; then
-		_arch_configure="--enable-targets=x86_64-pep"
-	fi
-
-	if [ "$CTARGET_ARCH" = "riscv64" ]; then
-		_gold_configure="--disable-gold"
-	fi
-
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--target=$CTARGET \
-		--with-build-sysroot="$CBUILDROOT" \
-		--with-sysroot=$_sysroot \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--sysconfdir=/etc \
-		$_arch_configure \
-		$_cross_configure \
-		$_gold_configure \
-		$_plugin_configure \
-		--disable-gprofng \
-		--disable-multilib \
-		--disable-nls \
-		--disable-werror \
-		--enable-64-bit-bfd \
-		--enable-colored-disassembly \
-		--enable-default-execstack=no \
-		--enable-default-hash-style=gnu \
-		--enable-deterministic-archives \
-		--enable-ld=default \
-		--enable-new-dtags \
-		--enable-relro \
-		--enable-threads \
-		--with-bugurl="https://postmarketos.org/issues" \
-		--with-mmap \
-		--with-pic \
-		--with-system-zlib
-	make
-}
-
-package() {
-	make install DESTDIR="$pkgdir"
-	if [ -d "$pkgdir"/usr/lib64 ]; then
-		mv "$pkgdir"/usr/lib64/* "$pkgdir"/usr/lib/
-		rmdir "$pkgdir"/usr/lib64
-	fi
-	if [ "$CHOST" != "$CTARGET" ]; then
-		# creating cross tools: remove any files that would conflict
-		# with the native tools, or other cross tools
-		rm -r "${pkgdir:?}"/usr/share
-		rm -f "$pkgdir"/usr/lib/libiberty.a
-		rm -r "${pkgdir:?}"/usr/lib/bfd-plugins
-	fi
-}
-
-gold() {
-	pkgdesc="GNU binutils - gold linker"
-
-	if [ -e "$pkgdir"/usr/bin/ld.gold ]; then
-		amove usr/bin/ld.gold
-	fi
-	amove usr/$CTARGET/bin/ld.gold
-}
-
-sha512sums="
-a37e042523bc46494d99d5637c3f3d8f9956d9477b748b3b1f6d7dfbb8d968ed52c932e88a4e946c6f77b8f48f1e1b360ca54c3d298f17193f3b4963472f6925  binutils-2.40.tar.xz
-ecee33b0e435aa704af1c334e560f201638ff79e199aa11ed78a72f7c9b46f85fbb227af5748e735fd681d1965fcc42ac81b0c8824e540430ce0c706c81e8b49  binutils-ld-fix-static-linking.patch
-70ec22bd72ef6dddecfd970613387dd4a8cdc8730dd3cbf03d5a0c3a7c4d839383167bb06dad21bf7c235329fd44b5dc4aefe762f68544f17155cf002bf1be4a  0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
-"
@@ -1,46 +0,0 @@
-This fixes static linking for our hardened toolchain
-diff --git a/ld/scripttempl/elf.sc b/ld/scripttempl/elf.sc
-index e8126cb..9532bfb 100644
--- a/ld/scripttempl/elf.sc
-+++ b/ld/scripttempl/elf.sc
-@@ -235,8 +235,8 @@ test "${LARGE_SECTIONS}" = "yes" && LARGE_SECTIONS="
- if test "${ENABLE_INITFINI_ARRAY}" = "yes"; then
-   SORT_INIT_ARRAY="KEEP (*(SORT_BY_INIT_PRIORITY(.init_array.*) SORT_BY_INIT_PRIORITY(.ctors.*)))"
-   SORT_FINI_ARRAY="KEEP (*(SORT_BY_INIT_PRIORITY(.fini_array.*) SORT_BY_INIT_PRIORITY(.dtors.*)))"
-  CTORS_IN_INIT_ARRAY="EXCLUDE_FILE (*crtbegin.o *crtbegin?.o *crtend.o *crtend?.o $OTHER_EXCLUDE_FILES) .ctors"
-  DTORS_IN_FINI_ARRAY="EXCLUDE_FILE (*crtbegin.o *crtbegin?.o *crtend.o *crtend?.o $OTHER_EXCLUDE_FILES) .dtors"
-+  CTORS_IN_INIT_ARRAY="EXCLUDE_FILE (*crtbegin*.o *crtend*.o $OTHER_EXCLUDE_FILES) .ctors"
-+  DTORS_IN_FINI_ARRAY="EXCLUDE_FILE (*crtbegin*.o *crtend*.o $OTHER_EXCLUDE_FILES) .dtors"
- else
-   SORT_INIT_ARRAY="KEEP (*(SORT(.init_array.*)))"
-   SORT_FINI_ARRAY="KEEP (*(SORT(.fini_array.*)))"
-@@ -270,15 +270,14 @@ CTOR=".ctors        ${CONSTRUCTING-0} :
-        doesn't matter which directory crtbegin.o
-        is in.  */
- 
-    KEEP (*crtbegin.o(.ctors))
-    KEEP (*crtbegin?.o(.ctors))
-+    KEEP (*crtbegin*.o(.ctors))
- 
-     /* We don't want to include the .ctor section from
-        the crtend.o file until after the sorted ctors.
-        The .ctor section from the crtend file contains the
-        end of ctors marker and it must be last */
- 
-    KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o $OTHER_EXCLUDE_FILES) .ctors))
-+    KEEP (*(EXCLUDE_FILE (*crtend*.o $OTHER_EXCLUDE_FILES) .ctors))
-     KEEP (*(SORT(.ctors.*)))
-     KEEP (*(.ctors))
-     ${CONSTRUCTING+${CTOR_END}}
-@@ -286,9 +285,8 @@ CTOR=".ctors        ${CONSTRUCTING-0} :
- DTOR=".dtors        ${CONSTRUCTING-0} :
-   {
-     ${CONSTRUCTING+${DTOR_START}}
-    KEEP (*crtbegin.o(.dtors))
-    KEEP (*crtbegin?.o(.dtors))
-    KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o $OTHER_EXCLUDE_FILES) .dtors))
-+    KEEP (*crtbegin*.o(.dtors))
-+    KEEP (*(EXCLUDE_FILE (*crtend*.o $OTHER_EXCLUDE_FILES) .dtors))
-     KEEP (*(SORT(.dtors.*)))
-     KEEP (*(.dtors))
-     ${CONSTRUCTING+${DTOR_END}}
@@ -1,55 +0,0 @@
-From bbf05b742fde518fb97c789b043fe0d3aaf549f0 Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Tue, 21 Sep 2021 14:53:13 +0000
-Subject: [PATCH] Revert "PR25882, .gnu.attributes are not checked for shared
- libraries"
-
-This revert is needed to avoid wrongly tagging objects with the incompatible
-IBM long double ABI, which is not supported by musl and will result in
-linking errors if used.
-
-This reverts commit a8acd6eeb6dc2cc5460ece90f90ebe36b56b20ba.
---
- bfd/elf32-tic6x.c |  3 ---
- ld/ldlang.c       | 10 ++++------
- 2 files changed, 4 insertions(+), 9 deletions(-)
-
-diff --git a/bfd/elf32-tic6x.c b/bfd/elf32-tic6x.c
-index 5754f3cb860..3ad1d612749 100644
--- a/bfd/elf32-tic6x.c
-+++ b/bfd/elf32-tic6x.c
-@@ -3735,9 +3735,6 @@ elf32_tic6x_merge_attributes (bfd *ibfd, struct bfd_link_info *info)
- 
- 	case Tag_ABI_PIC:
- 	case Tag_ABI_PID:
-	  /* Don't transfer these tags from dynamic objects.  */
-	  if ((ibfd->flags & DYNAMIC) != 0)
-	    continue;
- 	  if (out_attr[i].i > in_attr[i].i)
- 	    out_attr[i].i = in_attr[i].i;
- 	  break;
-diff --git a/ld/ldlang.c b/ld/ldlang.c
-index 37b64c89ee1..f13beaef9d9 100644
--- a/ld/ldlang.c
-+++ b/ld/ldlang.c
-@@ -7071,13 +7071,11 @@ lang_check (void)
- 		   bfd_printable_name (input_bfd), input_bfd,
- 		   bfd_printable_name (link_info.output_bfd));
- 	}
-
-      /* If the input bfd has no contents, it shouldn't set the
-	 private data of the output bfd.  */
-      else if (!file->flags.just_syms
-	       && ((input_bfd->flags & DYNAMIC) != 0
-		   || bfd_count_sections (input_bfd) != 0))
-+      else if (bfd_count_sections (input_bfd))
- 	{
-+	  /* If the input bfd has no contents, it shouldn't set the
-+	     private data of the output bfd.  */
-+
- 	  bfd_error_handler_type pfn = NULL;
- 
- 	  /* If we aren't supposed to warn about mismatched input
-- 
-2.33.0
-
@@ -1,144 +0,0 @@
-# Automatically generated aport, do not edit!
-# Generator: pmbootstrap aportgen binutils-armv7
-# Based on: main/binutils
-
-
-CTARGET_ARCH=armv7
-CTARGET="$(arch_to_hostspec $CTARGET_ARCH)"
-
-pkgname=binutils-armv7
-pkgver=2.40
-pkgrel=8
-pkgdesc="Tools necessary to build programs for armv7 targets"
-url="https://www.gnu.org/software/binutils/"
-makedepends_build="bison flex texinfo"
-makedepends_host="zlib-dev jansson-dev zstd-dev"
-makedepends="$makedepends_build $makedepends_host"
-arch="x86_64"
-license="GPL-2.0-or-later AND LGPL-2.1-or-later AND BSD-3-Clause"
-subpackages="binutils-dev binutils-doc"
-source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz
-	binutils-ld-fix-static-linking.patch
-	0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
-	"
-builddir="$srcdir/binutils-$pkgver"
-
-if [ -z "$BOOTSTRAP" ]; then
-	makedepends_host="$makedepends_host jansson-dev zstd-dev"
-fi
-
-if [ "$CHOST" = "$CBUILD" ] && [ "$CBUILD" = "$CTARGET" ] && [ "$CTARGET_ARCH" != "riscv64" ]; then
-	subpackages="$subpackages binutils-gold"
-fi
-
-if [ "$CHOST" != "$CTARGET" ]; then
-	pkgname="binutils-$CTARGET_ARCH"
-	subpackages=""
-	sonameprefix="binutils:"
-fi
-
-# secfixes:
-#   2.40-r0:
-#     - CVE-2023-1579
-#   2.39-r2:
-#     - CVE-2022-38533
-#   2.39-r0:
-#     - CVE-2022-38126
-#   2.35.2-r1:
-#     - CVE-2021-3487
-#   2.32-r0:
-#     - CVE-2018-19931
-#     - CVE-2018-19932
-#     - CVE-2018-20002
-#     - CVE-2018-20712
-#   2.28-r1:
-#     - CVE-2017-7614
-
-build() {
-	local _sysroot=/
-	local _cross_configure="--enable-install-libiberty --enable-shared"
-	local _arch_configure=""
-	local _gold_configure="--disable-gold"
-	local _plugin_configure="--enable-plugins"
-
-	if [ "$CHOST" != "$CTARGET" ]; then
-		_sysroot="$CBUILDROOT"
-		_cross_configure="--disable-install-libiberty"
-		_plugin_configure="--disable-plugins"
-	fi
-
-	if [ "$CHOST" = "$CBUILD" ] && [ "$CBUILD" = "$CTARGET" ] && [ "$CTARGET_ARCH" != "riscv64" ]; then
-		_gold_configure="--enable-gold"
-	fi
-
-	if [ "$CTARGET_ARCH" = "x86_64" ]; then
-		_arch_configure="--enable-targets=x86_64-pep"
-	fi
-
-	if [ "$CTARGET_ARCH" = "riscv64" ]; then
-		_gold_configure="--disable-gold"
-	fi
-
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--target=$CTARGET \
-		--with-build-sysroot="$CBUILDROOT" \
-		--with-sysroot=$_sysroot \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--sysconfdir=/etc \
-		$_arch_configure \
-		$_cross_configure \
-		$_gold_configure \
-		$_plugin_configure \
-		--disable-gprofng \
-		--disable-multilib \
-		--disable-nls \
-		--disable-werror \
-		--enable-64-bit-bfd \
-		--enable-colored-disassembly \
-		--enable-default-execstack=no \
-		--enable-default-hash-style=gnu \
-		--enable-deterministic-archives \
-		--enable-ld=default \
-		--enable-new-dtags \
-		--enable-relro \
-		--enable-threads \
-		--with-bugurl="https://postmarketos.org/issues" \
-		--with-mmap \
-		--with-pic \
-		--with-system-zlib
-	make
-}
-
-package() {
-	make install DESTDIR="$pkgdir"
-	if [ -d "$pkgdir"/usr/lib64 ]; then
-		mv "$pkgdir"/usr/lib64/* "$pkgdir"/usr/lib/
-		rmdir "$pkgdir"/usr/lib64
-	fi
-	if [ "$CHOST" != "$CTARGET" ]; then
-		# creating cross tools: remove any files that would conflict
-		# with the native tools, or other cross tools
-		rm -r "${pkgdir:?}"/usr/share
-		rm -f "$pkgdir"/usr/lib/libiberty.a
-		rm -r "${pkgdir:?}"/usr/lib/bfd-plugins
-	fi
-}
-
-gold() {
-	pkgdesc="GNU binutils - gold linker"
-
-	if [ -e "$pkgdir"/usr/bin/ld.gold ]; then
-		amove usr/bin/ld.gold
-	fi
-	amove usr/$CTARGET/bin/ld.gold
-}
-
-sha512sums="
-a37e042523bc46494d99d5637c3f3d8f9956d9477b748b3b1f6d7dfbb8d968ed52c932e88a4e946c6f77b8f48f1e1b360ca54c3d298f17193f3b4963472f6925  binutils-2.40.tar.xz
-ecee33b0e435aa704af1c334e560f201638ff79e199aa11ed78a72f7c9b46f85fbb227af5748e735fd681d1965fcc42ac81b0c8824e540430ce0c706c81e8b49  binutils-ld-fix-static-linking.patch
-70ec22bd72ef6dddecfd970613387dd4a8cdc8730dd3cbf03d5a0c3a7c4d839383167bb06dad21bf7c235329fd44b5dc4aefe762f68544f17155cf002bf1be4a  0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
-"
@@ -1,46 +0,0 @@
-This fixes static linking for our hardened toolchain
-diff --git a/ld/scripttempl/elf.sc b/ld/scripttempl/elf.sc
-index e8126cb..9532bfb 100644
--- a/ld/scripttempl/elf.sc
-+++ b/ld/scripttempl/elf.sc
-@@ -235,8 +235,8 @@ test "${LARGE_SECTIONS}" = "yes" && LARGE_SECTIONS="
- if test "${ENABLE_INITFINI_ARRAY}" = "yes"; then
-   SORT_INIT_ARRAY="KEEP (*(SORT_BY_INIT_PRIORITY(.init_array.*) SORT_BY_INIT_PRIORITY(.ctors.*)))"
-   SORT_FINI_ARRAY="KEEP (*(SORT_BY_INIT_PRIORITY(.fini_array.*) SORT_BY_INIT_PRIORITY(.dtors.*)))"
-  CTORS_IN_INIT_ARRAY="EXCLUDE_FILE (*crtbegin.o *crtbegin?.o *crtend.o *crtend?.o $OTHER_EXCLUDE_FILES) .ctors"
-  DTORS_IN_FINI_ARRAY="EXCLUDE_FILE (*crtbegin.o *crtbegin?.o *crtend.o *crtend?.o $OTHER_EXCLUDE_FILES) .dtors"
-+  CTORS_IN_INIT_ARRAY="EXCLUDE_FILE (*crtbegin*.o *crtend*.o $OTHER_EXCLUDE_FILES) .ctors"
-+  DTORS_IN_FINI_ARRAY="EXCLUDE_FILE (*crtbegin*.o *crtend*.o $OTHER_EXCLUDE_FILES) .dtors"
- else
-   SORT_INIT_ARRAY="KEEP (*(SORT(.init_array.*)))"
-   SORT_FINI_ARRAY="KEEP (*(SORT(.fini_array.*)))"
-@@ -270,15 +270,14 @@ CTOR=".ctors        ${CONSTRUCTING-0} :
-        doesn't matter which directory crtbegin.o
-        is in.  */
- 
-    KEEP (*crtbegin.o(.ctors))
-    KEEP (*crtbegin?.o(.ctors))
-+    KEEP (*crtbegin*.o(.ctors))
- 
-     /* We don't want to include the .ctor section from
-        the crtend.o file until after the sorted ctors.
-        The .ctor section from the crtend file contains the
-        end of ctors marker and it must be last */
- 
-    KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o $OTHER_EXCLUDE_FILES) .ctors))
-+    KEEP (*(EXCLUDE_FILE (*crtend*.o $OTHER_EXCLUDE_FILES) .ctors))
-     KEEP (*(SORT(.ctors.*)))
-     KEEP (*(.ctors))
-     ${CONSTRUCTING+${CTOR_END}}
-@@ -286,9 +285,8 @@ CTOR=".ctors        ${CONSTRUCTING-0} :
- DTOR=".dtors        ${CONSTRUCTING-0} :
-   {
-     ${CONSTRUCTING+${DTOR_START}}
-    KEEP (*crtbegin.o(.dtors))
-    KEEP (*crtbegin?.o(.dtors))
-    KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o $OTHER_EXCLUDE_FILES) .dtors))
-+    KEEP (*crtbegin*.o(.dtors))
-+    KEEP (*(EXCLUDE_FILE (*crtend*.o $OTHER_EXCLUDE_FILES) .dtors))
-     KEEP (*(SORT(.dtors.*)))
-     KEEP (*(.dtors))
-     ${CONSTRUCTING+${DTOR_END}}
@@ -1,55 +0,0 @@
-From bbf05b742fde518fb97c789b043fe0d3aaf549f0 Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Tue, 21 Sep 2021 14:53:13 +0000
-Subject: [PATCH] Revert "PR25882, .gnu.attributes are not checked for shared
- libraries"
-
-This revert is needed to avoid wrongly tagging objects with the incompatible
-IBM long double ABI, which is not supported by musl and will result in
-linking errors if used.
-
-This reverts commit a8acd6eeb6dc2cc5460ece90f90ebe36b56b20ba.
---
- bfd/elf32-tic6x.c |  3 ---
- ld/ldlang.c       | 10 ++++------
- 2 files changed, 4 insertions(+), 9 deletions(-)
-
-diff --git a/bfd/elf32-tic6x.c b/bfd/elf32-tic6x.c
-index 5754f3cb860..3ad1d612749 100644
--- a/bfd/elf32-tic6x.c
-+++ b/bfd/elf32-tic6x.c
-@@ -3735,9 +3735,6 @@ elf32_tic6x_merge_attributes (bfd *ibfd, struct bfd_link_info *info)
- 
- 	case Tag_ABI_PIC:
- 	case Tag_ABI_PID:
-	  /* Don't transfer these tags from dynamic objects.  */
-	  if ((ibfd->flags & DYNAMIC) != 0)
-	    continue;
- 	  if (out_attr[i].i > in_attr[i].i)
- 	    out_attr[i].i = in_attr[i].i;
- 	  break;
-diff --git a/ld/ldlang.c b/ld/ldlang.c
-index 37b64c89ee1..f13beaef9d9 100644
--- a/ld/ldlang.c
-+++ b/ld/ldlang.c
-@@ -7071,13 +7071,11 @@ lang_check (void)
- 		   bfd_printable_name (input_bfd), input_bfd,
- 		   bfd_printable_name (link_info.output_bfd));
- 	}
-
-      /* If the input bfd has no contents, it shouldn't set the
-	 private data of the output bfd.  */
-      else if (!file->flags.just_syms
-	       && ((input_bfd->flags & DYNAMIC) != 0
-		   || bfd_count_sections (input_bfd) != 0))
-+      else if (bfd_count_sections (input_bfd))
- 	{
-+	  /* If the input bfd has no contents, it shouldn't set the
-+	     private data of the output bfd.  */
-+
- 	  bfd_error_handler_type pfn = NULL;
- 
- 	  /* If we aren't supposed to warn about mismatched input
-- 
-2.33.0
-
@@ -1,144 +0,0 @@
-# Automatically generated aport, do not edit!
-# Generator: pmbootstrap aportgen binutils-riscv64
-# Based on: main/binutils
-
-
-CTARGET_ARCH=riscv64
-CTARGET="$(arch_to_hostspec $CTARGET_ARCH)"
-
-pkgname=binutils-riscv64
-pkgver=2.40
-pkgrel=8
-pkgdesc="Tools necessary to build programs for riscv64 targets"
-url="https://www.gnu.org/software/binutils/"
-makedepends_build="bison flex texinfo"
-makedepends_host="zlib-dev jansson-dev zstd-dev"
-makedepends="$makedepends_build $makedepends_host"
-arch="x86_64"
-license="GPL-2.0-or-later AND LGPL-2.1-or-later AND BSD-3-Clause"
-subpackages="binutils-dev binutils-doc"
-source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz
-	binutils-ld-fix-static-linking.patch
-	0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
-	"
-builddir="$srcdir/binutils-$pkgver"
-
-if [ -z "$BOOTSTRAP" ]; then
-	makedepends_host="$makedepends_host jansson-dev zstd-dev"
-fi
-
-if [ "$CHOST" = "$CBUILD" ] && [ "$CBUILD" = "$CTARGET" ] && [ "$CTARGET_ARCH" != "riscv64" ]; then
-	subpackages="$subpackages binutils-gold"
-fi
-
-if [ "$CHOST" != "$CTARGET" ]; then
-	pkgname="binutils-$CTARGET_ARCH"
-	subpackages=""
-	sonameprefix="binutils:"
-fi
-
-# secfixes:
-#   2.40-r0:
-#     - CVE-2023-1579
-#   2.39-r2:
-#     - CVE-2022-38533
-#   2.39-r0:
-#     - CVE-2022-38126
-#   2.35.2-r1:
-#     - CVE-2021-3487
-#   2.32-r0:
-#     - CVE-2018-19931
-#     - CVE-2018-19932
-#     - CVE-2018-20002
-#     - CVE-2018-20712
-#   2.28-r1:
-#     - CVE-2017-7614
-
-build() {
-	local _sysroot=/
-	local _cross_configure="--enable-install-libiberty --enable-shared"
-	local _arch_configure=""
-	local _gold_configure="--disable-gold"
-	local _plugin_configure="--enable-plugins"
-
-	if [ "$CHOST" != "$CTARGET" ]; then
-		_sysroot="$CBUILDROOT"
-		_cross_configure="--disable-install-libiberty"
-		_plugin_configure="--disable-plugins"
-	fi
-
-	if [ "$CHOST" = "$CBUILD" ] && [ "$CBUILD" = "$CTARGET" ] && [ "$CTARGET_ARCH" != "riscv64" ]; then
-		_gold_configure="--enable-gold"
-	fi
-
-	if [ "$CTARGET_ARCH" = "x86_64" ]; then
-		_arch_configure="--enable-targets=x86_64-pep"
-	fi
-
-	if [ "$CTARGET_ARCH" = "riscv64" ]; then
-		_gold_configure="--disable-gold"
-	fi
-
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--target=$CTARGET \
-		--with-build-sysroot="$CBUILDROOT" \
-		--with-sysroot=$_sysroot \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--sysconfdir=/etc \
-		$_arch_configure \
-		$_cross_configure \
-		$_gold_configure \
-		$_plugin_configure \
-		--disable-gprofng \
-		--disable-multilib \
-		--disable-nls \
-		--disable-werror \
-		--enable-64-bit-bfd \
-		--enable-colored-disassembly \
-		--enable-default-execstack=no \
-		--enable-default-hash-style=gnu \
-		--enable-deterministic-archives \
-		--enable-ld=default \
-		--enable-new-dtags \
-		--enable-relro \
-		--enable-threads \
-		--with-bugurl="https://postmarketos.org/issues" \
-		--with-mmap \
-		--with-pic \
-		--with-system-zlib
-	make
-}
-
-package() {
-	make install DESTDIR="$pkgdir"
-	if [ -d "$pkgdir"/usr/lib64 ]; then
-		mv "$pkgdir"/usr/lib64/* "$pkgdir"/usr/lib/
-		rmdir "$pkgdir"/usr/lib64
-	fi
-	if [ "$CHOST" != "$CTARGET" ]; then
-		# creating cross tools: remove any files that would conflict
-		# with the native tools, or other cross tools
-		rm -r "${pkgdir:?}"/usr/share
-		rm -f "$pkgdir"/usr/lib/libiberty.a
-		rm -r "${pkgdir:?}"/usr/lib/bfd-plugins
-	fi
-}
-
-gold() {
-	pkgdesc="GNU binutils - gold linker"
-
-	if [ -e "$pkgdir"/usr/bin/ld.gold ]; then
-		amove usr/bin/ld.gold
-	fi
-	amove usr/$CTARGET/bin/ld.gold
-}
-
-sha512sums="
-a37e042523bc46494d99d5637c3f3d8f9956d9477b748b3b1f6d7dfbb8d968ed52c932e88a4e946c6f77b8f48f1e1b360ca54c3d298f17193f3b4963472f6925  binutils-2.40.tar.xz
-ecee33b0e435aa704af1c334e560f201638ff79e199aa11ed78a72f7c9b46f85fbb227af5748e735fd681d1965fcc42ac81b0c8824e540430ce0c706c81e8b49  binutils-ld-fix-static-linking.patch
-70ec22bd72ef6dddecfd970613387dd4a8cdc8730dd3cbf03d5a0c3a7c4d839383167bb06dad21bf7c235329fd44b5dc4aefe762f68544f17155cf002bf1be4a  0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
-"
@@ -1,46 +0,0 @@
-This fixes static linking for our hardened toolchain
-diff --git a/ld/scripttempl/elf.sc b/ld/scripttempl/elf.sc
-index e8126cb..9532bfb 100644
--- a/ld/scripttempl/elf.sc
-+++ b/ld/scripttempl/elf.sc
-@@ -235,8 +235,8 @@ test "${LARGE_SECTIONS}" = "yes" && LARGE_SECTIONS="
- if test "${ENABLE_INITFINI_ARRAY}" = "yes"; then
-   SORT_INIT_ARRAY="KEEP (*(SORT_BY_INIT_PRIORITY(.init_array.*) SORT_BY_INIT_PRIORITY(.ctors.*)))"
-   SORT_FINI_ARRAY="KEEP (*(SORT_BY_INIT_PRIORITY(.fini_array.*) SORT_BY_INIT_PRIORITY(.dtors.*)))"
-  CTORS_IN_INIT_ARRAY="EXCLUDE_FILE (*crtbegin.o *crtbegin?.o *crtend.o *crtend?.o $OTHER_EXCLUDE_FILES) .ctors"
-  DTORS_IN_FINI_ARRAY="EXCLUDE_FILE (*crtbegin.o *crtbegin?.o *crtend.o *crtend?.o $OTHER_EXCLUDE_FILES) .dtors"
-+  CTORS_IN_INIT_ARRAY="EXCLUDE_FILE (*crtbegin*.o *crtend*.o $OTHER_EXCLUDE_FILES) .ctors"
-+  DTORS_IN_FINI_ARRAY="EXCLUDE_FILE (*crtbegin*.o *crtend*.o $OTHER_EXCLUDE_FILES) .dtors"
- else
-   SORT_INIT_ARRAY="KEEP (*(SORT(.init_array.*)))"
-   SORT_FINI_ARRAY="KEEP (*(SORT(.fini_array.*)))"
-@@ -270,15 +270,14 @@ CTOR=".ctors        ${CONSTRUCTING-0} :
-        doesn't matter which directory crtbegin.o
-        is in.  */
- 
-    KEEP (*crtbegin.o(.ctors))
-    KEEP (*crtbegin?.o(.ctors))
-+    KEEP (*crtbegin*.o(.ctors))
- 
-     /* We don't want to include the .ctor section from
-        the crtend.o file until after the sorted ctors.
-        The .ctor section from the crtend file contains the
-        end of ctors marker and it must be last */
- 
-    KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o $OTHER_EXCLUDE_FILES) .ctors))
-+    KEEP (*(EXCLUDE_FILE (*crtend*.o $OTHER_EXCLUDE_FILES) .ctors))
-     KEEP (*(SORT(.ctors.*)))
-     KEEP (*(.ctors))
-     ${CONSTRUCTING+${CTOR_END}}
-@@ -286,9 +285,8 @@ CTOR=".ctors        ${CONSTRUCTING-0} :
- DTOR=".dtors        ${CONSTRUCTING-0} :
-   {
-     ${CONSTRUCTING+${DTOR_START}}
-    KEEP (*crtbegin.o(.dtors))
-    KEEP (*crtbegin?.o(.dtors))
-    KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o $OTHER_EXCLUDE_FILES) .dtors))
-+    KEEP (*crtbegin*.o(.dtors))
-+    KEEP (*(EXCLUDE_FILE (*crtend*.o $OTHER_EXCLUDE_FILES) .dtors))
-     KEEP (*(SORT(.dtors.*)))
-     KEEP (*(.dtors))
-     ${CONSTRUCTING+${DTOR_END}}
@@ -7,8 +7,8 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi

 pkgname=busybox-static-aarch64
-pkgver=1.36.0
-pkgrel=11
+pkgver=1.36.1
+pkgrel=4

 _arch="aarch64"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }

 sha512sums="
-db059ff027eb3093889b7aae4b2769ad27a7bd3281395fbeec87daf35407b95fdec338da938fcb4189a7b39448235fe29cab541edb9a763bc6b3a3d6909a33e8  busybox-static-1.36.0-r11-aarch64-edge.apk
+c0ea71bcec70e35de3dcb919c22c02afe7e35b3168845209e93bcd15ff380d62dc807848e36e1e5fef22c16adbbdfc1dc3a3559015d0c4a3b2978e0e303d4413  busybox-static-1.36.1-r4-aarch64-edge.apk
 "
@@ -7,8 +7,8 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi

 pkgname=busybox-static-armhf
-pkgver=1.36.0
-pkgrel=11
+pkgver=1.36.1
+pkgrel=4

 _arch="armhf"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }

 sha512sums="
-e1d5cfa54e00317555a4f4f132a654b31d9770241ebfea87a9a6ab390424da6c0619fcdfb8fce10f71063e9ca43eafed7b4b9ea456cb17f05d50a5a44eaf0042  busybox-static-1.36.0-r11-armhf-edge.apk
+701ee52541aee37a075563c430b891860afd205e4446379a4686b3eac57ce8443c1203b06fb90f146c88064e00d99101c86d0d8b3a91377e465d46958c942366  busybox-static-1.36.1-r4-armhf-edge.apk
 "
@@ -7,8 +7,8 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi

 pkgname=busybox-static-armv7
-pkgver=1.36.0
-pkgrel=11
+pkgver=1.36.1
+pkgrel=4

 _arch="armv7"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }

 sha512sums="
-e2199f8039ecc94b99bfbac0d613d38abd43d758bcb90b34ef3a9a9e44ee549ec86fcebfd920b77c08f47057af38f3e9b52acb5a5bc1d84047c8d5a55b1a6407  busybox-static-1.36.0-r11-armv7-edge.apk
+e01fdc7edfe06b9b8c30acb0df90f026c49982d378724c8afd4e545f5ab7e9d317a9fd8e1e7ae06d3f89e3ddf5e572ad3f7d2d033225f195d5bc7530e6e4bcd2  busybox-static-1.36.1-r4-armv7-edge.apk
 "
@@ -16,14 +16,14 @@
 # version is implemented as simple shell wrappers.

 pkgname=crossdirect
-pkgver=4
-pkgrel=3
+pkgver=5
+pkgrel=0
 pkgdesc="Wrappers to launch native cross compilers in foreign chroots"
 url="https://postmarketOS.org"
 arch="all"
 license="MIT"
 options="!check"
-source="crossdirect.c rustc.sh rust-qemu-linker.sh"
+source="cargo.sh crossdirect.c rustc.sh rust-qemu-linker.sh"

 build() {
 	cd "$srcdir"
@@ -40,9 +40,6 @@ build() {
 			-Werror \
 			-DHOSTSPEC="\"$_hostspec\"" \
 			crossdirect.c
-
-		# rustc
-		sed "s/@ARCH@/$_arch/g" rustc.sh >rustc-"$_arch"
 	done
 }

@@ -51,9 +48,11 @@ package() {
 	_archs="x86_64 armhf armv7 aarch64"
 	_bins="c++ cc cpp g++ gcc clang clang++"

-	# Rust: qemu-linker
+	# Rust wrappers
 	install -Dm755 "$srcdir/rust-qemu-linker.sh" \
 		"$pkgdir/usr/lib/crossdirect/rust-qemu-linker"
+	install -Dm755 "$srcdir/cargo.sh" "$pkgdir/usr/lib/crossdirect/cargo.sh"
+	install -Dm755 "$srcdir/rustc.sh" "$pkgdir/usr/lib/crossdirect/rustc.sh"

 	# Iterate over architectures
 	for _arch in $_archs; do
@@ -73,10 +72,13 @@ package() {
 			ln -s "crossdirect-$_arch" "$_hostspec-$_bin"
 		done

-		# Rust: arch-specific rustc wrapper
-		install -Dm755 "$srcdir/rustc-$_arch" "$_bindir/rustc"
+		ln -s ../cargo.sh cargo
+		ln -s ../rustc.sh rustc
 	done
 }
-sha512sums="500107e5aff8b34e74b54982ebcd447fc41bc8283956d506561b031a055cb30ec12698047c2604918b4b6d8560fe03db427a63dff2b83c907e8494b7f5233f29  crossdirect.c
-6be16ba88720e628a3ecc8fa53f8e7a21d2af268b0509745d989139874d6b94b640bfcff09575eaa19073810be6ef91169c1f83e94f5cf8e6819f2670d9408de  rustc.sh
-ea9bf8db3810d03d0a7395057f3d6e57f7127d87c55deaedc171c255288f5f3cc6fbcc680a5a1b92786cf573875d5dc22521173799fe2639acc97d0715ff905b  rust-qemu-linker.sh"
+sha512sums="
+0f4b48f250425dc57f63955fc8b38477d23db793bee367c3fbe03c3d2a559ba576434d07518310db4cae9d90d501af4051b80038b10fae94b980e537fc9374ad  cargo.sh
+500107e5aff8b34e74b54982ebcd447fc41bc8283956d506561b031a055cb30ec12698047c2604918b4b6d8560fe03db427a63dff2b83c907e8494b7f5233f29  crossdirect.c
+2c41410a9ef2dab31403545e55e2464f2ee4e7056ffbcd3bc5810d582311801496b88d55307f17ce6acf766e9c867d30d05f2b0d8d46bf77a5e8f0495d6bc24e  rustc.sh
+ea9bf8db3810d03d0a7395057f3d6e57f7127d87c55deaedc171c255288f5f3cc6fbcc680a5a1b92786cf573875d5dc22521173799fe2639acc97d0715ff905b  rust-qemu-linker.sh
+"
@@ -0,0 +1,66 @@
+#!/bin/sh -e
+
+if [ -n "$CROSSDIRECT_DEBUG" ]; then
+	set -x
+fi
+
+native_version=$(LD_LIBRARY_PATH=/native/lib:/native/usr/lib /native/usr/bin/rustc -V)
+target_version=$(/usr/bin/rustc -V)
+
+if [ "$target_version" != "$native_version" ]; then
+	echo "ERROR: crossdirect: rustc version mismatch between native and build chroot. Please update your chroots and try again." >&2
+	exit 1
+fi
+
+triplet=$(/usr/bin/rustc -vV | sed -n 's/host: //p')
+cmd=$1
+shift
+
+case "$cmd" in
+	build|test|run)
+		;;
+	*)
+		echo "WARNING: crossdirect: 'cargo $cmd $*' command not supported, running in QEMU (slow!)" >&2
+		export PATH="$(echo "$PATH" | sed 's,/native/usr/lib/crossdirect/[^:]*:,,')"
+		exec /usr/bin/cargo "$cmd" "$@"
+		;;
+esac
+
+target_dir=${CARGO_TARGET_DIR:-target}
+target_already_specified=${CARGO_BUILD_TARGET:+1}
+
+if [ -z "$target_specified" ]; then
+	for arg in "$@"; do
+		if [ "$arg_target_dir" = 1 ]; then
+			target_dir=$arg
+			arg_target_dir=0
+		fi
+		case "$arg" in
+			--target|--target=*)
+				target_already_specified=1
+				break
+				;;
+			--target-dir)
+				arg_target_dir=1
+				;;
+			--target-dir=*)
+				target_dir=${arg##--target-dir=}
+				;;
+		esac
+	done
+fi
+
+if [ -n "$target_already_specified" ]; then
+	exec /usr/bin/cargo "$cmd" "$@"
+fi
+
+/usr/bin/cargo "$cmd" --target=$triplet "$@"
+
+# copy target/$triplet/{release,debug,...} to target/{release,debug,...}
+if [ -d "$target_dir/$triplet" ]; then
+	for dir in "$target_dir/$triplet"/*/; do
+		build=$(basename "$dir")
+		rm -rf "$target_dir/$build"
+		cp -r "$target_dir/$triplet/$build" "$target_dir/$build"
+	done
+fi
@@ -1,48 +1,26 @@
 #!/bin/sh -e

-rust_triplet() {
-	# Find the triplets in Alpine's rust APKBUILD or with:
-	# pmbootstrap chroot -barmhf --add=rust -- ls /usr/lib/rustlib
-	case "$1" in
-		x86_64)
-			echo "x86_64-alpine-linux-musl"
-			;;
-		armhf)
-			echo "armv6-alpine-linux-musleabihf"
-			;;
-		armv7)
-			echo "armv7-alpine-linux-musleabihf"
-			;;
-		aarch64)
-			echo "aarch64-alpine-linux-musl"
-			;;
-		*)
-			echo "ERROR: don't know the rust triple for $1!" >&2
-			exit 1
-			;;
-	esac
-}
+if [ -n "$CROSSDIRECT_DEBUG" ]; then
+	set -x
+fi

-arch="@ARCH@" # filled in by APKBUILD
+# return the correct host architecture when cargo requests it
+if [ "$*" = "-vV" ]; then
+	exec /usr/bin/rustc -vV
+fi

-if ! LD_LIBRARY_PATH=/native/lib:/native/usr/lib \
-	/native/usr/bin/rustc \
+# We expect the right target to be set in the arguments if compiling for the
+# target architecture. Our cargo wrapper passes the right "--target" argument
+# automatically. If no target is provided, this is probably a macro or a
+# build script, so it should be compiled for the native architecture.
+if echo "$*" | grep -qFe "--target"; then
+	LD_LIBRARY_PATH=/native/lib:/native/usr/lib /native/usr/bin/rustc \
 		-Clinker=/native/usr/lib/crossdirect/rust-qemu-linker \
-		--target=$(rust_triplet "$arch") \
 		--sysroot=/usr \
-		"$@"; then
-	echo "---" >&2
-	echo "WARNING: crossdirect: cross compiling with rustc failed, trying"\
-		"again with rustc + qemu" >&2
-	echo "---" >&2
-	# Usually the crossdirect approach works; however, when passing
-	# --extern to rustc with a dynamic library (.so), it fails with an
-	# error like 'can't find crate for `serde_derive`' (although the crate
-	# does exist). I think it fails to parse the metadata of the so file
-	# for some reason. We probably need to adjust rustc's
-	# librustc_metadata/locator.rs or something (and upstream that
-	# change!), but I've spent enough time on this already. Let's simply
-	# fall back to compiling in qemu in the very few cases where this is
-	# necessary.
-	/usr/bin/rustc "$@"
+		"$@"
+else
+	PATH=/native/usr/bin:/native/bin LD_LIBRARY_PATH=/native/lib:/native/usr/lib \
+		/native/usr/bin/rustc \
+		-Clink-arg=-Wl,-rpath,/native/lib:/native/usr/lib \
+		"$@"
 fi
@@ -1,7 +1,7 @@
-From 5238749680d22a42e90dc3832ef1ad1c9a5f1c20 Mon Sep 17 00:00:00 2001
+From 47b4bd4deb2c356bb07d2a96f22127aefafec3a4 Mon Sep 17 00:00:00 2001
 From: Szabolcs Nagy <nsz@port70.net>
 Date: Fri, 26 Jan 2018 20:32:50 +0000
-Subject: [PATCH 01/32] posix_memalign
+Subject: [PATCH 01/35] posix_memalign

 ---
 gcc/config/i386/pmm_malloc.h | 9 +++++----
@@ -38,5 +38,5 @@ index 3527283693b..c4071b64b53 100644
   else
     return NULL;
 -- 
-2.40.1
+2.41.0

@@ -1,7 +1,7 @@
-From dc71cb9815d25a57430ef5d8e2a87312d8c3b467 Mon Sep 17 00:00:00 2001
+From 4fa620d8c3e6730211bfb071eb4c817320491bd0 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 02/32] gcc: poison-system-directories
+Subject: [PATCH 02/35] gcc: poison-system-directories

 Add /sw/include and /opt/include based on the original
 zecke-no-host-includes.patch patch.  The original patch checked for
@@ -120,7 +120,7 @@ index 09082e8ccae..5504bf6eb01 100644
 AC_SUBST(subdirs)
 AC_SUBST(srcdir)
 diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index c0c3ad14515..7cdd5bfa952 100644
+index af0e5933fdb..b6731a4673c 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
@@ -384,6 +384,7 @@ Objective-C and Objective-C++ Dialects}.
@@ -131,7 +131,7 @@ index c0c3ad14515..7cdd5bfa952 100644
 -Wno-pragmas  -Wno-prio-ctor-dtor  -Wredundant-decls
 -Wrestrict  -Wno-return-local-addr  -Wreturn-type
 -Wno-scalar-storage-order  -Wsequence-point
-@@ -8424,6 +8425,14 @@ made up of data only and thus requires no special treatment.  But, for
+@@ -8426,6 +8427,14 @@ made up of data only and thus requires no special treatment.  But, for
 most targets, it is made up of code and thus requires the stack to be
 made executable in order for the program to work properly.
 
@@ -199,5 +199,5 @@ index 4d44321183f..0f3f071b44c 100644
 
 /* Use given -I paths for #include "..." but not #include <...>, and
 -- 
-2.40.1
+2.41.0

@@ -1,7 +1,7 @@
-From 95cd372c839d347b41e22605d569cca6a2119b85 Mon Sep 17 00:00:00 2001
+From ff4dd4ce33133e675b7bedc86b73357c04631cb9 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:45:49 +0000
-Subject: [PATCH 03/32] specs: turn on -Wl,-z,now by default
+Subject: [PATCH 03/35] 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.
@@ -14,10 +14,10 @@ now by default.
 2 files changed, 4 insertions(+)

 diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index 7cdd5bfa952..158b7bcb81e 100644
+index b6731a4673c..f393c7846c6 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
-@@ -17959,6 +17959,9 @@ For example, @option{-Wl,-Map,output.map} passes @option{-Map output.map} to the
+@@ -17961,6 +17961,9 @@ For example, @option{-Wl,-Map,output.map} passes @option{-Map output.map} to the
 linker.  When using the GNU linker, you can also get the same effect with
 @option{-Wl,-Map=output.map}.
 
@@ -40,5 +40,5 @@ index 33b56e721d2..f82fae23c22 100644
     %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!r:%{!nostartfiles:%S}}} \
     %{Wno-poison-system-directories:--no-poison-system-directories} \
 -- 
-2.40.1
+2.41.0

@@ -1,7 +1,7 @@
-From 12b0a32aa19334c1b5dd20c9cc3b0ca885e973ce Mon Sep 17 00:00:00 2001
+From 1b315235433701e4a974da259b8d651169ddc7ac Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:46:22 +0000
-Subject: [PATCH 04/32] Turn on -D_FORTIFY_SOURCE=2 by default for C, C++,
+Subject: [PATCH 04/35] Turn on -D_FORTIFY_SOURCE=2 by default for C, C++,
 ObjC, ObjC++, if the optimization level is > 0

 ---
@@ -25,10 +25,10 @@ index 5d64625fcd7..868d69506e4 100644
   if (flag_gnu89_inline)
     cpp_define (pfile, "__GNUC_GNU_INLINE__");
 diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index 158b7bcb81e..cc9972f907b 100644
+index f393c7846c6..ef3c14a189e 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
-@@ -11866,6 +11866,12 @@ also turns on the following optimization flags:
+@@ -11868,6 +11868,12 @@ also turns on the following optimization flags:
 Please note the warning under @option{-fgcse} about
 invoking @option{-O2} on programs that use computed gotos.
 
@@ -42,5 +42,5 @@ index 158b7bcb81e..cc9972f907b 100644
 @item -O3
 Optimize yet more.  @option{-O3} turns on all optimizations specified
 -- 
-2.40.1
+2.41.0

@@ -1,7 +1,7 @@
-From 8693307d930c085828c921023219d4c1459a32e9 Mon Sep 17 00:00:00 2001
+From 67c0f5789630b27149f60ff831999ef7c1dba5d5 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:46:56 +0000
-Subject: [PATCH 05/32] On linux targets pass --as-needed by default to the
+Subject: [PATCH 05/35] On linux targets pass --as-needed by default to the
 linker, but always link the sanitizer libraries with --no-as-needed.

 ---
@@ -137,7 +137,7 @@ index a4e5380b589..3cc61bce69f 100644
     %{!static: \
       %{rdynamic:-export-dynamic} \
 diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h
-index 2fdfd930cf2..16503482ec2 100644
+index 3e625e0f867..f8c2c351e5a 100644
 --- a/gcc/config/riscv/linux.h
 +++ b/gcc/config/riscv/linux.h
@@ -48,6 +48,7 @@ along with GCC; see the file COPYING3.  If not see
@@ -268,5 +268,5 @@ index f82fae23c22..da6417dd0d1 100644
 #else
 #define LIBUBSAN_SPEC "-lubsan" STATIC_LIBUBSAN_LIBS
 -- 
-2.40.1
+2.41.0

@@ -1,7 +1,7 @@
-From ec4e37d755110ffb5a4bdba54db89ea06ff3926a Mon Sep 17 00:00:00 2001
+From bb25e8489384504cd59e4a2538720863da1fb29c Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:47:43 +0000
-Subject: [PATCH 06/32] Enable -Wformat and -Wformat-security by default.
+Subject: [PATCH 06/35] Enable -Wformat and -Wformat-security by default.

 ---
 gcc/c-family/c.opt | 4 ++--
@@ -30,5 +30,5 @@ index a75038930ae..b98726f33ed 100644
 
 Wformat-overflow=
 -- 
-2.40.1
+2.41.0

@@ -1,7 +1,7 @@
-From fdc4c95806cb57e98785c991c6ae9d9f2183a914 Mon Sep 17 00:00:00 2001
+From 4a728ad48a7b437cc6f2697e26603bf648149f86 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:48:24 +0000
-Subject: [PATCH 07/32] Enable -Wtrampolines by default.
+Subject: [PATCH 07/35] Enable -Wtrampolines by default.

 ---
 gcc/common.opt | 2 +-
@@ -21,5 +21,5 @@ index 64c4277c991..c24839d32bc 100644
 
 Wtrivial-auto-var-init
 -- 
-2.40.1
+2.41.0

@@ -1,7 +1,7 @@
-From 547ed1d35f0fa8c04cefb8708c4a148f86ed3397 Mon Sep 17 00:00:00 2001
+From 32f24560d0602f7735d5e9efd92fe3151bd72cea Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:49:40 +0000
-Subject: [PATCH 08/32] Disable ssp on -nostdlib, -nodefaultlibs and
+Subject: [PATCH 08/35] Disable ssp on -nostdlib, -nodefaultlibs and
 -ffreestanding Change the buffer size.

 ---
@@ -49,5 +49,5 @@ index 823cdb2ff85..5b096899b40 100644
 
 -param=stack-clash-protection-guard-size=
 -- 
-2.40.1
+2.41.0

@@ -1,7 +1,7 @@
-From ee2e986e85a0400402f006ec2ddf2435cac621ba Mon Sep 17 00:00:00 2001
+From c7ec8da7280d7f97f5543eb9ddeca7600aafc43c Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:50:33 +0000
-Subject: [PATCH 09/32] Ensure that msgfmt doesn't encounter problems during
+Subject: [PATCH 09/35] Ensure that msgfmt doesn't encounter problems during
 gcc bootstrapping.

 Solves error messages like the following:
@@ -50,5 +50,5 @@ index 8e93445acd2..d6ff06e5ddb 100644
 
 all-local: all-local-$(USE_NLS)
 -- 
-2.40.1
+2.41.0

@@ -1,7 +1,7 @@
-From 2ed284234b08b5018fb542c784e6b8757b1e4967 Mon Sep 17 00:00:00 2001
+From aaa029bcee68298695b7c4278c90b6bc320d098c Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:52:07 +0000
-Subject: [PATCH 10/32] Don't declare asprintf if defined as a macro.
+Subject: [PATCH 10/35] Don't declare asprintf if defined as a macro.

 ---
 include/libiberty.h | 3 +++
@@ -24,5 +24,5 @@ index 1d5c779fcff..19e3cb1e31c 100644
 /* Like asprintf but allocates memory without fail. This works like
    xmalloc.  */
 -- 
-2.40.1
+2.41.0

@@ -1,7 +1,7 @@
-From 52544d0abdcf63f33446f880fcaae1d0aa589a81 Mon Sep 17 00:00:00 2001
+From 65e01e749205c9af218b01233cebd0077538d0ee Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:53:00 +0000
-Subject: [PATCH 11/32] libiberty: copy PIC objects during build process
+Subject: [PATCH 11/35] libiberty: copy PIC objects during build process

 ---
 libiberty/Makefile.in | 1 +
@@ -20,5 +20,5 @@ index 72608f3e4a7..58356884728 100644
 	else true; fi
 
 -- 
-2.40.1
+2.41.0

@@ -1,7 +1,7 @@
-From eff4677a5511567ab3d550a5989ee0805fc3e1a7 Mon Sep 17 00:00:00 2001
+From 453a815bf2844971a91eaef800af188d9e86b784 Mon Sep 17 00:00:00 2001
 From: Szabolcs Nagy <nsz@port70.net>
 Date: Sat, 24 Oct 2015 20:09:53 +0000
-Subject: [PATCH 12/32] libgcc_s
+Subject: [PATCH 12/35] libgcc_s

 ---
 gcc/config/i386/i386-expand.cc | 4 ++--
@@ -53,5 +53,5 @@ index 8506a635790..564296f788e 100644
 +HOST_LIBGCC2_CFLAGS += -mlong-double-80 $(CET_FLAGS)
 CRTSTUFF_T_CFLAGS += $(CET_FLAGS)
 -- 
-2.40.1
+2.41.0

@@ -1,7 +1,7 @@
-From 8af4ddcecc9dc43d714798d255a21e12985721b9 Mon Sep 17 00:00:00 2001
+From 7d7d12137c666761a8dd61179c9651b85dae9b41 Mon Sep 17 00:00:00 2001
 From: Szabolcs Nagy <nsz@port70.net>
 Date: Sat, 7 Nov 2015 02:08:05 +0000
-Subject: [PATCH 13/32] nopie
+Subject: [PATCH 13/35] nopie

 ---
 gcc/configure    | 27 +++++++++++++++++++++++++++
@@ -71,5 +71,5 @@ index 5504bf6eb01..57268319de1 100644
 AC_SUBST([NO_PIE_FLAG])
 
 -- 
-2.40.1
+2.41.0

@@ -1,7 +1,7 @@
-From 1330c37f63c0388480cfa369df2b437e9c8cc878 Mon Sep 17 00:00:00 2001
+From dd5bb97c31a9f57034c70a7a18ba6e2e133084c7 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:59:16 +0000
-Subject: [PATCH 14/32] ada: fix shared linking
+Subject: [PATCH 14/35] ada: fix shared linking

 ---
 gcc/ada/link.c | 12 ++++++------
@@ -38,5 +38,5 @@ index f2126441208..22cfa9c641f 100644
 unsigned char __gnat_objlist_file_supported = 1;
 const char *__gnat_object_library_extension = ".a";
 -- 
-2.40.1
+2.41.0

@@ -1,7 +1,7 @@
-From ceb43810c502b238cb487af6e84b1c80f2105f1a Mon Sep 17 00:00:00 2001
+From 6bb5b7d9161d05f31b001d8211a9c63caf63fd2f Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:59:43 +0000
-Subject: [PATCH 15/32] build: fix CXXFLAGS_FOR_BUILD passing
+Subject: [PATCH 15/35] build: fix CXXFLAGS_FOR_BUILD passing

 ---
 Makefile.in | 1 +
@@ -20,5 +20,5 @@ index 06a9398e172..6ff2b3f9925 100644
 
 # This is the list of directories to built for the host system.
 -- 
-2.40.1
+2.41.0

@@ -1,7 +1,7 @@
-From ebc8167db85bc37a59f02fec6904829652989564 Mon Sep 17 00:00:00 2001
+From f0d9e00cac06689f64b214de7aee80d7116ef084 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 07:01:06 +0000
-Subject: [PATCH 16/32] add fortify-headers paths
+Subject: [PATCH 16/35] add fortify-headers paths

 ---
 gcc/config/linux.h | 2 ++
@@ -21,5 +21,5 @@ index e3aca79cccc..b3537b8fbeb 100644
     { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 0 },
 #else
 -- 
-2.40.1
+2.41.0

@@ -1,7 +1,7 @@
-From 86a566d0ed9da32b5f3a6ac48999ebbac6dce4a5 Mon Sep 17 00:00:00 2001
+From 857db04f4f1a06e866551b4172fe8f27363f4a92 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 17/32] Alpine musl package provides libssp_nonshared.a. We
+Subject: [PATCH 17/35] Alpine musl package provides libssp_nonshared.a. We
 link to it unconditionally, as otherwise we get link failures if some objects
 are -fstack-protector built and final link happens with -fno-stack-protector.
 This seems to be the common case when bootstrapping gcc, the piepatches do
@@ -27,5 +27,5 @@ index b5a6f200635..6cbb726599b 100644
 #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
 		       "|fstack-protector-strong|fstack-protector-explicit" \
 -- 
-2.40.1
+2.41.0

@@ -1,7 +1,7 @@
-From d113a7974d55a8c5e71f0d72202db3e303245d2b Mon Sep 17 00:00:00 2001
+From 5a8347e23ab13912b6edec2c6c6e3a101b017c79 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 07:03:42 +0000
-Subject: [PATCH 18/32] DP: Use --push-state/--pop-state for gold as well when
+Subject: [PATCH 18/35] DP: Use --push-state/--pop-state for gold as well when
 linking libtsan.

 ---
@@ -65,5 +65,5 @@ index 6cbb726599b..59390fd39d6 100644
 #else
 #define LIBUBSAN_SPEC "-lubsan" STATIC_LIBUBSAN_LIBS
 -- 
-2.40.1
+2.41.0

@@ -1,7 +1,7 @@
-From 3ba91105e2299d591d817164e2c98b905460892d Mon Sep 17 00:00:00 2001
+From 41d00a2eb0754acf71958808bd17dbebeb517b84 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Thu, 6 Jan 2022 03:12:55 +0000
-Subject: [PATCH 19/32] aarch64: disable multilib support
+Subject: [PATCH 19/35] aarch64: disable multilib support

 multilib is unsupported on Alpine GCC
 ---
@@ -22,5 +22,5 @@ index 57bf4100fcd..172894b57ef 100644
 
 MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu_ilp32)
 -- 
-2.40.1
+2.41.0

@@ -1,7 +1,7 @@
-From ac6348347f14ba8274655aa6af27ccfbf89a437f Mon Sep 17 00:00:00 2001
+From 85b42bfbba71616831d14360b16998acb28790fd Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Thu, 6 Jan 2022 03:13:59 +0000
-Subject: [PATCH 20/32] s390x: disable multilib support
+Subject: [PATCH 20/35] s390x: disable multilib support

 multilib is not supported on Alpine GCC at present
 ---
@@ -21,5 +21,5 @@ index cc6ab367072..7f498ee1cdc 100644
 +MULTILIB_OSDIRNAMES = m64=../lib
 +MULTILIB_OSDIRNAMES+= m32=../lib32
 -- 
-2.40.1
+2.41.0

@@ -1,7 +1,7 @@
-From 969630b9b930860077fcc9b08972d18b40518828 Mon Sep 17 00:00:00 2001
+From 7b53df284242638e940c0155b6c21e88cea1f55b Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Thu, 6 Jan 2022 03:14:33 +0000
-Subject: [PATCH 21/32] ppc64[le]: disable multilib support
+Subject: [PATCH 21/35] ppc64[le]: disable multilib support

 multilib is not presently supported on Alpine GCC
 ---
@@ -77,5 +77,5 @@ index 2e63bdb9fc9..c6e1c5db65d 100644
 +MULTILIB_OSDIRNAMES += m32=../lib32
 MULTILIB_MATCHES    := ${MULTILIB_MATCHES_ENDIAN}
 -- 
-2.40.1
+2.41.0

@@ -1,7 +1,7 @@
-From a34c8e7255f71228e4bef4d51fbb791a10013658 Mon Sep 17 00:00:00 2001
+From 96e7e1e9a899d9bb5fcbdf788bd529d0390c626f Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Thu, 6 Jan 2022 03:14:54 +0000
-Subject: [PATCH 22/32] x86_64: disable multilib support
+Subject: [PATCH 22/35] x86_64: disable multilib support

 multilib is not presently supported on Alpine GCC
 ---
@@ -22,5 +22,5 @@ index 138956b0962..bc03dab874f 100644
 +MULTILIB_OSDIRNAMES+= m32=../lib32
 MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32)
 -- 
-2.40.1
+2.41.0

@@ -1,7 +1,7 @@
-From abf619dfadb883809457037a52d5eb77acf25dd5 Mon Sep 17 00:00:00 2001
+From b26224acf342eacb33491f6ea0da1faf73d35715 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 23/32] riscv: disable multilib support
+Subject: [PATCH 23/35] riscv: disable multilib support
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -38,15 +38,15 @@ library.
 [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/linux.h | 8 --------
 gcc/config/riscv/t-linux | 7 +++++--
- 2 files changed, 5 insertions(+), 8 deletions(-)
+ 2 files changed, 5 insertions(+), 10 deletions(-)

 diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h
-index 16503482ec2..8d9881eadeb 100644
+index f8c2c351e5a..8d9881eadeb 100644
 --- a/gcc/config/riscv/linux.h
 +++ b/gcc/config/riscv/linux.h
-@@ -61,9 +61,3 @@ along with GCC; see the file COPYING3.  If not see
+@@ -61,11 +61,3 @@ along with GCC; see the file COPYING3.  If not see
     %{static:-static}}"
 
 #define TARGET_ASM_FILE_END file_end_indicate_exec_stack
@@ -56,6 +56,8 @@ index 16503482ec2..8d9881eadeb 100644
 -   "/usr/lib" XLEN_SPEC "/" ABI_SPEC "/ "	\
 -   "/lib/ "					\
 -   "/usr/lib/ "
+-
+-#define RISCV_USE_CUSTOMISED_MULTI_LIB select_by_abi
 diff --git a/gcc/config/riscv/t-linux b/gcc/config/riscv/t-linux
 index 216d2776a18..1a8a863853e 100644
 --- a/gcc/config/riscv/t-linux
@@ -70,5 +72,5 @@ index 216d2776a18..1a8a863853e 100644
 MULTILIB_OSDIRNAMES := $(patsubst lib%,../lib%,$(MULTILIB_DIRNAMES))
 +MULTILIB_MATCHES := march?rv64gc=march?rv64imafdc
 -- 
-2.40.1
+2.41.0

@@ -1,7 +1,7 @@
-From fc731db4cee01c38c1454e55ec51cb78d6713188 Mon Sep 17 00:00:00 2001
+From a72e0613f79f6b6867819317accb7a714031a08c Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 07:05:41 +0000
-Subject: [PATCH 24/32] always build libgcc_eh.a
+Subject: [PATCH 24/35] always build libgcc_eh.a

 highly inspired by:
  http://landley.net/hg/aboriginal/file/7e0747a665ab/sources/patches/gcc-core-libgcceh.patch
@@ -47,5 +47,5 @@ index 6c4dc79ab71..023cede18a7 100644
 	for file in $$parts; do					\
 	  rm -f $(DESTDIR)$(inst_libdir)/$$file;		\
 -- 
-2.40.1
+2.41.0

@@ -1,7 +1,7 @@
-From e3271b1970ecb6dab612333ec93c8bd2107cc598 Mon Sep 17 00:00:00 2001
+From 3ee8cbc1cad261b30d4a7a66d31496d5f243ce2f Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 07:06:30 +0000
-Subject: [PATCH 25/32] ada: libgnarl compatibility for musl
+Subject: [PATCH 25/35] ada: libgnarl compatibility for musl

 ---
 gcc/ada/libgnarl/s-osinte__linux.ads | 11 ------
@@ -131,5 +131,5 @@ index 821ceef30e4..ae95b58e01e 100644
 
             pragma Assert (Result in 0 | ENOMEM);
 -- 
-2.40.1
+2.41.0

@@ -1,7 +1,7 @@
-From fdfa9e6dfcc384bce6e525a9ce3a280b808b8312 Mon Sep 17 00:00:00 2001
+From 3df4788c79c7429b196c7b284af2b4cf9a4b4f8d Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 07:07:48 +0000
-Subject: [PATCH 26/32] ada: musl support fixes
+Subject: [PATCH 26/35] ada: musl support fixes

 ---
 gcc/ada/Makefile.rtl | 10 +++++-----
@@ -219,5 +219,5 @@ index c0ee4a16bb1..ed796a48c1b 100644
   status = openpty (&master_fd, &slave_fd, NULL, NULL, NULL);
 #elif defined (USE_CLONE_DEVICE)
 -- 
-2.40.1
+2.41.0

@@ -1,7 +1,7 @@
-From 4a8793a2233c4bd91cd33958fff1420c4bf19333 Mon Sep 17 00:00:00 2001
+From 7b50823d8a4131e5a55d2499a0f5a52b3d91eed2 Mon Sep 17 00:00:00 2001
 From: Drew DeVault <sir@cmpwn.com>
 Date: Wed, 9 Dec 2020 07:42:06 +0000
-Subject: [PATCH 27/32] configure: Add --enable-autolink-libatomic, use in
+Subject: [PATCH 27/35] configure: Add --enable-autolink-libatomic, use in
 LINK_GCC_C_SEQUENCE_SPEC [PR81358]

 This fixes issues with RISC-V.
@@ -166,10 +166,10 @@ index 57268319de1..56bcaa87620 100644
 # Checks for other programs
 # -------------------------
 diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi
-index 928fc6b6d4b..81a677014df 100644
+index b30d3691fe6..ccc8e5dbb00 100644
 --- a/gcc/doc/install.texi
 +++ b/gcc/doc/install.texi
-@@ -2374,6 +2374,14 @@ files, but these changed header paths may conflict with some compilation
+@@ -2377,6 +2377,14 @@ files, but these changed header paths may conflict with some compilation
 environments.  Enabled by default, and may be disabled using
 @option{--disable-canonical-system-headers}.
 
@@ -252,5 +252,5 @@ index 59390fd39d6..dae1dd4cf79 100644
 
 #ifdef ENABLE_DEFAULT_SSP
 -- 
-2.40.1
+2.41.0

@@ -1,7 +1,7 @@
-From c9b40cfd31fd166e7481480218c074ba6b1214cb Mon Sep 17 00:00:00 2001
+From 5bbbd320e54ab5341cfba83e8af98685131caba1 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 12:23:34 +0200
-Subject: [PATCH 28/32] configure: fix detection of atomic builtins in
+Subject: [PATCH 28/35] configure: fix detection of atomic builtins in
 libatomic configure script

 Alpine's --enable-autolink-libatomic (which is enabled for riscv64 by
@@ -53,5 +53,5 @@ index a92ae9e8309..90b579ca4d8 100644
   alpha*)
 	# fenv.c needs this option to generate inexact exceptions.
 -- 
-2.40.1
+2.41.0

@@ -1,7 +1,7 @@
-From e2b9546b31d33f7d13ba675171025cf30ae2e21e Mon Sep 17 00:00:00 2001
+From 430c701a3cefbe09a9c7c8a2f5bbe957f9b2ecb2 Mon Sep 17 00:00:00 2001
 From: Samuel Holland <samuel@sholland.org>
 Date: Thu, 30 Jun 2022 16:44:51 +0000
-Subject: [PATCH 29/32] libstdc++: do not throw exceptions for non-C locales on
+Subject: [PATCH 29/35] libstdc++: do not throw exceptions for non-C locales on
 musl targets

 ---
@@ -23,5 +23,5 @@ index 8849d78fdfa..aff467f98fe 100644
 
   void
 -- 
-2.40.1
+2.41.0

@@ -1,7 +1,7 @@
-From f036f4b4dc5476429e5485cdc5cc15c29da4d7e1 Mon Sep 17 00:00:00 2001
+From 05f0043755f341a2ff4f845379327076b3e0203d Mon Sep 17 00:00:00 2001
 From: Mathias LANG <pro.mathias.lang@gmail.com>
 Date: Mon, 17 Jan 2022 03:49:21 +0000
-Subject: [PATCH 30/32] gdc: unconditionally link libgphobos against
+Subject: [PATCH 30/35] gdc: unconditionally link libgphobos against
 libucontext

 ref: alpine/aports#13422
@@ -23,5 +23,5 @@ index 394b105b271..bc4a77fc300 100644
 	  --srcdir=$${topdir}/$$module_srcdir \
 	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
 -- 
-2.40.1
+2.41.0

@@ -1,7 +1,7 @@
-From 3b27d7eebc87675a377a68b8bb67bdd3399de67f Mon Sep 17 00:00:00 2001
+From 0b89a74fbf77ae6917f043c79cd03db0d6ef0212 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
 Date: Sat, 16 Jul 2022 09:21:11 +0200
-Subject: [PATCH 31/32] druntime: link against libucontext on all platforms
+Subject: [PATCH 31/35] druntime: link against libucontext on all platforms

 On musl-based Linux distributions, swapcontext etc. are not provided by
 musl but instead by libucontext. Hence, we _always_ need to link against
@@ -50,5 +50,5 @@ index 45a56f6f76a..fef6e890b1e 100644
     AC_SEARCH_LIBS([swapcontext], [c ucontext], [],
       AC_MSG_ERROR([swapcontext required but not found]))
 -- 
-2.40.1
+2.41.0

@@ -1,7 +1,7 @@
-From 5081b2b7526e11a4877548a2348c53798ba3de7b Mon Sep 17 00:00:00 2001
+From eeec799f43fbd0bfffc13594585b39d708972511 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
 Date: Tue, 19 Jul 2022 14:54:07 +0200
-Subject: [PATCH 32/32] libgnat: time_t is always 64-bit on musl libc
+Subject: [PATCH 32/35] libgnat: time_t is always 64-bit on musl libc

 ---
 gcc/ada/libgnat/s-parame.ads | 2 +-
@@ -21,5 +21,5 @@ index 3d6e345a1ba..cfe0b4d3ca6 100644
 
    ----------------------------------------------
 -- 
-2.40.1
+2.41.0

@@ -0,0 +1,44 @@
+From b71d21b87e6946c763edad5e420bf22d8a453077 Mon Sep 17 00:00:00 2001
+From: psykose <alice@ayaya.dev>
+Date: Mon, 29 May 2023 15:33:11 +0000
+Subject: [PATCH 33/35] libphobos: do not use LFS64 symbols
+
+musl does not have these since 1.2.4, we can't use the compat interfaces.
+---
+ libphobos/libdruntime/core/sys/posix/config.d   | 2 +-
+ libphobos/libdruntime/core/sys/posix/sys/mman.d | 6 +-----
+ 2 files changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/libphobos/libdruntime/core/sys/posix/config.d b/libphobos/libdruntime/core/sys/posix/config.d
+index ae6752f220e..6b80d1ff0e6 100644
+--- a/libphobos/libdruntime/core/sys/posix/config.d
+++ b/libphobos/libdruntime/core/sys/posix/config.d
+@@ -88,7 +88,7 @@ else version (CRuntime_Musl)
+     enum __REDIRECT          = false;
+ 
+     // Those three are irrelevant for Musl as it always uses 64 bits off_t
+-    enum __USE_FILE_OFFSET64 = _FILE_OFFSET_BITS == 64;
+    enum __USE_FILE_OFFSET64 = false;
+     enum __USE_LARGEFILE     = __USE_FILE_OFFSET64 && !__REDIRECT;
+     enum __USE_LARGEFILE64   = __USE_FILE_OFFSET64 && !__REDIRECT;
+ 
+diff --git a/libphobos/libdruntime/core/sys/posix/sys/mman.d b/libphobos/libdruntime/core/sys/posix/sys/mman.d
+index 0d3d517d69a..323aa0af72d 100644
+--- a/libphobos/libdruntime/core/sys/posix/sys/mman.d
+++ b/libphobos/libdruntime/core/sys/posix/sys/mman.d
+@@ -293,11 +293,7 @@ else version (CRuntime_Bionic)
+ }
+ else version (CRuntime_Musl)
+ {
+-    static if (__USE_LARGEFILE64) void* mmap64(void*, size_t, int, int, int, off_t);
+-    static if (__USE_FILE_OFFSET64)
+-        alias mmap = mmap64;
+-    else
+-        void* mmap(void*, size_t, int, int, int, off_t);
+    void* mmap(void*, size_t, int, int, int, off_t);
+     int munmap(void*, size_t);
+ }
+ else version (CRuntime_UClibc)
+-- 
+2.41.0
+
@@ -0,0 +1,195 @@
+From 4bfcb35bc43d3e3b7510620362d7c28d9e4c17ca Mon Sep 17 00:00:00 2001
+From: psykose <alice@ayaya.dev>
+Date: Mon, 10 Jul 2023 23:23:29 +0000
+Subject: [PATCH 34/35] libgo: fix lfs64 use
+
+---
+ .../go/internal/syscall/unix/at_largefile.go  |  2 +-
+ libgo/go/os/dir_largefile.go                  |  2 +-
+ libgo/go/syscall/libcall_glibc.go             |  2 +-
+ libgo/go/syscall/libcall_linux.go             |  4 +--
+ libgo/go/syscall/libcall_posix_largefile.go   | 26 +++++++++----------
+ libgo/runtime/go-varargs.c                    |  2 +-
+ libgo/sysinfo.c                               |  9 +++----
+ 7 files changed, 22 insertions(+), 25 deletions(-)
+
+diff --git a/libgo/go/internal/syscall/unix/at_largefile.go b/libgo/go/internal/syscall/unix/at_largefile.go
+index 82e0dcfd074..16151ecad1b 100644
+--- a/libgo/go/internal/syscall/unix/at_largefile.go
+++ b/libgo/go/internal/syscall/unix/at_largefile.go
+@@ -10,5 +10,5 @@ import (
+ 	"syscall"
+ )
+ 
+-//extern fstatat64
+//extern fstatat
+ func fstatat(int32, *byte, *syscall.Stat_t, int32) int32
+diff --git a/libgo/go/os/dir_largefile.go b/libgo/go/os/dir_largefile.go
+index 1fc5ee0771f..0c6dffe1a75 100644
+--- a/libgo/go/os/dir_largefile.go
+++ b/libgo/go/os/dir_largefile.go
+@@ -11,5 +11,5 @@ package os
+ 
+ import "syscall"
+ 
+-//extern readdir64
+//extern readdir
+ func libc_readdir(*syscall.DIR) *syscall.Dirent
+diff --git a/libgo/go/syscall/libcall_glibc.go b/libgo/go/syscall/libcall_glibc.go
+index 5c1ec483c75..5a1245ed44b 100644
+--- a/libgo/go/syscall/libcall_glibc.go
+++ b/libgo/go/syscall/libcall_glibc.go
+@@ -114,7 +114,7 @@ func Pipe2(p []int, flags int) (err error) {
+ }
+ 
+ //sys	sendfile(outfd int, infd int, offset *Offset_t, count int) (written int, err error)
+-//sendfile64(outfd _C_int, infd _C_int, offset *Offset_t, count Size_t) Ssize_t
+//sendfile(outfd _C_int, infd _C_int, offset *Offset_t, count Size_t) Ssize_t
+ 
+ func Sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
+ 	if race.Enabled {
+diff --git a/libgo/go/syscall/libcall_linux.go b/libgo/go/syscall/libcall_linux.go
+index 03ca7261b59..ad21fd0b3ac 100644
+--- a/libgo/go/syscall/libcall_linux.go
+++ b/libgo/go/syscall/libcall_linux.go
+@@ -158,7 +158,7 @@ func Reboot(cmd int) (err error) {
+ //adjtimex(buf *Timex) _C_int
+ 
+ //sys	Fstatfs(fd int, buf *Statfs_t) (err error)
+-//fstatfs64(fd _C_int, buf *Statfs_t) _C_int
+//fstatfs(fd _C_int, buf *Statfs_t) _C_int
+ 
+ func Gettid() (tid int) {
+ 	r1, _, _ := Syscall(SYS_GETTID, 0, 0, 0)
+@@ -245,7 +245,7 @@ func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n i
+ }
+ 
+ //sys	Statfs(path string, buf *Statfs_t) (err error)
+-//statfs64(path *byte, buf *Statfs_t) _C_int
+//statfs(path *byte, buf *Statfs_t) _C_int
+ 
+ //sysnb	Sysinfo(info *Sysinfo_t) (err error)
+ //sysinfo(info *Sysinfo_t) _C_int
+diff --git a/libgo/go/syscall/libcall_posix_largefile.go b/libgo/go/syscall/libcall_posix_largefile.go
+index f90055bb29a..334212f0af1 100644
+--- a/libgo/go/syscall/libcall_posix_largefile.go
+++ b/libgo/go/syscall/libcall_posix_largefile.go
+@@ -10,40 +10,40 @@
+ package syscall
+ 
+ //sys	Creat(path string, mode uint32) (fd int, err error)
+-//creat64(path *byte, mode Mode_t) _C_int
+//creat(path *byte, mode Mode_t) _C_int
+ 
+ //sys	Fstat(fd int, stat *Stat_t) (err error)
+-//fstat64(fd _C_int, stat *Stat_t) _C_int
+//fstat(fd _C_int, stat *Stat_t) _C_int
+ 
+ //sys	Ftruncate(fd int, length int64) (err error)
+-//ftruncate64(fd _C_int, length Offset_t) _C_int
+//ftruncate(fd _C_int, length Offset_t) _C_int
+ 
+ //sysnb	Getrlimit(resource int, rlim *Rlimit) (err error)
+-//getrlimit64(resource _C_int, rlim *Rlimit) _C_int
+//getrlimit(resource _C_int, rlim *Rlimit) _C_int
+ 
+ //sys	Lstat(path string, stat *Stat_t) (err error)
+-//lstat64(path *byte, stat *Stat_t) _C_int
+//lstat(path *byte, stat *Stat_t) _C_int
+ 
+ //sys	mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error)
+-//mmap64(addr *byte, length Size_t, prot _C_int, flags _C_int, fd _C_int, offset Offset_t) *byte
+//mmap(addr *byte, length Size_t, prot _C_int, flags _C_int, fd _C_int, offset Offset_t) *byte
+ 
+ //sys	Open(path string, mode int, perm uint32) (fd int, err error)
+-//__go_open64(path *byte, mode _C_int, perm Mode_t) _C_int
+//__go_open(path *byte, mode _C_int, perm Mode_t) _C_int
+ 
+ //sys	Pread(fd int, p []byte, offset int64) (n int, err error)
+-//pread64(fd _C_int, buf *byte, count Size_t, offset Offset_t) Ssize_t
+//pread(fd _C_int, buf *byte, count Size_t, offset Offset_t) Ssize_t
+ 
+ //sys	Pwrite(fd int, p []byte, offset int64) (n int, err error)
+-//pwrite64(fd _C_int, buf *byte, count Size_t, offset Offset_t) Ssize_t
+//pwrite(fd _C_int, buf *byte, count Size_t, offset Offset_t) Ssize_t
+ 
+ //sys	Seek(fd int, offset int64, whence int) (off int64, err error)
+-//lseek64(fd _C_int, offset Offset_t, whence _C_int) Offset_t
+//lseek(fd _C_int, offset Offset_t, whence _C_int) Offset_t
+ 
+ //sysnb	Setrlimit(resource int, rlim *Rlimit) (err error)
+-//setrlimit64(resource int, rlim *Rlimit) _C_int
+//setrlimit(resource int, rlim *Rlimit) _C_int
+ 
+ //sys	Stat(path string, stat *Stat_t) (err error)
+-//stat64(path *byte, stat *Stat_t) _C_int
+//stat(path *byte, stat *Stat_t) _C_int
+ 
+ //sys	Truncate(path string, length int64) (err error)
+-//truncate64(path *byte, length Offset_t) _C_int
+//truncate(path *byte, length Offset_t) _C_int
+diff --git a/libgo/runtime/go-varargs.c b/libgo/runtime/go-varargs.c
+index f84860891e6..7efc9615985 100644
+--- a/libgo/runtime/go-varargs.c
+++ b/libgo/runtime/go-varargs.c
+@@ -84,7 +84,7 @@ __go_ioctl_ptr (int d, int request, void *arg)
+ int
+ __go_open64 (char *path, int mode, mode_t perm)
+ {
+-  return open64 (path, mode, perm);
+  return open (path, mode, perm);
+ }
+ 
+ #endif
+diff --git a/libgo/sysinfo.c b/libgo/sysinfo.c
+index 180f5c31d74..1d717d55c0e 100644
+--- a/libgo/sysinfo.c
+++ b/libgo/sysinfo.c
+@@ -366,7 +366,7 @@ typedef loff_t libgo_loff_t_type;
+ #endif
+ 
+ #if defined(HAVE_OFF64_T)
+-typedef off64_t libgo_off_t_type;
+typedef off_t libgo_off_t_type;
+ #else
+ typedef off_t libgo_off_t_type;
+ #endif
+@@ -398,13 +398,11 @@ typedef off_t libgo_off_t_type;
+ 
+ // From dirent.h
+ SREF(dirent);
+-SREF(dirent64);
+ OTREF(DIR);
+ EREF(DT_UNKNOWN);
+ 
+ // From fcntl.h
+ SREF(flock);
+-SREF(flock64);
+ 
+ // From ffi headers
+ SREF(_ffi_type);
+@@ -485,11 +483,10 @@ EREF(SS_ONSTACK);
+ EREF(SEGV_MAPERR);
+ 
+ // From stat.h
+-SREF(stat64);
+SREF(stat);
+ 
+ // From statfs.h
+ SREF(statfs);
+-SREF(statfs64);
+ 
+ // From sysinfo.h
+ SREF(sysinfo);
+@@ -519,7 +516,7 @@ EREF(PTRACE_PEEKTEXT);
+ 
+ // From sys/resource.h
+ SREF(rusage);
+-SREF(rlimit64);
+SREF(rlimit);
+ EREF(RLIMIT_NOFILE);
+ EREF(PRIO_USER);
+ EREF(RUSAGE_SELF);
+-- 
+2.41.0
+
@@ -0,0 +1,61 @@
+From ef740fff300fd9eb8285fb5611f6205705ee54ec Mon Sep 17 00:00:00 2001
+From: Prathamesh Kulkarni <prathamesh.kulkarni@linaro.org>
+Date: Fri, 23 Jun 2023 15:27:17 +0530
+Subject: [PATCH 35/35] Fix ICE observed in PR110280.
+
+gcc/ChangeLog:
+	PR tree-optimization/110280
+	* match.pd (vec_perm_expr(v, v, mask) -> v): Explicitly build vector
+	using build_vector_from_val with the element of input operand, and
+	mask's type if operand and mask's types don't match.
+
+gcc/testsuite/ChangeLog:
+	PR tree-optimization/110280
+	* gcc.target/aarch64/sve/pr110280.c: New test.
+---
+ gcc/match.pd                                    |  9 ++++++++-
+ gcc/testsuite/gcc.target/aarch64/sve/pr110280.c | 12 ++++++++++++
+ 2 files changed, 20 insertions(+), 1 deletion(-)
+ create mode 100644 gcc/testsuite/gcc.target/aarch64/sve/pr110280.c
+
+diff --git a/gcc/match.pd b/gcc/match.pd
+index 91182448250..c3bb4fbc0a7 100644
+--- a/gcc/match.pd
+++ b/gcc/match.pd
+@@ -8292,7 +8292,14 @@ and,
+ 
+ (simplify
+  (vec_perm vec_same_elem_p@0 @0 @1)
+- @0)
+ (if (types_match (type, TREE_TYPE (@0)))
+  @0
+  (with
+   {
+     tree elem = uniform_vector_p (@0);
+   }
+   (if (elem)
+    { build_vector_from_val (type, elem); }))))
+ 
+ /* Push VEC_PERM earlier if that may help FMA perception (PR101895).  */
+ (simplify
+diff --git a/gcc/testsuite/gcc.target/aarch64/sve/pr110280.c b/gcc/testsuite/gcc.target/aarch64/sve/pr110280.c
+new file mode 100644
+index 00000000000..d3279f38362
+--- /dev/null
+++ b/gcc/testsuite/gcc.target/aarch64/sve/pr110280.c
+@@ -0,0 +1,12 @@
+/* { dg-do compile } */
+/* { dg-options "-O3 -fdump-tree-optimized" } */
+
+#include "arm_sve.h"
+
+svuint32_t l()
+{
+  _Alignas(16) const unsigned int lanes[4] = {0, 0, 0, 0};
+  return svld1rq_u32(svptrue_b8(), lanes);
+}
+
+/* { dg-final { scan-tree-dump-not "VEC_PERM_EXPR" "optimized" } } */
+-- 
+2.41.0
+
@@ -24,15 +24,17 @@ CBUILDROOT="/"
 _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"

 pkgname=gcc-aarch64
-_pkgbase=13.1.1 # must match gcc/BASE-VER
-_pkgsnap=20230520
-pkgver=${_pkgbase}_git$_pkgsnap
+pkgver=13.1.1_git20230722
+# i.e. 13.1.1, must match gcc/BASE-VER
+_pkgbase="${pkgver%%_git*}"
+# date component from snapshots
+_pkgsnap="${pkgver##*_git}"
 [ "$BOOTSTRAP" = "nolibc" ] && pkgname="gcc-pass2"
 [ "$CBUILD" != "$CHOST" ] && _cross="-$CARCH" || _cross=""
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""

 pkgname=gcc-aarch64
-pkgrel=0
+pkgrel=1
 pkgdesc="Stage2 cross-compiler for aarch64"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -264,6 +266,9 @@ source="https://dev.alpinelinux.org/archive/gcc/${_pkgbase%%.*}-$_pkgsnap/gcc-${
 	0030-gdc-unconditionally-link-libgphobos-against-libucont.patch
 	0031-druntime-link-against-libucontext-on-all-platforms.patch
 	0032-libgnat-time_t-is-always-64-bit-on-musl-libc.patch
+	0033-libphobos-do-not-use-LFS64-symbols.patch
+	0034-libgo-fix-lfs64-use.patch
+	0035-Fix-ICE-observed-in-PR110280.patch
 	"

 # we build out-of-tree
@@ -316,7 +321,7 @@ build() {
 	powerpc-*-*-*)		_arch_configure="--enable-secureplt --enable-decimal-float=no";;
 	powerpc64*-*-*-*)	_arch_configure="--with-abi=elfv2 --enable-secureplt --enable-decimal-float=no --enable-targets=powerpcle-linux";;
 	i486-*-*-*)		_arch_configure="--with-arch=i486 --with-tune=generic --enable-cld";;
-	i586-*-*-*)		_arch_configure="--with-arch=i586 --with-tune=generic --enable-cld";;
+	i586-*-*-*)		_arch_configure="--with-arch=pentium-m --with-fpmath=sse --with-tune=generic --enable-cld";;
 	s390x-*-*-*)		_arch_configure="--with-arch=z196 --with-tune=zEC12 --with-zarch --with-long-double-128 --enable-decimal-float";;
 	riscv64-*-*-*)		_arch_configure="--with-arch=rv64gc --with-abi=lp64d --enable-autolink-libatomic";;
 	esac
@@ -420,7 +425,7 @@ build() {

 package() {
 	cd "$_builddir"
-	make DESTDIR="$pkgdir" install
+	make -j1 DESTDIR="$pkgdir" install

 	ln -s gcc "$pkgdir"/usr/bin/cc

@@ -777,37 +782,40 @@ gdb() {
 }

 sha512sums="
-d677cb9ca786128ecd0e3fd465e4ba7beb93244dcf174260e3d980f22807aa8df631954a403ff00bc1ed0597bfbd5475d8369c169c44ef1cb69166ed42bfa29e  gcc-13-20230520.tar.xz
-a39a2485fcffb05757e8a9100985a4c87cc472028ad756e1992747d3e737bd7526d2cc054f7f0e7c24708d2ba9e898eaebf3f2db424a1895daf796e126772e5e  0001-posix_memalign.patch
-a7bf2f69dc983c87dcc480b7c03d80d26128c89afbfea7f035694d7076aacf9361d39b734de5353b52e4e448e84aac68812006da42664bae661b66d4f8ea5098  0002-gcc-poison-system-directories.patch
-a0d4f99e0b3bc0c653d9e23b91c602d1e1ce22d67731aaf76ee267654fcffdfdfc2982b4e99ef6b5523def4cfd5a96e2a20aa5f9efa5256315e824dac3bab806  0003-specs-turn-on-Wl-z-now-by-default.patch
-ae94863ffecb30a40f3fd79f8b31106bbf8a17dbf13c6036847f1ba2726cc96f2a957f4694f3c880c06ee1dc8fbd990e957b9b55b0275e7d8cc7df10286942fa  0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
-2356813aec1ff0a3e82fedfe5dbd0f8c6d442cf567851db40077f98d659b7d048a5349e1ac9c056384a663dad08782d80e29675a457c503200b274a50a6db72d  0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
-c9ee725e69b20f15029920bc187178fbb1c6f0375f16ea1a1052187e591569618c93b108b0f4c387530d976e5daba607b9b76e5ec14a776799324ce7f7c3b11d  0006-Enable-Wformat-and-Wformat-security-by-default.patch
-70fe923321aa50bd4bf9b67d3bb872e03ecd5dd9669e783d7893513c0c86aaca6cac39c7dcc5818bfd4e5ba59f7e2b2e790ac87fcb0dc348c543c15bbb3f7064  0007-Enable-Wtrampolines-by-default.patch
-fa3106eb878ea48479f3145c837b4bb3e563edb9e0535b833f5d7006507af7427902b45c56751c8220eb828e02219e4c54835aa4c0c6eebf797bc29d3d9a7036  0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
-8054b3fb3b9e53000fb00229675b6408defac71f38fceff78372e154990540a23b1790cd7b30a61bfd2ae982cc7c9c8c0405398173abd5618e1814d3ccd85ce9  0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
-1591ba8c8e873d3e38da61038df0b0da0594f15dd8659c1a2a3f834d55599fc7adab18713c26bcfe389a023dc12d7e00231c4b6b61f6b23ff602c8360d459115  0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
-4d03d0bcb31e7a9e171ad408514ec4b1f90783891345bfbf65e513798271b1bbca41a7da616a4ae947a6ba1343a0df9b95233fa202eec70e88fec485841f2413  0011-libiberty-copy-PIC-objects-during-build-process.patch
-62574f57043a24ebc644dd761aa46334071c6f0e721375a83f36099b2514dcc7df0b2900fcd52dee7754664e3f59f7686d8b39bf9df5c61893206f34f485cb49  0012-libgcc_s.patch
-342782bdaaed8107758345fddb01be3df9e880af235f40c598d46a35c9b1499b7ca10d968f381af168886500aca5a155175d1576f1c30a00555da7467b9d1ccc  0013-nopie.patch
-e65bae2cce0e17586384b100ef3dbde232d9f7809cfd40dedb466a24ff2d87b92d68b1a02fe29ec958561bad49658c6a474eae32dd2ee151715808cb5bbfd1a9  0014-ada-fix-shared-linking.patch
-d23962505d7bfa99180edfe727df80e4b5d101697537d818327d9e836e90305b16de95729c70268150b55268d01ad5f1d92b70a0a056884f70abf5c4d5870e27  0015-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
-a4621dca1edb35e2648a348240bd6790e49b9db1fe7b9f81777222d4b1b241b3ee56a4fca9a02964a00ccc4bd291e37d5911fd142d55002424cd9b9e39f7f98f  0016-add-fortify-headers-paths.patch
-3ab96307b31a45e40e174986d13bba620f91954738d84f02ed024854a2cabebf5e6e62589c7006097eb4fb76d5ec526589a877cb8c01f90e5b24819fb191c182  0017-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
-da8b091796740d315f2e23cc63820f1f5ed242f5ce04acf1603fa308b6f3e09088b6976a984180ff54cefdfa4b279706e1ef5df675c0644028fbf3c948ee6e37  0018-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
-39fec69162c86160ee24030c9f14303dc8aac3341f1a8eabb23d1db58c63a3e7252b5b19172ace6730064a9bf1a848d83882f59b4ada319de46dc99ffbd30c83  0019-aarch64-disable-multilib-support.patch
-da2da38d118213567cfbe7c81a8c60deff8e77306b4d5e44d208dfcb6ebc7f29c3964106ebf3dd130edb8a343cc7ecddb3314c14488a429301dbf4750edc65ea  0020-s390x-disable-multilib-support.patch
-d74ba03a6da1bcc18e70f017616ab2a1b901e8d04dcb6ea994420aecd042378ec440652ba1168b05a40ddff431ae5b69a19148e928fa70e3e15ba91a03224fad  0021-ppc64-le-disable-multilib-support.patch
-828281a2e7404eedfd7a9a90a553ca7e4eab2a19d2a442faa69c3c2ecefe1a3750426bf5fe6d421dedbfba83feddbba04cb6938658d15110b4007813319713c0  0022-x86_64-disable-multilib-support.patch
-c7d76f6d987e51e488e404ca75a4c44ed35be6fda925cf0f4cfc9d85e71df6b034d514fdd2748e26d889f8ee30a252224096241348cd06516f2469a3ed6a6a35  0023-riscv-disable-multilib-support.patch
-42d9cce946d51d046a96930335915c927d2bb846d6cff685351f58a1006eb5f831b0fd928091df17ed5d4ac1efbbd359b54c325c40e70737d0302d22c8262606  0024-always-build-libgcc_eh.a.patch
-c45c449e5304a7483b1141f87a53ab4658402dec8fa5d5116fa7a5e4bebba322da3214cf85c9b25e1c6d040ec81c0094b56a1ed4eefbcde91235816aa0159c6e  0025-ada-libgnarl-compatibility-for-musl.patch
-e09ef88df90c4b484ab4172d7ac68c1defd9f1897fadfcb23572e2829e0f795f3eeb1e5ceeb6aac76cab938a0962371e99c168dcf1c2c4c31c8a8b4fa774dc3e  0026-ada-musl-support-fixes.patch
-0661fe9d2a61d4de8d9862d6d936bad8236f9ce679b5e40eea7d54b042a7f860f21103e489a8c7a2b12b1e368194ffeb9b4672d7086ebf4189c77f0a27f27a71  0027-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
-68da13272861a0b3f33022350135660af9a060d03529b610dddf540fb77050647934f1a463c681d1556fa0005b6c16fe76cad285667d1349d5be50ccc83c530e  0028-configure-fix-detection-of-atomic-builtins-in-libato.patch
-f638c4d7a3fb54d5fd76b7e9b49d8dd1041347409f842453bf862586e2770d595aa9e58f8c1ec45e3c37235d5e74b7327f4610a3cad81c0a757a1271e5a0e572  0029-libstdc-do-not-throw-exceptions-for-non-C-locales-on.patch
-f6f2971f4e1bc58c0aeb2a62d9ad551a0fe855b9086f308dce2bb713214415c9679e8e6547290b1514dfd3bc7296d3dfdb7c2964289bbec737984a7810e5ef5d  0030-gdc-unconditionally-link-libgphobos-against-libucont.patch
-ab26344341f5e75673e3a95590fb59fde3ee681949c3004e93ef04af9f1fe2d063c22fc21d14882808d3331ce9eeb135a33b87aeed4d3bf74cc9b087ac56610e  0031-druntime-link-against-libucontext-on-all-platforms.patch
-5dfdd7645ba5090ac46e025ce3ce629cbf612518654dced2159e0a621d0ef8e231514bad4746aa8863e544077502d4842486b978a0c3857c4ad48b20c49ef2d1  0032-libgnat-time_t-is-always-64-bit-on-musl-libc.patch
+284719308cad4546ebd85934fb9f12112e8f1a4c3e5beea0760da1f73509907c194e7c133e6e755b6148bd1c51a72c071ac0d16b05641d901af7105461686655  gcc-13-20230722.tar.xz
+1ecffba1b07d60e1b4422302b032bbea918b674c8e12b30aa6965b544d700ce86b61e9f7b8d402c6caf59257f491a394dd0912f0948565d6eae9335ee54f3b35  0001-posix_memalign.patch
+163f282455b6a4df33f011bcd8b0440566ba0ffaeeab30d8ac52d39948980a56881ca0eff60687129d59556389a58b9d64e7768750bd70b1fe0fedbc9fc30dc2  0002-gcc-poison-system-directories.patch
+3f24bb6a50d3c45b71ea05590e32fe3e69b91377ab185352891d5035c76ed193117c6d0b314a4c364bcf136b9a9dd5c926d6c7c30ab436976c121ebfea8d3ddd  0003-specs-turn-on-Wl-z-now-by-default.patch
+17a2993027d3ddf8595952ebcae425695ddc7b1cf73b384d2e55fddecb9cbf3f6482860a502ff69b14075e12badf27300fd3039f3a9005e851fd8d121d258c2b  0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
+444550e55491ff89fe8cbbb4b73d017c9c147cdce1ad5c0561fe7d6ab3834515a814c7676c408cfeec18e1aaace27b3c26a2ffe4a75042285df5124976c38672  0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
+5a5f57e4e45745bb4d9d63d7d410fe9dd56ce12dbd70c376dd45015909307faf02391e75368e4e7404591614a874cee41b20652cf27be234765d6db97ceb4e7e  0006-Enable-Wformat-and-Wformat-security-by-default.patch
+3a2b22388398a93dae7787e794cd580b9c577326f286241e086120c1fcfdd9228c2e00407088ebb163fb1acc21722c199071343551c989a958dc3c845b15132d  0007-Enable-Wtrampolines-by-default.patch
+7535de1c552544e3a51cbb00b5e08ac59edbf3bdcfce2a63b9f319fada3f3676f47e3a00c75d91bcefd14500555ea0844f18c130ff46b20f416ea76071e5af39  0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
+93d03afd83dee5f7129c36a7b81fa8fd323476507e2f53a4fbe40a026037e7dfafa23591145d7af5848d9a322d212497947a0f58ef828734552e6a6dabd00cfa  0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
+da9eaf2f0ddbec5ee14dc26053936587e6c76fbf16846db804a18cf4d318579426ebcc566aed02daf8e34f60c08b61f5d3959305886dca9bbcdc84db057258d9  0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
+35b9aafe7eee8138cb7aad7164a8f77c15ccdce26843cee78b5871ef91d76cad22ed0871b20f51c4b89b71afd9cfe4ba4227086e158c466558513708fe7d2a1a  0011-libiberty-copy-PIC-objects-during-build-process.patch
+9d43f844fad0ac6e1c35a2b6f461f9278ae09e468f2c9ae8adc43accbe6934994aa10d3a433644d1393a4a76e3caed69e3191db7f3c0c24b4e7a0a0a0cbac3f1  0012-libgcc_s.patch
+b2c4921c5eef33ee43a92ab5ec7f09d5d3adb49a2416595001e6376ffdf652ef9d0dc21778c3a86e45334290dbe467a4e891ed34a6522e0c72f746def22e8663  0013-nopie.patch
+0b50ad15115192699efa9fda3d4fb1c2fa95da06d7880ba34615b40c19a8256e1fe364da39f5c70dc22fbccf21db2de5900932afef68948722eeb25e435262f8  0014-ada-fix-shared-linking.patch
+00097c7106625ccf02149a757366f434c48f2abe824bb8b4bf067d29308889cb6039a5e5b2d3bd2683617693b47707d549252c56eea6bc3cdc2450a8d14f46a7  0015-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
+7f0bc42b93a389b614054e700b851abfbc53db391aa10cbdf6990d41396b293af78980bb39f1cf0967184d3fbf3d46ac7c7f096717b8f193ea34cbf7f37d7e91  0016-add-fortify-headers-paths.patch
+0841acbce81250f8cb140a75ff62958dfcab3bed792822baf1fe4193dd62633648343f4b66df886c12338eed88a98e591b968131416460f9f0274046019bb8ef  0017-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
+589d538bdf692559e475e53c79869734dede0eb15228cab9ca901c9db81b0e78a0e532b20dfb05ca584ea19ff4bedd83e139ddca912a26b446c5eb6905180536  0018-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
+2213e07bab6f5d8d3d39c732f5385f46cc8f0c84e35054139fdaf13051252d7bf11f647f54aa8456b532166b008fff0656d8f41278e34ba868dd6fe427427a3a  0019-aarch64-disable-multilib-support.patch
+a9567947471c3ba8a547a79c55e183974554bf823d9a97a165c966d7b3caad8789980e096e3b78452ece5de062bd9bb006af464bbf0c5a35b689eac3ee21e5c5  0020-s390x-disable-multilib-support.patch
+f382eb5f7c2c60c5a23fac587c9629a3059d7be0898e97a1feaf9b9cbe1ef4693cc1177eb29333e8b7944fa17487478e73958be45d5782ccb9ef501961fb9a96  0021-ppc64-le-disable-multilib-support.patch
+44ab86feb8e41e7c2b2e27accdf46194c9b80ee6a39543303dc04824f669d9fad182aabd40c9c7f6c265cf9bb71be830c257be115dc9d701d54eca3aa9ef174e  0022-x86_64-disable-multilib-support.patch
+e0763083c31485e8ac0b3724376a28af01bb6f50e1a054780b61886e4e3de2a35d127e6e353eb8d8729964ada9b5751bf05bdd51df539667008216db38f228a3  0023-riscv-disable-multilib-support.patch
+ab88a2f63e3545bbc36537aa9a86f2c6c35e41bbf702d6e13743a405cdac4f901eed5737189b780da96647fea9f5d863fdc76373f25a00064106dcb5514d6d87  0024-always-build-libgcc_eh.a.patch
+8fdbe0c8bf4ca60f458a33e59027de03d15ac91933fe46d8ca62119346d20b9bc2447c0bf22bceb63d0cf8613ab61512d9197f4e6c2224af473b63ef9f254295  0025-ada-libgnarl-compatibility-for-musl.patch
+30369bea84020c32d514196ba3adb3d09d2d0359af5550bd3f9719aa357e44b2f695623c1d2a99416e120dc86896c196c5dd4f638183dced4799604137385367  0026-ada-musl-support-fixes.patch
+3f9a406d7d2ce34951215ffbcadb49a45e55ad5c24ab9097c0e5e92383e43b876872ccd2a7e7def2833ab204975ee5733f8bcf90934db9fa9c4f6f56c62081f6  0027-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
+720a4001f9a1fa4122e456077ecff8d3eb8af7c83d0a81f9da6a6cca05b23664206a82a349e34482c48bfe40e99aa5f21567613d0913f6a24f282bc84a994496  0028-configure-fix-detection-of-atomic-builtins-in-libato.patch
+2044c23b23726965c0a6fd39f616cc464badd650947cb40495eeabd906a3af629878c1d28b403b8eb46b30a1a0ba39083023290d62f0c99ccf070063226e3f8f  0029-libstdc-do-not-throw-exceptions-for-non-C-locales-on.patch
+58e8415612e1042329ad114471852c19f6bf15bf3bfd7cd81ceeafa75778bcc28410a01071a7c8cbf12b8f549acd85723215772813deedb8f266e28b9e01a353  0030-gdc-unconditionally-link-libgphobos-against-libucont.patch
+d47b559075f40d526235f47b91da1d0cf6bfe6c5b7311bbfe08af9dd6e8f27e6c7cd82e3b2d529aab0536246fc56e2d42c089b22cacb0e7f09ca4a9d07556994  0031-druntime-link-against-libucontext-on-all-platforms.patch
+b325035cb7122d79c6b42ca6d3fc9e02319ed2f7cddb0639dff25d2798d2ce63812cd623462cdf95e21c9ffbf2412193f8b9fc89a4c36fa5a6a041661ac7399d  0032-libgnat-time_t-is-always-64-bit-on-musl-libc.patch
+c474f34e6f9a4239d486a65141a133dbe8ce91427d502a57a9fd6eb403478a2b5715ba74f24c1cc0761e16eec77ba2c1ca921fb7d7bc1e040fc3703fc9559e75  0033-libphobos-do-not-use-LFS64-symbols.patch
+c4482ffc36e7894b2140800159f4cbc9a3e9011e43a69b69f4fa92d5a11e2ee645c7e21df4423dd1e0636e8890849a5719647bfbdf84f951d638f8f488cb718c  0034-libgo-fix-lfs64-use.patch
+048d767f4477c92ee6835850d13063ede21c0be751d0945c94445d04054e134cdc617eeb0b1ac8c892a604d8644580fcfebeccaf537d6b7380558ac6378e445a  0035-Fix-ICE-observed-in-PR110280.patch
 "
@@ -1,7 +1,7 @@
-From 5238749680d22a42e90dc3832ef1ad1c9a5f1c20 Mon Sep 17 00:00:00 2001
+From 47b4bd4deb2c356bb07d2a96f22127aefafec3a4 Mon Sep 17 00:00:00 2001
 From: Szabolcs Nagy <nsz@port70.net>
 Date: Fri, 26 Jan 2018 20:32:50 +0000
-Subject: [PATCH 01/32] posix_memalign
+Subject: [PATCH 01/35] posix_memalign

 ---
 gcc/config/i386/pmm_malloc.h | 9 +++++----
@@ -38,5 +38,5 @@ index 3527283693b..c4071b64b53 100644
   else
     return NULL;
 -- 
-2.40.1
+2.41.0

@@ -1,7 +1,7 @@
-From dc71cb9815d25a57430ef5d8e2a87312d8c3b467 Mon Sep 17 00:00:00 2001
+From 4fa620d8c3e6730211bfb071eb4c817320491bd0 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 02/32] gcc: poison-system-directories
+Subject: [PATCH 02/35] gcc: poison-system-directories

 Add /sw/include and /opt/include based on the original
 zecke-no-host-includes.patch patch.  The original patch checked for
@@ -120,7 +120,7 @@ index 09082e8ccae..5504bf6eb01 100644
 AC_SUBST(subdirs)
 AC_SUBST(srcdir)
 diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index c0c3ad14515..7cdd5bfa952 100644
+index af0e5933fdb..b6731a4673c 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
@@ -384,6 +384,7 @@ Objective-C and Objective-C++ Dialects}.
@@ -131,7 +131,7 @@ index c0c3ad14515..7cdd5bfa952 100644
 -Wno-pragmas  -Wno-prio-ctor-dtor  -Wredundant-decls
 -Wrestrict  -Wno-return-local-addr  -Wreturn-type
 -Wno-scalar-storage-order  -Wsequence-point
-@@ -8424,6 +8425,14 @@ made up of data only and thus requires no special treatment.  But, for
+@@ -8426,6 +8427,14 @@ made up of data only and thus requires no special treatment.  But, for
 most targets, it is made up of code and thus requires the stack to be
 made executable in order for the program to work properly.
 
@@ -199,5 +199,5 @@ index 4d44321183f..0f3f071b44c 100644
 
 /* Use given -I paths for #include "..." but not #include <...>, and
 -- 
-2.40.1
+2.41.0

@@ -1,7 +1,7 @@
-From 95cd372c839d347b41e22605d569cca6a2119b85 Mon Sep 17 00:00:00 2001
+From ff4dd4ce33133e675b7bedc86b73357c04631cb9 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:45:49 +0000
-Subject: [PATCH 03/32] specs: turn on -Wl,-z,now by default
+Subject: [PATCH 03/35] 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.
@@ -14,10 +14,10 @@ now by default.
 2 files changed, 4 insertions(+)

 diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index 7cdd5bfa952..158b7bcb81e 100644
+index b6731a4673c..f393c7846c6 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
-@@ -17959,6 +17959,9 @@ For example, @option{-Wl,-Map,output.map} passes @option{-Map output.map} to the
+@@ -17961,6 +17961,9 @@ For example, @option{-Wl,-Map,output.map} passes @option{-Map output.map} to the
 linker.  When using the GNU linker, you can also get the same effect with
 @option{-Wl,-Map=output.map}.
 
@@ -40,5 +40,5 @@ index 33b56e721d2..f82fae23c22 100644
     %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!r:%{!nostartfiles:%S}}} \
     %{Wno-poison-system-directories:--no-poison-system-directories} \
 -- 
-2.40.1
+2.41.0

@@ -1,7 +1,7 @@
-From 12b0a32aa19334c1b5dd20c9cc3b0ca885e973ce Mon Sep 17 00:00:00 2001
+From 1b315235433701e4a974da259b8d651169ddc7ac Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:46:22 +0000
-Subject: [PATCH 04/32] Turn on -D_FORTIFY_SOURCE=2 by default for C, C++,
+Subject: [PATCH 04/35] Turn on -D_FORTIFY_SOURCE=2 by default for C, C++,
 ObjC, ObjC++, if the optimization level is > 0

 ---
@@ -25,10 +25,10 @@ index 5d64625fcd7..868d69506e4 100644
   if (flag_gnu89_inline)
     cpp_define (pfile, "__GNUC_GNU_INLINE__");
 diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index 158b7bcb81e..cc9972f907b 100644
+index f393c7846c6..ef3c14a189e 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
-@@ -11866,6 +11866,12 @@ also turns on the following optimization flags:
+@@ -11868,6 +11868,12 @@ also turns on the following optimization flags:
 Please note the warning under @option{-fgcse} about
 invoking @option{-O2} on programs that use computed gotos.
 
@@ -42,5 +42,5 @@ index 158b7bcb81e..cc9972f907b 100644
 @item -O3
 Optimize yet more.  @option{-O3} turns on all optimizations specified
 -- 
-2.40.1
+2.41.0

@@ -1,7 +1,7 @@
-From 8693307d930c085828c921023219d4c1459a32e9 Mon Sep 17 00:00:00 2001
+From 67c0f5789630b27149f60ff831999ef7c1dba5d5 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:46:56 +0000
-Subject: [PATCH 05/32] On linux targets pass --as-needed by default to the
+Subject: [PATCH 05/35] On linux targets pass --as-needed by default to the
 linker, but always link the sanitizer libraries with --no-as-needed.

 ---
@@ -137,7 +137,7 @@ index a4e5380b589..3cc61bce69f 100644
     %{!static: \
       %{rdynamic:-export-dynamic} \
 diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h
-index 2fdfd930cf2..16503482ec2 100644
+index 3e625e0f867..f8c2c351e5a 100644
 --- a/gcc/config/riscv/linux.h
 +++ b/gcc/config/riscv/linux.h
@@ -48,6 +48,7 @@ along with GCC; see the file COPYING3.  If not see
@@ -268,5 +268,5 @@ index f82fae23c22..da6417dd0d1 100644
 #else
 #define LIBUBSAN_SPEC "-lubsan" STATIC_LIBUBSAN_LIBS
 -- 
-2.40.1
+2.41.0

@@ -1,7 +1,7 @@
-From ec4e37d755110ffb5a4bdba54db89ea06ff3926a Mon Sep 17 00:00:00 2001
+From bb25e8489384504cd59e4a2538720863da1fb29c Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:47:43 +0000
-Subject: [PATCH 06/32] Enable -Wformat and -Wformat-security by default.
+Subject: [PATCH 06/35] Enable -Wformat and -Wformat-security by default.

 ---
 gcc/c-family/c.opt | 4 ++--
@@ -30,5 +30,5 @@ index a75038930ae..b98726f33ed 100644
 
 Wformat-overflow=
 -- 
-2.40.1
+2.41.0

@@ -1,7 +1,7 @@
-From fdc4c95806cb57e98785c991c6ae9d9f2183a914 Mon Sep 17 00:00:00 2001
+From 4a728ad48a7b437cc6f2697e26603bf648149f86 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:48:24 +0000
-Subject: [PATCH 07/32] Enable -Wtrampolines by default.
+Subject: [PATCH 07/35] Enable -Wtrampolines by default.

 ---
 gcc/common.opt | 2 +-
@@ -21,5 +21,5 @@ index 64c4277c991..c24839d32bc 100644
 
 Wtrivial-auto-var-init
 -- 
-2.40.1
+2.41.0

@@ -1,7 +1,7 @@
-From 547ed1d35f0fa8c04cefb8708c4a148f86ed3397 Mon Sep 17 00:00:00 2001
+From 32f24560d0602f7735d5e9efd92fe3151bd72cea Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:49:40 +0000
-Subject: [PATCH 08/32] Disable ssp on -nostdlib, -nodefaultlibs and
+Subject: [PATCH 08/35] Disable ssp on -nostdlib, -nodefaultlibs and
 -ffreestanding Change the buffer size.

 ---
@@ -49,5 +49,5 @@ index 823cdb2ff85..5b096899b40 100644
 
 -param=stack-clash-protection-guard-size=
 -- 
-2.40.1
+2.41.0

@@ -1,7 +1,7 @@
-From ee2e986e85a0400402f006ec2ddf2435cac621ba Mon Sep 17 00:00:00 2001
+From c7ec8da7280d7f97f5543eb9ddeca7600aafc43c Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:50:33 +0000
-Subject: [PATCH 09/32] Ensure that msgfmt doesn't encounter problems during
+Subject: [PATCH 09/35] Ensure that msgfmt doesn't encounter problems during
 gcc bootstrapping.

 Solves error messages like the following:
@@ -50,5 +50,5 @@ index 8e93445acd2..d6ff06e5ddb 100644
 
 all-local: all-local-$(USE_NLS)
 -- 
-2.40.1
+2.41.0

@@ -1,7 +1,7 @@
-From 2ed284234b08b5018fb542c784e6b8757b1e4967 Mon Sep 17 00:00:00 2001
+From aaa029bcee68298695b7c4278c90b6bc320d098c Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:52:07 +0000
-Subject: [PATCH 10/32] Don't declare asprintf if defined as a macro.
+Subject: [PATCH 10/35] Don't declare asprintf if defined as a macro.

 ---
 include/libiberty.h | 3 +++
@@ -24,5 +24,5 @@ index 1d5c779fcff..19e3cb1e31c 100644
 /* Like asprintf but allocates memory without fail. This works like
    xmalloc.  */
 -- 
-2.40.1
+2.41.0

@@ -1,7 +1,7 @@
-From 52544d0abdcf63f33446f880fcaae1d0aa589a81 Mon Sep 17 00:00:00 2001
+From 65e01e749205c9af218b01233cebd0077538d0ee Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:53:00 +0000
-Subject: [PATCH 11/32] libiberty: copy PIC objects during build process
+Subject: [PATCH 11/35] libiberty: copy PIC objects during build process

 ---
 libiberty/Makefile.in | 1 +
@@ -20,5 +20,5 @@ index 72608f3e4a7..58356884728 100644
 	else true; fi
 
 -- 
-2.40.1
+2.41.0

@@ -1,7 +1,7 @@
-From eff4677a5511567ab3d550a5989ee0805fc3e1a7 Mon Sep 17 00:00:00 2001
+From 453a815bf2844971a91eaef800af188d9e86b784 Mon Sep 17 00:00:00 2001
 From: Szabolcs Nagy <nsz@port70.net>
 Date: Sat, 24 Oct 2015 20:09:53 +0000
-Subject: [PATCH 12/32] libgcc_s
+Subject: [PATCH 12/35] libgcc_s

 ---
 gcc/config/i386/i386-expand.cc | 4 ++--
@@ -53,5 +53,5 @@ index 8506a635790..564296f788e 100644
 +HOST_LIBGCC2_CFLAGS += -mlong-double-80 $(CET_FLAGS)
 CRTSTUFF_T_CFLAGS += $(CET_FLAGS)
 -- 
-2.40.1
+2.41.0

@@ -1,7 +1,7 @@
-From 8af4ddcecc9dc43d714798d255a21e12985721b9 Mon Sep 17 00:00:00 2001
+From 7d7d12137c666761a8dd61179c9651b85dae9b41 Mon Sep 17 00:00:00 2001
 From: Szabolcs Nagy <nsz@port70.net>
 Date: Sat, 7 Nov 2015 02:08:05 +0000
-Subject: [PATCH 13/32] nopie
+Subject: [PATCH 13/35] nopie

 ---
 gcc/configure    | 27 +++++++++++++++++++++++++++
@@ -71,5 +71,5 @@ index 5504bf6eb01..57268319de1 100644
 AC_SUBST([NO_PIE_FLAG])
 
 -- 
-2.40.1
+2.41.0

@@ -1,7 +1,7 @@
-From 1330c37f63c0388480cfa369df2b437e9c8cc878 Mon Sep 17 00:00:00 2001
+From dd5bb97c31a9f57034c70a7a18ba6e2e133084c7 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:59:16 +0000
-Subject: [PATCH 14/32] ada: fix shared linking
+Subject: [PATCH 14/35] ada: fix shared linking

 ---
 gcc/ada/link.c | 12 ++++++------
@@ -38,5 +38,5 @@ index f2126441208..22cfa9c641f 100644
 unsigned char __gnat_objlist_file_supported = 1;
 const char *__gnat_object_library_extension = ".a";
 -- 
-2.40.1
+2.41.0

@@ -1,7 +1,7 @@
-From ceb43810c502b238cb487af6e84b1c80f2105f1a Mon Sep 17 00:00:00 2001
+From 6bb5b7d9161d05f31b001d8211a9c63caf63fd2f Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:59:43 +0000
-Subject: [PATCH 15/32] build: fix CXXFLAGS_FOR_BUILD passing
+Subject: [PATCH 15/35] build: fix CXXFLAGS_FOR_BUILD passing

 ---
 Makefile.in | 1 +
@@ -20,5 +20,5 @@ index 06a9398e172..6ff2b3f9925 100644
 
 # This is the list of directories to built for the host system.
 -- 
-2.40.1
+2.41.0

@@ -1,7 +1,7 @@
-From ebc8167db85bc37a59f02fec6904829652989564 Mon Sep 17 00:00:00 2001
+From f0d9e00cac06689f64b214de7aee80d7116ef084 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 07:01:06 +0000
-Subject: [PATCH 16/32] add fortify-headers paths
+Subject: [PATCH 16/35] add fortify-headers paths

 ---
 gcc/config/linux.h | 2 ++
@@ -21,5 +21,5 @@ index e3aca79cccc..b3537b8fbeb 100644
     { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 0 },
 #else
 -- 
-2.40.1
+2.41.0

@@ -1,7 +1,7 @@
-From 86a566d0ed9da32b5f3a6ac48999ebbac6dce4a5 Mon Sep 17 00:00:00 2001
+From 857db04f4f1a06e866551b4172fe8f27363f4a92 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 17/32] Alpine musl package provides libssp_nonshared.a. We
+Subject: [PATCH 17/35] Alpine musl package provides libssp_nonshared.a. We
 link to it unconditionally, as otherwise we get link failures if some objects
 are -fstack-protector built and final link happens with -fno-stack-protector.
 This seems to be the common case when bootstrapping gcc, the piepatches do
@@ -27,5 +27,5 @@ index b5a6f200635..6cbb726599b 100644
 #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
 		       "|fstack-protector-strong|fstack-protector-explicit" \
 -- 
-2.40.1
+2.41.0

@@ -1,7 +1,7 @@
-From d113a7974d55a8c5e71f0d72202db3e303245d2b Mon Sep 17 00:00:00 2001
+From 5a8347e23ab13912b6edec2c6c6e3a101b017c79 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 07:03:42 +0000
-Subject: [PATCH 18/32] DP: Use --push-state/--pop-state for gold as well when
+Subject: [PATCH 18/35] DP: Use --push-state/--pop-state for gold as well when
 linking libtsan.

 ---
@@ -65,5 +65,5 @@ index 6cbb726599b..59390fd39d6 100644
 #else
 #define LIBUBSAN_SPEC "-lubsan" STATIC_LIBUBSAN_LIBS
 -- 
-2.40.1
+2.41.0

@@ -1,7 +1,7 @@
-From 3ba91105e2299d591d817164e2c98b905460892d Mon Sep 17 00:00:00 2001
+From 41d00a2eb0754acf71958808bd17dbebeb517b84 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Thu, 6 Jan 2022 03:12:55 +0000
-Subject: [PATCH 19/32] aarch64: disable multilib support
+Subject: [PATCH 19/35] aarch64: disable multilib support

 multilib is unsupported on Alpine GCC
 ---
@@ -22,5 +22,5 @@ index 57bf4100fcd..172894b57ef 100644
 
 MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu_ilp32)
 -- 
-2.40.1
+2.41.0

@@ -1,7 +1,7 @@
-From ac6348347f14ba8274655aa6af27ccfbf89a437f Mon Sep 17 00:00:00 2001
+From 85b42bfbba71616831d14360b16998acb28790fd Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Thu, 6 Jan 2022 03:13:59 +0000
-Subject: [PATCH 20/32] s390x: disable multilib support
+Subject: [PATCH 20/35] s390x: disable multilib support

 multilib is not supported on Alpine GCC at present
 ---
@@ -21,5 +21,5 @@ index cc6ab367072..7f498ee1cdc 100644
 +MULTILIB_OSDIRNAMES = m64=../lib
 +MULTILIB_OSDIRNAMES+= m32=../lib32
 -- 
-2.40.1
+2.41.0

@@ -1,7 +1,7 @@
-From 969630b9b930860077fcc9b08972d18b40518828 Mon Sep 17 00:00:00 2001
+From 7b53df284242638e940c0155b6c21e88cea1f55b Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Thu, 6 Jan 2022 03:14:33 +0000
-Subject: [PATCH 21/32] ppc64[le]: disable multilib support
+Subject: [PATCH 21/35] ppc64[le]: disable multilib support

 multilib is not presently supported on Alpine GCC
 ---
@@ -77,5 +77,5 @@ index 2e63bdb9fc9..c6e1c5db65d 100644
 +MULTILIB_OSDIRNAMES += m32=../lib32
 MULTILIB_MATCHES    := ${MULTILIB_MATCHES_ENDIAN}
 -- 
-2.40.1
+2.41.0

@@ -1,7 +1,7 @@
-From a34c8e7255f71228e4bef4d51fbb791a10013658 Mon Sep 17 00:00:00 2001
+From 96e7e1e9a899d9bb5fcbdf788bd529d0390c626f Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Thu, 6 Jan 2022 03:14:54 +0000
-Subject: [PATCH 22/32] x86_64: disable multilib support
+Subject: [PATCH 22/35] x86_64: disable multilib support

 multilib is not presently supported on Alpine GCC
 ---
@@ -22,5 +22,5 @@ index 138956b0962..bc03dab874f 100644
 +MULTILIB_OSDIRNAMES+= m32=../lib32
 MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32)
 -- 
-2.40.1
+2.41.0

@@ -1,7 +1,7 @@
-From abf619dfadb883809457037a52d5eb77acf25dd5 Mon Sep 17 00:00:00 2001
+From b26224acf342eacb33491f6ea0da1faf73d35715 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 23/32] riscv: disable multilib support
+Subject: [PATCH 23/35] riscv: disable multilib support
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -38,15 +38,15 @@ library.
 [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/linux.h | 8 --------
 gcc/config/riscv/t-linux | 7 +++++--
- 2 files changed, 5 insertions(+), 8 deletions(-)
+ 2 files changed, 5 insertions(+), 10 deletions(-)

 diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h
-index 16503482ec2..8d9881eadeb 100644
+index f8c2c351e5a..8d9881eadeb 100644
 --- a/gcc/config/riscv/linux.h
 +++ b/gcc/config/riscv/linux.h
-@@ -61,9 +61,3 @@ along with GCC; see the file COPYING3.  If not see
+@@ -61,11 +61,3 @@ along with GCC; see the file COPYING3.  If not see
     %{static:-static}}"
 
 #define TARGET_ASM_FILE_END file_end_indicate_exec_stack
@@ -56,6 +56,8 @@ index 16503482ec2..8d9881eadeb 100644
 -   "/usr/lib" XLEN_SPEC "/" ABI_SPEC "/ "	\
 -   "/lib/ "					\
 -   "/usr/lib/ "
+-
+-#define RISCV_USE_CUSTOMISED_MULTI_LIB select_by_abi
 diff --git a/gcc/config/riscv/t-linux b/gcc/config/riscv/t-linux
 index 216d2776a18..1a8a863853e 100644
 --- a/gcc/config/riscv/t-linux
@@ -70,5 +72,5 @@ index 216d2776a18..1a8a863853e 100644
 MULTILIB_OSDIRNAMES := $(patsubst lib%,../lib%,$(MULTILIB_DIRNAMES))
 +MULTILIB_MATCHES := march?rv64gc=march?rv64imafdc
 -- 
-2.40.1
+2.41.0

@@ -1,7 +1,7 @@
-From fc731db4cee01c38c1454e55ec51cb78d6713188 Mon Sep 17 00:00:00 2001
+From a72e0613f79f6b6867819317accb7a714031a08c Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 07:05:41 +0000
-Subject: [PATCH 24/32] always build libgcc_eh.a
+Subject: [PATCH 24/35] always build libgcc_eh.a

 highly inspired by:
  http://landley.net/hg/aboriginal/file/7e0747a665ab/sources/patches/gcc-core-libgcceh.patch
@@ -47,5 +47,5 @@ index 6c4dc79ab71..023cede18a7 100644
 	for file in $$parts; do					\
 	  rm -f $(DESTDIR)$(inst_libdir)/$$file;		\
 -- 
-2.40.1
+2.41.0

@@ -1,7 +1,7 @@
-From e3271b1970ecb6dab612333ec93c8bd2107cc598 Mon Sep 17 00:00:00 2001
+From 3ee8cbc1cad261b30d4a7a66d31496d5f243ce2f Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 07:06:30 +0000
-Subject: [PATCH 25/32] ada: libgnarl compatibility for musl
+Subject: [PATCH 25/35] ada: libgnarl compatibility for musl

 ---
 gcc/ada/libgnarl/s-osinte__linux.ads | 11 ------
@@ -131,5 +131,5 @@ index 821ceef30e4..ae95b58e01e 100644
 
             pragma Assert (Result in 0 | ENOMEM);
 -- 
-2.40.1
+2.41.0

@@ -1,7 +1,7 @@
-From fdfa9e6dfcc384bce6e525a9ce3a280b808b8312 Mon Sep 17 00:00:00 2001
+From 3df4788c79c7429b196c7b284af2b4cf9a4b4f8d Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 07:07:48 +0000
-Subject: [PATCH 26/32] ada: musl support fixes
+Subject: [PATCH 26/35] ada: musl support fixes

 ---
 gcc/ada/Makefile.rtl | 10 +++++-----
@@ -219,5 +219,5 @@ index c0ee4a16bb1..ed796a48c1b 100644
   status = openpty (&master_fd, &slave_fd, NULL, NULL, NULL);
 #elif defined (USE_CLONE_DEVICE)
 -- 
-2.40.1
+2.41.0

@@ -1,7 +1,7 @@
-From 4a8793a2233c4bd91cd33958fff1420c4bf19333 Mon Sep 17 00:00:00 2001
+From 7b50823d8a4131e5a55d2499a0f5a52b3d91eed2 Mon Sep 17 00:00:00 2001
 From: Drew DeVault <sir@cmpwn.com>
 Date: Wed, 9 Dec 2020 07:42:06 +0000
-Subject: [PATCH 27/32] configure: Add --enable-autolink-libatomic, use in
+Subject: [PATCH 27/35] configure: Add --enable-autolink-libatomic, use in
 LINK_GCC_C_SEQUENCE_SPEC [PR81358]

 This fixes issues with RISC-V.
@@ -166,10 +166,10 @@ index 57268319de1..56bcaa87620 100644
 # Checks for other programs
 # -------------------------
 diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi
-index 928fc6b6d4b..81a677014df 100644
+index b30d3691fe6..ccc8e5dbb00 100644
 --- a/gcc/doc/install.texi
 +++ b/gcc/doc/install.texi
-@@ -2374,6 +2374,14 @@ files, but these changed header paths may conflict with some compilation
+@@ -2377,6 +2377,14 @@ files, but these changed header paths may conflict with some compilation
 environments.  Enabled by default, and may be disabled using
 @option{--disable-canonical-system-headers}.
 
@@ -252,5 +252,5 @@ index 59390fd39d6..dae1dd4cf79 100644
 
 #ifdef ENABLE_DEFAULT_SSP
 -- 
-2.40.1
+2.41.0

@@ -1,7 +1,7 @@
-From c9b40cfd31fd166e7481480218c074ba6b1214cb Mon Sep 17 00:00:00 2001
+From 5bbbd320e54ab5341cfba83e8af98685131caba1 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 12:23:34 +0200
-Subject: [PATCH 28/32] configure: fix detection of atomic builtins in
+Subject: [PATCH 28/35] configure: fix detection of atomic builtins in
 libatomic configure script

 Alpine's --enable-autolink-libatomic (which is enabled for riscv64 by
@@ -53,5 +53,5 @@ index a92ae9e8309..90b579ca4d8 100644
   alpha*)
 	# fenv.c needs this option to generate inexact exceptions.
 -- 
-2.40.1
+2.41.0

@@ -1,7 +1,7 @@
-From e2b9546b31d33f7d13ba675171025cf30ae2e21e Mon Sep 17 00:00:00 2001
+From 430c701a3cefbe09a9c7c8a2f5bbe957f9b2ecb2 Mon Sep 17 00:00:00 2001
 From: Samuel Holland <samuel@sholland.org>
 Date: Thu, 30 Jun 2022 16:44:51 +0000
-Subject: [PATCH 29/32] libstdc++: do not throw exceptions for non-C locales on
+Subject: [PATCH 29/35] libstdc++: do not throw exceptions for non-C locales on
 musl targets

 ---
@@ -23,5 +23,5 @@ index 8849d78fdfa..aff467f98fe 100644
 
   void
 -- 
-2.40.1
+2.41.0

@@ -1,7 +1,7 @@
-From f036f4b4dc5476429e5485cdc5cc15c29da4d7e1 Mon Sep 17 00:00:00 2001
+From 05f0043755f341a2ff4f845379327076b3e0203d Mon Sep 17 00:00:00 2001
 From: Mathias LANG <pro.mathias.lang@gmail.com>
 Date: Mon, 17 Jan 2022 03:49:21 +0000
-Subject: [PATCH 30/32] gdc: unconditionally link libgphobos against
+Subject: [PATCH 30/35] gdc: unconditionally link libgphobos against
 libucontext

 ref: alpine/aports#13422
@@ -23,5 +23,5 @@ index 394b105b271..bc4a77fc300 100644
 	  --srcdir=$${topdir}/$$module_srcdir \
 	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
 -- 
-2.40.1
+2.41.0

@@ -1,7 +1,7 @@
-From 3b27d7eebc87675a377a68b8bb67bdd3399de67f Mon Sep 17 00:00:00 2001
+From 0b89a74fbf77ae6917f043c79cd03db0d6ef0212 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
 Date: Sat, 16 Jul 2022 09:21:11 +0200
-Subject: [PATCH 31/32] druntime: link against libucontext on all platforms
+Subject: [PATCH 31/35] druntime: link against libucontext on all platforms

 On musl-based Linux distributions, swapcontext etc. are not provided by
 musl but instead by libucontext. Hence, we _always_ need to link against
@@ -50,5 +50,5 @@ index 45a56f6f76a..fef6e890b1e 100644
     AC_SEARCH_LIBS([swapcontext], [c ucontext], [],
       AC_MSG_ERROR([swapcontext required but not found]))
 -- 
-2.40.1
+2.41.0

@@ -1,7 +1,7 @@
-From 5081b2b7526e11a4877548a2348c53798ba3de7b Mon Sep 17 00:00:00 2001
+From eeec799f43fbd0bfffc13594585b39d708972511 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
 Date: Tue, 19 Jul 2022 14:54:07 +0200
-Subject: [PATCH 32/32] libgnat: time_t is always 64-bit on musl libc
+Subject: [PATCH 32/35] libgnat: time_t is always 64-bit on musl libc

 ---
 gcc/ada/libgnat/s-parame.ads | 2 +-
@@ -21,5 +21,5 @@ index 3d6e345a1ba..cfe0b4d3ca6 100644
 
    ----------------------------------------------
 -- 
-2.40.1
+2.41.0

@@ -0,0 +1,44 @@
+From b71d21b87e6946c763edad5e420bf22d8a453077 Mon Sep 17 00:00:00 2001
+From: psykose <alice@ayaya.dev>
+Date: Mon, 29 May 2023 15:33:11 +0000
+Subject: [PATCH 33/35] libphobos: do not use LFS64 symbols
+
+musl does not have these since 1.2.4, we can't use the compat interfaces.
+---
+ libphobos/libdruntime/core/sys/posix/config.d   | 2 +-
+ libphobos/libdruntime/core/sys/posix/sys/mman.d | 6 +-----
+ 2 files changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/libphobos/libdruntime/core/sys/posix/config.d b/libphobos/libdruntime/core/sys/posix/config.d
+index ae6752f220e..6b80d1ff0e6 100644
+--- a/libphobos/libdruntime/core/sys/posix/config.d
+++ b/libphobos/libdruntime/core/sys/posix/config.d
+@@ -88,7 +88,7 @@ else version (CRuntime_Musl)
+     enum __REDIRECT          = false;
+ 
+     // Those three are irrelevant for Musl as it always uses 64 bits off_t
+-    enum __USE_FILE_OFFSET64 = _FILE_OFFSET_BITS == 64;
+    enum __USE_FILE_OFFSET64 = false;
+     enum __USE_LARGEFILE     = __USE_FILE_OFFSET64 && !__REDIRECT;
+     enum __USE_LARGEFILE64   = __USE_FILE_OFFSET64 && !__REDIRECT;
+ 
+diff --git a/libphobos/libdruntime/core/sys/posix/sys/mman.d b/libphobos/libdruntime/core/sys/posix/sys/mman.d
+index 0d3d517d69a..323aa0af72d 100644
+--- a/libphobos/libdruntime/core/sys/posix/sys/mman.d
+++ b/libphobos/libdruntime/core/sys/posix/sys/mman.d
+@@ -293,11 +293,7 @@ else version (CRuntime_Bionic)
+ }
+ else version (CRuntime_Musl)
+ {
+-    static if (__USE_LARGEFILE64) void* mmap64(void*, size_t, int, int, int, off_t);
+-    static if (__USE_FILE_OFFSET64)
+-        alias mmap = mmap64;
+-    else
+-        void* mmap(void*, size_t, int, int, int, off_t);
+    void* mmap(void*, size_t, int, int, int, off_t);
+     int munmap(void*, size_t);
+ }
+ else version (CRuntime_UClibc)
+-- 
+2.41.0
+
@@ -0,0 +1,195 @@
+From 4bfcb35bc43d3e3b7510620362d7c28d9e4c17ca Mon Sep 17 00:00:00 2001
+From: psykose <alice@ayaya.dev>
+Date: Mon, 10 Jul 2023 23:23:29 +0000
+Subject: [PATCH 34/35] libgo: fix lfs64 use
+
+---
+ .../go/internal/syscall/unix/at_largefile.go  |  2 +-
+ libgo/go/os/dir_largefile.go                  |  2 +-
+ libgo/go/syscall/libcall_glibc.go             |  2 +-
+ libgo/go/syscall/libcall_linux.go             |  4 +--
+ libgo/go/syscall/libcall_posix_largefile.go   | 26 +++++++++----------
+ libgo/runtime/go-varargs.c                    |  2 +-
+ libgo/sysinfo.c                               |  9 +++----
+ 7 files changed, 22 insertions(+), 25 deletions(-)
+
+diff --git a/libgo/go/internal/syscall/unix/at_largefile.go b/libgo/go/internal/syscall/unix/at_largefile.go
+index 82e0dcfd074..16151ecad1b 100644
+--- a/libgo/go/internal/syscall/unix/at_largefile.go
+++ b/libgo/go/internal/syscall/unix/at_largefile.go
+@@ -10,5 +10,5 @@ import (
+ 	"syscall"
+ )
+ 
+-//extern fstatat64
+//extern fstatat
+ func fstatat(int32, *byte, *syscall.Stat_t, int32) int32
+diff --git a/libgo/go/os/dir_largefile.go b/libgo/go/os/dir_largefile.go
+index 1fc5ee0771f..0c6dffe1a75 100644
+--- a/libgo/go/os/dir_largefile.go
+++ b/libgo/go/os/dir_largefile.go
+@@ -11,5 +11,5 @@ package os
+ 
+ import "syscall"
+ 
+-//extern readdir64
+//extern readdir
+ func libc_readdir(*syscall.DIR) *syscall.Dirent
+diff --git a/libgo/go/syscall/libcall_glibc.go b/libgo/go/syscall/libcall_glibc.go
+index 5c1ec483c75..5a1245ed44b 100644
+--- a/libgo/go/syscall/libcall_glibc.go
+++ b/libgo/go/syscall/libcall_glibc.go
+@@ -114,7 +114,7 @@ func Pipe2(p []int, flags int) (err error) {
+ }
+ 
+ //sys	sendfile(outfd int, infd int, offset *Offset_t, count int) (written int, err error)
+-//sendfile64(outfd _C_int, infd _C_int, offset *Offset_t, count Size_t) Ssize_t
+//sendfile(outfd _C_int, infd _C_int, offset *Offset_t, count Size_t) Ssize_t
+ 
+ func Sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
+ 	if race.Enabled {
+diff --git a/libgo/go/syscall/libcall_linux.go b/libgo/go/syscall/libcall_linux.go
+index 03ca7261b59..ad21fd0b3ac 100644
+--- a/libgo/go/syscall/libcall_linux.go
+++ b/libgo/go/syscall/libcall_linux.go
+@@ -158,7 +158,7 @@ func Reboot(cmd int) (err error) {
+ //adjtimex(buf *Timex) _C_int
+ 
+ //sys	Fstatfs(fd int, buf *Statfs_t) (err error)
+-//fstatfs64(fd _C_int, buf *Statfs_t) _C_int
+//fstatfs(fd _C_int, buf *Statfs_t) _C_int
+ 
+ func Gettid() (tid int) {
+ 	r1, _, _ := Syscall(SYS_GETTID, 0, 0, 0)
+@@ -245,7 +245,7 @@ func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n i
+ }
+ 
+ //sys	Statfs(path string, buf *Statfs_t) (err error)
+-//statfs64(path *byte, buf *Statfs_t) _C_int
+//statfs(path *byte, buf *Statfs_t) _C_int
+ 
+ //sysnb	Sysinfo(info *Sysinfo_t) (err error)
+ //sysinfo(info *Sysinfo_t) _C_int
+diff --git a/libgo/go/syscall/libcall_posix_largefile.go b/libgo/go/syscall/libcall_posix_largefile.go
+index f90055bb29a..334212f0af1 100644
+--- a/libgo/go/syscall/libcall_posix_largefile.go
+++ b/libgo/go/syscall/libcall_posix_largefile.go
+@@ -10,40 +10,40 @@
+ package syscall
+ 
+ //sys	Creat(path string, mode uint32) (fd int, err error)
+-//creat64(path *byte, mode Mode_t) _C_int
+//creat(path *byte, mode Mode_t) _C_int
+ 
+ //sys	Fstat(fd int, stat *Stat_t) (err error)
+-//fstat64(fd _C_int, stat *Stat_t) _C_int
+//fstat(fd _C_int, stat *Stat_t) _C_int
+ 
+ //sys	Ftruncate(fd int, length int64) (err error)
+-//ftruncate64(fd _C_int, length Offset_t) _C_int
+//ftruncate(fd _C_int, length Offset_t) _C_int
+ 
+ //sysnb	Getrlimit(resource int, rlim *Rlimit) (err error)
+-//getrlimit64(resource _C_int, rlim *Rlimit) _C_int
+//getrlimit(resource _C_int, rlim *Rlimit) _C_int
+ 
+ //sys	Lstat(path string, stat *Stat_t) (err error)
+-//lstat64(path *byte, stat *Stat_t) _C_int
+//lstat(path *byte, stat *Stat_t) _C_int
+ 
+ //sys	mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error)
+-//mmap64(addr *byte, length Size_t, prot _C_int, flags _C_int, fd _C_int, offset Offset_t) *byte
+//mmap(addr *byte, length Size_t, prot _C_int, flags _C_int, fd _C_int, offset Offset_t) *byte
+ 
+ //sys	Open(path string, mode int, perm uint32) (fd int, err error)
+-//__go_open64(path *byte, mode _C_int, perm Mode_t) _C_int
+//__go_open(path *byte, mode _C_int, perm Mode_t) _C_int
+ 
+ //sys	Pread(fd int, p []byte, offset int64) (n int, err error)
+-//pread64(fd _C_int, buf *byte, count Size_t, offset Offset_t) Ssize_t
+//pread(fd _C_int, buf *byte, count Size_t, offset Offset_t) Ssize_t
+ 
+ //sys	Pwrite(fd int, p []byte, offset int64) (n int, err error)
+-//pwrite64(fd _C_int, buf *byte, count Size_t, offset Offset_t) Ssize_t
+//pwrite(fd _C_int, buf *byte, count Size_t, offset Offset_t) Ssize_t
+ 
+ //sys	Seek(fd int, offset int64, whence int) (off int64, err error)
+-//lseek64(fd _C_int, offset Offset_t, whence _C_int) Offset_t
+//lseek(fd _C_int, offset Offset_t, whence _C_int) Offset_t
+ 
+ //sysnb	Setrlimit(resource int, rlim *Rlimit) (err error)
+-//setrlimit64(resource int, rlim *Rlimit) _C_int
+//setrlimit(resource int, rlim *Rlimit) _C_int
+ 
+ //sys	Stat(path string, stat *Stat_t) (err error)
+-//stat64(path *byte, stat *Stat_t) _C_int
+//stat(path *byte, stat *Stat_t) _C_int
+ 
+ //sys	Truncate(path string, length int64) (err error)
+-//truncate64(path *byte, length Offset_t) _C_int
+//truncate(path *byte, length Offset_t) _C_int
+diff --git a/libgo/runtime/go-varargs.c b/libgo/runtime/go-varargs.c
+index f84860891e6..7efc9615985 100644
+--- a/libgo/runtime/go-varargs.c
+++ b/libgo/runtime/go-varargs.c
+@@ -84,7 +84,7 @@ __go_ioctl_ptr (int d, int request, void *arg)
+ int
+ __go_open64 (char *path, int mode, mode_t perm)
+ {
+-  return open64 (path, mode, perm);
+  return open (path, mode, perm);
+ }
+ 
+ #endif
+diff --git a/libgo/sysinfo.c b/libgo/sysinfo.c
+index 180f5c31d74..1d717d55c0e 100644
+--- a/libgo/sysinfo.c
+++ b/libgo/sysinfo.c
+@@ -366,7 +366,7 @@ typedef loff_t libgo_loff_t_type;
+ #endif
+ 
+ #if defined(HAVE_OFF64_T)
+-typedef off64_t libgo_off_t_type;
+typedef off_t libgo_off_t_type;
+ #else
+ typedef off_t libgo_off_t_type;
+ #endif
+@@ -398,13 +398,11 @@ typedef off_t libgo_off_t_type;
+ 
+ // From dirent.h
+ SREF(dirent);
+-SREF(dirent64);
+ OTREF(DIR);
+ EREF(DT_UNKNOWN);
+ 
+ // From fcntl.h
+ SREF(flock);
+-SREF(flock64);
+ 
+ // From ffi headers
+ SREF(_ffi_type);
+@@ -485,11 +483,10 @@ EREF(SS_ONSTACK);
+ EREF(SEGV_MAPERR);
+ 
+ // From stat.h
+-SREF(stat64);
+SREF(stat);
+ 
+ // From statfs.h
+ SREF(statfs);
+-SREF(statfs64);
+ 
+ // From sysinfo.h
+ SREF(sysinfo);
+@@ -519,7 +516,7 @@ EREF(PTRACE_PEEKTEXT);
+ 
+ // From sys/resource.h
+ SREF(rusage);
+-SREF(rlimit64);
+SREF(rlimit);
+ EREF(RLIMIT_NOFILE);
+ EREF(PRIO_USER);
+ EREF(RUSAGE_SELF);
+-- 
+2.41.0
+
@@ -0,0 +1,61 @@
+From ef740fff300fd9eb8285fb5611f6205705ee54ec Mon Sep 17 00:00:00 2001
+From: Prathamesh Kulkarni <prathamesh.kulkarni@linaro.org>
+Date: Fri, 23 Jun 2023 15:27:17 +0530
+Subject: [PATCH 35/35] Fix ICE observed in PR110280.
+
+gcc/ChangeLog:
+	PR tree-optimization/110280
+	* match.pd (vec_perm_expr(v, v, mask) -> v): Explicitly build vector
+	using build_vector_from_val with the element of input operand, and
+	mask's type if operand and mask's types don't match.
+
+gcc/testsuite/ChangeLog:
+	PR tree-optimization/110280
+	* gcc.target/aarch64/sve/pr110280.c: New test.
+---
+ gcc/match.pd                                    |  9 ++++++++-
+ gcc/testsuite/gcc.target/aarch64/sve/pr110280.c | 12 ++++++++++++
+ 2 files changed, 20 insertions(+), 1 deletion(-)
+ create mode 100644 gcc/testsuite/gcc.target/aarch64/sve/pr110280.c
+
+diff --git a/gcc/match.pd b/gcc/match.pd
+index 91182448250..c3bb4fbc0a7 100644
+--- a/gcc/match.pd
+++ b/gcc/match.pd
+@@ -8292,7 +8292,14 @@ and,
+ 
+ (simplify
+  (vec_perm vec_same_elem_p@0 @0 @1)
+- @0)
+ (if (types_match (type, TREE_TYPE (@0)))
+  @0
+  (with
+   {
+     tree elem = uniform_vector_p (@0);
+   }
+   (if (elem)
+    { build_vector_from_val (type, elem); }))))
+ 
+ /* Push VEC_PERM earlier if that may help FMA perception (PR101895).  */
+ (simplify
+diff --git a/gcc/testsuite/gcc.target/aarch64/sve/pr110280.c b/gcc/testsuite/gcc.target/aarch64/sve/pr110280.c
+new file mode 100644
+index 00000000000..d3279f38362
+--- /dev/null
+++ b/gcc/testsuite/gcc.target/aarch64/sve/pr110280.c
+@@ -0,0 +1,12 @@
+/* { dg-do compile } */
+/* { dg-options "-O3 -fdump-tree-optimized" } */
+
+#include "arm_sve.h"
+
+svuint32_t l()
+{
+  _Alignas(16) const unsigned int lanes[4] = {0, 0, 0, 0};
+  return svld1rq_u32(svptrue_b8(), lanes);
+}
+
+/* { dg-final { scan-tree-dump-not "VEC_PERM_EXPR" "optimized" } } */
+-- 
+2.41.0
+
@@ -24,15 +24,17 @@ CBUILDROOT="/"
 _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"

 pkgname=gcc-armhf
-_pkgbase=13.1.1 # must match gcc/BASE-VER
-_pkgsnap=20230520
-pkgver=${_pkgbase}_git$_pkgsnap
+pkgver=13.1.1_git20230722
+# i.e. 13.1.1, must match gcc/BASE-VER
+_pkgbase="${pkgver%%_git*}"
+# date component from snapshots
+_pkgsnap="${pkgver##*_git}"
 [ "$BOOTSTRAP" = "nolibc" ] && pkgname="gcc-pass2"
 [ "$CBUILD" != "$CHOST" ] && _cross="-$CARCH" || _cross=""
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""

 pkgname=gcc-armhf
-pkgrel=0
+pkgrel=1
 pkgdesc="Stage2 cross-compiler for armhf"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -264,6 +266,9 @@ source="https://dev.alpinelinux.org/archive/gcc/${_pkgbase%%.*}-$_pkgsnap/gcc-${
 	0030-gdc-unconditionally-link-libgphobos-against-libucont.patch
 	0031-druntime-link-against-libucontext-on-all-platforms.patch
 	0032-libgnat-time_t-is-always-64-bit-on-musl-libc.patch
+	0033-libphobos-do-not-use-LFS64-symbols.patch
+	0034-libgo-fix-lfs64-use.patch
+	0035-Fix-ICE-observed-in-PR110280.patch
 	"

 # we build out-of-tree
@@ -316,7 +321,7 @@ build() {
 	powerpc-*-*-*)		_arch_configure="--enable-secureplt --enable-decimal-float=no";;
 	powerpc64*-*-*-*)	_arch_configure="--with-abi=elfv2 --enable-secureplt --enable-decimal-float=no --enable-targets=powerpcle-linux";;
 	i486-*-*-*)		_arch_configure="--with-arch=i486 --with-tune=generic --enable-cld";;
-	i586-*-*-*)		_arch_configure="--with-arch=i586 --with-tune=generic --enable-cld";;
+	i586-*-*-*)		_arch_configure="--with-arch=pentium-m --with-fpmath=sse --with-tune=generic --enable-cld";;
 	s390x-*-*-*)		_arch_configure="--with-arch=z196 --with-tune=zEC12 --with-zarch --with-long-double-128 --enable-decimal-float";;
 	riscv64-*-*-*)		_arch_configure="--with-arch=rv64gc --with-abi=lp64d --enable-autolink-libatomic";;
 	esac
@@ -420,7 +425,7 @@ build() {

 package() {
 	cd "$_builddir"
-	make DESTDIR="$pkgdir" install
+	make -j1 DESTDIR="$pkgdir" install

 	ln -s gcc "$pkgdir"/usr/bin/cc

@@ -777,37 +782,40 @@ gdb() {
 }

 sha512sums="
-d677cb9ca786128ecd0e3fd465e4ba7beb93244dcf174260e3d980f22807aa8df631954a403ff00bc1ed0597bfbd5475d8369c169c44ef1cb69166ed42bfa29e  gcc-13-20230520.tar.xz
-a39a2485fcffb05757e8a9100985a4c87cc472028ad756e1992747d3e737bd7526d2cc054f7f0e7c24708d2ba9e898eaebf3f2db424a1895daf796e126772e5e  0001-posix_memalign.patch
-a7bf2f69dc983c87dcc480b7c03d80d26128c89afbfea7f035694d7076aacf9361d39b734de5353b52e4e448e84aac68812006da42664bae661b66d4f8ea5098  0002-gcc-poison-system-directories.patch
-a0d4f99e0b3bc0c653d9e23b91c602d1e1ce22d67731aaf76ee267654fcffdfdfc2982b4e99ef6b5523def4cfd5a96e2a20aa5f9efa5256315e824dac3bab806  0003-specs-turn-on-Wl-z-now-by-default.patch
-ae94863ffecb30a40f3fd79f8b31106bbf8a17dbf13c6036847f1ba2726cc96f2a957f4694f3c880c06ee1dc8fbd990e957b9b55b0275e7d8cc7df10286942fa  0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
-2356813aec1ff0a3e82fedfe5dbd0f8c6d442cf567851db40077f98d659b7d048a5349e1ac9c056384a663dad08782d80e29675a457c503200b274a50a6db72d  0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
-c9ee725e69b20f15029920bc187178fbb1c6f0375f16ea1a1052187e591569618c93b108b0f4c387530d976e5daba607b9b76e5ec14a776799324ce7f7c3b11d  0006-Enable-Wformat-and-Wformat-security-by-default.patch
-70fe923321aa50bd4bf9b67d3bb872e03ecd5dd9669e783d7893513c0c86aaca6cac39c7dcc5818bfd4e5ba59f7e2b2e790ac87fcb0dc348c543c15bbb3f7064  0007-Enable-Wtrampolines-by-default.patch
-fa3106eb878ea48479f3145c837b4bb3e563edb9e0535b833f5d7006507af7427902b45c56751c8220eb828e02219e4c54835aa4c0c6eebf797bc29d3d9a7036  0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
-8054b3fb3b9e53000fb00229675b6408defac71f38fceff78372e154990540a23b1790cd7b30a61bfd2ae982cc7c9c8c0405398173abd5618e1814d3ccd85ce9  0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
-1591ba8c8e873d3e38da61038df0b0da0594f15dd8659c1a2a3f834d55599fc7adab18713c26bcfe389a023dc12d7e00231c4b6b61f6b23ff602c8360d459115  0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
-4d03d0bcb31e7a9e171ad408514ec4b1f90783891345bfbf65e513798271b1bbca41a7da616a4ae947a6ba1343a0df9b95233fa202eec70e88fec485841f2413  0011-libiberty-copy-PIC-objects-during-build-process.patch
-62574f57043a24ebc644dd761aa46334071c6f0e721375a83f36099b2514dcc7df0b2900fcd52dee7754664e3f59f7686d8b39bf9df5c61893206f34f485cb49  0012-libgcc_s.patch
-342782bdaaed8107758345fddb01be3df9e880af235f40c598d46a35c9b1499b7ca10d968f381af168886500aca5a155175d1576f1c30a00555da7467b9d1ccc  0013-nopie.patch
-e65bae2cce0e17586384b100ef3dbde232d9f7809cfd40dedb466a24ff2d87b92d68b1a02fe29ec958561bad49658c6a474eae32dd2ee151715808cb5bbfd1a9  0014-ada-fix-shared-linking.patch
-d23962505d7bfa99180edfe727df80e4b5d101697537d818327d9e836e90305b16de95729c70268150b55268d01ad5f1d92b70a0a056884f70abf5c4d5870e27  0015-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
-a4621dca1edb35e2648a348240bd6790e49b9db1fe7b9f81777222d4b1b241b3ee56a4fca9a02964a00ccc4bd291e37d5911fd142d55002424cd9b9e39f7f98f  0016-add-fortify-headers-paths.patch
-3ab96307b31a45e40e174986d13bba620f91954738d84f02ed024854a2cabebf5e6e62589c7006097eb4fb76d5ec526589a877cb8c01f90e5b24819fb191c182  0017-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
-da8b091796740d315f2e23cc63820f1f5ed242f5ce04acf1603fa308b6f3e09088b6976a984180ff54cefdfa4b279706e1ef5df675c0644028fbf3c948ee6e37  0018-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
-39fec69162c86160ee24030c9f14303dc8aac3341f1a8eabb23d1db58c63a3e7252b5b19172ace6730064a9bf1a848d83882f59b4ada319de46dc99ffbd30c83  0019-aarch64-disable-multilib-support.patch
-da2da38d118213567cfbe7c81a8c60deff8e77306b4d5e44d208dfcb6ebc7f29c3964106ebf3dd130edb8a343cc7ecddb3314c14488a429301dbf4750edc65ea  0020-s390x-disable-multilib-support.patch
-d74ba03a6da1bcc18e70f017616ab2a1b901e8d04dcb6ea994420aecd042378ec440652ba1168b05a40ddff431ae5b69a19148e928fa70e3e15ba91a03224fad  0021-ppc64-le-disable-multilib-support.patch
-828281a2e7404eedfd7a9a90a553ca7e4eab2a19d2a442faa69c3c2ecefe1a3750426bf5fe6d421dedbfba83feddbba04cb6938658d15110b4007813319713c0  0022-x86_64-disable-multilib-support.patch
-c7d76f6d987e51e488e404ca75a4c44ed35be6fda925cf0f4cfc9d85e71df6b034d514fdd2748e26d889f8ee30a252224096241348cd06516f2469a3ed6a6a35  0023-riscv-disable-multilib-support.patch
-42d9cce946d51d046a96930335915c927d2bb846d6cff685351f58a1006eb5f831b0fd928091df17ed5d4ac1efbbd359b54c325c40e70737d0302d22c8262606  0024-always-build-libgcc_eh.a.patch
-c45c449e5304a7483b1141f87a53ab4658402dec8fa5d5116fa7a5e4bebba322da3214cf85c9b25e1c6d040ec81c0094b56a1ed4eefbcde91235816aa0159c6e  0025-ada-libgnarl-compatibility-for-musl.patch
-e09ef88df90c4b484ab4172d7ac68c1defd9f1897fadfcb23572e2829e0f795f3eeb1e5ceeb6aac76cab938a0962371e99c168dcf1c2c4c31c8a8b4fa774dc3e  0026-ada-musl-support-fixes.patch
-0661fe9d2a61d4de8d9862d6d936bad8236f9ce679b5e40eea7d54b042a7f860f21103e489a8c7a2b12b1e368194ffeb9b4672d7086ebf4189c77f0a27f27a71  0027-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
-68da13272861a0b3f33022350135660af9a060d03529b610dddf540fb77050647934f1a463c681d1556fa0005b6c16fe76cad285667d1349d5be50ccc83c530e  0028-configure-fix-detection-of-atomic-builtins-in-libato.patch
-f638c4d7a3fb54d5fd76b7e9b49d8dd1041347409f842453bf862586e2770d595aa9e58f8c1ec45e3c37235d5e74b7327f4610a3cad81c0a757a1271e5a0e572  0029-libstdc-do-not-throw-exceptions-for-non-C-locales-on.patch
-f6f2971f4e1bc58c0aeb2a62d9ad551a0fe855b9086f308dce2bb713214415c9679e8e6547290b1514dfd3bc7296d3dfdb7c2964289bbec737984a7810e5ef5d  0030-gdc-unconditionally-link-libgphobos-against-libucont.patch
-ab26344341f5e75673e3a95590fb59fde3ee681949c3004e93ef04af9f1fe2d063c22fc21d14882808d3331ce9eeb135a33b87aeed4d3bf74cc9b087ac56610e  0031-druntime-link-against-libucontext-on-all-platforms.patch
-5dfdd7645ba5090ac46e025ce3ce629cbf612518654dced2159e0a621d0ef8e231514bad4746aa8863e544077502d4842486b978a0c3857c4ad48b20c49ef2d1  0032-libgnat-time_t-is-always-64-bit-on-musl-libc.patch
+284719308cad4546ebd85934fb9f12112e8f1a4c3e5beea0760da1f73509907c194e7c133e6e755b6148bd1c51a72c071ac0d16b05641d901af7105461686655  gcc-13-20230722.tar.xz
+1ecffba1b07d60e1b4422302b032bbea918b674c8e12b30aa6965b544d700ce86b61e9f7b8d402c6caf59257f491a394dd0912f0948565d6eae9335ee54f3b35  0001-posix_memalign.patch
+163f282455b6a4df33f011bcd8b0440566ba0ffaeeab30d8ac52d39948980a56881ca0eff60687129d59556389a58b9d64e7768750bd70b1fe0fedbc9fc30dc2  0002-gcc-poison-system-directories.patch
+3f24bb6a50d3c45b71ea05590e32fe3e69b91377ab185352891d5035c76ed193117c6d0b314a4c364bcf136b9a9dd5c926d6c7c30ab436976c121ebfea8d3ddd  0003-specs-turn-on-Wl-z-now-by-default.patch
+17a2993027d3ddf8595952ebcae425695ddc7b1cf73b384d2e55fddecb9cbf3f6482860a502ff69b14075e12badf27300fd3039f3a9005e851fd8d121d258c2b  0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
+444550e55491ff89fe8cbbb4b73d017c9c147cdce1ad5c0561fe7d6ab3834515a814c7676c408cfeec18e1aaace27b3c26a2ffe4a75042285df5124976c38672  0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
+5a5f57e4e45745bb4d9d63d7d410fe9dd56ce12dbd70c376dd45015909307faf02391e75368e4e7404591614a874cee41b20652cf27be234765d6db97ceb4e7e  0006-Enable-Wformat-and-Wformat-security-by-default.patch
+3a2b22388398a93dae7787e794cd580b9c577326f286241e086120c1fcfdd9228c2e00407088ebb163fb1acc21722c199071343551c989a958dc3c845b15132d  0007-Enable-Wtrampolines-by-default.patch
+7535de1c552544e3a51cbb00b5e08ac59edbf3bdcfce2a63b9f319fada3f3676f47e3a00c75d91bcefd14500555ea0844f18c130ff46b20f416ea76071e5af39  0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
+93d03afd83dee5f7129c36a7b81fa8fd323476507e2f53a4fbe40a026037e7dfafa23591145d7af5848d9a322d212497947a0f58ef828734552e6a6dabd00cfa  0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
+da9eaf2f0ddbec5ee14dc26053936587e6c76fbf16846db804a18cf4d318579426ebcc566aed02daf8e34f60c08b61f5d3959305886dca9bbcdc84db057258d9  0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
+35b9aafe7eee8138cb7aad7164a8f77c15ccdce26843cee78b5871ef91d76cad22ed0871b20f51c4b89b71afd9cfe4ba4227086e158c466558513708fe7d2a1a  0011-libiberty-copy-PIC-objects-during-build-process.patch
+9d43f844fad0ac6e1c35a2b6f461f9278ae09e468f2c9ae8adc43accbe6934994aa10d3a433644d1393a4a76e3caed69e3191db7f3c0c24b4e7a0a0a0cbac3f1  0012-libgcc_s.patch
+b2c4921c5eef33ee43a92ab5ec7f09d5d3adb49a2416595001e6376ffdf652ef9d0dc21778c3a86e45334290dbe467a4e891ed34a6522e0c72f746def22e8663  0013-nopie.patch
+0b50ad15115192699efa9fda3d4fb1c2fa95da06d7880ba34615b40c19a8256e1fe364da39f5c70dc22fbccf21db2de5900932afef68948722eeb25e435262f8  0014-ada-fix-shared-linking.patch
+00097c7106625ccf02149a757366f434c48f2abe824bb8b4bf067d29308889cb6039a5e5b2d3bd2683617693b47707d549252c56eea6bc3cdc2450a8d14f46a7  0015-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
+7f0bc42b93a389b614054e700b851abfbc53db391aa10cbdf6990d41396b293af78980bb39f1cf0967184d3fbf3d46ac7c7f096717b8f193ea34cbf7f37d7e91  0016-add-fortify-headers-paths.patch
+0841acbce81250f8cb140a75ff62958dfcab3bed792822baf1fe4193dd62633648343f4b66df886c12338eed88a98e591b968131416460f9f0274046019bb8ef  0017-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
+589d538bdf692559e475e53c79869734dede0eb15228cab9ca901c9db81b0e78a0e532b20dfb05ca584ea19ff4bedd83e139ddca912a26b446c5eb6905180536  0018-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
+2213e07bab6f5d8d3d39c732f5385f46cc8f0c84e35054139fdaf13051252d7bf11f647f54aa8456b532166b008fff0656d8f41278e34ba868dd6fe427427a3a  0019-aarch64-disable-multilib-support.patch
+a9567947471c3ba8a547a79c55e183974554bf823d9a97a165c966d7b3caad8789980e096e3b78452ece5de062bd9bb006af464bbf0c5a35b689eac3ee21e5c5  0020-s390x-disable-multilib-support.patch
+f382eb5f7c2c60c5a23fac587c9629a3059d7be0898e97a1feaf9b9cbe1ef4693cc1177eb29333e8b7944fa17487478e73958be45d5782ccb9ef501961fb9a96  0021-ppc64-le-disable-multilib-support.patch
+44ab86feb8e41e7c2b2e27accdf46194c9b80ee6a39543303dc04824f669d9fad182aabd40c9c7f6c265cf9bb71be830c257be115dc9d701d54eca3aa9ef174e  0022-x86_64-disable-multilib-support.patch
+e0763083c31485e8ac0b3724376a28af01bb6f50e1a054780b61886e4e3de2a35d127e6e353eb8d8729964ada9b5751bf05bdd51df539667008216db38f228a3  0023-riscv-disable-multilib-support.patch
+ab88a2f63e3545bbc36537aa9a86f2c6c35e41bbf702d6e13743a405cdac4f901eed5737189b780da96647fea9f5d863fdc76373f25a00064106dcb5514d6d87  0024-always-build-libgcc_eh.a.patch
+8fdbe0c8bf4ca60f458a33e59027de03d15ac91933fe46d8ca62119346d20b9bc2447c0bf22bceb63d0cf8613ab61512d9197f4e6c2224af473b63ef9f254295  0025-ada-libgnarl-compatibility-for-musl.patch
+30369bea84020c32d514196ba3adb3d09d2d0359af5550bd3f9719aa357e44b2f695623c1d2a99416e120dc86896c196c5dd4f638183dced4799604137385367  0026-ada-musl-support-fixes.patch
+3f9a406d7d2ce34951215ffbcadb49a45e55ad5c24ab9097c0e5e92383e43b876872ccd2a7e7def2833ab204975ee5733f8bcf90934db9fa9c4f6f56c62081f6  0027-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
+720a4001f9a1fa4122e456077ecff8d3eb8af7c83d0a81f9da6a6cca05b23664206a82a349e34482c48bfe40e99aa5f21567613d0913f6a24f282bc84a994496  0028-configure-fix-detection-of-atomic-builtins-in-libato.patch
+2044c23b23726965c0a6fd39f616cc464badd650947cb40495eeabd906a3af629878c1d28b403b8eb46b30a1a0ba39083023290d62f0c99ccf070063226e3f8f  0029-libstdc-do-not-throw-exceptions-for-non-C-locales-on.patch
+58e8415612e1042329ad114471852c19f6bf15bf3bfd7cd81ceeafa75778bcc28410a01071a7c8cbf12b8f549acd85723215772813deedb8f266e28b9e01a353  0030-gdc-unconditionally-link-libgphobos-against-libucont.patch
+d47b559075f40d526235f47b91da1d0cf6bfe6c5b7311bbfe08af9dd6e8f27e6c7cd82e3b2d529aab0536246fc56e2d42c089b22cacb0e7f09ca4a9d07556994  0031-druntime-link-against-libucontext-on-all-platforms.patch
+b325035cb7122d79c6b42ca6d3fc9e02319ed2f7cddb0639dff25d2798d2ce63812cd623462cdf95e21c9ffbf2412193f8b9fc89a4c36fa5a6a041661ac7399d  0032-libgnat-time_t-is-always-64-bit-on-musl-libc.patch
+c474f34e6f9a4239d486a65141a133dbe8ce91427d502a57a9fd6eb403478a2b5715ba74f24c1cc0761e16eec77ba2c1ca921fb7d7bc1e040fc3703fc9559e75  0033-libphobos-do-not-use-LFS64-symbols.patch
+c4482ffc36e7894b2140800159f4cbc9a3e9011e43a69b69f4fa92d5a11e2ee645c7e21df4423dd1e0636e8890849a5719647bfbdf84f951d638f8f488cb718c  0034-libgo-fix-lfs64-use.patch
+048d767f4477c92ee6835850d13063ede21c0be751d0945c94445d04054e134cdc617eeb0b1ac8c892a604d8644580fcfebeccaf537d6b7380558ac6378e445a  0035-Fix-ICE-observed-in-PR110280.patch
 "
@@ -1,7 +1,7 @@
-From 5238749680d22a42e90dc3832ef1ad1c9a5f1c20 Mon Sep 17 00:00:00 2001
+From 47b4bd4deb2c356bb07d2a96f22127aefafec3a4 Mon Sep 17 00:00:00 2001
 From: Szabolcs Nagy <nsz@port70.net>
 Date: Fri, 26 Jan 2018 20:32:50 +0000
-Subject: [PATCH 01/32] posix_memalign
+Subject: [PATCH 01/35] posix_memalign

 ---
 gcc/config/i386/pmm_malloc.h | 9 +++++----
@@ -38,5 +38,5 @@ index 3527283693b..c4071b64b53 100644
   else
     return NULL;
 -- 
-2.40.1
+2.41.0

@@ -1,7 +1,7 @@
-From dc71cb9815d25a57430ef5d8e2a87312d8c3b467 Mon Sep 17 00:00:00 2001
+From 4fa620d8c3e6730211bfb071eb4c817320491bd0 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 02/32] gcc: poison-system-directories
+Subject: [PATCH 02/35] gcc: poison-system-directories

 Add /sw/include and /opt/include based on the original
 zecke-no-host-includes.patch patch.  The original patch checked for
@@ -120,7 +120,7 @@ index 09082e8ccae..5504bf6eb01 100644
 AC_SUBST(subdirs)
 AC_SUBST(srcdir)
 diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index c0c3ad14515..7cdd5bfa952 100644
+index af0e5933fdb..b6731a4673c 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
@@ -384,6 +384,7 @@ Objective-C and Objective-C++ Dialects}.
@@ -131,7 +131,7 @@ index c0c3ad14515..7cdd5bfa952 100644
 -Wno-pragmas  -Wno-prio-ctor-dtor  -Wredundant-decls
 -Wrestrict  -Wno-return-local-addr  -Wreturn-type
 -Wno-scalar-storage-order  -Wsequence-point
-@@ -8424,6 +8425,14 @@ made up of data only and thus requires no special treatment.  But, for
+@@ -8426,6 +8427,14 @@ made up of data only and thus requires no special treatment.  But, for
 most targets, it is made up of code and thus requires the stack to be
 made executable in order for the program to work properly.
 
@@ -199,5 +199,5 @@ index 4d44321183f..0f3f071b44c 100644
 
 /* Use given -I paths for #include "..." but not #include <...>, and
 -- 
-2.40.1
+2.41.0

@@ -1,7 +1,7 @@
-From 95cd372c839d347b41e22605d569cca6a2119b85 Mon Sep 17 00:00:00 2001
+From ff4dd4ce33133e675b7bedc86b73357c04631cb9 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:45:49 +0000
-Subject: [PATCH 03/32] specs: turn on -Wl,-z,now by default
+Subject: [PATCH 03/35] 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.
@@ -14,10 +14,10 @@ now by default.
 2 files changed, 4 insertions(+)

 diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index 7cdd5bfa952..158b7bcb81e 100644
+index b6731a4673c..f393c7846c6 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
-@@ -17959,6 +17959,9 @@ For example, @option{-Wl,-Map,output.map} passes @option{-Map output.map} to the
+@@ -17961,6 +17961,9 @@ For example, @option{-Wl,-Map,output.map} passes @option{-Map output.map} to the
 linker.  When using the GNU linker, you can also get the same effect with
 @option{-Wl,-Map=output.map}.
 
@@ -40,5 +40,5 @@ index 33b56e721d2..f82fae23c22 100644
     %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!r:%{!nostartfiles:%S}}} \
     %{Wno-poison-system-directories:--no-poison-system-directories} \
 -- 
-2.40.1
+2.41.0

@@ -1,7 +1,7 @@
-From 12b0a32aa19334c1b5dd20c9cc3b0ca885e973ce Mon Sep 17 00:00:00 2001
+From 1b315235433701e4a974da259b8d651169ddc7ac Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:46:22 +0000
-Subject: [PATCH 04/32] Turn on -D_FORTIFY_SOURCE=2 by default for C, C++,
+Subject: [PATCH 04/35] Turn on -D_FORTIFY_SOURCE=2 by default for C, C++,
 ObjC, ObjC++, if the optimization level is > 0

 ---
@@ -25,10 +25,10 @@ index 5d64625fcd7..868d69506e4 100644
   if (flag_gnu89_inline)
     cpp_define (pfile, "__GNUC_GNU_INLINE__");
 diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index 158b7bcb81e..cc9972f907b 100644
+index f393c7846c6..ef3c14a189e 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
-@@ -11866,6 +11866,12 @@ also turns on the following optimization flags:
+@@ -11868,6 +11868,12 @@ also turns on the following optimization flags:
 Please note the warning under @option{-fgcse} about
 invoking @option{-O2} on programs that use computed gotos.
 
@@ -42,5 +42,5 @@ index 158b7bcb81e..cc9972f907b 100644
 @item -O3
 Optimize yet more.  @option{-O3} turns on all optimizations specified
 -- 
-2.40.1
+2.41.0

@@ -1,7 +1,7 @@
-From 8693307d930c085828c921023219d4c1459a32e9 Mon Sep 17 00:00:00 2001
+From 67c0f5789630b27149f60ff831999ef7c1dba5d5 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:46:56 +0000
-Subject: [PATCH 05/32] On linux targets pass --as-needed by default to the
+Subject: [PATCH 05/35] On linux targets pass --as-needed by default to the
 linker, but always link the sanitizer libraries with --no-as-needed.

 ---
@@ -137,7 +137,7 @@ index a4e5380b589..3cc61bce69f 100644
     %{!static: \
       %{rdynamic:-export-dynamic} \
 diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h
-index 2fdfd930cf2..16503482ec2 100644
+index 3e625e0f867..f8c2c351e5a 100644
 --- a/gcc/config/riscv/linux.h
 +++ b/gcc/config/riscv/linux.h
@@ -48,6 +48,7 @@ along with GCC; see the file COPYING3.  If not see
@@ -268,5 +268,5 @@ index f82fae23c22..da6417dd0d1 100644
 #else
 #define LIBUBSAN_SPEC "-lubsan" STATIC_LIBUBSAN_LIBS
 -- 
-2.40.1
+2.41.0