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, 22 insertions, 22 deletions

diff --git a/ld/testsuite/ld-x86-64/tls.exp b/ld/testsuite/ld-x86-64/tls.exp
index bf2c3b6..217bac5 100644
--- a/ld/testsuite/ld-x86-64/tls.exp
+++ b/ld/testsuite/ld-x86-64/tls.exp
@@ -40,19 +40,19 @@ run_cc_link_tests [list \
     [list \
 	"Build tls-def1.o tls-main1.o" \
 	"" \
-	"-fPIE" \
+	"-fPIE -Wa,-mx86-used-note=yes" \
 	{tls-def1.c tls-main1.c} \
     ] \
     [list \
 	"Build tls-gd1.o tls-ld1.o" \
 	"" \
-	"-fPIC -Wa,-mrelax-relocations=yes" \
+	"-fPIC -Wa,-mrelax-relocations=yes,-mx86-used-note=yes" \
 	{tls-gd1.S tls-ld1.S} \
     ] \
     [list \
 	"Build libtls-1a.so" \
 	"-shared tmpdir/tls-def1.o" \
-	"" \
+	"-Wa,-mx86-used-note=yes" \
 	{dummy.s} \
 	{} \
 	"libtls-1a.so" \
@@ -60,7 +60,7 @@ run_cc_link_tests [list \
     [list \
 	"Build libtls-1b.so" \
 	"-shared tmpdir/tls-gd1.o tmpdir/tls-ld1.o" \
-	"" \
+	"-Wa,-mx86-used-note=yes" \
 	{dummy.s} \
 	{} \
 	"libtls-1b.so" \
@@ -68,7 +68,7 @@ run_cc_link_tests [list \
     [list \
 	"Build libtls-1bn.so" \
 	"-Wl,-z,now -shared tmpdir/tls-gd1.o tmpdir/tls-ld1.o" \
-	"" \
+	"-Wa,-mx86-used-note=yes" \
 	{dummy.s} \
 	{} \
 	"libtls-1bn.so" \
@@ -80,7 +80,7 @@ run_ld_link_exec_tests [list \
 	"TLS GD/LD -> LE transition without PLT (dynamic)" \
 	"tmpdir/tls-def1.o tmpdir/tls-main1.o tmpdir/tls-gd1.o \
 	 tmpdir/tls-ld1.o" \
-	"" \
+	"-Wa,-mx86-used-note=yes" \
 	{ dummy.s } \
 	"tls-1a" \
 	"pass.out" \
@@ -89,7 +89,7 @@ run_ld_link_exec_tests [list \
 	"TLS GD/LD -> LE transition without PLT (dynamic, -z now)" \
 	"-Wl,-z,now tmpdir/tls-def1.o tmpdir/tls-main1.o tmpdir/tls-gd1.o \
 	 tmpdir/tls-ld1.o" \
-	"" \
+	"-Wa,-mx86-used-note=yes" \
 	{ dummy.s } \
 	"tls-1an" \
 	"pass.out" \
@@ -98,7 +98,7 @@ run_ld_link_exec_tests [list \
 	"TLS GD/LD -> LE transition without PLT (PIE)" \
 	"-pie tmpdir/tls-def1.o tmpdir/tls-main1.o tmpdir/tls-gd1.o \
 	 tmpdir/tls-ld1.o" \
-	"" \
+	"-Wa,-mx86-used-note=yes" \
 	{ dummy.s } \
 	"tls-1b" \
 	"pass.out" \
@@ -107,7 +107,7 @@ run_ld_link_exec_tests [list \
 	"TLS GD/LD -> LE transition without PLT (PIE, -z now)" \
 	"-pie -Wl,-z,now tmpdir/tls-def1.o tmpdir/tls-main1.o tmpdir/tls-gd1.o \
 	 tmpdir/tls-ld1.o" \
-	"" \
+	"-Wa,-mx86-used-note=yes" \
 	{ dummy.s } \
 	"tls-1bn" \
 	"pass.out" \
@@ -116,7 +116,7 @@ run_ld_link_exec_tests [list \
 	"TLS GD/LD -> LE transition without PLT (static)" \
 	"-static tmpdir/tls-def1.o tmpdir/tls-main1.o tmpdir/tls-gd1.o \
 	 tmpdir/tls-ld1.o" \
-	"" \
+	"-Wa,-mx86-used-note=yes" \
 	{ dummy.s } \
 	"tls-1c" \
 	"pass.out" \
@@ -125,7 +125,7 @@ run_ld_link_exec_tests [list \
 	"TLS GD/LD -> IE transition without PLT" \
 	"-Wl,--no-as-needed,-R,tmpdir tmpdir/tls-main1.o \
 	 tmpdir/tls-gd1.o tmpdir/tls-ld1.o tmpdir/libtls-1a.so" \
-	"" \
+	"-Wa,-mx86-used-note=yes" \
 	{ dummy.s } \
 	"tls-1d" \
 	"pass.out" \
@@ -134,7 +134,7 @@ run_ld_link_exec_tests [list \
 	"TLS GD/LD -> IE transition without PLT (-z now)" \
 	"-Wl,-z,now tmpdir/tls-main1.o tmpdir/tls-gd1.o tmpdir/tls-ld1.o \
 	 tmpdir/libtls-1a.so -Wl,-R,tmpdir" \
-	"" \
+	"-Wa,-mx86-used-note=yes" \
 	{ dummy.s } \
 	"tls-1dn" \
 	"pass.out" \
@@ -143,7 +143,7 @@ run_ld_link_exec_tests [list \
 	"TLS without PLT (1)" \
 	"-Wl,--no-as-needed,-R,tmpdir tmpdir/tls-main1.o \
 	 tmpdir/libtls-1a.so tmpdir/libtls-1b.so" \
-	"" \
+	"-Wa,-mx86-used-note=yes" \
 	{ dummy.s } \
 	"tls-1e" \
 	"pass.out" \
@@ -152,7 +152,7 @@ run_ld_link_exec_tests [list \
 	"TLS without PLT (2)" \
 	"-Wl,--no-as-needed,-R,tmpdir tmpdir/tls-main1.o \
 	 tmpdir/tls-def1.o tmpdir/libtls-1b.so" \
-	"" \
+	"-Wa,-mx86-used-note=yes" \
 	{ dummy.s } \
 	"tls-1f" \
 	"pass.out" \
@@ -161,7 +161,7 @@ run_ld_link_exec_tests [list \
 	"TLS without PLT (3)" \
 	"-Wl,--no-as-needed -Wl,-z,now tmpdir/tls-main1.o \
 	 tmpdir/libtls-1a.so tmpdir/libtls-1bn.so -Wl,-R,tmpdir" \
-	"" \
+	"-Wa,-mx86-used-note=yes" \
 	{ dummy.s } \
 	"tls-1en" \
 	"pass.out" \
@@ -170,7 +170,7 @@ run_ld_link_exec_tests [list \
 	"TLS without PLT (4)" \
 	"-Wl,-z,now tmpdir/tls-main1.o tmpdir/tls-def1.o \
 	 tmpdir/libtls-1bn.so -Wl,-R,tmpdir" \
-	"" \
+	"-Wa,-mx86-used-note=yes" \
 	{ dummy.s } \
 	"tls-1fn" \
 	"pass.out" \
@@ -186,7 +186,7 @@ run_cc_link_tests [list \
     [list \
 	"Build libtlsdesc1.so" \
 	"-shared" \
-	"-fPIC $GNU2_CFLAGS" \
+	"-fPIC $GNU2_CFLAGS -Wa,-mx86-used-note=yes" \
 	{ tlsdesc1b.c } \
 	{} \
 	"libtlsdesc1.so" \
@@ -194,7 +194,7 @@ run_cc_link_tests [list \
     [list \
 	"Build libtlsdesc1n.so" \
 	"-Wl,-z,now -shared" \
-	"-fPIC $GNU2_CFLAGS" \
+	"-fPIC $GNU2_CFLAGS -Wa,-mx86-used-note=yes" \
 	{ tlsdesc1b.c } \
 	{} \
 	"libtlsdesc1n.so" \
@@ -211,7 +211,7 @@ if { [at_least_gcc_version 5 0] } {
 	[list \
 	    "Run tlsdesc1" \
 	    "-Wl,--no-as-needed tmpdir/libtlsdesc1.so" \
-	    "" \
+	    "-Wa,-mx86-used-note=yes" \
 	    { tlsdesc1a.c } \
 	    "tlsdesc1a" \
 	    "pass.out" \
@@ -220,7 +220,7 @@ if { [at_least_gcc_version 5 0] } {
 	[list \
 	    "Run tlsdesc1 with PIE" \
 	    "-pie -Wl,--no-as-needed tmpdir/libtlsdesc1.so" \
-	    "" \
+	    "-Wa,-mx86-used-note=yes" \
 	    { tlsdesc1a.c } \
 	    "tlsdesc1c" \
 	    "pass.out" \
@@ -233,7 +233,7 @@ run_ld_link_exec_tests [list \
     [list \
 	"Run tlsdesc1 (-z now)" \
 	"-Wl,-z,now -Wl,--no-as-needed tmpdir/libtlsdesc1n.so" \
-	"" \
+	"-Wa,-mx86-used-note=yes" \
 	{ tlsdesc1a.c } \
 	"tlsdesc1b" \
 	"pass.out" \
@@ -242,7 +242,7 @@ run_ld_link_exec_tests [list \
     [list \
 	"Run tlsdesc1 with PIE (-z now)" \
 	"-pie -Wl,-z,now -Wl,--no-as-needed tmpdir/libtlsdesc1n.so" \
-	"" \
+	"-Wa,-mx86-used-note=yes" \
 	{ tlsdesc1a.c } \
 	"tlsdesc1d" \
 	"pass.out" \