x86: Properly handle PLT expression in directive

[deliverable/binutils-gdb.git] / ld / testsuite / ld-x86-64 / x86-64.exp

diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp
index 02aa38a75ad54aaf2f29e88c620bf00518b17913..c9e8ecbb1983a6998c8e090f80ce77f8f1b8f5bb 100644 (file)
--- a/ld/testsuite/ld-x86-64/x86-64.exp
+++ b/ld/testsuite/ld-x86-64/x86-64.exp
@@ -34,6 +34,10 @@ if [istarget "*-*-nacl*"] {
     set emul "elf_x86_64"
 }
 
+global ASFLAGS
+set saved_ASFLAGS "$ASFLAGS"
+set ASFLAGS "$ASFLAGS -mx86-used-note=no"
+
 # List contains test-items with 3 items followed by 2 lists:
 # 0:name 1:ld early options 2:ld late options 3:assembler options
 # 4:filenames of assembler files 5: action and options. 6: name of output file
@@ -353,6 +357,8 @@ run_dump_test "property-x86-4b"
 run_dump_test "property-x86-3-x32"
 run_dump_test "property-x86-4a-x32"
 run_dump_test "property-x86-4b-x32"
+run_dump_test "property-x86-5"
+run_dump_test "property-x86-5-x32"
 run_dump_test "property-x86-ibt1a"
 run_dump_test "property-x86-ibt1b"
 run_dump_test "property-x86-ibt1a-x32"
@@ -395,6 +401,29 @@ run_dump_test "pr22115-1d-x32"
 run_dump_test "pr22135"
 run_dump_test "pr22782a"
 run_dump_test "pr22782b"
+run_dump_test "pr23189"
+run_dump_test "pr23194"
+run_dump_test "pr23324a"
+run_dump_test "pr23324b"
+run_dump_test "pr23372a"
+run_dump_test "pr23372a-x32"
+run_dump_test "pr23372b"
+run_dump_test "pr23372b-x32"
+run_dump_test "pr23372c"
+run_dump_test "pr23372c-x32"
+run_dump_test "pr23372d"
+run_dump_test "pr23372d-x32"
+run_dump_test "pr23486a"
+run_dump_test "pr23486a-x32"
+run_dump_test "pr23486b"
+run_dump_test "pr23486b-x32"
+run_dump_test "pr23486c"
+run_dump_test "pr23486c-x32"
+run_dump_test "pr23486d"
+run_dump_test "pr23486d-x32"
+run_dump_test "pr23854"
+run_dump_test "pr23930"
+run_dump_test "pr23930-x32"
 
 if { ![istarget "x86_64-*-linux*"] && ![istarget "x86_64-*-nacl*"]} {
     return
@@ -605,6 +634,7 @@ run_dump_test "pr20253-5a"
 run_dump_test "pr20253-5b"
 run_dump_test "tlsdesc2"
 run_dump_test "pr22048"
+run_dump_test "pr22929"
 
 proc undefined_weak {cflags ldflags} {
     set testname "Undefined weak symbol"
@@ -685,7 +715,8 @@ if { [isnative] && [which $CC] != 0 } {
 
     run_ld_link_tests {
        {"X32 DSO from x86-64 object"
-        "-shared -melf32_x86_64 tmpdir/simple-x32.o" "" "--x32"
+        "-shared -melf32_x86_64 tmpdir/simple-x32.o" ""
+        "--x32 -mx86-used-note=yes"
        {dummy.s} {{readelf {-s --wide} x86-64-x32.rd}} "x86-64-x32"}
     }
 
@@ -693,7 +724,7 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Build plt-lib.so" \
            "-shared" \
-           "-fPIC" \
+           "-fPIC -Wa,-mx86-used-note=yes" \
            { plt-lib.c } \
            {} \
            "libplt-lib.so" \
@@ -701,7 +732,7 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Build libplt-main1.a" \
            "" \
-           "-fPIC -Wa,-mrelax-relocations=yes" \
+           "-fPIC -Wa,-mrelax-relocations=yes,-mx86-used-note=yes" \
            { plt-main1.c } \
            {{readelf {-Wr} plt-main1.rd}} \
            "libplt-main1.a" \
@@ -709,7 +740,7 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Build libplt-main2.a" \
            "" \
-           "-fPIC -Wa,-mrelax-relocations=yes" \
+           "-fPIC -Wa,-mrelax-relocations=yes,-mx86-used-note=yes" \
            { plt-main2.c } \
            {{readelf {-Wr} plt-main2.rd}} \
            "libplt-main2.a" \
@@ -717,7 +748,7 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Build libplt-main3.a" \
            "" \
-           "-fPIC -Wa,-mrelax-relocations=yes $PLT_CFLAGS" \
+           "-fPIC -Wa,-mrelax-relocations=yes,-mx86-used-note=yes $PLT_CFLAGS" \
            { plt-main3.c } \
            {{readelf {-Wr} plt-main3.rd}} \
            "libplt-main3.a" \
@@ -725,7 +756,7 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Build libplt-main4.a" \
            "" \
-           "-fPIC -Wa,-mrelax-relocations=yes $PLT_CFLAGS" \
+           "-fPIC -Wa,-mrelax-relocations=yes,-mx86-used-note=yes $PLT_CFLAGS" \
            { plt-main4.c } \
            {{readelf {-Wr} plt-main4.rd}} \
            "libplt-main4.a" \
@@ -743,7 +774,7 @@ if { [isnative] && [which $CC] != 0 } {
            "Build plt-main with PIE" \
            "tmpdir/plt-main1.o tmpdir/plt-main2.o tmpdir/plt-main3.o \
             tmpdir/plt-main4.o tmpdir/libplt-lib.so -pie" \
-           "-fPIC" \
+           "-fPIC -Wa,-mx86-used-note=yes" \
            { plt-main5.c } \
            {{readelf {-Wr} plt-main.rd}} \
            "plt-main" \
@@ -751,7 +782,7 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Build copyreloc-lib.so" \
            "-shared" \
-           "-fPIC" \
+           "-fPIC -Wa,-mx86-used-note=yes" \
            { copyreloc-lib.c } \
            {} \
            "copyreloc-lib.so" \
@@ -759,7 +790,7 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Build libcopyreloc-main.a" \
            "" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { copyreloc-main.S } \
            {} \
            "libcopyreloc-main.a" \
@@ -767,7 +798,7 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Build copyreloc-main with PIE without -fPIE (1)" \
            "tmpdir/copyreloc-main.o tmpdir/copyreloc-lib.so -pie" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { dummy.s } \
            {{readelf {-Wr} copyreloc-main1.rd}} \
            "copyreloc-main" \
@@ -775,7 +806,7 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Build copyreloc-main with PIE without -fPIE (2)" \
            "tmpdir/copyreloc-main.o tmpdir/copyreloc-lib.so -pie" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { dummy.s } \
            {{readelf {-Wr} copyreloc-main2.rd}} \
            "copyreloc-main" \
@@ -783,7 +814,7 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Build pr17689.so" \
            "-shared" \
-           "-fPIC" \
+           "-fPIC -Wa,-mx86-used-note=yes" \
            { pr17689a.c } \
            {} \
            "pr17689.so" \
@@ -791,7 +822,7 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Build pr17689now.so with -z now" \
            "-shared -Wl,-z,now" \
-           "-fPIC" \
+           "-fPIC -Wa,-mx86-used-note=yes" \
            { pr17689a.c } \
            {{readelf {-Wr} pr17689now.rd}} \
            "pr17689now.so" \
@@ -799,14 +830,14 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Build pr17689b.o" \
            "" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { pr17689b.S } \
            {} \
        ] \
        [list \
            "Build pr17689 with PIE without -fPIE" \
            "tmpdir/pr17689b.o tmpdir/pr17689.so -pie" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { dummy.s } \
            {{readelf {-Wr} pr17689.rd}} \
            "pr17689" \
@@ -814,7 +845,7 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Build pr17689 with PIE -z now without -fPIE" \
            "tmpdir/pr17689b.o tmpdir/pr17689.so -pie -Wl,-z,now" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { dummy.s } \
            {{readelf {-Wr} pr17689now.rd}} \
            "pr17689now" \
@@ -822,7 +853,7 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Build pr17827 with PIE without -fPIE" \
            "-Wl,--as-needed tmpdir/pr17689b.o tmpdir/pr17689.so -pie" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { dummy.s } \
            {{readelf {-Wr} pr17827.rd}} \
            "pr17827" \
@@ -830,7 +861,7 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Build pr18900.so" \
            "-shared" \
-           "-fPIC" \
+           "-fPIC -Wa,-mx86-used-note=yes" \
            { pr18900a.c } \
            "" \
            "pr18900.so" \
@@ -838,7 +869,7 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Build pr18900.o" \
            "-r -nostdlib" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { pr18900b.c pr18900c.c } \
            "" \
            "pr18900.o" \
@@ -846,7 +877,7 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Build pr18900a" \
            "tmpdir/pr18900.o tmpdir/pr18900.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { dummy.s } \
            {{readelf {-Wrd} pr18900a.rd}} \
            "pr18900a" \
@@ -854,7 +885,7 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Build pr18900b" \
            "-Wl,--as-needed tmpdir/pr18900.o tmpdir/pr18900.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { dummy.s } \
            {{readelf {-Wrd} pr18900b.rd}} \
            "pr18900b" \
@@ -862,7 +893,7 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Build pr19031.so" \
            "-shared" \
-           "-fPIC" \
+           "-fPIC -Wa,-mx86-used-note=yes" \
            { pr19031a.c } \
            "" \
            "pr19031.so" \
@@ -870,7 +901,7 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Build gotpcrel1d.so" \
            "-shared" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { gotpcrel1d.S } \
            "" \
            "gotpcrel1d.so" \
@@ -878,7 +909,7 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Build gotpcrel1a.o gotpcrel1b.o gotpcrel1c.o" \
            "" \
-           "-Wa,-mrelax-relocations=yes" \
+           "-Wa,-mrelax-relocations=yes,-mx86-used-note=yes" \
            { gotpcrel1a.S gotpcrel1b.c gotpcrel1c.c } \
        ] \
        [list \
@@ -886,15 +917,15 @@ if { [isnative] && [which $CC] != 0 } {
            "$NOPIE_LDFLAGS -Wl,--as-needed tmpdir/gotpcrel1a.o \
             tmpdir/gotpcrel1b.o tmpdir/gotpcrel1c.o \
             tmpdir/gotpcrel1d.so" \
+           "-Wa,-mx86-used-note=yes" \
            { dummy.s } \
-           "" \
            {{objdump {-dw} gotpcrel1.dd}} \
            "gotpcrel1" \
        ] \
        [list \
            "Build pr19319.so" \
            "-shared" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { pr19319a.S } \
            "" \
            "pr19319.so" \
@@ -902,7 +933,7 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Build pr19319" \
            "-pie -nostdlib -nostartfiles tmpdir/pr19319.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { pr19319b.S } \
            {{objdump {-dw} pr19319.dd}} \
            "pr19319" \
@@ -910,7 +941,7 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Build property 1" \
            "" \
-           "" \
+           "-Wa,-mx86-used-note=no" \
            {pass.c property-no-copy.S} \
            {{readelf {-n} property-1.r}} \
            "property-1" \
@@ -918,15 +949,15 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Build property 1 (.o)" \
            "-r -nostdlib" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {pass.c property-no-copy.S} \
-           {{readelf {-n} property-1.r}} \
+           {{readelf {-n} property-1a.r}} \
            "property-1.o" \
        ] \
        [list \
            "Build property 1 (.so)" \
            "-shared" \
-           "-fPIC" \
+           "-fPIC -Wa,-mx86-used-note=no" \
            {pass.c property-no-copy.S} \
            {{readelf {-n} property-1.r}} \
            "property-1.so" \
@@ -934,7 +965,7 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Build property 2" \
            "" \
-           "" \
+           "-Wa,-mx86-used-note=no" \
            {pass.c property-stack.S} \
            {{readelf {-n} property-2.r}} \
            "property-2" \
@@ -942,15 +973,15 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Build property 2 (.o)" \
            "-r -nostdlib" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {pass.c property-stack.S} \
-           {{readelf {-n} property-2.r}} \
+           {{readelf {-n} property-2a.r}} \
            "property-2.o" \
        ] \
        [list \
            "Build property 2 (.so)" \
            "-shared" \
-           "-fPIC" \
+           "-fPIC -Wa,-mx86-used-note=yes" \
            {pass.c property-stack.S} \
            {{readelf {-n} property-2.r}} \
            "property-2.so" \
@@ -958,7 +989,7 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Build property 3" \
            "" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {pass.c property-stack.S property-x86-1.S} \
            {{readelf {-n} property-3.r}} \
            "property-3" \
@@ -966,15 +997,15 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Build property 3 (.o)" \
            "-r -nostdlib" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {pass.c property-x86-1.S property-stack.S} \
-           {{readelf {-n} property-3.r}} \
+           {{readelf {-n} property-3a.r}} \
            "property-3.o" \
        ] \
        [list \
            "Build property 3 (.so)" \
            "-shared" \
-           "-fPIC" \
+           "-fPIC -Wa,-mx86-used-note=yes" \
            {property-x86-1.S pass.c property-stack.S} \
            {{readelf {-n} property-3.r}} \
            "property-3.so" \
@@ -982,7 +1013,7 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Build property 4" \
            "" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {pass.c property-stack.S property-x86-1.S property-x86-2.S} \
            {{readelf {-n} property-4.r}} \
            "property-4" \
@@ -990,15 +1021,15 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Build property 4 (.o)" \
            "-r -nostdlib" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {pass.c property-x86-2.S property-x86-1.S property-stack.S} \
-           {{readelf {-n} property-4.r}} \
+           {{readelf {-n} property-4a.r}} \
            "property-4.o" \
        ] \
        [list \
            "Build property 4 (.so)" \
            "-shared" \
-           "-fPIC" \
+           "-fPIC -Wa,-mx86-used-note=yes" \
            {property-x86-2.S property-x86-1.S pass.c property-stack.S} \
            {{readelf {-n} property-4.r}} \
            "property-4.so" \
@@ -1006,7 +1037,7 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Build property 4 (-Wl,-z,stack-size=0)" \
            "-Wl,-z,stack-size=0" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {pass.c property-stack.S property-x86-1.S property-x86-2.S} \
            {{readelf {-n} property-4.r}} \
            "property-4" \
@@ -1014,7 +1045,7 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Build property 5" \
            "-Wl,-z,stack-size=0x900000" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {pass.c property-stack.S property-x86-1.S property-x86-2.S} \
            {{readelf {-n} property-5.r}} \
            "property-5" \
@@ -1022,15 +1053,15 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Build property 5 (.o)" \
            "-r -nostdlib -Wl,-z,stack-size=0x900000" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {pass.c property-x86-2.S property-x86-1.S property-stack.S} \
-           {{readelf {-n} property-5.r}} \
+           {{readelf {-n} property-5a.r}} \
            "property-5.o" \
        ] \
        [list \
            "Build property 5 (.so)" \
            "-shared -Wl,-z,stack-size=0x900000" \
-           "-fPIC" \
+           "-fPIC -Wa,-mx86-used-note=yes" \
            {property-x86-2.S property-x86-1.S pass.c property-stack.S} \
            {{readelf {-n} property-5.r}} \
            "property-5.so" \
@@ -1038,7 +1069,7 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Build property-6.so" \
            "-shared" \
-           "-fPIC" \
+           "-fPIC -Wa,-mx86-used-note=yes" \
            {property-6a.c property-6c.S} \
            {{readelf {-n} property-6.r}} \
            "property-6.so" \
@@ -1046,39 +1077,39 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Build property-6.o" \
            "-r -nostdlib" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {property-6b.c property-stack.S} \
-           {{readelf {-n} property-2.r}} \
+           {{readelf {-n} property-2a.r}} \
            "property-6.o" \
        ] \
        [list \
            "Build property-6" \
            "-Wl,--as-needed tmpdir/property-6.o tmpdir/property-6.so" \
+           "-Wa,-mx86-used-note=yes" \
            { dummy.s } \
-           "" \
            {{readelf {-n} property-2.r}} \
            "property-6" \
        ] \
        [list \
            "Build property 7a (.o)" \
            "-r -nostdlib" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {property-unsorted-1.S} \
-           {{readelf {-n} property-7.r}} \
+           {{readelf {-n} property-7a.r}} \
            "property-7a.o" \
        ] \
        [list \
            "Build property 7b (.o)" \
            "-r -nostdlib" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {property-unsorted-2.S} \
-           {{readelf {-n} property-7.r}} \
+           {{readelf {-n} property-7a.r}} \
            "property-7b.o" \
        ] \
        [list \
            "Build pr22001-1.so" \
            "-shared" \
-           "-fPIC" \
+           "-fPIC -Wa,-mx86-used-note=yes" \
            { pr22001-1a.c } \
            {} \
            "pr22001-1.so" \
@@ -1086,7 +1117,7 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Build pr22001-1a" \
            "$NOPIE_LDFLAGS -Wl,-z,nocopyreloc,--no-as-needed tmpdir/pr22001-1.so" \
-           "$NOPIE_CFLAGS" \
+           "$NOPIE_CFLAGS -Wa,-mx86-used-note=yes" \
            { pr22001-1b.c } \
            {{error_output "pr22001-1a.err"}} \
            "pr22001-1a" \
@@ -1094,7 +1125,7 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Build pr21997-1.so" \
            "-shared" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { property-stack.S property-no-copy.S pr21997-1a.S } \
            {} \
            "pr21997-1.so" \
@@ -1102,7 +1133,7 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Build pr21997-1a" \
            "$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/pr21997-1.so" \
-           "$NOPIE_CFLAGS" \
+           "$NOPIE_CFLAGS -Wa,-mx86-used-note=yes" \
            { pr21997-1b.c } \
            {{error_output "pr21997-1a.err"}} \
            "pr21997-1a" \
@@ -1110,13 +1141,13 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Build pr22064a.o" \
            "" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { pr22064a.S } \
        ] \
        [list \
            "Build pr22064.so" \
            "-shared" \
-           "-fPIC" \
+           "-fPIC -Wa,-mx86-used-note=yes" \
            { pr22064b.c } \
            {} \
            "pr22064.so" \
@@ -1124,7 +1155,7 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Build pr22393-3a.so" \
            "-shared -Wl,-z,separate-code,-z,max-page-size=0x1000" \
-           "-fPIC" \
+           "-fPIC -Wa,-mx86-used-note=yes" \
            {pr22393-3a.c} \
            {{readelf -lW pr22393-3a.rd} \
             {readelf -lW pr22393-3b.rd}} \
@@ -1133,7 +1164,7 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Build pr22393-3a-now.so" \
            "-shared -Wl,-z,separate-code,-z,now,-z,max-page-size=0x1000" \
-           "-fPIC" \
+           "-fPIC -Wa,-mx86-used-note=yes" \
            {pr22393-3a.c} \
            {{readelf -lW pr22393-3a.rd} \
             {readelf -lW pr22393-3b.rd}} \
@@ -1142,7 +1173,7 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Build pr22393-3" \
            "$NOPIE_LDFLAGS -Wl,-z,separate-code,-z,max-page-size=0x1000,--no-as-needed tmpdir/pr22393-3a.so" \
-           "$NOPIE_CFLAGS" \
+           "$NOPIE_CFLAGS -Wa,-mx86-used-note=yes" \
            {pr22393-3b.c} \
            {{readelf -lW pr22393-3a.rd} \
             {readelf -lW pr22393-3b.rd}} \
@@ -1151,7 +1182,7 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Build pr22393-3 (PIE)" \
            "-pie -Wl,-z,separate-code,-z,max-page-size=0x1000,--no-as-needed tmpdir/pr22393-3a-now.so" \
-           "-fPIE" \
+           "-fPIE -Wa,-mx86-used-note=yes" \
            {pr22393-3b.c} \
            {{readelf -lW pr22393-3a.rd} \
             {readelf -lW pr22393-3b.rd}} \
@@ -1160,7 +1191,7 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Build pr22393-3 (static)" \
            "-static -Wl,-z,separate-code,-z,max-page-size=0x1000" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {pr22393-3a.c pr22393-3b.c} \
            {{readelf -lW pr22393-3a.rd} \
             {readelf -lW pr22393-3b.rd}} \
@@ -1169,7 +1200,7 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Build pr22791-1.so" \
            "-shared" \
-           "-fPIC" \
+           "-fPIC -Wa,-mx86-used-note=yes" \
            { pr22791-1a.c } \
            {} \
            "pr22791-1.so" \
@@ -1177,7 +1208,7 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Build pr22791-1" \
            "-pie -Wl,--no-as-needed tmpdir/pr22791-1.so" \
-           "$NOPIE_CFLAGS" \
+           "$NOPIE_CFLAGS -Wa,-mx86-used-note=yes" \
            { pr22791-1b.s } \
            {{error_output "pr22791-1.err"}} \
            "pr22791-1" \
@@ -1185,13 +1216,13 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Build pr22791-2a.o" \
            "" \
-           "$NOPIE_CFLAGS" \
+           "$NOPIE_CFLAGS -Wa,-mx86-used-note=yes" \
            { pr22791-2a.s } \
        ] \
        [list \
            "Build pr22791-2.so" \
            "-shared tmpdir/pr22791-2a.o" \
-           "-fPIC" \
+           "-fPIC -Wa,-mx86-used-note=yes" \
            { pr22791-2b.c } \
            {{readelf -drW pr22791-2.rd}} \
            "pr22791-2.so" \
@@ -1199,7 +1230,7 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Build pr22791-2" \
            "-pie -Wl,--no-as-needed tmpdir/pr22791-2.so" \
-           "$NOPIE_CFLAGS" \
+           "$NOPIE_CFLAGS -Wa,-mx86-used-note=yes" \
            { pr22791-2c.s } \
            {{readelf -drW pr22791-2.rd}} \
            "pr22791-2" \
@@ -1207,7 +1238,7 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Build pr22842.so" \
            "-shared" \
-           "-fPIC" \
+           "-fPIC -Wa,-mx86-used-note=yes" \
            { pr22842a.c } \
            {} \
            "pr22842.so" \
@@ -1215,7 +1246,7 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Build pr22842" \
            "-pie -Wl,--no-as-needed tmpdir/pr22842.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { pr22842b.S } \
            {{readelf -rW pr22842a.rd} \
             {readelf -rW pr22842b.rd}} \
@@ -1228,7 +1259,7 @@ if { [isnative] && [which $CC] != 0 } {
            [list \
                "Run pr22001-1b" \
                "$NOPIE_LDFLAGS -Wl,-z,nocopyreloc,--no-as-needed tmpdir/pr22001-1.so" \
-               "" \
+               "-Wa,-mx86-used-note=yes" \
                { pr22001-1c.c } \
                "pr22001-1b" \
                "pass.out" \
@@ -1237,7 +1268,7 @@ if { [isnative] && [which $CC] != 0 } {
            [list \
                "Run pr21997-1b" \
                "$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/pr21997-1.so" \
-               "" \
+               "-Wa,-mx86-used-note=yes" \
                { pr21997-1c.c } \
                "pr21997-1b" \
                "pass.out" \
@@ -1249,7 +1280,7 @@ if { [isnative] && [which $CC] != 0 } {
            [list \
                "Build pr22001-1b" \
                "$NOPIE_LDFLAGS -Wl,-z,nocopyreloc,--no-as-needed tmpdir/pr22001-1.so" \
-               "$NOPIE_CFLAGS" \
+               "$NOPIE_CFLAGS -Wa,-mx86-used-note=yes" \
                { pr22001-1c.c } \
                {{error_output "pr22001-1b.err"}} \
                "pr22001-1b" \
@@ -1257,7 +1288,7 @@ if { [isnative] && [which $CC] != 0 } {
            [list \
                "Build pr21997-1b" \
                "$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/pr21997-1.so" \
-               "$NOPIE_CFLAGS" \
+               "$NOPIE_CFLAGS -Wa,-mx86-used-note=yes" \
                { pr21997-1c.c } \
                {{error_output "pr21997-1b.err"}} \
                "pr21997-1b" \
@@ -1270,7 +1301,7 @@ if { [isnative] && [which $CC] != 0 } {
            "Run plt-main" \
            "-Wl,--no-as-needed tmpdir/plt-main1.o tmpdir/plt-main2.o \
             tmpdir/plt-main3.o tmpdir/plt-main4.o tmpdir/libplt-lib.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { plt-main5.c } \
            "plt-main" \
            "plt-main.out" \
@@ -1279,7 +1310,7 @@ if { [isnative] && [which $CC] != 0 } {
            "Run plt-main with PIE" \
            "-Wl,--no-as-needed -pie tmpdir/plt-main1.o tmpdir/plt-main2.o \
             tmpdir/plt-main3.o tmpdir/plt-main4.o tmpdir/libplt-lib.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { plt-main5.c } \
            "plt-main-pie" \
            "plt-main.out" \
@@ -1288,7 +1319,7 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Run copyreloc-main with PIE without -fPIE" \
            "-Wl,--as-needed -pie tmpdir/copyreloc-main.o tmpdir/copyreloc-lib.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { dummy.s } \
            "copyreloc-main" \
            "copyreloc-main.out" \
@@ -1296,7 +1327,7 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Run pr17689 with PIE without -fPIE" \
            "-Wl,--no-as-needed -pie tmpdir/pr17689b.o tmpdir/pr17689.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { dummy.s } \
            "pr17689" \
            "pr17689.out" \
@@ -1304,7 +1335,7 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Run pr17689 with PIE -z now without -fPIE" \
            "-Wl,--as-needed,-z,now -pie tmpdir/pr17689b.o tmpdir/pr17689.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { dummy.s } \
            "pr17689now" \
            "pr17689.out" \
@@ -1312,7 +1343,7 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Run pr18900" \
            "-Wl,--no-as-needed tmpdir/pr18900.o tmpdir/pr18900.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { dummy.s } \
            "pr18900" \
            "pr18900.out" \
@@ -1320,7 +1351,7 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Run pr19031" \
            "$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/pr19031.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { pr19031b.S pr19031c.c } \
            "pr19031" \
            "pr19031.out" \
@@ -1329,7 +1360,7 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Run gotpcrel1" \
            "-Wl,--no-as-needed tmpdir/gotpcrel1d.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { gotpcrel1a.S gotpcrel1b.c gotpcrel1c.c } \
            "gotpcrel1" \
            "gotpcrel1.out" \
@@ -1337,112 +1368,112 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Run property 1" \
            "" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {pass.c property-no-copy.S} \
            "property-1" "pass.out" \
        ] \
        [list \
            "Run property 1 (PIE)" \
            "-pie" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {pass.c property-no-copy.S} \
            "property-1-pie" "pass.out" "-fPIE" \
        ] \
        [list \
            "Run property 1 (static)" \
            "-static" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {pass.c property-no-copy.S} \
            "property-1-static" "pass.out" \
        ] \
        [list \
            "Run property 2" \
            "" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {pass.c property-stack.S} \
            "property-2" "pass.out" \
        ] \
        [list \
            "Run property 2 (PIE)" \
            "-pie" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {pass.c property-stack.S} \
            "property-2-pie" "pass.out" "-fPIE" \
        ] \
        [list \
            "Run property 2 (static)" \
            "-static" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {pass.c property-stack.S} \
            "property-3-static" "pass.out" \
        ] \
        [list \
            "Run property 3" \
            "" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {pass.c property-stack.S property-x86-1.S} \
            "property-3" "pass.out" \
        ] \
        [list \
            "Run property 3 (PIE)" \
            "-pie" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {pass.c property-x86-1.S property-stack.S} \
            "property-3-pie" "pass.out" "-fPIE" \
        ] \
        [list \
            "Run property 3 (static)" \
            "-static" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {property-x86-1.S pass.c property-stack.S} \
            "property-3-static" "pass.out" \
        ] \
        [list \
            "Run property 4" \
            "" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {pass.c property-stack.S property-x86-1.S property-x86-2.S} \
            "property-4" "pass.out" \
        ] \
        [list \
            "Run property 4 (PIE)" \
            "-pie" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {pass.c property-x86-2.S property-x86-1.S property-stack.S} \
            "property-4-pie" "pass.out" "-fPIE" \
        ] \
        [list \
            "Run property 4 (static)" \
            "-static" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {property-x86-2.S property-x86-1.S pass.c property-stack.S} \
            "property-4-static" "pass.out" \
        ] \
        [list \
            "Run property 5" \
            "-Wl,-z,stack-size=0x900000" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {pass.c property-stack.S property-x86-1.S property-x86-2.S} \
            "property-5" "pass.out" \
        ] \
        [list \
            "Run property 5 (PIE)" \
            "-pie -Wl,-z,stack-size=0x900000" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {pass.c property-x86-2.S property-x86-1.S property-stack.S} \
            "property-5-pie" "pass.out" "-fPIE" \
        ] \
        [list \
            "Run property 5 (static)" \
            "-static -Wl,-z,stack-size=0x900000" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {property-x86-2.S property-x86-1.S pass.c property-stack.S} \
            "property-5-static" "pass.out" \
        ] \
        [list \
            "Run pr22001-1a (PIC 1)" \
            "$NOPIE_LDFLAGS -Wl,-z,nocopyreloc,--no-as-needed tmpdir/pr22001-1.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { pr22001-1b.c } \
            "pr22001-1a-pic-1" \
            "pass.out" \
@@ -1451,7 +1482,7 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Run pr22001-1a (PIC 2)" \
            "-pie -Wl,-z,nocopyreloc,--no-as-needed tmpdir/pr22001-1.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { pr22001-1b.c } \
            "pr22001-1a-pic-2" \
            "pass.out" \
@@ -1460,7 +1491,7 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Run pr22001-1b (PIC 1)" \
            "$NOPIE_LDFLAGS -Wl,-z,nocopyreloc,--no-as-needed tmpdir/pr22001-1.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { pr22001-1c.c } \
            "pr22001-1b-pic-1" \
            "pass.out" \
@@ -1469,7 +1500,7 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Run pr22001-1b (PIC 2)" \
            "-pie -Wl,-z,nocopyreloc,--no-as-needed tmpdir/pr22001-1.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { pr22001-1c.c } \
            "pr22001-1b-pic-2" \
            "pass.out" \
@@ -1478,7 +1509,7 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Run pr21997-1a (PIC 1)" \
            "$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/pr21997-1.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { pr21997-1b.c } \
            "pr21997-1a-pic-1" \
            "pass.out" \
@@ -1487,7 +1518,7 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Run pr21997-1a (PIC 2)" \
            "-pie -Wl,--no-as-needed tmpdir/pr21997-1.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { pr21997-1b.c } \
            "pr21997-1a-pic-2" \
            "pass.out" \
@@ -1496,7 +1527,7 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Run pr21997-1b (PIC 1)" \
            "$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/pr21997-1.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { pr21997-1c.c } \
            "pr21997-1b-pic-1" \
            "pass.out" \
@@ -1505,7 +1536,7 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Run pr21997-1b (PIC 2)" \
            "-pie -Wl,--no-as-needed tmpdir/pr21997-1.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { pr21997-1c.c } \
            "pr21997-1b-pic-2" \
            "pass.out" \
@@ -1514,7 +1545,7 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Run pr22064" \
            "-pie -Wl,--no-as-needed tmpdir/pr22064a.o tmpdir/pr22064.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { dummy.s } \
            "pr22064-pie" \
            "pass.out" \
@@ -1523,7 +1554,7 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Run pr22393-3" \
            "$NOPIE_LDFLAGS -Wl,-z,separate-code,-z,max-page-size=0x1000,--no-as-needed tmpdir/pr22393-3a.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {pr22393-3b.c} \
            "pr22393-3" \
            "pass.out" \
@@ -1532,7 +1563,7 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Run pr22393-3 (PIE)" \
            "-pie -Wl,-z,separate-code,-z,max-page-size=0x1000,--no-as-needed tmpdir/pr22393-3a-now.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {pr22393-3b.c} \
            "pr22393-3-pie" \
            "pass.out" \
@@ -1541,7 +1572,7 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Run pr22393-3 (static)" \
            "-static -Wl,-z,separate-code,-z,max-page-size=0x1000" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {pr22393-3a.c pr22393-3b.c} \
            "pr22393-3-static" \
            "pass.out" \
@@ -1549,20 +1580,28 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Run pr22791-2" \
            "-pie -Wl,--no-as-needed tmpdir/pr22791-2.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { pr22791-2c.s } \
            "pr22791-2" \
            "pass.out" \
            "$NOPIE_CFLAGS" \
        ] \
        [list \
-           "Build pr22842" \
+           "Run pr22842" \
            "-pie -Wl,--no-as-needed tmpdir/pr22842.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { pr22842b.S } \
            "pr22842" \
            "pass.out" \
        ] \
+       [list \
+           "Run pr23997" \
+           "" \
+           "" \
+           { pr23997a.s pr23997b.c pr23997c.c } \
+           "pr23997" \
+           "pass.out" \
+       ] \
     ]
 
     # Run-time tests which require working ifunc attribute support.
@@ -1571,7 +1610,7 @@ if { [isnative] && [which $CC] != 0 } {
            [list \
                "Build libpr19784a.so" \
                "-shared -Wl,-Bsymbolic-functions" \
-               "-fPIC -O2 -g" \
+               "-fPIC -O2 -g -Wa,-mx86-used-note=yes" \
                { pr19784b.c pr19784c.c } \
                {} \
                "libpr19784a.so" \
@@ -1579,7 +1618,7 @@ if { [isnative] && [which $CC] != 0 } {
            [list \
                "Build libpr19784b.so" \
                "-shared -Wl,-Bsymbolic-functions" \
-               "-fPIC -O2 -g" \
+               "-fPIC -O2 -g -Wa,-mx86-used-note=yes" \
                { pr19784c.c pr19784b.c } \
                {} \
                "libpr19784b.so" \
@@ -1587,7 +1626,7 @@ if { [isnative] && [which $CC] != 0 } {
            [list \
                "Build pr19784a.o" \
                "" \
-               "" \
+               "-Wa,-mx86-used-note=yes" \
                { pr19784a.c } \
            ] \
        ]
@@ -1596,7 +1635,7 @@ if { [isnative] && [which $CC] != 0 } {
            [list \
                "Run pr19784a" \
                "-Wl,--no-as-needed tmpdir/pr19784a.o tmpdir/libpr19784a.so" \
-               "" \
+               "-Wa,-mx86-used-note=yes" \
                { dummy.s } \
                "pr19784a" \
                "pass.out" \
@@ -1604,7 +1643,7 @@ if { [isnative] && [which $CC] != 0 } {
            [list \
                "Run pr19784b" \
                "-Wl,--as-needed tmpdir/pr19784a.o tmpdir/libpr19784b.so" \
-               "" \
+               "-Wa,-mx86-used-note=yes" \
                { dummy.s } \
                "pr19784b" \
                "pass.out" \
@@ -1621,7 +1660,7 @@ if { [isnative] && [which $CC] != 0 } {
                "tmpdir/plt-main1.o tmpdir/plt-main2.o tmpdir/plt-main3.o \
                 tmpdir/plt-main4.o tmpdir/libplt-lib.so -z bndplt \
                 -z noseparate-code -z max-page-size=0x200000" \
-               "" \
+               "-Wa,-mx86-used-note=yes" \
                { plt-main5.c } \
                {{objdump {-drw} plt-main-bnd.dd}} \
                "plt-main-bnd" \
@@ -1631,7 +1670,7 @@ if { [isnative] && [which $CC] != 0 } {
                "tmpdir/plt-main1.o tmpdir/plt-main2.o tmpdir/plt-main3.o \
                 tmpdir/plt-main4.o tmpdir/libplt-lib.so -z bndplt -pie \
                 -z noseparate-code -z max-page-size=0x200000" \
-               "-fPIC" \
+               "-fPIC -Wa,-mx86-used-note=yes" \
                { plt-main5.c } \
                {{objdump {-drw} plt-main-bnd.dd}} \
                "plt-main-pie-bnd" \
@@ -1641,7 +1680,7 @@ if { [isnative] && [which $CC] != 0 } {
                "tmpdir/plt-main1.o tmpdir/plt-main2.o tmpdir/plt-main3.o \
                 tmpdir/plt-main4.o tmpdir/libplt-lib.so -z bndplt -z now \
                 -z noseparate-code -z max-page-size=0x200000" \
-               "" \
+               "-Wa,-mx86-used-note=yes" \
                { plt-main5.c } \
                {{readelf {-SW} plt-main-bnd-now.rd} {objdump {-drw} plt-main-bnd.dd}} \
                "plt-main-bnd-now" \
@@ -1651,7 +1690,7 @@ if { [isnative] && [which $CC] != 0 } {
                "tmpdir/plt-main1.o tmpdir/plt-main2.o tmpdir/plt-main3.o \
                 tmpdir/plt-main4.o tmpdir/libplt-lib.so -z bndplt -z now -pie \
                 -z noseparate-code -z max-page-size=0x200000" \
-               "-fPIC" \
+               "-fPIC -Wa,-mx86-used-note=yes" \
                { plt-main5.c } \
                {{readelf {-SW} plt-main-bnd-now.rd} {objdump {-drw} plt-main-bnd.dd}} \
                "plt-main-pie-bnd-now" \
@@ -1664,7 +1703,7 @@ if { [isnative] && [which $CC] != 0 } {
                "-Wl,--no-as-needed,-z,bndplt tmpdir/plt-main1.o \
                 tmpdir/plt-main2.o tmpdir/plt-main3.o \
                 tmpdir/plt-main4.o tmpdir/libplt-lib.so" \
-               "" \
+               "-Wa,-mx86-used-note=yes" \
                { plt-main5.c } \
                "plt-main-bnd" \
                "plt-main.out" \
@@ -1674,7 +1713,7 @@ if { [isnative] && [which $CC] != 0 } {
                "-Wl,--no-as-needed,-z,bndplt -pie tmpdir/plt-main1.o \
                 tmpdir/plt-main2.o tmpdir/plt-main3.o \
                 tmpdir/plt-main4.o tmpdir/libplt-lib.so" \
-               "" \
+               "-Wa,-mx86-used-note=yes" \
                { plt-main5.c } \
                "plt-main-pie-bnd" \
                "plt-main.out" \
@@ -1685,7 +1724,7 @@ if { [isnative] && [which $CC] != 0 } {
                "-Wl,--no-as-needed,-z,bndplt,-z,now tmpdir/plt-main1.o \
                 tmpdir/plt-main2.o tmpdir/plt-main3.o \
                 tmpdir/plt-main4.o tmpdir/libplt-lib.so" \
-               "" \
+               "-Wa,-mx86-used-note=yes" \
                { plt-main5.c } \
                "plt-main-bnd-now" \
                "plt-main.out" \
@@ -1695,7 +1734,7 @@ if { [isnative] && [which $CC] != 0 } {
                "-Wl,--no-as-needed,-z,bndplt,-z,now -pie tmpdir/plt-main1.o \
                 tmpdir/plt-main2.o tmpdir/plt-main3.o \
                 tmpdir/plt-main4.o tmpdir/libplt-lib.so" \
-               "" \
+               "-Wa,-mx86-used-note=yes" \
                { plt-main5.c } \
                "plt-main-pie-bnd-now" \
                "plt-main.out" \
@@ -1704,7 +1743,7 @@ if { [isnative] && [which $CC] != 0 } {
            [list \
                "Run pr20800" \
                "-Wl,-z,now -pie" \
-               "" \
+               "-Wa,-mx86-used-note=yes" \
                { pr20800a.S pr20800b.S } \
                "pr20800" \
                "pass.out" \
@@ -1715,7 +1754,7 @@ if { [isnative] && [which $CC] != 0 } {
                [list \
                    "Run pr21481a" \
                    "$NOPIE_LDFLAGS -Wl,-z,bndplt" \
-                   "" \
+                   "-Wa,-mx86-used-note=yes" \
                    { pr21481a.c pr21481b.S } \
                    "pr21481a" \
                    "pass.out" \
@@ -1724,7 +1763,7 @@ if { [isnative] && [which $CC] != 0 } {
                [list \
                    "Run pr21481b" \
                    "$NOPIE_LDFLAGS -Wl,-z,bndplt,-z,now" \
-                   "" \
+                   "-Wa,-mx86-used-note=yes" \
                    { pr21481a.c pr21481b.S } \
                    "pr21481b" \
                    "pass.out" \
@@ -1748,7 +1787,7 @@ if { [isnative] && [which $CC] != 0 } {
                "tmpdir/plt-main1.o tmpdir/plt-main2.o tmpdir/plt-main3.o \
                 tmpdir/plt-main4.o tmpdir/libplt-lib.so -z ibtplt \
                 -z noseparate-code -z max-page-size=0x200000" \
-               "" \
+               "-Wa,-mx86-used-note=yes" \
                { plt-main5.c } \
                $pltdump \
                "plt-main-ibt" \
@@ -1758,7 +1797,7 @@ if { [isnative] && [which $CC] != 0 } {
                "tmpdir/plt-main1.o tmpdir/plt-main2.o tmpdir/plt-main3.o \
                 tmpdir/plt-main4.o tmpdir/libplt-lib.so -z ibtplt -pie \
                 -z noseparate-code -z max-page-size=0x200000" \
-               "-fPIC" \
+               "-fPIC -Wa,-mx86-used-note=yes" \
                { plt-main5.c } \
                $pltdump \
                "plt-main-pie-ibt" \
@@ -1768,7 +1807,7 @@ if { [isnative] && [which $CC] != 0 } {
                "tmpdir/plt-main1.o tmpdir/plt-main2.o tmpdir/plt-main3.o \
                 tmpdir/plt-main4.o tmpdir/libplt-lib.so -z ibtplt -z now \
                 -z noseparate-code -z max-page-size=0x200000" \
-               "" \
+               "-Wa,-mx86-used-note=yes" \
                { plt-main5.c } \
                $pltsecdump \
                "plt-main-ibt-now" \
@@ -1778,7 +1817,7 @@ if { [isnative] && [which $CC] != 0 } {
                "tmpdir/plt-main1.o tmpdir/plt-main2.o tmpdir/plt-main3.o \
                 tmpdir/plt-main4.o tmpdir/libplt-lib.so -z ibtplt -z now -pie \
                 -z noseparate-code -z max-page-size=0x200000" \
-               "-fPIC" \
+               "-fPIC -Wa,-mx86-used-note=yes" \
                { plt-main5.c } \
                $pltsecdump \
                "plt-main-pie-ibt-now" \
@@ -1787,7 +1826,7 @@ if { [isnative] && [which $CC] != 0 } {
                "Build libibtplt-lib.so with -z ibtplt" \
                "-shared -z ibtplt \
                 -z noseparate-code -z max-page-size=0x200000" \
-               "-fPIC" \
+               "-fPIC -Wa,-mx86-used-note=yes" \
                { plt-main1.c plt-main2.c plt-main3.c plt-main4.c} \
                $pltdump \
                "libibtplt-lib.so" \
@@ -1796,7 +1835,7 @@ if { [isnative] && [which $CC] != 0 } {
                "Build libibtplt--now-lib.so with -z ibtplt -z now" \
                "-shared -z ibtplt -z now \
                 -z noseparate-code -z max-page-size=0x200000" \
-               "-fPIC" \
+               "-fPIC -Wa,-mx86-used-note=yes" \
                { plt-main1.c plt-main2.c plt-main3.c plt-main4.c} \
                $pltdump \
                "libibtplt-now-lib.so" \
@@ -1809,7 +1848,7 @@ if { [isnative] && [which $CC] != 0 } {
                "-Wl,--no-as-needed,-z,ibtplt tmpdir/plt-main1.o \
                 tmpdir/plt-main2.o tmpdir/plt-main3.o \
                 tmpdir/plt-main4.o tmpdir/libplt-lib.so" \
-               "" \
+               "-Wa,-mx86-used-note=yes" \
                { plt-main5.c } \
                "plt-main-ibt" \
                "plt-main.out" \
@@ -1819,7 +1858,7 @@ if { [isnative] && [which $CC] != 0 } {
                "-Wl,--no-as-needed,-z,ibtplt -pie tmpdir/plt-main1.o \
                 tmpdir/plt-main2.o tmpdir/plt-main3.o \
                 tmpdir/plt-main4.o tmpdir/libplt-lib.so" \
-               "" \
+               "-Wa,-mx86-used-note=yes" \
                { plt-main5.c } \
                "plt-main-pie-ibt" \
                "plt-main.out" \
@@ -1830,7 +1869,7 @@ if { [isnative] && [which $CC] != 0 } {
                "-Wl,--no-as-needed,-z,ibtplt,-z,now tmpdir/plt-main1.o \
                 tmpdir/plt-main2.o tmpdir/plt-main3.o \
                 tmpdir/plt-main4.o tmpdir/libplt-lib.so" \
-               "" \
+               "-Wa,-mx86-used-note=yes" \
                { plt-main5.c } \
                "plt-main-ibt-now" \
                "plt-main.out" \
@@ -1840,7 +1879,7 @@ if { [isnative] && [which $CC] != 0 } {
                "-Wl,--no-as-needed,-z,ibtplt,-z,now -pie tmpdir/plt-main1.o \
                 tmpdir/plt-main2.o tmpdir/plt-main3.o \
                 tmpdir/plt-main4.o tmpdir/libplt-lib.so" \
-               "" \
+               "-Wa,-mx86-used-note=yes" \
                { plt-main5.c } \
                "plt-main-pie-ibt-now" \
                "plt-main.out" \
@@ -1850,7 +1889,7 @@ if { [isnative] && [which $CC] != 0 } {
                "Run plt-main with libibtplt-lib.so -z ibtplt" \
                "-Wl,--no-as-needed,-z,ibtplt tmpdir/libibtplt-lib.so \
                 tmpdir/libplt-lib.so" \
-               "" \
+               "-Wa,-mx86-used-note=yes" \
                { plt-main5.c } \
                "plt-main-ibt-lib" \
                "plt-main.out" \
@@ -1859,7 +1898,7 @@ if { [isnative] && [which $CC] != 0 } {
                "Run plt-main with libibtplt-lib.so -z ibtplt -z now" \
                "-Wl,--no-as-needed,-z,ibtplt,-z,now \
                 tmpdir/libibtplt-now-lib.so tmpdir/libplt-lib.so" \
-               "" \
+               "-Wa,-mx86-used-note=yes" \
                { plt-main5.c } \
                "plt-main-ibt-now-lib" \
                "plt-main.out" \
@@ -1871,7 +1910,7 @@ if { [isnative] && [which $CC] != 0 } {
                [list \
                    "Run pr21481a" \
                    "$NOPIE_LDFLAGS -Wl,-z,ibtplt" \
-                   "" \
+                   "-Wa,-mx86-used-note=yes" \
                    { pr21481a.c pr21481b.S } \
                    "pr21481a" \
                    "pass.out" \
@@ -1880,7 +1919,7 @@ if { [isnative] && [which $CC] != 0 } {
                [list \
                    "Run pr21481b" \
                    "$NOPIE_LDFLAGS -Wl,-z,ibtplt,-z,now" \
-                   "" \
+                   "-Wa,-mx86-used-note=yes" \
                    { pr21481a.c pr21481b.S } \
                    "pr21481b" \
                    "pass.out" \
@@ -1898,6 +1937,7 @@ if { [isnative] && [which $CC] != 0 } {
 }
 
 if { ![istarget "x86_64-*-linux*"]} {
+    set ASFLAGS "$saved_ASFLAGS"
     return
 }
 
@@ -1916,7 +1956,7 @@ run_ld_link_tests [list \
        "Build pr21626.so" \
        "-shared -melf_x86_64" \
        "" \
-       "--64 -defsym __64_bit__=1" \
+       "--64 -defsym __64_bit__=1 -mx86-used-note=yes" \
        {property-x86-3.s} \
        "" \
        "pr21626.so" \
@@ -1925,7 +1965,7 @@ run_ld_link_tests [list \
        "Build pr21626" \
        "-melf_x86_64 tmpdir/pr21626.so" \
        "" \
-       "--64" \
+       "--64 -mx86-used-note=yes" \
        {start.s foo.s} \
        "" \
        "pr21626" \
@@ -1968,3 +2008,5 @@ run_dump_test "ibt-plt-3a-x32"
 run_dump_test "ibt-plt-3b-x32"
 run_dump_test "ibt-plt-3c-x32"
 run_dump_test "ibt-plt-3d-x32"
+
+set ASFLAGS "$saved_ASFLAGS"