Import fix for PR 23870 in order to help building Go binaries.

Resolves: #1680658

.fmf/version

@@ -1 +0,0 @@
-1

.gitignore

@@ -1,70 +1,17 @@
-*.diff
-*.orig
-*.rej
-*.sed
-*.xz
+binutils-2.*/
+i386
+i686
+x86_64
+/binutils-*.tar.bz2
+.build-*
+*.src.rpm
+*.log
+HOWTO
+build-sources
 
-*~
-.#*
-*#
-
-*.flt
-*.gmo
-*.info
-*.la
-*.lo
-*.o
-*.pyc
-*.tmp
-*.a
-
-.deps
-.libs
-
-autom4te.cache
-config.cache
-config.h
-config.intl
-config.log
-config.status
-libtool
-POTFILES
-*-POTFILES
-
-TAGS
-TAGS.sub
-
-.local.vimrc
-.lvimrc
-
-.clang-format
-
-.gdbinit
-.gdb_history
-
-perf.data
-perf.data.old
-
-# ignore core files, but not java/net/protocol/core/
-core
-!core/
-
-lost+found
-
-# ignore ./contrib/gcc_update output
-LAST_UPDATED
-REVISION
-
-stamp-*
-*.stamp
-
-# ignore in-tree prerequisites
-/mpfr*
-/mpc*
-/gmp*
-/isl*
+/binutils-2.29.tar.xz
+/binutils-2.29.1.tar.xz
 /binutils-2.19.50.0.1-output-format.sed
-/binutils-2.44.50-13.fc43.src.rpm
-/binutils-with-gold-2.45.50-be970c68891.tar.gz
-/binutils-with-gold-2.45.50-ba5838a98fb.tar.gz
-/binutils-2.47.50-1.fc46.src.rpm
+/binutils-2.30.tar.xz
+/binutils-2.30.90.tar.xz
+/binutils-2.31.1.tar.xz

binutils-2.19.50.0.1-output-format.sed

@@ -0,0 +1,38 @@
+# Generate OUTPUT_FORMAT line for .so files from the system linker output.
+# Imported from glibc/Makerules.
+
+/ld.*[ 	]-E[BL]/b f
+/collect.*[ 	]-E[BL]/b f
+/OUTPUT_FORMAT[^)]*$/{N
+s/\n[	 ]*/ /
+}
+t o
+: o
+s/^.*OUTPUT_FORMAT(\([^,]*\), \1, \1).*$/OUTPUT_FORMAT(\1)/
+t q
+s/^.*OUTPUT_FORMAT(\([^,]*\), \([^,]*\), \([^,]*\)).*$/\1,\2,\3/
+t s
+s/^.*OUTPUT_FORMAT(\([^,)]*\).*$)/OUTPUT_FORMAT(\1)/
+t q
+d
+: s
+s/"//g
+G
+s/\n//
+s/^\([^,]*\),\([^,]*\),\([^,]*\),B/OUTPUT_FORMAT(\2)/p
+s/^\([^,]*\),\([^,]*\),\([^,]*\),L/OUTPUT_FORMAT(\3)/p
+s/^\([^,]*\),\([^,]*\),\([^,]*\)/OUTPUT_FORMAT(\1)/p
+/,/s|^|*** BUG in libc/scripts/output-format.sed *** |p
+q
+: q
+s/"//g
+p
+q
+: f
+s/^.*[ 	]-E\([BL]\)[ 	].*$/,\1/
+t h
+s/^.*[ 	]-E\([BL]\)$/,\1/
+t h
+d
+: h
+h

binutils-2.25-version.patch

@@ -1,10 +1,9 @@
-diff -rup binutils.orig/bfd/Makefile.am binutils-2.38/bfd/Makefile.am
---- binutils.orig/bfd/Makefile.am	2022-02-09 14:10:42.659300681 +0000
-+++ binutils-2.38/bfd/Makefile.am	2022-02-09 14:12:40.562532916 +0000
-@@ -977,8 +977,8 @@ DISTCLEANFILES = $(BUILD_CFILES) $(BUILD
+--- binutils-2.26.orig/bfd/Makefile.am	2016-01-25 10:11:33.505289018 +0000
++++ binutils-2.26/bfd/Makefile.am	2016-01-25 10:13:23.489964145 +0000
+@@ -1043,8 +1043,8 @@ DISTCLEANFILES = $(BUILD_CFILES) $(BUILD
  bfdver.h: $(srcdir)/version.h $(srcdir)/development.sh $(srcdir)/Makefile.in
- 	$(AM_V_GEN)\
- 	bfd_version=`echo "$(VERSION)" | $(SED) -e 's/\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\).*/\1.00\2.00\3.00\4.00\5/' -e 's/\([^\.]*\)\..*\(..\)\..*\(..\)\..*\(..\)\..*\(..\)$$/\1\2\3\4\5/'` ;\
+ 	@echo "creating $@"
+ 	@bfd_version=`echo "$(VERSION)" | $(SED) -e 's/\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\).*/\1.00\2.00\3.00\4.00\5/' -e 's/\([^\.]*\)\..*\(..\)\..*\(..\)\..*\(..\)\..*\(..\)$$/\1\2\3\4\5/'` ;\
 -	bfd_version_string="\"$(VERSION)\"" ;\
 -	bfd_soversion="$(VERSION)" ;\
 +	bfd_version_string="\"$(VERSION)-%{release}\"" ;\
@@ -12,7 +11,7 @@ diff -rup binutils.orig/bfd/Makefile.am binutils-2.38/bfd/Makefile.am
  	bfd_version_package="\"$(PKGVERSION)\"" ;\
  	report_bugs_to="\"$(REPORT_BUGS_TO)\"" ;\
  	. $(srcdir)/development.sh ;\
-@@ -989,7 +989,7 @@ bfdver.h: $(srcdir)/version.h $(srcdir)/
+@@ -1055,7 +1055,7 @@ bfdver.h: $(srcdir)/version.h $(srcdir)/
  	fi ;\
  	$(SED) -e "s,@bfd_version@,$$bfd_version," \
  	    -e "s,@bfd_version_string@,$$bfd_version_string," \
@@ -21,13 +20,12 @@ diff -rup binutils.orig/bfd/Makefile.am binutils-2.38/bfd/Makefile.am
  	    -e "s,@report_bugs_to@,$$report_bugs_to," \
  	    < $(srcdir)/version.h > $@; \
  	echo "$${bfd_soversion}" > libtool-soversion
-diff -rup binutils.orig/bfd/Makefile.in binutils-2.38/bfd/Makefile.in
---- binutils.orig/bfd/Makefile.in	2022-02-09 14:10:42.653300720 +0000
-+++ binutils-2.38/bfd/Makefile.in	2022-02-09 14:19:03.362040188 +0000
-@@ -2094,8 +2094,8 @@ stmp-lcoff-h: $(LIBCOFF_H_FILES) $(MKDOC
+--- binutils-2.26.orig/bfd/Makefile.in	2016-01-25 10:11:33.505289018 +0000
++++ binutils-2.26/bfd/Makefile.in	2016-01-25 10:14:17.818297941 +0000
+@@ -2111,8 +2111,8 @@ stmp-lcoff-h: $(LIBCOFF_H_FILES)
  bfdver.h: $(srcdir)/version.h $(srcdir)/development.sh $(srcdir)/Makefile.in
- 	$(AM_V_GEN)\
- 	bfd_version=`echo "$(VERSION)" | $(SED) -e 's/\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\).*/\1.00\2.00\3.00\4.00\5/' -e 's/\([^\.]*\)\..*\(..\)\..*\(..\)\..*\(..\)\..*\(..\)$$/\1\2\3\4\5/'` ;\
+ 	@echo "creating $@"
+ 	@bfd_version=`echo "$(VERSION)" | $(SED) -e 's/\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\).*/\1.00\2.00\3.00\4.00\5/' -e 's/\([^\.]*\)\..*\(..\)\..*\(..\)\..*\(..\)\..*\(..\)$$/\1\2\3\4\5/'` ;\
 -	bfd_version_string="\"$(VERSION)\"" ;\
 -	bfd_soversion="$(VERSION)" ;\
 +	bfd_version_string="\"$(VERSION)-%{release}\"" ;\
@@ -35,7 +33,7 @@ diff -rup binutils.orig/bfd/Makefile.in binutils-2.38/bfd/Makefile.in
  	bfd_version_package="\"$(PKGVERSION)\"" ;\
  	report_bugs_to="\"$(REPORT_BUGS_TO)\"" ;\
  	. $(srcdir)/development.sh ;\
-@@ -2106,7 +2106,7 @@ bfdver.h: $(srcdir)/version.h $(srcdir)/
+@@ -2123,7 +2123,7 @@ bfdver.h: $(srcdir)/version.h $(srcdir)/
  	fi ;\
  	$(SED) -e "s,@bfd_version@,$$bfd_version," \
  	    -e "s,@bfd_version_string@,$$bfd_version_string," \

binutils-2.28-ignore-gold-duplicates.patch

@@ -0,0 +1,14 @@
+diff -rup binutils.orig/ld/ldmain.c binutils-2.28/ld/ldmain.c
+--- binutils.orig/ld/ldmain.c	2017-06-09 09:08:26.954016429 +0100
++++ binutils-2.28/ld/ldmain.c	2017-06-09 09:09:11.307490976 +0100
+@@ -923,6 +923,10 @@ multiple_definition (struct bfd_link_inf
+       obfd = h->u.def.section->owner;
+       break;
+     case bfd_link_hash_indirect:
++      /* PR 21074: The GOLD linker can produce multiple indirect
++	 refences to the same symbol.  These can be ignored.  */
++      if (bfd_is_ind_section (nsec))
++	return;
+       osec = bfd_ind_section_ptr;
+       oval = 0;
+       obfd = NULL;

binutils-2.29-filename-in-error-messages.patch

@@ -0,0 +1,124 @@
+--- binutils.orig/binutils/readelf.c	2018-01-22 15:48:10.450701702 +0000
++++ binutils-2.30.0/binutils/readelf.c	2018-01-22 15:55:26.739588657 +0000
+@@ -19019,75 +19019,85 @@ process_file (char * file_name)
+   Filedata * filedata = NULL;
+   struct stat statbuf;
+   char armag[SARMAG];
+-  bfd_boolean ret = TRUE;
++  bfd_boolean ret = FALSE;
++  char * name;
++  char * saved_program_name;
++
++  /* Overload program_name to include file_name.  Doing this means
++     that warning/error messages will positively identify the file
++     concerned even when multiple instances of readelf are running.  */
++  name = xmalloc (strlen (program_name) + strlen (file_name) + 3);
++  sprintf (name, "%s: %s", program_name, file_name);
++  saved_program_name = program_name;
++  program_name = name;
+ 
+   if (stat (file_name, &statbuf) < 0)
+     {
+       if (errno == ENOENT)
+-	error (_("'%s': No such file\n"), file_name);
++	error (_("No such file\n"));
+       else
+-	error (_("Could not locate '%s'.  System error message: %s\n"),
+-	       file_name, strerror (errno));
+-      return FALSE;
++	error (_("Could not locate file.  System error message: %s\n"),
++	       strerror (errno));
++      goto done;
+     }
+ 
+   if (! S_ISREG (statbuf.st_mode))
+     {
+-      error (_("'%s' is not an ordinary file\n"), file_name);
+-      return FALSE;
++      error (_("Not an ordinary file\n"));
++      goto done;
+     }
+ 
+   filedata = calloc (1, sizeof * filedata);
+   if (filedata == NULL)
+     {
+       error (_("Out of memory allocating file data structure\n"));
+-      return FALSE;
++      goto done;
+     }
+ 
+   filedata->file_name = file_name;
+   filedata->handle = fopen (file_name, "rb");
+   if (filedata->handle == NULL)
+     {
+-      error (_("Input file '%s' is not readable.\n"), file_name);
+-      free (filedata);
+-      return FALSE;
++      error (_("Not readable\n"));
++      goto done;
+     }
+ 
+   if (fread (armag, SARMAG, 1, filedata->handle) != 1)
+     {
+-      error (_("%s: Failed to read file's magic number\n"), file_name);
+-      fclose (filedata->handle);
+-      free (filedata);
+-      return FALSE;
+-    }
+-
+-  filedata->file_size = (bfd_size_type) statbuf.st_size;
+-
+-  if (memcmp (armag, ARMAG, SARMAG) == 0)
+-    {
+-      if (! process_archive (filedata, FALSE))
+-	ret = FALSE;
+-    }
+-  else if (memcmp (armag, ARMAGT, SARMAG) == 0)
+-    {
+-      if ( ! process_archive (filedata, TRUE))
+-	ret = FALSE;
++      error (_("Failed to read file's magic number\n"));
+     }
+   else
+     {
+-      if (do_archive_index)
+-	error (_("File %s is not an archive so its index cannot be displayed.\n"),
+-	       file_name);
++      filedata->file_size = (bfd_size_type) statbuf.st_size;
+ 
+-      rewind (filedata->handle);
+-      archive_file_size = archive_file_offset = 0;
+-
+-      if (! process_object (filedata))
+-	ret = FALSE;
++      if (memcmp (armag, ARMAG, SARMAG) == 0)
++	{
++	  if (process_archive (filedata, FALSE))
++	    ret = TRUE;
++	}
++      else if (memcmp (armag, ARMAGT, SARMAG) == 0)
++	{
++	  if (process_archive (filedata, TRUE))
++	    ret = TRUE;
++	}
++      else
++	{
++	  if (do_archive_index)
++	    error (_("Not an archive so its index cannot be displayed.\n"));
++
++	  rewind (filedata->handle);
++	  archive_file_size = archive_file_offset = 0;
++
++	  if (process_object (filedata))
++	    ret = TRUE;
++	}
+     }
+ 
+   fclose (filedata->handle);
++ done:
+   free (filedata);
++  free (program_name);
++  program_name = saved_program_name;
+ 
+   return ret;
+ }

binutils-2.29-revert-PLT-elision.patch

@@ -67,6 +67,29 @@ diff -rup binutils.orig/ld/testsuite/ld-x86-64/pltgot-2.d binutils-2.29.1/ld/tes
  #...
   +0x[0-9a-f]+ +\(PLTREL.*
  #...
+diff -rup binutils.orig/ld/testsuite/ld-x86-64/plt-main-bnd.dd binutils-2.29.1/ld/testsuite/ld-x86-64/plt-main-bnd.dd
+--- binutils.orig/ld/testsuite/ld-x86-64/plt-main-bnd.dd	2017-11-15 13:32:39.405064420 +0000
++++ binutils-2.29.1/ld/testsuite/ld-x86-64/plt-main-bnd.dd	2017-11-15 15:06:53.694623801 +0000
+@@ -1,7 +1,4 @@
+-#...
+-Disassembly of section .plt.got:
+ 
+-[a-f0-9]+ <[a-z_]+@plt>:
+-[ 	]*[a-f0-9]+:	f2 ff 25 .. .. 20 00 	bnd jmpq \*0x20....\(%rip\)        # ...... <.*>
++#...
+ [ 	]*[a-f0-9]+:	90                   	nop
+ #pass
+diff -rup binutils.orig/ld/testsuite/ld-x86-64/plt-main-ibt.dd binutils-2.29.1/ld/testsuite/ld-x86-64/plt-main-ibt.dd
+--- binutils.orig/ld/testsuite/ld-x86-64/plt-main-ibt.dd	2017-11-15 13:32:39.412064336 +0000
++++ binutils-2.29.1/ld/testsuite/ld-x86-64/plt-main-ibt.dd	2017-11-15 15:06:35.148842897 +0000
+@@ -1,7 +1,3 @@
+ #...
+-Disassembly of section .plt.got:
+-
+-[a-f0-9]+ <[_a-z]+@plt>:
+ [ 	]*[a-f0-9]+:	f3 0f 1e fa          	endbr64 
+-[ 	]*[a-f0-9]+:	f2 ff 25 .. .. 20 00 	bnd jmpq \*0x20....\(%rip\)        # ...... <[_a-z]+>
+ #pass
 diff -rup binutils.orig/ld/testsuite/ld-x86-64/plt-main.rd binutils-2.29.1/ld/testsuite/ld-x86-64/plt-main.rd
 --- binutils.orig/ld/testsuite/ld-x86-64/plt-main.rd	2017-11-15 13:32:39.407064397 +0000
 +++ binutils-2.29.1/ld/testsuite/ld-x86-64/plt-main.rd	2017-11-15 15:06:17.244054423 +0000
@@ -123,6 +146,82 @@ diff -rup binutils.orig/ld/testsuite/ld-x86-64/pr20830b-now.d binutils-2.29.1/ld
  0+18 0000000000000010 0000001c FDE cie=00000000 pc=0000000000000138..0000000000000144
    DW_CFA_nop
    DW_CFA_nop
+diff -rup binutils.orig/ld/testsuite/ld-x86-64/pr21038a.d binutils-2.29.1/ld/testsuite/ld-x86-64/pr21038a.d
+--- binutils.orig/ld/testsuite/ld-x86-64/pr21038a.d	2017-11-15 13:32:39.408064384 +0000
++++ binutils-2.29.1/ld/testsuite/ld-x86-64/pr21038a.d	2017-11-15 15:19:48.097433680 +0000
+@@ -19,7 +19,8 @@ Contents of the .eh_frame section:
+   DW_CFA_offset: r16 \(rip\) at cfa-8
+   DW_CFA_nop
+   DW_CFA_nop
+-
++#pass
++  
+ 0+18 0000000000000014 0000001c FDE cie=00000000 pc=00000000000001c8..00000000000001d4
+   DW_CFA_nop
+   DW_CFA_nop
+diff -rup binutils.orig/ld/testsuite/ld-x86-64/pr21038a-now.d binutils-2.29.1/ld/testsuite/ld-x86-64/pr21038a-now.d
+--- binutils.orig/ld/testsuite/ld-x86-64/pr21038a-now.d	2017-11-15 13:32:39.401064469 +0000
++++ binutils-2.29.1/ld/testsuite/ld-x86-64/pr21038a-now.d	2017-11-15 15:10:56.077760324 +0000
+@@ -20,7 +20,8 @@ Contents of the .eh_frame section:
+   DW_CFA_offset: r16 \(rip\) at cfa-8
+   DW_CFA_nop
+   DW_CFA_nop
+-
++#pass
++  
+ 0+18 0000000000000014 0000001c FDE cie=00000000 pc=00000000000001c8..00000000000001d4
+   DW_CFA_nop
+   DW_CFA_nop
+diff -rup binutils.orig/ld/testsuite/ld-x86-64/pr21038b.d binutils-2.29.1/ld/testsuite/ld-x86-64/pr21038b.d
+--- binutils.orig/ld/testsuite/ld-x86-64/pr21038b.d	2017-11-15 13:32:39.405064420 +0000
++++ binutils-2.29.1/ld/testsuite/ld-x86-64/pr21038b.d	2017-11-15 15:10:42.828916844 +0000
+@@ -19,6 +19,7 @@ Contents of the .eh_frame section:
+   DW_CFA_offset: r16 \(rip\) at cfa-8
+   DW_CFA_nop
+   DW_CFA_nop
++#pass
+ 
+ 0+18 0000000000000014 0000001c FDE cie=00000000 pc=00000000000001d8..00000000000001dd
+   DW_CFA_nop
+diff -rup binutils.orig/ld/testsuite/ld-x86-64/pr21038b-now.d binutils-2.29.1/ld/testsuite/ld-x86-64/pr21038b-now.d
+--- binutils.orig/ld/testsuite/ld-x86-64/pr21038b-now.d	2017-11-15 13:32:39.416064288 +0000
++++ binutils-2.29.1/ld/testsuite/ld-x86-64/pr21038b-now.d	2017-11-15 15:11:11.550577531 +0000
+@@ -20,7 +20,8 @@ Contents of the .eh_frame section:
+   DW_CFA_offset: r16 \(rip\) at cfa-8
+   DW_CFA_nop
+   DW_CFA_nop
+-
++#pass
++  
+ 0+18 0000000000000014 0000001c FDE cie=00000000 pc=00000000000001d8..00000000000001dd
+   DW_CFA_nop
+   DW_CFA_nop
+diff -rup binutils.orig/ld/testsuite/ld-x86-64/pr21038c.d binutils-2.29.1/ld/testsuite/ld-x86-64/pr21038c.d
+--- binutils.orig/ld/testsuite/ld-x86-64/pr21038c.d	2017-11-15 13:32:39.411064348 +0000
++++ binutils-2.29.1/ld/testsuite/ld-x86-64/pr21038c.d	2017-11-15 15:09:52.664509478 +0000
+@@ -19,7 +19,8 @@ Contents of the .eh_frame section:
+   DW_CFA_offset: r16 \(rip\) at cfa-8
+   DW_CFA_nop
+   DW_CFA_nop
+-
++#pass
++  
+ 0+18 0000000000000014 0000001c FDE cie=00000000 pc=0000000000000220..0000000000000231
+   DW_CFA_nop
+   DW_CFA_nop
+diff -rup binutils.orig/ld/testsuite/ld-x86-64/pr21038c-now.d binutils-2.29.1/ld/testsuite/ld-x86-64/pr21038c-now.d
+--- binutils.orig/ld/testsuite/ld-x86-64/pr21038c-now.d	2017-11-15 13:32:39.413064324 +0000
++++ binutils-2.29.1/ld/testsuite/ld-x86-64/pr21038c-now.d	2017-11-15 15:11:22.975442559 +0000
+@@ -20,7 +20,8 @@ Contents of the .eh_frame section:
+   DW_CFA_offset: r16 \(rip\) at cfa-8
+   DW_CFA_nop
+   DW_CFA_nop
+-
++#pass
++  
+ 0+18 0000000000000014 0000001c FDE cie=00000000 pc=0000000000000220..0000000000000231
+   DW_CFA_nop
+   DW_CFA_nop
 diff -rup binutils.orig/ld/testsuite/ld-x86-64/tlspic2.rd binutils-2.29.1/ld/testsuite/ld-x86-64/tlspic2.rd
 --- binutils.orig/ld/testsuite/ld-x86-64/tlspic2.rd	2017-11-15 13:32:39.417064276 +0000
 +++ binutils-2.29.1/ld/testsuite/ld-x86-64/tlspic2.rd	2017-11-15 15:05:02.950932110 +0000

binutils-2.31-export-demangle.h.patch

@@ -0,0 +1,33 @@
+diff -rup binutils.orig/bfd/Makefile.am binutils-2.30.90/bfd/Makefile.am
+--- binutils.orig/bfd/Makefile.am	2018-07-09 09:49:43.378323137 +0100
++++ binutils-2.30.90/bfd/Makefile.am	2018-07-09 09:50:40.252723495 +0100
+@@ -33,7 +33,7 @@ bfdlibdir = @bfdlibdir@
+ bfdincludedir = @bfdincludedir@
+ bfdlib_LTLIBRARIES = libbfd.la
+ bfdinclude_HEADERS = $(BFD_H) $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
+-		     $(INCDIR)/bfdlink.h $(INCDIR)/diagnostics.h
++		     $(INCDIR)/bfdlink.h $(INCDIR)/diagnostics.h  $(INCDIR)/demangle.h
+ else !INSTALL_LIBBFD
+ # Empty these so that the respective installation directories will not be created.
+ bfdlibdir =
+diff -rup binutils.orig/bfd/Makefile.in binutils-2.30.90/bfd/Makefile.in
+--- binutils.orig/bfd/Makefile.in	2018-07-09 09:49:42.757329685 +0100
++++ binutils-2.30.90/bfd/Makefile.in	2018-07-09 09:51:16.145345812 +0100
+@@ -248,7 +248,7 @@ am__can_run_installinfo = \
+   esac
+ am__bfdinclude_HEADERS_DIST = $(INCDIR)/plugin-api.h bfd.h \
+ 	$(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/bfdlink.h \
+-	$(INCDIR)/diagnostics.h
++	$(INCDIR)/diagnostics.h $(INCDIR)/demangle.h
+ HEADERS = $(bfdinclude_HEADERS)
+ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+   distclean-recursive maintainer-clean-recursive
+@@ -467,7 +467,7 @@ libbfd_la_LDFLAGS = $(am__append_1) -rel
+ @INSTALL_LIBBFD_FALSE@bfdinclude_HEADERS = $(am__append_2)
+ @INSTALL_LIBBFD_TRUE@bfdinclude_HEADERS = $(BFD_H) \
+ @INSTALL_LIBBFD_TRUE@	$(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
+-@INSTALL_LIBBFD_TRUE@	$(INCDIR)/bfdlink.h \
++@INSTALL_LIBBFD_TRUE@	$(INCDIR)/bfdlink.h  $(INCDIR)/demangle.h \
+ @INSTALL_LIBBFD_TRUE@	$(INCDIR)/diagnostics.h $(am__append_2)
+ @INSTALL_LIBBFD_FALSE@rpath_bfdlibdir = @bfdlibdir@
+ @INSTALL_LIBBFD_FALSE@noinst_LTLIBRARIES = libbfd.la

binutils-CVE-2018-20002.patch

@@ -0,0 +1,56 @@
+diff -rup binutils.ori/bfd/syms.c binutils-2.31.1/bfd/syms.c
+--- binutils.ori/bfd/syms.c	2019-01-03 13:51:05.784005438 +0000
++++ binutils-2.31.1/bfd/syms.c	2019-01-03 13:53:43.238815129 +0000
+@@ -822,10 +822,18 @@ _bfd_generic_read_minisymbols (bfd *abfd
+   if (symcount < 0)
+     goto error_return;
+ 
+-  *minisymsp = syms;
+-  *sizep = sizeof (asymbol *);
++  if (symcount == 0)
++    /* We return 0 above when storage is 0.  Exit in the same state
++       here, so as to not complicate callers with having to deal with
++       freeing memory for zero symcount.  */
++    free (syms);
++  else
++    {
++      *minisymsp = syms;
++      *sizep = sizeof (asymbol *);
++    }
+ 
+-  return symcount;
++ return symcount;
+ 
+  error_return:
+   bfd_set_error (bfd_error_no_symbols);
+diff -rup binutils.ori/binutils/nm.c binutils-2.31.1/binutils/nm.c
+--- binutils.ori/binutils/nm.c	2019-01-03 13:51:06.337001258 +0000
++++ binutils-2.31.1/binutils/nm.c	2019-01-03 13:52:37.542311774 +0000
+@@ -1162,13 +1162,11 @@ display_rel_file (bfd *abfd, bfd *archiv
+       if (synth_count > 0)
+ 	{
+ 	  asymbol **symp;
+-	  void *new_mini;
+ 	  long i;
+ 
+-	  new_mini = xmalloc ((symcount + synth_count + 1) * sizeof (*symp));
+-	  symp = (asymbol **) new_mini;
+-	  memcpy (symp, minisyms, symcount * sizeof (*symp));
+-	  symp += symcount;
++	  minisyms = xrealloc (minisyms,
++			       (symcount + synth_count + 1) * sizeof (*symp));
++	  symp = (asymbol **) minisyms + symcount;
+ 	  for (i = 0; i < synth_count; i++)
+ 	    *symp++ = synthsyms + i;
+ 	  *symp = 0;
+diff -rup binutils.orig/binutils/nm.c binutils-2.31.1/binutils/nm.c
+--- binutils.orig/binutils/nm.c	2019-01-03 14:18:21.086458519 +0000
++++ binutils-2.31.1/binutils/nm.c	2019-01-03 14:18:23.642438853 +0000
+@@ -1170,7 +1170,6 @@ display_rel_file (bfd *abfd, bfd *archiv
+ 	  for (i = 0; i < synth_count; i++)
+ 	    *symp++ = synthsyms + i;
+ 	  *symp = 0;
+-	  minisyms = new_mini;
+ 	  symcount += synth_count;
+ 	}
+     }

binutils-CVE-2019-9071.patch

@@ -0,0 +1,110 @@
+--- binutils.orig/libiberty/cp-demangle.c	2019-04-10 10:31:27.854997707 +0100
++++ binutils-2.31.1/libiberty/cp-demangle.c	2019-04-10 16:00:35.820350978 +0100
+@@ -858,7 +858,7 @@ CP_STATIC_IF_GLIBCPP_V3
+ int
+ cplus_demangle_fill_name (struct demangle_component *p, const char *s, int len)
+ {
+-  if (p == NULL || s == NULL || len == 0)
++  if (p == NULL || s == NULL || len <= 0)
+     return 0;
+   p->d_printing = 0;
+   p->type = DEMANGLE_COMPONENT_NAME;
+@@ -4032,7 +4032,7 @@ d_growable_string_callback_adapter (cons
+    are larger than the actual numbers encountered.  */
+ 
+ static void
+-d_count_templates_scopes (int *num_templates, int *num_scopes,
++d_count_templates_scopes (struct d_print_info *dpi,
+ 			  const struct demangle_component *dc)
+ {
+   if (dc == NULL)
+@@ -4052,13 +4052,13 @@ d_count_templates_scopes (int *num_templ
+       break;
+ 
+     case DEMANGLE_COMPONENT_TEMPLATE:
+-      (*num_templates)++;
++      dpi->num_copy_templates++;
+       goto recurse_left_right;
+ 
+     case DEMANGLE_COMPONENT_REFERENCE:
+     case DEMANGLE_COMPONENT_RVALUE_REFERENCE:
+       if (d_left (dc)->type == DEMANGLE_COMPONENT_TEMPLATE_PARAM)
+-	(*num_scopes)++;
++	dpi->num_saved_scopes++;
+       goto recurse_left_right;
+ 
+     case DEMANGLE_COMPONENT_QUAL_NAME:
+@@ -4122,42 +4122,42 @@ d_count_templates_scopes (int *num_templ
+     case DEMANGLE_COMPONENT_TAGGED_NAME:
+     case DEMANGLE_COMPONENT_CLONE:
+     recurse_left_right:
+-      d_count_templates_scopes (num_templates, num_scopes,
+-				d_left (dc));
+-      d_count_templates_scopes (num_templates, num_scopes,
+-				d_right (dc));
++      /* PR 89394 - Check for too much recursion.  */
++      if (dpi->recursion > MAX_RECURSION_COUNT)
++	/* FIXME: There ought to be a way to report to the
++	   user that the recursion limit has been reached.  */
++	return;
++
++      ++ dpi->recursion;
++      d_count_templates_scopes (dpi, d_left (dc));
++      d_count_templates_scopes (dpi, d_right (dc));
++      -- dpi->recursion;
+       break;
+ 
+     case DEMANGLE_COMPONENT_CTOR:
+-      d_count_templates_scopes (num_templates, num_scopes,
+-				dc->u.s_ctor.name);
++      d_count_templates_scopes (dpi, dc->u.s_ctor.name);
+       break;
+ 
+     case DEMANGLE_COMPONENT_DTOR:
+-      d_count_templates_scopes (num_templates, num_scopes,
+-				dc->u.s_dtor.name);
++      d_count_templates_scopes (dpi, dc->u.s_dtor.name);
+       break;
+ 
+     case DEMANGLE_COMPONENT_EXTENDED_OPERATOR:
+-      d_count_templates_scopes (num_templates, num_scopes,
+-				dc->u.s_extended_operator.name);
++      d_count_templates_scopes (dpi, dc->u.s_extended_operator.name);
+       break;
+ 
+     case DEMANGLE_COMPONENT_FIXED_TYPE:
+-      d_count_templates_scopes (num_templates, num_scopes,
+-                                dc->u.s_fixed.length);
++      d_count_templates_scopes (dpi, dc->u.s_fixed.length);
+       break;
+ 
+     case DEMANGLE_COMPONENT_GLOBAL_CONSTRUCTORS:
+     case DEMANGLE_COMPONENT_GLOBAL_DESTRUCTORS:
+-      d_count_templates_scopes (num_templates, num_scopes,
+-				d_left (dc));
++      d_count_templates_scopes (dpi, d_left (dc));
+       break;
+ 
+     case DEMANGLE_COMPONENT_LAMBDA:
+     case DEMANGLE_COMPONENT_DEFAULT_ARG:
+-      d_count_templates_scopes (num_templates, num_scopes,
+-				dc->u.s_unary_num.sub);
++      d_count_templates_scopes (dpi, dc->u.s_unary_num.sub);
+       break;
+     }
+ }
+@@ -4192,8 +4192,12 @@ d_print_init (struct d_print_info *dpi,
+   dpi->next_copy_template = 0;
+   dpi->num_copy_templates = 0;
+ 
+-  d_count_templates_scopes (&dpi->num_copy_templates,
+-			    &dpi->num_saved_scopes, dc);
++  d_count_templates_scopes (dpi, dc);
++  /* If we did not reach the recursion limit then reset the
++     current recursion value back to 0, so that we can print
++     the templates.  */
++  if (dpi->recursion < MAX_RECURSION_COUNT)
++    dpi->recursion = 0;
+   dpi->num_copy_templates *= dpi->num_saved_scopes;
+ 
+   dpi->current_template = NULL;

binutils-CVE-2019-9073.patch

@@ -0,0 +1,13 @@
+--- binutils.orig/binutils/objdump.c	2019-02-25 16:12:30.394056901 +0000
++++ binutils-2.31.1/binutils/objdump.c	2019-02-25 16:13:07.224778005 +0000
+@@ -2993,7 +2993,9 @@ dump_bfd_header (bfd *abfd)
+ static void
+ dump_bfd_private_header (bfd *abfd)
+ {
+-  bfd_print_private_bfd_data (abfd, stdout);
++  if (!bfd_print_private_bfd_data (abfd, stdout))
++    non_fatal (_("warning: private headers incomplete: %s"),
++              bfd_errmsg (bfd_get_error ()));
+ }
+ 
+ static void

binutils-CVE-2019-9074.patch

@@ -0,0 +1,32 @@
+--- binutils.orig/bfd/pei-x86_64.c	2019-02-25 16:12:29.798061414 +0000
++++ binutils-2.31.1/bfd/pei-x86_64.c	2019-02-25 17:09:02.783425236 +0000
+@@ -541,7 +541,7 @@ pex64_bfd_print_pdata_section (bfd *abfd
+   /* virt_size might be zero for objects.  */
+   if (stop == 0 && strcmp (abfd->xvec->name, "pe-x86-64") == 0)
+     {
+-      stop = (datasize / onaline) * onaline;
++      stop = datasize;
+       virt_size_is_zero = TRUE;
+     }
+   else if (datasize < stop)
+@@ -551,8 +551,8 @@ pex64_bfd_print_pdata_section (bfd *abfd
+ 		 _("Warning: %s section size (%ld) is smaller than virtual size (%ld)\n"),
+ 		 pdata_section->name, (unsigned long) datasize,
+ 		 (unsigned long) stop);
+-	/* Be sure not to read passed datasize.  */
+-	stop = datasize / onaline;
++	/* Be sure not to read past datasize.  */
++	stop = datasize;
+       }
+ 
+   /* Display functions table.  */
+@@ -724,8 +724,7 @@ pex64_bfd_print_pdata_section (bfd *abfd
+ 	      altent += imagebase;
+ 
+ 	      if (altent >= pdata_vma
+-		  && (altent + PDATA_ROW_SIZE <= pdata_vma
+-		      + pei_section_data (abfd, pdata_section)->virt_size))
++		  && altent - pdata_vma + PDATA_ROW_SIZE <= stop)
+ 		{
+ 		  pex64_get_runtime_function
+ 		    (abfd, &arf, &pdata[altent - pdata_vma]);

binutils-CVE-2019-9075.patch

@@ -0,0 +1,73 @@
+diff -rup binutils.orig/bfd/archive64.c binutils-2.31.1/bfd/archive64.c
+--- binutils.orig/bfd/archive64.c	2019-02-26 11:17:11.882530151 +0000
++++ binutils-2.31.1/bfd/archive64.c	2019-02-26 11:19:18.422488805 +0000
+@@ -100,8 +100,6 @@ _bfd_archive_64_bit_slurp_armap (bfd *ab
+     return FALSE;
+   carsyms = ardata->symdefs;
+   stringbase = ((char *) ardata->symdefs) + carsym_size;
+-  stringbase[stringsize] = 0;
+-  stringend = stringbase + stringsize;
+ 
+   raw_armap = (bfd_byte *) bfd_alloc (abfd, ptrsize);
+   if (raw_armap == NULL)
+@@ -115,15 +113,17 @@ _bfd_archive_64_bit_slurp_armap (bfd *ab
+       goto release_raw_armap;
+     }
+ 
++  stringend = stringbase + stringsize;
++  *stringend = 0;
+   for (i = 0; i < nsymz; i++)
+     {
+       carsyms->file_offset = bfd_getb64 (raw_armap + i * 8);
+       carsyms->name = stringbase;
+-      if (stringbase < stringend)
+-	stringbase += strlen (stringbase) + 1;
++      stringbase += strlen (stringbase);
++      if (stringbase != stringend)
++	++stringbase;
+       ++carsyms;
+     }
+-  *stringbase = '\0';
+ 
+   ardata->symdef_count = nsymz;
+   ardata->first_file_filepos = bfd_tell (abfd);
+diff -rup binutils.orig/bfd/archive.c binutils-2.31.1/bfd/archive.c
+--- binutils.orig/bfd/archive.c	2019-02-26 11:17:11.884530134 +0000
++++ binutils-2.31.1/bfd/archive.c	2019-02-26 11:18:33.354859687 +0000
+@@ -1014,6 +1014,7 @@ do_slurp_coff_armap (bfd *abfd)
+   int *raw_armap, *rawptr;
+   struct artdata *ardata = bfd_ardata (abfd);
+   char *stringbase;
++  char *stringend;
+   bfd_size_type stringsize;
+   bfd_size_type parsed_size;
+   carsym *carsyms;
+@@ -1073,22 +1074,20 @@ do_slurp_coff_armap (bfd *abfd)
+     }
+ 
+   /* OK, build the carsyms.  */
+-  for (i = 0; i < nsymz && stringsize > 0; i++)
++  stringend = stringbase + stringsize;
++  *stringend = 0;
++  for (i = 0; i < nsymz; i++)
+     {
+       bfd_size_type len;
+ 
+       rawptr = raw_armap + i;
+       carsyms->file_offset = swap ((bfd_byte *) rawptr);
+       carsyms->name = stringbase;
+-      /* PR 17512: file: 4a1d50c1.  */
+-      len = strnlen (stringbase, stringsize);
+-      if (len < stringsize)
+-	len ++;
+-      stringbase += len;
+-      stringsize -= len;
++      stringbase += strlen (stringbase);
++      if (stringbase != stringend)
++	++stringbase;
+       carsyms++;
+     }
+-  *stringbase = 0;
+ 
+   ardata->symdef_count = nsymz;
+   ardata->first_file_filepos = bfd_tell (abfd);

binutils-CVE-2019-9077.patch

@@ -0,0 +1,16 @@
+--- binutils.orig/binutils/readelf.c	2019-02-26 11:17:12.414525772 +0000
++++ binutils-2.31.1/binutils/readelf.c	2019-02-26 12:11:40.642876742 +0000
+@@ -16009,6 +16009,13 @@ process_mips_specific (Filedata * fileda
+ 	  return FALSE;
+ 	}
+ 
++      /* PR 24243  */
++      if (sect->sh_size < sizeof (* eopt))
++	{
++	  error (_("The MIPS options section is too small.\n"));
++	  return FALSE;
++	}
++
+       eopt = (Elf_External_Options *) get_data (NULL, filedata, options_offset, 1,
+                                                 sect->sh_size, _("options"));
+       if (eopt)

binutils-LTO-restore-wrapper-symbol.patch

@@ -1,154 +0,0 @@
-From 3221c470f0765886a49a1a3d2ec602e4104a377b Mon Sep 17 00:00:00 2001
-From: "H.J. Lu" <hjl.tools@gmail.com>
-Date: Fri, 2 Aug 2024 19:52:00 -0700
-Subject: [PATCH] LTO: Restore the wrapper symbol check for standard function
-
-Call unwrap_hash_lookup to restore the wrapper symbol check for standard
-function since reference to standard function may not show up in LTO
-symbol table:
-
-[hjl@gnu-tgl-3 pr31956-3]$ nm foo.o
-00000000 T main
-         U __real_malloc
-00000000 T __wrap_malloc
-[hjl@gnu-tgl-3 pr31956-3]$  lto-dump -list foo.o
-Type   Visibility  Size  Name
-function  default     0  malloc
-function  default     0  __real_malloc
-function  default     3  main
-function  default     5  __wrap_malloc
-[hjl@gnu-tgl-3 pr31956-3]$ make
-gcc -O2 -flto -Wall   -c -o foo.o foo.c
-gcc -Wl,--wrap=malloc -O2 -flto -Wall -o x foo.o
-/usr/local/bin/ld: /tmp/ccsPW0a9.ltrans0.ltrans.o: in function `main':
-<artificial>:(.text.startup+0xa): undefined reference to `__wrap_malloc'
-collect2: error: ld returned 1 exit status
-make: *** [Makefile:22: x] Error 1
-[hjl@gnu-tgl-3 pr31956-3]$
-
-Also add a test to verify that the unused wrapper is removed.
-
-	PR ld/31956
-	* plugin.c (get_symbols): Restore the wrapper symbol check for
-	standard function.
-	* testsuite/ld-plugin/lto.exp: Run the malloc test and the
-	unused test.
-	* testsuite/ld-plugin/pr31956c.c: New file.
-	* testsuite/ld-plugin/pr31956d.c: New file.
-	* testsuite/ld-plugin/pr31956d.d: New file.
-
-Signed-off-by: H.J. Lu <hjl.tools@gmail.com>
----
- ld/plugin.c                       | 14 ++++++++++++--
- ld/testsuite/ld-plugin/lto.exp    | 16 ++++++++++++++++
- ld/testsuite/ld-plugin/pr31956c.c | 19 +++++++++++++++++++
- ld/testsuite/ld-plugin/pr31956d.c |  7 +++++++
- ld/testsuite/ld-plugin/pr31956d.d |  4 ++++
- 5 files changed, 58 insertions(+), 2 deletions(-)
- create mode 100644 ld/testsuite/ld-plugin/pr31956c.c
- create mode 100644 ld/testsuite/ld-plugin/pr31956d.c
- create mode 100644 ld/testsuite/ld-plugin/pr31956d.d
-
-diff --git a/ld/plugin.c b/ld/plugin.c
-index 03ee9880d10..51c4765cc5b 100644
---- a/ld/plugin.c
-+++ b/ld/plugin.c
-@@ -778,8 +778,18 @@ get_symbols (const void *handle, int nsyms, struct ld_plugin_symbol *syms,
- 	{
- 	  blhe = h;
- 	  /* Check if a symbol is a wrapper symbol.  */
--	  if (blhe && blhe->wrapper_symbol)
--	    wrap_status = wrapper;
-+	  if (blhe)
-+	    {
-+	      if (blhe->wrapper_symbol)
-+		wrap_status = wrapper;
-+	      else if (link_info.wrap_hash != NULL)
-+		{
-+		  struct bfd_link_hash_entry *unwrap
-+		    = unwrap_hash_lookup (&link_info, (bfd *) abfd, blhe);
-+		  if (unwrap != NULL && unwrap != h)
-+		    wrap_status = wrapper;
-+		}
-+	    }
- 	}
-       else
- 	{
-diff --git a/ld/testsuite/ld-plugin/lto.exp b/ld/testsuite/ld-plugin/lto.exp
-index ad59e2abd61..1a8c3736307 100644
---- a/ld/testsuite/ld-plugin/lto.exp
-+++ b/ld/testsuite/ld-plugin/lto.exp
-@@ -546,6 +546,22 @@ set lto_link_elf_tests [list \
-    {} \
-    "pr31956b" \
-   ] \
-+  [list \
-+   "PR ld/31956 (malloc)" \
-+   "-Wl,--wrap=malloc" \
-+   "-O2 -flto" \
-+   {pr31956c.c} \
-+   {} \
-+   "pr31956c" \
-+  ] \
-+  [list \
-+   "PR ld/31956 (unused)" \
-+   "-Wl,--wrap=parse_line" \
-+   "-O2 -flto" \
-+   {pr31956d.c} \
-+   {{"nm" {} "pr31956d.d"}} \
-+   "pr31956d" \
-+  ] \
-   [list \
-    "Build pr30281.so" \
-    "-shared -Wl,--version-script,pr30281.t \
-diff --git a/ld/testsuite/ld-plugin/pr31956c.c b/ld/testsuite/ld-plugin/pr31956c.c
-new file mode 100644
-index 00000000000..4a46b2b49a8
---- /dev/null
-+++ b/ld/testsuite/ld-plugin/pr31956c.c
-@@ -0,0 +1,19 @@
-+#include <stdlib.h>
-+
-+extern void *__real_malloc (size_t);
-+
-+void *
-+__wrap_malloc (size_t n)
-+{
-+  if (n == 0)
-+    return NULL;
-+  else
-+    return __real_malloc (n);
-+};
-+
-+int
-+main (void)
-+{
-+  void *ptr = malloc (30);
-+  return ptr == NULL ? 1 : 0;
-+}
-diff --git a/ld/testsuite/ld-plugin/pr31956d.c b/ld/testsuite/ld-plugin/pr31956d.c
-new file mode 100644
-index 00000000000..cb7f2d50643
---- /dev/null
-+++ b/ld/testsuite/ld-plugin/pr31956d.c
-@@ -0,0 +1,7 @@
-+void __wrap_parse_line(void) {};
-+
-+int
-+main (void)
-+{
-+  return 0;
-+}
-diff --git a/ld/testsuite/ld-plugin/pr31956d.d b/ld/testsuite/ld-plugin/pr31956d.d
-new file mode 100644
-index 00000000000..b579cdc7353
---- /dev/null
-+++ b/ld/testsuite/ld-plugin/pr31956d.d
-@@ -0,0 +1,4 @@
-+#failif
-+#...
-+[0-9a-f]+ T .*parse_line
-+#...
--- 
-2.45.2
-

binutils-aarch64-gold-PLT-for-MOVW_ABS.patch

@@ -0,0 +1,20 @@
+--- binutils.orig/gold/aarch64.cc	2019-05-21 11:24:07.642560743 +0100
++++ binutils-2.32/gold/aarch64.cc	2019-05-21 11:25:02.425157682 +0100
+@@ -6496,6 +6496,17 @@ Target_aarch64<size, big_endian>::Scan::
+ 	  gold_error(_("%s: unsupported reloc %u in pos independent link."),
+ 		     object->name().c_str(), r_type);
+ 	}
++      // Make a PLT entry if necessary.
++      if (gsym->needs_plt_entry())
++	{
++	  target->make_plt_entry(symtab, layout, gsym);
++	  // Since this is not a PC-relative relocation, we may be
++	  // taking the address of a function. In that case we need to
++	  // set the entry in the dynamic symbol table to the address of
++	  // the PLT entry.
++	  if (gsym->is_from_dynobj() && !parameters->options().shared())
++	    gsym->set_needs_dynsym_value();
++	}
+       break;
+ 
+     case elfcpp::R_AARCH64_LD_PREL_LO19:        // 273

binutils-aarch64-small-plt0.patch

@@ -1,12 +0,0 @@
---- binutils.orig/bfd/elfnn-aarch64.c	2025-02-07 13:42:20.961333141 +0000
-+++ binutils-with-gold-2.44/bfd/elfnn-aarch64.c	2025-02-07 13:42:29.781353740 +0000
-@@ -10162,7 +10162,8 @@ elfNN_aarch64_init_small_plt0_entry (bfd
-   /* PR 26312: Explicitly set the sh_entsize to 0 so that
-      consumers do not think that the section contains fixed
-      sized objects.  */
--  elf_section_data (htab->root.splt->output_section)->this_hdr.sh_entsize = 0;
-+  if (elf_section_data (htab->root.splt->output_section) != NULL)
-+    elf_section_data (htab->root.splt->output_section)->this_hdr.sh_entsize = 0;
- 
-   plt_got_2nd_ent = (htab->root.sgotplt->output_section->vma
- 		  + htab->root.sgotplt->output_offset

binutils-alignment-of-decompressed-sections.patch

@@ -0,0 +1,447 @@
+diff -rup binutils.orig/bfd/bfd.c binutils-2.31.1/bfd/bfd.c
+--- binutils.orig/bfd/bfd.c	2019-02-18 11:53:32.155652114 +0000
++++ binutils-2.31.1/bfd/bfd.c	2019-02-18 12:03:21.591459682 +0000
+@@ -2332,6 +2332,8 @@ bfd_update_compression_header (bfd *abfd
+ 		  bfd_put_32 (abfd, sec->size, &echdr->ch_size);
+ 		  bfd_put_32 (abfd, 1 << sec->alignment_power,
+ 			      &echdr->ch_addralign);
++		  /* bfd_log2 (alignof (Elf32_Chdr)).  */
++		  bfd_set_section_alignment (abfd, sec, 2);
+ 		}
+ 	      else
+ 		{
+@@ -2342,6 +2344,8 @@ bfd_update_compression_header (bfd *abfd
+ 		  bfd_put_64 (abfd, sec->size, &echdr->ch_size);
+ 		  bfd_put_64 (abfd, 1 << sec->alignment_power,
+ 			      &echdr->ch_addralign);
++		  /* bfd_log2 (alignof (Elf64_Chdr)).  */
++		  bfd_set_section_alignment (abfd, sec, 3);
+ 		}
+ 	    }
+ 	  else
+@@ -2354,6 +2358,8 @@ bfd_update_compression_header (bfd *abfd
+ 		 order.  */
+ 	      memcpy (contents, "ZLIB", 4);
+ 	      bfd_putb64 (sec->size, contents + 4);
++	      /* No way to keep the original alignment, just use 1 always.  */
++	      bfd_set_section_alignment (abfd, sec, 0);
+ 	    }
+ 	}
+     }
+@@ -2368,12 +2374,15 @@ bfd_update_compression_header (bfd *abfd
+    SYNOPSIS
+ 	bfd_boolean bfd_check_compression_header
+ 	  (bfd *abfd, bfd_byte *contents, asection *sec,
+-	  bfd_size_type *uncompressed_size);
++          bfd_size_type *uncompressed_size,
++          unsigned int *uncompressed_alignment_power);
++
+ 
+ DESCRIPTION
+ 	Check the compression header at CONTENTS of SEC in ABFD and
+-	store the uncompressed size in UNCOMPRESSED_SIZE if the
+-	compression header is valid.
++        store the uncompressed size in UNCOMPRESSED_SIZE and the
++        uncompressed data alignment in UNCOMPRESSED_ALIGNMENT_POWER
++        if the compression header is valid.
+ 
+ RETURNS
+ 	Return TRUE if the compression header is valid.
+@@ -2382,7 +2391,8 @@ RETURNS
+ bfd_boolean
+ bfd_check_compression_header (bfd *abfd, bfd_byte *contents,
+ 			      asection *sec,
+-			      bfd_size_type *uncompressed_size)
++			      bfd_size_type *uncompressed_size,
++			      unsigned int *uncompressed_alignment_power)
+ {
+   if (bfd_get_flavour (abfd) == bfd_target_elf_flavour
+       && (elf_section_flags (sec) & SHF_COMPRESSED) != 0)
+@@ -2404,9 +2414,10 @@ bfd_check_compression_header (bfd *abfd,
+ 	  chdr.ch_addralign = bfd_get_64 (abfd, &echdr->ch_addralign);
+ 	}
+       if (chdr.ch_type == ELFCOMPRESS_ZLIB
+-	  && chdr.ch_addralign == 1U << sec->alignment_power)
++	  && chdr.ch_addralign == (1U << bfd_log2 (chdr.ch_addralign)))
+ 	{
+ 	  *uncompressed_size = chdr.ch_size;
++	  *uncompressed_alignment_power = bfd_log2 (chdr.ch_addralign);
+ 	  return TRUE;
+ 	}
+     }
+diff -rup binutils.orig/bfd/bfd-in2.h binutils-2.31.1/bfd/bfd-in2.h
+--- binutils.orig/bfd/bfd-in2.h	2019-02-18 11:53:32.156652107 +0000
++++ binutils-2.31.1/bfd/bfd-in2.h	2019-02-18 12:00:23.849723903 +0000
+@@ -7274,7 +7274,8 @@ void bfd_update_compression_header
+ 
+ bfd_boolean bfd_check_compression_header
+    (bfd *abfd, bfd_byte *contents, asection *sec,
+-    bfd_size_type *uncompressed_size);
++    bfd_size_type *uncompressed_size,
++    unsigned int *uncompressed_alignment_power);
+ 
+ int bfd_get_compression_header_size (bfd *abfd, asection *sec);
+ 
+@@ -7850,7 +7851,8 @@ void bfd_cache_section_contents
+ bfd_boolean bfd_is_section_compressed_with_header
+    (bfd *abfd, asection *section,
+     int *compression_header_size_p,
+-    bfd_size_type *uncompressed_size_p);
++    bfd_size_type *uncompressed_size_p,
++    unsigned int *uncompressed_alignment_power_p);
+ 
+ bfd_boolean bfd_is_section_compressed
+    (bfd *abfd, asection *section);
+diff -rup binutils.orig/bfd/compress.c binutils-2.31.1/bfd/compress.c
+--- binutils.orig/bfd/compress.c	2019-02-18 11:53:32.153652128 +0000
++++ binutils-2.31.1/bfd/compress.c	2019-02-18 12:11:44.899886376 +0000
+@@ -84,11 +84,13 @@ bfd_compress_section_contents (bfd *abfd
+   int zlib_size = 0;
+   int orig_compression_header_size;
+   bfd_size_type orig_uncompressed_size;
++  unsigned int orig_uncompressed_alignment_pow;
+   int header_size = bfd_get_compression_header_size (abfd, NULL);
+   bfd_boolean compressed
+     = bfd_is_section_compressed_with_header (abfd, sec,
+ 					     &orig_compression_header_size,
+-					     &orig_uncompressed_size);
++					     &orig_uncompressed_size,
++					     &orig_uncompressed_alignment_pow);
+ 
+   /* Either ELF compression header or the 12-byte, "ZLIB" + 8-byte size,
+      overhead in .zdebug* section.  */
+@@ -153,6 +155,8 @@ bfd_compress_section_contents (bfd *abfd
+ 	      return 0;
+ 	    }
+ 	  free (uncompressed_buffer);
++	  bfd_set_section_alignment (abfd, sec,
++				     orig_uncompressed_alignment_pow);
+ 	  sec->contents = buffer;
+ 	  sec->compress_status = COMPRESS_SECTION_DONE;
+ 	  return orig_uncompressed_size;
+@@ -364,20 +368,25 @@ SYNOPSIS
+ 	bfd_boolean bfd_is_section_compressed_with_header
+ 	  (bfd *abfd, asection *section,
+ 	  int *compression_header_size_p,
+-	  bfd_size_type *uncompressed_size_p);
++	  bfd_size_type *uncompressed_size_p,
++	  unsigned int *uncompressed_alignment_power_p);
++
+ 
+ DESCRIPTION
+ 	Return @code{TRUE} if @var{section} is compressed.  Compression
+-	header size is returned in @var{compression_header_size_p} and
+-	uncompressed size is returned in @var{uncompressed_size_p}.  If
+-	compression is unsupported, compression header size is returned
+-	with -1 and uncompressed size is returned with 0.
++	header size is returned in @var{compression_header_size_p},
++        uncompressed size is returned in @var{uncompressed_size_p}
++        and the uncompressed data alignement power is returned in
++        @var{uncompressed_align_pow_p}.  If compression is
++        unsupported, compression header size is returned with -1
++        and uncompressed size is returned with 0.
+ */
+ 
+ bfd_boolean
+ bfd_is_section_compressed_with_header (bfd *abfd, sec_ptr sec,
+ 				       int *compression_header_size_p,
+-				       bfd_size_type *uncompressed_size_p)
++				       bfd_size_type *uncompressed_size_p,
++				       unsigned int *uncompressed_align_pow_p)
+ {
+   bfd_byte header[MAX_COMPRESSION_HEADER_SIZE];
+   int compression_header_size;
+@@ -385,6 +394,8 @@ bfd_is_section_compressed_with_header (b
+   unsigned int saved = sec->compress_status;
+   bfd_boolean compressed;
+ 
++  *uncompressed_align_pow_p = 0;
++
+   compression_header_size = bfd_get_compression_header_size (abfd, sec);
+   if (compression_header_size > MAX_COMPRESSION_HEADER_SIZE)
+     abort ();
+@@ -412,7 +423,8 @@ bfd_is_section_compressed_with_header (b
+       if (compression_header_size != 0)
+ 	{
+ 	  if (!bfd_check_compression_header (abfd, header, sec,
+-					     uncompressed_size_p))
++					     uncompressed_size_p,
++					     uncompressed_align_pow_p))
+ 	    compression_header_size = -1;
+ 	}
+       /* Check for the pathalogical case of a debug string section that
+@@ -449,9 +461,11 @@ bfd_is_section_compressed (bfd *abfd, se
+ {
+   int compression_header_size;
+   bfd_size_type uncompressed_size;
++  unsigned int uncompressed_align_power;
+   return (bfd_is_section_compressed_with_header (abfd, sec,
+ 						 &compression_header_size,
+-						 &uncompressed_size)
++						 &uncompressed_size,
++						 &uncompressed_align_power)
+ 	  && compression_header_size >= 0
+ 	  && uncompressed_size > 0);
+ }
+@@ -480,6 +494,7 @@ bfd_init_section_decompress_status (bfd
+   int compression_header_size;
+   int header_size;
+   bfd_size_type uncompressed_size;
++  unsigned int uncompressed_alignment_power = 0;
+ 
+   compression_header_size = bfd_get_compression_header_size (abfd, sec);
+   if (compression_header_size > MAX_COMPRESSION_HEADER_SIZE)
+@@ -508,7 +523,8 @@ bfd_init_section_decompress_status (bfd
+       uncompressed_size = bfd_getb64 (header + 4);
+     }
+   else if (!bfd_check_compression_header (abfd, header, sec,
+-					 &uncompressed_size))
++					  &uncompressed_size,
++					  &uncompressed_alignment_power))
+     {
+       bfd_set_error (bfd_error_wrong_format);
+       return FALSE;
+@@ -516,6 +532,7 @@ bfd_init_section_decompress_status (bfd
+ 
+   sec->compressed_size = sec->size;
+   sec->size = uncompressed_size;
++  bfd_set_section_alignment (abfd, sec, uncompressed_alignment_power);
+   sec->compress_status = DECOMPRESS_SECTION_SIZED;
+ 
+   return TRUE;
+diff -rup binutils.orig/bfd/elf.c binutils-2.31.1/bfd/elf.c
+--- binutils.orig/bfd/elf.c	2019-02-18 11:53:32.161652071 +0000
++++ binutils-2.31.1/bfd/elf.c	2019-02-18 12:08:52.135108638 +0000
+@@ -1177,10 +1177,12 @@ _bfd_elf_make_section_from_shdr (bfd *ab
+       enum { nothing, compress, decompress } action = nothing;
+       int compression_header_size;
+       bfd_size_type uncompressed_size;
++      unsigned int uncompressed_align_power;
+       bfd_boolean compressed
+ 	= bfd_is_section_compressed_with_header (abfd, newsect,
+ 						 &compression_header_size,
+-						 &uncompressed_size);
++						 &uncompressed_size,
++						 &uncompressed_align_power);
+ 
+       if (compressed)
+ 	{
+diff -rup binutils.orig/binutils/readelf.c binutils-2.31.1/binutils/readelf.c
+--- binutils.orig/binutils/readelf.c	2019-02-18 11:53:32.947646480 +0000
++++ binutils-2.31.1/binutils/readelf.c	2019-02-18 12:10:13.142535034 +0000
+@@ -13366,12 +13366,6 @@ dump_section_as_strings (Elf_Internal_Sh
+ 		    printable_section_name (filedata, section), chdr.ch_type);
+ 	      return FALSE;
+ 	    }
+-	  else if (chdr.ch_addralign != section->sh_addralign)
+-	    {
+-	      warn (_("compressed section '%s' is corrupted\n"),
+-		    printable_section_name (filedata, section));
+-	      return FALSE;
+-	    }
+ 	  uncompressed_size = chdr.ch_size;
+ 	  start += compression_header_size;
+ 	  new_size -= compression_header_size;
+@@ -13513,12 +13507,6 @@ dump_section_as_bytes (Elf_Internal_Shdr
+ 		    printable_section_name (filedata, section), chdr.ch_type);
+ 	      return FALSE;
+ 	    }
+-	  else if (chdr.ch_addralign != section->sh_addralign)
+-	    {
+-	      warn (_("compressed section '%s' is corrupted\n"),
+-		    printable_section_name (filedata, section));
+-	      return FALSE;
+-	    }
+ 	  uncompressed_size = chdr.ch_size;
+ 	  start += compression_header_size;
+ 	  new_size -= compression_header_size;
+@@ -13688,12 +13676,6 @@ load_specific_debug_section (enum dwarf_
+ 		    section->name, chdr.ch_type);
+ 	      return FALSE;
+ 	    }
+-	  else if (chdr.ch_addralign != sec->sh_addralign)
+-	    {
+-	      warn (_("compressed section '%s' is corrupted\n"),
+-		    section->name);
+-	      return FALSE;
+-	    }
+ 	  uncompressed_size = chdr.ch_size;
+ 	  start += compression_header_size;
+ 	  size -= compression_header_size;
+diff -rup binutils.orig/binutils/testsuite/binutils-all/dw2-3.rS binutils-2.31.1/binutils/testsuite/binutils-all/dw2-3.rS
+--- binutils.orig/binutils/testsuite/binutils-all/dw2-3.rS	2019-02-18 11:53:32.908646758 +0000
++++ binutils-2.31.1/binutils/testsuite/binutils-all/dw2-3.rS	2019-02-18 12:10:40.884338917 +0000
+@@ -1,3 +1,3 @@
+ #...
+- +\[[ 0-9]+\] .debug_info +(PROGBITS|MIPS_DWARF) +0+ +[0-9a-f]+ +[0-9a-f]+ [0-9a-f]+ +C +0 +0 +1
++ +\[[ 0-9]+\] .debug_info +(PROGBITS|MIPS_DWARF) +0+ +[0-9a-f]+ +[0-9a-f]+ [0-9a-f]+ +C +0 +0 +(4|8)
+ #pass
+diff -rup binutils.orig/binutils/testsuite/binutils-all/dw2-3.rt binutils-2.31.1/binutils/testsuite/binutils-all/dw2-3.rt
+--- binutils.orig/binutils/testsuite/binutils-all/dw2-3.rt	2019-02-18 11:53:32.905646779 +0000
++++ binutils-2.31.1/binutils/testsuite/binutils-all/dw2-3.rt	2019-02-18 12:11:13.476108521 +0000
+@@ -1,6 +1,6 @@
+ #...
+  +\[[ 0-9]+\] .debug_info
+- +(PROGBITS|MIPS_DWARF) +0+ +[0-9a-f]+ +[0-9a-f]+ +[0-9a-f]+ +0 +0 +1
++ +(PROGBITS|MIPS_DWARF) +0+ +[0-9a-f]+ +[0-9a-f]+ +[0-9a-f]+ +0 +0 +(4|8)
+  +\[0+800\]: COMPRESSED
+  +ZLIB, 0+9d, 1
+ #pass
+diff -rup binutils.orig/gold/merge.cc binutils-2.31.1/gold/merge.cc
+--- binutils.orig/gold/merge.cc	2019-02-18 11:53:32.210651723 +0000
++++ binutils-2.31.1/gold/merge.cc	2019-02-18 12:12:59.027362334 +0000
+@@ -440,9 +440,11 @@ Output_merge_string<Char_type>::do_add_i
+ {
+   section_size_type sec_len;
+   bool is_new;
++  uint64_t addralign = this->addralign();
+   const unsigned char* pdata = object->decompressed_section_contents(shndx,
+ 								     &sec_len,
+-								     &is_new);
++								     &is_new,
++								     &addralign);
+ 
+   const Char_type* p = reinterpret_cast<const Char_type*>(pdata);
+   const Char_type* pend = p + sec_len / sizeof(Char_type);
+@@ -494,7 +496,7 @@ Output_merge_string<Char_type>::do_add_i
+   // aligned, so each string within the section must retain the same
+   // modulo.
+   uintptr_t init_align_modulo = (reinterpret_cast<uintptr_t>(pdata)
+-				 & (this->addralign() - 1));
++				 & (addralign - 1));
+   bool has_misaligned_strings = false;
+ 
+   while (p < pend)
+@@ -503,7 +505,7 @@ Output_merge_string<Char_type>::do_add_i
+ 
+       // Within merge input section each string must be aligned.
+       if (len != 0
+-	  && ((reinterpret_cast<uintptr_t>(p) & (this->addralign() - 1))
++	  && ((reinterpret_cast<uintptr_t>(p) & (addralign - 1))
+ 	      != init_align_modulo))
+ 	  has_misaligned_strings = true;
+ 
+diff -rup binutils.orig/gold/object.cc binutils-2.31.1/gold/object.cc
+--- binutils.orig/gold/object.cc	2019-02-18 11:53:32.208651737 +0000
++++ binutils-2.31.1/gold/object.cc	2019-02-18 12:16:35.938828914 +0000
+@@ -751,11 +751,13 @@ build_compressed_section_map(
+ 	      const unsigned char* contents =
+ 		  obj->section_contents(i, &len, false);
+ 	      uint64_t uncompressed_size;
++	      Compressed_section_info info;
+ 	      if (is_zcompressed)
+ 		{
+ 		  // Skip over the ".zdebug" prefix.
+ 		  name += 7;
+ 		  uncompressed_size = get_uncompressed_size(contents, len);
++		  info.addralign = shdr.get_sh_addralign();
+ 		}
+ 	      else
+ 		{
+@@ -763,8 +765,8 @@ build_compressed_section_map(
+ 		  name += 6;
+ 		  elfcpp::Chdr<size, big_endian> chdr(contents);
+ 		  uncompressed_size = chdr.get_ch_size();
++		  info.addralign = chdr.get_ch_addralign();
+ 		}
+-	      Compressed_section_info info;
+ 	      info.size = convert_to_section_size_type(uncompressed_size);
+ 	      info.flag = shdr.get_sh_flags();
+ 	      info.contents = NULL;
+@@ -3060,7 +3062,8 @@ const unsigned char*
+ Object::decompressed_section_contents(
+     unsigned int shndx,
+     section_size_type* plen,
+-    bool* is_new)
++    bool* is_new,
++    uint64_t* palign)
+ {
+   section_size_type buffer_size;
+   const unsigned char* buffer = this->do_section_contents(shndx, &buffer_size,
+@@ -3087,6 +3090,8 @@ Object::decompressed_section_contents(
+     {
+       *plen = uncompressed_size;
+       *is_new = false;
++      if (palign != NULL)
++	*palign = p->second.addralign;
+       return p->second.contents;
+     }
+ 
+@@ -3108,6 +3113,8 @@ Object::decompressed_section_contents(
+   // once in this pass.
+   *plen = uncompressed_size;
+   *is_new = true;
++  if (palign != NULL)
++    *palign = p->second.addralign;
+   return uncompressed_data;
+ }
+ 
+diff -rup binutils.orig/gold/object.h binutils-2.31.1/gold/object.h
+--- binutils.orig/gold/object.h	2019-02-18 11:53:32.210651723 +0000
++++ binutils-2.31.1/gold/object.h	2019-02-18 12:17:50.625300926 +0000
+@@ -373,6 +373,7 @@ struct Compressed_section_info
+ {
+   section_size_type size;
+   elfcpp::Elf_Xword flag;
++  uint64_t addralign;
+   const unsigned char* contents;
+ };
+ typedef std::map<unsigned int, Compressed_section_info> Compressed_section_map;
+@@ -808,7 +809,8 @@ class Object
+ 
+   bool
+   section_is_compressed(unsigned int shndx,
+-			section_size_type* uncompressed_size) const
++			section_size_type* uncompressed_size,
++			elfcpp::Elf_Xword* palign = NULL) const
+   {
+     if (this->compressed_sections_ == NULL)
+       return false;
+@@ -818,6 +820,8 @@ class Object
+       {
+ 	if (uncompressed_size != NULL)
+ 	  *uncompressed_size = p->second.size;
++	if (palign != NULL)
++	  *palign = p->second.addralign;
+ 	return true;
+       }
+     return false;
+@@ -828,7 +832,7 @@ class Object
+   // by the caller.
+   const unsigned char*
+   decompressed_section_contents(unsigned int shndx, section_size_type* plen,
+-				bool* is_cached);
++				bool* is_cached, uint64_t* palign = NULL);
+ 
+   // Discard any buffers of decompressed sections.  This is done
+   // at the end of the Add_symbols task.
+diff -rup binutils.orig/gold/output.cc binutils-2.31.1/gold/output.cc
+--- binutils.orig/gold/output.cc	2019-02-18 11:53:32.209651729 +0000
++++ binutils-2.31.1/gold/output.cc	2019-02-18 12:18:39.729953797 +0000
+@@ -2448,7 +2448,14 @@ Output_section::add_input_section(Layout
+ 				  unsigned int reloc_shndx,
+ 				  bool have_sections_script)
+ {
++  section_size_type input_section_size = shdr.get_sh_size();
++  section_size_type uncompressed_size;
+   elfcpp::Elf_Xword addralign = shdr.get_sh_addralign();
++
++  if (object->section_is_compressed(shndx, &uncompressed_size,
++                                   &addralign))
++    input_section_size = uncompressed_size;
++
+   if ((addralign & (addralign - 1)) != 0)
+     {
+       object->error(_("invalid alignment %lu for section \"%s\""),
+@@ -2498,11 +2505,6 @@ Output_section::add_input_section(Layout
+ 	}
+     }
+ 
+-  section_size_type input_section_size = shdr.get_sh_size();
+-  section_size_type uncompressed_size;
+-  if (object->section_is_compressed(shndx, &uncompressed_size))
+-    input_section_size = uncompressed_size;
+-
+   off_t offset_in_section;
+ 
+   if (this->has_fixed_layout())

binutils-autoconf-version.patch

@@ -1,11 +0,0 @@
---- binutils.orig/config/override.m4	2021-08-31 14:20:17.275574804 +0100
-+++ binutils-2.37/config/override.m4	2021-08-31 14:36:37.793954247 +0100
-@@ -41,7 +41,7 @@ dnl Or for updating the whole tree at on
- AC_DEFUN([_GCC_AUTOCONF_VERSION_CHECK],
- [m4_if(m4_defn([_GCC_AUTOCONF_VERSION]),
-   m4_defn([m4_PACKAGE_VERSION]), [],
--  [m4_fatal([Please use exactly Autoconf ]_GCC_AUTOCONF_VERSION[ instead of ]m4_defn([m4_PACKAGE_VERSION])[.])])
-+  [])
- ])
- m4_define([AC_INIT], m4_defn([AC_INIT])[
- _GCC_AUTOCONF_VERSION_CHECK

binutils-clear-version-info.patch

@@ -0,0 +1,21 @@
+--- binutils.orig/bfd/elflink.c	2018-08-14 10:25:09.108322746 +0100
++++ binutils-2.31.1/bfd/elflink.c	2018-08-14 10:28:45.617780256 +0100
+@@ -686,13 +686,11 @@ bfd_elf_record_link_assignment (bfd *out
+       && !h->def_regular)
+     h->root.type = bfd_link_hash_undefined;
+ 
+-  /* If this symbol is not being provided by the linker script, and it is
+-     currently defined by a dynamic object, but not by a regular object,
+-     then clear out any version information because the symbol will not be
+-     associated with the dynamic object any more.  */
+-  if (!provide
+-      && h->def_dynamic
+-      && !h->def_regular)
++  /* If this symbol is currently defined by a dynamic object, but not
++     by a regular object, then clear out any version information because
++     the symbol will not be associated with the dynamic object any
++     more.  */
++  if (h->def_dynamic && !h->def_regular)
+     h->verinfo.verdef = NULL;
+ 
+   /* Make sure this symbol is not garbage collected.  */

binutils-delay-ld-script-constant-eval.patch

@@ -0,0 +1,196 @@
+diff -rup binutils.orig/ld/emultempl/pe.em binutils-2.31.1/ld/emultempl/pe.em
+--- binutils.orig/ld/emultempl/pe.em	2018-09-04 11:00:05.546667021 +0100
++++ binutils-2.31.1/ld/emultempl/pe.em	2018-09-04 11:00:58.427292612 +0100
+@@ -2165,7 +2165,7 @@ gld_${EMULATION_NAME}_place_orphan (asec
+ 			       &add_child);
+       if (bfd_link_relocatable (&link_info))
+ 	{
+-	  os->section_alignment = s->alignment_power;
++	  os->section_alignment = exp_intop (1U << s->alignment_power);
+ 	  os->bfd_section->alignment_power = s->alignment_power;
+ 	}
+     }
+diff -rup binutils.orig/ld/emultempl/pep.em binutils-2.31.1/ld/emultempl/pep.em
+--- binutils.orig/ld/emultempl/pep.em	2018-09-04 11:00:05.545667029 +0100
++++ binutils-2.31.1/ld/emultempl/pep.em	2018-09-04 11:01:29.340073740 +0100
+@@ -1962,7 +1962,7 @@ gld_${EMULATION_NAME}_place_orphan (asec
+ 			       &add_child);
+       if (bfd_link_relocatable (&link_info))
+ 	{
+-	  os->section_alignment = s->alignment_power;
++	  os->section_alignment = exp_intop (1U << s->alignment_power);
+ 	  os->bfd_section->alignment_power = s->alignment_power;
+ 	}
+     }
+diff -rup binutils.orig/ld/ldexp.c binutils-2.31.1/ld/ldexp.c
+--- binutils.orig/ld/ldexp.c	2018-09-04 11:00:05.535667100 +0100
++++ binutils-2.31.1/ld/ldexp.c	2018-09-04 11:03:29.179225246 +0100
+@@ -1528,6 +1528,28 @@ exp_get_value_int (etree_type *tree, int
+   return exp_get_vma (tree, def, name);
+ }
+ 
++/* Return the smallest non-negative integer such that two raised to
++   that power is at least as large as the vma evaluated at TREE, if
++   TREE is a non-NULL expression that can be resolved.  If TREE is
++   NULL or cannot be resolved, return -1.  */
++
++signed int
++exp_get_power (etree_type *tree, char *name)
++{
++  bfd_vma x = exp_get_vma (tree, -1, name);
++  bfd_vma p2;
++  int n;
++
++  if (x == (bfd_vma) -1)
++    return -1;
++
++  for (n = 0, p2 = 1; p2 < x; ++n, p2 <<= 1)
++    if (p2 == 0)
++      break;
++
++  return n;
++}
++
+ fill_type *
+ exp_get_fill (etree_type *tree, fill_type *def, char *name)
+ {
+diff -rup binutils.orig/ld/ldexp.h binutils-2.31.1/ld/ldexp.h
+--- binutils.orig/ld/ldexp.h	2018-09-04 11:00:05.536667092 +0100
++++ binutils-2.31.1/ld/ldexp.h	2018-09-04 11:04:12.937915422 +0100
+@@ -231,6 +231,8 @@ bfd_vma exp_get_vma
+   (etree_type *, bfd_vma, char *);
+ int exp_get_value_int
+   (etree_type *, int, char *);
++signed int exp_get_power
++  (etree_type *, char *);
+ fill_type *exp_get_fill
+   (etree_type *, fill_type *, char *);
+ bfd_vma exp_get_abs_int
+diff -rup binutils.orig/ld/ldlang.c binutils-2.31.1/ld/ldlang.c
+--- binutils.orig/ld/ldlang.c	2018-09-04 11:00:05.536667092 +0100
++++ binutils-2.31.1/ld/ldlang.c	2018-09-04 11:07:42.249433438 +0100
+@@ -1199,8 +1199,8 @@ output_section_statement_newfunc (struct
+   ret = (struct out_section_hash_entry *) entry;
+   memset (&ret->s, 0, sizeof (ret->s));
+   ret->s.header.type = lang_output_section_statement_enum;
+-  ret->s.output_section_statement.subsection_alignment = -1;
+-  ret->s.output_section_statement.section_alignment = -1;
++  ret->s.output_section_statement.subsection_alignment = NULL;
++  ret->s.output_section_statement.section_alignment = NULL;
+   ret->s.output_section_statement.block_value = 1;
+   lang_list_init (&ret->s.output_section_statement.children);
+   lang_statement_append (stat_ptr, &ret->s, &ret->s.header.next);
+@@ -2193,8 +2193,9 @@ init_os (lang_output_section_statement_t
+     exp_init_os (s->load_base);
+ 
+   /* If supplied an alignment, set it.  */
+-  if (s->section_alignment != -1)
+-    s->bfd_section->alignment_power = s->section_alignment;
++  if (s->section_alignment != NULL)
++    s->bfd_section->alignment_power = exp_get_power (s->section_alignment,
++                                                    "section alignment");
+ }
+ 
+ /* Make sure that all output sections mentioned in an expression are
+@@ -4706,8 +4707,10 @@ size_input_section
+ 	 is greater than any seen before, then record it too.  Perform
+ 	 the alignment by inserting a magic 'padding' statement.  */
+ 
+-      if (output_section_statement->subsection_alignment != -1)
+-	i->alignment_power = output_section_statement->subsection_alignment;
++      if (output_section_statement->subsection_alignment != NULL)
++	i->alignment_power
++	  = exp_get_power (output_section_statement->subsection_alignment,
++			   "subsection alignment");
+ 
+       if (o->alignment_power < i->alignment_power)
+ 	o->alignment_power = i->alignment_power;
+@@ -5147,7 +5150,8 @@ lang_size_sections_1
+ 		    section_alignment = os->bfd_section->alignment_power;
+ 		  }
+ 		else
+-		  section_alignment = os->section_alignment;
++                 section_alignment = exp_get_power (os->section_alignment,
++                                                    "section alignment");
+ 
+ 		/* Align to what the section needs.  */
+ 		if (section_alignment > 0)
+@@ -5225,7 +5229,8 @@ lang_size_sections_1
+ 		       only align according to the value in the output
+ 		       statement.  */
+ 		    if (os->lma_region != os->region)
+-		      section_alignment = os->section_alignment;
++		      section_alignment = exp_get_power (os->section_alignment,
++							 "section alignment");
+ 		    if (section_alignment > 0)
+ 		      lma = align_power (lma, section_alignment);
+ 		  }
+@@ -6673,25 +6678,6 @@ lang_add_output (const char *name, int f
+     }
+ }
+ 
+-static int
+-topower (int x)
+-{
+-  unsigned int i = 1;
+-  int l;
+-
+-  if (x < 0)
+-    return -1;
+-
+-  for (l = 0; l < 32; l++)
+-    {
+-      if (i >= (unsigned int) x)
+-	return l;
+-      i <<= 1;
+-    }
+-
+-  return 0;
+-}
+-
+ lang_output_section_statement_type *
+ lang_enter_output_section_statement (const char *output_section_statement_name,
+ 				     etree_type *address_exp,
+@@ -6727,10 +6713,8 @@ lang_enter_output_section_statement (con
+     einfo (_("%F%P:%pS: error: align with input and explicit align specified\n"),
+ 	   NULL);
+ 
+-  os->subsection_alignment =
+-    topower (exp_get_value_int (subalign, -1, "subsection alignment"));
+-  os->section_alignment =
+-    topower (exp_get_value_int (align, -1, "section alignment"));
++  os->subsection_alignment = subalign;
++  os->section_alignment = align;
+ 
+   os->load_base = ebase;
+   return os;
+@@ -7748,7 +7732,7 @@ lang_new_phdr (const char *name,
+   n = (struct lang_phdr *) stat_alloc (sizeof (struct lang_phdr));
+   n->next = NULL;
+   n->name = name;
+-  n->type = exp_get_value_int (type, 0, "program header type");
++  n->type = exp_get_vma (type, 0, "program header type");
+   n->filehdr = filehdr;
+   n->phdrs = phdrs;
+   n->at = at;
+diff -rup binutils.orig/ld/ldlang.h binutils-2.31.1/ld/ldlang.h
+--- binutils.orig/ld/ldlang.h	2018-09-04 11:00:05.533667114 +0100
++++ binutils-2.31.1/ld/ldlang.h	2018-09-04 11:08:29.224100845 +0100
+@@ -143,6 +143,8 @@ typedef struct lang_output_section_state
+   fill_type *fill;
+   union etree_union *addr_tree;
+   union etree_union *load_base;
++  union etree_union *section_alignment;
++  union etree_union *subsection_alignment;
+ 
+   /* If non-null, an expression to evaluate after setting the section's
+      size.  The expression is evaluated inside REGION (above) with '.'
+@@ -153,8 +155,6 @@ typedef struct lang_output_section_state
+   lang_output_section_phdr_list *phdrs;
+ 
+   unsigned int block_value;
+-  int subsection_alignment;	/* Alignment of components.  */
+-  int section_alignment;	/* Alignment of start of section.  */
+   int constraint;
+   flagword flags;
+   enum section_type sectype;

binutils-detect-corrupt-sym-version-info.patch

@@ -0,0 +1,52 @@
+diff -rup binutils,orig/bfd/elf.c binutils-2.31.1/bfd/elf.c
+--- binutils,orig/bfd/elf.c	2018-08-28 12:38:29.987511521 +0100
++++ binutils-2.31.1/bfd/elf.c	2018-08-28 12:39:35.010036349 +0100
+@@ -1877,7 +1877,7 @@ _bfd_elf_get_symbol_version_string (bfd
+ 	{
+ 	  Elf_Internal_Verneed *t;
+ 
+-	  version_string = "";
++	  version_string = _("<corrupt>");
+ 	  for (t = elf_tdata (abfd)->verref;
+ 	       t != NULL;
+ 	       t = t->vn_nextref)
+diff -rup binutils,orig/binutils/readelf.c binutils-2.31.1/binutils/readelf.c
+--- binutils,orig/binutils/readelf.c	2018-08-28 12:38:30.552507392 +0100
++++ binutils-2.31.1/binutils/readelf.c	2018-08-28 12:42:04.625942967 +0100
+@@ -11263,6 +11263,7 @@ get_symbol_version_string (Filedata *
+   unsigned char data[2];
+   unsigned short vers_data;
+   unsigned long offset;
++  unsigned short max_vd_ndx;
+ 
+   if (!is_dynsym
+       || version_info[DT_VERSIONTAGIDX (DT_VERSYM)] == 0)
+@@ -11280,6 +11281,8 @@ get_symbol_version_string (Filedata *
+   if ((vers_data & VERSYM_HIDDEN) == 0 && vers_data == 0)
+     return NULL;
+ 
++  max_vd_ndx = 0;
++
+   /* Usually we'd only see verdef for defined symbols, and verneed for
+      undefined symbols.  However, symbols defined by the linker in
+      .dynbss for variables copied from a shared library in order to
+@@ -11322,6 +11325,9 @@ get_symbol_version_string (Filedata *
+ 	      ivd.vd_flags = BYTE_GET (evd.vd_flags);
+ 	    }
+ 
++	  if ((ivd.vd_ndx & VERSYM_VERSION) > max_vd_ndx)
++	    max_vd_ndx = ivd.vd_ndx & VERSYM_VERSION;
++
+ 	  off += ivd.vd_next;
+ 	}
+       while (ivd.vd_ndx != (vers_data & VERSYM_VERSION) && ivd.vd_next != 0);
+@@ -11413,6 +11419,9 @@ get_symbol_version_string (Filedata *
+ 	  return (ivna.vna_name < strtab_size
+ 		  ? strtab + ivna.vna_name : _("<corrupt>"));
+ 	}
++      else if ((max_vd_ndx || (vers_data & VERSYM_VERSION) != 1)
++	       && (vers_data & VERSYM_VERSION) > max_vd_ndx)
++	return _("<corrupt>");
+     }
+   return NULL;
+ }

binutils-disassembling-efi-files.patch

@@ -0,0 +1,39 @@
+diff -rup binutils.orig/bfd/coffgen.c binutils-2.31.1/bfd/coffgen.c
+--- binutils.orig/bfd/coffgen.c	2019-03-06 08:49:19.500586870 +0000
++++ binutils-2.31.1/bfd/coffgen.c	2019-03-06 08:49:45.798394582 +0000
+@@ -2289,7 +2289,7 @@ coff_find_nearest_line_with_names (bfd *
+      information.  So try again, using a bias against the address sought.  */
+   if (coff_data (abfd)->dwarf2_find_line_info != NULL)
+     {
+-      bfd_signed_vma bias;
++      bfd_signed_vma bias = 0;
+ 
+       /* Create a cache of the result for the next call.  */
+       if (sec_data == NULL && section->owner == abfd)
+@@ -2301,10 +2301,11 @@ coff_find_nearest_line_with_names (bfd *
+ 
+       if (sec_data != NULL && sec_data->saved_bias)
+ 	bias = sec_data->saved_bias;
+-      else
++      else if (symbols)
+ 	{
+ 	  bias = _bfd_dwarf2_find_symbol_bias (symbols,
+ 					       & coff_data (abfd)->dwarf2_find_line_info);
++
+ 	  if (sec_data)
+ 	    {
+ 	      sec_data->saved_bias = TRUE;
+Only in binutils-2.31.1/bfd: coffgen.c.orig
+diff -rup binutils.orig/bfd/dwarf2.c binutils-2.31.1/bfd/dwarf2.c
+--- binutils.orig/bfd/dwarf2.c	2019-03-06 08:49:19.498586884 +0000
++++ binutils-2.31.1/bfd/dwarf2.c	2019-03-06 08:49:45.799394575 +0000
+@@ -4463,7 +4463,7 @@ _bfd_dwarf2_find_symbol_bias (asymbol **
+ 
+   stash = (struct dwarf2_debug *) *pinfo;
+ 
+-  if (stash == NULL)
++  if (stash == NULL || symbols == NULL)
+     return 0;
+ 
+   for (unit = stash->all_comp_units; unit; unit = unit->next_unit)
+Only in binutils-2.31.1/bfd: dwarf2.c.orig

binutils-do-not-link-with-static-libstdc++.patch

@@ -1,82 +0,0 @@
-diff -rup binutils.orig/configure binutils-2.40/configure
---- binutils.orig/configure	2023-02-13 14:43:00.728877170 +0000
-+++ binutils-2.40/configure	2023-02-13 14:43:13.671864892 +0000
-@@ -5442,49 +5442,6 @@ if test -z "$LD"; then
-   fi
- fi
- 
--# Check whether -static-libstdc++ -static-libgcc is supported.
--have_static_libs=no
--if test "$GCC" = yes; then
--  saved_LDFLAGS="$LDFLAGS"
--
--  LDFLAGS="$LDFLAGS -static-libstdc++ -static-libgcc"
--  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether g++ accepts -static-libstdc++ -static-libgcc" >&5
--$as_echo_n "checking whether g++ accepts -static-libstdc++ -static-libgcc... " >&6; }
--  ac_ext=cpp
--ac_cpp='$CXXCPP $CPPFLAGS'
--ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
--
--
--cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--
--#if (__GNUC__ < 4) || (__GNUC__ == 4 && __GNUC_MINOR__ < 5)
--#error -static-libstdc++ not implemented
--#endif
--int main() {}
--_ACEOF
--if ac_fn_cxx_try_link "$LINENO"; then :
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--$as_echo "yes" >&6; }; have_static_libs=yes
--else
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--fi
--rm -f core conftest.err conftest.$ac_objext \
--    conftest$ac_exeext conftest.$ac_ext
--  ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
--
--
--  LDFLAGS="$saved_LDFLAGS"
--fi
--
--
- 
- 
- if test -n "$ac_tool_prefix"; then
---- binutils.orig/configure.ac	2024-11-26 15:08:50.162328683 +0000
-+++ binutils-2.43.50-1686dc7079f/configure.ac	2024-11-26 15:08:56.929374527 +0000
-@@ -1410,26 +1410,6 @@ if test -z "$LD"; then
-   fi
- fi
- 
--# Check whether -static-libstdc++ -static-libgcc is supported.
--have_static_libs=no
--if test "$GCC" = yes; then
--  saved_LDFLAGS="$LDFLAGS"
--
--  LDFLAGS="$LDFLAGS -static-libstdc++ -static-libgcc"
--  AC_MSG_CHECKING([whether g++ accepts -static-libstdc++ -static-libgcc])
--  AC_LANG_PUSH(C++)
--  AC_LINK_IFELSE([AC_LANG_SOURCE([
--#if (__GNUC__ < 4) || (__GNUC__ == 4 && __GNUC_MINOR__ < 5)
--#error -static-libstdc++ not implemented
--#endif
--int main() {}])],
--    [AC_MSG_RESULT([yes]); have_static_libs=yes],
--    [AC_MSG_RESULT([no])])
--  AC_LANG_POP(C++)
--
--  LDFLAGS="$saved_LDFLAGS"
--fi
--
- ACX_PROG_GNAT
- ACX_PROG_GDC
- ACX_PROG_CARGO

binutils-do-not-provide-shared-section-symbols.patch

@@ -0,0 +1,25 @@
+diff --git a/ld/scripttempl/elf.sc b/ld/scripttempl/elf.sc
+index 444aef2942..8a3858d32b 100644
+--- a/ld/scripttempl/elf.sc
++++ b/ld/scripttempl/elf.sc
+@@ -637,9 +637,9 @@ cat <<EOF
+   ${SDATA_GOT+${OTHER_GOT_SECTIONS}}
+   ${DATA_SDATA-${SDATA}}
+   ${DATA_SDATA-${OTHER_SDATA_SECTIONS}}
+-  ${RELOCATING+${DATA_END_SYMBOLS-${CREATE_SHLIB+PROVIDE (}${USER_LABEL_PREFIX}_edata = .${CREATE_SHLIB+)}; PROVIDE (${USER_LABEL_PREFIX}edata = .);}}
++  ${RELOCATING+${DATA_END_SYMBOLS-${USER_LABEL_PREFIX}_edata = .; PROVIDE (${USER_LABEL_PREFIX}edata = .);}}
+   ${RELOCATING+. = .;}
+-  ${RELOCATING+${CREATE_SHLIB+PROVIDE (}${USER_LABEL_PREFIX}__bss_start = .${CREATE_SHLIB+)};}
++  ${RELOCATING+${USER_LABEL_PREFIX}__bss_start = .;}
+   ${RELOCATING+${OTHER_BSS_SYMBOLS}}
+   ${DATA_SDATA-${SBSS}}
+   ${BSS_PLT+${PLT}}
+@@ -672,7 +672,7 @@ cat <<EOF
+   ${LARGE_BSS_AFTER_BSS-${LARGE_BSS}}
+   ${RELOCATING+. = ALIGN(${ALIGNMENT});}
+   ${RELOCATING+${OTHER_END_SYMBOLS}}
+-  ${RELOCATING+${END_SYMBOLS-${CREATE_SHLIB+PROVIDE (}${USER_LABEL_PREFIX}_end = .${CREATE_SHLIB+)}; PROVIDE (${USER_LABEL_PREFIX}end = .);}}
++  ${RELOCATING+${END_SYMBOLS-${USER_LABEL_PREFIX}_end = .; PROVIDE (${USER_LABEL_PREFIX}end = .);}}
+   ${RELOCATING+${DATA_SEGMENT_END}}
+   ${TINY_DATA_SECTION}
+   ${TINY_BSS_SECTION}

binutils-export-demangle.h.patch

@@ -1,33 +0,0 @@
-diff -rup binutils.orig/bfd/Makefile.am binutils-2.32/bfd/Makefile.am
---- binutils.orig/bfd/Makefile.am	2019-02-08 12:22:51.395684251 +0000
-+++ binutils-2.32/bfd/Makefile.am	2019-02-08 12:22:53.970664973 +0000
-@@ -33,7 +33,7 @@ bfdlibdir = @bfdlibdir@
- bfdincludedir = @bfdincludedir@
- bfdlib_LTLIBRARIES = libbfd.la
- bfdinclude_HEADERS = $(BFD_H) $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
--		     $(INCDIR)/diagnostics.h $(INCDIR)/bfdlink.h
-+		     $(INCDIR)/diagnostics.h $(INCDIR)/bfdlink.h $(INCDIR)/demangle.h
- else !INSTALL_LIBBFD
- # Empty these so that the respective installation directories will not be created.
- bfdlibdir =
-diff -rup binutils.orig/bfd/Makefile.in binutils-2.32/bfd/Makefile.in
---- binutils.orig/bfd/Makefile.in	2019-02-08 12:21:35.291254044 +0000
-+++ binutils-2.32/bfd/Makefile.in	2019-02-08 12:22:10.163992947 +0000
-@@ -249,7 +249,7 @@ am__can_run_installinfo = \
-   esac
- am__bfdinclude_HEADERS_DIST = $(INCDIR)/plugin-api.h bfd.h \
- 	$(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
--	$(INCDIR)/diagnostics.h $(INCDIR)/bfdlink.h
-+	$(INCDIR)/diagnostics.h $(INCDIR)/bfdlink.h $(INCDIR)/demangle.h
- HEADERS = $(bfdinclude_HEADERS)
- RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-   distclean-recursive maintainer-clean-recursive
-@@ -468,7 +468,7 @@ libbfd_la_LDFLAGS = $(am__append_1) -rel
- @INSTALL_LIBBFD_FALSE@bfdinclude_HEADERS = $(am__append_2)
- @INSTALL_LIBBFD_TRUE@bfdinclude_HEADERS = $(BFD_H) \
- @INSTALL_LIBBFD_TRUE@	$(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
--@INSTALL_LIBBFD_TRUE@	$(INCDIR)/diagnostics.h \
-+@INSTALL_LIBBFD_TRUE@	$(INCDIR)/diagnostics.h $(INCDIR)/demangle.h \
- @INSTALL_LIBBFD_TRUE@	$(INCDIR)/bfdlink.h $(am__append_2)
- @INSTALL_LIBBFD_FALSE@rpath_bfdlibdir = @bfdlibdir@
- @INSTALL_LIBBFD_FALSE@noinst_LTLIBRARIES = libbfd.la

binutils-fix-ar-test.patch

@@ -1,11 +0,0 @@
---- binutils.orig/binutils/testsuite/binutils-all/ar.exp	2024-02-07 13:02:23.490031197 +0000
-+++ binutils-2.42/binutils/testsuite/binutils-all/ar.exp	2024-02-07 13:03:10.285034069 +0000
-@@ -1017,7 +1017,7 @@ symbol_table
- argument_parsing
- deterministic_archive
- replacing_deterministic_member
--replacing_non_deterministic_member
-+# replacing_non_deterministic_member
- replacing_sde_deterministic_member
- delete_an_element
- move_an_element

binutils-fix-testsuite-failures.patch

@@ -0,0 +1,657 @@
+diff -rup binutils.orig/gold/testsuite/Makefile.am binutils-2.30/gold/testsuite/Makefile.am
+--- binutils.orig/gold/testsuite/Makefile.am	2018-05-31 16:14:12.736538727 +0100
++++ binutils-2.30/gold/testsuite/Makefile.am	2018-06-01 10:15:00.936103521 +0100
+@@ -393,7 +393,7 @@ icf_sht_rel_addend_test: icf_sht_rel_add
+ icf_sht_rel_addend_test.stdout: icf_sht_rel_addend_test
+ 	$(TEST_NM) icf_sht_rel_addend_test > icf_sht_rel_addend_test.stdout
+ 
+-check_PROGRAMS += large_symbol_alignment
++# check_PROGRAMS += large_symbol_alignment
+ large_symbol_alignment_SOURCES = large_symbol_alignment.cc
+ large_symbol_alignment_DEPENDENCIES = gcctestdir/ld
+ large_symbol_alignment_LDFLAGS = -Bgcctestdir/
+@@ -783,7 +783,7 @@ weak_test_DEPENDENCIES = gcctestdir/ld
+ weak_test_LDFLAGS = -Bgcctestdir/
+ weak_test_LDADD =
+ 
+-check_PROGRAMS += weak_undef_test
++# check_PROGRAMS += weak_undef_test
+ MOSTLYCLEANFILES += alt/weak_undef_lib.so
+ weak_undef_test_SOURCES = weak_undef_test.cc
+ weak_undef_test_DEPENDENCIES = gcctestdir/ld weak_undef_lib.so alt/weak_undef_lib.so
+@@ -1409,7 +1409,7 @@ initpri2_DEPENDENCIES = gcctestdir/ld
+ initpri2_LDFLAGS = -Bgcctestdir/ -Wl,--ctors-in-init-array
+ initpri2_LDADD =
+ 
+-check_PROGRAMS += initpri3a
++# check_PROGRAMS += initpri3a
+ initpri3a_SOURCES = initpri3.c
+ initpri3a_DEPENDENCIES = gcctestdir/ld
+ initpri3a_LDFLAGS = -Bgcctestdir/
+@@ -1897,19 +1897,19 @@ relro_script_test_LDADD = relro_script_t
+ relro_script_test.so: gcctestdir/ld relro_script_test.t relro_test_pic.o
+ 	$(CXXLINK) -Bgcctestdir/ -shared -Wl,-z,relro -Wl,-T,$(srcdir)/relro_script_test.t relro_test_pic.o
+ 
+-check_PROGRAMS += script_test_1
++# check_PROGRAMS += script_test_1
+ script_test_1_SOURCES = script_test_1a.cc script_test_1b.cc
+ script_test_1_DEPENDENCIES = gcctestdir/ld script_test_1.t
+ script_test_1_LDFLAGS = -Bgcctestdir/ -Wl,-R,. -Wl,-T,$(srcdir)/script_test_1.t
+ script_test_1_LDADD =
+ 
+-check_PROGRAMS += script_test_2
++# check_PROGRAMS += script_test_2
+ script_test_2_SOURCES = script_test_2.cc script_test_2a.cc script_test_2b.cc
+ script_test_2_DEPENDENCIES = gcctestdir/ld script_test_2.t
+ script_test_2_LDFLAGS = -Bgcctestdir/ -Wl,-R,. -Wl,-T,$(srcdir)/script_test_2.t
+ script_test_2_LDADD =
+ 
+-check_PROGRAMS += justsyms
++# check_PROGRAMS += justsyms
+ justsyms_SOURCES = justsyms_1.cc
+ justsyms_DEPENDENCIES = gcctestdir/ld justsyms_2r.o
+ justsyms_LDFLAGS = -Bgcctestdir/ -Wl,-R,justsyms_2r.o
+@@ -1919,7 +1919,7 @@ justsyms_2.o: justsyms_2.cc
+ justsyms_2r.o: justsyms_2.o gcctestdir/ld $(srcdir)/justsyms.t
+ 	gcctestdir/ld -o $@ -r -T $(srcdir)/justsyms.t justsyms_2.o
+ 
+-check_PROGRAMS += justsyms_exec
++# check_PROGRAMS += justsyms_exec
+ justsyms_exec_SOURCES = justsyms_exec.c
+ justsyms_exec_DEPENDENCIES = gcctestdir/ld justsyms_lib
+ justsyms_exec_LDFLAGS = -Bgcctestdir/ -Wl,-R,justsyms_lib
+@@ -1930,7 +1930,7 @@ justsyms_lib.o: justsyms_lib.c
+ justsyms_lib: justsyms_lib.o gcctestdir/ld
+ 	gcctestdir/ld -o $@ -Ttext=0x1000200 -Tdata=0x2000000 -e exported_func justsyms_lib.o
+ 
+-check_PROGRAMS += binary_test
++# check_PROGRAMS += binary_test
+ MOSTLYCLEANFILES += binary.txt
+ binary_test_SOURCES = binary_test.cc
+ binary_test_DEPENDENCIES = gcctestdir/ld binary.txt
+@@ -1952,7 +1952,7 @@ ver_matching_def_pic.o: ver_matching_def
+ ver_matching_test.stdout: ver_matching_def.so
+ 	$(TEST_OBJDUMP) -T ver_matching_def.so | $(TEST_CXXFILT) > ver_matching_test.stdout
+ 
+-check_PROGRAMS += script_test_3
++# check_PROGRAMS += script_test_3
+ check_SCRIPTS += script_test_3.sh
+ check_DATA += script_test_3.stdout
+ MOSTLYCLEANFILES += script_test_3.stdout
+@@ -1961,7 +1961,7 @@ script_test_3: basic_test.o gcctestdir/l
+ script_test_3.stdout: script_test_3
+ 	$(TEST_READELF) -SlW script_test_3 > script_test_3.stdout
+ 
+-check_PROGRAMS += tls_phdrs_script_test
++# check_PROGRAMS += tls_phdrs_script_test
+ tls_phdrs_script_test_SOURCES = $(tls_test_SOURCES)
+ tls_phdrs_script_test_DEPENDENCIES = $(tls_test_DEPENDENCIES) $(srcdir)/script_test_3.t
+ tls_phdrs_script_test_LDFLAGS = $(tls_test_LDFLAGS) -Wl,-T,$(srcdir)/script_test_3.t
+@@ -2043,7 +2043,7 @@ check_PROGRAMS += script_test_12
+ script_test_12: gcctestdir/ld $(srcdir)/script_test_12.t script_test_12a.o script_test_12b.o
+ 	$(LINK) -Bgcctestdir/ -Wl,-T,$(srcdir)/script_test_12.t script_test_12a.o script_test_12b.o
+ 
+-check_PROGRAMS += script_test_12i
++# check_PROGRAMS += script_test_12i
+ script_test_12i: gcctestdir/ld $(srcdir)/script_test_12i.t script_test_12a.o script_test_12b.o
+ 	$(LINK) -Bgcctestdir/ -Wl,-T,$(srcdir)/script_test_12i.t script_test_12a.o script_test_12b.o
+ script_test_12a.o: script_test_12a.c
+@@ -3023,7 +3023,7 @@ two_file_test_2_ndebug.o: two_file_test_
+ two_file_test_main_ndebug.o: two_file_test_main.cc
+ 	$(CXXCOMPILE) -O0 -g0 -c -o $@ $<
+ 
+-check_PROGRAMS += incremental_test_2
++# check_PROGRAMS += incremental_test_2
+ MOSTLYCLEANFILES += two_file_test_tmp_2.o
+ incremental_test_2: two_file_test_1_v1_ndebug.o two_file_test_1_ndebug.o two_file_test_1b_ndebug.o \
+ 		    two_file_test_2_ndebug.o two_file_test_main_ndebug.o gcctestdir/ld
+@@ -3033,7 +3033,7 @@ incremental_test_2: two_file_test_1_v1_n
+ 	cp -f two_file_test_1_ndebug.o two_file_test_tmp_2.o
+ 	$(CXXLINK) -Wl,--incremental-update -Wl,-z,norelro,-no-pie -Bgcctestdir/ two_file_test_tmp_2.o two_file_test_1b_ndebug.o two_file_test_2_ndebug.o two_file_test_main_ndebug.o
+ 
+-check_PROGRAMS += incremental_test_3
++# check_PROGRAMS += incremental_test_3
+ MOSTLYCLEANFILES += two_file_test_tmp_3.o
+ incremental_test_3: two_file_test_1.o two_file_test_1b_v1.o two_file_test_1b.o \
+ 		    two_file_test_2.o two_file_test_main.o gcctestdir/ld
+@@ -3043,7 +3043,7 @@ incremental_test_3: two_file_test_1.o tw
+ 	cp -f two_file_test_1b.o two_file_test_tmp_3.o
+ 	$(CXXLINK) -Wl,--incremental-update -Wl,-z,norelro,-no-pie -Bgcctestdir/ two_file_test_1.o two_file_test_tmp_3.o two_file_test_2.o two_file_test_main.o
+ 
+-check_PROGRAMS += incremental_test_4
++# check_PROGRAMS += incremental_test_4
+ MOSTLYCLEANFILES += incremental_test_4.base two_file_test_tmp_4.o
+ incremental_test_4: two_file_test_1.o two_file_test_1b.o two_file_test_2_v1.o \
+ 		    two_file_test_2.o two_file_test_main.o gcctestdir/ld
+@@ -3054,7 +3054,7 @@ incremental_test_4: two_file_test_1.o tw
+ 	cp -f two_file_test_2.o two_file_test_tmp_4.o
+ 	$(CXXLINK) -Wl,--incremental-update,--incremental-base=incremental_test_4.base -Wl,-z,norelro,-no-pie -Bgcctestdir/ two_file_test_1.o two_file_test_1b.o two_file_test_tmp_4.o two_file_test_main.o
+ 
+-check_PROGRAMS += incremental_test_5
++# check_PROGRAMS += incremental_test_5
+ MOSTLYCLEANFILES += two_file_test_5.a
+ incremental_test_5: two_file_test_1.o two_file_test_1b_v1.o two_file_test_1b.o \
+ 		    two_file_test_2.o two_file_test_main.o gcctestdir/ld
+@@ -3068,7 +3068,7 @@ incremental_test_5: two_file_test_1.o tw
+ 
+ # Test the --incremental-unchanged flag with an archive library.
+ # The second link should not update the library.
+-check_PROGRAMS += incremental_test_6
++# check_PROGRAMS += incremental_test_6
+ MOSTLYCLEANFILES += two_file_test_6.a
+ incremental_test_6: two_file_test_1.o two_file_test_1b_v1.o two_file_test_1b.o \
+ 		    two_file_test_2.o two_file_test_main.o gcctestdir/ld
+@@ -3080,7 +3080,7 @@ incremental_test_6: two_file_test_1.o tw
+ 	$(TEST_AR) rc two_file_test_6.a two_file_test_1.o two_file_test_tmp_6.o two_file_test_2.o
+ 	$(CXXLINK) -Wl,--incremental-update -Wl,-z,norelro,-no-pie -Bgcctestdir/ two_file_test_main.o -Wl,--incremental-unchanged two_file_test_6.a -Wl,--incremental-unknown
+ 
+-check_PROGRAMS += incremental_copy_test
++# check_PROGRAMS += incremental_copy_test
+ incremental_copy_test: copy_test_v1.o copy_test.o copy_test_1.so copy_test_2.so
+ 	cp -f copy_test_v1.o copy_test_tmp.o
+ 	$(CXXLINK) -Wl,--incremental-full,--incremental-patch=100 -Wl,-z,norelro,-no-pie -Bgcctestdir/ -Wl,-R,. -Wl,--no-as-needed copy_test_tmp.o copy_test_1.so copy_test_2.so
+@@ -3088,7 +3088,7 @@ incremental_copy_test: copy_test_v1.o co
+ 	cp -f copy_test.o copy_test_tmp.o
+ 	$(CXXLINK) -Wl,--incremental-update -Wl,-z,norelro,-no-pie -Bgcctestdir/ -Wl,-R,. -Wl,--no-as-needed copy_test_tmp.o copy_test_1.so copy_test_2.so
+ 
+-check_PROGRAMS += incremental_common_test_1
++# check_PROGRAMS += incremental_common_test_1
+ incremental_common_test_1: common_test_1_v1.o common_test_1_v2.o gcctestdir/ld
+ 	cp -f common_test_1_v1.o common_test_1_tmp.o
+ 	$(CXXLINK) -Wl,--incremental-full,--incremental-patch=100 -Wl,-z,norelro,-no-pie -Bgcctestdir/ common_test_1_tmp.o
+@@ -3096,7 +3096,7 @@ incremental_common_test_1: common_test_1
+ 	cp -f common_test_1_v2.o common_test_1_tmp.o
+ 	$(CXXLINK) -Wl,--incremental-update -Wl,-z,norelro,-no-pie -Bgcctestdir/ common_test_1_tmp.o
+ 
+-check_PROGRAMS += incremental_comdat_test_1
++# check_PROGRAMS += incremental_comdat_test_1
+ incremental_comdat_test_1: incr_comdat_test_1.o incr_comdat_test_2_v1.o incr_comdat_test_2_v2.o incr_comdat_test_2_v3.o gcctestdir/ld
+ 	cp -f incr_comdat_test_2_v1.o incr_comdat_test_1_tmp.o
+ 	$(CXXLINK) -Wl,--incremental-full,--incremental-patch=100 -Wl,-z,norelro,-no-pie -Bgcctestdir/ incr_comdat_test_1.o incr_comdat_test_1_tmp.o
+diff -rup binutils.orig/gold/testsuite/Makefile.in binutils-2.30/gold/testsuite/Makefile.in
+--- binutils.orig/gold/testsuite/Makefile.in	2018-05-31 16:14:12.729538804 +0100
++++ binutils-2.30/gold/testsuite/Makefile.in	2018-06-01 10:15:13.070965094 +0100
+@@ -166,7 +166,6 @@ check_PROGRAMS = $(am__EXEEXT_1) $(am__E
+ @GCC_TRUE@@NATIVE_LINKER_TRUE@	alt/weak_undef_lib.so \
+ @GCC_TRUE@@NATIVE_LINKER_TRUE@	libweak_undef_2.a
+ @GCC_TRUE@@NATIVE_LINKER_TRUE@am__append_5 = icf_virtual_function_folding_test \
+-@GCC_TRUE@@NATIVE_LINKER_TRUE@	large_symbol_alignment \
+ @GCC_TRUE@@NATIVE_LINKER_TRUE@	basic_test basic_pic_test \
+ @GCC_TRUE@@NATIVE_LINKER_TRUE@	eh_test
+ @GCC_FALSE@large_symbol_alignment_DEPENDENCIES =
+@@ -220,7 +219,6 @@ check_PROGRAMS = $(am__EXEEXT_1) $(am__E
+ @NATIVE_LINKER_FALSE@exception_test_DEPENDENCIES =
+ @GCC_TRUE@@HAVE_STATIC_TRUE@@NATIVE_LINKER_TRUE@am__append_14 = exception_static_test
+ @GCC_TRUE@@NATIVE_LINKER_TRUE@am__append_15 = weak_test \
+-@GCC_TRUE@@NATIVE_LINKER_TRUE@	weak_undef_test \
+ @GCC_TRUE@@NATIVE_LINKER_TRUE@	weak_undef_test_2
+ @GCC_FALSE@weak_test_DEPENDENCIES =
+ @NATIVE_LINKER_FALSE@weak_test_DEPENDENCIES =
+@@ -334,7 +332,7 @@ check_PROGRAMS = $(am__EXEEXT_1) $(am__E
+ # Test difference between "*(a b)" and "*(a) *(b)" in input section spec.
+ @GCC_TRUE@@NATIVE_LINKER_TRUE@am__append_39 = many_sections_test \
+ @GCC_TRUE@@NATIVE_LINKER_TRUE@	many_sections_r_test initpri1 \
+-@GCC_TRUE@@NATIVE_LINKER_TRUE@	initpri2 initpri3a \
++@GCC_TRUE@@NATIVE_LINKER_TRUE@	initpri2 \
+ @GCC_TRUE@@NATIVE_LINKER_TRUE@	flagstest_o_specialfile \
+ @GCC_TRUE@@NATIVE_LINKER_TRUE@	flagstest_compress_debug_sections_none \
+ @GCC_TRUE@@NATIVE_LINKER_TRUE@	flagstest_compress_debug_sections \
+@@ -348,13 +346,9 @@ check_PROGRAMS = $(am__EXEEXT_1) $(am__E
+ @GCC_TRUE@@NATIVE_LINKER_TRUE@	ver_test_12 protected_1 \
+ @GCC_TRUE@@NATIVE_LINKER_TRUE@	protected_2 relro_test \
+ @GCC_TRUE@@NATIVE_LINKER_TRUE@	relro_now_test relro_strip_test \
+-@GCC_TRUE@@NATIVE_LINKER_TRUE@	relro_script_test script_test_1 \
+-@GCC_TRUE@@NATIVE_LINKER_TRUE@	script_test_2 justsyms \
+-@GCC_TRUE@@NATIVE_LINKER_TRUE@	justsyms_exec binary_test \
+-@GCC_TRUE@@NATIVE_LINKER_TRUE@	script_test_3 \
+-@GCC_TRUE@@NATIVE_LINKER_TRUE@	tls_phdrs_script_test \
++@GCC_TRUE@@NATIVE_LINKER_TRUE@	relro_script_test \
+ @GCC_TRUE@@NATIVE_LINKER_TRUE@	tls_script_test script_test_11 \
+-@GCC_TRUE@@NATIVE_LINKER_TRUE@	script_test_12 script_test_12i \
++@GCC_TRUE@@NATIVE_LINKER_TRUE@	script_test_12 \
+ @GCC_TRUE@@NATIVE_LINKER_TRUE@	dynamic_list_2 \
+ @GCC_TRUE@@NATIVE_LINKER_TRUE@	thin_archive_test_1 \
+ @GCC_TRUE@@NATIVE_LINKER_TRUE@	thin_archive_test_2
+@@ -813,15 +807,7 @@ check_PROGRAMS = $(am__EXEEXT_1) $(am__E
+ 
+ # Test the --incremental-unchanged flag with an archive library.
+ # The second link should not update the library.
+-@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@am__append_82 = incremental_test_2 \
+-@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@	incremental_test_3 \
+-@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@	incremental_test_4 \
+-@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@	incremental_test_5 \
+-@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@	incremental_test_6 \
+-@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@	incremental_copy_test \
+-@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@	incremental_common_test_1 \
+-@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@	incremental_comdat_test_1 \
+-@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@	exception_x86_64_bnd_test
++@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@am__append_82 = 
+ @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@am__append_83 = two_file_test_tmp_2.o \
+ @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@	two_file_test_tmp_3.o \
+ @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@	incremental_test_4.base \
+@@ -1082,7 +1068,6 @@ libgoldtest_a_OBJECTS = $(am_libgoldtest
+ @NATIVE_OR_CROSS_LINKER_TRUE@	leb128_unittest$(EXEEXT) \
+ @NATIVE_OR_CROSS_LINKER_TRUE@	overflow_unittest$(EXEEXT)
+ @GCC_TRUE@@NATIVE_LINKER_TRUE@am__EXEEXT_2 = icf_virtual_function_folding_test$(EXEEXT) \
+-@GCC_TRUE@@NATIVE_LINKER_TRUE@	large_symbol_alignment$(EXEEXT) \
+ @GCC_TRUE@@NATIVE_LINKER_TRUE@	basic_test$(EXEEXT) \
+ @GCC_TRUE@@NATIVE_LINKER_TRUE@	basic_pic_test$(EXEEXT) \
+ @GCC_TRUE@@NATIVE_LINKER_TRUE@	eh_test$(EXEEXT)
+@@ -1127,7 +1112,6 @@ libgoldtest_a_OBJECTS = $(am_libgoldtest
+ @GCC_TRUE@@NATIVE_LINKER_TRUE@	exception_separate_shared_21_test$(EXEEXT)
+ @GCC_TRUE@@HAVE_STATIC_TRUE@@NATIVE_LINKER_TRUE@am__EXEEXT_11 = exception_static_test$(EXEEXT)
+ @GCC_TRUE@@NATIVE_LINKER_TRUE@am__EXEEXT_12 = weak_test$(EXEEXT) \
+-@GCC_TRUE@@NATIVE_LINKER_TRUE@	weak_undef_test$(EXEEXT) \
+ @GCC_TRUE@@NATIVE_LINKER_TRUE@	weak_undef_test_2$(EXEEXT)
+ @FN_PTRS_IN_SO_WITHOUT_PIC_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@am__EXEEXT_13 = weak_undef_nonpic_test$(EXEEXT)
+ @GCC_TRUE@@NATIVE_LINKER_TRUE@am__EXEEXT_14 =  \
+@@ -1164,7 +1148,6 @@ libgoldtest_a_OBJECTS = $(am_libgoldtest
+ @GCC_TRUE@@NATIVE_LINKER_TRUE@	many_sections_r_test$(EXEEXT) \
+ @GCC_TRUE@@NATIVE_LINKER_TRUE@	initpri1$(EXEEXT) \
+ @GCC_TRUE@@NATIVE_LINKER_TRUE@	initpri2$(EXEEXT) \
+-@GCC_TRUE@@NATIVE_LINKER_TRUE@	initpri3a$(EXEEXT) \
+ @GCC_TRUE@@NATIVE_LINKER_TRUE@	flagstest_o_specialfile$(EXEEXT) \
+ @GCC_TRUE@@NATIVE_LINKER_TRUE@	flagstest_compress_debug_sections_none$(EXEEXT) \
+ @GCC_TRUE@@NATIVE_LINKER_TRUE@	flagstest_compress_debug_sections$(EXEEXT) \
+@@ -1186,17 +1169,9 @@ libgoldtest_a_OBJECTS = $(am_libgoldtest
+ @GCC_TRUE@@NATIVE_LINKER_TRUE@	relro_now_test$(EXEEXT) \
+ @GCC_TRUE@@NATIVE_LINKER_TRUE@	relro_strip_test$(EXEEXT) \
+ @GCC_TRUE@@NATIVE_LINKER_TRUE@	relro_script_test$(EXEEXT) \
+-@GCC_TRUE@@NATIVE_LINKER_TRUE@	script_test_1$(EXEEXT) \
+-@GCC_TRUE@@NATIVE_LINKER_TRUE@	script_test_2$(EXEEXT) \
+-@GCC_TRUE@@NATIVE_LINKER_TRUE@	justsyms$(EXEEXT) \
+-@GCC_TRUE@@NATIVE_LINKER_TRUE@	justsyms_exec$(EXEEXT) \
+-@GCC_TRUE@@NATIVE_LINKER_TRUE@	binary_test$(EXEEXT) \
+-@GCC_TRUE@@NATIVE_LINKER_TRUE@	script_test_3$(EXEEXT) \
+-@GCC_TRUE@@NATIVE_LINKER_TRUE@	tls_phdrs_script_test$(EXEEXT) \
+ @GCC_TRUE@@NATIVE_LINKER_TRUE@	tls_script_test$(EXEEXT) \
+ @GCC_TRUE@@NATIVE_LINKER_TRUE@	script_test_11$(EXEEXT) \
+ @GCC_TRUE@@NATIVE_LINKER_TRUE@	script_test_12$(EXEEXT) \
+-@GCC_TRUE@@NATIVE_LINKER_TRUE@	script_test_12i$(EXEEXT) \
+ @GCC_TRUE@@NATIVE_LINKER_TRUE@	dynamic_list_2$(EXEEXT) \
+ @GCC_TRUE@@NATIVE_LINKER_TRUE@	thin_archive_test_1$(EXEEXT) \
+ @GCC_TRUE@@NATIVE_LINKER_TRUE@	thin_archive_test_2$(EXEEXT)
+@@ -1263,14 +1238,7 @@ libgoldtest_a_OBJECTS = $(am_libgoldtest
+ @GCC_TRUE@@NATIVE_LINKER_TRUE@	ehdr_start_test_3$(EXEEXT) \
+ @GCC_TRUE@@NATIVE_LINKER_TRUE@	ehdr_start_test_5$(EXEEXT) \
+ @GCC_TRUE@@NATIVE_LINKER_TRUE@	pr20976$(EXEEXT)
+-@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@am__EXEEXT_40 = incremental_test_2$(EXEEXT) \
+-@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@	incremental_test_3$(EXEEXT) \
+-@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@	incremental_test_4$(EXEEXT) \
+-@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@	incremental_test_5$(EXEEXT) \
+-@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@	incremental_test_6$(EXEEXT) \
+-@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@	incremental_copy_test$(EXEEXT) \
+-@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@	incremental_common_test_1$(EXEEXT) \
+-@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@	incremental_comdat_test_1$(EXEEXT) \
++@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@am__EXEEXT_40 = \
+ @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@	exception_x86_64_bnd_test$(EXEEXT)
+ @GCC_TRUE@@NATIVE_LINKER_TRUE@am__EXEEXT_41 = pr22266$(EXEEXT)
+ basic_pic_test_SOURCES = basic_pic_test.c
+--- binutils.orig/ld/testsuite/ld-elf/pr22269-1.c	2018-05-31 16:14:12.648539694 +0100
++++ binutils-2.30/ld/testsuite/ld-elf/pr22269-1.c	2018-06-01 10:55:24.284977908 +0100
+@@ -5,4 +5,5 @@ _start (void)
+ {
+   if (&foo)
+     return foo;
++  return 0;
+ }
+--- binutils.orig/ld/testsuite/ld-scripts/cross3.t	2018-05-31 16:14:12.679539354 +0100
++++ binutils-2.30/ld/testsuite/ld-scripts/cross3.t	2018-06-01 10:59:46.109996654 +0100
+@@ -6,5 +6,6 @@ SECTIONS
+   .nocrossrefs : { *(.nocrossrefs) }
+   .data : { *(.data) *(.data.*) *(.sdata) *(.opd) *(.toc) }
+   .bss : { *(.bss) *(COMMON) }
++  .got.plt : { *(.got) *(.plt) *(.got.plt) }
+   /DISCARD/ : { *(*) }
+ }
+--- binutils.orig/ld/testsuite/ld-srec/srec.exp	2018-05-31 16:14:12.570540551 +0100
++++ binutils-2.30/ld/testsuite/ld-srec/srec.exp	2018-06-01 11:01:15.443979458 +0100
+@@ -19,6 +19,14 @@
+ # Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+ # MA 02110-1301, USA.
+ 
++if [istarget x86_64-*-*] {
++    # The S-record tests are failing for some configurations
++    # of x86_64-linux builds, but not others.  Not worth
++    # investigating however as S-record conversion can always
++    # be done outside of the linker.
++    return
++}
++
+ # Get the offset from an S-record line to the start of the data.
+ 
+ proc srec_off { l } {
+--- binutils.orig/ld/testsuite/ld-x86-64/pr22001-1b.err	2018-05-31 16:14:12.621539991 +0100
++++ binutils-2.30/ld/testsuite/ld-x86-64/pr22001-1b.err	2018-06-01 11:02:58.554805393 +0100
+@@ -1,2 +1,2 @@
+-.*relocation R_X86_64_32S against symbol `copy' can not be used when making a P(D|I)E object; recompile with -fPIC
++.*relocation R_X86_64_(PC32|32S) against symbol `copy' can not be used when making a P(D|I)E object; recompile with -fPIC
+ #...
+--- binutils.orig/ld/testsuite/ld-x86-64/pr21997-1b.err	2018-05-31 16:14:12.620540002 +0100
++++ binutils-2.30/ld/testsuite/ld-x86-64/pr21997-1b.err	2018-06-01 11:04:01.535088273 +0100
+@@ -1,2 +1,2 @@
+-.*relocation R_X86_64_32S against protected symbol `protected' can not be used when making a P(D|I)E object; recompile with -fPIC
++.*relocation R_X86_64_(PC32|32S) against protected symbol `protected' can not be used when making a P(D|I)E object; recompile with -fPIC
+ #...
+--- binutils.orig/ld/testsuite/ld-x86-64/x86-64.exp	2018-05-31 16:14:12.617540035 +0100
++++ binutils-2.30/ld/testsuite/ld-x86-64/x86-64.exp	2018-06-01 11:05:46.005912951 +0100
+@@ -1792,7 +1792,7 @@ if { [isnative] && [which $CC] != 0 } {
+ 	}
+     }
+ 
+-    undefined_weak "$NOPIE_CFLAGS" "$NOPIE_LDFLAGS"
++    # undefined_weak "$NOPIE_CFLAGS" "$NOPIE_LDFLAGS"
+     undefined_weak "-fPIE" ""
+     undefined_weak "-fPIE" "-pie"
+     undefined_weak "-fPIE" "-Wl,-z,nodynamic-undefined-weak"
+--- binutils.orig/ld/testsuite/ld-size/size-7a.c	2018-05-31 16:14:12.569540562 +0100
++++ binutils-2.30/ld/testsuite/ld-size/size-7a.c	2018-06-01 11:06:44.106265741 +0100
+@@ -1,11 +1,12 @@
+ #include <stdio.h>
+ 
+-extern char size_of_bar asm ("bar@SIZE");
++extern char  size_of_bar  asm ("bar@SIZE");
++char *       bar_size   = & size_of_bar;
+ 
+ int
+-main ()
++main (void)
+ {
+-  if (10 == (long) &size_of_bar)
++  if (10L == (long) bar_size)
+     printf ("OK\n");
+ 
+   return 0;
+--- binutils.orig/ld/testsuite/ld-size/size-8a.c	2018-05-31 16:14:12.568540573 +0100
++++ binutils-2.30/ld/testsuite/ld-size/size-8a.c	2018-06-01 11:07:54.926476839 +0100
+@@ -1,14 +1,15 @@
+ #include <stdio.h>
+ 
+ extern __thread char bar[];
+-extern char size_of_bar asm ("bar@SIZE");
+-extern void set_bar (int, int);
++extern char  size_of_bar asm ("bar@SIZE");
++extern void  set_bar (int, int);
++char *       bar_size   = & size_of_bar;
+ 
+ int
+-main ()
++main (void)
+ {
+   set_bar (1, 20);
+-  if (10 == (long) &size_of_bar && bar[1] == 20)
++  if (10L == (long) bar_size && bar[1] == 20)
+     printf ("OK\n");
+ 
+   return 0;
+--- binutils.orig/ld/testsuite/ld-size/size-4b.c	2018-05-31 16:14:12.569540562 +0100
++++ binutils-2.30/ld/testsuite/ld-size/size-4b.c	2018-06-01 11:09:00.979741038 +0100
+@@ -2,7 +2,7 @@ extern char bar[];
+ extern char size_of_bar asm ("bar@SIZE");
+ 
+ char *bar_size_1 = &size_of_bar;
+-static char *bar_size_2 = &size_of_bar;
++char *bar_size_2 = &size_of_bar;
+ 
+ char *
+ bar_size1 (void)
+@@ -20,7 +20,7 @@ extern char foo[];
+ extern char size_of_foo asm ("foo@SIZE");
+ 
+ char *foo_size_1 = &size_of_foo;
+-static char *foo_size_2 = &size_of_foo;
++char *foo_size_2 = &size_of_foo;
+ 
+ char *
+ foo_size1 (void)
+--- binutils.orig/ld/testsuite/ld-size/size-5b.c	2018-05-31 16:14:12.569540562 +0100
++++ binutils-2.30/ld/testsuite/ld-size/size-5b.c	2018-06-01 11:09:42.134282596 +0100
+@@ -2,7 +2,7 @@ extern __thread char bar[];
+ extern char size_of_bar asm ("bar@SIZE");
+ 
+ char *bar_size_1 = &size_of_bar;
+-static char *bar_size_2 = &size_of_bar;
++char *bar_size_2 = &size_of_bar;
+ 
+ char *
+ bar_size1 (void)
+@@ -21,7 +21,7 @@ extern __thread char foo[];
+ extern char size_of_foo asm ("foo@SIZE");
+ 
+ char *foo_size_1 = &size_of_foo;
+-static char *foo_size_2 = &size_of_foo;
++char *foo_size_2 = &size_of_foo;
+ 
+ char *
+ foo_size1 (void)
+--- binutils.orig/ld/testsuite/ld-size/size-6a.c	2018-05-31 16:14:12.568540573 +0100
++++ binutils-2.30/ld/testsuite/ld-size/size-6a.c	2018-06-01 11:11:42.478942015 +0100
+@@ -1,14 +1,15 @@
+ #include <stdio.h>
+ 
+-extern char bar[];
+-extern char size_of_bar asm ("bar@SIZE");
+-extern void set_bar (int, int);
++extern char  bar[];
++extern char  size_of_bar asm ("bar@SIZE");
++extern void  set_bar (int, int);
++char *       bar_size = & size_of_bar;
+ 
+ int
+-main ()
++main (void)
+ {
+   set_bar (1, 20);
+-  if (10 == (long) &size_of_bar && bar[1] == 20)
++  if (10 == (long) bar_size && bar[1] == 20)
+     printf ("OK\n");
+ 
+   return 0;
+--- binutils.orig/ld/testsuite/ld-s390/tlspic_64.dd	2018-05-31 16:14:12.579540452 +0100
++++ binutils-2.30/ld/testsuite/ld-s390/tlspic_64.dd	2018-06-01 13:20:16.509595466 +0100
+@@ -78,7 +78,7 @@ Disassembly of section .text:
+  +[0-9a-f]+:	00 00 00 60       	.long	0x00000060
+ # function prolog
+  +[0-9a-f]+:	b9 04 00 ef       	lgr	%r14,%r15
+- +[0-9a-f]+:	c0 c0 [0-9a-f ]+ 	larl	%r12,[0-9a-f]+ <_GLOBAL_OFFSET_TABLE_>
++ +[0-9a-f]+:	c0 c0 [0-9a-f ]+ 	larl	%r12,[0-9a-f]+ <.*>
+  +[0-9a-f]+:	a7 fb ff 60       	aghi	%r15,-160
+  +[0-9a-f]+:	e3 e0 e0 00 00 24 	stg	%r14,0\(%r14\)
+ # extract TCB
+--- binutils.orig/ld/testsuite/ld-srec/srec.exp	2018-05-31 16:14:12.570540551 +0100
++++ binutils-2.30/ld/testsuite/ld-srec/srec.exp	2018-06-01 13:24:35.262758291 +0100
+@@ -420,6 +420,8 @@ setup_xfail "bfin-*-linux-uclibc"
+ # generate the format if need be).
+ setup_xfail "tile*-*-*"
+ 
++setup_xfail "s390*-*-*"
++
+ run_srec_test $test1 "tmpdir/sr1.o tmpdir/sr2.o"
+ 
+ # Now try linking a C++ program with global constructors and
+--- binutils.orig/ld/testsuite/ld-elf/indirect.exp	2018-05-31 16:14:12.649539683 +0100
++++ binutils-2.30/ld/testsuite/ld-elf/indirect.exp	2018-06-01 14:32:22.949232924 +0100
+@@ -156,12 +156,26 @@ set run_tests {
+     {"Run with libindirect4c.so 4"
+      "-Wl,--no-as-needed tmpdir/libindirect4c.so tmpdir/indirect4b.o tmpdir/indirect4a.o" ""
+      {dummy.c} "indirect4d" "indirect4.out"}
+-    {"Run indirect5 1"
+-     "$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/libindirect5.so" ""
+-     {indirect5a.c} "indirect5a" "indirect5.out" "$NOPIE_CFLAGS"}
+-    {"Run indirect5 2"
+-     "$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/indirect5a.o tmpdir/libindirect5.so" ""
+-     {dummy.c} "indirect5b" "indirect5.out" "$NOPIE_CFLAGS"}
++}
++
++run_ld_link_exec_tests $run_tests
++
++# The s390x system compiler miscompiles these tests.
++if { ! [istarget s390x-*-*] } {
++    
++    set run_tests {
++	{"Run indirect5 1"
++	    "$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/libindirect5.so" ""
++	    {indirect5a.c} "indirect5a" "indirect5.out" "$NOPIE_CFLAGS"}
++	{"Run indirect5 2"
++	    "$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/indirect5a.o tmpdir/libindirect5.so" ""
++	    {dummy.c} "indirect5b" "indirect5.out" "$NOPIE_CFLAGS"}
++    }
++
++    run_ld_link_exec_tests $run_tests
++}
++
++set run_tests {
+     {"Run indirect6 1"
+      "$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/libindirect5.so" ""
+      {indirect6a.c} "indirect6a" "indirect5.out" "$NOPIE_CFLAGS"}
+@@ -213,12 +227,15 @@ proc check_dynamic_syms { test } {
+     return 1
+ }
+ 
+-foreach t [list indirect5a indirect5b indirect6a indirect6b] {
+-    set testname [concat $t "dynsym"]
+-    if { [check_dynamic_syms tmpdir/$t] } {
+-	pass $testname
+-    } else {
+-	fail $testname
++# The s390x system compiler miscompiles indirect5 tests.
++if { ! [istarget s390x-*-*] } {
++    foreach t [list indirect5a indirect5b indirect6a indirect6b] {
++	set testname [concat $t "dynsym"]
++	if { [check_dynamic_syms tmpdir/$t] } {
++	    pass $testname
++	} else {
++	    fail $testname
++	}
+     }
+ }
+ 
+@@ -229,13 +246,22 @@ if { ! [string match "" $exec_output] }
+     return
+ }
+ 
++
++# The s390x system compiler miscompiles these tests.
++if { ! [istarget s390x-*-*] } {
++    set pie_tests {
++	{"Run indirect5 3"
++	    "-pie -Wl,--no-as-needed tmpdir/libindirect5.so" ""
++	    {indirect5a.c} "indirect5c" "indirect5.out" "-fPIE"}
++	{"Run indirect5 4"
++	    "-pie -Wl,--no-as-needed tmpdir/indirect5a.o tmpdir/libindirect5.so" ""
++	    {dummy.c} "indirect5d" "indirect5.out" "-fPIE"}
++    }
++
++    run_ld_link_exec_tests $pie_tests
++}
++
+ set pie_tests {
+-    {"Run indirect5 3"
+-     "-pie -Wl,--no-as-needed tmpdir/libindirect5.so" ""
+-     {indirect5a.c} "indirect5c" "indirect5.out" "-fPIE"}
+-    {"Run indirect5 4"
+-     "-pie -Wl,--no-as-needed tmpdir/indirect5a.o tmpdir/libindirect5.so" ""
+-     {dummy.c} "indirect5d" "indirect5.out" "-fPIE"}
+     {"Run indirect6 3"
+      "-pie -Wl,--no-as-needed tmpdir/libindirect5.so" ""
+      {indirect6a.c} "indirect6c" "indirect5.out" "-fPIE"}
+@@ -246,11 +272,14 @@ set pie_tests {
+ 
+ run_ld_link_exec_tests $pie_tests
+ 
+-foreach t [list indirect5c indirect5d indirect6c indirect6d] {
+-    set testname [concat $t "dynsym"]
+-    if { [check_dynamic_syms tmpdir/$t] } {
+-	pass $testname
+-    } else {
+-	fail $testname
++# The s390x system compiler miscompiles indirect5 tests.
++if { ! [istarget s390x-*-*] } {
++    foreach t [list indirect5c indirect5d indirect6c indirect6d] {
++	set testname [concat $t "dynsym"]
++	if { [check_dynamic_syms tmpdir/$t] } {
++	    pass $testname
++	} else {
++	    fail $testname
++	}
+     }
+ }
+--- binutils.orig/ld/testsuite/ld-elfvers/vers.exp	2018-05-31 16:14:12.572540529 +0100
++++ binutils-2.30/ld/testsuite/ld-elfvers/vers.exp	2018-06-01 15:23:36.518815276 +0100
+@@ -938,6 +938,7 @@ if [string match "yes" $pic] then {
+     build_exec "vers23" vers23.c vers23 "-Wl,--no-as-needed tmpdir/vers23a.so tmpdir/vers23b.o tmpdir/vers23b.so" "" vers23.ver vers23.dsym ""
+ }
+ 
++if {! [istarget ppc64*-*-*] } {
+ # Test .symver x,x@VERS.0
+ set as_pic_flags ""
+ if [istarget sparc*-*-*] {
+@@ -955,6 +956,7 @@ run_ld_link_tests [list "\"vers24c\"
+ 			 \"-shared --version-script $srcdir/$subdir/vers24.map\" \"\"
+ 			 \"$as_pic_flags $as_options\" {vers24c.c} { { readelf -Wrs vers24.rd } }
+ 			 \"libvers24c.so\" \"-fpic\""]
++}
+ 
+ # Test versioned definition vs. normal definition in different files.
+ if [string match "yes" $pic] then {
+--- binutils.orig/ld/testsuite/ld-ifunc/ifunc.exp	2018-05-31 16:14:12.573540519 +0100
++++ binutils-2.30/ld/testsuite/ld-ifunc/ifunc.exp	2018-06-01 15:26:52.020691739 +0100
+@@ -284,11 +284,14 @@ if {! [check_osabi tmpdir/static_nonifun
+ # The linked ifunc using executables and the shared library containing
+ # ifunc should contain an IFUNC symbol.  The non-ifunc using executable
+ # should not.
+-
++if { ![istarget "ppc*-*-*"] } {
+ if {[contains_ifunc_symbol tmpdir/libshared_ifunc.so] != 1} {
+     fail "Shared libraries containing ifunc does not contain an IFUNC symbol"
+     set fails [expr $fails + 1]
+ }
++}
++
++if { ![istarget "ppc*-*-*"] } {
+ if {[contains_ifunc_symbol tmpdir/local_prog] != 1} {
+     fail "Local ifunc-using executable does not contain an IFUNC symbol"
+     set fails [expr $fails + 1]
+@@ -297,6 +300,7 @@ if {[contains_ifunc_symbol tmpdir/static
+     fail "Static ifunc-using executable does not contain an IFUNC symbol"
+     set fails [expr $fails + 1]
+ }
++}
+ if {[contains_ifunc_symbol tmpdir/dynamic_prog] != 0} {
+     fail "Dynamic ifunc-using executable contains an IFUNC symbol"
+     set fails [expr $fails + 1]
+--- binutils.orig/ld/testsuite/ld-plugin/plugin.exp	2018-05-31 16:14:12.580540442 +0100
++++ binutils-2.30/ld/testsuite/ld-plugin/plugin.exp	2018-06-01 15:29:44.048823172 +0100
+@@ -293,12 +293,14 @@ if { !$can_compile || $failed_compile }
+ 
+ run_ld_link_tests $plugin_tests
+ 
++if { ! [istarget "ppc*-*-*"] } {
+ if { [is_elf_format] \
+      && [ld_compile "$CC $CFLAGS" $srcdir/$subdir/func1p.c tmpdir/func1p.o] \
+      && [ld_compile "$CC $CFLAGS" $srcdir/$subdir/func2i.c tmpdir/func2i.o] \
+      && [ld_compile "$CC $CFLAGS" $srcdir/$subdir/func3h.c tmpdir/func3h.o] } {
+     run_ld_link_tests $plugin_extra_elf_tests
+ }
++}
+ 
+ if {![ar_simple_create $ar "" "tmpdir/libtext.a" "tmpdir/text.o"] || \
+     ![ar_simple_create $ar "" "tmpdir/libempty.a" ""]} {
+--- binutils.orig/ld/testsuite/ld-elf/tls.exp	2018-07-09 09:49:50.488248175 +0100
++++ binutils-2.30.90/ld/testsuite/ld-elf/tls.exp	2018-07-09 10:46:26.449688046 +0100
+@@ -39,7 +39,9 @@ if [istarget "sparc*-*-*"] {
+     append AFLAGS_PIC " -K PIC"
+ }
+ 
+-run_ld_link_tests [list \
++# The s390x system compiler miscompiles these tests.
++if { ! [istarget s390x-*-*] } {
++    run_ld_link_tests [list \
+     [list \
+ 	"Build pr22263-1" \
+ 	"-pie -e _start -z text" \
+@@ -51,3 +53,4 @@ run_ld_link_tests [list \
+ 	"-fPIE -O2" \
+     ] \
+ ]
++}

binutils-gas-input-matches-output.patch

@@ -0,0 +1,37 @@
+--- binutils.orig/gas/as.c	2019-01-30 11:02:04.055574300 +0000
++++ binutils-2.31.1/gas/as.c	2019-01-30 11:03:12.212050935 +0000
+@@ -1254,14 +1254,27 @@ main (int argc, char ** argv)
+ 	{
+ 	  struct stat sib;
+ 
+-	  if (stat (argv[i], &sib) == 0)
++	  /* Check that the input file and output file are different.  */
++	  if (stat (argv[i], &sib) == 0
++	      && sib.st_ino == sob.st_ino
++	      /* POSIX emulating systems may support stat() but if the
++		 underlying file system does not support a file serial number
++		 of some kind then they will return 0 for the inode.  So
++		 two files with an inode of 0 may not actually be the same.
++		 On real POSIX systems no ordinary file will ever have an
++		 inode of 0.  */
++	      && sib.st_ino != 0
++	      /* Different files may have the same inode number if they
++		 reside on different devices, so check the st_dev field as
++		 well.  */
++	      && sib.st_dev == sob.st_dev)
+ 	    {
+-	      if (sib.st_ino == sob.st_ino && sib.st_ino != 0)
+-		{
+-		  /* Don't let as_fatal remove the output file!  */
+-		  out_file_name = NULL;
+-		  as_fatal (_("The input and output files must be distinct"));
+-		}
++	      const char *saved_out_file_name = out_file_name;
++
++	      /* Don't let as_fatal remove the output file!  */
++	      out_file_name = NULL;
++	      as_fatal (_("The input '%s' and output '%s' files are the same"),
++			argv[i], saved_out_file_name);
+ 	    }
+ 	}
+     }

binutils-gcc-10-fixes.patch

@@ -1,180 +0,0 @@
-diff -rup binutils.orig/gold/gdb-index.cc binutils-2.34.0/gold/gdb-index.cc
---- binutils.orig/gold/gdb-index.cc	2020-07-24 09:12:29.241306445 +0100
-+++ binutils-2.34.0/gold/gdb-index.cc	2020-07-24 09:15:48.332095898 +0100
-@@ -817,7 +817,7 @@ Gdb_index_info_reader::get_qualified_nam
- void
- Gdb_index_info_reader::record_cu_ranges(Dwarf_die* die)
- {
--  unsigned int shndx;
-+  unsigned int shndx = 0;
-   unsigned int shndx2;
- 
-   off_t ranges_offset = die->ref_attribute(elfcpp::DW_AT_ranges, &shndx);
-diff -rup binutils.orig/gold/layout.cc binutils-2.34.0/gold/layout.cc
---- binutils.orig/gold/layout.cc	2020-07-24 09:12:29.243306433 +0100
-+++ binutils-2.34.0/gold/layout.cc	2020-07-24 09:15:11.464320064 +0100
-@@ -1986,7 +1986,7 @@ Layout::attach_allocated_section_to_segm
-   seg_flags |= os->extra_segment_flags();
- 
-   // Check for --section-start.
--  uint64_t addr;
-+  uint64_t addr = 0;
-   bool is_address_set = parameters->options().section_start(os->name(), &addr);
- 
-   // In general the only thing we really care about for PT_LOAD
-diff -rup binutils.orig/binutils/dlltool.c binutils-2.34.0/binutils/dlltool.c
---- binutils.orig/binutils/dlltool.c	2020-07-24 09:12:28.974308069 +0100
-+++ binutils-2.34.0/binutils/dlltool.c	2020-07-24 12:09:37.527121295 +0100
-@@ -1305,7 +1305,7 @@ run (const char *what, char *args)
-   int pid, wait_status;
-   int i;
-   const char **argv;
--  char *errmsg_fmt, *errmsg_arg;
-+  char *errmsg_fmt = "", *errmsg_arg = "";
-   char *temp_base = choose_temp_base ();
- 
-   inform (_("run: %s %s"), what, args);
-diff -rup binutils.orig/gas/config/tc-arm.c binutils-2.34.0/gas/config/tc-arm.c
---- binutils.orig/gas/config/tc-arm.c	2020-07-24 09:12:32.368287432 +0100
-+++ binutils-2.34.0/gas/config/tc-arm.c	2020-07-24 12:14:19.842360634 +0100
-@@ -28416,9 +28416,12 @@ md_apply_fix (fixS *	fixP,
- 	 perform relaxation.  */
-       if (value == -2)
- 	{
--	  newval = md_chars_to_number (buf, THUMB_SIZE);
--	  newval = 0xbf00; /* NOP encoding T1 */
--	  md_number_to_chars (buf, newval, THUMB_SIZE);
-+	  if (fixP->fx_done || !seg->use_rela_p)
-+	    {
-+	      newval = md_chars_to_number (buf, THUMB_SIZE);
-+	      newval = 0xbf00; /* NOP encoding T1 */
-+	      md_number_to_chars (buf, newval, THUMB_SIZE);
-+	    }
- 	}
-       else
- 	{
-@@ -28631,17 +28634,14 @@ md_apply_fix (fixS *	fixP,
-     case BFD_RELOC_ARM_GOTFUNCDESC:
-     case BFD_RELOC_ARM_GOTOFFFUNCDESC:
-     case BFD_RELOC_ARM_FUNCDESC:
--      if (arm_fdpic)
--	{
--	  if (fixP->fx_done || !seg->use_rela_p)
--	    md_number_to_chars (buf, 0, 4);
--	}
--      else
-+      if (!arm_fdpic)
- 	{
- 	  as_bad_where (fixP->fx_file, fixP->fx_line,
- 			_("Relocation supported only in FDPIC mode"));
--      }
--      break;
-+	  break;
-+	}
-+      value = 0;
-+      /* Fall through.  */
- #endif
- 
-     case BFD_RELOC_RVA:
-diff -rup binutils.orig/gas/config/tc-arm.c binutils-2.34.0/gas/config/tc-arm.c
---- binutils.orig/gas/config/tc-arm.c	2020-07-24 12:16:02.099719884 +0100
-+++ binutils-2.34.0/gas/config/tc-arm.c	2020-07-24 12:34:17.690858328 +0100
-@@ -28641,7 +28641,7 @@ md_apply_fix (fixS *	fixP,
- 	  break;
- 	}
-       value = 0;
--      /* Fall through.  */
-+      goto fred;
- #endif
- 
-     case BFD_RELOC_RVA:
-@@ -28653,6 +28653,7 @@ md_apply_fix (fixS *	fixP,
- #ifdef TE_PE
-     case BFD_RELOC_32_SECREL:
- #endif
-+    fred:
-       if (fixP->fx_done || !seg->use_rela_p)
- #ifdef TE_WINCE
- 	/* For WinCE we only do this for pcrel fixups.  */
-diff -rup binutils.orig/gas/config/tc-arm.c binutils-2.34.0/gas/config/tc-arm.c
---- binutils.orig/gas/config/tc-arm.c	2020-07-24 13:28:26.926553452 +0100
-+++ binutils-2.34.0/gas/config/tc-arm.c	2020-07-24 13:31:57.835215763 +0100
-@@ -28416,12 +28416,8 @@ md_apply_fix (fixS *	fixP,
- 	 perform relaxation.  */
-       if (value == -2)
- 	{
--	  if (fixP->fx_done || !seg->use_rela_p)
--	    {
--	      newval = md_chars_to_number (buf, THUMB_SIZE);
--	      newval = 0xbf00; /* NOP encoding T1 */
--	      md_number_to_chars (buf, newval, THUMB_SIZE);
--	    }
-+	  newval = 0xbf00; /* NOP encoding T1 */
-+	  goto jim;
- 	}
-       else
- 	{
-@@ -28432,6 +28428,7 @@ md_apply_fix (fixS *	fixP,
- 	    {
- 	      newval = md_chars_to_number (buf, THUMB_SIZE);
- 	      newval |= ((value & 0x3e) << 2) | ((value & 0x40) << 3);
-+	    jim:
- 	      md_number_to_chars (buf, newval, THUMB_SIZE);
- 	    }
- 	}
-diff -rup binutils.orig/binutils/mclex.c binutils-2.34.0/binutils/mclex.c
---- binutils.orig/binutils/mclex.c	2020-07-24 13:28:26.297557441 +0100
-+++ binutils-2.34.0/binutils/mclex.c	2020-07-24 14:46:53.587940149 +0100
-@@ -207,7 +207,7 @@ enum_severity (int e)
- static void
- mc_add_keyword_ascii (const char *sz, int rid, const char *grp, rc_uint_type nv, const char *sv)
- {
--  unichar *usz, *usv = NULL;
-+  unichar *usz = NULL, *usv = NULL;
-   rc_uint_type usz_len;
- 
-   unicode_from_codepage (&usz_len, &usz, sz, CP_ACP);
-diff -rup binutils.orig/binutils/windmc.c binutils-2.34.0/binutils/windmc.c
---- binutils.orig/binutils/windmc.c	2020-07-24 13:28:26.279557556 +0100
-+++ binutils-2.34.0/binutils/windmc.c	2020-07-24 14:48:05.460477478 +0100
-@@ -338,7 +338,7 @@ mc_add_node_lang (mc_node *root, const m
- static char *
- convert_unicode_to_ACP (const unichar *usz)
- {
--  char *s;
-+  char *s = NULL;
-   rc_uint_type l;
- 
-   if (! usz)
-@@ -607,10 +607,10 @@ mc_generate_bin_item (mc_node_lang *n, r
-   else
-     {
-       rc_uint_type txt_len, l;
--      char *cvt_txt;
-+      char *cvt_txt = NULL;
- 
-       codepage_from_unicode( &l, n->message, &cvt_txt, n->lang->lang_info.wincp);
--      if (! cvt_txt)
-+      if (cvt_txt == NULL)
- 	fatal ("Failed to convert message to language codepage.\n");
-       txt_len = strlen (cvt_txt);
-       if (mcset_automatic_null_termination && txt_len > 0)
-@@ -1107,7 +1107,7 @@ main (int argc, char **argv)
- 
-   /* Load the input file and do code page transformations to UTF16.  */
-   {
--    unichar *u;
-+    unichar *u = NULL;
-     rc_uint_type ul;
-     char *buff;
-     bfd_size_type flen;
---- binutils.orig/binutils/srconv.c	2020-07-24 15:37:25.847459208 +0100
-+++ binutils-2.34.0/binutils/srconv.c	2020-07-24 15:39:12.853773423 +0100
-@@ -316,6 +316,7 @@ wr_hd (struct coff_ofile *p)
-   struct IT_hd hd;
- 
-   hd.spare1 = 0;
-+  hd.spare2 = 0;
-   if (bfd_get_file_flags (abfd) & EXEC_P)
-     hd.mt = MTYPE_ABS_LM;
-   else

binutils-gold-discard-version-info.patch

@@ -0,0 +1,35 @@
+diff -rup binutils.orig/gold/options.h binutils-2.31.1/gold/options.h
+--- binutils.orig/gold/options.h	2018-11-28 13:43:45.192094029 +0000
++++ binutils-2.31.1/gold/options.h	2018-11-28 13:44:30.616758345 +0000
+@@ -1358,6 +1358,10 @@ class General_options
+ 	      N_("Warn about duplicate common symbols"),
+ 	      N_("Do not warn about duplicate common symbols"));
+ 
++  DEFINE_bool(warn_drop_version, options::TWO_DASHES, '\0', false,
++             N_("Warn when discarding version information"),
++             N_("Do not warn when discarding version information"));
++
+   DEFINE_bool_ignore(warn_constructors, options::TWO_DASHES, '\0',
+ 		     N_("Ignored"), N_("Ignored"));
+ 
+diff -rup binutils.orig/gold/symtab.cc binutils-2.31.1/gold/symtab.cc
+--- binutils.orig/gold/symtab.cc	2018-11-28 13:43:45.193094021 +0000
++++ binutils-2.31.1/gold/symtab.cc	2018-11-28 13:45:13.479441595 +0000
+@@ -2623,11 +2623,12 @@ Symbol_table::set_dynsym_indexes(unsigne
+ 		versions->record_version(this, dynpool, sym);
+ 	      else
+ 		{
+-		  gold_warning(_("discarding version information for "
+-				 "%s@%s, defined in unused shared library %s "
+-				 "(linked with --as-needed)"),
+-			       sym->name(), sym->version(),
+-			       sym->object()->name().c_str());
++		  if (parameters->options().warn_drop_version())
++		    gold_warning(_("discarding version information for "
++                                  "%s@%s, defined in unused shared library %s "
++                                  "(linked with --as-needed)"),
++                                sym->name(), sym->version(),
++                                sym->object()->name().c_str());
+ 		  sym->clear_version();
+ 		}
+ 	    }

binutils-gold-empty-dwp.patch

@@ -1,11 +0,0 @@
---- binutils.orig/gold/dwp.cc	2023-05-02 13:26:44.075148082 +0100
-+++ binutils-2.40/gold/dwp.cc	2023-05-02 13:27:16.189130127 +0100
-@@ -2418,6 +2418,8 @@ main(int argc, char** argv)
-     {
-       Dwo_file exe_file(exe_filename);
-       exe_file.read_executable(&files);
-+      if (files.empty())
-+        gold_fatal(_("Could not find any dwo links in specified EXE"));
-     }
- 
-   // Add any additional files listed on command line.

binutils-gold-i386-gnu-property-notes.patch

@@ -1,193 +0,0 @@
-diff --git a/gold/i386.cc b/gold/i386.cc
-index bf209fe9a86..31161ff091c 100644
---- a/gold/i386.cc
-+++ b/gold/i386.cc
-@@ -360,7 +360,11 @@ class Target_i386 : public Sized_target<32, false>
-       got_(NULL), plt_(NULL), got_plt_(NULL), got_irelative_(NULL),
-       got_tlsdesc_(NULL), global_offset_table_(NULL), rel_dyn_(NULL),
-       rel_irelative_(NULL), copy_relocs_(elfcpp::R_386_COPY),
--      got_mod_index_offset_(-1U), tls_base_symbol_defined_(false)
-+      got_mod_index_offset_(-1U), tls_base_symbol_defined_(false),
-+      isa_1_used_(0), isa_1_needed_(0),
-+      feature_1_(0), feature_2_used_(0), feature_2_needed_(0),
-+      object_isa_1_used_(0), object_feature_1_(0),
-+      object_feature_2_used_(0), seen_first_object_(false)
-   { }
- 
-   // Process the relocations to determine unreferenced sections for
-@@ -859,6 +863,21 @@ class Target_i386 : public Sized_target<32, false>
- 				  this->rel_dyn_section(layout));
-   }
- 
-+  // Record a target-specific program property in the .note.gnu.property
-+  // section.
-+  void
-+  record_gnu_property(unsigned int, unsigned int, size_t,
-+		      const unsigned char*, const Object*);
-+
-+  // Merge the target-specific program properties from the current object.
-+  void
-+  merge_gnu_properties(const Object*);
-+
-+  // Finalize the target-specific program properties and add them back to
-+  // the layout.
-+  void
-+  do_finalize_gnu_properties(Layout*) const;
-+
-   // Information about this specific target which we pass to the
-   // general Target structure.
-   static const Target::Target_info i386_info;
-@@ -898,6 +917,26 @@ class Target_i386 : public Sized_target<32, false>
-   unsigned int got_mod_index_offset_;
-   // True if the _TLS_MODULE_BASE_ symbol has been defined.
-   bool tls_base_symbol_defined_;
-+
-+  // Target-specific program properties, from .note.gnu.property section.
-+  // Each bit represents a specific feature.
-+  uint32_t isa_1_used_;
-+  uint32_t isa_1_needed_;
-+  uint32_t feature_1_;
-+  uint32_t feature_2_used_;
-+  uint32_t feature_2_needed_;
-+  // Target-specific properties from the current object.
-+  // These bits get ORed into ISA_1_USED_ after all properties for the object
-+  // have been processed. But if either is all zeroes (as when the property
-+  // is absent from an object), the result should be all zeroes.
-+  // (See PR ld/23486.)
-+  uint32_t object_isa_1_used_;
-+  // These bits get ANDed into FEATURE_1_ after all properties for the object
-+  // have been processed.
-+  uint32_t object_feature_1_;
-+  uint32_t object_feature_2_used_;
-+  // Whether we have seen our first object, for use in initializing FEATURE_1_.
-+  bool seen_first_object_;
- };
- 
- const Target::Target_info Target_i386::i386_info =
-@@ -1042,6 +1081,126 @@ Target_i386::rel_irelative_section(Layout* layout)
-   return this->rel_irelative_;
- }
- 
-+// Record a target-specific program property from the .note.gnu.property
-+// section.
-+void
-+Target_i386::record_gnu_property(
-+    unsigned int, unsigned int pr_type,
-+    size_t pr_datasz, const unsigned char* pr_data,
-+    const Object* object)
-+{
-+  uint32_t val = 0;
-+
-+  switch (pr_type)
-+    {
-+    case elfcpp::GNU_PROPERTY_X86_COMPAT_ISA_1_USED:
-+    case elfcpp::GNU_PROPERTY_X86_COMPAT_ISA_1_NEEDED:
-+    case elfcpp::GNU_PROPERTY_X86_COMPAT_2_ISA_1_USED:
-+    case elfcpp::GNU_PROPERTY_X86_COMPAT_2_ISA_1_NEEDED:
-+    case elfcpp::GNU_PROPERTY_X86_ISA_1_USED:
-+    case elfcpp::GNU_PROPERTY_X86_ISA_1_NEEDED:
-+    case elfcpp::GNU_PROPERTY_X86_FEATURE_1_AND:
-+    case elfcpp::GNU_PROPERTY_X86_FEATURE_2_USED:
-+    case elfcpp::GNU_PROPERTY_X86_FEATURE_2_NEEDED:
-+      if (pr_datasz != 4)
-+	{
-+	  gold_warning(_("%s: corrupt .note.gnu.property section "
-+			 "(pr_datasz for property %d is not 4)"),
-+		       object->name().c_str(), pr_type);
-+	  return;
-+	}
-+      val = elfcpp::Swap<32, false>::readval(pr_data);
-+      break;
-+    default:
-+      gold_warning(_("%s: unknown program property type 0x%x "
-+		     "in .note.gnu.property section"),
-+		   object->name().c_str(), pr_type);
-+      break;
-+    }
-+
-+  switch (pr_type)
-+    {
-+    case elfcpp::GNU_PROPERTY_X86_ISA_1_USED:
-+      this->object_isa_1_used_ |= val;
-+      break;
-+    case elfcpp::GNU_PROPERTY_X86_ISA_1_NEEDED:
-+      this->isa_1_needed_ |= val;
-+      break;
-+    case elfcpp::GNU_PROPERTY_X86_FEATURE_1_AND:
-+      // If we see multiple feature props in one object, OR them together.
-+      this->object_feature_1_ |= val;
-+      break;
-+    case elfcpp::GNU_PROPERTY_X86_FEATURE_2_USED:
-+      this->object_feature_2_used_ |= val;
-+      break;
-+    case elfcpp::GNU_PROPERTY_X86_FEATURE_2_NEEDED:
-+      this->feature_2_needed_ |= val;
-+      break;
-+    }
-+}
-+
-+// Merge the target-specific program properties from the current object.
-+void
-+Target_i386::merge_gnu_properties(const Object*)
-+{
-+  if (this->seen_first_object_)
-+    {
-+      // If any object is missing the ISA_1_USED property, we must omit
-+      // it from the output file.
-+      if (this->object_isa_1_used_ == 0)
-+	this->isa_1_used_ = 0;
-+      else if (this->isa_1_used_ != 0)
-+	this->isa_1_used_ |= this->object_isa_1_used_;
-+      this->feature_1_ &= this->object_feature_1_;
-+      // If any object is missing the FEATURE_2_USED property, we must
-+      // omit it from the output file.
-+      if (this->object_feature_2_used_ == 0)
-+	this->feature_2_used_ = 0;
-+      else if (this->feature_2_used_ != 0)
-+	this->feature_2_used_ |= this->object_feature_2_used_;
-+    }
-+  else
-+    {
-+      this->isa_1_used_ = this->object_isa_1_used_;
-+      this->feature_1_ = this->object_feature_1_;
-+      this->feature_2_used_ = this->object_feature_2_used_;
-+      this->seen_first_object_ = true;
-+    }
-+  this->object_isa_1_used_ = 0;
-+  this->object_feature_1_ = 0;
-+  this->object_feature_2_used_ = 0;
-+}
-+
-+static inline void
-+add_property(Layout* layout, unsigned int pr_type, uint32_t val)
-+{
-+  unsigned char buf[4];
-+  elfcpp::Swap<32, false>::writeval(buf, val);
-+  layout->add_gnu_property(elfcpp::NT_GNU_PROPERTY_TYPE_0, pr_type, 4, buf);
-+}
-+
-+// Finalize the target-specific program properties and add them back to
-+// the layout.
-+void
-+Target_i386::do_finalize_gnu_properties(Layout* layout) const
-+{
-+  if (this->isa_1_used_ != 0)
-+    add_property(layout, elfcpp::GNU_PROPERTY_X86_ISA_1_USED,
-+		 this->isa_1_used_);
-+  if (this->isa_1_needed_ != 0)
-+    add_property(layout, elfcpp::GNU_PROPERTY_X86_ISA_1_NEEDED,
-+		 this->isa_1_needed_);
-+  if (this->feature_1_ != 0)
-+    add_property(layout, elfcpp::GNU_PROPERTY_X86_FEATURE_1_AND,
-+		 this->feature_1_);
-+  if (this->feature_2_used_ != 0)
-+    add_property(layout, elfcpp::GNU_PROPERTY_X86_FEATURE_2_USED,
-+		 this->feature_2_used_);
-+  if (this->feature_2_needed_ != 0)
-+    add_property(layout, elfcpp::GNU_PROPERTY_X86_FEATURE_2_NEEDED,
-+		 this->feature_2_needed_);
-+}
-+
- // Write the first three reserved words of the .got.plt section.
- // The remainder of the section is written while writing the PLT
- // in Output_data_plt_i386::do_write.

binutils-gold-ignore-discarded-note-relocs.patch

@@ -0,0 +1,10 @@
+--- binutils.orig/gold/target-reloc.h	2018-07-12 11:37:24.894494658 +0100
++++ binutils-2.30.90/gold/target-reloc.h	2018-07-12 15:38:50.049083904 +0100
+@@ -136,6 +136,7 @@ class Default_comdat_behavior
+     if (Layout::is_debug_info_section(name))
+       return CB_PRETEND;
+     if (strcmp(name, ".eh_frame") == 0
++	|| strncmp(name, ".gnu.build.attributes", 21) == 0 	// FIXME: We should really be checking the section type for ST_NOTE...
+ 	|| strcmp(name, ".gcc_except_table") == 0)
+       return CB_IGNORE;
+     return CB_ERROR;

binutils-gold-ignore-execstack-error.patch

@@ -1,16 +0,0 @@
-diff -rup binutils.orig/gold/options.h binutils-2.41/gold/options.h
---- binutils.orig/gold/options.h	2024-01-04 09:52:09.282002253 +0000
-+++ binutils-2.41/gold/options.h	2024-01-04 09:52:51.890972630 +0000
-@@ -855,6 +855,12 @@ class General_options
- 	      N_("(ARM only) Do not warn about objects with incompatible "
- 		 "enum sizes"));
- 
-+  DEFINE_bool_ignore(error_execstack, options::TWO_DASHES, '\0',
-+		     N_("Ignored"), N_("Ignored"));
-+
-+  DEFINE_bool_ignore(error_rwx_segments, options::TWO_DASHES, '\0',
-+		     N_("Ignored"), N_("Ignored"));
-+
-   DEFINE_special(exclude_libs, options::TWO_DASHES, '\0',
- 		 N_("Exclude libraries from automatic export"),
- 		 N_(("lib,lib ...")));

binutils-gold-mismatched-section-flags.patch

@@ -1,19 +0,0 @@
-diff -rup binutils.orig/gold/layout.cc binutils-2.32/gold/layout.cc
---- binutils.orig/gold/layout.cc	2019-06-24 14:37:36.013086899 +0100
-+++ binutils-2.32/gold/layout.cc	2019-06-24 14:41:40.054517479 +0100
-@@ -868,6 +868,7 @@ Layout::get_output_section(const char* n
- 		  && (same_name->flags() & elfcpp::SHF_TLS) == 0)
- 		os = same_name;
- 	    }
-+#if 0 /* BZ 1722715, PR 17556.  */
- 	  else if ((flags & elfcpp::SHF_TLS) == 0)
- 	    {
- 	      elfcpp::Elf_Xword zero_flags = 0;
-@@ -878,6 +879,7 @@ Layout::get_output_section(const char* n
- 	      if (p != this->section_name_map_.end())
- 		os = p->second;
- 	    }
-+#endif
- 	}
- 
-       if (os == NULL)

binutils-gold-pack-relative-relocs.patch

@@ -1,27 +0,0 @@
-diff --git a/gold/options.cc b/gold/options.cc
-index c9834b66159..91d7802fffe 100644
---- a/gold/options.cc
-+++ b/gold/options.cc
-@@ -989,7 +989,7 @@ parse_short_option(int argc, const char** argv, int pos_in_argv_i,
-     }
- 
-   // If we're a -z option, we need to parse our argument as a
--  // long-option, e.g. "-z stacksize=8192".
-+  // long-option, e.g. "-z stack-size=8192".
-   if (retval == &dash_z)
-     {
-       int dummy_i = 0;
-diff --git a/gold/options.h b/gold/options.h
-index 46f658f23ea..d16e38066da 100644
---- a/gold/options.h
-+++ b/gold/options.h
-@@ -1110,6 +1110,9 @@ class General_options
- 			 N_("Generate package metadata note"),
- 			 N_("[=JSON]"));
- 
-+  DEFINE_bool_ignore(pack_relative_relocs, options::DASH_Z, '\0',
-+		     N_("Ignored"), N_("Ignored"));
-+
-   DEFINE_bool(pie, options::ONE_DASH, '\0', false,
- 	      N_("Create a position independent executable"),
- 	      N_("Do not create a position independent executable"));

binutils-gold-s390-configure.patch

@@ -1,40 +0,0 @@
-# The gold linker does not build if the target list includes s390x-linux
-# but does not include s390-linux.  ie it needs the 32-bit target to be
-# enabled in order for the 64-bit target to work.  On the other hand the
-# BFD library does not support the 32-bit s390 target.  So this patch
-# "enhances" the gold configure script so that if s390x is listed, the
-# s390 target will automatically be added to the list as well.
-
-diff -upr orig/gold/configure binutils-2.47/gold/configure
---- orig/gold/configure	2026-07-27 09:38:54.907192013 +0100
-+++ binutils-2.47/gold/configure	2026-07-27 10:12:02.759629540 +0100
-@@ -5223,7 +5223,12 @@ if test -n "$enable_targets"; then
-   for targ in `echo $enable_targets | sed -e 's/,/ /g'`; do
-     result=`$ac_config_sub $targ 2>/dev/null`
-     if test -n "$result"; then
--      canon_targets="$canon_targets $result"
-+      canon_targets="$canon_targets $result" ;
-+      case "$result" in
-+      s390x-*)
-+            canon_targets="$canon_targets s390-gnu-linux"
-+	    ;;
-+      esac
-     else
-       # Permit unrecognized target names, like "all".
-       canon_targets="$canon_targets $targ"
-diff -upr orig/gold/configure.ac binutils-2.47/gold/configure.ac
---- orig/gold/configure.ac	2026-07-27 09:38:54.907192013 +0100
-+++ binutils-2.47/gold/configure.ac	2026-07-27 10:18:18.480766140 +0100
-@@ -133,6 +133,12 @@ if test -n "$enable_targets"; then
-     result=`$ac_config_sub $targ 2>/dev/null`
-     if test -n "$result"; then
-       canon_targets="$canon_targets $result"
-+      # Hack: Enable the s390-linux target if s390x-linux is enabled.
-+      case "$result" in
-+      s390x-*)
-+            canon_targets="$canon_targets s390-gnu-linux"
-+	    ;;
-+      esac
-     else
-       # Permit unrecognized target names, like "all".
-       canon_targets="$canon_targets $targ"

binutils-gold-warn-unsupported.patch

@@ -1,48 +0,0 @@
-Only in binutils-2.34/gold: autom4te.cache
-diff -rup binutils.orig/gold/configure binutils-2.34/gold/configure
---- binutils.orig/gold/configure	2020-04-20 12:35:13.048297305 +0100
-+++ binutils-2.34/gold/configure	2020-04-20 14:02:06.743725696 +0100
-@@ -5180,7 +5180,8 @@ for targ in $target $canon_targets; do
-     . ${srcdir}/configure.tgt
- 
-     if test "$targ_obj" = "UNKNOWN"; then
--      as_fn_error $? "\"unsupported target $targ\"" "$LINENO" 5
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"unsupported target $targ\"" >&5
-+$as_echo "$as_me: WARNING: \"unsupported target $targ\"" >&2;}
-     else
-       targetobjs="$targetobjs ${targ_obj}.\$(OBJEXT)"
-       if test "$targ_extra_obj" != ""; then
-diff -rup binutils.orig/gold/configure.ac binutils-2.34/gold/configure.ac
---- binutils.orig/gold/configure.ac	2020-04-20 12:35:13.050297291 +0100
-+++ binutils-2.34/gold/configure.ac	2020-04-20 14:01:46.435868770 +0100
-@@ -181,7 +181,7 @@ for targ in $target $canon_targets; do
-     . ${srcdir}/configure.tgt
- 
-     if test "$targ_obj" = "UNKNOWN"; then
--      AC_MSG_ERROR("unsupported target $targ")
-+      AC_MSG_WARN("unsupported target $targ")
-     else
-       targetobjs="$targetobjs ${targ_obj}.\$(OBJEXT)"
-       if test "$targ_extra_obj" != ""; then
---- binutils.orig/bfd/config.bfd	2020-04-20 12:35:13.038297375 +0100
-+++ binutils-2.34/bfd/config.bfd	2020-04-20 14:25:26.452869193 +0100
-@@ -473,7 +473,7 @@ case "${targ}" in
-     ;;
- 
- #ifdef BFD64
--  bpf-*-none)
-+  bpf-*-none | bpf-*)
-     targ_defvec=bpf_elf64_le_vec
-     targ_selvecs=bpf_elf64_be_vec
-     targ_underscore=yes
---- binutils.orig/ld/configure.tgt	2026-01-05 08:51:02.908224792 +0000
-+++ binutils-with-gold-2.45.50-be970c68891/ld/configure.tgt	2026-01-05 08:51:55.852677409 +0000
-@@ -255,7 +255,7 @@ bfin-*-uclinux*)	targ_emul=elf32bfin;
- bfin-*-linux-uclibc*)	targ_emul=elf32bfinfd;
- 			targ_extra_libpath=elf32bfin
- 			;;
--bpf-*-*)		targ_emul=elf64bpf
-+bpf-* | bpf-*-*)	targ_emul=elf64bpf
- 			;;
- cr16-*-elf*)		targ_emul=elf32cr16
- 			;;

binutils-ld-default-z-text.patch

@@ -1,52 +0,0 @@
-diff -rup binutils.orig/bfd/elflink.c binutils-with-gold-2.45.50-be970c68891/bfd/elflink.c
---- binutils.orig/bfd/elflink.c	2026-01-14 09:21:14.835847967 +0000
-+++ binutils-with-gold-2.45.50-be970c68891/bfd/elflink.c	2026-01-14 09:23:48.780495205 +0000
-@@ -13786,7 +13786,7 @@ _bfd_elf_final_link (bfd *abfd, struct b
- 		{
- 		  if (info->textrel_check == textrel_check_error)
- 		    info->callbacks->einfo
--		      (_("%P%X: read-only segment has dynamic relocations\n"));
-+		      (_("%P%X: error: read-only segment has dynamic relocations\n"));
- 		  else if (bfd_link_dll (info))
- 		    info->callbacks->einfo
- 		      (_("%P: warning: creating DT_TEXTREL in a shared object\n"));
-diff -rup binutils.orig/ld/testsuite/ld-aarch64/dt-memtag-mode.d binutils-with-gold-2.45.50-be970c68891/ld/testsuite/ld-aarch64/dt-memtag-mode.d
---- binutils.orig/ld/testsuite/ld-aarch64/dt-memtag-mode.d	2026-01-14 09:21:15.248851537 +0000
-+++ binutils-with-gold-2.45.50-be970c68891/ld/testsuite/ld-aarch64/dt-memtag-mode.d	2026-01-14 09:22:24.603416270 +0000
-@@ -1,5 +1,5 @@
- #source: dt-memtag.s
--#ld: -shared -z memtag-mode=async
-+#ld: -shared -z memtag-mode=async -z notext
- #readelf: -d
- 
- #...
-diff -rup binutils.orig/ld/testsuite/ld-aarch64/dt-memtag-stack.d binutils-with-gold-2.45.50-be970c68891/ld/testsuite/ld-aarch64/dt-memtag-stack.d
---- binutils.orig/ld/testsuite/ld-aarch64/dt-memtag-stack.d	2026-01-14 09:21:15.248851537 +0000
-+++ binutils-with-gold-2.45.50-be970c68891/ld/testsuite/ld-aarch64/dt-memtag-stack.d	2026-01-14 09:24:19.594780414 +0000
-@@ -1,5 +1,5 @@
- #source: dt-memtag.s
--#ld: -shared -z memtag-stack
-+#ld: -shared -z memtag-stack -z notext
- #readelf: -d
- 
- #...
-diff -rup binutils.orig/ld/testsuite/ld-aarch64/relr-text-pie.d binutils-with-gold-2.45.50-be970c68891/ld/testsuite/ld-aarch64/relr-text-pie.d
---- binutils.orig/ld/testsuite/ld-aarch64/relr-text-pie.d	2026-01-14 09:21:15.246851520 +0000
-+++ binutils-with-gold-2.45.50-be970c68891/ld/testsuite/ld-aarch64/relr-text-pie.d	2026-01-14 09:24:45.363485698 +0000
-@@ -1,5 +1,5 @@
- #source: relr-text.s
--#ld: -pie -z pack-relative-relocs -T relocs.ld
-+#ld: -pie -z pack-relative-relocs -T relocs.ld -z notext
- #readelf: -drW
- 
- #...
-diff -rup binutils.orig/ld/testsuite/ld-aarch64/relr-text-shared.d binutils-with-gold-2.45.50-be970c68891/ld/testsuite/ld-aarch64/relr-text-shared.d
---- binutils.orig/ld/testsuite/ld-aarch64/relr-text-shared.d	2026-01-14 09:21:15.246851520 +0000
-+++ binutils-with-gold-2.45.50-be970c68891/ld/testsuite/ld-aarch64/relr-text-shared.d	2026-01-14 09:25:06.651664713 +0000
-@@ -1,5 +1,5 @@
- #source: relr-text.s
--#ld: -shared -z pack-relative-relocs -T relocs.ld
-+#ld: -shared -z pack-relative-relocs -T relocs.ld -z notext
- #readelf: -drW
- 
- #...

binutils-libtool-no-rpath.patch

@@ -1,28 +0,0 @@
-diff -rup binutils.orig/ltmain.sh binutils-2.37/ltmain.sh
---- binutils.orig/ltmain.sh	2022-01-27 16:23:09.304207432 +0000
-+++ binutils-2.37/ltmain.sh	2022-01-27 16:23:18.380143759 +0000
-@@ -7103,6 +7103,7 @@ EOF
- 	  rpath="$finalize_rpath"
- 	  test "$mode" != relink && rpath="$compile_rpath$rpath"
- 	  for libdir in $rpath; do
-+	    case "$libdir" in /usr/lib|/usr/lib64|/usr/lib/../lib|/usr/lib/../lib64) continue;; esac
- 	    if test -n "$hardcode_libdir_flag_spec"; then
- 	      if test -n "$hardcode_libdir_separator"; then
- 		if test -z "$hardcode_libdirs"; then
-@@ -7798,6 +7799,7 @@ EOF
-       rpath=
-       hardcode_libdirs=
-       for libdir in $compile_rpath $finalize_rpath; do
-+	case "$libdir" in /usr/lib|/usr/lib64|/usr/lib/../lib|/usr/lib/../lib64) continue;; esac
- 	if test -n "$hardcode_libdir_flag_spec"; then
- 	  if test -n "$hardcode_libdir_separator"; then
- 	    if test -z "$hardcode_libdirs"; then
-@@ -7849,6 +7851,7 @@ EOF
-       rpath=
-       hardcode_libdirs=
-       for libdir in $finalize_rpath; do
-+	case "$libdir" in /usr/lib|/usr/lib64|/usr/lib/../lib|/usr/lib/../lib64) continue;; esac
- 	if test -n "$hardcode_libdir_flag_spec"; then
- 	  if test -n "$hardcode_libdir_separator"; then
- 	    if test -z "$hardcode_libdirs"; then
-Only in binutils-2.37: ltmain.sh.orig

binutils-merge-attribute-sections.patch

@@ -0,0 +1,23 @@
+diff -rup binutils.orig/gold/layout.cc binutils-2.31.1/gold/layout.cc
+--- binutils.orig/gold/layout.cc	2018-07-27 11:49:15.188939352 +0100
++++ binutils-2.31.1/gold/layout.cc	2018-07-27 11:50:03.984405949 +0100
+@@ -5429,6 +5429,7 @@ const Layout::Section_name_mapping Layou
+   MAPPING_INIT(".gnu.linkonce.armextab.", ".ARM.extab"),
+   MAPPING_INIT(".ARM.exidx", ".ARM.exidx"),
+   MAPPING_INIT(".gnu.linkonce.armexidx.", ".ARM.exidx"),
++  MAPPING_INIT(".gnu.build.attributes.", ".gnu.build.attributes"),
+ };
+ 
+ // Mapping for ".text" section prefixes with -z,keep-text-section-prefix.
+diff -rup binutils.orig/ld/scripttempl/elf.sc binutils-2.31.1/ld/scripttempl/elf.sc
+--- binutils.orig/ld/scripttempl/elf.sc	2018-07-30 10:48:58.409509857 +0100
++++ binutils-2.31.1/ld/scripttempl/elf.sc	2018-07-30 10:49:09.267393364 +0100
+@@ -692,6 +692,8 @@ cat <<EOF
+ 
+   .comment       0 : { *(.comment) }
+ 
++  .gnu.build.attributes : { *(.gnu.build.attributes .gnu.build.attributes.*) }
++
+ EOF
+ 
+ . $srcdir/scripttempl/DWARF.sc

binutils-note-merge-improvements.patch

@@ -0,0 +1,61 @@
+--- binutils.orig/binutils/objcopy.c	2018-08-06 09:11:02.053503486 +0100
++++ binutils-2.30/binutils/objcopy.c	2018-08-06 09:11:23.296329566 +0100
+@@ -2174,7 +2174,7 @@ merge_gnu_build_notes (bfd * abfd, asect
+      3. Eliminate any NT_GNU_BUILD_ATTRIBUTE_OPEN notes that have the same
+         full name field as the immediately preceeding note with the same type
+ 	of name and whose address ranges coincide.
+-	IE - it there are gaps in the coverage of the notes, then these gaps
++	IE - if there are gaps in the coverage of the notes, then these gaps
+ 	must be preserved.
+      4. Combine the numeric value of any NT_GNU_BUILD_ATTRIBUTE_OPEN notes
+         of type GNU_BUILD_ATTRIBUTE_STACK_SIZE.
+@@ -2182,16 +2182,47 @@ merge_gnu_build_notes (bfd * abfd, asect
+         its description field is empty then the nearest preceeding OPEN note
+ 	with a non-empty description field must also be preserved *OR* the
+ 	description field of the note must be changed to contain the starting
+-	address to which it refers.  */
++	address to which it refers.
++     6. Notes with the same start and end address can be deleted.  */
+   for (pnote = pnotes + 1; pnote < pnotes_end; pnote ++)
+     {
+       int                      note_type;
+       objcopy_internal_note *  back;
+       objcopy_internal_note *  prev_open_with_range = NULL;
+ 
++      /* Rule 6 - delete 0-range notes.  */
++      if (pnote->start == pnote->end)
++	{
++	  duplicate_found = TRUE;
++	  pnote->note.type = 0;
++	  continue;
++	}
++
+       /* Rule 2 - preserve function notes.  */
+       if (! is_open_note (pnote))
+-	continue;
++	{
++	  int iter;
++
++	  /* Check to see if there is an identical previous function note.
++	     This can happen with overlays for example.  */
++	  for (iter = 0, back = pnote -1; back >= pnotes; back --)
++	    {
++	      if (back->start == pnote->start
++		  && back->end == pnote->end
++		  && back->note.namesz == pnote->note.namesz
++		  && memcmp (back->note.namedata, pnote->note.namedata, pnote->note.namesz) == 0)
++		{
++		  duplicate_found = TRUE;
++		  pnote->note.type = 0;
++		  break;
++		}
++
++	      /* Don't scan too far back however.  */
++	      if (iter ++ > 16)
++		break;
++	    }
++	  continue;
++	}
+ 
+       note_type = pnote->note.namedata[attribute_type_byte];
+ 

binutils-ppc64-local-ifunc-relocs.patch

@@ -0,0 +1,12 @@
+--- binutils.orig/bfd/elf64-ppc.c	2019-02-20 10:58:09.700552616 +0000
++++ binutils-2.31.1/bfd/elf64-ppc.c	2019-02-20 10:59:15.989062349 +0000
+@@ -13530,7 +13530,8 @@ write_plt_relocs_for_local_syms (struct
+ 		}
+ 
+ 	      val = sym->st_value + ent->addend;
+-	      val += PPC64_LOCAL_ENTRY_OFFSET (sym->st_other);
++	      if (ELF_ST_TYPE (sym->st_info) != STT_GNU_IFUNC)
++		val += PPC64_LOCAL_ENTRY_OFFSET (sym->st_other);
+ 	      if (sym_sec != NULL && sym_sec->output_section != NULL)
+ 		val += sym_sec->output_offset + sym_sec->output_section->vma;
+ 

binutils-readelf-other-sym-info.patch

@@ -0,0 +1,66 @@
+diff -rup binutils.orig/binutils/readelf.c binutils-2.29/binutils/readelf.c
+--- binutils.orig/binutils/readelf.c	2017-12-12 16:24:19.571221194 +0000
++++ binutils-2.29/binutils/readelf.c	2017-12-12 16:27:26.997979803 +0000
+@@ -11018,12 +11018,14 @@ print_dynamic_symbol (bfd_vma si, unsign
+       unsigned int vis = ELF_ST_VISIBILITY (psym->st_other);
+ 
+       printf (" %-7s",  get_symbol_visibility (vis));
++#if 0
+       /* Check to see if any other bits in the st_other field are set.
+ 	 Note - displaying this information disrupts the layout of the
+ 	 table being generated, but for the moment this case is very
+ 	 rare.  */
+       if (psym->st_other ^ vis)
+ 	printf (" [%s] ", get_symbol_other (filedata, psym->st_other ^ vis));
++#endif
+     }
+ 
+   printf (" %3.3s ", get_symbol_index_type (filedata, psym->st_shndx));
+@@ -11031,6 +11033,15 @@ print_dynamic_symbol (bfd_vma si, unsign
+     print_symbol (25, GET_DYNAMIC_NAME (psym->st_name));
+   else
+     printf (_(" <corrupt: %14ld>"), psym->st_name);
++#if 1
++    {
++      unsigned int vis = ELF_ST_VISIBILITY (psym->st_other);
++
++      /* Check to see if any other bits in the st_other field are set.  */
++      if (psym->st_other ^ vis)
++	printf (" \t[%s]", get_symbol_other (filedata, psym->st_other ^ vis));
++    }
++#endif
+   putchar ('\n');
+ }
+ 
+--- binutils.orig/binutils/readelf.c	2017-12-12 16:36:21.806561149 +0000
++++ binutils-2.29.1/binutils/readelf.c	2017-12-12 16:38:17.763168514 +0000
+@@ -11548,11 +11548,13 @@ process_symbol_table (FILE * file)
+ 		  unsigned int vis = ELF_ST_VISIBILITY (psym->st_other);
+ 
+ 		  printf (" %-7s", get_symbol_visibility (vis));
++#if 0
+ 		  /* Check to see if any other bits in the st_other field are set.
+ 		     Note - displaying this information disrupts the layout of the
+ 		     table being generated, but for the moment this case is very rare.  */
+ 		  if (psym->st_other ^ vis)
+ 		    printf (" [%s] ", get_symbol_other (filedata, psym->st_other ^ vis));
++#endif
+ 		}
+ 	      printf (" %4s ", get_symbol_index_type (filedata, psym->st_shndx));
+ 	      print_symbol (25, psym->st_name < strtab_size
+@@ -11571,7 +11573,15 @@ process_symbol_table (FILE * file)
+ 		    printf (sym_info == symbol_hidden ? "@%s" : "@@%s",
+ 			    version_string);
+ 		}
++#if 1
++		{
++		  unsigned int vis = ELF_ST_VISIBILITY (psym->st_other);
+ 
++		  /* Check to see if any other bits in the st_other field are set.  */
++		  if (psym->st_other ^ vis)
++		    printf (" \t[%s] ", get_symbol_other (filedata, psym->st_other ^ vis));
++		}
++#endif
+ 	      putchar ('\n');
+ 
+ 	      if (ELF_ST_BIND (psym->st_info) == STB_LOCAL

binutils-remove-ld-protected-func-2-test.patch

@@ -1,33 +0,0 @@
-diff -rup binutils.orig/ld/testsuite/ld-x86-64/x86-64.exp binutils-with-gold-2.45.50-96b8a8a633a/ld/testsuite/ld-x86-64/x86-64.exp
---- binutils.orig/ld/testsuite/ld-x86-64/x86-64.exp	2025-11-20 12:02:23.738336155 +0000
-+++ binutils-with-gold-2.45.50-96b8a8a633a/ld/testsuite/ld-x86-64/x86-64.exp	2025-11-20 12:03:17.894485264 +0000
-@@ -1413,14 +1413,6 @@ if { [isnative] && [check_compiler_avail
- 	    "libprotected-func-2b.so" \
- 	] \
- 	[list \
--	    "Build protected-func-2 without PIE" \
--	    "$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/libprotected-func-2b.so" \
--	    "$DIRECT_EXTERN_ACCESS_CFLAGS $NOPIE_CFLAGS -Wa,-mx86-used-note=yes" \
--	    { protected-func-1b.c } \
--	    {} \
--	    "protected-func-2" \
--	] \
--	[list \
- 	    "Build libprotected-func-2c.so" \
- 	    "-shared" \
- 	    "-fPIC -Wa,-mx86-used-note=yes" \
-@@ -1429,14 +1421,6 @@ if { [isnative] && [check_compiler_avail
- 	    "libprotected-func-2c.so" \
- 	] \
- 	[list \
--	    "Build protected-func-2a without PIE" \
--	    "$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/libprotected-func-2c.so" \
--	    "$DIRECT_EXTERN_ACCESS_CFLAGS $NOPIE_CFLAGS -Wa,-mx86-used-note=yes" \
--	    { protected-func-1b.c } \
--	    {} \
--	    "protected-func-2a" \
--	] \
--	[list \
- 	    "Build libprotected-data-1a.so" \
- 	    "-shared -z noindirect-extern-access" \
- 	    "-fPIC -Wa,-mx86-used-note=yes" \

binutils-riscv-testsuite-fixes.patch

@@ -1,269 +0,0 @@
-diff -rup binutils.orig/ld/testsuite/ld-riscv-elf/attr-phdr.d binutils-2.40/ld/testsuite/ld-riscv-elf/attr-phdr.d
---- binutils.orig/ld/testsuite/ld-riscv-elf/attr-phdr.d	2023-02-16 10:11:38.656875289 +0000
-+++ binutils-2.40/ld/testsuite/ld-riscv-elf/attr-phdr.d	2023-02-16 10:49:26.786573665 +0000
-@@ -12,8 +12,8 @@ Program Headers:
-   Type           Offset   VirtAddr   PhysAddr   FileSiz MemSiz  Flg Align
-   RISCV_ATTRIBUT .*
-   LOAD           .*
--
-+#...
-  Section to Segment mapping:
-   Segment Sections...
-    00     .riscv.attributes 
--   01     .text 
-+#pass
-diff -rup binutils.orig/ld/testsuite/ld-riscv-elf/pcgp-relax-01.d binutils-2.40/ld/testsuite/ld-riscv-elf/pcgp-relax-01.d
---- binutils.orig/ld/testsuite/ld-riscv-elf/pcgp-relax-01.d	2023-02-16 10:11:38.659875285 +0000
-+++ binutils-2.40/ld/testsuite/ld-riscv-elf/pcgp-relax-01.d	2023-02-16 10:42:54.803431287 +0000
-@@ -8,7 +8,7 @@
- Disassembly of section \.text:
- 
- 0+[0-9a-f]+ <_start>:
--.*:[ 	]+[0-9a-f]+[ 	]+addi[ 	]+a0,a0,[0-9]+
-+.*:[ 	]+[0-9a-f]+[ 	]+addi[ 	]+a0,a0,\-[0-9]+
- .*:[ 	]+[0-9a-f]+[ 	]+jal[ 	]+ra,[0-9a-f]+ <_start>
- .*:[ 	]+[0-9a-f]+[ 	]+addi[ 	]+a1,gp,\-[0-9]+ # [0-9a-f]+ <data_g>
- .*:[ 	]+[0-9a-f]+[ 	]+addi[ 	]+a2,gp,\-[0-9]+ # [0-9a-f]+ <data_g>
-diff -rup binutils.orig/ld/testsuite/ld-riscv-elf/pcgp-relax-02.d binutils-2.40/ld/testsuite/ld-riscv-elf/pcgp-relax-02.d
---- binutils.orig/ld/testsuite/ld-riscv-elf/pcgp-relax-02.d	2023-02-16 10:11:38.659875285 +0000
-+++ binutils-2.40/ld/testsuite/ld-riscv-elf/pcgp-relax-02.d	2023-02-16 10:43:49.540306593 +0000
-@@ -11,5 +11,5 @@ Disassembly of section .text:
- [0-9a-f]+ <_start>:
- .*:[ 	]+[0-9a-f]+[ 	]+auipc[ 	]+a1.*
- .*:[ 	]+[0-9a-f]+[ 	]+addi[ 	]+a0,gp.*<data_a>
--.*:[ 	]+[0-9a-f]+[ 	]+addi[ 	]+a1,a1.*<data_b>
-+.*:[ 	]+[0-9a-f]+[ 	]+mv[ 	]+a1,a1
- #pass
-diff -rup binutils.orig/ld/testsuite/ld-riscv-elf/pcrel-lo-addend-2a.d binutils-2.40/ld/testsuite/ld-riscv-elf/pcrel-lo-addend-2a.d
---- binutils.orig/ld/testsuite/ld-riscv-elf/pcrel-lo-addend-2a.d	2023-02-16 10:11:38.659875285 +0000
-+++ binutils-2.40/ld/testsuite/ld-riscv-elf/pcrel-lo-addend-2a.d	2023-02-16 10:46:55.570899994 +0000
-@@ -2,4 +2,5 @@
- #source: pcrel-lo-addend-2a.s
- #as: -march=rv32ic
- #ld: -m[riscv_choose_ilp32_emul] --no-relax
-+#skip: *-*-*
- #error: .*dangerous relocation: %pcrel_lo overflow with an addend, the value of %pcrel_hi is 0x1000 without any addend, but may be 0x2000 after adding the %pcrel_lo addend
-diff -rup binutils.orig/ld/testsuite/ld-elf/dwarf.exp binutils-2.40/ld/testsuite/ld-elf/dwarf.exp
---- binutils.orig/ld/testsuite/ld-elf/dwarf.exp	2023-02-16 10:11:38.515875516 +0000
-+++ binutils-2.40/ld/testsuite/ld-elf/dwarf.exp	2023-02-16 11:08:52.209377332 +0000
-@@ -29,6 +29,10 @@ if ![is_elf_format] {
-     return
- }
- 
-+if { [istarget riscv*-*-*] } then {
-+    return
-+}
-+
- # Skip targets where -shared is not supported
- 
- if ![check_shared_lib_support] {
-diff -rup binutils.orig/ld/testsuite/ld-elf/tls.exp binutils-2.40/ld/testsuite/ld-elf/tls.exp
---- binutils.orig/ld/testsuite/ld-elf/tls.exp	2023-02-16 10:11:38.540875476 +0000
-+++ binutils-2.40/ld/testsuite/ld-elf/tls.exp	2023-02-16 11:08:56.944369374 +0000
-@@ -28,6 +28,10 @@ if { !([istarget *-*-linux*]
-     return
- }
- 
-+if { [istarget riscv*-*-*] } then {
-+    return
-+}
-+
- # Check to see if the C compiler works.
- if { ![check_compiler_available] } {
-     return
---- binutils.orig/binutils/testsuite/binutils-all/objcopy.exp	2023-08-24 07:48:30.429195480 +0100
-+++ binutils-2.41/binutils/testsuite/binutils-all/objcopy.exp	2023-08-24 07:57:05.535302711 +0100
-@@ -1409,6 +1409,8 @@ proc objcopy_test_without_global_symbol
- # The AArch64 and ARM targets preserve mapping symbols
- # in object files, so they will fail this test.
- setup_xfail aarch64*-*-* arm*-*-*
-+# The RISC-V target compiles with annotation enabled and these symbols remain after stripping.
-+setup_xfail riscv*-*-* 
- 
- objcopy_test_without_global_symbol
- 
---- binutils.orig/ld/testsuite/ld-plugin/plugin.exp	2023-08-24 07:48:31.808196076 +0100
-+++ binutils-2.41/ld/testsuite/ld-plugin/plugin.exp	2023-08-24 07:59:30.285716568 +0100
-@@ -132,6 +132,10 @@ if [is_pecoff_format] {
-     append libs " --image-base=0x10000000"
- }
- 
-+if { [istarget riscv*-*-*] } then {
-+    return
-+}
-+
- set plugin_tests [list \
-     [list "load plugin" "-plugin $plugin_path \
-     $testobjfiles $libs" "" "" "" {{ld plugin-1.d}} "main.x" ] \
---- binutils.orig/binutils/testsuite/binutils-all/compress.exp	2023-12-11 10:09:16.923374463 +0000
-+++ binutils-2.41/binutils/testsuite/binutils-all/compress.exp	2023-12-12 09:00:15.150036675 +0000
-@@ -818,6 +818,10 @@ proc test_gnu_debuglink {} {
-     }
- }
- 
-+if { [istarget riscv*-*-*] } then {
-+    return
-+}
-+
- if {[is_elf_format]} then {
-     test_gnu_debuglink
- }
---- binutils-2.41/ld/testsuite/ld-riscv-elf/pcgp-relax-01-norelaxgp.d	2023-07-03 00:00:00.000000000 +0100
-+++ binutils.new/ld/testsuite/ld-riscv-elf/pcgp-relax-01-norelaxgp.d	2023-12-12 11:52:54.564057931 +0000
-@@ -8,10 +8,10 @@
- Disassembly of section \.text:
- 
- 0+[0-9a-f]+ <_start>:
--.*:[ 	]+[0-9a-f]+[ 	]+addi[ 	]+a0,a0,[0-9]+
-+.*:[ 	]+[0-9a-f]+[ 	]+addi[ 	]+a0,a0,\-[0-9]+
- .*:[ 	]+[0-9a-f]+[ 	]+jal[ 	        ]+ra,[0-9a-f]+ <_start>
- .*:[ 	]+[0-9a-f]+[ 	]+auipc[ 	]+a1,0x[0-9a-f]+
--.*:[ 	]+[0-9a-f]+[ 	]+addi[ 	]+a1,a1,[0-9]+ # [0-9a-f]+ <data_g>
-+.*:[ 	]+[0-9a-f]+[ 	]+addi[ 	]+a1,a1,\-[0-9]+ # [0-9a-f]+ <data_g>
- .*:[ 	]+[0-9a-f]+[ 	]+lui[ 	        ]+a2,0x[0-9a-f]+
- .*:[ 	]+[0-9a-f]+[ 	]+addi[ 	]+a2,a2,[0-9]+ # [0-9a-f]+ <data_g>
- .*:[ 	]+[0-9a-f]+[ 	]+addi[ 	]+a3,tp,0 # 0 <data_t>
---- binutils.orig/binutils/testsuite/binutils-all/objcopy.exp	2023-12-12 14:21:10.225342926 +0000
-+++ binutils-2.41/binutils/testsuite/binutils-all/objcopy.exp	2023-12-12 14:22:12.453421499 +0000
-@@ -1410,7 +1410,7 @@ proc objcopy_test_without_global_symbol
- # in object files, so they will fail this test.
- setup_xfail aarch64*-*-* arm*-*-*
- # The RISC-V target compiles with annotation enabled and these symbols remain after stripping.
--setup_xfail riscv*-*-* 
-+# setup_xfail riscv*-*-* 
- 
- objcopy_test_without_global_symbol
- 
-diff -rup binutils.orig/ld/testsuite/ld-riscv-elf/pcgp-relax-01-norelaxgp.d binutils-2.43.50-1f4aee70ed1/ld/testsuite/ld-riscv-elf/pcgp-relax-01-norelaxgp.d
---- binutils.orig/ld/testsuite/ld-riscv-elf/pcgp-relax-01-norelaxgp.d	2024-10-03 15:21:47.926570551 +0100
-+++ binutils-2.43.50-1f4aee70ed1/ld/testsuite/ld-riscv-elf/pcgp-relax-01-norelaxgp.d	2024-10-03 15:24:26.152502612 +0100
-@@ -8,10 +8,10 @@
- Disassembly of section \.text:
- 
- 0+[0-9a-f]+ <_start>:
--.*:[ 	]+[0-9a-f]+[ 	]+addi[ 	]+a0,a0,\-[0-9]+
-+.*:[ 	]+[0-9a-f]+[ 	]+addi[ 	]+a0,a0,.*
- .*:[ 	]+[0-9a-f]+[ 	]+jal[ 	        ]+ra,[0-9a-f]+ <_start>
- .*:[ 	]+[0-9a-f]+[ 	]+auipc[ 	]+a1,0x[0-9a-f]+
--.*:[ 	]+[0-9a-f]+[ 	]+addi[ 	]+a1,a1,\-[0-9]+ # [0-9a-f]+ <data_g>
-+.*:[ 	]+[0-9a-f]+[ 	]+addi[ 	]+a1,a1,.*
- .*:[ 	]+[0-9a-f]+[ 	]+lui[ 	        ]+a2,0x[0-9a-f]+
- .*:[ 	]+[0-9a-f]+[ 	]+addi[ 	]+a2,a2,[0-9]+ # [0-9a-f]+ <data_g>
- .*:[ 	]+[0-9a-f]+[ 	]+addi[ 	]+a3,tp,0 # 0 <data_t>
-diff -rup binutils.orig/ld/testsuite/ld-riscv-elf/pcgp-relax-01.d binutils-2.43.50-1f4aee70ed1/ld/testsuite/ld-riscv-elf/pcgp-relax-01.d
---- binutils.orig/ld/testsuite/ld-riscv-elf/pcgp-relax-01.d	2024-10-03 15:21:47.926570551 +0100
-+++ binutils-2.43.50-1f4aee70ed1/ld/testsuite/ld-riscv-elf/pcgp-relax-01.d	2024-10-03 15:23:54.512530979 +0100
-@@ -8,7 +8,7 @@
- Disassembly of section \.text:
- 
- 0+[0-9a-f]+ <_start>:
--.*:[ 	]+[0-9a-f]+[ 	]+addi[ 	]+a0,a0,\-[0-9]+
-+.*:[ 	]+[0-9a-f]+[ 	]+addi[ 	]+a0,a0,.*
- .*:[ 	]+[0-9a-f]+[ 	]+jal[ 	]+ra,[0-9a-f]+ <_start>
- .*:[ 	]+[0-9a-f]+[ 	]+addi[ 	]+a1,gp,\-[0-9]+ # [0-9a-f]+ <data_g>
- .*:[ 	]+[0-9a-f]+[ 	]+addi[ 	]+a2,gp,\-[0-9]+ # [0-9a-f]+ <data_g>
-diff -rup binutils.orig/ld/testsuite/ld-riscv-elf/pcgp-relax-02.d binutils-2.43.50-1f4aee70ed1/ld/testsuite/ld-riscv-elf/pcgp-relax-02.d
---- binutils.orig/ld/testsuite/ld-riscv-elf/pcgp-relax-02.d	2024-10-03 15:21:47.926570551 +0100
-+++ binutils-2.43.50-1f4aee70ed1/ld/testsuite/ld-riscv-elf/pcgp-relax-02.d	2024-10-03 15:25:01.687468496 +0100
-@@ -11,5 +11,5 @@ Disassembly of section .text:
- [0-9a-f]+ <_start>:
- .*:[ 	]+[0-9a-f]+[ 	]+auipc[ 	]+a1.*
- .*:[ 	]+[0-9a-f]+[ 	]+addi[ 	]+a0,gp.*<data_a>
--.*:[ 	]+[0-9a-f]+[ 	]+mv[ 	]+a1,a1
-+.*:[ 	]+[0-9a-f]+[ 	]+.*
- #pass
---- binutils-with-gold-2.45.50-79b2b564fec.orig/ld/testsuite/ld-riscv-elf/zicfilp-unlabeled-plt.d	2025-09-09 15:52:30.684689609 +0100
-+++ binutils-with-gold-2.45.50-79b2b564fec/ld/testsuite/ld-riscv-elf/zicfilp-unlabeled-plt.d	2025-09-09 15:53:12.837859447 +0100
-@@ -30,6 +30,6 @@ Disassembly of section \.plt:
- 
- [0-9a-f]+ <bar@plt>:
- .*:[ 	]+[0-9a-f]+[ 	]+lpad[ 	]+0x0
--.*:[ 	]+[0-9a-f]+[ 	]+auipc[ 	]+t3,0x1
-+.*:[ 	]+[0-9a-f]+[ 	]+auipc[ 	]+t3,0x[0-9a-f]+
- .*:[ 	]+[0-9a-f]+[ 	]+ld[ 	]+t3,[0-9]+\(t3\) # [0-9a-f]+ <bar>
- .*:[ 	]+[0-9a-f]+[ 	]+jalr[ 	]+t1,t3
-diff -rup binutils-with-gold-2.45.50-beab972c07d,orig/binutils/testsuite/binutils-all/objcopy.exp binutils-with-gold-2.45.50-beab972c07d/binutils/testsuite/binutils-all/objcopy.exp
---- binutils-with-gold-2.45.50-beab972c07d,orig/binutils/testsuite/binutils-all/objcopy.exp	2025-12-02 12:47:19.063123207 +0000
-+++ binutils-with-gold-2.45.50-beab972c07d/binutils/testsuite/binutils-all/objcopy.exp	2025-12-04 12:39:26.079989597 +0000
-@@ -602,14 +602,19 @@ proc strip_test { } {
-     set exec_output [binutils_run $STRIP "$STRIPFLAGS $objfile"]
-     set exec_output [prune_warnings $exec_output]
-     if ![string equal "" $exec_output] {
--	fail $test
-+	fail "$test (warnings in linker output)"
-+	verbose $exec_output
- 	return
-     }
- 
-     set exec_output [binutils_run $NM "-a $NMFLAGS $objfile"]
-     set exec_output [prune_warnings $exec_output]
-     if ![string match "*: no symbols*" $exec_output] {
--	fail $test
-+
-+	# The RISC-V target compiles with annotation enabled and these symbols remain after stripping.
-+	setup_xfail riscv*-*-* 
-+
-+	fail "$test (symbols in nm output)"
- 	return
-     }
- 
-@@ -659,6 +664,9 @@ proc strip_test_with_saving_a_symbol { }
-     pass $test
- }
- 
-+# The RISC-V target compiles with annotation enabled and these symbols remain after stripping.
-+setup_xfail riscv*-*-* 
-+
- strip_test_with_saving_a_symbol
- 
- # Test stripping an archive.
-@@ -1503,7 +1519,7 @@ proc objcopy_test_without_global_symbol
- # in object files, so they will fail this test.
- setup_xfail aarch64*-*-* arm*-*-*
- # The RISC-V target compiles with annotation enabled and these symbols remain after stripping.
--# setup_xfail riscv*-*-* 
-+setup_xfail riscv*-*-* 
- 
- objcopy_test_without_global_symbol
- 
-diff -rup binutils-with-gold-2.45.50-beab972c07d,orig/ld/testsuite/lib/ld-lib.exp binutils-with-gold-2.45.50-beab972c07d/ld/testsuite/lib/ld-lib.exp
---- binutils-with-gold-2.45.50-beab972c07d,orig/ld/testsuite/lib/ld-lib.exp	2025-12-02 12:47:19.201090894 +0000
-+++ binutils-with-gold-2.45.50-beab972c07d/ld/testsuite/lib/ld-lib.exp	2025-12-03 09:30:07.184360005 +0000
-@@ -1633,6 +1633,12 @@ proc compile_one_cc { src output additio
- proc check_ctf_available { } {
-     global ctf_available_saved
- 
-+    # Skip CTF tests for the Risc-V target for now, as the
-+    # tests have not been tweaked to support the riscv format.
-+    if { [istarget "riscv*-*-linux*"] } {
-+	return 0
-+    }
-+    
-     if {![info exists ctf_available_saved]} {
- 	set ctf_available_saved 0
- 
---- fred/binutils/testsuite/lib/binutils-common.exp	2026-03-16 09:18:37.205413649 +0000
-+++ binutils-with-gold-2.46.50-d712202846b/binutils/testsuite/lib/binutils-common.exp	2026-03-16 09:18:49.559358668 +0000
-@@ -803,6 +803,9 @@ proc prune_warnings_extra { text } {
-     # Ignore warnings about linking objects with an old sframe format
-     regsub -all {(^|\n)([^\n]* unexpected SFrame format version [^\n]*\n[^\n]* SFrame section ignored\n?)+} $text {\1} text
- 
-+    # Skip warnings about the LTO plugin being needed.
-+    regsub -all "(^|\n)(\[^\n\]*:\[^\n\]*plugin needed to handle lto object\[^\n\]*\n?)+" $text "\\1" text
-+    
-     return $text
- }
- 
---- binutils.orig/ld/testsuite/ld-elf/shared.exp	2026-06-10 15:32:21.012274073 +0100
-+++ binutils-with-gold-2.46.50-48997323b0f/ld/testsuite/ld-elf/shared.exp	2026-06-10 15:34:41.397899263 +0100
-@@ -1859,6 +1859,10 @@ run_cc_link_tests [list \
- 	"pr29655.so" \
-     ] \
- ]
-+
-+# FIXME: Find out why the Risc-V fails this test.
-+setup_xfail "riscv64-*-*"
-+
- # PR 29655 (cont.): Check that in PIC code linked as PDE taking the address
- # of a function defined in a DSO results in the function address (from GOT)
- # and not the "canonical PLT" address from the PDE.

binutils-s390-partial-relro.patch

@@ -0,0 +1,872 @@
+diff -rup binutils.orig/bfd/elf64-s390.c binutils-2.31.1/bfd/elf64-s390.c
+--- binutils.orig/bfd/elf64-s390.c	2018-07-19 12:37:28.107030007 +0100
++++ binutils-2.31.1/bfd/elf64-s390.c	2018-07-19 12:38:11.235548717 +0100
+@@ -481,7 +481,7 @@ elf_s390_is_local_label_name (bfd *abfd,
+ 
+ #define RELA_ENTRY_SIZE sizeof (Elf64_External_Rela)
+ 
+-/* The first three entries in a procedure linkage table are reserved,
++/* The first three entries in a global offset table are reserved,
+    and the initial contents are unimportant (we zero them out).
+    Subsequent entries look like this.  See the SVR4 ABI 386
+    supplement to see how this works.  */
+@@ -511,8 +511,8 @@ elf_s390_is_local_label_name (bfd *abfd,
+ 	 LG   1,0(1)	  # 6 bytes  Load address from GOT in r1
+ 	 BCR  15,1	  # 2 bytes  Jump to address
+    RET1: BASR 1,0	  # 2 bytes  Return from GOT 1st time
+-	 LGF  1,12(1)	  # 6 bytes  Load offset in symbl table in r1
+-	 BRCL 15,-x	  # 6 bytes  Jump to start of PLT
++	 LGF  1,12(1)	  # 6 bytes  Load rela.plt offset into r1
++	 BRCL 15,-x	  # 6 bytes  Jump to first PLT entry
+ 	 .long ?	  # 4 bytes  offset into .rela.plt
+ 
+    Total = 32 bytes per PLT entry
+@@ -1605,8 +1605,7 @@ allocate_dynrelocs (struct elf_link_hash
+ 	  /* Make room for this entry.  */
+ 	  s->size += PLT_ENTRY_SIZE;
+ 
+-	  /* We also need to make an entry in the .got.plt section, which
+-	     will be placed in the .got section by the linker script.  */
++	  /* We also need to make an entry in the .got.plt section.  */
+ 	  htab->elf.sgotplt->size += GOT_ENTRY_SIZE;
+ 
+ 	  /* We also need to make an entry in the .rela.plt section.  */
+@@ -1831,6 +1830,20 @@ elf_s390_size_dynamic_sections (bfd *out
+ 	}
+     }
+ 
++  if (htab->elf.sgot && s390_gotplt_after_got_p (info))
++    {
++      /* _bfd_elf_create_got_section adds the got header size always
++	 to .got.plt but we need it in .got if this section comes
++	 first.  */
++      htab->elf.sgot->size += 3 * GOT_ENTRY_SIZE;
++      htab->elf.sgotplt->size -= 3 * GOT_ENTRY_SIZE;
++
++      /* Make the _GLOBAL_OFFSET_TABLE_ symbol point to the .got
++	 instead of .got.plt.  */
++      htab->elf.hgot->root.u.def.section = htab->elf.sgot;
++      htab->elf.hgot->root.u.def.value = 0;
++    }
++
+   /* Set up .got offsets for local syms, and space for local dynamic
+      relocs.  */
+   for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link.next)
+@@ -2131,7 +2144,6 @@ elf_s390_relocate_section (bfd *output_b
+       bfd_boolean unresolved_reloc;
+       bfd_reloc_status_type r;
+       int tls_type;
+-      asection *base_got = htab->elf.sgot;
+       bfd_boolean resolved_to_zero;
+ 
+       r_type = ELF64_R_TYPE (rel->r_info);
+@@ -2172,7 +2184,7 @@ elf_s390_relocate_section (bfd *output_b
+ 		case R_390_PLTOFF16:
+ 		case R_390_PLTOFF32:
+ 		case R_390_PLTOFF64:
+-		  relocation -= htab->elf.sgot->output_section->vma;
++		  relocation -= s390_got_pointer (info);
+ 		  break;
+ 		case R_390_GOTPLT12:
+ 		case R_390_GOTPLT16:
+@@ -2192,10 +2204,10 @@ elf_s390_relocate_section (bfd *output_b
+ 				htab->elf.sgot->contents +
+ 				local_got_offsets[r_symndx]);
+ 		    relocation = (local_got_offsets[r_symndx] +
+-				  htab->elf.sgot->output_offset);
++				  s390_got_offset (info));
+ 
+ 		    if (r_type == R_390_GOTENT || r_type == R_390_GOTPLTENT)
+-		      relocation += htab->elf.sgot->output_section->vma;
++		      relocation += s390_got_pointer (info);
+ 		    break;
+ 		  }
+ 		default:
+@@ -2254,25 +2266,23 @@ elf_s390_relocate_section (bfd *output_b
+ 
+ 	      if (s390_is_ifunc_symbol_p (h))
+ 		{
++		  /* Entry indices of .iplt and .igot.plt match
++		     1:1. No magic PLT first entry here.  */
+ 		  plt_index = h->plt.offset / PLT_ENTRY_SIZE;
+-		  relocation = (plt_index * GOT_ENTRY_SIZE +
+-				htab->elf.igotplt->output_offset);
+-		  if (r_type == R_390_GOTPLTENT)
+-		    relocation += htab->elf.igotplt->output_section->vma;
++		  relocation = (plt_index * GOT_ENTRY_SIZE
++				+ s390_gotplt_offset (info)
++				+ htab->elf.igotplt->output_offset);
+ 		}
+ 	      else
+ 		{
+-		  /* Calc. index no.
+-		     Current offset - size first entry / entry size.  */
+-		  plt_index = (h->plt.offset - PLT_FIRST_ENTRY_SIZE) /
+-		    PLT_ENTRY_SIZE;
+-
+-		  /* Offset in GOT is PLT index plus GOT headers(3)
+-		     times 8, addr & GOT addr.  */
+-		  relocation = (plt_index + 3) * GOT_ENTRY_SIZE;
+-		  if (r_type == R_390_GOTPLTENT)
+-		    relocation += htab->elf.sgot->output_section->vma;
++		  plt_index = ((h->plt.offset - PLT_FIRST_ENTRY_SIZE)
++			       / PLT_ENTRY_SIZE);
++
++		  relocation = (plt_index * GOT_ENTRY_SIZE
++				+ s390_gotplt_offset (info));
+ 		}
++	      if (r_type == R_390_GOTPLTENT)
++		relocation += s390_got_pointer (info);
+ 	      unresolved_reloc = FALSE;
+ 	      break;
+ 	    }
+@@ -2286,7 +2296,7 @@ elf_s390_relocate_section (bfd *output_b
+ 	case R_390_GOTENT:
+ 	  /* Relocation is to the entry for this symbol in the global
+ 	     offset table.  */
+-	  if (base_got == NULL)
++	  if (htab->elf.sgot == NULL)
+ 	    abort ();
+ 
+ 	  if (h != NULL)
+@@ -2303,8 +2313,19 @@ elf_s390_relocate_section (bfd *output_b
+ 		    {
+ 		      /* No explicit GOT usage so redirect to the
+ 			 got.iplt slot.  */
+-		      base_got = htab->elf.igotplt;
+-		      off = h->plt.offset / PLT_ENTRY_SIZE * GOT_ENTRY_SIZE;
++		      relocation = (s390_gotplt_offset (info)
++				    + htab->elf.igotplt->output_offset
++				    + (h->plt.offset / PLT_ENTRY_SIZE
++				       * GOT_ENTRY_SIZE));
++
++		      /* For @GOTENT the relocation is against the offset between
++			 the instruction and the symbols entry in the GOT and not
++			 between the start of the GOT and the symbols entry. We
++			 add the vma of the GOT to get the correct value.  */
++		      if (r_type == R_390_GOTENT || r_type == R_390_GOTPLTENT)
++			relocation += s390_got_pointer (info);
++
++		      break;
+ 		    }
+ 		  else
+ 		    {
+@@ -2337,7 +2358,7 @@ elf_s390_relocate_section (bfd *output_b
+ 		  else
+ 		    {
+ 		      bfd_put_64 (output_bfd, relocation,
+-				  base_got->contents + off);
++				  htab->elf.sgot->contents + off);
+ 		      h->got.offset |= 1;
+ 		    }
+ 
+@@ -2419,7 +2440,7 @@ elf_s390_relocate_section (bfd *output_b
+ 	  if (off >= (bfd_vma) -2)
+ 	    abort ();
+ 
+-	  relocation = base_got->output_offset + off;
++	  relocation = s390_got_offset (info) + off;
+ 
+ 	  /* For @GOTENT the relocation is against the offset between
+ 	     the instruction and the symbols entry in the GOT and not
+@@ -2427,7 +2448,7 @@ elf_s390_relocate_section (bfd *output_b
+ 	     add the vma of the GOT to get the correct value.  */
+ 	  if (   r_type == R_390_GOTENT
+ 	      || r_type == R_390_GOTPLTENT)
+-	    relocation += base_got->output_section->vma;
++	    relocation += s390_got_pointer (info);
+ 
+ 	  break;
+ 
+@@ -2445,22 +2466,17 @@ elf_s390_relocate_section (bfd *output_b
+ 	      relocation = (htab->elf.iplt->output_section->vma
+ 			    + htab->elf.iplt->output_offset
+ 			    + h->plt.offset
+-			    - htab->elf.sgot->output_section->vma);
++			    - s390_got_pointer (info));
+ 	      goto do_relocation;
+ 	    }
+ 
+-	  /* Note that sgot->output_offset is not involved in this
+-	     calculation.  We always want the start of .got.  If we
+-	     defined _GLOBAL_OFFSET_TABLE in a different way, as is
+-	     permitted by the ABI, we might have to change this
+-	     calculation.  */
+-	  relocation -= htab->elf.sgot->output_section->vma;
++	  relocation -= s390_got_pointer (info);
+ 	  break;
+ 
+ 	case R_390_GOTPC:
+ 	case R_390_GOTPCDBL:
+ 	  /* Use global offset table as symbol value.  */
+-	  relocation = htab->elf.sgot->output_section->vma;
++	  relocation = s390_got_pointer (info);
+ 	  unresolved_reloc = FALSE;
+ 	  break;
+ 
+@@ -2509,7 +2525,7 @@ elf_s390_relocate_section (bfd *output_b
+ 	      || h->plt.offset == (bfd_vma) -1
+ 	      || (htab->elf.splt == NULL && !s390_is_ifunc_symbol_p (h)))
+ 	    {
+-	      relocation -= htab->elf.sgot->output_section->vma;
++	      relocation -= s390_got_pointer (info);
+ 	      break;
+ 	    }
+ 
+@@ -2517,12 +2533,12 @@ elf_s390_relocate_section (bfd *output_b
+ 	    relocation = (htab->elf.iplt->output_section->vma
+ 			  + htab->elf.iplt->output_offset
+ 			  + h->plt.offset
+-			  - htab->elf.sgot->output_section->vma);
++			  - s390_got_pointer (info));
+ 	  else
+ 	    relocation = (htab->elf.splt->output_section->vma
+ 			  + htab->elf.splt->output_offset
+ 			  + h->plt.offset
+-			  - htab->elf.sgot->output_section->vma);
++			  - s390_got_pointer (info));
+ 	  unresolved_reloc = FALSE;
+ 	  break;
+ 
+@@ -3296,7 +3312,7 @@ elf_s390_finish_dynamic_symbol (bfd *out
+   if (h->plt.offset != (bfd_vma) -1)
+     {
+       bfd_vma plt_index;
+-      bfd_vma got_offset;
++      bfd_vma gotplt_offset;
+       Elf_Internal_Rela rela;
+       bfd_byte *loc;
+ 
+@@ -3325,18 +3341,25 @@ elf_s390_finish_dynamic_symbol (bfd *out
+ 	     Current offset - size first entry / entry size.  */
+ 	  plt_index = (h->plt.offset - PLT_FIRST_ENTRY_SIZE) / PLT_ENTRY_SIZE;
+ 
+-	  /* Offset in GOT is PLT index plus GOT headers(3) times 8,
+-	     addr & GOT addr.  */
+-	  got_offset = (plt_index + 3) * GOT_ENTRY_SIZE;
++	  /* The slots in the .got.plt correspond to the PLT slots in
++	     the same order.  */
++	  gotplt_offset = plt_index * GOT_ENTRY_SIZE;
++
++	  /* If .got.plt comes first it needs to contain the 3 header
++	     entries.  */
++	  if (!s390_gotplt_after_got_p (info))
++	    gotplt_offset += 3 * GOT_ENTRY_SIZE;
+ 
+ 	  /* Fill in the blueprint of a PLT.  */
+ 	  memcpy (htab->elf.splt->contents + h->plt.offset, elf_s390x_plt_entry,
+ 		  PLT_ENTRY_SIZE);
+ 
+-	  /* Fixup the relative address to the GOT entry */
++	  /* The first instruction in the PLT entry is a LARL loading
++	     the address of the GOT slot.  We write the 4 byte
++	     immediate operand of the LARL instruction here.  */
+ 	  bfd_put_32 (output_bfd,
+ 		      (htab->elf.sgotplt->output_section->vma +
+-		       htab->elf.sgotplt->output_offset + got_offset
++		       htab->elf.sgotplt->output_offset + gotplt_offset
+ 		       - (htab->elf.splt->output_section->vma +
+ 			  htab->elf.splt->output_offset +
+ 			  h->plt.offset))/2,
+@@ -3356,12 +3379,12 @@ elf_s390_finish_dynamic_symbol (bfd *out
+ 		       + htab->elf.splt->output_offset
+ 		       + h->plt.offset
+ 		       + 14),
+-		      htab->elf.sgotplt->contents + got_offset);
++		      htab->elf.sgotplt->contents + gotplt_offset);
+ 
+ 	  /* Fill in the entry in the .rela.plt section.  */
+ 	  rela.r_offset = (htab->elf.sgotplt->output_section->vma
+ 			   + htab->elf.sgotplt->output_offset
+-			   + got_offset);
++			   + gotplt_offset);
+ 	  rela.r_info = ELF64_R_INFO (h->dynindx, R_390_JMP_SLOT);
+ 	  rela.r_addend = 0;
+ 	  loc = htab->elf.srelplt->contents + plt_index *
+@@ -3568,8 +3591,8 @@ elf_s390_finish_dynamic_sections (bfd *o
+ 	      continue;
+ 
+ 	    case DT_PLTGOT:
+-	      s = htab->elf.sgotplt;
+-	      dyn.d_un.d_ptr = s->output_section->vma + s->output_offset;
++	      /* DT_PLTGOT matches _GLOBAL_OFFSET_TABLE_ */
++	      dyn.d_un.d_ptr = s390_got_pointer (info);
+ 	      break;
+ 
+ 	    case DT_JMPREL:
+@@ -3606,10 +3629,11 @@ elf_s390_finish_dynamic_sections (bfd *o
+ 	  /* fill in blueprint for plt 0 entry */
+ 	  memcpy (htab->elf.splt->contents, elf_s390x_first_plt_entry,
+ 		  PLT_FIRST_ENTRY_SIZE);
+-	  /* Fixup relative address to start of GOT */
++	  /* The second instruction in the first PLT entry is a LARL
++	     loading the GOT pointer.  Fill in the LARL immediate
++	     address.  */
+ 	  bfd_put_32 (output_bfd,
+-		      (htab->elf.sgotplt->output_section->vma
+-		       + htab->elf.sgotplt->output_offset
++		      (s390_got_pointer (info)
+ 		       - htab->elf.splt->output_section->vma
+ 		       - htab->elf.splt->output_offset - 6)/2,
+ 		      htab->elf.splt->contents + 8);
+@@ -3619,21 +3643,22 @@ elf_s390_finish_dynamic_sections (bfd *o
+ 	  = PLT_ENTRY_SIZE;
+     }
+ 
+-  if (htab->elf.sgotplt)
++  if (htab->elf.hgot && htab->elf.hgot->root.u.def.section)
+     {
+       /* Fill in the first three entries in the global offset table.  */
+-      if (htab->elf.sgotplt->size > 0)
++      if (htab->elf.hgot->root.u.def.section->size > 0)
+ 	{
+ 	  bfd_put_64 (output_bfd,
+ 		      (sdyn == NULL ? (bfd_vma) 0
+ 		       : sdyn->output_section->vma + sdyn->output_offset),
+-		      htab->elf.sgotplt->contents);
++		      htab->elf.hgot->root.u.def.section->contents);
+ 	  /* One entry for shared object struct ptr.  */
+-	  bfd_put_64 (output_bfd, (bfd_vma) 0, htab->elf.sgotplt->contents + 8);
++	  bfd_put_64 (output_bfd, (bfd_vma) 0,
++		      htab->elf.hgot->root.u.def.section->contents + 8);
+ 	  /* One entry for _dl_runtime_resolve.  */
+-	  bfd_put_64 (output_bfd, (bfd_vma) 0, htab->elf.sgotplt->contents + 16);
++	  bfd_put_64 (output_bfd, (bfd_vma) 0,
++		      htab->elf.hgot->root.u.def.section->contents + 16);
+ 	}
+-
+       elf_section_data (htab->elf.sgot->output_section)
+ 	->this_hdr.sh_entsize = 8;
+     }
+diff -rup binutils.orig/bfd/elf-s390-common.c binutils-2.31.1/bfd/elf-s390-common.c
+--- binutils.orig/bfd/elf-s390-common.c	2018-07-19 12:37:28.113029940 +0100
++++ binutils-2.31.1/bfd/elf-s390-common.c	2018-07-19 12:38:11.235548717 +0100
+@@ -30,6 +30,87 @@ s390_is_ifunc_symbol_p (struct elf_link_
+   return h->type == STT_GNU_IFUNC || eh->ifunc_resolver_address != 0;
+ }
+ 
++/* Return true if .got.plt is supposed to be emitted after .got.  */
++
++static inline bfd_boolean
++s390_gotplt_after_got_p (struct bfd_link_info *info)
++{
++  struct elf_s390_link_hash_table *htab = elf_s390_hash_table (info);
++
++  if (!htab->elf.sgot || !htab->elf.sgotplt)
++    return TRUE;
++
++  if (htab->elf.sgot->output_section == htab->elf.sgotplt->output_section)
++    {
++      if (htab->elf.sgot->output_offset < htab->elf.sgotplt->output_offset)
++	return TRUE;
++    }
++  else
++    {
++      if (htab->elf.sgot->output_section->vma
++	  <= htab->elf.sgotplt->output_section->vma)
++	return TRUE;
++    }
++  return FALSE;
++}
++
++/* Return the value of the _GLOBAL_OFFSET_TABLE_ symbol.  */
++
++static inline bfd_vma
++s390_got_pointer (struct bfd_link_info *info)
++{
++  struct elf_s390_link_hash_table *htab = elf_s390_hash_table (info);
++  bfd_vma got_pointer;
++
++  BFD_ASSERT (htab && htab->elf.hgot);
++
++  got_pointer = (htab->elf.hgot->root.u.def.section->output_section->vma
++		 + htab->elf.hgot->root.u.def.section->output_offset);
++  /* Our ABI requires the GOT pointer to point at the very beginning
++     of the global offset table.  */
++  BFD_ASSERT (got_pointer
++	      <= (htab->elf.sgot->output_section->vma
++		  + htab->elf.sgot->output_offset));
++  BFD_ASSERT (got_pointer
++	      <= (htab->elf.sgotplt->output_section->vma
++		  + htab->elf.sgotplt->output_offset));
++
++  return got_pointer;
++}
++
++
++/* Return the offset of the .got versus _GLOBAL_OFFSET_TABLE_.  */
++
++static inline bfd_vma
++s390_got_offset (struct bfd_link_info *info)
++{
++  struct elf_s390_link_hash_table *htab = elf_s390_hash_table (info);
++
++  /* The absolute address of the .got in the target image.  */
++  bfd_vma got_address = (htab->elf.sgot->output_section->vma
++			 + htab->elf.sgot->output_offset);
++
++  /* GOT offset must not be negative.  */
++  BFD_ASSERT (s390_got_pointer (info) <= got_address);
++  return got_address - s390_got_pointer (info);
++}
++
++/* Return the offset of the .got.plt versus _GLOBAL_OFFSET_TABLE_.  */
++
++static inline bfd_vma
++s390_gotplt_offset (struct bfd_link_info *info)
++{
++  struct elf_s390_link_hash_table *htab = elf_s390_hash_table (info);
++
++  /* The absolute address of the .got.plt in the target image.  */
++  bfd_vma gotplt_address = (htab->elf.sgotplt->output_section->vma
++			    + htab->elf.sgotplt->output_offset);
++
++  /* GOT offset must not be negative.  */
++  BFD_ASSERT (s390_got_pointer (info) <= gotplt_address);
++  return gotplt_address - s390_got_pointer (info);
++}
++
+ /* Create sections needed by STT_GNU_IFUNC symbol.  */
+ 
+ static bfd_boolean
+diff -rup binutils.orig/ld/emulparams/elf64_s390.sh binutils-2.31.1/ld/emulparams/elf64_s390.sh
+--- binutils.orig/ld/emulparams/elf64_s390.sh	2018-07-19 12:37:28.544025130 +0100
++++ binutils-2.31.1/ld/emulparams/elf64_s390.sh	2018-07-19 12:38:11.235548717 +0100
+@@ -11,9 +11,12 @@ NOP=0x07070707
+ TEMPLATE_NAME=elf32
+ GENERATE_SHLIB_SCRIPT=yes
+ GENERATE_PIE_SCRIPT=yes
++GENERATE_RELRO_SCRIPT=yes
+ NO_SMALL_DATA=yes
+ EXTRA_EM_FILE=s390
+ IREL_IN_PLT=
++SEPARATE_GOTPLT=0
++test -z "$RELRO" && unset SEPARATE_GOTPLT
+ 
+ # Treat a host that matches the target with the possible exception of "x"
+ # in the name as if it were native.
+diff -rup binutils.orig/ld/emultempl/elf32.em binutils-2.31.1/ld/emultempl/elf32.em
+--- binutils.orig/ld/emultempl/elf32.em	2018-07-19 12:37:28.549025074 +0100
++++ binutils-2.31.1/ld/emultempl/elf32.em	2018-07-19 12:37:39.041907980 +0100
+@@ -2376,17 +2376,41 @@ echo '             && link_info.combrelo
+ echo '             && link_info.relro'			>> e${EMULATION_NAME}.c
+ echo '             && (link_info.flags & DF_BIND_NOW)) return' >> e${EMULATION_NAME}.c
+ sed $sc ldscripts/${EMULATION_NAME}.xdw			>> e${EMULATION_NAME}.c
++if test -n "$GENERATE_RELRO_SCRIPT" ; then
++echo '  ; else if (bfd_link_pie (&link_info)'          >> e${EMULATION_NAME}.c
++echo '             && link_info.combreloc'             >> e${EMULATION_NAME}.c
++echo '             && link_info.separate_code'         >> e${EMULATION_NAME}.c
++echo '             && link_info.relro) return'         >> e${EMULATION_NAME}.c
++sed $sc ldscripts/${EMULATION_NAME}.xdceo              >> e${EMULATION_NAME}.c
++fi
+ echo '  ; else if (bfd_link_pie (&link_info)'		>> e${EMULATION_NAME}.c
+ echo '             && link_info.separate_code'		>> e${EMULATION_NAME}.c
+ echo '             && link_info.combreloc) return'	>> e${EMULATION_NAME}.c
+ sed $sc ldscripts/${EMULATION_NAME}.xdce		>> e${EMULATION_NAME}.c
++if test -n "$GENERATE_RELRO_SCRIPT" ; then
++echo '  ; else if (bfd_link_pie (&link_info)'          >> e${EMULATION_NAME}.c
++echo '             && link_info.combreloc'             >> e${EMULATION_NAME}.c
++echo '             && link_info.relro) return'         >> e${EMULATION_NAME}.c
++sed $sc ldscripts/${EMULATION_NAME}.xdco               >> e${EMULATION_NAME}.c
++fi
+ echo '  ; else if (bfd_link_pie (&link_info)'		>> e${EMULATION_NAME}.c
+ echo '             && link_info.combreloc) return'	>> e${EMULATION_NAME}.c
+ sed $sc ldscripts/${EMULATION_NAME}.xdc			>> e${EMULATION_NAME}.c
++if test -n "$GENERATE_RELRO_SCRIPT" ; then
++echo '  ; else if (bfd_link_pie (&link_info)'          >> e${EMULATION_NAME}.c
++echo '             && link_info.separate_code'         >> e${EMULATION_NAME}.c
++echo '             && link_info.relro) return'         >> e${EMULATION_NAME}.c
++sed $sc ldscripts/${EMULATION_NAME}.xdeo               >> e${EMULATION_NAME}.c
++fi
+ fi
+ echo '  ; else if (bfd_link_pie (&link_info)'		>> e${EMULATION_NAME}.c
+ echo '             && link_info.separate_code) return'	>> e${EMULATION_NAME}.c
+ sed $sc ldscripts/${EMULATION_NAME}.xde			>> e${EMULATION_NAME}.c
++if test -n "$GENERATE_RELRO_SCRIPT" ; then
++echo '  ; else if (bfd_link_pie (&link_info)'          >> e${EMULATION_NAME}.c
++echo '             && link_info.relro) return'         >> e${EMULATION_NAME}.c
++sed $sc ldscripts/${EMULATION_NAME}.xdo                >> e${EMULATION_NAME}.c
++fi
+ echo '  ; else if (bfd_link_pie (&link_info)) return'	>> e${EMULATION_NAME}.c
+ sed $sc ldscripts/${EMULATION_NAME}.xd			>> e${EMULATION_NAME}.c
+ fi
+@@ -2402,17 +2426,41 @@ echo '             && link_info.combrelo
+ echo '             && link_info.relro'			>> e${EMULATION_NAME}.c
+ echo '             && (link_info.flags & DF_BIND_NOW)) return' >> e${EMULATION_NAME}.c
+ sed $sc ldscripts/${EMULATION_NAME}.xsw			>> e${EMULATION_NAME}.c
++if test -n "$GENERATE_RELRO_SCRIPT" ; then
++echo '  ; else if (bfd_link_dll (&link_info)'          >> e${EMULATION_NAME}.c
++echo '             && link_info.combreloc'             >> e${EMULATION_NAME}.c
++echo '             && link_info.separate_code'         >> e${EMULATION_NAME}.c
++echo '             && link_info.relro) return'         >> e${EMULATION_NAME}.c
++sed $sc ldscripts/${EMULATION_NAME}.xsceo              >> e${EMULATION_NAME}.c
++fi
+ echo '  ; else if (bfd_link_dll (&link_info)'		>> e${EMULATION_NAME}.c
+ echo '             && link_info.combreloc'		>> e${EMULATION_NAME}.c
+ echo '             && link_info.separate_code) return'	>> e${EMULATION_NAME}.c
+ sed $sc ldscripts/${EMULATION_NAME}.xsce			>> e${EMULATION_NAME}.c
++if test -n "$GENERATE_RELRO_SCRIPT" ; then
++echo '  ; else if (bfd_link_dll (&link_info)'          >> e${EMULATION_NAME}.c
++echo '             && link_info.combreloc'             >> e${EMULATION_NAME}.c
++echo '             && link_info.relro) return'         >> e${EMULATION_NAME}.c
++sed $sc ldscripts/${EMULATION_NAME}.xsco               >> e${EMULATION_NAME}.c
++fi
+ echo '  ; else if (bfd_link_dll (&link_info)'		>> e${EMULATION_NAME}.c
+ echo '             && link_info.combreloc) return'	>> e${EMULATION_NAME}.c
+ sed $sc ldscripts/${EMULATION_NAME}.xsc			>> e${EMULATION_NAME}.c
++if test -n "$GENERATE_RELRO_SCRIPT" ; then
++echo '  ; else if (bfd_link_dll (&link_info)'          >> e${EMULATION_NAME}.c
++echo '             && link_info.separate_code'         >> e${EMULATION_NAME}.c
++echo '             && link_info.relro) return'         >> e${EMULATION_NAME}.c
++sed $sc ldscripts/${EMULATION_NAME}.xseo               >> e${EMULATION_NAME}.c
++fi
+ fi
+ echo '  ; else if (bfd_link_dll (&link_info)'		>> e${EMULATION_NAME}.c
+ echo '             && link_info.separate_code) return'	>> e${EMULATION_NAME}.c
+ sed $sc ldscripts/${EMULATION_NAME}.xse			>> e${EMULATION_NAME}.c
++if test -n "$GENERATE_RELRO_SCRIPT" ; then
++echo '  ; else if (bfd_link_dll (&link_info)'          >> e${EMULATION_NAME}.c
++echo '             && link_info.relro) return'         >> e${EMULATION_NAME}.c
++sed $sc ldscripts/${EMULATION_NAME}.xso               >> e${EMULATION_NAME}.c
++fi
+ echo '  ; else if (bfd_link_dll (&link_info)) return'	>> e${EMULATION_NAME}.c
+ sed $sc ldscripts/${EMULATION_NAME}.xs			>> e${EMULATION_NAME}.c
+ fi
+@@ -2425,14 +2473,34 @@ echo '  ; else if (link_info.combreloc'
+ echo '             && link_info.relro'			>> e${EMULATION_NAME}.c
+ echo '             && (link_info.flags & DF_BIND_NOW)) return' >> e${EMULATION_NAME}.c
+ sed $sc ldscripts/${EMULATION_NAME}.xw			>> e${EMULATION_NAME}.c
++if test -n "$GENERATE_RELRO_SCRIPT" ; then
++echo '  ; else if (link_info.combreloc'                 >> e${EMULATION_NAME}.c
++echo '             && link_info.separate_code'		>> e${EMULATION_NAME}.c
++echo '             && link_info.relro) return'          >> e${EMULATION_NAME}.c
++sed $sc ldscripts/${EMULATION_NAME}.xceo                >> e${EMULATION_NAME}.c
++fi
+ echo '  ; else if (link_info.combreloc'			>> e${EMULATION_NAME}.c
+ echo '             && link_info.separate_code) return'	>> e${EMULATION_NAME}.c
+ sed $sc ldscripts/${EMULATION_NAME}.xce			>> e${EMULATION_NAME}.c
++if test -n "$GENERATE_RELRO_SCRIPT" ; then
++echo '  ; else if (link_info.combreloc'                 >> e${EMULATION_NAME}.c
++echo '             && link_info.relro) return'          >> e${EMULATION_NAME}.c
++sed $sc ldscripts/${EMULATION_NAME}.xco                 >> e${EMULATION_NAME}.c
++fi
+ echo '  ; else if (link_info.combreloc) return'		>> e${EMULATION_NAME}.c
+ sed $sc ldscripts/${EMULATION_NAME}.xc			>> e${EMULATION_NAME}.c
+ fi
+-echo '  ; else if (link_info.separate_code) return'		>> e${EMULATION_NAME}.c
++if test -n "$GENERATE_RELRO_SCRIPT" ; then
++echo '  ; else if (link_info.separate_code'             >> e${EMULATION_NAME}.c
++echo '             && link_info.relro) return'          >> e${EMULATION_NAME}.c
++sed $sc ldscripts/${EMULATION_NAME}.xeo                 >> e${EMULATION_NAME}.c
++fi
++echo '  ; else if (link_info.separate_code) return'     >> e${EMULATION_NAME}.c
+ sed $sc ldscripts/${EMULATION_NAME}.xe			>> e${EMULATION_NAME}.c
++if test -n "$GENERATE_RELRO_SCRIPT" ; then
++echo '  ; else if (link_info.relro) return'             >> e${EMULATION_NAME}.c
++sed $sc ldscripts/${EMULATION_NAME}.xo                  >> e${EMULATION_NAME}.c
++fi
+ echo '  ; else return'					>> e${EMULATION_NAME}.c
+ sed $sc ldscripts/${EMULATION_NAME}.x			>> e${EMULATION_NAME}.c
+ echo '; }'						>> e${EMULATION_NAME}.c
+@@ -2471,6 +2539,21 @@ fragment <<EOF
+       else
+ 	return "ldscripts/${EMULATION_NAME}.xdw";
+     }
++EOF
++if test -n "$GENERATE_RELRO_SCRIPT" ; then
++fragment <<EOF
++  else if (bfd_link_pie (&link_info)
++	   && link_info.combreloc
++	   && link_info.relro)
++    {
++      if (link_info.separate_code)
++	return "ldscripts/${EMULATION_NAME}.xdceo";
++      else
++	return "ldscripts/${EMULATION_NAME}.xdco";
++    }
++EOF
++fi
++fragment <<EOF
+   else if (bfd_link_pie (&link_info)
+ 	   && link_info.combreloc)
+     {
+@@ -2481,6 +2564,18 @@ fragment <<EOF
+     }
+ EOF
+ fi
++if test -n "$GENERATE_RELRO_SCRIPT" ; then
++fragment <<EOF
++  else if (bfd_link_pie (&link_info)
++	   && link_info.relro)
++    {
++      if (link_info.separate_code)
++	return "ldscripts/${EMULATION_NAME}.xdeo";
++      else
++	return "ldscripts/${EMULATION_NAME}.xdo";
++    }
++EOF
++fi
+ fragment <<EOF
+   else if (bfd_link_pie (&link_info))
+     {
+@@ -2502,6 +2597,21 @@ fragment <<EOF
+       else
+ 	return "ldscripts/${EMULATION_NAME}.xsw";
+     }
++EOF
++if test -n "$GENERATE_RELRO_SCRIPT" ; then
++fragment <<EOF
++  else if (bfd_link_dll (&link_info)
++	   && link_info.combreloc
++	   && link_info.relro)
++    {
++      if (link_info.separate_code)
++	return "ldscripts/${EMULATION_NAME}.xsceo";
++      else
++	return "ldscripts/${EMULATION_NAME}.xsco";
++    }
++EOF
++fi
++fragment <<EOF
+   else if (bfd_link_dll (&link_info) && link_info.combreloc)
+     {
+       if (link_info.separate_code)
+@@ -2511,6 +2621,18 @@ fragment <<EOF
+     }
+ EOF
+ fi
++if test -n "$GENERATE_RELRO_SCRIPT" ; then
++fragment <<EOF
++  else if (bfd_link_dll (&link_info)
++	   && link_info.relro)
++    {
++      if (link_info.separate_code)
++	return "ldscripts/${EMULATION_NAME}.xseo";
++      else
++	return "ldscripts/${EMULATION_NAME}.xso";
++    }
++EOF
++fi
+ fragment <<EOF
+   else if (bfd_link_dll (&link_info))
+     {
+@@ -2531,6 +2653,20 @@ fragment <<EOF
+       else
+ 	return "ldscripts/${EMULATION_NAME}.xw";
+     }
++EOF
++if test -n "$GENERATE_RELRO_SCRIPT" ; then
++fragment <<EOF
++  else if (link_info.combreloc
++	   && link_info.relro)
++    {
++      if (link_info.separate_code)
++	return "ldscripts/${EMULATION_NAME}.xceo";
++      else
++	return "ldscripts/${EMULATION_NAME}.xco";
++    }
++EOF
++fi
++fragment <<EOF
+   else if (link_info.combreloc)
+     {
+       if (link_info.separate_code)
+@@ -2540,6 +2676,17 @@ fragment <<EOF
+     }
+ EOF
+ fi
++if test -n "$GENERATE_RELRO_SCRIPT" ; then
++fragment <<EOF
++  else if (link_info.relro)
++    {
++      if (link_info.separate_code)
++	return "ldscripts/${EMULATION_NAME}.xeo";
++      else
++	return "ldscripts/${EMULATION_NAME}.xo";
++    }
++EOF
++fi
+ fragment <<EOF
+   else
+     {
+diff -rup binutils.orig/ld/genscripts.sh binutils-2.31.1/ld/genscripts.sh
+--- binutils.orig/ld/genscripts.sh	2018-07-19 12:37:28.540025175 +0100
++++ binutils-2.31.1/ld/genscripts.sh	2018-07-19 12:37:39.041907980 +0100
+@@ -306,6 +306,20 @@ LD_FLAG=textonly
+   . ${srcdir}/scripttempl/${SCRIPT_NAME}.sc
+ ) | sed -e '/^ *$/d;s/[	 ]*$//' > ldscripts/${EMULATION_NAME}.xe
+ 
++if test -n "$GENERATE_RELRO_SCRIPT"; then
++    LD_FLAG=
++    RELRO=" "
++    ( echo "/* Script for -z relo: generate normal executables with separate code segment */"
++      . ${CUSTOMIZER_SCRIPT}
++      . ${srcdir}/scripttempl/${SCRIPT_NAME}.sc
++    ) | sed -e '/^ *$/d;s/[	 ]*$//' > ldscripts/${EMULATION_NAME}.xo
++    LD_FLAG=textonly
++    ( echo "/* Script for -z separate-code -z relo: generate normal executables with separate code segment */"
++      . ${CUSTOMIZER_SCRIPT}
++      . ${srcdir}/scripttempl/${SCRIPT_NAME}.sc
++    ) | sed -e '/^ *$/d;s/[	 ]*$//' > ldscripts/${EMULATION_NAME}.xeo
++    unset RELRO
++fi
+ LD_FLAG=n
+ DATA_ALIGNMENT=${DATA_ALIGNMENT_n}
+ ( echo "/* Script for -n: mix text and data on same page */"
+@@ -353,6 +367,25 @@ if test -n "$GENERATE_COMBRELOC_SCRIPT";
+   rm -f ${COMBRELOC}
+   COMBRELOC=
+   unset RELRO_NOW
++  if test -n "$GENERATE_RELRO_SCRIPT"; then
++      LD_FLAG=c
++      RELRO=" "
++      COMBRELOC=ldscripts/${EMULATION_NAME}.xco.tmp
++      ( echo "/* Script for -z combreloc -z relro: combine and sort reloc sections */"
++	. ${CUSTOMIZER_SCRIPT}
++	. ${srcdir}/scripttempl/${SCRIPT_NAME}.sc
++      ) | sed -e '/^ *$/d;s/[    ]*$//' > ldscripts/${EMULATION_NAME}.xco
++      rm -f ${COMBRELOC}
++      LD_FLAG=ctextonly
++      COMBRELOC=ldscripts/${EMULATION_NAME}.xceo.tmp
++      ( echo "/* Script for -z combreloc -z separate-code -z relro: combine and sort reloc sections */"
++	. ${CUSTOMIZER_SCRIPT}
++	. ${srcdir}/scripttempl/${SCRIPT_NAME}.sc
++      ) | sed -e '/^ *$/d;s/[    ]*$//' > ldscripts/${EMULATION_NAME}.xceo
++      rm -f ${COMBRELOC}
++      COMBRELOC=
++      unset RELRO
++  fi
+ fi
+ 
+ if test -n "$GENERATE_SHLIB_SCRIPT"; then
+@@ -370,6 +403,23 @@ if test -n "$GENERATE_SHLIB_SCRIPT"; the
+     . ${CUSTOMIZER_SCRIPT}
+     . ${srcdir}/scripttempl/${SCRIPT_NAME}.sc
+   ) | sed -e '/^ *$/d;s/[	 ]*$//' > ldscripts/${EMULATION_NAME}.xse
++
++  if test -n "$GENERATE_RELRO_SCRIPT"; then
++      RELRO=" "
++      LD_FLAG=shared
++      (
++	  echo "/* Script for ld --shared -z relro: link shared library */"
++	  . ${CUSTOMIZER_SCRIPT}
++	  . ${srcdir}/scripttempl/${SCRIPT_NAME}.sc
++      ) | sed -e '/^ *$/d;s/[	 ]*$//' > ldscripts/${EMULATION_NAME}.xso
++      LD_FLAG=sharedtextonly
++      (
++	  echo "/* Script for ld --shared -z relro -z separate-code: link shared library with separate code segment */"
++	  . ${CUSTOMIZER_SCRIPT}
++	  . ${srcdir}/scripttempl/${SCRIPT_NAME}.sc
++      ) | sed -e '/^ *$/d;s/[	 ]*$//' > ldscripts/${EMULATION_NAME}.xseo
++      unset RELRO
++  fi
+   if test -n "$GENERATE_COMBRELOC_SCRIPT"; then
+     DATA_ALIGNMENT=${DATA_ALIGNMENT_sc-${DATA_ALIGNMENT}}
+     LD_FLAG=cshared
+@@ -401,8 +451,27 @@ if test -n "$GENERATE_SHLIB_SCRIPT"; the
+       . ${srcdir}/scripttempl/${SCRIPT_NAME}.sc
+     ) | sed -e '/^ *$/d;s/[	 ]*$//' > ldscripts/${EMULATION_NAME}.xswe
+     rm -f ${COMBRELOC}
+-    COMBRELOC=
+     unset RELRO_NOW
++
++    if test -n "$GENERATE_RELRO_SCRIPT"; then
++	LD_FLAG=wshared
++	RELRO=" "
++	COMBRELOC=ldscripts/${EMULATION_NAME}.xsco.tmp
++	( echo "/* Script for --shared -z combreloc -z relro: shared library, combine & sort relocs with separate code segment */"
++	  . ${CUSTOMIZER_SCRIPT}
++	  . ${srcdir}/scripttempl/${SCRIPT_NAME}.sc
++	) | sed -e '/^ *$/d;s/[	 ]*$//' > ldscripts/${EMULATION_NAME}.xsco
++	rm -f ${COMBRELOC}
++	LD_FLAG=wsharedtextonly
++	COMBRELOC=ldscripts/${EMULATION_NAME}.xsceo.tmp
++	( echo "/* Script for --shared -z combreloc -z relro -z separate-code: shared library, combine & sort relocs with separate code segment */"
++	  . ${CUSTOMIZER_SCRIPT}
++	  . ${srcdir}/scripttempl/${SCRIPT_NAME}.sc
++	) | sed -e '/^ *$/d;s/[	 ]*$//' > ldscripts/${EMULATION_NAME}.xsceo
++	rm -f ${COMBRELOC}
++	unset RELRO
++    fi
++    COMBRELOC=
+   fi
+   unset CREATE_SHLIB
+ fi
+@@ -422,6 +491,22 @@ if test -n "$GENERATE_PIE_SCRIPT"; then
+     . ${CUSTOMIZER_SCRIPT}
+     . ${srcdir}/scripttempl/${SCRIPT_NAME}.sc
+   ) | sed -e '/^ *$/d;s/[	 ]*$//' > ldscripts/${EMULATION_NAME}.xde
++  if test -n "$GENERATE_RELRO_SCRIPT"; then
++      RELRO=" "
++      LD_FLAG=pie
++      (
++	  echo "/* Script for ld -pie -z relro: link position independent executable */"
++	  . ${CUSTOMIZER_SCRIPT}
++	  . ${srcdir}/scripttempl/${SCRIPT_NAME}.sc
++      ) | sed -e '/^ *$/d;s/[	 ]*$//' > ldscripts/${EMULATION_NAME}.xdo
++      LD_FLAG=pietextonly
++      (
++	  echo "/* Script for ld -pie -z relro -z separate-code: link position independent executable with separate code segment */"
++	  . ${CUSTOMIZER_SCRIPT}
++	  . ${srcdir}/scripttempl/${SCRIPT_NAME}.sc
++      ) | sed -e '/^ *$/d;s/[	 ]*$//' > ldscripts/${EMULATION_NAME}.xdeo
++      unset RELRO
++  fi
+   if test -n "$GENERATE_COMBRELOC_SCRIPT"; then
+     DATA_ALIGNMENT=${DATA_ALIGNMENT_sc-${DATA_ALIGNMENT}}
+     COMBRELOC=ldscripts/${EMULATION_NAME}.xdc.tmp
+@@ -453,8 +538,28 @@ if test -n "$GENERATE_PIE_SCRIPT"; then
+       . ${srcdir}/scripttempl/${SCRIPT_NAME}.sc
+     ) | sed -e '/^ *$/d;s/[	 ]*$//' > ldscripts/${EMULATION_NAME}.xdwe
+     rm -f ${COMBRELOC}
+-    COMBRELOC=
+     unset RELRO_NOW
++
++    if test -n "$GENERATE_RELRO_SCRIPT"; then
++	LD_FLAG=wpie
++	RELRO=" "
++	COMBRELOC=ldscripts/${EMULATION_NAME}.xdco.tmp
++	( echo "/* Script for -pie -z combreloc -z relro: position independent executable, combine & sort relocs with separate code segment */"
++	  . ${CUSTOMIZER_SCRIPT}
++	  . ${srcdir}/scripttempl/${SCRIPT_NAME}.sc
++	) | sed -e '/^ *$/d;s/[	 ]*$//' > ldscripts/${EMULATION_NAME}.xdco
++	rm -f ${COMBRELOC}
++	LD_FLAG=wpietextonly
++	COMBRELOC=ldscripts/${EMULATION_NAME}.xdceo.tmp
++	( echo "/* Script for -pie -z combreloc -z relro -z separate-code: position independent executable, combine & sort relocs with separate code segment */"
++	  . ${CUSTOMIZER_SCRIPT}
++	  . ${srcdir}/scripttempl/${SCRIPT_NAME}.sc
++	) | sed -e '/^ *$/d;s/[	 ]*$//' > ldscripts/${EMULATION_NAME}.xdceo
++	rm -f ${COMBRELOC}
++
++	unset RELRO
++    fi
++    COMBRELOC=
+   fi
+   unset CREATE_PIE
+ fi
+Only in binutils.orig/ld/testsuite/ld-s390: gotreloc_64-1.dd
+Only in binutils-2.31.1/ld/testsuite/ld-s390: gotreloc_64-norelro-1.dd
+Only in binutils-2.31.1/ld/testsuite/ld-s390: gotreloc_64-relro-1.dd
+diff -rup binutils.orig/ld/testsuite/ld-s390/s390.exp binutils-2.31.1/ld/testsuite/ld-s390/s390.exp
+--- binutils.orig/ld/testsuite/ld-s390/s390.exp	2018-07-19 12:37:28.498025644 +0100
++++ binutils-2.31.1/ld/testsuite/ld-s390/s390.exp	2018-07-19 12:38:11.236548705 +0100
+@@ -70,10 +70,15 @@ set s390xtests {
+      {{readelf -WSsrl tlsbin_64.rd} {objdump -dzrj.text tlsbin_64.dd}
+       {objdump -sj.got tlsbin_64.sd} {objdump -sj.tdata tlsbin_64.td}}
+      "tlsbin_64"}
+-    {"GOT: symbol address load from got to larl"
+-     "-shared -melf64_s390 --hash-style=sysv --version-script=gotreloc-1.ver" ""
++    {"GOT: norelro symbol address load from got to larl"
++     "-shared -melf64_s390 -z norelro --hash-style=sysv --version-script=gotreloc-1.ver" ""
+      "-m64" {gotreloc-1.s}
+-     {{objdump -dzrj.text gotreloc_64-1.dd}}
++     {{objdump -dzrj.text gotreloc_64-norelro-1.dd}}
++     "gotreloc_64-1"}
++    {"GOT: relro symbol address load from got to larl"
++     "-shared -melf64_s390 -z relro --hash-style=sysv --version-script=gotreloc-1.ver" ""
++     "-m64" {gotreloc-1.s}
++     {{objdump -dzrj.text gotreloc_64-relro-1.dd}}
+      "gotreloc_64-1"}
+     {"PLT: offset test"
+      "-shared -m elf64_s390 -dT pltoffset-1.ld" ""

binutils-suppress-ld-align-tests.patch

@@ -1,13 +0,0 @@
---- binutils.orig/ld/testsuite/ld-elf/linux-x86.exp	2024-01-24 11:52:35.288014542 +0000
-+++ binutils-2.41/ld/testsuite/ld-elf/linux-x86.exp	2024-01-24 17:31:39.356167357 +0000
-@@ -225,6 +225,10 @@ if { [check_ifunc_attribute_available] }
- # Old gcc silently ignores __attribute__ ((aligned())) with too big alignment.
- proc compiler_honours_aligned { } {
-     global CC_FOR_TARGET READELF srcdir subdir
-+
-+    # Temporary fix for CentOS-10 kernel issue.  (RHEL-22466)
-+    return 0 
-+    
-     ld_compile $CC_FOR_TARGET $srcdir/$subdir/p_align-1.c tmpdir/p_align-1.o
-     set output [run_host_cmd "$READELF" "-SW tmpdir/p_align-1.o"]
-     if { [regexp { [.]data *PROGBITS .* 8388608[\n]} $output] } {

binutils-x86-no-scale-8bit-displacements.patch

@@ -0,0 +1,38 @@
+Only in binutils-2.31.1/gas: ChangeLog.orig
+diff -rup binutils.orig/gas/config/tc-i386.c binutils-2.31.1/gas/config/tc-i386.c
+--- binutils.orig/gas/config/tc-i386.c	2019-04-10 10:31:32.788961110 +0100
++++ binutils-2.31.1/gas/config/tc-i386.c	2019-04-10 10:31:57.669774802 +0100
+@@ -7857,7 +7857,8 @@ output_disp (fragS *insn_start_frag, off
+ 	      int size = disp_size (n);
+ 	      offsetT val = i.op[n].disps->X_add_number;
+ 
+-	      val = offset_in_range (val >> i.memshift, size);
++	      val = offset_in_range (val >> (size == 1 ? i.memshift : 0),
++				     size);
+ 	      p = frag_more (size);
+ 	      md_number_to_chars (p, val, size);
+ 	    }
+Only in binutils-2.31.1/gas/config: tc-i386.c.orig
+Only in binutils-2.31.1/gas/testsuite/gas/i386: evex-no-scale-32.d
+Only in binutils-2.31.1/gas/testsuite/gas/i386: evex-no-scale-64.d
+Only in binutils-2.31.1/gas/testsuite/gas/i386: evex-no-scale.s
+diff -rup binutils.orig/gas/testsuite/gas/i386/i386.exp binutils-2.31.1/gas/testsuite/gas/i386/i386.exp
+--- binutils.orig/gas/testsuite/gas/i386/i386.exp	2019-04-10 10:31:32.160965768 +0100
++++ binutils-2.31.1/gas/testsuite/gas/i386/i386.exp	2019-04-10 10:31:57.670774795 +0100
+@@ -224,6 +224,7 @@ if [expr ([istarget "i*86-*-*"] ||  [ist
+     run_dump_test "evex-lig512-intel"
+     run_dump_test "evex-wig1"
+     run_dump_test "evex-wig1-intel"
++    run_dump_test "evex-no-scale-32"
+     run_dump_test "sse2avx"
+     run_list_test "inval-avx" "-al"
+     run_list_test "inval-avx512f" "-al"
+@@ -733,6 +734,7 @@ if [expr ([istarget "i*86-*-*"] || [ista
+     run_dump_test "x86-64-evex-lig512-intel"
+     run_dump_test "x86-64-evex-wig1"
+     run_dump_test "x86-64-evex-wig1-intel"
++    run_dump_test "evex-no-scale-64"
+     run_dump_test "x86-64-sse2avx"
+     run_list_test "x86-64-inval-avx" "-al"
+     run_list_test "x86-64-inval-avx512f" "-al"
+Only in binutils-2.31.1/gas/testsuite/gas/i386: i386.exp.orig

gating.yaml

@@ -1,15 +0,0 @@
---- !Policy
-product_versions:
-  - fedora-*
-decision_context: bodhi_update_push_stable
-subject_type: koji_build
-rules:
-  - !PassingTestCaseRule {test_case_name: baseos-qe.koji-build.scratch-build.validation}
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
---- !Policy
-product_versions:
-  - rhel-9
-decision_context: osci_compose_gate
-rules:
-  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.gate-build-fast-lane.functional}
-  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.gate-build-slow-lane.functional}

plans/build-gating.fmf

@@ -1,26 +0,0 @@
-#
-# Build/PR gating tests for binutils
-#
-
-/common:
-  plan:
-    import:
-      url: https://gitlab.com/redhat/centos-stream/tests/binutils.git
-      ref: main
-      name: /plans/build-gating/common
-
-/kernel-rebuild:
-  plan:
-    import:
-      url: https://gitlab.com/redhat/centos-stream/tests/binutils.git
-      ref: main
-      name: /plans/build-gating/kernel-rebuild
-
-adjust+:
-  - because: "Plan to be ran when executed locally, or executed by CI system to gate a build or PR."
-    # `commit` is used by Fedora CI, CentOS Stream CI, `build` by BaseOS CI
-    when: >-
-      trigger is defined
-      and trigger != commit
-      and trigger != build
-    enabled: false

plans/regression.fmf

@@ -1,18 +0,0 @@
-#
-# Build/PR gating tests for binutils
-#
-
-/common:
-  plan:
-    import:
-      url: https://gitlab.com/redhat/centos-stream/tests/binutils.git
-      ref: main
-      name: /plans/regression
-
-adjust+:
-  - because: "Plan to be ran when executed locally, or executed by CI system after updating an erratum/bodhi update."
-    # `build` is used by Bodhi
-    when: >-
-      trigger is defined
-      and trigger != build
-    enabled: false

sources

@@ -1,2 +1 @@
-SHA512 (binutils-with-gold-2.47.50-48c933a69a8.tar.xz) = c4300e4881227c431c0bbbb949a5ee5bc113701f993766418b152df7d46d9df378ebace9efffcb6e1f0b7e72ad716bbcccf5b6aa55851dc28216555b242d18a0
-SHA512 (binutils-2.19.50.0.1-output-format.sed) = 2f8686b0c8af13c98cda056824c2820416f6e2d003f70b78ccf5314525b9ee3684d421dfa83e638a2d42d06ea4d4bdaf5226b64d6ec26f7ff59c44ffb2a23dd2
+SHA512 (binutils-2.31.1.tar.xz) = 0fca326feb1d5f5fe505a827b20237fe3ec9c13eaf7ec7e35847fd71184f605ba1cefe1314b1b8f8a29c0aa9d88162849ee1c1a3e70c2f7407d88339b17edb30