x86: Add explicit -mx86-used-note=[yes|no] to tests

Pass explicit -mx86-used-note=[yes|no] to x86 assembler and update
expected outputs from "readelf -n" if needed.

binutils/

	* testsuite/binutils-all/i386/compressed-1b.d: Pass
	-mx86-used-note=no to assembler.
	* testsuite/binutils-all/i386/compressed-1c.d: Likewise.
	* testsuite/binutils-all/x86-64/compressed-1b.d: Likewise.
	* testsuite/binutils-all/x86-64/compressed-1c.d: Likewise.
	* testsuite/binutils-all/i386/empty.d: Pass -mx86-used-note=yes
	to assembler and update expected output from "readelf -n".
	* testsuite/binutils-all/i386/ibt.d: Likewise.
	* testsuite/binutils-all/i386/pr21231a.d: Likewise.
	* testsuite/binutils-all/i386/pr21231b.d: Likewise.
	* testsuite/binutils-all/i386/shstk.d: Likewise.
	* testsuite/binutils-all/x86-64/empty-x32.d: Likewise.
	* testsuite/binutils-all/x86-64/empty.d: Likewise.
	* testsuite/binutils-all/x86-64/ibt-x32.d: Likewise.
	* testsuite/binutils-all/x86-64/ibt.d: Likewise.
	* testsuite/binutils-all/x86-64/pr21231a.d: Likewise.
	* testsuite/binutils-all/x86-64/pr21231b.d: Likewise.
	* testsuite/binutils-all/x86-64/pr23494a-x32.d: Likewise.
	* testsuite/binutils-all/x86-64/pr23494a.d: Likewise.
	* testsuite/binutils-all/x86-64/pr23494b-x32.d: Likewise.
	* testsuite/binutils-all/x86-64/pr23494b.d: Likewise.
	* testsuite/binutils-all/x86-64/pr23494c-x32.d: Likewise.
	* testsuite/binutils-all/x86-64/pr23494c.d: Likewise.
	* testsuite/binutils-all/x86-64/pr23494d-x32.d: Likewise.
	* testsuite/binutils-all/x86-64/pr23494d.d: Likewise.
	* testsuite/binutils-all/x86-64/pr23494e-x32.d: Likewise.
	* testsuite/binutils-all/x86-64/pr23494e.d: Likewise.
	* testsuite/binutils-all/x86-64/shstk-x32.d: Likewise.
	* testsuite/binutils-all/x86-64/shstk.d: Likewise.

gas/

	* testsuite/gas/i386/bss.d: Pass -mx86-used-note=no to assembler.
	* testsuite/gas/i386/ilp32/quad.d: Likewise.
	* testsuite/gas/i386/ilp32/reloc64.d: Likewise.
	* testsuite/gas/i386/ilp32/x86-64-size-1.d: Likewise.
	* testsuite/gas/i386/ilp32/x86-64-size-3.d: Likewise.
	* testsuite/gas/i386/ilp32/x86-64-size-5.d: Likewise.
	* testsuite/gas/i386/ilp32/x86-64-unwind.d: Likewise.
	* testsuite/gas/i386/property-1.d: Likewise.
	* testsuite/gas/i386/relax.d: Likewise.
	* testsuite/gas/i386/reloc64.d: Likewise.
	* testsuite/gas/i386/size-1.d: Likewise.
	* testsuite/gas/i386/size-3.d: Likewise.
	* testsuite/gas/i386/x86-64-property-1.d: Likewise.
	* testsuite/gas/i386/x86-64-size-1.d: Likewise.
	* testsuite/gas/i386/x86-64-size-3.d: Likewise.
	* testsuite/gas/i386/x86-64-size-5.d: Likewise.
	* testsuite/gas/i386/x86-64-unwind.d: Likewise.
	* testsuite/gas/i386/divide.d: Append "#pass".

ld/

	* testsuite/ld-i386/i386.exp: (ASFLAGS): Save, append
	-mx86-used-note=no and restore.  Pass -mx86-used-note=yes and
	-mx86-used-note=no to assembler.
	* testsuite/ld-x86-64/x86-64.exp: Likewise.
	* testsuite/ld-i386/no-plt.exp: Pass -mx86-used-note=yes to
	assembler.
	* testsuite/ld-i386/tls.exp: Likewise.
	* testsuite/ld-x86-64/no-plt.exp: Likewise.
	* testsuite/ld-x86-64/tls.exp: Likewise.
	* testsuite/ld-i386/pr23486a.d: Pass -mx86-used-note=no to
	assembler.
	* testsuite/ld-i386/pr23486b.d: Likewise.
	* testsuite/ld-x86-64/bnd-branch-1-now.d: Likewise.
	* testsuite/ld-x86-64/bnd-ifunc-1-now.d: Likewise.
	* testsuite/ld-x86-64/bnd-ifunc-2-now.d: Likewise.
	* testsuite/ld-x86-64/bnd-ifunc-2.d: Likewise.
	* testsuite/ld-x86-64/bnd-plt-1-now.d: Likewise.
	* testsuite/ld-x86-64/bnd-plt-1.d: Likewise.
	* testsuite/ld-x86-64/pr23486a-x32.d: Likewise.
	* testsuite/ld-x86-64/pr23486a.d: Likewise.
	* testsuite/ld-x86-64/pr23486b-x32.d: Likewise.
	* testsuite/ld-x86-64/pr23486b.d: Likewise.
	* testsuite/ld-i386/property-x86-3.d: Pass -mx86-used-note=yes
	to assembler and update expected output from "readelf -n".
	* testsuite/ld-i386/property-x86-4a.d: Likewise.
	* testsuite/ld-i386/property-x86-ibt1a.d: Likewise.
	* testsuite/ld-i386/property-x86-ibt1b.d: Likewise.
	* testsuite/ld-i386/property-x86-ibt2.d: Likewise.
	* testsuite/ld-i386/property-x86-ibt3a.d: Likewise.
	* testsuite/ld-i386/property-x86-ibt3b.d: Likewise.
	* testsuite/ld-i386/property-x86-ibt4.d: Likewise.
	* testsuite/ld-i386/property-x86-ibt5.d: Likewise.
	* testsuite/ld-i386/property-x86-shstk1a.d: Likewise.
	* testsuite/ld-i386/property-x86-shstk1b.d: Likewise.
	* testsuite/ld-i386/property-x86-shstk2.d: Likewise.
	* testsuite/ld-i386/property-x86-shstk3a.d: Likewise.
	* testsuite/ld-i386/property-x86-shstk3b.d: Likewise.
	* testsuite/ld-i386/property-x86-shstk4.d: Likewise.
	* testsuite/ld-i386/property-x86-shstk5.d: Likewise.
	* testsuite/ld-x86-64/property-x86-3-x32.d: Likewise.
	* testsuite/ld-x86-64/property-x86-3.d: Likewise.
	* testsuite/ld-x86-64/property-x86-4a-x32.d: Likewise.
	* testsuite/ld-x86-64/property-x86-4a.d: Likewise.
	* testsuite/ld-x86-64/property-x86-ibt1a-x32.d: Likewise.
	* testsuite/ld-x86-64/property-x86-ibt1a.d: Likewise.
	* testsuite/ld-x86-64/property-x86-ibt1b-x32.d: Likewise.
	* testsuite/ld-x86-64/property-x86-ibt1b.d: Likewise.
	* testsuite/ld-x86-64/property-x86-ibt2-x32.d: Likewise.
	* testsuite/ld-x86-64/property-x86-ibt2.d: Likewise.
	* testsuite/ld-x86-64/property-x86-ibt3a-x32.d: Likewise.
	* testsuite/ld-x86-64/property-x86-ibt3a.d: Likewise.
	* testsuite/ld-x86-64/property-x86-ibt3b-x32.d: Likewise.
	* testsuite/ld-x86-64/property-x86-ibt3b.d: Likewise.
	* testsuite/ld-x86-64/property-x86-ibt4-x32.d: Likewise.
	* testsuite/ld-x86-64/property-x86-ibt4.d: Likewise.
	* testsuite/ld-x86-64/property-x86-ibt5-x32.d: Likewise.
	* testsuite/ld-x86-64/property-x86-ibt5.d: Likewise.
	* testsuite/ld-x86-64/property-x86-shstk1a-x32.d: Likewise.
	* testsuite/ld-x86-64/property-x86-shstk1a.d: Likewise.
	* testsuite/ld-x86-64/property-x86-shstk1b-x32.d: Likewise.
	* testsuite/ld-x86-64/property-x86-shstk1b.d: Likewise.
	* testsuite/ld-x86-64/property-x86-shstk2-x32.d: Likewise.
	* testsuite/ld-x86-64/property-x86-shstk2.d: Likewise.
	* testsuite/ld-x86-64/property-x86-shstk3a-x32.d: Likewise.
	* testsuite/ld-x86-64/property-x86-shstk3a.d: Likewise.
	* testsuite/ld-x86-64/property-x86-shstk3b-x32.d: Likewise.
	* testsuite/ld-x86-64/property-x86-shstk3b.d: Likewise.
	* testsuite/ld-x86-64/property-x86-shstk4-x32.d: Likewise.
	* testsuite/ld-x86-64/property-x86-shstk4.d: Likewise.
	* testsuite/ld-x86-64/property-x86-shstk5-x32.d: Likewise.
	* testsuite/ld-x86-64/property-x86-shstk5.d: Likewise.
	* testsuite/ld-i386/property-1a.r: New file.
	* testsuite/ld-i386/property-2a.r: Likewise.
	* testsuite/ld-i386/property-3a.r: Likewise.
	* testsuite/ld-i386/property-4a.r: Likewise.
	* testsuite/ld-i386/property-5a.r: Likewise.
	* testsuite/ld-i386/property-7a.r: Likewise.
	* testsuite/ld-x86-64/property-1a.r: Likewise.
	* testsuite/ld-x86-64/property-2a.r: Likewise.
	* testsuite/ld-x86-64/property-3a.r: Likewise.
	* testsuite/ld-x86-64/property-4a.r: Likewise.
	* testsuite/ld-x86-64/property-5a.r: Likewise.
	* testsuite/ld-x86-64/property-7a.r: Likewise.
	* testsuite/ld-x86-64/mpx.exp: Pass -mx86-used-note=no to
	assembler.

1 files changed, 41 insertions, 41 deletions

diff --git a/ld/testsuite/ld-i386/no-plt.exp b/ld/testsuite/ld-i386/no-plt.exp
index 08584a8..c9f36c5 100644
--- a/ld/testsuite/ld-i386/no-plt.exp
+++ b/ld/testsuite/ld-i386/no-plt.exp
@@ -46,21 +46,21 @@ run_cc_link_tests [list \
     [list \
 	"Build no-plt-func1.o no-plt-main1.o" \
 	"" \
-	"-fPIE" \
+	"-fPIE -Wa,-mx86-used-note=yes" \
 	{no-plt-func1.c no-plt-main1.c} \
     ] \
     [list \
 	"Build no-plt-check1a.o no-plt-extern1a.o \
 	 no-plt-check1b.o no-plt-extern1b.o" \
 	"" \
-	"-Wa,-mrelax-relocations=yes" \
+	"-Wa,-mrelax-relocations=yes,-mx86-used-note=yes" \
 	{no-plt-check1a.S no-plt-extern1a.S \
 	 no-plt-check1b.S no-plt-extern1b.S } \
     ] \
     [list \
 	"Build libno-plt-1a.so" \
 	"-shared tmpdir/no-plt-func1.o" \
-	"" \
+	"-Wa,-mx86-used-note=yes" \
 	{dummy.s} \
 	{} \
 	"libno-plt-1a.so" \
@@ -68,7 +68,7 @@ run_cc_link_tests [list \
     [list \
 	"Build libno-plt-1b.so" \
 	"-shared tmpdir/no-plt-extern1a.o" \
-	"" \
+	"-Wa,-mx86-used-note=yes" \
 	{dummy.s} \
 	{{readelf -Wr libno-plt-1b.rd} \
 	 {objdump -dwrj.text libno-plt-1b.dd}} \
@@ -78,7 +78,7 @@ run_cc_link_tests [list \
 	"No PLT (dynamic 1a)" \
 	"$NOPIE_LDFLAGS tmpdir/no-plt-check1a.o tmpdir/no-plt-main1.o \
 	 tmpdir/no-plt-func1.o tmpdir/no-plt-extern1a.o" \
-	"" \
+	"-Wa,-mx86-used-note=yes" \
 	{dummy.s} \
 	{{readelf -Wr no-plt-1a.rd} {objdump -dwrj.text no-plt-1a.dd}} \
 	"no-plt-1a" \
@@ -87,7 +87,7 @@ run_cc_link_tests [list \
 	"No PLT (dynamic 1b)" \
 	"tmpdir/no-plt-check1a.o tmpdir/no-plt-main1.o \
 	 tmpdir/libno-plt-1a.so tmpdir/libno-plt-1b.so" \
-	"" \
+	"-Wa,-mx86-used-note=yes" \
 	{dummy.s} \
 	{{readelf -Wr no-plt-1b.rd} {objdump -dwrj.text no-plt-1b.dd}} \
 	"no-plt-1b" \
@@ -96,7 +96,7 @@ run_cc_link_tests [list \
 	"No PLT (dynamic 1c)" \
 	"$NOPIE_LDFLAGS tmpdir/no-plt-check1a.o tmpdir/no-plt-main1.o \
 	 tmpdir/no-plt-func1.o tmpdir/libno-plt-1b.so" \
-	"" \
+	"-Wa,-mx86-used-note=yes" \
 	{dummy.s} \
 	{{readelf -Wr no-plt-1c.rd} {objdump -dwrj.text no-plt-1c.dd}} \
 	"no-plt-1c" \
@@ -105,7 +105,7 @@ run_cc_link_tests [list \
 	"No PLT (static 1d)" \
 	"-static tmpdir/no-plt-check1a.o tmpdir/no-plt-main1.o \
 	 tmpdir/no-plt-func1.o tmpdir/no-plt-extern1a.o" \
-	"" \
+	"-Wa,-mx86-used-note=yes" \
 	{dummy.s} \
 	{{readelf -Wr no-plt-1d.rd} {objdump -dwrj.text no-plt-1d.dd}} \
 	"no-plt-1d" \
@@ -114,7 +114,7 @@ run_cc_link_tests [list \
 	"No PLT (PIE 1e)" \
 	"-pie tmpdir/no-plt-check1a.o tmpdir/no-plt-main1.o \
 	 tmpdir/no-plt-func1.o tmpdir/no-plt-extern1a.o" \
-	"" \
+	"-Wa,-mx86-used-note=yes" \
 	{dummy.s} \
 	{{readelf -Wr no-plt-1e.rd} {objdump -dwrj.text no-plt-1e.dd}} \
 	"no-plt-1e" \
@@ -123,7 +123,7 @@ run_cc_link_tests [list \
 	"No PLT (PIE 1f)" \
 	"-pie tmpdir/no-plt-check1a.o tmpdir/no-plt-main1.o \
 	 tmpdir/libno-plt-1a.so tmpdir/libno-plt-1b.so" \
-	"" \
+	"-Wa,-mx86-used-note=yes" \
 	{ dummy.s } \
 	{{readelf -Wr no-plt-1f.rd} {objdump -dwrj.text no-plt-1f.dd}} \
 	"no-plt-1f" \
@@ -132,7 +132,7 @@ run_cc_link_tests [list \
 	"No PLT (PIE 1g)" \
 	"-pie tmpdir/no-plt-check1a.o tmpdir/no-plt-main1.o \
 	 tmpdir/no-plt-func1.o tmpdir/libno-plt-1b.so" \
-	"" \
+	"-Wa,-mx86-used-note=yes" \
 	{ dummy.s } \
 	{{readelf -Wr no-plt-1g.rd} {objdump -dwrj.text no-plt-1g.dd}} \
 	"no-plt-1g" \
@@ -141,7 +141,7 @@ run_cc_link_tests [list \
 	"No PLT (dynamic 1h)" \
 	"$NOPIE_LDFLAGS tmpdir/no-plt-check1b.o tmpdir/no-plt-main1.o \
 	 tmpdir/no-plt-func1.o tmpdir/no-plt-extern1b.o" \
-	"" \
+	"-Wa,-mx86-used-note=yes" \
 	{dummy.s} \
 	{{readelf -Wr no-plt-1h.rd} {objdump -dwrj.text no-plt-1h.dd}} \
 	"no-plt-1h" \
@@ -150,7 +150,7 @@ run_cc_link_tests [list \
 	"No PLT (dynamic 1i)" \
 	"$NOPIE_LDFLAGS tmpdir/no-plt-check1b.o tmpdir/no-plt-main1.o \
 	 tmpdir/no-plt-extern1b.o tmpdir/libno-plt-1a.so" \
-	"" \
+	"-Wa,-mx86-used-note=yes" \
 	{dummy.s} \
 	{{readelf -Wr no-plt-1i.rd} {objdump -dwrj.text no-plt-1i.dd}} \
 	"no-plt-1i" \
@@ -159,7 +159,7 @@ run_cc_link_tests [list \
 	"No PLT (static 1j)" \
 	"-static tmpdir/no-plt-check1b.o tmpdir/no-plt-main1.o \
 	 tmpdir/no-plt-func1.o tmpdir/no-plt-extern1b.o" \
-	"" \
+	"-Wa,-mx86-used-note=yes" \
 	{dummy.s} \
 	{{readelf -Wr no-plt-1j.rd} {objdump -dwrj.text no-plt-1j.dd}} \
 	"no-plt-1j" \
@@ -171,7 +171,7 @@ run_ld_link_exec_tests [list \
 	"No PLT (dynamic 1a)" \
 	"tmpdir/no-plt-check1a.o tmpdir/no-plt-main1.o \
 	 tmpdir/no-plt-func1.o tmpdir/no-plt-extern1a.o" \
-	"" \
+	"-Wa,-mx86-used-note=yes" \
 	{ dummy.s } \
 	"no-plt-1a" \
 	"pass.out" \
@@ -180,7 +180,7 @@ run_ld_link_exec_tests [list \
 	"No PLT (dynamic 1b)" \
 	"tmpdir/no-plt-check1a.o tmpdir/no-plt-main1.o \
 	 tmpdir/libno-plt-1a.so tmpdir/libno-plt-1b.so" \
-	"" \
+	"-Wa,-mx86-used-note=yes" \
 	{ dummy.s } \
 	"no-plt-1b" \
 	"pass.out" \
@@ -189,7 +189,7 @@ run_ld_link_exec_tests [list \
 	"No PLT (dynamic 1c)" \
 	"tmpdir/no-plt-check1a.o tmpdir/no-plt-main1.o \
 	 tmpdir/no-plt-func1.o tmpdir/libno-plt-1b.so" \
-	"" \
+	"-Wa,-mx86-used-note=yes" \
 	{ dummy.s } \
 	"no-plt-1c" \
 	"pass.out" \
@@ -198,7 +198,7 @@ run_ld_link_exec_tests [list \
 	"No PLT (static 1d)" \
 	"-static tmpdir/no-plt-check1a.o tmpdir/no-plt-main1.o \
 	 tmpdir/no-plt-func1.o tmpdir/no-plt-extern1a.o" \
-	"" \
+	"-Wa,-mx86-used-note=yes" \
 	{ dummy.s } \
 	"no-plt-1d" \
 	"pass.out" \
@@ -207,7 +207,7 @@ run_ld_link_exec_tests [list \
 	"No PLT (PIE 1e)" \
 	"-pie tmpdir/no-plt-check1a.o tmpdir/no-plt-main1.o \
 	 tmpdir/no-plt-func1.o tmpdir/no-plt-extern1a.o" \
-	"" \
+	"-Wa,-mx86-used-note=yes" \
 	{ dummy.s } \
 	"no-plt-1e" \
 	"pass.out" \
@@ -216,7 +216,7 @@ run_ld_link_exec_tests [list \
 	"No PLT (PIE 1f)" \
 	"-pie tmpdir/no-plt-check1a.o tmpdir/no-plt-main1.o \
 	 tmpdir/libno-plt-1a.so tmpdir/libno-plt-1b.so" \
-	"" \
+	"-Wa,-mx86-used-note=yes" \
 	{ dummy.s } \
 	"no-plt-1f" \
 	"pass.out" \
@@ -225,7 +225,7 @@ run_ld_link_exec_tests [list \
 	"No PLT (PIE 1g)" \
 	"-pie tmpdir/no-plt-check1a.o tmpdir/no-plt-main1.o \
 	 tmpdir/no-plt-func1.o tmpdir/libno-plt-1b.so" \
-	"" \
+	"-Wa,-mx86-used-note=yes" \
 	{ dummy.s } \
 	"no-plt-1g" \
 	"pass.out" \
@@ -234,7 +234,7 @@ run_ld_link_exec_tests [list \
 	"No PLT (dynamic 1h)" \
 	"$NOPIE_LDFLAGS tmpdir/no-plt-check1b.o tmpdir/no-plt-main1.o \
 	 tmpdir/no-plt-func1.o tmpdir/no-plt-extern1b.o" \
-	"" \
+	"-Wa,-mx86-used-note=yes" \
 	{dummy.s} \
 	"no-plt-1h" \
 	"pass.out" \
@@ -243,7 +243,7 @@ run_ld_link_exec_tests [list \
 	"No PLT (dynamic 1i)" \
 	"$NOPIE_LDFLAGS tmpdir/no-plt-check1b.o tmpdir/no-plt-main1.o \
 	 tmpdir/no-plt-extern1b.o tmpdir/libno-plt-1a.so" \
-	"" \
+	"-Wa,-mx86-used-note=yes" \
 	{dummy.s} \
 	"no-plt-1i" \
 	"pass.out" \
@@ -252,7 +252,7 @@ run_ld_link_exec_tests [list \
 	"No PLT (static 1j)" \
 	"-static tmpdir/no-plt-check1b.o tmpdir/no-plt-main1.o \
 	 tmpdir/no-plt-func1.o tmpdir/no-plt-extern1b.o" \
-	"" \
+	"-Wa,-mx86-used-note=yes" \
 	{dummy.s} \
 	"no-plt-1j" \
 	"pass.out" \
@@ -265,27 +265,27 @@ if { [check_ifunc_available] } {
 	[list \
 	    "Build pr20244-3a.o pr20244-3b.o pr20244-3c.o pr20244-3d.o" \
 	    "" \
-	    "-fPIC -O2 -g" \
+	    "-fPIC -O2 -g -Wa,-mx86-used-note=yes" \
 	    { pr20244-3a.c pr20244-3b.S pr20244-3c.S pr20244-3d.S } \
 	] \
 	[list \
 	    "Build pr20253-1a.o pr20253-1b.o pr20253-1c.o pr20253-1d.o" \
 	    "" \
-	    "-fPIE -O2 -g" \
+	    "-fPIE -O2 -g -Wa,-mx86-used-note=yes" \
 	    { pr20253-1a.c pr20253-1b.S pr20253-1c.S pr20253-1d.S } \
 	] \
 	[list \
 	    "Build libpr20253-1a.so" \
 	    "-shared tmpdir/pr20253-1b.o \
 	     tmpdir/pr20253-1c.o tmpdir/pr20253-1d.o" \
-	    "" \
+	    "-Wa,-mx86-used-note=yes" \
 	    { dummy.s } \
 	    {} \
 	    "libpr20253-1a.so" \
 	] \
 	[list \
 	    "Build pr20253-2a.o pr20253-2b.o pr20253-2c.o pr20253-2d.o" \
-	    "" \
+	    "-Wa,-mx86-used-note=yes" \
 	    "-fPIE -O2 -g" \
 	    { pr20253-2a.c pr20253-2b.S pr20253-2c.S pr20253-2d.S } \
 	] \
@@ -296,7 +296,7 @@ if { [check_ifunc_available] } {
 	    "Run pr20244-3a" \
 	    "$NOPIE_LDFLAGS tmpdir/pr20244-3a.o tmpdir/pr20244-3b.o \
 	     tmpdir/pr20244-3c.o tmpdir/pr20244-3d.o" \
-	    "" \
+	    "-Wa,-mx86-used-note=yes" \
 	    { dummy.c } \
 	    "pr20244-3a" \
 	    "pass.out" \
@@ -305,7 +305,7 @@ if { [check_ifunc_available] } {
 	    "Run pr20244-3b" \
 	    "--static tmpdir/pr20244-3a.o tmpdir/pr20244-3b.o \
 	    tmpdir/pr20244-3c.o tmpdir/pr20244-3d.o" \
-	    "" \
+	    "-Wa,-mx86-used-note=yes" \
 	    { dummy.c } \
 	    "pr20244-3b" \
 	    "pass.out" \
@@ -314,7 +314,7 @@ if { [check_ifunc_available] } {
 	    "Run pr20253-1a" \
 	    "tmpdir/pr20253-1a.o tmpdir/pr20253-1b.o \
 	     tmpdir/pr20253-1c.o tmpdir/pr20253-1d.o" \
-	    "" \
+	    "-Wa,-mx86-used-note=yes" \
 	    { dummy.s } \
 	    "pr20253-1a" \
 	    "pass.out" \
@@ -323,7 +323,7 @@ if { [check_ifunc_available] } {
 	    "Run pr20253-1b" \
 	    "--static tmpdir/pr20253-1a.o tmpdir/pr20253-1b.o \
 	    tmpdir/pr20253-1c.o tmpdir/pr20253-1d.o" \
-	    "" \
+	    "-Wa,-mx86-used-note=yes" \
 	    { dummy.s } \
 	    "pr20253-1b" \
 	    "pass.out" \
@@ -332,7 +332,7 @@ if { [check_ifunc_available] } {
 	    "Run pr20253-1c" \
 	    "-pie tmpdir/pr20253-1a.o tmpdir/pr20253-1b.o \
 	    tmpdir/pr20253-1c.o tmpdir/pr20253-1d.o" \
-	    "" \
+	    "-Wa,-mx86-used-note=yes" \
 	    { dummy.s } \
 	    "pr20253-1c" \
 	    "pass.out" \
@@ -340,7 +340,7 @@ if { [check_ifunc_available] } {
 	[list \
 	    "Run pr20253-1d" \
 	    "tmpdir/pr20253-1a.o tmpdir/libpr20253-1a.so" \
-	    "" \
+	    "-Wa,-mx86-used-note=yes" \
 	    { dummy.s } \
 	    "pr20253-1d" \
 	    "pass.out" \
@@ -348,7 +348,7 @@ if { [check_ifunc_available] } {
 	[list \
 	    "Run pr20253-1e" \
 	    "-pie tmpdir/pr20253-1a.o tmpdir/libpr20253-1a.so" \
-	    "" \
+	    "-Wa,-mx86-used-note=yes" \
 	    { dummy.s } \
 	    "pr20253-1e" \
 	    "pass.out" \
@@ -356,7 +356,7 @@ if { [check_ifunc_available] } {
 	[list \
 	    "Run pr20253-1f" \
 	    "$NOPIE_LDFLAGS tmpdir/pr20253-1a.o" \
-	    "" \
+	    "-Wa,-mx86-used-note=yes" \
 	    { pr20253-1b.S pr20253-1c.S pr20253-1d.S } \
 	    "pr20253-1f" \
 	    "pass.out" \
@@ -365,7 +365,7 @@ if { [check_ifunc_available] } {
 	[list \
 	    "Run pr20253-1g" \
 	    "--static tmpdir/pr20253-1a.o" \
-	    "" \
+	    "-Wa,-mx86-used-note=yes" \
 	    { pr20253-1b.S pr20253-1c.S pr20253-1d.S } \
 	    "pr20253-1g" \
 	    "pass.out" \
@@ -375,7 +375,7 @@ if { [check_ifunc_available] } {
 	    "Run pr20253-2a" \
 	    "$NOPIE_LDFLAGS tmpdir/pr20253-2a.o tmpdir/pr20253-2b.o \
 	     tmpdir/pr20253-2c.o tmpdir/pr20253-2d.o" \
-	    "" \
+	    "-Wa,-mx86-used-note=yes" \
 	    { dummy.s } \
 	    "pr20253-2a" \
 	    "pass.out" \
@@ -384,7 +384,7 @@ if { [check_ifunc_available] } {
 	    "Run pr20253-2b" \
 	    "--static tmpdir/pr20253-2a.o tmpdir/pr20253-2b.o \
 	    tmpdir/pr20253-2c.o tmpdir/pr20253-2d.o" \
-	    "" \
+	    "-Wa,-mx86-used-note=yes" \
 	    { dummy.s } \
 	    "pr20253-2b" \
 	    "pass.out" \
@@ -392,7 +392,7 @@ if { [check_ifunc_available] } {
 	[list \
 	    "Run pr20253-2c" \
 	    "$NOPIE_LDFLAGS tmpdir/pr20253-2a.o" \
-	    "" \
+	    "-Wa,-mx86-used-note=yes" \
 	    { pr20253-2b.S pr20253-2c.S pr20253-2d.S } \
 	    "pr20253-2c" \
 	    "pass.out" \
@@ -401,7 +401,7 @@ if { [check_ifunc_available] } {
 	[list \
 	    "Run pr20253-2d" \
 	    "--static tmpdir/pr20253-2a.o" \
-	    "" \
+	    "-Wa,-mx86-used-note=yes" \
 	    { pr20253-2b.S pr20253-2c.S pr20253-2d.S } \
 	    "pr20253-2d" \
 	    "pass.out" \