Rebase to commit 48c933a69a8.

Fix logic to enable and disable gold linker
Rebase to bring in commits d9ab6e42e739fe826b02a5f868586132ea2d893a and - 0f9faaebc91bc1886a563bde6c178601b4be743b, thus fixing CVE-2026-19548.
2026-09-01 11:34:23 +01:00 · 2026-08-25 09:22:43 +02:00 · 2026-08-19 13:25:44 +01:00 · 2026-08-13 14:09:50 +01:00 · 2026-08-13 10:00:35 +01:00 · 2026-08-12 11:22:10 +01:00
45 changed files with 4079 additions and 12387 deletions
--- a/.fmf/version
+++ b/.fmf/version
@ -0,0 +1 @@
+1
--- a/.gitignore
+++ b/.gitignore
@ -1,6 +1,8 @@
 *.diff
 *.orig
 *.rej
+*.sed
+*.xz

 *~
 .#*
@ -61,7 +63,8 @@ stamp-*
 /mpc*
 /gmp*
 /isl*
-/binutils-2.34.0-5dfc0c955dbe912cd328fc2688e5fceb3239ac2a.tar.xz
 /binutils-2.19.50.0.1-output-format.sed
-/binutils-2.35.tar.xz
-/binutils-2.35.1.tar.xz
+/binutils-2.44.50-13.fc43.src.rpm
+/binutils-with-gold-2.45.50-be970c68891.tar.gz
+/binutils-with-gold-2.45.50-ba5838a98fb.tar.gz
+/binutils-2.47.50-1.fc46.src.rpm
--- a/binutils-2.29-filename-in-error-messages.patch
+++ b/binutils-2.29-filename-in-error-messages.patch
@ -1,123 +0,0 @@
--- binutils.orig/binutils/readelf.c	2020-07-24 14:55:25.163647522 +0100
-+++ binutils-2.35/binutils/readelf.c	2020-07-24 15:02:39.613851369 +0100
-@@ -20729,79 +20729,92 @@ process_file (char * file_name)
-   Filedata * filedata = NULL;
-   struct stat statbuf;
-   char armag[SARMAG];
-  bfd_boolean ret = TRUE;
-+  bfd_boolean 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);
-+      error (_("Failed to read file's magic number\n"));
-       fclose (filedata->handle);
-      free (filedata);
-      return FALSE;
-+      goto done;
-     }
- 
-   filedata->file_size = (bfd_size_type) statbuf.st_size;
- 
-   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)
-+    {
-+      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;
--- a/binutils-CVE-2019-1010204.patch
+++ b/binutils-CVE-2019-1010204.patch
@ -1,15 +0,0 @@
--- binutils.orig/gold/fileread.cc	2019-08-06 14:22:08.669313110 +0100
-+++ binutils-2.32/gold/fileread.cc	2019-08-06 14:22:28.799177543 +0100
-@@ -381,6 +381,12 @@ File_read::do_read(off_t start, section_
-   ssize_t bytes;
-   if (this->whole_file_view_ != NULL)
-     {
-+      // See PR 23765 for an example of a testcase that triggers this error.
-+      if (((ssize_t) start) < 0)
-+	gold_fatal(_("%s: read failed, starting offset (%#llx) less than zero"),
-+		   this->filename().c_str(),
-+		   static_cast<long long>(start));
-+	
-       bytes = this->size_ - start;
-       if (static_cast<section_size_type>(bytes) >= size)
- 	{
--- a/binutils-LTO-fix.patch
+++ b/binutils-LTO-fix.patch
--- a/binutils-LTO-restore-wrapper-symbol.patch
+++ b/binutils-LTO-restore-wrapper-symbol.patch
@ -0,0 +1,154 @@
+From 3221c470f0765886a49a1a3d2ec602e4104a377b Mon Sep 17 00:00:00 2001
+From: "H.J. Lu" <hjl.tools@gmail.com>
+Date: Fri, 2 Aug 2024 19:52:00 -0700
+Subject: [PATCH] LTO: Restore the wrapper symbol check for standard function
+
+Call unwrap_hash_lookup to restore the wrapper symbol check for standard
+function since reference to standard function may not show up in LTO
+symbol table:
+
+[hjl@gnu-tgl-3 pr31956-3]$ nm foo.o
+00000000 T main
+         U __real_malloc
+00000000 T __wrap_malloc
+[hjl@gnu-tgl-3 pr31956-3]$  lto-dump -list foo.o
+Type   Visibility  Size  Name
+function  default     0  malloc
+function  default     0  __real_malloc
+function  default     3  main
+function  default     5  __wrap_malloc
+[hjl@gnu-tgl-3 pr31956-3]$ make
+gcc -O2 -flto -Wall   -c -o foo.o foo.c
+gcc -Wl,--wrap=malloc -O2 -flto -Wall -o x foo.o
+/usr/local/bin/ld: /tmp/ccsPW0a9.ltrans0.ltrans.o: in function `main':
+<artificial>:(.text.startup+0xa): undefined reference to `__wrap_malloc'
+collect2: error: ld returned 1 exit status
+make: *** [Makefile:22: x] Error 1
+[hjl@gnu-tgl-3 pr31956-3]$
+
+Also add a test to verify that the unused wrapper is removed.
+
+	PR ld/31956
+	* plugin.c (get_symbols): Restore the wrapper symbol check for
+	standard function.
+	* testsuite/ld-plugin/lto.exp: Run the malloc test and the
+	unused test.
+	* testsuite/ld-plugin/pr31956c.c: New file.
+	* testsuite/ld-plugin/pr31956d.c: New file.
+	* testsuite/ld-plugin/pr31956d.d: New file.
+
+Signed-off-by: H.J. Lu <hjl.tools@gmail.com>
+---
+ ld/plugin.c                       | 14 ++++++++++++--
+ ld/testsuite/ld-plugin/lto.exp    | 16 ++++++++++++++++
+ ld/testsuite/ld-plugin/pr31956c.c | 19 +++++++++++++++++++
+ ld/testsuite/ld-plugin/pr31956d.c |  7 +++++++
+ ld/testsuite/ld-plugin/pr31956d.d |  4 ++++
+ 5 files changed, 58 insertions(+), 2 deletions(-)
+ create mode 100644 ld/testsuite/ld-plugin/pr31956c.c
+ create mode 100644 ld/testsuite/ld-plugin/pr31956d.c
+ create mode 100644 ld/testsuite/ld-plugin/pr31956d.d
+
+diff --git a/ld/plugin.c b/ld/plugin.c
+index 03ee9880d10..51c4765cc5b 100644
+--- a/ld/plugin.c
+++ b/ld/plugin.c
+@@ -778,8 +778,18 @@ get_symbols (const void *handle, int nsyms, struct ld_plugin_symbol *syms,
+ 	{
+ 	  blhe = h;
+ 	  /* Check if a symbol is a wrapper symbol.  */
+-	  if (blhe && blhe->wrapper_symbol)
+-	    wrap_status = wrapper;
+	  if (blhe)
+	    {
+	      if (blhe->wrapper_symbol)
+		wrap_status = wrapper;
+	      else if (link_info.wrap_hash != NULL)
+		{
+		  struct bfd_link_hash_entry *unwrap
+		    = unwrap_hash_lookup (&link_info, (bfd *) abfd, blhe);
+		  if (unwrap != NULL && unwrap != h)
+		    wrap_status = wrapper;
+		}
+	    }
+ 	}
+       else
+ 	{
+diff --git a/ld/testsuite/ld-plugin/lto.exp b/ld/testsuite/ld-plugin/lto.exp
+index ad59e2abd61..1a8c3736307 100644
+--- a/ld/testsuite/ld-plugin/lto.exp
+++ b/ld/testsuite/ld-plugin/lto.exp
+@@ -546,6 +546,22 @@ set lto_link_elf_tests [list \
+    {} \
+    "pr31956b" \
+   ] \
+  [list \
+   "PR ld/31956 (malloc)" \
+   "-Wl,--wrap=malloc" \
+   "-O2 -flto" \
+   {pr31956c.c} \
+   {} \
+   "pr31956c" \
+  ] \
+  [list \
+   "PR ld/31956 (unused)" \
+   "-Wl,--wrap=parse_line" \
+   "-O2 -flto" \
+   {pr31956d.c} \
+   {{"nm" {} "pr31956d.d"}} \
+   "pr31956d" \
+  ] \
+   [list \
+    "Build pr30281.so" \
+    "-shared -Wl,--version-script,pr30281.t \
+diff --git a/ld/testsuite/ld-plugin/pr31956c.c b/ld/testsuite/ld-plugin/pr31956c.c
+new file mode 100644
+index 00000000000..4a46b2b49a8
+--- /dev/null
+++ b/ld/testsuite/ld-plugin/pr31956c.c
+@@ -0,0 +1,19 @@
+#include <stdlib.h>
+
+extern void *__real_malloc (size_t);
+
+void *
+__wrap_malloc (size_t n)
+{
+  if (n == 0)
+    return NULL;
+  else
+    return __real_malloc (n);
+};
+
+int
+main (void)
+{
+  void *ptr = malloc (30);
+  return ptr == NULL ? 1 : 0;
+}
+diff --git a/ld/testsuite/ld-plugin/pr31956d.c b/ld/testsuite/ld-plugin/pr31956d.c
+new file mode 100644
+index 00000000000..cb7f2d50643
+--- /dev/null
+++ b/ld/testsuite/ld-plugin/pr31956d.c
+@@ -0,0 +1,7 @@
+void __wrap_parse_line(void) {};
+
+int
+main (void)
+{
+  return 0;
+}
+diff --git a/ld/testsuite/ld-plugin/pr31956d.d b/ld/testsuite/ld-plugin/pr31956d.d
+new file mode 100644
+index 00000000000..b579cdc7353
+--- /dev/null
+++ b/ld/testsuite/ld-plugin/pr31956d.d
+@@ -0,0 +1,4 @@
+#failif
+#...
+[0-9a-f]+ T .*parse_line
+#...
+-- 
+2.45.2
+
--- a/binutils-Power10-fixes.patch
+++ b/binutils-Power10-fixes.patch
--- a/binutils-aarch64-condbranch-relocs.patch
+++ b/binutils-aarch64-condbranch-relocs.patch
@ -1,93 +0,0 @@
-diff -rup binutils.orig/bfd/elfnn-aarch64.c binutils-2.35/bfd/elfnn-aarch64.c
--- binutils.orig/bfd/elfnn-aarch64.c	2020-09-10 17:03:31.738458044 +0100
-+++ binutils-2.35/bfd/elfnn-aarch64.c	2020-09-10 17:04:03.643344898 +0100
-@@ -5445,7 +5445,6 @@ elfNN_aarch64_final_link_relocate (reloc
-   bfd_vma orig_value = value;
-   bfd_boolean resolved_to_zero;
-   bfd_boolean abs_symbol_p;
-  bfd_boolean via_plt_p;
- 
-   globals = elf_aarch64_hash_table (info);
- 
-@@ -5467,8 +5466,6 @@ elfNN_aarch64_final_link_relocate (reloc
- 		  : bfd_is_und_section (sym_sec));
-   abs_symbol_p = h != NULL && bfd_is_abs_symbol (&h->root);
- 
-  via_plt_p = (globals->root.splt != NULL && h != NULL
-	       && h->plt.offset != (bfd_vma) - 1);
- 
-   /* Since STT_GNU_IFUNC symbol must go through PLT, we handle
-      it here if it is defined in a non-shared object.  */
-@@ -5805,23 +5802,12 @@ elfNN_aarch64_final_link_relocate (reloc
- 	value += signed_addend;
-       break;
- 
-    case BFD_RELOC_AARCH64_BRANCH19:
-    case BFD_RELOC_AARCH64_TSTBR14:
-      /* A conditional branch to an undefined weak symbol is converted to a
-	 branch to itself.  */
-      if (weak_undef_p && !via_plt_p)
-	{
-	  value = _bfd_aarch64_elf_resolve_relocation (input_bfd, bfd_r_type,
-						       place, value,
-						       signed_addend,
-						       weak_undef_p);
-	  break;
-	}
-      /* Fall through.  */
-     case BFD_RELOC_AARCH64_CALL26:
-     case BFD_RELOC_AARCH64_JUMP26:
-       {
- 	asection *splt = globals->root.splt;
-+	bfd_boolean via_plt_p =
-+	  splt != NULL && h != NULL && h->plt.offset != (bfd_vma) - 1;
- 
- 	/* A call to an undefined weak symbol is converted to a jump to
- 	   the next instruction unless a PLT entry will be created.
-@@ -5902,6 +5888,23 @@ elfNN_aarch64_final_link_relocate (reloc
- 	  bfd_set_error (bfd_error_bad_value);
- 	  return bfd_reloc_notsupported;
- 	}
-+      value = _bfd_aarch64_elf_resolve_relocation (input_bfd, bfd_r_type,
-+						   place, value,
-+						   signed_addend,
-+						   weak_undef_p);
-+      break;
-+
-+    case BFD_RELOC_AARCH64_BRANCH19:
-+    case BFD_RELOC_AARCH64_TSTBR14:
-+      if (h && h->root.type == bfd_link_hash_undefined)
-+	{
-+	  _bfd_error_handler
-+	    /* xgettext:c-format */
-+	    (_("%pB: conditional branch to undefined symbol `%s' "
-+	       "not allowed"), input_bfd, h->root.root.string);
-+	  bfd_set_error (bfd_error_bad_value);
-+	  return bfd_reloc_notsupported;
-+	}
-       /* Fall through.  */
- 
-     case BFD_RELOC_AARCH64_16:
-@@ -7967,8 +7970,6 @@ elfNN_aarch64_check_relocs (bfd *abfd, s
- 	    break;
- 	  }
- 
-	case BFD_RELOC_AARCH64_BRANCH19:
-	case BFD_RELOC_AARCH64_TSTBR14:
- 	case BFD_RELOC_AARCH64_CALL26:
- 	case BFD_RELOC_AARCH64_JUMP26:
- 	  /* If this is a local symbol then we resolve it
-Only in binutils-2.35/bfd: elfnn-aarch64.c.orig
-diff -rup binutils.orig/ld/testsuite/ld-aarch64/emit-relocs-560.d binutils-2.35/ld/testsuite/ld-aarch64/emit-relocs-560.d
--- binutils.orig/ld/testsuite/ld-aarch64/emit-relocs-560.d	2020-09-10 17:03:31.067460424 +0100
-+++ binutils-2.35/ld/testsuite/ld-aarch64/emit-relocs-560.d	2020-09-10 17:04:03.644344895 +0100
-@@ -1,8 +1,3 @@
- #source: emit-relocs-560.s
- #ld: -shared
-#readelf: -r
-
-Relocation section '.rela.plt' at offset 0x[0-9a-f]+ contains 2 entries:
-  Offset          Info           Type           Sym. Value    Sym. Name \+ Addend
-[0-9a-f]+  000100000402 R_AARCH64_JUMP_SL 0000000000000000 baz \+ 0
-[0-9a-f]+  000200000402 R_AARCH64_JUMP_SL 0000000000000000 bar \+ 0
-+#error: .*: conditional branch to undefined symbol `bar' not allowed
--- a/binutils-aarch64-small-plt0.patch
+++ b/binutils-aarch64-small-plt0.patch
@ -0,0 +1,12 @@
+--- binutils.orig/bfd/elfnn-aarch64.c	2025-02-07 13:42:20.961333141 +0000
+++ binutils-with-gold-2.44/bfd/elfnn-aarch64.c	2025-02-07 13:42:29.781353740 +0000
+@@ -10162,7 +10162,8 @@ elfNN_aarch64_init_small_plt0_entry (bfd
+   /* PR 26312: Explicitly set the sh_entsize to 0 so that
+      consumers do not think that the section contains fixed
+      sized objects.  */
+-  elf_section_data (htab->root.splt->output_section)->this_hdr.sh_entsize = 0;
+  if (elf_section_data (htab->root.splt->output_section) != NULL)
+    elf_section_data (htab->root.splt->output_section)->this_hdr.sh_entsize = 0;
+ 
+   plt_got_2nd_ent = (htab->root.sgotplt->output_section->vma
+ 		  + htab->root.sgotplt->output_offset
--- a/binutils-add-sym-cache-to-elf-link-hash.patch
+++ b/binutils-add-sym-cache-to-elf-link-hash.patch
--- a/binutils-attach-to-group.patch
+++ b/binutils-attach-to-group.patch
@ -1,70 +0,0 @@
-diff -rup binutils.orig/gas/config/obj-elf.c binutils-2.34/gas/config/obj-elf.c
--- binutils.orig/gas/config/obj-elf.c	2020-02-02 11:34:11.858321477 +0000
-+++ binutils-2.34/gas/config/obj-elf.c	2020-02-02 11:34:30.099247619 +0000
-@@ -78,9 +78,11 @@ static void obj_elf_gnu_attribute (int);
- static void obj_elf_tls_common (int);
- static void obj_elf_lcomm (int);
- static void obj_elf_struct (int);
-+static void obj_elf_attach_to_group (int);
- 
- static const pseudo_typeS elf_pseudo_table[] =
- {
-+  {"attach_to_group", obj_elf_attach_to_group, 0},
-   {"comm", obj_elf_common, 0},
-   {"common", obj_elf_common, 1},
-   {"ident", obj_elf_ident, 0},
-@@ -1003,6 +1005,27 @@ obj_elf_section_name (void)
-   return name;
- }
- 
-+static void
-+obj_elf_attach_to_group (int dummy ATTRIBUTE_UNUSED)
-+{
-+  const char * gname = obj_elf_section_name ();
-+
-+  if (gname == NULL)
-+    {
-+      as_warn ("group name not parseable");
-+      return;
-+    }
-+
-+  if (elf_group_name (now_seg))
-+    {
-+      as_warn ("already has a group");
-+      return;
-+    }
-+
-+  elf_group_name (now_seg) = xstrdup (gname);
-+  elf_section_flags (now_seg) |= SHF_GROUP;
-+}
-+
- void
- obj_elf_section (int push)
- {
-Only in binutils-2.34/gas/config: obj-elf.c.orig
-diff -rup binutils.orig/gas/doc/as.texi binutils-2.34/gas/doc/as.texi
--- binutils.orig/gas/doc/as.texi	2020-02-02 11:34:11.850321509 +0000
-+++ binutils-2.34/gas/doc/as.texi	2020-02-02 11:35:11.359080560 +0000
-@@ -4359,6 +4359,7 @@ Some machine configurations provide addi
- * Altmacro::                    @code{.altmacro}
- * Ascii::                       @code{.ascii "@var{string}"}@dots{}
- * Asciz::                       @code{.asciz "@var{string}"}@dots{}
-+* Attach_to_group::             @code{.attach_to_group @var{name}}
- * Balign::                      @code{.balign [@var{abs-expr}[, @var{abs-expr}]]}
- * Bundle directives::           @code{.bundle_align_mode @var{abs-expr}}, etc
- * Byte::                        @code{.byte @var{expressions}}
-@@ -4656,6 +4657,12 @@ trailing zero byte) into consecutive add
- @code{.asciz} is just like @code{.ascii}, but each string is followed by
- a zero byte.  The ``z'' in @samp{.asciz} stands for ``zero''.
- 
-+@node Attach_to_group
-+@section @code{.attach_to_group @var{name}}
-+Attaches the current section to the named group.  This is like declaring
-+the section with the @code{G} attribute, but can be done after the section
-+has been created.
-+
- @node Balign
- @section @code{.balign[wl] [@var{abs-expr}[, @var{abs-expr}[, @var{abs-expr}]]]}
- 
-Only in binutils-2.34/gas/doc: as.texi.orig
-Only in binutils-2.34/gas/doc: as.texi.rej
--- a/binutils-autoconf-version.patch
+++ b/binutils-autoconf-version.patch
@ -0,0 +1,11 @@
+--- 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
--- a/binutils-config.patch
+++ b/binutils-config.patch
@ -1,44 +0,0 @@
-diff -Nrup a/libiberty/aclocal.m4 b/libiberty/aclocal.m4
--- a/libiberty/aclocal.m4	2019-01-19 09:01:34.000000000 -0700
-+++ b/libiberty/aclocal.m4	2020-01-09 22:00:27.183312982 -0700
-@@ -147,7 +147,7 @@ if test $ac_cv_os_cray = yes; then
- fi
- 
- AC_CACHE_CHECK(stack direction for C alloca, ac_cv_c_stack_direction,
-[AC_TRY_RUN([find_stack_direction ()
-+[AC_TRY_RUN([__attribute__ ((noclone,noinline)) find_stack_direction ()
- {
-   static char *addr = 0;
-   auto char dummy;
-diff --git a/config/intdiv0.m4 b/config/intdiv0.m4
-index 55dddcf1..ba906efc 100644
--- a/config/intdiv0.m4
-+++ b/config/intdiv0.m4
-@@ -31,10 +31,10 @@ sigfpe_handler (sig) int sig;
-   exit (sig != SIGFPE);
- }
- 
-int x = 1;
-int y = 0;
-int z;
-int nan;
-+volatile int x = 1;
-+volatile int y = 0;
-+volatile int z;
-+volatile int nan;
- 
- int main ()
- {
-diff --git a/libiberty/configure.ac b/libiberty/configure.ac
-index f1ce7601..fc20d228 100644
--- a/libiberty/configure.ac
-+++ b/libiberty/configure.ac
-@@ -661,7 +661,7 @@ if test -z "${setobjs}"; then
-   for v in $vars; do
-     AC_MSG_CHECKING([for $v])
-     AC_CACHE_VAL(libiberty_cv_var_$v,
-      [AC_LINK_IFELSE([AC_LANG_PROGRAM([[int *p;]],[[extern int $v []; p = $v;]])],
-+      [AC_LINK_IFELSE([AC_LANG_PROGRAM([[__attribute__ ((used)) int *p;]],[[extern int $v []; p = $v;]])],
- 		      [eval "libiberty_cv_var_$v=yes"],
- 		      [eval "libiberty_cv_var_$v=no"])])
-     if eval "test \"`echo '$libiberty_cv_var_'$v`\" = yes"; then
--- a/binutils-do-not-link-with-static-libstdc++.patch
+++ b/binutils-do-not-link-with-static-libstdc++.patch
@ -1,7 +1,7 @@
-diff -rup binutils.orig/configure binutils-2.30/configure
--- binutils.orig/configure	2018-09-24 17:50:06.967172922 +0100
-+++ binutils-2.30/configure	2018-09-24 17:51:16.648624865 +0100
-@@ -4996,49 +4996,6 @@ if test -z "$LD"; then
+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
 
@ -51,10 +51,9 @@ diff -rup binutils.orig/configure binutils-2.30/configure
 
 
 if test -n "$ac_tool_prefix"; then
-diff -rup binutils.orig/configure.ac binutils-2.30/configure.ac
--- binutils.orig/configure.ac	2018-09-24 17:50:07.241170767 +0100
-+++ binutils-2.30/configure.ac	2018-09-24 17:50:29.908992486 +0100
-@@ -1288,26 +1288,6 @@ if test -z "$LD"; then
+--- binutils.orig/configure.ac	2024-11-26 15:08:50.162328683 +0000
+++ binutils-2.43.50-1686dc7079f/configure.ac	2024-11-26 15:08:56.929374527 +0000
+@@ -1410,26 +1410,6 @@ if test -z "$LD"; then
   fi
 fi
 
@ -79,5 +78,5 @@ diff -rup binutils.orig/configure.ac binutils-2.30/configure.ac
 -fi
 -
 ACX_PROG_GNAT
- ACX_PROG_CMP_IGNORE_INITIAL
- 
+ ACX_PROG_GDC
+ ACX_PROG_CARGO
--- a/binutils-elf-add-objects.patch
+++ b/binutils-elf-add-objects.patch
@ -1,36 +0,0 @@
--- binutils.orig/bfd/elflink.c	2020-07-31 10:45:48.747912761 +0100
-+++ binutils-2.35/bfd/elflink.c	2020-07-31 10:47:26.336262770 +0100
-@@ -505,6 +505,16 @@ bfd_elf_link_record_dynamic_symbol (stru
-       const char *name;
-       size_t indx;
- 
-+      if (h->root.type == bfd_link_hash_defined
-+	  || h->root.type == bfd_link_hash_defweak)
-+	{
-+	  /* An IR symbol should not be made dynamic.  */
-+	  if (h->root.u.def.section != NULL
-+	      && h->root.u.def.section->owner != NULL
-+	      && (h->root.u.def.section->owner->flags & BFD_PLUGIN) != 0)
-+	    return TRUE;
-+	}
-+
-       /* XXX: The ABI draft says the linker must turn hidden and
- 	 internal symbols into STB_LOCAL symbols when producing the
- 	 DSO. However, if ld.so honors st_other in the dynamic table,
-@@ -5199,15 +5209,11 @@ elf_link_add_object_symbols (bfd *abfd,
- 		break;
- 	      }
- 
-	  /* Don't add DT_NEEDED for references from the dummy bfd nor
-	     for unmatched symbol.  */
- 	  if (!add_needed
- 	      && matched
- 	      && definition
- 	      && ((dynsym
-		   && h->ref_regular_nonweak
-		   && (old_bfd == NULL
-		       || (old_bfd->flags & BFD_PLUGIN) == 0))
-+		   && h->ref_regular_nonweak)
- 		  || (h->ref_dynamic_nonweak
- 		      && (elf_dyn_lib_class (abfd) & DYN_AS_NEEDED) != 0
- 		      && !on_needed_list (elf_dt_name (abfd),
--- a/binutils-export-demangle.h.patch
+++ b/binutils-export-demangle.h.patch
@ -5,8 +5,8 @@ diff -rup binutils.orig/bfd/Makefile.am binutils-2.32/bfd/Makefile.am
 bfdincludedir = @bfdincludedir@
 bfdlib_LTLIBRARIES = libbfd.la
 bfdinclude_HEADERS = $(BFD_H) $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
-		     bfd_stdint.h $(INCDIR)/diagnostics.h $(INCDIR)/bfdlink.h
-+		     bfd_stdint.h $(INCDIR)/diagnostics.h $(INCDIR)/bfdlink.h $(INCDIR)/demangle.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 =
@ -16,7 +16,7 @@ diff -rup binutils.orig/bfd/Makefile.in binutils-2.32/bfd/Makefile.in
@@ -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 bfd_stdint.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)
@ -26,8 +26,8 @@ diff -rup binutils.orig/bfd/Makefile.in binutils-2.32/bfd/Makefile.in
 @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@	bfd_stdint.h $(INCDIR)/diagnostics.h \
-+@INSTALL_LIBBFD_TRUE@	bfd_stdint.h $(INCDIR)/diagnostics.h $(INCDIR)/demangle.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
--- a/binutils-fix-ar-test.patch
+++ b/binutils-fix-ar-test.patch
@ -0,0 +1,11 @@
+--- binutils.orig/binutils/testsuite/binutils-all/ar.exp	2024-02-07 13:02:23.490031197 +0000
+++ binutils-2.42/binutils/testsuite/binutils-all/ar.exp	2024-02-07 13:03:10.285034069 +0000
+@@ -1017,7 +1017,7 @@ symbol_table
+ argument_parsing
+ deterministic_archive
+ replacing_deterministic_member
+-replacing_non_deterministic_member
+# replacing_non_deterministic_member
+ replacing_sde_deterministic_member
+ delete_an_element
+ move_an_element
--- a/binutils-fix-testsuite-failures.patch
+++ b/binutils-fix-testsuite-failures.patch
@ -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"
--- a/binutils-gold-empty-dwp.patch
+++ b/binutils-gold-empty-dwp.patch
@ -0,0 +1,11 @@
+--- binutils.orig/gold/dwp.cc	2023-05-02 13:26:44.075148082 +0100
+++ binutils-2.40/gold/dwp.cc	2023-05-02 13:27:16.189130127 +0100
+@@ -2418,6 +2418,8 @@ main(int argc, char** argv)
+     {
+       Dwo_file exe_file(exe_filename);
+       exe_file.read_executable(&files);
+      if (files.empty())
+        gold_fatal(_("Could not find any dwo links in specified EXE"));
+     }
+ 
+   // Add any additional files listed on command line.
--- a/binutils-gold-i386-gnu-property-notes.patch
+++ b/binutils-gold-i386-gnu-property-notes.patch
@ -0,0 +1,193 @@
+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.
--- a/binutils-gold-ignore-execstack-error.patch
+++ b/binutils-gold-ignore-execstack-error.patch
@ -0,0 +1,16 @@
+diff -rup binutils.orig/gold/options.h binutils-2.41/gold/options.h
+--- binutils.orig/gold/options.h	2024-01-04 09:52:09.282002253 +0000
+++ binutils-2.41/gold/options.h	2024-01-04 09:52:51.890972630 +0000
+@@ -855,6 +855,12 @@ class General_options
+ 	      N_("(ARM only) Do not warn about objects with incompatible "
+ 		 "enum sizes"));
+ 
+  DEFINE_bool_ignore(error_execstack, options::TWO_DASHES, '\0',
+		     N_("Ignored"), N_("Ignored"));
+
+  DEFINE_bool_ignore(error_rwx_segments, options::TWO_DASHES, '\0',
+		     N_("Ignored"), N_("Ignored"));
+
+   DEFINE_special(exclude_libs, options::TWO_DASHES, '\0',
+ 		 N_("Exclude libraries from automatic export"),
+ 		 N_(("lib,lib ...")));
--- a/binutils-gold-pack-relative-relocs.patch
+++ b/binutils-gold-pack-relative-relocs.patch
@ -0,0 +1,27 @@
+diff --git a/gold/options.cc b/gold/options.cc
+index c9834b66159..91d7802fffe 100644
+--- a/gold/options.cc
+++ b/gold/options.cc
+@@ -989,7 +989,7 @@ parse_short_option(int argc, const char** argv, int pos_in_argv_i,
+     }
+ 
+   // If we're a -z option, we need to parse our argument as a
+-  // long-option, e.g. "-z stacksize=8192".
+  // long-option, e.g. "-z stack-size=8192".
+   if (retval == &dash_z)
+     {
+       int dummy_i = 0;
+diff --git a/gold/options.h b/gold/options.h
+index 46f658f23ea..d16e38066da 100644
+--- a/gold/options.h
+++ b/gold/options.h
+@@ -1110,6 +1110,9 @@ class General_options
+ 			 N_("Generate package metadata note"),
+ 			 N_("[=JSON]"));
+ 
+  DEFINE_bool_ignore(pack_relative_relocs, options::DASH_Z, '\0',
+		     N_("Ignored"), N_("Ignored"));
+
+   DEFINE_bool(pie, options::ONE_DASH, '\0', false,
+ 	      N_("Create a position independent executable"),
+ 	      N_("Do not create a position independent executable"));
--- a/binutils-gold-s390-configure.patch
+++ b/binutils-gold-s390-configure.patch
@ -0,0 +1,40 @@
+# The gold linker does not build if the target list includes s390x-linux
+# but does not include s390-linux.  ie it needs the 32-bit target to be
+# enabled in order for the 64-bit target to work.  On the other hand the
+# BFD library does not support the 32-bit s390 target.  So this patch
+# "enhances" the gold configure script so that if s390x is listed, the
+# s390 target will automatically be added to the list as well.
+
+diff -upr orig/gold/configure binutils-2.47/gold/configure
+--- orig/gold/configure	2026-07-27 09:38:54.907192013 +0100
+++ binutils-2.47/gold/configure	2026-07-27 10:12:02.759629540 +0100
+@@ -5223,7 +5223,12 @@ if test -n "$enable_targets"; then
+   for targ in `echo $enable_targets | sed -e 's/,/ /g'`; do
+     result=`$ac_config_sub $targ 2>/dev/null`
+     if test -n "$result"; then
+-      canon_targets="$canon_targets $result"
+      canon_targets="$canon_targets $result" ;
+      case "$result" in
+      s390x-*)
+            canon_targets="$canon_targets s390-gnu-linux"
+	    ;;
+      esac
+     else
+       # Permit unrecognized target names, like "all".
+       canon_targets="$canon_targets $targ"
+diff -upr orig/gold/configure.ac binutils-2.47/gold/configure.ac
+--- orig/gold/configure.ac	2026-07-27 09:38:54.907192013 +0100
+++ binutils-2.47/gold/configure.ac	2026-07-27 10:18:18.480766140 +0100
+@@ -133,6 +133,12 @@ if test -n "$enable_targets"; then
+     result=`$ac_config_sub $targ 2>/dev/null`
+     if test -n "$result"; then
+       canon_targets="$canon_targets $result"
+      # Hack: Enable the s390-linux target if s390x-linux is enabled.
+      case "$result" in
+      s390x-*)
+            canon_targets="$canon_targets s390-gnu-linux"
+	    ;;
+      esac
+     else
+       # Permit unrecognized target names, like "all".
+       canon_targets="$canon_targets $targ"
--- a/binutils-gold-warn-unsupported.patch
+++ b/binutils-gold-warn-unsupported.patch
@ -24,26 +24,6 @@ diff -rup binutils.orig/gold/configure.ac binutils-2.34/gold/configure.ac
     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
@ -55,12 +35,14 @@ diff -rup binutils.orig/gold/configure.ac binutils-2.34/gold/configure.ac
     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
-     ;;
+--- binutils.orig/ld/configure.tgt	2026-01-05 08:51:02.908224792 +0000
+++ binutils-with-gold-2.45.50-be970c68891/ld/configure.tgt	2026-01-05 08:51:55.852677409 +0000
+@@ -255,7 +255,7 @@ bfin-*-uclinux*)	targ_emul=elf32bfin;
+ bfin-*-linux-uclibc*)	targ_emul=elf32bfinfd;
+ 			targ_extra_libpath=elf32bfin
+ 			;;
+-bpf-*-*)		targ_emul=elf64bpf
+bpf-* | bpf-*-*)	targ_emul=elf64bpf
+ 			;;
+ cr16-*-elf*)		targ_emul=elf32cr16
+ 			;;
--- a/binutils-ld-default-z-text.patch
+++ b/binutils-ld-default-z-text.patch
@ -0,0 +1,52 @@
+diff -rup binutils.orig/bfd/elflink.c binutils-with-gold-2.45.50-be970c68891/bfd/elflink.c
+--- binutils.orig/bfd/elflink.c	2026-01-14 09:21:14.835847967 +0000
+++ binutils-with-gold-2.45.50-be970c68891/bfd/elflink.c	2026-01-14 09:23:48.780495205 +0000
+@@ -13786,7 +13786,7 @@ _bfd_elf_final_link (bfd *abfd, struct b
+ 		{
+ 		  if (info->textrel_check == textrel_check_error)
+ 		    info->callbacks->einfo
+-		      (_("%P%X: read-only segment has dynamic relocations\n"));
+		      (_("%P%X: error: read-only segment has dynamic relocations\n"));
+ 		  else if (bfd_link_dll (info))
+ 		    info->callbacks->einfo
+ 		      (_("%P: warning: creating DT_TEXTREL in a shared object\n"));
+diff -rup binutils.orig/ld/testsuite/ld-aarch64/dt-memtag-mode.d binutils-with-gold-2.45.50-be970c68891/ld/testsuite/ld-aarch64/dt-memtag-mode.d
+--- binutils.orig/ld/testsuite/ld-aarch64/dt-memtag-mode.d	2026-01-14 09:21:15.248851537 +0000
+++ binutils-with-gold-2.45.50-be970c68891/ld/testsuite/ld-aarch64/dt-memtag-mode.d	2026-01-14 09:22:24.603416270 +0000
+@@ -1,5 +1,5 @@
+ #source: dt-memtag.s
+-#ld: -shared -z memtag-mode=async
+#ld: -shared -z memtag-mode=async -z notext
+ #readelf: -d
+ 
+ #...
+diff -rup binutils.orig/ld/testsuite/ld-aarch64/dt-memtag-stack.d binutils-with-gold-2.45.50-be970c68891/ld/testsuite/ld-aarch64/dt-memtag-stack.d
+--- binutils.orig/ld/testsuite/ld-aarch64/dt-memtag-stack.d	2026-01-14 09:21:15.248851537 +0000
+++ binutils-with-gold-2.45.50-be970c68891/ld/testsuite/ld-aarch64/dt-memtag-stack.d	2026-01-14 09:24:19.594780414 +0000
+@@ -1,5 +1,5 @@
+ #source: dt-memtag.s
+-#ld: -shared -z memtag-stack
+#ld: -shared -z memtag-stack -z notext
+ #readelf: -d
+ 
+ #...
+diff -rup binutils.orig/ld/testsuite/ld-aarch64/relr-text-pie.d binutils-with-gold-2.45.50-be970c68891/ld/testsuite/ld-aarch64/relr-text-pie.d
+--- binutils.orig/ld/testsuite/ld-aarch64/relr-text-pie.d	2026-01-14 09:21:15.246851520 +0000
+++ binutils-with-gold-2.45.50-be970c68891/ld/testsuite/ld-aarch64/relr-text-pie.d	2026-01-14 09:24:45.363485698 +0000
+@@ -1,5 +1,5 @@
+ #source: relr-text.s
+-#ld: -pie -z pack-relative-relocs -T relocs.ld
+#ld: -pie -z pack-relative-relocs -T relocs.ld -z notext
+ #readelf: -drW
+ 
+ #...
+diff -rup binutils.orig/ld/testsuite/ld-aarch64/relr-text-shared.d binutils-with-gold-2.45.50-be970c68891/ld/testsuite/ld-aarch64/relr-text-shared.d
+--- binutils.orig/ld/testsuite/ld-aarch64/relr-text-shared.d	2026-01-14 09:21:15.246851520 +0000
+++ binutils-with-gold-2.45.50-be970c68891/ld/testsuite/ld-aarch64/relr-text-shared.d	2026-01-14 09:25:06.651664713 +0000
+@@ -1,5 +1,5 @@
+ #source: relr-text.s
+-#ld: -shared -z pack-relative-relocs -T relocs.ld
+#ld: -shared -z pack-relative-relocs -T relocs.ld -z notext
+ #readelf: -drW
+ 
+ #...
--- a/binutils-2.20.51.0.2-libtool-lib64.patch
+++ b/binutils-2.20.51.0.2-libtool-lib64.patch
--- a/binutils-libtool-no-rpath.patch
+++ b/binutils-libtool-no-rpath.patch
@ -0,0 +1,28 @@
+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
--- a/binutils-2.22.52.0.4-no-config-h-check.patch
+++ b/binutils-2.22.52.0.4-no-config-h-check.patch
--- a/binutils-ppc-annobin-disassembly.patch
+++ b/binutils-ppc-annobin-disassembly.patch
@ -1,39 +0,0 @@
--- binutils.orig/opcodes/ppc-dis.c	2020-09-11 10:55:56.243724026 +0100
-+++ binutils-2.35/opcodes/ppc-dis.c	2020-09-11 10:57:51.363934217 +0100
-@@ -399,12 +399,36 @@ static unsigned short vle_opcd_indices[V
- #define SPE2_OPCD_SEGS (1 + SPE2_XOP_TO_SEG (SPE2_XOP (-1)))
- static unsigned short spe2_opcd_indices[SPE2_OPCD_SEGS + 1];
- 
-+static bfd_boolean
-+ppc_symbol_is_valid (asymbol *sym,
-+		     struct disassemble_info *info ATTRIBUTE_UNUSED)
-+{
-+  elf_symbol_type * est;
-+
-+  if (sym == NULL)
-+    return FALSE;
-+
-+  est = elf_symbol_from (NULL, sym);
-+  
-+  /* Ignore ELF hidden, local, no-type symbols.
-+     These are generated by annobin.  */
-+  if (est != NULL
-+      && ELF_ST_VISIBILITY (est->internal_elf_sym.st_other) == STV_HIDDEN
-+      && ELF_ST_BIND (est->internal_elf_sym.st_info) == STB_LOCAL
-+      && ELF_ST_TYPE (est->internal_elf_sym.st_info) == STT_NOTYPE)
-+    return FALSE;
-+
-+  return TRUE;
-+}
-+
- /* Calculate opcode table indices to speed up disassembly,
-    and init dialect.  */
- 
- void
- disassemble_init_powerpc (struct disassemble_info *info)
- {
-+  info->symbol_is_valid = ppc_symbol_is_valid;
-+
-   if (powerpc_opcd_indices[PPC_OPCD_SEGS] == 0)
-     {
-       unsigned seg, idx, op;
--- a/binutils-readelf-other-sym-info.patch
+++ b/binutils-readelf-other-sym-info.patch
@ -1,35 +0,0 @@
--- binutils.orig/binutils/readelf.c	2020-07-24 15:08:30.317597020 +0100
-+++ binutils-2.35/binutils/readelf.c	2020-07-24 15:09:39.029155552 +0100
-@@ -12069,11 +12069,13 @@ print_dynamic_symbol (Filedata *filedata
-       unsigned int vis = ELF_ST_VISIBILITY (psym->st_other);
- 
-       printf (" %-7s", get_symbol_visibility (vis));
-+#if 0
-       /* Check to see if any other bits in the st_other field are set.
- 	 Note - displaying this information disrupts the layout of the
- 	 table being generated, but for the moment this case is very rare.  */
-       if (psym->st_other ^ vis)
- 	printf (" [%s] ", get_symbol_other (filedata, psym->st_other ^ vis));
-+#endif
-     }
-   printf (" %4s ", get_symbol_index_type (filedata, psym->st_shndx));
- 
-@@ -12112,7 +12114,17 @@ print_dynamic_symbol (Filedata *filedata
- 		version_string);
-     }
- 
-  putchar ('\n');
-+#if 1
-+    {
-+      unsigned int vis = ELF_ST_VISIBILITY (psym->st_other);
-+
-+      /* Check to see if any other bits in the st_other field are set.  */
-+      if (psym->st_other ^ vis)
-+	printf (" \t[%s]", get_symbol_other (filedata, psym->st_other ^ vis));
-+    }
-+#endif
-+
-+    putchar ('\n');
- 
-   if (ELF_ST_BIND (psym->st_info) == STB_LOCAL
-       && section != NULL
--- a/binutils-remove-ld-protected-func-2-test.patch
+++ b/binutils-remove-ld-protected-func-2-test.patch
@ -0,0 +1,33 @@
+diff -rup binutils.orig/ld/testsuite/ld-x86-64/x86-64.exp binutils-with-gold-2.45.50-96b8a8a633a/ld/testsuite/ld-x86-64/x86-64.exp
+--- binutils.orig/ld/testsuite/ld-x86-64/x86-64.exp	2025-11-20 12:02:23.738336155 +0000
+++ binutils-with-gold-2.45.50-96b8a8a633a/ld/testsuite/ld-x86-64/x86-64.exp	2025-11-20 12:03:17.894485264 +0000
+@@ -1413,14 +1413,6 @@ if { [isnative] && [check_compiler_avail
+ 	    "libprotected-func-2b.so" \
+ 	] \
+ 	[list \
+-	    "Build protected-func-2 without PIE" \
+-	    "$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/libprotected-func-2b.so" \
+-	    "$DIRECT_EXTERN_ACCESS_CFLAGS $NOPIE_CFLAGS -Wa,-mx86-used-note=yes" \
+-	    { protected-func-1b.c } \
+-	    {} \
+-	    "protected-func-2" \
+-	] \
+-	[list \
+ 	    "Build libprotected-func-2c.so" \
+ 	    "-shared" \
+ 	    "-fPIC -Wa,-mx86-used-note=yes" \
+@@ -1429,14 +1421,6 @@ if { [isnative] && [check_compiler_avail
+ 	    "libprotected-func-2c.so" \
+ 	] \
+ 	[list \
+-	    "Build protected-func-2a without PIE" \
+-	    "$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/libprotected-func-2c.so" \
+-	    "$DIRECT_EXTERN_ACCESS_CFLAGS $NOPIE_CFLAGS -Wa,-mx86-used-note=yes" \
+-	    { protected-func-1b.c } \
+-	    {} \
+-	    "protected-func-2a" \
+-	] \
+-	[list \
+ 	    "Build libprotected-data-1a.so" \
+ 	    "-shared -z noindirect-extern-access" \
+ 	    "-fPIC -Wa,-mx86-used-note=yes" \
--- a/binutils-2.29-revert-PLT-elision.patch
+++ b/binutils-2.29-revert-PLT-elision.patch
@ -67,18 +67,6 @@ diff -rup binutils.orig/ld/testsuite/ld-x86-64/pltgot-2.d binutils-2.29.1/ld/tes
 #...
  +0x[0-9a-f]+ +\(PLTREL.*
 #...
-diff -rup binutils.orig/ld/testsuite/ld-x86-64/plt-main-bnd.dd binutils-2.29.1/ld/testsuite/ld-x86-64/plt-main-bnd.dd
--- binutils.orig/ld/testsuite/ld-x86-64/plt-main-bnd.dd	2017-11-15 13:32:39.405064420 +0000
-+++ binutils-2.29.1/ld/testsuite/ld-x86-64/plt-main-bnd.dd	2017-11-15 15:06:53.694623801 +0000
-@@ -1,7 +1,4 @@
-#...
-Disassembly of section .plt.got:
- 
-[a-f0-9]+ <[a-z_]+@plt>:
-[ 	]*[a-f0-9]+:	f2 ff 25 .. .. 20 00 	bnd jmpq \*0x20....\(%rip\)        # ...... <.*>
-+#...
- [ 	]*[a-f0-9]+:	90                   	nop
- #pass
 diff -rup binutils.orig/ld/testsuite/ld-x86-64/plt-main.rd binutils-2.29.1/ld/testsuite/ld-x86-64/plt-main.rd
 --- binutils.orig/ld/testsuite/ld-x86-64/plt-main.rd	2017-11-15 13:32:39.407064397 +0000
 +++ binutils-2.29.1/ld/testsuite/ld-x86-64/plt-main.rd	2017-11-15 15:06:17.244054423 +0000
@ -135,82 +123,6 @@ diff -rup binutils.orig/ld/testsuite/ld-x86-64/pr20830b-now.d binutils-2.29.1/ld
 0+18 0000000000000010 0000001c FDE cie=00000000 pc=0000000000000138..0000000000000144
   DW_CFA_nop
   DW_CFA_nop
-diff -rup binutils.orig/ld/testsuite/ld-x86-64/pr21038a.d binutils-2.29.1/ld/testsuite/ld-x86-64/pr21038a.d
--- binutils.orig/ld/testsuite/ld-x86-64/pr21038a.d	2017-11-15 13:32:39.408064384 +0000
-+++ binutils-2.29.1/ld/testsuite/ld-x86-64/pr21038a.d	2017-11-15 15:19:48.097433680 +0000
-@@ -19,7 +19,8 @@ Contents of the .eh_frame section:
-   DW_CFA_offset: r16 \(rip\) at cfa-8
-   DW_CFA_nop
-   DW_CFA_nop
-
-+#pass
-+  
- 0+18 0000000000000014 0000001c FDE cie=00000000 pc=00000000000001c8..00000000000001d4
-   DW_CFA_nop
-   DW_CFA_nop
-diff -rup binutils.orig/ld/testsuite/ld-x86-64/pr21038a-now.d binutils-2.29.1/ld/testsuite/ld-x86-64/pr21038a-now.d
--- binutils.orig/ld/testsuite/ld-x86-64/pr21038a-now.d	2017-11-15 13:32:39.401064469 +0000
-+++ binutils-2.29.1/ld/testsuite/ld-x86-64/pr21038a-now.d	2017-11-15 15:10:56.077760324 +0000
-@@ -20,7 +20,8 @@ Contents of the .eh_frame section:
-   DW_CFA_offset: r16 \(rip\) at cfa-8
-   DW_CFA_nop
-   DW_CFA_nop
-
-+#pass
-+  
- 0+18 0000000000000014 0000001c FDE cie=00000000 pc=00000000000001c8..00000000000001d4
-   DW_CFA_nop
-   DW_CFA_nop
-diff -rup binutils.orig/ld/testsuite/ld-x86-64/pr21038b.d binutils-2.29.1/ld/testsuite/ld-x86-64/pr21038b.d
--- binutils.orig/ld/testsuite/ld-x86-64/pr21038b.d	2017-11-15 13:32:39.405064420 +0000
-+++ binutils-2.29.1/ld/testsuite/ld-x86-64/pr21038b.d	2017-11-15 15:10:42.828916844 +0000
-@@ -19,6 +19,7 @@ Contents of the .eh_frame section:
-   DW_CFA_offset: r16 \(rip\) at cfa-8
-   DW_CFA_nop
-   DW_CFA_nop
-+#pass
- 
- 0+18 0000000000000014 0000001c FDE cie=00000000 pc=00000000000001d8..00000000000001dd
-   DW_CFA_nop
-diff -rup binutils.orig/ld/testsuite/ld-x86-64/pr21038b-now.d binutils-2.29.1/ld/testsuite/ld-x86-64/pr21038b-now.d
--- binutils.orig/ld/testsuite/ld-x86-64/pr21038b-now.d	2017-11-15 13:32:39.416064288 +0000
-+++ binutils-2.29.1/ld/testsuite/ld-x86-64/pr21038b-now.d	2017-11-15 15:11:11.550577531 +0000
-@@ -20,7 +20,8 @@ Contents of the .eh_frame section:
-   DW_CFA_offset: r16 \(rip\) at cfa-8
-   DW_CFA_nop
-   DW_CFA_nop
-
-+#pass
-+  
- 0+18 0000000000000014 0000001c FDE cie=00000000 pc=00000000000001d8..00000000000001dd
-   DW_CFA_nop
-   DW_CFA_nop
-diff -rup binutils.orig/ld/testsuite/ld-x86-64/pr21038c.d binutils-2.29.1/ld/testsuite/ld-x86-64/pr21038c.d
--- binutils.orig/ld/testsuite/ld-x86-64/pr21038c.d	2017-11-15 13:32:39.411064348 +0000
-+++ binutils-2.29.1/ld/testsuite/ld-x86-64/pr21038c.d	2017-11-15 15:09:52.664509478 +0000
-@@ -19,7 +19,8 @@ Contents of the .eh_frame section:
-   DW_CFA_offset: r16 \(rip\) at cfa-8
-   DW_CFA_nop
-   DW_CFA_nop
-
-+#pass
-+  
- 0+18 0000000000000014 0000001c FDE cie=00000000 pc=0000000000000220..0000000000000231
-   DW_CFA_nop
-   DW_CFA_nop
-diff -rup binutils.orig/ld/testsuite/ld-x86-64/pr21038c-now.d binutils-2.29.1/ld/testsuite/ld-x86-64/pr21038c-now.d
--- binutils.orig/ld/testsuite/ld-x86-64/pr21038c-now.d	2017-11-15 13:32:39.413064324 +0000
-+++ binutils-2.29.1/ld/testsuite/ld-x86-64/pr21038c-now.d	2017-11-15 15:11:22.975442559 +0000
-@@ -20,7 +20,8 @@ Contents of the .eh_frame section:
-   DW_CFA_offset: r16 \(rip\) at cfa-8
-   DW_CFA_nop
-   DW_CFA_nop
-
-+#pass
-+  
- 0+18 0000000000000014 0000001c FDE cie=00000000 pc=0000000000000220..0000000000000231
-   DW_CFA_nop
-   DW_CFA_nop
 diff -rup binutils.orig/ld/testsuite/ld-x86-64/tlspic2.rd binutils-2.29.1/ld/testsuite/ld-x86-64/tlspic2.rd
 --- binutils.orig/ld/testsuite/ld-x86-64/tlspic2.rd	2017-11-15 13:32:39.417064276 +0000
 +++ binutils-2.29.1/ld/testsuite/ld-x86-64/tlspic2.rd	2017-11-15 15:05:02.950932110 +0000
@ -253,13 +165,3 @@ diff -rup binutils.orig/ld/testsuite/ld-x86-64/tlspic2.rd binutils-2.29.1/ld/tes
 0+18 00000010 0000001c FDE cie=00000000 pc=00000128..00000133
   DW_CFA_nop
   DW_CFA_nop
--- binutils.orig/ld/testsuite/ld-x86-64/plt-main-ibt.dd	2020-07-24 14:55:25.370646189 +0100
-+++ binutils-2.35/ld/testsuite/ld-x86-64/plt-main-ibt.dd	2020-07-24 15:06:58.124189348 +0100
-@@ -1,7 +1,3 @@
- #...
-Disassembly of section .plt.got:
-
-[a-f0-9]+ <[_a-z]+@plt>:
- [ 	]*[a-f0-9]+:	f3 0f 1e fa          	endbr64 
-[ 	]*[a-f0-9]+:	f2 ff 25 .. .. 20 00 	bnd jmpq \*0x20....\(%rip\)        # ...... <.*>
- #pass
--- a/binutils-riscv-testsuite-fixes.patch
+++ b/binutils-riscv-testsuite-fixes.patch
@ -0,0 +1,269 @@
+diff -rup binutils.orig/ld/testsuite/ld-riscv-elf/attr-phdr.d binutils-2.40/ld/testsuite/ld-riscv-elf/attr-phdr.d
+--- binutils.orig/ld/testsuite/ld-riscv-elf/attr-phdr.d	2023-02-16 10:11:38.656875289 +0000
+++ binutils-2.40/ld/testsuite/ld-riscv-elf/attr-phdr.d	2023-02-16 10:49:26.786573665 +0000
+@@ -12,8 +12,8 @@ Program Headers:
+   Type           Offset   VirtAddr   PhysAddr   FileSiz MemSiz  Flg Align
+   RISCV_ATTRIBUT .*
+   LOAD           .*
+-
+#...
+  Section to Segment mapping:
+   Segment Sections...
+    00     .riscv.attributes 
+-   01     .text 
+#pass
+diff -rup binutils.orig/ld/testsuite/ld-riscv-elf/pcgp-relax-01.d binutils-2.40/ld/testsuite/ld-riscv-elf/pcgp-relax-01.d
+--- binutils.orig/ld/testsuite/ld-riscv-elf/pcgp-relax-01.d	2023-02-16 10:11:38.659875285 +0000
+++ binutils-2.40/ld/testsuite/ld-riscv-elf/pcgp-relax-01.d	2023-02-16 10:42:54.803431287 +0000
+@@ -8,7 +8,7 @@
+ Disassembly of section \.text:
+ 
+ 0+[0-9a-f]+ <_start>:
+-.*:[ 	]+[0-9a-f]+[ 	]+addi[ 	]+a0,a0,[0-9]+
+.*:[ 	]+[0-9a-f]+[ 	]+addi[ 	]+a0,a0,\-[0-9]+
+ .*:[ 	]+[0-9a-f]+[ 	]+jal[ 	]+ra,[0-9a-f]+ <_start>
+ .*:[ 	]+[0-9a-f]+[ 	]+addi[ 	]+a1,gp,\-[0-9]+ # [0-9a-f]+ <data_g>
+ .*:[ 	]+[0-9a-f]+[ 	]+addi[ 	]+a2,gp,\-[0-9]+ # [0-9a-f]+ <data_g>
+diff -rup binutils.orig/ld/testsuite/ld-riscv-elf/pcgp-relax-02.d binutils-2.40/ld/testsuite/ld-riscv-elf/pcgp-relax-02.d
+--- binutils.orig/ld/testsuite/ld-riscv-elf/pcgp-relax-02.d	2023-02-16 10:11:38.659875285 +0000
+++ binutils-2.40/ld/testsuite/ld-riscv-elf/pcgp-relax-02.d	2023-02-16 10:43:49.540306593 +0000
+@@ -11,5 +11,5 @@ Disassembly of section .text:
+ [0-9a-f]+ <_start>:
+ .*:[ 	]+[0-9a-f]+[ 	]+auipc[ 	]+a1.*
+ .*:[ 	]+[0-9a-f]+[ 	]+addi[ 	]+a0,gp.*<data_a>
+-.*:[ 	]+[0-9a-f]+[ 	]+addi[ 	]+a1,a1.*<data_b>
+.*:[ 	]+[0-9a-f]+[ 	]+mv[ 	]+a1,a1
+ #pass
+diff -rup binutils.orig/ld/testsuite/ld-riscv-elf/pcrel-lo-addend-2a.d binutils-2.40/ld/testsuite/ld-riscv-elf/pcrel-lo-addend-2a.d
+--- binutils.orig/ld/testsuite/ld-riscv-elf/pcrel-lo-addend-2a.d	2023-02-16 10:11:38.659875285 +0000
+++ binutils-2.40/ld/testsuite/ld-riscv-elf/pcrel-lo-addend-2a.d	2023-02-16 10:46:55.570899994 +0000
+@@ -2,4 +2,5 @@
+ #source: pcrel-lo-addend-2a.s
+ #as: -march=rv32ic
+ #ld: -m[riscv_choose_ilp32_emul] --no-relax
+#skip: *-*-*
+ #error: .*dangerous relocation: %pcrel_lo overflow with an addend, the value of %pcrel_hi is 0x1000 without any addend, but may be 0x2000 after adding the %pcrel_lo addend
+diff -rup binutils.orig/ld/testsuite/ld-elf/dwarf.exp binutils-2.40/ld/testsuite/ld-elf/dwarf.exp
+--- binutils.orig/ld/testsuite/ld-elf/dwarf.exp	2023-02-16 10:11:38.515875516 +0000
+++ binutils-2.40/ld/testsuite/ld-elf/dwarf.exp	2023-02-16 11:08:52.209377332 +0000
+@@ -29,6 +29,10 @@ if ![is_elf_format] {
+     return
+ }
+ 
+if { [istarget riscv*-*-*] } then {
+    return
+}
+
+ # Skip targets where -shared is not supported
+ 
+ if ![check_shared_lib_support] {
+diff -rup binutils.orig/ld/testsuite/ld-elf/tls.exp binutils-2.40/ld/testsuite/ld-elf/tls.exp
+--- binutils.orig/ld/testsuite/ld-elf/tls.exp	2023-02-16 10:11:38.540875476 +0000
+++ binutils-2.40/ld/testsuite/ld-elf/tls.exp	2023-02-16 11:08:56.944369374 +0000
+@@ -28,6 +28,10 @@ if { !([istarget *-*-linux*]
+     return
+ }
+ 
+if { [istarget riscv*-*-*] } then {
+    return
+}
+
+ # Check to see if the C compiler works.
+ if { ![check_compiler_available] } {
+     return
+--- binutils.orig/binutils/testsuite/binutils-all/objcopy.exp	2023-08-24 07:48:30.429195480 +0100
+++ binutils-2.41/binutils/testsuite/binutils-all/objcopy.exp	2023-08-24 07:57:05.535302711 +0100
+@@ -1409,6 +1409,8 @@ proc objcopy_test_without_global_symbol
+ # The AArch64 and ARM targets preserve mapping symbols
+ # in object files, so they will fail this test.
+ setup_xfail aarch64*-*-* arm*-*-*
+# The RISC-V target compiles with annotation enabled and these symbols remain after stripping.
+setup_xfail riscv*-*-* 
+ 
+ objcopy_test_without_global_symbol
+ 
+--- binutils.orig/ld/testsuite/ld-plugin/plugin.exp	2023-08-24 07:48:31.808196076 +0100
+++ binutils-2.41/ld/testsuite/ld-plugin/plugin.exp	2023-08-24 07:59:30.285716568 +0100
+@@ -132,6 +132,10 @@ if [is_pecoff_format] {
+     append libs " --image-base=0x10000000"
+ }
+ 
+if { [istarget riscv*-*-*] } then {
+    return
+}
+
+ set plugin_tests [list \
+     [list "load plugin" "-plugin $plugin_path \
+     $testobjfiles $libs" "" "" "" {{ld plugin-1.d}} "main.x" ] \
+--- binutils.orig/binutils/testsuite/binutils-all/compress.exp	2023-12-11 10:09:16.923374463 +0000
+++ binutils-2.41/binutils/testsuite/binutils-all/compress.exp	2023-12-12 09:00:15.150036675 +0000
+@@ -818,6 +818,10 @@ proc test_gnu_debuglink {} {
+     }
+ }
+ 
+if { [istarget riscv*-*-*] } then {
+    return
+}
+
+ if {[is_elf_format]} then {
+     test_gnu_debuglink
+ }
+--- binutils-2.41/ld/testsuite/ld-riscv-elf/pcgp-relax-01-norelaxgp.d	2023-07-03 00:00:00.000000000 +0100
+++ binutils.new/ld/testsuite/ld-riscv-elf/pcgp-relax-01-norelaxgp.d	2023-12-12 11:52:54.564057931 +0000
+@@ -8,10 +8,10 @@
+ Disassembly of section \.text:
+ 
+ 0+[0-9a-f]+ <_start>:
+-.*:[ 	]+[0-9a-f]+[ 	]+addi[ 	]+a0,a0,[0-9]+
+.*:[ 	]+[0-9a-f]+[ 	]+addi[ 	]+a0,a0,\-[0-9]+
+ .*:[ 	]+[0-9a-f]+[ 	]+jal[ 	        ]+ra,[0-9a-f]+ <_start>
+ .*:[ 	]+[0-9a-f]+[ 	]+auipc[ 	]+a1,0x[0-9a-f]+
+-.*:[ 	]+[0-9a-f]+[ 	]+addi[ 	]+a1,a1,[0-9]+ # [0-9a-f]+ <data_g>
+.*:[ 	]+[0-9a-f]+[ 	]+addi[ 	]+a1,a1,\-[0-9]+ # [0-9a-f]+ <data_g>
+ .*:[ 	]+[0-9a-f]+[ 	]+lui[ 	        ]+a2,0x[0-9a-f]+
+ .*:[ 	]+[0-9a-f]+[ 	]+addi[ 	]+a2,a2,[0-9]+ # [0-9a-f]+ <data_g>
+ .*:[ 	]+[0-9a-f]+[ 	]+addi[ 	]+a3,tp,0 # 0 <data_t>
+--- binutils.orig/binutils/testsuite/binutils-all/objcopy.exp	2023-12-12 14:21:10.225342926 +0000
+++ binutils-2.41/binutils/testsuite/binutils-all/objcopy.exp	2023-12-12 14:22:12.453421499 +0000
+@@ -1410,7 +1410,7 @@ proc objcopy_test_without_global_symbol
+ # in object files, so they will fail this test.
+ setup_xfail aarch64*-*-* arm*-*-*
+ # The RISC-V target compiles with annotation enabled and these symbols remain after stripping.
+-setup_xfail riscv*-*-* 
+# setup_xfail riscv*-*-* 
+ 
+ objcopy_test_without_global_symbol
+ 
+diff -rup binutils.orig/ld/testsuite/ld-riscv-elf/pcgp-relax-01-norelaxgp.d binutils-2.43.50-1f4aee70ed1/ld/testsuite/ld-riscv-elf/pcgp-relax-01-norelaxgp.d
+--- binutils.orig/ld/testsuite/ld-riscv-elf/pcgp-relax-01-norelaxgp.d	2024-10-03 15:21:47.926570551 +0100
+++ binutils-2.43.50-1f4aee70ed1/ld/testsuite/ld-riscv-elf/pcgp-relax-01-norelaxgp.d	2024-10-03 15:24:26.152502612 +0100
+@@ -8,10 +8,10 @@
+ Disassembly of section \.text:
+ 
+ 0+[0-9a-f]+ <_start>:
+-.*:[ 	]+[0-9a-f]+[ 	]+addi[ 	]+a0,a0,\-[0-9]+
+.*:[ 	]+[0-9a-f]+[ 	]+addi[ 	]+a0,a0,.*
+ .*:[ 	]+[0-9a-f]+[ 	]+jal[ 	        ]+ra,[0-9a-f]+ <_start>
+ .*:[ 	]+[0-9a-f]+[ 	]+auipc[ 	]+a1,0x[0-9a-f]+
+-.*:[ 	]+[0-9a-f]+[ 	]+addi[ 	]+a1,a1,\-[0-9]+ # [0-9a-f]+ <data_g>
+.*:[ 	]+[0-9a-f]+[ 	]+addi[ 	]+a1,a1,.*
+ .*:[ 	]+[0-9a-f]+[ 	]+lui[ 	        ]+a2,0x[0-9a-f]+
+ .*:[ 	]+[0-9a-f]+[ 	]+addi[ 	]+a2,a2,[0-9]+ # [0-9a-f]+ <data_g>
+ .*:[ 	]+[0-9a-f]+[ 	]+addi[ 	]+a3,tp,0 # 0 <data_t>
+diff -rup binutils.orig/ld/testsuite/ld-riscv-elf/pcgp-relax-01.d binutils-2.43.50-1f4aee70ed1/ld/testsuite/ld-riscv-elf/pcgp-relax-01.d
+--- binutils.orig/ld/testsuite/ld-riscv-elf/pcgp-relax-01.d	2024-10-03 15:21:47.926570551 +0100
+++ binutils-2.43.50-1f4aee70ed1/ld/testsuite/ld-riscv-elf/pcgp-relax-01.d	2024-10-03 15:23:54.512530979 +0100
+@@ -8,7 +8,7 @@
+ Disassembly of section \.text:
+ 
+ 0+[0-9a-f]+ <_start>:
+-.*:[ 	]+[0-9a-f]+[ 	]+addi[ 	]+a0,a0,\-[0-9]+
+.*:[ 	]+[0-9a-f]+[ 	]+addi[ 	]+a0,a0,.*
+ .*:[ 	]+[0-9a-f]+[ 	]+jal[ 	]+ra,[0-9a-f]+ <_start>
+ .*:[ 	]+[0-9a-f]+[ 	]+addi[ 	]+a1,gp,\-[0-9]+ # [0-9a-f]+ <data_g>
+ .*:[ 	]+[0-9a-f]+[ 	]+addi[ 	]+a2,gp,\-[0-9]+ # [0-9a-f]+ <data_g>
+diff -rup binutils.orig/ld/testsuite/ld-riscv-elf/pcgp-relax-02.d binutils-2.43.50-1f4aee70ed1/ld/testsuite/ld-riscv-elf/pcgp-relax-02.d
+--- binutils.orig/ld/testsuite/ld-riscv-elf/pcgp-relax-02.d	2024-10-03 15:21:47.926570551 +0100
+++ binutils-2.43.50-1f4aee70ed1/ld/testsuite/ld-riscv-elf/pcgp-relax-02.d	2024-10-03 15:25:01.687468496 +0100
+@@ -11,5 +11,5 @@ Disassembly of section .text:
+ [0-9a-f]+ <_start>:
+ .*:[ 	]+[0-9a-f]+[ 	]+auipc[ 	]+a1.*
+ .*:[ 	]+[0-9a-f]+[ 	]+addi[ 	]+a0,gp.*<data_a>
+-.*:[ 	]+[0-9a-f]+[ 	]+mv[ 	]+a1,a1
+.*:[ 	]+[0-9a-f]+[ 	]+.*
+ #pass
+--- binutils-with-gold-2.45.50-79b2b564fec.orig/ld/testsuite/ld-riscv-elf/zicfilp-unlabeled-plt.d	2025-09-09 15:52:30.684689609 +0100
+++ binutils-with-gold-2.45.50-79b2b564fec/ld/testsuite/ld-riscv-elf/zicfilp-unlabeled-plt.d	2025-09-09 15:53:12.837859447 +0100
+@@ -30,6 +30,6 @@ Disassembly of section \.plt:
+ 
+ [0-9a-f]+ <bar@plt>:
+ .*:[ 	]+[0-9a-f]+[ 	]+lpad[ 	]+0x0
+-.*:[ 	]+[0-9a-f]+[ 	]+auipc[ 	]+t3,0x1
+.*:[ 	]+[0-9a-f]+[ 	]+auipc[ 	]+t3,0x[0-9a-f]+
+ .*:[ 	]+[0-9a-f]+[ 	]+ld[ 	]+t3,[0-9]+\(t3\) # [0-9a-f]+ <bar>
+ .*:[ 	]+[0-9a-f]+[ 	]+jalr[ 	]+t1,t3
+diff -rup binutils-with-gold-2.45.50-beab972c07d,orig/binutils/testsuite/binutils-all/objcopy.exp binutils-with-gold-2.45.50-beab972c07d/binutils/testsuite/binutils-all/objcopy.exp
+--- binutils-with-gold-2.45.50-beab972c07d,orig/binutils/testsuite/binutils-all/objcopy.exp	2025-12-02 12:47:19.063123207 +0000
+++ binutils-with-gold-2.45.50-beab972c07d/binutils/testsuite/binutils-all/objcopy.exp	2025-12-04 12:39:26.079989597 +0000
+@@ -602,14 +602,19 @@ proc strip_test { } {
+     set exec_output [binutils_run $STRIP "$STRIPFLAGS $objfile"]
+     set exec_output [prune_warnings $exec_output]
+     if ![string equal "" $exec_output] {
+-	fail $test
+	fail "$test (warnings in linker output)"
+	verbose $exec_output
+ 	return
+     }
+ 
+     set exec_output [binutils_run $NM "-a $NMFLAGS $objfile"]
+     set exec_output [prune_warnings $exec_output]
+     if ![string match "*: no symbols*" $exec_output] {
+-	fail $test
+
+	# The RISC-V target compiles with annotation enabled and these symbols remain after stripping.
+	setup_xfail riscv*-*-* 
+
+	fail "$test (symbols in nm output)"
+ 	return
+     }
+ 
+@@ -659,6 +664,9 @@ proc strip_test_with_saving_a_symbol { }
+     pass $test
+ }
+ 
+# The RISC-V target compiles with annotation enabled and these symbols remain after stripping.
+setup_xfail riscv*-*-* 
+
+ strip_test_with_saving_a_symbol
+ 
+ # Test stripping an archive.
+@@ -1503,7 +1519,7 @@ proc objcopy_test_without_global_symbol
+ # in object files, so they will fail this test.
+ setup_xfail aarch64*-*-* arm*-*-*
+ # The RISC-V target compiles with annotation enabled and these symbols remain after stripping.
+-# setup_xfail riscv*-*-* 
+setup_xfail riscv*-*-* 
+ 
+ objcopy_test_without_global_symbol
+ 
+diff -rup binutils-with-gold-2.45.50-beab972c07d,orig/ld/testsuite/lib/ld-lib.exp binutils-with-gold-2.45.50-beab972c07d/ld/testsuite/lib/ld-lib.exp
+--- binutils-with-gold-2.45.50-beab972c07d,orig/ld/testsuite/lib/ld-lib.exp	2025-12-02 12:47:19.201090894 +0000
+++ binutils-with-gold-2.45.50-beab972c07d/ld/testsuite/lib/ld-lib.exp	2025-12-03 09:30:07.184360005 +0000
+@@ -1633,6 +1633,12 @@ proc compile_one_cc { src output additio
+ proc check_ctf_available { } {
+     global ctf_available_saved
+ 
+    # Skip CTF tests for the Risc-V target for now, as the
+    # tests have not been tweaked to support the riscv format.
+    if { [istarget "riscv*-*-linux*"] } {
+	return 0
+    }
+    
+     if {![info exists ctf_available_saved]} {
+ 	set ctf_available_saved 0
+ 
+--- fred/binutils/testsuite/lib/binutils-common.exp	2026-03-16 09:18:37.205413649 +0000
+++ binutils-with-gold-2.46.50-d712202846b/binutils/testsuite/lib/binutils-common.exp	2026-03-16 09:18:49.559358668 +0000
+@@ -803,6 +803,9 @@ proc prune_warnings_extra { text } {
+     # Ignore warnings about linking objects with an old sframe format
+     regsub -all {(^|\n)([^\n]* unexpected SFrame format version [^\n]*\n[^\n]* SFrame section ignored\n?)+} $text {\1} text
+ 
+    # Skip warnings about the LTO plugin being needed.
+    regsub -all "(^|\n)(\[^\n\]*:\[^\n\]*plugin needed to handle lto object\[^\n\]*\n?)+" $text "\\1" text
+    
+     return $text
+ }
+ 
+--- binutils.orig/ld/testsuite/ld-elf/shared.exp	2026-06-10 15:32:21.012274073 +0100
+++ binutils-with-gold-2.46.50-48997323b0f/ld/testsuite/ld-elf/shared.exp	2026-06-10 15:34:41.397899263 +0100
+@@ -1859,6 +1859,10 @@ run_cc_link_tests [list \
+ 	"pr29655.so" \
+     ] \
+ ]
+
+# FIXME: Find out why the Risc-V fails this test.
+setup_xfail "riscv64-*-*"
+
+ # PR 29655 (cont.): Check that in PIC code linked as PDE taking the address
+ # of a function defined in a DSO results in the function address (from GOT)
+ # and not the "canonical PLT" address from the PDE.
--- a/binutils-s390-build.patch
+++ b/binutils-s390-build.patch
@ -1,772 +0,0 @@
-diff -rup binutils.orig/libctf/ctf-create.c binutils-2.34.0/libctf/ctf-create.c
--- binutils.orig/libctf/ctf-create.c	2020-06-16 12:06:28.466468753 +0100
-+++ binutils-2.34.0/libctf/ctf-create.c	2020-06-16 12:16:19.744482839 +0100
-@@ -871,7 +871,8 @@ ctf_add_encoded (ctf_file_t *fp, uint32_
- 
-   if ((type = ctf_add_generic (fp, flag, name, kind, &dtd)) == CTF_ERR)
-     return CTF_ERR;		/* errno is set for us.  */
-
-+  if (dtd == NULL)
-+    return CTF_ERR;
-   dtd->dtd_data.ctt_info = CTF_TYPE_INFO (kind, flag, 0);
-   dtd->dtd_data.ctt_size = clp2 (P2ROUNDUP (ep->cte_bits, CHAR_BIT)
- 				 / CHAR_BIT);
-@@ -896,6 +897,8 @@ ctf_add_reftype (ctf_file_t *fp, uint32_
- 
-   if ((type = ctf_add_generic (fp, flag, NULL, kind, &dtd)) == CTF_ERR)
-     return CTF_ERR;		/* errno is set for us.  */
-+  if (dtd == NULL)
-+    return CTF_ERR;
- 
-   dtd->dtd_data.ctt_info = CTF_TYPE_INFO (kind, flag, 0);
-   dtd->dtd_data.ctt_type = (uint32_t) ref;
-@@ -958,6 +961,8 @@ ctf_add_slice (ctf_file_t *fp, uint32_t
- 
-   if ((type = ctf_add_generic (fp, flag, NULL, CTF_K_SLICE, &dtd)) == CTF_ERR)
-     return CTF_ERR;		/* errno is set for us.  */
-+  if (dtd == NULL)
-+    return CTF_ERR;
- 
-   dtd->dtd_data.ctt_info = CTF_TYPE_INFO (CTF_K_SLICE, flag, 0);
-   dtd->dtd_data.ctt_size = clp2 (P2ROUNDUP (ep->cte_bits, CHAR_BIT)
-@@ -1008,6 +1013,8 @@ ctf_add_array (ctf_file_t *fp, uint32_t
- 
-   if ((type = ctf_add_generic (fp, flag, NULL, CTF_K_ARRAY, &dtd)) == CTF_ERR)
-     return CTF_ERR;		/* errno is set for us.  */
-+  if (dtd == NULL)
-+    return CTF_ERR;
- 
-   dtd->dtd_data.ctt_info = CTF_TYPE_INFO (CTF_K_ARRAY, flag, 0);
-   dtd->dtd_data.ctt_size = 0;
-@@ -1075,6 +1082,8 @@ ctf_add_function (ctf_file_t *fp, uint32
-       free (vdat);
-       return CTF_ERR;		   /* errno is set for us.  */
-     }
-+  if (dtd == NULL)
-+    return CTF_ERR;
- 
-   dtd->dtd_data.ctt_info = CTF_TYPE_INFO (CTF_K_FUNCTION, flag, vlen);
-   dtd->dtd_data.ctt_type = (uint32_t) ctc->ctc_return;
-@@ -1104,6 +1113,8 @@ ctf_add_struct_sized (ctf_file_t *fp, ui
-   else if ((type = ctf_add_generic (fp, flag, name, CTF_K_STRUCT,
- 				    &dtd)) == CTF_ERR)
-     return CTF_ERR;		/* errno is set for us.  */
-+  if (dtd == NULL)
-+    return CTF_ERR;
- 
-   dtd->dtd_data.ctt_info = CTF_TYPE_INFO (CTF_K_STRUCT, flag, 0);
- 
-@@ -1141,6 +1152,8 @@ ctf_add_union_sized (ctf_file_t *fp, uin
-   else if ((type = ctf_add_generic (fp, flag, name, CTF_K_UNION,
- 				    &dtd)) == CTF_ERR)
-     return CTF_ERR;		/* errno is set for us */
-+  if (dtd == NULL)
-+    return CTF_ERR;
- 
-   dtd->dtd_data.ctt_info = CTF_TYPE_INFO (CTF_K_UNION, flag, 0);
- 
-@@ -1177,6 +1190,8 @@ ctf_add_enum (ctf_file_t *fp, uint32_t f
-   else if ((type = ctf_add_generic (fp, flag, name, CTF_K_ENUM,
- 				    &dtd)) == CTF_ERR)
-     return CTF_ERR;		/* errno is set for us.  */
-+  if (dtd == NULL)
-+    return CTF_ERR;
- 
-   dtd->dtd_data.ctt_info = CTF_TYPE_INFO (CTF_K_ENUM, flag, 0);
-   dtd->dtd_data.ctt_size = fp->ctf_dmodel->ctd_int;
-diff -rup binutils.orig/libctf/ctf-types.c binutils-2.34.0/libctf/ctf-types.c
--- binutils.orig/libctf/ctf-types.c	2020-06-16 12:06:28.466468753 +0100
-+++ binutils-2.34.0/libctf/ctf-types.c	2020-06-16 12:10:58.033563365 +0100
-@@ -748,7 +748,7 @@ ctf_type_encoding (ctf_file_t *fp, ctf_i
- 	case CTF_K_SLICE:
- 	  {
- 	    const ctf_slice_t *slice;
-	    ctf_encoding_t underlying_en;
-+	    ctf_encoding_t underlying_en = {0};
- 	    slice = &dtd->dtd_u.dtu_slice;
- 
- 	    data = ctf_type_encoding (fp, slice->cts_type, &underlying_en);
-diff -rup binutils.orig/opcodes/s390-mkopc.c binutils-2.34.0/opcodes/s390-mkopc.c
--- binutils.orig/opcodes/s390-mkopc.c	2020-06-16 12:06:28.447468816 +0100
-+++ binutils-2.34.0/opcodes/s390-mkopc.c	2020-06-16 12:17:10.783311417 +0100
-@@ -168,7 +168,7 @@ insertExpandedMnemonic (char *opcode, ch
-   int mask_start, i = 0, tag_found = 0, reading_number = 0;
-   int number_p = 0, suffix_p = 0, prefix_p = 0;
-   const struct s390_cond_ext_format *ext_table;
-  int ext_table_length;
-+  int ext_table_length = 0;
- 
-   if (!(tag = strpbrk (mnemonic, "*$")))
-     {
-Only in binutils.orig/libctf: .#ctf-create.c
-diff -rup binutils.orig/libctf/ctf-create.c binutils-2.34.0/libctf/ctf-create.c
--- binutils.orig/libctf/ctf-create.c	2020-06-16 14:49:06.080801319 +0100
-+++ binutils-2.34.0/libctf/ctf-create.c	2020-06-16 14:49:08.046794113 +0100
-@@ -798,6 +798,7 @@ ctf_add_generic (ctf_file_t *fp, uint32_
- {
-   ctf_dtdef_t *dtd;
-   ctf_id_t type;
-+  *rp = NULL;
- 
-   if (flag != CTF_ADD_NONROOT && flag != CTF_ADD_ROOT)
-     return (ctf_set_errno (fp, EINVAL));
-diff -rup binutils.orig/opcodes/fr30-ibld.c binutils-2.34.0/opcodes/fr30-ibld.c
--- binutils.orig/opcodes/fr30-ibld.c	2020-06-16 14:49:06.074801341 +0100
-+++ binutils-2.34.0/opcodes/fr30-ibld.c	2020-06-16 16:43:31.428324833 +0100
-@@ -810,7 +810,7 @@ fr30_cgen_extract_operand (CGEN_CPU_DESC
-       break;
-     case FR30_OPERAND_DIR10 :
-       {
-        long value;
-+        long value = 0;
-         length = extract_normal (cd, ex_info, insn_value, 0, 0, 8, 8, 16, total_length, pc, & value);
-         value = ((value) << (2));
-         fields->f_dir10 = value;
-@@ -821,7 +821,7 @@ fr30_cgen_extract_operand (CGEN_CPU_DESC
-       break;
-     case FR30_OPERAND_DIR9 :
-       {
-        long value;
-+        long value = 0;
-         length = extract_normal (cd, ex_info, insn_value, 0, 0, 8, 8, 16, total_length, pc, & value);
-         value = ((value) << (1));
-         fields->f_dir9 = value;
-@@ -829,7 +829,7 @@ fr30_cgen_extract_operand (CGEN_CPU_DESC
-       break;
-     case FR30_OPERAND_DISP10 :
-       {
-        long value;
-+        long value = 0;
-         length = extract_normal (cd, ex_info, insn_value, 0|(1<<CGEN_IFLD_SIGNED), 0, 4, 8, 16, total_length, pc, & value);
-         value = ((value) * (4));
-         fields->f_disp10 = value;
-@@ -840,7 +840,7 @@ fr30_cgen_extract_operand (CGEN_CPU_DESC
-       break;
-     case FR30_OPERAND_DISP9 :
-       {
-        long value;
-+        long value = 0;
-         length = extract_normal (cd, ex_info, insn_value, 0|(1<<CGEN_IFLD_SIGNED), 0, 4, 8, 16, total_length, pc, & value);
-         value = ((value) * (2));
-         fields->f_disp9 = value;
-@@ -865,7 +865,7 @@ fr30_cgen_extract_operand (CGEN_CPU_DESC
-       break;
-     case FR30_OPERAND_LABEL12 :
-       {
-        long value;
-+        long value = 0;
-         length = extract_normal (cd, ex_info, insn_value, 0|(1<<CGEN_IFLD_SIGNED)|(1<<CGEN_IFLD_PCREL_ADDR), 0, 5, 11, 16, total_length, pc, & value);
-         value = ((((value) * (2))) + (((pc) + (2))));
-         fields->f_rel12 = value;
-@@ -873,7 +873,7 @@ fr30_cgen_extract_operand (CGEN_CPU_DESC
-       break;
-     case FR30_OPERAND_LABEL9 :
-       {
-        long value;
-+        long value = 0;
-         length = extract_normal (cd, ex_info, insn_value, 0|(1<<CGEN_IFLD_SIGNED)|(1<<CGEN_IFLD_PCREL_ADDR), 0, 8, 8, 16, total_length, pc, & value);
-         value = ((((value) * (2))) + (((pc) + (2))));
-         fields->f_rel9 = value;
-@@ -881,7 +881,7 @@ fr30_cgen_extract_operand (CGEN_CPU_DESC
-       break;
-     case FR30_OPERAND_M4 :
-       {
-        long value;
-+        long value = 0;
-         length = extract_normal (cd, ex_info, insn_value, 0, 0, 8, 4, 16, total_length, pc, & value);
-         value = ((value) | (-16));
-         fields->f_m4 = value;
-@@ -911,7 +911,7 @@ fr30_cgen_extract_operand (CGEN_CPU_DESC
-       break;
-     case FR30_OPERAND_U10 :
-       {
-        long value;
-+        long value = 0;
-         length = extract_normal (cd, ex_info, insn_value, 0, 0, 8, 8, 16, total_length, pc, & value);
-         value = ((value) << (2));
-         fields->f_u10 = value;
-@@ -928,7 +928,7 @@ fr30_cgen_extract_operand (CGEN_CPU_DESC
-       break;
-     case FR30_OPERAND_UDISP6 :
-       {
-        long value;
-+        long value = 0;
-         length = extract_normal (cd, ex_info, insn_value, 0, 0, 8, 4, 16, total_length, pc, & value);
-         value = ((value) << (2));
-         fields->f_udisp6 = value;
-
-diff -rup binutils.orig/opcodes/fr30-ibld.c binutils-2.34.0/opcodes/fr30-ibld.c
--- binutils.orig/opcodes/fr30-ibld.c	2020-06-16 17:10:22.540563440 +0100
-+++ binutils-2.34.0/opcodes/fr30-ibld.c	2020-06-16 17:10:48.966468906 +0100
-@@ -903,7 +903,7 @@ fr30_cgen_extract_operand (CGEN_CPU_DESC
-       break;
-     case FR30_OPERAND_S10 :
-       {
-        long value;
-+        long value = 0;
-         length = extract_normal (cd, ex_info, insn_value, 0|(1<<CGEN_IFLD_SIGNED), 0, 8, 8, 16, total_length, pc, & value);
-         value = ((value) * (4));
-         fields->f_s10 = value;
-Only in binutils-2.34.0/opcodes: fr30-ibld.c~
--- binutils.orig/opcodes/m32c-ibld.c	2020-06-16 17:10:22.531563472 +0100
-+++ binutils-2.34.0/opcodes/m32c-ibld.c	2020-06-16 17:25:48.612258094 +0100
-@@ -1805,7 +1805,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC
-       break;
-     case M32C_OPERAND_BIT32RNPREFIXED :
-       {
-        long value;
-+        long value = 0;
-         length = extract_normal (cd, ex_info, insn_value, 0, 0, 16, 2, 32, total_length, pc, & value);
-         value = (((((~ (((USI) (value) >> (1))))) & (1))) | (((((value) << (1))) & (2))));
-         fields->f_dst32_rn_prefixed_QI = value;
-@@ -1813,7 +1813,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC
-       break;
-     case M32C_OPERAND_BIT32RNUNPREFIXED :
-       {
-        long value;
-+        long value = 0;
-         length = extract_normal (cd, ex_info, insn_value, 0, 0, 8, 2, 32, total_length, pc, & value);
-         value = (((((~ (((USI) (value) >> (1))))) & (1))) | (((((value) << (1))) & (2))));
-         fields->f_dst32_rn_unprefixed_QI = value;
-@@ -1824,7 +1824,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC
-       break;
-     case M32C_OPERAND_BITBASE16_16_U16 :
-       {
-        long value;
-+        long value = 0;
-         length = extract_normal (cd, ex_info, insn_value, 0, 0, 16, 16, 32, total_length, pc, & value);
-         value = ((((((UHI) (value) >> (8))) & (255))) | (((((value) & (255))) << (8))));
-         fields->f_dsp_16_u16 = value;
-@@ -1860,7 +1860,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC
-         length = extract_normal (cd, ex_info, insn_value, 0, 0, 13, 3, 32, total_length, pc, & fields->f_bitno32_unprefixed);
-         if (length <= 0) break;
-         {
-        long value;
-+        long value = 0;
-         length = extract_normal (cd, ex_info, insn_value, 0|(1<<CGEN_IFLD_SIGNED), 0, 16, 16, 32, total_length, pc, & value);
-         value = EXTHISI (((HI) (INT) (((((((UINT) (value) >> (8))) & (255))) | (((((value) & (255))) << (8)))))));
-         fields->f_dsp_16_s16 = value;
-@@ -1887,7 +1887,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC
-         length = extract_normal (cd, ex_info, insn_value, 0, 0, 13, 3, 32, total_length, pc, & fields->f_bitno32_unprefixed);
-         if (length <= 0) break;
-         {
-        long value;
-+        long value = 0;
-         length = extract_normal (cd, ex_info, insn_value, 0, 0, 16, 16, 32, total_length, pc, & value);
-         value = ((((((UHI) (value) >> (8))) & (255))) | (((((value) & (255))) << (8))));
-         fields->f_dsp_16_u16 = value;
-@@ -1903,7 +1903,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC
-         length = extract_normal (cd, ex_info, insn_value, 0, 0, 13, 3, 32, total_length, pc, & fields->f_bitno32_unprefixed);
-         if (length <= 0) break;
-         {
-        long value;
-+        long value = 0;
-         length = extract_normal (cd, ex_info, insn_value, 0, 0, 16, 16, 32, total_length, pc, & value);
-         value = ((((((UHI) (value) >> (8))) & (255))) | (((((value) & (255))) << (8))));
-         fields->f_dsp_16_u16 = value;
-@@ -1971,7 +1971,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC
-         length = extract_normal (cd, ex_info, insn_value, 0, 0, 24, 8, 32, total_length, pc, & fields->f_dsp_24_u8);
-         if (length <= 0) break;
-         {
-        long value;
-+        long value = 0;
-         length = extract_normal (cd, ex_info, insn_value, 0, 32, 0, 16, 32, total_length, pc, & value);
-         value = ((((((UHI) (value) >> (8))) & (255))) | (((((value) & (255))) << (8))));
-         fields->f_dsp_32_u16 = value;
-@@ -1996,7 +1996,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC
-       break;
-     case M32C_OPERAND_DSP_16_S16 :
-       {
-        long value;
-+        long value = 0;
-         length = extract_normal (cd, ex_info, insn_value, 0|(1<<CGEN_IFLD_SIGNED), 0, 16, 16, 32, total_length, pc, & value);
-         value = EXTHISI (((HI) (INT) (((((((UINT) (value) >> (8))) & (255))) | (((((value) & (255))) << (8)))))));
-         fields->f_dsp_16_s16 = value;
-@@ -2007,7 +2007,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC
-       break;
-     case M32C_OPERAND_DSP_16_U16 :
-       {
-        long value;
-+        long value = 0;
-         length = extract_normal (cd, ex_info, insn_value, 0, 0, 16, 16, 32, total_length, pc, & value);
-         value = ((((((UHI) (value) >> (8))) & (255))) | (((((value) & (255))) << (8))));
-         fields->f_dsp_16_u16 = value;
-@@ -2016,7 +2016,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC
-     case M32C_OPERAND_DSP_16_U20 :
-       {
-         {
-        long value;
-+        long value = 0;
-         length = extract_normal (cd, ex_info, insn_value, 0, 0, 16, 16, 32, total_length, pc, & value);
-         value = ((((((UHI) (value) >> (8))) & (255))) | (((((value) & (255))) << (8))));
-         fields->f_dsp_16_u16 = value;
-@@ -2032,7 +2032,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC
-     case M32C_OPERAND_DSP_16_U24 :
-       {
-         {
-        long value;
-+        long value = 0;
-         length = extract_normal (cd, ex_info, insn_value, 0, 0, 16, 16, 32, total_length, pc, & value);
-         value = ((((((UHI) (value) >> (8))) & (255))) | (((((value) & (255))) << (8))));
-         fields->f_dsp_16_u16 = value;
-@@ -2078,7 +2078,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC
-         length = extract_normal (cd, ex_info, insn_value, 0, 0, 24, 8, 32, total_length, pc, & fields->f_dsp_24_u8);
-         if (length <= 0) break;
-         {
-        long value;
-+        long value = 0;
-         length = extract_normal (cd, ex_info, insn_value, 0, 32, 0, 16, 32, total_length, pc, & value);
-         value = ((((((UHI) (value) >> (8))) & (255))) | (((((value) & (255))) << (8))));
-         fields->f_dsp_32_u16 = value;
-@@ -2094,7 +2094,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC
-         length = extract_normal (cd, ex_info, insn_value, 0, 0, 24, 8, 32, total_length, pc, & fields->f_dsp_24_u8);
-         if (length <= 0) break;
-         {
-        long value;
-+        long value = 0;
-         length = extract_normal (cd, ex_info, insn_value, 0, 32, 0, 16, 32, total_length, pc, & value);
-         value = ((((((UHI) (value) >> (8))) & (255))) | (((((value) & (255))) << (8))));
-         fields->f_dsp_32_u16 = value;
-@@ -2110,7 +2110,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC
-       break;
-     case M32C_OPERAND_DSP_32_S16 :
-       {
-        long value;
-+        long value = 0;
-         length = extract_normal (cd, ex_info, insn_value, 0|(1<<CGEN_IFLD_SIGNED), 32, 0, 16, 32, total_length, pc, & value);
-         value = EXTHISI (((HI) (INT) (((((((UINT) (value) >> (8))) & (255))) | (((((value) & (255))) << (8)))))));
-         fields->f_dsp_32_s16 = value;
-@@ -2121,7 +2121,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC
-       break;
-     case M32C_OPERAND_DSP_32_U16 :
-       {
-        long value;
-+        long value = 0;
-         length = extract_normal (cd, ex_info, insn_value, 0, 32, 0, 16, 32, total_length, pc, & value);
-         value = ((((((UHI) (value) >> (8))) & (255))) | (((((value) & (255))) << (8))));
-         fields->f_dsp_32_u16 = value;
-@@ -2129,7 +2129,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC
-       break;
-     case M32C_OPERAND_DSP_32_U20 :
-       {
-        long value;
-+        long value = 0;
-         length = extract_normal (cd, ex_info, insn_value, 0, 32, 0, 24, 32, total_length, pc, & value);
-         value = ((((((((USI) (value) >> (16))) & (255))) | (((value) & (65280))))) | (((((value) << (16))) & (16711680))));
-         fields->f_dsp_32_u24 = value;
-@@ -2137,7 +2137,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC
-       break;
-     case M32C_OPERAND_DSP_32_U24 :
-       {
-        long value;
-+        long value = 0;
-         length = extract_normal (cd, ex_info, insn_value, 0, 32, 0, 24, 32, total_length, pc, & value);
-         value = ((((((((USI) (value) >> (16))) & (255))) | (((value) & (65280))))) | (((((value) << (16))) & (16711680))));
-         fields->f_dsp_32_u24 = value;
-@@ -2148,7 +2148,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC
-       break;
-     case M32C_OPERAND_DSP_40_S16 :
-       {
-        long value;
-+        long value = 0;
-         length = extract_normal (cd, ex_info, insn_value, 0|(1<<CGEN_IFLD_SIGNED), 32, 8, 16, 32, total_length, pc, & value);
-         value = EXTHISI (((HI) (INT) (((((((UINT) (value) >> (8))) & (255))) | (((((value) & (255))) << (8)))))));
-         fields->f_dsp_40_s16 = value;
-@@ -2159,7 +2159,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC
-       break;
-     case M32C_OPERAND_DSP_40_U16 :
-       {
-        long value;
-+        long value = 0;
-         length = extract_normal (cd, ex_info, insn_value, 0, 32, 8, 16, 32, total_length, pc, & value);
-         value = ((((((UHI) (value) >> (8))) & (255))) | (((((value) & (255))) << (8))));
-         fields->f_dsp_40_u16 = value;
-@@ -2167,7 +2167,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC
-       break;
-     case M32C_OPERAND_DSP_40_U20 :
-       {
-        long value;
-+        long value = 0;
-         length = extract_normal (cd, ex_info, insn_value, 0, 32, 8, 20, 32, total_length, pc, & value);
-         value = ((((((((USI) (value) >> (16))) & (255))) | (((value) & (65280))))) | (((((value) << (16))) & (983040))));
-         fields->f_dsp_40_u20 = value;
-@@ -2175,7 +2175,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC
-       break;
-     case M32C_OPERAND_DSP_40_U24 :
-       {
-        long value;
-+        long value = 0;
-         length = extract_normal (cd, ex_info, insn_value, 0, 32, 8, 24, 32, total_length, pc, & value);
-         value = ((((((((USI) (value) >> (16))) & (255))) | (((value) & (65280))))) | (((((value) << (16))) & (16711680))));
-         fields->f_dsp_40_u24 = value;
-@@ -2186,7 +2186,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC
-       break;
-     case M32C_OPERAND_DSP_48_S16 :
-       {
-        long value;
-+        long value = 0;
-         length = extract_normal (cd, ex_info, insn_value, 0|(1<<CGEN_IFLD_SIGNED), 32, 16, 16, 32, total_length, pc, & value);
-         value = EXTHISI (((HI) (INT) (((((((UINT) (value) >> (8))) & (255))) | (((((value) & (255))) << (8)))))));
-         fields->f_dsp_48_s16 = value;
-@@ -2197,7 +2197,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC
-       break;
-     case M32C_OPERAND_DSP_48_U16 :
-       {
-        long value;
-+        long value = 0;
-         length = extract_normal (cd, ex_info, insn_value, 0, 32, 16, 16, 32, total_length, pc, & value);
-         value = ((((((UHI) (value) >> (8))) & (255))) | (((((value) & (255))) << (8))));
-         fields->f_dsp_48_u16 = value;
-@@ -2206,7 +2206,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC
-     case M32C_OPERAND_DSP_48_U20 :
-       {
-         {
-        long value;
-+        long value = 0;
-         length = extract_normal (cd, ex_info, insn_value, 0, 32, 16, 16, 32, total_length, pc, & value);
-         value = ((((((UHI) (value) >> (8))) & (255))) | (((((value) & (255))) << (8))));
-         fields->f_dsp_48_u16 = value;
-@@ -2222,7 +2222,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC
-     case M32C_OPERAND_DSP_48_U24 :
-       {
-         {
-        long value;
-+        long value = 0;
-         length = extract_normal (cd, ex_info, insn_value, 0, 32, 16, 16, 32, total_length, pc, & value);
-         value = ((((((UHI) (value) >> (8))) & (255))) | (((((value) & (255))) << (8))));
-         fields->f_dsp_48_u16 = value;
-@@ -2240,7 +2240,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC
-       break;
-     case M32C_OPERAND_DSP_8_S24 :
-       {
-        long value;
-+        long value = 0;
-         length = extract_normal (cd, ex_info, insn_value, 0|(1<<CGEN_IFLD_SIGNED), 0, 8, 24, 32, total_length, pc, & value);
-         value = ((((((((((((USI) (value) >> (16))) & (255))) | (((value) & (65280))))) | (((((value) & (255))) << (16))))) ^ (8388608))) - (8388608));
-         fields->f_dsp_8_s24 = value;
-@@ -2251,7 +2251,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC
-       break;
-     case M32C_OPERAND_DSP_8_U16 :
-       {
-        long value;
-+        long value = 0;
-         length = extract_normal (cd, ex_info, insn_value, 0, 0, 8, 16, 32, total_length, pc, & value);
-         value = ((((((UHI) (value) >> (8))) & (255))) | (((((value) & (255))) << (8))));
-         fields->f_dsp_8_u16 = value;
-@@ -2259,7 +2259,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC
-       break;
-     case M32C_OPERAND_DSP_8_U24 :
-       {
-        long value;
-+        long value = 0;
-         length = extract_normal (cd, ex_info, insn_value, 0, 0, 8, 24, 32, total_length, pc, & value);
-         value = ((((((USI) (value) >> (16))) | (((value) & (65280))))) | (((((value) & (255))) << (16))));
-         fields->f_dsp_8_u24 = value;
-@@ -2343,7 +2343,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC
-       break;
-     case M32C_OPERAND_DST32RNPREFIXEDHI :
-       {
-        long value;
-+        long value = 0;
-         length = extract_normal (cd, ex_info, insn_value, 0, 0, 16, 2, 32, total_length, pc, & value);
-         value = ((((value) + (2))) % (4));
-         fields->f_dst32_rn_prefixed_HI = value;
-@@ -2351,7 +2351,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC
-       break;
-     case M32C_OPERAND_DST32RNPREFIXEDQI :
-       {
-        long value;
-+        long value = 0;
-         length = extract_normal (cd, ex_info, insn_value, 0, 0, 16, 2, 32, total_length, pc, & value);
-         value = (((((~ (((USI) (value) >> (1))))) & (1))) | (((((value) << (1))) & (2))));
-         fields->f_dst32_rn_prefixed_QI = value;
-@@ -2359,7 +2359,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC
-       break;
-     case M32C_OPERAND_DST32RNPREFIXEDSI :
-       {
-        long value;
-+        long value = 0;
-         length = extract_normal (cd, ex_info, insn_value, 0, 0, 16, 2, 32, total_length, pc, & value);
-         value = ((value) - (2));
-         fields->f_dst32_rn_prefixed_SI = value;
-@@ -2367,7 +2367,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC
-       break;
-     case M32C_OPERAND_DST32RNUNPREFIXEDHI :
-       {
-        long value;
-+        long value = 0;
-         length = extract_normal (cd, ex_info, insn_value, 0, 0, 8, 2, 32, total_length, pc, & value);
-         value = ((((value) + (2))) % (4));
-         fields->f_dst32_rn_unprefixed_HI = value;
-@@ -2375,7 +2375,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC
-       break;
-     case M32C_OPERAND_DST32RNUNPREFIXEDQI :
-       {
-        long value;
-+        long value = 0;
-         length = extract_normal (cd, ex_info, insn_value, 0, 0, 8, 2, 32, total_length, pc, & value);
-         value = (((((~ (((USI) (value) >> (1))))) & (1))) | (((((value) << (1))) & (2))));
-         fields->f_dst32_rn_unprefixed_QI = value;
-@@ -2383,7 +2383,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC
-       break;
-     case M32C_OPERAND_DST32RNUNPREFIXEDSI :
-       {
-        long value;
-+        long value = 0;
-         length = extract_normal (cd, ex_info, insn_value, 0, 0, 8, 2, 32, total_length, pc, & value);
-         value = ((value) - (2));
-         fields->f_dst32_rn_unprefixed_SI = value;
-@@ -2402,7 +2402,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC
-       break;
-     case M32C_OPERAND_IMM_16_HI :
-       {
-        long value;
-+        long value = 0;
-         length = extract_normal (cd, ex_info, insn_value, 0|(1<<CGEN_IFLD_SIGNED), 0, 16, 16, 32, total_length, pc, & value);
-         value = EXTHISI (((HI) (INT) (((((((UINT) (value) >> (8))) & (255))) | (((((value) & (255))) << (8)))))));
-         fields->f_dsp_16_s16 = value;
-@@ -2414,14 +2414,14 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC
-     case M32C_OPERAND_IMM_16_SI :
-       {
-         {
-        long value;
-+        long value = 0;
-         length = extract_normal (cd, ex_info, insn_value, 0, 0, 16, 16, 32, total_length, pc, & value);
-         value = ((((((UHI) (value) >> (8))) & (255))) | (((((value) & (255))) << (8))));
-         fields->f_dsp_16_u16 = value;
-       }
-         if (length <= 0) break;
-         {
-        long value;
-+        long value = 0;
-         length = extract_normal (cd, ex_info, insn_value, 0, 32, 0, 16, 32, total_length, pc, & value);
-         value = ((((((UHI) (value) >> (8))) & (255))) | (((((value) & (255))) << (8))));
-         fields->f_dsp_32_u16 = value;
-@@ -2454,7 +2454,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC
-         length = extract_normal (cd, ex_info, insn_value, 0, 0, 24, 8, 32, total_length, pc, & fields->f_dsp_24_u8);
-         if (length <= 0) break;
-         {
-        long value;
-+        long value = 0;
-         length = extract_normal (cd, ex_info, insn_value, 0, 32, 0, 24, 32, total_length, pc, & value);
-         value = ((((((((USI) (value) >> (16))) & (255))) | (((value) & (65280))))) | (((((value) << (16))) & (16711680))));
-         fields->f_dsp_32_u24 = value;
-@@ -2467,7 +2467,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC
-       break;
-     case M32C_OPERAND_IMM_32_HI :
-       {
-        long value;
-+        long value = 0;
-         length = extract_normal (cd, ex_info, insn_value, 0|(1<<CGEN_IFLD_SIGNED), 32, 0, 16, 32, total_length, pc, & value);
-         value = EXTHISI (((HI) (INT) (((((((UINT) (value) >> (8))) & (255))) | (((((value) & (255))) << (8)))))));
-         fields->f_dsp_32_s16 = value;
-@@ -2486,7 +2486,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC
-       break;
-     case M32C_OPERAND_IMM_40_HI :
-       {
-        long value;
-+        long value = 0;
-         length = extract_normal (cd, ex_info, insn_value, 0|(1<<CGEN_IFLD_SIGNED), 32, 8, 16, 32, total_length, pc, & value);
-         value = EXTHISI (((HI) (INT) (((((((UINT) (value) >> (8))) & (255))) | (((((value) & (255))) << (8)))))));
-         fields->f_dsp_40_s16 = value;
-@@ -2498,7 +2498,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC
-     case M32C_OPERAND_IMM_40_SI :
-       {
-         {
-        long value;
-+        long value = 0;
-         length = extract_normal (cd, ex_info, insn_value, 0, 32, 8, 24, 32, total_length, pc, & value);
-         value = ((((((((USI) (value) >> (16))) & (255))) | (((value) & (65280))))) | (((((value) << (16))) & (16711680))));
-         fields->f_dsp_40_u24 = value;
-@@ -2513,7 +2513,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC
-       break;
-     case M32C_OPERAND_IMM_48_HI :
-       {
-        long value;
-+        long value = 0;
-         length = extract_normal (cd, ex_info, insn_value, 0|(1<<CGEN_IFLD_SIGNED), 32, 16, 16, 32, total_length, pc, & value);
-         value = EXTHISI (((HI) (INT) (((((((UINT) (value) >> (8))) & (255))) | (((((value) & (255))) << (8)))))));
-         fields->f_dsp_48_s16 = value;
-@@ -2525,14 +2525,14 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC
-     case M32C_OPERAND_IMM_48_SI :
-       {
-         {
-        long value;
-+        long value = 0;
-         length = extract_normal (cd, ex_info, insn_value, 0, 32, 16, 16, 32, total_length, pc, & value);
-         value = ((((((UHI) (value) >> (8))) & (255))) | (((((value) & (255))) << (8))));
-         fields->f_dsp_48_u16 = value;
-       }
-         if (length <= 0) break;
-         {
-        long value;
-+        long value = 0;
-         length = extract_normal (cd, ex_info, insn_value, 0, 64, 0, 16, 32, total_length, pc, & value);
-         value = ((((((UHI) (value) >> (8))) & (255))) | (((((value) & (255))) << (8))));
-         fields->f_dsp_64_u16 = value;
-@@ -2567,7 +2567,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC
-       break;
-     case M32C_OPERAND_IMM_8_HI :
-       {
-        long value;
-+        long value = 0;
-         length = extract_normal (cd, ex_info, insn_value, 0|(1<<CGEN_IFLD_SIGNED), 0, 8, 16, 32, total_length, pc, & value);
-         value = EXTHISI (((HI) (INT) (((((((UINT) (value) >> (8))) & (255))) | (((((value) & (255))) << (8)))))));
-         fields->f_dsp_8_s16 = value;
-@@ -2593,7 +2593,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC
-       break;
-     case M32C_OPERAND_IMM1_S :
-       {
-        long value;
-+        long value = 0;
-         length = extract_normal (cd, ex_info, insn_value, 0, 0, 2, 1, 32, total_length, pc, & value);
-         value = ((value) + (1));
-         fields->f_imm1_S = value;
-@@ -2612,7 +2612,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC
-       break;
-     case M32C_OPERAND_LAB_16_8 :
-       {
-        long value;
-+        long value = 0;
-         length = extract_normal (cd, ex_info, insn_value, 0|(1<<CGEN_IFLD_SIGNED)|(1<<CGEN_IFLD_PCREL_ADDR), 0, 16, 8, 32, total_length, pc, & value);
-         value = ((value) + (((pc) + (2))));
-         fields->f_lab_16_8 = value;
-@@ -2620,7 +2620,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC
-       break;
-     case M32C_OPERAND_LAB_24_8 :
-       {
-        long value;
-+        long value = 0;
-         length = extract_normal (cd, ex_info, insn_value, 0|(1<<CGEN_IFLD_SIGNED)|(1<<CGEN_IFLD_PCREL_ADDR), 0, 24, 8, 32, total_length, pc, & value);
-         value = ((value) + (((pc) + (2))));
-         fields->f_lab_24_8 = value;
-@@ -2628,7 +2628,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC
-       break;
-     case M32C_OPERAND_LAB_32_8 :
-       {
-        long value;
-+        long value = 0;
-         length = extract_normal (cd, ex_info, insn_value, 0|(1<<CGEN_IFLD_SIGNED)|(1<<CGEN_IFLD_PCREL_ADDR), 32, 0, 8, 32, total_length, pc, & value);
-         value = ((value) + (((pc) + (2))));
-         fields->f_lab_32_8 = value;
-@@ -2636,7 +2636,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC
-       break;
-     case M32C_OPERAND_LAB_40_8 :
-       {
-        long value;
-+        long value = 0;
-         length = extract_normal (cd, ex_info, insn_value, 0|(1<<CGEN_IFLD_SIGNED)|(1<<CGEN_IFLD_PCREL_ADDR), 32, 8, 8, 32, total_length, pc, & value);
-         value = ((value) + (((pc) + (2))));
-         fields->f_lab_40_8 = value;
-@@ -2644,7 +2644,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC
-       break;
-     case M32C_OPERAND_LAB_5_3 :
-       {
-        long value;
-+        long value = 0;
-         length = extract_normal (cd, ex_info, insn_value, 0|(1<<CGEN_IFLD_PCREL_ADDR), 0, 5, 3, 32, total_length, pc, & value);
-         value = ((value) + (((pc) + (2))));
-         fields->f_lab_5_3 = value;
-@@ -2652,7 +2652,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC
-       break;
-     case M32C_OPERAND_LAB_8_16 :
-       {
-        long value;
-+        long value = 0;
-         length = extract_normal (cd, ex_info, insn_value, 0|(1<<CGEN_IFLD_SIGN_OPT)|(1<<CGEN_IFLD_PCREL_ADDR), 0, 8, 16, 32, total_length, pc, & value);
-         value = ((((((((((USI) (((value) & (65280))) >> (8))) | (((((value) & (255))) << (8))))) ^ (32768))) - (32768))) + (((pc) + (1))));
-         fields->f_lab_8_16 = value;
-@@ -2660,7 +2660,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC
-       break;
-     case M32C_OPERAND_LAB_8_24 :
-       {
-        long value;
-+        long value = 0;
-         length = extract_normal (cd, ex_info, insn_value, 0|(1<<CGEN_IFLD_ABS_ADDR), 0, 8, 24, 32, total_length, pc, & value);
-         value = ((((((USI) (value) >> (16))) | (((value) & (65280))))) | (((((value) & (255))) << (16))));
-         fields->f_lab_8_24 = value;
-@@ -2668,7 +2668,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC
-       break;
-     case M32C_OPERAND_LAB_8_8 :
-       {
-        long value;
-+        long value = 0;
-         length = extract_normal (cd, ex_info, insn_value, 0|(1<<CGEN_IFLD_SIGNED)|(1<<CGEN_IFLD_PCREL_ADDR), 0, 8, 8, 32, total_length, pc, & value);
-         value = ((value) + (((pc) + (1))));
-         fields->f_lab_8_8 = value;
-@@ -2757,7 +2757,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC
-       break;
-     case M32C_OPERAND_SRC32RNPREFIXEDHI :
-       {
-        long value;
-+        long value = 0;
-         length = extract_normal (cd, ex_info, insn_value, 0, 0, 18, 2, 32, total_length, pc, & value);
-         value = ((((value) + (2))) % (4));
-         fields->f_src32_rn_prefixed_HI = value;
-@@ -2765,7 +2765,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC
-       break;
-     case M32C_OPERAND_SRC32RNPREFIXEDQI :
-       {
-        long value;
-+        long value = 0;
-         length = extract_normal (cd, ex_info, insn_value, 0, 0, 18, 2, 32, total_length, pc, & value);
-         value = (((((~ (((USI) (value) >> (1))))) & (1))) | (((((value) << (1))) & (2))));
-         fields->f_src32_rn_prefixed_QI = value;
-@@ -2773,7 +2773,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC
-       break;
-     case M32C_OPERAND_SRC32RNPREFIXEDSI :
-       {
-        long value;
-+        long value = 0;
-         length = extract_normal (cd, ex_info, insn_value, 0, 0, 18, 2, 32, total_length, pc, & value);
-         value = ((value) - (2));
-         fields->f_src32_rn_prefixed_SI = value;
-@@ -2781,7 +2781,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC
-       break;
-     case M32C_OPERAND_SRC32RNUNPREFIXEDHI :
-       {
-        long value;
-+        long value = 0;
-         length = extract_normal (cd, ex_info, insn_value, 0, 0, 10, 2, 32, total_length, pc, & value);
-         value = ((((value) + (2))) % (4));
-         fields->f_src32_rn_unprefixed_HI = value;
-@@ -2789,7 +2789,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC
-       break;
-     case M32C_OPERAND_SRC32RNUNPREFIXEDQI :
-       {
-        long value;
-+        long value = 0;
-         length = extract_normal (cd, ex_info, insn_value, 0, 0, 10, 2, 32, total_length, pc, & value);
-         value = (((((~ (((USI) (value) >> (1))))) & (1))) | (((((value) << (1))) & (2))));
-         fields->f_src32_rn_unprefixed_QI = value;
-@@ -2797,7 +2797,7 @@ m32c_cgen_extract_operand (CGEN_CPU_DESC
-       break;
-     case M32C_OPERAND_SRC32RNUNPREFIXEDSI :
-       {
-        long value;
-+        long value = 0;
-         length = extract_normal (cd, ex_info, insn_value, 0, 0, 10, 2, 32, total_length, pc, & value);
-         value = ((value) - (2));
-         fields->f_src32_rn_unprefixed_SI = value;
--- binutils.orig/binutils/srconv.c	2020-06-16 17:10:22.251564474 +0100
-+++ binutils-2.34.0/binutils/srconv.c	2020-06-16 20:07:51.670025912 +0100
-@@ -492,6 +492,8 @@ wr_rl (struct coff_ofile *ptr ATTRIBUTE_
-       rl.addr = r->offset;
-       rl.bitloc = 0;
-       rl.flen = 32;		/* SH Specific.  */
-+      rl.dunno = 0;
-+      rl.symn = 0;
- 
-       /* What sort of reloc ? Look in the section to find out.  */
-       ref = r->symbol;
--- binutils.orig/libctf/ctf-create.c	2020-07-24 15:33:26.100996335 +0100
-+++ binutils-2.35/libctf/ctf-create.c	2020-07-24 15:33:29.042977475 +0100
-@@ -1257,6 +1257,8 @@ ctf_add_forward (ctf_file_t *fp, uint32_
- 
-   if ((type = ctf_add_generic (fp, flag, name, kind, &dtd)) == CTF_ERR)
-     return CTF_ERR;		/* errno is set for us.  */
-+  if (dtd == NULL)
-+    return CTF_ERR;
- 
-   dtd->dtd_data.ctt_info = CTF_TYPE_INFO (CTF_K_FORWARD, flag, 0);
-   dtd->dtd_data.ctt_type = kind;
--- a/binutils-special-sections-in-groups.patch
+++ b/binutils-special-sections-in-groups.patch
@ -1,27 +0,0 @@
--- binutils.orig/bfd/elf.c	2018-10-19 11:42:10.107277490 +0100
-+++ binutils-2.31.1/bfd/elf.c	2018-10-19 11:44:33.607105801 +0100
-@@ -830,7 +830,13 @@ setup_group (bfd *abfd, Elf_Internal_Shd
- 	}
-     }
- 
-  if (elf_group_name (newsect) == NULL)
-+  if (elf_group_name (newsect) == NULL
-+      /* OS specific sections might be in a group (eg ARM's ARM_EXIDX section)
-+	 but they will not have been added to the group because they do not
-+	 have contents that the ELF code in the BFD library knows how to
-+	 process.  This is OK though - we rely upon the target backends to
-+	 handle these sections for us.  */
-+      && hdr->sh_type < SHT_LOOS)
-     {
-       /* xgettext:c-format */
-       _bfd_error_handler (_("%pB: no group info for section '%pA'"),
-@@ -936,7 +942,8 @@ _bfd_elf_setup_sections (bfd *abfd)
- 	  else if (idx->shdr->bfd_section)
- 	    elf_sec_group (idx->shdr->bfd_section) = shdr->bfd_section;
- 	  else if (idx->shdr->sh_type != SHT_RELA
-		   && idx->shdr->sh_type != SHT_REL)
-+		   && idx->shdr->sh_type != SHT_REL
-+		   && idx->shdr->sh_type < SHT_LOOS)
- 	    {
- 	      /* There are some unknown sections in the group.  */
- 	      _bfd_error_handler
--- a/binutils-strip-merge.patch
+++ b/binutils-strip-merge.patch
@ -1,19 +0,0 @@
--- binutils.orig/binutils/objcopy.c	2020-10-06 14:53:19.264943750 +0100
-+++ binutils-2.35.1/binutils/objcopy.c	2020-10-06 14:53:47.002761889 +0100
-@@ -3313,14 +3313,12 @@ copy_object (bfd *ibfd, bfd *obfd, const
- 	  /* It is likely that output sections are in the same order
- 	     as the input sections, but do not assume that this is
- 	     the case.  */
-	  if (strcmp (bfd_section_name (merged->sec),
-		      bfd_section_name (osec)) != 0)
-+	  if (merged->sec->output_section != osec)
- 	    {
- 	      for (merged = merged_note_sections;
- 		   merged != NULL;
- 		   merged = merged->next)
-		if (strcmp (bfd_section_name (merged->sec),
-			    bfd_section_name (osec)) == 0)
-+		if (merged->sec->output_section == osec)
- 		  break;
- 
- 	      if (merged == NULL)
--- a/binutils-suppress-ld-align-tests.patch
+++ b/binutils-suppress-ld-align-tests.patch
@ -0,0 +1,13 @@
+--- binutils.orig/ld/testsuite/ld-elf/linux-x86.exp	2024-01-24 11:52:35.288014542 +0000
+++ binutils-2.41/ld/testsuite/ld-elf/linux-x86.exp	2024-01-24 17:31:39.356167357 +0000
+@@ -225,6 +225,10 @@ if { [check_ifunc_attribute_available] }
+ # Old gcc silently ignores __attribute__ ((aligned())) with too big alignment.
+ proc compiler_honours_aligned { } {
+     global CC_FOR_TARGET READELF srcdir subdir
+
+    # Temporary fix for CentOS-10 kernel issue.  (RHEL-22466)
+    return 0 
+    
+     ld_compile $CC_FOR_TARGET $srcdir/$subdir/p_align-1.c tmpdir/p_align-1.o
+     set output [run_host_cmd "$READELF" "-SW tmpdir/p_align-1.o"]
+     if { [regexp { [.]data *PROGBITS .* 8388608[\n]} $output] } {
--- a/binutils-testsuite-fixes.patch
+++ b/binutils-testsuite-fixes.patch
--- a/binutils-2.25-version.patch
+++ b/binutils-2.25-version.patch
@ -1,9 +1,10 @@
--- binutils-2.26.orig/bfd/Makefile.am	2016-01-25 10:11:33.505289018 +0000
-+++ binutils-2.26/bfd/Makefile.am	2016-01-25 10:13:23.489964145 +0000
-@@ -1043,8 +1043,8 @@ DISTCLEANFILES = $(BUILD_CFILES) $(BUILD
+diff -rup binutils.orig/bfd/Makefile.am binutils-2.38/bfd/Makefile.am
+--- binutils.orig/bfd/Makefile.am	2022-02-09 14:10:42.659300681 +0000
+++ binutils-2.38/bfd/Makefile.am	2022-02-09 14:12:40.562532916 +0000
+@@ -977,8 +977,8 @@ DISTCLEANFILES = $(BUILD_CFILES) $(BUILD
 bfdver.h: $(srcdir)/version.h $(srcdir)/development.sh $(srcdir)/Makefile.in
- 	@echo "creating $@"
- 	@bfd_version=`echo "$(VERSION)" | $(SED) -e 's/\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\).*/\1.00\2.00\3.00\4.00\5/' -e 's/\([^\.]*\)\..*\(..\)\..*\(..\)\..*\(..\)\..*\(..\)$$/\1\2\3\4\5/'` ;\
+ 	$(AM_V_GEN)\
+ 	bfd_version=`echo "$(VERSION)" | $(SED) -e 's/\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\).*/\1.00\2.00\3.00\4.00\5/' -e 's/\([^\.]*\)\..*\(..\)\..*\(..\)\..*\(..\)\..*\(..\)$$/\1\2\3\4\5/'` ;\
 -	bfd_version_string="\"$(VERSION)\"" ;\
 -	bfd_soversion="$(VERSION)" ;\
 +	bfd_version_string="\"$(VERSION)-%{release}\"" ;\
@ -11,7 +12,7 @@
 	bfd_version_package="\"$(PKGVERSION)\"" ;\
 	report_bugs_to="\"$(REPORT_BUGS_TO)\"" ;\
 	. $(srcdir)/development.sh ;\
-@@ -1055,7 +1055,7 @@ bfdver.h: $(srcdir)/version.h $(srcdir)/
+@@ -989,7 +989,7 @@ bfdver.h: $(srcdir)/version.h $(srcdir)/
 	fi ;\
 	$(SED) -e "s,@bfd_version@,$$bfd_version," \
 	    -e "s,@bfd_version_string@,$$bfd_version_string," \
@ -20,12 +21,13 @@
 	    -e "s,@report_bugs_to@,$$report_bugs_to," \
 	    < $(srcdir)/version.h > $@; \
 	echo "$${bfd_soversion}" > libtool-soversion
--- binutils-2.26.orig/bfd/Makefile.in	2016-01-25 10:11:33.505289018 +0000
-+++ binutils-2.26/bfd/Makefile.in	2016-01-25 10:14:17.818297941 +0000
-@@ -2111,8 +2111,8 @@ stmp-lcoff-h: $(LIBCOFF_H_FILES)
+diff -rup binutils.orig/bfd/Makefile.in binutils-2.38/bfd/Makefile.in
+--- binutils.orig/bfd/Makefile.in	2022-02-09 14:10:42.653300720 +0000
+++ binutils-2.38/bfd/Makefile.in	2022-02-09 14:19:03.362040188 +0000
+@@ -2094,8 +2094,8 @@ stmp-lcoff-h: $(LIBCOFF_H_FILES) $(MKDOC
 bfdver.h: $(srcdir)/version.h $(srcdir)/development.sh $(srcdir)/Makefile.in
- 	@echo "creating $@"
- 	@bfd_version=`echo "$(VERSION)" | $(SED) -e 's/\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\).*/\1.00\2.00\3.00\4.00\5/' -e 's/\([^\.]*\)\..*\(..\)\..*\(..\)\..*\(..\)\..*\(..\)$$/\1\2\3\4\5/'` ;\
+ 	$(AM_V_GEN)\
+ 	bfd_version=`echo "$(VERSION)" | $(SED) -e 's/\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\).*/\1.00\2.00\3.00\4.00\5/' -e 's/\([^\.]*\)\..*\(..\)\..*\(..\)\..*\(..\)\..*\(..\)$$/\1\2\3\4\5/'` ;\
 -	bfd_version_string="\"$(VERSION)\"" ;\
 -	bfd_soversion="$(VERSION)" ;\
 +	bfd_version_string="\"$(VERSION)-%{release}\"" ;\
@ -33,7 +35,7 @@
 	bfd_version_package="\"$(PKGVERSION)\"" ;\
 	report_bugs_to="\"$(REPORT_BUGS_TO)\"" ;\
 	. $(srcdir)/development.sh ;\
-@@ -2123,7 +2123,7 @@ bfdver.h: $(srcdir)/version.h $(srcdir)/
+@@ -2106,7 +2106,7 @@ bfdver.h: $(srcdir)/version.h $(srcdir)/
 	fi ;\
 	$(SED) -e "s,@bfd_version@,$$bfd_version," \
 	    -e "s,@bfd_version_string@,$$bfd_version_string," \
--- a/binutils-warnings.patch
+++ b/binutils-warnings.patch
@ -1,158 +0,0 @@
-diff --git a/binutils/dwarf.c b/binutils/dwarf.c
-index 6ecfab5d..f8698213 100644
--- a/binutils/dwarf.c
-+++ b/binutils/dwarf.c
-@@ -4914,7 +4914,7 @@ display_debug_lines_decoded (struct dwarf_section *  section,
- 	      else
- 		{
- 		  newFileName = (char *) xmalloc (fileNameLength + 1);
-		  strncpy (newFileName, fileName, fileNameLength + 1);
-+		  strcpy (newFileName, fileName);
- 		}
- 
- 	      if (!do_wide || (fileNameLength <= MAX_FILENAME_LENGTH))
-diff --git a/libiberty/cp-demangle.c b/libiberty/cp-demangle.c
-index 3639bfbf..ed080a1a 100644
--- a/libiberty/cp-demangle.c
-+++ b/libiberty/cp-demangle.c
-@@ -185,20 +185,6 @@ static void d_init_info (const char *, int, size_t, struct d_info *);
- #define CP_STATIC_IF_GLIBCPP_V3
- #endif /* ! defined(IN_GLIBCPP_V3) */
- 
-/* See if the compiler supports dynamic arrays.  */
-
-#ifdef __GNUC__
-#define CP_DYNAMIC_ARRAYS
-#else
-#ifdef __STDC__
-#ifdef __STDC_VERSION__
-#if __STDC_VERSION__ >= 199901L && !__STDC_NO_VLA__
-#define CP_DYNAMIC_ARRAYS
-#endif /* __STDC_VERSION__ >= 199901L && !__STDC_NO_VLA__ */
-#endif /* defined (__STDC_VERSION__) */
-#endif /* defined (__STDC__) */
-#endif /* ! defined (__GNUC__) */
-
- /* We avoid pulling in the ctype tables, to prevent pulling in
-    additional unresolved symbols when this code is used in a library.
-    FIXME: Is this really a valid reason?  This comes from the original
-@@ -4343,29 +4329,21 @@ cplus_demangle_print_callback (int options,
-   d_print_init (&dpi, callback, opaque, dc);
- 
-   {
-#ifdef CP_DYNAMIC_ARRAYS
-    /* Avoid zero-length VLAs, which are prohibited by the C99 standard
-       and flagged as errors by Address Sanitizer.  */
-    __extension__ struct d_saved_scope scopes[(dpi.num_saved_scopes > 0)
-                                              ? dpi.num_saved_scopes : 1];
-    __extension__ struct d_print_template temps[(dpi.num_copy_templates > 0)
-                                                ? dpi.num_copy_templates : 1];
-
-    dpi.saved_scopes = scopes;
-    dpi.copy_templates = temps;
-#else
-    dpi.saved_scopes = alloca (dpi.num_saved_scopes
-			       * sizeof (*dpi.saved_scopes));
-    dpi.copy_templates = alloca (dpi.num_copy_templates
-				 * sizeof (*dpi.copy_templates));
-#endif
-
-+    dpi.saved_scopes
-+      = (struct d_saved_scope *) xmalloc (dpi.num_saved_scopes
-+					  * sizeof (*dpi.saved_scopes));
-+    dpi.copy_templates
-+      = (struct d_print_template *) xmalloc (dpi.num_copy_templates
-+					     * sizeof (*dpi.copy_templates));
-     d_print_comp (&dpi, options, dc);
-   }
- 
-   d_print_flush (&dpi);
- 
-  return ! d_print_saw_error (&dpi);
-+  int retval = ! d_print_saw_error (&dpi);
-+  free (dpi.saved_scopes);
-+  free (dpi.copy_templates);
-+  return retval;
- }
- 
- /* Turn components into a human readable string.  OPTIONS is the
-@@ -6307,16 +6285,12 @@ d_demangle_callback (const char *mangled, int options,
-     }
- 
-   {
-#ifdef CP_DYNAMIC_ARRAYS
-    __extension__ struct demangle_component comps[di.num_comps];
-    __extension__ struct demangle_component *subs[di.num_subs];
-
-    di.comps = comps;
-    di.subs = subs;
-#else
-    di.comps = alloca (di.num_comps * sizeof (*di.comps));
-    di.subs = alloca (di.num_subs * sizeof (*di.subs));
-#endif
-+    di.comps
-+      = (struct demangle_component *) xmalloc (di.num_comps
-+					       * sizeof (*di.comps));
-+    di.subs
-+      = (struct demangle_component **) xmalloc (di.num_subs
-+						* sizeof (*di.subs));
- 
-     switch (type)
-       {
-@@ -6357,6 +6331,8 @@ d_demangle_callback (const char *mangled, int options,
-              : 0;
-   }
- 
-+  free (di.comps);
-+  free (di.subs);
-   return status;
- }
- 
-@@ -6588,16 +6564,12 @@ is_ctor_or_dtor (const char *mangled,
-   cplus_demangle_init_info (mangled, DMGL_GNU_V3, strlen (mangled), &di);
- 
-   {
-#ifdef CP_DYNAMIC_ARRAYS
-    __extension__ struct demangle_component comps[di.num_comps];
-    __extension__ struct demangle_component *subs[di.num_subs];
-
-    di.comps = comps;
-    di.subs = subs;
-#else
-    di.comps = alloca (di.num_comps * sizeof (*di.comps));
-    di.subs = alloca (di.num_subs * sizeof (*di.subs));
-#endif
-+    di.comps
-+      = (struct demangle_component *) xmalloc (di.num_comps
-+					       * sizeof (*di.comps));
-+    di.subs
-+      = (struct demangle_component **) xmalloc (di.num_subs
-+						* sizeof (*di.subs));
- 
-     dc = cplus_demangle_mangled_name (&di, 1);
- 
-@@ -6640,6 +6612,8 @@ is_ctor_or_dtor (const char *mangled,
-       }
-   }
- 
-+  free (di.comps);
-+  free (di.subs);
-   return ret;
- }
- 
-diff --git a/libiberty/make-relative-prefix.c b/libiberty/make-relative-prefix.c
-index e3f9f920..5dbe6f89 100644
--- a/libiberty/make-relative-prefix.c
-+++ b/libiberty/make-relative-prefix.c
-@@ -259,10 +259,7 @@ make_relative_prefix_1 (const char *progname, const char *bin_prefix,
- #ifdef HAVE_HOST_EXECUTABLE_SUFFIX
- 	  len += strlen (HOST_EXECUTABLE_SUFFIX);
- #endif
-	  if (len < MAX_ALLOCA_SIZE)
-	    nstore = (char *) alloca (len);
-	  else
-	    alloc_ptr = nstore = (char *) malloc (len);
-+	  alloc_ptr = nstore = (char *) malloc (len);
- 
- 	  startp = endp = temp;
- 	  while (1)
--- a/binutils.spec
+++ b/binutils.spec
--- a/gating.yaml
+++ b/gating.yaml
@ -0,0 +1,15 @@
+--- !Policy
+product_versions:
+  - fedora-*
+decision_context: bodhi_update_push_stable
+subject_type: koji_build
+rules:
+  - !PassingTestCaseRule {test_case_name: baseos-qe.koji-build.scratch-build.validation}
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
+--- !Policy
+product_versions:
+  - rhel-9
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.gate-build-fast-lane.functional}
+  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.gate-build-slow-lane.functional}
--- a/plans/build-gating.fmf
+++ b/plans/build-gating.fmf
@ -0,0 +1,26 @@
+#
+# Build/PR gating tests for binutils
+#
+
+/common:
+  plan:
+    import:
+      url: https://gitlab.com/redhat/centos-stream/tests/binutils.git
+      ref: main
+      name: /plans/build-gating/common
+
+/kernel-rebuild:
+  plan:
+    import:
+      url: https://gitlab.com/redhat/centos-stream/tests/binutils.git
+      ref: main
+      name: /plans/build-gating/kernel-rebuild
+
+adjust+:
+  - because: "Plan to be ran when executed locally, or executed by CI system to gate a build or PR."
+    # `commit` is used by Fedora CI, CentOS Stream CI, `build` by BaseOS CI
+    when: >-
+      trigger is defined
+      and trigger != commit
+      and trigger != build
+    enabled: false
--- a/plans/regression.fmf
+++ b/plans/regression.fmf
@ -0,0 +1,18 @@
+#
+# Build/PR gating tests for binutils
+#
+
+/common:
+  plan:
+    import:
+      url: https://gitlab.com/redhat/centos-stream/tests/binutils.git
+      ref: main
+      name: /plans/regression
+
+adjust+:
+  - because: "Plan to be ran when executed locally, or executed by CI system after updating an erratum/bodhi update."
+    # `build` is used by Bodhi
+    when: >-
+      trigger is defined
+      and trigger != build
+    enabled: false
--- a/2
+++ b/2
@ -1,2 +1,2 @@
-SHA512 (binutils-2.35.1.tar.xz) = 94ff72708403413b70b247f3af4099ebaa882b6659249869f1ed9941a0f1912e313f08357d470f9fd2359e7f5e5b0eb86285e5eaf883fa8187789d6b1bd304eb
+SHA512 (binutils-with-gold-2.47.50-48c933a69a8.tar.xz) = c4300e4881227c431c0bbbb949a5ee5bc113701f993766418b152df7d46d9df378ebace9efffcb6e1f0b7e72ad716bbcccf5b6aa55851dc28216555b242d18a0
 SHA512 (binutils-2.19.50.0.1-output-format.sed) = 2f8686b0c8af13c98cda056824c2820416f6e2d003f70b78ccf5314525b9ee3684d421dfa83e638a2d42d06ea4d4bdaf5226b64d6ec26f7ff59c44ffb2a23dd2