Update to 2.36.1

2021-02-15 16:28:48 +01:00 · 2021-02-15 16:28:48 +01:00 · f9882af93d
commit f9882af93d
parent f23ce7cd88
20 changed files with 850 additions and 900 deletions
--- a/.gitignore
+++ b/.gitignore
@ -17,3 +17,4 @@ binutils-2.20.1.tar.bz2
 /binutils-2.30.tar.bz2
 /binutils-2.32.tar.bz2
 /binutils-2.34.tar.bz2
+/binutils-2.36.1.tar.bz2
--- a/binutils-2.27-aarch64-ifunc.patch
+++ b/binutils-2.27-aarch64-ifunc.patch
@ -1,7 +1,7 @@
-diff -rup binutils.orig/bfd/elfnn-aarch64.c binutils-2.27/bfd/elfnn-aarch64.c
--- binutils.orig/bfd/elfnn-aarch64.c	2017-02-21 10:45:19.311956006 +0000
-+++ binutils-2.27/bfd/elfnn-aarch64.c	2017-02-21 11:55:07.517922655 +0000
-@@ -4947,6 +4947,7 @@ elfNN_aarch64_final_link_relocate (reloc
+diff -rupN --no-dereference binutils-2.36.1/bfd/elfnn-aarch64.c binutils-2.36.1-new/bfd/elfnn-aarch64.c
+--- binutils-2.36.1/bfd/elfnn-aarch64.c	2021-01-09 11:47:33.000000000 +0100
+++ binutils-2.36.1-new/bfd/elfnn-aarch64.c	2021-02-13 18:13:13.323258545 +0100
+@@ -5473,6 +5473,7 @@ elfNN_aarch64_final_link_relocate (reloc
      it here if it is defined in a non-shared object.  */
   if (h != NULL
       && h->type == STT_GNU_IFUNC
--- a/binutils-2.36-branch-updates.patch
+++ b/binutils-2.36-branch-updates.patch
@ -1,6 +1,6 @@
-diff -rup binutils.orig/binutils/objcopy.c binutils-2.36.1/binutils/objcopy.c
--- binutils.orig/binutils/objcopy.c	2021-02-11 10:53:45.582148696 +0000
-+++ binutils-2.36.1/binutils/objcopy.c	2021-02-11 10:54:25.226852733 +0000
+diff -rupN --no-dereference binutils-2.36.1/binutils/objcopy.c binutils-2.36.1-new/binutils/objcopy.c
+--- binutils-2.36.1/binutils/objcopy.c	2021-02-05 15:13:40.000000000 +0100
+++ binutils-2.36.1-new/binutils/objcopy.c	2021-02-13 18:13:20.401224360 +0100
@@ -3769,7 +3769,7 @@ copy_file (const char *input_filename, c
   /* To allow us to do "strip *" without dying on the first
      non-object file, failures are nonfatal.  */
@ -10,9 +10,9 @@ diff -rup binutils.orig/binutils/objcopy.c binutils-2.36.1/binutils/objcopy.c
     {
       bfd_nonfatal_message (input_filename, NULL, NULL, NULL);
       status = 1;
-diff -rup binutils.orig/ld/testsuite/ld-i386/i386.exp binutils-2.36.1/ld/testsuite/ld-i386/i386.exp
--- binutils.orig/ld/testsuite/ld-i386/i386.exp	2021-02-11 10:53:45.739147527 +0000
-+++ binutils-2.36.1/ld/testsuite/ld-i386/i386.exp	2021-02-11 10:55:36.505320591 +0000
+diff -rupN --no-dereference binutils-2.36.1/ld/testsuite/ld-i386/i386.exp binutils-2.36.1-new/ld/testsuite/ld-i386/i386.exp
+--- binutils-2.36.1/ld/testsuite/ld-i386/i386.exp	2021-01-18 16:00:36.000000000 +0100
+++ binutils-2.36.1-new/ld/testsuite/ld-i386/i386.exp	2021-02-13 18:13:20.401224360 +0100
@@ -1105,69 +1105,6 @@ if { [isnative]
 	    {pass.c property-stack.S} \
 	    "property-3-static" "pass.out" \
@ -83,9 +83,9 @@ diff -rup binutils.orig/ld/testsuite/ld-i386/i386.exp binutils-2.36.1/ld/testsui
     ]
 
     undefined_weak "$NOPIE_CFLAGS" "$NOPIE_LDFLAGS"
-diff -rup binutils.orig/ld/testsuite/ld-x86-64/x86-64.exp binutils-2.36.1/ld/testsuite/ld-x86-64/x86-64.exp
--- binutils.orig/ld/testsuite/ld-x86-64/x86-64.exp	2021-02-11 10:53:45.702147802 +0000
-+++ binutils-2.36.1/ld/testsuite/ld-x86-64/x86-64.exp	2021-02-11 10:56:09.481074386 +0000
+diff -rupN --no-dereference binutils-2.36.1/ld/testsuite/ld-x86-64/x86-64.exp binutils-2.36.1-new/ld/testsuite/ld-x86-64/x86-64.exp
+--- binutils-2.36.1/ld/testsuite/ld-x86-64/x86-64.exp	2021-01-11 13:43:47.000000000 +0100
+++ binutils-2.36.1-new/ld/testsuite/ld-x86-64/x86-64.exp	2021-02-13 18:13:20.401224360 +0100
@@ -1583,69 +1583,6 @@ if { [isnative] && [check_compiler_avail
 	    "property-3-static" "pass.out" \
 	] \
--- a/binutils-CVE-2019-1010204.patch
+++ b/binutils-CVE-2019-1010204.patch
@ -1,6 +1,7 @@
--- binutils.orig/gold/fileread.cc	2019-08-06 14:22:08.669313110 +0100
-+++ binutils-2.32/gold/fileread.cc	2019-08-06 14:22:28.799177543 +0100
-@@ -381,6 +381,12 @@ File_read::do_read(off_t start, section_
+diff -rupN --no-dereference binutils-2.36.1/gold/fileread.cc binutils-2.36.1-new/gold/fileread.cc
+--- binutils-2.36.1/gold/fileread.cc	2021-01-09 11:47:34.000000000 +0100
+++ binutils-2.36.1-new/gold/fileread.cc	2021-02-13 18:13:17.754237190 +0100
+@@ -385,6 +385,12 @@ File_read::do_read(off_t start, section_
   ssize_t bytes;
   if (this->whole_file_view_ != NULL)
     {
--- a/binutils-config.patch
+++ b/binutils-config.patch
@ -1,6 +1,6 @@
-diff -rupN --no-dereference binutils-2.34/config/intdiv0.m4 binutils-2.34-new/config/intdiv0.m4
--- binutils-2.34/config/intdiv0.m4	2020-01-18 14:55:47.000000000 +0100
-+++ binutils-2.34-new/config/intdiv0.m4	2020-12-18 02:57:26.339013830 +0100
+diff -rupN --no-dereference binutils-2.36.1/config/intdiv0.m4 binutils-2.36.1-new/config/intdiv0.m4
+--- binutils-2.36.1/config/intdiv0.m4	2021-01-09 11:47:33.000000000 +0100
+++ binutils-2.36.1-new/config/intdiv0.m4	2021-02-13 18:13:22.165215781 +0100
@@ -31,10 +31,10 @@ sigfpe_handler (sig) int sig;
   exit (sig != SIGFPE);
 }
@ -16,10 +16,10 @@ diff -rupN --no-dereference binutils-2.34/config/intdiv0.m4 binutils-2.34-new/co
 
 int main ()
 {
-diff -rupN --no-dereference binutils-2.34/libiberty/aclocal.m4 binutils-2.34-new/libiberty/aclocal.m4
--- binutils-2.34/libiberty/aclocal.m4	2020-01-18 14:55:48.000000000 +0100
-+++ binutils-2.34-new/libiberty/aclocal.m4	2020-12-18 02:57:26.339013830 +0100
-@@ -147,7 +147,7 @@ if test $ac_cv_os_cray = yes; then
+diff -rupN --no-dereference binutils-2.36.1/libiberty/aclocal.m4 binutils-2.36.1-new/libiberty/aclocal.m4
+--- binutils-2.36.1/libiberty/aclocal.m4	2021-01-09 11:47:34.000000000 +0100
+++ binutils-2.36.1-new/libiberty/aclocal.m4	2021-02-13 18:13:22.166215776 +0100
+@@ -149,7 +149,7 @@ if test $ac_cv_os_cray = yes; then
 fi
 
 AC_CACHE_CHECK(stack direction for C alloca, ac_cv_c_stack_direction,
@ -28,10 +28,10 @@ diff -rupN --no-dereference binutils-2.34/libiberty/aclocal.m4 binutils-2.34-new
 {
   static char *addr = 0;
   auto char dummy;
-diff -rupN --no-dereference binutils-2.34/libiberty/configure.ac binutils-2.34-new/libiberty/configure.ac
--- binutils-2.34/libiberty/configure.ac	2020-01-18 14:55:48.000000000 +0100
-+++ binutils-2.34-new/libiberty/configure.ac	2020-12-18 02:57:26.339013830 +0100
-@@ -661,7 +661,7 @@ if test -z "${setobjs}"; then
+diff -rupN --no-dereference binutils-2.36.1/libiberty/configure.ac binutils-2.36.1-new/libiberty/configure.ac
+--- binutils-2.36.1/libiberty/configure.ac	2021-01-09 11:47:34.000000000 +0100
+++ binutils-2.36.1-new/libiberty/configure.ac	2021-02-13 18:13:22.166215776 +0100
+@@ -665,7 +665,7 @@ if test -z "${setobjs}"; then
   for v in $vars; do
     AC_MSG_CHECKING([for $v])
     AC_CACHE_VAL(libiberty_cv_var_$v,
--- a/binutils-do-not-link-with-static-libstdc++.patch
+++ b/binutils-do-not-link-with-static-libstdc++.patch
@ -1,7 +1,7 @@
-diff -rup binutils.orig/configure binutils-2.30/configure
--- binutils.orig/configure	2018-09-24 17:50:06.967172922 +0100
-+++ binutils-2.30/configure	2018-09-24 17:51:16.648624865 +0100
-@@ -4996,49 +4996,6 @@ if test -z "$LD"; then
+diff -rupN --no-dereference binutils-2.36.1/configure binutils-2.36.1-new/configure
+--- binutils-2.36.1/configure	2021-01-24 11:41:35.000000000 +0100
+++ binutils-2.36.1-new/configure	2021-02-13 18:13:14.200254331 +0100
+@@ -5075,49 +5075,6 @@ if test -z "$LD"; then
   fi
 fi
 
@ -51,10 +51,10 @@ diff -rup binutils.orig/configure binutils-2.30/configure
 
 
 if test -n "$ac_tool_prefix"; then
-diff -rup binutils.orig/configure.ac binutils-2.30/configure.ac
--- binutils.orig/configure.ac	2018-09-24 17:50:07.241170767 +0100
-+++ binutils-2.30/configure.ac	2018-09-24 17:50:29.908992486 +0100
-@@ -1288,26 +1288,6 @@ if test -z "$LD"; then
+diff -rupN --no-dereference binutils-2.36.1/configure.ac binutils-2.36.1-new/configure.ac
+--- binutils-2.36.1/configure.ac	2021-02-06 10:25:05.000000000 +0100
+++ binutils-2.36.1-new/configure.ac	2021-02-13 18:13:14.201254326 +0100
+@@ -1302,26 +1302,6 @@ if test -z "$LD"; then
   fi
 fi
 
--- a/binutils-export-demangle.h.patch
+++ b/binutils-export-demangle.h.patch
@ -1,6 +1,6 @@
-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
+diff -rupN --no-dereference binutils-2.36.1/bfd/Makefile.am binutils-2.36.1-new/bfd/Makefile.am
+--- binutils-2.36.1/bfd/Makefile.am	2021-02-13 18:13:08.892279748 +0100
+++ binutils-2.36.1-new/bfd/Makefile.am	2021-02-13 18:13:08.894279739 +0100
@@ -33,7 +33,7 @@ bfdlibdir = @bfdlibdir@
 bfdincludedir = @bfdincludedir@
 bfdlib_LTLIBRARIES = libbfd.la
@ -10,9 +10,9 @@ diff -rup binutils.orig/bfd/Makefile.am binutils-2.32/bfd/Makefile.am
 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
+diff -rupN --no-dereference binutils-2.36.1/bfd/Makefile.in binutils-2.36.1-new/bfd/Makefile.in
+--- binutils-2.36.1/bfd/Makefile.in	2021-02-13 18:13:08.892279748 +0100
+++ binutils-2.36.1-new/bfd/Makefile.in	2021-02-13 18:13:08.895279734 +0100
@@ -249,7 +249,7 @@ am__can_run_installinfo = \
   esac
 am__bfdinclude_HEADERS_DIST = $(INCDIR)/plugin-api.h bfd.h \
@ -22,7 +22,7 @@ diff -rup binutils.orig/bfd/Makefile.in binutils-2.32/bfd/Makefile.in
 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
+@@ -469,7 +469,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 \
--- a/binutils-filename-in-error-messages.patch
+++ b/binutils-filename-in-error-messages.patch
@ -1,6 +1,7 @@
--- binutils.orig/binutils/readelf.c	2020-07-24 14:55:25.163647522 +0100
-+++ binutils-2.35/binutils/readelf.c	2020-07-24 15:02:39.613851369 +0100
-@@ -20729,79 +20729,92 @@ process_file (char * file_name)
+diff -rupN --no-dereference binutils-2.36.1/binutils/readelf.c binutils-2.36.1-new/binutils/readelf.c
+--- binutils-2.36.1/binutils/readelf.c	2021-01-09 11:47:33.000000000 +0100
+++ binutils-2.36.1-new/binutils/readelf.c	2021-02-13 18:13:10.680271211 +0100
+@@ -21386,79 +21386,92 @@ process_file (char * file_name)
   Filedata * filedata = NULL;
   struct stat statbuf;
   char armag[SARMAG];
@ -61,10 +62,10 @@
   if (fread (armag, SARMAG, 1, filedata->handle) != 1)
     {
 -      error (_("%s: Failed to read file's magic number\n"), file_name);
-+      error (_("Failed to read file's magic number\n"));
-       fclose (filedata->handle);
+-      fclose (filedata->handle);
 -      free (filedata);
 -      return FALSE;
+      error (_("Failed to read file's magic number\n"));
 +      goto done;
     }
 
@ -109,7 +110,8 @@
 + done:
 +  if (filedata)
 +    {
-+      fclose (filedata->handle);
+      if (filedata->handle != NULL)
+	fclose (filedata->handle);
 +      free (filedata->section_headers);
 +      free (filedata->program_headers);
 +      free (filedata->string_table);
@ -121,25 +123,3 @@
 
   free (ba_cache.strtab);
   ba_cache.strtab = NULL;
--- binutils.orig/binutils/readelf.c	2021-01-07 12:59:35.802994842 +0000
-+++ binutils-2.35.1/binutils/readelf.c	2021-01-07 13:02:36.591754005 +0000
-@@ -20818,7 +20818,8 @@ process_file (char * file_name)
-  done:
-   if (filedata)
-     {
-      fclose (filedata->handle);
-+      if (filedata->handle != NULL)
-+	fclose (filedata->handle);
-       free (filedata->section_headers);
-       free (filedata->program_headers);
-       free (filedata->string_table);
--- binutils.orig/binutils/readelf.c	2021-01-08 17:01:23.573093204 +0000
-+++ binutils-2.35.1/binutils/readelf.c	2021-01-08 17:02:23.095677242 +0000
-@@ -20787,7 +20787,6 @@ process_file (char * file_name)
-   if (fread (armag, SARMAG, 1, filedata->handle) != 1)
-     {
-       error (_("Failed to read file's magic number\n"));
-      fclose (filedata->handle);
-       goto done;
-     }
- 
--- a/binutils-fix-testsuite-failures.patch
+++ b/binutils-fix-testsuite-failures.patch
@ -1,305 +1,6 @@
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-10.d binutils-2.32/ld/testsuite/ld-plugin/plugin-10.d
--- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-10.d	2019-02-15 13:33:21.979627285 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-10.d	2019-02-15 13:40:26.911199033 +0000
-@@ -34,5 +34,6 @@ hook called: claim_file tmpdir/libtext.a
- hook called: all symbols read.
- Sym: '_?func' Resolution: LDPR_PREVAILING_DEF
- Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY
-+#...
- hook called: cleanup.
- #...
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-13.d binutils-2.32/ld/testsuite/ld-plugin/plugin-13.d
--- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-13.d	2019-02-15 13:33:21.980627277 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-13.d	2019-02-15 13:41:30.189692800 +0000
-@@ -23,5 +23,3 @@ hook called: claim_file tmpdir/main.o \[
- hook called: claim_file .*/ld/testsuite/ld-plugin/func.c \[@0/.* CLAIMED
- hook called: claim_file tmpdir/text.o \[@0/.* not claimed
- #...
-.*main.c.*: undefined reference to `\.?func'
-#...
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-14.d binutils-2.32/ld/testsuite/ld-plugin/plugin-14.d
--- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-14.d	2019-02-15 13:33:21.977627301 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-14.d	2019-02-15 13:42:03.598430960 +0000
-@@ -27,7 +27,6 @@ hook called: claim_file .*/ld/testsuite/
- hook called: claim_file tmpdir/text.o \[@0/.* not claimed
- #...
- hook called: all symbols read.
-.*: tmpdir/main.o: in function `main':
-.*main.c.*: undefined reference to `\.?func'
-+#...
- hook called: cleanup.
- #...
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-15.d binutils-2.32/ld/testsuite/ld-plugin/plugin-15.d
--- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-15.d	2019-02-15 13:33:21.980627277 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-15.d	2019-02-15 13:42:28.014239600 +0000
-@@ -28,7 +28,6 @@ hook called: claim_file .*/ld/testsuite/
- hook called: claim_file tmpdir/text.o \[@0/.* not claimed
- #...
- hook called: all symbols read.
-.*: tmpdir/main.o: in function `main':
-.*main.c.*: undefined reference to `\.?func'
-+#...
- hook called: cleanup.
- #...
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-16.d binutils-2.32/ld/testsuite/ld-plugin/plugin-16.d
--- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-16.d	2019-02-15 13:33:21.977627301 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-16.d	2019-02-15 13:43:21.309821910 +0000
-@@ -30,9 +30,8 @@ hook called: claim_file .*/ld/testsuite/
- hook called: claim_file tmpdir/text.o \[@0/.* not claimed
- #...
- hook called: all symbols read.
-Sym: '_?func' Resolution: LDPR_PREVAILING_DEF
-+Sym: '_?func' Resolution: LDPR_PREVAILING_DEF_IRONLY
- Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY
-.*: tmpdir/main.o: in function `main':
-.*main.c.*: undefined reference to `\.?func'
-+#...
- hook called: cleanup.
- #...
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-17.d binutils-2.32/ld/testsuite/ld-plugin/plugin-17.d
--- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-17.d	2019-02-15 13:33:21.977627301 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-17.d	2019-02-15 13:43:54.925558451 +0000
-@@ -31,7 +31,8 @@ hook called: claim_file .*/ld/testsuite/
- hook called: claim_file tmpdir/text.o \[@0/.* not claimed
- #...
- hook called: all symbols read.
-Sym: '_?func' Resolution: LDPR_PREVAILING_DEF
-+Sym: '_?func' Resolution: LDPR_PREVAILING_DEF_IRONLY
- Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY
-+#...
- hook called: cleanup.
- #...
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-20.d binutils-2.32/ld/testsuite/ld-plugin/plugin-20.d
--- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-20.d	2019-02-15 13:33:21.980627277 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-20.d	2019-02-15 13:49:20.091010016 +0000
-@@ -2,6 +2,5 @@ hook called: all symbols read.
- Input: func.c \(tmpdir/libfunc.a\)
- Sym: '_?func' Resolution: LDPR_PREVAILING_DEF.*
- Sym: '_?func' Resolution: LDPR_PREVAILING_DEF.*
-.*: tmpdir/main.o: in function `main':
-.*main.c.*: undefined reference to `\.?func'
-+#...
- hook called: cleanup.
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-21.d binutils-2.32/ld/testsuite/ld-plugin/plugin-21.d
--- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-21.d	2019-02-15 13:33:21.978627293 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-21.d	2019-02-15 13:49:34.506897033 +0000
-@@ -2,6 +2,5 @@ hook called: all symbols read.
- Input: .*/ld/testsuite/ld-plugin/func.c \(.*/ld/testsuite/ld-plugin/func.c\)
- Sym: '_?func' Resolution: LDPR_PREVAILING_DEF.*
- Sym: '_?func' Resolution: LDPR_PREVAILING_DEF.*
-.*: tmpdir/main.o: in function `main':
-.*main.c.*: undefined reference to `\.?func'
-+#...
- hook called: cleanup.
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-22.d binutils-2.32/ld/testsuite/ld-plugin/plugin-22.d
--- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-22.d	2019-02-15 13:33:21.980627277 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-22.d	2019-02-15 13:50:00.409694022 +0000
-@@ -2,6 +2,5 @@ Claimed: tmpdir/libfunc.a \[@.*
- hook called: all symbols read.
- Sym: '_?func' Resolution: LDPR_PREVAILING_DEF.*
- Sym: '_?func' Resolution: LDPR_PREVAILING_DEF.*
-.*: tmpdir/main.o: in function `main':
-.*main.c.*: undefined reference to `\.?func'
-+#...
- hook called: cleanup.
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-23.d binutils-2.32/ld/testsuite/ld-plugin/plugin-23.d
--- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-23.d	2019-02-15 13:33:21.979627285 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-23.d	2019-02-15 13:50:14.938580156 +0000
-@@ -2,6 +2,5 @@ Claimed: .*/ld/testsuite/ld-plugin/func.
- hook called: all symbols read.
- Sym: '_?func' Resolution: LDPR_PREVAILING_DEF.*
- Sym: '_?func' Resolution: LDPR_PREVAILING_DEF.*
-.*: tmpdir/main.o: in function `main':
-.*main.c.*: undefined reference to `\.?func'
-+#...
- hook called: cleanup.
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-24.d binutils-2.32/ld/testsuite/ld-plugin/plugin-24.d
--- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-24.d	2019-02-15 13:33:21.980627277 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-24.d	2019-02-15 13:49:46.346804240 +0000
-@@ -2,4 +2,5 @@ hook called: all symbols read.
- Input: .*/ld/testsuite/ld-plugin/func.c \(.*/ld/testsuite/ld-plugin/func.c\)
- Sym: '_?func' Resolution: LDPR_PREVAILING_DEF.*
- Sym: '_?func' Resolution: LDPR_PREVAILING_DEF.*
-+#...
- hook called: cleanup.
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-25.d binutils-2.32/ld/testsuite/ld-plugin/plugin-25.d
--- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-25.d	2019-02-15 13:33:21.978627293 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-25.d	2019-02-15 13:50:29.322467422 +0000
-@@ -2,4 +2,5 @@ Claimed: .*/ld/testsuite/ld-plugin/func.
- hook called: all symbols read.
- Sym: '_?func' Resolution: LDPR_PREVAILING_DEF.*
- Sym: '_?func' Resolution: LDPR_PREVAILING_DEF.*
-+#...
- hook called: cleanup.
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-28.d binutils-2.32/ld/testsuite/ld-plugin/plugin-28.d
--- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-28.d	2019-02-15 13:33:21.977627301 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-28.d	2019-02-15 13:45:05.343006557 +0000
-@@ -1 +1,3 @@
- .*: error: Error
-+#...
-+
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-29.d binutils-2.32/ld/testsuite/ld-plugin/plugin-29.d
--- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-29.d	2019-02-15 13:33:21.978627293 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-29.d	2019-02-15 13:45:22.764870016 +0000
-@@ -1 +1,2 @@
- .*: warning: Warning
-+#...
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-30.d binutils-2.32/ld/testsuite/ld-plugin/plugin-30.d
--- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-30.d	2019-02-15 13:33:21.976627309 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-30.d	2019-02-15 13:48:57.067190464 +0000
-@@ -24,3 +24,4 @@ hook called: claim_file tmpdir/main.o \[
- hook called: claim_file tmpdir/func.o \[@0/.* not claimed
- hook called: claim_file tmpdir/text.o \[@0/.* not claimed
- hook called: claim_file tmpdir/libempty.a \[@.* not claimed
-+#pass
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-6.d binutils-2.32/ld/testsuite/ld-plugin/plugin-6.d
--- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-6.d	2019-02-15 13:33:21.979627285 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-6.d	2019-02-15 13:37:14.672749977 +0000
-@@ -27,7 +27,6 @@ hook called: claim_file tmpdir/func.o \[
- hook called: claim_file tmpdir/text.o \[@0/.* not claimed
- #...
- hook called: all symbols read.
-.*: tmpdir/main.o: in function `main':
-.*main.c.*: undefined reference to `\.?func'
-+#...
- hook called: cleanup.
- #...
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-7.d binutils-2.32/ld/testsuite/ld-plugin/plugin-7.d
--- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-7.d	2019-02-15 13:33:21.977627301 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-7.d	2019-02-15 13:37:58.000400421 +0000
-@@ -28,7 +28,6 @@ hook called: claim_file tmpdir/func.o \[
- hook called: claim_file tmpdir/text.o \[@0/.* not claimed
- #...
- hook called: all symbols read.
-.*: tmpdir/main.o: in function `main':
-.*main.c.*: undefined reference to `\.?func'
-+#...
- hook called: cleanup.
- #...
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-8.d binutils-2.32/ld/testsuite/ld-plugin/plugin-8.d
--- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-8.d	2019-02-15 13:33:21.980627277 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-8.d	2019-02-15 13:38:34.096109209 +0000
-@@ -32,7 +32,6 @@ hook called: claim_file tmpdir/text.o \[
- hook called: all symbols read.
- Sym: '_?func' Resolution: LDPR_PREVAILING_DEF
- Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY
-.*: tmpdir/main.o: in function `main':
-.*main.c.*: undefined reference to `\.?func'
-+#...
- hook called: cleanup.
- #...
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-9.d binutils-2.32/ld/testsuite/ld-plugin/plugin-9.d
--- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-9.d	2019-02-15 13:33:21.977627301 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-9.d	2019-02-15 13:39:52.655475403 +0000
-@@ -31,7 +31,8 @@ hook called: claim_file tmpdir/func.o \[
- hook called: claim_file tmpdir/text.o \[@0/.* not claimed
- #...
- hook called: all symbols read.
-Sym: '_?func' Resolution: LDPR_PREVAILING_DEF
-+Sym: '_?func' Resolution: LDPR_PREVAILING_DEF_IRONLY
- Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY
-+#...
- hook called: cleanup.
- #...
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/pr20070.d binutils-2.32/ld/testsuite/ld-plugin/pr20070.d
--- binutils-2.32.orig/ld/testsuite/ld-plugin/pr20070.d	2019-02-15 13:33:21.976627309 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/pr20070.d	2019-02-15 13:50:56.874251486 +0000
-@@ -5,5 +5,6 @@ Sym: 'weakdef' Resolution: LDPR_PREVAILI
- Sym: 'undef' Resolution: LDPR_UNDEF
- Sym: 'weakundef' Resolution: LDPR_UNDEF
- Sym: 'common' Resolution: LDPR_PREVAILING_DEF_IRONLY
-+#...
- hook called: cleanup.
- #...
-diff -rup binutils-2.32.orig/ld/testsuite/ld-srec/srec.exp binutils-2.32/ld/testsuite/ld-srec/srec.exp
--- binutils-2.32.orig/ld/testsuite/ld-srec/srec.exp	2019-02-15 13:33:21.938627615 +0000
-+++ binutils-2.32/ld/testsuite/ld-srec/srec.exp	2019-02-15 13:53:58.744814006 +0000
-@@ -21,6 +21,8 @@
- 
- # Get the offset from an S-record line to the start of the data.
- 
-+return
-+
- proc srec_off { l } {
-     if [string match "S1*" $l] {
- 	return 8
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-10.d binutils-2.32/ld/testsuite/ld-plugin/plugin-10.d
--- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-10.d	2019-02-15 14:10:59.038709514 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-10.d	2019-02-15 14:13:53.532300721 +0000
-@@ -32,7 +32,7 @@ hook called: claim_file tmpdir/func.o \[
- hook called: claim_file tmpdir/libtext.a \[@.* not claimed
- #...
- hook called: all symbols read.
-Sym: '_?func' Resolution: LDPR_PREVAILING_DEF
-+Sym: '_?func' Resolution: LDPR_PREVAILING_DEF_IRONLY
- Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY
- #...
- hook called: cleanup.
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-11.d binutils-2.32/ld/testsuite/ld-plugin/plugin-11.d
--- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-11.d	2019-02-15 14:10:59.041709490 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-11.d	2019-02-15 14:14:50.061844322 +0000
-@@ -35,8 +35,9 @@ hook called: claim_file tmpdir/func.o \[
- hook called: claim_file tmpdir/libtext.a \[@.* CLAIMED
- #...
- hook called: all symbols read.
-Sym: '_?func' Resolution: LDPR_PREVAILING_DEF
-+Sym: '_?func' Resolution: LDPR_PREVAILING_DEF_IRONLY
- Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY
-Sym: '_?text' Resolution: LDPR_PREVAILING_DEF
-+Sym: '_?text' Resolution: LDPR_PREVAILING_DEF_IRONLY
-+#...
- hook called: cleanup.
- #...
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-18.d binutils-2.32/ld/testsuite/ld-plugin/plugin-18.d
--- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-18.d	2019-02-15 14:10:58.942710289 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-18.d	2019-02-15 14:15:20.030602369 +0000
-@@ -32,7 +32,8 @@ hook called: claim_file .*/ld/testsuite/
- hook called: claim_file tmpdir/libtext.a \[@.* not claimed
- #...
- hook called: all symbols read.
-Sym: '_?func' Resolution: LDPR_PREVAILING_DEF
-+Sym: '_?func' Resolution: LDPR_PREVAILING_DEF_IRONLY
- Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY
-+#...
- hook called: cleanup.
- #...
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-19.d binutils-2.32/ld/testsuite/ld-plugin/plugin-19.d
--- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-19.d	2019-02-15 14:10:59.024709627 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-19.d	2019-02-15 14:15:54.926320633 +0000
-@@ -35,8 +35,9 @@ hook called: claim_file .*/ld/testsuite/
- hook called: claim_file tmpdir/libtext.a \[@.* CLAIMED
- #...
- hook called: all symbols read.
-Sym: '_?func' Resolution: LDPR_PREVAILING_DEF
-+Sym: '_?func' Resolution: LDPR_PREVAILING_DEF_IRONLY
- Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY
-Sym: '_?text' Resolution: LDPR_PREVAILING_DEF
-+Sym: '_?text' Resolution: LDPR_PREVAILING_DEF_IRONLY
-+#...
- hook called: cleanup.
- #...
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-28.d binutils-2.32/ld/testsuite/ld-plugin/plugin-28.d
--- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-28.d	2019-02-15 14:10:58.998709837 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-28.d	2019-02-15 14:12:19.856057024 +0000
-@@ -1,3 +1,2 @@
- .*: error: Error
- #...
-
-diff -rup binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-8.d binutils-2.32/ld/testsuite/ld-plugin/plugin-8.d
--- binutils-2.32.orig/ld/testsuite/ld-plugin/plugin-8.d	2019-02-15 14:10:59.074709224 +0000
-+++ binutils-2.32/ld/testsuite/ld-plugin/plugin-8.d	2019-02-15 14:11:48.144313048 +0000
-@@ -30,7 +30,7 @@ hook called: claim_file tmpdir/func.o \[
- hook called: claim_file tmpdir/text.o \[@0/.* not claimed
- #...
- hook called: all symbols read.
-Sym: '_?func' Resolution: LDPR_PREVAILING_DEF
-+Sym: '_?func' Resolution: LDPR_PREVAILING_DEF_IRONLY
- Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY
- #...
- hook called: cleanup.
-diff -rup binutils.orig/ld/testsuite/ld-elfvers/vers24.rd binutils-2.30/ld/testsuite/ld-elfvers/vers24.rd
--- binutils.orig/ld/testsuite/ld-elfvers/vers24.rd	2018-09-05 09:45:44.013108697 +0100
-+++ binutils-2.30/ld/testsuite/ld-elfvers/vers24.rd	2018-09-05 12:06:17.287425232 +0100
+diff -rupN --no-dereference binutils-2.36.1/ld/testsuite/ld-elfvers/vers24.rd binutils-2.36.1-new/ld/testsuite/ld-elfvers/vers24.rd
+--- binutils-2.36.1/ld/testsuite/ld-elfvers/vers24.rd	2021-01-09 11:47:34.000000000 +0100
+++ binutils-2.36.1-new/ld/testsuite/ld-elfvers/vers24.rd	2021-02-13 18:13:16.011245609 +0100
@@ -7,9 +7,9 @@ Symbol table '.dynsym' contains [0-9]+ e
 # And ensure the dynamic symbol table contains at least x@VERS.0
 # and foo@@VERS.0 symbols
@ -312,10 +13,261 @@ diff -rup binutils.orig/ld/testsuite/ld-elfvers/vers24.rd binutils-2.30/ld/tests
 #...
 Symbol table '.symtab' contains [0-9]+ entries:
 #pass
-diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin.exp binutils-2.30/ld/testsuite/ld-plugin/plugin.exp
--- binutils.orig/ld/testsuite/ld-plugin/plugin.exp	2018-09-05 09:45:44.023108605 +0100
-+++ binutils-2.30/ld/testsuite/ld-plugin/plugin.exp	2018-09-05 11:18:53.997202105 +0100
-@@ -118,6 +118,12 @@ if { $can_compile && !$failed_compile }
+diff -rupN --no-dereference binutils-2.36.1/ld/testsuite/ld-plugin/plugin-10.d binutils-2.36.1-new/ld/testsuite/ld-plugin/plugin-10.d
+--- binutils-2.36.1/ld/testsuite/ld-plugin/plugin-10.d	2021-01-09 11:47:34.000000000 +0100
+++ binutils-2.36.1-new/ld/testsuite/ld-plugin/plugin-10.d	2021-02-13 18:13:16.011245609 +0100
+@@ -32,7 +32,8 @@ hook called: claim_file tmpdir/func.o \[
+ hook called: claim_file tmpdir/libtext.a \[@.* not claimed
+ #...
+ hook called: all symbols read.
+-Sym: '_?func' Resolution: LDPR_PREVAILING_DEF
+Sym: '_?func' Resolution: LDPR_PREVAILING_DEF_IRONLY
+ Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY
+#...
+ hook called: cleanup.
+ #...
+diff -rupN --no-dereference binutils-2.36.1/ld/testsuite/ld-plugin/plugin-11.d binutils-2.36.1-new/ld/testsuite/ld-plugin/plugin-11.d
+--- binutils-2.36.1/ld/testsuite/ld-plugin/plugin-11.d	2021-01-09 11:47:34.000000000 +0100
+++ binutils-2.36.1-new/ld/testsuite/ld-plugin/plugin-11.d	2021-02-13 18:13:16.011245609 +0100
+@@ -35,8 +35,9 @@ hook called: claim_file tmpdir/func.o \[
+ hook called: claim_file tmpdir/libtext.a \[@.* CLAIMED
+ #...
+ hook called: all symbols read.
+-Sym: '_?func' Resolution: LDPR_PREVAILING_DEF
+Sym: '_?func' Resolution: LDPR_PREVAILING_DEF_IRONLY
+ Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY
+-Sym: '_?text' Resolution: LDPR_PREVAILING_DEF
+Sym: '_?text' Resolution: LDPR_PREVAILING_DEF_IRONLY
+#...
+ hook called: cleanup.
+ #...
+diff -rupN --no-dereference binutils-2.36.1/ld/testsuite/ld-plugin/plugin-13.d binutils-2.36.1-new/ld/testsuite/ld-plugin/plugin-13.d
+--- binutils-2.36.1/ld/testsuite/ld-plugin/plugin-13.d	2021-01-09 11:47:34.000000000 +0100
+++ binutils-2.36.1-new/ld/testsuite/ld-plugin/plugin-13.d	2021-02-13 18:13:16.008245623 +0100
+@@ -23,5 +23,3 @@ hook called: claim_file tmpdir/main.o \[
+ hook called: claim_file .*/ld/testsuite/ld-plugin/func.c \[@0/.* CLAIMED
+ hook called: claim_file tmpdir/text.o \[@0/.* not claimed
+ #...
+-.*main.c.*: undefined reference to `\.?func'
+-#...
+diff -rupN --no-dereference binutils-2.36.1/ld/testsuite/ld-plugin/plugin-14.d binutils-2.36.1-new/ld/testsuite/ld-plugin/plugin-14.d
+--- binutils-2.36.1/ld/testsuite/ld-plugin/plugin-14.d	2021-01-09 11:47:34.000000000 +0100
+++ binutils-2.36.1-new/ld/testsuite/ld-plugin/plugin-14.d	2021-02-13 18:13:16.008245623 +0100
+@@ -27,7 +27,6 @@ hook called: claim_file .*/ld/testsuite/
+ hook called: claim_file tmpdir/text.o \[@0/.* not claimed
+ #...
+ hook called: all symbols read.
+-.*: tmpdir/main.o: in function `main':
+-.*main.c.*: undefined reference to `\.?func'
+#...
+ hook called: cleanup.
+ #...
+diff -rupN --no-dereference binutils-2.36.1/ld/testsuite/ld-plugin/plugin-15.d binutils-2.36.1-new/ld/testsuite/ld-plugin/plugin-15.d
+--- binutils-2.36.1/ld/testsuite/ld-plugin/plugin-15.d	2021-01-09 11:47:34.000000000 +0100
+++ binutils-2.36.1-new/ld/testsuite/ld-plugin/plugin-15.d	2021-02-13 18:13:16.008245623 +0100
+@@ -28,7 +28,6 @@ hook called: claim_file .*/ld/testsuite/
+ hook called: claim_file tmpdir/text.o \[@0/.* not claimed
+ #...
+ hook called: all symbols read.
+-.*: tmpdir/main.o: in function `main':
+-.*main.c.*: undefined reference to `\.?func'
+#...
+ hook called: cleanup.
+ #...
+diff -rupN --no-dereference binutils-2.36.1/ld/testsuite/ld-plugin/plugin-16.d binutils-2.36.1-new/ld/testsuite/ld-plugin/plugin-16.d
+--- binutils-2.36.1/ld/testsuite/ld-plugin/plugin-16.d	2021-01-09 11:47:34.000000000 +0100
+++ binutils-2.36.1-new/ld/testsuite/ld-plugin/plugin-16.d	2021-02-13 18:13:16.008245623 +0100
+@@ -30,9 +30,8 @@ hook called: claim_file .*/ld/testsuite/
+ hook called: claim_file tmpdir/text.o \[@0/.* not claimed
+ #...
+ hook called: all symbols read.
+-Sym: '_?func' Resolution: LDPR_PREVAILING_DEF
+Sym: '_?func' Resolution: LDPR_PREVAILING_DEF_IRONLY
+ Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY
+-.*: tmpdir/main.o: in function `main':
+-.*main.c.*: undefined reference to `\.?func'
+#...
+ hook called: cleanup.
+ #...
+diff -rupN --no-dereference binutils-2.36.1/ld/testsuite/ld-plugin/plugin-17.d binutils-2.36.1-new/ld/testsuite/ld-plugin/plugin-17.d
+--- binutils-2.36.1/ld/testsuite/ld-plugin/plugin-17.d	2021-01-09 11:47:34.000000000 +0100
+++ binutils-2.36.1-new/ld/testsuite/ld-plugin/plugin-17.d	2021-02-13 18:13:16.009245619 +0100
+@@ -31,7 +31,8 @@ hook called: claim_file .*/ld/testsuite/
+ hook called: claim_file tmpdir/text.o \[@0/.* not claimed
+ #...
+ hook called: all symbols read.
+-Sym: '_?func' Resolution: LDPR_PREVAILING_DEF
+Sym: '_?func' Resolution: LDPR_PREVAILING_DEF_IRONLY
+ Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY
+#...
+ hook called: cleanup.
+ #...
+diff -rupN --no-dereference binutils-2.36.1/ld/testsuite/ld-plugin/plugin-18.d binutils-2.36.1-new/ld/testsuite/ld-plugin/plugin-18.d
+--- binutils-2.36.1/ld/testsuite/ld-plugin/plugin-18.d	2021-01-09 11:47:34.000000000 +0100
+++ binutils-2.36.1-new/ld/testsuite/ld-plugin/plugin-18.d	2021-02-13 18:13:16.011245609 +0100
+@@ -32,7 +32,8 @@ hook called: claim_file .*/ld/testsuite/
+ hook called: claim_file tmpdir/libtext.a \[@.* not claimed
+ #...
+ hook called: all symbols read.
+-Sym: '_?func' Resolution: LDPR_PREVAILING_DEF
+Sym: '_?func' Resolution: LDPR_PREVAILING_DEF_IRONLY
+ Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY
+#...
+ hook called: cleanup.
+ #...
+diff -rupN --no-dereference binutils-2.36.1/ld/testsuite/ld-plugin/plugin-19.d binutils-2.36.1-new/ld/testsuite/ld-plugin/plugin-19.d
+--- binutils-2.36.1/ld/testsuite/ld-plugin/plugin-19.d	2021-01-09 11:47:34.000000000 +0100
+++ binutils-2.36.1-new/ld/testsuite/ld-plugin/plugin-19.d	2021-02-13 18:13:16.011245609 +0100
+@@ -35,8 +35,9 @@ hook called: claim_file .*/ld/testsuite/
+ hook called: claim_file tmpdir/libtext.a \[@.* CLAIMED
+ #...
+ hook called: all symbols read.
+-Sym: '_?func' Resolution: LDPR_PREVAILING_DEF
+Sym: '_?func' Resolution: LDPR_PREVAILING_DEF_IRONLY
+ Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY
+-Sym: '_?text' Resolution: LDPR_PREVAILING_DEF
+Sym: '_?text' Resolution: LDPR_PREVAILING_DEF_IRONLY
+#...
+ hook called: cleanup.
+ #...
+diff -rupN --no-dereference binutils-2.36.1/ld/testsuite/ld-plugin/plugin-20.d binutils-2.36.1-new/ld/testsuite/ld-plugin/plugin-20.d
+--- binutils-2.36.1/ld/testsuite/ld-plugin/plugin-20.d	2021-01-09 11:47:34.000000000 +0100
+++ binutils-2.36.1-new/ld/testsuite/ld-plugin/plugin-20.d	2021-02-13 18:13:16.009245619 +0100
+@@ -2,6 +2,5 @@ hook called: all symbols read.
+ Input: func.c \(tmpdir/libfunc.a\)
+ Sym: '_?func' Resolution: LDPR_PREVAILING_DEF.*
+ Sym: '_?func' Resolution: LDPR_PREVAILING_DEF.*
+-.*: tmpdir/main.o: in function `main':
+-.*main.c.*: undefined reference to `\.?func'
+#...
+ hook called: cleanup.
+diff -rupN --no-dereference binutils-2.36.1/ld/testsuite/ld-plugin/plugin-21.d binutils-2.36.1-new/ld/testsuite/ld-plugin/plugin-21.d
+--- binutils-2.36.1/ld/testsuite/ld-plugin/plugin-21.d	2021-01-09 11:47:34.000000000 +0100
+++ binutils-2.36.1-new/ld/testsuite/ld-plugin/plugin-21.d	2021-02-13 18:13:16.009245619 +0100
+@@ -2,6 +2,5 @@ hook called: all symbols read.
+ Input: .*/ld/testsuite/ld-plugin/func.c \(.*/ld/testsuite/ld-plugin/func.c\)
+ Sym: '_?func' Resolution: LDPR_PREVAILING_DEF.*
+ Sym: '_?func' Resolution: LDPR_PREVAILING_DEF.*
+-.*: tmpdir/main.o: in function `main':
+-.*main.c.*: undefined reference to `\.?func'
+#...
+ hook called: cleanup.
+diff -rupN --no-dereference binutils-2.36.1/ld/testsuite/ld-plugin/plugin-22.d binutils-2.36.1-new/ld/testsuite/ld-plugin/plugin-22.d
+--- binutils-2.36.1/ld/testsuite/ld-plugin/plugin-22.d	2021-01-09 11:47:34.000000000 +0100
+++ binutils-2.36.1-new/ld/testsuite/ld-plugin/plugin-22.d	2021-02-13 18:13:16.009245619 +0100
+@@ -2,6 +2,5 @@ Claimed: tmpdir/libfunc.a \[@.*
+ hook called: all symbols read.
+ Sym: '_?func' Resolution: LDPR_PREVAILING_DEF.*
+ Sym: '_?func' Resolution: LDPR_PREVAILING_DEF.*
+-.*: tmpdir/main.o: in function `main':
+-.*main.c.*: undefined reference to `\.?func'
+#...
+ hook called: cleanup.
+diff -rupN --no-dereference binutils-2.36.1/ld/testsuite/ld-plugin/plugin-23.d binutils-2.36.1-new/ld/testsuite/ld-plugin/plugin-23.d
+--- binutils-2.36.1/ld/testsuite/ld-plugin/plugin-23.d	2021-01-09 11:47:34.000000000 +0100
+++ binutils-2.36.1-new/ld/testsuite/ld-plugin/plugin-23.d	2021-02-13 18:13:16.009245619 +0100
+@@ -2,6 +2,5 @@ Claimed: .*/ld/testsuite/ld-plugin/func.
+ hook called: all symbols read.
+ Sym: '_?func' Resolution: LDPR_PREVAILING_DEF.*
+ Sym: '_?func' Resolution: LDPR_PREVAILING_DEF.*
+-.*: tmpdir/main.o: in function `main':
+-.*main.c.*: undefined reference to `\.?func'
+#...
+ hook called: cleanup.
+diff -rupN --no-dereference binutils-2.36.1/ld/testsuite/ld-plugin/plugin-24.d binutils-2.36.1-new/ld/testsuite/ld-plugin/plugin-24.d
+--- binutils-2.36.1/ld/testsuite/ld-plugin/plugin-24.d	2021-01-09 11:47:34.000000000 +0100
+++ binutils-2.36.1-new/ld/testsuite/ld-plugin/plugin-24.d	2021-02-13 18:13:16.009245619 +0100
+@@ -2,4 +2,5 @@ hook called: all symbols read.
+ Input: .*/ld/testsuite/ld-plugin/func.c \(.*/ld/testsuite/ld-plugin/func.c\)
+ Sym: '_?func' Resolution: LDPR_PREVAILING_DEF.*
+ Sym: '_?func' Resolution: LDPR_PREVAILING_DEF.*
+#...
+ hook called: cleanup.
+diff -rupN --no-dereference binutils-2.36.1/ld/testsuite/ld-plugin/plugin-25.d binutils-2.36.1-new/ld/testsuite/ld-plugin/plugin-25.d
+--- binutils-2.36.1/ld/testsuite/ld-plugin/plugin-25.d	2021-01-09 11:47:34.000000000 +0100
+++ binutils-2.36.1-new/ld/testsuite/ld-plugin/plugin-25.d	2021-02-13 18:13:16.009245619 +0100
+@@ -2,4 +2,5 @@ Claimed: .*/ld/testsuite/ld-plugin/func.
+ hook called: all symbols read.
+ Sym: '_?func' Resolution: LDPR_PREVAILING_DEF.*
+ Sym: '_?func' Resolution: LDPR_PREVAILING_DEF.*
+#...
+ hook called: cleanup.
+diff -rupN --no-dereference binutils-2.36.1/ld/testsuite/ld-plugin/plugin-28.d binutils-2.36.1-new/ld/testsuite/ld-plugin/plugin-28.d
+--- binutils-2.36.1/ld/testsuite/ld-plugin/plugin-28.d	2021-01-09 11:47:34.000000000 +0100
+++ binutils-2.36.1-new/ld/testsuite/ld-plugin/plugin-28.d	2021-02-13 18:13:16.011245609 +0100
+@@ -1 +1,2 @@
+ .*: error: Error
+#...
+diff -rupN --no-dereference binutils-2.36.1/ld/testsuite/ld-plugin/plugin-29.d binutils-2.36.1-new/ld/testsuite/ld-plugin/plugin-29.d
+--- binutils-2.36.1/ld/testsuite/ld-plugin/plugin-29.d	2021-01-09 11:47:34.000000000 +0100
+++ binutils-2.36.1-new/ld/testsuite/ld-plugin/plugin-29.d	2021-02-13 18:13:16.010245614 +0100
+@@ -1 +1,2 @@
+ .*: warning: Warning
+#...
+diff -rupN --no-dereference binutils-2.36.1/ld/testsuite/ld-plugin/plugin-30.d binutils-2.36.1-new/ld/testsuite/ld-plugin/plugin-30.d
+--- binutils-2.36.1/ld/testsuite/ld-plugin/plugin-30.d	2021-01-09 11:47:34.000000000 +0100
+++ binutils-2.36.1-new/ld/testsuite/ld-plugin/plugin-30.d	2021-02-13 18:13:16.010245614 +0100
+@@ -24,3 +24,4 @@ hook called: claim_file tmpdir/main.o \[
+ hook called: claim_file tmpdir/func.o \[@0/.* not claimed
+ hook called: claim_file tmpdir/text.o \[@0/.* not claimed
+ hook called: claim_file tmpdir/libempty.a \[@.* not claimed
+#pass
+diff -rupN --no-dereference binutils-2.36.1/ld/testsuite/ld-plugin/plugin-6.d binutils-2.36.1-new/ld/testsuite/ld-plugin/plugin-6.d
+--- binutils-2.36.1/ld/testsuite/ld-plugin/plugin-6.d	2021-01-09 11:47:34.000000000 +0100
+++ binutils-2.36.1-new/ld/testsuite/ld-plugin/plugin-6.d	2021-02-13 18:13:16.010245614 +0100
+@@ -27,7 +27,6 @@ hook called: claim_file tmpdir/func.o \[
+ hook called: claim_file tmpdir/text.o \[@0/.* not claimed
+ #...
+ hook called: all symbols read.
+-.*: tmpdir/main.o: in function `main':
+-.*main.c.*: undefined reference to `\.?func'
+#...
+ hook called: cleanup.
+ #...
+diff -rupN --no-dereference binutils-2.36.1/ld/testsuite/ld-plugin/plugin-7.d binutils-2.36.1-new/ld/testsuite/ld-plugin/plugin-7.d
+--- binutils-2.36.1/ld/testsuite/ld-plugin/plugin-7.d	2021-01-09 11:47:34.000000000 +0100
+++ binutils-2.36.1-new/ld/testsuite/ld-plugin/plugin-7.d	2021-02-13 18:13:16.010245614 +0100
+@@ -28,7 +28,6 @@ hook called: claim_file tmpdir/func.o \[
+ hook called: claim_file tmpdir/text.o \[@0/.* not claimed
+ #...
+ hook called: all symbols read.
+-.*: tmpdir/main.o: in function `main':
+-.*main.c.*: undefined reference to `\.?func'
+#...
+ hook called: cleanup.
+ #...
+diff -rupN --no-dereference binutils-2.36.1/ld/testsuite/ld-plugin/plugin-8.d binutils-2.36.1-new/ld/testsuite/ld-plugin/plugin-8.d
+--- binutils-2.36.1/ld/testsuite/ld-plugin/plugin-8.d	2021-01-09 11:47:34.000000000 +0100
+++ binutils-2.36.1-new/ld/testsuite/ld-plugin/plugin-8.d	2021-02-13 18:13:16.011245609 +0100
+@@ -30,9 +30,8 @@ hook called: claim_file tmpdir/func.o \[
+ hook called: claim_file tmpdir/text.o \[@0/.* not claimed
+ #...
+ hook called: all symbols read.
+-Sym: '_?func' Resolution: LDPR_PREVAILING_DEF
+Sym: '_?func' Resolution: LDPR_PREVAILING_DEF_IRONLY
+ Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY
+-.*: tmpdir/main.o: in function `main':
+-.*main.c.*: undefined reference to `\.?func'
+#...
+ hook called: cleanup.
+ #...
+diff -rupN --no-dereference binutils-2.36.1/ld/testsuite/ld-plugin/plugin-9.d binutils-2.36.1-new/ld/testsuite/ld-plugin/plugin-9.d
+--- binutils-2.36.1/ld/testsuite/ld-plugin/plugin-9.d	2021-01-09 11:47:34.000000000 +0100
+++ binutils-2.36.1-new/ld/testsuite/ld-plugin/plugin-9.d	2021-02-13 18:13:16.010245614 +0100
+@@ -31,7 +31,8 @@ hook called: claim_file tmpdir/func.o \[
+ hook called: claim_file tmpdir/text.o \[@0/.* not claimed
+ #...
+ hook called: all symbols read.
+-Sym: '_?func' Resolution: LDPR_PREVAILING_DEF
+Sym: '_?func' Resolution: LDPR_PREVAILING_DEF_IRONLY
+ Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY
+#...
+ hook called: cleanup.
+ #...
+diff -rupN --no-dereference binutils-2.36.1/ld/testsuite/ld-plugin/plugin.exp binutils-2.36.1-new/ld/testsuite/ld-plugin/plugin.exp
+--- binutils-2.36.1/ld/testsuite/ld-plugin/plugin.exp	2021-01-09 11:47:34.000000000 +0100
+++ binutils-2.36.1-new/ld/testsuite/ld-plugin/plugin.exp	2021-02-13 18:13:16.012245604 +0100
+@@ -119,6 +119,12 @@ if { $can_compile && !$failed_compile }
     }
 }
 
@ -328,3 +280,25 @@ diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin.exp binutils-2.30/ld/tests
 set testobjfiles "tmpdir/main.o tmpdir/func.o tmpdir/text.o"
 set testobjfiles_notext "tmpdir/main.o tmpdir/func.o"
 set testsrcfiles "tmpdir/main.o $srcdir/$subdir/func.c tmpdir/text.o"
+diff -rupN --no-dereference binutils-2.36.1/ld/testsuite/ld-plugin/pr20070.d binutils-2.36.1-new/ld/testsuite/ld-plugin/pr20070.d
+--- binutils-2.36.1/ld/testsuite/ld-plugin/pr20070.d	2021-01-09 11:47:34.000000000 +0100
+++ binutils-2.36.1-new/ld/testsuite/ld-plugin/pr20070.d	2021-02-13 18:13:16.010245614 +0100
+@@ -5,5 +5,6 @@ Sym: 'weakdef' Resolution: LDPR_PREVAILI
+ Sym: 'undef' Resolution: LDPR_UNDEF
+ Sym: 'weakundef' Resolution: LDPR_UNDEF
+ Sym: 'common' Resolution: LDPR_PREVAILING_DEF_IRONLY
+#...
+ hook called: cleanup.
+ #...
+diff -rupN --no-dereference binutils-2.36.1/ld/testsuite/ld-srec/srec.exp binutils-2.36.1-new/ld/testsuite/ld-srec/srec.exp
+--- binutils-2.36.1/ld/testsuite/ld-srec/srec.exp	2021-01-09 11:47:34.000000000 +0100
+++ binutils-2.36.1-new/ld/testsuite/ld-srec/srec.exp	2021-02-13 18:13:16.010245614 +0100
+@@ -21,6 +21,8 @@
+ 
+ # Get the offset from an S-record line to the start of the data.
+ 
+return
+
+ proc srec_off { l } {
+     if [string match "S1*" $l] {
+ 	return 8
--- a/binutils-gold-mismatched-section-flags.patch
+++ b/binutils-gold-mismatched-section-flags.patch
@ -1,7 +1,7 @@
-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
+diff -rupN --no-dereference binutils-2.36.1/gold/layout.cc binutils-2.36.1-new/gold/layout.cc
+--- binutils-2.36.1/gold/layout.cc	2021-01-09 11:47:34.000000000 +0100
+++ binutils-2.36.1-new/gold/layout.cc	2021-02-13 18:13:16.883241400 +0100
+@@ -869,6 +869,7 @@ Layout::get_output_section(const char* n
 		  && (same_name->flags() & elfcpp::SHF_TLS) == 0)
 		os = same_name;
 	    }
@ -9,7 +9,7 @@ diff -rup binutils.orig/gold/layout.cc binutils-2.32/gold/layout.cc
 	  else if ((flags & elfcpp::SHF_TLS) == 0)
 	    {
 	      elfcpp::Elf_Xword zero_flags = 0;
-@@ -878,6 +879,7 @@ Layout::get_output_section(const char* n
+@@ -879,6 +880,7 @@ Layout::get_output_section(const char* n
 	      if (p != this->section_name_map_.end())
 		os = p->second;
 	    }
--- a/binutils-gold-warn-unsupported.patch
+++ b/binutils-gold-warn-unsupported.patch
@ -1,8 +1,28 @@
-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
+diff -rupN --no-dereference binutils-2.36.1/bfd/config.bfd binutils-2.36.1-new/bfd/config.bfd
+--- binutils-2.36.1/bfd/config.bfd	2021-01-09 11:47:33.000000000 +0100
+++ binutils-2.36.1-new/bfd/config.bfd	2021-02-13 18:13:18.636232921 +0100
+@@ -470,7 +470,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
+@@ -1425,7 +1425,7 @@ case "${targ}" in
+     ;;
+ 
+   *)
+-    echo 1>&2 "*** BFD does not support target ${targ}."
+    echo 1>&2 "*** BFD does not support target '${targ}'.  Honest."
+     echo 1>&2 "*** Look in bfd/config.bfd for supported targets."
+     exit 1
+     ;;
+diff -rupN --no-dereference binutils-2.36.1/gold/configure binutils-2.36.1-new/gold/configure
+--- binutils-2.36.1/gold/configure	2021-01-09 11:59:18.000000000 +0100
+++ binutils-2.36.1-new/gold/configure	2021-02-13 18:13:18.635232926 +0100
+@@ -5184,7 +5184,8 @@ for targ in $target $canon_targets; do
     . ${srcdir}/configure.tgt
 
     if test "$targ_obj" = "UNKNOWN"; then
@ -12,9 +32,9 @@ diff -rup binutils.orig/gold/configure binutils-2.34/gold/configure
     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
+diff -rupN --no-dereference binutils-2.36.1/gold/configure.ac binutils-2.36.1-new/gold/configure.ac
+--- binutils-2.36.1/gold/configure.ac	2021-01-09 11:47:34.000000000 +0100
+++ binutils-2.36.1-new/gold/configure.ac	2021-02-13 18:13:18.636232921 +0100
@@ -181,7 +181,7 @@ for targ in $target $canon_targets; do
     . ${srcdir}/configure.tgt
 
@ -24,9 +44,10 @@ diff -rup binutils.orig/gold/configure.ac binutils-2.34/gold/configure.ac
     else
       targetobjs="$targetobjs ${targ_obj}.\$(OBJEXT)"
       if test "$targ_extra_obj" != ""; then
--- binutils.orig/ld/configure.tgt	2020-04-20 12:35:12.465301359 +0100
-+++ binutils-2.34/ld/configure.tgt	2020-04-20 14:17:52.123066333 +0100
-@@ -220,7 +220,7 @@ bfin-*-linux-uclibc*)	targ_emul=elf32bfi
+diff -rupN --no-dereference binutils-2.36.1/ld/configure.tgt binutils-2.36.1-new/ld/configure.tgt
+--- binutils-2.36.1/ld/configure.tgt	2021-01-09 11:47:34.000000000 +0100
+++ binutils-2.36.1-new/ld/configure.tgt	2021-02-13 18:13:18.636232921 +0100
+@@ -216,7 +216,7 @@ bfin-*-linux-uclibc*)	targ_emul=elf32bfi
 			targ_extra_emuls="elf32bfin"
 			targ_extra_libpath=$targ_extra_emuls
 			;;
@ -44,23 +65,3 @@ diff -rup binutils.orig/gold/configure.ac binutils-2.34/gold/configure.ac
   echo 2>&1 "*** see ld/configure.tgt for supported targets"
   exit 1
 
--- binutils.orig/bfd/config.bfd	2020-04-20 12:35:13.038297375 +0100
-+++ binutils-2.34/bfd/config.bfd	2020-04-20 14:25:26.452869193 +0100
-@@ -473,7 +473,7 @@ case "${targ}" in
-     ;;
- 
- #ifdef BFD64
-  bpf-*-none)
-+  bpf-*-none | bpf-*)
-     targ_defvec=bpf_elf64_le_vec
-     targ_selvecs=bpf_elf64_be_vec
-     targ_underscore=yes
-@@ -1427,7 +1427,7 @@ case "${targ}" in
-     ;;
- 
-   *)
-    echo 1>&2 "*** BFD does not support target ${targ}."
-+    echo 1>&2 "*** BFD does not support target '${targ}'.  Honest."
-     echo 1>&2 "*** Look in bfd/config.bfd for supported targets."
-     exit 1
-     ;;
--- a/binutils-no-config-h-check.patch
+++ b/binutils-no-config-h-check.patch
@ -1,6 +1,7 @@
--- a/bfd/bfd-in.h	2012-08-02 10:56:34.561769686 +0100
-+++ b/bfd/bfd-in.h	2012-08-02 11:13:27.134797755 +0100
-@@ -25,11 +25,6 @@
+diff -rupN --no-dereference binutils-2.36.1/bfd/bfd-in2.h binutils-2.36.1-new/bfd/bfd-in2.h
+--- binutils-2.36.1/bfd/bfd-in2.h	2021-01-09 11:47:33.000000000 +0100
+++ binutils-2.36.1-new/bfd/bfd-in2.h	2021-02-13 18:13:09.797275430 +0100
+@@ -30,11 +30,6 @@
 #ifndef __BFD_H_SEEN__
 #define __BFD_H_SEEN__
 
@ -12,9 +13,10 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
--- a/bfd/bfd-in2.h	2012-08-02 10:56:34.349769680 +0100
-+++ b/bfd/bfd-in2.h	2012-08-02 11:13:40.015798113 +0100
-@@ -32,11 +32,6 @@
+diff -rupN --no-dereference binutils-2.36.1/bfd/bfd-in.h binutils-2.36.1-new/bfd/bfd-in.h
+--- binutils-2.36.1/bfd/bfd-in.h	2021-01-09 11:47:33.000000000 +0100
+++ binutils-2.36.1-new/bfd/bfd-in.h	2021-02-13 18:13:09.796275435 +0100
+@@ -23,11 +23,6 @@
 #ifndef __BFD_H_SEEN__
 #define __BFD_H_SEEN__
 
--- a/binutils-readelf-other-sym-info.patch
+++ b/binutils-readelf-other-sym-info.patch
@ -1,6 +1,7 @@
--- binutils.orig/binutils/readelf.c	2020-07-24 15:08:30.317597020 +0100
-+++ binutils-2.35/binutils/readelf.c	2020-07-24 15:09:39.029155552 +0100
-@@ -12069,11 +12069,13 @@ print_dynamic_symbol (Filedata *filedata
+diff -rupN --no-dereference binutils-2.36.1/binutils/readelf.c binutils-2.36.1-new/binutils/readelf.c
+--- binutils-2.36.1/binutils/readelf.c	2021-02-13 18:13:11.555267023 +0100
+++ binutils-2.36.1-new/binutils/readelf.c	2021-02-13 18:13:12.450262734 +0100
+@@ -12241,11 +12241,13 @@ print_dynamic_symbol (Filedata *filedata
       unsigned int vis = ELF_ST_VISIBILITY (psym->st_other);
 
       printf (" %-7s", get_symbol_visibility (vis));
@ -14,7 +15,7 @@
     }
   printf (" %4s ", get_symbol_index_type (filedata, psym->st_shndx));
 
-@@ -12112,7 +12114,17 @@ print_dynamic_symbol (Filedata *filedata
+@@ -12284,7 +12286,17 @@ print_dynamic_symbol (Filedata *filedata
 		version_string);
     }
 
--- a/binutils-revert-PLT-elision.patch
+++ b/binutils-revert-PLT-elision.patch
@ -1,217 +1,6 @@
-diff -rup binutils.orig/ld/testsuite/ld-i386/pltgot-1.d binutils-2.29.1/ld/testsuite/ld-i386/pltgot-1.d
--- binutils.orig/ld/testsuite/ld-i386/pltgot-1.d	2017-11-15 13:32:39.335065263 +0000
-+++ binutils-2.29.1/ld/testsuite/ld-i386/pltgot-1.d	2017-11-15 15:03:55.649727195 +0000
-@@ -2,6 +2,7 @@
- #readelf: -S --wide
- #as: --32
- 
-+#pass
- #...
-  +\[ *[0-9]+\] \.plt +PROGBITS +[0-9a-f]+ +[0-9a-f]+ +0+10 +.*
- #...
-diff -rup binutils.orig/ld/testsuite/ld-i386/pltgot-2.d binutils-2.29.1/ld/testsuite/ld-i386/pltgot-2.d
--- binutils.orig/ld/testsuite/ld-i386/pltgot-2.d	2017-11-15 13:32:39.329065335 +0000
-+++ binutils-2.29.1/ld/testsuite/ld-i386/pltgot-2.d	2017-11-15 15:04:20.803430034 +0000
-@@ -3,7 +3,6 @@
- #readelf: -d --wide
- #as: --32
- 
-#failif
- #...
-  +0x[0-9a-f]+ +\(PLTREL.*
- #...
-diff -rup binutils.orig/ld/testsuite/ld-i386/pr19636-2d.d binutils-2.29.1/ld/testsuite/ld-i386/pr19636-2d.d
--- binutils.orig/ld/testsuite/ld-i386/pr19636-2d.d	2017-11-15 13:32:39.336065251 +0000
-+++ binutils-2.29.1/ld/testsuite/ld-i386/pr19636-2d.d	2017-11-15 15:03:00.413379749 +0000
-@@ -9,7 +9,7 @@ Relocation section '\.rel\.dyn' at offse
- [0-9a-f]+ +[0-9a-f]+ +R_386_32 +0+ +func
- [0-9a-f]+ +[0-9a-f]+ +R_386_PC32 +0+ +func
- [0-9a-f]+ +[0-9a-f]+ +R_386_GLOB_DAT +0+ +func
-
-+#...
- Symbol table '\.dynsym' contains [0-9]+ entries:
-  +Num: +Value +Size Type +Bind +Vis +Ndx Name
- #...
-diff -rup binutils.orig/ld/testsuite/ld-i386/pr19636-2e.d binutils-2.29.1/ld/testsuite/ld-i386/pr19636-2e.d
--- binutils.orig/ld/testsuite/ld-i386/pr19636-2e.d	2017-11-15 13:32:39.330065323 +0000
-+++ binutils-2.29.1/ld/testsuite/ld-i386/pr19636-2e.d	2017-11-15 15:03:28.928042882 +0000
-@@ -9,7 +9,7 @@ Relocation section '\.rel\.dyn' at offse
- [0-9a-f]+ +[0-9a-f]+ +R_386_32 +0+ +func
- [0-9a-f]+ +[0-9a-f]+ +R_386_PC32 +0+ +func
- [0-9a-f]+ +[0-9a-f]+ +R_386_GLOB_DAT +0+ +func
-
-+#...
- Symbol table '\.dynsym' contains [0-9]+ entries:
-  +Num: +Value +Size Type +Bind +Vis +Ndx Name
- #...
-diff -rup binutils.orig/ld/testsuite/ld-x86-64/pltgot-1.d binutils-2.29.1/ld/testsuite/ld-x86-64/pltgot-1.d
--- binutils.orig/ld/testsuite/ld-x86-64/pltgot-1.d	2017-11-15 13:32:39.415064300 +0000
-+++ binutils-2.29.1/ld/testsuite/ld-x86-64/pltgot-1.d	2017-11-15 15:08:39.333375801 +0000
-@@ -2,8 +2,4 @@
- #readelf: -S --wide
- #as: --64
- 
-#...
- +\[ *[0-9]+\] \.plt +PROGBITS +[0-9a-f]+ +[0-9a-f]+ +0+10 +.*
-#...
- +\[ *[0-9]+\] \.got\.plt +PROGBITS +[0-9a-f]+ +[0-9a-f]+ +0+18 +.*
- #pass
-diff -rup binutils.orig/ld/testsuite/ld-x86-64/pltgot-2.d binutils-2.29.1/ld/testsuite/ld-x86-64/pltgot-2.d
--- binutils.orig/ld/testsuite/ld-x86-64/pltgot-2.d	2017-11-15 13:32:39.404064432 +0000
-+++ binutils-2.29.1/ld/testsuite/ld-x86-64/pltgot-2.d	2017-11-15 15:08:59.031143095 +0000
-@@ -3,7 +3,6 @@
- #readelf: -d --wide
- #as: --64
- 
-#failif
- #...
-  +0x[0-9a-f]+ +\(PLTREL.*
- #...
-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
-@@ -1,4 +1,3 @@
-#failif
- #...
- [0-9a-f ]+R_X86_64_JUMP_SLOT +0+ +bar \+ 0
- #...
-diff -rup binutils.orig/ld/testsuite/ld-x86-64/pr20830a.d binutils-2.29.1/ld/testsuite/ld-x86-64/pr20830a.d
--- binutils.orig/ld/testsuite/ld-x86-64/pr20830a.d	2017-11-15 13:32:39.412064336 +0000
-+++ binutils-2.29.1/ld/testsuite/ld-x86-64/pr20830a.d	2017-11-15 15:15:09.918750288 +0000
-@@ -20,6 +20,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=00000000000001c8..00000000000001d4
-   DW_CFA_nop
-diff -rup binutils.orig/ld/testsuite/ld-x86-64/pr20830a-now.d binutils-2.29.1/ld/testsuite/ld-x86-64/pr20830a-now.d
--- binutils.orig/ld/testsuite/ld-x86-64/pr20830a-now.d	2017-11-15 13:32:39.413064324 +0000
-+++ binutils-2.29.1/ld/testsuite/ld-x86-64/pr20830a-now.d	2017-11-15 15:16:08.227055104 +0000
-@@ -20,6 +20,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=00000000000001c8..00000000000001d4
-   DW_CFA_nop
-diff -rup binutils.orig/ld/testsuite/ld-x86-64/pr20830b.d binutils-2.29.1/ld/testsuite/ld-x86-64/pr20830b.d
--- binutils.orig/ld/testsuite/ld-x86-64/pr20830b.d	2017-11-15 13:32:39.413064324 +0000
-+++ binutils-2.29.1/ld/testsuite/ld-x86-64/pr20830b.d	2017-11-15 15:16:20.115913358 +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 0000000000000010 0000001c FDE cie=00000000 pc=0000000000000138..0000000000000144
-   DW_CFA_nop
-   DW_CFA_nop
-diff -rup binutils.orig/ld/testsuite/ld-x86-64/pr20830b-now.d binutils-2.29.1/ld/testsuite/ld-x86-64/pr20830b-now.d
--- binutils.orig/ld/testsuite/ld-x86-64/pr20830b-now.d	2017-11-15 13:32:39.411064348 +0000
-+++ binutils-2.29.1/ld/testsuite/ld-x86-64/pr20830b-now.d	2017-11-15 15:16:29.012807282 +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 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
-@@ -14,6 +14,7 @@ Section Headers:
-  +\[[ 0-9]+\] .dynsym +.*
-  +\[[ 0-9]+\] .dynstr +.*
-  +\[[ 0-9]+\] .rela.dyn +.*
-+#pass
-  +\[[ 0-9]+\] .plt +.*
-  +\[[ 0-9]+\] .plt.got +.*
-  +\[[ 0-9]+\] .text +PROGBITS +0+1000 0+1000 0+31a 00 +AX +0 +0 4096
--- binutils.orig/bfd/elfxx-x86.c	2018-01-22 15:59:25.875788033 +0000
-+++ binutils-2.30.0/bfd/elfxx-x86.c	2018-01-22 16:00:20.789146597 +0000
+diff -rupN --no-dereference binutils-2.36.1/bfd/elfxx-x86.c binutils-2.36.1-new/bfd/elfxx-x86.c
+--- binutils-2.36.1/bfd/elfxx-x86.c	2021-01-18 16:00:36.000000000 +0100
+++ binutils-2.36.1-new/bfd/elfxx-x86.c	2021-02-13 18:13:11.560267000 +0100
@@ -107,7 +107,7 @@ elf_x86_allocate_dynrelocs (struct elf_l
   plt_entry_size = htab->plt.plt_entry_size;
 
@ -230,8 +19,55 @@ diff -rup binutils.orig/ld/testsuite/ld-x86-64/tlspic2.rd binutils-2.29.1/ld/tes
   /* Since STT_GNU_IFUNC symbol must go through PLT, we handle it
      here if it is defined and referenced in a non-shared object.  */
   if (h->type == STT_GNU_IFUNC
--- binutils.orig/ld/testsuite/ld-i386/pr20830.d	2018-07-09 09:49:51.277239857 +0100
-+++ binutils-2.30.90/ld/testsuite/ld-i386/pr20830.d	2018-07-09 10:32:41.113356733 +0100
+diff -rupN --no-dereference binutils-2.36.1/ld/testsuite/ld-i386/pltgot-1.d binutils-2.36.1-new/ld/testsuite/ld-i386/pltgot-1.d
+--- binutils-2.36.1/ld/testsuite/ld-i386/pltgot-1.d	2021-01-09 11:47:34.000000000 +0100
+++ binutils-2.36.1-new/ld/testsuite/ld-i386/pltgot-1.d	2021-02-13 18:13:11.557267014 +0100
+@@ -2,6 +2,7 @@
+ #readelf: -S --wide
+ #as: --32
+ 
+#pass
+ #...
+  +\[ *[0-9]+\] \.plt +PROGBITS +[0-9a-f]+ +[0-9a-f]+ +0+10 +.*
+ #...
+diff -rupN --no-dereference binutils-2.36.1/ld/testsuite/ld-i386/pltgot-2.d binutils-2.36.1-new/ld/testsuite/ld-i386/pltgot-2.d
+--- binutils-2.36.1/ld/testsuite/ld-i386/pltgot-2.d	2021-01-09 11:47:34.000000000 +0100
+++ binutils-2.36.1-new/ld/testsuite/ld-i386/pltgot-2.d	2021-02-13 18:13:11.557267014 +0100
+@@ -3,7 +3,6 @@
+ #readelf: -d --wide
+ #as: --32
+ 
+-#failif
+ #...
+  +0x[0-9a-f]+ +\(PLTREL.*
+ #...
+diff -rupN --no-dereference binutils-2.36.1/ld/testsuite/ld-i386/pr19636-2d.d binutils-2.36.1-new/ld/testsuite/ld-i386/pr19636-2d.d
+--- binutils-2.36.1/ld/testsuite/ld-i386/pr19636-2d.d	2021-01-09 11:47:34.000000000 +0100
+++ binutils-2.36.1-new/ld/testsuite/ld-i386/pr19636-2d.d	2021-02-13 18:13:11.557267014 +0100
+@@ -8,7 +8,7 @@ Relocation section '\.rel\.dyn' at offse
+ [0-9a-f]+ +[0-9a-f]+ +R_386_32 +0+ +func
+ [0-9a-f]+ +[0-9a-f]+ +R_386_PC32 +0+ +func
+ [0-9a-f]+ +[0-9a-f]+ +R_386_GLOB_DAT +0+ +func
+-
+#...
+ Symbol table '\.dynsym' contains [0-9]+ entries:
+  +Num: +Value +Size Type +Bind +Vis +Ndx Name
+ #...
+diff -rupN --no-dereference binutils-2.36.1/ld/testsuite/ld-i386/pr19636-2e.d binutils-2.36.1-new/ld/testsuite/ld-i386/pr19636-2e.d
+--- binutils-2.36.1/ld/testsuite/ld-i386/pr19636-2e.d	2021-01-09 11:47:34.000000000 +0100
+++ binutils-2.36.1-new/ld/testsuite/ld-i386/pr19636-2e.d	2021-02-13 18:13:11.558267009 +0100
+@@ -8,7 +8,7 @@ Relocation section '\.rel\.dyn' at offse
+ [0-9a-f]+ +[0-9a-f]+ +R_386_32 +0+ +func
+ [0-9a-f]+ +[0-9a-f]+ +R_386_PC32 +0+ +func
+ [0-9a-f]+ +[0-9a-f]+ +R_386_GLOB_DAT +0+ +func
+-
+#...
+ Symbol table '\.dynsym' contains [0-9]+ entries:
+  +Num: +Value +Size Type +Bind +Vis +Ndx Name
+ #...
+diff -rupN --no-dereference binutils-2.36.1/ld/testsuite/ld-i386/pr20830.d binutils-2.36.1-new/ld/testsuite/ld-i386/pr20830.d
+--- binutils-2.36.1/ld/testsuite/ld-i386/pr20830.d	2021-01-09 11:47:34.000000000 +0100
+++ binutils-2.36.1-new/ld/testsuite/ld-i386/pr20830.d	2021-02-13 18:13:11.560267000 +0100
@@ -19,7 +19,7 @@ Contents of the .eh_frame section:
   DW_CFA_offset: r8 \(eip\) at cfa-4
   DW_CFA_nop
@ -241,3 +77,169 @@ diff -rup binutils.orig/ld/testsuite/ld-x86-64/tlspic2.rd binutils-2.29.1/ld/tes
 0+18 00000010 0000001c FDE cie=00000000 pc=00000128..00000133
   DW_CFA_nop
   DW_CFA_nop
+diff -rupN --no-dereference binutils-2.36.1/ld/testsuite/ld-x86-64/pltgot-1.d binutils-2.36.1-new/ld/testsuite/ld-x86-64/pltgot-1.d
+--- binutils-2.36.1/ld/testsuite/ld-x86-64/pltgot-1.d	2021-01-09 11:47:34.000000000 +0100
+++ binutils-2.36.1-new/ld/testsuite/ld-x86-64/pltgot-1.d	2021-02-13 18:13:11.558267009 +0100
+@@ -2,8 +2,4 @@
+ #readelf: -S --wide
+ #as: --64
+ 
+-#...
+- +\[ *[0-9]+\] \.plt +PROGBITS +[0-9a-f]+ +[0-9a-f]+ +0+10 +.*
+-#...
+- +\[ *[0-9]+\] \.got\.plt +PROGBITS +[0-9a-f]+ +[0-9a-f]+ +0+18 +.*
+ #pass
+diff -rupN --no-dereference binutils-2.36.1/ld/testsuite/ld-x86-64/pltgot-2.d binutils-2.36.1-new/ld/testsuite/ld-x86-64/pltgot-2.d
+--- binutils-2.36.1/ld/testsuite/ld-x86-64/pltgot-2.d	2021-01-09 11:47:34.000000000 +0100
+++ binutils-2.36.1-new/ld/testsuite/ld-x86-64/pltgot-2.d	2021-02-13 18:13:11.558267009 +0100
+@@ -3,7 +3,6 @@
+ #readelf: -d --wide
+ #as: --64
+ 
+-#failif
+ #...
+  +0x[0-9a-f]+ +\(PLTREL.*
+ #...
+diff -rupN --no-dereference binutils-2.36.1/ld/testsuite/ld-x86-64/plt-main.rd binutils-2.36.1-new/ld/testsuite/ld-x86-64/plt-main.rd
+--- binutils-2.36.1/ld/testsuite/ld-x86-64/plt-main.rd	2021-01-09 11:47:34.000000000 +0100
+++ binutils-2.36.1-new/ld/testsuite/ld-x86-64/plt-main.rd	2021-02-13 18:13:11.558267009 +0100
+@@ -1,4 +1,3 @@
+-#failif
+ #...
+ [0-9a-f ]+R_X86_64_JUMP_SLOT +0+ +bar \+ 0
+ #...
+diff -rupN --no-dereference binutils-2.36.1/ld/testsuite/ld-x86-64/pr20830a.d binutils-2.36.1-new/ld/testsuite/ld-x86-64/pr20830a.d
+--- binutils-2.36.1/ld/testsuite/ld-x86-64/pr20830a.d	2021-01-09 11:47:34.000000000 +0100
+++ binutils-2.36.1-new/ld/testsuite/ld-x86-64/pr20830a.d	2021-02-13 18:13:11.558267009 +0100
+@@ -20,6 +20,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=00000000000001c8..00000000000001d4
+   DW_CFA_nop
+diff -rupN --no-dereference binutils-2.36.1/ld/testsuite/ld-x86-64/pr20830a-now.d binutils-2.36.1-new/ld/testsuite/ld-x86-64/pr20830a-now.d
+--- binutils-2.36.1/ld/testsuite/ld-x86-64/pr20830a-now.d	2021-01-09 11:47:34.000000000 +0100
+++ binutils-2.36.1-new/ld/testsuite/ld-x86-64/pr20830a-now.d	2021-02-13 18:13:11.558267009 +0100
+@@ -20,6 +20,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=00000000000001c8..00000000000001d4
+   DW_CFA_nop
+diff -rupN --no-dereference binutils-2.36.1/ld/testsuite/ld-x86-64/pr20830b.d binutils-2.36.1-new/ld/testsuite/ld-x86-64/pr20830b.d
+--- binutils-2.36.1/ld/testsuite/ld-x86-64/pr20830b.d	2021-01-09 11:47:34.000000000 +0100
+++ binutils-2.36.1-new/ld/testsuite/ld-x86-64/pr20830b.d	2021-02-13 18:13:11.559267004 +0100
+@@ -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 0000000000000010 0000001c FDE cie=00000000 pc=0000000000000138..0000000000000144
+   DW_CFA_nop
+   DW_CFA_nop
+diff -rupN --no-dereference binutils-2.36.1/ld/testsuite/ld-x86-64/pr20830b-now.d binutils-2.36.1-new/ld/testsuite/ld-x86-64/pr20830b-now.d
+--- binutils-2.36.1/ld/testsuite/ld-x86-64/pr20830b-now.d	2021-01-09 11:47:34.000000000 +0100
+++ binutils-2.36.1-new/ld/testsuite/ld-x86-64/pr20830b-now.d	2021-02-13 18:13:11.559267004 +0100
+@@ -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 0000000000000010 0000001c FDE cie=00000000 pc=0000000000000138..0000000000000144
+   DW_CFA_nop
+   DW_CFA_nop
+diff -rupN --no-dereference binutils-2.36.1/ld/testsuite/ld-x86-64/pr21038a.d binutils-2.36.1-new/ld/testsuite/ld-x86-64/pr21038a.d
+--- binutils-2.36.1/ld/testsuite/ld-x86-64/pr21038a.d	2021-01-09 11:47:34.000000000 +0100
+++ binutils-2.36.1-new/ld/testsuite/ld-x86-64/pr21038a.d	2021-02-13 18:13:11.559267004 +0100
+@@ -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 -rupN --no-dereference binutils-2.36.1/ld/testsuite/ld-x86-64/pr21038a-now.d binutils-2.36.1-new/ld/testsuite/ld-x86-64/pr21038a-now.d
+--- binutils-2.36.1/ld/testsuite/ld-x86-64/pr21038a-now.d	2021-01-09 11:47:34.000000000 +0100
+++ binutils-2.36.1-new/ld/testsuite/ld-x86-64/pr21038a-now.d	2021-02-13 18:13:11.559267004 +0100
+@@ -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 -rupN --no-dereference binutils-2.36.1/ld/testsuite/ld-x86-64/pr21038b.d binutils-2.36.1-new/ld/testsuite/ld-x86-64/pr21038b.d
+--- binutils-2.36.1/ld/testsuite/ld-x86-64/pr21038b.d	2021-01-09 11:47:34.000000000 +0100
+++ binutils-2.36.1-new/ld/testsuite/ld-x86-64/pr21038b.d	2021-02-13 18:13:11.559267004 +0100
+@@ -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 -rupN --no-dereference binutils-2.36.1/ld/testsuite/ld-x86-64/pr21038b-now.d binutils-2.36.1-new/ld/testsuite/ld-x86-64/pr21038b-now.d
+--- binutils-2.36.1/ld/testsuite/ld-x86-64/pr21038b-now.d	2021-01-09 11:47:34.000000000 +0100
+++ binutils-2.36.1-new/ld/testsuite/ld-x86-64/pr21038b-now.d	2021-02-13 18:13:11.559267004 +0100
+@@ -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 -rupN --no-dereference binutils-2.36.1/ld/testsuite/ld-x86-64/pr21038c.d binutils-2.36.1-new/ld/testsuite/ld-x86-64/pr21038c.d
+--- binutils-2.36.1/ld/testsuite/ld-x86-64/pr21038c.d	2021-01-09 11:47:34.000000000 +0100
+++ binutils-2.36.1-new/ld/testsuite/ld-x86-64/pr21038c.d	2021-02-13 18:13:11.559267004 +0100
+@@ -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 -rupN --no-dereference binutils-2.36.1/ld/testsuite/ld-x86-64/pr21038c-now.d binutils-2.36.1-new/ld/testsuite/ld-x86-64/pr21038c-now.d
+--- binutils-2.36.1/ld/testsuite/ld-x86-64/pr21038c-now.d	2021-01-09 11:47:34.000000000 +0100
+++ binutils-2.36.1-new/ld/testsuite/ld-x86-64/pr21038c-now.d	2021-02-13 18:13:11.559267004 +0100
+@@ -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 -rupN --no-dereference binutils-2.36.1/ld/testsuite/ld-x86-64/tlspic2.rd binutils-2.36.1-new/ld/testsuite/ld-x86-64/tlspic2.rd
+--- binutils-2.36.1/ld/testsuite/ld-x86-64/tlspic2.rd	2021-01-09 11:47:34.000000000 +0100
+++ binutils-2.36.1-new/ld/testsuite/ld-x86-64/tlspic2.rd	2021-02-13 18:13:11.559267004 +0100
+@@ -14,6 +14,7 @@ Section Headers:
+  +\[[ 0-9]+\] .dynsym +.*
+  +\[[ 0-9]+\] .dynstr +.*
+  +\[[ 0-9]+\] .rela.dyn +.*
+#pass
+  +\[[ 0-9]+\] .plt +.*
+  +\[[ 0-9]+\] .plt.got +.*
+  +\[[ 0-9]+\] .text +PROGBITS +0+1000 0+1000 0+31a 00 +AX +0 +0 4096
--- a/binutils-special-sections-in-groups.patch
+++ b/binutils-special-sections-in-groups.patch
@ -1,6 +1,7 @@
--- binutils.orig/bfd/elf.c	2018-10-19 11:42:10.107277490 +0100
-+++ binutils-2.31.1/bfd/elf.c	2018-10-19 11:44:33.607105801 +0100
-@@ -830,7 +830,13 @@ setup_group (bfd *abfd, Elf_Internal_Shd
+diff -rupN --no-dereference binutils-2.36.1/bfd/elf.c binutils-2.36.1-new/bfd/elf.c
+--- binutils-2.36.1/bfd/elf.c	2021-01-14 10:16:07.000000000 +0100
+++ binutils-2.36.1-new/bfd/elf.c	2021-02-13 18:13:15.144249787 +0100
+@@ -824,7 +824,13 @@ setup_group (bfd *abfd, Elf_Internal_Shd
 	}
     }
 
@ -15,7 +16,7 @@
     {
       /* xgettext:c-format */
       _bfd_error_handler (_("%pB: no group info for section '%pA'"),
-@@ -936,7 +942,8 @@ _bfd_elf_setup_sections (bfd *abfd)
+@@ -927,7 +933,8 @@ _bfd_elf_setup_sections (bfd *abfd)
 	  else if (idx->shdr->bfd_section)
 	    elf_sec_group (idx->shdr->bfd_section) = shdr->bfd_section;
 	  else if (idx->shdr->sh_type != SHT_RELA
--- a/binutils-testsuite-fixes.patch
+++ b/binutils-testsuite-fixes.patch
@ -1,6 +1,188 @@
-diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin-10.d binutils-2.36.1/ld/testsuite/ld-plugin/plugin-10.d
--- binutils.orig/ld/testsuite/ld-plugin/plugin-10.d	2021-02-12 10:13:11.116049499 +0000
-+++ binutils-2.36.1/ld/testsuite/ld-plugin/plugin-10.d	2021-02-12 10:23:44.298370984 +0000
+diff -rupN --no-dereference binutils-2.36.1/binutils/dwarf.c binutils-2.36.1-new/binutils/dwarf.c
+--- binutils-2.36.1/binutils/dwarf.c	2021-01-09 11:47:33.000000000 +0100
+++ binutils-2.36.1-new/binutils/dwarf.c	2021-02-13 18:13:21.286220059 +0100
+@@ -2117,6 +2117,7 @@ get_type_abbrev_from_form (unsigned long
+   switch (form)
+     {
+     case DW_FORM_GNU_ref_alt:
+    case DW_FORM_ref_sig8:
+       /* FIXME: We are unable to handle this form at the moment.  */
+       return NULL;
+ 
+@@ -2146,7 +2147,7 @@ get_type_abbrev_from_form (unsigned long
+       /* FIXME: Are there other DW_FORMs that can be used by types ?  */
+ 
+     default:
+-      warn (_("Unexpected form %lx encountered whilst finding abbreviation for type\n"), form);
+      warn (_("Unexpected form %#lx encountered whilst finding abbreviation for type\n"), form);
+       return NULL;
+     }
+ 
+diff -rupN --no-dereference binutils-2.36.1/gold/main.cc binutils-2.36.1-new/gold/main.cc
+--- binutils-2.36.1/gold/main.cc	2021-01-09 11:47:34.000000000 +0100
+++ binutils-2.36.1-new/gold/main.cc	2021-02-13 18:13:21.287220054 +0100
+@@ -290,11 +290,6 @@ main(int argc, char** argv)
+               elapsed.sys / 1000, (elapsed.sys % 1000) * 1000,
+               elapsed.wall / 1000, (elapsed.wall % 1000) * 1000);
+ 
+-#ifdef HAVE_MALLINFO
+-      struct mallinfo m = mallinfo();
+-      fprintf(stderr, _("%s: total space allocated by malloc: %lld bytes\n"),
+-	      program_name, static_cast<long long>(m.arena));
+-#endif
+       File_read::print_stats();
+       Archive::print_stats();
+       Lib_group::print_stats();
+diff -rupN --no-dereference binutils-2.36.1/ld/testsuite/ld-aarch64/variant_pcs-now.d binutils-2.36.1-new/ld/testsuite/ld-aarch64/variant_pcs-now.d
+--- binutils-2.36.1/ld/testsuite/ld-aarch64/variant_pcs-now.d	2021-01-09 11:47:34.000000000 +0100
+++ binutils-2.36.1-new/ld/testsuite/ld-aarch64/variant_pcs-now.d	2021-02-13 18:13:21.287220054 +0100
+@@ -23,10 +23,10 @@ Symbol table '\.dynsym' contains 7 entri
+    Num:    Value          Size Type    Bind   Vis      Ndx Name
+      0: 0000000000000000     0 NOTYPE  LOCAL  DEFAULT  UND 
+      1: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT  UND f_base_global_default_undef
+-     2: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT \[VARIANT_PCS\]   UND f_spec_global_default_undef
+-     3: 0000000000008000     0 IFUNC   GLOBAL DEFAULT \[VARIANT_PCS\]     1 f_spec_global_default_ifunc
+     2: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT[ 	]+UND f_spec_global_default_undef[ 	]+\[VARIANT_PCS\]
+     3: 0000000000008000     0 IFUNC   GLOBAL DEFAULT[ 	]+1 f_spec_global_default_ifunc[ 	]+\[VARIANT_PCS\]
+      4: 0000000000008000     0 NOTYPE  GLOBAL DEFAULT    1 f_base_global_default_def
+-     5: 0000000000008000     0 NOTYPE  GLOBAL DEFAULT \[VARIANT_PCS\]     1 f_spec_global_default_def
+     5: 0000000000008000     0 NOTYPE  GLOBAL DEFAULT[ 	]+1 f_spec_global_default_def[ 	]+\[VARIANT_PCS\]
+      6: 0000000000008000     0 IFUNC   GLOBAL DEFAULT    1 f_base_global_default_ifunc
+ 
+ Symbol table '\.symtab' contains 35 entries:
+@@ -41,28 +41,28 @@ Symbol table '\.symtab' contains 35 entr
+      7: 00000000000111c8     0 SECTION LOCAL  DEFAULT    7 
+      8: 0000000000011270     0 SECTION LOCAL  DEFAULT    8 
+      9: 0000000000000000     0 FILE    LOCAL  DEFAULT  ABS .*variant_pcs-1\.o
+-    10: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_local
+-    11: 0000000000008000     0 IFUNC   LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_local_ifunc
+    10: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT[ 	]+1 f_spec_local[ 	]+\[VARIANT_PCS\]
+    11: 0000000000008000     0 IFUNC   LOCAL  DEFAULT[ 	]+1 f_spec_local_ifunc[ 	]+\[VARIANT_PCS\]
+     12: 0000000000008000     0 IFUNC   LOCAL  DEFAULT    1 f_base_local_ifunc
+     13: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT    1 f_base_local
+     14: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT    1 \$x
+     15: 0000000000000000     0 FILE    LOCAL  DEFAULT  ABS .*variant_pcs-2\.o
+-    16: 0000000000008038     0 NOTYPE  LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_local2
+-    17: 0000000000008038     0 IFUNC   LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_local2_ifunc
+    16: 0000000000008038     0 NOTYPE  LOCAL  DEFAULT[ 	]+1 f_spec_local2[ 	]+\[VARIANT_PCS\]
+    17: 0000000000008038     0 IFUNC   LOCAL  DEFAULT[ 	]+1 f_spec_local2_ifunc[ 	]+\[VARIANT_PCS\]
+     18: 0000000000008038     0 IFUNC   LOCAL  DEFAULT    1 f_base_local2_ifunc
+     19: 0000000000008038     0 NOTYPE  LOCAL  DEFAULT    1 f_base_local2
+     20: 0000000000008038     0 NOTYPE  LOCAL  DEFAULT    1 \$x
+     21: 0000000000000000     0 FILE    LOCAL  DEFAULT  ABS 
+     22: 0000000000009080     0 OBJECT  LOCAL  DEFAULT  ABS _DYNAMIC
+-    23: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_global_hidden_def
+    23: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT[ 	]+1 f_spec_global_hidden_def[ 	]+\[VARIANT_PCS\]
+     24: 0000000000008000     0 IFUNC   LOCAL  DEFAULT    1 f_base_global_hidden_ifunc
+     25: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT    1 f_base_global_hidden_def
+     26: 0000000000009000     0 OBJECT  LOCAL  DEFAULT  ABS _GLOBAL_OFFSET_TABLE_
+-    27: 0000000000008000     0 IFUNC   LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_global_hidden_ifunc
+    27: 0000000000008000     0 IFUNC   LOCAL  DEFAULT[ 	]+1 f_spec_global_hidden_ifunc[ 	]+\[VARIANT_PCS\]
+     28: 0000000000008070     0 NOTYPE  LOCAL  DEFAULT    2 \$x
+     29: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT  UND f_base_global_default_undef
+-    30: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT \[VARIANT_PCS\]   UND f_spec_global_default_undef
+-    31: 0000000000008000     0 IFUNC   GLOBAL DEFAULT \[VARIANT_PCS\]     1 f_spec_global_default_ifunc
+    30: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT[ 	]+UND f_spec_global_default_undef[ 	]+\[VARIANT_PCS\]
+    31: 0000000000008000     0 IFUNC   GLOBAL DEFAULT[ 	]+1 f_spec_global_default_ifunc[ 	]+\[VARIANT_PCS\]
+     32: 0000000000008000     0 NOTYPE  GLOBAL DEFAULT    1 f_base_global_default_def
+-    33: 0000000000008000     0 NOTYPE  GLOBAL DEFAULT \[VARIANT_PCS\]     1 f_spec_global_default_def
+    33: 0000000000008000     0 NOTYPE  GLOBAL DEFAULT[ 	]+1 f_spec_global_default_def[ 	]+\[VARIANT_PCS\]
+     34: 0000000000008000     0 IFUNC   GLOBAL DEFAULT    1 f_base_global_default_ifunc
+diff -rupN --no-dereference binutils-2.36.1/ld/testsuite/ld-aarch64/variant_pcs-r.d binutils-2.36.1-new/ld/testsuite/ld-aarch64/variant_pcs-r.d
+--- binutils-2.36.1/ld/testsuite/ld-aarch64/variant_pcs-r.d	2021-01-09 11:47:34.000000000 +0100
+++ binutils-2.36.1-new/ld/testsuite/ld-aarch64/variant_pcs-r.d	2021-02-13 18:13:21.287220054 +0100
+@@ -37,24 +37,24 @@ Symbol table '\.symtab' contains 26 entr
+      2: 0000000000000000     0 SECTION LOCAL  DEFAULT    3 
+      3: 0000000000000000     0 SECTION LOCAL  DEFAULT    4 
+      4: 0000000000000000     0 FILE    LOCAL  DEFAULT  ABS .*variant_pcs-1\.o
+-     5: 0000000000000000     0 NOTYPE  LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_local
+-     6: 0000000000000000     0 IFUNC   LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_local_ifunc
+     5: 0000000000000000     0 NOTYPE  LOCAL  DEFAULT[ 	]+1 f_spec_local[ 	]+\[VARIANT_PCS\]
+     6: 0000000000000000     0 IFUNC   LOCAL  DEFAULT[ 	]+1 f_spec_local_ifunc[ 	]+\[VARIANT_PCS\]
+      7: 0000000000000000     0 IFUNC   LOCAL  DEFAULT    1 f_base_local_ifunc
+      8: 0000000000000000     0 NOTYPE  LOCAL  DEFAULT    1 f_base_local
+      9: 0000000000000000     0 NOTYPE  LOCAL  DEFAULT    1 \$x
+     10: 0000000000000000     0 FILE    LOCAL  DEFAULT  ABS .*variant_pcs-2\.o
+-    11: 0000000000000038     0 NOTYPE  LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_local2
+-    12: 0000000000000038     0 IFUNC   LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_local2_ifunc
+    11: 0000000000000038     0 NOTYPE  LOCAL  DEFAULT[ 	]+1 f_spec_local2[ 	]+\[VARIANT_PCS\]
+    12: 0000000000000038     0 IFUNC   LOCAL  DEFAULT[ 	]+1 f_spec_local2_ifunc[ 	]+\[VARIANT_PCS\]
+     13: 0000000000000038     0 IFUNC   LOCAL  DEFAULT    1 f_base_local2_ifunc
+     14: 0000000000000038     0 NOTYPE  LOCAL  DEFAULT    1 f_base_local2
+     15: 0000000000000038     0 NOTYPE  LOCAL  DEFAULT    1 \$x
+     16: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT  UND f_base_global_default_undef
+-    17: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT \[VARIANT_PCS\]   UND f_spec_global_default_undef
+-    18: 0000000000000000     0 NOTYPE  GLOBAL HIDDEN  \[VARIANT_PCS\]     1 f_spec_global_hidden_def
+    17: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT[ 	]+UND f_spec_global_default_undef[ 	]+\[VARIANT_PCS\]
+    18: 0000000000000000     0 NOTYPE  GLOBAL HIDDEN[ 	]+1 f_spec_global_hidden_def[ 	]+\[VARIANT_PCS\]
+     19: 0000000000000000     0 IFUNC   GLOBAL HIDDEN     1 f_base_global_hidden_ifunc
+-    20: 0000000000000000     0 IFUNC   GLOBAL DEFAULT \[VARIANT_PCS\]     1 f_spec_global_default_ifunc
+    20: 0000000000000000     0 IFUNC   GLOBAL DEFAULT[ 	]+1 f_spec_global_default_ifunc[ 	]+\[VARIANT_PCS\]
+     21: 0000000000000000     0 NOTYPE  GLOBAL HIDDEN     1 f_base_global_hidden_def
+-    22: 0000000000000000     0 IFUNC   GLOBAL HIDDEN  \[VARIANT_PCS\]     1 f_spec_global_hidden_ifunc
+    22: 0000000000000000     0 IFUNC   GLOBAL HIDDEN[ 	]+1 f_spec_global_hidden_ifunc[ 	]+\[VARIANT_PCS\]
+     23: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT    1 f_base_global_default_def
+-    24: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT \[VARIANT_PCS\]     1 f_spec_global_default_def
+    24: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT[ 	]+1 f_spec_global_default_def[ 	]+\[VARIANT_PCS\]
+     25: 0000000000000000     0 IFUNC   GLOBAL DEFAULT    1 f_base_global_default_ifunc
+diff -rupN --no-dereference binutils-2.36.1/ld/testsuite/ld-aarch64/variant_pcs-shared.d binutils-2.36.1-new/ld/testsuite/ld-aarch64/variant_pcs-shared.d
+--- binutils-2.36.1/ld/testsuite/ld-aarch64/variant_pcs-shared.d	2021-01-09 11:47:34.000000000 +0100
+++ binutils-2.36.1-new/ld/testsuite/ld-aarch64/variant_pcs-shared.d	2021-02-13 18:13:21.287220054 +0100
+@@ -23,10 +23,10 @@ Symbol table '\.dynsym' contains 7 entri
+    Num:    Value          Size Type    Bind   Vis      Ndx Name
+      0: 0000000000000000     0 NOTYPE  LOCAL  DEFAULT  UND 
+      1: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT  UND f_base_global_default_undef
+-     2: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT \[VARIANT_PCS\]   UND f_spec_global_default_undef
+-     3: 0000000000008000     0 IFUNC   GLOBAL DEFAULT \[VARIANT_PCS\]     1 f_spec_global_default_ifunc
+     2: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT[ 	]+UND f_spec_global_default_undef[ 	]+\[VARIANT_PCS\]
+     3: 0000000000008000     0 IFUNC   GLOBAL DEFAULT[ 	]+1 f_spec_global_default_ifunc[ 	]+\[VARIANT_PCS\]
+      4: 0000000000008000     0 NOTYPE  GLOBAL DEFAULT    1 f_base_global_default_def
+-     5: 0000000000008000     0 NOTYPE  GLOBAL DEFAULT \[VARIANT_PCS\]     1 f_spec_global_default_def
+     5: 0000000000008000     0 NOTYPE  GLOBAL DEFAULT[ 	]+1 f_spec_global_default_def[ 	]+\[VARIANT_PCS\]
+      6: 0000000000008000     0 IFUNC   GLOBAL DEFAULT    1 f_base_global_default_ifunc
+ 
+ Symbol table '\.symtab' contains 35 entries:
+@@ -41,28 +41,28 @@ Symbol table '\.symtab' contains 35 entr
+      7: 00000000000111c8     0 SECTION LOCAL  DEFAULT    7 
+      8: 0000000000011270     0 SECTION LOCAL  DEFAULT    8 
+      9: 0000000000000000     0 FILE    LOCAL  DEFAULT  ABS .*variant_pcs-1\.o
+-    10: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_local
+-    11: 0000000000008000     0 IFUNC   LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_local_ifunc
+    10: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT[ 	]+1 f_spec_local[ 	]+\[VARIANT_PCS\]
+    11: 0000000000008000     0 IFUNC   LOCAL  DEFAULT[ 	]+1 f_spec_local_ifunc[ 	]+\[VARIANT_PCS\]
+     12: 0000000000008000     0 IFUNC   LOCAL  DEFAULT    1 f_base_local_ifunc
+     13: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT    1 f_base_local
+     14: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT    1 \$x
+     15: 0000000000000000     0 FILE    LOCAL  DEFAULT  ABS .*variant_pcs-2\.o
+-    16: 0000000000008038     0 NOTYPE  LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_local2
+-    17: 0000000000008038     0 IFUNC   LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_local2_ifunc
+    16: 0000000000008038     0 NOTYPE  LOCAL  DEFAULT[ 	]+1 f_spec_local2[ 	]+\[VARIANT_PCS\]
+    17: 0000000000008038     0 IFUNC   LOCAL  DEFAULT[ 	]+1 f_spec_local2_ifunc[ 	]+\[VARIANT_PCS\]
+     18: 0000000000008038     0 IFUNC   LOCAL  DEFAULT    1 f_base_local2_ifunc
+     19: 0000000000008038     0 NOTYPE  LOCAL  DEFAULT    1 f_base_local2
+     20: 0000000000008038     0 NOTYPE  LOCAL  DEFAULT    1 \$x
+     21: 0000000000000000     0 FILE    LOCAL  DEFAULT  ABS 
+     22: 0000000000009080     0 OBJECT  LOCAL  DEFAULT  ABS _DYNAMIC
+-    23: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_global_hidden_def
+    23: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT[ 	]+1 f_spec_global_hidden_def[ 	]+\[VARIANT_PCS\]
+     24: 0000000000008000     0 IFUNC   LOCAL  DEFAULT    1 f_base_global_hidden_ifunc
+     25: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT    1 f_base_global_hidden_def
+     26: 0000000000009000     0 OBJECT  LOCAL  DEFAULT  ABS _GLOBAL_OFFSET_TABLE_
+-    27: 0000000000008000     0 IFUNC   LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_global_hidden_ifunc
+    27: 0000000000008000     0 IFUNC   LOCAL  DEFAULT[ 	]+1 f_spec_global_hidden_ifunc[ 	]+\[VARIANT_PCS\]
+     28: 0000000000008070     0 NOTYPE  LOCAL  DEFAULT    2 \$x
+     29: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT  UND f_base_global_default_undef
+-    30: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT \[VARIANT_PCS\]   UND f_spec_global_default_undef
+-    31: 0000000000008000     0 IFUNC   GLOBAL DEFAULT \[VARIANT_PCS\]     1 f_spec_global_default_ifunc
+    30: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT[ 	]+UND f_spec_global_default_undef[ 	]+\[VARIANT_PCS\]
+    31: 0000000000008000     0 IFUNC   GLOBAL DEFAULT[ 	]+1 f_spec_global_default_ifunc[ 	]+\[VARIANT_PCS\]
+     32: 0000000000008000     0 NOTYPE  GLOBAL DEFAULT    1 f_base_global_default_def
+-    33: 0000000000008000     0 NOTYPE  GLOBAL DEFAULT \[VARIANT_PCS\]     1 f_spec_global_default_def
+    33: 0000000000008000     0 NOTYPE  GLOBAL DEFAULT[ 	]+1 f_spec_global_default_def[ 	]+\[VARIANT_PCS\]
+     34: 0000000000008000     0 IFUNC   GLOBAL DEFAULT    1 f_base_global_default_ifunc
+diff -rupN --no-dereference binutils-2.36.1/ld/testsuite/ld-plugin/plugin-10.d binutils-2.36.1-new/ld/testsuite/ld-plugin/plugin-10.d
+--- binutils-2.36.1/ld/testsuite/ld-plugin/plugin-10.d	2021-02-13 18:13:16.877241429 +0100
+++ binutils-2.36.1-new/ld/testsuite/ld-plugin/plugin-10.d	2021-02-13 18:13:21.284220069 +0100
@@ -32,7 +32,7 @@ hook called: claim_file tmpdir/func.o \[
 hook called: claim_file tmpdir/libtext.a \[@.* not claimed
 #...
@ -10,9 +192,9 @@ diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin-10.d binutils-2.36.1/ld/te
 Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY
 #...
 hook called: cleanup.
-diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin-11.d binutils-2.36.1/ld/testsuite/ld-plugin/plugin-11.d
--- binutils.orig/ld/testsuite/ld-plugin/plugin-11.d	2021-02-12 10:13:11.119049477 +0000
-+++ binutils-2.36.1/ld/testsuite/ld-plugin/plugin-11.d	2021-02-12 10:50:40.973828943 +0000
+diff -rupN --no-dereference binutils-2.36.1/ld/testsuite/ld-plugin/plugin-11.d binutils-2.36.1-new/ld/testsuite/ld-plugin/plugin-11.d
+--- binutils-2.36.1/ld/testsuite/ld-plugin/plugin-11.d	2021-02-13 18:13:16.877241429 +0100
+++ binutils-2.36.1-new/ld/testsuite/ld-plugin/plugin-11.d	2021-02-13 18:13:21.284220069 +0100
@@ -35,9 +35,9 @@ hook called: claim_file tmpdir/func.o \[
 hook called: claim_file tmpdir/libtext.a \[@.* CLAIMED
 #...
@ -25,9 +207,23 @@ diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin-11.d binutils-2.36.1/ld/te
 #...
 hook called: cleanup.
 #...
-diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin-16.d binutils-2.36.1/ld/testsuite/ld-plugin/plugin-16.d
--- binutils.orig/ld/testsuite/ld-plugin/plugin-16.d	2021-02-12 10:13:11.119049477 +0000
-+++ binutils-2.36.1/ld/testsuite/ld-plugin/plugin-16.d	2021-02-12 10:29:31.510843797 +0000
+diff -rupN --no-dereference binutils-2.36.1/ld/testsuite/ld-plugin/plugin-12.d binutils-2.36.1-new/ld/testsuite/ld-plugin/plugin-12.d
+--- binutils-2.36.1/ld/testsuite/ld-plugin/plugin-12.d	2021-01-09 11:47:34.000000000 +0100
+++ binutils-2.36.1-new/ld/testsuite/ld-plugin/plugin-12.d	2021-02-13 18:13:21.288220049 +0100
+@@ -1,6 +1,6 @@
+ #...
+-.*: symbol `func' definition: DEF, visibility: DEFAULT, resolution: PREVAILING_DEF
+-.*: symbol `func1' definition: DEF, visibility: PROTECTED, resolution: PREVAILING_DEF_IRONLY
+-.*: symbol `func2' definition: DEF, visibility: INTERNAL, resolution: PREVAILING_DEF_IRONLY
+-.*: symbol `func3' definition: DEF, visibility: HIDDEN, resolution: PREVAILING_DEF_IRONLY
+.*: symbol `.*unc' definition: DEF, visibility: DEFAULT, resolution: PREVAILING_DE.*
+.*: symbol `.*unc1' definition: DEF, visibility: PROTECTED, resolution: PREVAILING_DEF_IRONLY
+.*: symbol `.*unc2' definition: DEF, visibility: INTERNAL, resolution: PREVAILING_DEF_IRONLY
+.*: symbol `.*unc3' definition: DEF, visibility: HIDDEN, resolution: PREVAILING_DEF_IRONLY
+ #pass
+diff -rupN --no-dereference binutils-2.36.1/ld/testsuite/ld-plugin/plugin-16.d binutils-2.36.1-new/ld/testsuite/ld-plugin/plugin-16.d
+--- binutils-2.36.1/ld/testsuite/ld-plugin/plugin-16.d	2021-02-13 18:13:16.878241424 +0100
+++ binutils-2.36.1-new/ld/testsuite/ld-plugin/plugin-16.d	2021-02-13 18:13:21.284220069 +0100
@@ -30,7 +30,7 @@ hook called: claim_file .*/ld/testsuite/
 hook called: claim_file tmpdir/text.o \[@0/.* not claimed
 #...
@ -37,9 +233,9 @@ diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin-16.d binutils-2.36.1/ld/te
 Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY
 #...
 hook called: cleanup.
-diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin-17.d binutils-2.36.1/ld/testsuite/ld-plugin/plugin-17.d
--- binutils.orig/ld/testsuite/ld-plugin/plugin-17.d	2021-02-12 10:13:11.116049499 +0000
-+++ binutils-2.36.1/ld/testsuite/ld-plugin/plugin-17.d	2021-02-12 10:35:13.348404638 +0000
+diff -rupN --no-dereference binutils-2.36.1/ld/testsuite/ld-plugin/plugin-17.d binutils-2.36.1-new/ld/testsuite/ld-plugin/plugin-17.d
+--- binutils-2.36.1/ld/testsuite/ld-plugin/plugin-17.d	2021-02-13 18:13:16.878241424 +0100
+++ binutils-2.36.1-new/ld/testsuite/ld-plugin/plugin-17.d	2021-02-13 18:13:21.284220069 +0100
@@ -31,7 +31,7 @@ hook called: claim_file .*/ld/testsuite/
 hook called: claim_file tmpdir/text.o \[@0/.* not claimed
 #...
@ -49,9 +245,9 @@ diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin-17.d binutils-2.36.1/ld/te
 Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY
 #...
 hook called: cleanup.
-diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin-18.d binutils-2.36.1/ld/testsuite/ld-plugin/plugin-18.d
--- binutils.orig/ld/testsuite/ld-plugin/plugin-18.d	2021-02-12 10:13:11.118049484 +0000
-+++ binutils-2.36.1/ld/testsuite/ld-plugin/plugin-18.d	2021-02-12 10:29:47.974726314 +0000
+diff -rupN --no-dereference binutils-2.36.1/ld/testsuite/ld-plugin/plugin-18.d binutils-2.36.1-new/ld/testsuite/ld-plugin/plugin-18.d
+--- binutils-2.36.1/ld/testsuite/ld-plugin/plugin-18.d	2021-02-13 18:13:16.878241424 +0100
+++ binutils-2.36.1-new/ld/testsuite/ld-plugin/plugin-18.d	2021-02-13 18:13:21.284220069 +0100
@@ -32,7 +32,7 @@ hook called: claim_file .*/ld/testsuite/
 hook called: claim_file tmpdir/libtext.a \[@.* not claimed
 #...
@ -61,9 +257,9 @@ diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin-18.d binutils-2.36.1/ld/te
 Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY
 #...
 hook called: cleanup.
-diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin-19.d binutils-2.36.1/ld/testsuite/ld-plugin/plugin-19.d
--- binutils.orig/ld/testsuite/ld-plugin/plugin-19.d	2021-02-12 10:13:11.116049499 +0000
-+++ binutils-2.36.1/ld/testsuite/ld-plugin/plugin-19.d	2021-02-12 10:30:31.990412245 +0000
+diff -rupN --no-dereference binutils-2.36.1/ld/testsuite/ld-plugin/plugin-19.d binutils-2.36.1-new/ld/testsuite/ld-plugin/plugin-19.d
+--- binutils-2.36.1/ld/testsuite/ld-plugin/plugin-19.d	2021-02-13 18:13:16.878241424 +0100
+++ binutils-2.36.1-new/ld/testsuite/ld-plugin/plugin-19.d	2021-02-13 18:13:21.284220069 +0100
@@ -35,9 +35,9 @@ hook called: claim_file .*/ld/testsuite/
 hook called: claim_file tmpdir/libtext.a \[@.* CLAIMED
 #...
@ -76,9 +272,9 @@ diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin-19.d binutils-2.36.1/ld/te
 #...
 hook called: cleanup.
 #...
-diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin-8.d binutils-2.36.1/ld/testsuite/ld-plugin/plugin-8.d
--- binutils.orig/ld/testsuite/ld-plugin/plugin-8.d	2021-02-12 10:13:11.118049484 +0000
-+++ binutils-2.36.1/ld/testsuite/ld-plugin/plugin-8.d	2021-02-12 10:23:18.489561148 +0000
+diff -rupN --no-dereference binutils-2.36.1/ld/testsuite/ld-plugin/plugin-8.d binutils-2.36.1-new/ld/testsuite/ld-plugin/plugin-8.d
+--- binutils-2.36.1/ld/testsuite/ld-plugin/plugin-8.d	2021-02-13 18:13:16.880241414 +0100
+++ binutils-2.36.1-new/ld/testsuite/ld-plugin/plugin-8.d	2021-02-13 18:13:21.284220069 +0100
@@ -30,7 +30,7 @@ hook called: claim_file tmpdir/func.o \[
 hook called: claim_file tmpdir/text.o \[@0/.* not claimed
 #...
@ -88,9 +284,9 @@ diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin-8.d binutils-2.36.1/ld/tes
 Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY
 #...
 hook called: cleanup.
-diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin-9.d binutils-2.36.1/ld/testsuite/ld-plugin/plugin-9.d
--- binutils.orig/ld/testsuite/ld-plugin/plugin-9.d	2021-02-12 10:13:11.119049477 +0000
-+++ binutils-2.36.1/ld/testsuite/ld-plugin/plugin-9.d	2021-02-12 10:23:34.417443785 +0000
+diff -rupN --no-dereference binutils-2.36.1/ld/testsuite/ld-plugin/plugin-9.d binutils-2.36.1-new/ld/testsuite/ld-plugin/plugin-9.d
+--- binutils-2.36.1/ld/testsuite/ld-plugin/plugin-9.d	2021-02-13 18:13:16.880241414 +0100
+++ binutils-2.36.1-new/ld/testsuite/ld-plugin/plugin-9.d	2021-02-13 18:13:21.285220064 +0100
@@ -31,7 +31,7 @@ hook called: claim_file tmpdir/func.o \[
 hook called: claim_file tmpdir/text.o \[@0/.* not claimed
 #...
@ -100,9 +296,9 @@ diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin-9.d binutils-2.36.1/ld/tes
 Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY
 #...
 hook called: cleanup.
-diff -rup binutils.orig/ld/testsuite/ld-x86-64/x86-64.exp binutils-2.36.1/ld/testsuite/ld-x86-64/x86-64.exp
--- binutils.orig/ld/testsuite/ld-x86-64/x86-64.exp	2021-02-12 10:13:11.177049047 +0000
-+++ binutils-2.36.1/ld/testsuite/ld-x86-64/x86-64.exp	2021-02-12 10:57:23.339975059 +0000
+diff -rupN --no-dereference binutils-2.36.1/ld/testsuite/ld-x86-64/x86-64.exp binutils-2.36.1-new/ld/testsuite/ld-x86-64/x86-64.exp
+--- binutils-2.36.1/ld/testsuite/ld-x86-64/x86-64.exp	2021-02-13 18:13:21.282220078 +0100
+++ binutils-2.36.1-new/ld/testsuite/ld-x86-64/x86-64.exp	2021-02-13 18:13:21.285220064 +0100
@@ -1437,22 +1437,6 @@ if { [isnative] && [check_compiler_avail
     } else {
 	run_cc_link_tests [list \
@ -243,10 +439,7 @@ diff -rup binutils.orig/ld/testsuite/ld-x86-64/x86-64.exp binutils-2.36.1/ld/tes
 
 	run_ld_link_exec_tests [list \
 	    [list \
-diff -rup binutils.orig/ld/testsuite/ld-x86-64/x86-64.exp binutils-2.36.1/ld/testsuite/ld-x86-64/x86-64.exp
--- binutils.orig/ld/testsuite/ld-x86-64/x86-64.exp	2021-02-12 11:44:39.121364751 +0000
-+++ binutils-2.36.1/ld/testsuite/ld-x86-64/x86-64.exp	2021-02-12 11:46:27.505597689 +0000
-@@ -1878,24 +1878,6 @@ if { [isnative] && [check_compiler_avail
+@@ -1997,24 +1878,6 @@ if { [isnative] && [check_compiler_avail
 		"plt-main.out" \
 		"-fPIC" \
 	    ] \
@ -271,7 +464,7 @@ diff -rup binutils.orig/ld/testsuite/ld-x86-64/x86-64.exp binutils-2.36.1/ld/tes
 	]
 
 	if { [check_ifunc_attribute_available] } {
-@@ -1922,7 +1904,6 @@ if { [isnative] && [check_compiler_avail
+@@ -2041,7 +1904,6 @@ if { [isnative] && [check_compiler_avail
 	}
     }
 
@ -279,212 +472,3 @@ diff -rup binutils.orig/ld/testsuite/ld-x86-64/x86-64.exp binutils-2.36.1/ld/tes
     undefined_weak "-fPIE" ""
     undefined_weak "-fPIE" "-pie"
     undefined_weak "-fPIE" "-Wl,-z,nodynamic-undefined-weak"
--- binutils.orig/binutils/dwarf.c	2021-02-12 11:44:39.012365518 +0000
-+++ binutils-2.36.1/binutils/dwarf.c	2021-02-12 11:49:35.408266181 +0000
-@@ -2117,6 +2117,7 @@ get_type_abbrev_from_form (unsigned long
-   switch (form)
-     {
-     case DW_FORM_GNU_ref_alt:
-+    case DW_FORM_ref_sig8:
-       /* FIXME: We are unable to handle this form at the moment.  */
-       return NULL;
- 
-@@ -2146,7 +2147,7 @@ get_type_abbrev_from_form (unsigned long
-       /* FIXME: Are there other DW_FORMs that can be used by types ?  */
- 
-     default:
-      warn (_("Unexpected form %lx encountered whilst finding abbreviation for type\n"), form);
-+      warn (_("Unexpected form %#lx encountered whilst finding abbreviation for type\n"), form);
-       return NULL;
-     }
- 
-diff -rup binutils.orig/ld/testsuite/ld-aarch64/variant_pcs-now.d binutils-2.36.1/ld/testsuite/ld-aarch64/variant_pcs-now.d
--- binutils.orig/ld/testsuite/ld-aarch64/variant_pcs-now.d	2021-02-12 11:44:39.034365363 +0000
-+++ binutils-2.36.1/ld/testsuite/ld-aarch64/variant_pcs-now.d	2021-02-12 11:57:49.372692119 +0000
-@@ -41,28 +41,28 @@ Symbol table '\.symtab' contains 35 entr
-      7: 00000000000111c8     0 SECTION LOCAL  DEFAULT    7 
-      8: 0000000000011270     0 SECTION LOCAL  DEFAULT    8 
-      9: 0000000000000000     0 FILE    LOCAL  DEFAULT  ABS .*variant_pcs-1\.o
-    10: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_local
-    11: 0000000000008000     0 IFUNC   LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_local_ifunc
-+    10: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT[ 	]+1 f_spec_local[ 	]+\[VARIANT_PCS\]
-+    11: 0000000000008000     0 IFUNC   LOCAL  DEFAULT[ 	]+1 f_spec_local_ifunc[ 	]+\[VARIANT_PCS\]
-     12: 0000000000008000     0 IFUNC   LOCAL  DEFAULT    1 f_base_local_ifunc
-     13: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT    1 f_base_local
-     14: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT    1 \$x
-     15: 0000000000000000     0 FILE    LOCAL  DEFAULT  ABS .*variant_pcs-2\.o
-    16: 0000000000008038     0 NOTYPE  LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_local2
-    17: 0000000000008038     0 IFUNC   LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_local2_ifunc
-+    16: 0000000000008038     0 NOTYPE  LOCAL  DEFAULT[ 	]+1 f_spec_local2[ 	]+\[VARIANT_PCS\]
-+    17: 0000000000008038     0 IFUNC   LOCAL  DEFAULT[ 	]+1 f_spec_local2_ifunc[ 	]+\[VARIANT_PCS\]
-     18: 0000000000008038     0 IFUNC   LOCAL  DEFAULT    1 f_base_local2_ifunc
-     19: 0000000000008038     0 NOTYPE  LOCAL  DEFAULT    1 f_base_local2
-     20: 0000000000008038     0 NOTYPE  LOCAL  DEFAULT    1 \$x
-     21: 0000000000000000     0 FILE    LOCAL  DEFAULT  ABS 
-     22: 0000000000009080     0 OBJECT  LOCAL  DEFAULT  ABS _DYNAMIC
-    23: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_global_hidden_def
-+    23: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT[ 	]+1 f_spec_global_hidden_def[ 	]+\[VARIANT_PCS\]
-     24: 0000000000008000     0 IFUNC   LOCAL  DEFAULT    1 f_base_global_hidden_ifunc
-     25: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT    1 f_base_global_hidden_def
-     26: 0000000000009000     0 OBJECT  LOCAL  DEFAULT  ABS _GLOBAL_OFFSET_TABLE_
-    27: 0000000000008000     0 IFUNC   LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_global_hidden_ifunc
-+    27: 0000000000008000     0 IFUNC   LOCAL  DEFAULT[ 	]+1 f_spec_global_hidden_ifunc[ 	]+\[VARIANT_PCS\]
-     28: 0000000000008070     0 NOTYPE  LOCAL  DEFAULT    2 \$x
-     29: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT  UND f_base_global_default_undef
-    30: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT \[VARIANT_PCS\]   UND f_spec_global_default_undef
-    31: 0000000000008000     0 IFUNC   GLOBAL DEFAULT \[VARIANT_PCS\]     1 f_spec_global_default_ifunc
-+    30: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT[ 	]+UND f_spec_global_default_undef[ 	]+\[VARIANT_PCS\]
-+    31: 0000000000008000     0 IFUNC   GLOBAL DEFAULT[ 	]+1 f_spec_global_default_ifunc[ 	]+\[VARIANT_PCS\]
-     32: 0000000000008000     0 NOTYPE  GLOBAL DEFAULT    1 f_base_global_default_def
-    33: 0000000000008000     0 NOTYPE  GLOBAL DEFAULT \[VARIANT_PCS\]     1 f_spec_global_default_def
-+    33: 0000000000008000     0 NOTYPE  GLOBAL DEFAULT[ 	]+1 f_spec_global_default_def[ 	]+\[VARIANT_PCS\]
-     34: 0000000000008000     0 IFUNC   GLOBAL DEFAULT    1 f_base_global_default_ifunc
-diff -rup binutils.orig/ld/testsuite/ld-aarch64/variant_pcs-r.d binutils-2.36.1/ld/testsuite/ld-aarch64/variant_pcs-r.d
--- binutils.orig/ld/testsuite/ld-aarch64/variant_pcs-r.d	2021-02-12 11:44:39.028365406 +0000
-+++ binutils-2.36.1/ld/testsuite/ld-aarch64/variant_pcs-r.d	2021-02-12 11:54:36.878111688 +0000
-@@ -37,24 +37,24 @@ Symbol table '\.symtab' contains 26 entr
-      2: 0000000000000000     0 SECTION LOCAL  DEFAULT    3 
-      3: 0000000000000000     0 SECTION LOCAL  DEFAULT    4 
-      4: 0000000000000000     0 FILE    LOCAL  DEFAULT  ABS .*variant_pcs-1\.o
-     5: 0000000000000000     0 NOTYPE  LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_local
-     6: 0000000000000000     0 IFUNC   LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_local_ifunc
-+     5: 0000000000000000     0 NOTYPE  LOCAL  DEFAULT[ 	]+1 f_spec_local[ 	]+\[VARIANT_PCS\]
-+     6: 0000000000000000     0 IFUNC   LOCAL  DEFAULT[ 	]+1 f_spec_local_ifunc[ 	]+\[VARIANT_PCS\]
-      7: 0000000000000000     0 IFUNC   LOCAL  DEFAULT    1 f_base_local_ifunc
-      8: 0000000000000000     0 NOTYPE  LOCAL  DEFAULT    1 f_base_local
-      9: 0000000000000000     0 NOTYPE  LOCAL  DEFAULT    1 \$x
-     10: 0000000000000000     0 FILE    LOCAL  DEFAULT  ABS .*variant_pcs-2\.o
-    11: 0000000000000038     0 NOTYPE  LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_local2
-    12: 0000000000000038     0 IFUNC   LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_local2_ifunc
-+    11: 0000000000000038     0 NOTYPE  LOCAL  DEFAULT[ 	]+1 f_spec_local2[ 	]+\[VARIANT_PCS\]
-+    12: 0000000000000038     0 IFUNC   LOCAL  DEFAULT[ 	]+1 f_spec_local2_ifunc[ 	]+\[VARIANT_PCS\]
-     13: 0000000000000038     0 IFUNC   LOCAL  DEFAULT    1 f_base_local2_ifunc
-     14: 0000000000000038     0 NOTYPE  LOCAL  DEFAULT    1 f_base_local2
-     15: 0000000000000038     0 NOTYPE  LOCAL  DEFAULT    1 \$x
-     16: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT  UND f_base_global_default_undef
-    17: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT \[VARIANT_PCS\]   UND f_spec_global_default_undef
-    18: 0000000000000000     0 NOTYPE  GLOBAL HIDDEN  \[VARIANT_PCS\]     1 f_spec_global_hidden_def
-+    17: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT[ 	]+UND f_spec_global_default_undef[ 	]+\[VARIANT_PCS\]
-+    18: 0000000000000000     0 NOTYPE  GLOBAL HIDDEN[ 	]+1 f_spec_global_hidden_def[ 	]+\[VARIANT_PCS\]
-     19: 0000000000000000     0 IFUNC   GLOBAL HIDDEN     1 f_base_global_hidden_ifunc
-    20: 0000000000000000     0 IFUNC   GLOBAL DEFAULT \[VARIANT_PCS\]     1 f_spec_global_default_ifunc
-+    20: 0000000000000000     0 IFUNC   GLOBAL DEFAULT[ 	]+1 f_spec_global_default_ifunc[ 	]+\[VARIANT_PCS\]
-     21: 0000000000000000     0 NOTYPE  GLOBAL HIDDEN     1 f_base_global_hidden_def
-    22: 0000000000000000     0 IFUNC   GLOBAL HIDDEN  \[VARIANT_PCS\]     1 f_spec_global_hidden_ifunc
-+    22: 0000000000000000     0 IFUNC   GLOBAL HIDDEN[ 	]+1 f_spec_global_hidden_ifunc[ 	]+\[VARIANT_PCS\]
-     23: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT    1 f_base_global_default_def
-    24: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT \[VARIANT_PCS\]     1 f_spec_global_default_def
-+    24: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT[ 	]+1 f_spec_global_default_def[ 	]+\[VARIANT_PCS\]
-     25: 0000000000000000     0 IFUNC   GLOBAL DEFAULT    1 f_base_global_default_ifunc
-diff -rup binutils.orig/ld/testsuite/ld-aarch64/variant_pcs-shared.d binutils-2.36.1/ld/testsuite/ld-aarch64/variant_pcs-shared.d
--- binutils.orig/ld/testsuite/ld-aarch64/variant_pcs-shared.d	2021-02-12 11:44:39.027365412 +0000
-+++ binutils-2.36.1/ld/testsuite/ld-aarch64/variant_pcs-shared.d	2021-02-12 11:56:14.669390518 +0000
-@@ -41,28 +41,28 @@ Symbol table '\.symtab' contains 35 entr
-      7: 00000000000111c8     0 SECTION LOCAL  DEFAULT    7 
-      8: 0000000000011270     0 SECTION LOCAL  DEFAULT    8 
-      9: 0000000000000000     0 FILE    LOCAL  DEFAULT  ABS .*variant_pcs-1\.o
-    10: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_local
-    11: 0000000000008000     0 IFUNC   LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_local_ifunc
-+    10: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT[ 	]+1 f_spec_local[ 	]+\[VARIANT_PCS\]
-+    11: 0000000000008000     0 IFUNC   LOCAL  DEFAULT[ 	]+1 f_spec_local_ifunc[ 	]+\[VARIANT_PCS\]
-     12: 0000000000008000     0 IFUNC   LOCAL  DEFAULT    1 f_base_local_ifunc
-     13: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT    1 f_base_local
-     14: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT    1 \$x
-     15: 0000000000000000     0 FILE    LOCAL  DEFAULT  ABS .*variant_pcs-2\.o
-    16: 0000000000008038     0 NOTYPE  LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_local2
-    17: 0000000000008038     0 IFUNC   LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_local2_ifunc
-+    16: 0000000000008038     0 NOTYPE  LOCAL  DEFAULT[ 	]+1 f_spec_local2[ 	]+\[VARIANT_PCS\]
-+    17: 0000000000008038     0 IFUNC   LOCAL  DEFAULT[ 	]+1 f_spec_local2_ifunc[ 	]+\[VARIANT_PCS\]
-     18: 0000000000008038     0 IFUNC   LOCAL  DEFAULT    1 f_base_local2_ifunc
-     19: 0000000000008038     0 NOTYPE  LOCAL  DEFAULT    1 f_base_local2
-     20: 0000000000008038     0 NOTYPE  LOCAL  DEFAULT    1 \$x
-     21: 0000000000000000     0 FILE    LOCAL  DEFAULT  ABS 
-     22: 0000000000009080     0 OBJECT  LOCAL  DEFAULT  ABS _DYNAMIC
-    23: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_global_hidden_def
-+    23: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT[ 	]+1 f_spec_global_hidden_def[ 	]+\[VARIANT_PCS\]
-     24: 0000000000008000     0 IFUNC   LOCAL  DEFAULT    1 f_base_global_hidden_ifunc
-     25: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT    1 f_base_global_hidden_def
-     26: 0000000000009000     0 OBJECT  LOCAL  DEFAULT  ABS _GLOBAL_OFFSET_TABLE_
-    27: 0000000000008000     0 IFUNC   LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_global_hidden_ifunc
-+    27: 0000000000008000     0 IFUNC   LOCAL  DEFAULT[ 	]+1 f_spec_global_hidden_ifunc[ 	]+\[VARIANT_PCS\]
-     28: 0000000000008070     0 NOTYPE  LOCAL  DEFAULT    2 \$x
-     29: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT  UND f_base_global_default_undef
-    30: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT \[VARIANT_PCS\]   UND f_spec_global_default_undef
-    31: 0000000000008000     0 IFUNC   GLOBAL DEFAULT \[VARIANT_PCS\]     1 f_spec_global_default_ifunc
-+    30: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT[ 	]+UND f_spec_global_default_undef[ 	]+\[VARIANT_PCS\]
-+    31: 0000000000008000     0 IFUNC   GLOBAL DEFAULT[ 	]+1 f_spec_global_default_ifunc[ 	]+\[VARIANT_PCS\]
-     32: 0000000000008000     0 NOTYPE  GLOBAL DEFAULT    1 f_base_global_default_def
-    33: 0000000000008000     0 NOTYPE  GLOBAL DEFAULT \[VARIANT_PCS\]     1 f_spec_global_default_def
-+    33: 0000000000008000     0 NOTYPE  GLOBAL DEFAULT[ 	]+1 f_spec_global_default_def[ 	]+\[VARIANT_PCS\]
-     34: 0000000000008000     0 IFUNC   GLOBAL DEFAULT    1 f_base_global_default_ifunc
--- binutils.orig/ld/testsuite/ld-plugin/plugin-12.d	2021-02-12 11:44:39.076365068 +0000
-+++ binutils-2.36.1/ld/testsuite/ld-plugin/plugin-12.d	2021-02-12 12:01:48.091931654 +0000
-@@ -1,5 +1,5 @@
- #...
-.*: symbol `func' definition: DEF, visibility: DEFAULT, resolution: PREVAILING_DEF
-+.*: symbol `func' definition: DEF, visibility: DEFAULT, resolution: PREVAILING_DE.*
- .*: symbol `func1' definition: DEF, visibility: PROTECTED, resolution: PREVAILING_DEF_IRONLY
- .*: symbol `func2' definition: DEF, visibility: INTERNAL, resolution: PREVAILING_DEF_IRONLY
- .*: symbol `func3' definition: DEF, visibility: HIDDEN, resolution: PREVAILING_DEF_IRONLY
--- binutils.orig/gold/main.cc	2021-01-21 16:12:10.006321882 +0000
-+++ binutils-2.35.90/gold/main.cc	2021-01-21 16:12:41.935071183 +0000
-@@ -290,11 +290,6 @@ main(int argc, char** argv)
-               elapsed.sys / 1000, (elapsed.sys % 1000) * 1000,
-               elapsed.wall / 1000, (elapsed.wall % 1000) * 1000);
- 
-#ifdef HAVE_MALLINFO
-      struct mallinfo m = mallinfo();
-      fprintf(stderr, _("%s: total space allocated by malloc: %lld bytes\n"),
-	      program_name, static_cast<long long>(m.arena));
-#endif
-       File_read::print_stats();
-       Archive::print_stats();
-       Lib_group::print_stats();
-
-diff -rup binutils.orig/ld/testsuite/ld-aarch64/variant_pcs-now.d binutils-2.36.1/ld/testsuite/ld-aarch64/variant_pcs-now.d
--- binutils.orig/ld/testsuite/ld-aarch64/variant_pcs-now.d	2021-02-12 14:14:24.977160359 +0000
-+++ binutils-2.36.1/ld/testsuite/ld-aarch64/variant_pcs-now.d	2021-02-12 14:17:35.540758925 +0000
-@@ -23,10 +23,10 @@ Symbol table '\.dynsym' contains 7 entri
-    Num:    Value          Size Type    Bind   Vis      Ndx Name
-      0: 0000000000000000     0 NOTYPE  LOCAL  DEFAULT  UND 
-      1: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT  UND f_base_global_default_undef
-     2: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT \[VARIANT_PCS\]   UND f_spec_global_default_undef
-     3: 0000000000008000     0 IFUNC   GLOBAL DEFAULT \[VARIANT_PCS\]     1 f_spec_global_default_ifunc
-+     2: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT[ 	]+UND f_spec_global_default_undef[ 	]+\[VARIANT_PCS\]
-+     3: 0000000000008000     0 IFUNC   GLOBAL DEFAULT[ 	]+1 f_spec_global_default_ifunc[ 	]+\[VARIANT_PCS\]
-      4: 0000000000008000     0 NOTYPE  GLOBAL DEFAULT    1 f_base_global_default_def
-     5: 0000000000008000     0 NOTYPE  GLOBAL DEFAULT \[VARIANT_PCS\]     1 f_spec_global_default_def
-+     5: 0000000000008000     0 NOTYPE  GLOBAL DEFAULT[ 	]+1 f_spec_global_default_def[ 	]+\[VARIANT_PCS\]
-      6: 0000000000008000     0 IFUNC   GLOBAL DEFAULT    1 f_base_global_default_ifunc
- 
- Symbol table '\.symtab' contains 35 entries:
-diff -rup binutils.orig/ld/testsuite/ld-aarch64/variant_pcs-shared.d binutils-2.36.1/ld/testsuite/ld-aarch64/variant_pcs-shared.d
--- binutils.orig/ld/testsuite/ld-aarch64/variant_pcs-shared.d	2021-02-12 14:14:24.980160337 +0000
-+++ binutils-2.36.1/ld/testsuite/ld-aarch64/variant_pcs-shared.d	2021-02-12 14:16:49.860094868 +0000
-@@ -23,10 +23,10 @@ Symbol table '\.dynsym' contains 7 entri
-    Num:    Value          Size Type    Bind   Vis      Ndx Name
-      0: 0000000000000000     0 NOTYPE  LOCAL  DEFAULT  UND 
-      1: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT  UND f_base_global_default_undef
-     2: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT \[VARIANT_PCS\]   UND f_spec_global_default_undef
-     3: 0000000000008000     0 IFUNC   GLOBAL DEFAULT \[VARIANT_PCS\]     1 f_spec_global_default_ifunc
-+     2: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT[ 	]+UND f_spec_global_default_undef[ 	]+\[VARIANT_PCS\]
-+     3: 0000000000008000     0 IFUNC   GLOBAL DEFAULT[ 	]+1 f_spec_global_default_ifunc[ 	]+\[VARIANT_PCS\]
-      4: 0000000000008000     0 NOTYPE  GLOBAL DEFAULT    1 f_base_global_default_def
-     5: 0000000000008000     0 NOTYPE  GLOBAL DEFAULT \[VARIANT_PCS\]     1 f_spec_global_default_def
-+     5: 0000000000008000     0 NOTYPE  GLOBAL DEFAULT[ 	]+1 f_spec_global_default_def[ 	]+\[VARIANT_PCS\]
-      6: 0000000000008000     0 IFUNC   GLOBAL DEFAULT    1 f_base_global_default_ifunc
- 
- Symbol table '\.symtab' contains 35 entries:
--- binutils.orig/ld/testsuite/ld-plugin/plugin-12.d	2021-02-12 14:14:25.023160021 +0000
-+++ binutils-2.36.1/ld/testsuite/ld-plugin/plugin-12.d	2021-02-12 14:19:29.106923745 +0000
-@@ -1,6 +1,6 @@
- #...
-.*: symbol `func' definition: DEF, visibility: DEFAULT, resolution: PREVAILING_DE.*
-.*: symbol `func1' definition: DEF, visibility: PROTECTED, resolution: PREVAILING_DEF_IRONLY
-.*: symbol `func2' definition: DEF, visibility: INTERNAL, resolution: PREVAILING_DEF_IRONLY
-.*: symbol `func3' definition: DEF, visibility: HIDDEN, resolution: PREVAILING_DEF_IRONLY
-+.*: symbol `.*unc' definition: DEF, visibility: DEFAULT, resolution: PREVAILING_DE.*
-+.*: symbol `.*unc1' definition: DEF, visibility: PROTECTED, resolution: PREVAILING_DEF_IRONLY
-+.*: symbol `.*unc2' definition: DEF, visibility: INTERNAL, resolution: PREVAILING_DEF_IRONLY
-+.*: symbol `.*unc3' definition: DEF, visibility: HIDDEN, resolution: PREVAILING_DEF_IRONLY
- #pass
--- a/binutils-use-long-long.patch
+++ b/binutils-use-long-long.patch
@ -1,7 +1,7 @@
-diff -up binutils-2.25.orig/bfd/configure.ac binutils-2.25/bfd/configure.ac
--- binutils-2.25.orig/bfd/configure.ac	2014-12-24 10:34:45.590491143 +0000
-+++ binutils-2.25/bfd/configure.ac	2014-12-24 10:36:12.997981992 +0000
-@@ -183,11 +183,13 @@ if test "x${ac_cv_sizeof_long}" = "x8";
+diff -rupN --no-dereference binutils-2.36.1/bfd/configure binutils-2.36.1-new/bfd/configure
+--- binutils-2.36.1/bfd/configure	2021-02-06 10:02:09.000000000 +0100
+++ binutils-2.36.1-new/bfd/configure	2021-02-13 18:13:19.528228597 +0100
+@@ -13461,11 +13461,13 @@ if test "x${ac_cv_sizeof_long}" = "x8";
   BFD_HOST_64BIT_LONG=1
   test -n "${HOST_64BIT_TYPE}" || HOST_64BIT_TYPE="long"
   test -n "${HOST_U_64BIT_TYPE}" || HOST_U_64BIT_TYPE="unsigned long"
@ -17,10 +17,10 @@ diff -up binutils-2.25.orig/bfd/configure.ac binutils-2.25/bfd/configure.ac
     BFD_HOSTPTR_T="unsigned long long"
   fi
 fi
-diff -up ../binutils-2.20.51.0.7.original/bfd/configure ./bfd/configure
--- a/bfd/configure	2010-04-08 15:23:58.000000000 +0100
-+++ b/bfd/configure	2010-04-08 15:24:06.000000000 +0100
-@@ -12819,11 +12819,13 @@
+diff -rupN --no-dereference binutils-2.36.1/bfd/configure.ac binutils-2.36.1-new/bfd/configure.ac
+--- binutils-2.36.1/bfd/configure.ac	2021-01-09 11:47:33.000000000 +0100
+++ binutils-2.36.1-new/bfd/configure.ac	2021-02-13 18:13:19.526228607 +0100
+@@ -219,11 +219,13 @@ if test "x${ac_cv_sizeof_long}" = "x8";
   BFD_HOST_64BIT_LONG=1
   test -n "${HOST_64BIT_TYPE}" || HOST_64BIT_TYPE="long"
   test -n "${HOST_U_64BIT_TYPE}" || HOST_U_64BIT_TYPE="unsigned long"
--- a/binutils-version.patch
+++ b/binutils-version.patch
@ -1,6 +1,7 @@
--- binutils-2.26.orig/bfd/Makefile.am	2016-01-25 10:11:33.505289018 +0000
-+++ binutils-2.26/bfd/Makefile.am	2016-01-25 10:13:23.489964145 +0000
-@@ -1043,8 +1043,8 @@ DISTCLEANFILES = $(BUILD_CFILES) $(BUILD
+diff -rupN --no-dereference binutils-2.36.1/bfd/Makefile.am binutils-2.36.1-new/bfd/Makefile.am
+--- binutils-2.36.1/bfd/Makefile.am	2021-01-09 11:47:33.000000000 +0100
+++ binutils-2.36.1-new/bfd/Makefile.am	2021-02-13 18:13:07.980284094 +0100
+@@ -942,8 +942,8 @@ DISTCLEANFILES = $(BUILD_CFILES) $(BUILD
 bfdver.h: $(srcdir)/version.h $(srcdir)/development.sh $(srcdir)/Makefile.in
 	@echo "creating $@"
 	@bfd_version=`echo "$(VERSION)" | $(SED) -e 's/\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\).*/\1.00\2.00\3.00\4.00\5/' -e 's/\([^\.]*\)\..*\(..\)\..*\(..\)\..*\(..\)\..*\(..\)$$/\1\2\3\4\5/'` ;\
@ -11,7 +12,7 @@
 	bfd_version_package="\"$(PKGVERSION)\"" ;\
 	report_bugs_to="\"$(REPORT_BUGS_TO)\"" ;\
 	. $(srcdir)/development.sh ;\
-@@ -1055,7 +1055,7 @@ bfdver.h: $(srcdir)/version.h $(srcdir)/
+@@ -954,7 +954,7 @@ bfdver.h: $(srcdir)/version.h $(srcdir)/
 	fi ;\
 	$(SED) -e "s,@bfd_version@,$$bfd_version," \
 	    -e "s,@bfd_version_string@,$$bfd_version_string," \
@ -20,9 +21,10 @@
 	    -e "s,@report_bugs_to@,$$report_bugs_to," \
 	    < $(srcdir)/version.h > $@; \
 	echo "$${bfd_soversion}" > libtool-soversion
--- binutils-2.26.orig/bfd/Makefile.in	2016-01-25 10:11:33.505289018 +0000
-+++ binutils-2.26/bfd/Makefile.in	2016-01-25 10:14:17.818297941 +0000
-@@ -2111,8 +2111,8 @@ stmp-lcoff-h: $(LIBCOFF_H_FILES)
+diff -rupN --no-dereference binutils-2.36.1/bfd/Makefile.in binutils-2.36.1-new/bfd/Makefile.in
+--- binutils-2.36.1/bfd/Makefile.in	2021-02-06 10:02:09.000000000 +0100
+++ binutils-2.36.1-new/bfd/Makefile.in	2021-02-13 18:13:07.981284089 +0100
+@@ -2053,8 +2053,8 @@ stmp-lcoff-h: $(LIBCOFF_H_FILES)
 bfdver.h: $(srcdir)/version.h $(srcdir)/development.sh $(srcdir)/Makefile.in
 	@echo "creating $@"
 	@bfd_version=`echo "$(VERSION)" | $(SED) -e 's/\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\).*/\1.00\2.00\3.00\4.00\5/' -e 's/\([^\.]*\)\..*\(..\)\..*\(..\)\..*\(..\)\..*\(..\)$$/\1\2\3\4\5/'` ;\
@ -33,7 +35,7 @@
 	bfd_version_package="\"$(PKGVERSION)\"" ;\
 	report_bugs_to="\"$(REPORT_BUGS_TO)\"" ;\
 	. $(srcdir)/development.sh ;\
-@@ -2123,7 +2123,7 @@ bfdver.h: $(srcdir)/version.h $(srcdir)/
+@@ -2065,7 +2065,7 @@ bfdver.h: $(srcdir)/version.h $(srcdir)/
 	fi ;\
 	$(SED) -e "s,@bfd_version@,$$bfd_version," \
 	    -e "s,@bfd_version_string@,$$bfd_version_string," \
--- a/mingw-binutils.spec
+++ b/mingw-binutils.spec
@ -295,6 +295,7 @@ make -C build_multilib DESTDIR=%{buildroot}/multilib install
 # These files conflict with ordinary binutils.
 rm -rf %{buildroot}%{_infodir}
 rm -f %{buildroot}%{_libdir}/libiberty*
+rm -f %{buildroot}%{_libdir}/bfd-plugins/libdep.so

 # Keep the multilib versions of the strip, objdump and objcopy commands
 # We need these for the RPM integration as these tools must be able to
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (binutils-2.34.tar.bz2) = f47e7304e102c7bbc97958a08093e27796b9051d1567ce4fbb723d39ef3e29efa325ee14a1bdcc462a925a7f9bbbc9aee28294c6dc23850f371030f3835a8067
+SHA512 (binutils-2.36.1.tar.bz2) = 5c40cfe05b922492627db71990dd2ba6030fd2de4bdba3f53a3f274543ff161fb56e2f6bdac107e0ffdcfd095e499c54e1157ee1865723baefa67b5b4d3da201