From e9ef788ea043e403aff26f83c862c309bdb9d6a2 Mon Sep 17 00:00:00 2001
From: Johnny Hughes <jhughes@redhat.com>
Date: Wed, 2 Oct 2024 16:59:11 +0000
Subject: [PATCH] gcc-toolset-13-binutils package is retired on branch c10s for
 CS-2551

---
 .fmf/version                                  |   1 -
 .gitignore                                    |   2 -
 README.md                                     |   3 +
 binutils-2.27-aarch64-ifunc.patch             |  11 -
 binutils-AMD-znver5.patch                     | 176 ----------
 binutils-CVE-2023-1972.patch                  |  20 --
 binutils-autoconf-version.patch               |  11 -
 ...ls-do-not-link-with-static-libstdc++.patch |  85 -----
 binutils-export-demangle.h.patch              |  33 --
 binutils-filename-in-readelf-messages.patch   | 127 -------
 binutils-fix-testsuite-failures.patch         | 330 ------------------
 binutils-gcc-10-fixes.patch                   | 180 ----------
 binutils-gold-i386-gnu-property-notes.patch   | 193 ----------
 binutils-gold-mismatched-section-flags.patch  |  19 -
 binutils-gold-warn-unsupported.patch          |  66 ----
 binutils-ld-read-only-script.patch            | 158 ---------
 binutils-libtool-lib64.patch                  | 236 -------------
 binutils-libtool-no-rpath.patch               |  28 --
 binutils-no-config-h-check.patch              |  28 --
 dead.package                                  |   1 +
 20 files changed, 4 insertions(+), 1704 deletions(-)
 delete mode 100644 .fmf/version
 delete mode 100644 .gitignore
 create mode 100644 README.md
 delete mode 100644 binutils-2.27-aarch64-ifunc.patch
 delete mode 100644 binutils-AMD-znver5.patch
 delete mode 100644 binutils-CVE-2023-1972.patch
 delete mode 100644 binutils-autoconf-version.patch
 delete mode 100644 binutils-do-not-link-with-static-libstdc++.patch
 delete mode 100644 binutils-export-demangle.h.patch
 delete mode 100644 binutils-filename-in-readelf-messages.patch
 delete mode 100644 binutils-fix-testsuite-failures.patch
 delete mode 100644 binutils-gcc-10-fixes.patch
 delete mode 100644 binutils-gold-i386-gnu-property-notes.patch
 delete mode 100644 binutils-gold-mismatched-section-flags.patch
 delete mode 100644 binutils-gold-warn-unsupported.patch
 delete mode 100644 binutils-ld-read-only-script.patch
 delete mode 100644 binutils-libtool-lib64.patch
 delete mode 100644 binutils-libtool-no-rpath.patch
 delete mode 100644 binutils-no-config-h-check.patch
 create mode 100644 dead.package

diff --git a/.fmf/version b/.fmf/version
deleted file mode 100644
index d00491f..0000000
--- a/.fmf/version
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 0b82286..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/binutils-2.40.tar.xz
-/binutils-2.19.50.0.1-output-format.sed
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..24b9ea2
--- /dev/null
+++ b/README.md
@@ -0,0 +1,3 @@
+# Package Not Available
+This package is not available on CentOS Stream 10.
+It may be available on another branch.
\ No newline at end of file
diff --git a/binutils-2.27-aarch64-ifunc.patch b/binutils-2.27-aarch64-ifunc.patch
deleted file mode 100644
index 562ef18..0000000
--- a/binutils-2.27-aarch64-ifunc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -rup binutils.orig/bfd/elfnn-aarch64.c binutils-2.27/bfd/elfnn-aarch64.c
---- binutils.orig/bfd/elfnn-aarch64.c	2017-02-21 10:45:19.311956006 +0000
-+++ binutils-2.27/bfd/elfnn-aarch64.c	2017-02-21 11:55:07.517922655 +0000
-@@ -4947,6 +4947,7 @@ elfNN_aarch64_final_link_relocate (reloc
-      it here if it is defined in a non-shared object.  */
-   if (h != NULL
-       && h->type == STT_GNU_IFUNC
-+      && (input_section->flags & SEC_ALLOC)
-       && h->def_regular)
-     {
-       asection *plt;
diff --git a/binutils-AMD-znver5.patch b/binutils-AMD-znver5.patch
deleted file mode 100644
index c29f35f..0000000
--- a/binutils-AMD-znver5.patch
+++ /dev/null
@@ -1,176 +0,0 @@
-diff -rupN binutils.orig/gas/config/tc-i386.c binutils-2.40/gas/config/tc-i386.c
---- binutils.orig/gas/config/tc-i386.c	2024-02-13 16:41:10.787729089 +0000
-+++ binutils-2.40/gas/config/tc-i386.c	2024-02-13 16:52:35.402669140 +0000
-@@ -998,6 +998,7 @@ static const arch_entry cpu_arch[] =
-   ARCH (znver2, ZNVER, ZNVER2, false),
-   ARCH (znver3, ZNVER, ZNVER3, false),
-   ARCH (znver4, ZNVER, ZNVER4, false),
-+  ARCH (znver5, ZNVER, ZNVER5, false),
-   ARCH (btver1, BT, BTVER1, false),
-   ARCH (btver2, BT, BTVER2, false),
- 
-diff -rupN binutils.orig/gas/doc/c-i386.texi binutils-2.40/gas/doc/c-i386.texi
---- binutils.orig/gas/doc/c-i386.texi	2024-02-13 16:41:10.789729089 +0000
-+++ binutils-2.40/gas/doc/c-i386.texi	2024-02-13 16:52:35.572669132 +0000
-@@ -125,6 +125,7 @@ processor names are recognized:
- @code{znver2},
- @code{znver3},
- @code{znver4},
-+@code{znver5},
- @code{btver1},
- @code{btver2},
- @code{generic32} and
-@@ -1477,7 +1478,8 @@ supported on the CPU specified.  The cho
- @item @samp{k6} @tab @samp{k6_2} @tab @samp{athlon} @tab @samp{k8}
- @item @samp{amdfam10} @tab @samp{bdver1} @tab @samp{bdver2} @tab @samp{bdver3}
- @item @samp{bdver4} @tab @samp{znver1} @tab @samp{znver2} @tab @samp{znver3}
--@item @samp{znver4} @tab @samp{btver1} @tab @samp{btver2} @tab @samp{generic32}
-+@item @samp{znver4} @tab @samp{znver5} @tab @samp{btver1} @tab @samp{btver2}
-+@item @samp{generic32}
- @item @samp{generic64} @tab @samp{.cmov} @tab @samp{.fxsr} @tab @samp{.mmx}
- @item @samp{.sse} @tab @samp{.sse2} @tab @samp{.sse3} @tab @samp{.sse4a}
- @item @samp{.ssse3} @tab @samp{.sse4.1} @tab @samp{.sse4.2} @tab @samp{.sse4}
-diff -rupN binutils.orig/gas/testsuite/gas/i386/arch-15-znver5.d binutils-2.40/gas/testsuite/gas/i386/arch-15-znver5.d
---- binutils.orig/gas/testsuite/gas/i386/arch-15-znver5.d	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.40/gas/testsuite/gas/i386/arch-15-znver5.d	2024-02-13 16:52:35.405669140 +0000
-@@ -0,0 +1,5 @@
-+#source: arch-15.s
-+#as: -march=znver5
-+#objdump: -dw
-+#name: i386 arch 15 (znver5)
-+#dump: arch-15.d
-diff -rupN binutils.orig/gas/testsuite/gas/i386/arch-15.d binutils-2.40/gas/testsuite/gas/i386/arch-15.d
---- binutils.orig/gas/testsuite/gas/i386/arch-15.d	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.40/gas/testsuite/gas/i386/arch-15.d	2024-02-13 16:52:35.405669140 +0000
-@@ -0,0 +1,13 @@
-+#objdump: -dw
-+#name: i386 arch 15
-+
-+.*:     file format .*
-+
-+Disassembly of section .text:
-+
-+0+ <.text>:
-+[ 	]*[a-f0-9]+:[ 	]*c4 e2 59 50 d2[ 	]*\{vex\} vpdpbusd %xmm2,%xmm4,%xmm2
-+[ 	]*[a-f0-9]+:[ 	]*0f 38 f9 01[ 	]*movdiri %eax,\(%ecx\)
-+[ 	]*[a-f0-9]+:[ 	]*66 0f 38 f8 01[ 	]*movdir64b \(%ecx\),%eax
-+[ 	]*[a-f0-9]+:[ 	]*62 f2 6f 48 68 d9[ 	]*vp2intersectd %zmm1,%zmm2,%k3
-+#pass
-diff -rupN binutils.orig/gas/testsuite/gas/i386/arch-15.s binutils-2.40/gas/testsuite/gas/i386/arch-15.s
---- binutils.orig/gas/testsuite/gas/i386/arch-15.s	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.40/gas/testsuite/gas/i386/arch-15.s	2024-02-13 16:52:35.405669140 +0000
-@@ -0,0 +1,7 @@
-+# Test -march=
-+	.text
-+
-+    {vex} vpdpbusd %xmm2, %xmm4, %xmm2    #AVX_VNNI
-+    movdiri %eax, (%ecx)            #MOVDIRI
-+    movdir64b (%ecx), %eax          #MOVDIR64B
-+    vp2intersectd %zmm1, %zmm2, %k3 #AVX512_VP2INTERSECT
-diff -rupN binutils.orig/gas/testsuite/gas/i386/i386.exp binutils-2.40/gas/testsuite/gas/i386/i386.exp
---- binutils.orig/gas/testsuite/gas/i386/i386.exp	2024-02-13 16:41:10.859729082 +0000
-+++ binutils-2.40/gas/testsuite/gas/i386/i386.exp	2024-02-13 16:52:35.405669140 +0000
-@@ -199,6 +199,7 @@ if [gas_32_check] then {
-     run_dump_test "arch-13-znver2"
-     run_dump_test "arch-14-znver3"
-     run_dump_test "arch-14-znver4"
-+    run_dump_test "arch-15-znver5"
-     run_dump_test "arch-10-btver1"
-     run_dump_test "arch-10-btver2"
-     run_list_test "arch-10-1" "-march=generic32 -I${srcdir}/$subdir -al"
-@@ -211,6 +212,7 @@ if [gas_32_check] then {
-     run_dump_test "arch-13"
-     run_dump_test "arch-14"
-     run_dump_test "arch-14-1"
-+    run_dump_test "arch-15"
-     run_list_test "arch-dflt" "-march=generic32 -al"
-     run_list_test "arch-stk" "-march=generic32 -al"
-     run_dump_test "8087"
-diff -rupN binutils.orig/gas/testsuite/gas/i386/x86-64-arch-5-znver5.d binutils-2.40/gas/testsuite/gas/i386/x86-64-arch-5-znver5.d
---- binutils.orig/gas/testsuite/gas/i386/x86-64-arch-5-znver5.d	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.40/gas/testsuite/gas/i386/x86-64-arch-5-znver5.d	2024-02-13 16:52:35.406669140 +0000
-@@ -0,0 +1,5 @@
-+#source: x86-64-arch-5.s
-+#as: -march=znver5
-+#objdump: -dw
-+#name: x86-64 arch 5 (znver5)
-+#dump: x86-64-arch-5.d
-diff -rupN binutils.orig/gas/testsuite/gas/i386/x86-64-arch-5.d binutils-2.40/gas/testsuite/gas/i386/x86-64-arch-5.d
---- binutils.orig/gas/testsuite/gas/i386/x86-64-arch-5.d	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.40/gas/testsuite/gas/i386/x86-64-arch-5.d	2024-02-13 16:52:35.406669140 +0000
-@@ -0,0 +1,14 @@
-+#objdump: -dw
-+#name: x86-64 arch 5
-+
-+.*:     file format .*
-+
-+Disassembly of section .text:
-+
-+0+ <.text>:
-+[ 	]*[a-f0-9]+:[ 	]*c4 c2 59 50 d4[ 	]*\{vex\} vpdpbusd %xmm12,%xmm4,%xmm2
-+[ 	]*[a-f0-9]+:[ 	]*48 0f 38 f9 01[ 	]*movdiri %rax,\(%rcx\)
-+[ 	]*[a-f0-9]+:[ 	]*66 0f 38 f8 01[ 	]*movdir64b \(%rcx\),%rax
-+[ 	]*[a-f0-9]+:[ 	]*62 f2 6f 48 68 d9[ 	]*vp2intersectd %zmm1,%zmm2,%k3
-+[ 	]*[a-f0-9]+:[ 	]*0f 18 3d 78 56 34 12[ 	]*prefetchit0 0x12345678\(%rip\)        # 0x[0-9a-f]+
-+#pass
-diff -rupN binutils.orig/gas/testsuite/gas/i386/x86-64-arch-5.s binutils-2.40/gas/testsuite/gas/i386/x86-64-arch-5.s
---- binutils.orig/gas/testsuite/gas/i386/x86-64-arch-5.s	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.40/gas/testsuite/gas/i386/x86-64-arch-5.s	2024-02-13 16:52:35.406669140 +0000
-@@ -0,0 +1,8 @@
-+# Test -march=
-+	.text
-+
-+    {vex} vpdpbusd %xmm12, %xmm4, %xmm2     #AVX_VNNI
-+    movdiri %rax, (%rcx)                    #MOVDIRI
-+    movdir64b (%rcx), %rax                  #MOVDIR64B
-+    vp2intersectd %zmm1, %zmm2, %k3         #AVX512_VP2INTERSECT
-+    prefetchit0 0x12345678(%rip)            #prefetchi
-diff -rupN binutils.orig/opcodes/i386-gen.c binutils-2.40/opcodes/i386-gen.c
---- binutils.orig/opcodes/i386-gen.c	2024-02-13 16:41:11.145729056 +0000
-+++ binutils-2.40/opcodes/i386-gen.c	2024-02-13 16:52:35.406669140 +0000
-@@ -97,6 +97,8 @@ static const dependency isa_dependencies
-     "ZNVER2|INVLPGB|TLBSYNC|VAES|VPCLMULQDQ|INVPCID|SNP|OSPKE" },
-   { "ZNVER4",
-     "ZNVER3|AVX512F|AVX512DQ|AVX512IFMA|AVX512CD|AVX512BW|AVX512VL|AVX512_BF16|AVX512VBMI|AVX512_VBMI2|AVX512_VNNI|AVX512_BITALG|AVX512_VPOPCNTDQ|GFNI|RMPQUERY" },
-+  { "ZNVER5",
-+    "ZNVER4|AVX_VNNI|MOVDIRI|MOVDIR64B|AVX512_VP2INTERSECT|PREFETCHI" },
-   { "BTVER1",
-     "GENERIC64|FISTTP|CX16|Rdtscp|SSSE3|SSE4A|ABM|PRFCHW|CX16|Clflush|FISTTP|SVME" },
-   { "BTVER2",
-diff -rupN binutils.orig/opcodes/i386-init.h binutils-2.40/opcodes/i386-init.h
---- binutils.orig/opcodes/i386-init.h	2024-02-13 16:41:11.145729056 +0000
-+++ binutils-2.40/opcodes/i386-init.h	2024-02-13 17:32:50.339735343 +0000
-@@ -1431,6 +1431,15 @@
-       1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, \
-       0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0 } }
- 
-+#define CPU_ZNVER5_FLAGS \
-+  { { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 0, \
-+      0, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, \
-+      1, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 0, 1, 1, 0, 1, 1, 1, 1, 1, \
-+      0, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 0, \
-+      0, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, \
-+      1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, \
-+      0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0 } }
-+
- #define CPU_BTVER1_FLAGS \
-   { { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 0, \
-       0, 1, 0, 1, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \
---- binutils.orig/gas/testsuite/gas/i386/i386.exp	2024-02-22 12:25:43.212505914 +0000
-+++ binutils-2.40/gas/testsuite/gas/i386/i386.exp	2024-02-22 12:28:26.254563823 +0000
-@@ -922,6 +922,7 @@ if [gas_64_check] then {
-     run_dump_test "x86-64-arch-4"
-     run_dump_test "x86-64-arch-4-1"
-     run_dump_test "rmpquery"
-+    run_dump_test "x86-64-arch-5"
-     run_dump_test "x86-64-arch-2-lzcnt"
-     run_dump_test "x86-64-arch-2-prefetchw"
-     run_dump_test "x86-64-arch-2-bdver1"
-@@ -932,6 +933,7 @@ if [gas_64_check] then {
-     run_dump_test "x86-64-arch-3-znver2"
-     run_dump_test "x86-64-arch-4-znver3"
-     run_dump_test "x86-64-arch-4-znver4"
-+    run_dump_test "x86-64-arch-5-znver5"
-     run_dump_test "x86-64-arch-2-btver1"
-     run_dump_test "x86-64-arch-2-btver2"
-     run_list_test "x86-64-arch-2-1" "-march=generic64 -I${srcdir}/$subdir -al"
diff --git a/binutils-CVE-2023-1972.patch b/binutils-CVE-2023-1972.patch
deleted file mode 100644
index dd637fc..0000000
--- a/binutils-CVE-2023-1972.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- binutils.orig/bfd/elf.c	2023-04-17 16:26:08.720347439 +0100
-+++ binutils-2.40/bfd/elf.c	2023-04-17 16:28:03.286317601 +0100
-@@ -9050,6 +9050,8 @@ _bfd_elf_slurp_version_tables (bfd *abfd
- 	  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;
-@@ -9153,6 +9155,8 @@ _bfd_elf_slurp_version_tables (bfd *abfd
- 	  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;
diff --git a/binutils-autoconf-version.patch b/binutils-autoconf-version.patch
deleted file mode 100644
index f94fdad..0000000
--- a/binutils-autoconf-version.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- binutils.orig/config/override.m4	2021-08-31 14:20:17.275574804 +0100
-+++ binutils-2.37/config/override.m4	2021-08-31 14:36:37.793954247 +0100
-@@ -41,7 +41,7 @@ dnl Or for updating the whole tree at on
- AC_DEFUN([_GCC_AUTOCONF_VERSION_CHECK],
- [m4_if(m4_defn([_GCC_AUTOCONF_VERSION]),
-   m4_defn([m4_PACKAGE_VERSION]), [],
--  [m4_fatal([Please use exactly Autoconf ]_GCC_AUTOCONF_VERSION[ instead of ]m4_defn([m4_PACKAGE_VERSION])[.])])
-+  [])
- ])
- m4_define([AC_INIT], m4_defn([AC_INIT])[
- _GCC_AUTOCONF_VERSION_CHECK
diff --git a/binutils-do-not-link-with-static-libstdc++.patch b/binutils-do-not-link-with-static-libstdc++.patch
deleted file mode 100644
index af73925..0000000
--- a/binutils-do-not-link-with-static-libstdc++.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-diff -rup binutils.orig/configure binutils-2.40/configure
---- binutils.orig/configure	2023-02-13 14:43:00.728877170 +0000
-+++ binutils-2.40/configure	2023-02-13 14:43:13.671864892 +0000
-@@ -5442,49 +5442,6 @@ if test -z "$LD"; then
-   fi
- fi
- 
--# Check whether -static-libstdc++ -static-libgcc is supported.
--have_static_libs=no
--if test "$GCC" = yes; then
--  saved_LDFLAGS="$LDFLAGS"
--
--  LDFLAGS="$LDFLAGS -static-libstdc++ -static-libgcc"
--  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether g++ accepts -static-libstdc++ -static-libgcc" >&5
--$as_echo_n "checking whether g++ accepts -static-libstdc++ -static-libgcc... " >&6; }
--  ac_ext=cpp
--ac_cpp='$CXXCPP $CPPFLAGS'
--ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
--
--
--cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--
--#if (__GNUC__ < 4) || (__GNUC__ == 4 && __GNUC_MINOR__ < 5)
--#error -static-libstdc++ not implemented
--#endif
--int main() {}
--_ACEOF
--if ac_fn_cxx_try_link "$LINENO"; then :
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--$as_echo "yes" >&6; }; have_static_libs=yes
--else
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--fi
--rm -f core conftest.err conftest.$ac_objext \
--    conftest$ac_exeext conftest.$ac_ext
--  ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
--
--
--  LDFLAGS="$saved_LDFLAGS"
--fi
--
--
- 
- 
- if test -n "$ac_tool_prefix"; then
-diff -rup binutils.orig/configure.ac binutils-2.40/configure.ac
---- binutils.orig/configure.ac	2023-02-13 14:43:00.728877170 +0000
-+++ binutils-2.40/configure.ac	2023-02-13 14:43:13.671864892 +0000
-@@ -1435,26 +1435,6 @@ if test -z "$LD"; then
-   fi
- fi
- 
--# Check whether -static-libstdc++ -static-libgcc is supported.
--have_static_libs=no
--if test "$GCC" = yes; then
--  saved_LDFLAGS="$LDFLAGS"
--
--  LDFLAGS="$LDFLAGS -static-libstdc++ -static-libgcc"
--  AC_MSG_CHECKING([whether g++ accepts -static-libstdc++ -static-libgcc])
--  AC_LANG_PUSH(C++)
--  AC_LINK_IFELSE([AC_LANG_SOURCE([
--#if (__GNUC__ < 4) || (__GNUC__ == 4 && __GNUC_MINOR__ < 5)
--#error -static-libstdc++ not implemented
--#endif
--int main() {}])],
--    [AC_MSG_RESULT([yes]); have_static_libs=yes],
--    [AC_MSG_RESULT([no])])
--  AC_LANG_POP(C++)
--
--  LDFLAGS="$saved_LDFLAGS"
--fi
--
- ACX_PROG_GNAT
- ACX_PROG_GDC
- ACX_PROG_CMP_IGNORE_INITIAL
-Only in binutils-2.40: configure.ac.orig
-Only in binutils-2.40: configure.orig
diff --git a/binutils-export-demangle.h.patch b/binutils-export-demangle.h.patch
deleted file mode 100644
index 9716a8b..0000000
--- a/binutils-export-demangle.h.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -rup binutils.orig/bfd/Makefile.am binutils-2.32/bfd/Makefile.am
---- binutils.orig/bfd/Makefile.am	2019-02-08 12:22:51.395684251 +0000
-+++ binutils-2.32/bfd/Makefile.am	2019-02-08 12:22:53.970664973 +0000
-@@ -33,7 +33,7 @@ bfdlibdir = @bfdlibdir@
- bfdincludedir = @bfdincludedir@
- bfdlib_LTLIBRARIES = libbfd.la
- bfdinclude_HEADERS = $(BFD_H) $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
--		     $(INCDIR)/diagnostics.h $(INCDIR)/bfdlink.h
-+		     $(INCDIR)/diagnostics.h $(INCDIR)/bfdlink.h $(INCDIR)/demangle.h
- else !INSTALL_LIBBFD
- # Empty these so that the respective installation directories will not be created.
- bfdlibdir =
-diff -rup binutils.orig/bfd/Makefile.in binutils-2.32/bfd/Makefile.in
---- binutils.orig/bfd/Makefile.in	2019-02-08 12:21:35.291254044 +0000
-+++ binutils-2.32/bfd/Makefile.in	2019-02-08 12:22:10.163992947 +0000
-@@ -249,7 +249,7 @@ am__can_run_installinfo = \
-   esac
- am__bfdinclude_HEADERS_DIST = $(INCDIR)/plugin-api.h bfd.h \
- 	$(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
--	$(INCDIR)/diagnostics.h $(INCDIR)/bfdlink.h
-+	$(INCDIR)/diagnostics.h $(INCDIR)/bfdlink.h $(INCDIR)/demangle.h
- HEADERS = $(bfdinclude_HEADERS)
- RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-   distclean-recursive maintainer-clean-recursive
-@@ -468,7 +468,7 @@ libbfd_la_LDFLAGS = $(am__append_1) -rel
- @INSTALL_LIBBFD_FALSE@bfdinclude_HEADERS = $(am__append_2)
- @INSTALL_LIBBFD_TRUE@bfdinclude_HEADERS = $(BFD_H) \
- @INSTALL_LIBBFD_TRUE@	$(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
--@INSTALL_LIBBFD_TRUE@	$(INCDIR)/diagnostics.h \
-+@INSTALL_LIBBFD_TRUE@	$(INCDIR)/diagnostics.h $(INCDIR)/demangle.h \
- @INSTALL_LIBBFD_TRUE@	$(INCDIR)/bfdlink.h $(am__append_2)
- @INSTALL_LIBBFD_FALSE@rpath_bfdlibdir = @bfdlibdir@
- @INSTALL_LIBBFD_FALSE@noinst_LTLIBRARIES = libbfd.la
diff --git a/binutils-filename-in-readelf-messages.patch b/binutils-filename-in-readelf-messages.patch
deleted file mode 100644
index eb2f98b..0000000
--- a/binutils-filename-in-readelf-messages.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-diff -rup binutils.orig/binutils/readelf.c binutils-2.40/binutils/readelf.c
---- binutils.orig/binutils/readelf.c	2023-02-13 14:38:44.081029276 +0000
-+++ binutils-2.40/binutils/readelf.c	2023-02-13 14:38:56.201022315 +0000
-@@ -22858,46 +22858,53 @@ process_file (char * file_name)
-   Filedata * filedata = NULL;
-   struct stat statbuf;
-   char armag[SARMAG];
--  bool ret = true;
-+  bool ret = false;
-+  char * name;
-+  char * saved_program_name;
-+
-+  /* Overload program_name to include file_name.  Doing this means
-+     that warning/error messages will positively identify the file
-+     concerned even when multiple instances of readelf are running.  */
-+  name = xmalloc (strlen (program_name) + strlen (file_name) + 3);
-+  sprintf (name, "%s: %s", program_name, file_name);
-+  saved_program_name = program_name;
-+  program_name = name;
- 
-   if (stat (file_name, &statbuf) < 0)
-     {
-       if (errno == ENOENT)
--	error (_("'%s': No such file\n"), file_name);
-+	error (_("No such file\n"));
-       else
--	error (_("Could not locate '%s'.  System error message: %s\n"),
--	       file_name, strerror (errno));
--      return false;
-+	error (_("Could not locate file.  System error message: %s\n"),
-+	       strerror (errno));
-+      goto done;
-     }
- 
-   if (! S_ISREG (statbuf.st_mode))
-     {
--      error (_("'%s' is not an ordinary file\n"), file_name);
--      return false;
-+      error (_("Not an ordinary file\n"));
-+      goto done;
-     }
- 
-   filedata = calloc (1, sizeof * filedata);
-   if (filedata == NULL)
-     {
-       error (_("Out of memory allocating file data structure\n"));
--      return false;
-+      goto done;
-     }
- 
-   filedata->file_name = file_name;
-   filedata->handle = fopen (file_name, "rb");
-   if (filedata->handle == NULL)
-     {
--      error (_("Input file '%s' is not readable.\n"), file_name);
--      free (filedata);
--      return false;
-+      error (_("Not readable\n"));
-+      goto done;
-     }
- 
-   if (fread (armag, SARMAG, 1, filedata->handle) != 1)
-     {
--      error (_("%s: Failed to read file's magic number\n"), file_name);
--      fclose (filedata->handle);
--      free (filedata);
--      return false;
-+      error (_("Failed to read file's magic number\n"));
-+      goto done;
-     }
- 
-   filedata->file_size = statbuf.st_size;
-@@ -22905,33 +22912,39 @@ process_file (char * file_name)
- 
-   if (memcmp (armag, ARMAG, SARMAG) == 0)
-     {
--      if (! process_archive (filedata, false))
--	ret = false;
-+      if (process_archive (filedata, false))
-+	ret = true;
-     }
-   else if (memcmp (armag, ARMAGT, SARMAG) == 0)
-     {
--      if ( ! process_archive (filedata, true))
--	ret = false;
-+      if (process_archive (filedata, true))
-+	ret = true;
-     }
-   else
-     {
-       if (do_archive_index && !check_all)
--	error (_("File %s is not an archive so its index cannot be displayed.\n"),
--	       file_name);
-+	error (_("Not an archive so its index cannot be displayed.\n"));
- 
-       rewind (filedata->handle);
-       filedata->archive_file_size = filedata->archive_file_offset = 0;
- 
--      if (! process_object (filedata))
--	ret = false;
-+      if (process_object (filedata))
-+	ret = true;
-     }
- 
--  fclose (filedata->handle);
--  free (filedata->section_headers);
--  free (filedata->program_headers);
--  free (filedata->string_table);
--  free (filedata->dump.dump_sects);
--  free (filedata);
-+ done:
-+  if (filedata)
-+    {
-+      if (filedata->handle != NULL)
-+	fclose (filedata->handle);
-+      free (filedata->section_headers);
-+      free (filedata->program_headers);
-+      free (filedata->string_table);
-+      free (filedata->dump.dump_sects);
-+      free (filedata);
-+    }
-+  free (program_name);
-+  program_name = saved_program_name;
- 
-   free (ba_cache.strtab);
-   ba_cache.strtab = NULL;
-Only in binutils-2.40/binutils: readelf.c.orig
diff --git a/binutils-fix-testsuite-failures.patch b/binutils-fix-testsuite-failures.patch
deleted file mode 100644
index c2b19a5..0000000
--- a/binutils-fix-testsuite-failures.patch
+++ /dev/null
@@ -1,330 +0,0 @@
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-10.d binutils-2.32/ld/testsuite/ld-plugin/plugin-10.d
---- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-10.d	2019-02-15 13:33:21.979627285 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-10.d	2019-02-15 13:40:26.911199033 +0000
-@@ -34,5 +34,6 @@ hook called: claim_file tmpdir/libtext.a
- hook called: all symbols read.
- Sym: '_?func' Resolution: LDPR_PREVAILING_DEF
- Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY
-+#...
- hook called: cleanup.
- #...
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-13.d binutils-2.32/ld/testsuite/ld-plugin/plugin-13.d
---- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-13.d	2019-02-15 13:33:21.980627277 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-13.d	2019-02-15 13:41:30.189692800 +0000
-@@ -23,5 +23,3 @@ hook called: claim_file tmpdir/main.o \[
- hook called: claim_file .*/ld/testsuite/ld-plugin/func.c \[@0/.* CLAIMED
- hook called: claim_file tmpdir/text.o \[@0/.* not claimed
- #...
--.*main.c.*: undefined reference to `\.?func'
--#...
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-14.d binutils-2.32/ld/testsuite/ld-plugin/plugin-14.d
---- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-14.d	2019-02-15 13:33:21.977627301 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-14.d	2019-02-15 13:42:03.598430960 +0000
-@@ -27,7 +27,6 @@ hook called: claim_file .*/ld/testsuite/
- hook called: claim_file tmpdir/text.o \[@0/.* not claimed
- #...
- hook called: all symbols read.
--.*: tmpdir/main.o: in function `main':
--.*main.c.*: undefined reference to `\.?func'
-+#...
- hook called: cleanup.
- #...
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-15.d binutils-2.32/ld/testsuite/ld-plugin/plugin-15.d
---- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-15.d	2019-02-15 13:33:21.980627277 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-15.d	2019-02-15 13:42:28.014239600 +0000
-@@ -28,7 +28,6 @@ hook called: claim_file .*/ld/testsuite/
- hook called: claim_file tmpdir/text.o \[@0/.* not claimed
- #...
- hook called: all symbols read.
--.*: tmpdir/main.o: in function `main':
--.*main.c.*: undefined reference to `\.?func'
-+#...
- hook called: cleanup.
- #...
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-16.d binutils-2.32/ld/testsuite/ld-plugin/plugin-16.d
---- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-16.d	2019-02-15 13:33:21.977627301 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-16.d	2019-02-15 13:43:21.309821910 +0000
-@@ -30,9 +30,8 @@ hook called: claim_file .*/ld/testsuite/
- hook called: claim_file tmpdir/text.o \[@0/.* not claimed
- #...
- hook called: all symbols read.
--Sym: '_?func' Resolution: LDPR_PREVAILING_DEF
-+Sym: '_?func' Resolution: LDPR_PREVAILING_DEF_IRONLY
- Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY
--.*: tmpdir/main.o: in function `main':
--.*main.c.*: undefined reference to `\.?func'
-+#...
- hook called: cleanup.
- #...
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-17.d binutils-2.32/ld/testsuite/ld-plugin/plugin-17.d
---- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-17.d	2019-02-15 13:33:21.977627301 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-17.d	2019-02-15 13:43:54.925558451 +0000
-@@ -31,7 +31,8 @@ hook called: claim_file .*/ld/testsuite/
- hook called: claim_file tmpdir/text.o \[@0/.* not claimed
- #...
- hook called: all symbols read.
--Sym: '_?func' Resolution: LDPR_PREVAILING_DEF
-+Sym: '_?func' Resolution: LDPR_PREVAILING_DEF_IRONLY
- Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY
-+#...
- hook called: cleanup.
- #...
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-20.d binutils-2.32/ld/testsuite/ld-plugin/plugin-20.d
---- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-20.d	2019-02-15 13:33:21.980627277 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-20.d	2019-02-15 13:49:20.091010016 +0000
-@@ -2,6 +2,5 @@ hook called: all symbols read.
- Input: func.c \(tmpdir/libfunc.a\)
- Sym: '_?func' Resolution: LDPR_PREVAILING_DEF.*
- Sym: '_?func' Resolution: LDPR_PREVAILING_DEF.*
--.*: tmpdir/main.o: in function `main':
--.*main.c.*: undefined reference to `\.?func'
-+#...
- hook called: cleanup.
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-21.d binutils-2.32/ld/testsuite/ld-plugin/plugin-21.d
---- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-21.d	2019-02-15 13:33:21.978627293 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-21.d	2019-02-15 13:49:34.506897033 +0000
-@@ -2,6 +2,5 @@ hook called: all symbols read.
- Input: .*/ld/testsuite/ld-plugin/func.c \(.*/ld/testsuite/ld-plugin/func.c\)
- Sym: '_?func' Resolution: LDPR_PREVAILING_DEF.*
- Sym: '_?func' Resolution: LDPR_PREVAILING_DEF.*
--.*: tmpdir/main.o: in function `main':
--.*main.c.*: undefined reference to `\.?func'
-+#...
- hook called: cleanup.
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-22.d binutils-2.32/ld/testsuite/ld-plugin/plugin-22.d
---- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-22.d	2019-02-15 13:33:21.980627277 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-22.d	2019-02-15 13:50:00.409694022 +0000
-@@ -2,6 +2,5 @@ Claimed: tmpdir/libfunc.a \[@.*
- hook called: all symbols read.
- Sym: '_?func' Resolution: LDPR_PREVAILING_DEF.*
- Sym: '_?func' Resolution: LDPR_PREVAILING_DEF.*
--.*: tmpdir/main.o: in function `main':
--.*main.c.*: undefined reference to `\.?func'
-+#...
- hook called: cleanup.
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-23.d binutils-2.32/ld/testsuite/ld-plugin/plugin-23.d
---- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-23.d	2019-02-15 13:33:21.979627285 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-23.d	2019-02-15 13:50:14.938580156 +0000
-@@ -2,6 +2,5 @@ Claimed: .*/ld/testsuite/ld-plugin/func.
- hook called: all symbols read.
- Sym: '_?func' Resolution: LDPR_PREVAILING_DEF.*
- Sym: '_?func' Resolution: LDPR_PREVAILING_DEF.*
--.*: tmpdir/main.o: in function `main':
--.*main.c.*: undefined reference to `\.?func'
-+#...
- hook called: cleanup.
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-24.d binutils-2.32/ld/testsuite/ld-plugin/plugin-24.d
---- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-24.d	2019-02-15 13:33:21.980627277 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-24.d	2019-02-15 13:49:46.346804240 +0000
-@@ -2,4 +2,5 @@ hook called: all symbols read.
- Input: .*/ld/testsuite/ld-plugin/func.c \(.*/ld/testsuite/ld-plugin/func.c\)
- Sym: '_?func' Resolution: LDPR_PREVAILING_DEF.*
- Sym: '_?func' Resolution: LDPR_PREVAILING_DEF.*
-+#...
- hook called: cleanup.
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-25.d binutils-2.32/ld/testsuite/ld-plugin/plugin-25.d
---- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-25.d	2019-02-15 13:33:21.978627293 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-25.d	2019-02-15 13:50:29.322467422 +0000
-@@ -2,4 +2,5 @@ Claimed: .*/ld/testsuite/ld-plugin/func.
- hook called: all symbols read.
- Sym: '_?func' Resolution: LDPR_PREVAILING_DEF.*
- Sym: '_?func' Resolution: LDPR_PREVAILING_DEF.*
-+#...
- hook called: cleanup.
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-28.d binutils-2.32/ld/testsuite/ld-plugin/plugin-28.d
---- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-28.d	2019-02-15 13:33:21.977627301 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-28.d	2019-02-15 13:45:05.343006557 +0000
-@@ -1 +1,3 @@
- .*: error: Error
-+#...
-+
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-29.d binutils-2.32/ld/testsuite/ld-plugin/plugin-29.d
---- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-29.d	2019-02-15 13:33:21.978627293 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-29.d	2019-02-15 13:45:22.764870016 +0000
-@@ -1 +1,2 @@
- .*: warning: Warning
-+#...
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-30.d binutils-2.32/ld/testsuite/ld-plugin/plugin-30.d
---- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-30.d	2019-02-15 13:33:21.976627309 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-30.d	2019-02-15 13:48:57.067190464 +0000
-@@ -24,3 +24,4 @@ hook called: claim_file tmpdir/main.o \[
- hook called: claim_file tmpdir/func.o \[@0/.* not claimed
- hook called: claim_file tmpdir/text.o \[@0/.* not claimed
- hook called: claim_file tmpdir/libempty.a \[@.* not claimed
-+#pass
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-6.d binutils-2.32/ld/testsuite/ld-plugin/plugin-6.d
---- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-6.d	2019-02-15 13:33:21.979627285 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-6.d	2019-02-15 13:37:14.672749977 +0000
-@@ -27,7 +27,6 @@ hook called: claim_file tmpdir/func.o \[
- hook called: claim_file tmpdir/text.o \[@0/.* not claimed
- #...
- hook called: all symbols read.
--.*: tmpdir/main.o: in function `main':
--.*main.c.*: undefined reference to `\.?func'
-+#...
- hook called: cleanup.
- #...
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-7.d binutils-2.32/ld/testsuite/ld-plugin/plugin-7.d
---- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-7.d	2019-02-15 13:33:21.977627301 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-7.d	2019-02-15 13:37:58.000400421 +0000
-@@ -28,7 +28,6 @@ hook called: claim_file tmpdir/func.o \[
- hook called: claim_file tmpdir/text.o \[@0/.* not claimed
- #...
- hook called: all symbols read.
--.*: tmpdir/main.o: in function `main':
--.*main.c.*: undefined reference to `\.?func'
-+#...
- hook called: cleanup.
- #...
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-8.d binutils-2.32/ld/testsuite/ld-plugin/plugin-8.d
---- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-8.d	2019-02-15 13:33:21.980627277 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-8.d	2019-02-15 13:38:34.096109209 +0000
-@@ -32,7 +32,6 @@ hook called: claim_file tmpdir/text.o \[
- hook called: all symbols read.
- Sym: '_?func' Resolution: LDPR_PREVAILING_DEF
- Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY
--.*: tmpdir/main.o: in function `main':
--.*main.c.*: undefined reference to `\.?func'
-+#...
- hook called: cleanup.
- #...
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-9.d binutils-2.32/ld/testsuite/ld-plugin/plugin-9.d
---- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-9.d	2019-02-15 13:33:21.977627301 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-9.d	2019-02-15 13:39:52.655475403 +0000
-@@ -31,7 +31,8 @@ hook called: claim_file tmpdir/func.o \[
- hook called: claim_file tmpdir/text.o \[@0/.* not claimed
- #...
- hook called: all symbols read.
--Sym: '_?func' Resolution: LDPR_PREVAILING_DEF
-+Sym: '_?func' Resolution: LDPR_PREVAILING_DEF_IRONLY
- Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY
-+#...
- hook called: cleanup.
- #...
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/pr20070.d binutils-2.32/ld/testsuite/ld-plugin/pr20070.d
---- binutils-2.32.orig/ld/testsuite/ld-plugin/pr20070.d	2019-02-15 13:33:21.976627309 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/pr20070.d	2019-02-15 13:50:56.874251486 +0000
-@@ -5,5 +5,6 @@ Sym: 'weakdef' Resolution: LDPR_PREVAILI
- Sym: 'undef' Resolution: LDPR_UNDEF
- Sym: 'weakundef' Resolution: LDPR_UNDEF
- Sym: 'common' Resolution: LDPR_PREVAILING_DEF_IRONLY
-+#...
- hook called: cleanup.
- #...
-diff -rup binutils-2.32.orig/ld/testsuite/ld-srec/srec.exp binutils-2.32/ld/testsuite/ld-srec/srec.exp
---- binutils-2.32.orig/ld/testsuite/ld-srec/srec.exp	2019-02-15 13:33:21.938627615 +0000
-+++ binutils-2.32/ld/testsuite/ld-srec/srec.exp	2019-02-15 13:53:58.744814006 +0000
-@@ -21,6 +21,8 @@
- 
- # Get the offset from an S-record line to the start of the data.
- 
-+return
-+
- proc srec_off { l } {
-     if [string match "S1*" $l] {
- 	return 8
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-10.d binutils-2.32/ld/testsuite/ld-plugin/plugin-10.d
---- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-10.d	2019-02-15 14:10:59.038709514 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-10.d	2019-02-15 14:13:53.532300721 +0000
-@@ -32,7 +32,7 @@ hook called: claim_file tmpdir/func.o \[
- hook called: claim_file tmpdir/libtext.a \[@.* not claimed
- #...
- hook called: all symbols read.
--Sym: '_?func' Resolution: LDPR_PREVAILING_DEF
-+Sym: '_?func' Resolution: LDPR_PREVAILING_DEF_IRONLY
- Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY
- #...
- hook called: cleanup.
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-11.d binutils-2.32/ld/testsuite/ld-plugin/plugin-11.d
---- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-11.d	2019-02-15 14:10:59.041709490 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-11.d	2019-02-15 14:14:50.061844322 +0000
-@@ -35,8 +35,9 @@ hook called: claim_file tmpdir/func.o \[
- hook called: claim_file tmpdir/libtext.a \[@.* CLAIMED
- #...
- hook called: all symbols read.
--Sym: '_?func' Resolution: LDPR_PREVAILING_DEF
-+Sym: '_?func' Resolution: LDPR_PREVAILING_DEF_IRONLY
- Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY
--Sym: '_?text' Resolution: LDPR_PREVAILING_DEF
-+Sym: '_?text' Resolution: LDPR_PREVAILING_DEF_IRONLY
-+#...
- hook called: cleanup.
- #...
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-18.d binutils-2.32/ld/testsuite/ld-plugin/plugin-18.d
---- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-18.d	2019-02-15 14:10:58.942710289 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-18.d	2019-02-15 14:15:20.030602369 +0000
-@@ -32,7 +32,8 @@ hook called: claim_file .*/ld/testsuite/
- hook called: claim_file tmpdir/libtext.a \[@.* not claimed
- #...
- hook called: all symbols read.
--Sym: '_?func' Resolution: LDPR_PREVAILING_DEF
-+Sym: '_?func' Resolution: LDPR_PREVAILING_DEF_IRONLY
- Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY
-+#...
- hook called: cleanup.
- #...
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-19.d binutils-2.32/ld/testsuite/ld-plugin/plugin-19.d
---- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-19.d	2019-02-15 14:10:59.024709627 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-19.d	2019-02-15 14:15:54.926320633 +0000
-@@ -35,8 +35,9 @@ hook called: claim_file .*/ld/testsuite/
- hook called: claim_file tmpdir/libtext.a \[@.* CLAIMED
- #...
- hook called: all symbols read.
--Sym: '_?func' Resolution: LDPR_PREVAILING_DEF
-+Sym: '_?func' Resolution: LDPR_PREVAILING_DEF_IRONLY
- Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY
--Sym: '_?text' Resolution: LDPR_PREVAILING_DEF
-+Sym: '_?text' Resolution: LDPR_PREVAILING_DEF_IRONLY
-+#...
- hook called: cleanup.
- #...
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-28.d binutils-2.32/ld/testsuite/ld-plugin/plugin-28.d
---- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-28.d	2019-02-15 14:10:58.998709837 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-28.d	2019-02-15 14:12:19.856057024 +0000
-@@ -1,3 +1,2 @@
- .*: error: Error
- #...
--
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-8.d binutils-2.32/ld/testsuite/ld-plugin/plugin-8.d
---- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-8.d	2019-02-15 14:10:59.074709224 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-8.d	2019-02-15 14:11:48.144313048 +0000
-@@ -30,7 +30,7 @@ hook called: claim_file tmpdir/func.o \[
- hook called: claim_file tmpdir/text.o \[@0/.* not claimed
- #...
- hook called: all symbols read.
--Sym: '_?func' Resolution: LDPR_PREVAILING_DEF
-+Sym: '_?func' Resolution: LDPR_PREVAILING_DEF_IRONLY
- Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY
- #...
- hook called: cleanup.
-diff -rup binutils.orig/ld/testsuite/ld-elfvers/vers24.rd binutils-2.30/ld/testsuite/ld-elfvers/vers24.rd
---- binutils.orig/ld/testsuite/ld-elfvers/vers24.rd	2018-09-05 09:45:44.013108697 +0100
-+++ binutils-2.30/ld/testsuite/ld-elfvers/vers24.rd	2018-09-05 12:06:17.287425232 +0100
-@@ -7,9 +7,9 @@ Symbol table '.dynsym' contains [0-9]+ e
- # And ensure the dynamic symbol table contains at least x@VERS.0
- # and foo@@VERS.0 symbols
- #...
-- +[0-9]+: [0-9a-f]+ +(4 +OBJECT +GLOBAL +DEFAULT +[0-9]+ _?x|[0-9]+ +FUNC +GLOBAL +DEFAULT .* [0-9]+ _?foo@)@VERS\.0
-+ +[0-9]+: [0-9a-f]+ +(4 +OBJECT +GLOBAL +DEFAULT +[0-9]+ _?x|[0-9]+ +FUNC +GLOBAL +DEFAULT .* [0-9]+ _?foo@)@VERS\.0.*
- #...
-- +[0-9]+: [0-9a-f]+ +(4 +OBJECT +GLOBAL +DEFAULT +[0-9]+ _?x|[0-9]+ +FUNC +GLOBAL +DEFAULT .* [0-9]+ _?foo@)@VERS\.0
-+ +[0-9]+: [0-9a-f]+ +(4 +OBJECT +GLOBAL +DEFAULT +[0-9]+ _?x|[0-9]+ +FUNC +GLOBAL +DEFAULT .* [0-9]+ _?foo@)@VERS\.0.*
- #...
- Symbol table '.symtab' contains [0-9]+ entries:
- #pass
-diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin.exp binutils-2.30/ld/testsuite/ld-plugin/plugin.exp
---- binutils.orig/ld/testsuite/ld-plugin/plugin.exp	2018-09-05 09:45:44.023108605 +0100
-+++ binutils-2.30/ld/testsuite/ld-plugin/plugin.exp	2018-09-05 11:18:53.997202105 +0100
-@@ -118,6 +118,12 @@ if { $can_compile && !$failed_compile }
-     }
- }
- 
-+# I do not know why, but the underscore prefix test is going
-+# wrong on ppc64le targets.  So override it here.
-+if { [istarget powerpc*-*-linux*] || [istarget x86_64*-*-linux*] } {
-+    set _ ""
-+}
-+
- set testobjfiles "tmpdir/main.o tmpdir/func.o tmpdir/text.o"
- set testobjfiles_notext "tmpdir/main.o tmpdir/func.o"
- set testsrcfiles "tmpdir/main.o $srcdir/$subdir/func.c tmpdir/text.o"
diff --git a/binutils-gcc-10-fixes.patch b/binutils-gcc-10-fixes.patch
deleted file mode 100644
index 4233279..0000000
--- a/binutils-gcc-10-fixes.patch
+++ /dev/null
@@ -1,180 +0,0 @@
-diff -rup binutils.orig/gold/gdb-index.cc binutils-2.34.0/gold/gdb-index.cc
---- binutils.orig/gold/gdb-index.cc	2020-07-24 09:12:29.241306445 +0100
-+++ binutils-2.34.0/gold/gdb-index.cc	2020-07-24 09:15:48.332095898 +0100
-@@ -817,7 +817,7 @@ Gdb_index_info_reader::get_qualified_nam
- void
- Gdb_index_info_reader::record_cu_ranges(Dwarf_die* die)
- {
--  unsigned int shndx;
-+  unsigned int shndx = 0;
-   unsigned int shndx2;
- 
-   off_t ranges_offset = die->ref_attribute(elfcpp::DW_AT_ranges, &shndx);
-diff -rup binutils.orig/gold/layout.cc binutils-2.34.0/gold/layout.cc
---- binutils.orig/gold/layout.cc	2020-07-24 09:12:29.243306433 +0100
-+++ binutils-2.34.0/gold/layout.cc	2020-07-24 09:15:11.464320064 +0100
-@@ -1986,7 +1986,7 @@ Layout::attach_allocated_section_to_segm
-   seg_flags |= os->extra_segment_flags();
- 
-   // Check for --section-start.
--  uint64_t addr;
-+  uint64_t addr = 0;
-   bool is_address_set = parameters->options().section_start(os->name(), &addr);
- 
-   // In general the only thing we really care about for PT_LOAD
-diff -rup binutils.orig/binutils/dlltool.c binutils-2.34.0/binutils/dlltool.c
---- binutils.orig/binutils/dlltool.c	2020-07-24 09:12:28.974308069 +0100
-+++ binutils-2.34.0/binutils/dlltool.c	2020-07-24 12:09:37.527121295 +0100
-@@ -1305,7 +1305,7 @@ run (const char *what, char *args)
-   int pid, wait_status;
-   int i;
-   const char **argv;
--  char *errmsg_fmt, *errmsg_arg;
-+  char *errmsg_fmt = "", *errmsg_arg = "";
-   char *temp_base = choose_temp_base ();
- 
-   inform (_("run: %s %s"), what, args);
-diff -rup binutils.orig/gas/config/tc-arm.c binutils-2.34.0/gas/config/tc-arm.c
---- binutils.orig/gas/config/tc-arm.c	2020-07-24 09:12:32.368287432 +0100
-+++ binutils-2.34.0/gas/config/tc-arm.c	2020-07-24 12:14:19.842360634 +0100
-@@ -28416,9 +28416,12 @@ md_apply_fix (fixS *	fixP,
- 	 perform relaxation.  */
-       if (value == -2)
- 	{
--	  newval = md_chars_to_number (buf, THUMB_SIZE);
--	  newval = 0xbf00; /* NOP encoding T1 */
--	  md_number_to_chars (buf, newval, THUMB_SIZE);
-+	  if (fixP->fx_done || !seg->use_rela_p)
-+	    {
-+	      newval = md_chars_to_number (buf, THUMB_SIZE);
-+	      newval = 0xbf00; /* NOP encoding T1 */
-+	      md_number_to_chars (buf, newval, THUMB_SIZE);
-+	    }
- 	}
-       else
- 	{
-@@ -28631,17 +28634,14 @@ md_apply_fix (fixS *	fixP,
-     case BFD_RELOC_ARM_GOTFUNCDESC:
-     case BFD_RELOC_ARM_GOTOFFFUNCDESC:
-     case BFD_RELOC_ARM_FUNCDESC:
--      if (arm_fdpic)
--	{
--	  if (fixP->fx_done || !seg->use_rela_p)
--	    md_number_to_chars (buf, 0, 4);
--	}
--      else
-+      if (!arm_fdpic)
- 	{
- 	  as_bad_where (fixP->fx_file, fixP->fx_line,
- 			_("Relocation supported only in FDPIC mode"));
--      }
--      break;
-+	  break;
-+	}
-+      value = 0;
-+      /* Fall through.  */
- #endif
- 
-     case BFD_RELOC_RVA:
-diff -rup binutils.orig/gas/config/tc-arm.c binutils-2.34.0/gas/config/tc-arm.c
---- binutils.orig/gas/config/tc-arm.c	2020-07-24 12:16:02.099719884 +0100
-+++ binutils-2.34.0/gas/config/tc-arm.c	2020-07-24 12:34:17.690858328 +0100
-@@ -28641,7 +28641,7 @@ md_apply_fix (fixS *	fixP,
- 	  break;
- 	}
-       value = 0;
--      /* Fall through.  */
-+      goto fred;
- #endif
- 
-     case BFD_RELOC_RVA:
-@@ -28653,6 +28653,7 @@ md_apply_fix (fixS *	fixP,
- #ifdef TE_PE
-     case BFD_RELOC_32_SECREL:
- #endif
-+    fred:
-       if (fixP->fx_done || !seg->use_rela_p)
- #ifdef TE_WINCE
- 	/* For WinCE we only do this for pcrel fixups.  */
-diff -rup binutils.orig/gas/config/tc-arm.c binutils-2.34.0/gas/config/tc-arm.c
---- binutils.orig/gas/config/tc-arm.c	2020-07-24 13:28:26.926553452 +0100
-+++ binutils-2.34.0/gas/config/tc-arm.c	2020-07-24 13:31:57.835215763 +0100
-@@ -28416,12 +28416,8 @@ md_apply_fix (fixS *	fixP,
- 	 perform relaxation.  */
-       if (value == -2)
- 	{
--	  if (fixP->fx_done || !seg->use_rela_p)
--	    {
--	      newval = md_chars_to_number (buf, THUMB_SIZE);
--	      newval = 0xbf00; /* NOP encoding T1 */
--	      md_number_to_chars (buf, newval, THUMB_SIZE);
--	    }
-+	  newval = 0xbf00; /* NOP encoding T1 */
-+	  goto jim;
- 	}
-       else
- 	{
-@@ -28432,6 +28428,7 @@ md_apply_fix (fixS *	fixP,
- 	    {
- 	      newval = md_chars_to_number (buf, THUMB_SIZE);
- 	      newval |= ((value & 0x3e) << 2) | ((value & 0x40) << 3);
-+	    jim:
- 	      md_number_to_chars (buf, newval, THUMB_SIZE);
- 	    }
- 	}
-diff -rup binutils.orig/binutils/mclex.c binutils-2.34.0/binutils/mclex.c
---- binutils.orig/binutils/mclex.c	2020-07-24 13:28:26.297557441 +0100
-+++ binutils-2.34.0/binutils/mclex.c	2020-07-24 14:46:53.587940149 +0100
-@@ -207,7 +207,7 @@ enum_severity (int e)
- static void
- mc_add_keyword_ascii (const char *sz, int rid, const char *grp, rc_uint_type nv, const char *sv)
- {
--  unichar *usz, *usv = NULL;
-+  unichar *usz = NULL, *usv = NULL;
-   rc_uint_type usz_len;
- 
-   unicode_from_codepage (&usz_len, &usz, sz, CP_ACP);
-diff -rup binutils.orig/binutils/windmc.c binutils-2.34.0/binutils/windmc.c
---- binutils.orig/binutils/windmc.c	2020-07-24 13:28:26.279557556 +0100
-+++ binutils-2.34.0/binutils/windmc.c	2020-07-24 14:48:05.460477478 +0100
-@@ -338,7 +338,7 @@ mc_add_node_lang (mc_node *root, const m
- static char *
- convert_unicode_to_ACP (const unichar *usz)
- {
--  char *s;
-+  char *s = NULL;
-   rc_uint_type l;
- 
-   if (! usz)
-@@ -607,10 +607,10 @@ mc_generate_bin_item (mc_node_lang *n, r
-   else
-     {
-       rc_uint_type txt_len, l;
--      char *cvt_txt;
-+      char *cvt_txt = NULL;
- 
-       codepage_from_unicode( &l, n->message, &cvt_txt, n->lang->lang_info.wincp);
--      if (! cvt_txt)
-+      if (cvt_txt == NULL)
- 	fatal ("Failed to convert message to language codepage.\n");
-       txt_len = strlen (cvt_txt);
-       if (mcset_automatic_null_termination && txt_len > 0)
-@@ -1107,7 +1107,7 @@ main (int argc, char **argv)
- 
-   /* Load the input file and do code page transformations to UTF16.  */
-   {
--    unichar *u;
-+    unichar *u = NULL;
-     rc_uint_type ul;
-     char *buff;
-     bfd_size_type flen;
---- binutils.orig/binutils/srconv.c	2020-07-24 15:37:25.847459208 +0100
-+++ binutils-2.34.0/binutils/srconv.c	2020-07-24 15:39:12.853773423 +0100
-@@ -316,6 +316,7 @@ wr_hd (struct coff_ofile *p)
-   struct IT_hd hd;
- 
-   hd.spare1 = 0;
-+  hd.spare2 = 0;
-   if (bfd_get_file_flags (abfd) & EXEC_P)
-     hd.mt = MTYPE_ABS_LM;
-   else
diff --git a/binutils-gold-i386-gnu-property-notes.patch b/binutils-gold-i386-gnu-property-notes.patch
deleted file mode 100644
index 7831bf7..0000000
--- a/binutils-gold-i386-gnu-property-notes.patch
+++ /dev/null
@@ -1,193 +0,0 @@
-diff --git a/gold/i386.cc b/gold/i386.cc
-index bf209fe9a86..31161ff091c 100644
---- a/gold/i386.cc
-+++ b/gold/i386.cc
-@@ -360,7 +360,11 @@ class Target_i386 : public Sized_target<32, false>
-       got_(NULL), plt_(NULL), got_plt_(NULL), got_irelative_(NULL),
-       got_tlsdesc_(NULL), global_offset_table_(NULL), rel_dyn_(NULL),
-       rel_irelative_(NULL), copy_relocs_(elfcpp::R_386_COPY),
--      got_mod_index_offset_(-1U), tls_base_symbol_defined_(false)
-+      got_mod_index_offset_(-1U), tls_base_symbol_defined_(false),
-+      isa_1_used_(0), isa_1_needed_(0),
-+      feature_1_(0), feature_2_used_(0), feature_2_needed_(0),
-+      object_isa_1_used_(0), object_feature_1_(0),
-+      object_feature_2_used_(0), seen_first_object_(false)
-   { }
- 
-   // Process the relocations to determine unreferenced sections for
-@@ -859,6 +863,21 @@ class Target_i386 : public Sized_target<32, false>
- 				  this->rel_dyn_section(layout));
-   }
- 
-+  // Record a target-specific program property in the .note.gnu.property
-+  // section.
-+  void
-+  record_gnu_property(unsigned int, unsigned int, size_t,
-+		      const unsigned char*, const Object*);
-+
-+  // Merge the target-specific program properties from the current object.
-+  void
-+  merge_gnu_properties(const Object*);
-+
-+  // Finalize the target-specific program properties and add them back to
-+  // the layout.
-+  void
-+  do_finalize_gnu_properties(Layout*) const;
-+
-   // Information about this specific target which we pass to the
-   // general Target structure.
-   static const Target::Target_info i386_info;
-@@ -898,6 +917,26 @@ class Target_i386 : public Sized_target<32, false>
-   unsigned int got_mod_index_offset_;
-   // True if the _TLS_MODULE_BASE_ symbol has been defined.
-   bool tls_base_symbol_defined_;
-+
-+  // Target-specific program properties, from .note.gnu.property section.
-+  // Each bit represents a specific feature.
-+  uint32_t isa_1_used_;
-+  uint32_t isa_1_needed_;
-+  uint32_t feature_1_;
-+  uint32_t feature_2_used_;
-+  uint32_t feature_2_needed_;
-+  // Target-specific properties from the current object.
-+  // These bits get ORed into ISA_1_USED_ after all properties for the object
-+  // have been processed. But if either is all zeroes (as when the property
-+  // is absent from an object), the result should be all zeroes.
-+  // (See PR ld/23486.)
-+  uint32_t object_isa_1_used_;
-+  // These bits get ANDed into FEATURE_1_ after all properties for the object
-+  // have been processed.
-+  uint32_t object_feature_1_;
-+  uint32_t object_feature_2_used_;
-+  // Whether we have seen our first object, for use in initializing FEATURE_1_.
-+  bool seen_first_object_;
- };
- 
- const Target::Target_info Target_i386::i386_info =
-@@ -1042,6 +1081,126 @@ Target_i386::rel_irelative_section(Layout* layout)
-   return this->rel_irelative_;
- }
- 
-+// Record a target-specific program property from the .note.gnu.property
-+// section.
-+void
-+Target_i386::record_gnu_property(
-+    unsigned int, unsigned int pr_type,
-+    size_t pr_datasz, const unsigned char* pr_data,
-+    const Object* object)
-+{
-+  uint32_t val = 0;
-+
-+  switch (pr_type)
-+    {
-+    case elfcpp::GNU_PROPERTY_X86_COMPAT_ISA_1_USED:
-+    case elfcpp::GNU_PROPERTY_X86_COMPAT_ISA_1_NEEDED:
-+    case elfcpp::GNU_PROPERTY_X86_COMPAT_2_ISA_1_USED:
-+    case elfcpp::GNU_PROPERTY_X86_COMPAT_2_ISA_1_NEEDED:
-+    case elfcpp::GNU_PROPERTY_X86_ISA_1_USED:
-+    case elfcpp::GNU_PROPERTY_X86_ISA_1_NEEDED:
-+    case elfcpp::GNU_PROPERTY_X86_FEATURE_1_AND:
-+    case elfcpp::GNU_PROPERTY_X86_FEATURE_2_USED:
-+    case elfcpp::GNU_PROPERTY_X86_FEATURE_2_NEEDED:
-+      if (pr_datasz != 4)
-+	{
-+	  gold_warning(_("%s: corrupt .note.gnu.property section "
-+			 "(pr_datasz for property %d is not 4)"),
-+		       object->name().c_str(), pr_type);
-+	  return;
-+	}
-+      val = elfcpp::Swap<32, false>::readval(pr_data);
-+      break;
-+    default:
-+      gold_warning(_("%s: unknown program property type 0x%x "
-+		     "in .note.gnu.property section"),
-+		   object->name().c_str(), pr_type);
-+      break;
-+    }
-+
-+  switch (pr_type)
-+    {
-+    case elfcpp::GNU_PROPERTY_X86_ISA_1_USED:
-+      this->object_isa_1_used_ |= val;
-+      break;
-+    case elfcpp::GNU_PROPERTY_X86_ISA_1_NEEDED:
-+      this->isa_1_needed_ |= val;
-+      break;
-+    case elfcpp::GNU_PROPERTY_X86_FEATURE_1_AND:
-+      // If we see multiple feature props in one object, OR them together.
-+      this->object_feature_1_ |= val;
-+      break;
-+    case elfcpp::GNU_PROPERTY_X86_FEATURE_2_USED:
-+      this->object_feature_2_used_ |= val;
-+      break;
-+    case elfcpp::GNU_PROPERTY_X86_FEATURE_2_NEEDED:
-+      this->feature_2_needed_ |= val;
-+      break;
-+    }
-+}
-+
-+// Merge the target-specific program properties from the current object.
-+void
-+Target_i386::merge_gnu_properties(const Object*)
-+{
-+  if (this->seen_first_object_)
-+    {
-+      // If any object is missing the ISA_1_USED property, we must omit
-+      // it from the output file.
-+      if (this->object_isa_1_used_ == 0)
-+	this->isa_1_used_ = 0;
-+      else if (this->isa_1_used_ != 0)
-+	this->isa_1_used_ |= this->object_isa_1_used_;
-+      this->feature_1_ &= this->object_feature_1_;
-+      // If any object is missing the FEATURE_2_USED property, we must
-+      // omit it from the output file.
-+      if (this->object_feature_2_used_ == 0)
-+	this->feature_2_used_ = 0;
-+      else if (this->feature_2_used_ != 0)
-+	this->feature_2_used_ |= this->object_feature_2_used_;
-+    }
-+  else
-+    {
-+      this->isa_1_used_ = this->object_isa_1_used_;
-+      this->feature_1_ = this->object_feature_1_;
-+      this->feature_2_used_ = this->object_feature_2_used_;
-+      this->seen_first_object_ = true;
-+    }
-+  this->object_isa_1_used_ = 0;
-+  this->object_feature_1_ = 0;
-+  this->object_feature_2_used_ = 0;
-+}
-+
-+static inline void
-+add_property(Layout* layout, unsigned int pr_type, uint32_t val)
-+{
-+  unsigned char buf[4];
-+  elfcpp::Swap<32, false>::writeval(buf, val);
-+  layout->add_gnu_property(elfcpp::NT_GNU_PROPERTY_TYPE_0, pr_type, 4, buf);
-+}
-+
-+// Finalize the target-specific program properties and add them back to
-+// the layout.
-+void
-+Target_i386::do_finalize_gnu_properties(Layout* layout) const
-+{
-+  if (this->isa_1_used_ != 0)
-+    add_property(layout, elfcpp::GNU_PROPERTY_X86_ISA_1_USED,
-+		 this->isa_1_used_);
-+  if (this->isa_1_needed_ != 0)
-+    add_property(layout, elfcpp::GNU_PROPERTY_X86_ISA_1_NEEDED,
-+		 this->isa_1_needed_);
-+  if (this->feature_1_ != 0)
-+    add_property(layout, elfcpp::GNU_PROPERTY_X86_FEATURE_1_AND,
-+		 this->feature_1_);
-+  if (this->feature_2_used_ != 0)
-+    add_property(layout, elfcpp::GNU_PROPERTY_X86_FEATURE_2_USED,
-+		 this->feature_2_used_);
-+  if (this->feature_2_needed_ != 0)
-+    add_property(layout, elfcpp::GNU_PROPERTY_X86_FEATURE_2_NEEDED,
-+		 this->feature_2_needed_);
-+}
-+
- // Write the first three reserved words of the .got.plt section.
- // The remainder of the section is written while writing the PLT
- // in Output_data_plt_i386::do_write.
diff --git a/binutils-gold-mismatched-section-flags.patch b/binutils-gold-mismatched-section-flags.patch
deleted file mode 100644
index 63dba2b..0000000
--- a/binutils-gold-mismatched-section-flags.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -rup binutils.orig/gold/layout.cc binutils-2.32/gold/layout.cc
---- binutils.orig/gold/layout.cc	2019-06-24 14:37:36.013086899 +0100
-+++ binutils-2.32/gold/layout.cc	2019-06-24 14:41:40.054517479 +0100
-@@ -868,6 +868,7 @@ Layout::get_output_section(const char* n
- 		  && (same_name->flags() & elfcpp::SHF_TLS) == 0)
- 		os = same_name;
- 	    }
-+#if 0 /* BZ 1722715, PR 17556.  */
- 	  else if ((flags & elfcpp::SHF_TLS) == 0)
- 	    {
- 	      elfcpp::Elf_Xword zero_flags = 0;
-@@ -878,6 +879,7 @@ Layout::get_output_section(const char* n
- 	      if (p != this->section_name_map_.end())
- 		os = p->second;
- 	    }
-+#endif
- 	}
- 
-       if (os == NULL)
diff --git a/binutils-gold-warn-unsupported.patch b/binutils-gold-warn-unsupported.patch
deleted file mode 100644
index 8e00aa3..0000000
--- a/binutils-gold-warn-unsupported.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-Only in binutils-2.34/gold: autom4te.cache
-diff -rup binutils.orig/gold/configure binutils-2.34/gold/configure
---- binutils.orig/gold/configure	2020-04-20 12:35:13.048297305 +0100
-+++ binutils-2.34/gold/configure	2020-04-20 14:02:06.743725696 +0100
-@@ -5180,7 +5180,8 @@ for targ in $target $canon_targets; do
-     . ${srcdir}/configure.tgt
- 
-     if test "$targ_obj" = "UNKNOWN"; then
--      as_fn_error $? "\"unsupported target $targ\"" "$LINENO" 5
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"unsupported target $targ\"" >&5
-+$as_echo "$as_me: WARNING: \"unsupported target $targ\"" >&2;}
-     else
-       targetobjs="$targetobjs ${targ_obj}.\$(OBJEXT)"
-       if test "$targ_extra_obj" != ""; then
-diff -rup binutils.orig/gold/configure.ac binutils-2.34/gold/configure.ac
---- binutils.orig/gold/configure.ac	2020-04-20 12:35:13.050297291 +0100
-+++ binutils-2.34/gold/configure.ac	2020-04-20 14:01:46.435868770 +0100
-@@ -181,7 +181,7 @@ for targ in $target $canon_targets; do
-     . ${srcdir}/configure.tgt
- 
-     if test "$targ_obj" = "UNKNOWN"; then
--      AC_MSG_ERROR("unsupported target $targ")
-+      AC_MSG_WARN("unsupported target $targ")
-     else
-       targetobjs="$targetobjs ${targ_obj}.\$(OBJEXT)"
-       if test "$targ_extra_obj" != ""; then
---- binutils.orig/ld/configure.tgt	2020-04-20 12:35:12.465301359 +0100
-+++ binutils-2.34/ld/configure.tgt	2020-04-20 14:17:52.123066333 +0100
-@@ -220,7 +220,7 @@ bfin-*-linux-uclibc*)	targ_emul=elf32bfi
- 			targ_extra_emuls="elf32bfin"
- 			targ_extra_libpath=$targ_extra_emuls
- 			;;
--bpf-*-*)		targ_emul=elf64bpf
-+bpf-* | bpf-*-*)	targ_emul=elf64bpf
- 			;;
- cr16-*-elf*)		targ_emul=elf32cr16
- 			;;
-@@ -1026,7 +1026,7 @@ z8k-*-coff)		targ_emul=z8002
- 			targ_extra_ofiles=
- 			;;
- *)
--  echo 2>&1 "*** ld does not support target ${targ}"
-+  echo 2>&1 "*** ld does not support target '${targ}' NO REALLY"
-   echo 2>&1 "*** see ld/configure.tgt for supported targets"
-   exit 1
- 
---- binutils.orig/bfd/config.bfd	2020-04-20 12:35:13.038297375 +0100
-+++ binutils-2.34/bfd/config.bfd	2020-04-20 14:25:26.452869193 +0100
-@@ -473,7 +473,7 @@ case "${targ}" in
-     ;;
- 
- #ifdef BFD64
--  bpf-*-none)
-+  bpf-*-none | bpf-*)
-     targ_defvec=bpf_elf64_le_vec
-     targ_selvecs=bpf_elf64_be_vec
-     targ_underscore=yes
-@@ -1427,7 +1427,7 @@ case "${targ}" in
-     ;;
- 
-   *)
--    echo 1>&2 "*** BFD does not support target ${targ}."
-+    echo 1>&2 "*** BFD does not support target '${targ}'.  Honest."
-     echo 1>&2 "*** Look in bfd/config.bfd for supported targets."
-     exit 1
-     ;;
diff --git a/binutils-ld-read-only-script.patch b/binutils-ld-read-only-script.patch
deleted file mode 100644
index 481b387..0000000
--- a/binutils-ld-read-only-script.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-From a0b911576eb49e06a457ebf757b42543d2c7e548 Mon Sep 17 00:00:00 2001
-From: Luca Boccassi <luca.boccassi@microsoft.com>
-Date: Wed, 21 Jul 2021 14:32:03 +0100
-Subject: [PATCH] Allows linker scripts to set the SEC_READONLY flag.
-
-* ld.texi: Document new output section type.
-* ldgram.y: Add new token.
-* ldlang.c: Handle the new flag.
-* ldlang.h: Add readonly_section to list of section types.
-* ldlex.l: Add a new identifier.
-* testsuite/ld-scripts/output-section-types.t: New example linker script.
-* testsuite/ld-scripts/output-section-types.d: Test driver.
-* testsyute/ld-scripts/script.exp: Run the new test.
-
-(cherry picked from commit 6b86da53d5ee2022b9065f445d23356190380746)
----
- ld/ld.texi                                     |  2 ++
- ld/ldgram.y                                    |  2 ++
- ld/ldlang.c                                    |  6 ++++++
- ld/ldlang.h                                    |  3 ++-
- ld/ldlex.l                                     |  1 +
- ld/testsuite/ld-scripts/output-section-types.d | 13 +++++++++++++
- ld/testsuite/ld-scripts/output-section-types.t |  7 +++++++
- ld/testsuite/ld-scripts/script.exp             |  1 +
- 8 files changed, 34 insertions(+), 1 deletion(-)
- create mode 100644 ld/testsuite/ld-scripts/output-section-types.d
- create mode 100644 ld/testsuite/ld-scripts/output-section-types.t
-
-diff --git a/ld/ld.texi b/ld/ld.texi
-index dd8f571d4e4..cf1e637adbf 100644
---- a/ld/ld.texi
-+++ b/ld/ld.texi
-@@ -5456,6 +5456,8 @@ parentheses.  The following types are defined:
- @item NOLOAD
- The section should be marked as not loadable, so that it will not be
- loaded into memory when the program is run.
-+@item READONLY
-+The section should be marked as read-only.
- @item DSECT
- @itemx COPY
- @itemx INFO
-diff --git a/ld/ldgram.y b/ld/ldgram.y
-index dd911f46169..31e0071c6fc 100644
---- a/ld/ldgram.y
-+++ b/ld/ldgram.y
-@@ -139,6 +139,7 @@ static int error_index;
- %token REGION_ALIAS
- %token LD_FEATURE
- %token NOLOAD DSECT COPY INFO OVERLAY
-+%token READONLY
- %token DEFINED TARGET_K SEARCH_DIR MAP ENTRY
- %token <integer> NEXT
- %token SIZEOF ALIGNOF ADDR LOADADDR MAX_K MIN_K
-@@ -1123,6 +1124,7 @@ type:
- 	|  COPY    { sectype = noalloc_section; }
- 	|  INFO    { sectype = noalloc_section; }
- 	|  OVERLAY { sectype = noalloc_section; }
-+	|  READONLY { sectype = readonly_section; }
- 	;
- 
- atype:
-diff --git a/ld/ldlang.c b/ld/ldlang.c
-index 37b64c89ee1..2610be995ca 100644
---- a/ld/ldlang.c
-+++ b/ld/ldlang.c
-@@ -2639,6 +2639,9 @@ lang_add_section (lang_statement_list_type *ptr,
-     case noalloc_section:
-       flags &= ~SEC_ALLOC;
-       break;
-+    case readonly_section:
-+      flags |= SEC_READONLY;
-+      break;
-     case noload_section:
-       flags &= ~SEC_LOAD;
-       flags |= SEC_NEVER_LOAD;
-@@ -4232,6 +4235,9 @@ map_input_to_output_sections
- 	    case noalloc_section:
- 	      flags = SEC_HAS_CONTENTS;
- 	      break;
-+	    case readonly_section:
-+	      flags |= SEC_READONLY;
-+	      break;
- 	    case noload_section:
- 	      if (bfd_get_flavour (link_info.output_bfd)
- 		  == bfd_target_elf_flavour)
-diff --git a/ld/ldlang.h b/ld/ldlang.h
-index 6fbe16d97d9..f68ae27b409 100644
---- a/ld/ldlang.h
-+++ b/ld/ldlang.h
-@@ -121,7 +121,8 @@ enum section_type
-   first_overlay_section,
-   overlay_section,
-   noload_section,
--  noalloc_section
-+  noalloc_section,
-+  readonly_section
- };
- 
- /* This structure holds a list of program headers describing
-diff --git a/ld/ldlex.l b/ld/ldlex.l
-index c1b15263587..25b4bcaae01 100644
---- a/ld/ldlex.l
-+++ b/ld/ldlex.l
-@@ -294,6 +294,7 @@ V_IDENTIFIER [*?.$_a-zA-Z\[\]\-\!\^\\]([*?.$_a-zA-Z0-9\[\]\-\!\^\\]|::)*
- <BOTH,SCRIPT>"SORT_BY_INIT_PRIORITY"	{ RTOKEN(SORT_BY_INIT_PRIORITY); }
- <BOTH,SCRIPT>"SORT_NONE"		{ RTOKEN(SORT_NONE); }
- <EXPRESSION,BOTH,SCRIPT>"NOLOAD"	{ RTOKEN(NOLOAD);}
-+<EXPRESSION,BOTH,SCRIPT>"READONLY"	{ RTOKEN(READONLY);}
- <EXPRESSION,BOTH,SCRIPT>"DSECT"		{ RTOKEN(DSECT);}
- <EXPRESSION,BOTH,SCRIPT>"COPY"		{ RTOKEN(COPY);}
- <EXPRESSION,BOTH,SCRIPT>"INFO"		{ RTOKEN(INFO);}
-diff --git a/ld/testsuite/ld-scripts/output-section-types.d b/ld/testsuite/ld-scripts/output-section-types.d
-new file mode 100644
-index 00000000000..ab124fa4dd7
---- /dev/null
-+++ b/ld/testsuite/ld-scripts/output-section-types.d
-@@ -0,0 +1,13 @@
-+#ld: -Toutput-section-types.t
-+#source: align2a.s
-+#objdump: -h
-+#target: [is_elf_format]
-+
-+#...
-+  . \.rom.*
-+[ 	]+ALLOC, READONLY
-+  . \.ro.*
-+[ 	]+CONTENTS, ALLOC, LOAD, READONLY, DATA
-+  . \.over.*
-+[ 	]+CONTENTS, READONLY
-+#pass
-diff --git a/ld/testsuite/ld-scripts/output-section-types.t b/ld/testsuite/ld-scripts/output-section-types.t
-new file mode 100644
-index 00000000000..d8fdfda1a03
---- /dev/null
-+++ b/ld/testsuite/ld-scripts/output-section-types.t
-@@ -0,0 +1,7 @@
-+SECTIONS {
-+  .rom  (NOLOAD)   : { LONG(1234); }
-+  .ro   (READONLY) : { LONG(5678); }
-+  .over (OVERLAY)  : { LONG(0123); }
-+  /DISCARD/        : { *(*) }
-+
-+}
-diff --git a/ld/testsuite/ld-scripts/script.exp b/ld/testsuite/ld-scripts/script.exp
-index 961cd08c4b1..ff50199b3ae 100644
---- a/ld/testsuite/ld-scripts/script.exp
-+++ b/ld/testsuite/ld-scripts/script.exp
-@@ -229,6 +229,7 @@ foreach test_script $test_script_list {
- 
- run_dump_test "align-with-input"
- run_dump_test "pr20302"
-+run_dump_test "output-section-types"
- 
- run_dump_test "segment-start" {{name (default)}}
- run_dump_test "segment-start" {{name (overridden)} \
--- 
-2.30.2
-
diff --git a/binutils-libtool-lib64.patch b/binutils-libtool-lib64.patch
deleted file mode 100644
index 142fc7e..0000000
--- a/binutils-libtool-lib64.patch
+++ /dev/null
@@ -1,236 +0,0 @@
-diff -rcp ../binutils-2.20.51.0.7.original/bfd/configure ./bfd/configure
---- a/bfd/configure	2010-04-08 14:53:48.000000000 +0100
-+++ b/bfd/configure	2010-04-08 14:56:50.000000000 +0100
-@@ -10762,10 +10762,34 @@
-   # before this can be enabled.
-   hardcode_into_libs=yes
- 
-+  # find out which ABI we are using
-+  libsuff=
-+  case "$host_cpu" in
-+  x86_64*|s390*|powerpc*|ppc*|sparc*)
-+    echo 'int i;' > conftest.$ac_ext
-+    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; then
-+      case `/usr/bin/file conftest.$ac_objext` in
-+      *64-bit*)
-+        libsuff=64
-+        if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then
-+          sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
-+        fi
-+        sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
-+        ;;
-+      esac
-+    fi
-+    rm -rf conftest*
-+    ;;
-+  esac
-+
-   # Append ld.so.conf contents to the search path
-   if test -f /etc/ld.so.conf; then
-     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
--    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-+    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
-   fi
- 
-   # We used to test for /lib/ld.so.1 and disable shared libraries on
-diff -rcp ../binutils-2.20.51.0.7.original/binutils/configure ./binutils/configure
---- a/binutils/configure	2010-04-08 14:53:45.000000000 +0100
-+++ b/binutils/configure	2010-04-08 14:56:21.000000000 +0100
-@@ -10560,10 +10560,34 @@
-   # before this can be enabled.
-   hardcode_into_libs=yes
- 
-+  # find out which ABI we are using
-+  libsuff=
-+  case "$host_cpu" in
-+  x86_64*|s390*|powerpc*|ppc*|sparc*)
-+    echo 'int i;' > conftest.$ac_ext
-+    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; then
-+      case `/usr/bin/file conftest.$ac_objext` in
-+      *64-bit*)
-+        libsuff=64
-+        if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then
-+          sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
-+        fi
-+        sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
-+        ;;
-+      esac
-+    fi
-+    rm -rf conftest*
-+    ;;
-+  esac
-+
-   # Append ld.so.conf contents to the search path
-   if test -f /etc/ld.so.conf; then
-     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
--    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-+    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
-   fi
- 
-   # We used to test for /lib/ld.so.1 and disable shared libraries on
-diff -rcp ../binutils-2.20.51.0.7.original/gas/configure ./gas/configure
---- a/gas/configure	2010-04-08 14:53:47.000000000 +0100
-+++ b/gas/configure	2010-04-08 14:57:24.000000000 +0100
-@@ -10547,10 +10547,34 @@
-   # before this can be enabled.
-   hardcode_into_libs=yes
- 
-+  # find out which ABI we are using
-+  libsuff=
-+  case "$host_cpu" in
-+  x86_64*|s390*|powerpc*|ppc*|sparc*)
-+    echo 'int i;' > conftest.$ac_ext
-+    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; then
-+      case `/usr/bin/file conftest.$ac_objext` in
-+      *64-bit*)
-+        libsuff=64
-+        if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then
-+          sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
-+        fi
-+        sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
-+        ;;
-+      esac
-+    fi
-+    rm -rf conftest*
-+    ;;
-+  esac
-+
-   # Append ld.so.conf contents to the search path
-   if test -f /etc/ld.so.conf; then
-     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
--    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-+    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
-   fi
- 
-   # We used to test for /lib/ld.so.1 and disable shared libraries on
-diff -rcp ../binutils-2.20.51.0.7.original/gprof/configure ./gprof/configure
---- a/gprof/configure	2010-04-08 14:53:45.000000000 +0100
-+++ b/gprof/configure	2010-04-08 14:57:50.000000000 +0100
-@@ -10485,10 +10485,34 @@
-   # before this can be enabled.
-   hardcode_into_libs=yes
- 
-+  # find out which ABI we are using
-+  libsuff=
-+  case "$host_cpu" in
-+  x86_64*|s390*|powerpc*|ppc*|sparc*)
-+    echo 'int i;' > conftest.$ac_ext
-+    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; then
-+      case `/usr/bin/file conftest.$ac_objext` in
-+      *64-bit*)
-+        libsuff=64
-+        if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then
-+          sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
-+        fi
-+        sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
-+        ;;
-+      esac
-+    fi
-+    rm -rf conftest*
-+    ;;
-+  esac
-+
-   # Append ld.so.conf contents to the search path
-   if test -f /etc/ld.so.conf; then
-     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
--    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-+    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
-   fi
- 
-   # We used to test for /lib/ld.so.1 and disable shared libraries on
-diff -rcp ../binutils-2.20.51.0.7.original/ld/configure ./ld/configure
---- a/ld/configure	2010-04-08 14:53:44.000000000 +0100
-+++ b/ld/configure	2010-04-08 14:58:21.000000000 +0100
-@@ -10966,10 +10966,34 @@
-   # before this can be enabled.
-   hardcode_into_libs=yes
- 
-+  # find out which ABI we are using
-+  libsuff=
-+  case "$host_cpu" in
-+  x86_64*|s390*|powerpc*|ppc*|sparc*)
-+    echo 'int i;' > conftest.$ac_ext
-+    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; then
-+      case `/usr/bin/file conftest.$ac_objext` in
-+      *64-bit*)
-+        libsuff=64
-+        if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then
-+          sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
-+        fi
-+        sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
-+        ;;
-+      esac
-+    fi
-+    rm -rf conftest*
-+    ;;
-+  esac
-+
-   # Append ld.so.conf contents to the search path
-   if test -f /etc/ld.so.conf; then
-     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
--    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-+    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
-   fi
- 
-   # We used to test for /lib/ld.so.1 and disable shared libraries on
-Only in .: .#libtool.m4
-Only in .: #libtool.m4#
-diff -rcp ../binutils-2.20.51.0.7.original/opcodes/configure ./opcodes/configure
---- a/opcodes/configure	2010-04-08 14:53:45.000000000 +0100
-+++ b/opcodes/configure	2010-04-08 14:59:10.000000000 +0100
-@@ -10496,10 +10496,34 @@
-   # before this can be enabled.
-   hardcode_into_libs=yes
- 
-+  # find out which ABI we are using
-+  libsuff=
-+  case "$host_cpu" in
-+  x86_64*|s390*|powerpc*|ppc*|sparc*)
-+    echo 'int i;' > conftest.$ac_ext
-+    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; then
-+      case `/usr/bin/file conftest.$ac_objext` in
-+      *64-bit*)
-+        libsuff=64
-+        if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then
-+          sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
-+        fi
-+        sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
-+        ;;
-+      esac
-+    fi
-+    rm -rf conftest*
-+    ;;
-+  esac
-+
-   # Append ld.so.conf contents to the search path
-   if test -f /etc/ld.so.conf; then
-     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
--    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-+    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
-   fi
- 
-   # We used to test for /lib/ld.so.1 and disable shared libraries on
diff --git a/binutils-libtool-no-rpath.patch b/binutils-libtool-no-rpath.patch
deleted file mode 100644
index a4f90a1..0000000
--- a/binutils-libtool-no-rpath.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -rup binutils.orig/ltmain.sh binutils-2.37/ltmain.sh
---- binutils.orig/ltmain.sh	2022-01-27 16:23:09.304207432 +0000
-+++ binutils-2.37/ltmain.sh	2022-01-27 16:23:18.380143759 +0000
-@@ -7103,6 +7103,7 @@ EOF
- 	  rpath="$finalize_rpath"
- 	  test "$mode" != relink && rpath="$compile_rpath$rpath"
- 	  for libdir in $rpath; do
-+	    case "$libdir" in /usr/lib|/usr/lib64|/usr/lib/../lib|/usr/lib/../lib64) continue;; esac
- 	    if test -n "$hardcode_libdir_flag_spec"; then
- 	      if test -n "$hardcode_libdir_separator"; then
- 		if test -z "$hardcode_libdirs"; then
-@@ -7798,6 +7799,7 @@ EOF
-       rpath=
-       hardcode_libdirs=
-       for libdir in $compile_rpath $finalize_rpath; do
-+	case "$libdir" in /usr/lib|/usr/lib64|/usr/lib/../lib|/usr/lib/../lib64) continue;; esac
- 	if test -n "$hardcode_libdir_flag_spec"; then
- 	  if test -n "$hardcode_libdir_separator"; then
- 	    if test -z "$hardcode_libdirs"; then
-@@ -7849,6 +7851,7 @@ EOF
-       rpath=
-       hardcode_libdirs=
-       for libdir in $finalize_rpath; do
-+	case "$libdir" in /usr/lib|/usr/lib64|/usr/lib/../lib|/usr/lib/../lib64) continue;; esac
- 	if test -n "$hardcode_libdir_flag_spec"; then
- 	  if test -n "$hardcode_libdir_separator"; then
- 	    if test -z "$hardcode_libdirs"; then
-Only in binutils-2.37: ltmain.sh.orig
diff --git a/binutils-no-config-h-check.patch b/binutils-no-config-h-check.patch
deleted file mode 100644
index c89195a..0000000
--- a/binutils-no-config-h-check.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/bfd/bfd-in.h	2012-08-02 10:56:34.561769686 +0100
-+++ b/bfd/bfd-in.h	2012-08-02 11:13:27.134797755 +0100
-@@ -25,11 +25,6 @@
- #ifndef __BFD_H_SEEN__
- #define __BFD_H_SEEN__
- 
--/* PR 14072: Ensure that config.h is included first.  */
--#if !defined PACKAGE && !defined PACKAGE_VERSION
--#error config.h must be included before this header
--#endif
--
- #ifdef __cplusplus
- extern "C" {
- #endif
---- a/bfd/bfd-in2.h	2012-08-02 10:56:34.349769680 +0100
-+++ b/bfd/bfd-in2.h	2012-08-02 11:13:40.015798113 +0100
-@@ -32,11 +32,6 @@
- #ifndef __BFD_H_SEEN__
- #define __BFD_H_SEEN__
- 
--/* PR 14072: Ensure that config.h is included first.  */
--#if !defined PACKAGE && !defined PACKAGE_VERSION
--#error config.h must be included before this header
--#endif
--
- #ifdef __cplusplus
- extern "C" {
- #endif
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..48a4643
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+gcc-toolset-13-binutils package is retired on branch c10s for CS-2551
\ No newline at end of file