Fix problems running the linkers LTO testsuite.

Resolves: #2117284
- Fixes warning when running strip on an object file (#2114597 )
2022-08-11 10:27:42 +01:00 · 2022-08-10 20:20:47 +02:00 · 2022-08-08 17:19:12 +02:00 · 2022-08-04 10:28:41 +02:00 · 2022-06-30 16:58:28 +01:00 · 2022-06-09 12:39:39 +02:00
18 changed files with 37576 additions and 24 deletions
--- a/binutils-AArch64-EFI.patch
+++ b/binutils-AArch64-EFI.patch
@ -0,0 +1,944 @@
+diff -rup binutils.orig/bfd/.gitignore binutils-2.37/bfd/.gitignore
+--- binutils.orig/bfd/.gitignore	2021-12-01 13:35:33.826078119 +0000
+++ binutils-2.37/bfd/.gitignore	2021-12-01 13:35:43.138988270 +0000
+@@ -10,6 +10,7 @@
+ /peigen.c
+ /pepigen.c
+ /pex64igen.c
+/pe-aarch64igen.c
+ /stmp-bfd-h
+ /targmatch.h
+ 
+diff -rup binutils.orig/bfd/Makefile.am binutils-2.37/bfd/Makefile.am
+--- binutils.orig/bfd/Makefile.am	2021-12-01 13:35:33.817078206 +0000
+++ binutils-2.37/bfd/Makefile.am	2021-12-01 13:35:43.139988261 +0000
+@@ -567,7 +567,9 @@ BFD64_BACKENDS = \
+ 	mach-o-aarch64.lo \
+ 	mach-o-x86-64.lo \
+ 	mmo.lo \
+	pe-aarch64igen.lo \
+ 	pe-x86_64.lo \
+	pei-aarch64lo \
+ 	pei-ia64.lo \
+ 	pei-x86_64.lo \
+ 	pepigen.lo \
+@@ -607,6 +609,7 @@ BFD64_BACKENDS_CFILES = \
+ 	mach-o-x86-64.c \
+ 	mmo.c \
+ 	pe-x86_64.c \
+	pei-aarch64.c \
+ 	pei-ia64.c \
+ 	pei-x86_64.c \
+ 	vms-alpha.c
+@@ -666,7 +669,7 @@ BUILD_CFILES = \
+ 	elf32-aarch64.c elf64-aarch64.c \
+ 	elf32-ia64.c elf64-ia64.c \
+ 	elf32-riscv.c elf64-riscv.c \
+-	peigen.c pepigen.c pex64igen.c
+	peigen.c pepigen.c pex64igen.c pe-aarch64igen.c
+ 
+ CFILES = $(SOURCE_CFILES) $(BUILD_CFILES)
+ 
+@@ -862,6 +865,10 @@ pex64igen.c: peXXigen.c
+ 	echo "#line 1 \"peXXigen.c\"" > $@
+ 	$(SED) -e s/XX/pex64/g < $< >> $@
+ 
+pe-aarch64igen.c: peXXigen.c
+	echo "#line 1 \"peXXigen.c\"" > $@
+	$(SED) -e s/XX/peAArch64/g < $< >> $@
+
+ BFD_H_DEPS= $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/diagnostics.h
+ LOCAL_H_DEPS= libbfd.h sysdep.h config.h
+ $(BFD32_LIBS) \
+diff -rup binutils.orig/bfd/Makefile.in binutils-2.37/bfd/Makefile.in
+--- binutils.orig/bfd/Makefile.in	2021-12-01 13:35:33.823078148 +0000
+++ binutils-2.37/bfd/Makefile.in	2021-12-01 13:35:43.139988261 +0000
+@@ -994,7 +994,9 @@ BFD64_BACKENDS = \
+ 	mach-o-aarch64.lo \
+ 	mach-o-x86-64.lo \
+ 	mmo.lo \
+	pe-aarch64igen.lo \
+ 	pe-x86_64.lo \
+	pei-aarch64.lo \
+ 	pei-ia64.lo \
+ 	pei-x86_64.lo \
+ 	pepigen.lo \
+@@ -1034,6 +1036,7 @@ BFD64_BACKENDS_CFILES = \
+ 	mach-o-x86-64.c \
+ 	mmo.c \
+ 	pe-x86_64.c \
+	pei-aarch64.c \
+ 	pei-ia64.c \
+ 	pei-x86_64.c \
+ 	vms-alpha.c
+@@ -1092,7 +1095,7 @@ BUILD_CFILES = \
+ 	elf32-aarch64.c elf64-aarch64.c \
+ 	elf32-ia64.c elf64-ia64.c \
+ 	elf32-riscv.c elf64-riscv.c \
+-	peigen.c pepigen.c pex64igen.c
+	peigen.c pepigen.c pex64igen.c pe-aarch64igen.c
+ 
+ CFILES = $(SOURCE_CFILES) $(BUILD_CFILES)
+ SOURCE_HFILES = \
+@@ -1551,9 +1554,11 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pei-mcore.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pei-sh.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pei-x86_64.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pei-aarch64.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/peigen.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pepigen.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pex64igen.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pe-aarch64igen.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plugin.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ppcboot.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/reloc.Plo@am__quote@
+@@ -1991,6 +1996,11 @@ pepigen.c : peXXigen.c
+ pex64igen.c: peXXigen.c
+ 	echo "#line 1 \"peXXigen.c\"" > $@
+ 	$(SED) -e s/XX/pex64/g < $< >> $@
+
+pe-aarch64igen.c: peXXigen.c
+	echo "#line 1 \"peXXigen.c\"" > $@
+	$(SED) -e s/XX/peAArch64/g < $< >> $@
+
+ $(BFD32_LIBS) \
+  $(BFD64_LIBS) \
+  $(ALL_MACHINES) \
+diff -rup binutils.orig/bfd/bfd.c binutils-2.37/bfd/bfd.c
+--- binutils.orig/bfd/bfd.c	2021-12-01 13:35:33.821078167 +0000
+++ binutils-2.37/bfd/bfd.c	2021-12-01 13:35:43.139988261 +0000
+@@ -1735,6 +1735,7 @@ bfd_get_sign_extend_vma (bfd *abfd)
+       || strcmp (name, "pei-i386") == 0
+       || strcmp (name, "pe-x86-64") == 0
+       || strcmp (name, "pei-x86-64") == 0
+      || strcmp (name, "pei-aarch64-little") == 0
+       || strcmp (name, "pe-arm-wince-little") == 0
+       || strcmp (name, "pei-arm-wince-little") == 0
+       || strcmp (name, "aixcoff-rs6000") == 0
+Only in binutils-2.37/bfd: coff-aarch64.c
+diff -rup binutils.orig/bfd/coffcode.h binutils-2.37/bfd/coffcode.h
+--- binutils.orig/bfd/coffcode.h	2021-12-01 13:35:33.822078158 +0000
+++ binutils-2.37/bfd/coffcode.h	2021-12-01 13:35:43.140988251 +0000
+@@ -2215,6 +2215,12 @@ coff_set_arch_mach_hook (bfd *abfd, void
+ 	}
+       break;
+ #endif
+#ifdef AARCH64MAGIC
+    case AARCH64MAGIC:
+      arch = bfd_arch_aarch64;
+      machine = internal_f->f_flags & F_AARCH64_ARCHITECTURE_MASK;
+      break;
+#endif
+ #ifdef Z80MAGIC
+     case Z80MAGIC:
+       arch = bfd_arch_z80;
+@@ -2771,6 +2777,12 @@ coff_set_flags (bfd * abfd,
+       return true;
+ #endif
+ 
+#ifdef AARCH64MAGIC
+    case bfd_arch_aarch64:
+      * magicp = AARCH64MAGIC;
+      return true;
+#endif
+
+ #ifdef ARMMAGIC
+     case bfd_arch_arm:
+ #ifdef ARM_WINCE
+@@ -3866,7 +3878,7 @@ coff_write_object_contents (bfd * abfd)
+     internal_f.f_flags |= IMAGE_FILE_LARGE_ADDRESS_AWARE;
+ #endif
+ 
+-#ifndef COFF_WITH_pex64
+#if !defined(COFF_WITH_pex64) && !defined(COFF_WITH_peAArch64)
+ #ifdef COFF_WITH_PE
+   internal_f.f_flags |= IMAGE_FILE_32BIT_MACHINE;
+ #else
+@@ -3914,6 +3926,11 @@ coff_write_object_contents (bfd * abfd)
+ #define __A_MAGIC_SET__
+     internal_a.magic = ZMAGIC;
+ #endif
+
+#if defined(AARCH64)
+#define __A_MAGIC_SET__
+    internal_a.magic = ZMAGIC;
+#endif
+ 
+ #if defined MCORE_PE
+ #define __A_MAGIC_SET__
+diff -rup binutils.orig/bfd/config.bfd binutils-2.37/bfd/config.bfd
+--- binutils.orig/bfd/config.bfd	2021-12-01 13:35:33.833078051 +0000
+++ binutils-2.37/bfd/config.bfd	2021-12-01 13:35:43.140988251 +0000
+@@ -232,7 +232,7 @@ case "${targ}" in
+     ;;
+   aarch64-*-elf | aarch64-*-rtems* | aarch64-*-genode*)
+     targ_defvec=aarch64_elf64_le_vec
+-    targ_selvecs="aarch64_elf64_be_vec aarch64_elf32_le_vec aarch64_elf32_be_vec arm_elf32_le_vec arm_elf32_be_vec"
+    targ_selvecs="aarch64_elf64_be_vec aarch64_elf32_le_vec aarch64_elf32_be_vec arm_elf32_le_vec arm_elf32_be_vec aarch64_pei_vec"
+     want64=true
+     ;;
+   aarch64_be-*-elf)
+@@ -257,7 +257,7 @@ case "${targ}" in
+     ;;
+   aarch64-*-linux* | aarch64-*-netbsd*)
+     targ_defvec=aarch64_elf64_le_vec
+-    targ_selvecs="aarch64_elf64_be_vec aarch64_elf32_le_vec aarch64_elf32_be_vec arm_elf32_le_vec arm_elf32_be_vec"
+    targ_selvecs="aarch64_elf64_be_vec aarch64_elf32_le_vec aarch64_elf32_be_vec arm_elf32_le_vec arm_elf32_be_vec aarch64_pei_vec"
+     want64=true
+     ;;
+   aarch64_be-*-linux* | aarch64_be-*-netbsd*)
+diff -rup binutils.orig/bfd/configure binutils-2.37/bfd/configure
+--- binutils.orig/bfd/configure	2021-12-01 13:35:33.817078206 +0000
+++ binutils-2.37/bfd/configure	2021-12-01 13:35:43.141988241 +0000
+@@ -13283,6 +13283,7 @@ do
+     aarch64_elf64_le_vec)	   tb="$tb elf64-aarch64.lo elfxx-aarch64.lo elf-ifunc.lo elf64.lo $elf"; target_size=64 ;;
+     aarch64_elf64_le_cloudabi_vec) tb="$tb elf64-aarch64.lo elfxx-aarch64.lo elf-ifunc.lo elf64.lo $elf"; target_size=64 ;;
+     aarch64_mach_o_vec)		 tb="$tb mach-o-aarch64.lo"; target_size=64 ;;
+    aarch64_pei_vec)		 tb="$tb pei-aarch64.lo pe-aarch64igen.lo $coff"; target_size=64 ;;
+     alpha_ecoff_le_vec)		 tb="$tb coff-alpha.lo ecoff.lo $ecoff"; target_size=64 ;;
+     alpha_elf64_vec)		 tb="$tb elf64-alpha.lo elf64.lo $elf"; target_size=64 ;;
+     alpha_elf64_fbsd_vec)	 tb="$tb elf64-alpha.lo elf64.lo $elf"; target_size=64 ;;
+diff -rup binutils.orig/bfd/configure.ac binutils-2.37/bfd/configure.ac
+--- binutils.orig/bfd/configure.ac	2021-12-01 13:35:33.829078090 +0000
+++ binutils-2.37/bfd/configure.ac	2021-12-01 13:35:43.141988241 +0000
+@@ -439,6 +439,7 @@ do
+     aarch64_elf64_le_vec)	   tb="$tb elf64-aarch64.lo elfxx-aarch64.lo elf-ifunc.lo elf64.lo $elf"; target_size=64 ;;
+     aarch64_elf64_le_cloudabi_vec) tb="$tb elf64-aarch64.lo elfxx-aarch64.lo elf-ifunc.lo elf64.lo $elf"; target_size=64 ;;
+     aarch64_mach_o_vec)		 tb="$tb mach-o-aarch64.lo"; target_size=64 ;;
+    aarch64_pei_vec)		 tb="$tb pei-aarch64.lo pe-aarch64igen.lo $coff"; target_size=64 ;;
+     alpha_ecoff_le_vec)		 tb="$tb coff-alpha.lo ecoff.lo $ecoff"; target_size=64 ;;
+     alpha_elf64_vec)		 tb="$tb elf64-alpha.lo elf64.lo $elf"; target_size=64 ;;
+     alpha_elf64_fbsd_vec)	 tb="$tb elf64-alpha.lo elf64.lo $elf"; target_size=64 ;;
+diff -rup binutils.orig/bfd/libpei.h binutils-2.37/bfd/libpei.h
+--- binutils.orig/bfd/libpei.h	2021-12-01 13:35:33.830078081 +0000
+++ binutils-2.37/bfd/libpei.h	2021-12-01 13:35:43.141988241 +0000
+@@ -275,6 +275,41 @@
+ #define _bfd_XXi_write_codeview_record			_bfd_pepi_write_codeview_record
+ #define _bfd_XXi_slurp_codeview_record			_bfd_pepi_slurp_codeview_record
+ 
+#elif defined COFF_WITH_peAArch64
+
+#define GET_OPTHDR_IMAGE_BASE		 H_GET_64
+#define PUT_OPTHDR_IMAGE_BASE		 H_PUT_64
+#define GET_OPTHDR_SIZE_OF_STACK_RESERVE H_GET_64
+#define PUT_OPTHDR_SIZE_OF_STACK_RESERVE H_PUT_64
+#define GET_OPTHDR_SIZE_OF_STACK_COMMIT	 H_GET_64
+#define PUT_OPTHDR_SIZE_OF_STACK_COMMIT	 H_PUT_64
+#define GET_OPTHDR_SIZE_OF_HEAP_RESERVE	 H_GET_64
+#define PUT_OPTHDR_SIZE_OF_HEAP_RESERVE	 H_PUT_64
+#define GET_OPTHDR_SIZE_OF_HEAP_COMMIT	 H_GET_64
+#define PUT_OPTHDR_SIZE_OF_HEAP_COMMIT	 H_PUT_64
+#define GET_PDATA_ENTRY			 bfd_get_32
+
+#define _bfd_XX_bfd_copy_private_bfd_data_common	_bfd_peAArch64_bfd_copy_private_bfd_data_common
+#define _bfd_XX_bfd_copy_private_section_data		_bfd_peAArch64_bfd_copy_private_section_data
+#define _bfd_XX_get_symbol_info				_bfd_peAArch64_get_symbol_info
+#define _bfd_XX_only_swap_filehdr_out			_bfd_peAArch64_only_swap_filehdr_out
+#define _bfd_XX_print_private_bfd_data_common		_bfd_peAArch64_print_private_bfd_data_common
+#define _bfd_XXi_final_link_postscript			_bfd_peAArch64i_final_link_postscript
+#define _bfd_XXi_only_swap_filehdr_out			_bfd_peAArch64i_only_swap_filehdr_out
+#define _bfd_XXi_swap_aouthdr_in			_bfd_peAArch64i_swap_aouthdr_in
+#define _bfd_XXi_swap_aouthdr_out			_bfd_peAArch64i_swap_aouthdr_out
+#define _bfd_XXi_swap_aux_in				_bfd_peAArch64i_swap_aux_in
+#define _bfd_XXi_swap_aux_out				_bfd_peAArch64i_swap_aux_out
+#define _bfd_XXi_swap_lineno_in				_bfd_peAArch64i_swap_lineno_in
+#define _bfd_XXi_swap_lineno_out			_bfd_peAArch64i_swap_lineno_out
+#define _bfd_XXi_swap_scnhdr_out			_bfd_peAArch64i_swap_scnhdr_out
+#define _bfd_XXi_swap_sym_in				_bfd_peAArch64i_swap_sym_in
+#define _bfd_XXi_swap_sym_out				_bfd_peAArch64i_swap_sym_out
+#define _bfd_XXi_swap_debugdir_in			_bfd_peAArch64i_swap_debugdir_in
+#define _bfd_XXi_swap_debugdir_out			_bfd_peAArch64i_swap_debugdir_out
+#define _bfd_XXi_write_codeview_record			_bfd_peAArch64i_write_codeview_record
+#define _bfd_XXi_slurp_codeview_record			_bfd_peAArch64i_slurp_codeview_record
+
+ #else /* !COFF_WITH_pep */
+ 
+ #define GET_OPTHDR_IMAGE_BASE H_GET_32
+@@ -369,5 +404,6 @@ bool _bfd_XX_bfd_copy_private_section_da
+ bool _bfd_pe_print_ce_compressed_pdata (bfd *, void *);
+ bool _bfd_pe64_print_ce_compressed_pdata (bfd *, void *);
+ bool _bfd_pex64_print_ce_compressed_pdata (bfd *, void *);
+bool _bfd_peAArch64_print_ce_compressed_pdata (bfd *, void *);
+ bool _bfd_pep_print_ce_compressed_pdata (bfd *, void *);
+ 
+diff -rup binutils.orig/bfd/peXXigen.c binutils-2.37/bfd/peXXigen.c
+--- binutils.orig/bfd/peXXigen.c	2021-12-01 13:35:33.827078110 +0000
+++ binutils-2.37/bfd/peXXigen.c	2021-12-01 13:35:43.142988232 +0000
+@@ -60,8 +60,9 @@
+    on this code has a chance of getting something accomplished without
+    wasting too much time.  */
+ 
+-/* This expands into COFF_WITH_pe, COFF_WITH_pep, or COFF_WITH_pex64
+-   depending on whether we're compiling for straight PE or PE+.  */
+/* This expands into COFF_WITH_pe, COFF_WITH_pep, COFF_WITH_pex64 or
+   COFF_WITH_peAArch64 depending on whether we're compiling for straight
+   PE or PE+.  */
+ #define COFF_WITH_XX
+ 
+ #include "sysdep.h"
+@@ -83,6 +84,8 @@
+ # include "coff/x86_64.h"
+ #elif defined COFF_WITH_pep
+ # include "coff/ia64.h"
+#elif defined COFF_WITH_peAArch64
+# include "coff/aarch64.h"
+ #else
+ # include "coff/i386.h"
+ #endif
+@@ -92,7 +95,7 @@
+ #include "libpei.h"
+ #include "safe-ctype.h"
+ 
+-#if defined COFF_WITH_pep || defined COFF_WITH_pex64
+#if defined COFF_WITH_pep || defined COFF_WITH_pex64 || defined COFF_WITH_peAArch64
+ # undef AOUTSZ
+ # define AOUTSZ		PEPAOUTSZ
+ # define PEAOUTHDR	PEPAOUTHDR
+@@ -469,7 +472,7 @@ _bfd_XXi_swap_aouthdr_in (bfd * abfd,
+   aouthdr_int->text_start =
+     GET_AOUTHDR_TEXT_START (abfd, aouthdr_ext->text_start);
+ 
+-#if !defined(COFF_WITH_pep) && !defined(COFF_WITH_pex64)
+#if !defined(COFF_WITH_pep) && !defined(COFF_WITH_pex64) && !defined(COFF_WITH_peAArch64)
+   /* PE32+ does not have data_start member!  */
+   aouthdr_int->data_start =
+     GET_AOUTHDR_DATA_START (abfd, aouthdr_ext->data_start);
+@@ -555,7 +558,7 @@ _bfd_XXi_swap_aouthdr_in (bfd * abfd,
+   if (aouthdr_int->entry)
+     {
+       aouthdr_int->entry += a->ImageBase;
+-#if !defined(COFF_WITH_pep) && !defined(COFF_WITH_pex64)
+#if !defined(COFF_WITH_pep) && !defined(COFF_WITH_pex64) && !defined(COFF_WITH_peAArch64)
+       aouthdr_int->entry &= 0xffffffff;
+ #endif
+     }
+@@ -563,12 +566,12 @@ _bfd_XXi_swap_aouthdr_in (bfd * abfd,
+   if (aouthdr_int->tsize)
+     {
+       aouthdr_int->text_start += a->ImageBase;
+-#if !defined(COFF_WITH_pep) && !defined(COFF_WITH_pex64)
+#if !defined(COFF_WITH_pep) && !defined(COFF_WITH_pex64) && !defined(COFF_WITH_peAArch64)
+       aouthdr_int->text_start &= 0xffffffff;
+ #endif
+     }
+ 
+-#if !defined(COFF_WITH_pep) && !defined(COFF_WITH_pex64)
+#if !defined(COFF_WITH_pep) && !defined(COFF_WITH_pex64) && !defined(COFF_WITH_peAArch64)
+   /* PE32+ does not have data_start member!  */
+   if (aouthdr_int->dsize)
+     {
+@@ -628,7 +631,7 @@ _bfd_XXi_swap_aouthdr_out (bfd * abfd, v
+   if (aouthdr_in->tsize)
+     {
+       aouthdr_in->text_start -= ib;
+-#if !defined(COFF_WITH_pep) && !defined(COFF_WITH_pex64)
+#if !defined(COFF_WITH_pep) && !defined(COFF_WITH_pex64) && !defined(COFF_WITH_peAArch64)
+       aouthdr_in->text_start &= 0xffffffff;
+ #endif
+     }
+@@ -636,7 +639,7 @@ _bfd_XXi_swap_aouthdr_out (bfd * abfd, v
+   if (aouthdr_in->dsize)
+     {
+       aouthdr_in->data_start -= ib;
+-#if !defined(COFF_WITH_pep) && !defined(COFF_WITH_pex64)
+#if !defined(COFF_WITH_pep) && !defined(COFF_WITH_pex64) && !defined(COFF_WITH_peAArch64)
+       aouthdr_in->data_start &= 0xffffffff;
+ #endif
+     }
+@@ -644,7 +647,7 @@ _bfd_XXi_swap_aouthdr_out (bfd * abfd, v
+   if (aouthdr_in->entry)
+     {
+       aouthdr_in->entry -= ib;
+-#if !defined(COFF_WITH_pep) && !defined(COFF_WITH_pex64)
+#if !defined(COFF_WITH_pep) && !defined(COFF_WITH_pex64) && !defined(COFF_WITH_peAArch64)
+       aouthdr_in->entry &= 0xffffffff;
+ #endif
+     }
+@@ -748,7 +751,7 @@ _bfd_XXi_swap_aouthdr_out (bfd * abfd, v
+   PUT_AOUTHDR_TEXT_START (abfd, aouthdr_in->text_start,
+ 			  aouthdr_out->standard.text_start);
+ 
+-#if !defined(COFF_WITH_pep) && !defined(COFF_WITH_pex64)
+#if !defined(COFF_WITH_pep) && !defined(COFF_WITH_pex64) && !defined(COFF_WITH_peAArch64)
+   /* PE32+ does not have data_start member!  */
+   PUT_AOUTHDR_DATA_START (abfd, aouthdr_in->data_start,
+ 			  aouthdr_out->standard.data_start);
+@@ -1800,7 +1803,7 @@ pe_print_edata (bfd * abfd, void * vfile
+ static bool
+ pe_print_pdata (bfd * abfd, void * vfile)
+ {
+-#if defined(COFF_WITH_pep) && !defined(COFF_WITH_pex64)
+#if defined(COFF_WITH_pep) && !defined(COFF_WITH_pex64) && !defined(COFF_WITH_peAArch64)
+ # define PDATA_ROW_SIZE	(3 * 8)
+ #else
+ # define PDATA_ROW_SIZE	(5 * 4)
+@@ -1827,7 +1830,7 @@ pe_print_pdata (bfd * abfd, void * vfile
+ 
+   fprintf (file,
+ 	   _("\nThe Function Table (interpreted .pdata section contents)\n"));
+-#if defined(COFF_WITH_pep) && !defined(COFF_WITH_pex64)
+#if defined(COFF_WITH_pep) && !defined(COFF_WITH_pex64) && !defined(COFF_WITH_peAArch64)
+   fprintf (file,
+ 	   _(" vma:\t\t\tBegin Address    End Address      Unwind Info\n"));
+ #else
+@@ -1864,7 +1867,7 @@ pe_print_pdata (bfd * abfd, void * vfile
+       bfd_vma eh_handler;
+       bfd_vma eh_data;
+       bfd_vma prolog_end_addr;
+-#if !defined(COFF_WITH_pep) || defined(COFF_WITH_pex64)
+#if !defined(COFF_WITH_pep) || defined(COFF_WITH_pex64) || defined(COFF_WITH_peAArch64)
+       int em_data;
+ #endif
+ 
+@@ -1882,7 +1885,7 @@ pe_print_pdata (bfd * abfd, void * vfile
+ 	/* We are probably into the padding of the section now.  */
+ 	break;
+ 
+-#if !defined(COFF_WITH_pep) || defined(COFF_WITH_pex64)
+#if !defined(COFF_WITH_pep) || defined(COFF_WITH_pex64) || defined(COFF_WITH_peAArch64)
+       em_data = ((eh_handler & 0x1) << 2) | (prolog_end_addr & 0x3);
+ #endif
+       eh_handler &= ~(bfd_vma) 0x3;
+@@ -1893,7 +1896,7 @@ pe_print_pdata (bfd * abfd, void * vfile
+       bfd_fprintf_vma (abfd, file, begin_addr); fputc (' ', file);
+       bfd_fprintf_vma (abfd, file, end_addr); fputc (' ', file);
+       bfd_fprintf_vma (abfd, file, eh_handler);
+-#if !defined(COFF_WITH_pep) || defined(COFF_WITH_pex64)
+#if !defined(COFF_WITH_pep) || defined(COFF_WITH_pex64) || defined(COFF_WITH_peAArch64)
+       fputc (' ', file);
+       bfd_fprintf_vma (abfd, file, eh_data); fputc (' ', file);
+       bfd_fprintf_vma (abfd, file, prolog_end_addr);
+@@ -2784,7 +2787,7 @@ _bfd_XX_print_private_bfd_data_common (b
+   bfd_fprintf_vma (abfd, file, i->AddressOfEntryPoint);
+   fprintf (file, "\nBaseOfCode\t\t");
+   bfd_fprintf_vma (abfd, file, i->BaseOfCode);
+-#if !defined(COFF_WITH_pep) && !defined(COFF_WITH_pex64)
+#if !defined(COFF_WITH_pep) && !defined(COFF_WITH_pex64) && !defined(COFF_WITH_peAArch64)
+   /* PE32+ does not have BaseOfData member!  */
+   fprintf (file, "\nBaseOfData\t\t");
+   bfd_fprintf_vma (abfd, file, i->BaseOfData);
+@@ -3085,7 +3088,7 @@ _bfd_XX_get_symbol_info (bfd * abfd, asy
+   coff_get_symbol_info (abfd, symbol, ret);
+ }
+ 
+-#if !defined(COFF_WITH_pep) && defined(COFF_WITH_pex64)
+#if !defined(COFF_WITH_pep) && defined(COFF_WITH_pex64) && defined(COFF_WITH_peAArch64)
+ static int
+ sort_x64_pdata (const void *l, const void *r)
+ {
+@@ -4504,7 +4507,7 @@ _bfd_XXi_final_link_postscript (bfd * ab
+ 	the TLS data directory consists of 4 pointers, followed
+ 	by two 4-byte integer. This implies that the total size
+ 	is different for 32-bit and 64-bit executables.  */
+-#if !defined(COFF_WITH_pep) && !defined(COFF_WITH_pex64)
+#if !defined(COFF_WITH_pep) && !defined(COFF_WITH_pex64) && !defined(COFF_WITH_peAArch64)
+       pe_data (abfd)->pe_opthdr.DataDirectory[PE_TLS_TABLE].Size = 0x18;
+ #else
+       pe_data (abfd)->pe_opthdr.DataDirectory[PE_TLS_TABLE].Size = 0x28;
+@@ -4513,7 +4516,7 @@ _bfd_XXi_final_link_postscript (bfd * ab
+ 
+ /* If there is a .pdata section and we have linked pdata finally, we
+      need to sort the entries ascending.  */
+-#if !defined(COFF_WITH_pep) && defined(COFF_WITH_pex64)
+#if !defined(COFF_WITH_pep) && defined(COFF_WITH_pex64) && defined(COFF_WITH_peAArch64)
+   {
+     asection *sec = bfd_get_section_by_name (abfd, ".pdata");
+ 
+Only in binutils-2.37/bfd: pei-aarch64.c
+diff -rup binutils.orig/bfd/peicode.h binutils-2.37/bfd/peicode.h
+--- binutils.orig/bfd/peicode.h	2021-12-01 13:35:33.829078090 +0000
+++ binutils-2.37/bfd/peicode.h	2021-12-01 13:35:43.142988232 +0000
+@@ -231,7 +231,7 @@ coff_swap_scnhdr_in (bfd * abfd, void *
+     {
+       scnhdr_int->s_vaddr += pe_data (abfd)->pe_opthdr.ImageBase;
+       /* Do not cut upper 32-bits for 64-bit vma.  */
+-#ifndef COFF_WITH_pex64
+#if !defined(COFF_WITH_pex64) && !defined(COFF_WITH_peAArch64)
+       scnhdr_int->s_vaddr &= 0xffffffff;
+ #endif
+     }
+@@ -738,6 +738,16 @@ static const jump_table jtab[] =
+   },
+ #endif
+ 
+#ifdef AARCH64MAGIC
+/* We don't currently support jumping to DLLs, so if
+   someone does try emit a runtime trap.  Through UDF #0.  */
+  { AARCH64MAGIC,
+    { 0x00, 0x00, 0x00, 0x00 },
+    4, 0
+  },
+
+#endif
+
+ #ifdef  ARMPEMAGIC
+   { ARMPEMAGIC,
+     { 0x00, 0xc0, 0x9f, 0xe5, 0x00, 0xf0,
+@@ -910,7 +920,7 @@ pe_ILF_build_a_bfd (bfd *	    abfd,
+ 	/* See PR 20907 for a reproducer.  */
+ 	goto error_return;
+ 
+-#ifdef COFF_WITH_pex64
+#if defined(COFF_WITH_pex64) || defined(COFF_WITH_peAArch64)
+       ((unsigned int *) id4->contents)[0] = ordinal;
+       ((unsigned int *) id4->contents)[1] = 0x80000000;
+       ((unsigned int *) id5->contents)[0] = ordinal;
+@@ -1206,6 +1216,12 @@ pe_ILF_object_p (bfd * abfd)
+ #endif
+       break;
+ 
+    case IMAGE_FILE_MACHINE_ARM64:
+#ifdef AARCH64MAGIC
+      magic = AARCH64MAGIC;
+#endif
+      break;
+
+     case IMAGE_FILE_MACHINE_THUMB:
+ #ifdef THUMBPEMAGIC
+       {
+diff -rup binutils.orig/bfd/targets.c binutils-2.37/bfd/targets.c
+--- binutils.orig/bfd/targets.c	2021-12-01 13:35:33.829078090 +0000
+++ binutils-2.37/bfd/targets.c	2021-12-01 13:35:43.142988232 +0000
+@@ -679,6 +679,7 @@ extern const bfd_target aarch64_elf64_be
+ extern const bfd_target aarch64_elf64_le_vec;
+ extern const bfd_target aarch64_elf64_le_cloudabi_vec;
+ extern const bfd_target aarch64_mach_o_vec;
+extern const bfd_target aarch64_pei_vec;
+ extern const bfd_target alpha_ecoff_le_vec;
+ extern const bfd_target alpha_elf64_vec;
+ extern const bfd_target alpha_elf64_fbsd_vec;
+@@ -991,6 +992,7 @@ static const bfd_target * const _bfd_tar
+ 	&aarch64_elf64_le_vec,
+ 	&aarch64_elf64_le_cloudabi_vec,
+ 	&aarch64_mach_o_vec,
+	&aarch64_pei_vec,
+ #endif
+ 
+ #ifdef BFD64
+diff -rup binutils.orig/binutils/NEWS binutils-2.37/binutils/NEWS
+--- binutils.orig/binutils/NEWS	2021-12-01 13:35:33.320083001 +0000
+++ binutils-2.37/binutils/NEWS	2021-12-01 13:35:43.142988232 +0000
+@@ -9,6 +9,9 @@
+   using --unicode=highlight will display them as unicode escape sequences
+   highlighted in red (if supported by the output device).
+ 
+* Support for efi-app-aarch64, efi-rtdrv-aarch64 and efi-bsdrv-aarch64 has been
+  added to objcopy in order to enable UEFI development using binutils.
+
+ Changes in 2.37:
+ 
+ * The readelf tool has a new command line option which can be used to specify
+Only in binutils.orig/binutils: NEWS.orig
+Only in binutils.orig/binutils: NEWS.rej
+Only in binutils.orig/binutils: nm.c.orig
+diff -rup binutils.orig/binutils/objcopy.c binutils-2.37/binutils/objcopy.c
+--- binutils.orig/binutils/objcopy.c	2021-12-01 13:35:33.302083174 +0000
+++ binutils-2.37/binutils/objcopy.c	2021-12-01 13:35:43.143988222 +0000
+@@ -4987,6 +4987,13 @@ convert_efi_target (char *efi)
+       /* Change x86_64 to x86-64.  */
+       efi[7] = '-';
+     }
+  else if (strcmp (efi + 4, "aarch64") == 0)
+    {
+      /* Change aarch64 to aarch64-little.  */
+      efi = (char *) xrealloc (efi, strlen (efi) + 7);
+      char *t = "aarch64-little";
+      strcpy (efi + 4, t);
+    }
+ }
+ 
+ /* Allocate and return a pointer to a struct section_add, initializing the
+Only in binutils.orig/binutils: objdump.c.orig
+Only in binutils.orig/binutils: objdump.c.rej
+Only in binutils.orig/binutils: readelf.c.orig
+Only in binutils-2.37/binutils/testsuite/binutils-all/aarch64: pei-aarch64-little.d
+Only in binutils-2.37/binutils/testsuite/binutils-all/aarch64: pei-aarch64-little.s
+Only in binutils-2.37/include/coff: aarch64.h
+diff -rup binutils.orig/include/coff/pe.h binutils-2.37/include/coff/pe.h
+--- binutils.orig/include/coff/pe.h	2021-12-01 13:35:33.251083666 +0000
+++ binutils-2.37/include/coff/pe.h	2021-12-01 13:35:43.143988222 +0000
+@@ -137,6 +137,7 @@
+ #define IMAGE_FILE_MACHINE_AM33              0x01d3
+ #define IMAGE_FILE_MACHINE_AMD64             0x8664
+ #define IMAGE_FILE_MACHINE_ARM               0x01c0
+#define IMAGE_FILE_MACHINE_ARM64             0xaa64
+ #define IMAGE_FILE_MACHINE_AXP64             IMAGE_FILE_MACHINE_ALPHA64
+ #define IMAGE_FILE_MACHINE_CEE               0xc0ee
+ #define IMAGE_FILE_MACHINE_CEF               0x0cef
+--- /dev/null	2021-12-01 09:13:46.241760896 +0000
+++ binutils-2.37/include/coff/aarch64.h	2021-12-01 13:35:43.143988222 +0000
+@@ -0,0 +1,63 @@
+/* AArch64 COFF support for BFD.
+   Copyright (C) 2021 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#define COFFAARCH64 1
+
+#define L_LNNO_SIZE 2
+#define INCLUDE_COMDAT_FIELDS_IN_AUXENT
+#include "coff/external.h"
+
+#define F_AARCH64_ARCHITECTURE_MASK	(0x4000)
+
+#define	AARCH64MAGIC	0xaa64  /* From Microsoft specification. */
+
+#undef  BADMAG
+#define BADMAG(x) ((x).f_magic != AARCH64MAGIC)
+#define AARCH64         1                 /* Customize coffcode.h.  */
+
+#define IMAGE_NT_OPTIONAL_HDR64_MAGIC      0x20b
+
+#define OMAGIC          0404    /* Object files, eg as output.  */
+#define ZMAGIC          IMAGE_NT_OPTIONAL_HDR64_MAGIC    /* Demand load format, eg normal ld output 0x10b.  */
+#define STMAGIC		0401	/* Target shlib.  */
+#define SHMAGIC		0443	/* Host   shlib.  */
+
+/* define some NT default values */
+/*  #define NT_IMAGE_BASE        0x400000 moved to internal.h */
+#define NT_SECTION_ALIGNMENT 0x1000
+#define NT_FILE_ALIGNMENT    0x200
+#define NT_DEF_RESERVE       0x100000
+#define NT_DEF_COMMIT        0x1000
+
+/* We use the .rdata section to hold read only data.  */
+#define _LIT	".rdata"
+
+/********************** RELOCATION DIRECTIVES **********************/
+struct external_reloc
+{
+  char r_vaddr[4];
+  char r_symndx[4];
+  char r_type[2];
+  char r_offset[4];
+};
+
+#define RELOC struct external_reloc
+#define RELSZ 14
+
+#define ARM_NOTE_SECTION ".note"
+--- /dev/null	2021-12-01 09:13:46.241760896 +0000
+++ binutils-2.37/bfd/coff-aarch64.c	2021-12-01 13:35:43.139988261 +0000
+@@ -0,0 +1,166 @@
+/* BFD back-end for AArch64 COFF files.
+   Copyright (C) 2021 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+
+#ifndef COFF_WITH_peAArch64
+#define COFF_WITH_peAArch64
+#endif
+
+/* Note we have to make sure not to include headers twice.
+   Not all headers are wrapped in #ifdef guards, so we define
+   PEI_HEADERS to prevent double including here.  */
+#ifndef PEI_HEADERS
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "coff/aarch64.h"
+#include "coff/internal.h"
+#include "coff/pe.h"
+#include "libcoff.h"
+#include "libiberty.h"
+#endif
+
+#include "libcoff.h"
+
+/* The page size is a guess based on ELF.  */
+
+#define COFF_PAGE_SIZE 0x1000
+
+/* All users of this file have bfd_octets_per_byte (abfd, sec) == 1.  */
+#define OCTETS_PER_BYTE(ABFD, SEC) 1
+
+#ifndef PCRELOFFSET
+#define PCRELOFFSET true
+#endif
+
+/* Currently we don't handle any relocations.  */
+static reloc_howto_type pe_aarch64_std_reloc_howto[] =
+  {
+
+  };
+
+#define COFF_DEFAULT_SECTION_ALIGNMENT_POWER  2
+#define COFF_PAGE_SIZE			      0x1000
+
+#ifndef NUM_ELEM
+#define NUM_ELEM(a) ((sizeof (a)) / sizeof ((a)[0]))
+#endif
+
+#define NUM_RELOCS NUM_ELEM (pe_aarch64_std_reloc_howto)
+
+#define RTYPE2HOWTO(cache_ptr, dst)             \
+  (cache_ptr)->howto = NULL
+
+#ifndef bfd_pe_print_pdata
+#define bfd_pe_print_pdata      NULL
+#endif
+
+/* Return TRUE if this relocation should
+   appear in the output .reloc section.  */
+
+static bool
+in_reloc_p (bfd * abfd ATTRIBUTE_UNUSED,
+            reloc_howto_type * howto)
+{
+  return !howto->pc_relative;
+}
+
+#include "coffcode.h"
+
+/* Target vectors.  */
+const bfd_target
+#ifdef TARGET_SYM
+  TARGET_SYM =
+#else
+  aarch64_pei_vec =
+#endif
+{
+#ifdef TARGET_NAME
+  TARGET_NAME,
+#else
+ "pei-aarch64-little",			/* Name.  */
+#endif
+  bfd_target_coff_flavour,
+  BFD_ENDIAN_LITTLE,		/* Data byte order is little.  */
+  BFD_ENDIAN_LITTLE,		/* Header byte order is little.  */
+
+  (HAS_RELOC | EXEC_P		/* Object flags.  */
+   | HAS_LINENO | HAS_DEBUG
+   | HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED | BFD_COMPRESS | BFD_DECOMPRESS),
+
+  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC /* Section flags.  */
+#if defined(COFF_WITH_PE)
+   | SEC_LINK_ONCE | SEC_LINK_DUPLICATES | SEC_READONLY | SEC_DEBUGGING
+#endif
+   | SEC_CODE | SEC_DATA | SEC_EXCLUDE ),
+
+#ifdef TARGET_UNDERSCORE
+  TARGET_UNDERSCORE,		/* Leading underscore.  */
+#else
+  0,				/* Leading underscore.  */
+#endif
+  '/',				/* Ar_pad_char.  */
+  15,				/* Ar_max_namelen.  */
+  0,				/* match priority.  */
+  TARGET_KEEP_UNUSED_SECTION_SYMBOLS, /* keep unused section symbols.  */
+
+     /* Data conversion functions.  */
+     bfd_getl64, bfd_getl_signed_64, bfd_putl64,
+     bfd_getl32, bfd_getl_signed_32, bfd_putl32,
+     bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* Data.  */
+     /* Header conversion functions.  */
+     bfd_getl64, bfd_getl_signed_64, bfd_putl64,
+     bfd_getl32, bfd_getl_signed_32, bfd_putl32,
+     bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* Hdrs.  */
+
+  /* Note that we allow an object file to be treated as a core file as well.  */
+  {				/* bfd_check_format.  */
+    _bfd_dummy_target,
+    coff_object_p,
+    bfd_generic_archive_p,
+    coff_object_p
+  },
+  {				/* bfd_set_format.  */
+    _bfd_bool_bfd_false_error,
+    coff_mkobject,
+    _bfd_generic_mkarchive,
+    _bfd_bool_bfd_false_error
+  },
+  {				/* bfd_write_contents.  */
+    _bfd_bool_bfd_false_error,
+    coff_write_object_contents,
+    _bfd_write_archive_contents,
+    _bfd_bool_bfd_false_error
+  },
+
+  BFD_JUMP_TABLE_GENERIC (coff),
+  BFD_JUMP_TABLE_COPY (coff),
+  BFD_JUMP_TABLE_CORE (_bfd_nocore),
+  BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_coff),
+  BFD_JUMP_TABLE_SYMBOLS (coff),
+  BFD_JUMP_TABLE_RELOCS (coff),
+  BFD_JUMP_TABLE_WRITE (coff),
+  BFD_JUMP_TABLE_LINK (coff),
+  BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
+
+  NULL,
+
+  COFF_SWAP_TABLE
+};
+--- /dev/null	2021-12-01 09:13:46.241760896 +0000
+++ binutils-2.37/binutils/testsuite/binutils-all/aarch64/pei-aarch64-little.s	2021-12-01 13:35:43.143988222 +0000
+@@ -0,0 +1,42 @@
+	.arch armv8-a
+	.text
+	.align	2
+	.global	foo
+	.type	foo, %function
+foo:
+.LFB0:
+	.cfi_startproc
+	sub	sp, sp, #16
+	.cfi_def_cfa_offset 16
+	str	w0, [sp, 12]
+	ldr	w0, [sp, 12]
+	mul	w0, w0, w0
+	add	sp, sp, 16
+	.cfi_def_cfa_offset 0
+	ret
+	.cfi_endproc
+.LFE0:
+	.size	foo, .-foo
+	.align	2
+	.global	main
+	.type	main, %function
+main:
+.LFB1:
+	.cfi_startproc
+	stp	x29, x30, [sp, -16]!
+	.cfi_def_cfa_offset 16
+	.cfi_offset 29, -16
+	.cfi_offset 30, -8
+	mov	x29, sp
+	mov	w0, 5
+	bl	foo
+	ldp	x29, x30, [sp], 16
+	.cfi_restore 30
+	.cfi_restore 29
+	.cfi_def_cfa_offset 0
+	ret
+	.cfi_endproc
+.LFE1:
+	.size	main, .-main
+	.ident	"GCC: (fsf-trunk.2870) 12.0.0 20210930 (experimental)"
+	.section	.note.GNU-stack,"",@progbits
+--- /dev/null	2021-12-01 09:13:46.241760896 +0000
+++ binutils-2.37/binutils/testsuite/binutils-all/aarch64/pei-aarch64-little.d	2021-12-01 13:35:43.143988222 +0000
+@@ -0,0 +1,16 @@
+#skip: aarch64_be-*-*
+#ld: -e0
+#PROG: objcopy
+#objcopy: -j .text -j .sdata -j .data -j .dynamic -j .dynsym -j .rel -j .rela -j .rel.* -j .rela.* -j .rel* -j .rela* -j .reloc --target=efi-app-aarch64
+#objdump: -h -f
+#name: Check if efi app format is recognized
+
+.*:     file format pei-aarch64-little
+architecture: aarch64, flags 0x00000132:
+EXEC_P, HAS_SYMS, HAS_LOCALS, D_PAGED
+start address 0x0000000000000000
+
+Sections:
+Idx Name          Size      VMA               LMA               File off  Algn
+  0 \.text         00000030  0[^ ]+  0[^ ]+  0[^ ]+  2\*\*2
+                  CONTENTS, ALLOC, LOAD, READONLY, CODE
+--- /dev/null	2021-11-30 07:48:35.901044247 +0000
+++ binutils-2.35.2/bfd/pei-aarch64.c	2021-11-30 13:38:37.255656936 +0000
+@@ -0,0 +1,75 @@
+/* BFD back-end for AArch64 PE IMAGE COFF files.
+   Copyright (C) 2021 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+
+#define TARGET_SYM		aarch64_pei_vec
+#define TARGET_NAME		"pei-aarch64-little"
+#define TARGET_ARCHITECTURE	bfd_arch_aarch64
+#define TARGET_PAGESIZE		4096
+#define TARGET_BIG_ENDIAN	0
+#define TARGET_ARCHIVE		0
+#define TARGET_PRIORITY		0
+
+#define COFF_IMAGE_WITH_PE
+/* Rename the above into.. */
+#define COFF_WITH_peAArch64
+#define COFF_WITH_PE
+#define PCRELOFFSET	   true
+
+/* Long section names not allowed in executable images, only object files.  */
+#define COFF_LONG_SECTION_NAMES 0
+
+#define COFF_SECTION_ALIGNMENT_ENTRIES \
+{ COFF_SECTION_NAME_EXACT_MATCH (".bss"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 2 }, \
+{ COFF_SECTION_NAME_EXACT_MATCH (".data"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 2 }, \
+{ COFF_SECTION_NAME_EXACT_MATCH (".rdata"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 2 }, \
+{ COFF_SECTION_NAME_EXACT_MATCH (".text"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 2 }, \
+{ COFF_SECTION_NAME_PARTIAL_MATCH (".idata"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 2 }, \
+{ COFF_SECTION_NAME_EXACT_MATCH (".pdata"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 2 }, \
+{ COFF_SECTION_NAME_PARTIAL_MATCH (".debug"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 0 }, \
+{ COFF_SECTION_NAME_PARTIAL_MATCH (".gnu.linkonce.wi."), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 0 }
+
+#define PEI_HEADERS
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "coff/aarch64.h"
+#include "coff/internal.h"
+#include "coff/pe.h"
+#include "libcoff.h"
+#include "libpei.h"
+#include "libiberty.h"
+
+/* Make sure we're setting a 64-bit format.  */
+#undef AOUTSZ
+#define AOUTSZ          PEPAOUTSZ
+#define PEAOUTHDR       PEPAOUTHDR
+
+#include "coff-aarch64.c"
--- a/binutils-CVE-2021-45078.patch
+++ b/binutils-CVE-2021-45078.patch
@ -0,0 +1,230 @@
+--- binutils.orig/binutils/stabs.c	2021-12-20 12:51:40.953113439 +0000
+++ binutils-2.37/binutils/stabs.c	2021-12-20 12:56:07.607348945 +0000
+@@ -202,7 +202,7 @@ static debug_type stab_find_type (void *
+ static bool stab_record_type
+   (void *, struct stab_handle *, const int *, debug_type);
+ static debug_type stab_xcoff_builtin_type
+-  (void *, struct stab_handle *, int);
+  (void *, struct stab_handle *, unsigned int);
+ static debug_type stab_find_tagged_type
+   (void *, struct stab_handle *, const char *, int, enum debug_type_kind);
+ static debug_type *stab_demangle_argtypes
+@@ -3496,166 +3496,167 @@ stab_record_type (void *dhandle ATTRIBUT
+ 
+ static debug_type
+ stab_xcoff_builtin_type (void *dhandle, struct stab_handle *info,
+-			 int typenum)
+			 unsigned int typenum)
+ {
+   debug_type rettype;
+   const char *name;
+ 
+-  if (typenum >= 0 || typenum < -XCOFF_TYPE_COUNT)
+  typenum = -typenum - 1;
+  if (typenum >= XCOFF_TYPE_COUNT)
+     {
+-      fprintf (stderr, _("Unrecognized XCOFF type %d\n"), typenum);
+      fprintf (stderr, _("Unrecognized XCOFF type %d\n"), -typenum - 1);
+       return DEBUG_TYPE_NULL;
+     }
+-  if (info->xcoff_types[-typenum] != NULL)
+-    return info->xcoff_types[-typenum];
+  if (info->xcoff_types[typenum] != NULL)
+    return info->xcoff_types[typenum];
+ 
+-  switch (-typenum)
+  switch (typenum)
+     {
+-    case 1:
+    case 0:
+       /* The size of this and all the other types are fixed, defined
+ 	 by the debugging format.  */
+       name = "int";
+       rettype = debug_make_int_type (dhandle, 4, false);
+       break;
+-    case 2:
+    case 1:
+       name = "char";
+       rettype = debug_make_int_type (dhandle, 1, false);
+       break;
+-    case 3:
+    case 2:
+       name = "short";
+       rettype = debug_make_int_type (dhandle, 2, false);
+       break;
+-    case 4:
+    case 3:
+       name = "long";
+       rettype = debug_make_int_type (dhandle, 4, false);
+       break;
+-    case 5:
+    case 4:
+       name = "unsigned char";
+       rettype = debug_make_int_type (dhandle, 1, true);
+       break;
+-    case 6:
+    case 5:
+       name = "signed char";
+       rettype = debug_make_int_type (dhandle, 1, false);
+       break;
+-    case 7:
+    case 6:
+       name = "unsigned short";
+       rettype = debug_make_int_type (dhandle, 2, true);
+       break;
+-    case 8:
+    case 7:
+       name = "unsigned int";
+       rettype = debug_make_int_type (dhandle, 4, true);
+       break;
+-    case 9:
+    case 8:
+       name = "unsigned";
+       rettype = debug_make_int_type (dhandle, 4, true);
+       break;
+-    case 10:
+    case 9:
+       name = "unsigned long";
+       rettype = debug_make_int_type (dhandle, 4, true);
+       break;
+-    case 11:
+    case 10:
+       name = "void";
+       rettype = debug_make_void_type (dhandle);
+       break;
+-    case 12:
+    case 11:
+       /* IEEE single precision (32 bit).  */
+       name = "float";
+       rettype = debug_make_float_type (dhandle, 4);
+       break;
+-    case 13:
+    case 12:
+       /* IEEE double precision (64 bit).  */
+       name = "double";
+       rettype = debug_make_float_type (dhandle, 8);
+       break;
+-    case 14:
+    case 13:
+       /* This is an IEEE double on the RS/6000, and different machines
+ 	 with different sizes for "long double" should use different
+ 	 negative type numbers.  See stabs.texinfo.  */
+       name = "long double";
+       rettype = debug_make_float_type (dhandle, 8);
+       break;
+-    case 15:
+    case 14:
+       name = "integer";
+       rettype = debug_make_int_type (dhandle, 4, false);
+       break;
+-    case 16:
+    case 15:
+       name = "boolean";
+       rettype = debug_make_bool_type (dhandle, 4);
+       break;
+-    case 17:
+    case 16:
+       name = "short real";
+       rettype = debug_make_float_type (dhandle, 4);
+       break;
+-    case 18:
+    case 17:
+       name = "real";
+       rettype = debug_make_float_type (dhandle, 8);
+       break;
+-    case 19:
+    case 18:
+       /* FIXME */
+       name = "stringptr";
+       rettype = NULL;
+       break;
+-    case 20:
+    case 19:
+       /* FIXME */
+       name = "character";
+       rettype = debug_make_int_type (dhandle, 1, true);
+       break;
+-    case 21:
+    case 20:
+       name = "logical*1";
+       rettype = debug_make_bool_type (dhandle, 1);
+       break;
+-    case 22:
+    case 21:
+       name = "logical*2";
+       rettype = debug_make_bool_type (dhandle, 2);
+       break;
+-    case 23:
+    case 22:
+       name = "logical*4";
+       rettype = debug_make_bool_type (dhandle, 4);
+       break;
+-    case 24:
+    case 23:
+       name = "logical";
+       rettype = debug_make_bool_type (dhandle, 4);
+       break;
+-    case 25:
+    case 24:
+       /* Complex type consisting of two IEEE single precision values.  */
+       name = "complex";
+       rettype = debug_make_complex_type (dhandle, 8);
+       break;
+-    case 26:
+    case 25:
+       /* Complex type consisting of two IEEE double precision values.  */
+       name = "double complex";
+       rettype = debug_make_complex_type (dhandle, 16);
+       break;
+-    case 27:
+    case 26:
+       name = "integer*1";
+       rettype = debug_make_int_type (dhandle, 1, false);
+       break;
+-    case 28:
+    case 27:
+       name = "integer*2";
+       rettype = debug_make_int_type (dhandle, 2, false);
+       break;
+-    case 29:
+    case 28:
+       name = "integer*4";
+       rettype = debug_make_int_type (dhandle, 4, false);
+       break;
+-    case 30:
+    case 29:
+       /* FIXME */
+       name = "wchar";
+       rettype = debug_make_int_type (dhandle, 2, false);
+       break;
+-    case 31:
+    case 30:
+       name = "long long";
+       rettype = debug_make_int_type (dhandle, 8, false);
+       break;
+-    case 32:
+    case 31:
+       name = "unsigned long long";
+       rettype = debug_make_int_type (dhandle, 8, true);
+       break;
+-    case 33:
+    case 32:
+       name = "logical*8";
+       rettype = debug_make_bool_type (dhandle, 8);
+       break;
+-    case 34:
+    case 33:
+       name = "integer*8";
+       rettype = debug_make_int_type (dhandle, 8, false);
+       break;
+@@ -3664,9 +3665,7 @@ stab_xcoff_builtin_type (void *dhandle,
+     }
+ 
+   rettype = debug_name_type (dhandle, name, rettype);
+-
+-  info->xcoff_types[-typenum] = rettype;
+-
+  info->xcoff_types[typenum] = rettype;
+   return rettype;
+ }
+ 
--- a/binutils-bfd-close-fds.patch
+++ b/binutils-bfd-close-fds.patch
@ -0,0 +1,232 @@
+From 1c611b40e6bfc8029bff7696814330b5bc0ee5c0 Mon Sep 17 00:00:00 2001
+From: "H.J. Lu" <hjl.tools@gmail.com>
+Date: Mon, 26 Jul 2021 05:59:55 -0700
+Subject: [PATCH] bfd: Close the file descriptor if there is no archive fd
+
+Close the file descriptor if there is no archive plugin file descriptor
+to avoid running out of file descriptors on thin archives with many
+archive members.
+
+bfd/
+
+	PR ld/28138
+	* plugin.c (bfd_plugin_close_file_descriptor): Close the file
+	descriptor there is no archive plugin file descriptor.
+
+ld/
+
+	PR ld/28138
+	* testsuite/ld-plugin/lto.exp: Run tmpdir/pr28138 only for
+	native build.
+
+	PR ld/28138
+	* testsuite/ld-plugin/lto.exp: Run ld/28138 tests.
+	* testsuite/ld-plugin/pr28138.c: New file.
+	* testsuite/ld-plugin/pr28138-1.c: Likewise.
+	* testsuite/ld-plugin/pr28138-2.c: Likewise.
+	* testsuite/ld-plugin/pr28138-3.c: Likewise.
+	* testsuite/ld-plugin/pr28138-4.c: Likewise.
+	* testsuite/ld-plugin/pr28138-5.c: Likewise.
+	* testsuite/ld-plugin/pr28138-6.c: Likewise.
+	* testsuite/ld-plugin/pr28138-7.c: Likewise.
+
+(cherry picked from commit 5a98fb7513b559e20dfebdbaa2a471afda3b4742)
+(cherry picked from commit 7dc37e1e1209c80e0bab784df6b6bac335e836f2)
+---
+ bfd/plugin.c                       |  8 +++++++
+ ld/testsuite/ld-plugin/lto.exp     | 34 ++++++++++++++++++++++++++++++
+ ld/testsuite/ld-plugin/pr28138-1.c |  6 ++++++
+ ld/testsuite/ld-plugin/pr28138-2.c |  6 ++++++
+ ld/testsuite/ld-plugin/pr28138-3.c |  6 ++++++
+ ld/testsuite/ld-plugin/pr28138-4.c |  6 ++++++
+ ld/testsuite/ld-plugin/pr28138-5.c |  6 ++++++
+ ld/testsuite/ld-plugin/pr28138-6.c |  6 ++++++
+ ld/testsuite/ld-plugin/pr28138-7.c |  6 ++++++
+ ld/testsuite/ld-plugin/pr28138.c   | 20 ++++++++++++++++++
+ 10 files changed, 104 insertions(+)
+ create mode 100644 ld/testsuite/ld-plugin/pr28138-1.c
+ create mode 100644 ld/testsuite/ld-plugin/pr28138-2.c
+ create mode 100644 ld/testsuite/ld-plugin/pr28138-3.c
+ create mode 100644 ld/testsuite/ld-plugin/pr28138-4.c
+ create mode 100644 ld/testsuite/ld-plugin/pr28138-5.c
+ create mode 100644 ld/testsuite/ld-plugin/pr28138-6.c
+ create mode 100644 ld/testsuite/ld-plugin/pr28138-7.c
+ create mode 100644 ld/testsuite/ld-plugin/pr28138.c
+
+diff --git a/bfd/plugin.c b/bfd/plugin.c
+index 6cfa2b66470..3bab8febe88 100644
+--- a/bfd/plugin.c
+++ b/bfd/plugin.c
+@@ -291,6 +291,14 @@ bfd_plugin_close_file_descriptor (bfd *abfd, int fd)
+ 	     && !bfd_is_thin_archive (abfd->my_archive))
+ 	abfd = abfd->my_archive;
+ 
+      /* Close the file descriptor if there is no archive plugin file
+	 descriptor.  */
+      if (abfd->archive_plugin_fd == -1)
+	{
+	  close (fd);
+	  return;
+	}
+
+       abfd->archive_plugin_fd_open_count--;
+       /* Dup the archive plugin file descriptor for later use, which
+ 	 will be closed by _bfd_archive_close_and_cleanup.  */
+diff --git a/ld/testsuite/ld-plugin/lto.exp b/ld/testsuite/ld-plugin/lto.exp
+index def69e43ab3..999d911ce6a 100644
+--- a/ld/testsuite/ld-plugin/lto.exp
+++ b/ld/testsuite/ld-plugin/lto.exp
+@@ -687,6 +687,40 @@ if { [is_elf_format] && [check_lto_shared_available] } {
+     }
+ }
+ 
+run_cc_link_tests [list \
+    [list \
+	"Build pr28138.a" \
+	"-T" "" \
+	{pr28138-1.c pr28138-2.c pr28138-3.c pr28138-4.c pr28138-5.c \
+	 pr28138-6.c pr28138-7.c} {} "pr28138.a" \
+    ] \
+    [list \
+	"Build pr28138.o" \
+	"" "" \
+	{pr28138.c} {} \
+    ] \
+]
+
+set exec_output [run_host_cmd "sh" \
+			      "-c \"ulimit -n 20; \
+			      $CC -Btmpdir/ld -o tmpdir/pr28138 \
+			      tmpdir/pr28138.o tmpdir/pr28138.a\""]
+set exec_output [prune_warnings $exec_output]
+if [string match "" $exec_output] then {
+    if { [isnative] } {
+	set exec_output [run_host_cmd "tmpdir/pr28138" ""]
+	if [string match "PASS" $exec_output] then {
+	    pass "PR ld/28138"
+	} else {
+	    fail "PR ld/28138"
+	}
+    } else {
+	pass "PR ld/28138"
+    }
+} else {
+    fail "PR ld/28138"
+}
+
+ set testname "Build liblto-11.a"
+ remote_file host delete "tmpdir/liblto-11.a"
+ set catch_output [run_host_cmd "$ar" "rc $plug_opt tmpdir/liblto-11.a tmpdir/lto-11a.o tmpdir/lto-11b.o tmpdir/lto-11c.o"]
+diff --git a/ld/testsuite/ld-plugin/pr28138-1.c b/ld/testsuite/ld-plugin/pr28138-1.c
+new file mode 100644
+index 00000000000..51d119e1642
+--- /dev/null
+++ b/ld/testsuite/ld-plugin/pr28138-1.c
+@@ -0,0 +1,6 @@
+extern int a0(void);
+int
+a1(void)
+{
+  return 1 + a0();
+}
+diff --git a/ld/testsuite/ld-plugin/pr28138-2.c b/ld/testsuite/ld-plugin/pr28138-2.c
+new file mode 100644
+index 00000000000..1120cd797e9
+--- /dev/null
+++ b/ld/testsuite/ld-plugin/pr28138-2.c
+@@ -0,0 +1,6 @@
+extern int a1(void);
+int
+a2(void)
+{
+  return 1 + a1();
+}
+diff --git a/ld/testsuite/ld-plugin/pr28138-3.c b/ld/testsuite/ld-plugin/pr28138-3.c
+new file mode 100644
+index 00000000000..ec464947ee6
+--- /dev/null
+++ b/ld/testsuite/ld-plugin/pr28138-3.c
+@@ -0,0 +1,6 @@
+extern int a2(void);
+int
+a3(void)
+{
+  return 1 + a2();
+}
+diff --git a/ld/testsuite/ld-plugin/pr28138-4.c b/ld/testsuite/ld-plugin/pr28138-4.c
+new file mode 100644
+index 00000000000..475701b2c5c
+--- /dev/null
+++ b/ld/testsuite/ld-plugin/pr28138-4.c
+@@ -0,0 +1,6 @@
+extern int a3(void);
+int
+a4(void)
+{
+  return 1 + a3();
+}
+diff --git a/ld/testsuite/ld-plugin/pr28138-5.c b/ld/testsuite/ld-plugin/pr28138-5.c
+new file mode 100644
+index 00000000000..e24f86c363e
+--- /dev/null
+++ b/ld/testsuite/ld-plugin/pr28138-5.c
+@@ -0,0 +1,6 @@
+extern int a4(void);
+int
+a5(void)
+{
+  return 1 + a4();
+}
+diff --git a/ld/testsuite/ld-plugin/pr28138-6.c b/ld/testsuite/ld-plugin/pr28138-6.c
+new file mode 100644
+index 00000000000..b5b938bdb21
+--- /dev/null
+++ b/ld/testsuite/ld-plugin/pr28138-6.c
+@@ -0,0 +1,6 @@
+extern int a5(void);
+int
+a6(void)
+{
+  return 1 + a5();
+}
+diff --git a/ld/testsuite/ld-plugin/pr28138-7.c b/ld/testsuite/ld-plugin/pr28138-7.c
+new file mode 100644
+index 00000000000..4ef75bf0f0c
+--- /dev/null
+++ b/ld/testsuite/ld-plugin/pr28138-7.c
+@@ -0,0 +1,6 @@
+extern int a6(void);
+int
+a7(void)
+{
+  return 1 + a6();
+}
+diff --git a/ld/testsuite/ld-plugin/pr28138.c b/ld/testsuite/ld-plugin/pr28138.c
+new file mode 100644
+index 00000000000..68252c9f382
+--- /dev/null
+++ b/ld/testsuite/ld-plugin/pr28138.c
+@@ -0,0 +1,20 @@
+#include <stdio.h>
+
+extern int a7(void);
+
+int
+a0(void)
+{
+  return 0;
+}
+
+int
+main()
+{
+  if (a7() == 7)
+    {
+      printf ("PASS\n");
+      return 0;
+    }
+  return 1;
+}
+-- 
+2.27.0
+
--- a/binutils-do-not-use-debuginfod.patch
+++ b/binutils-do-not-use-debuginfod.patch
@ -0,0 +1,972 @@
+diff -rup binutils.orig/binutils/NEWS binutils-2.37/binutils/NEWS
+--- binutils.orig/binutils/NEWS	2022-03-10 10:52:01.090309329 +0000
+++ binutils-2.37/binutils/NEWS	2022-03-10 10:52:35.149087511 +0000
+@@ -1,5 +1,8 @@
+ -*- text -*-
+ 
++* Add an option to objdump and readelf to prevent attempts to access debuginfod
++  servers when following links.
++
+ * Tools which display symbols or strings (readelf, strings, nm, objdump)
+   have a new command line option which controls how unicode characters are
+   handled.  By default they are treated as normal for the tool.  Using
+diff -rup binutils.orig/binutils/NEWS.orig binutils-2.37/binutils/NEWS.orig
+--- binutils.orig/binutils/NEWS.orig	2022-03-10 10:52:01.072309446 +0000
+++ binutils-2.37/binutils/NEWS.orig	2022-03-10 10:52:09.778252743 +0000
+@@ -1,5 +1,17 @@
+ -*- text -*-
+ 
+* Tools which display symbols or strings (readelf, strings, nm, objdump)
+  have a new command line option which controls how unicode characters are
+  handled.  By default they are treated as normal for the tool.  Using
+  --unicode=locale will display them according to the current locale.
+  Using --unicode=hex will display them as hex byte values, whilst
+  --unicode=escape will display them as escape sequences.  In addition
+  using --unicode=highlight will display them as unicode escape sequences
+  highlighted in red (if supported by the output device).
+
+* Support for efi-app-aarch64, efi-rtdrv-aarch64 and efi-bsdrv-aarch64 has been
+  added to objcopy in order to enable UEFI development using binutils.
+
+ Changes in 2.37:
+ 
+ * The readelf tool has a new command line option which can be used to specify
+diff -rup binutils.orig/binutils/NEWS.rej binutils-2.37/binutils/NEWS.rej
+--- binutils.orig/binutils/NEWS.rej	2022-03-10 10:52:01.090309329 +0000
+++ binutils-2.37/binutils/NEWS.rej	2022-03-10 10:52:09.778252743 +0000
+@@ -1,18 +1,11 @@
+ --- binutils/NEWS
+ +++ binutils/NEWS
+-@@ -2,6 +2,15 @@
+@@ -1,5 +1,8 @@
+ -*- text -*-
+  
+- * Add support for the LoongArch instruction set.
+- 
+-+* Tools which display symbols or strings (readelf, strings, nm, objdump)
+-+  have a new command line option which controls how unicode characters are
+-+  handled.  By default they are treated as normal for the tool.  Using
+-+  --unicode=locale will display them according to the current locale.
+-+  Using --unicode=hex will display them as hex byte values, whilst
+-+  --unicode=escape will display them as escape sequences.  In addition
+-+  using --unicode=highlight will display them as unicode escape sequences
+-+  highlighted in red (if supported by the output device).
++* Add an option to objdump and readelf to prevent attempts to access debuginfod
++  servers when following links.
+ +
+- Changes in 2.37:
+ Changes in 2.38:
+  
+- * The readelf tool has a new command line option which can be used to specify
+ * elfedit: Add --output-abiversion option to update ABIVERSION.
+diff -rup binutils.orig/binutils/doc/binutils.texi binutils-2.37/binutils/doc/binutils.texi
+--- binutils.orig/binutils/doc/binutils.texi	2022-03-10 10:52:01.073309440 +0000
+++ binutils-2.37/binutils/doc/binutils.texi	2022-03-10 10:52:09.779252737 +0000
+@@ -2241,6 +2241,8 @@ objdump [@option{-a}|@option{--archive-h
+          @option{--dwarf}[=rawline,=decodedline,=info,=abbrev,=pubnames,=aranges,=macro,=frames,=frames-interp,=str,=str-offsets,=loc,=Ranges,=pubtypes,=trace_info,=trace_abbrev,=trace_aranges,=gdb_index,=addr,=cu_index,=links]]
+         [@option{-WK}|@option{--dwarf=follow-links}]
+         [@option{-WN}|@option{--dwarf=no-follow-links}]
+        [@option{-wD}|@option{--dwarf=use-debuginfod}]
+        [@option{-wE}|@option{--dwarf=do-not-use-debuginfod}]
+         [@option{-L}|@option{--process-links}]
+         [@option{--ctf=}@var{section}]
+         [@option{-G}|@option{--stabs}]
+@@ -4869,6 +4871,8 @@ readelf [@option{-a}|@option{--all}]
+          @option{--debug-dump}[=rawline,=decodedline,=info,=abbrev,=pubnames,=aranges,=macro,=frames,=frames-interp,=str,=str-offsets,=loc,=Ranges,=pubtypes,=trace_info,=trace_abbrev,=trace_aranges,=gdb_index,=addr,=cu_index,=links]]
+         [@option{-wK}|@option{--debug-dump=follow-links}]
+         [@option{-wN}|@option{--debug-dump=no-follow-links}]
+        [@option{-wD}|@option{--debug-dump=use-debuginfod}]
+        [@option{-wE}|@option{--debug-dump=do-not-use-debuginfod}]
+         [@option{-P}|@option{--process-links}]
+         [@option{--dwarf-depth=@var{n}}]
+         [@option{--dwarf-start=@var{n}}]
+@@ -5482,7 +5486,8 @@ deduced from the input file
+ @cindex separate debug files
+ 
+ debuginfod is a web service that indexes ELF/DWARF debugging resources
+-by build-id and serves them over HTTP.
+by build-id and serves them over HTTP.  For more information see:
+@emph{https://sourceware.org/elfutils/Debuginfod.html}
+ 
+ Binutils can be built with the debuginfod client library
+ @code{libdebuginfod} using the @option{--with-debuginfod} configure option.
+@@ -5494,6 +5499,10 @@ separate debug files when the files are
+ debuginfod is packaged with elfutils, starting with version 0.178.
+ You can get the latest version from `https://sourceware.org/elfutils/'.
+ 
+The DWARF info dumping tools (@command{readelf} and @command{objdump})
+have options to control when they should access the debuginfod
+servers.  By default this access is enabled.
+
+ @node Reporting Bugs
+ @chapter Reporting Bugs
+ @cindex bugs
+Only in binutils-2.37/binutils/doc: binutils.texi.orig
+diff -rup binutils.orig/binutils/doc/debug.options.texi binutils-2.37/binutils/doc/debug.options.texi
+--- binutils.orig/binutils/doc/debug.options.texi	2022-03-10 10:52:01.073309440 +0000
+++ binutils-2.37/binutils/doc/debug.options.texi	2022-03-10 10:52:09.779252737 +0000
+@@ -68,10 +68,27 @@ chosen when configuring the binutils via
+ @option{--enable-follow-debug-links=no} options.  If these are not
+ used then the default is to enable the following of debug links.
+ 
+Note - if support for the debuginfod protocol was enabled when the
+binutils were built then this option will also include an attempt to
+contact any debuginfod servers mentioned in the @var{DEBUGINFOD_URLS}
+environment variable.  This could take some time to resolve.  This
+behaviour can be disabled via the @option{=do-not-use-debuginfod} debug
+option.
+
+ @item N
+ @itemx =no-follow-links
+ Disables the following of links to separate debug info files.
+ 
+@item D
+@itemx =use-debuginfod
+Enables contacting debuginfod servers if there is a need to follow
+debug links.  This is the default behaviour.
+
+@item E
+@itemx =do-not-use-debuginfod
+Disables contacting debuginfod servers when there is a need to follow
+debug links.
+
+ @item l
+ @itemx =rawline
+ Displays the contents of the @samp{.debug_line} section in a raw
+diff -rup binutils.orig/binutils/dwarf.c binutils-2.37/binutils/dwarf.c
+--- binutils.orig/binutils/dwarf.c	2022-03-10 10:52:01.066309485 +0000
+++ binutils-2.37/binutils/dwarf.c	2022-03-10 10:52:09.779252737 +0000
+@@ -109,6 +109,9 @@ int do_debug_cu_index;
+ int do_wide;
+ int do_debug_links;
+ int do_follow_links = DEFAULT_FOR_FOLLOW_LINKS;
+#ifdef HAVE_LIBDEBUGINFOD
+int use_debuginfod = 1;
+#endif
+ bool do_checks;
+ 
+ int dwarf_cutoff_level = -1;
+@@ -11003,7 +11006,7 @@ debuginfod_fetch_separate_debug_info (st
+ 
+   return false;
+ }
+-#endif
+#endif /* HAVE_LIBDEBUGINFOD  */
+ 
+ static void *
+ load_separate_debug_info (const char *            main_filename,
+@@ -11117,9 +11120,10 @@ load_separate_debug_info (const char *
+   {
+     char * tmp_filename;
+ 
+-    if (debuginfod_fetch_separate_debug_info (xlink,
+-                                              & tmp_filename,
+-                                              file))
+    if (use_debuginfod
+	&& debuginfod_fetch_separate_debug_info (xlink,
+						 & tmp_filename,
+						 file))
+       {
+         /* File successfully downloaded from server, replace
+            debug_filename with the file's path.  */
+@@ -11167,13 +11171,15 @@ load_separate_debug_info (const char *
+       warn (_("tried: %s\n"), debug_filename);
+ 
+ #if HAVE_LIBDEBUGINFOD
+-      {
+-	char *urls = getenv (DEBUGINFOD_URLS_ENV_VAR);
+-	if (urls == NULL)
+-	  urls = "";
+      if (use_debuginfod)
+	{
+	  char *urls = getenv (DEBUGINFOD_URLS_ENV_VAR);
+ 
+-	warn (_("tried: DEBUGINFOD_URLS=%s\n"), urls);
+-      }
+	  if (urls == NULL)
+	    urls = "";
+
+	  warn (_("tried: DEBUGINFOD_URLS=%s\n"), urls);
+	}
+ #endif
+     }
+ 
+@@ -11547,6 +11553,9 @@ dwarf_select_sections_by_names (const ch
+       { "aranges", & do_debug_aranges, 1 },
+       { "cu_index", & do_debug_cu_index, 1 },
+       { "decodedline", & do_debug_lines, FLAG_DEBUG_LINES_DECODED },
+#ifdef HAVE_LIBDEBUGINFOD
+      { "do-not-use-debuginfod", & use_debuginfod, 0 },
+#endif
+       { "follow-links", & do_follow_links, 1 },
+       { "frames", & do_debug_frames, 1 },
+       { "frames-interp", & do_debug_frames_interp, 1 },
+@@ -11570,6 +11579,9 @@ dwarf_select_sections_by_names (const ch
+       { "trace_abbrev", & do_trace_abbrevs, 1 },
+       { "trace_aranges", & do_trace_aranges, 1 },
+       { "trace_info", & do_trace_info, 1 },
+#ifdef HAVE_LIBDEBUGINFOD
+      { "use-debuginfod", & use_debuginfod, 1 },
+#endif
+       { NULL, NULL, 0 }
+     };
+ 
+@@ -11623,6 +11635,10 @@ dwarf_select_sections_by_letters (const
+       case 'A':	do_debug_addr = 1; break;
+       case 'a':	do_debug_abbrevs = 1; break;
+       case 'c':	do_debug_cu_index = 1; break;
+#ifdef HAVE_LIBDEBUGINFOD
+      case 'D': use_debuginfod = 1; break;
+      case 'E': use_debuginfod = 0; break;
+#endif
+       case 'F':	do_debug_frames_interp = 1; /* Fall through.  */
+       case 'f':	do_debug_frames = 1; break;
+       case 'g':	do_gdb_index = 1; break;
+Only in binutils-2.37/binutils/: dwarf.c.orig
+diff -rup binutils.orig/binutils/dwarf.h binutils-2.37/binutils/dwarf.h
+--- binutils.orig/binutils/dwarf.h	2022-03-10 10:52:01.066309485 +0000
+++ binutils-2.37/binutils/dwarf.h	2022-03-10 10:52:09.780252730 +0000
+@@ -221,6 +221,9 @@ extern int do_debug_cu_index;
+ extern int do_wide;
+ extern int do_debug_links;
+ extern int do_follow_links;
+#ifdef HAVE_LIBDEBUGINFOD
+extern int use_debuginfod;
+#endif
+ extern bool do_checks;
+ 
+ extern int dwarf_cutoff_level;
+Only in binutils-2.37/binutils/: dwarf.h.orig
+diff -rup binutils.orig/binutils/objdump.c binutils-2.37/binutils/objdump.c
+--- binutils.orig/binutils/objdump.c	2022-03-10 10:52:01.090309329 +0000
+++ binutils-2.37/binutils/objdump.c	2022-03-10 10:52:09.780252730 +0000
+@@ -280,6 +280,14 @@ usage (FILE *stream, int status)
+                            Do not follow links to separate debug info files\n\
+                             (default)\n"));
+ #endif
+#if HAVE_LIBDEBUGINFOD
+  fprintf (stream, _("\
+  -WD --dwarf=use-debuginfod\n\
+                           When following links, also query debuginfod servers (default)\n"));
+  fprintf (stream, _("\
+  -WE --dwarf=do-not-use-debuginfod\n\
+                           When following links, do not query debuginfod servers\n"));
+#endif
+   fprintf (stream, _("\
+   -L, --process-links      Display the contents of non-debug sections in\n\
+                             separate debuginfo files.  (Implies -WK)\n"));
+diff -rup binutils.orig/binutils/objdump.c.orig binutils-2.37/binutils/objdump.c.orig
+--- binutils.orig/binutils/objdump.c.orig	2022-03-10 10:52:01.065309492 +0000
+++ binutils-2.37/binutils/objdump.c.orig	2022-03-10 10:51:55.365346615 +0000
+@@ -204,6 +204,18 @@ static const struct objdump_private_desc
+ 
+ /* The list of detected jumps inside a function.  */
+ static struct jump_info *detected_jumps = NULL;
+
+typedef enum unicode_display_type
+{
+  unicode_default = 0,
+  unicode_locale,
+  unicode_escape,
+  unicode_hex,
+  unicode_highlight,
+  unicode_invalid
+} unicode_display_type;
+
+static unicode_display_type unicode_display = unicode_default;
+ 
+ static void usage (FILE *, int) ATTRIBUTE_NORETURN;
+ static void
+@@ -330,6 +342,9 @@ usage (FILE *stream, int status)
+       fprintf (stream, _("\
+   -w, --wide                     Format output for more than 80 columns\n"));
+       fprintf (stream, _("\
+  -U[d|l|i|x|e|h]                Controls the display of UTF-8 unicode characters\n\
+  --unicode=[default|locale|invalid|hex|escape|highlight]\n"));
+      fprintf (stream, _("\
+   -z, --disassemble-zeroes       Do not skip blocks of zeroes when disassembling\n"));
+       fprintf (stream, _("\
+       --start-address=ADDR       Only process data whose address is >= ADDR\n"));
+@@ -420,17 +435,23 @@ static struct option long_options[]=
+ {
+   {"adjust-vma", required_argument, NULL, OPTION_ADJUST_VMA},
+   {"all-headers", no_argument, NULL, 'x'},
+-  {"private-headers", no_argument, NULL, 'p'},
+-  {"private", required_argument, NULL, 'P'},
+   {"architecture", required_argument, NULL, 'm'},
+   {"archive-headers", no_argument, NULL, 'a'},
+#ifdef ENABLE_LIBCTF
+  {"ctf", required_argument, NULL, OPTION_CTF},
+  {"ctf-parent", required_argument, NULL, OPTION_CTF_PARENT},
+#endif
+   {"debugging", no_argument, NULL, 'g'},
+   {"debugging-tags", no_argument, NULL, 'e'},
+   {"demangle", optional_argument, NULL, 'C'},
+   {"disassemble", optional_argument, NULL, 'd'},
+   {"disassemble-all", no_argument, NULL, 'D'},
+-  {"disassembler-options", required_argument, NULL, 'M'},
+   {"disassemble-zeroes", no_argument, NULL, 'z'},
+  {"disassembler-options", required_argument, NULL, 'M'},
+  {"dwarf", optional_argument, NULL, OPTION_DWARF},
+  {"dwarf-check", no_argument, 0, OPTION_DWARF_CHECK},
+  {"dwarf-depth", required_argument, 0, OPTION_DWARF_DEPTH},
+  {"dwarf-start", required_argument, 0, OPTION_DWARF_START},
+   {"dynamic-reloc", no_argument, NULL, 'R'},
+   {"dynamic-syms", no_argument, NULL, 'T'},
+   {"endian", required_argument, NULL, OPTION_ENDIAN},
+@@ -440,16 +461,23 @@ static struct option long_options[]=
+   {"full-contents", no_argument, NULL, 's'},
+   {"headers", no_argument, NULL, 'h'},
+   {"help", no_argument, NULL, 'H'},
+  {"include", required_argument, NULL, 'I'},
+   {"info", no_argument, NULL, 'i'},
+  {"inlines", no_argument, 0, OPTION_INLINES},
+  {"insn-width", required_argument, NULL, OPTION_INSN_WIDTH},
+   {"line-numbers", no_argument, NULL, 'l'},
+-  {"no-show-raw-insn", no_argument, &show_raw_insn, -1},
+   {"no-addresses", no_argument, &no_addresses, 1},
+-  {"process-links", no_argument, &process_links, true},
+  {"no-recurse-limit", no_argument, NULL, OPTION_NO_RECURSE_LIMIT},
+  {"no-recursion-limit", no_argument, NULL, OPTION_NO_RECURSE_LIMIT},
+  {"no-show-raw-insn", no_argument, &show_raw_insn, -1},
+  {"prefix", required_argument, NULL, OPTION_PREFIX},
+   {"prefix-addresses", no_argument, &prefix_addresses, 1},
+  {"prefix-strip", required_argument, NULL, OPTION_PREFIX_STRIP},
+  {"private", required_argument, NULL, 'P'},
+  {"private-headers", no_argument, NULL, 'p'},
+  {"process-links", no_argument, &process_links, true},
+   {"recurse-limit", no_argument, NULL, OPTION_RECURSE_LIMIT},
+   {"recursion-limit", no_argument, NULL, OPTION_RECURSE_LIMIT},
+-  {"no-recurse-limit", no_argument, NULL, OPTION_NO_RECURSE_LIMIT},
+-  {"no-recursion-limit", no_argument, NULL, OPTION_NO_RECURSE_LIMIT},
+   {"reloc", no_argument, NULL, 'r'},
+   {"section", required_argument, NULL, 'j'},
+   {"section-headers", no_argument, NULL, 'h'},
+@@ -457,28 +485,16 @@ static struct option long_options[]=
+   {"source", no_argument, NULL, 'S'},
+   {"source-comment", optional_argument, NULL, OPTION_SOURCE_COMMENT},
+   {"special-syms", no_argument, &dump_special_syms, 1},
+-  {"include", required_argument, NULL, 'I'},
+-  {"dwarf", optional_argument, NULL, OPTION_DWARF},
+-#ifdef ENABLE_LIBCTF
+-  {"ctf", required_argument, NULL, OPTION_CTF},
+-  {"ctf-parent", required_argument, NULL, OPTION_CTF_PARENT},
+-#endif
+   {"stabs", no_argument, NULL, 'G'},
+   {"start-address", required_argument, NULL, OPTION_START_ADDRESS},
+   {"stop-address", required_argument, NULL, OPTION_STOP_ADDRESS},
+   {"syms", no_argument, NULL, 't'},
+   {"target", required_argument, NULL, 'b'},
+  {"unicode", required_argument, NULL, 'U'},
+   {"version", no_argument, NULL, 'V'},
+-  {"wide", no_argument, NULL, 'w'},
+-  {"prefix", required_argument, NULL, OPTION_PREFIX},
+-  {"prefix-strip", required_argument, NULL, OPTION_PREFIX_STRIP},
+-  {"insn-width", required_argument, NULL, OPTION_INSN_WIDTH},
+-  {"dwarf-depth", required_argument, 0, OPTION_DWARF_DEPTH},
+-  {"dwarf-start", required_argument, 0, OPTION_DWARF_START},
+-  {"dwarf-check", no_argument, 0, OPTION_DWARF_CHECK},
+-  {"inlines", no_argument, 0, OPTION_INLINES},
+   {"visualize-jumps", optional_argument, 0, OPTION_VISUALIZE_JUMPS},
+-  {0, no_argument, 0, 0}
+  {"wide", no_argument, NULL, 'w'},
+  {NULL, no_argument, NULL, 0}
+ };
+ 
+ static void
+@@ -488,9 +504,121 @@ nonfatal (const char *msg)
+   exit_status = 1;
+ }
+ 
+/* Convert a potential UTF-8 encoded sequence in IN into characters in OUT.
+   The conversion format is controlled by the unicode_display variable.
+   Returns the number of characters added to OUT.
+   Returns the number of bytes consumed from IN in CONSUMED.
+   Always consumes at least one byte and displays at least one character.  */
+   
+static unsigned int
+display_utf8 (const unsigned char * in, char * out, unsigned int * consumed)
+{
+  char *        orig_out = out;
+  unsigned int  nchars = 0;
+  unsigned int j;
+
+  if (unicode_display == unicode_default)
+    goto invalid;
+
+  if (in[0] < 0xc0)
+    goto invalid;
+
+  if ((in[1] & 0xc0) != 0x80)
+    goto invalid;
+
+  if ((in[0] & 0x20) == 0)
+    {
+      nchars = 2;
+      goto valid;
+    }
+
+  if ((in[2] & 0xc0) != 0x80)
+    goto invalid;
+
+  if ((in[0] & 0x10) == 0)
+    {
+      nchars = 3;
+      goto valid;
+    }
+
+  if ((in[3] & 0xc0) != 0x80)
+    goto invalid;
+
+  nchars = 4;
+
+ valid:
+  switch (unicode_display)
+    {
+    case unicode_locale:
+      /* Copy the bytes into the output buffer as is.  */
+      memcpy (out, in, nchars);
+      out += nchars;
+      break;
+
+    case unicode_invalid:
+    case unicode_hex:
+      out += sprintf (out, "%c", unicode_display == unicode_hex ? '<' : '{');
+      out += sprintf (out, "0x");
+      for (j = 0; j < nchars; j++)
+	out += sprintf (out, "%02x", in [j]);
+      out += sprintf (out, "%c", unicode_display == unicode_hex ? '>' : '}');
+      break;
+      
+    case unicode_highlight:
+      if (isatty (1))
+	out += sprintf (out, "\x1B[31;47m"); /* Red.  */
+      /* Fall through.  */
+    case unicode_escape:
+      switch (nchars)
+	{
+	case 2:
+	  out += sprintf (out, "\\u%02x%02x",
+		  ((in[0] & 0x1c) >> 2), 
+		  ((in[0] & 0x03) << 6) | (in[1] & 0x3f));
+	  break;
+
+	case 3:
+	  out += sprintf (out, "\\u%02x%02x",
+		  ((in[0] & 0x0f) << 4) | ((in[1] & 0x3c) >> 2),
+		  ((in[1] & 0x03) << 6) | ((in[2] & 0x3f)));
+	  break;
+
+	case 4:
+	  out += sprintf (out, "\\u%02x%02x%02x",
+		  ((in[0] & 0x07) << 6) | ((in[1] & 0x3c) >> 2),
+		  ((in[1] & 0x03) << 6) | ((in[2] & 0x3c) >> 2),
+		  ((in[2] & 0x03) << 6) | ((in[3] & 0x3f)));
+	  break;
+	default:
+	  /* URG.  */
+	  break;
+	}
+
+      if (unicode_display == unicode_highlight && isatty (1))
+	out += sprintf (out, "\033[0m"); /* Default colour.  */
+      break;
+
+    default:
+      /* URG */
+      break;
+    }
+
+  * consumed = nchars;
+  return out - orig_out;
+
+ invalid:
+  /* Not a valid UTF-8 sequence.  */
+  *out = *in;
+  * consumed = 1;
+  return 1;
+}
+
+ /* Returns a version of IN with any control characters
+    replaced by escape sequences.  Uses a static buffer
+-   if necessary.  */
+   if necessary.
+
+   If unicode display is enabled, then also handles the
+   conversion of unicode characters.  */
+ 
+ static const char *
+ sanitize_string (const char * in)
+@@ -508,40 +636,50 @@ sanitize_string (const char * in)
+      of cases it will not be needed.  */
+   do
+     {
+-      char c = *in++;
+      unsigned char c = *in++;
+ 
+       if (c == 0)
+ 	return original;
+ 
+       if (ISCNTRL (c))
+ 	break;
+
+      if (unicode_display != unicode_default && c >= 0xc0)
+	break;
+     }
+   while (1);
+ 
+   /* Copy the input, translating as needed.  */
+   in = original;
+-  if (buffer_len < (strlen (in) * 2))
+  if (buffer_len < (strlen (in) * 9))
+     {
+       free ((void *) buffer);
+-      buffer_len = strlen (in) * 2;
+      buffer_len = strlen (in) * 9;
+       buffer = xmalloc (buffer_len + 1);
+     }
+ 
+   out = buffer;
+   do
+     {
+-      char c = *in++;
+      unsigned char c = *in++;
+ 
+       if (c == 0)
+ 	break;
+ 
+-      if (!ISCNTRL (c))
+-	*out++ = c;
+-      else
+      if (ISCNTRL (c))
+ 	{
+ 	  *out++ = '^';
+ 	  *out++ = c + 0x40;
+ 	}
+      else if (unicode_display != unicode_default && c >= 0xc0)
+	{
+	  unsigned int num_consumed;
+
+	  out += display_utf8 ((const unsigned char *)(in - 1), out, & num_consumed);
+	  in += num_consumed - 1;
+	}
+      else
+	*out++ = c;
+     }
+   while (1);
+ 
+@@ -4529,6 +4667,24 @@ dump_symbols (bfd *abfd ATTRIBUTE_UNUSED
+ 		  free (alloc);
+ 		}
+ 	    }
+	  else if (unicode_display != unicode_default
+		   && name != NULL && *name != '\0')
+	    {
+	      const char * sanitized_name;
+
+	      /* If we want to sanitize the name, we do it here, and
+		 temporarily clobber it while calling bfd_print_symbol.
+		 FIXME: This is a gross hack.  */
+	      sanitized_name = sanitize_string (name);
+	      if (sanitized_name != name)
+		(*current)->name = sanitized_name;
+	      else
+		sanitized_name = NULL;
+	      bfd_print_symbol (cur_bfd, stdout, *current,
+				bfd_print_symbol_all);
+	      if (sanitized_name != NULL)
+		(*current)->name = name;
+	    }
+ 	  else
+ 	    bfd_print_symbol (cur_bfd, stdout, *current,
+ 			      bfd_print_symbol_all);
+@@ -5212,7 +5368,7 @@ main (int argc, char **argv)
+   set_default_bfd_target ();
+ 
+   while ((c = getopt_long (argc, argv,
+-			   "pP:ib:m:M:VvCdDlfFaHhrRtTxsSI:j:wE:zgeGW::",
+			   "pP:ib:m:M:VvCdDlfFaHhrRtTU:xsSI:j:wE:zgeGW::",
+ 			   long_options, (int *) 0))
+ 	 != EOF)
+     {
+@@ -5495,6 +5651,23 @@ main (int argc, char **argv)
+ 	  seenflag = true;
+ 	  break;
+ 
+	case 'U':
+	  if (streq (optarg, "default") || streq (optarg, "d"))
+	    unicode_display = unicode_default;
+	  else if (streq (optarg, "locale") || streq (optarg, "l"))
+	    unicode_display = unicode_locale;
+	  else if (streq (optarg, "escape") || streq (optarg, "e"))
+	    unicode_display = unicode_escape;
+	  else if (streq (optarg, "invalid") || streq (optarg, "i"))
+	    unicode_display = unicode_invalid;
+	  else if (streq (optarg, "hex") || streq (optarg, "x"))
+	    unicode_display = unicode_hex;
+	  else if (streq (optarg, "highlight") || streq (optarg, "h"))
+	    unicode_display = unicode_highlight;
+	  else
+	    fatal (_("invalid argument to -U/--unicode: %s"), optarg);
+	  break;
+
+ 	case 'H':
+ 	  usage (stdout, 0);
+ 	  /* No need to set seenflag or to break - usage() does not return.  */
+diff -rup binutils.orig/binutils/readelf.c binutils-2.37/binutils/readelf.c
+--- binutils.orig/binutils/readelf.c	2022-03-10 10:52:01.063309505 +0000
+++ binutils-2.37/binutils/readelf.c	2022-03-10 10:52:09.781252724 +0000
+@@ -4955,6 +4955,14 @@ usage (FILE * stream)
+                          Do not follow links to separate debug info files\n\
+                           (default)\n"));
+ #endif
+#if HAVE_LIBDEBUGINFOD
+  fprintf (stream, _("\
+  -wD --debug-dump=use-debuginfod\n\
+                         When following links, also query debuginfod servers (default)\n"));
+  fprintf (stream, _("\
+  -wE --debug-dump=do-not-use-debuginfod\n\
+                         When following links, do not query debuginfod servers\n"));
+#endif
+   fprintf (stream, _("\
+   --dwarf-depth=N        Do not display DIEs at depth N or greater\n"));
+   fprintf (stream, _("\
+diff -rup binutils.orig/binutils/readelf.c.orig binutils-2.37/binutils/readelf.c.orig
+--- binutils.orig/binutils/readelf.c.orig	2022-03-10 10:52:01.089309336 +0000
+++ binutils-2.37/binutils/readelf.c.orig	2022-03-10 10:51:55.396346413 +0000
+@@ -328,6 +328,19 @@ typedef enum print_mode
+ }
+ print_mode;
+ 
+typedef enum unicode_display_type
+{
+  unicode_default = 0,
+  unicode_locale,
+  unicode_escape,
+  unicode_hex,
+  unicode_highlight,
+  unicode_invalid
+} unicode_display_type;
+
+static unicode_display_type unicode_display = unicode_default;
+
+  
+ /* Versioned symbol info.  */
+ enum versioned_symbol_info
+ {
+@@ -632,11 +645,18 @@ print_symbol (signed int width, const ch
+       if (c == 0)
+ 	break;
+ 
+-      /* Do not print control characters directly as they can affect terminal
+-	 settings.  Such characters usually appear in the names generated
+-	 by the assembler for local labels.  */
+-      if (ISCNTRL (c))
+      if (ISPRINT (c))
+ 	{
+	  putchar (c);
+	  width_remaining --;
+	  num_printed ++;
+	}
+      else if (ISCNTRL (c))
+	{
+	  /* Do not print control characters directly as they can affect terminal
+	     settings.  Such characters usually appear in the names generated
+	     by the assembler for local labels.  */
+
+ 	  if (width_remaining < 2)
+ 	    break;
+ 
+@@ -644,11 +664,137 @@ print_symbol (signed int width, const ch
+ 	  width_remaining -= 2;
+ 	  num_printed += 2;
+ 	}
+-      else if (ISPRINT (c))
+      else if (c == 0x7f)
+ 	{
+-	  putchar (c);
+-	  width_remaining --;
+-	  num_printed ++;
+	  if (width_remaining < 5)
+	    break;
+	  printf ("<DEL>");
+	  width_remaining -= 5;
+	  num_printed += 5;
+	}
+      else if (unicode_display != unicode_locale
+	       && unicode_display != unicode_default)
+	{
+	  /* Display unicode characters as something else.  */
+	  unsigned char bytes[4];
+	  bool          is_utf8;
+	  uint          nbytes;
+
+	  bytes[0] = c;
+
+	  if (bytes[0] < 0xc0)
+	    {
+	      nbytes = 1;
+	      is_utf8 = false;
+	    }
+	  else
+	    {
+	      bytes[1] = *symbol++;
+
+	      if ((bytes[1] & 0xc0) != 0x80)
+		{
+		  is_utf8 = false;
+		  /* Do not consume this character.  It may only
+		     be the first byte in the sequence that was
+		     corrupt.  */
+		  --symbol;
+		  nbytes = 1;
+		}
+	      else if ((bytes[0] & 0x20) == 0)
+		{
+		  is_utf8 = true;
+		  nbytes = 2;
+		}
+	      else
+		{
+		  bytes[2] = *symbol++;
+
+		  if ((bytes[2] & 0xc0) != 0x80)
+		    {
+		      is_utf8 = false;
+		      symbol -= 2;
+		      nbytes = 1;
+		    }
+		  else if ((bytes[0] & 0x10) == 0)
+		    {
+		      is_utf8 = true;
+		      nbytes = 3;
+		    }
+		  else
+		    {
+		      bytes[3] = *symbol++;
+
+		      nbytes = 4;
+
+		      if ((bytes[3] & 0xc0) != 0x80)
+			{
+			  is_utf8 = false;
+			  symbol -= 3;
+			  nbytes = 1;
+			}
+		      else
+			is_utf8 = true;
+		    }
+		}
+	    }
+
+	  if (unicode_display == unicode_invalid)
+	    is_utf8 = false;
+
+	  if (unicode_display == unicode_hex || ! is_utf8)
+	    {
+	      uint i;
+
+	      if (width_remaining < (nbytes * 2) + 2)
+		break;
+	  
+	      putchar (is_utf8 ? '<' : '{');
+	      printf ("0x");
+	      for (i = 0; i < nbytes; i++)
+		printf ("%02x", bytes[i]);
+	      putchar (is_utf8 ? '>' : '}');
+	    }
+	  else
+	    {
+	      if (unicode_display == unicode_highlight && isatty (1))
+		printf ("\x1B[31;47m"); /* Red.  */
+	      
+	      switch (nbytes)
+		{
+		case 2:
+		  if (width_remaining < 6)
+		    break;
+		  printf ("\\u%02x%02x",
+			  (bytes[0] & 0x1c) >> 2, 
+			  ((bytes[0] & 0x03) << 6) | (bytes[1] & 0x3f));
+		  break;
+		case 3:
+		  if (width_remaining < 6)
+		    break;
+		  printf ("\\u%02x%02x",
+			  ((bytes[0] & 0x0f) << 4) | ((bytes[1] & 0x3c) >> 2),
+			  ((bytes[1] & 0x03) << 6) | (bytes[2] & 0x3f));
+		  break;
+		case 4:
+		  if (width_remaining < 8)
+		    break;
+		  printf ("\\u%02x%02x%02x",
+			  ((bytes[0] & 0x07) << 6) | ((bytes[1] & 0x3c) >> 2),
+			  ((bytes[1] & 0x03) << 6) | ((bytes[2] & 0x3c) >> 2),
+			  ((bytes[2] & 0x03) << 6) | (bytes[3] & 0x3f));
+		  
+		  break;
+		default:
+		  /* URG.  */
+		  break;
+		}
+
+	      if (unicode_display == unicode_highlight && isatty (1))
+		printf ("\033[0m"); /* Default colour.  */
+	    }
+	  
+	  if (bytes[nbytes - 1] == 0)
+	    break;
+ 	}
+       else
+ 	{
+@@ -4668,6 +4814,7 @@ static struct option options[] =
+   {"syms",	       no_argument, 0, 's'},
+   {"silent-truncation",no_argument, 0, 'T'},
+   {"section-details",  no_argument, 0, 't'},
+  {"unicode",          required_argument, NULL, 'U'},
+   {"unwind",	       no_argument, 0, 'u'},
+   {"version-info",     no_argument, 0, 'V'},
+   {"version",	       no_argument, 0, 'v'},
+@@ -4744,6 +4891,12 @@ usage (FILE * stream)
+   fprintf (stream, _("\
+      --no-recurse-limit  Disable a demangling recursion limit\n"));
+   fprintf (stream, _("\
+     -U[dlexhi] --unicode=[default|locale|escape|hex|highlight|invalid]\n\
+                         Display unicode characters as determined by the current locale\n\
+                          (default), escape sequences, \"<hex sequences>\", highlighted\n\
+                          escape sequences, or treat them as invalid and display as\n\
+                          \"{hex sequences}\"\n"));
+  fprintf (stream, _("\
+   -n --notes             Display the core notes (if present)\n"));
+   fprintf (stream, _("\
+   -r --relocs            Display the relocations (if present)\n"));
+@@ -4928,7 +5081,7 @@ parse_args (struct dump_data *dumpdata,
+     usage (stderr);
+ 
+   while ((c = getopt_long
+-	  (argc, argv, "ACDHILNPR:STVWacdeghi:lnp:rstuvw::x:z", options, NULL)) != EOF)
+	  (argc, argv, "ACDHILNPR:STU:VWacdeghi:lnp:rstuvw::x:z", options, NULL)) != EOF)
+     {
+       switch (c)
+ 	{
+@@ -5130,6 +5283,25 @@ parse_args (struct dump_data *dumpdata,
+ 	  /* Ignored for backward compatibility.  */
+ 	  break;
+ 
+	case 'U':
+	  if (optarg == NULL)
+	    error (_("Missing arg to -U/--unicode")); /* Can this happen ?  */
+	  else if (streq (optarg, "default") || streq (optarg, "d"))
+	    unicode_display = unicode_default;
+	  else if (streq (optarg, "locale") || streq (optarg, "l"))
+	    unicode_display = unicode_locale;
+	  else if (streq (optarg, "escape") || streq (optarg, "e"))
+	    unicode_display = unicode_escape;
+	  else if (streq (optarg, "invalid") || streq (optarg, "i"))
+	    unicode_display = unicode_invalid;
+	  else if (streq (optarg, "hex") || streq (optarg, "x"))
+	    unicode_display = unicode_hex;
+	  else if (streq (optarg, "highlight") || streq (optarg, "h"))
+	    unicode_display = unicode_highlight;
+	  else
+	    error (_("invalid argument to -U/--unicode: %s"), optarg);
+	  break;
+
+ 	case OPTION_SYM_BASE:
+ 	  sym_base = 0;
+ 	  if (optarg != NULL)
+@@ -5285,10 +5457,7 @@ process_file_header (Filedata * filedata
+       if (filedata->section_headers != NULL
+ 	  && header->e_phnum == PN_XNUM
+ 	  && filedata->section_headers[0].sh_info != 0)
+-	{
+-	  header->e_phnum = filedata->section_headers[0].sh_info;
+-	  printf (" (%u)", header->e_phnum);
+-	}
+	printf (" (%u)", filedata->section_headers[0].sh_info);
+       putc ('\n', stdout);
+       printf (_("  Size of section headers:           %u (bytes)\n"),
+ 	      header->e_shentsize);
+@@ -5321,7 +5490,12 @@ process_file_header (Filedata * filedata
+     {
+       if (header->e_phnum == PN_XNUM
+ 	  && filedata->section_headers[0].sh_info != 0)
+-	header->e_phnum = filedata->section_headers[0].sh_info;
+	{
+	  /* Throw away any cached read of PN_XNUM headers.  */
+	  free (filedata->program_headers);
+	  filedata->program_headers = NULL;
+	  header->e_phnum = filedata->section_headers[0].sh_info;
+       }
+       if (header->e_shnum == SHN_UNDEF)
+ 	header->e_shnum = filedata->section_headers[0].sh_size;
+       if (header->e_shstrndx == (SHN_XINDEX & 0xffff))
+@@ -18873,6 +19047,8 @@ get_note_type (Filedata * filedata, unsi
+ 	return _("func");
+       case NT_GO_BUILDID:
+ 	return _("GO BUILDID");
+      case FDO_PACKAGING_METADATA:
+	return _("FDO_PACKAGING_METADATA");
+       default:
+ 	break;
+       }
+@@ -20024,6 +20200,17 @@ print_stapsdt_note (Elf_Internal_Note *p
+   return false;
+ }
+ 
+static bool
+print_fdo_note (Elf_Internal_Note * pnote)
+{
+  if (pnote->descsz > 0 && pnote->type == FDO_PACKAGING_METADATA)
+    {
+      printf (_("    Packaging Metadata: %.*s\n"), (int) pnote->descsz, pnote->descdata);
+      return true;
+    }
+  return false;
+}
+
+ static const char *
+ get_ia64_vms_note_type (unsigned e_type)
+ {
+@@ -20753,6 +20940,8 @@ process_note (Elf_Internal_Note *  pnote
+     return print_stapsdt_note (pnote);
+   else if (startswith (pnote->namedata, "CORE"))
+     return print_core_note (pnote);
+  else if (startswith (pnote->namedata, "FDO"))
+    return print_fdo_note (pnote);
+   else if (((startswith (pnote->namedata, "GA")
+ 	     && strchr ("*$!+", pnote->namedata[2]) != NULL)
+ 	    || strchr ("*$!+", pnote->namedata[0]) != NULL)
+diff -rup binutils.orig/binutils/testsuite/binutils-all/debuginfod.exp binutils-2.37/binutils/testsuite/binutils-all/debuginfod.exp
+--- binutils.orig/binutils/testsuite/binutils-all/debuginfod.exp	2022-03-10 10:52:01.079309401 +0000
+++ binutils-2.37/binutils/testsuite/binutils-all/debuginfod.exp	2022-03-10 10:52:09.782252717 +0000
+@@ -184,8 +184,14 @@ proc test_fetch_debugaltlink { prog prog
+ }
+ 
+ if { [regexp ".*DEBUGINFOD.*" $conf_objdump] } {
+-    test_fetch_debuglink $OBJDUMP "-W"
+    test_fetch_debuglink $OBJDUMP "-W -WD"
+     test_fetch_debugaltlink $OBJDUMP "-Wk"
+
+    set test "disabling debuginfod access"
+    setup_xfail *-*-*
+    test_fetch_debuglink $OBJDUMP "-W -WE"
+    set test "debuginfod"
+
+ } else {
+     untested "$test (objdump not configured with debuginfod)"
+ }
+@@ -193,6 +199,12 @@ if { [regexp ".*DEBUGINFOD.*" $conf_objd
+ if { [regexp ".*DEBUGINFOD.*" $conf_readelf] } {
+     test_fetch_debuglink $READELF "-w"
+     test_fetch_debugaltlink $READELF "-wk"
+
+    set test "disabling debuginfod access"
+    setup_xfail *-*-*
+    test_fetch_debuglink $READELF "-w -wE"
+    set test "debuginfod"
+
+ } else {
+     untested "$test (readelf not configured with debuginfod)"
+ }
+Only in binutils-2.37/binutils/testsuite/binutils-all: debuginfod.exp.orig
--- a/binutils-gas-Use-the-directory-name-in-.file-0.patch
+++ b/binutils-gas-Use-the-directory-name-in-.file-0.patch
@ -0,0 +1,323 @@
+commit 58f3b6a3495074da39ba6e19935e4401dcbacf88
+Author: H.J. Lu <hjl.tools@gmail.com>
+Date:   Thu Sep 9 09:14:42 2021 -0700
+
+    gas: Use the directory name in .file 0
+    
+    DWARF5 allows .file 0 to take an optional directory name.  Set the entry
+    0 of the directory table to the directory name in .file 0.
+    
+            PR gas/28266
+            * dwarf2dbg.c (get_directory_table_entry): Add an argument for
+            the directory name in .file 0 and use it, instead of PWD.
+            (allocate_filenum): Pass NULL to get_directory_table_entry.
+            (allocate_filename_to_slot): Pass the incoming dirname to
+            get_directory_table_entry.
+            * testsuite/gas/elf/dwarf-5-file0-2.d: New file.
+            * testsuite/gas/elf/dwarf-5-file0-2.s: Likewise.
+            * testsuite/gas/elf/elf.exp: Run dwarf-5-file0-2.
+
+diff --git a/gas/dwarf2dbg.c b/gas/dwarf2dbg.c
+index 8f5248534ad..9e3437b8948 100644
+--- a/gas/dwarf2dbg.c
+++ b/gas/dwarf2dbg.c
+@@ -592,6 +592,7 @@ get_basename (const char * pathname)
+ 
+ static unsigned int
+ get_directory_table_entry (const char *dirname,
+			   const char *file0_dirname,
+ 			   size_t dirlen,
+ 			   bool can_use_zero)
+ {
+@@ -621,7 +622,7 @@ get_directory_table_entry (const char *dirname,
+     {
+       if (dirs == NULL || dirs[0] == NULL)
+ 	{
+-	  const char * pwd = getpwd ();
+	  const char * pwd = file0_dirname ? file0_dirname : getpwd ();
+ 
+ 	  if (dwarf_level >= 5 && strcmp (dirname, pwd) != 0)
+ 	    {
+@@ -630,7 +631,8 @@ get_directory_table_entry (const char *dirname,
+ 		 directory).  Since we are about to create a directory entry that
+ 		 is not the same, allocate the current directory first.
+ 		 FIXME: Alternatively we could generate an error message here.  */
+-	      (void) get_directory_table_entry (pwd, strlen (pwd), true);
+	      (void) get_directory_table_entry (pwd, NULL, strlen (pwd),
+						true);
+ 	      d = 1;
+ 	    }
+ 	  else
+@@ -726,7 +728,7 @@ allocate_filenum (const char * pathname)
+   file = get_basename (pathname);
+   dir_len = file - pathname;
+ 
+-  dir = get_directory_table_entry (pathname, dir_len, false);
+  dir = get_directory_table_entry (pathname, NULL, dir_len, false);
+ 
+   /* Do not use slot-0.  That is specifically reserved for use by
+      the '.file 0 "name"' directive.  */
+@@ -766,6 +768,7 @@ allocate_filename_to_slot (const char *dirname,
+   const char *file;
+   size_t dirlen;
+   unsigned int i, d;
+  const char *file0_dirname = dirname;
+ 
+   /* Short circuit the common case of adding the same pathname
+      as last time.  */
+@@ -856,7 +859,8 @@ allocate_filename_to_slot (const char *dirname,
+       file = filename;
+     }
+ 
+-  d = get_directory_table_entry (dirname, dirlen, num == 0);
+  d = get_directory_table_entry (dirname, file0_dirname, dirlen,
+				 num == 0);
+   i = num;
+ 
+   if (! assign_file_to_slot (i, file, d))
+diff --git a/gas/testsuite/gas/elf/dwarf-5-file0-2.d b/gas/testsuite/gas/elf/dwarf-5-file0-2.d
+new file mode 100644
+index 00000000000..4b3ed29f4c9
+--- /dev/null
+++ b/gas/testsuite/gas/elf/dwarf-5-file0-2.d
+@@ -0,0 +1,15 @@
+#as: --gdwarf-5
+#name: DWARF5 .file 0 dir file
+#readelf: -wl
+
+#...
+ The Directory Table \(offset 0x.*, lines 1, columns 1\):
+  Entry	Name
+#...
+  0	\(indirect line string, offset: 0x.*\): /example
+
+ The File Name Table \(offset 0x.*, lines 2, columns 2\):
+  Entry	Dir	Name
+  0	0	\(indirect line string, offset: 0x.*\): test.c
+  1	0	\(indirect line string, offset: 0x.*\): test.c
+#pass
+diff --git a/gas/testsuite/gas/elf/dwarf-5-file0-2.s b/gas/testsuite/gas/elf/dwarf-5-file0-2.s
+new file mode 100644
+index 00000000000..135a03bf493
+--- /dev/null
+++ b/gas/testsuite/gas/elf/dwarf-5-file0-2.s
+@@ -0,0 +1,111 @@
+	.file	"test.c"
+	.text
+.Ltext0:
+	.file 0 "/example" "test.c"
+	.globl	x
+	.section	.bss
+	.balign 4
+	.type	x, @object
+	.size	x, 4
+x:
+	.zero	4
+	.text
+.Letext0:
+	.file 1 "test.c"
+	.section	.debug_info,"",%progbits
+.Ldebug_info0:
+	.long	0x32
+	.2byte	0x5
+	.byte	0x1
+	.byte	0x4
+	.long	.Ldebug_abbrev0
+	.uleb128 0x1
+	.long	.LASF2
+	.byte	0x1d
+	.long	.LASF0
+	.long	.LASF1
+	.long	.Ldebug_line0
+	.uleb128 0x2
+	.string	"x"
+	.byte	0x1
+	.byte	0x1
+	.byte	0x5
+	.long	0x2e
+	.uleb128 0x5
+	.byte	0x3
+	.long	x
+	.uleb128 0x3
+	.byte	0x4
+	.byte	0x5
+	.string	"int"
+	.byte	0
+	.section	.debug_abbrev,"",%progbits
+.Ldebug_abbrev0:
+	.uleb128 0x1
+	.uleb128 0x11
+	.byte	0x1
+	.uleb128 0x25
+	.uleb128 0xe
+	.uleb128 0x13
+	.uleb128 0xb
+	.uleb128 0x3
+	.uleb128 0x1f
+	.uleb128 0x1b
+	.uleb128 0x1f
+	.uleb128 0x10
+	.uleb128 0x17
+	.byte	0
+	.byte	0
+	.uleb128 0x2
+	.uleb128 0x34
+	.byte	0
+	.uleb128 0x3
+	.uleb128 0x8
+	.uleb128 0x3a
+	.uleb128 0xb
+	.uleb128 0x3b
+	.uleb128 0xb
+	.uleb128 0x39
+	.uleb128 0xb
+	.uleb128 0x49
+	.uleb128 0x13
+	.uleb128 0x3f
+	.uleb128 0x19
+	.uleb128 0x2
+	.uleb128 0x18
+	.byte	0
+	.byte	0
+	.uleb128 0x3
+	.uleb128 0x24
+	.byte	0
+	.uleb128 0xb
+	.uleb128 0xb
+	.uleb128 0x3e
+	.uleb128 0xb
+	.uleb128 0x3
+	.uleb128 0x8
+	.byte	0
+	.byte	0
+	.byte	0
+	.section	.debug_aranges,"",%progbits
+	.long	0x14
+	.2byte	0x2
+	.long	.Ldebug_info0
+	.byte	0x4
+	.byte	0
+	.2byte	0
+	.2byte	0
+	.long	0
+	.long	0
+	.section	.debug_line,"",%progbits
+.Ldebug_line0:
+	.section	.debug_str,"MS",%progbits,1
+.LASF2:
+	.string	"GNU C17 11.2.1 -g"
+	.section	.debug_line_str,"MS",%progbits,1
+.LASF1:
+	.string	"/example"
+.LASF0:
+	.string	"test.c"
+	.ident	"GCC: (GNU) 11.2.1"
+	.section	.note.GNU-stack,"",%progbits
+diff --git a/gas/testsuite/gas/elf/elf.exp b/gas/testsuite/gas/elf/elf.exp
+index 18bc1db8c70..2485008d569 100644
+--- a/gas/testsuite/gas/elf/elf.exp
+++ b/gas/testsuite/gas/elf/elf.exp
+@@ -297,6 +297,7 @@ if { [is_elf_format] } then {
+     run_dump_test "dwarf2-19" $dump_opts
+     run_dump_test "dwarf2-20" $dump_opts
+     run_dump_test "dwarf-5-file0" $dump_opts
+    run_dump_test "dwarf-5-file0-2" $dump_opts
+     run_dump_test "dwarf-5-dir0" $dump_opts
+     run_dump_test "dwarf-4-cu" $dump_opts
+     run_dump_test "dwarf-5-cu" $dump_opts
+commit 9f81b99e2426d19760c20c07f8cd3ae5cd85e8df
+Author: Alan Modra <amodra@gmail.com>
+Date:   Fri Sep 10 18:01:43 2021 +0930
+
+    Re: gas: Use the directory name in .file 0
+    
+            PR gas/28266
+            * testsuite/gas/elf/dwarf-5-file0-2.s: Use %object rather than
+            @object, .4byte instead of .long, and .asciz instead of .string.
+
+diff --git a/gas/testsuite/gas/elf/dwarf-5-file0-2.s b/gas/testsuite/gas/elf/dwarf-5-file0-2.s
+index 135a03bf493..bab4a16b56b 100644
+--- a/gas/testsuite/gas/elf/dwarf-5-file0-2.s
+++ b/gas/testsuite/gas/elf/dwarf-5-file0-2.s
+@@ -5,7 +5,7 @@
+ 	.globl	x
+ 	.section	.bss
+ 	.balign 4
+-	.type	x, @object
+	.type	x, %object
+ 	.size	x, 4
+ x:
+ 	.zero	4
+@@ -14,30 +14,30 @@ x:
+ 	.file 1 "test.c"
+ 	.section	.debug_info,"",%progbits
+ .Ldebug_info0:
+-	.long	0x32
+	.4byte	0x32
+ 	.2byte	0x5
+ 	.byte	0x1
+ 	.byte	0x4
+-	.long	.Ldebug_abbrev0
+	.4byte	.Ldebug_abbrev0
+ 	.uleb128 0x1
+-	.long	.LASF2
+	.4byte	.LASF2
+ 	.byte	0x1d
+-	.long	.LASF0
+-	.long	.LASF1
+-	.long	.Ldebug_line0
+	.4byte	.LASF0
+	.4byte	.LASF1
+	.4byte	.Ldebug_line0
+ 	.uleb128 0x2
+-	.string	"x"
+	.asciz	"x"
+ 	.byte	0x1
+ 	.byte	0x1
+ 	.byte	0x5
+-	.long	0x2e
+	.4byte	0x2e
+ 	.uleb128 0x5
+ 	.byte	0x3
+-	.long	x
+	.4byte	x
+ 	.uleb128 0x3
+ 	.byte	0x4
+ 	.byte	0x5
+-	.string	"int"
+	.asciz	"int"
+ 	.byte	0
+ 	.section	.debug_abbrev,"",%progbits
+ .Ldebug_abbrev0:
+@@ -88,24 +88,24 @@ x:
+ 	.byte	0
+ 	.byte	0
+ 	.section	.debug_aranges,"",%progbits
+-	.long	0x14
+	.4byte	0x14
+ 	.2byte	0x2
+-	.long	.Ldebug_info0
+	.4byte	.Ldebug_info0
+ 	.byte	0x4
+ 	.byte	0
+ 	.2byte	0
+ 	.2byte	0
+-	.long	0
+-	.long	0
+	.4byte	0
+	.4byte	0
+ 	.section	.debug_line,"",%progbits
+ .Ldebug_line0:
+ 	.section	.debug_str,"MS",%progbits,1
+ .LASF2:
+-	.string	"GNU C17 11.2.1 -g"
+	.asciz	"GNU C17 11.2.1 -g"
+ 	.section	.debug_line_str,"MS",%progbits,1
+ .LASF1:
+-	.string	"/example"
+	.asciz	"/example"
+ .LASF0:
+-	.string	"test.c"
+	.asciz	"test.c"
+ 	.ident	"GCC: (GNU) 11.2.1"
+ 	.section	.note.GNU-stack,"",%progbits
--- a/binutils-gas-multibyte-warnings.patch
+++ b/binutils-gas-multibyte-warnings.patch
@ -0,0 +1,384 @@
+diff -rupN binutils.orig/gas/NEWS binutils-2.37/gas/NEWS
+--- binutils.orig/gas/NEWS	2021-11-18 16:50:39.104088534 +0000
+++ binutils-2.37/gas/NEWS	2021-11-18 16:51:16.340948280 +0000
+@@ -1,5 +1,13 @@
+ -*- text -*-
+ 
+* The --multibyte-handling=[allow|warn|warn-sym-only] option tells the
+  assembler what to when it encoutners multibyte characters in the input.  The
+  default is to allow them.  Setting the option to "warn" will generate a
+  warning message whenever any multibyte character is encountered.  Using the
+  option to "warn-sym-only" will make the assembler generate a warning whenever a
+  symbol is defined containing multibyte characters.  (References to undefined
+  symbols will not generate warnings).
+
+ Changes in 2.37:
+ 
+ * arm-symbianelf support removed.
+diff -rupN binutils.orig/gas/app.c binutils-2.37/gas/app.c
+--- binutils.orig/gas/app.c	2021-11-18 16:50:39.104088534 +0000
+++ binutils-2.37/gas/app.c	2021-11-18 16:50:42.530075630 +0000
+@@ -345,6 +345,55 @@ process_escape (int ch)
+     }
+ }
+ 
+#define MULTIBYTE_WARN_COUNT_LIMIT 10
+static unsigned int multibyte_warn_count = 0;
+
+bool
+scan_for_multibyte_characters (const unsigned char *  start,
+			       const unsigned char *  end,
+			       bool                   warn)
+{
+  if (end <= start)
+    return false;
+
+  if (warn && multibyte_warn_count > MULTIBYTE_WARN_COUNT_LIMIT)
+    return false;
+
+  bool found = false;
+
+  while (start < end)
+    {
+      unsigned char c;
+
+      if ((c = * start++) <= 0x7f)
+	continue;
+
+      if (!warn)
+	return true;
+
+      found = true;
+
+      const char * filename;
+      unsigned int lineno;
+
+      filename = as_where (& lineno);
+      if (filename == NULL)
+	as_warn (_("multibyte character (%#x) encountered in input"), c);
+      else if (lineno == 0)
+	as_warn (_("multibyte character (%#x) encountered in %s"), c, filename);
+      else
+	as_warn (_("multibyte character (%#x) encountered in %s at or near line %u"), c, filename, lineno);
+
+      if (++ multibyte_warn_count == MULTIBYTE_WARN_COUNT_LIMIT)
+	{
+	  as_warn (_("further multibyte character warnings suppressed"));
+	  break;
+	}
+    }
+
+  return found;
+}
+
+ /* This function is called to process input characters.  The GET
+    parameter is used to retrieve more input characters.  GET should
+    set its parameter to point to a buffer, and return the length of
+@@ -463,6 +512,11 @@ do_scrub_chars (size_t (*get) (char *, s
+ 	return 0;
+       from = input_buffer;
+       fromend = from + fromlen;
+
+      if (multibyte_handling == multibyte_warn)
+	(void) scan_for_multibyte_characters ((const unsigned char *) from,
+					      (const unsigned char* ) fromend,
+					      true /* Generate warnings.  */);
+     }
+ 
+   while (1)
+diff -rupN binutils.orig/gas/as.c binutils-2.37/gas/as.c
+--- binutils.orig/gas/as.c	2021-11-18 16:50:39.104088534 +0000
+++ binutils-2.37/gas/as.c	2021-11-18 16:50:42.531075627 +0000
+@@ -474,7 +474,7 @@ parse_args (int * pargc, char *** pargv)
+       OPTION_DEBUG_PREFIX_MAP,
+       OPTION_DEFSYM,
+       OPTION_LISTING_LHS_WIDTH,
+-      OPTION_LISTING_LHS_WIDTH2,
+      OPTION_LISTING_LHS_WIDTH2, /* = STD_BASE + 10 */
+       OPTION_LISTING_RHS_WIDTH,
+       OPTION_LISTING_CONT_LINES,
+       OPTION_DEPFILE,
+@@ -484,7 +484,7 @@ parse_args (int * pargc, char *** pargv)
+       OPTION_GDWARF_3,
+       OPTION_GDWARF_4,
+       OPTION_GDWARF_5,
+-      OPTION_GDWARF_SECTIONS,
+      OPTION_GDWARF_SECTIONS, /* = STD_BASE + 20 */
+       OPTION_GDWARF_CIE_VERSION,
+       OPTION_STRIP_LOCAL_ABSOLUTE,
+       OPTION_TRADITIONAL_FORMAT,
+@@ -494,7 +494,7 @@ parse_args (int * pargc, char *** pargv)
+       OPTION_NOEXECSTACK,
+       OPTION_SIZE_CHECK,
+       OPTION_ELF_STT_COMMON,
+-      OPTION_ELF_BUILD_NOTES,
+      OPTION_ELF_BUILD_NOTES, /* = STD_BASE + 30 */
+       OPTION_SECTNAME_SUBST,
+       OPTION_ALTERNATE,
+       OPTION_AL,
+@@ -503,7 +503,8 @@ parse_args (int * pargc, char *** pargv)
+       OPTION_WARN_FATAL,
+       OPTION_COMPRESS_DEBUG,
+       OPTION_NOCOMPRESS_DEBUG,
+-      OPTION_NO_PAD_SECTIONS /* = STD_BASE + 40 */
+      OPTION_NO_PAD_SECTIONS,
+      OPTION_MULTIBYTE_HANDLING  /* = STD_BASE + 40 */
+     /* When you add options here, check that they do
+        not collide with OPTION_MD_BASE.  See as.h.  */
+     };
+@@ -581,6 +582,7 @@ parse_args (int * pargc, char *** pargv)
+     ,{"target-help", no_argument, NULL, OPTION_TARGET_HELP}
+     ,{"traditional-format", no_argument, NULL, OPTION_TRADITIONAL_FORMAT}
+     ,{"warn", no_argument, NULL, OPTION_WARN}
+    ,{"multibyte-handling", required_argument, NULL, OPTION_MULTIBYTE_HANDLING}
+   };
+ 
+   /* Construct the option lists from the standard list and the target
+@@ -683,6 +685,19 @@ parse_args (int * pargc, char *** pargv)
+ 	  flag_traditional_format = 1;
+ 	  break;
+ 
+	case OPTION_MULTIBYTE_HANDLING:
+	  if (strcmp (optarg, "allow") == 0)
+	    multibyte_handling = multibyte_allow;
+	  else if (strcmp (optarg, "warn") == 0)
+	    multibyte_handling = multibyte_warn;
+	  else if (strcmp (optarg, "warn-sym-only") == 0)
+	    multibyte_handling = multibyte_warn_syms;
+	  else if (strcmp (optarg, "warn_sym_only") == 0)
+	    multibyte_handling = multibyte_warn_syms;
+	  else
+	    as_fatal (_("unexpected argument to --multibyte-input-option: '%s'"), optarg);
+	  break;
+
+ 	case OPTION_VERSION:
+ 	  /* This output is intended to follow the GNU standards document.  */
+ 	  printf (_("GNU assembler %s\n"), BFD_VERSION_STRING);
+diff -rupN binutils.orig/gas/as.h binutils-2.37/gas/as.h
+--- binutils.orig/gas/as.h	2021-11-18 16:50:38.834089551 +0000
+++ binutils-2.37/gas/as.h	2021-11-18 16:50:42.531075627 +0000
+@@ -344,6 +344,14 @@ COMMON int linkrelax;
+ 
+ COMMON int do_not_pad_sections_to_alignment;
+ 
+enum multibyte_input_handling
+{
+  multibyte_allow = 0,
+  multibyte_warn,
+  multibyte_warn_syms
+};
+COMMON enum multibyte_input_handling multibyte_handling;
+
+ /* TRUE if we should produce a listing.  */
+ extern int listing;
+ 
+@@ -450,6 +458,7 @@ void   input_scrub_insert_file (char *);
+ char * input_scrub_new_file (const char *);
+ char * input_scrub_next_buffer (char **bufp);
+ size_t do_scrub_chars (size_t (*get) (char *, size_t), char *, size_t);
+bool   scan_for_multibyte_characters (const unsigned char *, const unsigned char *, bool);
+ int    gen_to_words (LITTLENUM_TYPE *, int, long);
+ int    had_err (void);
+ int    ignore_input (void);
+diff -rupN binutils.orig/gas/doc/as.texi binutils-2.37/gas/doc/as.texi
+--- binutils.orig/gas/doc/as.texi	2021-11-18 16:50:38.838089536 +0000
+++ binutils-2.37/gas/doc/as.texi	2021-11-18 16:50:42.535075612 +0000
+@@ -245,6 +245,7 @@ gcc(1), ld(1), and the Info entries for
+  [@b{--sectname-subst}] [@b{--size-check=[error|warning]}]
+  [@b{--elf-stt-common=[no|yes]}]
+  [@b{--generate-missing-build-notes=[no|yes]}]
+ [@b{--multibyte-handling=[allow|warn|warn-sym-only]}]
+  [@b{--target-help}] [@var{target-options}]
+  [@b{--}|@var{files} @dots{}]
+ @c
+@@ -866,6 +867,18 @@ Set the maximum width of an input source
+ Set the maximum number of lines printed in a listing for a single line of input
+ to @var{number} + 1.
+ 
+@item --multibyte-handling=allow
+@itemx --multibyte-handling=warn
+@itemx --multibyte-handling=warn-sym-only
+Controls how the assembler handles multibyte characters in the input.  The
+default (which can be restored by using the @option{allow} argument) is to
+allow such characters without complaint.  Using the @option{warn} argument will
+make the assembler generate a warning message whenever any multibyte character
+is encountered.  Using the @option{warn-sym-only} argument will only cause a
+warning to be generated when a symbol is defined with a name that contains
+multibyte characters.  (References to undefined symbols will not generate a
+warning).
+
+ @item --no-pad-sections
+ Stop the assembler for padding the ends of output sections to the alignment
+ of that section.  The default is to pad the sections, but this can waste space
+@@ -2942,9 +2955,11 @@ are noted in @ref{Machine Dependencies}.
+ @end ifset
+ No symbol may begin with a digit.  Case is significant.
+ There is no length limit; all characters are significant.  Multibyte characters
+-are supported.  Symbols are delimited by characters not in that set, or by the
+-beginning of a file (since the source program must end with a newline, the end
+-of a file is not a possible symbol delimiter).  @xref{Symbols}.
+are supported, but note that the setting of the
+@option{--multibyte-handling} option might prevent their use.  Symbols
+are delimited by characters not in that set, or by the beginning of a file
+(since the source program must end with a newline, the end of a file is not a
+possible symbol delimiter).  @xref{Symbols}.
+ 
+ Symbol names may also be enclosed in double quote @code{"} characters.  In such
+ cases any characters are allowed, except for the NUL character.  If a double
+@@ -3834,11 +3849,18 @@ than @code{Foo}.
+ Symbol names do not start with a digit.  An exception to this rule is made for
+ Local Labels.  See below.
+ 
+-Multibyte characters are supported.  To generate a symbol name containing
+Multibyte characters are supported, but note that the setting of the
+@option{multibyte-handling} option might prevent their use.
+To generate a symbol name containing
+ multibyte characters enclose it within double quotes and use escape codes. cf
+ @xref{Strings}.  Generating a multibyte symbol name from a label is not
+ currently supported.
+ 
+Since multibyte symbol names are unusual, and could possibly be used
+maliciously, @command{@value{AS}} provides a command line option
+(@option{--multibyte-handling=warn-sym-only}) which can be used to generate a
+warning message whenever a symbol name containing multibyte characters is defined.
+
+ Each symbol has exactly one name.  Each name in an assembly language program
+ refers to exactly one symbol.  You may use that symbol name any number of times
+ in a program.
+diff -rupN binutils.orig/gas/input-scrub.c binutils-2.37/gas/input-scrub.c
+--- binutils.orig/gas/input-scrub.c	2021-11-18 16:50:38.835089547 +0000
+++ binutils-2.37/gas/input-scrub.c	2021-11-18 16:50:42.535075612 +0000
+@@ -377,6 +377,11 @@ input_scrub_next_buffer (char **bufp)
+ 	  ++p;
+ 	}
+ 
+      if (multibyte_handling == multibyte_warn)
+	(void) scan_for_multibyte_characters ((const unsigned char *) p,
+					      (const unsigned char *) limit,
+					      true /* Generate warnings */);
+
+       /* We found a newline in the newly read chars.  */
+       partial_where = p;
+       partial_size = limit - p;
+diff -rupN binutils.orig/gas/symbols.c binutils-2.37/gas/symbols.c
+--- binutils.orig/gas/symbols.c	2021-11-18 16:50:39.105088530 +0000
+++ binutils-2.37/gas/symbols.c	2021-11-18 16:52:17.980716107 +0000
+@@ -78,6 +78,10 @@ struct symbol_flags
+      before.  It is cleared as soon as any direct reference to the
+      symbol is present.  */
+   unsigned int weakrefd : 1;
+
+  /* Set when a warning about the symbol containing multibyte characters
+     is generated.  */
+  unsigned int multibyte_warned : 1;
+ };
+ 
+ /* A pointer in the symbol may point to either a complete symbol
+@@ -194,7 +198,7 @@ static void *
+ symbol_entry_find (htab_t table, const char *name)
+ {
+   hashval_t hash = htab_hash_string (name);
+-  symbol_entry_t needle = { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+  symbol_entry_t needle = { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+ 			      hash, name, 0, 0, 0 } };
+   return htab_find_with_hash (table, &needle, hash);
+ }
+@@ -305,6 +309,18 @@ symbol_init (symbolS *symbolP, const cha
+   symbolP->bsym->name = name;
+   symbolP->bsym->section = sec;
+ 
+  if (multibyte_handling == multibyte_warn_syms
+      && ! symbolP->flags.local_symbol
+      && sec != undefined_section
+      && ! symbolP->flags.multibyte_warned
+      && scan_for_multibyte_characters ((const unsigned char *) name,
+					(const unsigned char *) name + strlen (name),
+					false /* Do not warn.  */))
+    {
+      as_warn (_("symbol '%s' contains multibyte characters"), name);
+      symbolP->flags.multibyte_warned = 1;
+    }
+
+   S_SET_VALUE (symbolP, valu);
+ 
+   symbol_clear_list_pointers (symbolP);
+@@ -2413,7 +2429,21 @@ S_SET_SEGMENT (symbolS *s, segT seg)
+ 	abort ();
+     }
+   else
+-    s->bsym->section = seg;
+    {
+      if (multibyte_handling == multibyte_warn_syms
+	  && ! s->flags.local_symbol
+	  && seg != undefined_section
+	  && ! s->flags.multibyte_warned
+	  && scan_for_multibyte_characters ((const unsigned char *) s->name,
+					    (const unsigned char *) s->name + strlen (s->name),
+					    false))
+	{
+	  as_warn (_("symbol '%s' contains multibyte characters"), s->name);
+	  s->flags.multibyte_warned = 1;
+	}
+
+      s->bsym->section = seg;
+    }
+ }
+ 
+ void
+diff -rupN binutils.orig/gas/testsuite/gas/all/gas.exp binutils-2.37/gas/testsuite/gas/all/gas.exp
+--- binutils.orig/gas/testsuite/gas/all/gas.exp	2021-11-18 16:50:39.101088545 +0000
+++ binutils-2.37/gas/testsuite/gas/all/gas.exp	2021-11-18 16:50:42.538075600 +0000
+@@ -494,3 +494,5 @@ run_dump_test "nop"
+ run_dump_test "asciz"
+ run_dump_test "pr27384"
+ run_dump_test "pr27381"
+run_dump_test "multibyte1"
+run_dump_test "multibyte2"
+diff -rupN binutils.orig/testsuite/gas/all/multibyte.s binutils-2.37/testsuite/gas/all/multibyte.s
+--- binutils.orig/testsuite/gas/all/multibyte.s	1970-01-01 01:00:00.000000000 +0100
+++ binutils-2.37/testsuite/gas/all/multibyte.s	2021-11-18 16:50:42.541075589 +0000
+@@ -0,0 +1,8 @@
+	.text
+	.globl	he‮oll‬
+he‮oll‬:
+	.nop
+	
+	.globl	hello
+hello:
+	.nop
+diff -rupN binutils.orig/testsuite/gas/all/multibyte1.d binutils-2.37/testsuite/gas/all/multibyte1.d
+--- binutils.orig/testsuite/gas/all/multibyte1.d	1970-01-01 01:00:00.000000000 +0100
+++ binutils-2.37/testsuite/gas/all/multibyte1.d	2021-11-18 16:50:42.541075589 +0000
+@@ -0,0 +1,3 @@
+#source: multibyte.s
+#as: --multibyte-handling=warn
+#warning_output: multibyte1.l
+diff -rupN binutils.orig/testsuite/gas/all/multibyte1.l binutils-2.37/testsuite/gas/all/multibyte1.l
+--- binutils.orig/testsuite/gas/all/multibyte1.l	1970-01-01 01:00:00.000000000 +0100
+++ binutils-2.37/testsuite/gas/all/multibyte1.l	2021-11-18 16:50:42.541075589 +0000
+@@ -0,0 +1,12 @@
+[^:]*: Assembler messages:
+[^:]*: Warning: multibyte character \(0xe2\) encountered in .*multibyte.s
+[^:]*: Warning: multibyte character \(0x80\) encountered in .*multibyte.s
+[^:]*: Warning: multibyte character \(0xae\) encountered in .*multibyte.s
+[^:]*: Warning: multibyte character \(0xe2\) encountered in .*multibyte.s
+[^:]*: Warning: multibyte character \(0x80\) encountered in .*multibyte.s
+[^:]*: Warning: multibyte character \(0xac\) encountered in .*multibyte.s
+[^:]*: Warning: multibyte character \(0xe2\) encountered in .*multibyte.s
+[^:]*: Warning: multibyte character \(0x80\) encountered in .*multibyte.s
+[^:]*: Warning: multibyte character \(0xae\) encountered in .*multibyte.s
+[^:]*: Warning: multibyte character \(0xe2\) encountered in .*multibyte.s
+[^:]*: Warning: further multibyte character warnings suppressed
+diff -rupN binutils.orig/testsuite/gas/all/multibyte2.d binutils-2.37/testsuite/gas/all/multibyte2.d
+--- binutils.orig/testsuite/gas/all/multibyte2.d	1970-01-01 01:00:00.000000000 +0100
+++ binutils-2.37/testsuite/gas/all/multibyte2.d	2021-11-18 16:50:42.542075585 +0000
+@@ -0,0 +1,3 @@
+#source: multibyte.s
+#as: --multibyte-handling=warn-sym-only
+#warning_output: multibyte2.l
+diff -rupN binutils.orig/testsuite/gas/all/multibyte2.l binutils-2.37/testsuite/gas/all/multibyte2.l
+--- binutils.orig/testsuite/gas/all/multibyte2.l	1970-01-01 01:00:00.000000000 +0100
+++ binutils-2.37/testsuite/gas/all/multibyte2.l	2021-11-18 16:50:42.541075589 +0000
+@@ -0,0 +1,2 @@
+[^:]*: Assembler messages:
+[^:]*:3: Warning: symbol '.*' contains multibyte characters
--- a/binutils-link-following.patch
+++ b/binutils-link-following.patch
@ -0,0 +1,459 @@
+diff -rup binutils.orig/binutils/dwarf.c binutils-2.37/binutils/dwarf.c
+--- binutils.orig/binutils/dwarf.c	2022-05-21 13:12:31.851174169 +0100
+++ binutils-2.37/binutils/dwarf.c	2022-05-21 13:12:58.798988551 +0100
+@@ -11533,7 +11533,11 @@ free_debug_memory (void)
+   free_dwo_info ();
+ }
+ 
+-void
+/* Enable display of specific DWARF sections as determined by the comma
+   separated strings in NAMES.  Returns non-zero if any displaying was
+   enabled.  */
+
+int
+ dwarf_select_sections_by_names (const char *names)
+ {
+   typedef struct
+@@ -11586,6 +11590,7 @@ dwarf_select_sections_by_names (const ch
+     };
+ 
+   const char *p;
+  int result = 0;
+ 
+   p = names;
+   while (*p)
+@@ -11600,6 +11605,7 @@ dwarf_select_sections_by_names (const ch
+ 	      && (p[len] == ',' || p[len] == '\0'))
+ 	    {
+ 	      * entry->variable = entry->val;
+	      result |= entry->val;
+ 
+ 	      /* The --debug-dump=frames-interp option also
+ 		 enables the --debug-dump=frames option.  */
+@@ -11622,48 +11628,82 @@ dwarf_select_sections_by_names (const ch
+       if (*p == ',')
+ 	p++;
+     }
+
+  return result;
+ }
+ 
+-void
+/* Enable display of specific DWARF sections as determined by the characters
+   in LETTERS.  Returns non-zero if any displaying was enabled.  */
+
+int
+ dwarf_select_sections_by_letters (const char *letters)
+ {
+-  unsigned int lindex = 0;
+  typedef struct
+  {
+    const char   letter;
+    int *        variable;
+    int          val;
+    bool         cont;
+  }
+  debug_dump_letter_opts;
+ 
+-  while (letters[lindex])
+-    switch (letters[lindex++])
+-      {
+-      case 'A':	do_debug_addr = 1; break;
+-      case 'a':	do_debug_abbrevs = 1; break;
+-      case 'c':	do_debug_cu_index = 1; break;
+  static const debug_dump_letter_opts letter_table [] =
+    {
+      { 'A', & do_debug_addr, 1, false},
+      { 'a', & do_debug_abbrevs, 1, false },
+      { 'c', & do_debug_cu_index, 1, false },
+ #ifdef HAVE_LIBDEBUGINFOD
+-      case 'D': use_debuginfod = 1; break;
+-      case 'E': use_debuginfod = 0; break;
+      { 'D', & use_debuginfod, 1, false },
+      { 'E', & use_debuginfod, 0, false },
+ #endif
+-      case 'F':	do_debug_frames_interp = 1; /* Fall through.  */
+-      case 'f':	do_debug_frames = 1; break;
+-      case 'g':	do_gdb_index = 1; break;
+-      case 'i':	do_debug_info = 1; break;
+-      case 'K': do_follow_links = 1; break;
+-      case 'N': do_follow_links = 0; break;
+-      case 'k':	do_debug_links = 1; break;
+-      case 'l':	do_debug_lines |= FLAG_DEBUG_LINES_RAW;	break;
+-      case 'L':	do_debug_lines |= FLAG_DEBUG_LINES_DECODED; break;
+-      case 'm': do_debug_macinfo = 1; break;
+-      case 'O':	do_debug_str_offsets = 1; break;
+-      case 'o':	do_debug_loc = 1; break;
+-      case 'p':	do_debug_pubnames = 1; break;
+-      case 'R':	do_debug_ranges = 1; break;
+-      case 'r':	do_debug_aranges = 1; break;
+-      case 's':	do_debug_str = 1; break;
+-      case 'T': do_trace_aranges = 1; break;
+-      case 't': do_debug_pubtypes = 1; break;
+-      case 'U': do_trace_info = 1; break;
+-      case 'u': do_trace_abbrevs = 1; break;
+-
+-      default:
+-	warn (_("Unrecognized debug option '%s'\n"), letters);
+-	break;
+-      }
+      { 'F', & do_debug_frames_interp, 1, true }, /* Note the fall through.  */
+      { 'f', & do_debug_frames, 1, false },
+      { 'g', & do_gdb_index, 1, false },
+      { 'i', & do_debug_info, 1, false },
+      { 'K', & do_follow_links, 1, false },
+      { 'k', & do_debug_links, 1, false },
+      { 'L', & do_debug_lines, FLAG_DEBUG_LINES_DECODED, false },
+      { 'l', & do_debug_lines, FLAG_DEBUG_LINES_RAW, false },
+      { 'm', & do_debug_macinfo, 1, false },
+      { 'N', & do_follow_links, 0, false },
+      { 'O', & do_debug_str_offsets, 1, false },
+      { 'o', & do_debug_loc, 1, false },
+      { 'p', & do_debug_pubnames, 1, false },
+      { 'R', & do_debug_ranges, 1, false },
+      { 'r', & do_debug_aranges, 1, false },
+      { 's', & do_debug_str, 1, false },
+      { 'T', & do_trace_aranges, 1, false },
+      { 't', & do_debug_pubtypes, 1, false },
+      { 'U', & do_trace_info, 1, false },
+      { 'u', & do_trace_abbrevs, 1, false },
+      { 0, NULL, 0, false }
+    };
+
+  int result = 0;
+
+  while (* letters)
+    {
+      const debug_dump_letter_opts * entry;
+
+      for (entry = letter_table; entry->letter; entry++)
+	{
+	  if (entry->letter == * letters)
+	    {
+	      * entry->variable |= entry->val;
+	      result |= entry->val;
+
+	      if (! entry->cont)
+		break;
+	    }
+	}
+
+      if (entry->letter == 0)
+	warn (_("Unrecognized debug letter option '%c'\n"), * letters);
+
+      letters ++;
+    }
+
+  return result;
+ }
+ 
+ void
+Only in binutils-2.37/binutils/: dwarf.c.orig
+diff -rup binutils.orig/binutils/dwarf.h binutils-2.37/binutils/dwarf.h
+--- binutils.orig/binutils/dwarf.h	2022-05-21 13:12:31.854174148 +0100
+++ binutils-2.37/binutils/dwarf.h	2022-05-21 13:12:58.799988544 +0100
+@@ -243,8 +243,8 @@ extern void *open_debug_file (const char
+ 
+ extern void free_debug_memory (void);
+ 
+-extern void dwarf_select_sections_by_names (const char *);
+-extern void dwarf_select_sections_by_letters (const char *);
+extern int dwarf_select_sections_by_names (const char *);
+extern int dwarf_select_sections_by_letters (const char *);
+ extern void dwarf_select_sections_all (void);
+ 
+ extern unsigned int * find_cu_tu_set (void *, unsigned int);
+Only in binutils-2.37/binutils/: dwarf.h.orig
+diff -rup binutils.orig/binutils/objdump.c binutils-2.37/binutils/objdump.c
+--- binutils.orig/binutils/objdump.c	2022-05-21 13:12:31.855174141 +0100
+++ binutils-2.37/binutils/objdump.c	2022-05-21 13:14:42.740372795 +0100
+@@ -5010,6 +5010,26 @@ sign_extend_address (bfd *abfd ATTRIBUTE
+   return (((vma & ((mask << 1) - 1)) ^ mask) - mask);
+ }
+ 
+static bool
+might_need_separate_debug_info (bool is_mainfile)
+{
+  /* We do not follow links from debug info files.  */
+  if (! is_mainfile)
+    return false;
+
+  /* Since do_follow_links might be enabled by default, only treat it as an
+     indication that separate files should be loaded if setting it was a
+     deliberate user action.  */
+  if (DEFAULT_FOR_FOLLOW_LINKS == 0 && do_follow_links)
+    return true;
+  
+  if (process_links || dump_symtab || dump_debugging
+      || dump_dwarf_section_info)
+    return true;
+
+  return false;  
+}
+
+ /* Dump selected contents of ABFD.  */
+ 
+ static void
+@@ -5024,16 +5044,8 @@ dump_bfd (bfd *abfd, bool is_mainfile)
+   else
+     byte_get = NULL;
+ 
+-  /* Load any separate debug information files.
+-     We do this now and without checking do_follow_links because separate
+-     debug info files may contain symbol tables that we will need when
+-     displaying information about the main file.  Any memory allocated by
+-     load_separate_debug_files will be released when we call
+-     free_debug_memory below.
+-     
+-     The test on is_mainfile is there because the chain of separate debug
+-     info files is a global variable shared by all invocations of dump_bfd.  */
+-  if (is_mainfile)
+  /* Load any separate debug information files.  */
+  if (byte_get != NULL && might_need_separate_debug_info (is_mainfile))
+     {
+       load_separate_debug_files (abfd, bfd_get_filename (abfd));
+ 
+@@ -5588,20 +5600,30 @@ main (int argc, char **argv)
+ 	  do_follow_links = true;
+ 	  break;
+ 	case 'W':
+-	  dump_dwarf_section_info = true;
+ 	  seenflag = true;
+ 	  if (optarg)
+-	    dwarf_select_sections_by_letters (optarg);
+	    {
+	      if (dwarf_select_sections_by_letters (optarg))
+		dump_dwarf_section_info = true;
+	    }
+ 	  else
+-	    dwarf_select_sections_all ();
+	    {
+	      dump_dwarf_section_info = true;
+	      dwarf_select_sections_all ();
+	    }
+ 	  break;
+ 	case OPTION_DWARF:
+-	  dump_dwarf_section_info = true;
+ 	  seenflag = true;
+ 	  if (optarg)
+-	    dwarf_select_sections_by_names (optarg);
+	    {
+	      if (dwarf_select_sections_by_names (optarg))
+		dump_dwarf_section_info = true;
+	    }
+ 	  else
+-	    dwarf_select_sections_all ();
+	    {
+	      dwarf_select_sections_all ();
+	      dump_dwarf_section_info = true;
+	    }
+ 	  break;
+ 	case OPTION_DWARF_DEPTH:
+ 	  {
+diff -rup binutils.orig/binutils/objdump.c.orig binutils-2.37/binutils/objdump.c.orig
+--- binutils.orig/binutils/objdump.c.orig	2022-05-21 13:12:31.872174024 +0100
+++ binutils-2.37/binutils/objdump.c.orig	2022-05-21 13:12:22.066241569 +0100
+@@ -280,6 +280,14 @@ usage (FILE *stream, int status)
+                            Do not follow links to separate debug info files\n\
+                             (default)\n"));
+ #endif
+#if HAVE_LIBDEBUGINFOD
+  fprintf (stream, _("\
+  -WD --dwarf=use-debuginfod\n\
+                           When following links, also query debuginfod servers (default)\n"));
+  fprintf (stream, _("\
+  -WE --dwarf=do-not-use-debuginfod\n\
+                           When following links, do not query debuginfod servers\n"));
+#endif
+   fprintf (stream, _("\
+   -L, --process-links      Display the contents of non-debug sections in\n\
+                             separate debuginfo files.  (Implies -WK)\n"));
+diff -rup binutils.orig/binutils/objdump.c.rej binutils-2.37/binutils/objdump.c.rej
+--- binutils.orig/binutils/objdump.c.rej	2022-05-21 13:12:31.872174024 +0100
+++ binutils-2.37/binutils/objdump.c.rej	2022-05-21 13:12:58.800988538 +0100
+@@ -1,43 +1,21 @@
+---- binutils/objdump.c
+-+++ binutils/objdump.c
+-@@ -487,28 +517,16 @@ static struct option long_options[]=
+-   {"source", no_argument, NULL, 'S'},
+-   {"source-comment", optional_argument, NULL, OPTION_SOURCE_COMMENT},
+-   {"special-syms", no_argument, &dump_special_syms, 1},
+--  {"include", required_argument, NULL, 'I'},
+--  {"dwarf", optional_argument, NULL, OPTION_DWARF},
+--#ifdef ENABLE_LIBCTF
+--  {"ctf", optional_argument, NULL, OPTION_CTF},
+--  {"ctf-parent", required_argument, NULL, OPTION_CTF_PARENT},
+--#endif
+-   {"stabs", no_argument, NULL, 'G'},
+-   {"start-address", required_argument, NULL, OPTION_START_ADDRESS},
+-   {"stop-address", required_argument, NULL, OPTION_STOP_ADDRESS},
+-   {"syms", no_argument, NULL, 't'},
+-   {"target", required_argument, NULL, 'b'},
+-+  {"unicode", required_argument, NULL, 'U'},
+-   {"version", no_argument, NULL, 'V'},
+--  {"wide", no_argument, NULL, 'w'},
+--  {"prefix", required_argument, NULL, OPTION_PREFIX},
+--  {"prefix-strip", required_argument, NULL, OPTION_PREFIX_STRIP},
+--  {"insn-width", required_argument, NULL, OPTION_INSN_WIDTH},
+--  {"dwarf-depth", required_argument, 0, OPTION_DWARF_DEPTH},
+--  {"dwarf-start", required_argument, 0, OPTION_DWARF_START},
+--  {"dwarf-check", no_argument, 0, OPTION_DWARF_CHECK},
+--  {"inlines", no_argument, 0, OPTION_INLINES},
+-   {"visualize-jumps", optional_argument, 0, OPTION_VISUALIZE_JUMPS},
+--  {0, no_argument, 0, 0}
+-+  {"wide", no_argument, NULL, 'w'},
+-+  {NULL, no_argument, NULL, 0}
+- };
+- 
+- static void
+-@@ -5375,7 +5533,7 @@ main (int argc, char **argv)
+-   set_default_bfd_target ();
+--- binutils/objdump.c	2022-05-20 16:57:16.566961359 +0100
++++ binutils/objdump.c	2022-05-20 16:57:32.881853688 +0100
+@@ -5042,16 +5062,8 @@ dump_bfd (bfd *abfd, bool is_mainfile)
+   else
+     byte_get = NULL;
+  
+-   while ((c = getopt_long (argc, argv,
+--			   "CDE:FGHI:LM:P:RSTVW::ab:defghij:lm:prstvwxz",
+-+			   "CDE:FGHI:LM:P:RSTU:VW::ab:defghij:lm:prstvwxz",
+- 			   long_options, (int *) 0))
+- 	 != EOF)
+-  /* Load any separate debug information files.
+-     We do this now and without checking do_follow_links because separate
+-     debug info files may contain symbol tables that we will need when
+-     displaying information about the main file.  Any memory allocated by
+-     load_separate_debug_files will be released when we call
+-     free_debug_memory below.
+-
+-     The test on is_mainfile is there because the chain of separate debug
+-     info files is a global variable shared by all invocations of dump_bfd.  */
+-  if (byte_get != NULL && is_mainfile)
++  /* Load any separate debug information files.  */
++  if (byte_get != NULL && might_need_separate_debug_info (is_mainfile))
+      {
+       load_separate_debug_files (abfd, bfd_get_filename (abfd));
+ 
+diff -rup binutils.orig/binutils/readelf.c binutils-2.37/binutils/readelf.c
+--- binutils.orig/binutils/readelf.c	2022-05-21 13:12:31.853174155 +0100
+++ binutils-2.37/binutils/readelf.c	2022-05-21 13:12:58.802988523 +0100
+@@ -21632,6 +21632,26 @@ initialise_dump_sects (Filedata * fileda
+     }
+ }
+ 
+static bool
+might_need_separate_debug_info (Filedata * filedata)
+{
+  /* Debuginfo files do not need further separate file loading.  */
+  if (filedata->file_header.e_shstrndx == SHN_UNDEF)
+    return false;
+
+  /* Since do_follow_links might be enabled by default, only treat it as an
+     indication that separate files should be loaded if setting it was a
+     deliberate user action.  */
+  if (DEFAULT_FOR_FOLLOW_LINKS == 0 && do_follow_links)
+    return true;
+  
+  if (process_links || do_syms || do_unwind 
+      || do_dump || do_debugging)
+    return true;
+
+  return false;
+}
+
+ /* Process one ELF object file according to the command line options.
+    This file may actually be stored in an archive.  The file is
+    positioned at the start of the ELF object.  Returns TRUE if no
+@@ -21715,7 +21735,7 @@ process_object (Filedata * filedata)
+   if (! process_version_sections (filedata))
+     res = false;
+ 
+-  if (filedata->file_header.e_shstrndx != SHN_UNDEF)
+  if (might_need_separate_debug_info (filedata))
+     have_separate_files = load_separate_debug_files (filedata, filedata->file_name);
+   else
+     have_separate_files = false;
+diff -rup binutils.orig/binutils/readelf.c.orig binutils-2.37/binutils/readelf.c.orig
+--- binutils.orig/binutils/readelf.c.orig	2022-05-21 13:12:31.854174148 +0100
+++ binutils-2.37/binutils/readelf.c.orig	2022-05-21 13:12:22.077241494 +0100
+@@ -4955,6 +4955,14 @@ usage (FILE * stream)
+                          Do not follow links to separate debug info files\n\
+                           (default)\n"));
+ #endif
+#if HAVE_LIBDEBUGINFOD
+  fprintf (stream, _("\
+  -wD --debug-dump=use-debuginfod\n\
+                         When following links, also query debuginfod servers (default)\n"));
+  fprintf (stream, _("\
+  -wE --debug-dump=do-not-use-debuginfod\n\
+                         When following links, do not query debuginfod servers\n"));
+#endif
+   fprintf (stream, _("\
+   --dwarf-depth=N        Do not display DIEs at depth N or greater\n"));
+   fprintf (stream, _("\
+diff -rup binutils.orig/binutils/testsuite/binutils-all/debuginfod.exp binutils-2.37/binutils/testsuite/binutils-all/debuginfod.exp
+--- binutils.orig/binutils/testsuite/binutils-all/debuginfod.exp	2022-05-21 13:12:31.872174024 +0100
+++ binutils-2.37/binutils/testsuite/binutils-all/debuginfod.exp	2022-05-21 13:12:58.803988517 +0100
+@@ -188,7 +188,7 @@ if { [regexp ".*DEBUGINFOD.*" $conf_objd
+     test_fetch_debugaltlink $OBJDUMP "-Wk"
+ 
+     set test "disabling debuginfod access"
+-    setup_xfail *-*-*
+    # setup_xfail *-*-*
+     test_fetch_debuglink $OBJDUMP "-W -WE"
+     set test "debuginfod"
+ 
+@@ -201,7 +201,7 @@ if { [regexp ".*DEBUGINFOD.*" $conf_read
+     test_fetch_debugaltlink $READELF "-wk"
+ 
+     set test "disabling debuginfod access"
+-    setup_xfail *-*-*
+    # setup_xfail *-*-*
+     test_fetch_debuglink $READELF "-w -wE"
+     set test "debuginfod"
+ 
+Only in binutils-2.37/binutils/testsuite/binutils-all: debuginfod.exp.orig
+diff -rup binutils.orig/binutils/testsuite/binutils-all/objdump.Wk binutils-2.37/binutils/testsuite/binutils-all/objdump.Wk
+--- binutils.orig/binutils/testsuite/binutils-all/objdump.Wk	2022-05-21 13:12:31.862174093 +0100
+++ binutils-2.37/binutils/testsuite/binutils-all/objdump.Wk	2022-05-21 13:12:58.803988517 +0100
+@@ -1,8 +1,9 @@
+#...
+ tmpdir/debuglink\.o:     file format .*
+-Contents of the \.gnu_debuglink section:
+Contents of the \.gnu_debuglink section.*
+   Separate debug info file: this_is_a_debuglink\.debug
+   CRC value: 0x12345678
+-Contents of the \.gnu_debugaltlink section:
+Contents of the \.gnu_debugaltlink section.*
+   Separate debug info file: linkdebug\.debug
+   Build-ID \(0x18 bytes\):
+  00 11 22 33 44 55 66 77 88 99 aa bb cc dd ee ff 01 23 45 67 89 ab cd ef
+diff -rup binutils.orig/binutils/testsuite/binutils-all/readelf.k binutils-2.37/binutils/testsuite/binutils-all/readelf.k
+--- binutils.orig/binutils/testsuite/binutils-all/readelf.k	2022-05-21 13:12:31.863174086 +0100
+++ binutils-2.37/binutils/testsuite/binutils-all/readelf.k	2022-05-21 13:12:58.812988455 +0100
+@@ -1,7 +1,8 @@
+-Contents of the \.gnu_debuglink section:
+#...
+Contents of the \.gnu_debuglink section.*
+   Separate debug info file: this_is_a_debuglink\.debug
+   CRC value: 0x12345678
+-Contents of the \.gnu_debugaltlink section:
+Contents of the \.gnu_debugaltlink section.*
+   Separate debug info file: linkdebug\.debug
+   Build-ID \(0x18 bytes\):
+  00 11 22 33 44 55 66 77 88 99 aa bb cc dd ee ff 01 23 45 67 89 ab cd ef
+Only in binutils-2.37/binutils/testsuite/binutils-all: debuginfod.exp.orig
+--- binutils.orig/binutils/dwarf.c	2022-06-30 15:28:53.484593360 +0100
+++ binutils-2.37/binutils/dwarf.c	2022-06-30 15:32:22.112213811 +0100
+@@ -11689,7 +11689,10 @@ dwarf_select_sections_by_letters (const
+ 	{
+ 	  if (entry->letter == * letters)
+ 	    {
+-	      * entry->variable |= entry->val;
+	      if (entry->val == 0)
+		* entry->variable = 0;
+	      else
+		* entry->variable |= entry->val;
+ 	      result |= entry->val;
+ 
+ 	      if (! entry->cont)
--- a/binutils-missing-man-pages.patch
+++ b/binutils-missing-man-pages.patch
@ -0,0 +1,12 @@
+diff -rup binutils.orig/etc/texi2pod.pl binutils-2.37/etc/texi2pod.pl
+--- binutils.orig/etc/texi2pod.pl	2021-08-10 10:15:38.063964450 +0100
+++ binutils-2.37/etc/texi2pod.pl	2021-08-10 16:52:51.705688992 +0100
+@@ -59,6 +59,8 @@ while ($_ = shift) {
+ 	    $flag = shift;
+ 	}
+         push (@ipath, $flag);
+    } elsif (/^--no-split$/) {
+       # ignore option for makeinfo compatibility
+     } elsif (/^-/) {
+ 	usage();
+     } else {
--- a/binutils-package-metadata.patch
+++ b/binutils-package-metadata.patch
--- a/binutils-readelf-corrupt-program-headers.patch
+++ b/binutils-readelf-corrupt-program-headers.patch
@ -0,0 +1,29 @@
+diff -rup binutils.orig/binutils/readelf.c binutils-2.37/binutils/readelf.c
+--- binutils.orig/binutils/readelf.c	2022-02-10 10:10:21.508156583 +0000
+++ binutils-2.37/binutils/readelf.c	2022-02-10 10:13:36.486511842 +0000
+@@ -5457,10 +5457,7 @@ process_file_header (Filedata * filedata
+       if (filedata->section_headers != NULL
+ 	  && header->e_phnum == PN_XNUM
+ 	  && filedata->section_headers[0].sh_info != 0)
+-	{
+-	  header->e_phnum = filedata->section_headers[0].sh_info;
+-	  printf (" (%u)", header->e_phnum);
+-	}
+	printf (" (%u)", filedata->section_headers[0].sh_info);
+       putc ('\n', stdout);
+       printf (_("  Size of section headers:           %u (bytes)\n"),
+ 	      header->e_shentsize);
+@@ -5493,7 +5490,12 @@ process_file_header (Filedata * filedata
+     {
+       if (header->e_phnum == PN_XNUM
+ 	  && filedata->section_headers[0].sh_info != 0)
+-	header->e_phnum = filedata->section_headers[0].sh_info;
+	{
+	  /* Throw away any cached read of PN_XNUM headers.  */
+	  free (filedata->program_headers);
+	  filedata->program_headers = NULL;
+	  header->e_phnum = filedata->section_headers[0].sh_info;
+       }
+       if (header->e_shnum == SHN_UNDEF)
+ 	header->e_shnum = filedata->section_headers[0].sh_size;
+       if (header->e_shstrndx == (SHN_XINDEX & 0xffff))
--- a/binutils-s390x-static-PIE.patch
+++ b/binutils-s390x-static-PIE.patch
@ -0,0 +1,142 @@
+diff -rup binutils.orig/bfd/elf64-s390.c binutils-2.37/bfd/elf64-s390.c
+--- binutils.orig/bfd/elf64-s390.c	2022-05-19 11:32:09.424050559 +0100
+++ binutils-2.37/bfd/elf64-s390.c	2022-05-19 11:32:29.169924728 +0100
+@@ -774,7 +774,7 @@ elf_s390_tls_transition (struct bfd_link
+ 			 int r_type,
+ 			 int is_local)
+ {
+-  if (bfd_link_pic (info))
+  if (bfd_link_dll (info))
+     return r_type;
+ 
+   switch (r_type)
+@@ -1026,7 +1026,7 @@ elf_s390_check_relocs (bfd *abfd,
+ 	case R_390_TLS_GOTIE20:
+ 	case R_390_TLS_GOTIE64:
+ 	case R_390_TLS_IEENT:
+-	  if (bfd_link_pic (info))
+	  if (bfd_link_dll (info))
+ 	    info->flags |= DF_STATIC_TLS;
+ 	  /* Fall through */
+ 
+@@ -1107,7 +1107,7 @@ elf_s390_check_relocs (bfd *abfd,
+ 	  if (r_type == R_390_TLS_LE64 && bfd_link_pie (info))
+ 	    break;
+ 
+-	  if (!bfd_link_pic (info))
+	  if (!bfd_link_dll (info))
+ 	    break;
+ 	  info->flags |= DF_STATIC_TLS;
+ 	  /* Fall through */
+@@ -1571,7 +1571,7 @@ allocate_dynrelocs (struct elf_link_hash
+      to R_390_TLS_LE64 requiring no TLS entry. For GOTIE12 and IEENT
+      we can save the dynamic TLS relocation.  */
+   if (h->got.refcount > 0
+-      && !bfd_link_pic (info)
+      && !bfd_link_dll (info)
+       && h->dynindx == -1
+       && elf_s390_hash_entry(h)->tls_type >= GOT_TLS_IE)
+     {
+@@ -1876,7 +1876,20 @@ elf_s390_size_dynamic_sections (bfd *out
+       else if (startswith (bfd_section_name (s), ".rela"))
+ 	{
+ 	  if (s->size != 0 && s != htab->elf.srelplt)
+-	    relocs = true;
+	    {
+	      relocs = true;
+	      if (s == htab->elf.irelplt)
+		{
+		  /* In static-pie case, there are IRELATIVE-relocs in
+		     .rela.iplt (htab->irelplt), which will later be grouped
+		     to .rela.plt.  On s390, the IRELATIVE relocations are
+		     always located in .rela.iplt - even for non-static case.
+		     Ensure that DT_JMPREL, DT_PLTRELA, DT_PLTRELASZ is added
+		     to the dynamic section even if htab->srelplt->size == 0.
+		     See _bfd_elf_add_dynamic_tags in bfd/elflink.c.  */
+		  htab->elf.dt_jmprel_required = true;
+		}
+	    }
+ 
+ 	  /* We use the reloc_count field as a counter if we need
+ 	     to copy relocs into the output file.  */
+@@ -2662,7 +2675,7 @@ elf_s390_relocate_section (bfd *output_b
+ 
+ 	  /* Relocations for tls literal pool entries.  */
+ 	case R_390_TLS_IE64:
+-	  if (bfd_link_pic (info))
+	  if (bfd_link_dll (info))
+ 	    {
+ 	      Elf_Internal_Rela outrel;
+ 	      asection *sreloc;
+@@ -2690,7 +2703,7 @@ elf_s390_relocate_section (bfd *output_b
+ 	  else if (h != NULL)
+ 	    {
+ 	      tls_type = elf_s390_hash_entry(h)->tls_type;
+-	      if (!bfd_link_pic (info) && h->dynindx == -1 && tls_type >= GOT_TLS_IE)
+	      if (!bfd_link_dll (info) && h->dynindx == -1 && tls_type >= GOT_TLS_IE)
+ 		r_type = R_390_TLS_LE64;
+ 	    }
+ 	  if (r_type == R_390_TLS_GD64 && tls_type >= GOT_TLS_IE)
+@@ -2801,14 +2814,14 @@ elf_s390_relocate_section (bfd *output_b
+ 	      if (local_got_offsets == NULL)
+ 		abort();
+ 	      off = local_got_offsets[r_symndx];
+-	      if (bfd_link_pic (info))
+	      if (bfd_link_dll (info))
+ 		goto emit_tls_relocs;
+ 	    }
+ 	  else
+ 	    {
+ 	      off = h->got.offset;
+ 	      tls_type = elf_s390_hash_entry(h)->tls_type;
+-	      if (bfd_link_pic (info) || h->dynindx != -1 || tls_type < GOT_TLS_IE)
+	      if (bfd_link_dll (info) || h->dynindx != -1 || tls_type < GOT_TLS_IE)
+ 		goto emit_tls_relocs;
+ 	    }
+ 
+@@ -2825,7 +2838,7 @@ elf_s390_relocate_section (bfd *output_b
+ 	  break;
+ 
+ 	case R_390_TLS_LDM64:
+-	  if (! bfd_link_pic (info))
+	  if (! bfd_link_dll (info))
+ 	    /* The literal pool entry this relocation refers to gets ignored
+ 	       by the optimized code of the local exec model. Do nothing
+ 	       and the value will turn out zero.  */
+@@ -2900,7 +2913,7 @@ elf_s390_relocate_section (bfd *output_b
+ 	  continue;
+ 
+ 	case R_390_TLS_LDO64:
+-	  if (bfd_link_pic (info) || (input_section->flags & SEC_DEBUGGING))
+	  if (bfd_link_dll (info) || (input_section->flags & SEC_DEBUGGING))
+ 	    relocation -= dtpoff_base (info);
+ 	  else
+ 	    /* When converting LDO to LE, we must negate.  */
+@@ -2922,7 +2935,7 @@ elf_s390_relocate_section (bfd *output_b
+ 
+ 	  if (r_type == R_390_TLS_LOAD)
+ 	    {
+-	      if (!bfd_link_pic (info) && (h == NULL || h->dynindx == -1))
+	      if (!bfd_link_dll (info) && (h == NULL || h->dynindx == -1))
+ 		{
+ 		  /* IE->LE transition. Four valid cases:
+ 		     lg %rx,(0,%ry)    -> sllg %rx,%ry,0
+@@ -2972,7 +2985,7 @@ elf_s390_relocate_section (bfd *output_b
+ 		  invalid_tls_insn (input_bfd, input_section, rel);
+ 		  return false;
+ 		}
+-	      if (!bfd_link_pic (info) && (h == NULL || h->dynindx == -1))
+	      if (!bfd_link_dll (info) && (h == NULL || h->dynindx == -1))
+ 		{
+ 		  /* GD->LE transition.
+ 		     brasl %r14,__tls_get_addr@plt -> brcl 0,. */
+@@ -2991,7 +3004,7 @@ elf_s390_relocate_section (bfd *output_b
+ 	    }
+ 	  else if (r_type == R_390_TLS_LDCALL)
+ 	    {
+-	      if (!bfd_link_pic (info))
+	      if (!bfd_link_dll (info))
+ 		{
+ 		  unsigned int insn0, insn1;
+ 
+Only in binutils-2.37/bfd: elf64-s390.c.orig
--- a/binutils-strip-objcopy-preserve-dates.patch
+++ b/binutils-strip-objcopy-preserve-dates.patch
@ -0,0 +1,49 @@
+From 0d62064867c74286360e821b75ef6799bedc4b34 Mon Sep 17 00:00:00 2001
+From: Gleb Fotengauer-Malinovskiy <glebfm@altlinux.org>
+Date: Tue, 28 Sep 2021 20:11:26 +0930
+Subject: [PATCH] PR28391, strip/objcopy --preserve-dates *.a: cannot set time
+
+After commit 985e0264516 copy_archive function began to pass invalid
+values to the utimensat(2) function when it tries to preserve
+timestamps in ar archives.  This happens because the bfd_stat_arch_elt
+implementation for ar archives fills only the st_mtim.tv_sec part of
+the st_mtim timespec structure, but leaves the st_mtim.tv_nsec part
+and the whole st_atim timespec untouched leaving them uninitialized
+
+	PR 28391
+	* ar.c (extract_file): Clear buf for preserve_dates.
+	* objcopy.c (copy_archive): Likewise.
+---
+ binutils/ar.c      | 3 +++
+ binutils/objcopy.c | 1 +
+ 2 files changed, 4 insertions(+)
+
+diff --git a/binutils/ar.c b/binutils/ar.c
+index 5d6976c7027..8885585ef75 100644
+--- a/binutils/ar.c
+++ b/binutils/ar.c
+@@ -1180,6 +1180,9 @@ extract_file (bfd *abfd)
+   bfd_size_type size;
+   struct stat buf;
+ 
+  if (preserve_dates)
+    memset (&buf, 0, sizeof (buf));
+
+   if (bfd_stat_arch_elt (abfd, &buf) != 0)
+     /* xgettext:c-format */
+     fatal (_("internal stat error on %s"), bfd_get_filename (abfd));
+diff --git a/binutils/objcopy.c b/binutils/objcopy.c
+index a6c2e0dcc26..fd7557fe433 100644
+--- a/binutils/objcopy.c
+++ b/binutils/objcopy.c
+@@ -3600,6 +3600,7 @@ copy_archive (bfd *ibfd, bfd *obfd, const char *output_target,
+ 
+       if (preserve_dates)
+ 	{
+	  memset (&buf, 0, sizeof (buf));
+ 	  stat_status = bfd_stat_arch_elt (this_element, &buf);
+ 
+ 	  if (stat_status != 0)
+-- 
+2.37.1
+
--- a/binutils-testsuite-fixes.patch
+++ b/binutils-testsuite-fixes.patch
@ -935,3 +935,31 @@ diff -rup binutils.orig/ld/testsuite/ld-powerpc/tlsso32.r binutils-2.37/ld/tests
 
 # This target requires extra GAS options when building PIC/PIE code.
 set AFLAGS_PIC ""
+--- binutils.orig/binutils/testsuite/binutils-all/compress.exp	2021-08-18 12:41:47.036991908 +0100
+++ binutils-2.37/binutils/testsuite/binutils-all/compress.exp	2021-08-18 12:47:46.097987950 +0100
+@@ -766,12 +766,6 @@ proc test_gnu_debuglink {} {
+     } else {
+ 	pass "$test (objdump with missing link)"
+     }
+-    set got [remote_exec host [concat sh -c [list "$READELF -S tmpdir/testprog > /dev/null"]]]
+-    if { [lindex $got 0] != 0 || ![string match "" [lindex $got 1]] } then {
+-	fail "$test (readelf with missing link)"
+-    } else {
+-	pass "$test (readelf with missing link)"
+-    }
+ }
+ 
+ if {[is_elf_format]} then {
+--- binutils.orig/ld/testsuite/ld-plugin/lto.exp	2022-08-11 09:47:38.597862309 +0100
+++ binutils-2.37/ld/testsuite/ld-plugin/lto.exp	2022-08-11 09:48:23.878601461 +0100
+@@ -31,8 +31,8 @@ if { ![check_plugin_api_available]
+ 
+ set saved_CFLAGS "$CFLAGS"
+ set saved_CXXFLAGS "$CXXFLAGS"
+-regsub -all "(\\-Wp,)?-D_FORTIFY_SOURCE=\[0-9\]+" $CFLAGS "" CFLAGS
+-regsub -all "(\\-Wp,)?-D_FORTIFY_SOURCE=\[0-9\]+" $CXXFLAGS "" CXXFLAGS
+# regsub -all "(\\-Wp,)?-D_FORTIFY_SOURCE=\[0-9\]+" $CFLAGS "" CFLAGS
+# regsub -all "(\\-Wp,)?-D_FORTIFY_SOURCE=\[0-9\]+" $CXXFLAGS "" CXXFLAGS
+ 
+ proc restore_notify { } {
+   global saved_CFLAGS
--- a/binutils-update-linker-manual.patch
+++ b/binutils-update-linker-manual.patch
@ -0,0 +1,29 @@
+Only in binutils-2.37: binutils-update-linker-manual.patch
+Only in binutils-2.37/ld: ld.1.orig
+Only in binutils-2.37/ld: ld.1.rej
+diff -rup binutils.orig/ld/ld.info binutils-2.37/ld/ld.info
+--- binutils.orig/ld/ld.info	2022-06-08 17:11:56.281578073 +0200
+++ binutils-2.37/ld/ld.info	2022-06-08 17:13:14.784873487 +0200
+@@ -2211,7 +2211,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'
+Only in binutils-2.37/ld: ld.info.orig
+diff -rup binutils.orig/ld/ld.texi binutils-2.37/ld/ld.texi
+--- binutils.orig/ld/ld.texi	2022-06-08 17:11:56.281578073 +0200
+++ binutils-2.37/ld/ld.texi	2022-06-08 17:13:14.788873503 +0200
+@@ -2773,7 +2773,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}
+Only in binutils-2.37/ld: ld.texi.orig
--- a/binutils.spec
+++ b/binutils.spec
@ -39,7 +39,7 @@
 Summary: A GNU collection of binary utilities
 Name: binutils%{?name_cross}%{?_with_debug:-debug}
 Version: 2.37
-Release: 5%{?dist}
+Release: 25%{?dist}
 License: GPLv3+
 URL: https://sourceware.org/binutils

@ -277,6 +277,66 @@ Patch17: binutils-gold-i386-gnu-property-notes.patch
 # Lifetime: Fixed in 2.38
 Patch18: binutils-dwarf-5-dir0.patch

+# Purpose:  Ensure that the manual pages are generated.
+# Lifetime: Fixed in 2.38
+Patch19: binutils-missing-man-pages.patch
+
+# Purpose: Close the file descriptor if there is no archive plugin file
+# descriptor to avoid running out of file descriptors on thin archives with
+# many archive members.
+# Lifetime: Fixed in 2.38
+Patch20: binutils-bfd-close-fds.patch
+
+# Purpose:  Fix ccache test failure introduced with 2.37
+# Lifetime: Fixed in 2.38.
+Patch21: binutils-gas-Use-the-directory-name-in-.file-0.patch
+
+# Purpose:  Add ability to show unicode characters to display tools
+# Lifetime: Fixed in 2.38.
+Patch22: binutils.unicode.patch
+
+# Purpose:  Add ability to warn about unicode characters in the assembler
+# Lifetime: Fixed in 2.38.
+Patch23: binutils-gas-multibyte-warnings.patch
+
+# Purpose:  Add support for the EFI format to the AArch64 target.
+# Lifetime: Fixed in 2.38.
+Patch24: binutils-AArch64-EFI.patch
+
+# Purpose:  Fix a potential illegal memory access parsing a corrupt COFF file.
+# Lifetime: Fixed in 2.38.
+Patch25: binutils-CVE-2021-45078.patch
+
+# Purpose:  Fix a potential illegal memory access parsing a corrupt ELF file.
+# Lifetime: Fixed in 2.38.
+Patch26: binutils-readelf-corrupt-program-headers.patch
+
+# Purpose:  Add an option to disable access to debuginfod servers.
+# Lifetime: Fixed in 2.39
+Patch27: binutils-do-not-use-debuginfod.patch
+
+# Purpose:  Support generating static PIE binaries for the s390x.
+# Lifetime: Fixed in 2.39
+Patch28: binutils-s390x-static-PIE.patch
+
+
+# Purpose:  Stop readelf and objdump from unnecessarily following links.
+# Lifetime: Fixed in 2.39
+Patch29: binutils-link-following.patch
+
+%if %{enable_new_dtags}
+# Purpose:  Change ld man page so that it says that --enable-new-dtags is the default.
+# Lifetime: Permanent
+Patch30: binutils-update-linker-manual.patch
+%endif
+
+# Purpose:  Add a --package-metadata option to the linkers.
+# Lifetime: Fixed in 2.39 (for ld.bfd)
+Patch31: binutils-package-metadata.patch
+
+# Purpose: Fixes warning when running strip on an object file 
+# Lifetime: Fixed in 2.38 
+Patch32: binutils-strip-objcopy-preserve-dates.patch
 #----------------------------------------------------------------------------

 Provides: bundled(libiberty)
@ -343,6 +403,9 @@ Requires(post): coreutils
 BuildRequires: elfutils-debuginfod-client-devel
 %endif

+# The priority of the linker.  Important oif the gold linker is also being built.
+%{!?ld_bfd_priority: %global ld_bfd_priority    50}
+
 #----------------------------------------------------------------------------

 %description
@ -368,6 +431,14 @@ Requires: binutils = %{version}-%{release}
 # BZ 1215242: We need touch...
 Requires: coreutils

+# BZ 1924068.  Since applications that use the BFD library are
+# required to link against the static version, ensure that it retains
+# its debug informnation.
+# FIXME: Yes - this is being done twice.  I have no idea why this
+# second invocation is necessary but if both are not present the
+# static archives will be stripped.
+%undefine __brp_strip_static_archive
+
 %description devel
 This package contains BFD and opcodes static and dynamic libraries.

@ -382,14 +453,6 @@ dynamic libraries.
 Developers starting new projects are strongly encouraged to consider
 using libelf instead of BFD.

-# BZ 1924068.  Since applications that use the BFD library are
-# required to link against the static version, ensure that it retains
-# its debug informnation.
-# FIXME: Yes - this is being done twice.  I have no idea why this
-# second invocation is necessary but if both are not present the
-# static archives will be stripped.
-%undefine __brp_strip_static_archive
-
 #----------------------------------------------------------------------------

 %if %{with gold}
@ -399,13 +462,6 @@ Summary: The GOLD linker, a faster alternative to the BFD linker
 Provides: gold = %{version}-%{release}
 Requires: binutils >= %{version}

-%description gold
-This package provides the GOLD linker, which can be used as an alternative to
-the default binutils linker (ld.bfd).  The GOLD is generally faster than the
-BFD linker, and it supports features such as Identical Code Folding and
-Incremental linking.  Unfortunately it is not as well maintained as the BFD
-linker, and it may become deprecated in the future.
-
 # Gold needs bison in order to build gold/yyscript.c.
 BuildRequires: bison, m4, gcc-c++
 # The GOLD testsuite needs a static libc++
@ -416,12 +472,17 @@ BuildRequires: gcc-c++
 Conflicts: gcc-c++ < 4.0.0
 %endif

-# The higher of these two numbers determines the default ld.
+# If ld_gold_priority is higher than ld_bfd_priority then it will be the default linker.
 %{!?ld_gold_priority:%global ld_gold_priority   30}

-%endif
+%description gold
+This package provides the GOLD linker, which can be used as an alternative to
+the default binutils linker (ld.bfd).  The GOLD is generally faster than the
+BFD linker, and it supports features such as Identical Code Folding and
+Incremental linking.  Unfortunately it is not as well maintained as the BFD
+linker, and it may become deprecated in the future.

-%{!?ld_bfd_priority: %global ld_bfd_priority    50}
+%endif

 #----------------------------------------------------------------------------

@ -457,6 +518,11 @@ touch */configure
 %if %{without docs}
  find . -name *.info -print -exec touch {} \;
 %endif
+# If we are creating the docs, touch the texi files so that the info and
+# man pages will be rebuilt.
+%if %{with docs}
+  find . -name *.texi -print -exec touch {} \;
+%endif

 %ifarch %{power64}
 %define _target_platform %{_arch}-%{_vendor}-%{_host_os}
@ -471,10 +537,19 @@ echo target is %{binutils_target}
 # The LDFLAGS containing -flto are not being passed when linking the
 # libbfd.so, so the build fails.  Solution: disable LTO.
 %if %{with clang}
-%global _lto_cflags %{nil}
 %define enable_lto 0
 %endif

+# Disable LTO on arm due to:
+# https://bugzilla.redhat.com/show_bug.cgi?id=1918924
+%ifarch %{arm}
+%define enable_lto 0
+%endif
+
+%if !0%{?enable_lto}
+%global _lto_cflags %{nil}
+%endif
+
 %set_build_flags

 %ifarch %{power64}
@ -502,7 +577,7 @@ CARGS=
 CARGS="$CARGS --with-debuginfod"
 %endif

-%ifarch %{ix86} x86_64 ppc %{power64} s390 s390x sh3 sh4 sparc sparc64 arm
+%ifarch %{ix86} x86_64 ppc %{power64} s390 s390x sh3 sh4 sparc sparc64 arm aarch64 riscv64
 CARGS="$CARGS --enable-64-bit-bfd"
 %endif

@ -708,7 +783,7 @@ rm -f %{buildroot}%{_libdir}/lib{bfd,opcodes}.so
 rm -f %{buildroot}%{_libdir}/lib{bfd,opcodes}.la

 # Fix multilib conflicts of generated values by __WORDSIZE-based expressions.
-%ifarch %{ix86} x86_64 ppc %{power64} s390 s390x sh3 sh4 sparc sparc64 arm
+%ifarch %{ix86} x86_64 ppc %{power64} s390 s390x sh3 sh4 sparc sparc64 arm aarch64 riscv64
 # Sanity check --enable-64-bit-bfd really works.
 grep '^#define BFD_ARCH_SIZE 64$' %{buildroot}%{_prefix}/include/bfd.h
 sed -i -e '/^#include "ansidecl.h"/{p;s~^.*$~#include <bits/wordsize.h>~;}' \
@ -880,6 +955,61 @@ exit 0

 #----------------------------------------------------------------------------
 %changelog
+* Thu Aug 11 2022 Nick Clifton  <nickc@redhat.com> - 2.37-25
+- Fix problems running the linkers LTO testsuite.  (#2117284)
+
+* Wed Aug 10 2022 Yara Ahmad  <yahmad@redhat.com> - 2.37-24
+- Fixes warning when running strip on an object file  (#2114597)
+
+* Fri Aug 05 2022 Yara Ahmad  <yahmad@redhat.com> - 2.37-23
+- Add the --package-metadata option to the linkers.  (#2099999)
+
+* Wed Aug 03 2022 Yara Ahmad <yahmad@redhat.com> - 2.37-22
+- Restore the use of --enable-64-bit-bfd for the AArch64 and riscv64 targets.
+- Check and enable 64-bit bfd on aarch64 and riscv64.
+
+* Thu Jun 30 2022 Nick Clifton  <nickc@redhat.com> - 2.37-21
+- Fix a problem honouring readelf's -wE and -wN command line options.
+
+* Wed Jun 8 2022 Yara Ahmad <yahmad@redhat.com> - 2.37-20
+- Fix bug in binutils.spec file that was causing the wrong linker flags to be used.
+- Change the ld man page so that it says that --enable-new-dtags is the default.  (#2090818)
+
+* Sat May 21 2022 Nick Clifton  <nickc@redhat.comn> - 2.37-19
+- Stop readelf and objdump from unnecessarily following links.  (#2086863)
+
+* Thu May 19 2022 Nick Clifton  <nickc@redhat.comn> - 2.37-18
+- Add support for generating static PIE binaries for s390x.  (#2088331)
+
+* Thu Mar 10 2022 Nick Clifton  <nickc@redhat.comn> - 2.37-17
+- Add an option to objdump/readelf to disable accessing debuginfod servers.  (#2051741)
+
+* Thu Feb 10 2022 Nick Clifton  <nickc@redhat.comn> - 2.37-16
+- Fix a potential illegal memory access parsing a corrupt ELF format file.  (#2052522)
+
+* Mon Dec 20 2021 Nick Clifton  <nickc@redhat.comn> - 2.37-15
+- Fix a potential illegal memory access parsing a COFF format file.  (#2033716)
+
+* Wed Dec 01 2021 Nick Clifton <nickc@redhat.com> - 2.37-14
+- Add support for the EFI format to the AArch64 target.  (#2027515)
+
+* Fri Nov 19 2021 Nick Clifton <nickc@redhat.com> - 2.37-13
+- Add ability to warn about multibyte characters in the assembler.  (#2018848)
+
+* Tue Nov 09 2021 Nick Clifton <nickc@redhat.com> - 2.37-12
+- Add ability to show unicode characters to display tools.
+
+* Mon Nov 08 2021 Nick Clifton  <nickc@redhat.com> - 2.37-11
+- Add upstream patch to use the directory name in .file 0, fixes ccache FTBFS (#1996936)
+
+* Thu Sep 16 2021 Tom Stellard <tstellar@redhat.com> - 2.37-10
+- Disable LTO on arm. (#1918924)
+
+* Fri Aug 20 2021 Nick Clifton  <nickc@redhat.com> - 2.37-9
+- Fix a few testsuite failures.
+- Backport upstream patch to fix fd exhaustion
+- Resolves: https://sourceware.org/bugzilla/show_bug.cgi?id=28138
+
 * Tue Aug 10 2021 Nick Clifton  <nickc@redhat.com> - 2.37-5
 - Fix a local change to readelf which resulted in a success exit code for non-existant files.  (#1990817)

--- a/binutils.unicode.patch
+++ b/binutils.unicode.patch
--- a/tests/Sanity/dts-probe-binaries/runtest.sh
+++ b/tests/Sanity/dts-probe-binaries/runtest.sh
@ -326,7 +326,7 @@ fi
    rlRun "$READELF -Wh /bin/true > H"
    rlAssertGrep "ELF Header:" H
    rlAssertGrep "7f 45 4c 46" H
-    rlAssertGrep "DYN (Shared object file)" H
+    rlAssertGrep "DYN (Position-Independent Executable file)" H
    rlAssertGrep "Section header string table index:" H
    rlAssertGrep "ABI Version:" H

--- a/tests/Sanity/rebuild-coreutils/runtest.sh
+++ b/tests/Sanity/rebuild-coreutils/runtest.sh
@ -53,7 +53,7 @@ rlJournalStart
    rlPhaseEnd

    rlPhaseStartTest
-        rlRun "su - $TEST_USER -c 'rpmbuild -bb --clean \$(rpm --eval=%_specdir)/coreutils.spec'"
+        rlRun "su - $TEST_USER -c 'rpmbuild -bc --clean \$(rpm --eval=%_specdir)/coreutils.spec'"
    rlPhaseEnd

    rlPhaseStartCleanup
Author	SHA1	Message	Date
Nick Clifton	2391c3b9ee	Fix problems running the linkers LTO testsuite. Resolves: #2117284	2022-08-11 10:27:42 +01:00
yahmad	da676ef767	- Fixes warning when running strip on an object file (#2114597 )	2022-08-10 20:20:47 +02:00
yahmad	a95926d240	- Add the --package-metadata option to the linkers. (#2099999 )	2022-08-08 17:19:12 +02:00
yahmad	2c3fa4adb4	- Restore the use of --enable-64-bit-bfd for the AArch64 and riscv64 targets. - Check and enable 64-bit bfd on aarch64 and riscv64.	2022-08-04 10:28:41 +02:00
Nick Clifton	2b924e2a4b	Fix a problem honouring readelf's -wE and -wN command line options.	2022-06-30 16:58:28 +01:00
yahmad	b0bbec2ce9	Add back deleted sources, and fixed typo in changelog	2022-06-09 12:39:39 +02:00
yahmad	d00293da5e	- Fix bug in binutils.spec file that was causing the wrong linker flags to be used. - Change the ld man page so that it says that --enable-new-dtags is the default. (#2090818)	2022-06-09 00:06:59 +02:00
Nick Clifton	6ae0a15bfc	Stop readelf and objdump from unnecessarily following links. (#2086863 )	2022-05-21 14:43:45 +01:00
Nick Clifton	6f4f398193	Add support for generating static PIE binaries for s390x. (#2088331 )	2022-05-19 13:29:18 +01:00
Nick Clifton	10477980ae	Add an option to objdump/readelf to disable accessing debuginfod servers. Resolves: #2051741	2022-03-10 11:44:30 +00:00
Nick Clifton	6d28776abe	Fix a potential illegal memory access parsing a corrupt ELF format file. Resolves: #2052522	2022-02-10 10:50:50 +00:00
Nick Clifton	e38a1643f1	Fix a potential illegal memory access parsing a COFF format file. (#2033716 )	2021-12-20 14:58:26 +00:00
Nick Clifton	3f8fde082b	Add support for the EFI format to the AArch64 target. Resolves: #2027515	2021-12-01 16:22:03 +00:00
Nick Clifton	620973c050	Add ability to warn about multibyte characters in the assembler. (#2018848 )	2021-11-19 12:36:57 +00:00
Nick Clifton	1524ef5833	Add ability to show unicode characters to display tools.	2021-11-09 16:23:45 +00:00
Nick Clifton	fa66961fc8	Add upstream patch to use the directory name in .file 0, fixes ccache FTBFS Resolves: #1996936	2021-11-08 15:29:03 +00:00
Nick Clifton	16cc417f02	Disable LTO on arm. (#1918924 )	2021-09-16 17:15:18 +01:00
Nick Clifton	b55e9b8c78	Fix a few testsuite failures. Backport upstream patch to fix fd exhaustion	2021-08-20 12:18:10 +01:00