Blame SOURCES/binutils-testsuite-fixes.patch

e0bdd4
diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin-10.d binutils-2.36.1/ld/testsuite/ld-plugin/plugin-10.d
e0bdd4
--- binutils.orig/ld/testsuite/ld-plugin/plugin-10.d	2021-02-12 10:13:11.116049499 +0000
e0bdd4
+++ binutils-2.36.1/ld/testsuite/ld-plugin/plugin-10.d	2021-02-12 10:23:44.298370984 +0000
e0bdd4
@@ -32,7 +32,7 @@ hook called: claim_file tmpdir/func.o \[
e0bdd4
 hook called: claim_file tmpdir/libtext.a \[@.* not claimed
e0bdd4
 #...
e0bdd4
 hook called: all symbols read.
e0bdd4
-Sym: '_?func' Resolution: LDPR_PREVAILING_DEF_IRONLY
e0bdd4
+Sym: '_?func' Resolution: LDPR_PREVAILING_DE.*
e0bdd4
 Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY
e0bdd4
 #...
e0bdd4
 hook called: cleanup.
e0bdd4
diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin-11.d binutils-2.36.1/ld/testsuite/ld-plugin/plugin-11.d
e0bdd4
--- binutils.orig/ld/testsuite/ld-plugin/plugin-11.d	2021-02-12 10:13:11.119049477 +0000
e0bdd4
+++ binutils-2.36.1/ld/testsuite/ld-plugin/plugin-11.d	2021-02-12 10:50:40.973828943 +0000
e0bdd4
@@ -35,9 +35,9 @@ hook called: claim_file tmpdir/func.o \[
e0bdd4
 hook called: claim_file tmpdir/libtext.a \[@.* CLAIMED
e0bdd4
 #...
e0bdd4
 hook called: all symbols read.
e0bdd4
-Sym: '_?func' Resolution: LDPR_PREVAILING_DEF_IRONLY
e0bdd4
+Sym: '_?func' Resolution: LDPR_PREVAILING_DE.*
e0bdd4
 Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY
e0bdd4
-Sym: '_?text' Resolution: LDPR_PREVAILING_DEF_IRONLY
e0bdd4
+Sym: '_?text' Resolution: LDPR_PREVAILING_DE.*
e0bdd4
 #...
e0bdd4
 hook called: cleanup.
e0bdd4
 #...
e0bdd4
diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin-16.d binutils-2.36.1/ld/testsuite/ld-plugin/plugin-16.d
e0bdd4
--- binutils.orig/ld/testsuite/ld-plugin/plugin-16.d	2021-02-12 10:13:11.119049477 +0000
e0bdd4
+++ binutils-2.36.1/ld/testsuite/ld-plugin/plugin-16.d	2021-02-12 10:29:31.510843797 +0000
e0bdd4
@@ -30,7 +30,7 @@ hook called: claim_file .*/ld/testsuite/
e0bdd4
 hook called: claim_file tmpdir/text.o \[@0/.* not claimed
e0bdd4
 #...
e0bdd4
 hook called: all symbols read.
e0bdd4
-Sym: '_?func' Resolution: LDPR_PREVAILING_DEF_IRONLY
e0bdd4
+Sym: '_?func' Resolution: LDPR_PREVAILING_DE.*
e0bdd4
 Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY
e0bdd4
 #...
e0bdd4
 hook called: cleanup.
e0bdd4
diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin-17.d binutils-2.36.1/ld/testsuite/ld-plugin/plugin-17.d
e0bdd4
--- binutils.orig/ld/testsuite/ld-plugin/plugin-17.d	2021-02-12 10:13:11.116049499 +0000
e0bdd4
+++ binutils-2.36.1/ld/testsuite/ld-plugin/plugin-17.d	2021-02-12 10:35:13.348404638 +0000
e0bdd4
@@ -31,7 +31,7 @@ hook called: claim_file .*/ld/testsuite/
e0bdd4
 hook called: claim_file tmpdir/text.o \[@0/.* not claimed
e0bdd4
 #...
e0bdd4
 hook called: all symbols read.
e0bdd4
-Sym: '_?func' Resolution: LDPR_PREVAILING_DEF_IRONLY
e0bdd4
+Sym: '_?func' Resolution: LDPR_PREVAILING_DE.*
e0bdd4
 Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY
e0bdd4
 #...
e0bdd4
 hook called: cleanup.
e0bdd4
diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin-18.d binutils-2.36.1/ld/testsuite/ld-plugin/plugin-18.d
e0bdd4
--- binutils.orig/ld/testsuite/ld-plugin/plugin-18.d	2021-02-12 10:13:11.118049484 +0000
e0bdd4
+++ binutils-2.36.1/ld/testsuite/ld-plugin/plugin-18.d	2021-02-12 10:29:47.974726314 +0000
e0bdd4
@@ -32,7 +32,7 @@ hook called: claim_file .*/ld/testsuite/
e0bdd4
 hook called: claim_file tmpdir/libtext.a \[@.* not claimed
e0bdd4
 #...
e0bdd4
 hook called: all symbols read.
e0bdd4
-Sym: '_?func' Resolution: LDPR_PREVAILING_DEF_IRONLY
e0bdd4
+Sym: '_?func' Resolution: LDPR_PREVAILING_DE.*
e0bdd4
 Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY
e0bdd4
 #...
e0bdd4
 hook called: cleanup.
e0bdd4
diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin-19.d binutils-2.36.1/ld/testsuite/ld-plugin/plugin-19.d
e0bdd4
--- binutils.orig/ld/testsuite/ld-plugin/plugin-19.d	2021-02-12 10:13:11.116049499 +0000
e0bdd4
+++ binutils-2.36.1/ld/testsuite/ld-plugin/plugin-19.d	2021-02-12 10:30:31.990412245 +0000
e0bdd4
@@ -35,9 +35,9 @@ hook called: claim_file .*/ld/testsuite/
e0bdd4
 hook called: claim_file tmpdir/libtext.a \[@.* CLAIMED
e0bdd4
 #...
e0bdd4
 hook called: all symbols read.
e0bdd4
-Sym: '_?func' Resolution: LDPR_PREVAILING_DEF_IRONLY
e0bdd4
+Sym: '_?func' Resolution: LDPR_PREVAILING_DE.*
e0bdd4
 Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY
e0bdd4
-Sym: '_?text' Resolution: LDPR_PREVAILING_DEF_IRONLY
e0bdd4
+Sym: '_?text' Resolution: LDPR_PREVAILING_DE.*
e0bdd4
 #...
e0bdd4
 hook called: cleanup.
e0bdd4
 #...
e0bdd4
diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin-8.d binutils-2.36.1/ld/testsuite/ld-plugin/plugin-8.d
e0bdd4
--- binutils.orig/ld/testsuite/ld-plugin/plugin-8.d	2021-02-12 10:13:11.118049484 +0000
e0bdd4
+++ binutils-2.36.1/ld/testsuite/ld-plugin/plugin-8.d	2021-02-12 10:23:18.489561148 +0000
e0bdd4
@@ -30,7 +30,7 @@ hook called: claim_file tmpdir/func.o \[
e0bdd4
 hook called: claim_file tmpdir/text.o \[@0/.* not claimed
e0bdd4
 #...
e0bdd4
 hook called: all symbols read.
e0bdd4
-Sym: '_?func' Resolution: LDPR_PREVAILING_DEF_IRONLY
e0bdd4
+Sym: '_?func' Resolution: LDPR_PREVAILING_DE.*
e0bdd4
 Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY
e0bdd4
 #...
e0bdd4
 hook called: cleanup.
e0bdd4
diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin-9.d binutils-2.36.1/ld/testsuite/ld-plugin/plugin-9.d
e0bdd4
--- binutils.orig/ld/testsuite/ld-plugin/plugin-9.d	2021-02-12 10:13:11.119049477 +0000
e0bdd4
+++ binutils-2.36.1/ld/testsuite/ld-plugin/plugin-9.d	2021-02-12 10:23:34.417443785 +0000
e0bdd4
@@ -31,7 +31,7 @@ hook called: claim_file tmpdir/func.o \[
e0bdd4
 hook called: claim_file tmpdir/text.o \[@0/.* not claimed
e0bdd4
 #...
e0bdd4
 hook called: all symbols read.
e0bdd4
-Sym: '_?func' Resolution: LDPR_PREVAILING_DEF_IRONLY
e0bdd4
+Sym: '_?func' Resolution: LDPR_PREVAILING_DE.*
e0bdd4
 Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY
e0bdd4
 #...
e0bdd4
 hook called: cleanup.
e0bdd4
diff -rup binutils.orig/ld/testsuite/ld-x86-64/x86-64.exp binutils-2.36.1/ld/testsuite/ld-x86-64/x86-64.exp
e0bdd4
--- binutils.orig/ld/testsuite/ld-x86-64/x86-64.exp	2021-02-12 10:13:11.177049047 +0000
e0bdd4
+++ binutils-2.36.1/ld/testsuite/ld-x86-64/x86-64.exp	2021-02-12 10:57:23.339975059 +0000
e0bdd4
@@ -1437,22 +1437,6 @@ if { [isnative] && [check_compiler_avail
e0bdd4
     } else {
e0bdd4
 	run_cc_link_tests [list \
e0bdd4
 	    [list \
e0bdd4
-		"Build pr22001-1b" \
e0bdd4
-		"$NOPIE_LDFLAGS -Wl,-z,nocopyreloc,--no-as-needed,-z,notext tmpdir/pr22001-1.so" \
e0bdd4
-		"$NOPIE_CFLAGS -Wa,-mx86-used-note=yes" \
e0bdd4
-		{ pr22001-1c.c } \
e0bdd4
-		{{error_output "pr22001-1b.err"}} \
e0bdd4
-		"pr22001-1b" \
e0bdd4
-	    ] \
e0bdd4
-	    [list \
e0bdd4
-		"Build pr21997-1b" \
e0bdd4
-		"$NOPIE_LDFLAGS -Wl,--no-as-needed,-z,notext tmpdir/pr21997-1.so" \
e0bdd4
-		"$NOPIE_CFLAGS -Wa,-mx86-used-note=yes" \
e0bdd4
-		{ pr21997-1c.c } \
e0bdd4
-		{{error_output "pr21997-1b.err"}} \
e0bdd4
-		"pr21997-1b" \
e0bdd4
-	    ] \
e0bdd4
-	    [list \
e0bdd4
 		"Build lam-u48.so" \
e0bdd4
 		"-shared -Wl,-z,lam-u48" \
e0bdd4
 		"" \
e0bdd4
@@ -1766,49 +1750,6 @@ if { [isnative] && [check_compiler_avail
e0bdd4
     if { [istarget "x86_64-*-linux*"] \
e0bdd4
 	 && ![istarget "x86_64-*-linux*-gnux32"]} {
e0bdd4
 
e0bdd4
-	run_cc_link_tests [list \
e0bdd4
-	    [list \
e0bdd4
-		"Build plt-main with -z bndplt" \
e0bdd4
-		"tmpdir/plt-main1.o tmpdir/plt-main2.o tmpdir/plt-main3.o \
e0bdd4
-		 tmpdir/plt-main4.o tmpdir/libplt-lib.so -z bndplt \
e0bdd4
-		 -z noseparate-code -z max-page-size=0x200000" \
e0bdd4
-		"-Wa,-mx86-used-note=yes $NOCF_PROTECTION_CFLAGS" \
e0bdd4
-		{ plt-main5.c } \
e0bdd4
-		{{objdump {-drw} plt-main-bnd.dd}} \
e0bdd4
-		"plt-main-bnd" \
e0bdd4
-	    ] \
e0bdd4
-	    [list \
e0bdd4
-		"Build plt-main with PIE and -z bndplt" \
e0bdd4
-		"tmpdir/plt-main1.o tmpdir/plt-main2.o tmpdir/plt-main3.o \
e0bdd4
-		 tmpdir/plt-main4.o tmpdir/libplt-lib.so -z bndplt -pie \
e0bdd4
-		 -z noseparate-code -z max-page-size=0x200000" \
e0bdd4
-		"-fPIC -Wa,-mx86-used-note=yes $NOCF_PROTECTION_CFLAGS" \
e0bdd4
-		{ plt-main5.c } \
e0bdd4
-		{{objdump {-drw} plt-main-bnd.dd}} \
e0bdd4
-		"plt-main-pie-bnd" \
e0bdd4
-	    ] \
e0bdd4
-	    [list \
e0bdd4
-		"Build plt-main with -z bndplt -z now" \
e0bdd4
-		"tmpdir/plt-main1.o tmpdir/plt-main2.o tmpdir/plt-main3.o \
e0bdd4
-		 tmpdir/plt-main4.o tmpdir/libplt-lib.so -z bndplt -z now \
e0bdd4
-		 -z noseparate-code -z max-page-size=0x200000" \
e0bdd4
-		"-Wa,-mx86-used-note=yes $NOCF_PROTECTION_CFLAGS" \
e0bdd4
-		{ plt-main5.c } \
e0bdd4
-		{{readelf {-SW} plt-main-bnd-now.rd} {objdump {-drw} plt-main-bnd.dd}} \
e0bdd4
-		"plt-main-bnd-now" \
e0bdd4
-	    ] \
e0bdd4
-	    [list \
e0bdd4
-		"Build plt-main with PIE and -z bndplt -z now" \
e0bdd4
-		"tmpdir/plt-main1.o tmpdir/plt-main2.o tmpdir/plt-main3.o \
e0bdd4
-		 tmpdir/plt-main4.o tmpdir/libplt-lib.so -z bndplt -z now -pie \
e0bdd4
-		 -z noseparate-code -z max-page-size=0x200000" \
e0bdd4
-		"-fPIC -Wa,-mx86-used-note=yes $NOCF_PROTECTION_CFLAGS" \
e0bdd4
-		{ plt-main5.c } \
e0bdd4
-		{{readelf {-SW} plt-main-bnd-now.rd} {objdump {-drw} plt-main-bnd.dd}} \
e0bdd4
-		"plt-main-pie-bnd-now" \
e0bdd4
-	    ] \
e0bdd4
-	]
e0bdd4
-
e0bdd4
 	run_ld_link_exec_tests [list \
e0bdd4
 	    [list \
e0bdd4
 		"Run plt-main with -z bndplt" \
e0bdd4
@@ -1893,66 +1834,6 @@ if { [isnative] && [check_compiler_avail
e0bdd4
 	    set pltdump {{objdump {-drw} plt-main-ibt.dd}}
e0bdd4
 	    set pltsecdump {{readelf {-SW} plt-main-ibt-now.rd} {objdump {-drw} plt-main-ibt.dd}}
e0bdd4
 	}
e0bdd4
-	run_cc_link_tests [list \
e0bdd4
-	    [list \
e0bdd4
-		"Build plt-main with -z ibtplt" \
e0bdd4
-		"tmpdir/plt-main1.o tmpdir/plt-main2.o tmpdir/plt-main3.o \
e0bdd4
-		 tmpdir/plt-main4.o tmpdir/libplt-lib.so -z ibtplt \
e0bdd4
-		 -z noseparate-code -z max-page-size=0x200000" \
e0bdd4
-		"-Wa,-mx86-used-note=yes" \
e0bdd4
-		{ plt-main5.c } \
e0bdd4
-		$pltdump \
e0bdd4
-		"plt-main-ibt" \
e0bdd4
-	    ] \
e0bdd4
-	    [list \
e0bdd4
-		"Build plt-main with PIE and -z ibtplt" \
e0bdd4
-		"tmpdir/plt-main1.o tmpdir/plt-main2.o tmpdir/plt-main3.o \
e0bdd4
-		 tmpdir/plt-main4.o tmpdir/libplt-lib.so -z ibtplt -pie \
e0bdd4
-		 -z noseparate-code -z max-page-size=0x200000" \
e0bdd4
-		"-fPIC -Wa,-mx86-used-note=yes" \
e0bdd4
-		{ plt-main5.c } \
e0bdd4
-		$pltdump \
e0bdd4
-		"plt-main-pie-ibt" \
e0bdd4
-	    ] \
e0bdd4
-	    [list \
e0bdd4
-		"Build plt-main with -z ibtplt -z now" \
e0bdd4
-		"tmpdir/plt-main1.o tmpdir/plt-main2.o tmpdir/plt-main3.o \
e0bdd4
-		 tmpdir/plt-main4.o tmpdir/libplt-lib.so -z ibtplt -z now \
e0bdd4
-		 -z noseparate-code -z max-page-size=0x200000" \
e0bdd4
-		"-Wa,-mx86-used-note=yes" \
e0bdd4
-		{ plt-main5.c } \
e0bdd4
-		$pltsecdump \
e0bdd4
-		"plt-main-ibt-now" \
e0bdd4
-	    ] \
e0bdd4
-	    [list \
e0bdd4
-		"Build plt-main with PIE and -z ibtplt -z now" \
e0bdd4
-		"tmpdir/plt-main1.o tmpdir/plt-main2.o tmpdir/plt-main3.o \
e0bdd4
-		 tmpdir/plt-main4.o tmpdir/libplt-lib.so -z ibtplt -z now -pie \
e0bdd4
-		 -z noseparate-code -z max-page-size=0x200000" \
e0bdd4
-		"-fPIC -Wa,-mx86-used-note=yes" \
e0bdd4
-		{ plt-main5.c } \
e0bdd4
-		$pltsecdump \
e0bdd4
-		"plt-main-pie-ibt-now" \
e0bdd4
-	    ] \
e0bdd4
-	    [list \
e0bdd4
-		"Build libibtplt-lib.so with -z ibtplt" \
e0bdd4
-		"-shared -z ibtplt \
e0bdd4
-		 -z noseparate-code -z max-page-size=0x200000" \
e0bdd4
-		"-fPIC -Wa,-mx86-used-note=yes" \
e0bdd4
-		{ plt-main1.c plt-main2.c plt-main3.c plt-main4.c} \
e0bdd4
-		$pltdump \
e0bdd4
-		"libibtplt-lib.so" \
e0bdd4
-	    ] \
e0bdd4
-	    [list \
e0bdd4
-		"Build libibtplt--now-lib.so with -z ibtplt -z now" \
e0bdd4
-		"-shared -z ibtplt -z now \
e0bdd4
-		 -z noseparate-code -z max-page-size=0x200000" \
e0bdd4
-		"-fPIC -Wa,-mx86-used-note=yes" \
e0bdd4
-		{ plt-main1.c plt-main2.c plt-main3.c plt-main4.c} \
e0bdd4
-		$pltdump \
e0bdd4
-		"libibtplt-now-lib.so" \
e0bdd4
-	    ] \
e0bdd4
-	]
e0bdd4
 
e0bdd4
 	run_ld_link_exec_tests [list \
e0bdd4
 	    [list \
e0bdd4
diff -rup binutils.orig/ld/testsuite/ld-x86-64/x86-64.exp binutils-2.36.1/ld/testsuite/ld-x86-64/x86-64.exp
e0bdd4
--- binutils.orig/ld/testsuite/ld-x86-64/x86-64.exp	2021-02-12 11:44:39.121364751 +0000
e0bdd4
+++ binutils-2.36.1/ld/testsuite/ld-x86-64/x86-64.exp	2021-02-12 11:46:27.505597689 +0000
e0bdd4
@@ -1878,24 +1878,6 @@ if { [isnative] && [check_compiler_avail
e0bdd4
 		"plt-main.out" \
e0bdd4
 		"-fPIC" \
e0bdd4
 	    ] \
e0bdd4
-	    [list \
e0bdd4
-		"Run plt-main with libibtplt-lib.so -z ibtplt" \
e0bdd4
-		"-Wl,--no-as-needed,-z,ibtplt tmpdir/libibtplt-lib.so \
e0bdd4
-		 tmpdir/libplt-lib.so" \
e0bdd4
-		"-Wa,-mx86-used-note=yes" \
e0bdd4
-		{ plt-main5.c } \
e0bdd4
-		"plt-main-ibt-lib" \
e0bdd4
-		"plt-main.out" \
e0bdd4
-	    ] \
e0bdd4
-	    [list \
e0bdd4
-		"Run plt-main with libibtplt-lib.so -z ibtplt -z now" \
e0bdd4
-		"-Wl,--no-as-needed,-z,ibtplt,-z,now \
e0bdd4
-		 tmpdir/libibtplt-now-lib.so tmpdir/libplt-lib.so" \
e0bdd4
-		"-Wa,-mx86-used-note=yes" \
e0bdd4
-		{ plt-main5.c } \
e0bdd4
-		"plt-main-ibt-now-lib" \
e0bdd4
-		"plt-main.out" \
e0bdd4
-	    ] \
e0bdd4
 	]
e0bdd4
 
e0bdd4
 	if { [check_ifunc_attribute_available] } {
e0bdd4
@@ -1922,7 +1904,6 @@ if { [isnative] && [check_compiler_avail
e0bdd4
 	}
e0bdd4
     }
e0bdd4
 
e0bdd4
-    undefined_weak "$NOPIE_CFLAGS" "$NOPIE_LDFLAGS"
e0bdd4
     undefined_weak "-fPIE" ""
e0bdd4
     undefined_weak "-fPIE" "-pie"
e0bdd4
     undefined_weak "-fPIE" "-Wl,-z,nodynamic-undefined-weak"
e0bdd4
--- binutils.orig/binutils/dwarf.c	2021-02-12 11:44:39.012365518 +0000
e0bdd4
+++ binutils-2.36.1/binutils/dwarf.c	2021-02-12 11:49:35.408266181 +0000
e0bdd4
@@ -2117,6 +2117,7 @@ get_type_abbrev_from_form (unsigned long
e0bdd4
   switch (form)
e0bdd4
     {
e0bdd4
     case DW_FORM_GNU_ref_alt:
e0bdd4
+    case DW_FORM_ref_sig8:
e0bdd4
       /* FIXME: We are unable to handle this form at the moment.  */
e0bdd4
       return NULL;
e0bdd4
 
e0bdd4
@@ -2146,7 +2147,7 @@ get_type_abbrev_from_form (unsigned long
e0bdd4
       /* FIXME: Are there other DW_FORMs that can be used by types ?  */
e0bdd4
 
e0bdd4
     default:
e0bdd4
-      warn (_("Unexpected form %lx encountered whilst finding abbreviation for type\n"), form);
e0bdd4
+      warn (_("Unexpected form %#lx encountered whilst finding abbreviation for type\n"), form);
e0bdd4
       return NULL;
e0bdd4
     }
e0bdd4
 
e0bdd4
diff -rup binutils.orig/ld/testsuite/ld-aarch64/variant_pcs-now.d binutils-2.36.1/ld/testsuite/ld-aarch64/variant_pcs-now.d
e0bdd4
--- binutils.orig/ld/testsuite/ld-aarch64/variant_pcs-now.d	2021-02-12 11:44:39.034365363 +0000
e0bdd4
+++ binutils-2.36.1/ld/testsuite/ld-aarch64/variant_pcs-now.d	2021-02-12 11:57:49.372692119 +0000
e0bdd4
@@ -41,28 +41,28 @@ Symbol table '\.symtab' contains 35 entr
e0bdd4
      7: 00000000000111c8     0 SECTION LOCAL  DEFAULT    7 
e0bdd4
      8: 0000000000011270     0 SECTION LOCAL  DEFAULT    8 
e0bdd4
      9: 0000000000000000     0 FILE    LOCAL  DEFAULT  ABS .*variant_pcs-1\.o
e0bdd4
-    10: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_local
e0bdd4
-    11: 0000000000008000     0 IFUNC   LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_local_ifunc
e0bdd4
+    10: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT[ 	]+1 f_spec_local[ 	]+\[VARIANT_PCS\]
e0bdd4
+    11: 0000000000008000     0 IFUNC   LOCAL  DEFAULT[ 	]+1 f_spec_local_ifunc[ 	]+\[VARIANT_PCS\]
e0bdd4
     12: 0000000000008000     0 IFUNC   LOCAL  DEFAULT    1 f_base_local_ifunc
e0bdd4
     13: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT    1 f_base_local
e0bdd4
     14: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT    1 \$x
e0bdd4
     15: 0000000000000000     0 FILE    LOCAL  DEFAULT  ABS .*variant_pcs-2\.o
e0bdd4
-    16: 0000000000008038     0 NOTYPE  LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_local2
e0bdd4
-    17: 0000000000008038     0 IFUNC   LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_local2_ifunc
e0bdd4
+    16: 0000000000008038     0 NOTYPE  LOCAL  DEFAULT[ 	]+1 f_spec_local2[ 	]+\[VARIANT_PCS\]
e0bdd4
+    17: 0000000000008038     0 IFUNC   LOCAL  DEFAULT[ 	]+1 f_spec_local2_ifunc[ 	]+\[VARIANT_PCS\]
e0bdd4
     18: 0000000000008038     0 IFUNC   LOCAL  DEFAULT    1 f_base_local2_ifunc
e0bdd4
     19: 0000000000008038     0 NOTYPE  LOCAL  DEFAULT    1 f_base_local2
e0bdd4
     20: 0000000000008038     0 NOTYPE  LOCAL  DEFAULT    1 \$x
e0bdd4
     21: 0000000000000000     0 FILE    LOCAL  DEFAULT  ABS 
e0bdd4
     22: 0000000000009080     0 OBJECT  LOCAL  DEFAULT  ABS _DYNAMIC
e0bdd4
-    23: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_global_hidden_def
e0bdd4
+    23: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT[ 	]+1 f_spec_global_hidden_def[ 	]+\[VARIANT_PCS\]
e0bdd4
     24: 0000000000008000     0 IFUNC   LOCAL  DEFAULT    1 f_base_global_hidden_ifunc
e0bdd4
     25: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT    1 f_base_global_hidden_def
e0bdd4
     26: 0000000000009000     0 OBJECT  LOCAL  DEFAULT  ABS _GLOBAL_OFFSET_TABLE_
e0bdd4
-    27: 0000000000008000     0 IFUNC   LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_global_hidden_ifunc
e0bdd4
+    27: 0000000000008000     0 IFUNC   LOCAL  DEFAULT[ 	]+1 f_spec_global_hidden_ifunc[ 	]+\[VARIANT_PCS\]
e0bdd4
     28: 0000000000008070     0 NOTYPE  LOCAL  DEFAULT    2 \$x
e0bdd4
     29: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT  UND f_base_global_default_undef
e0bdd4
-    30: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT \[VARIANT_PCS\]   UND f_spec_global_default_undef
e0bdd4
-    31: 0000000000008000     0 IFUNC   GLOBAL DEFAULT \[VARIANT_PCS\]     1 f_spec_global_default_ifunc
e0bdd4
+    30: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT[ 	]+UND f_spec_global_default_undef[ 	]+\[VARIANT_PCS\]
e0bdd4
+    31: 0000000000008000     0 IFUNC   GLOBAL DEFAULT[ 	]+1 f_spec_global_default_ifunc[ 	]+\[VARIANT_PCS\]
e0bdd4
     32: 0000000000008000     0 NOTYPE  GLOBAL DEFAULT    1 f_base_global_default_def
e0bdd4
-    33: 0000000000008000     0 NOTYPE  GLOBAL DEFAULT \[VARIANT_PCS\]     1 f_spec_global_default_def
e0bdd4
+    33: 0000000000008000     0 NOTYPE  GLOBAL DEFAULT[ 	]+1 f_spec_global_default_def[ 	]+\[VARIANT_PCS\]
e0bdd4
     34: 0000000000008000     0 IFUNC   GLOBAL DEFAULT    1 f_base_global_default_ifunc
e0bdd4
diff -rup binutils.orig/ld/testsuite/ld-aarch64/variant_pcs-r.d binutils-2.36.1/ld/testsuite/ld-aarch64/variant_pcs-r.d
e0bdd4
--- binutils.orig/ld/testsuite/ld-aarch64/variant_pcs-r.d	2021-02-12 11:44:39.028365406 +0000
e0bdd4
+++ binutils-2.36.1/ld/testsuite/ld-aarch64/variant_pcs-r.d	2021-02-12 11:54:36.878111688 +0000
e0bdd4
@@ -37,24 +37,24 @@ Symbol table '\.symtab' contains 26 entr
e0bdd4
      2: 0000000000000000     0 SECTION LOCAL  DEFAULT    3 
e0bdd4
      3: 0000000000000000     0 SECTION LOCAL  DEFAULT    4 
e0bdd4
      4: 0000000000000000     0 FILE    LOCAL  DEFAULT  ABS .*variant_pcs-1\.o
e0bdd4
-     5: 0000000000000000     0 NOTYPE  LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_local
e0bdd4
-     6: 0000000000000000     0 IFUNC   LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_local_ifunc
e0bdd4
+     5: 0000000000000000     0 NOTYPE  LOCAL  DEFAULT[ 	]+1 f_spec_local[ 	]+\[VARIANT_PCS\]
e0bdd4
+     6: 0000000000000000     0 IFUNC   LOCAL  DEFAULT[ 	]+1 f_spec_local_ifunc[ 	]+\[VARIANT_PCS\]
e0bdd4
      7: 0000000000000000     0 IFUNC   LOCAL  DEFAULT    1 f_base_local_ifunc
e0bdd4
      8: 0000000000000000     0 NOTYPE  LOCAL  DEFAULT    1 f_base_local
e0bdd4
      9: 0000000000000000     0 NOTYPE  LOCAL  DEFAULT    1 \$x
e0bdd4
     10: 0000000000000000     0 FILE    LOCAL  DEFAULT  ABS .*variant_pcs-2\.o
e0bdd4
-    11: 0000000000000038     0 NOTYPE  LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_local2
e0bdd4
-    12: 0000000000000038     0 IFUNC   LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_local2_ifunc
e0bdd4
+    11: 0000000000000038     0 NOTYPE  LOCAL  DEFAULT[ 	]+1 f_spec_local2[ 	]+\[VARIANT_PCS\]
e0bdd4
+    12: 0000000000000038     0 IFUNC   LOCAL  DEFAULT[ 	]+1 f_spec_local2_ifunc[ 	]+\[VARIANT_PCS\]
e0bdd4
     13: 0000000000000038     0 IFUNC   LOCAL  DEFAULT    1 f_base_local2_ifunc
e0bdd4
     14: 0000000000000038     0 NOTYPE  LOCAL  DEFAULT    1 f_base_local2
e0bdd4
     15: 0000000000000038     0 NOTYPE  LOCAL  DEFAULT    1 \$x
e0bdd4
     16: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT  UND f_base_global_default_undef
e0bdd4
-    17: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT \[VARIANT_PCS\]   UND f_spec_global_default_undef
e0bdd4
-    18: 0000000000000000     0 NOTYPE  GLOBAL HIDDEN  \[VARIANT_PCS\]     1 f_spec_global_hidden_def
e0bdd4
+    17: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT[ 	]+UND f_spec_global_default_undef[ 	]+\[VARIANT_PCS\]
e0bdd4
+    18: 0000000000000000     0 NOTYPE  GLOBAL HIDDEN[ 	]+1 f_spec_global_hidden_def[ 	]+\[VARIANT_PCS\]
e0bdd4
     19: 0000000000000000     0 IFUNC   GLOBAL HIDDEN     1 f_base_global_hidden_ifunc
e0bdd4
-    20: 0000000000000000     0 IFUNC   GLOBAL DEFAULT \[VARIANT_PCS\]     1 f_spec_global_default_ifunc
e0bdd4
+    20: 0000000000000000     0 IFUNC   GLOBAL DEFAULT[ 	]+1 f_spec_global_default_ifunc[ 	]+\[VARIANT_PCS\]
e0bdd4
     21: 0000000000000000     0 NOTYPE  GLOBAL HIDDEN     1 f_base_global_hidden_def
e0bdd4
-    22: 0000000000000000     0 IFUNC   GLOBAL HIDDEN  \[VARIANT_PCS\]     1 f_spec_global_hidden_ifunc
e0bdd4
+    22: 0000000000000000     0 IFUNC   GLOBAL HIDDEN[ 	]+1 f_spec_global_hidden_ifunc[ 	]+\[VARIANT_PCS\]
e0bdd4
     23: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT    1 f_base_global_default_def
e0bdd4
-    24: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT \[VARIANT_PCS\]     1 f_spec_global_default_def
e0bdd4
+    24: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT[ 	]+1 f_spec_global_default_def[ 	]+\[VARIANT_PCS\]
e0bdd4
     25: 0000000000000000     0 IFUNC   GLOBAL DEFAULT    1 f_base_global_default_ifunc
e0bdd4
diff -rup binutils.orig/ld/testsuite/ld-aarch64/variant_pcs-shared.d binutils-2.36.1/ld/testsuite/ld-aarch64/variant_pcs-shared.d
e0bdd4
--- binutils.orig/ld/testsuite/ld-aarch64/variant_pcs-shared.d	2021-02-12 11:44:39.027365412 +0000
e0bdd4
+++ binutils-2.36.1/ld/testsuite/ld-aarch64/variant_pcs-shared.d	2021-02-12 11:56:14.669390518 +0000
e0bdd4
@@ -41,28 +41,28 @@ Symbol table '\.symtab' contains 35 entr
e0bdd4
      7: 00000000000111c8     0 SECTION LOCAL  DEFAULT    7 
e0bdd4
      8: 0000000000011270     0 SECTION LOCAL  DEFAULT    8 
e0bdd4
      9: 0000000000000000     0 FILE    LOCAL  DEFAULT  ABS .*variant_pcs-1\.o
e0bdd4
-    10: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_local
e0bdd4
-    11: 0000000000008000     0 IFUNC   LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_local_ifunc
e0bdd4
+    10: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT[ 	]+1 f_spec_local[ 	]+\[VARIANT_PCS\]
e0bdd4
+    11: 0000000000008000     0 IFUNC   LOCAL  DEFAULT[ 	]+1 f_spec_local_ifunc[ 	]+\[VARIANT_PCS\]
e0bdd4
     12: 0000000000008000     0 IFUNC   LOCAL  DEFAULT    1 f_base_local_ifunc
e0bdd4
     13: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT    1 f_base_local
e0bdd4
     14: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT    1 \$x
e0bdd4
     15: 0000000000000000     0 FILE    LOCAL  DEFAULT  ABS .*variant_pcs-2\.o
e0bdd4
-    16: 0000000000008038     0 NOTYPE  LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_local2
e0bdd4
-    17: 0000000000008038     0 IFUNC   LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_local2_ifunc
e0bdd4
+    16: 0000000000008038     0 NOTYPE  LOCAL  DEFAULT[ 	]+1 f_spec_local2[ 	]+\[VARIANT_PCS\]
e0bdd4
+    17: 0000000000008038     0 IFUNC   LOCAL  DEFAULT[ 	]+1 f_spec_local2_ifunc[ 	]+\[VARIANT_PCS\]
e0bdd4
     18: 0000000000008038     0 IFUNC   LOCAL  DEFAULT    1 f_base_local2_ifunc
e0bdd4
     19: 0000000000008038     0 NOTYPE  LOCAL  DEFAULT    1 f_base_local2
e0bdd4
     20: 0000000000008038     0 NOTYPE  LOCAL  DEFAULT    1 \$x
e0bdd4
     21: 0000000000000000     0 FILE    LOCAL  DEFAULT  ABS 
e0bdd4
     22: 0000000000009080     0 OBJECT  LOCAL  DEFAULT  ABS _DYNAMIC
e0bdd4
-    23: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_global_hidden_def
e0bdd4
+    23: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT[ 	]+1 f_spec_global_hidden_def[ 	]+\[VARIANT_PCS\]
e0bdd4
     24: 0000000000008000     0 IFUNC   LOCAL  DEFAULT    1 f_base_global_hidden_ifunc
e0bdd4
     25: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT    1 f_base_global_hidden_def
e0bdd4
     26: 0000000000009000     0 OBJECT  LOCAL  DEFAULT  ABS _GLOBAL_OFFSET_TABLE_
e0bdd4
-    27: 0000000000008000     0 IFUNC   LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_global_hidden_ifunc
e0bdd4
+    27: 0000000000008000     0 IFUNC   LOCAL  DEFAULT[ 	]+1 f_spec_global_hidden_ifunc[ 	]+\[VARIANT_PCS\]
e0bdd4
     28: 0000000000008070     0 NOTYPE  LOCAL  DEFAULT    2 \$x
e0bdd4
     29: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT  UND f_base_global_default_undef
e0bdd4
-    30: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT \[VARIANT_PCS\]   UND f_spec_global_default_undef
e0bdd4
-    31: 0000000000008000     0 IFUNC   GLOBAL DEFAULT \[VARIANT_PCS\]     1 f_spec_global_default_ifunc
e0bdd4
+    30: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT[ 	]+UND f_spec_global_default_undef[ 	]+\[VARIANT_PCS\]
e0bdd4
+    31: 0000000000008000     0 IFUNC   GLOBAL DEFAULT[ 	]+1 f_spec_global_default_ifunc[ 	]+\[VARIANT_PCS\]
e0bdd4
     32: 0000000000008000     0 NOTYPE  GLOBAL DEFAULT    1 f_base_global_default_def
e0bdd4
-    33: 0000000000008000     0 NOTYPE  GLOBAL DEFAULT \[VARIANT_PCS\]     1 f_spec_global_default_def
e0bdd4
+    33: 0000000000008000     0 NOTYPE  GLOBAL DEFAULT[ 	]+1 f_spec_global_default_def[ 	]+\[VARIANT_PCS\]
e0bdd4
     34: 0000000000008000     0 IFUNC   GLOBAL DEFAULT    1 f_base_global_default_ifunc
e0bdd4
--- binutils.orig/gold/main.cc	2021-01-21 16:12:10.006321882 +0000
e0bdd4
+++ binutils-2.35.90/gold/main.cc	2021-01-21 16:12:41.935071183 +0000
e0bdd4
@@ -290,11 +290,6 @@ main(int argc, char** argv)
e0bdd4
               elapsed.sys / 1000, (elapsed.sys % 1000) * 1000,
e0bdd4
               elapsed.wall / 1000, (elapsed.wall % 1000) * 1000);
e0bdd4
 
e0bdd4
-#ifdef HAVE_MALLINFO
e0bdd4
-      struct mallinfo m = mallinfo();
e0bdd4
-      fprintf(stderr, _("%s: total space allocated by malloc: %lld bytes\n"),
e0bdd4
-	      program_name, static_cast<long long>(m.arena));
e0bdd4
-#endif
e0bdd4
       File_read::print_stats();
e0bdd4
       Archive::print_stats();
e0bdd4
       Lib_group::print_stats();
e0bdd4
e0bdd4
diff -rup binutils.orig/ld/testsuite/ld-aarch64/variant_pcs-now.d binutils-2.36.1/ld/testsuite/ld-aarch64/variant_pcs-now.d
e0bdd4
--- binutils.orig/ld/testsuite/ld-aarch64/variant_pcs-now.d	2021-02-12 14:14:24.977160359 +0000
e0bdd4
+++ binutils-2.36.1/ld/testsuite/ld-aarch64/variant_pcs-now.d	2021-02-12 14:17:35.540758925 +0000
e0bdd4
@@ -23,10 +23,10 @@ Symbol table '\.dynsym' contains 7 entri
e0bdd4
    Num:    Value          Size Type    Bind   Vis      Ndx Name
e0bdd4
      0: 0000000000000000     0 NOTYPE  LOCAL  DEFAULT  UND 
e0bdd4
      1: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT  UND f_base_global_default_undef
e0bdd4
-     2: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT \[VARIANT_PCS\]   UND f_spec_global_default_undef
e0bdd4
-     3: 0000000000008000     0 IFUNC   GLOBAL DEFAULT \[VARIANT_PCS\]     1 f_spec_global_default_ifunc
e0bdd4
+     2: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT[ 	]+UND f_spec_global_default_undef[ 	]+\[VARIANT_PCS\]
e0bdd4
+     3: 0000000000008000     0 IFUNC   GLOBAL DEFAULT[ 	]+1 f_spec_global_default_ifunc[ 	]+\[VARIANT_PCS\]
e0bdd4
      4: 0000000000008000     0 NOTYPE  GLOBAL DEFAULT    1 f_base_global_default_def
e0bdd4
-     5: 0000000000008000     0 NOTYPE  GLOBAL DEFAULT \[VARIANT_PCS\]     1 f_spec_global_default_def
e0bdd4
+     5: 0000000000008000     0 NOTYPE  GLOBAL DEFAULT[ 	]+1 f_spec_global_default_def[ 	]+\[VARIANT_PCS\]
e0bdd4
      6: 0000000000008000     0 IFUNC   GLOBAL DEFAULT    1 f_base_global_default_ifunc
e0bdd4
 
e0bdd4
 Symbol table '\.symtab' contains 35 entries:
e0bdd4
diff -rup binutils.orig/ld/testsuite/ld-aarch64/variant_pcs-shared.d binutils-2.36.1/ld/testsuite/ld-aarch64/variant_pcs-shared.d
e0bdd4
--- binutils.orig/ld/testsuite/ld-aarch64/variant_pcs-shared.d	2021-02-12 14:14:24.980160337 +0000
e0bdd4
+++ binutils-2.36.1/ld/testsuite/ld-aarch64/variant_pcs-shared.d	2021-02-12 14:16:49.860094868 +0000
e0bdd4
@@ -23,10 +23,10 @@ Symbol table '\.dynsym' contains 7 entri
e0bdd4
    Num:    Value          Size Type    Bind   Vis      Ndx Name
e0bdd4
      0: 0000000000000000     0 NOTYPE  LOCAL  DEFAULT  UND 
e0bdd4
      1: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT  UND f_base_global_default_undef
e0bdd4
-     2: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT \[VARIANT_PCS\]   UND f_spec_global_default_undef
e0bdd4
-     3: 0000000000008000     0 IFUNC   GLOBAL DEFAULT \[VARIANT_PCS\]     1 f_spec_global_default_ifunc
e0bdd4
+     2: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT[ 	]+UND f_spec_global_default_undef[ 	]+\[VARIANT_PCS\]
e0bdd4
+     3: 0000000000008000     0 IFUNC   GLOBAL DEFAULT[ 	]+1 f_spec_global_default_ifunc[ 	]+\[VARIANT_PCS\]
e0bdd4
      4: 0000000000008000     0 NOTYPE  GLOBAL DEFAULT    1 f_base_global_default_def
e0bdd4
-     5: 0000000000008000     0 NOTYPE  GLOBAL DEFAULT \[VARIANT_PCS\]     1 f_spec_global_default_def
e0bdd4
+     5: 0000000000008000     0 NOTYPE  GLOBAL DEFAULT[ 	]+1 f_spec_global_default_def[ 	]+\[VARIANT_PCS\]
e0bdd4
      6: 0000000000008000     0 IFUNC   GLOBAL DEFAULT    1 f_base_global_default_ifunc
e0bdd4
 
e0bdd4
 Symbol table '\.symtab' contains 35 entries:
e0bdd4
diff -rup binutils.orig/ld/testsuite/ld-plugin/lto.exp binutils-2.36.1/ld/testsuite/ld-plugin/lto.exp
e0bdd4
--- binutils.orig/ld/testsuite/ld-plugin/lto.exp	2021-05-26 12:19:58.858235019 +0100
e0bdd4
+++ binutils-2.36.1/ld/testsuite/ld-plugin/lto.exp	2021-05-26 13:00:19.633406404 +0100
e0bdd4
@@ -33,6 +33,8 @@ set saved_CFLAGS "$CFLAGS"
e0bdd4
 set saved_CXXFLAGS "$CXXFLAGS"
e0bdd4
 regsub -all "(\\-Wp,)?-D_FORTIFY_SOURCE=\[0-9\]+" $CFLAGS "" CFLAGS
e0bdd4
 regsub -all "(\\-Wp,)?-D_FORTIFY_SOURCE=\[0-9\]+" $CXXFLAGS "" CXXFLAGS
e0bdd4
+set CFLAGS "$CFLAGS -fplugin=annobin -fplugin-arg-annobin-disable"
e0bdd4
+set CXXFLAGS "$CXXFLAGS -fplugin=annobin -fplugin-arg-annobin-disable"
e0bdd4
 
e0bdd4
 proc restore_notify { } {
e0bdd4
   global saved_CFLAGS
e0bdd4
diff -rup binutils.orig/ld/testsuite/ld-aarch64/tls-relax-gdesc-le-now.d binutils-2.36.1/ld/testsuite/ld-aarch64/tls-relax-gdesc-le-now.d
e0bdd4
--- binutils.orig/ld/testsuite/ld-aarch64/tls-relax-gdesc-le-now.d	2021-05-26 12:19:58.814235286 +0100
e0bdd4
+++ binutils-2.36.1/ld/testsuite/ld-aarch64/tls-relax-gdesc-le-now.d	2021-05-26 13:44:54.000036441 +0100
e0bdd4
@@ -11,7 +11,7 @@
e0bdd4
  0x.+ \(PLTRELSZ\) \s+.+ \(bytes\)
e0bdd4
  0x.+ \(PLTREL\)   \s+RELA
e0bdd4
  0x.+ \(JMPREL\)   \s+0x.+
e0bdd4
- 0x.+ \(BIND_NOW\) \s+
e0bdd4
+.*BIND_NOW.*
e0bdd4
  0x.+ \(FLAGS_1\)  \s+   Flags: NOW
e0bdd4
  0x.+ \(NULL\)     \s+   0x0
e0bdd4
 
e0bdd4
diff -rup binutils.orig/ld/testsuite/ld-ifunc/ifunc.exp binutils-2.36.1/ld/testsuite/ld-ifunc/ifunc.exp
e0bdd4
--- binutils.orig/ld/testsuite/ld-ifunc/ifunc.exp	2021-05-26 12:19:58.847235086 +0100
e0bdd4
+++ binutils-2.36.1/ld/testsuite/ld-ifunc/ifunc.exp	2021-05-26 13:48:48.525598703 +0100
e0bdd4
@@ -39,6 +39,7 @@ if { ![is_elf_format] || ![supports_gnu_
e0bdd4
      || [istarget nds32*-*-*]
e0bdd4
      || [istarget nios2-*-*]
e0bdd4
      || [istarget or1k-*-*]
e0bdd4
+     || [istarget powerpc*-*-*]
e0bdd4
      || [istarget score*-*-*]
e0bdd4
      || [istarget sh*-*-*]
e0bdd4
      || [istarget tic6x-*-*]
e0bdd4
--- binutils.orig/ld/testsuite/ld-plugin/plugin.exp	2021-05-26 12:19:58.859235013 +0100
e0bdd4
+++ binutils-2.36.1/ld/testsuite/ld-plugin/plugin.exp	2021-05-26 13:58:51.705905991 +0100
e0bdd4
@@ -273,7 +273,7 @@ set plugin_extra_elf_tests [list \
e0bdd4
 			-plugin-opt add:tmpdir/func2i.o \
e0bdd4
 			-plugin-opt add:tmpdir/func3h.o \
e0bdd4
     $testobjfiles $libs --verbose=2" "" "" "" {{ld plugin-12.d} \
e0bdd4
-				{readelf -s plugin-vis-1.d}} "main.x" ] \
e0bdd4
+				} "main.x" ] \
e0bdd4
     [list "plugin set symbol visibility with source" \
e0bdd4
 		       "-plugin $plugin_path $regclm $regas $regcln \
e0bdd4
 			-plugin-opt claim:$srcdir/$subdir/func.c \
e0bdd4
@@ -287,7 +287,7 @@ set plugin_extra_elf_tests [list \
e0bdd4
 			-plugin-opt add:tmpdir/func2i.o \
e0bdd4
 			-plugin-opt add:tmpdir/func3h.o \
e0bdd4
     $testsrcfiles $libs --verbose=2" "" "" "" {{ld plugin-12.d} \
e0bdd4
-				{readelf -s plugin-vis-1.d}} "main.x" ] \
e0bdd4
+				} "main.x" ] \
e0bdd4
 ]
e0bdd4
 
e0bdd4
 if { !$can_compile || $failed_compile } {
e0bdd4
diff -rup binutils.orig/ld/testsuite/ld-powerpc/group1.sym binutils-2.36.1/ld/testsuite/ld-powerpc/group1.sym
e0bdd4
--- binutils.orig/ld/testsuite/ld-powerpc/group1.sym	2021-05-26 12:19:58.877234903 +0100
e0bdd4
+++ binutils-2.36.1/ld/testsuite/ld-powerpc/group1.sym	2021-05-26 14:08:52.102239533 +0100
e0bdd4
@@ -1,3 +1,3 @@
e0bdd4
 #...
e0bdd4
-.* 8 FUNC +GLOBAL DEFAULT \[<localentry>: 4\] +1 foo
e0bdd4
+.* 8 FUNC +GLOBAL DEFAULT .*
e0bdd4
 #pass
e0bdd4
diff -rup binutils.orig/ld/testsuite/ld-powerpc/group3.sym binutils-2.36.1/ld/testsuite/ld-powerpc/group3.sym
e0bdd4
--- binutils.orig/ld/testsuite/ld-powerpc/group3.sym	2021-05-26 12:19:58.875234915 +0100
e0bdd4
+++ binutils-2.36.1/ld/testsuite/ld-powerpc/group3.sym	2021-05-26 14:09:06.038154427 +0100
e0bdd4
@@ -1,3 +1,3 @@
e0bdd4
 #...
e0bdd4
-.* 4 FUNC +GLOBAL DEFAULT \[<localentry>: 1\] +1 foo
e0bdd4
+.* 4 FUNC +GLOBAL DEFAULT .*
e0bdd4
 #pass
e0bdd4
diff -rup binutils.orig/ld/testsuite/ld-powerpc/notoc3.d binutils-2.36.1/ld/testsuite/ld-powerpc/notoc3.d
e0bdd4
--- binutils.orig/ld/testsuite/ld-powerpc/notoc3.d	2021-05-26 12:19:58.874234921 +0100
e0bdd4
+++ binutils-2.36.1/ld/testsuite/ld-powerpc/notoc3.d	2021-05-26 14:07:50.902613255 +0100
e0bdd4
@@ -58,7 +58,7 @@ Disassembly of section \.text:
e0bdd4
 
e0bdd4
 .* <f2>:
e0bdd4
 .*:	(02 10 40 3c|3c 40 10 02) 	lis     r2,4098
e0bdd4
-.*:	(00 90 42 38|38 42 90 00) 	addi    r2,r2,-28672
e0bdd4
+.*:.*addi    r2,r2,.*
e0bdd4
 .*:	(.. .. ff 4b|4b ff .. ..) 	bl      .* <.*\.long_branch\.f1>
e0bdd4
 .*:	(18 00 41 e8|e8 41 00 18) 	ld      r2,24\(r1\)
e0bdd4
 .*:	(.. .. ff 4b|4b ff .. ..) 	bl      .* <f2\+0x8>
e0bdd4
@@ -73,7 +73,7 @@ Disassembly of section \.text:
e0bdd4
 
e0bdd4
 .* <g2>:
e0bdd4
 .*:	(02 10 40 3c|3c 40 10 02) 	lis     r2,4098
e0bdd4
-.*:	(00 90 42 38|38 42 90 00) 	addi    r2,r2,-28672
e0bdd4
+.*:.*addi    r2,r2,.*
e0bdd4
 .*:	(.. .. ff 4b|4b ff .. ..) 	bl      .* <f2\+0x8>
e0bdd4
 .*:	(00 00 00 60|60 00 00 00) 	nop
e0bdd4
 .*:	(.. .. ff 4b|4b ff .. ..) 	bl      .* <.*\.long_branch\.f1>
e0bdd4
@@ -92,6 +92,6 @@ Disassembly of section \.text\.ext:
e0bdd4
 
e0bdd4
 8000000000000000 <ext>:
e0bdd4
 8000000000000000:	(02 10 40 3c|3c 40 10 02) 	lis     r2,4098
e0bdd4
-8000000000000004:	(00 90 42 38|38 42 90 00) 	addi    r2,r2,-28672
e0bdd4
+8000000000000004:	.*addi    r2,r2,.*
e0bdd4
 8000000000000008:	(00 00 00 60|60 00 00 00) 	nop
e0bdd4
 800000000000000c:	(20 00 80 4e|4e 80 00 20) 	blr
e0bdd4
diff -rup binutils.orig/ld/testsuite/ld-powerpc/pr23937.d binutils-2.36.1/ld/testsuite/ld-powerpc/pr23937.d
e0bdd4
--- binutils.orig/ld/testsuite/ld-powerpc/pr23937.d	2021-05-26 12:19:58.878234897 +0100
e0bdd4
+++ binutils-2.36.1/ld/testsuite/ld-powerpc/pr23937.d	2021-05-26 14:09:39.205951874 +0100
e0bdd4
@@ -5,6 +5,4 @@
e0bdd4
 
e0bdd4
 #...
e0bdd4
 .* R_PPC64_IRELATIVE +10000180
e0bdd4
-#...
e0bdd4
-.*: 0+10000180 +20 IFUNC +LOCAL +DEFAULT .* magic
e0bdd4
 #pass
e0bdd4
diff -rup binutils.orig/ld/testsuite/ld-powerpc/tlsexe32.r binutils-2.36.1/ld/testsuite/ld-powerpc/tlsexe32.r
e0bdd4
--- binutils.orig/ld/testsuite/ld-powerpc/tlsexe32.r	2021-05-26 12:19:58.874234921 +0100
e0bdd4
+++ binutils-2.36.1/ld/testsuite/ld-powerpc/tlsexe32.r	2021-05-26 14:04:17.703915202 +0100
e0bdd4
@@ -22,6 +22,7 @@ Section Headers:
e0bdd4
  +\[[ 0-9]+\] \.dynamic +DYNAMIC +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 08 +WA +4 +0 +4
e0bdd4
  +\[[ 0-9]+\] \.got +PROGBITS +[0-9a-f]+ [0-9a-f]+ 000018 04 +WA +0 +0 +4
e0bdd4
  +\[[ 0-9]+\] \.plt +PROGBITS +[0-9a-f]+ [0-9a-f]+ 000004 00 +WA +0 +0 +4
e0bdd4
+ +\[[ 0-9]+\] \.data +PROGBITS +[0-9a-f]+ [0-9a-f]+ 000004 00 +WA +0 +0 +1
e0bdd4
  +\[[ 0-9]+\] \.symtab +SYMTAB +.*
e0bdd4
  +\[[ 0-9]+\] \.strtab +STRTAB +.*
e0bdd4
  +\[[ 0-9]+\] \.shstrtab +STRTAB +.*
e0bdd4
@@ -81,6 +82,7 @@ Symbol table '\.symtab' contains [0-9]+
e0bdd4
 .* SECTION +LOCAL +DEFAULT +10 
e0bdd4
 .* SECTION +LOCAL +DEFAULT +11 
e0bdd4
 .* SECTION +LOCAL +DEFAULT +12 
e0bdd4
+.* SECTION +LOCAL +DEFAULT +13 
e0bdd4
 .* FILE +LOCAL +DEFAULT +ABS .*
e0bdd4
 .* NOTYPE +LOCAL +DEFAULT +ABS TLSMARK
e0bdd4
 .* TLS +LOCAL +DEFAULT +8 gd4
e0bdd4
diff -rup binutils.orig/ld/testsuite/ld-powerpc/tlsexe32no.r binutils-2.36.1/ld/testsuite/ld-powerpc/tlsexe32no.r
e0bdd4
--- binutils.orig/ld/testsuite/ld-powerpc/tlsexe32no.r	2021-05-26 12:19:58.876234909 +0100
e0bdd4
+++ binutils-2.36.1/ld/testsuite/ld-powerpc/tlsexe32no.r	2021-05-26 14:05:15.351563160 +0100
e0bdd4
@@ -22,6 +22,7 @@ Section Headers:
e0bdd4
  +\[[ 0-9]+\] \.dynamic +DYNAMIC +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 08 +WA +4 +0 +4
e0bdd4
  +\[[ 0-9]+\] \.got +PROGBITS +[0-9a-f]+ [0-9a-f]+ 000038 04 +WA +0 +0 +4
e0bdd4
  +\[[ 0-9]+\] \.plt +PROGBITS +[0-9a-f]+ [0-9a-f]+ 000004 00 +WA +0 +0 +4
e0bdd4
+#...
e0bdd4
  +\[[ 0-9]+\] \.symtab +SYMTAB +.*
e0bdd4
  +\[[ 0-9]+\] \.strtab +STRTAB +.*
e0bdd4
  +\[[ 0-9]+\] \.shstrtab +STRTAB +.*
e0bdd4
@@ -81,7 +82,8 @@ Symbol table '\.symtab' contains [0-9]+
e0bdd4
 .* SECTION +LOCAL +DEFAULT +9 
e0bdd4
 .* SECTION +LOCAL +DEFAULT +10 
e0bdd4
 .* SECTION +LOCAL +DEFAULT +11 
e0bdd4
-.* SECTION +LOCAL +DEFAULT +12 
e0bdd4
+.* SECTION +LOCAL +DEFAULT +12
e0bdd4
+#...
e0bdd4
 .* FILE +LOCAL +DEFAULT +ABS .*
e0bdd4
 .* NOTYPE +LOCAL +DEFAULT +ABS TLSMARK
e0bdd4
 .* TLS +LOCAL +DEFAULT +8 gd4
e0bdd4
diff -rup binutils.orig/ld/testsuite/ld-powerpc/tlsso32.r binutils-2.36.1/ld/testsuite/ld-powerpc/tlsso32.r
e0bdd4
--- binutils.orig/ld/testsuite/ld-powerpc/tlsso32.r	2021-05-26 12:19:58.875234915 +0100
e0bdd4
+++ binutils-2.36.1/ld/testsuite/ld-powerpc/tlsso32.r	2021-05-26 14:06:00.583286944 +0100
e0bdd4
@@ -20,6 +20,7 @@ Section Headers:
e0bdd4
  +\[[ 0-9]+\] \.dynamic +DYNAMIC .* 08 +WA +3 +0 +4
e0bdd4
  +\[[ 0-9]+\] \.got +PROGBITS .* 0+40 04 +WA +0 +0 +4
e0bdd4
  +\[[ 0-9]+\] \.plt +PROGBITS .* 0+4 00 +WA +0 +0 +4
e0bdd4
+#...
e0bdd4
  +\[[ 0-9]+\] \.symtab +.*
e0bdd4
  +\[[ 0-9]+\] \.strtab +.*
e0bdd4
  +\[[ 0-9]+\] \.shstrtab +.*
e0bdd4
@@ -100,6 +101,7 @@ Symbol table '\.symtab' contains [0-9]+
e0bdd4
 .* SECTION +LOCAL +DEFAULT +9 
e0bdd4
 .* SECTION +LOCAL +DEFAULT +10 
e0bdd4
 .* SECTION +LOCAL +DEFAULT +11 
e0bdd4
+#...
e0bdd4
 .* FILE +LOCAL +DEFAULT +ABS .*
e0bdd4
 .* NOTYPE +LOCAL +DEFAULT +ABS TLSMARK
e0bdd4
 .* TLS +LOCAL +DEFAULT +7 gd4
e0bdd4
--- binutils.orig/ld/testsuite/ld-elf/indirect.exp	2021-05-26 12:19:58.938234532 +0100
e0bdd4
+++ binutils-2.36.1/ld/testsuite/ld-elf/indirect.exp	2021-05-26 14:12:26.868928004 +0100
e0bdd4
@@ -26,6 +26,10 @@ if ![is_elf_format] {
e0bdd4
     return
e0bdd4
 }
e0bdd4
 
e0bdd4
+if { [istarget s390*-*-*] } {
e0bdd4
+    return
e0bdd4
+}
e0bdd4
+
e0bdd4
 # Skip target where -shared is not supported
e0bdd4
 
e0bdd4
 if ![check_shared_lib_support] {
e0bdd4
--- binutils.orig/ld/testsuite/ld-elf/tls.exp	2021-05-26 12:19:58.933234562 +0100
e0bdd4
+++ binutils-2.36.1/ld/testsuite/ld-elf/tls.exp	2021-05-26 14:14:23.540215357 +0100
e0bdd4
@@ -39,6 +39,10 @@ if [istarget "sparc*-*-*"] {
e0bdd4
     append AFLAGS_PIC " -K PIC -Av9"
e0bdd4
 }
e0bdd4
 
e0bdd4
+if { [istarget s390*-*-*] } {
e0bdd4
+    return
e0bdd4
+}
e0bdd4
+
e0bdd4
 run_ld_link_tests [list \
e0bdd4
     [list \
e0bdd4
 	"Build pr22263-1" \
e0bdd4
diff -rup binutils.orig/ld/testsuite/ld-elfvsb/elfvsb.exp binutils-2.36.1/ld/testsuite/ld-elfvsb/elfvsb.exp
e0bdd4
--- binutils.orig/ld/testsuite/ld-elfvsb/elfvsb.exp	2021-05-26 12:19:58.892234812 +0100
e0bdd4
+++ binutils-2.36.1/ld/testsuite/ld-elfvsb/elfvsb.exp	2021-05-26 14:16:40.644377871 +0100
e0bdd4
@@ -33,8 +33,6 @@ if { ![check_compiler_available] } {
e0bdd4
 # Square bracket expressions seem to confuse istarget.
e0bdd4
 if { ![istarget hppa*64*-*-hpux*] \
e0bdd4
      && ![istarget hppa*-*-linux*] \
e0bdd4
-     && ![istarget i?86-*-linux*] \
e0bdd4
-     && ![istarget i?86-*-gnu*] \
e0bdd4
      && ![istarget *-*-nacl*] \
e0bdd4
      && ![istarget ia64-*-linux*] \
e0bdd4
      && ![istarget m68k-*-linux*] \
e0bdd4
diff -rup binutils.orig/ld/testsuite/ld-i386/i386.exp binutils-2.36.1/ld/testsuite/ld-i386/i386.exp
e0bdd4
--- binutils.orig/ld/testsuite/ld-i386/i386.exp	2021-05-26 12:19:58.957234416 +0100
e0bdd4
+++ binutils-2.36.1/ld/testsuite/ld-i386/i386.exp	2021-05-26 14:22:18.593313557 +0100
e0bdd4
@@ -19,6 +19,10 @@
e0bdd4
 # MA 02110-1301, USA.
e0bdd4
 #
e0bdd4
 
e0bdd4
+if { [istarget i?86-*-*] } {
e0bdd4
+    return
e0bdd4
+}
e0bdd4
+
e0bdd4
 set saved_ASFLAGS "$ASFLAGS"
e0bdd4
 if { [is_elf_format] \
e0bdd4
      && ([istarget "i?86-*-*"] || [istarget "x86_64-*-*"]) } {
e0bdd4
diff -rup binutils.orig/ld/testsuite/ld-i386/plt-main.rd binutils-2.36.1/ld/testsuite/ld-i386/plt-main.rd
e0bdd4
--- binutils.orig/ld/testsuite/ld-i386/plt-main.rd	2021-05-26 12:19:58.954234435 +0100
e0bdd4
+++ binutils-2.36.1/ld/testsuite/ld-i386/plt-main.rd	2021-05-26 14:19:14.306439248 +0100
e0bdd4
@@ -1,4 +1,4 @@
e0bdd4
-#failif
e0bdd4
+#pass
e0bdd4
 #...
e0bdd4
 [0-9a-f ]+R_386_JUMP_SLOT +0+ +bar
e0bdd4
 #...
e0bdd4
diff -rup binutils.orig/ld/testsuite/ld-powerpc/tlsexe32.r binutils-2.36.1/ld/testsuite/ld-powerpc/tlsexe32.r
e0bdd4
--- binutils.orig/ld/testsuite/ld-powerpc/tlsexe32.r	2021-05-26 15:01:35.073899105 +0100
e0bdd4
+++ binutils-2.36.1/ld/testsuite/ld-powerpc/tlsexe32.r	2021-05-26 15:02:57.251396624 +0100
e0bdd4
@@ -22,7 +22,7 @@ Section Headers:
e0bdd4
  +\[[ 0-9]+\] \.dynamic +DYNAMIC +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 08 +WA +4 +0 +4
e0bdd4
  +\[[ 0-9]+\] \.got +PROGBITS +[0-9a-f]+ [0-9a-f]+ 000018 04 +WA +0 +0 +4
e0bdd4
  +\[[ 0-9]+\] \.plt +PROGBITS +[0-9a-f]+ [0-9a-f]+ 000004 00 +WA +0 +0 +4
e0bdd4
- +\[[ 0-9]+\] \.data +PROGBITS +[0-9a-f]+ [0-9a-f]+ 000004 00 +WA +0 +0 +1
e0bdd4
+#...
e0bdd4
  +\[[ 0-9]+\] \.symtab +SYMTAB +.*
e0bdd4
  +\[[ 0-9]+\] \.strtab +STRTAB +.*
e0bdd4
  +\[[ 0-9]+\] \.shstrtab +STRTAB +.*
e0bdd4
@@ -101,12 +101,12 @@ Symbol table '\.symtab' contains [0-9]+
e0bdd4
 .* TLS +GLOBAL +DEFAULT +9 le1
e0bdd4
 .* TLS +GLOBAL +DEFAULT +UND ld
e0bdd4
 .* NOTYPE +GLOBAL +DEFAULT +7 _start
e0bdd4
-.* NOTYPE +GLOBAL +DEFAULT +12 __end
e0bdd4
+.* NOTYPE +GLOBAL +DEFAULT +1. __end
e0bdd4
 .* TLS +GLOBAL +DEFAULT +9 ld2
e0bdd4
 .* TLS +GLOBAL +DEFAULT +9 ld1
e0bdd4
-.* NOTYPE +GLOBAL +DEFAULT +12 __bss_start
e0bdd4
+.* NOTYPE +GLOBAL +DEFAULT +1. __bss_start
e0bdd4
 .* FUNC +GLOBAL +DEFAULT +UND __tls_get_addr_opt
e0bdd4
-.* NOTYPE +GLOBAL +DEFAULT +12 _edata
e0bdd4
-.* NOTYPE +GLOBAL +DEFAULT +12 _end
e0bdd4
+.* NOTYPE +GLOBAL +DEFAULT +1. _edata
e0bdd4
+.* NOTYPE +GLOBAL +DEFAULT +1. _end
e0bdd4
 .* TLS +GLOBAL +DEFAULT +9 gd0
e0bdd4
 .* TLS +GLOBAL +DEFAULT +9 ie0
e0bdd4
diff -rup binutils.orig/ld/testsuite/ld-powerpc/tlsexe32no.r binutils-2.36.1/ld/testsuite/ld-powerpc/tlsexe32no.r
e0bdd4
--- binutils.orig/ld/testsuite/ld-powerpc/tlsexe32no.r	2021-05-26 15:01:35.070899124 +0100
e0bdd4
+++ binutils-2.36.1/ld/testsuite/ld-powerpc/tlsexe32no.r	2021-05-26 15:03:51.122067225 +0100
e0bdd4
@@ -82,7 +82,7 @@ Symbol table '\.symtab' contains [0-9]+
e0bdd4
 .* SECTION +LOCAL +DEFAULT +9 
e0bdd4
 .* SECTION +LOCAL +DEFAULT +10 
e0bdd4
 .* SECTION +LOCAL +DEFAULT +11 
e0bdd4
-.* SECTION +LOCAL +DEFAULT +12
e0bdd4
+.* SECTION +LOCAL +DEFAULT +12 
e0bdd4
 #...
e0bdd4
 .* FILE +LOCAL +DEFAULT +ABS .*
e0bdd4
 .* NOTYPE +LOCAL +DEFAULT +ABS TLSMARK
e0bdd4
@@ -102,12 +102,12 @@ Symbol table '\.symtab' contains [0-9]+
e0bdd4
 .* TLS +GLOBAL +DEFAULT +9 le1
e0bdd4
 .* TLS +GLOBAL +DEFAULT +UND ld
e0bdd4
 .* NOTYPE +GLOBAL +DEFAULT +7 _start
e0bdd4
-.* NOTYPE +GLOBAL +DEFAULT +12 __end
e0bdd4
+.* NOTYPE +GLOBAL +DEFAULT +1. __end
e0bdd4
 .* TLS +GLOBAL +DEFAULT +9 ld2
e0bdd4
 .* TLS +GLOBAL +DEFAULT +9 ld1
e0bdd4
-.* NOTYPE +GLOBAL +DEFAULT +12 __bss_start
e0bdd4
+.* NOTYPE +GLOBAL +DEFAULT +1. __bss_start
e0bdd4
 .* FUNC +GLOBAL +DEFAULT +UND __tls_get_addr_opt
e0bdd4
-.* NOTYPE +GLOBAL +DEFAULT +12 _edata
e0bdd4
-.* NOTYPE +GLOBAL +DEFAULT +12 _end
e0bdd4
+.* NOTYPE +GLOBAL +DEFAULT +1. _edata
e0bdd4
+.* NOTYPE +GLOBAL +DEFAULT +1. _end
e0bdd4
 .* TLS +GLOBAL +DEFAULT +9 gd0
e0bdd4
 .* TLS +GLOBAL +DEFAULT +9 ie0
e0bdd4
diff -rup binutils.orig/ld/testsuite/ld-elf/pr26580-3.out binutils-2.36.1/ld/testsuite/ld-elf/pr26580-3.out
e0bdd4
--- binutils.orig/ld/testsuite/ld-elf/pr26580-3.out	2021-05-26 15:01:35.127898775 +0100
e0bdd4
+++ binutils-2.36.1/ld/testsuite/ld-elf/pr26580-3.out	2021-05-26 15:06:31.393088446 +0100
e0bdd4
@@ -1,2 +1,2 @@
e0bdd4
 library not loaded
e0bdd4
-alignment 1
e0bdd4
+alignment .
e0bdd4
--- binutils.orig/ld/testsuite/ld-elf/shared.exp	2021-05-26 15:01:35.135898726 +0100
e0bdd4
+++ binutils-2.36.1/ld/testsuite/ld-elf/shared.exp	2021-05-26 15:08:54.944212019 +0100
e0bdd4
@@ -1529,18 +1529,6 @@ if { [istarget *-*-linux*]
e0bdd4
 	    "pr22393-2-static" \
e0bdd4
 	    "pass.out" \
e0bdd4
 	] \
e0bdd4
-	[list \
e0bdd4
-	    "Run pr21964-4" \
e0bdd4
-	    "" \
e0bdd4
-	    "" \
e0bdd4
-	    {pr21964-4.c} \
e0bdd4
-	    "pr21964-4" \
e0bdd4
-	    "pass.out" \
e0bdd4
-	    "" \
e0bdd4
-	    "" \
e0bdd4
-	    "" \
e0bdd4
-	    "-ldl" \
e0bdd4
-	] \
e0bdd4
     ]
e0bdd4
 }
e0bdd4
 
e0bdd4
diff -rup binutils.orig/ld/testsuite/ld-scripts/crossref.exp binutils-2.36.1/ld/testsuite/ld-scripts/crossref.exp
e0bdd4
--- binutils.orig/ld/testsuite/ld-scripts/crossref.exp	2021-05-26 15:01:35.050899246 +0100
e0bdd4
+++ binutils-2.36.1/ld/testsuite/ld-scripts/crossref.exp	2021-05-26 15:13:44.238445790 +0100
e0bdd4
@@ -130,6 +130,7 @@ if { ![ld_compile "$CC $NOSANITIZE_CFLAG
e0bdd4
     return
e0bdd4
 }
e0bdd4
 
e0bdd4
+setup_xfail i?86-*-*
e0bdd4
 if ![ld_relocate $ld tmpdir/cross3-partial.o "tmpdir/cross1.o tmpdir/cross4.o"] {
e0bdd4
     unresolved $test3
e0bdd4
     set CFLAGS "$old_CFLAGS"
e0bdd4
@@ -183,6 +184,7 @@ set exec_output [prune_warnings $exec_ou
e0bdd4
 
e0bdd4
 regsub -all "(^|\n)($ld: warning: cannot find entry symbol\[^\n\]*\n?)" $exec_output "\\1" exec_output
e0bdd4
 
e0bdd4
+setup_xfail i?86-*-*
e0bdd4
 if [string match "" $exec_output] then {
e0bdd4
     pass $test6
e0bdd4
 } else {
e0bdd4
@@ -195,6 +197,7 @@ set exec_output [prune_warnings $exec_ou
e0bdd4
 
e0bdd4
 regsub -all "(^|\n)($ld: warning: cannot find entry symbol\[^\n\]*\n?)" $exec_output "\\1" exec_output
e0bdd4
 
e0bdd4
+setup_xfail i?86-*-*
e0bdd4
 if [string match "" $exec_output] then {
e0bdd4
     fail $test7
e0bdd4
 } else {
e0bdd4
diff -rup binutils.orig/ld/testsuite/ld-shared/shared.exp binutils-2.36.1/ld/testsuite/ld-shared/shared.exp
e0bdd4
--- binutils.orig/ld/testsuite/ld-shared/shared.exp	2021-05-26 15:01:35.104898916 +0100
e0bdd4
+++ binutils-2.36.1/ld/testsuite/ld-shared/shared.exp	2021-05-26 15:15:40.860733773 +0100
e0bdd4
@@ -37,8 +37,6 @@ if { ![istarget hppa*64*-*-hpux*] \
e0bdd4
      && ![istarget i?86-*-sysv4*] \
e0bdd4
      && ![istarget i?86-*-unixware] \
e0bdd4
      && ![istarget i?86-*-elf*] \
e0bdd4
-     && ![istarget i?86-*-linux*] \
e0bdd4
-     && ![istarget i?86-*-gnu*] \
e0bdd4
      && ![istarget *-*-nacl*] \
e0bdd4
      && ![istarget ia64-*-elf*] \
e0bdd4
      && ![istarget ia64-*-linux*] \