e5b60c3
diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin-10.d binutils-2.36.1/ld/testsuite/ld-plugin/plugin-10.d
e5b60c3
--- binutils.orig/ld/testsuite/ld-plugin/plugin-10.d	2021-02-12 10:13:11.116049499 +0000
e5b60c3
+++ binutils-2.36.1/ld/testsuite/ld-plugin/plugin-10.d	2021-02-12 10:23:44.298370984 +0000
e5b60c3
@@ -32,7 +32,7 @@ hook called: claim_file tmpdir/func.o \[
e5b60c3
 hook called: claim_file tmpdir/libtext.a \[@.* not claimed
e5b60c3
 #...
e5b60c3
 hook called: all symbols read.
e5b60c3
-Sym: '_?func' Resolution: LDPR_PREVAILING_DEF_IRONLY
e5b60c3
+Sym: '_?func' Resolution: LDPR_PREVAILING_DE.*
e5b60c3
 Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY
e5b60c3
 #...
e5b60c3
 hook called: cleanup.
e5b60c3
diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin-11.d binutils-2.36.1/ld/testsuite/ld-plugin/plugin-11.d
e5b60c3
--- binutils.orig/ld/testsuite/ld-plugin/plugin-11.d	2021-02-12 10:13:11.119049477 +0000
e5b60c3
+++ binutils-2.36.1/ld/testsuite/ld-plugin/plugin-11.d	2021-02-12 10:50:40.973828943 +0000
e5b60c3
@@ -35,9 +35,9 @@ hook called: claim_file tmpdir/func.o \[
e5b60c3
 hook called: claim_file tmpdir/libtext.a \[@.* CLAIMED
e5b60c3
 #...
e5b60c3
 hook called: all symbols read.
e5b60c3
-Sym: '_?func' Resolution: LDPR_PREVAILING_DEF_IRONLY
e5b60c3
+Sym: '_?func' Resolution: LDPR_PREVAILING_DE.*
e5b60c3
 Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY
e5b60c3
-Sym: '_?text' Resolution: LDPR_PREVAILING_DEF_IRONLY
e5b60c3
+Sym: '_?text' Resolution: LDPR_PREVAILING_DE.*
e5b60c3
 #...
e5b60c3
 hook called: cleanup.
e5b60c3
 #...
e5b60c3
diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin-16.d binutils-2.36.1/ld/testsuite/ld-plugin/plugin-16.d
e5b60c3
--- binutils.orig/ld/testsuite/ld-plugin/plugin-16.d	2021-02-12 10:13:11.119049477 +0000
e5b60c3
+++ binutils-2.36.1/ld/testsuite/ld-plugin/plugin-16.d	2021-02-12 10:29:31.510843797 +0000
e5b60c3
@@ -30,7 +30,7 @@ hook called: claim_file .*/ld/testsuite/
e5b60c3
 hook called: claim_file tmpdir/text.o \[@0/.* not claimed
e5b60c3
 #...
e5b60c3
 hook called: all symbols read.
e5b60c3
-Sym: '_?func' Resolution: LDPR_PREVAILING_DEF_IRONLY
e5b60c3
+Sym: '_?func' Resolution: LDPR_PREVAILING_DE.*
e5b60c3
 Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY
e5b60c3
 #...
e5b60c3
 hook called: cleanup.
e5b60c3
diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin-17.d binutils-2.36.1/ld/testsuite/ld-plugin/plugin-17.d
e5b60c3
--- binutils.orig/ld/testsuite/ld-plugin/plugin-17.d	2021-02-12 10:13:11.116049499 +0000
e5b60c3
+++ binutils-2.36.1/ld/testsuite/ld-plugin/plugin-17.d	2021-02-12 10:35:13.348404638 +0000
e5b60c3
@@ -31,7 +31,7 @@ hook called: claim_file .*/ld/testsuite/
e5b60c3
 hook called: claim_file tmpdir/text.o \[@0/.* not claimed
e5b60c3
 #...
e5b60c3
 hook called: all symbols read.
e5b60c3
-Sym: '_?func' Resolution: LDPR_PREVAILING_DEF_IRONLY
e5b60c3
+Sym: '_?func' Resolution: LDPR_PREVAILING_DE.*
e5b60c3
 Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY
e5b60c3
 #...
e5b60c3
 hook called: cleanup.
e5b60c3
diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin-18.d binutils-2.36.1/ld/testsuite/ld-plugin/plugin-18.d
e5b60c3
--- binutils.orig/ld/testsuite/ld-plugin/plugin-18.d	2021-02-12 10:13:11.118049484 +0000
e5b60c3
+++ binutils-2.36.1/ld/testsuite/ld-plugin/plugin-18.d	2021-02-12 10:29:47.974726314 +0000
e5b60c3
@@ -32,7 +32,7 @@ hook called: claim_file .*/ld/testsuite/
e5b60c3
 hook called: claim_file tmpdir/libtext.a \[@.* not claimed
e5b60c3
 #...
e5b60c3
 hook called: all symbols read.
e5b60c3
-Sym: '_?func' Resolution: LDPR_PREVAILING_DEF_IRONLY
e5b60c3
+Sym: '_?func' Resolution: LDPR_PREVAILING_DE.*
e5b60c3
 Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY
e5b60c3
 #...
e5b60c3
 hook called: cleanup.
e5b60c3
diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin-19.d binutils-2.36.1/ld/testsuite/ld-plugin/plugin-19.d
e5b60c3
--- binutils.orig/ld/testsuite/ld-plugin/plugin-19.d	2021-02-12 10:13:11.116049499 +0000
e5b60c3
+++ binutils-2.36.1/ld/testsuite/ld-plugin/plugin-19.d	2021-02-12 10:30:31.990412245 +0000
e5b60c3
@@ -35,9 +35,9 @@ hook called: claim_file .*/ld/testsuite/
e5b60c3
 hook called: claim_file tmpdir/libtext.a \[@.* CLAIMED
e5b60c3
 #...
e5b60c3
 hook called: all symbols read.
e5b60c3
-Sym: '_?func' Resolution: LDPR_PREVAILING_DEF_IRONLY
e5b60c3
+Sym: '_?func' Resolution: LDPR_PREVAILING_DE.*
e5b60c3
 Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY
e5b60c3
-Sym: '_?text' Resolution: LDPR_PREVAILING_DEF_IRONLY
e5b60c3
+Sym: '_?text' Resolution: LDPR_PREVAILING_DE.*
e5b60c3
 #...
e5b60c3
 hook called: cleanup.
e5b60c3
 #...
e5b60c3
diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin-8.d binutils-2.36.1/ld/testsuite/ld-plugin/plugin-8.d
e5b60c3
--- binutils.orig/ld/testsuite/ld-plugin/plugin-8.d	2021-02-12 10:13:11.118049484 +0000
e5b60c3
+++ binutils-2.36.1/ld/testsuite/ld-plugin/plugin-8.d	2021-02-12 10:23:18.489561148 +0000
e5b60c3
@@ -30,7 +30,7 @@ hook called: claim_file tmpdir/func.o \[
e5b60c3
 hook called: claim_file tmpdir/text.o \[@0/.* not claimed
e5b60c3
 #...
e5b60c3
 hook called: all symbols read.
e5b60c3
-Sym: '_?func' Resolution: LDPR_PREVAILING_DEF_IRONLY
e5b60c3
+Sym: '_?func' Resolution: LDPR_PREVAILING_DE.*
e5b60c3
 Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY
e5b60c3
 #...
e5b60c3
 hook called: cleanup.
e5b60c3
diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin-9.d binutils-2.36.1/ld/testsuite/ld-plugin/plugin-9.d
e5b60c3
--- binutils.orig/ld/testsuite/ld-plugin/plugin-9.d	2021-02-12 10:13:11.119049477 +0000
e5b60c3
+++ binutils-2.36.1/ld/testsuite/ld-plugin/plugin-9.d	2021-02-12 10:23:34.417443785 +0000
e5b60c3
@@ -31,7 +31,7 @@ hook called: claim_file tmpdir/func.o \[
e5b60c3
 hook called: claim_file tmpdir/text.o \[@0/.* not claimed
e5b60c3
 #...
e5b60c3
 hook called: all symbols read.
e5b60c3
-Sym: '_?func' Resolution: LDPR_PREVAILING_DEF_IRONLY
e5b60c3
+Sym: '_?func' Resolution: LDPR_PREVAILING_DE.*
e5b60c3
 Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY
e5b60c3
 #...
e5b60c3
 hook called: cleanup.
e5b60c3
diff -rup binutils.orig/ld/testsuite/ld-x86-64/x86-64.exp binutils-2.36.1/ld/testsuite/ld-x86-64/x86-64.exp
e5b60c3
--- binutils.orig/ld/testsuite/ld-x86-64/x86-64.exp	2021-02-12 10:13:11.177049047 +0000
e5b60c3
+++ binutils-2.36.1/ld/testsuite/ld-x86-64/x86-64.exp	2021-02-12 10:57:23.339975059 +0000
e5b60c3
@@ -1437,22 +1437,6 @@ if { [isnative] && [check_compiler_avail
e5b60c3
     } else {
e5b60c3
 	run_cc_link_tests [list \
e5b60c3
 	    [list \
e5b60c3
-		"Build pr22001-1b" \
e5b60c3
-		"$NOPIE_LDFLAGS -Wl,-z,nocopyreloc,--no-as-needed,-z,notext tmpdir/pr22001-1.so" \
e5b60c3
-		"$NOPIE_CFLAGS -Wa,-mx86-used-note=yes" \
e5b60c3
-		{ pr22001-1c.c } \
e5b60c3
-		{{error_output "pr22001-1b.err"}} \
e5b60c3
-		"pr22001-1b" \
e5b60c3
-	    ] \
e5b60c3
-	    [list \
e5b60c3
-		"Build pr21997-1b" \
e5b60c3
-		"$NOPIE_LDFLAGS -Wl,--no-as-needed,-z,notext tmpdir/pr21997-1.so" \
e5b60c3
-		"$NOPIE_CFLAGS -Wa,-mx86-used-note=yes" \
e5b60c3
-		{ pr21997-1c.c } \
e5b60c3
-		{{error_output "pr21997-1b.err"}} \
e5b60c3
-		"pr21997-1b" \
e5b60c3
-	    ] \
e5b60c3
-	    [list \
e5b60c3
 		"Build lam-u48.so" \
e5b60c3
 		"-shared -Wl,-z,lam-u48" \
e5b60c3
 		"" \
e5b60c3
@@ -1766,49 +1750,6 @@ if { [isnative] && [check_compiler_avail
e5b60c3
     if { [istarget "x86_64-*-linux*"] \
e5b60c3
 	 && ![istarget "x86_64-*-linux*-gnux32"]} {
e5b60c3
 
e5b60c3
-	run_cc_link_tests [list \
e5b60c3
-	    [list \
e5b60c3
-		"Build plt-main with -z bndplt" \
e5b60c3
-		"tmpdir/plt-main1.o tmpdir/plt-main2.o tmpdir/plt-main3.o \
e5b60c3
-		 tmpdir/plt-main4.o tmpdir/libplt-lib.so -z bndplt \
e5b60c3
-		 -z noseparate-code -z max-page-size=0x200000" \
e5b60c3
-		"-Wa,-mx86-used-note=yes $NOCF_PROTECTION_CFLAGS" \
e5b60c3
-		{ plt-main5.c } \
e5b60c3
-		{{objdump {-drw} plt-main-bnd.dd}} \
e5b60c3
-		"plt-main-bnd" \
e5b60c3
-	    ] \
e5b60c3
-	    [list \
e5b60c3
-		"Build plt-main with PIE and -z bndplt" \
e5b60c3
-		"tmpdir/plt-main1.o tmpdir/plt-main2.o tmpdir/plt-main3.o \
e5b60c3
-		 tmpdir/plt-main4.o tmpdir/libplt-lib.so -z bndplt -pie \
e5b60c3
-		 -z noseparate-code -z max-page-size=0x200000" \
e5b60c3
-		"-fPIC -Wa,-mx86-used-note=yes $NOCF_PROTECTION_CFLAGS" \
e5b60c3
-		{ plt-main5.c } \
e5b60c3
-		{{objdump {-drw} plt-main-bnd.dd}} \
e5b60c3
-		"plt-main-pie-bnd" \
e5b60c3
-	    ] \
e5b60c3
-	    [list \
e5b60c3
-		"Build plt-main with -z bndplt -z now" \
e5b60c3
-		"tmpdir/plt-main1.o tmpdir/plt-main2.o tmpdir/plt-main3.o \
e5b60c3
-		 tmpdir/plt-main4.o tmpdir/libplt-lib.so -z bndplt -z now \
e5b60c3
-		 -z noseparate-code -z max-page-size=0x200000" \
e5b60c3
-		"-Wa,-mx86-used-note=yes $NOCF_PROTECTION_CFLAGS" \
e5b60c3
-		{ plt-main5.c } \
e5b60c3
-		{{readelf {-SW} plt-main-bnd-now.rd} {objdump {-drw} plt-main-bnd.dd}} \
e5b60c3
-		"plt-main-bnd-now" \
e5b60c3
-	    ] \
e5b60c3
-	    [list \
e5b60c3
-		"Build plt-main with PIE and -z bndplt -z now" \
e5b60c3
-		"tmpdir/plt-main1.o tmpdir/plt-main2.o tmpdir/plt-main3.o \
e5b60c3
-		 tmpdir/plt-main4.o tmpdir/libplt-lib.so -z bndplt -z now -pie \
e5b60c3
-		 -z noseparate-code -z max-page-size=0x200000" \
e5b60c3
-		"-fPIC -Wa,-mx86-used-note=yes $NOCF_PROTECTION_CFLAGS" \
e5b60c3
-		{ plt-main5.c } \
e5b60c3
-		{{readelf {-SW} plt-main-bnd-now.rd} {objdump {-drw} plt-main-bnd.dd}} \
e5b60c3
-		"plt-main-pie-bnd-now" \
e5b60c3
-	    ] \
e5b60c3
-	]
e5b60c3
-
e5b60c3
 	run_ld_link_exec_tests [list \
e5b60c3
 	    [list \
e5b60c3
 		"Run plt-main with -z bndplt" \
e5b60c3
@@ -1893,66 +1834,6 @@ if { [isnative] && [check_compiler_avail
e5b60c3
 	    set pltdump {{objdump {-drw} plt-main-ibt.dd}}
e5b60c3
 	    set pltsecdump {{readelf {-SW} plt-main-ibt-now.rd} {objdump {-drw} plt-main-ibt.dd}}
e5b60c3
 	}
e5b60c3
-	run_cc_link_tests [list \
e5b60c3
-	    [list \
e5b60c3
-		"Build plt-main with -z ibtplt" \
e5b60c3
-		"tmpdir/plt-main1.o tmpdir/plt-main2.o tmpdir/plt-main3.o \
e5b60c3
-		 tmpdir/plt-main4.o tmpdir/libplt-lib.so -z ibtplt \
e5b60c3
-		 -z noseparate-code -z max-page-size=0x200000" \
e5b60c3
-		"-Wa,-mx86-used-note=yes" \
e5b60c3
-		{ plt-main5.c } \
e5b60c3
-		$pltdump \
e5b60c3
-		"plt-main-ibt" \
e5b60c3
-	    ] \
e5b60c3
-	    [list \
e5b60c3
-		"Build plt-main with PIE and -z ibtplt" \
e5b60c3
-		"tmpdir/plt-main1.o tmpdir/plt-main2.o tmpdir/plt-main3.o \
e5b60c3
-		 tmpdir/plt-main4.o tmpdir/libplt-lib.so -z ibtplt -pie \
e5b60c3
-		 -z noseparate-code -z max-page-size=0x200000" \
e5b60c3
-		"-fPIC -Wa,-mx86-used-note=yes" \
e5b60c3
-		{ plt-main5.c } \
e5b60c3
-		$pltdump \
e5b60c3
-		"plt-main-pie-ibt" \
e5b60c3
-	    ] \
e5b60c3
-	    [list \
e5b60c3
-		"Build plt-main with -z ibtplt -z now" \
e5b60c3
-		"tmpdir/plt-main1.o tmpdir/plt-main2.o tmpdir/plt-main3.o \
e5b60c3
-		 tmpdir/plt-main4.o tmpdir/libplt-lib.so -z ibtplt -z now \
e5b60c3
-		 -z noseparate-code -z max-page-size=0x200000" \
e5b60c3
-		"-Wa,-mx86-used-note=yes" \
e5b60c3
-		{ plt-main5.c } \
e5b60c3
-		$pltsecdump \
e5b60c3
-		"plt-main-ibt-now" \
e5b60c3
-	    ] \
e5b60c3
-	    [list \
e5b60c3
-		"Build plt-main with PIE and -z ibtplt -z now" \
e5b60c3
-		"tmpdir/plt-main1.o tmpdir/plt-main2.o tmpdir/plt-main3.o \
e5b60c3
-		 tmpdir/plt-main4.o tmpdir/libplt-lib.so -z ibtplt -z now -pie \
e5b60c3
-		 -z noseparate-code -z max-page-size=0x200000" \
e5b60c3
-		"-fPIC -Wa,-mx86-used-note=yes" \
e5b60c3
-		{ plt-main5.c } \
e5b60c3
-		$pltsecdump \
e5b60c3
-		"plt-main-pie-ibt-now" \
e5b60c3
-	    ] \
e5b60c3
-	    [list \
e5b60c3
-		"Build libibtplt-lib.so with -z ibtplt" \
e5b60c3
-		"-shared -z ibtplt \
e5b60c3
-		 -z noseparate-code -z max-page-size=0x200000" \
e5b60c3
-		"-fPIC -Wa,-mx86-used-note=yes" \
e5b60c3
-		{ plt-main1.c plt-main2.c plt-main3.c plt-main4.c} \
e5b60c3
-		$pltdump \
e5b60c3
-		"libibtplt-lib.so" \
e5b60c3
-	    ] \
e5b60c3
-	    [list \
e5b60c3
-		"Build libibtplt--now-lib.so with -z ibtplt -z now" \
e5b60c3
-		"-shared -z ibtplt -z now \
e5b60c3
-		 -z noseparate-code -z max-page-size=0x200000" \
e5b60c3
-		"-fPIC -Wa,-mx86-used-note=yes" \
e5b60c3
-		{ plt-main1.c plt-main2.c plt-main3.c plt-main4.c} \
e5b60c3
-		$pltdump \
e5b60c3
-		"libibtplt-now-lib.so" \
e5b60c3
-	    ] \
e5b60c3
-	]
e5b60c3
 
e5b60c3
 	run_ld_link_exec_tests [list \
e5b60c3
 	    [list \
e5b60c3
diff -rup binutils.orig/ld/testsuite/ld-x86-64/x86-64.exp binutils-2.36.1/ld/testsuite/ld-x86-64/x86-64.exp
e5b60c3
--- binutils.orig/ld/testsuite/ld-x86-64/x86-64.exp	2021-02-12 11:44:39.121364751 +0000
e5b60c3
+++ binutils-2.36.1/ld/testsuite/ld-x86-64/x86-64.exp	2021-02-12 11:46:27.505597689 +0000
e5b60c3
@@ -1878,24 +1878,6 @@ if { [isnative] && [check_compiler_avail
e5b60c3
 		"plt-main.out" \
e5b60c3
 		"-fPIC" \
e5b60c3
 	    ] \
e5b60c3
-	    [list \
e5b60c3
-		"Run plt-main with libibtplt-lib.so -z ibtplt" \
e5b60c3
-		"-Wl,--no-as-needed,-z,ibtplt tmpdir/libibtplt-lib.so \
e5b60c3
-		 tmpdir/libplt-lib.so" \
e5b60c3
-		"-Wa,-mx86-used-note=yes" \
e5b60c3
-		{ plt-main5.c } \
e5b60c3
-		"plt-main-ibt-lib" \
e5b60c3
-		"plt-main.out" \
e5b60c3
-	    ] \
e5b60c3
-	    [list \
e5b60c3
-		"Run plt-main with libibtplt-lib.so -z ibtplt -z now" \
e5b60c3
-		"-Wl,--no-as-needed,-z,ibtplt,-z,now \
e5b60c3
-		 tmpdir/libibtplt-now-lib.so tmpdir/libplt-lib.so" \
e5b60c3
-		"-Wa,-mx86-used-note=yes" \
e5b60c3
-		{ plt-main5.c } \
e5b60c3
-		"plt-main-ibt-now-lib" \
e5b60c3
-		"plt-main.out" \
e5b60c3
-	    ] \
e5b60c3
 	]
e5b60c3
 
e5b60c3
 	if { [check_ifunc_attribute_available] } {
e5b60c3
@@ -1922,7 +1904,6 @@ if { [isnative] && [check_compiler_avail
e5b60c3
 	}
e5b60c3
     }
e5b60c3
 
e5b60c3
-    undefined_weak "$NOPIE_CFLAGS" "$NOPIE_LDFLAGS"
e5b60c3
     undefined_weak "-fPIE" ""
e5b60c3
     undefined_weak "-fPIE" "-pie"
e5b60c3
     undefined_weak "-fPIE" "-Wl,-z,nodynamic-undefined-weak"
e5b60c3
--- binutils.orig/binutils/dwarf.c	2021-02-12 11:44:39.012365518 +0000
e5b60c3
+++ binutils-2.36.1/binutils/dwarf.c	2021-02-12 11:49:35.408266181 +0000
e5b60c3
@@ -2117,6 +2117,7 @@ get_type_abbrev_from_form (unsigned long
e5b60c3
   switch (form)
e5b60c3
     {
e5b60c3
     case DW_FORM_GNU_ref_alt:
e5b60c3
+    case DW_FORM_ref_sig8:
e5b60c3
       /* FIXME: We are unable to handle this form at the moment.  */
e5b60c3
       return NULL;
e5b60c3
 
e5b60c3
@@ -2146,7 +2147,7 @@ get_type_abbrev_from_form (unsigned long
e5b60c3
       /* FIXME: Are there other DW_FORMs that can be used by types ?  */
e5b60c3
 
e5b60c3
     default:
e5b60c3
-      warn (_("Unexpected form %lx encountered whilst finding abbreviation for type\n"), form);
e5b60c3
+      warn (_("Unexpected form %#lx encountered whilst finding abbreviation for type\n"), form);
e5b60c3
       return NULL;
e5b60c3
     }
e5b60c3
 
e5b60c3
diff -rup binutils.orig/ld/testsuite/ld-aarch64/variant_pcs-now.d binutils-2.36.1/ld/testsuite/ld-aarch64/variant_pcs-now.d
e5b60c3
--- binutils.orig/ld/testsuite/ld-aarch64/variant_pcs-now.d	2021-02-12 11:44:39.034365363 +0000
e5b60c3
+++ binutils-2.36.1/ld/testsuite/ld-aarch64/variant_pcs-now.d	2021-02-12 11:57:49.372692119 +0000
e5b60c3
@@ -41,28 +41,28 @@ Symbol table '\.symtab' contains 35 entr
e5b60c3
      7: 00000000000111c8     0 SECTION LOCAL  DEFAULT    7 
e5b60c3
      8: 0000000000011270     0 SECTION LOCAL  DEFAULT    8 
e5b60c3
      9: 0000000000000000     0 FILE    LOCAL  DEFAULT  ABS .*variant_pcs-1\.o
e5b60c3
-    10: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_local
e5b60c3
-    11: 0000000000008000     0 IFUNC   LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_local_ifunc
e5b60c3
+    10: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT[ 	]+1 f_spec_local[ 	]+\[VARIANT_PCS\]
e5b60c3
+    11: 0000000000008000     0 IFUNC   LOCAL  DEFAULT[ 	]+1 f_spec_local_ifunc[ 	]+\[VARIANT_PCS\]
e5b60c3
     12: 0000000000008000     0 IFUNC   LOCAL  DEFAULT    1 f_base_local_ifunc
e5b60c3
     13: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT    1 f_base_local
e5b60c3
     14: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT    1 \$x
e5b60c3
     15: 0000000000000000     0 FILE    LOCAL  DEFAULT  ABS .*variant_pcs-2\.o
e5b60c3
-    16: 0000000000008038     0 NOTYPE  LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_local2
e5b60c3
-    17: 0000000000008038     0 IFUNC   LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_local2_ifunc
e5b60c3
+    16: 0000000000008038     0 NOTYPE  LOCAL  DEFAULT[ 	]+1 f_spec_local2[ 	]+\[VARIANT_PCS\]
e5b60c3
+    17: 0000000000008038     0 IFUNC   LOCAL  DEFAULT[ 	]+1 f_spec_local2_ifunc[ 	]+\[VARIANT_PCS\]
e5b60c3
     18: 0000000000008038     0 IFUNC   LOCAL  DEFAULT    1 f_base_local2_ifunc
e5b60c3
     19: 0000000000008038     0 NOTYPE  LOCAL  DEFAULT    1 f_base_local2
e5b60c3
     20: 0000000000008038     0 NOTYPE  LOCAL  DEFAULT    1 \$x
e5b60c3
     21: 0000000000000000     0 FILE    LOCAL  DEFAULT  ABS 
e5b60c3
     22: 0000000000009080     0 OBJECT  LOCAL  DEFAULT  ABS _DYNAMIC
e5b60c3
-    23: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_global_hidden_def
e5b60c3
+    23: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT[ 	]+1 f_spec_global_hidden_def[ 	]+\[VARIANT_PCS\]
e5b60c3
     24: 0000000000008000     0 IFUNC   LOCAL  DEFAULT    1 f_base_global_hidden_ifunc
e5b60c3
     25: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT    1 f_base_global_hidden_def
e5b60c3
     26: 0000000000009000     0 OBJECT  LOCAL  DEFAULT  ABS _GLOBAL_OFFSET_TABLE_
e5b60c3
-    27: 0000000000008000     0 IFUNC   LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_global_hidden_ifunc
e5b60c3
+    27: 0000000000008000     0 IFUNC   LOCAL  DEFAULT[ 	]+1 f_spec_global_hidden_ifunc[ 	]+\[VARIANT_PCS\]
e5b60c3
     28: 0000000000008070     0 NOTYPE  LOCAL  DEFAULT    2 \$x
e5b60c3
     29: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT  UND f_base_global_default_undef
e5b60c3
-    30: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT \[VARIANT_PCS\]   UND f_spec_global_default_undef
e5b60c3
-    31: 0000000000008000     0 IFUNC   GLOBAL DEFAULT \[VARIANT_PCS\]     1 f_spec_global_default_ifunc
e5b60c3
+    30: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT[ 	]+UND f_spec_global_default_undef[ 	]+\[VARIANT_PCS\]
e5b60c3
+    31: 0000000000008000     0 IFUNC   GLOBAL DEFAULT[ 	]+1 f_spec_global_default_ifunc[ 	]+\[VARIANT_PCS\]
e5b60c3
     32: 0000000000008000     0 NOTYPE  GLOBAL DEFAULT    1 f_base_global_default_def
e5b60c3
-    33: 0000000000008000     0 NOTYPE  GLOBAL DEFAULT \[VARIANT_PCS\]     1 f_spec_global_default_def
e5b60c3
+    33: 0000000000008000     0 NOTYPE  GLOBAL DEFAULT[ 	]+1 f_spec_global_default_def[ 	]+\[VARIANT_PCS\]
e5b60c3
     34: 0000000000008000     0 IFUNC   GLOBAL DEFAULT    1 f_base_global_default_ifunc
e5b60c3
diff -rup binutils.orig/ld/testsuite/ld-aarch64/variant_pcs-r.d binutils-2.36.1/ld/testsuite/ld-aarch64/variant_pcs-r.d
e5b60c3
--- binutils.orig/ld/testsuite/ld-aarch64/variant_pcs-r.d	2021-02-12 11:44:39.028365406 +0000
e5b60c3
+++ binutils-2.36.1/ld/testsuite/ld-aarch64/variant_pcs-r.d	2021-02-12 11:54:36.878111688 +0000
e5b60c3
@@ -37,24 +37,24 @@ Symbol table '\.symtab' contains 26 entr
e5b60c3
      2: 0000000000000000     0 SECTION LOCAL  DEFAULT    3 
e5b60c3
      3: 0000000000000000     0 SECTION LOCAL  DEFAULT    4 
e5b60c3
      4: 0000000000000000     0 FILE    LOCAL  DEFAULT  ABS .*variant_pcs-1\.o
e5b60c3
-     5: 0000000000000000     0 NOTYPE  LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_local
e5b60c3
-     6: 0000000000000000     0 IFUNC   LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_local_ifunc
e5b60c3
+     5: 0000000000000000     0 NOTYPE  LOCAL  DEFAULT[ 	]+1 f_spec_local[ 	]+\[VARIANT_PCS\]
e5b60c3
+     6: 0000000000000000     0 IFUNC   LOCAL  DEFAULT[ 	]+1 f_spec_local_ifunc[ 	]+\[VARIANT_PCS\]
e5b60c3
      7: 0000000000000000     0 IFUNC   LOCAL  DEFAULT    1 f_base_local_ifunc
e5b60c3
      8: 0000000000000000     0 NOTYPE  LOCAL  DEFAULT    1 f_base_local
e5b60c3
      9: 0000000000000000     0 NOTYPE  LOCAL  DEFAULT    1 \$x
e5b60c3
     10: 0000000000000000     0 FILE    LOCAL  DEFAULT  ABS .*variant_pcs-2\.o
e5b60c3
-    11: 0000000000000038     0 NOTYPE  LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_local2
e5b60c3
-    12: 0000000000000038     0 IFUNC   LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_local2_ifunc
e5b60c3
+    11: 0000000000000038     0 NOTYPE  LOCAL  DEFAULT[ 	]+1 f_spec_local2[ 	]+\[VARIANT_PCS\]
e5b60c3
+    12: 0000000000000038     0 IFUNC   LOCAL  DEFAULT[ 	]+1 f_spec_local2_ifunc[ 	]+\[VARIANT_PCS\]
e5b60c3
     13: 0000000000000038     0 IFUNC   LOCAL  DEFAULT    1 f_base_local2_ifunc
e5b60c3
     14: 0000000000000038     0 NOTYPE  LOCAL  DEFAULT    1 f_base_local2
e5b60c3
     15: 0000000000000038     0 NOTYPE  LOCAL  DEFAULT    1 \$x
e5b60c3
     16: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT  UND f_base_global_default_undef
e5b60c3
-    17: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT \[VARIANT_PCS\]   UND f_spec_global_default_undef
e5b60c3
-    18: 0000000000000000     0 NOTYPE  GLOBAL HIDDEN  \[VARIANT_PCS\]     1 f_spec_global_hidden_def
e5b60c3
+    17: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT[ 	]+UND f_spec_global_default_undef[ 	]+\[VARIANT_PCS\]
e5b60c3
+    18: 0000000000000000     0 NOTYPE  GLOBAL HIDDEN[ 	]+1 f_spec_global_hidden_def[ 	]+\[VARIANT_PCS\]
e5b60c3
     19: 0000000000000000     0 IFUNC   GLOBAL HIDDEN     1 f_base_global_hidden_ifunc
e5b60c3
-    20: 0000000000000000     0 IFUNC   GLOBAL DEFAULT \[VARIANT_PCS\]     1 f_spec_global_default_ifunc
e5b60c3
+    20: 0000000000000000     0 IFUNC   GLOBAL DEFAULT[ 	]+1 f_spec_global_default_ifunc[ 	]+\[VARIANT_PCS\]
e5b60c3
     21: 0000000000000000     0 NOTYPE  GLOBAL HIDDEN     1 f_base_global_hidden_def
e5b60c3
-    22: 0000000000000000     0 IFUNC   GLOBAL HIDDEN  \[VARIANT_PCS\]     1 f_spec_global_hidden_ifunc
e5b60c3
+    22: 0000000000000000     0 IFUNC   GLOBAL HIDDEN[ 	]+1 f_spec_global_hidden_ifunc[ 	]+\[VARIANT_PCS\]
e5b60c3
     23: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT    1 f_base_global_default_def
e5b60c3
-    24: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT \[VARIANT_PCS\]     1 f_spec_global_default_def
e5b60c3
+    24: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT[ 	]+1 f_spec_global_default_def[ 	]+\[VARIANT_PCS\]
e5b60c3
     25: 0000000000000000     0 IFUNC   GLOBAL DEFAULT    1 f_base_global_default_ifunc
e5b60c3
diff -rup binutils.orig/ld/testsuite/ld-aarch64/variant_pcs-shared.d binutils-2.36.1/ld/testsuite/ld-aarch64/variant_pcs-shared.d
e5b60c3
--- binutils.orig/ld/testsuite/ld-aarch64/variant_pcs-shared.d	2021-02-12 11:44:39.027365412 +0000
e5b60c3
+++ binutils-2.36.1/ld/testsuite/ld-aarch64/variant_pcs-shared.d	2021-02-12 11:56:14.669390518 +0000
e5b60c3
@@ -41,28 +41,28 @@ Symbol table '\.symtab' contains 35 entr
e5b60c3
      7: 00000000000111c8     0 SECTION LOCAL  DEFAULT    7 
e5b60c3
      8: 0000000000011270     0 SECTION LOCAL  DEFAULT    8 
e5b60c3
      9: 0000000000000000     0 FILE    LOCAL  DEFAULT  ABS .*variant_pcs-1\.o
e5b60c3
-    10: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_local
e5b60c3
-    11: 0000000000008000     0 IFUNC   LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_local_ifunc
e5b60c3
+    10: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT[ 	]+1 f_spec_local[ 	]+\[VARIANT_PCS\]
e5b60c3
+    11: 0000000000008000     0 IFUNC   LOCAL  DEFAULT[ 	]+1 f_spec_local_ifunc[ 	]+\[VARIANT_PCS\]
e5b60c3
     12: 0000000000008000     0 IFUNC   LOCAL  DEFAULT    1 f_base_local_ifunc
e5b60c3
     13: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT    1 f_base_local
e5b60c3
     14: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT    1 \$x
e5b60c3
     15: 0000000000000000     0 FILE    LOCAL  DEFAULT  ABS .*variant_pcs-2\.o
e5b60c3
-    16: 0000000000008038     0 NOTYPE  LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_local2
e5b60c3
-    17: 0000000000008038     0 IFUNC   LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_local2_ifunc
e5b60c3
+    16: 0000000000008038     0 NOTYPE  LOCAL  DEFAULT[ 	]+1 f_spec_local2[ 	]+\[VARIANT_PCS\]
e5b60c3
+    17: 0000000000008038     0 IFUNC   LOCAL  DEFAULT[ 	]+1 f_spec_local2_ifunc[ 	]+\[VARIANT_PCS\]
e5b60c3
     18: 0000000000008038     0 IFUNC   LOCAL  DEFAULT    1 f_base_local2_ifunc
e5b60c3
     19: 0000000000008038     0 NOTYPE  LOCAL  DEFAULT    1 f_base_local2
e5b60c3
     20: 0000000000008038     0 NOTYPE  LOCAL  DEFAULT    1 \$x
e5b60c3
     21: 0000000000000000     0 FILE    LOCAL  DEFAULT  ABS 
e5b60c3
     22: 0000000000009080     0 OBJECT  LOCAL  DEFAULT  ABS _DYNAMIC
e5b60c3
-    23: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_global_hidden_def
e5b60c3
+    23: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT[ 	]+1 f_spec_global_hidden_def[ 	]+\[VARIANT_PCS\]
e5b60c3
     24: 0000000000008000     0 IFUNC   LOCAL  DEFAULT    1 f_base_global_hidden_ifunc
e5b60c3
     25: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT    1 f_base_global_hidden_def
e5b60c3
     26: 0000000000009000     0 OBJECT  LOCAL  DEFAULT  ABS _GLOBAL_OFFSET_TABLE_
e5b60c3
-    27: 0000000000008000     0 IFUNC   LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_global_hidden_ifunc
e5b60c3
+    27: 0000000000008000     0 IFUNC   LOCAL  DEFAULT[ 	]+1 f_spec_global_hidden_ifunc[ 	]+\[VARIANT_PCS\]
e5b60c3
     28: 0000000000008070     0 NOTYPE  LOCAL  DEFAULT    2 \$x
e5b60c3
     29: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT  UND f_base_global_default_undef
e5b60c3
-    30: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT \[VARIANT_PCS\]   UND f_spec_global_default_undef
e5b60c3
-    31: 0000000000008000     0 IFUNC   GLOBAL DEFAULT \[VARIANT_PCS\]     1 f_spec_global_default_ifunc
e5b60c3
+    30: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT[ 	]+UND f_spec_global_default_undef[ 	]+\[VARIANT_PCS\]
e5b60c3
+    31: 0000000000008000     0 IFUNC   GLOBAL DEFAULT[ 	]+1 f_spec_global_default_ifunc[ 	]+\[VARIANT_PCS\]
e5b60c3
     32: 0000000000008000     0 NOTYPE  GLOBAL DEFAULT    1 f_base_global_default_def
e5b60c3
-    33: 0000000000008000     0 NOTYPE  GLOBAL DEFAULT \[VARIANT_PCS\]     1 f_spec_global_default_def
e5b60c3
+    33: 0000000000008000     0 NOTYPE  GLOBAL DEFAULT[ 	]+1 f_spec_global_default_def[ 	]+\[VARIANT_PCS\]
e5b60c3
     34: 0000000000008000     0 IFUNC   GLOBAL DEFAULT    1 f_base_global_default_ifunc
e5b60c3
--- binutils.orig/ld/testsuite/ld-plugin/plugin-12.d	2021-02-12 11:44:39.076365068 +0000
e5b60c3
+++ binutils-2.36.1/ld/testsuite/ld-plugin/plugin-12.d	2021-02-12 12:01:48.091931654 +0000
e5b60c3
@@ -1,5 +1,5 @@
e5b60c3
 #...
e5b60c3
-.*: symbol `func' definition: DEF, visibility: DEFAULT, resolution: PREVAILING_DEF
e5b60c3
+.*: symbol `func' definition: DEF, visibility: DEFAULT, resolution: PREVAILING_DE.*
e5b60c3
 .*: symbol `func1' definition: DEF, visibility: PROTECTED, resolution: PREVAILING_DEF_IRONLY
e5b60c3
 .*: symbol `func2' definition: DEF, visibility: INTERNAL, resolution: PREVAILING_DEF_IRONLY
e5b60c3
 .*: symbol `func3' definition: DEF, visibility: HIDDEN, resolution: PREVAILING_DEF_IRONLY
e5b60c3
--- binutils.orig/gold/main.cc	2021-01-21 16:12:10.006321882 +0000
e5b60c3
+++ binutils-2.35.90/gold/main.cc	2021-01-21 16:12:41.935071183 +0000
e5b60c3
@@ -290,11 +290,6 @@ main(int argc, char** argv)
e5b60c3
               elapsed.sys / 1000, (elapsed.sys % 1000) * 1000,
e5b60c3
               elapsed.wall / 1000, (elapsed.wall % 1000) * 1000);
e5b60c3
 
e5b60c3
-#ifdef HAVE_MALLINFO
e5b60c3
-      struct mallinfo m = mallinfo();
e5b60c3
-      fprintf(stderr, _("%s: total space allocated by malloc: %lld bytes\n"),
e5b60c3
-	      program_name, static_cast<long long>(m.arena));
e5b60c3
-#endif
e5b60c3
       File_read::print_stats();
e5b60c3
       Archive::print_stats();
e5b60c3
       Lib_group::print_stats();
e5b60c3
e5b60c3
diff -rup binutils.orig/ld/testsuite/ld-aarch64/variant_pcs-now.d binutils-2.36.1/ld/testsuite/ld-aarch64/variant_pcs-now.d
e5b60c3
--- binutils.orig/ld/testsuite/ld-aarch64/variant_pcs-now.d	2021-02-12 14:14:24.977160359 +0000
e5b60c3
+++ binutils-2.36.1/ld/testsuite/ld-aarch64/variant_pcs-now.d	2021-02-12 14:17:35.540758925 +0000
e5b60c3
@@ -23,10 +23,10 @@ Symbol table '\.dynsym' contains 7 entri
e5b60c3
    Num:    Value          Size Type    Bind   Vis      Ndx Name
e5b60c3
      0: 0000000000000000     0 NOTYPE  LOCAL  DEFAULT  UND 
e5b60c3
      1: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT  UND f_base_global_default_undef
e5b60c3
-     2: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT \[VARIANT_PCS\]   UND f_spec_global_default_undef
e5b60c3
-     3: 0000000000008000     0 IFUNC   GLOBAL DEFAULT \[VARIANT_PCS\]     1 f_spec_global_default_ifunc
e5b60c3
+     2: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT[ 	]+UND f_spec_global_default_undef[ 	]+\[VARIANT_PCS\]
e5b60c3
+     3: 0000000000008000     0 IFUNC   GLOBAL DEFAULT[ 	]+1 f_spec_global_default_ifunc[ 	]+\[VARIANT_PCS\]
e5b60c3
      4: 0000000000008000     0 NOTYPE  GLOBAL DEFAULT    1 f_base_global_default_def
e5b60c3
-     5: 0000000000008000     0 NOTYPE  GLOBAL DEFAULT \[VARIANT_PCS\]     1 f_spec_global_default_def
e5b60c3
+     5: 0000000000008000     0 NOTYPE  GLOBAL DEFAULT[ 	]+1 f_spec_global_default_def[ 	]+\[VARIANT_PCS\]
e5b60c3
      6: 0000000000008000     0 IFUNC   GLOBAL DEFAULT    1 f_base_global_default_ifunc
e5b60c3
 
e5b60c3
 Symbol table '\.symtab' contains 35 entries:
e5b60c3
diff -rup binutils.orig/ld/testsuite/ld-aarch64/variant_pcs-shared.d binutils-2.36.1/ld/testsuite/ld-aarch64/variant_pcs-shared.d
e5b60c3
--- binutils.orig/ld/testsuite/ld-aarch64/variant_pcs-shared.d	2021-02-12 14:14:24.980160337 +0000
e5b60c3
+++ binutils-2.36.1/ld/testsuite/ld-aarch64/variant_pcs-shared.d	2021-02-12 14:16:49.860094868 +0000
e5b60c3
@@ -23,10 +23,10 @@ Symbol table '\.dynsym' contains 7 entri
e5b60c3
    Num:    Value          Size Type    Bind   Vis      Ndx Name
e5b60c3
      0: 0000000000000000     0 NOTYPE  LOCAL  DEFAULT  UND 
e5b60c3
      1: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT  UND f_base_global_default_undef
e5b60c3
-     2: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT \[VARIANT_PCS\]   UND f_spec_global_default_undef
e5b60c3
-     3: 0000000000008000     0 IFUNC   GLOBAL DEFAULT \[VARIANT_PCS\]     1 f_spec_global_default_ifunc
e5b60c3
+     2: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT[ 	]+UND f_spec_global_default_undef[ 	]+\[VARIANT_PCS\]
e5b60c3
+     3: 0000000000008000     0 IFUNC   GLOBAL DEFAULT[ 	]+1 f_spec_global_default_ifunc[ 	]+\[VARIANT_PCS\]
e5b60c3
      4: 0000000000008000     0 NOTYPE  GLOBAL DEFAULT    1 f_base_global_default_def
e5b60c3
-     5: 0000000000008000     0 NOTYPE  GLOBAL DEFAULT \[VARIANT_PCS\]     1 f_spec_global_default_def
e5b60c3
+     5: 0000000000008000     0 NOTYPE  GLOBAL DEFAULT[ 	]+1 f_spec_global_default_def[ 	]+\[VARIANT_PCS\]
e5b60c3
      6: 0000000000008000     0 IFUNC   GLOBAL DEFAULT    1 f_base_global_default_ifunc
e5b60c3
 
e5b60c3
 Symbol table '\.symtab' contains 35 entries:
e5b60c3
--- binutils.orig/ld/testsuite/ld-plugin/plugin-12.d	2021-02-12 14:14:25.023160021 +0000
e5b60c3
+++ binutils-2.36.1/ld/testsuite/ld-plugin/plugin-12.d	2021-02-12 14:19:29.106923745 +0000
e5b60c3
@@ -1,6 +1,6 @@
e5b60c3
 #...
e5b60c3
-.*: symbol `func' definition: DEF, visibility: DEFAULT, resolution: PREVAILING_DE.*
e5b60c3
-.*: symbol `func1' definition: DEF, visibility: PROTECTED, resolution: PREVAILING_DEF_IRONLY
e5b60c3
-.*: symbol `func2' definition: DEF, visibility: INTERNAL, resolution: PREVAILING_DEF_IRONLY
e5b60c3
-.*: symbol `func3' definition: DEF, visibility: HIDDEN, resolution: PREVAILING_DEF_IRONLY
e5b60c3
+.*: symbol `.*unc' definition: DEF, visibility: DEFAULT, resolution: PREVAILING_DE.*
e5b60c3
+.*: symbol `.*unc1' definition: DEF, visibility: PROTECTED, resolution: PREVAILING_DEF_IRONLY
e5b60c3
+.*: symbol `.*unc2' definition: DEF, visibility: INTERNAL, resolution: PREVAILING_DEF_IRONLY
e5b60c3
+.*: symbol `.*unc3' definition: DEF, visibility: HIDDEN, resolution: PREVAILING_DEF_IRONLY
e5b60c3
 #pass