main/postmarketos-base-ui: enable USB tethering

USB tethering allows users to use their phone's WiFi or WWAN interface
as an access point for the device they connect the phone with over USB.
This way, they can use their data plan with a laptop or desktop when
regular Internet access is absent.

Configure NetworkManager to manage the usb0 iface from initfs so users
can configure it in GNOME Settings or KDE. Include a NetworkManager
dispatcher script as well to handle postmarketOS' setup with unudhcpd as
we want to provide an SSH login over USB when tethering is disabled. If
tethering is enabled, unudhpcd is stopped and its functionality is taken
over by NetworkManager through an instance of dnsmasq. NetworkManager
will also configure the necessary settings to allow IP forwarding and
firewall rules during tethering. Once disabled, NetworkManager cleans up
these settings and our dispatcher script starts unudhcpd again.

Due to upstream changes, NetworkManager requires networkmanager-dnsmasq
subpackage as dependency as dnsmasq needs DBus support for
NetworkManager. Without it, NetworkManager will silently fail spawning
dnsmasq instances.

.ci/grep.sh

@@ -38,10 +38,3 @@ if grep -qr '/usr/share/postmarketos-mkinitfs' -- *; then
 	grep --color=always -r '/usr/share/postmarketos-mkinitfs' -- *
 	exit 1
 fi
-
-# Direct sourcing of deviceinfo
-if grep --exclude='source_deviceinfo' -qEr 'source /etc/deviceinfo|\. /etc/deviceinfo' -- *; then
-	echo 'ERROR: Please source the source_deviceinfo script instead of sourcing deviceinfo directly!'
-	grep --color=always --exclude='rootfs-usr-share-misc-source_deviceinfo' -Er 'source /etc/deviceinfo|\. /etc/deviceinfo' -- *
-	exit 1
-fi

.ci/lib/common.py

@@ -134,7 +134,7 @@ def get_changed_packages_sanity_check(count):
     print("ERROR: Too many packages have changed!")
     print()
     print("This is a sanity check, so we don't end up building packages that")
-    print("have not been modified. CI won't run for more than three hours")
+    print("have not been modified. CI won't run for more than one hour")
     print("anyway.")
     print()
     print("Your options:")

.gitlab/issue_templates/Default.md

@@ -21,7 +21,6 @@
 	Replace space inside `[ ]` with `x` to fill the checkbox
 -->
 * [ ] edge (`master` branch)
-* [ ] `v23.06`
 * [ ] `v22.12`
 
 * [ ] I confirm that the issue still is present after running `sudo apk upgrade -a`

CODEOWNERS

@@ -71,8 +71,6 @@ device/*/device-samsung-klimtlte		@Grimler
 device/*/linux-samsung-klimtlte			@Grimler
 device/*/firmware-odroid-xu4			@Grimler
 device/*/linux-samsung-chagallwifi		@Grimler
-device/*/device-huawei-plank			@gtrxAC
-device/*/linux-huawei-plank			@gtrxAC
 
 main/postmarketos-update-depthcharge-kernel/	@jenneron
 main/osk-sdl/					@craftyguy

channels.cfg

@@ -8,12 +8,6 @@ branch_pmaports=master
 branch_aports=master
 mirrordir_alpine=edge
 
-[v23.06]
-description=Upcoming stable release (DO NOT USE)
-branch_pmaports=v23.06
-branch_aports=3.18-stable
-mirrordir_alpine=v3.18
-
 [v22.12]
 description=Latest release / Recommended for best stability
 branch_pmaports=v22.12

cross/binutils-aarch64/APKBUILD

@@ -8,27 +8,21 @@ CTARGET="$(arch_to_hostspec $CTARGET_ARCH)"
 
 pkgname=binutils-aarch64
 pkgver=2.40
-pkgrel=11
+pkgrel=7
 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_host="zlib-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
+	0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
 	"
 builddir="$srcdir/binutils-$pkgver"
 
-if [ -z "$BOOTSTRAP" ]; then
-	makedepends_host="$makedepends_host jansson-dev zstd-dev"
-fi
-
 if [ "$CHOST" = "$CBUILD" ] && [ "$CBUILD" = "$CTARGET" ] && [ "$CTARGET_ARCH" != "riscv64" ]; then
 	subpackages="$subpackages binutils-gold"
 fi
@@ -40,8 +34,6 @@ if [ "$CHOST" != "$CTARGET" ]; then
 fi
 
 # secfixes:
-#   2.40-r10:
-#     - CVE-2023-1972
 #   2.40-r0:
 #     - CVE-2023-1579
 #   2.39-r2:
@@ -83,8 +75,6 @@ build() {
 		_gold_configure="--disable-gold"
 	fi
 
-	CFLAGS="$CFLAGS -O2" \
-	CXXFLAGS="$CXXFLAGS -O2" \
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -94,27 +84,22 @@ build() {
 		--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 \
+		--disable-gprofng \
 		--enable-ld=default \
-		--enable-new-dtags \
+		$_gold_configure \
+		--enable-64-bit-bfd \
+		$_plugin_configure \
 		--enable-relro \
-		--enable-threads \
-		--with-bugurl="https://postmarketos.org/issues" \
-		--with-mmap \
+		--enable-deterministic-archives \
+		--enable-default-execstack=no \
+		$_cross_configure \
+		$_arch_configure \
+		--enable-default-hash-style=gnu \
 		--with-pic \
+		--disable-werror \
+		--disable-nls \
+		--with-mmap \
 		--with-system-zlib
 	make
 }
@@ -145,8 +130,6 @@ 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
+70ec22bd72ef6dddecfd970613387dd4a8cdc8730dd3cbf03d5a0c3a7c4d839383167bb06dad21bf7c235329fd44b5dc4aefe762f68544f17155cf002bf1be4a  0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
 "

cross/binutils-aarch64/CVE-2023-1972.patch

@@ -1,37 +0,0 @@
-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;

cross/binutils-aarch64/riscv64-textrels.patch

@@ -1,103 +0,0 @@
-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)
- 		{
-

cross/binutils-armhf/APKBUILD

@@ -8,27 +8,21 @@ CTARGET="$(arch_to_hostspec $CTARGET_ARCH)"
 
 pkgname=binutils-armhf
 pkgver=2.40
-pkgrel=11
+pkgrel=7
 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_host="zlib-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
+	0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
 	"
 builddir="$srcdir/binutils-$pkgver"
 
-if [ -z "$BOOTSTRAP" ]; then
-	makedepends_host="$makedepends_host jansson-dev zstd-dev"
-fi
-
 if [ "$CHOST" = "$CBUILD" ] && [ "$CBUILD" = "$CTARGET" ] && [ "$CTARGET_ARCH" != "riscv64" ]; then
 	subpackages="$subpackages binutils-gold"
 fi
@@ -40,8 +34,6 @@ if [ "$CHOST" != "$CTARGET" ]; then
 fi
 
 # secfixes:
-#   2.40-r10:
-#     - CVE-2023-1972
 #   2.40-r0:
 #     - CVE-2023-1579
 #   2.39-r2:
@@ -83,8 +75,6 @@ build() {
 		_gold_configure="--disable-gold"
 	fi
 
-	CFLAGS="$CFLAGS -O2" \
-	CXXFLAGS="$CXXFLAGS -O2" \
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -94,27 +84,22 @@ build() {
 		--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 \
+		--disable-gprofng \
 		--enable-ld=default \
-		--enable-new-dtags \
+		$_gold_configure \
+		--enable-64-bit-bfd \
+		$_plugin_configure \
 		--enable-relro \
-		--enable-threads \
-		--with-bugurl="https://postmarketos.org/issues" \
-		--with-mmap \
+		--enable-deterministic-archives \
+		--enable-default-execstack=no \
+		$_cross_configure \
+		$_arch_configure \
+		--enable-default-hash-style=gnu \
 		--with-pic \
+		--disable-werror \
+		--disable-nls \
+		--with-mmap \
 		--with-system-zlib
 	make
 }
@@ -145,8 +130,6 @@ 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
+70ec22bd72ef6dddecfd970613387dd4a8cdc8730dd3cbf03d5a0c3a7c4d839383167bb06dad21bf7c235329fd44b5dc4aefe762f68544f17155cf002bf1be4a  0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
 "

cross/binutils-armhf/CVE-2023-1972.patch

@@ -1,37 +0,0 @@
-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;

cross/binutils-armhf/riscv64-textrels.patch

@@ -1,103 +0,0 @@
-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)
- 		{
-

cross/binutils-armv7/APKBUILD

@@ -8,27 +8,21 @@ CTARGET="$(arch_to_hostspec $CTARGET_ARCH)"
 
 pkgname=binutils-armv7
 pkgver=2.40
-pkgrel=11
+pkgrel=7
 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_host="zlib-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
+	0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
 	"
 builddir="$srcdir/binutils-$pkgver"
 
-if [ -z "$BOOTSTRAP" ]; then
-	makedepends_host="$makedepends_host jansson-dev zstd-dev"
-fi
-
 if [ "$CHOST" = "$CBUILD" ] && [ "$CBUILD" = "$CTARGET" ] && [ "$CTARGET_ARCH" != "riscv64" ]; then
 	subpackages="$subpackages binutils-gold"
 fi
@@ -40,8 +34,6 @@ if [ "$CHOST" != "$CTARGET" ]; then
 fi
 
 # secfixes:
-#   2.40-r10:
-#     - CVE-2023-1972
 #   2.40-r0:
 #     - CVE-2023-1579
 #   2.39-r2:
@@ -83,8 +75,6 @@ build() {
 		_gold_configure="--disable-gold"
 	fi
 
-	CFLAGS="$CFLAGS -O2" \
-	CXXFLAGS="$CXXFLAGS -O2" \
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -94,27 +84,22 @@ build() {
 		--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 \
+		--disable-gprofng \
 		--enable-ld=default \
-		--enable-new-dtags \
+		$_gold_configure \
+		--enable-64-bit-bfd \
+		$_plugin_configure \
 		--enable-relro \
-		--enable-threads \
-		--with-bugurl="https://postmarketos.org/issues" \
-		--with-mmap \
+		--enable-deterministic-archives \
+		--enable-default-execstack=no \
+		$_cross_configure \
+		$_arch_configure \
+		--enable-default-hash-style=gnu \
 		--with-pic \
+		--disable-werror \
+		--disable-nls \
+		--with-mmap \
 		--with-system-zlib
 	make
 }
@@ -145,8 +130,6 @@ 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
+70ec22bd72ef6dddecfd970613387dd4a8cdc8730dd3cbf03d5a0c3a7c4d839383167bb06dad21bf7c235329fd44b5dc4aefe762f68544f17155cf002bf1be4a  0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
 "

cross/binutils-armv7/CVE-2023-1972.patch

@@ -1,37 +0,0 @@
-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;

cross/binutils-armv7/riscv64-textrels.patch

@@ -1,103 +0,0 @@
-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)
- 		{
-

cross/binutils-riscv64/APKBUILD

@@ -8,27 +8,21 @@ CTARGET="$(arch_to_hostspec $CTARGET_ARCH)"
 
 pkgname=binutils-riscv64
 pkgver=2.40
-pkgrel=11
+pkgrel=7
 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_host="zlib-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
+	0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
 	"
 builddir="$srcdir/binutils-$pkgver"
 
-if [ -z "$BOOTSTRAP" ]; then
-	makedepends_host="$makedepends_host jansson-dev zstd-dev"
-fi
-
 if [ "$CHOST" = "$CBUILD" ] && [ "$CBUILD" = "$CTARGET" ] && [ "$CTARGET_ARCH" != "riscv64" ]; then
 	subpackages="$subpackages binutils-gold"
 fi
@@ -40,8 +34,6 @@ if [ "$CHOST" != "$CTARGET" ]; then
 fi
 
 # secfixes:
-#   2.40-r10:
-#     - CVE-2023-1972
 #   2.40-r0:
 #     - CVE-2023-1579
 #   2.39-r2:
@@ -83,8 +75,6 @@ build() {
 		_gold_configure="--disable-gold"
 	fi
 
-	CFLAGS="$CFLAGS -O2" \
-	CXXFLAGS="$CXXFLAGS -O2" \
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -94,27 +84,22 @@ build() {
 		--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 \
+		--disable-gprofng \
 		--enable-ld=default \
-		--enable-new-dtags \
+		$_gold_configure \
+		--enable-64-bit-bfd \
+		$_plugin_configure \
 		--enable-relro \
-		--enable-threads \
-		--with-bugurl="https://postmarketos.org/issues" \
-		--with-mmap \
+		--enable-deterministic-archives \
+		--enable-default-execstack=no \
+		$_cross_configure \
+		$_arch_configure \
+		--enable-default-hash-style=gnu \
 		--with-pic \
+		--disable-werror \
+		--disable-nls \
+		--with-mmap \
 		--with-system-zlib
 	make
 }
@@ -145,8 +130,6 @@ 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
+70ec22bd72ef6dddecfd970613387dd4a8cdc8730dd3cbf03d5a0c3a7c4d839383167bb06dad21bf7c235329fd44b5dc4aefe762f68544f17155cf002bf1be4a  0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
 "

cross/binutils-riscv64/CVE-2023-1972.patch

@@ -1,37 +0,0 @@
-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;

cross/binutils-riscv64/riscv64-textrels.patch

@@ -1,103 +0,0 @@
-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)
- 		{
-

cross/busybox-static-aarch64/APKBUILD

@@ -7,8 +7,8 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi
 
 pkgname=busybox-static-aarch64
-pkgver=1.36.1
-pkgrel=0
+pkgver=1.36.0
+pkgrel=11
 
 _arch="aarch64"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }
 
 sha512sums="
-d4977cf4654bb5659d4e6d91785832d3fd418403b70f1619c26aa305839d64c131c6389979793896af0fb0d9e8fc2b99537dbeb65133465d7d983576902dff34  busybox-static-1.36.1-r0-aarch64-edge.apk
+db059ff027eb3093889b7aae4b2769ad27a7bd3281395fbeec87daf35407b95fdec338da938fcb4189a7b39448235fe29cab541edb9a763bc6b3a3d6909a33e8  busybox-static-1.36.0-r11-aarch64-edge.apk
 "

cross/busybox-static-armhf/APKBUILD

@@ -7,8 +7,8 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi
 
 pkgname=busybox-static-armhf
-pkgver=1.36.1
-pkgrel=0
+pkgver=1.36.0
+pkgrel=11
 
 _arch="armhf"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }
 
 sha512sums="
-eece41953046c99029ec4a0707c1fd4270d43b497f05cf63070deef376fc28f61bcdfa8b9f34e23305ba459a633909eb1682fbe183206b69dea8be3742479ae7  busybox-static-1.36.1-r0-armhf-edge.apk
+e1d5cfa54e00317555a4f4f132a654b31d9770241ebfea87a9a6ab390424da6c0619fcdfb8fce10f71063e9ca43eafed7b4b9ea456cb17f05d50a5a44eaf0042  busybox-static-1.36.0-r11-armhf-edge.apk
 "

cross/busybox-static-armv7/APKBUILD

@@ -7,8 +7,8 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi
 
 pkgname=busybox-static-armv7
-pkgver=1.36.1
-pkgrel=0
+pkgver=1.36.0
+pkgrel=11
 
 _arch="armv7"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }
 
 sha512sums="
-29df2ea5d83535632308524064dbb43bf9ed147ab1112bed76b1fc70b519d7dc3e4083c51527e80129a455a001479569641b710f58fdad8538852061d4880660  busybox-static-1.36.1-r0-armv7-edge.apk
+e2199f8039ecc94b99bfbac0d613d38abd43d758bcb90b34ef3a9a9e44ee549ec86fcebfd920b77c08f47057af38f3e9b52acb5a5bc1d84047c8d5a55b1a6407  busybox-static-1.36.0-r11-armv7-edge.apk
 "

cross/gcc-aarch64/0001-posix_memalign.patch

@@ -1,4 +1,4 @@
-From 3e5acbe356124aa5d8dde0635d652c065a553e7d Mon Sep 17 00:00:00 2001
+From a695388351636049500bd1f014caed177c2123c3 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/33] posix_memalign

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

@@ -1,4 +1,4 @@
-From f986a4a1224fa7d452b415d690aead8d356a7eae Mon Sep 17 00:00:00 2001
+From 41a1d0593acc2b24fb57bfec98a4328342b616da 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/33] gcc: poison-system-directories
@@ -120,7 +120,7 @@ index 09082e8ccae..5504bf6eb01 100644
  AC_SUBST(subdirs)
  AC_SUBST(srcdir)
 diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index c0c3ad14515..7cdd5bfa952 100644
+index 36ed1591440..4ff3e817c23 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
 @@ -384,6 +384,7 @@ Objective-C and Objective-C++ Dialects}.
@@ -131,7 +131,7 @@ index c0c3ad14515..7cdd5bfa952 100644
  -Wno-pragmas  -Wno-prio-ctor-dtor  -Wredundant-decls
  -Wrestrict  -Wno-return-local-addr  -Wreturn-type
  -Wno-scalar-storage-order  -Wsequence-point
-@@ -8424,6 +8425,14 @@ made up of data only and thus requires no special treatment.  But, for
+@@ -8423,6 +8424,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.
  

cross/gcc-aarch64/0003-specs-turn-on-Wl-z-now-by-default.patch

@@ -1,4 +1,4 @@
-From 31e2b60000e779ef775daa306120eabcf987852a Mon Sep 17 00:00:00 2001
+From a15c0e1514fb5fa5609ad7abc6c5f5d0749d0c4a 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/33] specs: turn on -Wl,-z,now by default
@@ -14,10 +14,10 @@ now by default.
  2 files changed, 4 insertions(+)
 
 diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index 7cdd5bfa952..158b7bcb81e 100644
+index 4ff3e817c23..b1877a751aa 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
-@@ -17959,6 +17959,9 @@ For example, @option{-Wl,-Map,output.map} passes @option{-Map output.map} to the
+@@ -17958,6 +17958,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}.
  

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

@@ -1,4 +1,4 @@
-From 3b910da7d1e81bdd953e6d9ec82020e7b120353b Mon Sep 17 00:00:00 2001
+From edb757265420be9c5a903827bedf46b02c09d868 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/33] Turn on -D_FORTIFY_SOURCE=2 by default for C, C++,
@@ -10,10 +10,10 @@ Subject: [PATCH 04/33] Turn on -D_FORTIFY_SOURCE=2 by default for C, C++,
  2 files changed, 10 insertions(+)
 
 diff --git a/gcc/c-family/c-cppbuiltin.cc b/gcc/c-family/c-cppbuiltin.cc
-index 5d64625fcd7..868d69506e4 100644
+index 98f5aef2af9..d4da19e4014 100644
 --- a/gcc/c-family/c-cppbuiltin.cc
 +++ b/gcc/c-family/c-cppbuiltin.cc
-@@ -1546,6 +1546,10 @@ c_cpp_builtins (cpp_reader *pfile)
+@@ -1545,6 +1545,10 @@ c_cpp_builtins (cpp_reader *pfile)
    builtin_define_with_value ("__REGISTER_PREFIX__", REGISTER_PREFIX, 0);
    builtin_define_with_value ("__USER_LABEL_PREFIX__", user_label_prefix, 0);
  
@@ -25,10 +25,10 @@ index 5d64625fcd7..868d69506e4 100644
    if (flag_gnu89_inline)
      cpp_define (pfile, "__GNUC_GNU_INLINE__");
 diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index 158b7bcb81e..cc9972f907b 100644
+index b1877a751aa..91d384e1927 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
-@@ -11866,6 +11866,12 @@ also turns on the following optimization flags:
+@@ -11865,6 +11865,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.
  

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

@@ -1,4 +1,4 @@
-From 9c3a2882b1932296ccb1d0ed2900cf046f998a26 Mon Sep 17 00:00:00 2001
+From dda9ee88db09aadab7585fa33aca67f1702df190 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/33] On linux targets pass --as-needed by default to the
@@ -137,10 +137,10 @@ index a4e5380b589..3cc61bce69f 100644
      %{!static: \
        %{rdynamic:-export-dynamic} \
 diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h
-index 2fdfd930cf2..16503482ec2 100644
+index b9557a75dc7..d8d1450f346 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
+@@ -58,6 +58,7 @@ along with GCC; see the file COPYING3.  If not see
    "%{mabi=ilp32:_ilp32}"
  
  #define LINK_SPEC "\

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

@@ -1,4 +1,4 @@
-From 288cb2be3abe07dcf2737ed3ac07e93573262bc4 Mon Sep 17 00:00:00 2001
+From 14d66aece585329970ed8a777792502baaa9606b 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/33] Enable -Wformat and -Wformat-security by default.

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

@@ -1,4 +1,4 @@
-From 93e44f7c7b1f11c1f714d6c384b0d39a191ac18a Mon Sep 17 00:00:00 2001
+From 53bedd7a7bfcc70cd518afedbf3713cbfaa1e631 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/33] Enable -Wtrampolines by default.

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

@@ -1,4 +1,4 @@
-From 7aa93d6d9a63c7bedf1e033f6d040e95038537e7 Mon Sep 17 00:00:00 2001
+From d5cecc5d699ad150c38794c6f4f231fa48cb450d 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/33] Disable ssp on -nostdlib, -nodefaultlibs and

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

@@ -1,4 +1,4 @@
-From e44b295b5b0b917c0b47085f60466a37f890e1c7 Mon Sep 17 00:00:00 2001
+From a646f903a6c04393c4c013d7bc4c979a74a0e0f9 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/33] Ensure that msgfmt doesn't encounter problems during

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

@@ -1,4 +1,4 @@
-From f041dcd8f775e03b85a49e3aeef0870e2333b10e Mon Sep 17 00:00:00 2001
+From 7a5b7b5c556b410074af850c6c49eb5e6ba84362 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/33] Don't declare asprintf if defined as a macro.

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

@@ -1,4 +1,4 @@
-From 6fc13fce114648b1a64e658b469a4697382d18bb Mon Sep 17 00:00:00 2001
+From b51bd406029737efbe4c93f8dbbaf797c4979215 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/33] libiberty: copy PIC objects during build process

cross/gcc-aarch64/0012-libgcc_s.patch

@@ -1,4 +1,4 @@
-From 6a1955bbf49836ad99b23501f42283842e01761b Mon Sep 17 00:00:00 2001
+From 5c0678a73c11e16853632717ced113497878b1b0 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/33] libgcc_s

cross/gcc-aarch64/0013-nopie.patch

@@ -1,4 +1,4 @@
-From 558e95aa2b0f3bbf416e1bb572e5f47bddc8601c Mon Sep 17 00:00:00 2001
+From 242ee89090db9c1ad797d949fc99819dcacf2e98 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/33] nopie

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

@@ -1,4 +1,4 @@
-From ecad19db42776c536bd4f6033ec1891ffae03720 Mon Sep 17 00:00:00 2001
+From 0e273647111ae365ac5c27dee96dc18f69668eac 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/33] ada: fix shared linking

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

@@ -1,4 +1,4 @@
-From 8500b4cdd039c16a02a8acabd124b92865871979 Mon Sep 17 00:00:00 2001
+From 3163941fdbb16261c4617fc6a1711d0835378d16 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/33] build: fix CXXFLAGS_FOR_BUILD passing

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

@@ -1,4 +1,4 @@
-From e893ad827215a7c090a835e20a81559f4044fb47 Mon Sep 17 00:00:00 2001
+From 157c80f27b5a9404c8f86e016d590ef7b691bc70 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/33] add fortify-headers paths

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

@@ -1,4 +1,4 @@
-From 064afc74f18f2a00771fc2600029a713b8708845 Mon Sep 17 00:00:00 2001
+From da159d71a8f2844a653fd5cdb320aeeed99aadd6 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/33] Alpine musl package provides libssp_nonshared.a. We

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

@@ -1,4 +1,4 @@
-From 45a98ce1f1702424aba4271f7f7570e43a354101 Mon Sep 17 00:00:00 2001
+From 78e41f066281892aa353cf2df61d1dc9e60af23a 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/33] DP: Use --push-state/--pop-state for gold as well when

cross/gcc-aarch64/0019-aarch64-disable-multilib-support.patch

@@ -1,4 +1,4 @@
-From 6a2e902dc8abcfd44522b9224fd759d038db51f5 Mon Sep 17 00:00:00 2001
+From 59e1be27072008d0c42e0315332a8bdcf7cdaefc 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/33] aarch64: disable multilib support

cross/gcc-aarch64/0020-s390x-disable-multilib-support.patch

@@ -1,4 +1,4 @@
-From 6e7c72ee05353a284d9c9809035e7ff488b4b8c1 Mon Sep 17 00:00:00 2001
+From a03f39ffea2bc204beaef1f0dfb8bab41efeb49f 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/33] s390x: disable multilib support

cross/gcc-aarch64/0021-ppc64-le-disable-multilib-support.patch

@@ -1,4 +1,4 @@
-From 44655aa3be8d5354fb82a42317a9ac6ac1b50164 Mon Sep 17 00:00:00 2001
+From fceb9cfebae070da1b07c5dbc915d2ea128bfb7d 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/33] ppc64[le]: disable multilib support

cross/gcc-aarch64/0022-x86_64-disable-multilib-support.patch

@@ -1,4 +1,4 @@
-From 5f79236c49bd0c2c36440f0ef83cea02d52fcaaf Mon Sep 17 00:00:00 2001
+From f79c1c2b5634ac59e120bc1130ba5584e7120623 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/33] x86_64: disable multilib support

cross/gcc-aarch64/0023-riscv-disable-multilib-support.patch

@@ -1,4 +1,4 @@
-From 4605e64b3a076411f2f8134256c400eb58bcc1c7 Mon Sep 17 00:00:00 2001
+From f1fb56b945fc7fc649d78a2f73bfe98f1377c814 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/33] riscv: disable multilib support
@@ -43,10 +43,10 @@ library.
  2 files changed, 5 insertions(+), 8 deletions(-)
 
 diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h
-index 16503482ec2..8d9881eadeb 100644
+index d8d1450f346..a386bba87d7 100644
 --- a/gcc/config/riscv/linux.h
 +++ b/gcc/config/riscv/linux.h
-@@ -61,9 +61,3 @@ along with GCC; see the file COPYING3.  If not see
+@@ -71,9 +71,3 @@ along with GCC; see the file COPYING3.  If not see
      %{static:-static}}"
  
  #define TARGET_ASM_FILE_END file_end_indicate_exec_stack

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

@@ -1,4 +1,4 @@
-From a178cfeb975d79bb9b9fd877ab4c6e05d10b147e Mon Sep 17 00:00:00 2001
+From b3d43777021f3c61def29d3764e8ee05ebb3c520 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/33] always build libgcc_eh.a

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

@@ -1,4 +1,4 @@
-From 5bc3deb9bc2679ad4f6f189a65e3643b550587a1 Mon Sep 17 00:00:00 2001
+From c33ad45cabb27512ec7f4e8f7e40cf448f4db59d 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/33] ada: libgnarl compatibility for musl

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

@@ -1,4 +1,4 @@
-From e1e6dccc9124e0907c5ae174d20acb3bad87e633 Mon Sep 17 00:00:00 2001
+From 3169e4c52c248f21a084ef5b540201c982e61d35 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/33] ada: musl support fixes

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

@@ -1,4 +1,4 @@
-From 9506e729f0e4f66f4018fbfc5340a568e8520264 Mon Sep 17 00:00:00 2001
+From 944dead3994c1a9bab757ad61e836e2317b8aa30 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/33] configure: Add --enable-autolink-libatomic, use in

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

@@ -1,4 +1,4 @@
-From 966da83d0d75482a1489804593ae61f3f8e3b385 Mon Sep 17 00:00:00 2001
+From 8ce637988d0c463544c6b95e3a543380854fb73c 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/33] configure: fix detection of atomic builtins in

cross/gcc-aarch64/0029-libstdc-do-not-throw-exceptions-for-non-C-locales-on.patch

@@ -1,4 +1,4 @@
-From e74f4b3a10d96f06b15df9d9b61d5b10a84ec084 Mon Sep 17 00:00:00 2001
+From 2f005ed8d54415aa609e3b5ade3ef80bb04f0cf4 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/33] libstdc++: do not throw exceptions for non-C locales on

cross/gcc-aarch64/0030-gdc-unconditionally-link-libgphobos-against-libucont.patch

@@ -1,4 +1,4 @@
-From bdc2699f0284e59842e5d3a39fc426550b4ba0e8 Mon Sep 17 00:00:00 2001
+From 65f85fc6750b5d6735f7688c832244ffca2b8ab1 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/33] gdc: unconditionally link libgphobos against

cross/gcc-aarch64/0031-druntime-link-against-libucontext-on-all-platforms.patch

@@ -1,4 +1,4 @@
-From 82780d18bfcb7dabc215d4b89b1187cb253e15f8 Mon Sep 17 00:00:00 2001
+From 1c7088d3182fac082706bfa9ec3864291b91b2b7 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/33] druntime: link against libucontext on all platforms

cross/gcc-aarch64/0032-libgnat-time_t-is-always-64-bit-on-musl-libc.patch

@@ -1,4 +1,4 @@
-From 32fc6be0b339983e31f6285dbc565b906ec983d4 Mon Sep 17 00:00:00 2001
+From 5dd552d33be47ea3b7586df7dc4812b2cd3b0a5f 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/33] libgnat: time_t is always 64-bit on musl libc

cross/gcc-aarch64/0033-fix-assert-in-__deregister_frame_info_bases.patch

@@ -0,0 +1,39 @@
+From 2f41b10437653f7dfee027dc623a94ac4054773c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
+Date: Sun, 14 May 2023 19:30:21 +0200
+Subject: [PATCH 33/33] fix assert in __deregister_frame_info_bases
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The assertion in __deregister_frame_info_bases assumes that for every
+frame something was inserted into the lookup data structure by
+__register_frame_info_bases. Unfortunately, this does not necessarily
+hold true as the btree_insert call in __register_frame_info_bases will
+not insert anything for empty ranges. Therefore, we need to explicitly
+account for such empty ranges in the assertion as `ob` will be a null
+pointer for such ranges, hence causing the assertion to fail.
+
+Signed-off-by: Sören Tempel <soeren@soeren-tempel.net>
+---
+ libgcc/unwind-dw2-fde.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/libgcc/unwind-dw2-fde.c b/libgcc/unwind-dw2-fde.c
+index 7b74c391ced..8683a65aa02 100644
+--- a/libgcc/unwind-dw2-fde.c
++++ b/libgcc/unwind-dw2-fde.c
+@@ -278,7 +278,9 @@ __deregister_frame_info_bases (const void *begin)
+   __gthread_mutex_unlock (&object_mutex);
+ #endif
+ 
+-  gcc_assert (in_shutdown || ob);
++  // If we didn't find anything in the lookup data structures then they
++  // were either already destroyed or we tried to remove an empty range.
++  gcc_assert (in_shutdown || ((range[1] - range[0]) == 0 || ob));
+   return (void *) ob;
+ }
+ 
+-- 
+2.40.1
+

cross/gcc-aarch64/0033-libphobos-do-not-use-LFS64-symbols.patch

@@ -1,30 +0,0 @@
-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/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/sys/mman.d | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
-
-diff --git a/libphobos/libdruntime/core/sys/posix/sys/mman.d b/libphobos/libdruntime/core/sys/posix/sys/mman.d
-index 0d3d517d69a..323aa0af72d 100644
---- a/libphobos/libdruntime/core/sys/posix/sys/mman.d
-+++ b/libphobos/libdruntime/core/sys/posix/sys/mman.d
-@@ -293,11 +293,7 @@ else version (CRuntime_Bionic)
- }
- else version (CRuntime_Musl)
- {
--    static if (__USE_LARGEFILE64) void* mmap64(void*, size_t, int, int, int, off_t);
--    static if (__USE_FILE_OFFSET64)
--        alias mmap = mmap64;
--    else
--        void* mmap(void*, size_t, int, int, int, off_t);
-+    void* mmap(void*, size_t, int, int, int, off_t);
-     int munmap(void*, size_t);
- }
- else version (CRuntime_UClibc)
--- 
-2.40.1
-

cross/gcc-aarch64/APKBUILD

@@ -24,17 +24,15 @@ CBUILDROOT="/"
 _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"
 
 pkgname=gcc-aarch64
-pkgver=13.1.1_git20230527
-# i.e. 13.1.1, must match gcc/BASE-VER
-_pkgbase="${pkgver%%_git*}"
-# date component from snapshots
-_pkgsnap="${pkgver##*_git}"
+_pkgbase=13.1.1 # must match gcc/BASE-VER
+_pkgsnap=20230513
+pkgver=${_pkgbase}_git$_pkgsnap
 [ "$BOOTSTRAP" = "nolibc" ] && pkgname="gcc-pass2"
 [ "$CBUILD" != "$CHOST" ] && _cross="-$CARCH" || _cross=""
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname=gcc-aarch64
-pkgrel=1
+pkgrel=2
 pkgdesc="Stage2 cross-compiler for aarch64"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -266,7 +264,7 @@ source="https://dev.alpinelinux.org/archive/gcc/${_pkgbase%%.*}-$_pkgsnap/gcc-${
 	0030-gdc-unconditionally-link-libgphobos-against-libucont.patch
 	0031-druntime-link-against-libucontext-on-all-platforms.patch
 	0032-libgnat-time_t-is-always-64-bit-on-musl-libc.patch
-	0033-libphobos-do-not-use-LFS64-symbols.patch
+	0033-fix-assert-in-__deregister_frame_info_bases.patch
 	"
 
 # we build out-of-tree
@@ -780,38 +778,38 @@ gdb() {
 }
 
 sha512sums="
-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
+a82e38d273a668e4a8ad33282cb74661d125babcc6165eb0ada5da471154b2ed2894bf1fa462f0345f9d817e733b155c09a971885f3b7c04398ebcdd3b5551f5  gcc-13-20230513.tar.xz
+275a71fcabc03209fe69894ee9c4bec57afabd170f08385fa148b4e481c0b2d2e5a3e2631e82551f21bc3f93c2b5299ddf39d09b88e1a5451d1cd4fb5ff3be06  0001-posix_memalign.patch
+8c247b796c2cea016fe43b1c7393ed94567bd565e453fdf114d90800a86d1e5bb3761a26c9b48bccb7b3192ca482a72d02fa8b65e4703753ff8b567ddd8cb949  0002-gcc-poison-system-directories.patch
+3c0773148638c41d2a45f43c8320bd9c7b1129650168f0f80bfe4cf9d00d11f352952f178c88285b5a5e47df76264304c05080b9df4948981c0d01bd7cce5cfa  0003-specs-turn-on-Wl-z-now-by-default.patch
+cc81175e0e74abbb46dbc63d64c1a36fc62d4eae7ba3cc5ab85de331c31f3341fc445f3b5be7e1f53ee72e0e3a512232b821cef349a0a5991d46834d1325246e  0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
+c52396a1708b1b4a29e0b5a8d2843f4ea1eb2c34fd2fd9401da0c826a1192b6f87d8b5aea7429f4811c3e293c2fef1945ac05d7c82f3ce94c84f440bb772c76e  0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
+03f1ce1a6c90a438d4b953273ae31996fd54226b320f075cc5ebfe8f1c14958138922b8037774fc9a29d10c8b99303d8119a0075fbb45b608fc14f0b18ed3720  0006-Enable-Wformat-and-Wformat-security-by-default.patch
+3c9f0cde600081e59e7542784839defa46e5bea7a19b9cfcfbf042f883a2a7a7547d0eeb6edea51cbb0682e20e25bde9e6597871d492cf5eaf9cfbd9475f7ce1  0007-Enable-Wtrampolines-by-default.patch
+de8c97e379e9e85d57988ef3d2df2dd7f1f0a7e4e20c2bbc19f148bf3fbaccaf34e80fae8e8f60c6b9b4932135c14fd2f1a20624e44aa6d67ba92b29d36c6051  0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
+acc01ac7a8da1eb02915b5b82dd539b1e8ac5045faeb6db02f54390f77a3d7a8f0cf65c2927a4150e7a52ee4a7df31091d325dd45641cc6639883defda7d0d42  0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
+101ef48ce43aa084ab9875c1917388e1ae2b3ef33d0d616429515a9ce1f6c9af28b13a6a59ef4a384b9834d0846b4d28f593857cffacda2ac04abe67ffe7ca8f  0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
+6563f09d331048f402dc0c54e8be48ff701fe14316ad48c301a75368414f3cf1fb0e3ed706090fff70db6879b390c05bf2ed504206c1e407b9cc5f7295517183  0011-libiberty-copy-PIC-objects-during-build-process.patch
+6ea5e476a67a16a9e94c5ed8040d1af4ebce4b417a22c97be978ff6fc91f7a627a35fc077c8ce7f5fdf0d20712001622abdccb117a7ffa789f9a90cf23cd1429  0012-libgcc_s.patch
+53f96185583ca048010e759eb364ee646ebb1728379da4a7f6137a2009a3657f3d166cb9bfae78994070dd3750859a29857dfc6420bd9accebf629e259c096c2  0013-nopie.patch
+d181e399bd2bdcbbbb69767ba08220d69ac97cd05faf2e1172266a1e194cf32ca3ff3a6bc29751223ecf9d2d739f6fca66dc825d4026ea6a272d39d98e038e2e  0014-ada-fix-shared-linking.patch
+c08339b2f2c2840471f0ff7270d372ec5613113432c507519c3805df97215955532f53e5d9f4ca1ec345199fe7701c5e4fc1054b2bdac998c21add01feeaf94a  0015-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
+2ee36af2e4bcd1d7b9bba588d638f618359a3c60fca8939311f1e837551522fa1a6911175dfd87c56dcb4d42de8b04af65afc882ddcec215ee5f2a8c086ee399  0016-add-fortify-headers-paths.patch
+af71729e9c21aaf13ab0ba9407b3be4b4e9c6b515a8e65686628ddd885ff6b69f8f31c714ce52b7c5a5c9b9d1f31070e6a4278b5d5d11868f152258002077355  0017-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
+dc37f213776957bd704caf481189063589e8ed7a223421a0489553421d45249e7425147755e344c4d172b35b329a2d191b420fd1cdd49de99546b874e5fbcd3d  0018-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
+4c9500ff6d479f84ce1ee9c043db4434b51b0f847914f78482e2fba915d0018bb19fb92882b3df8475cb70171183089115ce95c0e87f69c05e56d1e3b94262be  0019-aarch64-disable-multilib-support.patch
+832eb922bcd8b4bd510929de520ea036734316c55c222a3323b3df26923ce599a8580586e7922860db7ecd2a0c7d9d15213daa1ae7f7026fe8ec8eac5ca29f32  0020-s390x-disable-multilib-support.patch
+fe99502b6c12b923774486dfba7480959708722ca56690e8b601c7f774f074a21f8f3ff1a0b39ca0b88ebaa2b5773652f6c9fdf92d7f78a3e674038dcb98c5a6  0021-ppc64-le-disable-multilib-support.patch
+50160fdacd1eb2696a87c63955308b07c21bf9ce5b085e74fdcc3db633cbe705e84e9d37bc124dfdbfd89980026533c2ca5a537fdfa3edfdcb46d50625df53ea  0022-x86_64-disable-multilib-support.patch
+498fda16a87f11f802c4910a4e1cd8c02b6e302cccfc60588749a170e4729ac5054a1ae253772baf82854767659eedc07c5e6ae0e154b3ff24dc57a017de9f20  0023-riscv-disable-multilib-support.patch
+c846962e05062e036dd6b5d107cadb9aa33019ca555936394605911de8a3b5a145f03cc59b393b2a42f7b8ded5712c80583d27c8ac4eec145dcd688a5dfc8b81  0024-always-build-libgcc_eh.a.patch
+e476823a735ed41a1220b06e74c56312cd98077c4c4a06bc8af4875a25c197d3d38b0666765c2ed5b5e5d1c5093d456caf19cab5eb57cfb841797873d4fefe28  0025-ada-libgnarl-compatibility-for-musl.patch
+1a120d66233b5becd89f1042252d43327aab975ccdfd06480f11f79e306bd9ac4869d7483bd2bf9a8125426bf01582f3f2524eec5d7ab4d762e7d7829070be01  0026-ada-musl-support-fixes.patch
+1290e17df57e549e1de7431473389210102841e42bbafceeef5e69ec258ed4eb5a4fb2aa4ba1ccb66496833335412495000fd8be6c74b4edd633af352a54e10b  0027-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
+39c6604aaa6e931f507b804c1d3443d59edfd66d4ba8774b02fd6d30937c85a645575ab7921c3c8ee5d51d65a76290b47319c5f0276fd4fb5319f1e94e875160  0028-configure-fix-detection-of-atomic-builtins-in-libato.patch
+b3be6955a078ace099dceeb48535ab41ff47c79963822c93741f50823e0239e4aff26566e4abc9d2c3964f65bc7d61bf081398c5e6c4ba009db8d5d60dc8de10  0029-libstdc-do-not-throw-exceptions-for-non-C-locales-on.patch
+028e67e52aa6ae31dadd9da4d235e780832e9a114d2ffb72b452dac81f80851bcbb652429c760daf70e07edfb80589953bf780b670313b367cc72877cc3d16e5  0030-gdc-unconditionally-link-libgphobos-against-libucont.patch
+3d845c1684fb4286f9e8a57df860db9a9eb18296d6e54e09b53d33bce67b2529995b6611584eef7e37fd506c20ec1f9f839f107678614b1d1cde675a084495cc  0031-druntime-link-against-libucontext-on-all-platforms.patch
+4929eeeb0ea962ca3d8d5bf00334bb520c4419a31940d79244bd8a75cf9a5ac53d60aed4728404c463bb4a82070f0224887281207f4f8f2e532f312c5071098b  0032-libgnat-time_t-is-always-64-bit-on-musl-libc.patch
+97890297608a6f2926b9628321f3e27b5a86ca9f33933f66c9d2d4c441f4ed219867fbc18c2f51ad4e427ba799bd0ad7ff6927d0869ef9e1d594b72ad793657b  0033-fix-assert-in-__deregister_frame_info_bases.patch
 "

cross/gcc-armhf/0001-posix_memalign.patch

@@ -1,4 +1,4 @@
-From 3e5acbe356124aa5d8dde0635d652c065a553e7d Mon Sep 17 00:00:00 2001
+From a695388351636049500bd1f014caed177c2123c3 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/33] posix_memalign

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

@@ -1,4 +1,4 @@
-From f986a4a1224fa7d452b415d690aead8d356a7eae Mon Sep 17 00:00:00 2001
+From 41a1d0593acc2b24fb57bfec98a4328342b616da 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/33] gcc: poison-system-directories
@@ -120,7 +120,7 @@ index 09082e8ccae..5504bf6eb01 100644
  AC_SUBST(subdirs)
  AC_SUBST(srcdir)
 diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index c0c3ad14515..7cdd5bfa952 100644
+index 36ed1591440..4ff3e817c23 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
 @@ -384,6 +384,7 @@ Objective-C and Objective-C++ Dialects}.
@@ -131,7 +131,7 @@ index c0c3ad14515..7cdd5bfa952 100644
  -Wno-pragmas  -Wno-prio-ctor-dtor  -Wredundant-decls
  -Wrestrict  -Wno-return-local-addr  -Wreturn-type
  -Wno-scalar-storage-order  -Wsequence-point
-@@ -8424,6 +8425,14 @@ made up of data only and thus requires no special treatment.  But, for
+@@ -8423,6 +8424,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.
  

cross/gcc-armhf/0003-specs-turn-on-Wl-z-now-by-default.patch

@@ -1,4 +1,4 @@
-From 31e2b60000e779ef775daa306120eabcf987852a Mon Sep 17 00:00:00 2001
+From a15c0e1514fb5fa5609ad7abc6c5f5d0749d0c4a 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/33] specs: turn on -Wl,-z,now by default
@@ -14,10 +14,10 @@ now by default.
  2 files changed, 4 insertions(+)
 
 diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index 7cdd5bfa952..158b7bcb81e 100644
+index 4ff3e817c23..b1877a751aa 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
-@@ -17959,6 +17959,9 @@ For example, @option{-Wl,-Map,output.map} passes @option{-Map output.map} to the
+@@ -17958,6 +17958,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}.
  

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

@@ -1,4 +1,4 @@
-From 3b910da7d1e81bdd953e6d9ec82020e7b120353b Mon Sep 17 00:00:00 2001
+From edb757265420be9c5a903827bedf46b02c09d868 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/33] Turn on -D_FORTIFY_SOURCE=2 by default for C, C++,
@@ -10,10 +10,10 @@ Subject: [PATCH 04/33] Turn on -D_FORTIFY_SOURCE=2 by default for C, C++,
  2 files changed, 10 insertions(+)
 
 diff --git a/gcc/c-family/c-cppbuiltin.cc b/gcc/c-family/c-cppbuiltin.cc
-index 5d64625fcd7..868d69506e4 100644
+index 98f5aef2af9..d4da19e4014 100644
 --- a/gcc/c-family/c-cppbuiltin.cc
 +++ b/gcc/c-family/c-cppbuiltin.cc
-@@ -1546,6 +1546,10 @@ c_cpp_builtins (cpp_reader *pfile)
+@@ -1545,6 +1545,10 @@ c_cpp_builtins (cpp_reader *pfile)
    builtin_define_with_value ("__REGISTER_PREFIX__", REGISTER_PREFIX, 0);
    builtin_define_with_value ("__USER_LABEL_PREFIX__", user_label_prefix, 0);
  
@@ -25,10 +25,10 @@ index 5d64625fcd7..868d69506e4 100644
    if (flag_gnu89_inline)
      cpp_define (pfile, "__GNUC_GNU_INLINE__");
 diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index 158b7bcb81e..cc9972f907b 100644
+index b1877a751aa..91d384e1927 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
-@@ -11866,6 +11866,12 @@ also turns on the following optimization flags:
+@@ -11865,6 +11865,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.
  

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

@@ -1,4 +1,4 @@
-From 9c3a2882b1932296ccb1d0ed2900cf046f998a26 Mon Sep 17 00:00:00 2001
+From dda9ee88db09aadab7585fa33aca67f1702df190 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/33] On linux targets pass --as-needed by default to the
@@ -137,10 +137,10 @@ index a4e5380b589..3cc61bce69f 100644
      %{!static: \
        %{rdynamic:-export-dynamic} \
 diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h
-index 2fdfd930cf2..16503482ec2 100644
+index b9557a75dc7..d8d1450f346 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
+@@ -58,6 +58,7 @@ along with GCC; see the file COPYING3.  If not see
    "%{mabi=ilp32:_ilp32}"
  
  #define LINK_SPEC "\

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

@@ -1,4 +1,4 @@
-From 288cb2be3abe07dcf2737ed3ac07e93573262bc4 Mon Sep 17 00:00:00 2001
+From 14d66aece585329970ed8a777792502baaa9606b 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/33] Enable -Wformat and -Wformat-security by default.

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

@@ -1,4 +1,4 @@
-From 93e44f7c7b1f11c1f714d6c384b0d39a191ac18a Mon Sep 17 00:00:00 2001
+From 53bedd7a7bfcc70cd518afedbf3713cbfaa1e631 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/33] Enable -Wtrampolines by default.

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

@@ -1,4 +1,4 @@
-From 7aa93d6d9a63c7bedf1e033f6d040e95038537e7 Mon Sep 17 00:00:00 2001
+From d5cecc5d699ad150c38794c6f4f231fa48cb450d 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/33] Disable ssp on -nostdlib, -nodefaultlibs and

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

@@ -1,4 +1,4 @@
-From e44b295b5b0b917c0b47085f60466a37f890e1c7 Mon Sep 17 00:00:00 2001
+From a646f903a6c04393c4c013d7bc4c979a74a0e0f9 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/33] Ensure that msgfmt doesn't encounter problems during

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

@@ -1,4 +1,4 @@
-From f041dcd8f775e03b85a49e3aeef0870e2333b10e Mon Sep 17 00:00:00 2001
+From 7a5b7b5c556b410074af850c6c49eb5e6ba84362 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/33] Don't declare asprintf if defined as a macro.

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

@@ -1,4 +1,4 @@
-From 6fc13fce114648b1a64e658b469a4697382d18bb Mon Sep 17 00:00:00 2001
+From b51bd406029737efbe4c93f8dbbaf797c4979215 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/33] libiberty: copy PIC objects during build process

cross/gcc-armhf/0012-libgcc_s.patch

@@ -1,4 +1,4 @@
-From 6a1955bbf49836ad99b23501f42283842e01761b Mon Sep 17 00:00:00 2001
+From 5c0678a73c11e16853632717ced113497878b1b0 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/33] libgcc_s

cross/gcc-armhf/0013-nopie.patch

@@ -1,4 +1,4 @@
-From 558e95aa2b0f3bbf416e1bb572e5f47bddc8601c Mon Sep 17 00:00:00 2001
+From 242ee89090db9c1ad797d949fc99819dcacf2e98 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/33] nopie

cross/gcc-armhf/0014-ada-fix-shared-linking.patch

@@ -1,4 +1,4 @@
-From ecad19db42776c536bd4f6033ec1891ffae03720 Mon Sep 17 00:00:00 2001
+From 0e273647111ae365ac5c27dee96dc18f69668eac 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/33] ada: fix shared linking

cross/gcc-armhf/0015-build-fix-CXXFLAGS_FOR_BUILD-passing.patch

@@ -1,4 +1,4 @@
-From 8500b4cdd039c16a02a8acabd124b92865871979 Mon Sep 17 00:00:00 2001
+From 3163941fdbb16261c4617fc6a1711d0835378d16 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/33] build: fix CXXFLAGS_FOR_BUILD passing

cross/gcc-armhf/0016-add-fortify-headers-paths.patch

@@ -1,4 +1,4 @@
-From e893ad827215a7c090a835e20a81559f4044fb47 Mon Sep 17 00:00:00 2001
+From 157c80f27b5a9404c8f86e016d590ef7b691bc70 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/33] add fortify-headers paths

cross/gcc-armhf/0017-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch

@@ -1,4 +1,4 @@
-From 064afc74f18f2a00771fc2600029a713b8708845 Mon Sep 17 00:00:00 2001
+From da159d71a8f2844a653fd5cdb320aeeed99aadd6 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/33] Alpine musl package provides libssp_nonshared.a. We

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

@@ -1,4 +1,4 @@
-From 45a98ce1f1702424aba4271f7f7570e43a354101 Mon Sep 17 00:00:00 2001
+From 78e41f066281892aa353cf2df61d1dc9e60af23a 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/33] DP: Use --push-state/--pop-state for gold as well when

cross/gcc-armhf/0019-aarch64-disable-multilib-support.patch

@@ -1,4 +1,4 @@
-From 6a2e902dc8abcfd44522b9224fd759d038db51f5 Mon Sep 17 00:00:00 2001
+From 59e1be27072008d0c42e0315332a8bdcf7cdaefc 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/33] aarch64: disable multilib support

cross/gcc-armhf/0020-s390x-disable-multilib-support.patch

@@ -1,4 +1,4 @@
-From 6e7c72ee05353a284d9c9809035e7ff488b4b8c1 Mon Sep 17 00:00:00 2001
+From a03f39ffea2bc204beaef1f0dfb8bab41efeb49f 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/33] s390x: disable multilib support

cross/gcc-armhf/0021-ppc64-le-disable-multilib-support.patch

@@ -1,4 +1,4 @@
-From 44655aa3be8d5354fb82a42317a9ac6ac1b50164 Mon Sep 17 00:00:00 2001
+From fceb9cfebae070da1b07c5dbc915d2ea128bfb7d 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/33] ppc64[le]: disable multilib support

cross/gcc-armhf/0022-x86_64-disable-multilib-support.patch

@@ -1,4 +1,4 @@
-From 5f79236c49bd0c2c36440f0ef83cea02d52fcaaf Mon Sep 17 00:00:00 2001
+From f79c1c2b5634ac59e120bc1130ba5584e7120623 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/33] x86_64: disable multilib support

cross/gcc-armhf/0023-riscv-disable-multilib-support.patch

@@ -1,4 +1,4 @@
-From 4605e64b3a076411f2f8134256c400eb58bcc1c7 Mon Sep 17 00:00:00 2001
+From f1fb56b945fc7fc649d78a2f73bfe98f1377c814 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/33] riscv: disable multilib support
@@ -43,10 +43,10 @@ library.
  2 files changed, 5 insertions(+), 8 deletions(-)
 
 diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h
-index 16503482ec2..8d9881eadeb 100644
+index d8d1450f346..a386bba87d7 100644
 --- a/gcc/config/riscv/linux.h
 +++ b/gcc/config/riscv/linux.h
-@@ -61,9 +61,3 @@ along with GCC; see the file COPYING3.  If not see
+@@ -71,9 +71,3 @@ along with GCC; see the file COPYING3.  If not see
      %{static:-static}}"
  
  #define TARGET_ASM_FILE_END file_end_indicate_exec_stack

cross/gcc-armhf/0024-always-build-libgcc_eh.a.patch

@@ -1,4 +1,4 @@
-From a178cfeb975d79bb9b9fd877ab4c6e05d10b147e Mon Sep 17 00:00:00 2001
+From b3d43777021f3c61def29d3764e8ee05ebb3c520 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/33] always build libgcc_eh.a

cross/gcc-armhf/0025-ada-libgnarl-compatibility-for-musl.patch

@@ -1,4 +1,4 @@
-From 5bc3deb9bc2679ad4f6f189a65e3643b550587a1 Mon Sep 17 00:00:00 2001
+From c33ad45cabb27512ec7f4e8f7e40cf448f4db59d 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/33] ada: libgnarl compatibility for musl

cross/gcc-armhf/0026-ada-musl-support-fixes.patch

@@ -1,4 +1,4 @@
-From e1e6dccc9124e0907c5ae174d20acb3bad87e633 Mon Sep 17 00:00:00 2001
+From 3169e4c52c248f21a084ef5b540201c982e61d35 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/33] ada: musl support fixes

cross/gcc-armhf/0027-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch

@@ -1,4 +1,4 @@
-From 9506e729f0e4f66f4018fbfc5340a568e8520264 Mon Sep 17 00:00:00 2001
+From 944dead3994c1a9bab757ad61e836e2317b8aa30 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/33] configure: Add --enable-autolink-libatomic, use in

cross/gcc-armhf/0028-configure-fix-detection-of-atomic-builtins-in-libato.patch

@@ -1,4 +1,4 @@
-From 966da83d0d75482a1489804593ae61f3f8e3b385 Mon Sep 17 00:00:00 2001
+From 8ce637988d0c463544c6b95e3a543380854fb73c 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/33] configure: fix detection of atomic builtins in

cross/gcc-armhf/0029-libstdc-do-not-throw-exceptions-for-non-C-locales-on.patch

@@ -1,4 +1,4 @@
-From e74f4b3a10d96f06b15df9d9b61d5b10a84ec084 Mon Sep 17 00:00:00 2001
+From 2f005ed8d54415aa609e3b5ade3ef80bb04f0cf4 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/33] libstdc++: do not throw exceptions for non-C locales on

cross/gcc-armhf/0030-gdc-unconditionally-link-libgphobos-against-libucont.patch

@@ -1,4 +1,4 @@
-From bdc2699f0284e59842e5d3a39fc426550b4ba0e8 Mon Sep 17 00:00:00 2001
+From 65f85fc6750b5d6735f7688c832244ffca2b8ab1 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/33] gdc: unconditionally link libgphobos against

cross/gcc-armhf/0031-druntime-link-against-libucontext-on-all-platforms.patch

@@ -1,4 +1,4 @@
-From 82780d18bfcb7dabc215d4b89b1187cb253e15f8 Mon Sep 17 00:00:00 2001
+From 1c7088d3182fac082706bfa9ec3864291b91b2b7 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/33] druntime: link against libucontext on all platforms

cross/gcc-armhf/0032-libgnat-time_t-is-always-64-bit-on-musl-libc.patch

@@ -1,4 +1,4 @@
-From 32fc6be0b339983e31f6285dbc565b906ec983d4 Mon Sep 17 00:00:00 2001
+From 5dd552d33be47ea3b7586df7dc4812b2cd3b0a5f 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/33] libgnat: time_t is always 64-bit on musl libc

cross/gcc-armhf/0033-fix-assert-in-__deregister_frame_info_bases.patch

@@ -0,0 +1,39 @@
+From 2f41b10437653f7dfee027dc623a94ac4054773c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
+Date: Sun, 14 May 2023 19:30:21 +0200
+Subject: [PATCH 33/33] fix assert in __deregister_frame_info_bases
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The assertion in __deregister_frame_info_bases assumes that for every
+frame something was inserted into the lookup data structure by
+__register_frame_info_bases. Unfortunately, this does not necessarily
+hold true as the btree_insert call in __register_frame_info_bases will
+not insert anything for empty ranges. Therefore, we need to explicitly
+account for such empty ranges in the assertion as `ob` will be a null
+pointer for such ranges, hence causing the assertion to fail.
+
+Signed-off-by: Sören Tempel <soeren@soeren-tempel.net>
+---
+ libgcc/unwind-dw2-fde.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/libgcc/unwind-dw2-fde.c b/libgcc/unwind-dw2-fde.c
+index 7b74c391ced..8683a65aa02 100644
+--- a/libgcc/unwind-dw2-fde.c
++++ b/libgcc/unwind-dw2-fde.c
+@@ -278,7 +278,9 @@ __deregister_frame_info_bases (const void *begin)
+   __gthread_mutex_unlock (&object_mutex);
+ #endif
+ 
+-  gcc_assert (in_shutdown || ob);
++  // If we didn't find anything in the lookup data structures then they
++  // were either already destroyed or we tried to remove an empty range.
++  gcc_assert (in_shutdown || ((range[1] - range[0]) == 0 || ob));
+   return (void *) ob;
+ }
+ 
+-- 
+2.40.1
+

cross/gcc-armhf/0033-libphobos-do-not-use-LFS64-symbols.patch

@@ -1,30 +0,0 @@
-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/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/sys/mman.d | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
-
-diff --git a/libphobos/libdruntime/core/sys/posix/sys/mman.d b/libphobos/libdruntime/core/sys/posix/sys/mman.d
-index 0d3d517d69a..323aa0af72d 100644
---- a/libphobos/libdruntime/core/sys/posix/sys/mman.d
-+++ b/libphobos/libdruntime/core/sys/posix/sys/mman.d
-@@ -293,11 +293,7 @@ else version (CRuntime_Bionic)
- }
- else version (CRuntime_Musl)
- {
--    static if (__USE_LARGEFILE64) void* mmap64(void*, size_t, int, int, int, off_t);
--    static if (__USE_FILE_OFFSET64)
--        alias mmap = mmap64;
--    else
--        void* mmap(void*, size_t, int, int, int, off_t);
-+    void* mmap(void*, size_t, int, int, int, off_t);
-     int munmap(void*, size_t);
- }
- else version (CRuntime_UClibc)
--- 
-2.40.1
-

cross/gcc-armhf/APKBUILD

@@ -24,17 +24,15 @@ CBUILDROOT="/"
 _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"
 
 pkgname=gcc-armhf
-pkgver=13.1.1_git20230527
-# i.e. 13.1.1, must match gcc/BASE-VER
-_pkgbase="${pkgver%%_git*}"
-# date component from snapshots
-_pkgsnap="${pkgver##*_git}"
+_pkgbase=13.1.1 # must match gcc/BASE-VER
+_pkgsnap=20230513
+pkgver=${_pkgbase}_git$_pkgsnap
 [ "$BOOTSTRAP" = "nolibc" ] && pkgname="gcc-pass2"
 [ "$CBUILD" != "$CHOST" ] && _cross="-$CARCH" || _cross=""
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname=gcc-armhf
-pkgrel=1
+pkgrel=2
 pkgdesc="Stage2 cross-compiler for armhf"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -266,7 +264,7 @@ source="https://dev.alpinelinux.org/archive/gcc/${_pkgbase%%.*}-$_pkgsnap/gcc-${
 	0030-gdc-unconditionally-link-libgphobos-against-libucont.patch
 	0031-druntime-link-against-libucontext-on-all-platforms.patch
 	0032-libgnat-time_t-is-always-64-bit-on-musl-libc.patch
-	0033-libphobos-do-not-use-LFS64-symbols.patch
+	0033-fix-assert-in-__deregister_frame_info_bases.patch
 	"
 
 # we build out-of-tree
@@ -780,38 +778,38 @@ gdb() {
 }
 
 sha512sums="
-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
+a82e38d273a668e4a8ad33282cb74661d125babcc6165eb0ada5da471154b2ed2894bf1fa462f0345f9d817e733b155c09a971885f3b7c04398ebcdd3b5551f5  gcc-13-20230513.tar.xz
+275a71fcabc03209fe69894ee9c4bec57afabd170f08385fa148b4e481c0b2d2e5a3e2631e82551f21bc3f93c2b5299ddf39d09b88e1a5451d1cd4fb5ff3be06  0001-posix_memalign.patch
+8c247b796c2cea016fe43b1c7393ed94567bd565e453fdf114d90800a86d1e5bb3761a26c9b48bccb7b3192ca482a72d02fa8b65e4703753ff8b567ddd8cb949  0002-gcc-poison-system-directories.patch
+3c0773148638c41d2a45f43c8320bd9c7b1129650168f0f80bfe4cf9d00d11f352952f178c88285b5a5e47df76264304c05080b9df4948981c0d01bd7cce5cfa  0003-specs-turn-on-Wl-z-now-by-default.patch
+cc81175e0e74abbb46dbc63d64c1a36fc62d4eae7ba3cc5ab85de331c31f3341fc445f3b5be7e1f53ee72e0e3a512232b821cef349a0a5991d46834d1325246e  0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
+c52396a1708b1b4a29e0b5a8d2843f4ea1eb2c34fd2fd9401da0c826a1192b6f87d8b5aea7429f4811c3e293c2fef1945ac05d7c82f3ce94c84f440bb772c76e  0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
+03f1ce1a6c90a438d4b953273ae31996fd54226b320f075cc5ebfe8f1c14958138922b8037774fc9a29d10c8b99303d8119a0075fbb45b608fc14f0b18ed3720  0006-Enable-Wformat-and-Wformat-security-by-default.patch
+3c9f0cde600081e59e7542784839defa46e5bea7a19b9cfcfbf042f883a2a7a7547d0eeb6edea51cbb0682e20e25bde9e6597871d492cf5eaf9cfbd9475f7ce1  0007-Enable-Wtrampolines-by-default.patch
+de8c97e379e9e85d57988ef3d2df2dd7f1f0a7e4e20c2bbc19f148bf3fbaccaf34e80fae8e8f60c6b9b4932135c14fd2f1a20624e44aa6d67ba92b29d36c6051  0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
+acc01ac7a8da1eb02915b5b82dd539b1e8ac5045faeb6db02f54390f77a3d7a8f0cf65c2927a4150e7a52ee4a7df31091d325dd45641cc6639883defda7d0d42  0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
+101ef48ce43aa084ab9875c1917388e1ae2b3ef33d0d616429515a9ce1f6c9af28b13a6a59ef4a384b9834d0846b4d28f593857cffacda2ac04abe67ffe7ca8f  0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
+6563f09d331048f402dc0c54e8be48ff701fe14316ad48c301a75368414f3cf1fb0e3ed706090fff70db6879b390c05bf2ed504206c1e407b9cc5f7295517183  0011-libiberty-copy-PIC-objects-during-build-process.patch
+6ea5e476a67a16a9e94c5ed8040d1af4ebce4b417a22c97be978ff6fc91f7a627a35fc077c8ce7f5fdf0d20712001622abdccb117a7ffa789f9a90cf23cd1429  0012-libgcc_s.patch
+53f96185583ca048010e759eb364ee646ebb1728379da4a7f6137a2009a3657f3d166cb9bfae78994070dd3750859a29857dfc6420bd9accebf629e259c096c2  0013-nopie.patch
+d181e399bd2bdcbbbb69767ba08220d69ac97cd05faf2e1172266a1e194cf32ca3ff3a6bc29751223ecf9d2d739f6fca66dc825d4026ea6a272d39d98e038e2e  0014-ada-fix-shared-linking.patch
+c08339b2f2c2840471f0ff7270d372ec5613113432c507519c3805df97215955532f53e5d9f4ca1ec345199fe7701c5e4fc1054b2bdac998c21add01feeaf94a  0015-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
+2ee36af2e4bcd1d7b9bba588d638f618359a3c60fca8939311f1e837551522fa1a6911175dfd87c56dcb4d42de8b04af65afc882ddcec215ee5f2a8c086ee399  0016-add-fortify-headers-paths.patch
+af71729e9c21aaf13ab0ba9407b3be4b4e9c6b515a8e65686628ddd885ff6b69f8f31c714ce52b7c5a5c9b9d1f31070e6a4278b5d5d11868f152258002077355  0017-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
+dc37f213776957bd704caf481189063589e8ed7a223421a0489553421d45249e7425147755e344c4d172b35b329a2d191b420fd1cdd49de99546b874e5fbcd3d  0018-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
+4c9500ff6d479f84ce1ee9c043db4434b51b0f847914f78482e2fba915d0018bb19fb92882b3df8475cb70171183089115ce95c0e87f69c05e56d1e3b94262be  0019-aarch64-disable-multilib-support.patch
+832eb922bcd8b4bd510929de520ea036734316c55c222a3323b3df26923ce599a8580586e7922860db7ecd2a0c7d9d15213daa1ae7f7026fe8ec8eac5ca29f32  0020-s390x-disable-multilib-support.patch
+fe99502b6c12b923774486dfba7480959708722ca56690e8b601c7f774f074a21f8f3ff1a0b39ca0b88ebaa2b5773652f6c9fdf92d7f78a3e674038dcb98c5a6  0021-ppc64-le-disable-multilib-support.patch
+50160fdacd1eb2696a87c63955308b07c21bf9ce5b085e74fdcc3db633cbe705e84e9d37bc124dfdbfd89980026533c2ca5a537fdfa3edfdcb46d50625df53ea  0022-x86_64-disable-multilib-support.patch
+498fda16a87f11f802c4910a4e1cd8c02b6e302cccfc60588749a170e4729ac5054a1ae253772baf82854767659eedc07c5e6ae0e154b3ff24dc57a017de9f20  0023-riscv-disable-multilib-support.patch
+c846962e05062e036dd6b5d107cadb9aa33019ca555936394605911de8a3b5a145f03cc59b393b2a42f7b8ded5712c80583d27c8ac4eec145dcd688a5dfc8b81  0024-always-build-libgcc_eh.a.patch
+e476823a735ed41a1220b06e74c56312cd98077c4c4a06bc8af4875a25c197d3d38b0666765c2ed5b5e5d1c5093d456caf19cab5eb57cfb841797873d4fefe28  0025-ada-libgnarl-compatibility-for-musl.patch
+1a120d66233b5becd89f1042252d43327aab975ccdfd06480f11f79e306bd9ac4869d7483bd2bf9a8125426bf01582f3f2524eec5d7ab4d762e7d7829070be01  0026-ada-musl-support-fixes.patch
+1290e17df57e549e1de7431473389210102841e42bbafceeef5e69ec258ed4eb5a4fb2aa4ba1ccb66496833335412495000fd8be6c74b4edd633af352a54e10b  0027-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
+39c6604aaa6e931f507b804c1d3443d59edfd66d4ba8774b02fd6d30937c85a645575ab7921c3c8ee5d51d65a76290b47319c5f0276fd4fb5319f1e94e875160  0028-configure-fix-detection-of-atomic-builtins-in-libato.patch
+b3be6955a078ace099dceeb48535ab41ff47c79963822c93741f50823e0239e4aff26566e4abc9d2c3964f65bc7d61bf081398c5e6c4ba009db8d5d60dc8de10  0029-libstdc-do-not-throw-exceptions-for-non-C-locales-on.patch
+028e67e52aa6ae31dadd9da4d235e780832e9a114d2ffb72b452dac81f80851bcbb652429c760daf70e07edfb80589953bf780b670313b367cc72877cc3d16e5  0030-gdc-unconditionally-link-libgphobos-against-libucont.patch
+3d845c1684fb4286f9e8a57df860db9a9eb18296d6e54e09b53d33bce67b2529995b6611584eef7e37fd506c20ec1f9f839f107678614b1d1cde675a084495cc  0031-druntime-link-against-libucontext-on-all-platforms.patch
+4929eeeb0ea962ca3d8d5bf00334bb520c4419a31940d79244bd8a75cf9a5ac53d60aed4728404c463bb4a82070f0224887281207f4f8f2e532f312c5071098b  0032-libgnat-time_t-is-always-64-bit-on-musl-libc.patch
+97890297608a6f2926b9628321f3e27b5a86ca9f33933f66c9d2d4c441f4ed219867fbc18c2f51ad4e427ba799bd0ad7ff6927d0869ef9e1d594b72ad793657b  0033-fix-assert-in-__deregister_frame_info_bases.patch
 "

cross/gcc-armv7/0001-posix_memalign.patch

@@ -1,4 +1,4 @@
-From 3e5acbe356124aa5d8dde0635d652c065a553e7d Mon Sep 17 00:00:00 2001
+From a695388351636049500bd1f014caed177c2123c3 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/33] posix_memalign

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

@@ -1,4 +1,4 @@
-From f986a4a1224fa7d452b415d690aead8d356a7eae Mon Sep 17 00:00:00 2001
+From 41a1d0593acc2b24fb57bfec98a4328342b616da 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/33] gcc: poison-system-directories
@@ -120,7 +120,7 @@ index 09082e8ccae..5504bf6eb01 100644
  AC_SUBST(subdirs)
  AC_SUBST(srcdir)
 diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index c0c3ad14515..7cdd5bfa952 100644
+index 36ed1591440..4ff3e817c23 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
 @@ -384,6 +384,7 @@ Objective-C and Objective-C++ Dialects}.
@@ -131,7 +131,7 @@ index c0c3ad14515..7cdd5bfa952 100644
  -Wno-pragmas  -Wno-prio-ctor-dtor  -Wredundant-decls
  -Wrestrict  -Wno-return-local-addr  -Wreturn-type
  -Wno-scalar-storage-order  -Wsequence-point
-@@ -8424,6 +8425,14 @@ made up of data only and thus requires no special treatment.  But, for
+@@ -8423,6 +8424,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.
  

cross/gcc-armv7/0003-specs-turn-on-Wl-z-now-by-default.patch

@@ -1,4 +1,4 @@
-From 31e2b60000e779ef775daa306120eabcf987852a Mon Sep 17 00:00:00 2001
+From a15c0e1514fb5fa5609ad7abc6c5f5d0749d0c4a 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/33] specs: turn on -Wl,-z,now by default
@@ -14,10 +14,10 @@ now by default.
  2 files changed, 4 insertions(+)
 
 diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index 7cdd5bfa952..158b7bcb81e 100644
+index 4ff3e817c23..b1877a751aa 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
-@@ -17959,6 +17959,9 @@ For example, @option{-Wl,-Map,output.map} passes @option{-Map output.map} to the
+@@ -17958,6 +17958,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}.
  

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

@@ -1,4 +1,4 @@
-From 3b910da7d1e81bdd953e6d9ec82020e7b120353b Mon Sep 17 00:00:00 2001
+From edb757265420be9c5a903827bedf46b02c09d868 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/33] Turn on -D_FORTIFY_SOURCE=2 by default for C, C++,
@@ -10,10 +10,10 @@ Subject: [PATCH 04/33] Turn on -D_FORTIFY_SOURCE=2 by default for C, C++,
  2 files changed, 10 insertions(+)
 
 diff --git a/gcc/c-family/c-cppbuiltin.cc b/gcc/c-family/c-cppbuiltin.cc
-index 5d64625fcd7..868d69506e4 100644
+index 98f5aef2af9..d4da19e4014 100644
 --- a/gcc/c-family/c-cppbuiltin.cc
 +++ b/gcc/c-family/c-cppbuiltin.cc
-@@ -1546,6 +1546,10 @@ c_cpp_builtins (cpp_reader *pfile)
+@@ -1545,6 +1545,10 @@ c_cpp_builtins (cpp_reader *pfile)
    builtin_define_with_value ("__REGISTER_PREFIX__", REGISTER_PREFIX, 0);
    builtin_define_with_value ("__USER_LABEL_PREFIX__", user_label_prefix, 0);
  
@@ -25,10 +25,10 @@ index 5d64625fcd7..868d69506e4 100644
    if (flag_gnu89_inline)
      cpp_define (pfile, "__GNUC_GNU_INLINE__");
 diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index 158b7bcb81e..cc9972f907b 100644
+index b1877a751aa..91d384e1927 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
-@@ -11866,6 +11866,12 @@ also turns on the following optimization flags:
+@@ -11865,6 +11865,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.
  

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

@@ -1,4 +1,4 @@
-From 9c3a2882b1932296ccb1d0ed2900cf046f998a26 Mon Sep 17 00:00:00 2001
+From dda9ee88db09aadab7585fa33aca67f1702df190 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/33] On linux targets pass --as-needed by default to the
@@ -137,10 +137,10 @@ index a4e5380b589..3cc61bce69f 100644
      %{!static: \
        %{rdynamic:-export-dynamic} \
 diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h
-index 2fdfd930cf2..16503482ec2 100644
+index b9557a75dc7..d8d1450f346 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
+@@ -58,6 +58,7 @@ along with GCC; see the file COPYING3.  If not see
    "%{mabi=ilp32:_ilp32}"
  
  #define LINK_SPEC "\

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

@@ -1,4 +1,4 @@
-From 288cb2be3abe07dcf2737ed3ac07e93573262bc4 Mon Sep 17 00:00:00 2001
+From 14d66aece585329970ed8a777792502baaa9606b 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/33] Enable -Wformat and -Wformat-security by default.

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

@@ -1,4 +1,4 @@
-From 93e44f7c7b1f11c1f714d6c384b0d39a191ac18a Mon Sep 17 00:00:00 2001
+From 53bedd7a7bfcc70cd518afedbf3713cbfaa1e631 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/33] Enable -Wtrampolines by default.

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

@@ -1,4 +1,4 @@
-From 7aa93d6d9a63c7bedf1e033f6d040e95038537e7 Mon Sep 17 00:00:00 2001
+From d5cecc5d699ad150c38794c6f4f231fa48cb450d 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/33] Disable ssp on -nostdlib, -nodefaultlibs and

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

@@ -1,4 +1,4 @@
-From e44b295b5b0b917c0b47085f60466a37f890e1c7 Mon Sep 17 00:00:00 2001
+From a646f903a6c04393c4c013d7bc4c979a74a0e0f9 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/33] Ensure that msgfmt doesn't encounter problems during

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

@@ -1,4 +1,4 @@
-From f041dcd8f775e03b85a49e3aeef0870e2333b10e Mon Sep 17 00:00:00 2001
+From 7a5b7b5c556b410074af850c6c49eb5e6ba84362 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/33] Don't declare asprintf if defined as a macro.