Restore sources

- Add support for PowerPC v11 architecture extensions.
Rebase to GNU Binutils 2.42. - Retire: binutils-BPF-reloc-4.patch - Retire: binutils-Intel-APX-part-1.patch - Retire: binutils-aarch64-big-bti-programs.patch - Retire: binutils-big-merge.patch - Retire: binutils-demangler-updates.patch - Retire: binutils-execstack-error.patch - Retire: binutils-gold-powerpc.patch - Retire: binutils-handle-corrupt-version-info.patch - Retire: binutils-ppc-dt_relr-relocs.patch - Retire: binutils-riscv-SUB_ULEB128.patch - Retire: binutils-x86-64-v3.patch - Retire: i686-AVX10.1-part-1.patch - Retire: i686-AVX10.1-part-2.patch - Retire: i686-AVX10.1-part-3.patch - Retire: i686-AVX10.1-part-4.patch - Retire: i686-AVX10.1-part-5.patch - Retire: i686-AVX10.1-part-6.patch
2024-02-14 13:15:35 +00:00 · 2024-02-14 13:13:16 +00:00 · 2024-02-12 18:49:42 +00:00 · 2024-02-12 10:50:59 +00:00 · 2024-02-12 10:50:09 +00:00 · 2024-01-25 09:43:00 +00:00
42 changed files with 4654 additions and 3648 deletions
--- a/.fmf/version
+++ b/.fmf/version
@ -0,0 +1 @@
+1
--- a/.gitignore
+++ b/.gitignore
@ -1,20 +1,74 @@
-binutils-2.*/
-i386
-i686
-x86_64
-/binutils-*.tar.bz2
-.build-*
-*.src.rpm
-*.log
-HOWTO
-build-sources
+*.diff
+*.orig
+*.rej

-/binutils-2.29.tar.xz
-/binutils-2.29.1.tar.xz
+*~
+.#*
+*#
+
+*.flt
+*.gmo
+*.info
+*.la
+*.lo
+*.o
+*.pyc
+*.tmp
+*.a
+
+.deps
+.libs
+
+autom4te.cache
+config.cache
+config.h
+config.intl
+config.log
+config.status
+libtool
+POTFILES
+*-POTFILES
+
+TAGS
+TAGS.sub
+
+.local.vimrc
+.lvimrc
+
+.clang-format
+
+.gdbinit
+.gdb_history
+
+perf.data
+perf.data.old
+
+# ignore core files, but not java/net/protocol/core/
+core
+!core/
+
+lost+found
+
+# ignore ./contrib/gcc_update output
+LAST_UPDATED
+REVISION
+
+stamp-*
+*.stamp
+
+# ignore in-tree prerequisites
+/mpfr*
+/mpc*
+/gmp*
+/isl*
+/binutils-2.34.0-5dfc0c955dbe912cd328fc2688e5fceb3239ac2a.tar.xz
 /binutils-2.19.50.0.1-output-format.sed
-/binutils-2.30.tar.xz
-/binutils-2.30.90.tar.xz
-/binutils-2.31.1.tar.xz
-/binutils-special-sections-in-groups.patch
-/binutils-2.32.tar.xz
-/binutils-2.33.1.tar.xz
+/binutils-2.35.tar.xz
+/binutils-2.35.1.tar.xz
+/binutils-2.36.1.tar.xz
+/binutils-2.37.tar.xz
+/binutils-2.38.tar.xz
+/binutils-2.39.tar.xz
+/binutils-2.40.tar.xz
+/binutils-2.41.tar.xz
+/binutils-2.42.tar.xz
--- a/binutils-2.19.50.0.1-output-format.sed
+++ b/binutils-2.19.50.0.1-output-format.sed
@ -1,38 +0,0 @@
-# Generate OUTPUT_FORMAT line for .so files from the system linker output.
-# Imported from glibc/Makerules.
-
-/ld.*[ 	]-E[BL]/b f
-/collect.*[ 	]-E[BL]/b f
-/OUTPUT_FORMAT[^)]*$/{N
-s/\n[	 ]*/ /
-}
-t o
-: o
-s/^.*OUTPUT_FORMAT(\([^,]*\), \1, \1).*$/OUTPUT_FORMAT(\1)/
-t q
-s/^.*OUTPUT_FORMAT(\([^,]*\), \([^,]*\), \([^,]*\)).*$/\1,\2,\3/
-t s
-s/^.*OUTPUT_FORMAT(\([^,)]*\).*$)/OUTPUT_FORMAT(\1)/
-t q
-d
-: s
-s/"//g
-G
-s/\n//
-s/^\([^,]*\),\([^,]*\),\([^,]*\),B/OUTPUT_FORMAT(\2)/p
-s/^\([^,]*\),\([^,]*\),\([^,]*\),L/OUTPUT_FORMAT(\3)/p
-s/^\([^,]*\),\([^,]*\),\([^,]*\)/OUTPUT_FORMAT(\1)/p
-/,/s|^|*** BUG in libc/scripts/output-format.sed *** |p
-q
-: q
-s/"//g
-p
-q
-: f
-s/^.*[ 	]-E\([BL]\)[ 	].*$/,\1/
-t h
-s/^.*[ 	]-E\([BL]\)$/,\1/
-t h
-d
-: h
-h
--- a/binutils-2.29-filename-in-error-messages.patch
+++ b/binutils-2.29-filename-in-error-messages.patch
@ -1,124 +0,0 @@
--- binutils.orig/binutils/readelf.c	2018-01-22 15:48:10.450701702 +0000
-+++ binutils-2.30.0/binutils/readelf.c	2018-01-22 15:55:26.739588657 +0000
-@@ -19019,75 +19019,85 @@ 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);
-      fclose (filedata->handle);
-      free (filedata);
-      return FALSE;
-    }
-
-  filedata->file_size = (bfd_size_type) statbuf.st_size;
-
-  if (memcmp (armag, ARMAG, SARMAG) == 0)
-    {
-      if (! process_archive (filedata, FALSE))
-	ret = FALSE;
-    }
-  else if (memcmp (armag, ARMAGT, SARMAG) == 0)
-    {
-      if ( ! process_archive (filedata, TRUE))
-	ret = FALSE;
-+      error (_("Failed to read file's magic number\n"));
-     }
-   else
-     {
-      if (do_archive_index)
-	error (_("File %s is not an archive so its index cannot be displayed.\n"),
-	       file_name);
-+      filedata->file_size = (bfd_size_type) statbuf.st_size;
- 
-      rewind (filedata->handle);
-      archive_file_size = archive_file_offset = 0;
-
-      if (! process_object (filedata))
-	ret = FALSE;
-+      if (memcmp (armag, ARMAG, SARMAG) == 0)
-+	{
-+	  if (process_archive (filedata, FALSE))
-+	    ret = TRUE;
-+	}
-+      else if (memcmp (armag, ARMAGT, SARMAG) == 0)
-+	{
-+	  if (process_archive (filedata, TRUE))
-+	    ret = TRUE;
-+	}
-+      else
-+	{
-+	  if (do_archive_index)
-+	    error (_("Not an archive so its index cannot be displayed.\n"));
-+
-+	  rewind (filedata->handle);
-+	  archive_file_size = archive_file_offset = 0;
-+
-+	  if (process_object (filedata))
-+	    ret = TRUE;
-+	}
-     }
- 
-   fclose (filedata->handle);
-+ done:
-   free (filedata);
-+  free (program_name);
-+  program_name = saved_program_name;
- 
-   return ret;
- }
--- 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-CVE-2019-17450.patch
+++ b/binutils-CVE-2019-17450.patch
@ -1,62 +0,0 @@
--- binutils.orig/bfd/dwarf2.c	2019-11-13 11:49:52.211121564 +0000
-+++ binutils-2.33.1/bfd/dwarf2.c	2019-11-13 11:53:26.991423055 +0000
-@@ -2813,8 +2813,8 @@ static bfd_boolean comp_unit_maybe_decod
- 
- static bfd_boolean
- find_abstract_instance (struct comp_unit *   unit,
-			bfd_byte *           orig_info_ptr,
- 			struct attribute *   attr_ptr,
-+			unsigned int         recur_count,
- 			const char **        pname,
- 			bfd_boolean *        is_linkage,
- 			char **              filename_ptr,
-@@ -2829,6 +2829,14 @@ find_abstract_instance (struct comp_unit
-   struct attribute attr;
-   const char *name = NULL;
- 
-+  if (recur_count == 100)
-+    {
-+      _bfd_error_handler
-+       (_("DWARF error: abstract instance recursion detected"));
-+      bfd_set_error (bfd_error_bad_value);
-+      return FALSE;
-+    }
-+
-   /* DW_FORM_ref_addr can reference an entry in a different CU. It
-      is an offset from the .debug_info section, not the current CU.  */
-   if (attr_ptr->form == DW_FORM_ref_addr)
-@@ -2962,15 +2970,7 @@ find_abstract_instance (struct comp_unit
- 					 info_ptr, info_ptr_end);
- 	      if (info_ptr == NULL)
- 		break;
-	      /* It doesn't ever make sense for DW_AT_specification to
-		 refer to the same DIE.  Stop simple recursion.  */
-	      if (info_ptr == orig_info_ptr)
-		{
-		  _bfd_error_handler
-		    (_("DWARF error: abstract instance recursion detected"));
-		  bfd_set_error (bfd_error_bad_value);
-		  return FALSE;
-		}
-+
- 	      switch (attr.name)
- 		{
- 		case DW_AT_name:
-@@ -2984,7 +2984,7 @@ find_abstract_instance (struct comp_unit
- 		    }
- 		  break;
- 		case DW_AT_specification:
-		  if (!find_abstract_instance (unit, info_ptr, &attr,
-+		  if (!find_abstract_instance (unit, &attr, recur_count + 1,
- 					       &name, is_linkage,
- 					       filename_ptr, linenumber_ptr))
- 		    return FALSE;
-@@ -3200,7 +3200,7 @@ scan_unit_for_symbols (struct comp_unit
- 
- 		case DW_AT_abstract_origin:
- 		case DW_AT_specification:
-		  if (!find_abstract_instance (unit, info_ptr, &attr,
-+		  if (!find_abstract_instance (unit, &attr, 0,
- 					       &func->name,
- 					       &func->is_linkage,
- 					       &func->file,
--- a/binutils-CVE-2019-17451.patch
+++ b/binutils-CVE-2019-17451.patch
@ -1,20 +0,0 @@
--- binutils.orig/bfd/dwarf2.c	2019-11-13 11:32:09.395430104 +0000
-+++ binutils-2.33.1/bfd/dwarf2.c	2019-11-13 11:33:17.272899503 +0000
-@@ -4440,7 +4440,16 @@ _bfd_dwarf2_slurp_debug_info (bfd *abfd,
-       for (total_size = 0;
- 	   msec;
- 	   msec = find_debug_info (debug_bfd, debug_sections, msec))
-	total_size += msec->size;
-+       {
-+         /* Catch PR25070 testcase overflowing size calculation here.  */
-+         if (total_size + msec->size < total_size
-+             || total_size + msec->size < msec->size)
-+           {
-+             bfd_set_error (bfd_error_no_memory);
-+             return FALSE;
-+           }
-+         total_size += msec->size;
-+       }
- 
-       stash->info_ptr_memory = (bfd_byte *) bfd_malloc (total_size);
-       if (stash->info_ptr_memory == NULL)
--- a/binutils-Intel-APX-part-1-fixes.patch
+++ b/binutils-Intel-APX-part-1-fixes.patch
@ -0,0 +1,871 @@
+diff -rupN binutils.orig/opcodes/i386-dis.c binutils-2.41/opcodes/i386-dis.c
+--- binutils.orig/opcodes/i386-dis.c	2024-02-12 15:55:21.578572835 +0000
+++ binutils-2.41/opcodes/i386-dis.c	2024-02-12 15:56:38.828623964 +0000
+@@ -8824,6 +8824,8 @@ get_valid_dis386 (const struct dis386 *d
+       break;
+ 
+     case USE_3BYTE_TABLE:
+      if (ins->last_rex2_prefix >= 0)
+	return &err_opcode;
+       if (!fetch_code (ins->info, ins->codep + 2))
+ 	return &err_opcode;
+       vindex = *ins->codep++;
+@@ -9540,8 +9542,6 @@ print_insn (bfd_vma pc, disassemble_info
+   /* REX2.M in rex2 prefix represents map0 or map1.  */
+   if (ins.last_rex2_prefix < 0 ? *ins.codep == 0x0f : (ins.rex2 & REX2_M))
+     {
+-      unsigned char threebyte;
+-
+       if (!ins.rex2)
+ 	{
+ 	  ins.codep++;
+@@ -9549,17 +9549,15 @@ print_insn (bfd_vma pc, disassemble_info
+ 	    goto fetch_error_out;
+ 	}
+ 
+-      threebyte = *ins.codep;
+-      dp = &dis386_twobyte[threebyte];
+-      ins.need_modrm = twobyte_has_modrm[threebyte];
+-      ins.codep++;
+      dp = &dis386_twobyte[*ins.codep];
+      ins.need_modrm = twobyte_has_modrm[*ins.codep];
+     }
+   else
+     {
+       dp = &dis386[*ins.codep];
+       ins.need_modrm = onebyte_has_modrm[*ins.codep];
+-      ins.codep++;
+     }
+  ins.codep++;
+ 
+   /* Save sizeflag for printing the extra ins.prefixes later before updating
+      it for mnemonic and operand processing.  The prefix names depend
+diff -rupN binutils.orig/opcodes/i386-opc.tbl binutils-2.41/opcodes/i386-opc.tbl
+--- binutils.orig/opcodes/i386-opc.tbl	2024-02-12 15:55:21.578572835 +0000
+++ binutils-2.41/opcodes/i386-opc.tbl	2024-02-12 15:56:28.955616704 +0000
+@@ -1586,7 +1586,9 @@ vandnp<sd>, 0x<sd:ppfx>55, AVX, Modrm|Ve
+ vandp<sd>, 0x<sd:ppfx>54, AVX, Modrm|C|Vex|Space0F|VexVVVV|VexWIG|CheckOperandSize|NoSuf, { Unspecified|BaseIndex|RegXMM|RegYMM, RegXMM|RegYMM, RegXMM|RegYMM }
+ vblendp<sd>, 0x660c | <sd:opc>, AVX, Modrm|Vex|Space0F3A|VexVVVV|VexWIG|CheckOperandSize|NoSuf, { Imm8|Imm8S, Unspecified|BaseIndex|RegXMM|RegYMM, RegXMM|RegYMM, RegXMM|RegYMM }
+ vblendvp<sd>, 0x664a | <sd:opc>, AVX, Modrm|Vex|Space0F3A|VexVVVV|VexW0|CheckOperandSize|NoSuf, { RegXMM|RegYMM, Unspecified|BaseIndex|RegXMM|RegYMM, RegXMM|RegYMM, RegXMM|RegYMM }
+-vbroadcastf128, 0x661a, AVX, Modrm|Vex=2|Space0F38|VexW=1|NoSuf, { Xmmword|Unspecified|BaseIndex, RegYMM }
+vbroadcastf128, 0x661a, AVX, Modrm|Vex256|Space0F38|VexW0|NoSuf, { Xmmword|Unspecified|BaseIndex, RegYMM }
+// vbroadcastf32x4 in disguise (see vround{p,s}{s,d} comment)
+vbroadcastf128, 0x661a, APX_F&AVX512VL, Modrm|EVex256|Space0F38|VexW0|Disp8MemShift=4|NoSuf, { Xmmword|Unspecified|BaseIndex, RegYMM }
+ vbroadcastsd, 0x6619, AVX, Modrm|Vex256|Space0F38|VexW0|NoSuf, { Qword|Unspecified|BaseIndex, RegYMM }
+ vbroadcastss, 0x6618, AVX, Modrm|Vex128|Space0F38|VexW0|NoSuf, { Dword|Unspecified|BaseIndex, RegXMM|RegYMM }
+ vcmp<frel>p<sd>, 0x<sd:ppfx>c2/0x<frel:imm>, AVX, Modrm|<frel:comm>|Vex|Space0F|VexVVVV|VexWIG|CheckOperandSize|NoSuf|ImmExt, { RegXMM|RegYMM|Unspecified|BaseIndex, RegXMM|RegYMM, RegXMM|RegYMM }
+@@ -1614,7 +1616,9 @@ vdivp<sd>, 0x<sd:ppfx>5e, AVX, Modrm|Vex
+ vdivs<sd>, 0x<sd:spfx>5e, AVX, Modrm|VexLIG|Space0F|VexVVVV|VexWIG|NoSuf, { <sd:elem>|Unspecified|BaseIndex|RegXMM, RegXMM, RegXMM }
+ vdppd, 0x6641, AVX, Modrm|Vex|Space0F3A|VexVVVV|VexWIG|NoSuf, { Imm8|Imm8S, Unspecified|BaseIndex|RegXMM, RegXMM, RegXMM }
+ vdpps, 0x6640, AVX, Modrm|Vex|Space0F3A|VexVVVV|VexWIG|CheckOperandSize|NoSuf, { Imm8|Imm8S, Unspecified|BaseIndex|RegXMM|RegYMM, RegXMM|RegYMM, RegXMM|RegYMM }
+-vextractf128, 0x6619, AVX, Modrm|Vex=2|Space0F3A|VexW=1|NoSuf, { Imm8, RegYMM, Unspecified|BaseIndex|RegXMM }
+vextractf128, 0x6619, AVX, Modrm|Vex256|Space0F3A|VexW0|NoSuf, { Imm8, RegYMM, Unspecified|BaseIndex|RegXMM }
+// vextractf32x4 in disguise (see vround{p,s}{s,d} comment)
+vextractf128, 0x6619, APX_F&AVX512VL, Modrm|EVex256|Space0F3A|VexW0|Disp8MemShift=4|NoSuf, { Imm8, RegYMM, Xmmword|Unspecified|BaseIndex }
+ vextractps, 0x6617, AVX|AVX512F, Modrm|Vex128|EVex128|Space0F3A|VexWIG|Disp8MemShift=2|NoSuf, { Imm8, RegXMM, Reg32|Unspecified|BaseIndex }
+ vextractps, 0x6617, x64&(AVX|AVX512F), RegMem|Vex128|EVex128|Space0F3A|VexWIG|NoSuf, { Imm8, RegXMM, Reg64 }
+ vhaddpd, 0x667c, AVX, Modrm|Vex|Space0F|VexVVVV|VexWIG|CheckOperandSize|NoSuf, { Unspecified|BaseIndex|RegXMM|RegYMM, RegXMM|RegYMM, RegXMM|RegYMM }
+@@ -1622,6 +1626,8 @@ vhaddps, 0xf27c, AVX, Modrm|Vex|Space0F|
+ vhsubpd, 0x667d, AVX, Modrm|Vex|Space0F|VexVVVV|VexWIG|CheckOperandSize|NoSuf, { Unspecified|BaseIndex|RegXMM|RegYMM, RegXMM|RegYMM, RegXMM|RegYMM }
+ vhsubps, 0xf27d, AVX, Modrm|Vex|Space0F|VexVVVV|VexWIG|CheckOperandSize|NoSuf, { Unspecified|BaseIndex|RegXMM|RegYMM, RegXMM|RegYMM, RegXMM|RegYMM }
+ vinsertf128, 0x6618, AVX, Modrm|Vex256|Space0F3A|VexVVVV|VexW0|NoSuf, { Imm8, Unspecified|BaseIndex|RegXMM, RegYMM, RegYMM }
+// vinsertf32x4 in disguise (see vround{p,s}{s,d} comment)
+vinsertf128, 0x6618, APX_F&AVX512VL, Modrm|EVex256|Space0F3A|VexVVVV|VexW0|Disp8MemShift=4|NoSuf, { Imm8, Xmmword|Unspecified|BaseIndex, RegYMM, RegYMM }
+ vinsertps, 0x6621, AVX, Modrm|Vex|Space0F3A|VexVVVV|VexWIG|NoSuf, { Imm8, Dword|Unspecified|BaseIndex|RegXMM, RegXMM, RegXMM }
+ vlddqu, 0xf2f0, AVX, Modrm|Vex|Space0F|VexWIG|CheckOperandSize|NoSuf, { Xmmword|Ymmword|Unspecified|BaseIndex, RegXMM|RegYMM }
+ vldmxcsr, 0xae/2, AVX, Modrm|Vex128|Space0F|VexWIG|NoSuf, { Dword|Unspecified|BaseIndex }
+@@ -1792,8 +1798,8 @@ vroundp<sd>, 0x6608 | <sd:opc>, AVX, Mod
+ vrounds<sd>, 0x660a | <sd:opc>, AVX, Modrm|VexLIG|Space0F3A|VexVVVV|VexWIG|NoSuf, { Imm8, <sd:elem>|Unspecified|BaseIndex|RegXMM, RegXMM, RegXMM }
+ // These are really clones of VRNDSCALE{P,S}{S,D}, with broadcast, masking, SAE,
+ // 512-bit operand size, and register sources dropped.
+-vroundp<sd>, 0x6608 | <sd:opc>, APX_F, Modrm|Space0F3A|<sd:vexw>|Disp8ShiftVL|CheckOperandSize|NoSuf, { Imm8, Xmmword|Ymmword|Unspecified|BaseIndex, RegXMM|RegYMM }
+-vrounds<sd>, 0x660a | <sd:opc>, APX_F, Modrm|EVexLIG|Space0F3A|VexVVVV|<sd:vexw>|Disp8MemShift|NoSuf, { Imm8, <sd:elem>|Unspecified|BaseIndex, RegXMM, RegXMM }
+vroundp<sd>, 0x6608 | <sd:opc>, APX_F&AVX512VL, Modrm|Space0F3A|<sd:vexw>|Disp8ShiftVL|CheckOperandSize|NoSuf, { Imm8, Xmmword|Ymmword|Unspecified|BaseIndex, RegXMM|RegYMM }
+vrounds<sd>, 0x660a | <sd:opc>, APX_F&AVX512F, Modrm|EVexLIG|Space0F3A|VexVVVV|<sd:vexw>|Disp8MemShift|NoSuf, { Imm8, <sd:elem>|Unspecified|BaseIndex, RegXMM, RegXMM }
+ vrsqrtps, 0x52, AVX, Modrm|Vex|Space0F|VexWIG|CheckOperandSize|NoSuf, { Unspecified|BaseIndex|RegXMM|RegYMM, RegXMM|RegYMM }
+ vrsqrtss, 0xf352, AVX, Modrm|Vex=3|Space0F|VexVVVV|VexWIG|NoSuf, { Dword|Unspecified|BaseIndex|RegXMM, RegXMM, RegXMM }
+ vshufp<sd>, 0x<sd:ppfx>c6, AVX, Modrm|Vex|Space0F|VexVVVV|VexWIG|CheckOperandSize|NoSuf, { Imm8|Imm8S, Unspecified|BaseIndex|RegXMM|RegYMM, RegXMM|RegYMM, RegXMM|RegYMM }
+@@ -1828,7 +1834,9 @@ vpmovzxwq, 0x6634, AVX2|AVX512VL, Modrm|
+ 
+ // New AVX2 instructions.
+ 
+-vbroadcasti128, 0x665A, AVX2, Modrm|Vex=2|Space0F38|VexW=1|NoSuf, { Xmmword|Unspecified|BaseIndex, RegYMM }
+vbroadcasti128, 0x665A, AVX2, Modrm|Vex256|Space0F38|VexW0|NoSuf, { Xmmword|Unspecified|BaseIndex, RegYMM }
+// vbroadcasti32x4 in disguise (see vround{p,s}{s,d} comment)
+vbroadcasti128, 0x665a, APX_F&AVX512VL, Modrm|EVex256|Space0F38|VexW0|Disp8MemShift=4|NoSuf, { Xmmword|Unspecified|BaseIndex, RegYMM }
+ vbroadcastsd, 0x6619, AVX2, Modrm|Vex=2|Space0F38|VexW=1|NoSuf, { RegXMM, RegYMM }
+ vbroadcastss, 0x6618, AVX2|AVX512F, Modrm|Vex|EVexDYN|Masking|Space0F38|VexW0|Disp8MemShift=2|NoSuf, { RegXMM|Dword|Unspecified|BaseIndex, RegXMM|RegYMM|RegZMM }
+ vpblendd, 0x6602, AVX2, Modrm|Vex|Space0F3A|VexVVVV|VexW0|CheckOperandSize|NoSuf, { Imm8|Imm8S, Unspecified|BaseIndex|RegXMM|RegYMM, RegXMM|RegYMM, RegXMM|RegYMM }
+@@ -1840,8 +1848,12 @@ vpermd, 0x6636, AVX2|AVX512F, Modrm|Vex2
+ vpermpd, 0x6601, AVX2|AVX512F, Modrm|Vex256|EVexDYN|Masking|Space0F3A|VexW1|Broadcast|Disp8ShiftVL|CheckOperandSize|NoSuf, { Imm8|Imm8S, RegYMM|RegZMM|Qword|Unspecified|BaseIndex, RegYMM|RegZMM }
+ vpermps, 0x6616, AVX2|AVX512F, Modrm|Vex256|EVexDYN|Masking|Space0F38|VexVVVV|VexW0|Broadcast|Disp8ShiftVL|CheckOperandSize|NoSuf, { RegYMM|RegZMM|Dword|Unspecified|BaseIndex, RegYMM|RegZMM, RegYMM|RegZMM }
+ vpermq, 0x6600, AVX2|AVX512F, Modrm|Vex256|EVexDYN|Masking|Space0F3A|VexW1|Broadcast|Disp8ShiftVL|CheckOperandSize|NoSuf, { Imm8|Imm8S, RegYMM|RegZMM|Qword|Unspecified|BaseIndex, RegYMM|RegZMM }
+-vextracti128, 0x6639, AVX2, Modrm|Vex=2|Space0F3A|VexW=1|NoSuf, { Imm8, RegYMM, Unspecified|BaseIndex|RegXMM }
+vextracti128, 0x6639, AVX2, Modrm|Vex256|Space0F3A|VexW0|NoSuf, { Imm8, RegYMM, Unspecified|BaseIndex|RegXMM }
+// vextracti32x4 in disguise (see vround{p,s}{s,d} comment)
+vextracti128, 0x6639, APX_F&AVX512VL, Modrm|EVex256|Space0F3A|VexW0|Disp8MemShift=4|NoSuf, { Imm8, RegYMM, Xmmword|Unspecified|BaseIndex }
+ vinserti128, 0x6638, AVX2, Modrm|Vex256|Space0F3A|VexVVVV|VexW0|NoSuf, { Imm8, Unspecified|BaseIndex|RegXMM, RegYMM, RegYMM }
+// vinserti32x4 in disguise (see vround{p,s}{s,d} comment)
+vinserti128, 0x6638, APX_F&AVX512VL, Modrm|EVex256|Space0F3A|VexVVVV|VexW0|Disp8MemShift=4|NoSuf, { Imm8, Xmmword|Unspecified|BaseIndex, RegYMM, RegYMM }
+ vpmaskmov<dq>, 0x668e, AVX2, Modrm|Vex|Space0F38|VexVVVV|<dq:vexw>|CheckOperandSize|NoSuf, { RegXMM|RegYMM, RegXMM|RegYMM, Xmmword|Ymmword|Unspecified|BaseIndex }
+ vpmaskmov<dq>, 0x668c, AVX2, Modrm|Vex|Space0F38|VexVVVV|<dq:vexw>|CheckOperandSize|NoSuf, { Xmmword|Ymmword|Unspecified|BaseIndex, RegXMM|RegYMM, RegXMM|RegYMM }
+ vpsllv<dq>, 0x6647, AVX2|AVX512F, Modrm|Vex|EVexDYN|Masking|Space0F38|VexVVVV|<dq:vexw>|Broadcast|Disp8ShiftVL|CheckOperandSize|NoSuf, { RegXMM|RegYMM|RegZMM|<dq:elem>|Unspecified|BaseIndex, RegXMM|RegYMM|RegZMM, RegXMM|RegYMM|RegZMM }
+@@ -2115,12 +2127,12 @@ xcryptofb, 0xf30fa7e8, PadLock, NoSuf|Re
+ xstore, 0xfa7c0, PadLock, NoSuf|RepPrefixOk, {}
+ 
+ // Multy-precision Add Carry, rdseed instructions.
+-adcx, 0x6666, ADX&APX_F, C|Modrm|CheckOperandSize|IgnoreSize|No_bSuf|No_wSuf|No_sSuf|DstVVVV|EVexMap4, { Reg32|Reg64|Unspecified|BaseIndex, Reg32|Reg64, Reg32|Reg64 }
+adcx, 0x6666, ADX&APX_F, C|Modrm|CheckOperandSize|No_bSuf|No_wSuf|No_sSuf|DstVVVV|EVexMap4, { Reg32|Reg64|Unspecified|BaseIndex, Reg32|Reg64, Reg32|Reg64 }
+ adcx, 0x660f38f6, ADX, Modrm|CheckOperandSize|IgnoreSize|No_bSuf|No_wSuf|No_sSuf, { Reg32|Reg64|Unspecified|BaseIndex, Reg32|Reg64 }
+-adcx, 0x6666, ADX&APX_F, Modrm|CheckOperandSize|IgnoreSize|No_bSuf|No_wSuf|No_sSuf|EVexMap4, { Reg32|Reg64|Unspecified|BaseIndex, Reg32|Reg64 }
+-adox, 0xf366, ADX&APX_F, C|Modrm|CheckOperandSize|IgnoreSize|No_bSuf|No_wSuf|No_sSuf|DstVVVV|EVexMap4, { Reg32|Reg64|Unspecified|BaseIndex, Reg32|Reg64, Reg32|Reg64 }
+adcx, 0x6666, ADX&APX_F, Modrm|CheckOperandSize|No_bSuf|No_wSuf|No_sSuf|EVexMap4, { Reg32|Reg64|Unspecified|BaseIndex, Reg32|Reg64 }
+adox, 0xf366, ADX&APX_F, C|Modrm|CheckOperandSize|No_bSuf|No_wSuf|No_sSuf|DstVVVV|EVexMap4, { Reg32|Reg64|Unspecified|BaseIndex, Reg32|Reg64, Reg32|Reg64 }
+ adox, 0xf30f38f6, ADX, Modrm|CheckOperandSize|IgnoreSize|No_bSuf|No_wSuf|No_sSuf, { Reg32|Reg64|Unspecified|BaseIndex, Reg32|Reg64 }
+-adox, 0xf366, ADX&APX_F, Modrm|CheckOperandSize|IgnoreSize|No_bSuf|No_wSuf|No_sSuf|EVexMap4, { Reg32|Reg64|Unspecified|BaseIndex, Reg32|Reg64 }
+adox, 0xf366, ADX&APX_F, Modrm|CheckOperandSize|No_bSuf|No_wSuf|No_sSuf|EVexMap4, { Reg32|Reg64|Unspecified|BaseIndex, Reg32|Reg64 }
+ rdseed, 0xfc7/7, RdSeed, Modrm|NoSuf, { Reg16|Reg32|Reg64 }
+ 
+ // SMAP instructions.
+@@ -3098,11 +3110,11 @@ rdsspq, 0xf30f1e/1, SHSTK&x64, Modrm|NoS
+ saveprevssp, 0xf30f01ea, SHSTK, NoSuf, {}
+ rstorssp, 0xf30f01/5, SHSTK, Modrm|NoSuf, { Qword|Unspecified|BaseIndex }
+ wrssd, 0x0f38f6, SHSTK, Modrm|IgnoreSize|NoSuf, { Reg32, Dword|Unspecified|BaseIndex }
+-wrssd, 0x66, SHSTK&APX_F, Modrm|IgnoreSize|NoSuf|EVexMap4, { Reg32, Dword|Unspecified|BaseIndex }
+wrssd, 0x66, SHSTK&APX_F, Modrm|NoSuf|EVexMap4, { Reg32, Dword|Unspecified|BaseIndex }
+ wrssq, 0x0f38f6, SHSTK&x64, Modrm|NoSuf|Size64, { Reg64, Qword|Unspecified|BaseIndex }
+ wrssq, 0x66, SHSTK&APX_F, Modrm|NoSuf|Size64|EVexMap4, { Reg64, Qword|Unspecified|BaseIndex }
+ wrussd, 0x660f38f5, SHSTK, Modrm|IgnoreSize|NoSuf, { Reg32, Dword|Unspecified|BaseIndex }
+-wrussd, 0x6665, SHSTK&APX_F, Modrm|IgnoreSize|NoSuf|EVexMap4, { Reg32, Dword|Unspecified|BaseIndex }
+wrussd, 0x6665, SHSTK&APX_F, Modrm|NoSuf|EVexMap4, { Reg32, Dword|Unspecified|BaseIndex }
+ wrussq, 0x660f38f5, SHSTK&x64, Modrm|NoSuf, { Reg64, Qword|Unspecified|BaseIndex }
+ wrussq, 0x6665, SHSTK&APX_F, Modrm|NoSuf|EVexMap4, { Reg64, Qword|Unspecified|BaseIndex }
+ setssbsy, 0xf30f01e8, SHSTK, NoSuf, {}
+@@ -3152,7 +3164,7 @@ cldemote, 0x0f1c/0, CLDEMOTE, Modrm|Anys
+ // MOVDIR[I,64B] instructions.
+ 
+ movdiri, 0xf38f9, MOVDIRI, Modrm|CheckOperandSize|IgnoreSize|No_bSuf|No_wSuf|No_sSuf, { Reg32|Reg64, Dword|Qword|Unspecified|BaseIndex }
+-movdiri, 0xf9, MOVDIRI&APX_F, Modrm|CheckOperandSize|IgnoreSize|No_bSuf|No_wSuf|No_sSuf|EVexMap4, { Reg32|Reg64, Dword|Qword|Unspecified|BaseIndex }
+movdiri, 0xf9, MOVDIRI&APX_F, Modrm|CheckOperandSize|No_bSuf|No_wSuf|No_sSuf|EVexMap4, { Reg32|Reg64, Dword|Qword|Unspecified|BaseIndex }
+ movdir64b, 0x660f38f8, MOVDIR64B, Modrm|AddrPrefixOpReg|NoSuf, { Unspecified|BaseIndex, Reg16|Reg32|Reg64 }
+ movdir64b, 0x66f8, MOVDIR64B&APX_F, Modrm|AddrPrefixOpReg|NoSuf|EVexMap4, { Unspecified|BaseIndex, Reg32|Reg64 }
+ 
+@@ -3459,13 +3471,13 @@ wrmsrlist, 0xf30f01c6, MSRLIST, NoSuf, {
+ // RAO-INT instructions.
+ 
+ aadd, 0xf38fc, RAO_INT, Modrm|IgnoreSize|CheckOperandSize|NoSuf, { Reg32|Reg64, Dword|Qword|Unspecified|BaseIndex }
+-aadd, 0xfc, RAO_INT&APX_F, Modrm|IgnoreSize|CheckOperandSize|NoSuf|EVexMap4, { Reg32|Reg64, Dword|Qword|Unspecified|BaseIndex }
+aadd, 0xfc, RAO_INT&APX_F, Modrm|CheckOperandSize|NoSuf|EVexMap4, { Reg32|Reg64, Dword|Qword|Unspecified|BaseIndex }
+ aand, 0x660f38fc, RAO_INT, Modrm|IgnoreSize|CheckOperandSize|NoSuf, { Reg32|Reg64, Dword|Qword|Unspecified|BaseIndex }
+-aand, 0x66fc, RAO_INT&APX_F, Modrm|IgnoreSize|CheckOperandSize|NoSuf|EVexMap4, { Reg32|Reg64, Dword|Qword|Unspecified|BaseIndex }
+aand, 0x66fc, RAO_INT&APX_F, Modrm|CheckOperandSize|NoSuf|EVexMap4, { Reg32|Reg64, Dword|Qword|Unspecified|BaseIndex }
+ aor, 0xf20f38fc, RAO_INT, Modrm|IgnoreSize|CheckOperandSize|NoSuf, { Reg32|Reg64, Dword|Qword|Unspecified|BaseIndex }
+-aor, 0xf2fc, RAO_INT&APX_F, Modrm|IgnoreSize|CheckOperandSize|NoSuf|EVexMap4, { Reg32|Reg64, Dword|Qword|Unspecified|BaseIndex }
+aor, 0xf2fc, RAO_INT&APX_F, Modrm|CheckOperandSize|NoSuf|EVexMap4, { Reg32|Reg64, Dword|Qword|Unspecified|BaseIndex }
+ axor, 0xf30f38fc, RAO_INT, Modrm|IgnoreSize|CheckOperandSize|NoSuf, { Reg32|Reg64, Dword|Qword|Unspecified|BaseIndex }
+-axor, 0xf3fc, RAO_INT&APX_F, Modrm|IgnoreSize|CheckOperandSize|NoSuf|EVexMap4, { Reg32|Reg64, Dword|Qword|Unspecified|BaseIndex }
+axor, 0xf3fc, RAO_INT&APX_F, Modrm|CheckOperandSize|NoSuf|EVexMap4, { Reg32|Reg64, Dword|Qword|Unspecified|BaseIndex }
+ 
+ // RAO-INT instructions end.
+ 
+diff -rupN binutils.orig/opcodes/i386-tbl.h binutils-2.41/opcodes/i386-tbl.h
+--- binutils.orig/opcodes/i386-tbl.h	2024-02-12 15:55:21.578572835 +0000
+++ binutils-2.41/opcodes/i386-tbl.h	2024-02-12 16:42:52.494835094 +0000
+@@ -15372,6 +15372,16 @@ static const insn_template i386_optab[]
+ 	  1, 0, 0, 0, 1, 0 } },
+       { { 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 	  0, 1, 0, 0, 0, 0 } } } },
+  { MN_vbroadcastf128, 0x1a, 2, SPACE_0F38, None,
+    { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 1, 1, 0, 0, 3, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0,
+      0 },
+    { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0 } },
+    { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+    { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0,
+	  1, 0, 0, 0, 1, 0 } },
+      { { 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	  0, 1, 0, 0, 0, 0 } } } },
+   { MN_vbroadcastsd, 0x19, 2, SPACE_0F38, None,
+     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,
+       0, 0, 0, 2, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0,
+@@ -20804,6 +20814,18 @@ static const insn_template i386_optab[]
+ 	  0, 1, 0, 0, 0, 0 } },
+       { { 7, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0,
+ 	  1, 0, 0, 0, 1, 0 } } } },
+  { MN_vextractf128, 0x19, 3, SPACE_0F3A, None,
+    { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 1, 1, 0, 0, 3, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0,
+      0 },
+    { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0 } },
+    { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+    { { { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	  0, 0, 0, 0, 0, 0 } },
+      { { 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	  0, 1, 0, 0, 0, 0 } },
+      { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0,
+	  1, 0, 0, 0, 1, 0 } } } },
+   { MN_vextractps, 0x17, 3, SPACE_0F3A, None,
+     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,
+       0, 0, 0, 1, 0, 3, 1, 0, 0, 2, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0,
+@@ -20890,6 +20912,20 @@ static const insn_template i386_optab[]
+ 	  0, 1, 0, 0, 0, 0 } },
+       { { 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 	  0, 1, 0, 0, 0, 0 } } } },
+  { MN_vinsertf128, 0x18, 4, SPACE_0F3A, None,
+    { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 1, 1, 1, 0, 0, 3, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0,
+      0 },
+    { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0 } },
+    { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+    { { { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	  0, 0, 0, 0, 0, 0 } },
+      { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0,
+	  1, 0, 0, 0, 1, 0 } },
+      { { 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	  0, 1, 0, 0, 0, 0 } },
+      { { 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	  0, 1, 0, 0, 0, 0 } } } },
+   { MN_vinsertps, 0x21, 4, SPACE_0F3A, None,
+     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,
+       0, 0, 0, 1, 1, 3, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0,
+@@ -25296,7 +25332,7 @@ static const insn_template i386_optab[]
+     { 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,
+       0, 0, 0, 0, 0, 1, 1, 0, 0, 5, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0,
+       0 },
+-    { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0 } },
+    { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0 } },
+     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+     { { { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 	  0, 0, 0, 0, 0, 0 } },
+@@ -25320,7 +25356,7 @@ static const insn_template i386_optab[]
+     { 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,
+       0, 0, 0, 0, 0, 2, 1, 0, 0, 5, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0,
+       0 },
+-    { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0 } },
+    { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0 } },
+     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+     { { { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 	  0, 0, 0, 0, 0, 0 } },
+@@ -25346,7 +25382,7 @@ static const insn_template i386_optab[]
+     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,
+       0, 0, 0, 0, 1, 1, 1, 0, 0, 4, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0,
+       0 },
+-    { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0 } },
+    { { 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 0 } },
+     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+     { { { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 	  0, 0, 0, 0, 0, 0 } },
+@@ -25374,7 +25410,7 @@ static const insn_template i386_optab[]
+     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,
+       0, 0, 0, 0, 1, 2, 1, 0, 0, 4, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0,
+       0 },
+-    { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0 } },
+    { { 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 0 } },
+     { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+     { { { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 	  0, 0, 0, 0, 0, 0 } },
+@@ -25884,6 +25920,16 @@ static const insn_template i386_optab[]
+ 	  1, 0, 0, 0, 1, 0 } },
+       { { 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 	  0, 1, 0, 0, 0, 0 } } } },
+  { MN_vbroadcasti128, 0x5a, 2, SPACE_0F38, None,
+    { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 1, 1, 0, 0, 3, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0,
+      0 },
+    { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0 } },
+    { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+    { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0,
+	  1, 0, 0, 0, 1, 0 } },
+      { { 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	  0, 1, 0, 0, 0, 0 } } } },
+   { MN_vpblendd, 0x02, 4, SPACE_0F3A, None,
+     { 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,
+       0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0,
+@@ -26106,6 +26152,18 @@ static const insn_template i386_optab[]
+ 	  0, 1, 0, 0, 0, 0 } },
+       { { 7, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0,
+ 	  1, 0, 0, 0, 1, 0 } } } },
+  { MN_vextracti128, 0x39, 3, SPACE_0F3A, None,
+    { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 1, 1, 0, 0, 3, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0,
+      0 },
+    { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0 } },
+    { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+    { { { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	  0, 0, 0, 0, 0, 0 } },
+      { { 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	  0, 1, 0, 0, 0, 0 } },
+      { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0,
+	  1, 0, 0, 0, 1, 0 } } } },
+   { MN_vinserti128, 0x38, 4, SPACE_0F3A, None,
+     { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,
+       0, 0, 0, 2, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0,
+@@ -26120,6 +26178,20 @@ static const insn_template i386_optab[]
+ 	  0, 1, 0, 0, 0, 0 } },
+       { { 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 	  0, 1, 0, 0, 0, 0 } } } },
+  { MN_vinserti128, 0x38, 4, SPACE_0F3A, None,
+    { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 1, 1, 1, 0, 0, 3, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0,
+      0 },
+    { { 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0 } },
+    { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+    { { { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	  0, 0, 0, 0, 0, 0 } },
+      { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0,
+	  1, 0, 0, 0, 1, 0 } },
+      { { 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	  0, 1, 0, 0, 0, 0 } },
+      { { 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	  0, 1, 0, 0, 0, 0 } } } },
+   { MN_vpmaskmovd, 0x8e, 3, SPACE_0F38, None,
+     { 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,
+       0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0,
+@@ -30933,7 +31005,7 @@ static const insn_template i386_optab[]
+     { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 	  0, 0, 0, 0, 0, 0 } } } },
+   { MN_adcx, 0x66, 3, SPACE_EVEXMAP4, None,
+-    { 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0,
+    { 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0,
+       0, 0, 0, 0, 2, 0, 1, 0, 0, 2, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,
+       0 },
+     { { 61, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0 } },
+@@ -30955,7 +31027,7 @@ static const insn_template i386_optab[]
+       { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0,
+ 	  0, 0, 0, 0, 0, 0 } } } },
+   { MN_adcx, 0x66, 2, SPACE_EVEXMAP4, None,
+-    { 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0,
+    { 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0,
+       0, 0, 0, 0, 0, 0, 1, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+       0 },
+     { { 61, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0 } },
+@@ -30965,7 +31037,7 @@ static const insn_template i386_optab[]
+       { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0,
+ 	  0, 0, 0, 0, 0, 0 } } } },
+   { MN_adox, 0x66, 3, SPACE_EVEXMAP4, None,
+-    { 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0,
+    { 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0,
+       0, 0, 0, 0, 2, 0, 2, 0, 0, 2, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,
+       0 },
+     { { 61, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0 } },
+@@ -30987,7 +31059,7 @@ static const insn_template i386_optab[]
+       { { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0,
+ 	  0, 0, 0, 0, 0, 0 } } } },
+   { MN_adox, 0x66, 2, SPACE_EVEXMAP4, None,
+-    { 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0,
+    { 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0,
+       0, 0, 0, 0, 0, 0, 2, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+       0 },
+     { { 61, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0 } },
+@@ -37497,7 +37569,7 @@ static const insn_template i386_optab[]
+       { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 1, 0, 0, 0,
+ 	  0, 0, 0, 0, 1, 0 } } } },
+   { MN_wrssd, 0x66, 2, SPACE_EVEXMAP4, None,
+-    { 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,
+    { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,
+       0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+       0 },
+     { { 105, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0 } },
+@@ -37537,7 +37609,7 @@ static const insn_template i386_optab[]
+       { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 1, 0, 0, 0,
+ 	  0, 0, 0, 0, 1, 0 } } } },
+   { MN_wrussd, 0x65, 2, SPACE_EVEXMAP4, None,
+-    { 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,
+    { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,
+       0, 0, 0, 0, 0, 0, 1, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+       0 },
+     { { 105, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0 } },
+@@ -37697,7 +37769,7 @@ static const insn_template i386_optab[]
+       { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 1, 0, 1, 0,
+ 	  0, 0, 0, 0, 1, 0 } } } },
+   { MN_movdiri, 0xf9, 2, SPACE_EVEXMAP4, None,
+-    { 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0,
+    { 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0,
+       0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+       0 },
+     { { 120, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0 } },
+@@ -41093,7 +41165,7 @@ static const insn_template i386_optab[]
+       { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 1, 0, 1, 0,
+ 	  0, 0, 0, 0, 1, 0 } } } },
+   { MN_aadd, 0xfc, 2, SPACE_EVEXMAP4, None,
+-    { 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,
+    { 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,
+       0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+       0 },
+     { { 95, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0 } },
+@@ -41113,7 +41185,7 @@ static const insn_template i386_optab[]
+       { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 1, 0, 1, 0,
+ 	  0, 0, 0, 0, 1, 0 } } } },
+   { MN_aand, 0xfc, 2, SPACE_EVEXMAP4, None,
+-    { 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,
+    { 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,
+       0, 0, 0, 0, 0, 0, 1, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+       0 },
+     { { 95, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0 } },
+@@ -41133,7 +41205,7 @@ static const insn_template i386_optab[]
+       { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 1, 0, 1, 0,
+ 	  0, 0, 0, 0, 1, 0 } } } },
+   { MN_aor, 0xfc, 2, SPACE_EVEXMAP4, None,
+-    { 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,
+    { 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,
+       0, 0, 0, 0, 0, 0, 3, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+       0 },
+     { { 95, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0 } },
+@@ -41153,7 +41225,7 @@ static const insn_template i386_optab[]
+       { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 1, 0, 1, 0,
+ 	  0, 0, 0, 0, 1, 0 } } } },
+   { MN_axor, 0xfc, 2, SPACE_EVEXMAP4, None,
+-    { 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,
+    { 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,
+       0, 0, 0, 0, 0, 0, 2, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+       0 },
+     { { 95, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0 } },
+@@ -41398,203 +41470,203 @@ static const i386_op_off_t i386_op_sets[
+   1540, 1541, 1542, 1544, 1546, 1548, 1550, 1552,
+   1554, 1556, 1558, 1560, 1562, 1564, 1566, 1568,
+   1570, 1572, 1574, 1576, 1578, 1579, 1580, 1582,
+-  1584, 1586, 1588, 1589, 1590, 1591, 1592, 1593,
+-  1596, 1598, 1600, 1602, 1604, 1606, 1608, 1610,
+-  1612, 1614, 1616, 1618, 1620, 1622, 1624, 1626,
+-  1628, 1630, 1632, 1634, 1636, 1638, 1640, 1642,
+-  1644, 1646, 1648, 1650, 1652, 1654, 1656, 1658,
+-  1660, 1662, 1664, 1666, 1668, 1670, 1672, 1674,
+-  1676, 1678, 1680, 1682, 1684, 1686, 1688, 1690,
+-  1692, 1694, 1696, 1698, 1700, 1702, 1704, 1706,
+-  1708, 1710, 1712, 1714, 1716, 1718, 1720, 1722,
+-  1724, 1726, 1728, 1730, 1732, 1734, 1736, 1738,
+-  1740, 1742, 1744, 1746, 1748, 1750, 1752, 1754,
+-  1756, 1758, 1760, 1762, 1764, 1766, 1768, 1770,
+-  1772, 1774, 1776, 1778, 1780, 1782, 1784, 1786,
+-  1788, 1790, 1792, 1794, 1796, 1798, 1800, 1802,
+-  1804, 1806, 1808, 1810, 1812, 1814, 1816, 1818,
+-  1820, 1822, 1824, 1826, 1828, 1830, 1832, 1834,
+-  1836, 1838, 1840, 1842, 1844, 1846, 1848, 1850,
+-  1852, 1854, 1856, 1858, 1860, 1862, 1864, 1866,
+-  1868, 1870, 1872, 1874, 1876, 1878, 1880, 1882,
+-  1884, 1886, 1888, 1890, 1892, 1894, 1896, 1898,
+-  1900, 1902, 1904, 1906, 1908, 1910, 1912, 1914,
+-  1916, 1918, 1920, 1922, 1924, 1926, 1928, 1930,
+-  1932, 1934, 1936, 1938, 1940, 1942, 1944, 1946,
+-  1948, 1950, 1952, 1954, 1956, 1958, 1960, 1962,
+-  1964, 1966, 1968, 1970, 1972, 1974, 1976, 1978,
+-  1983, 1985, 1990, 1992, 1994, 1999, 2001, 2003,
+-  2005, 2010, 2012, 2014, 2016, 2020, 2026, 2028,
+-  2033, 2035, 2037, 2039, 2041, 2043, 2045, 2047,
+-  2049, 2051, 2052, 2053, 2054, 2056, 2057, 2058,
+-  2059, 2060, 2061, 2063, 2064, 2065, 2066, 2068,
+-  2070, 2072, 2074, 2076, 2078, 2080, 2082, 2084,
+-  2086, 2088, 2090, 2092, 2096, 2097, 2098, 2100,
+-  2104, 2108, 2110, 2114, 2118, 2119, 2120, 2122,
+-  2124, 2126, 2128, 2133, 2137, 2141, 2143, 2145,
+-  2147, 2149, 2150, 2152, 2154, 2156, 2158, 2160,
+-  2162, 2164, 2166, 2168, 2170, 2172, 2174, 2176,
+-  2178, 2180, 2182, 2184, 2186, 2188, 2190, 2192,
+-  2194, 2195, 2196, 2198, 2200, 2201, 2202, 2205,
+-  2208, 2211, 2214, 2216, 2218, 2220, 2222, 2224,
+-  2226, 2227, 2228, 2229, 2231, 2235, 2237, 2239,
+-  2245, 2249, 2250, 2251, 2252, 2253, 2254, 2255,
+-  2256, 2260, 2262, 2264, 2268, 2270, 2272, 2274,
+-  2276, 2278, 2280, 2282, 2284, 2286, 2288, 2290,
+-  2292, 2294, 2296, 2297, 2300, 2303, 2308, 2313,
+-  2316, 2319, 2322, 2325, 2330, 2335, 2338, 2341,
+-  2343, 2345, 2347, 2349, 2351, 2353, 2355, 2356,
+-  2358, 2360, 2362, 2364, 2366, 2367, 2368, 2369,
+-  2373, 2377, 2379, 2383, 2387, 2391, 2395, 2399,
+-  2401, 2405, 2407, 2409, 2411, 2413, 2415, 2417,
+-  2419, 2421, 2422, 2424, 2426, 2428, 2430, 2432,
+-  2434, 2436, 2438, 2439, 2440, 2441, 2443, 2445,
+-  2447, 2449, 2450, 2451, 2453, 2455, 2457, 2459,
+-  2461, 2463, 2464, 2466, 2468, 2470, 2472, 2473,
+-  2474, 2476, 2478, 2480, 2482, 2484, 2486, 2488,
+-  2490, 2491, 2492, 2493, 2494, 2497, 2500, 2502,
+-  2505, 2506, 2507, 2509, 2510, 2512, 2513, 2514,
+-  2516, 2518, 2519, 2520, 2521, 2522, 2523, 2526,
+-  2531, 2536, 2541, 2546, 2549, 2554, 2559, 2561,
+-  2563, 2565, 2567, 2568, 2569, 2571, 2573, 2575,
+-  2577, 2579, 2581, 2583, 2584, 2585, 2586, 2587,
+-  2588, 2589, 2594, 2599, 2600, 2601, 2602, 2603,
+-  2604, 2605, 2606, 2607, 2608, 2609, 2610, 2611,
+-  2612, 2613, 2614, 2615, 2616, 2617, 2618, 2619,
+-  2620, 2621, 2622, 2623, 2624, 2625, 2626, 2627,
+-  2628, 2629, 2630, 2631, 2632, 2633, 2634, 2635,
+-  2636, 2637, 2638, 2639, 2640, 2641, 2642, 2643,
+-  2644, 2645, 2646, 2647, 2648, 2649, 2650, 2651,
+-  2652, 2653, 2654, 2655, 2656, 2657, 2658, 2659,
+-  2660, 2661, 2662, 2663, 2664, 2665, 2666, 2667,
+-  2668, 2669, 2670, 2671, 2672, 2673, 2674, 2675,
+-  2676, 2677, 2678, 2679, 2680, 2681, 2682, 2683,
+-  2684, 2685, 2686, 2687, 2688, 2689, 2690, 2691,
+-  2692, 2693, 2694, 2695, 2696, 2697, 2698, 2699,
+-  2700, 2701, 2702, 2703, 2704, 2705, 2706, 2707,
+-  2708, 2709, 2710, 2711, 2712, 2713, 2714, 2715,
+-  2716, 2717, 2718, 2719, 2720, 2721, 2722, 2723,
+-  2724, 2725, 2726, 2727, 2728, 2729, 2730, 2731,
+-  2732, 2733, 2734, 2735, 2736, 2737, 2738, 2739,
+-  2740, 2741, 2742, 2743, 2744, 2745, 2746, 2747,
+-  2748, 2749, 2750, 2751, 2752, 2753, 2754, 2755,
+-  2756, 2757, 2758, 2759, 2760, 2761, 2762, 2763,
+-  2764, 2765, 2766, 2767, 2768, 2769, 2770, 2771,
+-  2772, 2773, 2774, 2775, 2776, 2777, 2778, 2779,
+-  2780, 2781, 2782, 2783, 2784, 2785, 2786, 2787,
+-  2788, 2789, 2790, 2791, 2792, 2793, 2794, 2795,
+-  2796, 2797, 2798, 2799, 2800, 2802, 2804, 2805,
+-  2806, 2807, 2808, 2809, 2810, 2811, 2812, 2813,
+-  2814, 2815, 2816, 2817, 2818, 2819, 2820, 2821,
+-  2822, 2823, 2824, 2825, 2826, 2827, 2828, 2829,
+-  2830, 2831, 2832, 2834, 2836, 2838, 2840, 2841,
+-  2842, 2843, 2844, 2845, 2846, 2847, 2848, 2849,
+-  2850, 2851, 2852, 2853, 2855, 2856, 2857, 2858,
+-  2859, 2860, 2861, 2862, 2863, 2864, 2865, 2866,
+-  2867, 2868, 2869, 2870, 2871, 2872, 2873, 2874,
+-  2875, 2876, 2877, 2878, 2879, 2880, 2881, 2882,
+-  2883, 2884, 2885, 2886, 2887, 2888, 2889, 2890,
+-  2891, 2892, 2893, 2894, 2895, 2896, 2897, 2898,
+-  2899, 2900, 2902, 2904, 2905, 2906, 2908, 2909,
+-  2911, 2913, 2914, 2915, 2917, 2919, 2920, 2921,
+-  2922, 2923, 2924, 2925, 2926, 2927, 2928, 2929,
+-  2930, 2931, 2932, 2933, 2934, 2935, 2936, 2937,
+-  2940, 2943, 2944, 2945, 2946, 2947, 2948, 2949,
+-  2951, 2953, 2955, 2956, 2957, 2959, 2961, 2963,
+-  2965, 2969, 2971, 2973, 2974, 2975, 2976, 2977,
+-  2978, 2979, 2980, 2981, 2982, 2983, 2984, 2985,
+-  2986, 2987, 2988, 2989, 2990, 2991, 2994, 2997,
+-  2998, 2999, 3000, 3001, 3002, 3003, 3004, 3005,
+-  3006, 3007, 3008, 3009, 3010, 3011, 3012, 3013,
+-  3014, 3015, 3016, 3017, 3018, 3019, 3020, 3021,
+-  3022, 3023, 3024, 3025, 3026, 3027, 3028, 3029,
+-  3030, 3031, 3032, 3033, 3034, 3035, 3036, 3037,
+-  3038, 3039, 3040, 3041, 3042, 3043, 3044, 3045,
+-  3046, 3047, 3048, 3049, 3050, 3051, 3054, 3056,
+-  3059, 3062, 3064, 3067, 3070, 3073, 3076, 3077,
+-  3080, 3081, 3082, 3083, 3084, 3085, 3089, 3091,
+-  3094, 3095, 3096, 3097, 3098, 3099, 3100, 3101,
+-  3102, 3103, 3104, 3105, 3106, 3107, 3108, 3109,
+-  3110, 3111, 3112, 3113, 3114, 3115, 3116, 3117,
+-  3118, 3119, 3120, 3121, 3122, 3123, 3124, 3125,
+-  3126, 3127, 3128, 3129, 3130, 3131, 3132, 3133,
+-  3134, 3135, 3136, 3137, 3138, 3139, 3140, 3141,
+-  3142, 3143, 3144, 3145, 3146, 3147, 3148, 3149,
+-  3151, 3152, 3153, 3154, 3155, 3156, 3157, 3158,
+-  3159, 3160, 3161, 3162, 3163, 3164, 3165, 3166,
+-  3167, 3168, 3169, 3170, 3171, 3172, 3173, 3174,
+-  3175, 3176, 3177, 3178, 3179, 3180, 3181, 3182,
+-  3183, 3184, 3185, 3186, 3187, 3188, 3189, 3190,
+-  3193, 3196, 3199, 3202, 3205, 3208, 3211, 3214,
+-  3217, 3220, 3223, 3226, 3229, 3232, 3235, 3236,
+-  3237, 3238, 3239, 3241, 3242, 3243, 3244, 3245,
+-  3246, 3247, 3248, 3249, 3250, 3251, 3252, 3253,
+-  3254, 3255, 3256, 3257, 3258, 3259, 3260, 3261,
+-  3262, 3263, 3264, 3265, 3266, 3267, 3268, 3269,
+-  3270, 3271, 3272, 3273, 3274, 3275, 3276, 3277,
+-  3278, 3279, 3280, 3281, 3282, 3283, 3284, 3285,
+-  3286, 3287, 3288, 3289, 3290, 3291, 3292, 3293,
+-  3294, 3295, 3296, 3297, 3298, 3299, 3300, 3301,
+-  3302, 3305, 3308, 3309, 3310, 3311, 3312, 3313,
+-  3314, 3315, 3316, 3317, 3318, 3319, 3320, 3321,
+-  3322, 3323, 3324, 3325, 3326, 3327, 3328, 3329,
+-  3330, 3331, 3332, 3333, 3334, 3335, 3336, 3337,
+-  3338, 3339, 3340, 3341, 3342, 3343, 3344, 3345,
+-  3346, 3347, 3348, 3349, 3350, 3351, 3352, 3353,
+-  3354, 3355, 3356, 3357, 3358, 3359, 3360, 3361,
+-  3362, 3363, 3364, 3365, 3366, 3367, 3368, 3369,
+-  3370, 3373, 3376, 3379, 3380, 3381, 3382, 3383,
+-  3384, 3385, 3386, 3387, 3388, 3389, 3390, 3391,
+-  3392, 3393, 3394, 3395, 3398, 3401, 3402, 3403,
+-  3406, 3407, 3408, 3409, 3410, 3413, 3416, 3419,
+-  3420, 3421, 3422, 3423, 3424, 3425, 3426, 3427,
+-  3428, 3429, 3431, 3433, 3434, 3435, 3436, 3437,
+-  3438, 3439, 3440, 3441, 3442, 3443, 3444, 3445,
+-  3446, 3447, 3448, 3449, 3450, 3451, 3452, 3453,
+-  3454, 3455, 3456, 3457, 3458, 3460, 3462, 3463,
+-  3464, 3465, 3466, 3467, 3468, 3469, 3470, 3471,
+-  3472, 3473, 3474, 3475, 3476, 3477, 3478, 3479,
+-  3480, 3481, 3482, 3483, 3484, 3485, 3486, 3487,
+-  3489, 3491, 3493, 3495, 3496, 3497, 3498, 3499,
+-  3500, 3501, 3502, 3503, 3504, 3505, 3506, 3507,
+-  3508, 3509, 3510, 3512, 3513, 3515, 3518, 3520,
+-  3521, 3522, 3524, 3526, 3527, 3528, 3529, 3530,
+-  3531, 3532, 3534, 3536, 3538, 3540, 3541, 3542,
+-  3543, 3544, 3545, 3546, 3547, 3548, 3549, 3551,
+-  3553, 3554, 3556, 3558, 3559, 3564, 3566, 3568,
+-  3569, 3570, 3571, 3572, 3573, 3574, 3575, 3577,
+-  3579, 3580, 3581, 3582, 3584, 3587, 3590, 3593,
+-  3595, 3596, 3597, 3598, 3599, 3600, 3601, 3602,
+-  3603, 3604, 3605, 3606, 3607, 3608, 3609, 3610,
+-  3611, 3612, 3613, 3614, 3615, 3617, 3619, 3621,
+-  3623, 3625, 3627, 3629, 3631, 3633, 3635, 3636,
+-  3637, 3638, 3639, 3640, 3641, 3642, 3643, 3644,
+-  3645, 3646, 3647, 3648, 3649, 3650, 3651, 3652,
+-  3653, 3654, 3655, 3656, 3657, 3658, 3659, 3660,
+-  3661, 3662, 3663, 3664, 3665, 3666, 3667, 3668,
+-  3669, 3670, 3671, 3672, 3673, 3674, 3675, 3676,
+-  3677, 3678, 3679, 3680, 3681, 3682, 3683, 3684,
+-  3685, 3686, 3687, 3688, 3689, 3690, 3691, 3692,
+-  3693, 3694, 3695, 3696, 3697, 3698, 3699, 3700,
+-  3701, 3702, 3703, 3704, 3705, 3706, 3707, 3708,
+-  3709, 3710, 3711, 3712, 3713, 3714, 3715, 3716,
+-  3717, 3718, 3719, 3720, 3721, 3722, 3723, 3724,
+-  3725, 3726, 3727, 3728, 3729, 3730, 3731, 3732,
+-  3733, 3734, 3735, 3736, 3737, 3738, 3739, 3740,
+-  3741, 3742, 3743, 3744, 3745, 3746, 3747, 3750,
+-  3751, 3752, 3755, 3756, 3757, 3759, 3760, 3761,
+-  3762, 3764, 3765, 3766, 3767, 3769, 3770, 3771,
+-  3772, 3775, 3776, 3777, 3778, 3779, 3782, 3785,
+-  3788, 3791, 3794, 3795, 3796, 3797, 3798, 3800,
+-  3802, 3803, 3804, 3805, 3808, 3811, 3814, 3817,
+-  3820, 3821, 3822, 3823, 3825, 3826, 3827, 3828,
+-  3830, 3831, 3832, 3833, 3834, 3835, 3836, 3837,
+-  3838, 3839, 3840, 3841, 3842, 3843, 3844, 3845,
+-  3846, 3847, 3848, 3849, 3850, 3851, 3852, 3853,
+-  3854, 3855, 3856, 3857, 3858, 3859, 3860, 3861,
+-  3862, 3863, 3864, 3865, 3866, 3867, 3868, 3869,
+-  3871, 3873, 3875, 3877, 3879, 3880, 3881, 3884,
+-  3887, 3888, 3889, 3890, 3891
+  1584, 1586, 1588, 1589, 1590, 1591, 1592, 1594,
+  1597, 1599, 1601, 1603, 1605, 1607, 1609, 1611,
+  1613, 1615, 1617, 1619, 1621, 1623, 1625, 1627,
+  1629, 1631, 1633, 1635, 1637, 1639, 1641, 1643,
+  1645, 1647, 1649, 1651, 1653, 1655, 1657, 1659,
+  1661, 1663, 1665, 1667, 1669, 1671, 1673, 1675,
+  1677, 1679, 1681, 1683, 1685, 1687, 1689, 1691,
+  1693, 1695, 1697, 1699, 1701, 1703, 1705, 1707,
+  1709, 1711, 1713, 1715, 1717, 1719, 1721, 1723,
+  1725, 1727, 1729, 1731, 1733, 1735, 1737, 1739,
+  1741, 1743, 1745, 1747, 1749, 1751, 1753, 1755,
+  1757, 1759, 1761, 1763, 1765, 1767, 1769, 1771,
+  1773, 1775, 1777, 1779, 1781, 1783, 1785, 1787,
+  1789, 1791, 1793, 1795, 1797, 1799, 1801, 1803,
+  1805, 1807, 1809, 1811, 1813, 1815, 1817, 1819,
+  1821, 1823, 1825, 1827, 1829, 1831, 1833, 1835,
+  1837, 1839, 1841, 1843, 1845, 1847, 1849, 1851,
+  1853, 1855, 1857, 1859, 1861, 1863, 1865, 1867,
+  1869, 1871, 1873, 1875, 1877, 1879, 1881, 1883,
+  1885, 1887, 1889, 1891, 1893, 1895, 1897, 1899,
+  1901, 1903, 1905, 1907, 1909, 1911, 1913, 1915,
+  1917, 1919, 1921, 1923, 1925, 1927, 1929, 1931,
+  1933, 1935, 1937, 1939, 1941, 1943, 1945, 1947,
+  1949, 1951, 1953, 1955, 1957, 1959, 1961, 1963,
+  1965, 1967, 1969, 1971, 1973, 1975, 1977, 1979,
+  1984, 1986, 1991, 1993, 1995, 2000, 2002, 2004,
+  2006, 2011, 2013, 2015, 2017, 2021, 2027, 2029,
+  2034, 2036, 2038, 2040, 2042, 2044, 2046, 2048,
+  2050, 2052, 2053, 2054, 2056, 2058, 2059, 2060,
+  2061, 2062, 2064, 2066, 2067, 2068, 2069, 2071,
+  2073, 2075, 2077, 2079, 2081, 2083, 2085, 2087,
+  2089, 2091, 2093, 2095, 2099, 2100, 2101, 2103,
+  2107, 2111, 2113, 2117, 2121, 2122, 2123, 2125,
+  2127, 2129, 2131, 2136, 2140, 2144, 2146, 2148,
+  2150, 2152, 2153, 2155, 2157, 2159, 2161, 2163,
+  2165, 2167, 2169, 2171, 2173, 2175, 2177, 2179,
+  2181, 2183, 2185, 2187, 2189, 2191, 2193, 2195,
+  2197, 2198, 2199, 2201, 2203, 2204, 2205, 2208,
+  2211, 2214, 2217, 2219, 2221, 2223, 2225, 2227,
+  2229, 2230, 2231, 2232, 2234, 2238, 2240, 2242,
+  2248, 2252, 2253, 2254, 2255, 2256, 2257, 2258,
+  2259, 2263, 2265, 2267, 2271, 2273, 2275, 2277,
+  2279, 2281, 2283, 2285, 2287, 2289, 2291, 2293,
+  2295, 2297, 2299, 2300, 2303, 2306, 2311, 2316,
+  2319, 2322, 2325, 2328, 2333, 2338, 2341, 2344,
+  2346, 2348, 2350, 2352, 2354, 2356, 2358, 2359,
+  2361, 2363, 2365, 2367, 2369, 2370, 2371, 2372,
+  2376, 2380, 2382, 2386, 2390, 2394, 2398, 2402,
+  2404, 2408, 2410, 2412, 2414, 2416, 2418, 2420,
+  2422, 2424, 2425, 2427, 2429, 2431, 2433, 2435,
+  2437, 2439, 2441, 2442, 2443, 2444, 2446, 2448,
+  2450, 2452, 2453, 2454, 2456, 2458, 2460, 2462,
+  2464, 2466, 2467, 2469, 2471, 2473, 2475, 2476,
+  2477, 2479, 2481, 2483, 2485, 2487, 2489, 2491,
+  2493, 2494, 2495, 2497, 2498, 2501, 2504, 2506,
+  2509, 2510, 2511, 2513, 2514, 2516, 2518, 2520,
+  2522, 2524, 2525, 2526, 2527, 2528, 2529, 2532,
+  2537, 2542, 2547, 2552, 2555, 2560, 2565, 2567,
+  2569, 2571, 2573, 2574, 2575, 2577, 2579, 2581,
+  2583, 2585, 2587, 2589, 2590, 2591, 2592, 2593,
+  2594, 2595, 2600, 2605, 2606, 2607, 2608, 2609,
+  2610, 2611, 2612, 2613, 2614, 2615, 2616, 2617,
+  2618, 2619, 2620, 2621, 2622, 2623, 2624, 2625,
+  2626, 2627, 2628, 2629, 2630, 2631, 2632, 2633,
+  2634, 2635, 2636, 2637, 2638, 2639, 2640, 2641,
+  2642, 2643, 2644, 2645, 2646, 2647, 2648, 2649,
+  2650, 2651, 2652, 2653, 2654, 2655, 2656, 2657,
+  2658, 2659, 2660, 2661, 2662, 2663, 2664, 2665,
+  2666, 2667, 2668, 2669, 2670, 2671, 2672, 2673,
+  2674, 2675, 2676, 2677, 2678, 2679, 2680, 2681,
+  2682, 2683, 2684, 2685, 2686, 2687, 2688, 2689,
+  2690, 2691, 2692, 2693, 2694, 2695, 2696, 2697,
+  2698, 2699, 2700, 2701, 2702, 2703, 2704, 2705,
+  2706, 2707, 2708, 2709, 2710, 2711, 2712, 2713,
+  2714, 2715, 2716, 2717, 2718, 2719, 2720, 2721,
+  2722, 2723, 2724, 2725, 2726, 2727, 2728, 2729,
+  2730, 2731, 2732, 2733, 2734, 2735, 2736, 2737,
+  2738, 2739, 2740, 2741, 2742, 2743, 2744, 2745,
+  2746, 2747, 2748, 2749, 2750, 2751, 2752, 2753,
+  2754, 2755, 2756, 2757, 2758, 2759, 2760, 2761,
+  2762, 2763, 2764, 2765, 2766, 2767, 2768, 2769,
+  2770, 2771, 2772, 2773, 2774, 2775, 2776, 2777,
+  2778, 2779, 2780, 2781, 2782, 2783, 2784, 2785,
+  2786, 2787, 2788, 2789, 2790, 2791, 2792, 2793,
+  2794, 2795, 2796, 2797, 2798, 2799, 2800, 2801,
+  2802, 2803, 2804, 2805, 2806, 2808, 2810, 2811,
+  2812, 2813, 2814, 2815, 2816, 2817, 2818, 2819,
+  2820, 2821, 2822, 2823, 2824, 2825, 2826, 2827,
+  2828, 2829, 2830, 2831, 2832, 2833, 2834, 2835,
+  2836, 2837, 2838, 2840, 2842, 2844, 2846, 2847,
+  2848, 2849, 2850, 2851, 2852, 2853, 2854, 2855,
+  2856, 2857, 2858, 2859, 2861, 2862, 2863, 2864,
+  2865, 2866, 2867, 2868, 2869, 2870, 2871, 2872,
+  2873, 2874, 2875, 2876, 2877, 2878, 2879, 2880,
+  2881, 2882, 2883, 2884, 2885, 2886, 2887, 2888,
+  2889, 2890, 2891, 2892, 2893, 2894, 2895, 2896,
+  2897, 2898, 2899, 2900, 2901, 2902, 2903, 2904,
+  2905, 2906, 2908, 2910, 2911, 2912, 2914, 2915,
+  2917, 2919, 2920, 2921, 2923, 2925, 2926, 2927,
+  2928, 2929, 2930, 2931, 2932, 2933, 2934, 2935,
+  2936, 2937, 2938, 2939, 2940, 2941, 2942, 2943,
+  2946, 2949, 2950, 2951, 2952, 2953, 2954, 2955,
+  2957, 2959, 2961, 2962, 2963, 2965, 2967, 2969,
+  2971, 2975, 2977, 2979, 2980, 2981, 2982, 2983,
+  2984, 2985, 2986, 2987, 2988, 2989, 2990, 2991,
+  2992, 2993, 2994, 2995, 2996, 2997, 3000, 3003,
+  3004, 3005, 3006, 3007, 3008, 3009, 3010, 3011,
+  3012, 3013, 3014, 3015, 3016, 3017, 3018, 3019,
+  3020, 3021, 3022, 3023, 3024, 3025, 3026, 3027,
+  3028, 3029, 3030, 3031, 3032, 3033, 3034, 3035,
+  3036, 3037, 3038, 3039, 3040, 3041, 3042, 3043,
+  3044, 3045, 3046, 3047, 3048, 3049, 3050, 3051,
+  3052, 3053, 3054, 3055, 3056, 3057, 3060, 3062,
+  3065, 3068, 3070, 3073, 3076, 3079, 3082, 3083,
+  3086, 3087, 3088, 3089, 3090, 3091, 3095, 3097,
+  3100, 3101, 3102, 3103, 3104, 3105, 3106, 3107,
+  3108, 3109, 3110, 3111, 3112, 3113, 3114, 3115,
+  3116, 3117, 3118, 3119, 3120, 3121, 3122, 3123,
+  3124, 3125, 3126, 3127, 3128, 3129, 3130, 3131,
+  3132, 3133, 3134, 3135, 3136, 3137, 3138, 3139,
+  3140, 3141, 3142, 3143, 3144, 3145, 3146, 3147,
+  3148, 3149, 3150, 3151, 3152, 3153, 3154, 3155,
+  3157, 3158, 3159, 3160, 3161, 3162, 3163, 3164,
+  3165, 3166, 3167, 3168, 3169, 3170, 3171, 3172,
+  3173, 3174, 3175, 3176, 3177, 3178, 3179, 3180,
+  3181, 3182, 3183, 3184, 3185, 3186, 3187, 3188,
+  3189, 3190, 3191, 3192, 3193, 3194, 3195, 3196,
+  3199, 3202, 3205, 3208, 3211, 3214, 3217, 3220,
+  3223, 3226, 3229, 3232, 3235, 3238, 3241, 3242,
+  3243, 3244, 3245, 3247, 3248, 3249, 3250, 3251,
+  3252, 3253, 3254, 3255, 3256, 3257, 3258, 3259,
+  3260, 3261, 3262, 3263, 3264, 3265, 3266, 3267,
+  3268, 3269, 3270, 3271, 3272, 3273, 3274, 3275,
+  3276, 3277, 3278, 3279, 3280, 3281, 3282, 3283,
+  3284, 3285, 3286, 3287, 3288, 3289, 3290, 3291,
+  3292, 3293, 3294, 3295, 3296, 3297, 3298, 3299,
+  3300, 3301, 3302, 3303, 3304, 3305, 3306, 3307,
+  3308, 3311, 3314, 3315, 3316, 3317, 3318, 3319,
+  3320, 3321, 3322, 3323, 3324, 3325, 3326, 3327,
+  3328, 3329, 3330, 3331, 3332, 3333, 3334, 3335,
+  3336, 3337, 3338, 3339, 3340, 3341, 3342, 3343,
+  3344, 3345, 3346, 3347, 3348, 3349, 3350, 3351,
+  3352, 3353, 3354, 3355, 3356, 3357, 3358, 3359,
+  3360, 3361, 3362, 3363, 3364, 3365, 3366, 3367,
+  3368, 3369, 3370, 3371, 3372, 3373, 3374, 3375,
+  3376, 3379, 3382, 3385, 3386, 3387, 3388, 3389,
+  3390, 3391, 3392, 3393, 3394, 3395, 3396, 3397,
+  3398, 3399, 3400, 3401, 3404, 3407, 3408, 3409,
+  3412, 3413, 3414, 3415, 3416, 3419, 3422, 3425,
+  3426, 3427, 3428, 3429, 3430, 3431, 3432, 3433,
+  3434, 3435, 3437, 3439, 3440, 3441, 3442, 3443,
+  3444, 3445, 3446, 3447, 3448, 3449, 3450, 3451,
+  3452, 3453, 3454, 3455, 3456, 3457, 3458, 3459,
+  3460, 3461, 3462, 3463, 3464, 3466, 3468, 3469,
+  3470, 3471, 3472, 3473, 3474, 3475, 3476, 3477,
+  3478, 3479, 3480, 3481, 3482, 3483, 3484, 3485,
+  3486, 3487, 3488, 3489, 3490, 3491, 3492, 3493,
+  3495, 3497, 3499, 3501, 3502, 3503, 3504, 3505,
+  3506, 3507, 3508, 3509, 3510, 3511, 3512, 3513,
+  3514, 3515, 3516, 3518, 3519, 3521, 3524, 3526,
+  3527, 3528, 3530, 3532, 3533, 3534, 3535, 3536,
+  3537, 3538, 3540, 3542, 3544, 3546, 3547, 3548,
+  3549, 3550, 3551, 3552, 3553, 3554, 3555, 3557,
+  3559, 3560, 3562, 3564, 3565, 3570, 3572, 3574,
+  3575, 3576, 3577, 3578, 3579, 3580, 3581, 3583,
+  3585, 3586, 3587, 3588, 3590, 3593, 3596, 3599,
+  3601, 3602, 3603, 3604, 3605, 3606, 3607, 3608,
+  3609, 3610, 3611, 3612, 3613, 3614, 3615, 3616,
+  3617, 3618, 3619, 3620, 3621, 3623, 3625, 3627,
+  3629, 3631, 3633, 3635, 3637, 3639, 3641, 3642,
+  3643, 3644, 3645, 3646, 3647, 3648, 3649, 3650,
+  3651, 3652, 3653, 3654, 3655, 3656, 3657, 3658,
+  3659, 3660, 3661, 3662, 3663, 3664, 3665, 3666,
+  3667, 3668, 3669, 3670, 3671, 3672, 3673, 3674,
+  3675, 3676, 3677, 3678, 3679, 3680, 3681, 3682,
+  3683, 3684, 3685, 3686, 3687, 3688, 3689, 3690,
+  3691, 3692, 3693, 3694, 3695, 3696, 3697, 3698,
+  3699, 3700, 3701, 3702, 3703, 3704, 3705, 3706,
+  3707, 3708, 3709, 3710, 3711, 3712, 3713, 3714,
+  3715, 3716, 3717, 3718, 3719, 3720, 3721, 3722,
+  3723, 3724, 3725, 3726, 3727, 3728, 3729, 3730,
+  3731, 3732, 3733, 3734, 3735, 3736, 3737, 3738,
+  3739, 3740, 3741, 3742, 3743, 3744, 3745, 3746,
+  3747, 3748, 3749, 3750, 3751, 3752, 3753, 3756,
+  3757, 3758, 3761, 3762, 3763, 3765, 3766, 3767,
+  3768, 3770, 3771, 3772, 3773, 3775, 3776, 3777,
+  3778, 3781, 3782, 3783, 3784, 3785, 3788, 3791,
+  3794, 3797, 3800, 3801, 3802, 3803, 3804, 3806,
+  3808, 3809, 3810, 3811, 3814, 3817, 3820, 3823,
+  3826, 3827, 3828, 3829, 3831, 3832, 3833, 3834,
+  3836, 3837, 3838, 3839, 3840, 3841, 3842, 3843,
+  3844, 3845, 3846, 3847, 3848, 3849, 3850, 3851,
+  3852, 3853, 3854, 3855, 3856, 3857, 3858, 3859,
+  3860, 3861, 3862, 3863, 3864, 3865, 3866, 3867,
+  3868, 3869, 3870, 3871, 3872, 3873, 3874, 3875,
+  3877, 3879, 3881, 3883, 3885, 3886, 3887, 3890,
+  3893, 3894, 3895, 3896, 3897
+ };
+ 
+ /* i386 mnemonics table.  */
+diff -rupN binutils.orig/gas/testsuite/gas/i386/x86-64-apx-evex-promoted-intel.d binutils-2.41/gas/testsuite/gas/i386/x86-64-apx-evex-promoted-intel.d
+--- binutils.orig/gas/testsuite/gas/i386/x86-64-apx-evex-promoted-intel.d	2024-02-12 15:55:20.792572349 +0000
+++ binutils-2.41/gas/testsuite/gas/i386/x86-64-apx-evex-promoted-intel.d	2024-02-12 15:56:07.355601128 +0000
+@@ -158,6 +158,12 @@ Disassembly of section \.text:
+ [	 ]*[a-f0-9]+:[	 ]*62 da 7f 08 4b b4 87 23 01 00 00[	 ]+tileloadd tmm6,\[r31\+rax\*4\+0x123\]
+ [	 ]*[a-f0-9]+:[	 ]*62 da 7d 08 4b b4 87 23 01 00 00[	 ]+tileloaddt1 tmm6,\[r31\+rax\*4\+0x123\]
+ [	 ]*[a-f0-9]+:[	 ]*62 da 7e 08 4b b4 87 23 01 00 00[	 ]+tilestored[	 ]+\[r31\+rax\*4\+0x123\],tmm6
+[	 ]*[a-f0-9]+:[	 ]*62 fa 7d 28 1a 18[	 ]+vbroadcastf32x4 ymm3,XMMWORD PTR \[r16\]
+[	 ]*[a-f0-9]+:[	 ]*62 fa 7d 28 5a 18[	 ]+vbroadcasti32x4 ymm3,XMMWORD PTR \[r16\]
+[	 ]*[a-f0-9]+:[	 ]*62 fb 7d 28 19 18 01[	 ]+vextractf32x4 XMMWORD PTR \[r16\],ymm3,(0x)?1
+[	 ]*[a-f0-9]+:[	 ]*62 fb 7d 28 39 18 01[	 ]+vextracti32x4 XMMWORD PTR \[r16\],ymm3,(0x)?1
+[	 ]*[a-f0-9]+:[	 ]*62 7b 65 28 18 00 01[	 ]+vinsertf32x4 ymm8,ymm3,XMMWORD PTR \[r16\],(0x)?1
+[	 ]*[a-f0-9]+:[	 ]*62 7b 65 28 38 00 01[	 ]+vinserti32x4 ymm8,ymm3,XMMWORD PTR \[r16\],(0x)?1
+ [	 ]*[a-f0-9]+:[	 ]*62 db fd 08 09 30 01[	 ]+vrndscalepd xmm6,XMMWORD PTR \[r24\],(0x)?1
+ [	 ]*[a-f0-9]+:[	 ]*62 db 7d 08 08 30 02[	 ]+vrndscaleps xmm6,XMMWORD PTR \[r24\],(0x)?2
+ [	 ]*[a-f0-9]+:[	 ]*62 db cd 08 0b 18 03[	 ]+vrndscalesd xmm3,xmm6,QWORD PTR \[r24\],(0x)?3
+diff -rupN binutils.orig/gas/testsuite/gas/i386/x86-64-apx-evex-promoted.d binutils-2.41/gas/testsuite/gas/i386/x86-64-apx-evex-promoted.d
+--- binutils.orig/gas/testsuite/gas/i386/x86-64-apx-evex-promoted.d	2024-02-12 15:55:20.792572349 +0000
+++ binutils-2.41/gas/testsuite/gas/i386/x86-64-apx-evex-promoted.d	2024-02-12 15:56:07.355601128 +0000
+@@ -158,6 +158,12 @@ Disassembly of section \.text:
+ [	 ]*[a-f0-9]+:[	 ]*62 da 7f 08 4b b4 87 23 01 00 00[	 ]+tileloadd[	 ]+0x123\(%r31,%rax,4\),%tmm6
+ [	 ]*[a-f0-9]+:[	 ]*62 da 7d 08 4b b4 87 23 01 00 00[	 ]+tileloaddt1[	 ]+0x123\(%r31,%rax,4\),%tmm6
+ [	 ]*[a-f0-9]+:[	 ]*62 da 7e 08 4b b4 87 23 01 00 00[	 ]+tilestored[	 ]+%tmm6,0x123\(%r31,%rax,4\)
+[	 ]*[a-f0-9]+:[	 ]*62 fa 7d 28 1a 18[	 ]+vbroadcastf32x4 \(%r16\),%ymm3
+[	 ]*[a-f0-9]+:[	 ]*62 fa 7d 28 5a 18[	 ]+vbroadcasti32x4 \(%r16\),%ymm3
+[	 ]*[a-f0-9]+:[	 ]*62 fb 7d 28 19 18 01[	 ]+vextractf32x4 \$(0x)?1,%ymm3,\(%r16\)
+[	 ]*[a-f0-9]+:[	 ]*62 fb 7d 28 39 18 01[	 ]+vextracti32x4 \$(0x)?1,%ymm3,\(%r16\)
+[	 ]*[a-f0-9]+:[	 ]*62 7b 65 28 18 00 01[	 ]+vinsertf32x4 \$(0x)?1,\(%r16\),%ymm3,%ymm8
+[	 ]*[a-f0-9]+:[	 ]*62 7b 65 28 38 00 01[	 ]+vinserti32x4 \$(0x)?1,\(%r16\),%ymm3,%ymm8
+ [	 ]*[a-f0-9]+:[	 ]*62 db fd 08 09 30 01[	 ]+vrndscalepd \$0x1,\(%r24\),%xmm6
+ [	 ]*[a-f0-9]+:[	 ]*62 db 7d 08 08 30 02[	 ]+vrndscaleps \$0x2,\(%r24\),%xmm6
+ [	 ]*[a-f0-9]+:[	 ]*62 db cd 08 0b 18 03[	 ]+vrndscalesd \$0x3,\(%r24\),%xmm6,%xmm3
+diff -rupN binutils.orig/gas/testsuite/gas/i386/x86-64-apx-evex-promoted.s binutils-2.41/gas/testsuite/gas/i386/x86-64-apx-evex-promoted.s
+--- binutils.orig/gas/testsuite/gas/i386/x86-64-apx-evex-promoted.s	2024-02-12 15:55:20.792572349 +0000
+++ binutils-2.41/gas/testsuite/gas/i386/x86-64-apx-evex-promoted.s	2024-02-12 15:56:07.356601129 +0000
+@@ -152,6 +152,12 @@ _start:
+ 	tileloadd	0x123(%r31,%rax,4),%tmm6
+ 	tileloaddt1	0x123(%r31,%rax,4),%tmm6
+ 	tilestored	%tmm6,0x123(%r31,%rax,4)
+	vbroadcastf128	(%r16),%ymm3
+	vbroadcasti128	(%r16),%ymm3
+	vextractf128	$1,%ymm3,(%r16)
+	vextracti128	$1,%ymm3,(%r16)
+	vinsertf128	$1,(%r16),%ymm3,%ymm8
+	vinserti128	$1,(%r16),%ymm3,%ymm8
+ 	vroundpd $1,(%r24),%xmm6
+ 	vroundps $2,(%r24),%xmm6
+ 	vroundsd $3,(%r24),%xmm6,%xmm3
--- a/binutils-alignment-of-decompressed-sections.patch
+++ b/binutils-alignment-of-decompressed-sections.patch
@ -1,447 +0,0 @@
-diff -rup binutils.orig/bfd/bfd.c binutils-2.31.1/bfd/bfd.c
--- binutils.orig/bfd/bfd.c	2019-02-18 11:53:32.155652114 +0000
-+++ binutils-2.31.1/bfd/bfd.c	2019-02-18 12:03:21.591459682 +0000
-@@ -2332,6 +2332,8 @@ bfd_update_compression_header (bfd *abfd
- 		  bfd_put_32 (abfd, sec->size, &echdr->ch_size);
- 		  bfd_put_32 (abfd, 1 << sec->alignment_power,
- 			      &echdr->ch_addralign);
-+		  /* bfd_log2 (alignof (Elf32_Chdr)).  */
-+		  bfd_set_section_alignment (abfd, sec, 2);
- 		}
- 	      else
- 		{
-@@ -2342,6 +2344,8 @@ bfd_update_compression_header (bfd *abfd
- 		  bfd_put_64 (abfd, sec->size, &echdr->ch_size);
- 		  bfd_put_64 (abfd, 1 << sec->alignment_power,
- 			      &echdr->ch_addralign);
-+		  /* bfd_log2 (alignof (Elf64_Chdr)).  */
-+		  bfd_set_section_alignment (abfd, sec, 3);
- 		}
- 	    }
- 	  else
-@@ -2354,6 +2358,8 @@ bfd_update_compression_header (bfd *abfd
- 		 order.  */
- 	      memcpy (contents, "ZLIB", 4);
- 	      bfd_putb64 (sec->size, contents + 4);
-+	      /* No way to keep the original alignment, just use 1 always.  */
-+	      bfd_set_section_alignment (abfd, sec, 0);
- 	    }
- 	}
-     }
-@@ -2368,12 +2374,15 @@ bfd_update_compression_header (bfd *abfd
-    SYNOPSIS
- 	bfd_boolean bfd_check_compression_header
- 	  (bfd *abfd, bfd_byte *contents, asection *sec,
-	  bfd_size_type *uncompressed_size);
-+          bfd_size_type *uncompressed_size,
-+          unsigned int *uncompressed_alignment_power);
-+
- 
- DESCRIPTION
- 	Check the compression header at CONTENTS of SEC in ABFD and
-	store the uncompressed size in UNCOMPRESSED_SIZE if the
-	compression header is valid.
-+        store the uncompressed size in UNCOMPRESSED_SIZE and the
-+        uncompressed data alignment in UNCOMPRESSED_ALIGNMENT_POWER
-+        if the compression header is valid.
- 
- RETURNS
- 	Return TRUE if the compression header is valid.
-@@ -2382,7 +2391,8 @@ RETURNS
- bfd_boolean
- bfd_check_compression_header (bfd *abfd, bfd_byte *contents,
- 			      asection *sec,
-			      bfd_size_type *uncompressed_size)
-+			      bfd_size_type *uncompressed_size,
-+			      unsigned int *uncompressed_alignment_power)
- {
-   if (bfd_get_flavour (abfd) == bfd_target_elf_flavour
-       && (elf_section_flags (sec) & SHF_COMPRESSED) != 0)
-@@ -2404,9 +2414,10 @@ bfd_check_compression_header (bfd *abfd,
- 	  chdr.ch_addralign = bfd_get_64 (abfd, &echdr->ch_addralign);
- 	}
-       if (chdr.ch_type == ELFCOMPRESS_ZLIB
-	  && chdr.ch_addralign == 1U << sec->alignment_power)
-+	  && chdr.ch_addralign == (1U << bfd_log2 (chdr.ch_addralign)))
- 	{
- 	  *uncompressed_size = chdr.ch_size;
-+	  *uncompressed_alignment_power = bfd_log2 (chdr.ch_addralign);
- 	  return TRUE;
- 	}
-     }
-diff -rup binutils.orig/bfd/bfd-in2.h binutils-2.31.1/bfd/bfd-in2.h
--- binutils.orig/bfd/bfd-in2.h	2019-02-18 11:53:32.156652107 +0000
-+++ binutils-2.31.1/bfd/bfd-in2.h	2019-02-18 12:00:23.849723903 +0000
-@@ -7274,7 +7274,8 @@ void bfd_update_compression_header
- 
- bfd_boolean bfd_check_compression_header
-    (bfd *abfd, bfd_byte *contents, asection *sec,
-    bfd_size_type *uncompressed_size);
-+    bfd_size_type *uncompressed_size,
-+    unsigned int *uncompressed_alignment_power);
- 
- int bfd_get_compression_header_size (bfd *abfd, asection *sec);
- 
-@@ -7850,7 +7851,8 @@ void bfd_cache_section_contents
- bfd_boolean bfd_is_section_compressed_with_header
-    (bfd *abfd, asection *section,
-     int *compression_header_size_p,
-    bfd_size_type *uncompressed_size_p);
-+    bfd_size_type *uncompressed_size_p,
-+    unsigned int *uncompressed_alignment_power_p);
- 
- bfd_boolean bfd_is_section_compressed
-    (bfd *abfd, asection *section);
-diff -rup binutils.orig/bfd/compress.c binutils-2.31.1/bfd/compress.c
--- binutils.orig/bfd/compress.c	2019-02-18 11:53:32.153652128 +0000
-+++ binutils-2.31.1/bfd/compress.c	2019-02-18 12:11:44.899886376 +0000
-@@ -84,11 +84,13 @@ bfd_compress_section_contents (bfd *abfd
-   int zlib_size = 0;
-   int orig_compression_header_size;
-   bfd_size_type orig_uncompressed_size;
-+  unsigned int orig_uncompressed_alignment_pow;
-   int header_size = bfd_get_compression_header_size (abfd, NULL);
-   bfd_boolean compressed
-     = bfd_is_section_compressed_with_header (abfd, sec,
- 					     &orig_compression_header_size,
-					     &orig_uncompressed_size);
-+					     &orig_uncompressed_size,
-+					     &orig_uncompressed_alignment_pow);
- 
-   /* Either ELF compression header or the 12-byte, "ZLIB" + 8-byte size,
-      overhead in .zdebug* section.  */
-@@ -153,6 +155,8 @@ bfd_compress_section_contents (bfd *abfd
- 	      return 0;
- 	    }
- 	  free (uncompressed_buffer);
-+	  bfd_set_section_alignment (abfd, sec,
-+				     orig_uncompressed_alignment_pow);
- 	  sec->contents = buffer;
- 	  sec->compress_status = COMPRESS_SECTION_DONE;
- 	  return orig_uncompressed_size;
-@@ -364,20 +368,25 @@ SYNOPSIS
- 	bfd_boolean bfd_is_section_compressed_with_header
- 	  (bfd *abfd, asection *section,
- 	  int *compression_header_size_p,
-	  bfd_size_type *uncompressed_size_p);
-+	  bfd_size_type *uncompressed_size_p,
-+	  unsigned int *uncompressed_alignment_power_p);
-+
- 
- DESCRIPTION
- 	Return @code{TRUE} if @var{section} is compressed.  Compression
-	header size is returned in @var{compression_header_size_p} and
-	uncompressed size is returned in @var{uncompressed_size_p}.  If
-	compression is unsupported, compression header size is returned
-	with -1 and uncompressed size is returned with 0.
-+	header size is returned in @var{compression_header_size_p},
-+        uncompressed size is returned in @var{uncompressed_size_p}
-+        and the uncompressed data alignement power is returned in
-+        @var{uncompressed_align_pow_p}.  If compression is
-+        unsupported, compression header size is returned with -1
-+        and uncompressed size is returned with 0.
- */
- 
- bfd_boolean
- bfd_is_section_compressed_with_header (bfd *abfd, sec_ptr sec,
- 				       int *compression_header_size_p,
-				       bfd_size_type *uncompressed_size_p)
-+				       bfd_size_type *uncompressed_size_p,
-+				       unsigned int *uncompressed_align_pow_p)
- {
-   bfd_byte header[MAX_COMPRESSION_HEADER_SIZE];
-   int compression_header_size;
-@@ -385,6 +394,8 @@ bfd_is_section_compressed_with_header (b
-   unsigned int saved = sec->compress_status;
-   bfd_boolean compressed;
- 
-+  *uncompressed_align_pow_p = 0;
-+
-   compression_header_size = bfd_get_compression_header_size (abfd, sec);
-   if (compression_header_size > MAX_COMPRESSION_HEADER_SIZE)
-     abort ();
-@@ -412,7 +423,8 @@ bfd_is_section_compressed_with_header (b
-       if (compression_header_size != 0)
- 	{
- 	  if (!bfd_check_compression_header (abfd, header, sec,
-					     uncompressed_size_p))
-+					     uncompressed_size_p,
-+					     uncompressed_align_pow_p))
- 	    compression_header_size = -1;
- 	}
-       /* Check for the pathalogical case of a debug string section that
-@@ -449,9 +461,11 @@ bfd_is_section_compressed (bfd *abfd, se
- {
-   int compression_header_size;
-   bfd_size_type uncompressed_size;
-+  unsigned int uncompressed_align_power;
-   return (bfd_is_section_compressed_with_header (abfd, sec,
- 						 &compression_header_size,
-						 &uncompressed_size)
-+						 &uncompressed_size,
-+						 &uncompressed_align_power)
- 	  && compression_header_size >= 0
- 	  && uncompressed_size > 0);
- }
-@@ -480,6 +494,7 @@ bfd_init_section_decompress_status (bfd
-   int compression_header_size;
-   int header_size;
-   bfd_size_type uncompressed_size;
-+  unsigned int uncompressed_alignment_power = 0;
- 
-   compression_header_size = bfd_get_compression_header_size (abfd, sec);
-   if (compression_header_size > MAX_COMPRESSION_HEADER_SIZE)
-@@ -508,7 +523,8 @@ bfd_init_section_decompress_status (bfd
-       uncompressed_size = bfd_getb64 (header + 4);
-     }
-   else if (!bfd_check_compression_header (abfd, header, sec,
-					 &uncompressed_size))
-+					  &uncompressed_size,
-+					  &uncompressed_alignment_power))
-     {
-       bfd_set_error (bfd_error_wrong_format);
-       return FALSE;
-@@ -516,6 +532,7 @@ bfd_init_section_decompress_status (bfd
- 
-   sec->compressed_size = sec->size;
-   sec->size = uncompressed_size;
-+  bfd_set_section_alignment (abfd, sec, uncompressed_alignment_power);
-   sec->compress_status = DECOMPRESS_SECTION_SIZED;
- 
-   return TRUE;
-diff -rup binutils.orig/bfd/elf.c binutils-2.31.1/bfd/elf.c
--- binutils.orig/bfd/elf.c	2019-02-18 11:53:32.161652071 +0000
-+++ binutils-2.31.1/bfd/elf.c	2019-02-18 12:08:52.135108638 +0000
-@@ -1177,10 +1177,12 @@ _bfd_elf_make_section_from_shdr (bfd *ab
-       enum { nothing, compress, decompress } action = nothing;
-       int compression_header_size;
-       bfd_size_type uncompressed_size;
-+      unsigned int uncompressed_align_power;
-       bfd_boolean compressed
- 	= bfd_is_section_compressed_with_header (abfd, newsect,
- 						 &compression_header_size,
-						 &uncompressed_size);
-+						 &uncompressed_size,
-+						 &uncompressed_align_power);
- 
-       if (compressed)
- 	{
-diff -rup binutils.orig/binutils/readelf.c binutils-2.31.1/binutils/readelf.c
--- binutils.orig/binutils/readelf.c	2019-02-18 11:53:32.947646480 +0000
-+++ binutils-2.31.1/binutils/readelf.c	2019-02-18 12:10:13.142535034 +0000
-@@ -13366,12 +13366,6 @@ dump_section_as_strings (Elf_Internal_Sh
- 		    printable_section_name (filedata, section), chdr.ch_type);
- 	      return FALSE;
- 	    }
-	  else if (chdr.ch_addralign != section->sh_addralign)
-	    {
-	      warn (_("compressed section '%s' is corrupted\n"),
-		    printable_section_name (filedata, section));
-	      return FALSE;
-	    }
- 	  uncompressed_size = chdr.ch_size;
- 	  start += compression_header_size;
- 	  new_size -= compression_header_size;
-@@ -13513,12 +13507,6 @@ dump_section_as_bytes (Elf_Internal_Shdr
- 		    printable_section_name (filedata, section), chdr.ch_type);
- 	      return FALSE;
- 	    }
-	  else if (chdr.ch_addralign != section->sh_addralign)
-	    {
-	      warn (_("compressed section '%s' is corrupted\n"),
-		    printable_section_name (filedata, section));
-	      return FALSE;
-	    }
- 	  uncompressed_size = chdr.ch_size;
- 	  start += compression_header_size;
- 	  new_size -= compression_header_size;
-@@ -13688,12 +13676,6 @@ load_specific_debug_section (enum dwarf_
- 		    section->name, chdr.ch_type);
- 	      return FALSE;
- 	    }
-	  else if (chdr.ch_addralign != sec->sh_addralign)
-	    {
-	      warn (_("compressed section '%s' is corrupted\n"),
-		    section->name);
-	      return FALSE;
-	    }
- 	  uncompressed_size = chdr.ch_size;
- 	  start += compression_header_size;
- 	  size -= compression_header_size;
-diff -rup binutils.orig/binutils/testsuite/binutils-all/dw2-3.rS binutils-2.31.1/binutils/testsuite/binutils-all/dw2-3.rS
--- binutils.orig/binutils/testsuite/binutils-all/dw2-3.rS	2019-02-18 11:53:32.908646758 +0000
-+++ binutils-2.31.1/binutils/testsuite/binutils-all/dw2-3.rS	2019-02-18 12:10:40.884338917 +0000
-@@ -1,3 +1,3 @@
- #...
- +\[[ 0-9]+\] .debug_info +(PROGBITS|MIPS_DWARF) +0+ +[0-9a-f]+ +[0-9a-f]+ [0-9a-f]+ +C +0 +0 +1
-+ +\[[ 0-9]+\] .debug_info +(PROGBITS|MIPS_DWARF) +0+ +[0-9a-f]+ +[0-9a-f]+ [0-9a-f]+ +C +0 +0 +(4|8)
- #pass
-diff -rup binutils.orig/binutils/testsuite/binutils-all/dw2-3.rt binutils-2.31.1/binutils/testsuite/binutils-all/dw2-3.rt
--- binutils.orig/binutils/testsuite/binutils-all/dw2-3.rt	2019-02-18 11:53:32.905646779 +0000
-+++ binutils-2.31.1/binutils/testsuite/binutils-all/dw2-3.rt	2019-02-18 12:11:13.476108521 +0000
-@@ -1,6 +1,6 @@
- #...
-  +\[[ 0-9]+\] .debug_info
- +(PROGBITS|MIPS_DWARF) +0+ +[0-9a-f]+ +[0-9a-f]+ +[0-9a-f]+ +0 +0 +1
-+ +(PROGBITS|MIPS_DWARF) +0+ +[0-9a-f]+ +[0-9a-f]+ +[0-9a-f]+ +0 +0 +(4|8)
-  +\[0+800\]: COMPRESSED
-  +ZLIB, 0+9d, 1
- #pass
-diff -rup binutils.orig/gold/merge.cc binutils-2.31.1/gold/merge.cc
--- binutils.orig/gold/merge.cc	2019-02-18 11:53:32.210651723 +0000
-+++ binutils-2.31.1/gold/merge.cc	2019-02-18 12:12:59.027362334 +0000
-@@ -440,9 +440,11 @@ Output_merge_string<Char_type>::do_add_i
- {
-   section_size_type sec_len;
-   bool is_new;
-+  uint64_t addralign = this->addralign();
-   const unsigned char* pdata = object->decompressed_section_contents(shndx,
- 								     &sec_len,
-								     &is_new);
-+								     &is_new,
-+								     &addralign);
- 
-   const Char_type* p = reinterpret_cast<const Char_type*>(pdata);
-   const Char_type* pend = p + sec_len / sizeof(Char_type);
-@@ -494,7 +496,7 @@ Output_merge_string<Char_type>::do_add_i
-   // aligned, so each string within the section must retain the same
-   // modulo.
-   uintptr_t init_align_modulo = (reinterpret_cast<uintptr_t>(pdata)
-				 & (this->addralign() - 1));
-+				 & (addralign - 1));
-   bool has_misaligned_strings = false;
- 
-   while (p < pend)
-@@ -503,7 +505,7 @@ Output_merge_string<Char_type>::do_add_i
- 
-       // Within merge input section each string must be aligned.
-       if (len != 0
-	  && ((reinterpret_cast<uintptr_t>(p) & (this->addralign() - 1))
-+	  && ((reinterpret_cast<uintptr_t>(p) & (addralign - 1))
- 	      != init_align_modulo))
- 	  has_misaligned_strings = true;
- 
-diff -rup binutils.orig/gold/object.cc binutils-2.31.1/gold/object.cc
--- binutils.orig/gold/object.cc	2019-02-18 11:53:32.208651737 +0000
-+++ binutils-2.31.1/gold/object.cc	2019-02-18 12:16:35.938828914 +0000
-@@ -751,11 +751,13 @@ build_compressed_section_map(
- 	      const unsigned char* contents =
- 		  obj->section_contents(i, &len, false);
- 	      uint64_t uncompressed_size;
-+	      Compressed_section_info info;
- 	      if (is_zcompressed)
- 		{
- 		  // Skip over the ".zdebug" prefix.
- 		  name += 7;
- 		  uncompressed_size = get_uncompressed_size(contents, len);
-+		  info.addralign = shdr.get_sh_addralign();
- 		}
- 	      else
- 		{
-@@ -763,8 +765,8 @@ build_compressed_section_map(
- 		  name += 6;
- 		  elfcpp::Chdr<size, big_endian> chdr(contents);
- 		  uncompressed_size = chdr.get_ch_size();
-+		  info.addralign = chdr.get_ch_addralign();
- 		}
-	      Compressed_section_info info;
- 	      info.size = convert_to_section_size_type(uncompressed_size);
- 	      info.flag = shdr.get_sh_flags();
- 	      info.contents = NULL;
-@@ -3060,7 +3062,8 @@ const unsigned char*
- Object::decompressed_section_contents(
-     unsigned int shndx,
-     section_size_type* plen,
-    bool* is_new)
-+    bool* is_new,
-+    uint64_t* palign)
- {
-   section_size_type buffer_size;
-   const unsigned char* buffer = this->do_section_contents(shndx, &buffer_size,
-@@ -3087,6 +3090,8 @@ Object::decompressed_section_contents(
-     {
-       *plen = uncompressed_size;
-       *is_new = false;
-+      if (palign != NULL)
-+	*palign = p->second.addralign;
-       return p->second.contents;
-     }
- 
-@@ -3108,6 +3113,8 @@ Object::decompressed_section_contents(
-   // once in this pass.
-   *plen = uncompressed_size;
-   *is_new = true;
-+  if (palign != NULL)
-+    *palign = p->second.addralign;
-   return uncompressed_data;
- }
- 
-diff -rup binutils.orig/gold/object.h binutils-2.31.1/gold/object.h
--- binutils.orig/gold/object.h	2019-02-18 11:53:32.210651723 +0000
-+++ binutils-2.31.1/gold/object.h	2019-02-18 12:17:50.625300926 +0000
-@@ -373,6 +373,7 @@ struct Compressed_section_info
- {
-   section_size_type size;
-   elfcpp::Elf_Xword flag;
-+  uint64_t addralign;
-   const unsigned char* contents;
- };
- typedef std::map<unsigned int, Compressed_section_info> Compressed_section_map;
-@@ -808,7 +809,8 @@ class Object
- 
-   bool
-   section_is_compressed(unsigned int shndx,
-			section_size_type* uncompressed_size) const
-+			section_size_type* uncompressed_size,
-+			elfcpp::Elf_Xword* palign = NULL) const
-   {
-     if (this->compressed_sections_ == NULL)
-       return false;
-@@ -818,6 +820,8 @@ class Object
-       {
- 	if (uncompressed_size != NULL)
- 	  *uncompressed_size = p->second.size;
-+	if (palign != NULL)
-+	  *palign = p->second.addralign;
- 	return true;
-       }
-     return false;
-@@ -828,7 +832,7 @@ class Object
-   // by the caller.
-   const unsigned char*
-   decompressed_section_contents(unsigned int shndx, section_size_type* plen,
-				bool* is_cached);
-+				bool* is_cached, uint64_t* palign = NULL);
- 
-   // Discard any buffers of decompressed sections.  This is done
-   // at the end of the Add_symbols task.
-diff -rup binutils.orig/gold/output.cc binutils-2.31.1/gold/output.cc
--- binutils.orig/gold/output.cc	2019-02-18 11:53:32.209651729 +0000
-+++ binutils-2.31.1/gold/output.cc	2019-02-18 12:18:39.729953797 +0000
-@@ -2448,7 +2448,14 @@ Output_section::add_input_section(Layout
- 				  unsigned int reloc_shndx,
- 				  bool have_sections_script)
- {
-+  section_size_type input_section_size = shdr.get_sh_size();
-+  section_size_type uncompressed_size;
-   elfcpp::Elf_Xword addralign = shdr.get_sh_addralign();
-+
-+  if (object->section_is_compressed(shndx, &uncompressed_size,
-+                                   &addralign))
-+    input_section_size = uncompressed_size;
-+
-   if ((addralign & (addralign - 1)) != 0)
-     {
-       object->error(_("invalid alignment %lu for section \"%s\""),
-@@ -2498,11 +2505,6 @@ Output_section::add_input_section(Layout
- 	}
-     }
- 
-  section_size_type input_section_size = shdr.get_sh_size();
-  section_size_type uncompressed_size;
-  if (object->section_is_compressed(shndx, &uncompressed_size))
-    input_section_size = uncompressed_size;
-
-   off_t offset_in_section;
- 
-   if (this->has_fixed_layout())
--- a/binutils-attach-to-group.patch
+++ b/binutils-attach-to-group.patch
@ -1,68 +0,0 @@
-diff -rup binutils.orig/gas/config/obj-elf.c binutils-2.30/gas/config/obj-elf.c
--- binutils.orig/gas/config/obj-elf.c	2018-09-24 17:50:06.974172867 +0100
-+++ binutils-2.30/gas/config/obj-elf.c	2018-09-25 15:19:33.559830794 +0100
-@@ -82,9 +82,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},
-@@ -1007,6 +1009,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)
- {
-diff -rup binutils.orig/gas/doc/as.texinfo binutils-2.30/gas/doc/as.texinfo
--- binutils.orig/gas/doc/as.texi	2018-09-24 17:50:06.984172788 +0100
-+++ binutils-2.30/gas/doc/as.texi	2018-09-25 15:19:43.557748972 +0100
-@@ -4407,6 +4407,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}}
-@@ -4703,6 +4704,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}}
- 
-
--- 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-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,10 @@ 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
+diff -rup binutils.orig/configure.ac binutils-2.40/configure.ac
+--- binutils.orig/configure.ac	2023-02-13 14:43:00.728877170 +0000
+++ binutils-2.40/configure.ac	2023-02-13 14:43:13.671864892 +0000
+@@ -1435,26 +1435,6 @@ if test -z "$LD"; then
   fi
 fi
 
@ -79,5 +79,7 @@ diff -rup binutils.orig/configure.ac binutils-2.30/configure.ac
 -fi
 -
 ACX_PROG_GNAT
+ ACX_PROG_GDC
 ACX_PROG_CMP_IGNORE_INITIAL
- 
+Only in binutils-2.40: configure.ac.orig
+Only in binutils-2.40: configure.orig
--- 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-fatal-warnings.patch
+++ b/binutils-fatal-warnings.patch
@ -0,0 +1,134 @@
+diff -rup binutils.orig/ld/emultempl/elf.em binutils-2.41/ld/emultempl/elf.em
+--- binutils.orig/ld/emultempl/elf.em	2024-01-25 12:15:12.113299123 +0000
+++ binutils-2.41/ld/emultempl/elf.em	2024-01-25 12:15:21.754311058 +0000
+@@ -893,7 +893,7 @@ fi
+ 
+ fragment <<EOF
+       else
+-	einfo (_("%P: warning: -z %s ignored\n"), optarg);
+	queue_unknown_cmdline_warning ("-z %s", optarg);
+       break;
+ EOF
+ 
+Only in binutils-2.41/ld/emultempl: elf.em.orig
+diff -rup binutils.orig/ld/ldelf.c binutils-2.41/ld/ldelf.c
+--- binutils.orig/ld/ldelf.c	2024-01-25 12:15:12.114299125 +0000
+++ binutils-2.41/ld/ldelf.c	2024-01-25 12:15:21.754311058 +0000
+@@ -74,7 +74,7 @@ ldelf_after_parse (void)
+       && link_info.nointerp)
+     {
+       if (link_info.dynamic_undefined_weak > 0)
+-	einfo (_("%P: warning: -z dynamic-undefined-weak ignored\n"));
+	queue_unknown_cmdline_warning ("-z dynamic-undefined-weak");
+       link_info.dynamic_undefined_weak = 0;
+     }
+ 
+diff -rup binutils.orig/ld/ldmain.c binutils-2.41/ld/ldmain.c
+--- binutils.orig/ld/ldmain.c	2024-01-25 12:15:12.114299125 +0000
+++ binutils-2.41/ld/ldmain.c	2024-01-25 12:15:21.754311058 +0000
+@@ -479,6 +479,8 @@ main (int argc, char **argv)
+ 
+   ldemul_after_parse ();
+ 
+  output_unknown_cmdline_warnings ();
+
+   if (config.map_filename)
+     {
+       if (strcmp (config.map_filename, "-") == 0)
+diff -rup binutils.orig/ld/ldmisc.c binutils-2.41/ld/ldmisc.c
+--- binutils.orig/ld/ldmisc.c	2024-01-25 12:15:12.114299125 +0000
+++ binutils-2.41/ld/ldmisc.c	2024-01-25 12:15:21.754311058 +0000
+@@ -620,6 +620,81 @@ einfo (const char *fmt, ...)
+   fflush (stderr);
+ }
+ 
+/* The buffer size for each command-line option warning.  */
+#define CMDLINE_WARNING_SIZE	256
+
+/* A linked list of command-line option warnings.  */
+
+struct cmdline_warning_list
+{
+  struct cmdline_warning_list *next;
+  char *warning;
+};
+
+/* The head of the linked list of command-line option warnings.  */
+static struct cmdline_warning_list *cmdline_warning_head = NULL;
+
+/* The tail of the linked list of command-line option warnings.  */
+static struct cmdline_warning_list **cmdline_warning_tail
+  = &cmdline_warning_head;
+
+/* Queue an unknown command-line option warning.  */
+
+void
+queue_unknown_cmdline_warning (const char *fmt, ...)
+{
+  va_list arg;
+  struct cmdline_warning_list *warning_ptr
+    = xmalloc (sizeof (*warning_ptr));
+  warning_ptr->warning = xmalloc (CMDLINE_WARNING_SIZE);
+  warning_ptr->next = NULL;
+  int written;
+
+  va_start (arg, fmt);
+  written = vsnprintf (warning_ptr->warning, CMDLINE_WARNING_SIZE, fmt,
+		       arg);
+  if (written < 0 || written >= CMDLINE_WARNING_SIZE)
+    {
+      /* If vsnprintf fails or truncates, output the warning directly.  */
+      fflush (stdout);
+      va_start (arg, fmt);
+      vfinfo (stderr, fmt, arg, true);
+      fflush (stderr);
+    }
+  else
+    {
+      *cmdline_warning_tail = warning_ptr;
+      cmdline_warning_tail = &warning_ptr->next;
+    }
+  va_end (arg);
+}
+
+/* Output queued unknown command-line option warnings.  */
+
+void
+output_unknown_cmdline_warnings (void)
+{
+  struct cmdline_warning_list *list = cmdline_warning_head;
+  struct cmdline_warning_list *next;
+  if (list == NULL)
+    return;
+
+  fflush (stdout);
+
+  for (; list != NULL; list = next)
+    {
+      next = list->next;
+      if (config.fatal_warnings)
+	einfo (_("%P: error: unsupported option: %s\n"), list->warning);
+      else
+	einfo (_("%P: warning: %s ignored\n"), list->warning);
+      free (list->warning);
+      free (list);
+    }
+
+  fflush (stderr);
+}
+
+ void
+ info_assert (const char *file, unsigned int line)
+ {
+diff -rup binutils.orig/ld/ldmisc.h binutils-2.41/ld/ldmisc.h
+--- binutils.orig/ld/ldmisc.h	2024-01-25 12:15:12.114299125 +0000
+++ binutils-2.41/ld/ldmisc.h	2024-01-25 12:15:59.559357849 +0000
+@@ -31,6 +31,8 @@ extern void yyerror (const char *);
+ extern void info_msg (const char *, ...);
+ extern void lfinfo (FILE *, const char *, ...);
+ extern void info_assert (const char *, unsigned int);
+extern void queue_unknown_cmdline_warning (const char *, ...);
+extern void output_unknown_cmdline_warnings (void);
+ 
+ #define ASSERT(x) \
+ do { if (!(x)) info_assert(__FILE__,__LINE__); } while (0)
--- a/binutils-fix-ar-test.patch
+++ b/binutils-fix-ar-test.patch
@ -0,0 +1,22 @@
+--- binutils.orig/binutils/testsuite/binutils-all/ar.exp	2024-02-07 11:08:53.866261015 +0000
+++ binutils-2.42/binutils/testsuite/binutils-all/ar.exp	2024-02-07 11:17:01.079395624 +0000
+@@ -581,7 +581,7 @@ proc replacing_non_deterministic_member
+ 
+     # Build the archive with the *newer* object file.
+     
+-    set got [binutils_run $AR "rc $archive ${newer_objfile}"]
+    set got [binutils_run $AR "rUc $archive ${newer_objfile}"]
+     if ![string match "" $got] {
+ 	fail "$testname: (could not build archive)"
+ 	return
+--- 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,328 +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-x86-64/x86-64.exp binutils-2.32/ld/testsuite/ld-x86-64/x86-64.exp
--- binutils-2.32.orig/ld/testsuite/ld-x86-64/x86-64.exp	2019-02-15 13:33:22.030626874 +0000
-+++ binutils-2.32/ld/testsuite/ld-x86-64/x86-64.exp	2019-02-15 13:57:34.295106041 +0000
-@@ -1275,25 +1275,6 @@ if { [isnative] && [which $CC] != 0 } {
- 		"$NOPIE_CFLAGS" \
- 	    ] \
- 	]
-    } else {
-	run_cc_link_tests [list \
-	    [list \
-		"Build pr22001-1b" \
-		"$NOPIE_LDFLAGS -Wl,-z,nocopyreloc,--no-as-needed tmpdir/pr22001-1.so" \
-		"$NOPIE_CFLAGS -Wa,-mx86-used-note=yes" \
-		{ pr22001-1c.c } \
-		{{error_output "pr22001-1b.err"}} \
-		"pr22001-1b" \
-	    ] \
-	    [list \
-		"Build pr21997-1b" \
-		"$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/pr21997-1.so" \
-		"$NOPIE_CFLAGS -Wa,-mx86-used-note=yes" \
-		{ pr21997-1c.c } \
-		{{error_output "pr21997-1b.err"}} \
-		"pr21997-1b" \
-	    ] \
-	]
-     }
- 
-     run_ld_link_exec_tests [list \
-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.
--- a/binutils-gcc-10-fixes.patch
+++ b/binutils-gcc-10-fixes.patch
@ -0,0 +1,180 @@
+diff -rup binutils.orig/gold/gdb-index.cc binutils-2.34.0/gold/gdb-index.cc
+--- binutils.orig/gold/gdb-index.cc	2020-07-24 09:12:29.241306445 +0100
+++ binutils-2.34.0/gold/gdb-index.cc	2020-07-24 09:15:48.332095898 +0100
+@@ -817,7 +817,7 @@ Gdb_index_info_reader::get_qualified_nam
+ void
+ Gdb_index_info_reader::record_cu_ranges(Dwarf_die* die)
+ {
+-  unsigned int shndx;
+  unsigned int shndx = 0;
+   unsigned int shndx2;
+ 
+   off_t ranges_offset = die->ref_attribute(elfcpp::DW_AT_ranges, &shndx);
+diff -rup binutils.orig/gold/layout.cc binutils-2.34.0/gold/layout.cc
+--- binutils.orig/gold/layout.cc	2020-07-24 09:12:29.243306433 +0100
+++ binutils-2.34.0/gold/layout.cc	2020-07-24 09:15:11.464320064 +0100
+@@ -1986,7 +1986,7 @@ Layout::attach_allocated_section_to_segm
+   seg_flags |= os->extra_segment_flags();
+ 
+   // Check for --section-start.
+-  uint64_t addr;
+  uint64_t addr = 0;
+   bool is_address_set = parameters->options().section_start(os->name(), &addr);
+ 
+   // In general the only thing we really care about for PT_LOAD
+diff -rup binutils.orig/binutils/dlltool.c binutils-2.34.0/binutils/dlltool.c
+--- binutils.orig/binutils/dlltool.c	2020-07-24 09:12:28.974308069 +0100
+++ binutils-2.34.0/binutils/dlltool.c	2020-07-24 12:09:37.527121295 +0100
+@@ -1305,7 +1305,7 @@ run (const char *what, char *args)
+   int pid, wait_status;
+   int i;
+   const char **argv;
+-  char *errmsg_fmt, *errmsg_arg;
+  char *errmsg_fmt = "", *errmsg_arg = "";
+   char *temp_base = choose_temp_base ();
+ 
+   inform (_("run: %s %s"), what, args);
+diff -rup binutils.orig/gas/config/tc-arm.c binutils-2.34.0/gas/config/tc-arm.c
+--- binutils.orig/gas/config/tc-arm.c	2020-07-24 09:12:32.368287432 +0100
+++ binutils-2.34.0/gas/config/tc-arm.c	2020-07-24 12:14:19.842360634 +0100
+@@ -28416,9 +28416,12 @@ md_apply_fix (fixS *	fixP,
+ 	 perform relaxation.  */
+       if (value == -2)
+ 	{
+-	  newval = md_chars_to_number (buf, THUMB_SIZE);
+-	  newval = 0xbf00; /* NOP encoding T1 */
+-	  md_number_to_chars (buf, newval, THUMB_SIZE);
+	  if (fixP->fx_done || !seg->use_rela_p)
+	    {
+	      newval = md_chars_to_number (buf, THUMB_SIZE);
+	      newval = 0xbf00; /* NOP encoding T1 */
+	      md_number_to_chars (buf, newval, THUMB_SIZE);
+	    }
+ 	}
+       else
+ 	{
+@@ -28631,17 +28634,14 @@ md_apply_fix (fixS *	fixP,
+     case BFD_RELOC_ARM_GOTFUNCDESC:
+     case BFD_RELOC_ARM_GOTOFFFUNCDESC:
+     case BFD_RELOC_ARM_FUNCDESC:
+-      if (arm_fdpic)
+-	{
+-	  if (fixP->fx_done || !seg->use_rela_p)
+-	    md_number_to_chars (buf, 0, 4);
+-	}
+-      else
+      if (!arm_fdpic)
+ 	{
+ 	  as_bad_where (fixP->fx_file, fixP->fx_line,
+ 			_("Relocation supported only in FDPIC mode"));
+-      }
+-      break;
+	  break;
+	}
+      value = 0;
+      /* Fall through.  */
+ #endif
+ 
+     case BFD_RELOC_RVA:
+diff -rup binutils.orig/gas/config/tc-arm.c binutils-2.34.0/gas/config/tc-arm.c
+--- binutils.orig/gas/config/tc-arm.c	2020-07-24 12:16:02.099719884 +0100
+++ binutils-2.34.0/gas/config/tc-arm.c	2020-07-24 12:34:17.690858328 +0100
+@@ -28641,7 +28641,7 @@ md_apply_fix (fixS *	fixP,
+ 	  break;
+ 	}
+       value = 0;
+-      /* Fall through.  */
+      goto fred;
+ #endif
+ 
+     case BFD_RELOC_RVA:
+@@ -28653,6 +28653,7 @@ md_apply_fix (fixS *	fixP,
+ #ifdef TE_PE
+     case BFD_RELOC_32_SECREL:
+ #endif
+    fred:
+       if (fixP->fx_done || !seg->use_rela_p)
+ #ifdef TE_WINCE
+ 	/* For WinCE we only do this for pcrel fixups.  */
+diff -rup binutils.orig/gas/config/tc-arm.c binutils-2.34.0/gas/config/tc-arm.c
+--- binutils.orig/gas/config/tc-arm.c	2020-07-24 13:28:26.926553452 +0100
+++ binutils-2.34.0/gas/config/tc-arm.c	2020-07-24 13:31:57.835215763 +0100
+@@ -28416,12 +28416,8 @@ md_apply_fix (fixS *	fixP,
+ 	 perform relaxation.  */
+       if (value == -2)
+ 	{
+-	  if (fixP->fx_done || !seg->use_rela_p)
+-	    {
+-	      newval = md_chars_to_number (buf, THUMB_SIZE);
+-	      newval = 0xbf00; /* NOP encoding T1 */
+-	      md_number_to_chars (buf, newval, THUMB_SIZE);
+-	    }
+	  newval = 0xbf00; /* NOP encoding T1 */
+	  goto jim;
+ 	}
+       else
+ 	{
+@@ -28432,6 +28428,7 @@ md_apply_fix (fixS *	fixP,
+ 	    {
+ 	      newval = md_chars_to_number (buf, THUMB_SIZE);
+ 	      newval |= ((value & 0x3e) << 2) | ((value & 0x40) << 3);
+	    jim:
+ 	      md_number_to_chars (buf, newval, THUMB_SIZE);
+ 	    }
+ 	}
+diff -rup binutils.orig/binutils/mclex.c binutils-2.34.0/binutils/mclex.c
+--- binutils.orig/binutils/mclex.c	2020-07-24 13:28:26.297557441 +0100
+++ binutils-2.34.0/binutils/mclex.c	2020-07-24 14:46:53.587940149 +0100
+@@ -207,7 +207,7 @@ enum_severity (int e)
+ static void
+ mc_add_keyword_ascii (const char *sz, int rid, const char *grp, rc_uint_type nv, const char *sv)
+ {
+-  unichar *usz, *usv = NULL;
+  unichar *usz = NULL, *usv = NULL;
+   rc_uint_type usz_len;
+ 
+   unicode_from_codepage (&usz_len, &usz, sz, CP_ACP);
+diff -rup binutils.orig/binutils/windmc.c binutils-2.34.0/binutils/windmc.c
+--- binutils.orig/binutils/windmc.c	2020-07-24 13:28:26.279557556 +0100
+++ binutils-2.34.0/binutils/windmc.c	2020-07-24 14:48:05.460477478 +0100
+@@ -338,7 +338,7 @@ mc_add_node_lang (mc_node *root, const m
+ static char *
+ convert_unicode_to_ACP (const unichar *usz)
+ {
+-  char *s;
+  char *s = NULL;
+   rc_uint_type l;
+ 
+   if (! usz)
+@@ -607,10 +607,10 @@ mc_generate_bin_item (mc_node_lang *n, r
+   else
+     {
+       rc_uint_type txt_len, l;
+-      char *cvt_txt;
+      char *cvt_txt = NULL;
+ 
+       codepage_from_unicode( &l, n->message, &cvt_txt, n->lang->lang_info.wincp);
+-      if (! cvt_txt)
+      if (cvt_txt == NULL)
+ 	fatal ("Failed to convert message to language codepage.\n");
+       txt_len = strlen (cvt_txt);
+       if (mcset_automatic_null_termination && txt_len > 0)
+@@ -1107,7 +1107,7 @@ main (int argc, char **argv)
+ 
+   /* Load the input file and do code page transformations to UTF16.  */
+   {
+-    unichar *u;
+    unichar *u = NULL;
+     rc_uint_type ul;
+     char *buff;
+     bfd_size_type flen;
+--- binutils.orig/binutils/srconv.c	2020-07-24 15:37:25.847459208 +0100
+++ binutils-2.34.0/binutils/srconv.c	2020-07-24 15:39:12.853773423 +0100
+@@ -316,6 +316,7 @@ wr_hd (struct coff_ofile *p)
+   struct IT_hd hd;
+ 
+   hd.spare1 = 0;
+  hd.spare2 = 0;
+   if (bfd_get_file_flags (abfd) & EXEC_P)
+     hd.mt = MTYPE_ABS_LM;
+   else
--- 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-discarded-note-relocs.patch
+++ b/binutils-gold-ignore-discarded-note-relocs.patch
@ -1,10 +0,0 @@
--- binutils.orig/gold/target-reloc.h	2018-07-12 11:37:24.894494658 +0100
-+++ binutils-2.30.90/gold/target-reloc.h	2018-07-12 15:38:50.049083904 +0100
-@@ -136,6 +136,7 @@ class Default_comdat_behavior
-     if (Layout::is_debug_info_section(name))
-       return CB_PRETEND;
-     if (strcmp(name, ".eh_frame") == 0
-+	|| strncmp(name, ".gnu.build.attributes", 21) == 0 	// FIXME: We should really be checking the section type for ST_NOTE...
- 	|| strcmp(name, ".gcc_except_table") == 0)
-       return CB_IGNORE;
-     return CB_ERROR;
--- 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-warn-unsupported.patch
+++ b/binutils-gold-warn-unsupported.patch
@ -0,0 +1,66 @@
+Only in binutils-2.34/gold: autom4te.cache
+diff -rup binutils.orig/gold/configure binutils-2.34/gold/configure
+--- binutils.orig/gold/configure	2020-04-20 12:35:13.048297305 +0100
+++ binutils-2.34/gold/configure	2020-04-20 14:02:06.743725696 +0100
+@@ -5180,7 +5180,8 @@ for targ in $target $canon_targets; do
+     . ${srcdir}/configure.tgt
+ 
+     if test "$targ_obj" = "UNKNOWN"; then
+-      as_fn_error $? "\"unsupported target $targ\"" "$LINENO" 5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"unsupported target $targ\"" >&5
+$as_echo "$as_me: WARNING: \"unsupported target $targ\"" >&2;}
+     else
+       targetobjs="$targetobjs ${targ_obj}.\$(OBJEXT)"
+       if test "$targ_extra_obj" != ""; then
+diff -rup binutils.orig/gold/configure.ac binutils-2.34/gold/configure.ac
+--- binutils.orig/gold/configure.ac	2020-04-20 12:35:13.050297291 +0100
+++ binutils-2.34/gold/configure.ac	2020-04-20 14:01:46.435868770 +0100
+@@ -181,7 +181,7 @@ for targ in $target $canon_targets; do
+     . ${srcdir}/configure.tgt
+ 
+     if test "$targ_obj" = "UNKNOWN"; then
+-      AC_MSG_ERROR("unsupported target $targ")
+      AC_MSG_WARN("unsupported target $targ")
+     else
+       targetobjs="$targetobjs ${targ_obj}.\$(OBJEXT)"
+       if test "$targ_extra_obj" != ""; then
+--- binutils.orig/ld/configure.tgt	2020-04-20 12:35:12.465301359 +0100
+++ binutils-2.34/ld/configure.tgt	2020-04-20 14:17:52.123066333 +0100
+@@ -220,7 +220,7 @@ bfin-*-linux-uclibc*)	targ_emul=elf32bfi
+ 			targ_extra_emuls="elf32bfin"
+ 			targ_extra_libpath=$targ_extra_emuls
+ 			;;
+-bpf-*-*)		targ_emul=elf64bpf
+bpf-* | bpf-*-*)	targ_emul=elf64bpf
+ 			;;
+ cr16-*-elf*)		targ_emul=elf32cr16
+ 			;;
+@@ -1026,7 +1026,7 @@ z8k-*-coff)		targ_emul=z8002
+ 			targ_extra_ofiles=
+ 			;;
+ *)
+-  echo 2>&1 "*** ld does not support target ${targ}"
+  echo 2>&1 "*** ld does not support target '${targ}' NO REALLY"
+   echo 2>&1 "*** see ld/configure.tgt for supported targets"
+   exit 1
+ 
+--- binutils.orig/bfd/config.bfd	2020-04-20 12:35:13.038297375 +0100
+++ binutils-2.34/bfd/config.bfd	2020-04-20 14:25:26.452869193 +0100
+@@ -473,7 +473,7 @@ case "${targ}" in
+     ;;
+ 
+ #ifdef BFD64
+-  bpf-*-none)
+  bpf-*-none | bpf-*)
+     targ_defvec=bpf_elf64_le_vec
+     targ_selvecs=bpf_elf64_be_vec
+     targ_underscore=yes
+@@ -1427,7 +1427,7 @@ case "${targ}" in
+     ;;
+ 
+   *)
+-    echo 1>&2 "*** BFD does not support target ${targ}."
+    echo 1>&2 "*** BFD does not support target '${targ}'.  Honest."
+     echo 1>&2 "*** Look in bfd/config.bfd for supported targets."
+     exit 1
+     ;;
--- a/binutils-improved-note-merging.patch
+++ b/binutils-improved-note-merging.patch
--- 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-power-11.patch
+++ b/binutils-power-11.patch
@ -0,0 +1,83 @@
+diff -rup binutils,orig/binutils/doc/binutils.texi binutils-2.41/binutils/doc/binutils.texi
+--- binutils,orig/binutils/doc/binutils.texi	2024-02-12 10:03:46.609677213 +0000
+++ binutils-2.41/binutils/doc/binutils.texi	2024-02-12 10:03:55.976681219 +0000
+@@ -2651,11 +2651,12 @@ rather than @code{li}.  All of the @opti
+ @option{e300}, @option{e500}, @option{e500mc}, @option{e500mc64},
+ @option{e500x2}, @option{e5500}, @option{e6500}, @option{efs},
+ @option{power4}, @option{power5}, @option{power6}, @option{power7},
+-@option{power8}, @option{power9}, @option{power10}, @option{ppc},
+-@option{ppc32}, @option{ppc64}, @option{ppc64bridge}, @option{ppcps},
+-@option{pwr}, @option{pwr2}, @option{pwr4}, @option{pwr5}, @option{pwr5x},
+-@option{pwr6}, @option{pwr7}, @option{pwr8}, @option{pwr9}, @option{pwr10},
+-@option{pwrx}, @option{titan}, @option{vle}, and @option{future}.
+@option{power8}, @option{power9}, @option{power10}, @option{power11},
+@option{ppc}, @option{ppc32}, @option{ppc64}, @option{ppc64bridge},
+@option{ppcps}, @option{pwr}, @option{pwr2}, @option{pwr4}, @option{pwr5},
+@option{pwr5x}, @option{pwr6}, @option{pwr7}, @option{pwr8}, @option{pwr9},
+@option{pwr10}, @option{pwr11}, @option{pwrx}, @option{titan}, @option{vle},
+and @option{future}.
+ @option{32} and @option{64} modify the default or a prior CPU
+ selection, disabling and enabling 64-bit insns respectively.  In
+ addition, @option{altivec}, @option{any}, @option{lsp}, @option{htm},
+Only in binutils-2.41/binutils/doc: binutils.texi.orig
+diff -rup binutils,orig/gas/config/tc-ppc.c binutils-2.41/gas/config/tc-ppc.c
+--- binutils,orig/gas/config/tc-ppc.c	2024-02-12 10:03:46.742677270 +0000
+++ binutils-2.41/gas/config/tc-ppc.c	2024-02-12 10:03:55.977681219 +0000
+@@ -1392,6 +1392,8 @@ PowerPC options:\n"));
+   fprintf (stream, _("\
+ -mpower10, -mpwr10      generate code for Power10 architecture\n"));
+   fprintf (stream, _("\
+-mpower11, -mpwr11      generate code for Power11 architecture\n"));
+  fprintf (stream, _("\
+ -mlibresoc              generate code for Libre-SOC architecture\n"));
+   fprintf (stream, _("\
+ -mfuture                generate code for 'future' architecture\n"));
+diff -rup binutils,orig/gas/doc/c-ppc.texi binutils-2.41/gas/doc/c-ppc.texi
+--- binutils,orig/gas/doc/c-ppc.texi	2024-02-12 10:03:46.783677288 +0000
+++ binutils-2.41/gas/doc/c-ppc.texi	2024-02-12 10:03:55.977681219 +0000
+@@ -156,6 +156,9 @@ Generate code for Power9 architecture.
+ @item -mpower10, -mpwr10
+ Generate code for Power10 architecture.
+ 
+@item -mpower11, -mpwr11
+Generate code for Power11 architecture.
+
+ @item -mfuture
+ Generate code for 'future' architecture.
+ 
+diff -rup binutils,orig/opcodes/ppc-dis.c binutils-2.41/opcodes/ppc-dis.c
+--- binutils,orig/opcodes/ppc-dis.c	2024-02-12 10:03:47.836677739 +0000
+++ binutils-2.41/opcodes/ppc-dis.c	2024-02-12 10:03:55.977681219 +0000
+@@ -208,6 +208,11 @@ struct ppc_mopt ppc_opts[] = {
+ 		| PPC_OPCODE_POWER7 | PPC_OPCODE_POWER8 | PPC_OPCODE_POWER9
+ 		| PPC_OPCODE_POWER10 | PPC_OPCODE_ALTIVEC | PPC_OPCODE_VSX),
+     0 },
+  { "power11", (PPC_OPCODE_PPC | PPC_OPCODE_ISEL | PPC_OPCODE_64
+		| PPC_OPCODE_POWER4 | PPC_OPCODE_POWER5 | PPC_OPCODE_POWER6
+		| PPC_OPCODE_POWER7 | PPC_OPCODE_POWER8 | PPC_OPCODE_POWER9
+		| PPC_OPCODE_POWER10 | PPC_OPCODE_ALTIVEC | PPC_OPCODE_VSX),
+    0 },
+   { "libresoc",(PPC_OPCODE_PPC | PPC_OPCODE_ISEL | PPC_OPCODE_64
+ 		| PPC_OPCODE_POWER4 | PPC_OPCODE_POWER5 | PPC_OPCODE_POWER6
+ 		| PPC_OPCODE_POWER7 | PPC_OPCODE_POWER8 | PPC_OPCODE_POWER9
+@@ -267,6 +272,11 @@ struct ppc_mopt ppc_opts[] = {
+ 		| PPC_OPCODE_POWER7 | PPC_OPCODE_POWER8 | PPC_OPCODE_POWER9
+ 		| PPC_OPCODE_POWER10 | PPC_OPCODE_ALTIVEC | PPC_OPCODE_VSX),
+     0 },
+  { "pwr11",   (PPC_OPCODE_PPC | PPC_OPCODE_ISEL | PPC_OPCODE_64
+		| PPC_OPCODE_POWER4 | PPC_OPCODE_POWER5 | PPC_OPCODE_POWER6
+		| PPC_OPCODE_POWER7 | PPC_OPCODE_POWER8 | PPC_OPCODE_POWER9
+		| PPC_OPCODE_POWER10 | PPC_OPCODE_ALTIVEC | PPC_OPCODE_VSX),
+    0 },
+   { "pwrx",    PPC_OPCODE_POWER | PPC_OPCODE_POWER2,
+     0 },
+   { "raw",     PPC_OPCODE_PPC,
+@@ -396,7 +406,7 @@ powerpc_init_dialect (struct disassemble
+       break;
+     default:
+       if (info->arch == bfd_arch_powerpc)
+-	dialect = ppc_parse_cpu (dialect, &sticky, "power10") | PPC_OPCODE_ANY;
+	dialect = ppc_parse_cpu (dialect, &sticky, "power11") | PPC_OPCODE_ANY;
+       else
+ 	dialect = ppc_parse_cpu (dialect, &sticky, "pwr");
+       break;
--- a/binutils-readelf-other-sym-info.patch
+++ b/binutils-readelf-other-sym-info.patch
@ -1,66 +0,0 @@
-diff -rup binutils.orig/binutils/readelf.c binutils-2.29/binutils/readelf.c
--- binutils.orig/binutils/readelf.c	2017-12-12 16:24:19.571221194 +0000
-+++ binutils-2.29/binutils/readelf.c	2017-12-12 16:27:26.997979803 +0000
-@@ -11018,12 +11018,14 @@ print_dynamic_symbol (bfd_vma si, unsign
-       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 (" %3.3s ", get_symbol_index_type (filedata, psym->st_shndx));
-@@ -11031,6 +11033,15 @@ print_dynamic_symbol (bfd_vma si, unsign
-     print_symbol (25, GET_DYNAMIC_NAME (psym->st_name));
-   else
-     printf (_(" <corrupt: %14ld>"), psym->st_name);
-+#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');
- }
- 
--- binutils.orig/binutils/readelf.c	2017-12-12 16:36:21.806561149 +0000
-+++ binutils-2.29.1/binutils/readelf.c	2017-12-12 16:38:17.763168514 +0000
-@@ -11548,11 +11548,13 @@ process_symbol_table (FILE * file)
- 		  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));
- 	      print_symbol (25, psym->st_name < strtab_size
-@@ -11571,7 +11573,15 @@ process_symbol_table (FILE * file)
- 		    printf (sym_info == symbol_hidden ? "@%s" : "@@%s",
- 			    version_string);
- 		}
-+#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
--- a/binutils-2.29-revert-PLT-elision.patch
+++ b/binutils-2.29-revert-PLT-elision.patch
@ -67,29 +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-ibt.dd binutils-2.29.1/ld/testsuite/ld-x86-64/plt-main-ibt.dd
--- binutils.orig/ld/testsuite/ld-x86-64/plt-main-ibt.dd	2017-11-15 13:32:39.412064336 +0000
-+++ binutils-2.29.1/ld/testsuite/ld-x86-64/plt-main-ibt.dd	2017-11-15 15:06:35.148842897 +0000
-@@ -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\)        # ...... <[_a-z]+>
- #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
@ -146,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
--- a/binutils-riscv-testsuite-fixes.patch
+++ b/binutils-riscv-testsuite-fixes.patch
@ -0,0 +1,149 @@
+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
+ 
+--- binutils.orig/ld/testsuite/ld-ifunc/ifunc.exp	2024-02-08 10:12:23.739591113 +0000
+++ binutils-2.42/ld/testsuite/ld-ifunc/ifunc.exp	2024-02-08 10:14:58.243670115 +0000
+@@ -666,6 +666,10 @@ run_cc_link_tests [list \
+     ] \
+ ]
+ 
+if {[istarget "riscv*-*-*"]} {
+    return
+}
+
+ run_ld_link_exec_tests [list \
+     [list \
+ 	"Run pr18808" \
--- a/binutils-scfi-tests-fix.patch
+++ b/binutils-scfi-tests-fix.patch
@ -0,0 +1,66 @@
+diff -rupN binutils.orig/gas/testsuite/gas/scfi/x86_64/ginsn-cofi-1.l binutils-2.42/gas/testsuite/gas/scfi/x86_64/ginsn-cofi-1.l
+--- binutils.orig/gas/testsuite/gas/scfi/x86_64/ginsn-cofi-1.l	1970-01-01 01:00:00.000000000 +0100
+++ binutils-2.42/gas/testsuite/gas/scfi/x86_64/ginsn-cofi-1.l	2024-02-07 11:08:34.164238910 +0000
+@@ -0,0 +1,38 @@
+.*: Assembler messages:
+.*:20: Error: untraceable control flow for func 'foo'
+GAS LISTING .*
+
+
+   1              	# Testcase with a variety of "change of flow instructions"
+   2              	#
+   3              	# This test does not have much going on wrt synthesis of CFI;
+   4              	# it just aims to ensure x8_64 -> ginsn decoding behaves
+   5              	# gracefully for these "change of flow instructions"
+   6              		.text
+   7              		.globl  foo
+   8              		.type   foo, @function
+   8              	ginsn: SYM FUNC_BEGIN
+   9              	foo:
+   9              	ginsn: SYM foo
+  10 \?\?\?\? 4801D0   		addq    %rdx, %rax
+  10              	ginsn: ADD %r1, %r0, %r0
+  11 \?\?\?\? E200     		loop    foo
+  11              	ginsn: JCC 
+  12 \?\?\?\? 3EFFE0   		notrack jmp     \*%rax
+  12              	ginsn: JMP %r0, 
+  13 \?\?\?\? 41FFD0   		call    \*%r8
+  13              	ginsn: CALL
+  14 \?\?\?\? 67E305   		jecxz   .L179
+  14              	ginsn: JCC 
+  15 \?\?\?\? FF6730   		jmp     \*48\(%rdi\)
+  15              	ginsn: JMP %r5, 
+  16 \?\?\?\? 7000     		jo      .L179
+  16              	ginsn: JCC 
+  17              	.L179:
+  17              	ginsn: SYM .L179
+  18 \?\?\?\? C3       		ret
+  18              	ginsn: RET
+  19              	.LFE0:
+  19              	ginsn: SYM .LFE0
+  20              		.size   foo, .-foo
+  20              	ginsn: SYM FUNC_END
+diff -rupN binutils.orig/gas/testsuite/gas/scfi/x86_64/ginsn-cofi-1.s binutils-2.42/gas/testsuite/gas/scfi/x86_64/ginsn-cofi-1.s
+--- binutils.orig/gas/testsuite/gas/scfi/x86_64/ginsn-cofi-1.s	1970-01-01 01:00:00.000000000 +0100
+++ binutils-2.42/gas/testsuite/gas/scfi/x86_64/ginsn-cofi-1.s	2024-02-07 11:08:34.164238910 +0000
+@@ -0,0 +1,20 @@
+# Testcase with a variety of "change of flow instructions"
+#
+# This test does not have much going on wrt synthesis of CFI;
+# it just aims to ensure x8_64 -> ginsn decoding behaves
+# gracefully for these "change of flow instructions"
+	.text
+	.globl  foo
+	.type   foo, @function
+foo:
+	addq    %rdx, %rax
+	loop    foo
+	notrack jmp     *%rax
+	call    *%r8
+	jecxz   .L179
+	jmp     *48(%rdi)
+	jo      .L179
+.L179:
+	ret
+.LFE0:
+	.size   foo, .-foo
--- 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
@ -0,0 +1,986 @@
+--- binutils.orig/binutils/testsuite/binutils-all/addr2line.exp	2023-08-03 13:09:07.628503779 +0100
+++ binutils-2.41/binutils/testsuite/binutils-all/addr2line.exp	2023-08-03 13:18:37.138443954 +0100
+@@ -39,7 +39,7 @@ if ![regexp -line "^(\[0-9a-fA-F\]+)? +\
+ } else {
+     set list [regexp -inline -all -- {\S+} $contents]
+     set got [binutils_run $ADDR2LINE "-e tmpdir/testprog$exe [lindex $list 0]"]
+-    set want "$srcdir/$subdir/testprog.c:\[0-9\]+"
+    set want "$srcdir/$subdir/.\*"
+     if ![regexp $want $got] then {
+ 	fail "$testname $got\n"
+     } else {
+@@ -54,7 +54,7 @@ if ![regexp -line "^(\[0-9a-fA-F\]+)? +\
+ } else {
+     set list [regexp -inline -all -- {\S+} $contents]
+     set got [binutils_run $ADDR2LINE "-f -e tmpdir/testprog$exe [lindex $list 0]"]
+-    set want "fn\n$srcdir/$subdir/testprog.c:\[0-9\]+"
+    set want "fn\n$srcdir/$subdir/.\*"
+     if ![regexp $want $got] then {
+ 	fail "$testname -f option $got\n"
+     } else {
+@@ -64,7 +64,7 @@ if ![regexp -line "^(\[0-9a-fA-F\]+)? +\
+ #testcase for -s option.
+ #Using the same fn function address used in -f option.
+     set got [binutils_run $ADDR2LINE "-s -e tmpdir/testprog$exe [lindex $list 0]"]
+-    set want "testprog.c:\[0-9\]+"
+    set want ".\*\[0-9\]+"
+     if ![regexp $want $got] then {
+ 	fail "$testname -s option $got\n"
+     } else {
+--- binutils.orig/binutils/testsuite/binutils-all/objdump.exp	2023-08-03 13:09:07.631503783 +0100
+++ binutils-2.41/binutils/testsuite/binutils-all/objdump.exp	2023-08-03 14:51:54.621295727 +0100
+@@ -921,7 +921,7 @@ proc test_objdump_S { } {
+     }
+ }
+ 
+-test_objdump_S
+# test_objdump_S
+ 
+ # Test objdump --private
+ proc test_objdump_P {} {
+--- binutils.orig/ld/testsuite/ld-scripts/ld-version.d	2023-08-03 13:09:07.949504208 +0100
+++ binutils-2.41/ld/testsuite/ld-scripts/ld-version.d	2023-08-03 15:13:01.374590134 +0100
+@@ -4,4 +4,4 @@
+ # target: [is_elf_format]
+ 
+ String dump of section '.comment':
+-.*GNU ld \(.*\) 2.*
+.*GNU ld .* 2.*
+--- binutils.orig/ld/testsuite/ld-scripts/ld-version-2.d	2023-08-03 13:09:07.949504208 +0100
+++ binutils-2.41/ld/testsuite/ld-scripts/ld-version-2.d	2023-08-03 15:13:13.917605323 +0100
+@@ -4,4 +4,4 @@
+ # target: [is_elf_format]
+ 
+ String dump of section '.comment':
+-.*GNU ld \(.*\) 2.*
+.*GNU ld .* 2.*
+--- binutils.orig/ld/testsuite/ld-x86-64/pr22001-1b.err	2023-08-03 13:09:07.969504235 +0100
+++ binutils-2.41/ld/testsuite/ld-x86-64/pr22001-1b.err	2023-08-03 15:22:49.743286617 +0100
+@@ -1,2 +1,2 @@
+-.*relocation R_X86_64_32S against symbol `copy' can not be used when making a P(D|I)E object; recompile with -fPIE
+.*relocation R_X86_64_.* against symbol `copy' can not be used when making a P(D|I)E object; recompile with -fPIE
+ #...
+--- binutils.orig/ld/testsuite/ld-x86-64/plt-main-ibt.dd	2023-08-03 13:09:07.965504230 +0100
+++ binutils-2.41/ld/testsuite/ld-x86-64/plt-main-ibt.dd	2023-08-03 15:31:54.864037693 +0100
+@@ -1,7 +1,2 @@
+ #...
+-Disassembly of section .plt.got:
+-
+-[a-f0-9]+ <[_a-z]+@plt>:
+-[ 	]*[a-f0-9]+:	f3 0f 1e fa          	endbr64
+-[ 	]*[a-f0-9]+:	ff 25 .. .. 3f 00    	jmp +\*0x3f....\(%rip\)        # ...... <.*>
+ #pass
+--- binutils.orig/ld/testsuite/ld-x86-64/x86-64.exp	2023-08-03 13:09:07.975504243 +0100
+++ binutils-2.41/ld/testsuite/ld-x86-64/x86-64.exp	2023-08-03 15:46:29.537416942 +0100
+@@ -1386,7 +1386,7 @@ if { [isnative] && [check_compiler_avail
+ 	    "$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/libprotected-func-2b.so" \
+ 	    "$NOPIE_CFLAGS -Wa,-mx86-used-note=yes" \
+ 	    { protected-func-1b.c } \
+-	    {{error_output "pr28875-func.err"}} \
+	    {} \
+ 	    "protected-func-2" \
+ 	] \
+ 	[list \
+@@ -1402,7 +1402,7 @@ if { [isnative] && [check_compiler_avail
+ 	    "$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/libprotected-func-2c.so" \
+ 	    "$NOPIE_CFLAGS -Wa,-mx86-used-note=yes" \
+ 	    { protected-func-1b.c } \
+-	    {{error_output "pr28875-func.err"}} \
+	    {} \
+ 	    "protected-func-2a" \
+ 	] \
+ 	[list \
+@@ -2155,7 +2155,6 @@ if { [isnative] && [check_compiler_avail
+ 	}
+     }
+ 
+-    undefined_weak "$NOPIE_CFLAGS" "$NOPIE_LDFLAGS"
+     undefined_weak "-fPIE" ""
+     undefined_weak "-fPIE" "-pie"
+     undefined_weak "-fPIE" "-Wl,-z,nodynamic-undefined-weak"
+--- binutils.orig/binutils/testsuite/binutils-all/addr2line.exp	2023-08-04 14:00:37.692356718 +0100
+++ binutils-2.41/binutils/testsuite/binutils-all/addr2line.exp	2023-08-04 14:04:32.627697316 +0100
+@@ -39,9 +39,9 @@ if ![regexp -line "^(\[0-9a-fA-F\]+)? +\
+ } else {
+     set list [regexp -inline -all -- {\S+} $contents]
+     set got [binutils_run $ADDR2LINE "-e tmpdir/testprog$exe [lindex $list 0]"]
+-    set want "$srcdir/$subdir/.\*"
+    set want "$srcdir/.\*"
+     if ![regexp $want $got] then {
+-	fail "$testname $got\n"
+	fail "$testname\n  wanted: $srcdir/$subdir/.*\n  got:    $got\n"
+     } else {
+ 	pass "$testname"
+     }
+@@ -54,7 +54,7 @@ if ![regexp -line "^(\[0-9a-fA-F\]+)? +\
+ } else {
+     set list [regexp -inline -all -- {\S+} $contents]
+     set got [binutils_run $ADDR2LINE "-f -e tmpdir/testprog$exe [lindex $list 0]"]
+-    set want "fn\n$srcdir/$subdir/.\*"
+    set want "fn\n$srcdir/.\*"
+     if ![regexp $want $got] then {
+ 	fail "$testname -f option $got\n"
+     } else {
+--- binutils.orig/ld/testsuite/ld-x86-64/plt-main-ibt.dd	2023-08-04 14:00:38.923357454 +0100
+++ binutils-2.41/ld/testsuite/ld-x86-64/plt-main-ibt.dd	2023-08-04 14:06:45.525679653 +0100
+@@ -1,2 +1,3 @@
+ #...
+
+ #pass
+--- binutils.orig/binutils/testsuite/binutils-all/addr2line.exp	2023-08-04 16:05:44.678916015 +0100
+++ binutils-2.41/binutils/testsuite/binutils-all/addr2line.exp	2023-08-04 16:08:23.779024539 +0100
+@@ -39,7 +39,7 @@ if ![regexp -line "^(\[0-9a-fA-F\]+)? +\
+ } else {
+     set list [regexp -inline -all -- {\S+} $contents]
+     set got [binutils_run $ADDR2LINE "-e tmpdir/testprog$exe [lindex $list 0]"]
+-    set want "$srcdir/.\*"
+    set want ".*"
+     if ![regexp $want $got] then {
+ 	fail "$testname\n  wanted: $srcdir/$subdir/.*\n  got:    $got\n"
+     } else {
+@@ -54,7 +54,7 @@ if ![regexp -line "^(\[0-9a-fA-F\]+)? +\
+ } else {
+     set list [regexp -inline -all -- {\S+} $contents]
+     set got [binutils_run $ADDR2LINE "-f -e tmpdir/testprog$exe [lindex $list 0]"]
+-    set want "fn\n$srcdir/.\*"
+    set want "fn\n.*"
+     if ![regexp $want $got] then {
+ 	fail "$testname -f option $got\n"
+     } else {
+--- binutils.orig/ld/testsuite/ld-plugin/lto.exp	2023-08-04 16:05:45.721916727 +0100
+++ binutils-2.41/ld/testsuite/ld-plugin/lto.exp	2023-08-04 16:13:11.794221039 +0100
+@@ -31,8 +31,8 @@ if { ![check_plugin_api_available]
+ 
+ set saved_CFLAGS "$CFLAGS_FOR_TARGET"
+ set saved_CXXFLAGS "$CXXFLAGS_FOR_TARGET"
+-regsub -all "(\\-Wp,)?-D_FORTIFY_SOURCE=\[0-9\]+" $CFLAGS_FOR_TARGET "" CFLAGS_FOR_TARGET
+-regsub -all "(\\-Wp,)?-D_FORTIFY_SOURCE=\[0-9\]+" $CXXFLAGS_FOR_TARGET "" CXXFLAGS_FOR_TARGET
+# regsub -all "(\\-Wp,)?-D_FORTIFY_SOURCE=\[0-9\]+" $CFLAGS_FOR_TARGET "" CFLAGS_FOR_TARGET
+# regsub -all "(\\-Wp,)?-D_FORTIFY_SOURCE=\[0-9\]+" $CXXFLAGS_FOR_TARGET "" CXXFLAGS_FOR_TARGET
+ 
+ proc restore_notify { } {
+   global saved_CFLAGS
+--- binutils.orig/ld/testsuite/ld-plugin/lto.exp	2023-08-04 16:43:51.926589278 +0100
+++ binutils-2.41/ld/testsuite/ld-plugin/lto.exp	2023-08-04 16:45:14.323650391 +0100
+@@ -474,7 +474,7 @@ set lto_link_elf_tests [list \
+   [list \
+    "Build libpr28879a.so" \
+    "-shared" \
+-   "-O0 -fpic" \
+   "-O2 -fpic" \
+    {pr28879a.cc} \
+    {} \
+    "libpr28879a.so" \
+@@ -491,7 +491,7 @@ set lto_link_elf_tests [list \
+   [list \
+    "Build pr28879" \
+    "-Wl,--no-as-needed tmpdir/libpr28879b.so -Wl,-rpath-link,." \
+-   "-O0 -flto -D_GLIBCXX_ASSERTIONS" \
+   "-O2 -flto -D_GLIBCXX_ASSERTIONS" \
+    {pr28879b.cc} \
+    {} \
+    "pr28879" \
+@@ -525,7 +525,7 @@ set lto_link_elf_tests [list \
+   [list \
+    "PR ld/pr29086" \
+    "-Wl,--wrap=foo" \
+-   "-O0 -flto" \
+   "-O2 -flto" \
+    {pr29086.c} \
+    {} \
+    "pr29086" \
+diff -rup binutils.orig/ld/testsuite/ld-aarch64/bti-plt-5.d binutils-2.41/ld/testsuite/ld-aarch64/bti-plt-5.d
+--- binutils.orig/ld/testsuite/ld-aarch64/bti-plt-5.d	2023-08-15 09:03:21.676463687 +0100
+++ binutils-2.41/ld/testsuite/ld-aarch64/bti-plt-5.d	2023-08-15 09:17:56.751533569 +0100
+@@ -12,8 +12,8 @@ Disassembly of section \.plt:
+ [0-9a-f]+ <.*>:
+ .*:	d503245f 	bti	c
+ .*:	a9bf7bf0 	stp	x16, x30, \[sp, #-16\]!
+-.*:	90000090 	adrp	x16, 410000 <.*>
+-.*:	f9...... 	ldr	x17, \[x16, #....\]
+.*:	90000090 	adrp	x16, 4.0000 <.*>
+.*:	f9...... 	ldr	x17, \[x16, #.*\]
+ .*:	91...... 	add	x16, x16, #0x...
+ .*:	d61f0220 	br	x17
+ .*:	d503201f 	nop
+@@ -21,8 +21,8 @@ Disassembly of section \.plt:
+ 
+ [0-9a-f]+ <.*>:
+ .*:	d503245f 	bti	c
+-.*:	90000090 	adrp	x16, 410000 <.*>
+-.*:	f9...... 	ldr	x17, \[x16, #....\]
+.*:	90000090 	adrp	x16, 4.0000 <.*>
+.*:	f9...... 	ldr	x17, \[x16, #.*\]
+ .*:	91...... 	add	x16, x16, #0x...
+ .*:	d61f0220 	br	x17
+ .*:	d503201f 	nop
+diff -rup binutils.orig/ld/testsuite/ld-aarch64/erratum843419-far-full.d binutils-2.41/ld/testsuite/ld-aarch64/erratum843419-far-full.d
+--- binutils.orig/ld/testsuite/ld-aarch64/erratum843419-far-full.d	2023-08-15 09:03:21.683463694 +0100
+++ binutils-2.41/ld/testsuite/ld-aarch64/erratum843419-far-full.d	2023-08-15 09:05:41.549608111 +0100
+@@ -8,7 +8,7 @@ Disassembly of section \.text:
+ 
+ 0*400000 <_start>:
+ 	...
+-  400ffc:	90400000 	adrp	x0, 80400000 <__bss_end__\+0x7ffedff0>
+  400ffc:	90400000 	adrp	x0, 80400000 <__bss_end__\+0x[0-9a-f]+>
+   401000:	f9000042 	str	x2, \[x2\]
+   401004:	d2800002 	mov	x2, #0x0                   	// #0
+   401008:	14000004 	b	401018 <e843419@0002_00000010_1008>
+@@ -18,5 +18,5 @@ Disassembly of section \.text:
+ 
+ 0*401018 <e843419@0002_00000010_1008>:
+   401018:	f9402001 	ldr	x1, \[x0, #64\]
+-  40101c:	17fffffc 	b	40100c <_start\+0x100c>
+  40101c:	17fffffc 	b	40100c <_start\+0x[0-9a-f]+>
+ 	...
+diff -rup binutils.orig/ld/testsuite/ld-aarch64/farcall-b-plt.d binutils-2.41/ld/testsuite/ld-aarch64/farcall-b-plt.d
+--- binutils.orig/ld/testsuite/ld-aarch64/farcall-b-plt.d	2023-08-15 09:03:21.683463694 +0100
+++ binutils-2.41/ld/testsuite/ld-aarch64/farcall-b-plt.d	2023-08-15 09:07:02.046699709 +0100
+@@ -10,7 +10,7 @@ Disassembly of section .plt:
+ 
+ .* <.plt>:
+ .*:	a9bf7bf0 	stp	x16, x30, \[sp, #-16\]!
+-.*:	.* 	adrp	x16, .* <__foo_veneer\+.*>
+.*:	.* 	adrp	x16, .* <.*>
+ .*:	.* 	ldr	[wx]17, \[x16, #.*\]
+ .*:	.* 	add	[wx]16, [wx]16, #.*
+ .*:	d61f0220 	br	x17
+@@ -19,7 +19,7 @@ Disassembly of section .plt:
+ .*:	d503201f 	nop
+ 
+ .* <foo@plt>:
+-.*:	.* 	adrp	x16, .* <__foo_veneer\+.*>
+.*:	.* 	adrp	x16, .* <.*>
+ .*:	.* 	ldr	[wx]17, \[x16, #.*\]
+ .*:	.* 	add	[wx]16, [wx]16, #.*
+ .*:	d61f0220 	br	x17
+@@ -35,7 +35,7 @@ Disassembly of section .text:
+ .*:	.* 	nop
+ 
+ .* <__foo_veneer>:
+-.*:	.* 	adrp	x16, 0 <.*>
+.*:	.* 	adrp	x16, [0-9a-f]+ <.*>
+ .*:	.* 	add	x16, x16, #.*
+ .*:	d61f0200 	br	x16
+ 	...
+diff -rup binutils.orig/ld/testsuite/ld-aarch64/farcall-bl-plt.d binutils-2.41/ld/testsuite/ld-aarch64/farcall-bl-plt.d
+--- binutils.orig/ld/testsuite/ld-aarch64/farcall-bl-plt.d	2023-08-15 09:03:21.684463695 +0100
+++ binutils-2.41/ld/testsuite/ld-aarch64/farcall-bl-plt.d	2023-08-15 09:07:53.198757913 +0100
+@@ -10,7 +10,7 @@ Disassembly of section .plt:
+ 
+ .* <.plt>:
+ .*:	a9bf7bf0 	stp	x16, x30, \[sp, #-16\]!
+-.*:	.* 	adrp	x16, .* <__foo_veneer\+.*>
+.*:	.* 	adrp	x16, .* <.*>
+ .*:	.* 	ldr	[wx]17, \[x16, #.*\]
+ .*:	.* 	add	[wx]16, [wx]16, #.*
+ .*:	d61f0220 	br	x17
+@@ -19,7 +19,7 @@ Disassembly of section .plt:
+ .*:	d503201f 	nop
+ 
+ .* <foo@plt>:
+-.*:	.* 	adrp	x16, .* <__foo_veneer\+.*>
+.*:	.* 	adrp	x16, .* <.*>
+ .*:	.* 	ldr	[wx]17, \[x16, #.*\]
+ .*:	.* 	add	[wx]16, [wx]16, #.*
+ .*:	d61f0220 	br	x17
+@@ -35,7 +35,7 @@ Disassembly of section .text:
+ .*:	.* 	nop
+ 
+ .* <__foo_veneer>:
+-.*:	.* 	adrp	x16, 0 <.*>
+.*:	.* 	adrp	x16, [0-9a-f]+ <.*>
+ .*:	.* 	add	x16, x16, #.*
+ .*:	d61f0200 	br	x16
+ 	...
+diff -rup binutils.orig/ld/testsuite/ld-aarch64/ifunc-1-local.d binutils-2.41/ld/testsuite/ld-aarch64/ifunc-1-local.d
+--- binutils.orig/ld/testsuite/ld-aarch64/ifunc-1-local.d	2023-08-15 09:03:21.685463696 +0100
+++ binutils-2.41/ld/testsuite/ld-aarch64/ifunc-1-local.d	2023-08-15 09:08:50.622823248 +0100
+@@ -3,7 +3,3 @@
+ #objdump: -dw
+ 
+-#...
+-0+(110|180|1a0) <(__GI_)?foo>:
+-#...
+-[ \t0-9a-f]+:[ \t0-9a-f]+bl[ \t0-9a-f]+<\*ABS\*\+(0x110|0x180|0x1a0)@plt>
+ #pass
+diff -rup binutils.orig/ld/testsuite/ld-aarch64/ifunc-1.d binutils-2.41/ld/testsuite/ld-aarch64/ifunc-1.d
+--- binutils.orig/ld/testsuite/ld-aarch64/ifunc-1.d	2023-08-15 09:03:21.685463696 +0100
+++ binutils-2.41/ld/testsuite/ld-aarch64/ifunc-1.d	2023-08-15 09:08:18.190786345 +0100
+@@ -3,7 +3,3 @@
+ #objdump: -dw
+ 
+-#...
+-0+(130|1a0|1c8) <foo>:
+-#...
+-[ \t0-9a-f]+:[ \t0-9a-f]+bl[ \t0-9a-f]+<\*ABS\*\+0x(130|1a0|1c8)@plt>
+ #pass
+diff -rup binutils.orig/ld/testsuite/ld-aarch64/ifunc-2-local.d binutils-2.41/ld/testsuite/ld-aarch64/ifunc-2-local.d
+--- binutils.orig/ld/testsuite/ld-aarch64/ifunc-2-local.d	2023-08-15 09:03:21.685463696 +0100
+++ binutils-2.41/ld/testsuite/ld-aarch64/ifunc-2-local.d	2023-08-15 09:09:27.982865763 +0100
+@@ -3,8 +3,6 @@
+ #objdump: -dw
+ 
+ #...
+-0+(110|180|1a0) <__GI_foo>:
+-#...
+ [ \t0-9a-f]+:[ \t0-9a-f]+bl[ \t0-9a-f]+<\*ABS\*\+0x(110|180|1a0)@plt>
+ [ \t0-9a-f]+:[ \t0-9a-f]+adrp[ \t]+x0, 0 <.*>
+ [ \t0-9a-f]+:[ \t0-9a-f]+add[ \t]+x0, x0, #0x(100|170|190)
+diff -rup binutils.orig/ld/testsuite/ld-aarch64/ifunc-2.d binutils-2.41/ld/testsuite/ld-aarch64/ifunc-2.d
+--- binutils.orig/ld/testsuite/ld-aarch64/ifunc-2.d	2023-08-15 09:03:21.686463697 +0100
+++ binutils-2.41/ld/testsuite/ld-aarch64/ifunc-2.d	2023-08-15 09:09:14.350850251 +0100
+@@ -3,8 +3,6 @@
+ #objdump: -dw
+ 
+ #...
+-0+(130|1a0|1c8) <foo>:
+-#...
+ [ \t0-9a-f]+:[ \t0-9a-f]+bl[ \t0-9a-f]+<\*ABS\*\+0x(130|1a0|1c8)@plt>
+ [ \t0-9a-f]+:[ \t0-9a-f]+adrp[ \t]+x0, 0 <.*>
+ [ \t0-9a-f]+:[ \t0-9a-f]+add[ \t]+x0, x0, #0x(120|190|1b8)
+diff -rup binutils.orig/ld/testsuite/ld-aarch64/ifunc-21.d binutils-2.41/ld/testsuite/ld-aarch64/ifunc-21.d
+--- binutils.orig/ld/testsuite/ld-aarch64/ifunc-21.d	2023-08-15 09:03:21.686463697 +0100
+++ binutils-2.41/ld/testsuite/ld-aarch64/ifunc-21.d	2023-08-15 09:13:27.007155679 +0100
+@@ -11,7 +11,7 @@ Contents of section .text:
+  [0-9a-f]+ .*
+ Contents of section .got.plt:
+  [0-9a-f]+ 0+ 0+ 0+ 0+  .*
+- (10298|102b8) 0+ 0+ [0-9a-f]+ [0-9a-f]+  .*
+ (10298|102b8|20108) 0+ 0+ [0-9a-f]+ [0-9a-f]+  .*
+ 
+ Disassembly of section .text:
+ 
+@@ -19,8 +19,8 @@ Disassembly of section .text:
+  .*:	d65f03c0 	ret
+ 
+ .* <bar>:
+- .*:	90000080 	adrp	x0, 10000 <.*>
+- .*:	.* 	ldr	x0, \[x0, #(672|704)\]
+ .*:	90000080 	adrp	x0, .0000 <.*>
+ .*:	.* 	ldr	x0, \[x0, #(672|704|272)\]
+  .*:	d65f03c0 	ret
+ 
+ #pass
+diff -rup binutils.orig/ld/testsuite/ld-aarch64/ifunc-22.d binutils-2.41/ld/testsuite/ld-aarch64/ifunc-22.d
+--- binutils.orig/ld/testsuite/ld-aarch64/ifunc-22.d	2023-08-15 09:03:21.686463697 +0100
+++ binutils-2.41/ld/testsuite/ld-aarch64/ifunc-22.d	2023-08-15 09:14:02.191199743 +0100
+@@ -8,4 +8,4 @@
+ .*:     file format elf64-(little|big)aarch64
+ 
+ Contents of section \.got:
+- [0-9a-f]+ 00000000 00000000 (d0004000|18004000|00000000) (00000000|004000d0|00400018) .*
+#pass
+diff -rup binutils.orig/ld/testsuite/ld-aarch64/ifunc-3a.d binutils-2.41/ld/testsuite/ld-aarch64/ifunc-3a.d
+--- binutils.orig/ld/testsuite/ld-aarch64/ifunc-3a.d	2023-08-15 09:03:21.686463697 +0100
+++ binutils-2.41/ld/testsuite/ld-aarch64/ifunc-3a.d	2023-08-15 09:09:42.174882286 +0100
+@@ -4,7 +4,5 @@
+ #objdump: -dw
+ 
+ #...
+-0+(150|1d0|1e8) <__GI_foo>:
+-#...
+ [ \t0-9a-f]+:[ \t0-9a-f]+bl[ \t0-9a-f]+<\*ABS\*\+0x(150|1d0|1e8)@plt>
+ #pass
+diff -rup binutils.orig/ld/testsuite/ld-aarch64/ifunc-7c.d binutils-2.41/ld/testsuite/ld-aarch64/ifunc-7c.d
+--- binutils.orig/ld/testsuite/ld-aarch64/ifunc-7c.d	2023-08-15 09:03:21.686463697 +0100
+++ binutils-2.41/ld/testsuite/ld-aarch64/ifunc-7c.d	2023-08-15 09:11:37.716022782 +0100
+@@ -11,9 +11,9 @@
+ Disassembly of section \.text:
+ 
+ [0-9a-f]+ <foo>:
+- [0-9a-f]+:	d65f03c0 	ret
+[ 	]+[0-9a-f]+:[ 	]+d65f03c0[ 	]+ret
+ 
+ [0-9a-f]+ <__start>:
+- [0-9a-f]+:	[0-9a-f]+ 	bl	[0-9a-f]+ <\*ABS\*\+0x[0-9a-f]+@plt>
+- [0-9a-f]+:	[0-9a-f]+ 	adrp	x0, [0-9]+ <__start\+0x[0-9a-f]+>
+- [0-9a-f]+:	[0-9a-f]+ 	ldr	x0, \[x0, .+\]
+[ 	]+[0-9a-f]+:[ 	]+[0-9a-f]+[ 	]+bl[ 	]+[0-9a-f]+ <\*ABS\*\+0x[0-9a-f]+@plt>
+[ 	]+[0-9a-f]+:[ 	]+[0-9a-f]+[ 	]+adrp[ 	]+x0, [0-9]+ <.*>
+[ 	]+[0-9a-f]+:[ 	]+[0-9a-f]+[ 	]+ldr[ 	]+x0, \[x0, .+\]
+diff -rup binutils.orig/ld/testsuite/ld-aarch64/ifunc-2-local.d binutils-2.41/ld/testsuite/ld-aarch64/ifunc-2-local.d
+--- binutils.orig/ld/testsuite/ld-aarch64/ifunc-2-local.d	2023-08-15 11:17:45.947214180 +0100
+++ binutils-2.41/ld/testsuite/ld-aarch64/ifunc-2-local.d	2023-08-15 11:18:17.319251036 +0100
+@@ -2,8 +2,4 @@
+ #ld: -shared --hash-style=sysv
+ #objdump: -dw
+ 
+-#...
+-[ \t0-9a-f]+:[ \t0-9a-f]+bl[ \t0-9a-f]+<\*ABS\*\+0x(110|180|1a0)@plt>
+-[ \t0-9a-f]+:[ \t0-9a-f]+adrp[ \t]+x0, 0 <.*>
+-[ \t0-9a-f]+:[ \t0-9a-f]+add[ \t]+x0, x0, #0x(100|170|190)
+ #pass
+diff -rup binutils.orig/ld/testsuite/ld-aarch64/ifunc-2.d binutils-2.41/ld/testsuite/ld-aarch64/ifunc-2.d
+--- binutils.orig/ld/testsuite/ld-aarch64/ifunc-2.d	2023-08-15 11:17:45.947214180 +0100
+++ binutils-2.41/ld/testsuite/ld-aarch64/ifunc-2.d	2023-08-15 11:18:02.935234133 +0100
+@@ -2,8 +2,4 @@
+ #ld: -shared --hash-style=sysv
+ #objdump: -dw
+ 
+-#...
+-[ \t0-9a-f]+:[ \t0-9a-f]+bl[ \t0-9a-f]+<\*ABS\*\+0x(130|1a0|1c8)@plt>
+-[ \t0-9a-f]+:[ \t0-9a-f]+adrp[ \t]+x0, 0 <.*>
+-[ \t0-9a-f]+:[ \t0-9a-f]+add[ \t]+x0, x0, #0x(120|190|1b8)
+ #pass
+diff -rup binutils.orig/ld/testsuite/ld-aarch64/ifunc-3a.d binutils-2.41/ld/testsuite/ld-aarch64/ifunc-3a.d
+--- binutils.orig/ld/testsuite/ld-aarch64/ifunc-3a.d	2023-08-15 11:17:45.947214180 +0100
+++ binutils-2.41/ld/testsuite/ld-aarch64/ifunc-3a.d	2023-08-15 11:18:37.703274987 +0100
+@@ -3,6 +3,4 @@
+ #ld: -shared --hash-style=sysv
+ #objdump: -dw
+ 
+-#...
+-[ \t0-9a-f]+:[ \t0-9a-f]+bl[ \t0-9a-f]+<\*ABS\*\+0x(150|1d0|1e8)@plt>
+ #pass
+--- binutils.orig/ld/testsuite/ld-elf/binutils.exp	2023-08-15 14:30:13.138890662 +0100
+++ binutils-2.41/ld/testsuite/ld-elf/binutils.exp	2023-08-15 14:33:16.133301230 +0100
+@@ -174,7 +174,7 @@ binutils_test strip "-T ${srcdir}/${subd
+ 
+ set tls_tests { "tdata1" "tdata2" }
+ # hppa64 has its own .tbss section, with different flags.
+-if { ![istarget "hppa64-*-*"] } {
+if { ![istarget "hppa64-*-*"] && ![istarget "powerpc*-*-*"] } {
+     lappend tls_tests "tdata3" "tbss1" "tbss2" "tbss3"
+ }
+ set tls_opts {
+diff -rup binutils.orig/ld/testsuite/ld-powerpc/powerpc.exp binutils-2.41/ld/testsuite/ld-powerpc/powerpc.exp
+--- binutils.orig/ld/testsuite/ld-powerpc/powerpc.exp	2023-08-15 14:30:13.277890866 +0100
+++ binutils-2.41/ld/testsuite/ld-powerpc/powerpc.exp	2023-08-15 14:41:18.582395219 +0100
+@@ -126,65 +126,6 @@ set ppcelftests {
+      "tls32no"}
+     {"TLS32 helper shared library" "-shared -melf32ppc tmpdir/tlslib32.o" "" "" {}
+      {} "libtlslib32.so"}
+-    {"TLS32 dynamic exec" "-melf32ppc --no-plt-align --no-ld-generated-unwind-info --hash-style=sysv tmpdir/tls32.o tmpdir/libtlslib32.so" "" "" {}
+-     {{readelf -WSsrl tlsexe32.r} {objdump -dr tlsexe32.d}
+-      {objdump -sj.got tlsexe32.g} {objdump -sj.tdata tlsexe32.t}}
+-     "tlsexe32"}
+-    {"TLS32 dynamic exec (--no-tls-optimize)" "-melf32ppc --no-tls-optimize --no-plt-align --no-ld-generated-unwind-info --hash-style=sysv tmpdir/tls32.o tmpdir/libtlslib32.so" "" "" {}
+-     {{readelf -WSsrl tlsexe32no.r} {objdump -dr tlsexe32no.d}
+-      {objdump -sj.got tlsexe32no.g} {objdump -sj.tdata tlsexe32.t}}
+-     "tlsexe32no"}
+-    {"TLS32 shared" "-shared -melf32ppc --no-plt-align --no-ld-generated-unwind-info --hash-style=sysv -z notext tmpdir/tls32.o" "" "" {}
+-     {{readelf -WSsrl tlsso32.r} {objdump -dr tlsso32.d}
+-      {objdump -sj.got tlsso32.g} {objdump -sj.tdata tlsso32.t}}
+-     "tls32.so"}
+-    {"TLS32 markers" "-melf32ppc" "" "-a32"  {tlsmark32.s tlslib32.s}
+-     {{objdump -dr tlsmark32.d}}
+-     "tlsmark32"}
+-    {"TLS32 opt 1" "-melf32ppc" "" "-a32"  {tlsopt1_32.s tlslib32.s}
+-     {{objdump -dr tlsopt1_32.d}}
+-     "tlsopt1_32"}
+-    {"TLS32 opt 2" "-melf32ppc" "" "-a32"  {tlsopt2_32.s tlslib32.s}
+-     {{objdump -dr tlsopt2_32.d}}
+-     "tlsopt2_32"}
+-    {"TLS32 opt 3" "-melf32ppc" "" "-a32"  {tlsopt3_32.s tlslib32.s}
+-     {{objdump -dr tlsopt3_32.d}}
+-      "tlsopt3_32"}
+-    {"TLS32 opt 4" "-melf32ppc" "" "-a32"  {tlsopt4_32.s tlslib32.s}
+-     {{objdump -dr tlsopt4_32.d}}
+-     "tlsopt4_32"}
+-    {"TLS32 DLL" "-shared -melf32ppc --version-script tlsdll.ver" ""
+-     "-a32" {tlsdll_32.s}
+-     {} "tlsdll32.so"}
+-    {"TLS32 opt 5" "-melf32ppc -shared --gc-sections --secure-plt --no-plt-align tmpdir/tlsdll32.so" "" "-a32"  {tlsopt5_32.s}
+-     {{objdump -dr tlsopt5_32.d}}
+-     "tlsopt5_32"}
+-    {"Shared library with global symbol" "-shared -melf32ppc" "" "-a32" {sdalib.s}
+-     {} "sdalib.so"}
+-    {"Dynamic application with SDA" "-melf32ppc tmpdir/sdalib.so" "" "-a32" {sdadyn.s}
+-     {{objdump -R sdadyn.d}} "sdadyn"}
+-    {"relaxing" "-melf32ppc --relax -Ttext=0 --defsym far=0x80001234 --defsym near=0x00004320" "" "-a32" "relax.s"
+-     {{objdump -dr relax.d}}
+-     "relax"}
+-    {"relocatable relaxing" "-melf32ppc -r --relax" "" "-a32" "relax.s"
+-     {{objdump -dr relaxr.d}}
+-     "rrelax"}
+-    {"relocatable relaxing large" "-melf32ppc -r --relax" "" "-a32" "relax.s big.s"
+-     {{objdump -dr relaxrl.d}}
+-     "rrelax"}
+-    {"build empty shared library" "-shared" "" "" "empty.s" {} "empty.so"}
+-    {"abs32-static" "-melf32ppc -static --defsym a=1 --defsym 'HIDDEN(b=2)' --defsym c=0x12345678" ""
+-	"-a32" {abs32-reloc.s}
+-	{{objdump {-dr} abs32-static.d}
+-	 {readelf {-rW} abs32-static.r}} "abs32-static"}
+-    {"abs32-pie" "-melf32ppc -pie --hash-style=sysv --defsym a=1 --defsym 'HIDDEN(b=2)' --defsym c=0x12345678" ""
+-	"-a32" {abs32-reloc.s}
+-	{{objdump {-dr} abs32-pie.d}
+-	 {readelf {-rW} abs32-pie.r}} "abs32-pie"}
+-    {"abs32-shared" "-melf32ppc -shared --hash-style=sysv --defsym a=1 --defsym 'HIDDEN(b=2)' --defsym c=0x12345678" ""
+-	"-a32" {abs32-reloc.s}
+-	{{objdump {-dr} abs32-shared.d}
+-	 {readelf {-rW} abs32-shared.r}} "abs32-shared"}
+ }
+ 
+ set ppc64elftests {
+@@ -192,200 +133,6 @@ set ppc64elftests {
+      "-a64 --defsym TLSMARK=1"  {tls.s tlslib.s}
+      {{objdump -dr tls.d} {objdump -sj.got tls.g} {objdump -sj.tdata tls.t}}
+      "tlsm"}
+-    {"TLS static exec" "-melf64ppc --no-plt-align" "" "-a64"  {tls.s tlslib.s}
+-     {{objdump -dr tls.d} {objdump -sj.got tls.g} {objdump -sj.tdata tls.t}}
+-     "tls"}
+-    {"TLS static exec (--no-tls-optimize)" "-melf64ppc --no-tls-optimize --no-plt-align" ""
+-     "-a64 --defsym TLSMARK=1"  {tls.s tlslib.s}
+-     {{objdump -dr tlsno.d} {objdump -sj.got tlsno.g} {objdump -sj.tdata tls.t}}
+-     "tlsno"}
+-    {"TLS helper shared library" "-shared -melf64ppc tmpdir/tlslib.o" "" "" {}
+-     {} "libtlslib.so"}
+-    {"TLS helper old shared lib" "-shared -melf64ppc" "" "-a64" {oldtlslib.s}
+-     {} "liboldlib.so"}
+-    {"TLS dynamic exec" "-melf64ppc --no-plt-align --no-ld-generated-unwind-info --hash-style=sysv tmpdir/tls.o tmpdir/libtlslib.so" "" "" {}
+-     {{readelf -WSsrl tlsexe.r} {objdump -dr tlsexe.d}
+-      {objdump -sj.got tlsexe.g} {objdump -sj.tdata tlsexe.t}}
+-     "tlsexe"}
+-    {"TLS dynamic old" "-melf64ppc --no-plt-align --no-ld-generated-unwind-info --hash-style=sysv tmpdir/tls.o tmpdir/liboldlib.so" "" "" {}
+-     {{readelf -WSsrl tlsexe.r} {objdump -dr tlsexe.d}
+-      {objdump -sj.got tlsexe.g} {objdump -sj.tdata tlsexe.t}}
+-     "tlsexeold"}
+-    {"TLS dynamic exec (--no-tls-optimize)" "-melf64ppc --no-tls-optimize --no-plt-align --no-ld-generated-unwind-info --hash-style=sysv tmpdir/tls.o tmpdir/libtlslib.so" "" "" {}
+-     {{readelf -WSsrl tlsexeno.r} {objdump -dr tlsexeno.d}
+-      {objdump -sj.got tlsexeno.g} {objdump -sj.tdata tlsexe.t}}
+-     "tlsexeno"}
+-    {"TLS shared" "-shared -melf64ppc --no-plt-align --no-ld-generated-unwind-info --hash-style=sysv -z notext tmpdir/tls.o" "" "" {}
+-     {{readelf -WSsrl tlsso.r} {objdump -dr tlsso.d}
+-      {objdump -sj.got tlsso.g} {objdump -sj.tdata tlsso.t}}
+-     "tls.so"}
+-    {"TLSTOC static exec" "-melf64ppc tmpdir/tlslib.o" "" "-a64"  {tlstoc.s}
+-     {{objdump -dr tlstoc.d} {objdump -sj.got tlstoc.g}
+-      {objdump -sj.tdata tlstoc.t}}
+-     "tlstoc"}
+-    {"TLSTOC static exec (--no-tls-optimize)" "-melf64ppc --no-tls-optimize tmpdir/tlslib.o tmpdir/tlstoc.o" "" ""  {}
+-     {{objdump -dr tlstocno.d} {objdump -sj.got tlstocno.g}
+-      {objdump -sj.tdata tlstoc.t}}
+-     "tlstocno"}
+-    {"TLSTOC dynamic exec" "-melf64ppc --no-plt-align --no-ld-generated-unwind-info --hash-style=sysv tmpdir/tlstoc.o tmpdir/libtlslib.so" ""
+-     "" {}
+-     {{readelf -WSsrl tlsexetoc.r} {objdump -dr tlsexetoc.d}
+-      {objdump -sj.got tlsexetoc.g} {objdump -sj.tdata tlsexetoc.t}}
+-     "tlsexetoc"}
+-    {"TLSTOC dynamic old" "-melf64ppc --no-plt-align --no-ld-generated-unwind-info --hash-style=sysv tmpdir/tlstoc.o tmpdir/liboldlib.so" ""
+-     "" {}
+-     {{readelf -WSsrl tlsexetoc.r} {objdump -dr tlsexetoc.d}
+-      {objdump -sj.got tlsexetoc.g} {objdump -sj.tdata tlsexetoc.t}}
+-     "tlsexetocold"}
+-    {"TLSTOC dynamic exec (--no-tls-optimize)" "-melf64ppc --no-tls-optimize --no-plt-align --no-ld-generated-unwind-info --hash-style=sysv tmpdir/tlstoc.o tmpdir/libtlslib.so" ""
+-     "" {}
+-     {{readelf -WSsrl tlsexetoc.r} {objdump -dr tlsexetocno.d}
+-      {objdump -sj.got tlsexetocno.g} {objdump -sj.tdata tlsexetoc.t}}
+-     "tlsexetocno"}
+-    {"TLSTOC shared" "-shared -melf64ppc --no-plt-align --no-ld-generated-unwind-info --hash-style=sysv -z notext tmpdir/tlstoc.o" "" "" {}
+-     {{readelf -WSsrl tlstocso.r} {objdump -dr tlstocso.d}
+-      {objdump -sj.got tlstocso.g} {objdump -sj.tdata tlstocso.t}}
+-     "tlstoc.so"}
+-    {"TLS dynamic exec (--tls-get-addr-regsave)" "-melf64ppc --no-plt-align --no-ld-generated-unwind-info --hash-style=sysv --tls-get-addr-regsave tmpdir/tls.o tmpdir/libtlslib.so" "" "" {}
+-     {{readelf -WSsrl tlsexers.r} {objdump -dr tlsexers.d}
+-      {objdump -sj.got tlsexe.g} {objdump -sj.tdata tlsexe.t}}
+-     "tlsexers"}
+-    {"TLS dynamic exec (--no-tls-optimize --tls-get-addr-regsave)" "-melf64ppc --no-tls-optimize --tls-get-addr-regsave --no-plt-align --no-ld-generated-unwind-info --hash-style=sysv tmpdir/tls.o tmpdir/libtlslib.so" "" "" {}
+-     {{readelf -WSsrl tlsexenors.r} {objdump -dr tlsexenors.d}
+-      {objdump -sj.got tlsexeno.g} {objdump -sj.tdata tlsexe.t}}
+-     "tlsexenors"}
+-    {"TLSTOC dynamic exec (--tls-get-addr-regsave)" "-melf64ppc --tls-get-addr-regsave --no-plt-align --no-ld-generated-unwind-info --hash-style=sysv tmpdir/tlstoc.o tmpdir/libtlslib.so" ""
+-     "" {}
+-     {{readelf -WSsrl tlsexetocrs.r} {objdump -dr tlsexetocrs.d}
+-      {objdump -sj.got tlsexetoc.g} {objdump -sj.tdata tlsexetoc.t}}
+-     "tlsexetocrs"}
+-    {"TLSTOC dynamic exec (--no-tls-optimize --tls-get-addr-regsave)" "-melf64ppc --no-tls-optimize --tls-get-addr-regsave --no-plt-align --no-ld-generated-unwind-info --hash-style=sysv tmpdir/tlstoc.o tmpdir/libtlslib.so" ""
+-     "" {}
+-     {{readelf -WSsrl tlsexetocrs.r} {objdump -dr tlsexetocnors.d}
+-      {objdump -sj.got tlsexetocno.g} {objdump -sj.tdata tlsexetoc.t}}
+-     "tlsexetocnors"}
+-    {"TLS markers" "-melf64ppc" "" "-a64"  {tlsmark.s tlslib.s}
+-     {{objdump -dr tlsmark.d}}
+-     "tlsmark"}
+-    {"TLS opt 1" "-melf64ppc" "" "-a64"  {tlsopt1.s tlslib.s}
+-     {{objdump -dr tlsopt1.d}}
+-     "tlsopt1"}
+-    {"TLS opt 2" "-melf64ppc" "" "-a64"  {tlsopt2.s tlslib.s}
+-     {{objdump -dr tlsopt2.d}}
+-     "tlsopt2"}
+-    {"TLS opt 3" "-melf64ppc" "" "-a64"  {tlsopt3.s tlslib.s}
+-     {{objdump -dr tlsopt3.d}}
+-     "tlsopt3"}
+-    {"TLS opt 4" "-melf64ppc" "" "-a64"  {tlsopt4.s tlslib.s}
+-     {{objdump -dr tlsopt4.d}}
+-     "tlsopt4"}
+-    {"TLS DLL" "-shared -melf64ppc --version-script tlsdll.ver" "" "-a64" {tlsdll.s}
+-     {} "tlsdll.so"}
+-    {"TLS opt 5" "-melf64ppc -shared --hash-style=both --gc-sections --no-plt-localentry tmpdir/tlsdll.so" "" "-a64"  {tlsopt5.s}
+-     {{objdump -dr tlsopt5.d} {readelf -wf tlsopt5.wf}}
+-     "tlsopt5"}
+-    {"TLS opt 6" "-melf64ppc -shared --hash-style=both --gc-sections --no-plt-localentry --tls-get-addr-regsave tmpdir/tlsdll.so" "" "-a64"  {tlsopt5.s}
+-     {{objdump -dr tlsopt6.d} {readelf -wf tlsopt6.wf}}
+-     "tlsopt6"}
+-    {"TLSdesc" "-melf64ppc -shared --hash-style=both --no-plt-localentry tmpdir/libtlslib.so" "" "-a64"  {tlsdesc.s}
+-     {{objdump -dr tlsdesc.d} {readelf -wf tlsdesc.wf}}
+-     "tlsdesc"}
+-    {"TLSdesc2" "-melf64ppc -shared --hash-style=both --no-plt-localentry tmpdir/tlsdll.so" "" "-a64"  {tlsdesc.s}
+-     {{objdump -dr tlsdesc2.d} {readelf -wf tlsdesc2.wf}}
+-     "tlsdesc2"}
+-    {"TLSdesc3" "-melf64ppc --no-tls-optimize tmpdir/tlsdll.o" "" "-a64"  {tlsdesc.s}
+-     {{objdump -dr tlsdesc3.d} {readelf -wf tlsdesc3.wf}}
+-     "tlsdesc3"}
+-    {"TLSdesc4" "-melf64ppc --no-tls-optimize tmpdir/tlsdll.o" "" "-a64"  {tlsdesc4.s}
+-     {{objdump -dr tlsdesc4.d} {readelf -wf tlsdesc4.wf}}
+-     "tlsdesc4"}
+-    {"tlsget" "-shared --hash-style=both -melf64ppc --plt-align=0" "tmpdir/tlsdll.so" "-a64 -mpower10"  {tlsget.s}
+-     {{objdump -dr tlsget.d} {readelf -wf tlsget.wf}}
+-     "tlsget.so"}
+-    {"tlsget2" "-shared --hash-style=both -melf64ppc --plt-align=0 --power10-stubs=yes" "tmpdir/tlsdll.so" "-a64 -mpower10"  {tlsget.s}
+-     {{objdump -dr tlsget2.d} {readelf -wf tlsget2.wf}}
+-     "tlsget2.so"}
+-    {"sym@tocbase" "-shared -melf64ppc" "" "-a64" {symtocbase-1.s symtocbase-2.s}
+-	{{objdump -dj.data symtocbase.d}} "symtocbase.so"}
+-    {"TOC opt" "-melf64ppc" "" "-a64"  {tocopt.s}
+-	{{ld tocopt.out} {objdump -s tocopt.d}} "tocopt"}
+-    {"TOC opt2" "-melf64ppc --defsym x=2" "" "-a64"  {tocopt2.s}
+-	{{ld tocopt2.out} {objdump -s tocopt2.d}} "tocopt2"}
+-    {"TOC opt3" "-melf64ppc -no-keep-memory --defsym x=2" "" "-a64"  {tocopt3.s}
+-	{{objdump -s tocopt3.d}} "tocopt3"}
+-    {"TOC opt4" "-melf64ppc -no-keep-memory --defsym x=2" "" "-a64"
+-        {tocopt4a.s tocopt4b.s} {{objdump -s tocopt4.d}} "tocopt4"}
+-    {"TOC opt5" "-melf64ppc" "" "-a64"  {tocopt5.s}
+-	{{objdump -s tocopt5.d}} "tocopt5"}
+-    {"TOC opt6" "-melf64ppc" "" "-a64"  {tocopt6a.s tocopt6b.s tocopt6c.s}
+-	{{objdump -d tocopt6.d}} "tocopt6"}
+-    {"TOC opt7" "-melf64ppc" "" "-a64 -mpower9"  {tocopt7.s}
+-	{{ld tocopt7.out} {objdump -s tocopt7.d}} "tocopt7"}
+-    {"TOC opt8" "-melf64ppc" "" "-a64 -mpower9"  {tocopt8.s}
+-	{{objdump -s tocopt8.d}} "tocopt8"}
+-    {"tocsave lib" "-shared -melf64ppc" "" "-a64" {tocsavelib.s}
+-	{} "tocsavelib.so"}
+-    {"tocsave1 shared" "-melf64ppc" "tmpdir/tocsavelib.so" "-a64" {tocsave1.s}
+-	{{objdump -dr tocsave1s.d}} "tocsave1s"}
+-    {"tocsave1 static" "-melf64ppc" "tmpdir/tocsavelib.o" "-a64" {tocsave1.s}
+-	{{objdump -dr tocsave1a.d}} "tocsave1a"}
+-    {"tocsave2 shared" "-melf64ppc" "tmpdir/tocsavelib.so" "-a64" {tocsave2.s}
+-	{{objdump -dr tocsave2s.d}} "tocsave2s"}
+-    {"tocsave2 static" "-melf64ppc" "tmpdir/tocsavelib.o" "-a64" {tocsave2.s}
+-	{{objdump -dr tocsave2a.d}} "tocsave2a"}
+-    {"ambig shared v1" "-shared -melf64ppc" "" "-a64" {funv1.s} {} "funv1.so"}
+-    {"ambig shared v2" "-shared -melf64ppc" "" "-a64" {funv2.s} {} "funv2.so"}
+-    {"notoc ext" "" "" "-a64" {ext.s} {} ""}
+-    {"notoc" "-melf64ppc --no-plt-localentry --no-power10-stubs -T ext.lnk"
+-	"" "-a64" {notoc.s}
+-	{{objdump -d notoc.d} {readelf {-wf -W} notoc.wf}} "notoc"}
+-    {"notoc2" "-melf64ppc -shared" "" "-a64 -mpower10" {notoc2.s}
+-	{{objdump {-d -Mpower10} notoc2.d}} "notoc2"}
+-    {"notoc3" "-melf64ppc --no-plt-localentry -T ext.lnk" ""
+-	"-a64 -mpower10" {notoc3.s}
+-	{{objdump -d notoc3.d} {readelf {-wf -W} notoc3.wf}} "notoc3"}
+-    {"pcrelopt" "-melf64ppc --hash-style=gnu" "tmpdir/symtocbase.so"
+-	"-a64 -mpower10" {pcrelopt.s}
+-	{{objdump {-d -Mpower10} pcrelopt.d}
+-	 {readelf {-S --wide} pcrelopt.sec}} "pcrelopt" }
+-    {"group1" "-melf64ppc -e foo" "" "-a64" {group1.s group2.s group3.s}
+-	{{objdump {-d} group1.d}
+-	 {readelf {-s} group1.sym}} "group1"}
+-    {"group2" "-melf64ppc -e foo" "" "-a64" {group2.s group1.s group3.s}
+-	{{objdump {-d} group2.d}
+-	 {readelf {-s} group2.sym}} "group2"}
+-    {"group3" "-melf64ppc -e foo" "" "-a64" {group3.s group2.s group1.s}
+-	{{objdump {-d} group2.d}
+-	 {readelf {-s} group3.sym}} "group3"}
+-    {"weak1" "-melf64ppc --hash-style=both" ""
+-	"-a64 -mpower10" {weak1.s}
+-	{{objdump -d weak1.d} {readelf {-srW} weak1.r}} "weak1"}
+-    {"weak1.so" "-shared -melf64ppc --hash-style=both" ""
+-	"-a64 -mpower10" {weak1.s}
+-	{{objdump -d weak1so.d} {readelf {-srW} weak1so.r}} "weak1.so"}
+-    {"startstop" "-shared -melf64ppc --hash-style=sysv --gc-sections -z start-stop-gc" ""
+-	"-a64 -mpower10" {startstop.s}
+-	{{objdump -d startstop.d} {readelf {-rW} startstop.r}} "startstop.so"}
+-    {"abs-static" "-melf64ppc -static --defsym a=1 --defsym 'HIDDEN(b=2)' --defsym c=0x123456789abcdef0" ""
+-	"-a64" {abs-reloc.s}
+-	{{objdump {-sdr} abs-static.d}
+-	 {readelf {-rW} abs-static.r}} "abs-static"}
+-    {"abs-pie" "-melf64ppc -pie --hash-style=sysv --defsym a=1 --defsym 'HIDDEN(b=2)' --defsym c=0x123456789abcdef0" ""
+-	"-a64" {abs-reloc.s}
+-	{{objdump {-sdr} abs-pie.d}
+-	 {readelf {-rW} abs-pie.r}} "abs-pie"}
+-    {"abs-shared" "-melf64ppc -shared --hash-style=sysv --defsym a=1 --defsym 'HIDDEN(b=2)' --defsym c=0x123456789abcdef0" ""
+-	"-a64" {abs-reloc.s}
+-	{{objdump {-sdr} abs-shared.d}
+-	 {readelf {-rW} abs-shared.r}} "abs-shared"}
+-    {"abs-pie-relr" "-melf64ppc -pie --hash-style=sysv -z pack-relative-relocs --defsym a=1 --defsym 'HIDDEN(b=2)' --defsym c=0x123456789abcdef0" ""
+-	"-a64" {abs-reloc.s}
+-	{{objdump {-sdr} abs-pie-relr.d}
+-	 {readelf {-rW} abs-pie-relr.r}} "abs-pie-relr"}
+-    {"abs-shared-relr" "-melf64ppc -shared --hash-style=sysv -z pack-relative-relocs --defsym a=1 --defsym 'HIDDEN(b=2)' --defsym c=0x123456789abcdef0" ""
+-	"-a64" {abs-reloc.s}
+-	{{objdump {-sdr} abs-shared-relr.d}
+-	 {readelf {-rW} abs-shared-relr.r}} "abs-shared-relr"}
+ }
+ 
+ set ppceabitests {
+@@ -404,15 +151,6 @@ set ppceabitests {
+     {"VLE multiple segments 5" "-melf32ppc -T vle-multiseg-5.ld" ""
+      "-a32 -mbig -mregnames -mvle" {vle-multiseg.s}
+     {{readelf "-l" vle-multiseg-5.d}} "vle-multiseg-5"}
+-    {"VLE relocations 1" "-melf32ppc -T vle.ld" ""
+-     "-a32 -mbig -mvle" {vle-reloc-1.s vle-reloc-def-1.s}
+-    {{objdump "-Mvle -d" vle-reloc-1.d}} "vle-reloc-1"}
+-    {"VLE relocations 2" "-melf32ppc -T vle.ld" ""
+-     "-a32 -mbig -mvle" {vle-reloc-2.s vle-reloc-def-2.s}
+-    {{objdump "-Mvle -d" vle-reloc-2.d}} "vle-reloc-2"}
+-    {"VLE relocations 3" "-melf32ppc -T vle.ld" ""
+-     "-a32 -mbig -mvle" {vle-reloc-3.s vle-reloc-def-3.s}
+-    {{objdump "-Mvle -d" vle-reloc-3.d}} "vle-reloc-3"}
+ }
+ 
+ if [istarget "powerpc*le*-*-*"] then {
+diff -rup binutils.orig/ld/testsuite/ld-powerpc/tls32.d binutils-2.41/ld/testsuite/ld-powerpc/tls32.d
+--- binutils.orig/ld/testsuite/ld-powerpc/tls32.d	2023-08-15 14:30:13.278890868 +0100
+++ binutils-2.41/ld/testsuite/ld-powerpc/tls32.d	2023-08-15 14:35:25.141593764 +0100
+@@ -9,11 +9,11 @@
+ 
+ Disassembly of section \.text:
+ 
+-0+18000a0 <_start>:
+0+18[0-9a-f]+ <_start>:
+ .*:	(42 9f 00 05|05 00 9f 42) 	bcl     20,4\*cr7\+so,.* <_start\+0x4>
+ .*:	(7f c8 02 a6|a6 02 c8 7f) 	mflr    r30
+ .*:	(3f de 00 02|02 00 de 3f) 	addis   r30,r30,2
+-.*:	(3b de 80 a0|a0 80 de 3b) 	addi    r30,r30,-32608
+.*:	(3b de 80 a0|.. 80 de 3b) 	addi    r30,r30,.*
+ .*:	(60 00 00 00|00 00 00 60) 	nop
+ .*:	(38 62 90 3c|3c 90 62 38) 	addi    r3,r2,-28612
+ .*:	(60 00 00 00|00 00 00 60) 	nop
+@@ -43,5 +43,5 @@ Disassembly of section \.text:
+ .*:	(60 00 00 00|00 00 00 60) 	nop
+ .*:	(a9 42 90 18|18 90 42 a9) 	lha     r10,-28648\(r2\)
+ 
+-0+1800120 <__tls_get_addr>:
+0+18[0-9a-f]+ <__tls_get_addr>:
+ .*:	(4e 80 00 20|20 00 80 4e) 	blr
+--- binutils.orig/ld/testsuite/ld-elf/shared.exp	2023-08-15 14:30:13.165890702 +0100
+++ binutils-2.41/ld/testsuite/ld-elf/shared.exp	2023-08-15 14:45:41.943992390 +0100
+@@ -1152,10 +1152,6 @@ set run_tests [list \
+     [list "Run pr21964-3" \
+      "-Wl,--no-as-needed,-rpath,tmpdir tmpdir/pr21964-1a.so tmpdir/pr21964-1b.so tmpdir/pr21964-3a.so" "" \
+      {pr21964-3c.c} "pr21964-3" "pass.out" ] \
+-    [list "pr26580-3" \
+-     "" "" \
+-     {pr26580-a.c} "pr26580-3" "pr26580-3.out" "-fcommon" "c" "" \
+-     "-Wl,--as-needed tmpdir/libpr26580-2.so" ] \
+     [list "pr26580-4" \
+      "" "" \
+      {pr26580-a.c} "pr26580-4" "pr26580-4.out" "-fcommon" "c" "" \
+@@ -1579,18 +1575,6 @@ if { [istarget *-*-linux*]
+ 	    "pr22393-2-static" \
+ 	    "pass.out" \
+ 	] \
+-	[list \
+-	    "Run pr21964-4" \
+-	    "" \
+-	    "" \
+-	    {pr21964-4.c} \
+-	    "pr21964-4" \
+-	    "pass.out" \
+-	    "" \
+-	    "" \
+-	    "" \
+-	    "-ldl" \
+-	] \
+     ]
+ }
+ 
+--- binutils.orig/ld/testsuite/ld-s390/s390.exp	2023-08-15 14:30:13.292890888 +0100
+++ binutils-2.41/ld/testsuite/ld-s390/s390.exp	2023-08-15 14:48:38.327360916 +0100
+@@ -35,6 +35,8 @@ if { !([istarget "s390-*-*"] || [istarge
+ # nm: Apply nm options on result.  Compare with regex (last arg).
+ # readelf: Apply readelf options on result.  Compare with regex (last arg).
+ 
+return
+
+ set s390tests {
+     {"TLS -fpic -shared transitions" "-shared -melf_s390 --hash-style=sysv" ""
+      "-m31" {tlspic1.s tlspic2.s}
+--- binutils.orig/ld/testsuite/ld-elf/linux-x86.exp	2023-08-15 14:30:13.146890674 +0100
+++ binutils-2.41/ld/testsuite/ld-elf/linux-x86.exp	2023-08-15 14:54:31.527999066 +0100
+@@ -152,6 +152,10 @@ run_cc_link_tests [list \
+     ] \
+ ]
+ 
+if { [istarget "i686-*-*"] } {
+    return
+}
+
+ run_ld_link_exec_tests [list \
+     [list \
+ 	"Run indirect-extern-access-1a without PIE" \
+--- binutils.orig/ld/testsuite/ld-i386/i386.exp	2023-08-15 14:30:13.183890728 +0100
+++ binutils-2.41/ld/testsuite/ld-i386/i386.exp	2023-08-15 14:55:59.001157084 +0100
+@@ -597,6 +597,10 @@ proc undefined_weak {cflags ldflags} {
+     }
+ }
+ 
+if { [istarget "i686-*-*"] } {
+    return
+}
+
+ # Must be Linux native with the C compiler
+ if { [isnative]
+      && [istarget "i?86-*-linux*"]
+--- binutils.orig/ld/testsuite/ld-scripts/crossref.exp	2023-08-15 14:30:13.294890891 +0100
+++ binutils-2.41/ld/testsuite/ld-scripts/crossref.exp	2023-08-15 14:59:36.680591177 +0100
+@@ -121,6 +121,10 @@ if [string match "" $exec_output] then {
+     }
+ }
+ 
+if { [istarget "i686-*-*"] } {
+    return
+}
+
+ # Check cross references for ld -r
+ 
+ if { ![ld_compile "$CC_FOR_TARGET $NOSANITIZE_CFLAGS $NOLTO_CFLAGS" "$srcdir/$subdir/cross4.c" tmpdir/cross4.o] } {
+--- binutils.orig/ld/testsuite/ld-shared/shared.exp	2023-08-15 14:30:13.309890913 +0100
+++ binutils-2.41/ld/testsuite/ld-shared/shared.exp	2023-08-15 15:00:31.929701875 +0100
+@@ -204,6 +204,10 @@ if { [istarget mips*-*-*] && ! [at_least
+ }
+ verbose "Using $picflag to compile PIC code"
+ 
+if { [istarget "i686-*-*"] } {
+    return
+}
+
+ # Compile the main program.
+ if ![ld_compile "$CC_FOR_TARGET $SHCFLAG" $srcdir/$subdir/main.c $tmpdir/mainnp.o] {
+     unsupported "shared (non PIC)"
+--- binutils.orig/ld/testsuite/ld-srec/srec.exp	2023-08-15 14:30:13.315890922 +0100
+++ binutils-2.41/ld/testsuite/ld-srec/srec.exp	2023-08-15 15:01:24.104806404 +0100
+@@ -442,6 +442,9 @@ setup_xfail "csky*-*-*"
+ # The S-record linker is not supported for eBPF.
+ setup_xfail "bpf-*-*"
+ 
+setup_xfail "s390*-*-*"
+setup_xfail "i686-*-*"
+
+ run_srec_test $test1 "tmpdir/sr1.o tmpdir/sr2.o"
+ 
+ # Now try linking a C++ program with global constructors and
+--- binutils.orig/ld/testsuite/ld-vsb/vsb.exp	2023-08-15 14:30:13.329890943 +0100
+++ binutils-2.41/ld/testsuite/ld-vsb/vsb.exp	2023-08-15 15:03:41.018080699 +0100
+@@ -29,6 +29,10 @@ if { ![check_compiler_available] } {
+     return
+ }
+ 
+if { [istarget "i686-*-*"] } {
+    return
+}
+
+ # This test can only be run on a couple of ELF platforms or with
+ # XCOFF formats.
+ # Square bracket expressions seem to confuse istarget.
+diff -rup binutils.orig/ld/testsuite/ld-powerpc/powerpc.exp binutils-2.41/ld/testsuite/ld-powerpc/powerpc.exp
+--- binutils.orig/ld/testsuite/ld-powerpc/powerpc.exp	2023-08-15 15:04:24.106167010 +0100
+++ binutils-2.41/ld/testsuite/ld-powerpc/powerpc.exp	2023-08-15 15:59:51.422385730 +0100
+@@ -177,6 +177,8 @@ if [istarget "powerpc*le*-*-*"] then {
+ 
+ run_ld_link_tests $ppcelftests
+ 
+return
+
+ if [ supports_ppc64 ] then {
+     run_ld_link_tests $ppc64elftests
+     run_dump_test "relbrlt"
+diff -rup binutils.orig/ld/testsuite/ld-powerpc/tls.d binutils-2.41/ld/testsuite/ld-powerpc/tls.d
+--- binutils.orig/ld/testsuite/ld-powerpc/tls.d	2023-08-15 15:04:24.100166998 +0100
+++ binutils-2.41/ld/testsuite/ld-powerpc/tls.d	2023-08-15 15:59:07.422314417 +0100
+@@ -9,7 +9,7 @@
+ 
+ Disassembly of section \.text:
+ 
+-0+100000e8 <\._start>:
+0+100..... <\._start>:
+ .*:	(60 00 00 00|00 00 00 60) 	nop
+ .*:	(38 6d 90 78|78 90 6d 38) 	addi    r3,r13,-28552
+ .*:	(60 00 00 00|00 00 00 60) 	nop
+@@ -49,5 +49,5 @@ Disassembly of section \.text:
+ .*:	(60 00 00 00|00 00 00 60) 	nop
+ .*:	(a9 4d 90 30|30 90 4d a9) 	lha     r10,-28624\(r13\)
+ 
+-0+10000180 <\.__tls_get_addr>:
+0+100..... <\.__tls_get_addr>:
+ .*:	(4e 80 00 20|20 00 80 4e) 	blr
+diff -rup binutils.orig/ld/testsuite/ld-powerpc/tls32.g binutils-2.41/ld/testsuite/ld-powerpc/tls32.g
+--- binutils.orig/ld/testsuite/ld-powerpc/tls32.g	2023-08-15 15:04:24.100166998 +0100
+++ binutils-2.41/ld/testsuite/ld-powerpc/tls32.g	2023-08-15 15:56:33.167064455 +0100
+@@ -8,4 +8,4 @@
+ .*
+ 
+ Contents of section \.got:
+- 1810144 00000000 00000000 00000000  .*
+ 18..... 00000000 00000000 00000000  .*
+diff -rup binutils.orig/ld/testsuite/ld-powerpc/tls32no.d binutils-2.41/ld/testsuite/ld-powerpc/tls32no.d
+--- binutils.orig/ld/testsuite/ld-powerpc/tls32no.d	2023-08-15 15:04:24.100166998 +0100
+++ binutils-2.41/ld/testsuite/ld-powerpc/tls32no.d	2023-08-15 15:58:02.959209959 +0100
+@@ -9,11 +9,11 @@
+ 
+ Disassembly of section \.text:
+ 
+-0+18000a0 <_start>:
+0+18..... <_start>:
+ .*:	(42 9f 00 05|05 00 9f 42) 	bcl     .*
+ .*:	(7f c8 02 a6|a6 02 c8 7f) 	mflr    r30
+ .*:	(3f de 00 02|02 00 de 3f) 	addis   r30,r30,2
+-.*:	(3b de 80 a0|a0 80 de 3b) 	addi    r30,r30,-32608
+.*:	(3b de 80 a0|.. 80 de 3b) 	addi    r30,r30,-[0-9]+
+ .*:	(38 7f ff e4|e4 ff 7f 38) 	addi    r3,r31,-28
+ .*:	(48 00 00 6d|6d 00 00 48) 	bl      .*
+ .*:	(38 7f ff f8|f8 ff 7f 38) 	addi    r3,r31,-8
+@@ -43,5 +43,5 @@ Disassembly of section \.text:
+ .*:	(3d 22 00 00|00 00 22 3d) 	addis   r9,r2,0
+ .*:	(a9 49 90 18|18 90 49 a9) 	lha     r10,-28648\(r9\)
+ 
+-0+1800120 <__tls_get_addr>:
+0+18..... <__tls_get_addr>:
+ .*:	(4e 80 00 20|20 00 80 4e) 	blr
+--- binutils.orig/ld/testsuite/ld-elf/linux-x86.exp	2023-08-15 15:04:23.995166788 +0100
+++ binutils-2.41/ld/testsuite/ld-elf/linux-x86.exp	2023-08-15 16:03:11.615710200 +0100
+@@ -73,6 +73,10 @@ run_ld_link_tests [list \
+     ] \
+ ]
+ 
+if { [istarget "i686-*-*"] } {
+    return
+}
+
+ run_cc_link_tests [list \
+     [list \
+ 	"Build indirect-extern-access-1.so" \
+@@ -152,10 +156,6 @@ run_cc_link_tests [list \
+     ] \
+ ]
+ 
+-if { [istarget "i686-*-*"] } {
+-    return
+-}
+-
+ run_ld_link_exec_tests [list \
+     [list \
+ 	"Run indirect-extern-access-1a without PIE" \
+diff -rup binutils.orig/ld/testsuite/ld-powerpc/tls32.t binutils-2.41/ld/testsuite/ld-powerpc/tls32.t
+--- binutils.orig/ld/testsuite/ld-powerpc/tls32.t	2023-08-15 16:48:58.540653339 +0100
+++ binutils-2.41/ld/testsuite/ld-powerpc/tls32.t	2023-08-15 16:49:34.611717013 +0100
+@@ -8,5 +8,5 @@
+ .*
+ 
+ Contents of section \.tdata:
+- 1810124 (12345678|78563412) (23456789|89674523) (3456789a|9a785634) (456789ab|ab896745)  .*
+- 1810134 (56789abc|bc9a7856) (6789abcd|cdab8967) (789abcde|debc9a78) (00c0ffee|eeffc000)  .*
+#pass
+
+diff -rup binutils.orig/ld/testsuite/ld-powerpc/tls32no.g binutils-2.41/ld/testsuite/ld-powerpc/tls32no.g
+--- binutils.orig/ld/testsuite/ld-powerpc/tls32no.g	2023-08-15 17:41:46.719412912 +0100
+++ binutils-2.41/ld/testsuite/ld-powerpc/tls32no.g	2023-08-15 17:42:37.097511729 +0100
+@@ -8,6 +8,4 @@
+ .*
+ 
+ Contents of section \.got:
+- 1810144 (0+01 f+8000 0+01 f+803c|010+ 0080f+ 010+ 3c80f+)  .*
+- 1810154 (0+01 f+8020 f+9030 0+01|010+ 2080f+ 3090f+ 010+)  .*
+- 1810164 0+ 0+ 0+ 0+0  .*
+#pass
--- a/binutils-update-linker-manual.patch
+++ b/binutils-update-linker-manual.patch
@ -0,0 +1,36 @@
+diff -rup binutils.orig/ld/ld.1 binutils-2.41/ld/ld.1
+--- binutils.orig/ld/ld.1	2023-08-03 12:47:14.427004953 +0100
+++ binutils-2.41/ld/ld.1	2023-08-03 12:49:10.672145873 +0100
+@@ -2669,7 +2669,7 @@ systems may not understand them. If you
+ \&\fB\-\-enable\-new\-dtags\fR, the new dynamic tags will be created as needed
+ and older dynamic tags will be omitted.
+ If you specify \fB\-\-disable\-new\-dtags\fR, no new dynamic tags will be
+-created. By default, the new dynamic tags are not created. Note that
+created. By default, the new dynamic tags are created. Note that
+ those options are only available for ELF systems.
+ .IP \fB\-\-hash\-size=\fR\fInumber\fR 4
+ .IX Item "--hash-size=number"
+diff -rup binutils.orig/ld/ld.info binutils-2.41/ld/ld.info
+--- binutils.orig/ld/ld.info	2023-08-03 12:47:14.427004953 +0100
+++ binutils-2.41/ld/ld.info	2023-08-03 12:49:58.829204257 +0100
+@@ -2366,7 +2366,7 @@ GNU linker:
+      ‘--enable-new-dtags’, the new dynamic tags will be created as
+      needed and older dynamic tags will be omitted.  If you specify
+      ‘--disable-new-dtags’, no new dynamic tags will be created.  By
+-     default, the new dynamic tags are not created.  Note that those
+     default, the new dynamic tags are created.  Note that those
+      options are only available for ELF systems.
+ 
+ ‘--hash-size=NUMBER’
+diff -rup binutils.orig/ld/ld.texi binutils-2.41/ld/ld.texi
+--- binutils.orig/ld/ld.texi	2023-08-03 12:50:58.176276215 +0100
+++ binutils-2.41/ld/ld.texi	2023-08-03 12:41:11.902610960 +0100
+@@ -2946,7 +2946,7 @@ systems may not understand them. If you
+ @option{--enable-new-dtags}, the new dynamic tags will be created as needed
+ and older dynamic tags will be omitted.
+ If you specify @option{--disable-new-dtags}, no new dynamic tags will be
+-created. By default, the new dynamic tags are not created. Note that
+created. By default, the new dynamic tags are created. Note that
+ those options are only available for ELF systems.
+ 
+ @kindex --hash-size=@var{number}
--- 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.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://src.fedoraproject.org/tests/binutils.git
+      ref: main
+      name: /plans/build-gating/common
+
+/kernel-rebuild:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/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://src.fedoraproject.org/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.33.1.tar.xz) = b7a6767c6c7ca6b5cafa7080e6820b7bb3a53b7148348c438d99905defbdf0d30c9744a484ee01c9441a8153901808513366b15ba9533e20c9673c262ade36ac
+SHA512 (binutils-2.42.tar.xz) = 155f3ba14cd220102f4f29a4f1e5cfee3c48aa03b74603460d05afb73c70d6657a9d87eee6eb88bf13203fe6f31177a5c9addc04384e956e7da8069c8ecd20a6
 SHA512 (binutils-2.19.50.0.1-output-format.sed) = 2f8686b0c8af13c98cda056824c2820416f6e2d003f70b78ccf5314525b9ee3684d421dfa83e638a2d42d06ea4d4bdaf5226b64d6ec26f7ff59c44ffb2a23dd2
--- a/spec.binutils.cross
+++ b/spec.binutils.cross
@ -0,0 +1,67 @@
+
+# Note - this is an rpm spec file, but it has been renamed in order to avoid
+# conflict with the real binutils.spec file.
+#
+# Its only use is to build a set of cross-binutils rpms by putting it into
+# the SPECS directory of an rpmbuild tree, installing the binutils source
+# rpm into the SOURCES directory and then running:
+#
+#    rpmbuild -bb spec.binutils.cross
+
+Summary: A meta collection of GNU binutils executables for cross builds
+Name: cross-binutils
+License: GPLv3+
+URL: https://sourceware.org/binutils
+
+#----------------------------------------------------------------------------
+#
+# Configurable settings - adjust to match your needs:
+#
+
+Version: 2.30
+Release: 89.el8
+
+# The list of cross architectures to build.
+# Note: this list assumes that we are building on an x86_64-linux-gnu host.
+
+%define arch_list  aarch64-linux-gnu  ppc64le-linux-gnu  s390x-linux-gnu
+
+#----------------------------------------------------------------------------
+
+%define binutils_source_rpm   binutils-%{version}-%{release}.src.rpm
+
+Source: %{binutils_source_rpm}
+
+# Provides: bundled(libiberty)
+
+BuildRequires: autoconf automake
+BuildRequires: perl, sed, coreutils
+BuildRequires: gcc, bison
+BuildRequires: gettext, flex, zlib-devel
+BuildRequires: findutils, texinfo
+BuildRequires: dejagnu, zlib-static, glibc-static, sharutils, bc
+# BuildRequires: elfutils-debuginfod-client-devel
+BuildRequires: rpm-build
+
+#----------------------------------------------------------------------------
+
+%description
+Provides a collection of cross built binutils for the targets
+supported by RHEL (aarch64, ppc64le, s390x).
+
+#----------------------------------------------------------------------------
+
+%build
+
+# Install the binutils sources.
+rpm -ivh %{_sourcedir}/%{binutils_source_rpm}
+
+# Build each set of cross binutils individually.
+for f in %{arch_list}; do
+  rpmbuild -bb --define "binutils_target $f" %{_specdir}/binutils.spec --without testsuite --without gold
+done
+
+#----------------------------------------------------------------------------
+%changelog
+* Wed Nov 11 2020 Nick Clifton  <nickc@redhat.com> - 2.35.1-14
+- First release of cross binutils rpm.