device-qemu-amd64: add none kernel subpackage (MR 4148)

Add a dummy subpackage that does not install any kernel. This is useful for testing 'pmbootstrap install' code quickly without actually downloading and installing a kernel package.
2023-06-06 10:56:30 +02:00
544 changed files with 7301 additions and 46757 deletions
@@ -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-usr-lib-NetworkManager-dispatcher.d-50-dns-filter.sh
-	./main/postmarketos-base-ui/rootfs-usr-lib-NetworkManager-dispatcher.d-50-tethering.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-installkernel/installkernel-pmos
 	./main/postmarketos-initramfs/init.sh
 	./main/postmarketos-initramfs/init_functions.sh
@@ -22,13 +22,12 @@
 -->
 * [ ] edge (`master` branch)
 * [ ] `v23.06`
-* [ ] `v22.12` (Supported until 2023-07-06)
+* [ ] `v22.12`

 * [ ] 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`**
@@ -9,13 +9,13 @@ branch_aports=master
 mirrordir_alpine=edge

 [v23.06]
-description=Latest release / Recommended for best stability
+description=Upcoming stable release (DO NOT USE)
 branch_pmaports=v23.06
 branch_aports=3.18-stable
 mirrordir_alpine=v3.18

 [v22.12]
-description=Old release (unsupported)
+description=Latest release / Recommended for best stability
 branch_pmaports=v22.12
 branch_aports=3.17-stable
 mirrordir_alpine=v3.17
@@ -0,0 +1,55 @@
+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
+
@@ -0,0 +1,152 @@
+# 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=11
+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
+	0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
+	CVE-2023-1972.patch
+	binutils-ld-fix-static-linking.patch
+	riscv64-textrels.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-r10:
+#     - CVE-2023-1972
+#   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
+
+	CFLAGS="$CFLAGS -O2" \
+	CXXFLAGS="$CXXFLAGS -O2" \
+	./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
+70ec22bd72ef6dddecfd970613387dd4a8cdc8730dd3cbf03d5a0c3a7c4d839383167bb06dad21bf7c235329fd44b5dc4aefe762f68544f17155cf002bf1be4a  0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
+b434e126c4c3f70c02b0a5597a0d75a4ea99b1498552c2d0676005ac0ae171c56cf07a6f6e2faa1381f1f4d4a37043a07d177dd4912f09b61109f103853594b2  CVE-2023-1972.patch
+ecee33b0e435aa704af1c334e560f201638ff79e199aa11ed78a72f7c9b46f85fbb227af5748e735fd681d1965fcc42ac81b0c8824e540430ce0c706c81e8b49  binutils-ld-fix-static-linking.patch
+d138691d953c6f49111601df1731db157d2ecedf1593e37ababb5c12ff10572b5f7982288c81579f4a99097780dbb18d3b457f74daab0f935f59423e69cec56f  riscv64-textrels.patch
+"
@@ -0,0 +1,37 @@
+Patch-Source: https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=c22d38baefc5a7a1e1f5cdc9dbb556b1f0ec5c57;hp=f2f9bde5cde7ff34ed0a4c4682a211d402aa1086
+https://sourceware.org/bugzilla/show_bug.cgi?id=30285
+--
+From: Nick Clifton <nickc@redhat.com>
+Date: Thu, 30 Mar 2023 09:10:09 +0000 (+0100)
+Subject: Fix an illegal memory access when an accessing a zer0-lengthverdef table.
+X-Git-Url: https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff_plain;h=c22d38baefc5a7a1e1f5cdc9dbb556b1f0ec5c57;hp=f2f9bde5cde7ff34ed0a4c4682a211d402aa1086
+
+Fix an illegal memory access when an accessing a zer0-lengthverdef table.
+
+  PR 30285
+  * elf.c (_bfd_elf_slurp_version_tables): Fail if no version definitions are allocated.
+---
+
+diff --git a/bfd/elf.c b/bfd/elf.c
+index 027d0143735..185028cbd97 100644
+--- a/bfd/elf.c
+++ b/bfd/elf.c
+@@ -9030,6 +9030,9 @@ _bfd_elf_slurp_version_tables (bfd *abfd, bool default_imported_symver)
+ 	  bfd_set_error (bfd_error_file_too_big);
+ 	  goto error_return_verdef;
+ 	}
+
+      if (amt == 0)
+	goto error_return_verdef;
+       elf_tdata (abfd)->verdef = (Elf_Internal_Verdef *) bfd_zalloc (abfd, amt);
+       if (elf_tdata (abfd)->verdef == NULL)
+ 	goto error_return_verdef;
+@@ -9133,6 +9136,8 @@ _bfd_elf_slurp_version_tables (bfd *abfd, bool default_imported_symver)
+ 	  bfd_set_error (bfd_error_file_too_big);
+ 	  goto error_return;
+ 	}
+      if (amt == 0)
+	goto error_return;
+       elf_tdata (abfd)->verdef = (Elf_Internal_Verdef *) bfd_zalloc (abfd, amt);
+       if (elf_tdata (abfd)->verdef == NULL)
+ 	goto error_return;
@@ -0,0 +1,46 @@
+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}}
@@ -0,0 +1,103 @@
+Patch-Source: https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=225df051d3d4cf714d1791b9035966a6686b3f3d;hp=a70d5ba34cb64bbbb7df4f3055cf5b1967bdf61e#patch1
+https://sourceware.org/bugzilla/show_bug.cgi?id=25694
+--
+From: Nelson Chu <nelson@nelson.ba.rivosinc.com>
+Date: Thu, 4 May 2023 09:08:50 +0000 (+0800)
+Subject: [PR ld/22263][PR ld/25694] RISC-V: Avoid dynamic TLS relocs in PIE.
+X-Git-Url: https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff_plain;h=225df051d3d4cf714d1791b9035966a6686b3f3d;hp=a70d5ba34cb64bbbb7df4f3055cf5b1967bdf61e
+
+[PR ld/22263][PR ld/25694] RISC-V: Avoid dynamic TLS relocs in PIE.
+
+Lots of targets already fixed the TEXTREL problem for TLS in PIE.
+
+* For PR ld/25694,
+In the check_reloc, refer to spare and loongarch, they don't need to reserve
+any local dynamic reloc for TLS LE in pie/pde, and similar to other targets.
+So it seems like riscv was too conservative to estimate the TLS LE before.
+Just break and don't goto static_reloc for TLS LE in pie/pde can fix the
+TEXTREL problem.
+
+* For PR ld/22263,
+The risc-v code for TLS GD/IE in the relocate_section seems same as MIPS port.
+So similar to MIPS, pr22570, commits 9143e72c6d4d and 1cb83cac9a89, it seems
+also the right way to do the same thing for risc-v.
+
+On risc-v, fixes
+FAIL: Build pr22263-1
+
+RISC-V haven't supported the TLS transitions, so will need the same fix (use
+bfd_link_dll) in the future.
+
+bfd/
+	PR ld/22263
+	PR ld/25694
+	* elfnn-riscv.c (riscv_elf_check_relocs): Replace bfd_link_pic with
+	bfd_link_dll for TLS IE.  Don't need to reserve the local dynamic
+	relocation for TLS LE in pie/pde, and report error in pic just like
+	before.
+	(riscv_elf_relocate_section): For TLS GD/IE, use bfd_link_dll rather
+	than !bfd_link_pic in determining the dynamic symbol index.  Avoid
+	the index of -1.
+---
+
+diff --git a/bfd/elfnn-riscv.c b/bfd/elfnn-riscv.c
+index 75af040cf92..762ea231c0b 100644
+--- a/bfd/elfnn-riscv.c
+++ b/bfd/elfnn-riscv.c
+@@ -824,7 +824,7 @@ riscv_elf_check_relocs (bfd *abfd, struct bfd_link_info *info,
+ 	  break;
+ 
+ 	case R_RISCV_TLS_GOT_HI20:
+-	  if (bfd_link_pic (info))
+	  if (bfd_link_dll (info))
+ 	    info->flags |= DF_STATIC_TLS;
+ 	  if (!riscv_elf_record_got_reference (abfd, info, h, r_symndx)
+ 	      || !riscv_elf_record_tls_type (abfd, h, r_symndx, GOT_TLS_IE))
+@@ -920,11 +920,12 @@ riscv_elf_check_relocs (bfd *abfd, struct bfd_link_info *info,
+ 	  goto static_reloc;
+ 
+ 	case R_RISCV_TPREL_HI20:
+	  /* This is not allowed in the pic, but okay in pie.  */
+ 	  if (!bfd_link_executable (info))
+ 	    return bad_static_reloc (abfd, r_type, h);
+ 	  if (h != NULL)
+ 	    riscv_elf_record_tls_type (abfd, h, r_symndx, GOT_TLS_LE);
+-	  goto static_reloc;
+	  break;
+ 
+ 	case R_RISCV_HI20:
+ 	  if (bfd_link_pic (info))
+@@ -2880,24 +2881,20 @@ riscv_elf_relocate_section (bfd *output_bfd,
+ 	      if (htab->elf.srelgot == NULL)
+ 		abort ();
+ 
+-	      if (h != NULL)
+-		{
+-		  bool dyn, pic;
+-		  dyn = htab->elf.dynamic_sections_created;
+-		  pic = bfd_link_pic (info);
+-
+-		  if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, pic, h)
+-		      && (!pic || !SYMBOL_REFERENCES_LOCAL (info, h)))
+-		    indx = h->dynindx;
+-		}
+	      bool dyn = elf_hash_table (info)->dynamic_sections_created;
+	      if (h != NULL
+		  && h->dynindx != -1
+		  && WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, bfd_link_pic (info), h)
+		  && (bfd_link_dll (info) || !SYMBOL_REFERENCES_LOCAL (info, h)))
+		indx = h->dynindx;
+ 
+ 	      /* The GOT entries have not been initialized yet.  Do it
+ 		 now, and emit any relocations.  */
+-	      if ((bfd_link_pic (info) || indx != 0)
+	      if ((bfd_link_dll (info) || indx != 0)
+ 		  && (h == NULL
+ 		      || ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
+ 		      || h->root.type != bfd_link_hash_undefweak))
+-		    need_relocs = true;
+		need_relocs = true;
+ 
+ 	      if (tls_type & GOT_TLS_GD)
+ 		{
+
@@ -0,0 +1,55 @@
+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
+
@@ -0,0 +1,152 @@
+# 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=11
+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
+	0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
+	CVE-2023-1972.patch
+	binutils-ld-fix-static-linking.patch
+	riscv64-textrels.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-r10:
+#     - CVE-2023-1972
+#   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
+
+	CFLAGS="$CFLAGS -O2" \
+	CXXFLAGS="$CXXFLAGS -O2" \
+	./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
+70ec22bd72ef6dddecfd970613387dd4a8cdc8730dd3cbf03d5a0c3a7c4d839383167bb06dad21bf7c235329fd44b5dc4aefe762f68544f17155cf002bf1be4a  0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
+b434e126c4c3f70c02b0a5597a0d75a4ea99b1498552c2d0676005ac0ae171c56cf07a6f6e2faa1381f1f4d4a37043a07d177dd4912f09b61109f103853594b2  CVE-2023-1972.patch
+ecee33b0e435aa704af1c334e560f201638ff79e199aa11ed78a72f7c9b46f85fbb227af5748e735fd681d1965fcc42ac81b0c8824e540430ce0c706c81e8b49  binutils-ld-fix-static-linking.patch
+d138691d953c6f49111601df1731db157d2ecedf1593e37ababb5c12ff10572b5f7982288c81579f4a99097780dbb18d3b457f74daab0f935f59423e69cec56f  riscv64-textrels.patch
+"
@@ -0,0 +1,37 @@
+Patch-Source: https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=c22d38baefc5a7a1e1f5cdc9dbb556b1f0ec5c57;hp=f2f9bde5cde7ff34ed0a4c4682a211d402aa1086
+https://sourceware.org/bugzilla/show_bug.cgi?id=30285
+--
+From: Nick Clifton <nickc@redhat.com>
+Date: Thu, 30 Mar 2023 09:10:09 +0000 (+0100)
+Subject: Fix an illegal memory access when an accessing a zer0-lengthverdef table.
+X-Git-Url: https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff_plain;h=c22d38baefc5a7a1e1f5cdc9dbb556b1f0ec5c57;hp=f2f9bde5cde7ff34ed0a4c4682a211d402aa1086
+
+Fix an illegal memory access when an accessing a zer0-lengthverdef table.
+
+  PR 30285
+  * elf.c (_bfd_elf_slurp_version_tables): Fail if no version definitions are allocated.
+---
+
+diff --git a/bfd/elf.c b/bfd/elf.c
+index 027d0143735..185028cbd97 100644
+--- a/bfd/elf.c
+++ b/bfd/elf.c
+@@ -9030,6 +9030,9 @@ _bfd_elf_slurp_version_tables (bfd *abfd, bool default_imported_symver)
+ 	  bfd_set_error (bfd_error_file_too_big);
+ 	  goto error_return_verdef;
+ 	}
+
+      if (amt == 0)
+	goto error_return_verdef;
+       elf_tdata (abfd)->verdef = (Elf_Internal_Verdef *) bfd_zalloc (abfd, amt);
+       if (elf_tdata (abfd)->verdef == NULL)
+ 	goto error_return_verdef;
+@@ -9133,6 +9136,8 @@ _bfd_elf_slurp_version_tables (bfd *abfd, bool default_imported_symver)
+ 	  bfd_set_error (bfd_error_file_too_big);
+ 	  goto error_return;
+ 	}
+      if (amt == 0)
+	goto error_return;
+       elf_tdata (abfd)->verdef = (Elf_Internal_Verdef *) bfd_zalloc (abfd, amt);
+       if (elf_tdata (abfd)->verdef == NULL)
+ 	goto error_return;
@@ -0,0 +1,46 @@
+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}}
@@ -0,0 +1,103 @@
+Patch-Source: https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=225df051d3d4cf714d1791b9035966a6686b3f3d;hp=a70d5ba34cb64bbbb7df4f3055cf5b1967bdf61e#patch1
+https://sourceware.org/bugzilla/show_bug.cgi?id=25694
+--
+From: Nelson Chu <nelson@nelson.ba.rivosinc.com>
+Date: Thu, 4 May 2023 09:08:50 +0000 (+0800)
+Subject: [PR ld/22263][PR ld/25694] RISC-V: Avoid dynamic TLS relocs in PIE.
+X-Git-Url: https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff_plain;h=225df051d3d4cf714d1791b9035966a6686b3f3d;hp=a70d5ba34cb64bbbb7df4f3055cf5b1967bdf61e
+
+[PR ld/22263][PR ld/25694] RISC-V: Avoid dynamic TLS relocs in PIE.
+
+Lots of targets already fixed the TEXTREL problem for TLS in PIE.
+
+* For PR ld/25694,
+In the check_reloc, refer to spare and loongarch, they don't need to reserve
+any local dynamic reloc for TLS LE in pie/pde, and similar to other targets.
+So it seems like riscv was too conservative to estimate the TLS LE before.
+Just break and don't goto static_reloc for TLS LE in pie/pde can fix the
+TEXTREL problem.
+
+* For PR ld/22263,
+The risc-v code for TLS GD/IE in the relocate_section seems same as MIPS port.
+So similar to MIPS, pr22570, commits 9143e72c6d4d and 1cb83cac9a89, it seems
+also the right way to do the same thing for risc-v.
+
+On risc-v, fixes
+FAIL: Build pr22263-1
+
+RISC-V haven't supported the TLS transitions, so will need the same fix (use
+bfd_link_dll) in the future.
+
+bfd/
+	PR ld/22263
+	PR ld/25694
+	* elfnn-riscv.c (riscv_elf_check_relocs): Replace bfd_link_pic with
+	bfd_link_dll for TLS IE.  Don't need to reserve the local dynamic
+	relocation for TLS LE in pie/pde, and report error in pic just like
+	before.
+	(riscv_elf_relocate_section): For TLS GD/IE, use bfd_link_dll rather
+	than !bfd_link_pic in determining the dynamic symbol index.  Avoid
+	the index of -1.
+---
+
+diff --git a/bfd/elfnn-riscv.c b/bfd/elfnn-riscv.c
+index 75af040cf92..762ea231c0b 100644
+--- a/bfd/elfnn-riscv.c
+++ b/bfd/elfnn-riscv.c
+@@ -824,7 +824,7 @@ riscv_elf_check_relocs (bfd *abfd, struct bfd_link_info *info,
+ 	  break;
+ 
+ 	case R_RISCV_TLS_GOT_HI20:
+-	  if (bfd_link_pic (info))
+	  if (bfd_link_dll (info))
+ 	    info->flags |= DF_STATIC_TLS;
+ 	  if (!riscv_elf_record_got_reference (abfd, info, h, r_symndx)
+ 	      || !riscv_elf_record_tls_type (abfd, h, r_symndx, GOT_TLS_IE))
+@@ -920,11 +920,12 @@ riscv_elf_check_relocs (bfd *abfd, struct bfd_link_info *info,
+ 	  goto static_reloc;
+ 
+ 	case R_RISCV_TPREL_HI20:
+	  /* This is not allowed in the pic, but okay in pie.  */
+ 	  if (!bfd_link_executable (info))
+ 	    return bad_static_reloc (abfd, r_type, h);
+ 	  if (h != NULL)
+ 	    riscv_elf_record_tls_type (abfd, h, r_symndx, GOT_TLS_LE);
+-	  goto static_reloc;
+	  break;
+ 
+ 	case R_RISCV_HI20:
+ 	  if (bfd_link_pic (info))
+@@ -2880,24 +2881,20 @@ riscv_elf_relocate_section (bfd *output_bfd,
+ 	      if (htab->elf.srelgot == NULL)
+ 		abort ();
+ 
+-	      if (h != NULL)
+-		{
+-		  bool dyn, pic;
+-		  dyn = htab->elf.dynamic_sections_created;
+-		  pic = bfd_link_pic (info);
+-
+-		  if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, pic, h)
+-		      && (!pic || !SYMBOL_REFERENCES_LOCAL (info, h)))
+-		    indx = h->dynindx;
+-		}
+	      bool dyn = elf_hash_table (info)->dynamic_sections_created;
+	      if (h != NULL
+		  && h->dynindx != -1
+		  && WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, bfd_link_pic (info), h)
+		  && (bfd_link_dll (info) || !SYMBOL_REFERENCES_LOCAL (info, h)))
+		indx = h->dynindx;
+ 
+ 	      /* The GOT entries have not been initialized yet.  Do it
+ 		 now, and emit any relocations.  */
+-	      if ((bfd_link_pic (info) || indx != 0)
+	      if ((bfd_link_dll (info) || indx != 0)
+ 		  && (h == NULL
+ 		      || ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
+ 		      || h->root.type != bfd_link_hash_undefweak))
+-		    need_relocs = true;
+		need_relocs = true;
+ 
+ 	      if (tls_type & GOT_TLS_GD)
+ 		{
+
@@ -0,0 +1,55 @@
+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
+
@@ -0,0 +1,152 @@
+# 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=11
+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
+	0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
+	CVE-2023-1972.patch
+	binutils-ld-fix-static-linking.patch
+	riscv64-textrels.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-r10:
+#     - CVE-2023-1972
+#   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
+
+	CFLAGS="$CFLAGS -O2" \
+	CXXFLAGS="$CXXFLAGS -O2" \
+	./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
+70ec22bd72ef6dddecfd970613387dd4a8cdc8730dd3cbf03d5a0c3a7c4d839383167bb06dad21bf7c235329fd44b5dc4aefe762f68544f17155cf002bf1be4a  0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
+b434e126c4c3f70c02b0a5597a0d75a4ea99b1498552c2d0676005ac0ae171c56cf07a6f6e2faa1381f1f4d4a37043a07d177dd4912f09b61109f103853594b2  CVE-2023-1972.patch
+ecee33b0e435aa704af1c334e560f201638ff79e199aa11ed78a72f7c9b46f85fbb227af5748e735fd681d1965fcc42ac81b0c8824e540430ce0c706c81e8b49  binutils-ld-fix-static-linking.patch
+d138691d953c6f49111601df1731db157d2ecedf1593e37ababb5c12ff10572b5f7982288c81579f4a99097780dbb18d3b457f74daab0f935f59423e69cec56f  riscv64-textrels.patch
+"
@@ -0,0 +1,37 @@
+Patch-Source: https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=c22d38baefc5a7a1e1f5cdc9dbb556b1f0ec5c57;hp=f2f9bde5cde7ff34ed0a4c4682a211d402aa1086
+https://sourceware.org/bugzilla/show_bug.cgi?id=30285
+--
+From: Nick Clifton <nickc@redhat.com>
+Date: Thu, 30 Mar 2023 09:10:09 +0000 (+0100)
+Subject: Fix an illegal memory access when an accessing a zer0-lengthverdef table.
+X-Git-Url: https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff_plain;h=c22d38baefc5a7a1e1f5cdc9dbb556b1f0ec5c57;hp=f2f9bde5cde7ff34ed0a4c4682a211d402aa1086
+
+Fix an illegal memory access when an accessing a zer0-lengthverdef table.
+
+  PR 30285
+  * elf.c (_bfd_elf_slurp_version_tables): Fail if no version definitions are allocated.
+---
+
+diff --git a/bfd/elf.c b/bfd/elf.c
+index 027d0143735..185028cbd97 100644
+--- a/bfd/elf.c
+++ b/bfd/elf.c
+@@ -9030,6 +9030,9 @@ _bfd_elf_slurp_version_tables (bfd *abfd, bool default_imported_symver)
+ 	  bfd_set_error (bfd_error_file_too_big);
+ 	  goto error_return_verdef;
+ 	}
+
+      if (amt == 0)
+	goto error_return_verdef;
+       elf_tdata (abfd)->verdef = (Elf_Internal_Verdef *) bfd_zalloc (abfd, amt);
+       if (elf_tdata (abfd)->verdef == NULL)
+ 	goto error_return_verdef;
+@@ -9133,6 +9136,8 @@ _bfd_elf_slurp_version_tables (bfd *abfd, bool default_imported_symver)
+ 	  bfd_set_error (bfd_error_file_too_big);
+ 	  goto error_return;
+ 	}
+      if (amt == 0)
+	goto error_return;
+       elf_tdata (abfd)->verdef = (Elf_Internal_Verdef *) bfd_zalloc (abfd, amt);
+       if (elf_tdata (abfd)->verdef == NULL)
+ 	goto error_return;
@@ -0,0 +1,46 @@
+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}}
@@ -0,0 +1,103 @@
+Patch-Source: https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=225df051d3d4cf714d1791b9035966a6686b3f3d;hp=a70d5ba34cb64bbbb7df4f3055cf5b1967bdf61e#patch1
+https://sourceware.org/bugzilla/show_bug.cgi?id=25694
+--
+From: Nelson Chu <nelson@nelson.ba.rivosinc.com>
+Date: Thu, 4 May 2023 09:08:50 +0000 (+0800)
+Subject: [PR ld/22263][PR ld/25694] RISC-V: Avoid dynamic TLS relocs in PIE.
+X-Git-Url: https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff_plain;h=225df051d3d4cf714d1791b9035966a6686b3f3d;hp=a70d5ba34cb64bbbb7df4f3055cf5b1967bdf61e
+
+[PR ld/22263][PR ld/25694] RISC-V: Avoid dynamic TLS relocs in PIE.
+
+Lots of targets already fixed the TEXTREL problem for TLS in PIE.
+
+* For PR ld/25694,
+In the check_reloc, refer to spare and loongarch, they don't need to reserve
+any local dynamic reloc for TLS LE in pie/pde, and similar to other targets.
+So it seems like riscv was too conservative to estimate the TLS LE before.
+Just break and don't goto static_reloc for TLS LE in pie/pde can fix the
+TEXTREL problem.
+
+* For PR ld/22263,
+The risc-v code for TLS GD/IE in the relocate_section seems same as MIPS port.
+So similar to MIPS, pr22570, commits 9143e72c6d4d and 1cb83cac9a89, it seems
+also the right way to do the same thing for risc-v.
+
+On risc-v, fixes
+FAIL: Build pr22263-1
+
+RISC-V haven't supported the TLS transitions, so will need the same fix (use
+bfd_link_dll) in the future.
+
+bfd/
+	PR ld/22263
+	PR ld/25694
+	* elfnn-riscv.c (riscv_elf_check_relocs): Replace bfd_link_pic with
+	bfd_link_dll for TLS IE.  Don't need to reserve the local dynamic
+	relocation for TLS LE in pie/pde, and report error in pic just like
+	before.
+	(riscv_elf_relocate_section): For TLS GD/IE, use bfd_link_dll rather
+	than !bfd_link_pic in determining the dynamic symbol index.  Avoid
+	the index of -1.
+---
+
+diff --git a/bfd/elfnn-riscv.c b/bfd/elfnn-riscv.c
+index 75af040cf92..762ea231c0b 100644
+--- a/bfd/elfnn-riscv.c
+++ b/bfd/elfnn-riscv.c
+@@ -824,7 +824,7 @@ riscv_elf_check_relocs (bfd *abfd, struct bfd_link_info *info,
+ 	  break;
+ 
+ 	case R_RISCV_TLS_GOT_HI20:
+-	  if (bfd_link_pic (info))
+	  if (bfd_link_dll (info))
+ 	    info->flags |= DF_STATIC_TLS;
+ 	  if (!riscv_elf_record_got_reference (abfd, info, h, r_symndx)
+ 	      || !riscv_elf_record_tls_type (abfd, h, r_symndx, GOT_TLS_IE))
+@@ -920,11 +920,12 @@ riscv_elf_check_relocs (bfd *abfd, struct bfd_link_info *info,
+ 	  goto static_reloc;
+ 
+ 	case R_RISCV_TPREL_HI20:
+	  /* This is not allowed in the pic, but okay in pie.  */
+ 	  if (!bfd_link_executable (info))
+ 	    return bad_static_reloc (abfd, r_type, h);
+ 	  if (h != NULL)
+ 	    riscv_elf_record_tls_type (abfd, h, r_symndx, GOT_TLS_LE);
+-	  goto static_reloc;
+	  break;
+ 
+ 	case R_RISCV_HI20:
+ 	  if (bfd_link_pic (info))
+@@ -2880,24 +2881,20 @@ riscv_elf_relocate_section (bfd *output_bfd,
+ 	      if (htab->elf.srelgot == NULL)
+ 		abort ();
+ 
+-	      if (h != NULL)
+-		{
+-		  bool dyn, pic;
+-		  dyn = htab->elf.dynamic_sections_created;
+-		  pic = bfd_link_pic (info);
+-
+-		  if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, pic, h)
+-		      && (!pic || !SYMBOL_REFERENCES_LOCAL (info, h)))
+-		    indx = h->dynindx;
+-		}
+	      bool dyn = elf_hash_table (info)->dynamic_sections_created;
+	      if (h != NULL
+		  && h->dynindx != -1
+		  && WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, bfd_link_pic (info), h)
+		  && (bfd_link_dll (info) || !SYMBOL_REFERENCES_LOCAL (info, h)))
+		indx = h->dynindx;
+ 
+ 	      /* The GOT entries have not been initialized yet.  Do it
+ 		 now, and emit any relocations.  */
+-	      if ((bfd_link_pic (info) || indx != 0)
+	      if ((bfd_link_dll (info) || indx != 0)
+ 		  && (h == NULL
+ 		      || ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
+ 		      || h->root.type != bfd_link_hash_undefweak))
+-		    need_relocs = true;
+		need_relocs = true;
+ 
+ 	      if (tls_type & GOT_TLS_GD)
+ 		{
+
@@ -0,0 +1,55 @@
+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
+
@@ -0,0 +1,152 @@
+# 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=11
+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
+	0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
+	CVE-2023-1972.patch
+	binutils-ld-fix-static-linking.patch
+	riscv64-textrels.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-r10:
+#     - CVE-2023-1972
+#   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
+
+	CFLAGS="$CFLAGS -O2" \
+	CXXFLAGS="$CXXFLAGS -O2" \
+	./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
+70ec22bd72ef6dddecfd970613387dd4a8cdc8730dd3cbf03d5a0c3a7c4d839383167bb06dad21bf7c235329fd44b5dc4aefe762f68544f17155cf002bf1be4a  0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
+b434e126c4c3f70c02b0a5597a0d75a4ea99b1498552c2d0676005ac0ae171c56cf07a6f6e2faa1381f1f4d4a37043a07d177dd4912f09b61109f103853594b2  CVE-2023-1972.patch
+ecee33b0e435aa704af1c334e560f201638ff79e199aa11ed78a72f7c9b46f85fbb227af5748e735fd681d1965fcc42ac81b0c8824e540430ce0c706c81e8b49  binutils-ld-fix-static-linking.patch
+d138691d953c6f49111601df1731db157d2ecedf1593e37ababb5c12ff10572b5f7982288c81579f4a99097780dbb18d3b457f74daab0f935f59423e69cec56f  riscv64-textrels.patch
+"
@@ -0,0 +1,37 @@
+Patch-Source: https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=c22d38baefc5a7a1e1f5cdc9dbb556b1f0ec5c57;hp=f2f9bde5cde7ff34ed0a4c4682a211d402aa1086
+https://sourceware.org/bugzilla/show_bug.cgi?id=30285
+--
+From: Nick Clifton <nickc@redhat.com>
+Date: Thu, 30 Mar 2023 09:10:09 +0000 (+0100)
+Subject: Fix an illegal memory access when an accessing a zer0-lengthverdef table.
+X-Git-Url: https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff_plain;h=c22d38baefc5a7a1e1f5cdc9dbb556b1f0ec5c57;hp=f2f9bde5cde7ff34ed0a4c4682a211d402aa1086
+
+Fix an illegal memory access when an accessing a zer0-lengthverdef table.
+
+  PR 30285
+  * elf.c (_bfd_elf_slurp_version_tables): Fail if no version definitions are allocated.
+---
+
+diff --git a/bfd/elf.c b/bfd/elf.c
+index 027d0143735..185028cbd97 100644
+--- a/bfd/elf.c
+++ b/bfd/elf.c
+@@ -9030,6 +9030,9 @@ _bfd_elf_slurp_version_tables (bfd *abfd, bool default_imported_symver)
+ 	  bfd_set_error (bfd_error_file_too_big);
+ 	  goto error_return_verdef;
+ 	}
+
+      if (amt == 0)
+	goto error_return_verdef;
+       elf_tdata (abfd)->verdef = (Elf_Internal_Verdef *) bfd_zalloc (abfd, amt);
+       if (elf_tdata (abfd)->verdef == NULL)
+ 	goto error_return_verdef;
+@@ -9133,6 +9136,8 @@ _bfd_elf_slurp_version_tables (bfd *abfd, bool default_imported_symver)
+ 	  bfd_set_error (bfd_error_file_too_big);
+ 	  goto error_return;
+ 	}
+      if (amt == 0)
+	goto error_return;
+       elf_tdata (abfd)->verdef = (Elf_Internal_Verdef *) bfd_zalloc (abfd, amt);
+       if (elf_tdata (abfd)->verdef == NULL)
+ 	goto error_return;
@@ -0,0 +1,46 @@
+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}}
@@ -0,0 +1,103 @@
+Patch-Source: https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=225df051d3d4cf714d1791b9035966a6686b3f3d;hp=a70d5ba34cb64bbbb7df4f3055cf5b1967bdf61e#patch1
+https://sourceware.org/bugzilla/show_bug.cgi?id=25694
+--
+From: Nelson Chu <nelson@nelson.ba.rivosinc.com>
+Date: Thu, 4 May 2023 09:08:50 +0000 (+0800)
+Subject: [PR ld/22263][PR ld/25694] RISC-V: Avoid dynamic TLS relocs in PIE.
+X-Git-Url: https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff_plain;h=225df051d3d4cf714d1791b9035966a6686b3f3d;hp=a70d5ba34cb64bbbb7df4f3055cf5b1967bdf61e
+
+[PR ld/22263][PR ld/25694] RISC-V: Avoid dynamic TLS relocs in PIE.
+
+Lots of targets already fixed the TEXTREL problem for TLS in PIE.
+
+* For PR ld/25694,
+In the check_reloc, refer to spare and loongarch, they don't need to reserve
+any local dynamic reloc for TLS LE in pie/pde, and similar to other targets.
+So it seems like riscv was too conservative to estimate the TLS LE before.
+Just break and don't goto static_reloc for TLS LE in pie/pde can fix the
+TEXTREL problem.
+
+* For PR ld/22263,
+The risc-v code for TLS GD/IE in the relocate_section seems same as MIPS port.
+So similar to MIPS, pr22570, commits 9143e72c6d4d and 1cb83cac9a89, it seems
+also the right way to do the same thing for risc-v.
+
+On risc-v, fixes
+FAIL: Build pr22263-1
+
+RISC-V haven't supported the TLS transitions, so will need the same fix (use
+bfd_link_dll) in the future.
+
+bfd/
+	PR ld/22263
+	PR ld/25694
+	* elfnn-riscv.c (riscv_elf_check_relocs): Replace bfd_link_pic with
+	bfd_link_dll for TLS IE.  Don't need to reserve the local dynamic
+	relocation for TLS LE in pie/pde, and report error in pic just like
+	before.
+	(riscv_elf_relocate_section): For TLS GD/IE, use bfd_link_dll rather
+	than !bfd_link_pic in determining the dynamic symbol index.  Avoid
+	the index of -1.
+---
+
+diff --git a/bfd/elfnn-riscv.c b/bfd/elfnn-riscv.c
+index 75af040cf92..762ea231c0b 100644
+--- a/bfd/elfnn-riscv.c
+++ b/bfd/elfnn-riscv.c
+@@ -824,7 +824,7 @@ riscv_elf_check_relocs (bfd *abfd, struct bfd_link_info *info,
+ 	  break;
+ 
+ 	case R_RISCV_TLS_GOT_HI20:
+-	  if (bfd_link_pic (info))
+	  if (bfd_link_dll (info))
+ 	    info->flags |= DF_STATIC_TLS;
+ 	  if (!riscv_elf_record_got_reference (abfd, info, h, r_symndx)
+ 	      || !riscv_elf_record_tls_type (abfd, h, r_symndx, GOT_TLS_IE))
+@@ -920,11 +920,12 @@ riscv_elf_check_relocs (bfd *abfd, struct bfd_link_info *info,
+ 	  goto static_reloc;
+ 
+ 	case R_RISCV_TPREL_HI20:
+	  /* This is not allowed in the pic, but okay in pie.  */
+ 	  if (!bfd_link_executable (info))
+ 	    return bad_static_reloc (abfd, r_type, h);
+ 	  if (h != NULL)
+ 	    riscv_elf_record_tls_type (abfd, h, r_symndx, GOT_TLS_LE);
+-	  goto static_reloc;
+	  break;
+ 
+ 	case R_RISCV_HI20:
+ 	  if (bfd_link_pic (info))
+@@ -2880,24 +2881,20 @@ riscv_elf_relocate_section (bfd *output_bfd,
+ 	      if (htab->elf.srelgot == NULL)
+ 		abort ();
+ 
+-	      if (h != NULL)
+-		{
+-		  bool dyn, pic;
+-		  dyn = htab->elf.dynamic_sections_created;
+-		  pic = bfd_link_pic (info);
+-
+-		  if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, pic, h)
+-		      && (!pic || !SYMBOL_REFERENCES_LOCAL (info, h)))
+-		    indx = h->dynindx;
+-		}
+	      bool dyn = elf_hash_table (info)->dynamic_sections_created;
+	      if (h != NULL
+		  && h->dynindx != -1
+		  && WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, bfd_link_pic (info), h)
+		  && (bfd_link_dll (info) || !SYMBOL_REFERENCES_LOCAL (info, h)))
+		indx = h->dynindx;
+ 
+ 	      /* The GOT entries have not been initialized yet.  Do it
+ 		 now, and emit any relocations.  */
+-	      if ((bfd_link_pic (info) || indx != 0)
+	      if ((bfd_link_dll (info) || indx != 0)
+ 		  && (h == NULL
+ 		      || ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
+ 		      || h->root.type != bfd_link_hash_undefweak))
+-		    need_relocs = true;
+		need_relocs = true;
+ 
+ 	      if (tls_type & GOT_TLS_GD)
+ 		{
+
@@ -8,7 +8,7 @@ fi

 pkgname=busybox-static-aarch64
 pkgver=1.36.1
-pkgrel=4
+pkgrel=0

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

 sha512sums="
-c0ea71bcec70e35de3dcb919c22c02afe7e35b3168845209e93bcd15ff380d62dc807848e36e1e5fef22c16adbbdfc1dc3a3559015d0c4a3b2978e0e303d4413  busybox-static-1.36.1-r4-aarch64-edge.apk
+d4977cf4654bb5659d4e6d91785832d3fd418403b70f1619c26aa305839d64c131c6389979793896af0fb0d9e8fc2b99537dbeb65133465d7d983576902dff34  busybox-static-1.36.1-r0-aarch64-edge.apk
 "
@@ -8,7 +8,7 @@ fi

 pkgname=busybox-static-armhf
 pkgver=1.36.1
-pkgrel=4
+pkgrel=0

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

 sha512sums="
-701ee52541aee37a075563c430b891860afd205e4446379a4686b3eac57ce8443c1203b06fb90f146c88064e00d99101c86d0d8b3a91377e465d46958c942366  busybox-static-1.36.1-r4-armhf-edge.apk
+eece41953046c99029ec4a0707c1fd4270d43b497f05cf63070deef376fc28f61bcdfa8b9f34e23305ba459a633909eb1682fbe183206b69dea8be3742479ae7  busybox-static-1.36.1-r0-armhf-edge.apk
 "
@@ -8,7 +8,7 @@ fi

 pkgname=busybox-static-armv7
 pkgver=1.36.1
-pkgrel=4
+pkgrel=0

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

 sha512sums="
-e01fdc7edfe06b9b8c30acb0df90f026c49982d378724c8afd4e545f5ab7e9d317a9fd8e1e7ae06d3f89e3ddf5e572ad3f7d2d033225f195d5bc7530e6e4bcd2  busybox-static-1.36.1-r4-armv7-edge.apk
+29df2ea5d83535632308524064dbb43bf9ed147ab1112bed76b1fc70b519d7dc3e4083c51527e80129a455a001479569641b710f58fdad8538852061d4880660  busybox-static-1.36.1-r0-armv7-edge.apk
 "
@@ -1,7 +1,7 @@
-From 47b4bd4deb2c356bb07d2a96f22127aefafec3a4 Mon Sep 17 00:00:00 2001
+From 3e5acbe356124aa5d8dde0635d652c065a553e7d 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/34] posix_memalign
+Subject: [PATCH 01/33] posix_memalign

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

@@ -1,7 +1,7 @@
-From 4fa620d8c3e6730211bfb071eb4c817320491bd0 Mon Sep 17 00:00:00 2001
+From f986a4a1224fa7d452b415d690aead8d356a7eae 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/34] gcc: poison-system-directories
+Subject: [PATCH 02/33] 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 af0e5933fdb..b6731a4673c 100644
+index c0c3ad14515..7cdd5bfa952 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 af0e5933fdb..b6731a4673c 100644
 -Wno-pragmas  -Wno-prio-ctor-dtor  -Wredundant-decls
 -Wrestrict  -Wno-return-local-addr  -Wreturn-type
 -Wno-scalar-storage-order  -Wsequence-point
-@@ -8426,6 +8427,14 @@ made up of data only and thus requires no special treatment.  But, for
+@@ -8424,6 +8425,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.41.0
+2.40.1

@@ -1,7 +1,7 @@
-From ff4dd4ce33133e675b7bedc86b73357c04631cb9 Mon Sep 17 00:00:00 2001
+From 31e2b60000e779ef775daa306120eabcf987852a 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/34] specs: turn on -Wl,-z,now by default
+Subject: [PATCH 03/33] 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 b6731a4673c..f393c7846c6 100644
+index 7cdd5bfa952..158b7bcb81e 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
-@@ -17961,6 +17961,9 @@ For example, @option{-Wl,-Map,output.map} passes @option{-Map output.map} to the
+@@ -17959,6 +17959,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.41.0
+2.40.1

@@ -1,7 +1,7 @@
-From 1b315235433701e4a974da259b8d651169ddc7ac Mon Sep 17 00:00:00 2001
+From 3b910da7d1e81bdd953e6d9ec82020e7b120353b 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/34] Turn on -D_FORTIFY_SOURCE=2 by default for C, C++,
+Subject: [PATCH 04/33] 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 f393c7846c6..ef3c14a189e 100644
+index 158b7bcb81e..cc9972f907b 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
-@@ -11868,6 +11868,12 @@ also turns on the following optimization flags:
+@@ -11866,6 +11866,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 f393c7846c6..ef3c14a189e 100644
 @item -O3
 Optimize yet more.  @option{-O3} turns on all optimizations specified
 -- 
-2.41.0
+2.40.1

@@ -1,7 +1,7 @@
-From 67c0f5789630b27149f60ff831999ef7c1dba5d5 Mon Sep 17 00:00:00 2001
+From 9c3a2882b1932296ccb1d0ed2900cf046f998a26 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/34] On linux targets pass --as-needed by default to the
+Subject: [PATCH 05/33] 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 3e625e0f867..f8c2c351e5a 100644
+index 2fdfd930cf2..16503482ec2 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.41.0
+2.40.1

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

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

@@ -1,7 +1,7 @@
-From 4a728ad48a7b437cc6f2697e26603bf648149f86 Mon Sep 17 00:00:00 2001
+From 93e44f7c7b1f11c1f714d6c384b0d39a191ac18a 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/34] Enable -Wtrampolines by default.
+Subject: [PATCH 07/33] Enable -Wtrampolines by default.

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

@@ -1,7 +1,7 @@
-From 32f24560d0602f7735d5e9efd92fe3151bd72cea Mon Sep 17 00:00:00 2001
+From 7aa93d6d9a63c7bedf1e033f6d040e95038537e7 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/34] Disable ssp on -nostdlib, -nodefaultlibs and
+Subject: [PATCH 08/33] 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.41.0
+2.40.1

@@ -1,7 +1,7 @@
-From c7ec8da7280d7f97f5543eb9ddeca7600aafc43c Mon Sep 17 00:00:00 2001
+From e44b295b5b0b917c0b47085f60466a37f890e1c7 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/34] Ensure that msgfmt doesn't encounter problems during
+Subject: [PATCH 09/33] 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.41.0
+2.40.1

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

@@ -1,7 +1,7 @@
-From 65e01e749205c9af218b01233cebd0077538d0ee Mon Sep 17 00:00:00 2001
+From 6fc13fce114648b1a64e658b469a4697382d18bb 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/34] libiberty: copy PIC objects during build process
+Subject: [PATCH 11/33] libiberty: copy PIC objects during build process

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

@@ -1,7 +1,7 @@
-From 453a815bf2844971a91eaef800af188d9e86b784 Mon Sep 17 00:00:00 2001
+From 6a1955bbf49836ad99b23501f42283842e01761b 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/34] libgcc_s
+Subject: [PATCH 12/33] 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.41.0
+2.40.1

@@ -1,7 +1,7 @@
-From 7d7d12137c666761a8dd61179c9651b85dae9b41 Mon Sep 17 00:00:00 2001
+From 558e95aa2b0f3bbf416e1bb572e5f47bddc8601c 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/34] nopie
+Subject: [PATCH 13/33] nopie

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

@@ -1,7 +1,7 @@
-From dd5bb97c31a9f57034c70a7a18ba6e2e133084c7 Mon Sep 17 00:00:00 2001
+From ecad19db42776c536bd4f6033ec1891ffae03720 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/34] ada: fix shared linking
+Subject: [PATCH 14/33] 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.41.0
+2.40.1

@@ -1,7 +1,7 @@
-From 6bb5b7d9161d05f31b001d8211a9c63caf63fd2f Mon Sep 17 00:00:00 2001
+From 8500b4cdd039c16a02a8acabd124b92865871979 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/34] build: fix CXXFLAGS_FOR_BUILD passing
+Subject: [PATCH 15/33] 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.41.0
+2.40.1

@@ -1,7 +1,7 @@
-From f0d9e00cac06689f64b214de7aee80d7116ef084 Mon Sep 17 00:00:00 2001
+From e893ad827215a7c090a835e20a81559f4044fb47 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/34] add fortify-headers paths
+Subject: [PATCH 16/33] 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.41.0
+2.40.1

@@ -1,7 +1,7 @@
-From 857db04f4f1a06e866551b4172fe8f27363f4a92 Mon Sep 17 00:00:00 2001
+From 064afc74f18f2a00771fc2600029a713b8708845 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/34] Alpine musl package provides libssp_nonshared.a. We
+Subject: [PATCH 17/33] 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.41.0
+2.40.1

@@ -1,7 +1,7 @@
-From 5a8347e23ab13912b6edec2c6c6e3a101b017c79 Mon Sep 17 00:00:00 2001
+From 45a98ce1f1702424aba4271f7f7570e43a354101 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/34] DP: Use --push-state/--pop-state for gold as well when
+Subject: [PATCH 18/33] 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.41.0
+2.40.1

@@ -1,7 +1,7 @@
-From 41d00a2eb0754acf71958808bd17dbebeb517b84 Mon Sep 17 00:00:00 2001
+From 6a2e902dc8abcfd44522b9224fd759d038db51f5 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/34] aarch64: disable multilib support
+Subject: [PATCH 19/33] 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.41.0
+2.40.1

@@ -1,7 +1,7 @@
-From 85b42bfbba71616831d14360b16998acb28790fd Mon Sep 17 00:00:00 2001
+From 6e7c72ee05353a284d9c9809035e7ff488b4b8c1 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/34] s390x: disable multilib support
+Subject: [PATCH 20/33] 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.41.0
+2.40.1

@@ -1,7 +1,7 @@
-From 7b53df284242638e940c0155b6c21e88cea1f55b Mon Sep 17 00:00:00 2001
+From 44655aa3be8d5354fb82a42317a9ac6ac1b50164 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/34] ppc64[le]: disable multilib support
+Subject: [PATCH 21/33] 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.41.0
+2.40.1

@@ -1,7 +1,7 @@
-From 96e7e1e9a899d9bb5fcbdf788bd529d0390c626f Mon Sep 17 00:00:00 2001
+From 5f79236c49bd0c2c36440f0ef83cea02d52fcaaf 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/34] x86_64: disable multilib support
+Subject: [PATCH 22/33] 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.41.0
+2.40.1

@@ -1,7 +1,7 @@
-From b26224acf342eacb33491f6ea0da1faf73d35715 Mon Sep 17 00:00:00 2001
+From 4605e64b3a076411f2f8134256c400eb58bcc1c7 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/34] riscv: disable multilib support
+Subject: [PATCH 23/33] 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 | 8 --------
+ gcc/config/riscv/linux.h | 6 ------
 gcc/config/riscv/t-linux | 7 +++++--
- 2 files changed, 5 insertions(+), 10 deletions(-)
+ 2 files changed, 5 insertions(+), 8 deletions(-)

 diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h
-index f8c2c351e5a..8d9881eadeb 100644
+index 16503482ec2..8d9881eadeb 100644
 --- a/gcc/config/riscv/linux.h
 +++ b/gcc/config/riscv/linux.h
-@@ -61,11 +61,3 @@ along with GCC; see the file COPYING3.  If not see
+@@ -61,9 +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,8 +56,6 @@ index f8c2c351e5a..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
@@ -72,5 +70,5 @@ index 216d2776a18..1a8a863853e 100644
 MULTILIB_OSDIRNAMES := $(patsubst lib%,../lib%,$(MULTILIB_DIRNAMES))
 +MULTILIB_MATCHES := march?rv64gc=march?rv64imafdc
 -- 
-2.41.0
+2.40.1

@@ -1,7 +1,7 @@
-From a72e0613f79f6b6867819317accb7a714031a08c Mon Sep 17 00:00:00 2001
+From a178cfeb975d79bb9b9fd877ab4c6e05d10b147e 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/34] always build libgcc_eh.a
+Subject: [PATCH 24/33] 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.41.0
+2.40.1

@@ -1,7 +1,7 @@
-From 3ee8cbc1cad261b30d4a7a66d31496d5f243ce2f Mon Sep 17 00:00:00 2001
+From 5bc3deb9bc2679ad4f6f189a65e3643b550587a1 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/34] ada: libgnarl compatibility for musl
+Subject: [PATCH 25/33] 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.41.0
+2.40.1

@@ -1,7 +1,7 @@
-From 3df4788c79c7429b196c7b284af2b4cf9a4b4f8d Mon Sep 17 00:00:00 2001
+From e1e6dccc9124e0907c5ae174d20acb3bad87e633 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/34] ada: musl support fixes
+Subject: [PATCH 26/33] 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.41.0
+2.40.1

@@ -1,7 +1,7 @@
-From 7b50823d8a4131e5a55d2499a0f5a52b3d91eed2 Mon Sep 17 00:00:00 2001
+From 9506e729f0e4f66f4018fbfc5340a568e8520264 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/34] configure: Add --enable-autolink-libatomic, use in
+Subject: [PATCH 27/33] 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 b30d3691fe6..ccc8e5dbb00 100644
+index 928fc6b6d4b..81a677014df 100644
 --- a/gcc/doc/install.texi
 +++ b/gcc/doc/install.texi
-@@ -2377,6 +2377,14 @@ files, but these changed header paths may conflict with some compilation
+@@ -2374,6 +2374,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.41.0
+2.40.1

@@ -1,7 +1,7 @@
-From 5bbbd320e54ab5341cfba83e8af98685131caba1 Mon Sep 17 00:00:00 2001
+From 966da83d0d75482a1489804593ae61f3f8e3b385 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/34] configure: fix detection of atomic builtins in
+Subject: [PATCH 28/33] 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.41.0
+2.40.1

@@ -1,7 +1,7 @@
-From 430c701a3cefbe09a9c7c8a2f5bbe957f9b2ecb2 Mon Sep 17 00:00:00 2001
+From e74f4b3a10d96f06b15df9d9b61d5b10a84ec084 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/34] libstdc++: do not throw exceptions for non-C locales on
+Subject: [PATCH 29/33] libstdc++: do not throw exceptions for non-C locales on
 musl targets

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

@@ -1,7 +1,7 @@
-From 05f0043755f341a2ff4f845379327076b3e0203d Mon Sep 17 00:00:00 2001
+From bdc2699f0284e59842e5d3a39fc426550b4ba0e8 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/34] gdc: unconditionally link libgphobos against
+Subject: [PATCH 30/33] 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.41.0
+2.40.1

@@ -1,7 +1,7 @@
-From 0b89a74fbf77ae6917f043c79cd03db0d6ef0212 Mon Sep 17 00:00:00 2001
+From 82780d18bfcb7dabc215d4b89b1187cb253e15f8 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/34] druntime: link against libucontext on all platforms
+Subject: [PATCH 31/33] 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.41.0
+2.40.1

@@ -1,7 +1,7 @@
-From eeec799f43fbd0bfffc13594585b39d708972511 Mon Sep 17 00:00:00 2001
+From 32fc6be0b339983e31f6285dbc565b906ec983d4 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/34] libgnat: time_t is always 64-bit on musl libc
+Subject: [PATCH 32/33] 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.41.0
+2.40.1

@@ -1,27 +1,13 @@
-From b71d21b87e6946c763edad5e420bf22d8a453077 Mon Sep 17 00:00:00 2001
+From b5e9f810a8a5963104dd1897c3276f60786f9edb Mon Sep 17 00:00:00 2001
 From: psykose <alice@ayaya.dev>
 Date: Mon, 29 May 2023 15:33:11 +0000
-Subject: [PATCH 33/34] libphobos: do not use LFS64 symbols
+Subject: [PATCH 33/33] 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(-)
+ 1 file changed, 1 insertion(+), 5 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
@@ -40,5 +26,5 @@ index 0d3d517d69a..323aa0af72d 100644
 }
 else version (CRuntime_UClibc)
 -- 
-2.41.0
+2.40.1

@@ -1,195 +0,0 @@
-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/34] 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
-
@@ -24,7 +24,7 @@ CBUILDROOT="/"
 _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"

 pkgname=gcc-aarch64
-pkgver=13.1.1_git20230715
+pkgver=13.1.1_git20230527
 # i.e. 13.1.1, must match gcc/BASE-VER
 _pkgbase="${pkgver%%_git*}"
 # date component from snapshots
@@ -267,7 +267,6 @@ source="https://dev.alpinelinux.org/archive/gcc/${_pkgbase%%.*}-$_pkgsnap/gcc-${
 	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
 	"

 # we build out-of-tree
@@ -320,7 +319,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=pentium-m --with-fpmath=sse --with-tune=generic --enable-cld";;
+	i586-*-*-*)		_arch_configure="--with-arch=i586 --with-tune=generic --enable-cld";;
 	s390x-*-*-*)		_arch_configure="--with-arch=z196 --with-tune=zEC12 --with-zarch --with-long-double-128 --enable-decimal-float";;
 	riscv64-*-*-*)		_arch_configure="--with-arch=rv64gc --with-abi=lp64d --enable-autolink-libatomic";;
 	esac
@@ -424,7 +423,7 @@ build() {

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

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

@@ -781,39 +780,38 @@ gdb() {
 }

 sha512sums="
-942d706e7f8ae8dbc85808e388b9c98de6bd922d49adeca63691218363a4f0b46829509ba1f1ed358ef436e1adf77ad7a820aaeb4bb03a4fc52cfdec118394f3  gcc-13-20230715.tar.xz
-438eda29a1851c72e65422bb4cd129ecc016f06f9bd038288e39762c01b932f786ed4aad587c7b16baf948c342c10dc9beff125166b97e0b8e0d05789aec95ce  0001-posix_memalign.patch
-4a7cd030e107b6e35fb883c80f21a547da14f540f989555ac2c9ba08958ace5b44dca194a96b460415c71f663e885954d73b04ade55f2f9d3cb116f50df8d8ca  0002-gcc-poison-system-directories.patch
-99b194f53677c3a75c3c376160673703f2d759d795ebd9f6e66d5ee095a648eba35d8aef1990a6a1e805c1cc1720636d7c23ef6102b674d92996b1e5646a0b2c  0003-specs-turn-on-Wl-z-now-by-default.patch
-39013ad0b255e9cfd168010eefc32ec4d015fce2c2b4e864341a6aa8bdb74e52a08f0ae83f29e27e9524d4da27f28369a6aa4d76f6aed6490dc2961b18f90e94  0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
-0ef08231bef5c77a38e8deaae4e00675de4312071425cf1db46ee54c3e00d2a5d1658a68302dd495c796d397e61e79efcf4e91fbd8fb2cd2e2fa539c2e884492  0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
-8202e22832141fb12601546cec42472fdb194892f839e9fed86b4ab597204b6e6575c0585c283301eeb598ac1f06d16ce500d9c0ea333444bd50ae2a210d2d76  0006-Enable-Wformat-and-Wformat-security-by-default.patch
-1b239b94b570a0eff2249a9ec7ad150270c3210128f8f8a67e1554a044a039b2acc69768ebc57a15cec661f039c41fb7b620e7ec65320efbce40ceec1c9c6b90  0007-Enable-Wtrampolines-by-default.patch
-eb3ce4df99bf4f22ca4bac2d4e24be4c235098fb67ae118cb8efe360f0441a39a9931076fa615fbc3b7d2b2a541d4ffb2cfc56097224fbd8b5f09bc01a1d7878  0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
-58a5ea76b4f7d662d3165dfeaad258087b0ec58b7ff87a62971c60817388ec6191d6dc841d63696d00fb68fe16b690790f3c0639e0edbd204033b4f8bbb4dafe  0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
-85d60bc6ef5f41854a5bc36847917dcee24bf6663fcd70b78a164a07fc08551f74fe37329b57cf187b95e23a6d04bce2ba620f21ac80c8df7d9cfcc8052089df  0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
-8ef0f45bc0639464537f39319f4954d9a9ab182e14a10c6e39455bebddd24dcdbe6ec3fc0316324a4f9d7dc1f95ec8babd7112c2ff05af54534e0fbe74ff6ebf  0011-libiberty-copy-PIC-objects-during-build-process.patch
-d8467365c19339e52bcf27476b338fb412b6a7dd6eefd4fd92822e67c756a1f04a106f4e0c1c1909b4bee8f5f3b506a98614c1bf3478d7714415cca9eb7257e1  0012-libgcc_s.patch
-cab0cb6c462f2f4abefde020e17199366c6c24ad2582fe7d793c552aa2bcbe3148c5f6cd6245bc9ff86017d949ef4e6f063c8a01ce7d247abfe685077c57e71c  0013-nopie.patch
-b1277a4edc91208fecf5ad7015e8cf237d567b310063f26d14ff39c4aade683e6d1d54d817b7f4fef79db7dc456be9f09a5a8c0ceeff784f839521d0cf243807  0014-ada-fix-shared-linking.patch
-9fa42ba8374b8e47cb3d96315d783c990cf35075354869f5657383908c4d5f143ee94d1f7f86f52140a974f5fc872b22bcaec1f732ebc249357a86ad9e781d4e  0015-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
-05e1e06a6e33958ec5c22b26919fe142153c9605173ad90c770a32d7d48dfb5df421553f3030b6d979f34acbd3614d0e32c86c3cb0b819f3fbaa054f2962ff20  0016-add-fortify-headers-paths.patch
-784d488cf55fafa259d3aa874f4230453b4d3aeb94158d0c96caf26524b8b7f8cea12367a72fa4616389dfcb877c4a1c4fe9d1cb57a67c0329bbad61e91ee423  0017-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
-18c1092273005f4fcaec36830a2cbfbf5e2a2e4e82cf5f7f4f7f3141dbbe2731db2f47a9869f271b4ee337835962c7dfbf009165f2988a14ff40d6c6935986ce  0018-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
-4bbce70032f125002aa857b0561c80e15588847282c2ab2851c3c507a48d22613ef3affb288c33da461688890c7ce265c6175fb1580194669621653788172d1b  0019-aarch64-disable-multilib-support.patch
-d4bf0a7add6d531871324c36004f7d92eea9ad7042d567e43377e5bdde7dce8d87c649c3c4bdf0144b82d2607b46fab4eb821cf9a82ee4eddb003601b331e395  0020-s390x-disable-multilib-support.patch
-e0002f9aea22c923530591f97cfb29953cd924a78b3c7ae5d15ccaae46491c1f40b03a5dc5fc17a286299b82ef48248a9ecbf6eea9bbd2058189a697e9e2ffe8  0021-ppc64-le-disable-multilib-support.patch
-28b6e2f1574611964f8e2effa57dcb6efff5d562ec5f923abfa9ddeaf4a09b0c6941d1406b02d113f950113b7239dcc8dd6b14d06ade3b2f4dbdb7f6d5560bed  0022-x86_64-disable-multilib-support.patch
-6955ea39199f258340b69c8aa7021c65fc15179323f50be08952a302b77cec1a720b99ada60bf2a07594ba536a50b682d06290497fc9d4553c8e11e2f536a606  0023-riscv-disable-multilib-support.patch
-46bfcfc122a29060d6ff1fb52b509251ba44357df67f81be1c274fdfe9b80099b1a5ad64f7d40d8412bb437e6147cb404448b8e067989018bdaf2df5cdfabaef  0024-always-build-libgcc_eh.a.patch
-07b4028c8d8c7b8bc71c0fb4e31669fb2066aefdded556d0a65773fa93db097a55e9bfa9ac9ee10fbc82e4ba21aa84738e91c331b768cf7d067407934fc30064  0025-ada-libgnarl-compatibility-for-musl.patch
-7201a76ac033bd4f7532600d7a975f2aa9f93692cec42e28323e6e8e27f7357e0cb1497c12503829a41ed025e9c7953bf4738ad0d980687a774088fabaf08cdf  0026-ada-musl-support-fixes.patch
-f3974d1a693c0e382fa78ae94ebf768c6a1ca0ee631b478cf52a366537edae373cd0ab31369ef1ae0627d2834bcacfb94c9a4d01505c91eaac9d228a5933d0ae  0027-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
-8f77c3a908ec92966fb1697fd40cc936d4dca2624f6f14b199ba154f8c46be773548a571b41a1cf537134b011e3426deb443e4a13e49fb763c91c821ca1bae63  0028-configure-fix-detection-of-atomic-builtins-in-libato.patch
-8cd10e3d10e3da0505cb4c09c4448335e5bbd18fe6e2c47cfa1257df3d83234983d71b1fdb0b4bfc76b24d477fd6e2d771b8eefacbb61e0ca1df105b980dbd4a  0029-libstdc-do-not-throw-exceptions-for-non-C-locales-on.patch
-e026f1e20b78328b55b92a5fdf8f9d1d761176d2eea90556d7be8e2bae72d0dc52fd482d1eac8ab623e98653ca56d39b18fd2139ff99d420994b10c36f266ca6  0030-gdc-unconditionally-link-libgphobos-against-libucont.patch
-80b41cf68a7e56bef50c05073cc79b9eafbd37535f6360deac16dfe5498ac041aaf91c3cc1bc6e323d574cd1da65aab22df32a03e39f606bff41a103063aafef  0031-druntime-link-against-libucontext-on-all-platforms.patch
-b4917017c45d170c6878c7744c1ecababef4346903ee1f684d5a59d65255a5576d16d40137f7dbfe46144907c6389035966813e9024c9a4f499e963ed533947a  0032-libgnat-time_t-is-always-64-bit-on-musl-libc.patch
-1cc7a5ef067bf543f6c1fa14dedc6378750a43be1649b18605699dffdc1ebce8b88405d3f12dd57e3d821c7d457d861ee0a54138c037917d6365b0bf69526e85  0033-libphobos-do-not-use-LFS64-symbols.patch
-77a1426e316b96b51edef9a35a64565d5f84b94d46a2fd7293ea406ede473b449613969f9e29cae44f8fbfbc767a27cef01b36392cf8ffb3f618c0df4e217c71  0034-libgo-fix-lfs64-use.patch
+bcad5977ff9b0fe66df53e985ddcf0be1727860f76025a09c2ea786bd6d4c7f1129776ad2e52912c16824fb5d870188d44a24125db78603d78da75c13d207311  gcc-13-20230527.tar.xz
+af3d297e6e6aa9076fd09d128d72d72cb9c225ee377f3c65cc7647620b956ac463e8f744c808b045102ab7ed131cbaa3d511e121e5c820ac93f29374bb1f4281  0001-posix_memalign.patch
+1be15c3740749731e606eed65f99c274fca2072cc8c907f036f44f3f03047af356fd2f1b2b5b8a082dac6f9046998dde400f8acb4046d14702dace7d976ff78f  0002-gcc-poison-system-directories.patch
+a43fd3091f7cecba66f6904d4241a3d04b084c6eab820f34d36a445fa57b44b0a65613550544c179e314a3d516c2cbd8f245a3f001a0854b99c7bbac171c5756  0003-specs-turn-on-Wl-z-now-by-default.patch
+b8dd907022785d5f3edd5b6575a1343d54a0c84d935e76a35308dcf2cb602a03e8b91fb51431a9be970eb797f0ae8d4f64f93ec97573cc0fdac61c0dba5ab79f  0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
+f93ec8f926a014cd43e70589ce188ca0ef24d216617184bcb81e9c9cbd56aeeede6653489f2d31105c51cab7ea94499db5ec46528ad6e14d33d8e90e2c95dc29  0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
+966012aa0a9271232d271d548c1029af3567aaf0b1d3d1ef502ad6fa18cb1c6709f8e7f7124c58040777ddd84bca68490255664a02f0a626d9e76aa4a3949980  0006-Enable-Wformat-and-Wformat-security-by-default.patch
+503789bae52d70ddae2cb55ab5046b149f03af95c8341927712d1f7c6c2d25db1fa2ee19f0832d477357162adb276f287c66b702565b684162a2f43b69157d9f  0007-Enable-Wtrampolines-by-default.patch
+1488ae4f29e3d9416430e1a10e9201d4c1cad10515ff0921756e98b6be4ec5aa8adbd94d7e5fe4dab446bdf495183fbd6d04cd53a69e5d7f2d1963eeb739daf7  0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
+6785152ee7d25ccfdb5bb14ccb08e9fa21433f3f9567b12c7174ec77c37d2437737bde60d8b4be41927eaf40efe46d24348e95ccde78428877f296f33642ab49  0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
+8ca5ef6c9ad56c0314a2230ef6d8d21e0bffdc1289f573991077d6ed1007e30d4cbefe00b0ea72718c09020bb8275178f028ce6763829f7e34255a9b84e5332f  0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
+6909b33e6067c3aef3f6a6975c9c35523d3aa7cb1e8bdaed73804b9afd28890fc868e54f806ac31b134a9c783b2e4774e561f9a7c456c6dba85c17acee1aa84d  0011-libiberty-copy-PIC-objects-during-build-process.patch
+2ff9b6828b25ea6ede730954131ccdcbdd7457f0fc32c0ba87dc9a4732a22f9bb87086b1429f7ebd04859ea66b7b3682fc75e8d81e96b2b74e9a6891456f6835  0012-libgcc_s.patch
+eb1241be648e0371dd83bed55e1902b7867938cb71fa5ed09b8e1ecfb81ee5da40abc42f2ab515217c8e70234f923fc1b85ec137fd7a58cbfaf357f732cd16f7  0013-nopie.patch
+4cd04db2d503d4cc224b08a39b4130056df340ea27c2d2c8b682096516255d4f431af2a9cf8bf1fb946b1499f1157123de666beaef72875ab3e678dde1dddce2  0014-ada-fix-shared-linking.patch
+07c159267d0f3fea64f504ce0f995e2e1dab5c96cc00198698ff24392d3cb242915ac373f69f8fc3fbc12bd60fa2c5d5b22bbf01aba938bcb6c9d2541c1701f0  0015-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
+548c7e0f7795405f46c9177638c6c20dca1d3de850a8e238ac2278887924be080d243135d246e7c15c0eb0c82b6d58cec5afbcba26da45c294a3e3de54b12e9b  0016-add-fortify-headers-paths.patch
+3e50bec315f257f57e5fdc830a91a813451348f4ed2b7d43d628544592d684e0971e2b00b614f46d0b5902fa530f13db7c86bedc180da6a700a96f1e4be2ad88  0017-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
+c777cf9ed9e0a9d91b5539a12375679f37b101e35aae6a70d113074138f4eb47afeae454206d47f5a8d6e5d437640a754839cc67cfa81a3269cc4ee4fefa8a6b  0018-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
+5b3e6875725b0a63666af7709e55154774045f1e03ef7e8620cf3cf9d50bfd852259b26e8f072613e02b106c0a09834f6223f21084362ff6a7697ba874ab1a14  0019-aarch64-disable-multilib-support.patch
+bc7790e9012985d8f2147476d57f580e966b83323b596914575518d80db51c27bd7080116ff6aef91fcf0de6712f4710a32f1c272c7fc927f0f8a4ee90fc547b  0020-s390x-disable-multilib-support.patch
+4284db01201fa1e9cebda4098b61b0c9c0319f86e0870e26e991df4b902cef6381b032f4ba83ba4e6b2537b2e14bf6e1069bba8a55054d70421769fbca3a5d80  0021-ppc64-le-disable-multilib-support.patch
+a151bd420781dae743c3406657d111a226e3170b258d7a0ce32c7c959c8702d504249222071e329c24dc74ebdcd9fafd36cb5a15d153714c6fc52e9b399353cb  0022-x86_64-disable-multilib-support.patch
+59a32ab970d83a7be15e75be73dcbf760df1a16768568ab8bfdb7519b97b53096cb9f9db5fbefe01c23957bb5f84f89eb44df3bd09ec168ab0dfb49036246b04  0023-riscv-disable-multilib-support.patch
+e083d4fdfdc22d318d8cb75c7b7ec9b1426cb0a4b66c35766a0c59aab0151a69cc40a58041ef7b2475e6c6c7d7130fbe8898f04b28008cec36076ed9b74f8b3e  0024-always-build-libgcc_eh.a.patch
+c3c3f80d48d79a8ea182d6b193cbc9334a04f8620bf53f44c7a1016a184c0113754d25c8ab912fae7c985147454f3c3dcaea05de05f9232bfa44b377a7740ebb  0025-ada-libgnarl-compatibility-for-musl.patch
+8f7392f6339488916b94ef5bae8e13991462b8ea4ce8317eb7b70eac59785b0a68fae26fee5b819e2889a365e512693a650f33c59848537568798b859884ad17  0026-ada-musl-support-fixes.patch
+8198c2761551912e286d4cbe8d9f3feadc63cba1cb03f9fec739b8127643714b559fbaa8d16f6f9605836cc660dbdd10d4d2cdf322418a9b135a03b79577e58e  0027-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
+65410e7eb0e9cfb202570365cac76ba951ec52332a02d16bfece10e4f90ea1c2feccc0aee8d3b57ec36c3d83dc3e48b80c077458106dc031fc4b9a9fe7386466  0028-configure-fix-detection-of-atomic-builtins-in-libato.patch
+023b3f79edd904a2fdafa903288626467aba43777ab40b53875fc3fb126a64af24b772ae06266afe93aa09f594c494b6e2c3b4d94eb9da724bb130978242a07c  0029-libstdc-do-not-throw-exceptions-for-non-C-locales-on.patch
+f37af328cf6562aaed7d3c8a62f4cc9bcd7b858d862e6a7cd9e6f5d8710578cf77c78bfe153b7a736cc1881b5534cd98f99065f821ae961e64840d360966c669  0030-gdc-unconditionally-link-libgphobos-against-libucont.patch
+8f5fd0aa921c3fb34bc268a76dea34f6db0dcf120b9c72dce8e691e880fc404f6881d73d0ea20620703da8720fff769215df3bbb679fd32eff78a27fc40a3366  0031-druntime-link-against-libucontext-on-all-platforms.patch
+00f1d6434bd8bc2baaad58f3d739e771fd2738af7c86f0ea1a99a70b71153b78d586b3e098cc7a5cdd06b515d70e32acb2b239a0bb3b96078af7a0e52be9d6aa  0032-libgnat-time_t-is-always-64-bit-on-musl-libc.patch
+5ee4a721f27908c9f9352f7f0de46f36d6464548b9524c7f45ca92c159966481782182022f2270ef690a1828270bbb9879111cc62b080e5314a235aa83d409e3  0033-libphobos-do-not-use-LFS64-symbols.patch
 "
@@ -1,7 +1,7 @@
-From 47b4bd4deb2c356bb07d2a96f22127aefafec3a4 Mon Sep 17 00:00:00 2001
+From 3e5acbe356124aa5d8dde0635d652c065a553e7d 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/34] posix_memalign
+Subject: [PATCH 01/33] posix_memalign

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

@@ -1,7 +1,7 @@
-From 4fa620d8c3e6730211bfb071eb4c817320491bd0 Mon Sep 17 00:00:00 2001
+From f986a4a1224fa7d452b415d690aead8d356a7eae 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/34] gcc: poison-system-directories
+Subject: [PATCH 02/33] 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 af0e5933fdb..b6731a4673c 100644
+index c0c3ad14515..7cdd5bfa952 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 af0e5933fdb..b6731a4673c 100644
 -Wno-pragmas  -Wno-prio-ctor-dtor  -Wredundant-decls
 -Wrestrict  -Wno-return-local-addr  -Wreturn-type
 -Wno-scalar-storage-order  -Wsequence-point
-@@ -8426,6 +8427,14 @@ made up of data only and thus requires no special treatment.  But, for
+@@ -8424,6 +8425,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.41.0
+2.40.1

@@ -1,7 +1,7 @@
-From ff4dd4ce33133e675b7bedc86b73357c04631cb9 Mon Sep 17 00:00:00 2001
+From 31e2b60000e779ef775daa306120eabcf987852a 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/34] specs: turn on -Wl,-z,now by default
+Subject: [PATCH 03/33] 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 b6731a4673c..f393c7846c6 100644
+index 7cdd5bfa952..158b7bcb81e 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
-@@ -17961,6 +17961,9 @@ For example, @option{-Wl,-Map,output.map} passes @option{-Map output.map} to the
+@@ -17959,6 +17959,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.41.0
+2.40.1

@@ -1,7 +1,7 @@
-From 1b315235433701e4a974da259b8d651169ddc7ac Mon Sep 17 00:00:00 2001
+From 3b910da7d1e81bdd953e6d9ec82020e7b120353b 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/34] Turn on -D_FORTIFY_SOURCE=2 by default for C, C++,
+Subject: [PATCH 04/33] 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 f393c7846c6..ef3c14a189e 100644
+index 158b7bcb81e..cc9972f907b 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
-@@ -11868,6 +11868,12 @@ also turns on the following optimization flags:
+@@ -11866,6 +11866,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 f393c7846c6..ef3c14a189e 100644
 @item -O3
 Optimize yet more.  @option{-O3} turns on all optimizations specified
 -- 
-2.41.0
+2.40.1

@@ -1,7 +1,7 @@
-From 67c0f5789630b27149f60ff831999ef7c1dba5d5 Mon Sep 17 00:00:00 2001
+From 9c3a2882b1932296ccb1d0ed2900cf046f998a26 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/34] On linux targets pass --as-needed by default to the
+Subject: [PATCH 05/33] 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 3e625e0f867..f8c2c351e5a 100644
+index 2fdfd930cf2..16503482ec2 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.41.0
+2.40.1

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

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

@@ -1,7 +1,7 @@
-From 4a728ad48a7b437cc6f2697e26603bf648149f86 Mon Sep 17 00:00:00 2001
+From 93e44f7c7b1f11c1f714d6c384b0d39a191ac18a 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/34] Enable -Wtrampolines by default.
+Subject: [PATCH 07/33] Enable -Wtrampolines by default.

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

@@ -1,7 +1,7 @@
-From 32f24560d0602f7735d5e9efd92fe3151bd72cea Mon Sep 17 00:00:00 2001
+From 7aa93d6d9a63c7bedf1e033f6d040e95038537e7 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/34] Disable ssp on -nostdlib, -nodefaultlibs and
+Subject: [PATCH 08/33] 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.41.0
+2.40.1

@@ -1,7 +1,7 @@
-From c7ec8da7280d7f97f5543eb9ddeca7600aafc43c Mon Sep 17 00:00:00 2001
+From e44b295b5b0b917c0b47085f60466a37f890e1c7 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/34] Ensure that msgfmt doesn't encounter problems during
+Subject: [PATCH 09/33] 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.41.0
+2.40.1

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

@@ -1,7 +1,7 @@
-From 65e01e749205c9af218b01233cebd0077538d0ee Mon Sep 17 00:00:00 2001
+From 6fc13fce114648b1a64e658b469a4697382d18bb 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/34] libiberty: copy PIC objects during build process
+Subject: [PATCH 11/33] libiberty: copy PIC objects during build process

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

@@ -1,7 +1,7 @@
-From 453a815bf2844971a91eaef800af188d9e86b784 Mon Sep 17 00:00:00 2001
+From 6a1955bbf49836ad99b23501f42283842e01761b 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/34] libgcc_s
+Subject: [PATCH 12/33] 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.41.0
+2.40.1

@@ -1,7 +1,7 @@
-From 7d7d12137c666761a8dd61179c9651b85dae9b41 Mon Sep 17 00:00:00 2001
+From 558e95aa2b0f3bbf416e1bb572e5f47bddc8601c 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/34] nopie
+Subject: [PATCH 13/33] nopie

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

@@ -1,7 +1,7 @@
-From dd5bb97c31a9f57034c70a7a18ba6e2e133084c7 Mon Sep 17 00:00:00 2001
+From ecad19db42776c536bd4f6033ec1891ffae03720 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/34] ada: fix shared linking
+Subject: [PATCH 14/33] 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.41.0
+2.40.1

@@ -1,7 +1,7 @@
-From 6bb5b7d9161d05f31b001d8211a9c63caf63fd2f Mon Sep 17 00:00:00 2001
+From 8500b4cdd039c16a02a8acabd124b92865871979 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/34] build: fix CXXFLAGS_FOR_BUILD passing
+Subject: [PATCH 15/33] 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.41.0
+2.40.1

@@ -1,7 +1,7 @@
-From f0d9e00cac06689f64b214de7aee80d7116ef084 Mon Sep 17 00:00:00 2001
+From e893ad827215a7c090a835e20a81559f4044fb47 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/34] add fortify-headers paths
+Subject: [PATCH 16/33] 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.41.0
+2.40.1

@@ -1,7 +1,7 @@
-From 857db04f4f1a06e866551b4172fe8f27363f4a92 Mon Sep 17 00:00:00 2001
+From 064afc74f18f2a00771fc2600029a713b8708845 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/34] Alpine musl package provides libssp_nonshared.a. We
+Subject: [PATCH 17/33] 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.41.0
+2.40.1

@@ -1,7 +1,7 @@
-From 5a8347e23ab13912b6edec2c6c6e3a101b017c79 Mon Sep 17 00:00:00 2001
+From 45a98ce1f1702424aba4271f7f7570e43a354101 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/34] DP: Use --push-state/--pop-state for gold as well when
+Subject: [PATCH 18/33] 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.41.0
+2.40.1

@@ -1,7 +1,7 @@
-From 41d00a2eb0754acf71958808bd17dbebeb517b84 Mon Sep 17 00:00:00 2001
+From 6a2e902dc8abcfd44522b9224fd759d038db51f5 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/34] aarch64: disable multilib support
+Subject: [PATCH 19/33] 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.41.0
+2.40.1

@@ -1,7 +1,7 @@
-From 85b42bfbba71616831d14360b16998acb28790fd Mon Sep 17 00:00:00 2001
+From 6e7c72ee05353a284d9c9809035e7ff488b4b8c1 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/34] s390x: disable multilib support
+Subject: [PATCH 20/33] 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.41.0
+2.40.1

@@ -1,7 +1,7 @@
-From 7b53df284242638e940c0155b6c21e88cea1f55b Mon Sep 17 00:00:00 2001
+From 44655aa3be8d5354fb82a42317a9ac6ac1b50164 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/34] ppc64[le]: disable multilib support
+Subject: [PATCH 21/33] 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.41.0
+2.40.1

@@ -1,7 +1,7 @@
-From 96e7e1e9a899d9bb5fcbdf788bd529d0390c626f Mon Sep 17 00:00:00 2001
+From 5f79236c49bd0c2c36440f0ef83cea02d52fcaaf 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/34] x86_64: disable multilib support
+Subject: [PATCH 22/33] 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.41.0
+2.40.1

@@ -1,7 +1,7 @@
-From b26224acf342eacb33491f6ea0da1faf73d35715 Mon Sep 17 00:00:00 2001
+From 4605e64b3a076411f2f8134256c400eb58bcc1c7 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/34] riscv: disable multilib support
+Subject: [PATCH 23/33] 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 | 8 --------
+ gcc/config/riscv/linux.h | 6 ------
 gcc/config/riscv/t-linux | 7 +++++--
- 2 files changed, 5 insertions(+), 10 deletions(-)
+ 2 files changed, 5 insertions(+), 8 deletions(-)

 diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h
-index f8c2c351e5a..8d9881eadeb 100644
+index 16503482ec2..8d9881eadeb 100644
 --- a/gcc/config/riscv/linux.h
 +++ b/gcc/config/riscv/linux.h
-@@ -61,11 +61,3 @@ along with GCC; see the file COPYING3.  If not see
+@@ -61,9 +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,8 +56,6 @@ index f8c2c351e5a..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
@@ -72,5 +70,5 @@ index 216d2776a18..1a8a863853e 100644
 MULTILIB_OSDIRNAMES := $(patsubst lib%,../lib%,$(MULTILIB_DIRNAMES))
 +MULTILIB_MATCHES := march?rv64gc=march?rv64imafdc
 -- 
-2.41.0
+2.40.1

@@ -1,7 +1,7 @@
-From a72e0613f79f6b6867819317accb7a714031a08c Mon Sep 17 00:00:00 2001
+From a178cfeb975d79bb9b9fd877ab4c6e05d10b147e 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/34] always build libgcc_eh.a
+Subject: [PATCH 24/33] 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.41.0
+2.40.1

@@ -1,7 +1,7 @@
-From 3ee8cbc1cad261b30d4a7a66d31496d5f243ce2f Mon Sep 17 00:00:00 2001
+From 5bc3deb9bc2679ad4f6f189a65e3643b550587a1 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/34] ada: libgnarl compatibility for musl
+Subject: [PATCH 25/33] 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.41.0
+2.40.1

@@ -1,7 +1,7 @@
-From 3df4788c79c7429b196c7b284af2b4cf9a4b4f8d Mon Sep 17 00:00:00 2001
+From e1e6dccc9124e0907c5ae174d20acb3bad87e633 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/34] ada: musl support fixes
+Subject: [PATCH 26/33] 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.41.0
+2.40.1

@@ -1,7 +1,7 @@
-From 7b50823d8a4131e5a55d2499a0f5a52b3d91eed2 Mon Sep 17 00:00:00 2001
+From 9506e729f0e4f66f4018fbfc5340a568e8520264 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/34] configure: Add --enable-autolink-libatomic, use in
+Subject: [PATCH 27/33] 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 b30d3691fe6..ccc8e5dbb00 100644
+index 928fc6b6d4b..81a677014df 100644
 --- a/gcc/doc/install.texi
 +++ b/gcc/doc/install.texi
-@@ -2377,6 +2377,14 @@ files, but these changed header paths may conflict with some compilation
+@@ -2374,6 +2374,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.41.0
+2.40.1

@@ -1,7 +1,7 @@
-From 5bbbd320e54ab5341cfba83e8af98685131caba1 Mon Sep 17 00:00:00 2001
+From 966da83d0d75482a1489804593ae61f3f8e3b385 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/34] configure: fix detection of atomic builtins in
+Subject: [PATCH 28/33] 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.41.0
+2.40.1

@@ -1,7 +1,7 @@
-From 430c701a3cefbe09a9c7c8a2f5bbe957f9b2ecb2 Mon Sep 17 00:00:00 2001
+From e74f4b3a10d96f06b15df9d9b61d5b10a84ec084 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/34] libstdc++: do not throw exceptions for non-C locales on
+Subject: [PATCH 29/33] libstdc++: do not throw exceptions for non-C locales on
 musl targets

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

@@ -1,7 +1,7 @@
-From 05f0043755f341a2ff4f845379327076b3e0203d Mon Sep 17 00:00:00 2001
+From bdc2699f0284e59842e5d3a39fc426550b4ba0e8 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/34] gdc: unconditionally link libgphobos against
+Subject: [PATCH 30/33] 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.41.0
+2.40.1

@@ -1,7 +1,7 @@
-From 0b89a74fbf77ae6917f043c79cd03db0d6ef0212 Mon Sep 17 00:00:00 2001
+From 82780d18bfcb7dabc215d4b89b1187cb253e15f8 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/34] druntime: link against libucontext on all platforms
+Subject: [PATCH 31/33] 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.41.0
+2.40.1

@@ -1,7 +1,7 @@
-From eeec799f43fbd0bfffc13594585b39d708972511 Mon Sep 17 00:00:00 2001
+From 32fc6be0b339983e31f6285dbc565b906ec983d4 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/34] libgnat: time_t is always 64-bit on musl libc
+Subject: [PATCH 32/33] 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.41.0
+2.40.1

@@ -1,27 +1,13 @@
-From b71d21b87e6946c763edad5e420bf22d8a453077 Mon Sep 17 00:00:00 2001
+From b5e9f810a8a5963104dd1897c3276f60786f9edb Mon Sep 17 00:00:00 2001
 From: psykose <alice@ayaya.dev>
 Date: Mon, 29 May 2023 15:33:11 +0000
-Subject: [PATCH 33/34] libphobos: do not use LFS64 symbols
+Subject: [PATCH 33/33] 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(-)
+ 1 file changed, 1 insertion(+), 5 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
@@ -40,5 +26,5 @@ index 0d3d517d69a..323aa0af72d 100644
 }
 else version (CRuntime_UClibc)
 -- 
-2.41.0
+2.40.1

@@ -1,195 +0,0 @@
-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/34] 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
-
@@ -24,7 +24,7 @@ CBUILDROOT="/"
 _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"

 pkgname=gcc-armhf
-pkgver=13.1.1_git20230715
+pkgver=13.1.1_git20230527
 # i.e. 13.1.1, must match gcc/BASE-VER
 _pkgbase="${pkgver%%_git*}"
 # date component from snapshots
@@ -267,7 +267,6 @@ source="https://dev.alpinelinux.org/archive/gcc/${_pkgbase%%.*}-$_pkgsnap/gcc-${
 	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
 	"

 # we build out-of-tree
@@ -320,7 +319,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=pentium-m --with-fpmath=sse --with-tune=generic --enable-cld";;
+	i586-*-*-*)		_arch_configure="--with-arch=i586 --with-tune=generic --enable-cld";;
 	s390x-*-*-*)		_arch_configure="--with-arch=z196 --with-tune=zEC12 --with-zarch --with-long-double-128 --enable-decimal-float";;
 	riscv64-*-*-*)		_arch_configure="--with-arch=rv64gc --with-abi=lp64d --enable-autolink-libatomic";;
 	esac
@@ -424,7 +423,7 @@ build() {

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

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

@@ -781,39 +780,38 @@ gdb() {
 }

 sha512sums="
-942d706e7f8ae8dbc85808e388b9c98de6bd922d49adeca63691218363a4f0b46829509ba1f1ed358ef436e1adf77ad7a820aaeb4bb03a4fc52cfdec118394f3  gcc-13-20230715.tar.xz
-438eda29a1851c72e65422bb4cd129ecc016f06f9bd038288e39762c01b932f786ed4aad587c7b16baf948c342c10dc9beff125166b97e0b8e0d05789aec95ce  0001-posix_memalign.patch
-4a7cd030e107b6e35fb883c80f21a547da14f540f989555ac2c9ba08958ace5b44dca194a96b460415c71f663e885954d73b04ade55f2f9d3cb116f50df8d8ca  0002-gcc-poison-system-directories.patch
-99b194f53677c3a75c3c376160673703f2d759d795ebd9f6e66d5ee095a648eba35d8aef1990a6a1e805c1cc1720636d7c23ef6102b674d92996b1e5646a0b2c  0003-specs-turn-on-Wl-z-now-by-default.patch
-39013ad0b255e9cfd168010eefc32ec4d015fce2c2b4e864341a6aa8bdb74e52a08f0ae83f29e27e9524d4da27f28369a6aa4d76f6aed6490dc2961b18f90e94  0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
-0ef08231bef5c77a38e8deaae4e00675de4312071425cf1db46ee54c3e00d2a5d1658a68302dd495c796d397e61e79efcf4e91fbd8fb2cd2e2fa539c2e884492  0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
-8202e22832141fb12601546cec42472fdb194892f839e9fed86b4ab597204b6e6575c0585c283301eeb598ac1f06d16ce500d9c0ea333444bd50ae2a210d2d76  0006-Enable-Wformat-and-Wformat-security-by-default.patch
-1b239b94b570a0eff2249a9ec7ad150270c3210128f8f8a67e1554a044a039b2acc69768ebc57a15cec661f039c41fb7b620e7ec65320efbce40ceec1c9c6b90  0007-Enable-Wtrampolines-by-default.patch
-eb3ce4df99bf4f22ca4bac2d4e24be4c235098fb67ae118cb8efe360f0441a39a9931076fa615fbc3b7d2b2a541d4ffb2cfc56097224fbd8b5f09bc01a1d7878  0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
-58a5ea76b4f7d662d3165dfeaad258087b0ec58b7ff87a62971c60817388ec6191d6dc841d63696d00fb68fe16b690790f3c0639e0edbd204033b4f8bbb4dafe  0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
-85d60bc6ef5f41854a5bc36847917dcee24bf6663fcd70b78a164a07fc08551f74fe37329b57cf187b95e23a6d04bce2ba620f21ac80c8df7d9cfcc8052089df  0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
-8ef0f45bc0639464537f39319f4954d9a9ab182e14a10c6e39455bebddd24dcdbe6ec3fc0316324a4f9d7dc1f95ec8babd7112c2ff05af54534e0fbe74ff6ebf  0011-libiberty-copy-PIC-objects-during-build-process.patch
-d8467365c19339e52bcf27476b338fb412b6a7dd6eefd4fd92822e67c756a1f04a106f4e0c1c1909b4bee8f5f3b506a98614c1bf3478d7714415cca9eb7257e1  0012-libgcc_s.patch
-cab0cb6c462f2f4abefde020e17199366c6c24ad2582fe7d793c552aa2bcbe3148c5f6cd6245bc9ff86017d949ef4e6f063c8a01ce7d247abfe685077c57e71c  0013-nopie.patch
-b1277a4edc91208fecf5ad7015e8cf237d567b310063f26d14ff39c4aade683e6d1d54d817b7f4fef79db7dc456be9f09a5a8c0ceeff784f839521d0cf243807  0014-ada-fix-shared-linking.patch
-9fa42ba8374b8e47cb3d96315d783c990cf35075354869f5657383908c4d5f143ee94d1f7f86f52140a974f5fc872b22bcaec1f732ebc249357a86ad9e781d4e  0015-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
-05e1e06a6e33958ec5c22b26919fe142153c9605173ad90c770a32d7d48dfb5df421553f3030b6d979f34acbd3614d0e32c86c3cb0b819f3fbaa054f2962ff20  0016-add-fortify-headers-paths.patch
-784d488cf55fafa259d3aa874f4230453b4d3aeb94158d0c96caf26524b8b7f8cea12367a72fa4616389dfcb877c4a1c4fe9d1cb57a67c0329bbad61e91ee423  0017-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
-18c1092273005f4fcaec36830a2cbfbf5e2a2e4e82cf5f7f4f7f3141dbbe2731db2f47a9869f271b4ee337835962c7dfbf009165f2988a14ff40d6c6935986ce  0018-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
-4bbce70032f125002aa857b0561c80e15588847282c2ab2851c3c507a48d22613ef3affb288c33da461688890c7ce265c6175fb1580194669621653788172d1b  0019-aarch64-disable-multilib-support.patch
-d4bf0a7add6d531871324c36004f7d92eea9ad7042d567e43377e5bdde7dce8d87c649c3c4bdf0144b82d2607b46fab4eb821cf9a82ee4eddb003601b331e395  0020-s390x-disable-multilib-support.patch
-e0002f9aea22c923530591f97cfb29953cd924a78b3c7ae5d15ccaae46491c1f40b03a5dc5fc17a286299b82ef48248a9ecbf6eea9bbd2058189a697e9e2ffe8  0021-ppc64-le-disable-multilib-support.patch
-28b6e2f1574611964f8e2effa57dcb6efff5d562ec5f923abfa9ddeaf4a09b0c6941d1406b02d113f950113b7239dcc8dd6b14d06ade3b2f4dbdb7f6d5560bed  0022-x86_64-disable-multilib-support.patch
-6955ea39199f258340b69c8aa7021c65fc15179323f50be08952a302b77cec1a720b99ada60bf2a07594ba536a50b682d06290497fc9d4553c8e11e2f536a606  0023-riscv-disable-multilib-support.patch
-46bfcfc122a29060d6ff1fb52b509251ba44357df67f81be1c274fdfe9b80099b1a5ad64f7d40d8412bb437e6147cb404448b8e067989018bdaf2df5cdfabaef  0024-always-build-libgcc_eh.a.patch
-07b4028c8d8c7b8bc71c0fb4e31669fb2066aefdded556d0a65773fa93db097a55e9bfa9ac9ee10fbc82e4ba21aa84738e91c331b768cf7d067407934fc30064  0025-ada-libgnarl-compatibility-for-musl.patch
-7201a76ac033bd4f7532600d7a975f2aa9f93692cec42e28323e6e8e27f7357e0cb1497c12503829a41ed025e9c7953bf4738ad0d980687a774088fabaf08cdf  0026-ada-musl-support-fixes.patch
-f3974d1a693c0e382fa78ae94ebf768c6a1ca0ee631b478cf52a366537edae373cd0ab31369ef1ae0627d2834bcacfb94c9a4d01505c91eaac9d228a5933d0ae  0027-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
-8f77c3a908ec92966fb1697fd40cc936d4dca2624f6f14b199ba154f8c46be773548a571b41a1cf537134b011e3426deb443e4a13e49fb763c91c821ca1bae63  0028-configure-fix-detection-of-atomic-builtins-in-libato.patch
-8cd10e3d10e3da0505cb4c09c4448335e5bbd18fe6e2c47cfa1257df3d83234983d71b1fdb0b4bfc76b24d477fd6e2d771b8eefacbb61e0ca1df105b980dbd4a  0029-libstdc-do-not-throw-exceptions-for-non-C-locales-on.patch
-e026f1e20b78328b55b92a5fdf8f9d1d761176d2eea90556d7be8e2bae72d0dc52fd482d1eac8ab623e98653ca56d39b18fd2139ff99d420994b10c36f266ca6  0030-gdc-unconditionally-link-libgphobos-against-libucont.patch
-80b41cf68a7e56bef50c05073cc79b9eafbd37535f6360deac16dfe5498ac041aaf91c3cc1bc6e323d574cd1da65aab22df32a03e39f606bff41a103063aafef  0031-druntime-link-against-libucontext-on-all-platforms.patch
-b4917017c45d170c6878c7744c1ecababef4346903ee1f684d5a59d65255a5576d16d40137f7dbfe46144907c6389035966813e9024c9a4f499e963ed533947a  0032-libgnat-time_t-is-always-64-bit-on-musl-libc.patch
-1cc7a5ef067bf543f6c1fa14dedc6378750a43be1649b18605699dffdc1ebce8b88405d3f12dd57e3d821c7d457d861ee0a54138c037917d6365b0bf69526e85  0033-libphobos-do-not-use-LFS64-symbols.patch
-77a1426e316b96b51edef9a35a64565d5f84b94d46a2fd7293ea406ede473b449613969f9e29cae44f8fbfbc767a27cef01b36392cf8ffb3f618c0df4e217c71  0034-libgo-fix-lfs64-use.patch
+bcad5977ff9b0fe66df53e985ddcf0be1727860f76025a09c2ea786bd6d4c7f1129776ad2e52912c16824fb5d870188d44a24125db78603d78da75c13d207311  gcc-13-20230527.tar.xz
+af3d297e6e6aa9076fd09d128d72d72cb9c225ee377f3c65cc7647620b956ac463e8f744c808b045102ab7ed131cbaa3d511e121e5c820ac93f29374bb1f4281  0001-posix_memalign.patch
+1be15c3740749731e606eed65f99c274fca2072cc8c907f036f44f3f03047af356fd2f1b2b5b8a082dac6f9046998dde400f8acb4046d14702dace7d976ff78f  0002-gcc-poison-system-directories.patch
+a43fd3091f7cecba66f6904d4241a3d04b084c6eab820f34d36a445fa57b44b0a65613550544c179e314a3d516c2cbd8f245a3f001a0854b99c7bbac171c5756  0003-specs-turn-on-Wl-z-now-by-default.patch
+b8dd907022785d5f3edd5b6575a1343d54a0c84d935e76a35308dcf2cb602a03e8b91fb51431a9be970eb797f0ae8d4f64f93ec97573cc0fdac61c0dba5ab79f  0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
+f93ec8f926a014cd43e70589ce188ca0ef24d216617184bcb81e9c9cbd56aeeede6653489f2d31105c51cab7ea94499db5ec46528ad6e14d33d8e90e2c95dc29  0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
+966012aa0a9271232d271d548c1029af3567aaf0b1d3d1ef502ad6fa18cb1c6709f8e7f7124c58040777ddd84bca68490255664a02f0a626d9e76aa4a3949980  0006-Enable-Wformat-and-Wformat-security-by-default.patch
+503789bae52d70ddae2cb55ab5046b149f03af95c8341927712d1f7c6c2d25db1fa2ee19f0832d477357162adb276f287c66b702565b684162a2f43b69157d9f  0007-Enable-Wtrampolines-by-default.patch
+1488ae4f29e3d9416430e1a10e9201d4c1cad10515ff0921756e98b6be4ec5aa8adbd94d7e5fe4dab446bdf495183fbd6d04cd53a69e5d7f2d1963eeb739daf7  0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
+6785152ee7d25ccfdb5bb14ccb08e9fa21433f3f9567b12c7174ec77c37d2437737bde60d8b4be41927eaf40efe46d24348e95ccde78428877f296f33642ab49  0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
+8ca5ef6c9ad56c0314a2230ef6d8d21e0bffdc1289f573991077d6ed1007e30d4cbefe00b0ea72718c09020bb8275178f028ce6763829f7e34255a9b84e5332f  0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
+6909b33e6067c3aef3f6a6975c9c35523d3aa7cb1e8bdaed73804b9afd28890fc868e54f806ac31b134a9c783b2e4774e561f9a7c456c6dba85c17acee1aa84d  0011-libiberty-copy-PIC-objects-during-build-process.patch
+2ff9b6828b25ea6ede730954131ccdcbdd7457f0fc32c0ba87dc9a4732a22f9bb87086b1429f7ebd04859ea66b7b3682fc75e8d81e96b2b74e9a6891456f6835  0012-libgcc_s.patch
+eb1241be648e0371dd83bed55e1902b7867938cb71fa5ed09b8e1ecfb81ee5da40abc42f2ab515217c8e70234f923fc1b85ec137fd7a58cbfaf357f732cd16f7  0013-nopie.patch
+4cd04db2d503d4cc224b08a39b4130056df340ea27c2d2c8b682096516255d4f431af2a9cf8bf1fb946b1499f1157123de666beaef72875ab3e678dde1dddce2  0014-ada-fix-shared-linking.patch
+07c159267d0f3fea64f504ce0f995e2e1dab5c96cc00198698ff24392d3cb242915ac373f69f8fc3fbc12bd60fa2c5d5b22bbf01aba938bcb6c9d2541c1701f0  0015-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
+548c7e0f7795405f46c9177638c6c20dca1d3de850a8e238ac2278887924be080d243135d246e7c15c0eb0c82b6d58cec5afbcba26da45c294a3e3de54b12e9b  0016-add-fortify-headers-paths.patch
+3e50bec315f257f57e5fdc830a91a813451348f4ed2b7d43d628544592d684e0971e2b00b614f46d0b5902fa530f13db7c86bedc180da6a700a96f1e4be2ad88  0017-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
+c777cf9ed9e0a9d91b5539a12375679f37b101e35aae6a70d113074138f4eb47afeae454206d47f5a8d6e5d437640a754839cc67cfa81a3269cc4ee4fefa8a6b  0018-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
+5b3e6875725b0a63666af7709e55154774045f1e03ef7e8620cf3cf9d50bfd852259b26e8f072613e02b106c0a09834f6223f21084362ff6a7697ba874ab1a14  0019-aarch64-disable-multilib-support.patch
+bc7790e9012985d8f2147476d57f580e966b83323b596914575518d80db51c27bd7080116ff6aef91fcf0de6712f4710a32f1c272c7fc927f0f8a4ee90fc547b  0020-s390x-disable-multilib-support.patch
+4284db01201fa1e9cebda4098b61b0c9c0319f86e0870e26e991df4b902cef6381b032f4ba83ba4e6b2537b2e14bf6e1069bba8a55054d70421769fbca3a5d80  0021-ppc64-le-disable-multilib-support.patch
+a151bd420781dae743c3406657d111a226e3170b258d7a0ce32c7c959c8702d504249222071e329c24dc74ebdcd9fafd36cb5a15d153714c6fc52e9b399353cb  0022-x86_64-disable-multilib-support.patch
+59a32ab970d83a7be15e75be73dcbf760df1a16768568ab8bfdb7519b97b53096cb9f9db5fbefe01c23957bb5f84f89eb44df3bd09ec168ab0dfb49036246b04  0023-riscv-disable-multilib-support.patch
+e083d4fdfdc22d318d8cb75c7b7ec9b1426cb0a4b66c35766a0c59aab0151a69cc40a58041ef7b2475e6c6c7d7130fbe8898f04b28008cec36076ed9b74f8b3e  0024-always-build-libgcc_eh.a.patch
+c3c3f80d48d79a8ea182d6b193cbc9334a04f8620bf53f44c7a1016a184c0113754d25c8ab912fae7c985147454f3c3dcaea05de05f9232bfa44b377a7740ebb  0025-ada-libgnarl-compatibility-for-musl.patch
+8f7392f6339488916b94ef5bae8e13991462b8ea4ce8317eb7b70eac59785b0a68fae26fee5b819e2889a365e512693a650f33c59848537568798b859884ad17  0026-ada-musl-support-fixes.patch
+8198c2761551912e286d4cbe8d9f3feadc63cba1cb03f9fec739b8127643714b559fbaa8d16f6f9605836cc660dbdd10d4d2cdf322418a9b135a03b79577e58e  0027-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
+65410e7eb0e9cfb202570365cac76ba951ec52332a02d16bfece10e4f90ea1c2feccc0aee8d3b57ec36c3d83dc3e48b80c077458106dc031fc4b9a9fe7386466  0028-configure-fix-detection-of-atomic-builtins-in-libato.patch
+023b3f79edd904a2fdafa903288626467aba43777ab40b53875fc3fb126a64af24b772ae06266afe93aa09f594c494b6e2c3b4d94eb9da724bb130978242a07c  0029-libstdc-do-not-throw-exceptions-for-non-C-locales-on.patch
+f37af328cf6562aaed7d3c8a62f4cc9bcd7b858d862e6a7cd9e6f5d8710578cf77c78bfe153b7a736cc1881b5534cd98f99065f821ae961e64840d360966c669  0030-gdc-unconditionally-link-libgphobos-against-libucont.patch
+8f5fd0aa921c3fb34bc268a76dea34f6db0dcf120b9c72dce8e691e880fc404f6881d73d0ea20620703da8720fff769215df3bbb679fd32eff78a27fc40a3366  0031-druntime-link-against-libucontext-on-all-platforms.patch
+00f1d6434bd8bc2baaad58f3d739e771fd2738af7c86f0ea1a99a70b71153b78d586b3e098cc7a5cdd06b515d70e32acb2b239a0bb3b96078af7a0e52be9d6aa  0032-libgnat-time_t-is-always-64-bit-on-musl-libc.patch
+5ee4a721f27908c9f9352f7f0de46f36d6464548b9524c7f45ca92c159966481782182022f2270ef690a1828270bbb9879111cc62b080e5314a235aa83d409e3  0033-libphobos-do-not-use-LFS64-symbols.patch
 "
@@ -1,7 +1,7 @@
-From 47b4bd4deb2c356bb07d2a96f22127aefafec3a4 Mon Sep 17 00:00:00 2001
+From 3e5acbe356124aa5d8dde0635d652c065a553e7d 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/34] posix_memalign
+Subject: [PATCH 01/33] posix_memalign

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

@@ -1,7 +1,7 @@
-From 4fa620d8c3e6730211bfb071eb4c817320491bd0 Mon Sep 17 00:00:00 2001
+From f986a4a1224fa7d452b415d690aead8d356a7eae 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/34] gcc: poison-system-directories
+Subject: [PATCH 02/33] 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 af0e5933fdb..b6731a4673c 100644
+index c0c3ad14515..7cdd5bfa952 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 af0e5933fdb..b6731a4673c 100644
 -Wno-pragmas  -Wno-prio-ctor-dtor  -Wredundant-decls
 -Wrestrict  -Wno-return-local-addr  -Wreturn-type
 -Wno-scalar-storage-order  -Wsequence-point
-@@ -8426,6 +8427,14 @@ made up of data only and thus requires no special treatment.  But, for
+@@ -8424,6 +8425,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.41.0
+2.40.1

@@ -1,7 +1,7 @@
-From ff4dd4ce33133e675b7bedc86b73357c04631cb9 Mon Sep 17 00:00:00 2001
+From 31e2b60000e779ef775daa306120eabcf987852a 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/34] specs: turn on -Wl,-z,now by default
+Subject: [PATCH 03/33] 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 b6731a4673c..f393c7846c6 100644
+index 7cdd5bfa952..158b7bcb81e 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
-@@ -17961,6 +17961,9 @@ For example, @option{-Wl,-Map,output.map} passes @option{-Map output.map} to the
+@@ -17959,6 +17959,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.41.0
+2.40.1

@@ -1,7 +1,7 @@
-From 1b315235433701e4a974da259b8d651169ddc7ac Mon Sep 17 00:00:00 2001
+From 3b910da7d1e81bdd953e6d9ec82020e7b120353b 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/34] Turn on -D_FORTIFY_SOURCE=2 by default for C, C++,
+Subject: [PATCH 04/33] 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 f393c7846c6..ef3c14a189e 100644
+index 158b7bcb81e..cc9972f907b 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
-@@ -11868,6 +11868,12 @@ also turns on the following optimization flags:
+@@ -11866,6 +11866,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 f393c7846c6..ef3c14a189e 100644
 @item -O3
 Optimize yet more.  @option{-O3} turns on all optimizations specified
 -- 
-2.41.0
+2.40.1