i386: Add tests for -malign-branch-boundary and -malign-branch

[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 5c1f90c9d3b98f32aec8061700c93834ef5c25ea..ab4822e2b43d8452afd29b93c05295427bb56b18 100644 (file)
--- a/ld/testsuite/ld-x86-64/x86-64.exp
+++ b/ld/testsuite/ld-x86-64/x86-64.exp
@@ -1,5 +1,5 @@
 # Expect script for ld-x86_64 tests
-#   Copyright (C) 2002-2018 Free Software Foundation, Inc.
+#   Copyright (C) 2002-2019 Free Software Foundation, Inc.
 #
 # This file is part of the GNU Binutils.
 #
@@ -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
@@ -383,6 +387,26 @@ run_dump_test "property-x86-shstk4"
 run_dump_test "property-x86-shstk4-x32"
 run_dump_test "property-x86-shstk5"
 run_dump_test "property-x86-shstk5-x32"
+run_dump_test "property-x86-cet1"
+run_dump_test "property-x86-cet1-x32"
+run_dump_test "property-x86-cet2a"
+run_dump_test "property-x86-cet2a-x32"
+run_dump_test "property-x86-cet2b"
+run_dump_test "property-x86-cet2b-x32"
+run_dump_test "property-x86-cet3a"
+run_dump_test "property-x86-cet3a-x32"
+run_dump_test "property-x86-cet3b"
+run_dump_test "property-x86-cet3b-x32"
+run_dump_test "property-x86-cet4a"
+run_dump_test "property-x86-cet4a-x32"
+run_dump_test "property-x86-cet4b"
+run_dump_test "property-x86-cet4b-x32"
+run_dump_test "property-x86-cet5a"
+run_dump_test "property-x86-cet5a-x32"
+run_dump_test "property-x86-cet5b"
+run_dump_test "property-x86-cet5b-x32"
+run_dump_test "property-x86-cet6"
+run_dump_test "property-x86-cet6-x32"
 run_dump_test "pr21884"
 run_dump_test "pr21884-nacl"
 run_dump_test "pr22071"
@@ -417,6 +441,26 @@ 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"
+run_dump_test "pr24151a"
+run_dump_test "pr24151a-x32"
+run_dump_test "pr24322a"
+run_dump_test "pr24322a-x32"
+run_dump_test "pr24322b"
+run_dump_test "pr24322b-x32"
+run_dump_test "pr24458a"
+run_dump_test "pr24458a-x32"
+run_dump_test "pr24458b"
+run_dump_test "pr24458b-x32"
+run_dump_test "pr24458c"
+run_dump_test "pr24458c-x32"
+run_dump_test "pr24721"
+run_dump_test "pr24721-x32"
+run_dump_test "pr24905"
+run_dump_test "pr24905-x32"
+run_dump_test "align-branch-1"
 
 if { ![istarget "x86_64-*-linux*"] && ![istarget "x86_64-*-nacl*"]} {
     return
@@ -527,7 +571,8 @@ run_dump_test "pr17935-1"
 run_dump_test "pr17935-2"
 run_dump_test "pr18160"
 run_dump_test "pr18176"
-run_dump_test "pr18801"
+run_dump_test "pr18801a"
+run_dump_test "pr18801b"
 run_dump_test "pr18815"
 run_dump_test "pr19013"
 run_dump_test "pr19013-x32"
@@ -691,7 +736,7 @@ global PLT_CFLAGS
 global NOPIE_CFLAGS NOPIE_LDFLAGS
 
 # Must be native with the C compiler
-if { [isnative] && [which $CC] != 0 } {
+if { [isnative] && [check_compiler_available] } {
     run_cc_link_tests {
        {"Helper X32 DSO from x86-64 object" "" "-m64 -fPIC -g"
         {simple.c} {} "libsimple.a"}
@@ -708,7 +753,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"}
     }
 
@@ -716,7 +762,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" \
@@ -724,7 +770,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" \
@@ -732,7 +778,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" \
@@ -740,7 +786,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" \
@@ -748,7 +794,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" \
@@ -766,7 +812,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" \
@@ -774,7 +820,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" \
@@ -782,7 +828,7 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Build libcopyreloc-main.a" \
            "" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { copyreloc-main.S } \
            {} \
            "libcopyreloc-main.a" \
@@ -790,7 +836,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" \
@@ -798,7 +844,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" \
@@ -806,7 +852,7 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Build pr17689.so" \
            "-shared" \
-           "-fPIC" \
+           "-fPIC -Wa,-mx86-used-note=yes" \
            { pr17689a.c } \
            {} \
            "pr17689.so" \
@@ -814,7 +860,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" \
@@ -822,14 +868,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" \
@@ -837,7 +883,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" \
@@ -845,7 +891,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" \
@@ -853,7 +899,7 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Build pr18900.so" \
            "-shared" \
-           "-fPIC" \
+           "-fPIC -Wa,-mx86-used-note=yes" \
            { pr18900a.c } \
            "" \
            "pr18900.so" \
@@ -861,7 +907,7 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Build pr18900.o" \
            "-r -nostdlib" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { pr18900b.c pr18900c.c } \
            "" \
            "pr18900.o" \
@@ -869,7 +915,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" \
@@ -877,7 +923,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" \
@@ -885,7 +931,7 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Build pr19031.so" \
            "-shared" \
-           "-fPIC" \
+           "-fPIC -Wa,-mx86-used-note=yes" \
            { pr19031a.c } \
            "" \
            "pr19031.so" \
@@ -893,7 +939,7 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Build gotpcrel1d.so" \
            "-shared" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { gotpcrel1d.S } \
            "" \
            "gotpcrel1d.so" \
@@ -901,7 +947,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 \
@@ -909,15 +955,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" \
@@ -925,15 +971,24 @@ 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" \
        ] \
+       [list \
+           "Build pr24276.so" \
+           "-shared -nostdlib -nostartfiles \
+            -Ltmpdir $srcdir/$subdir/pr24276.dso" \
+           "-Wa,-mx86-used-note=yes" \
+           { pr19319b.S } \
+           {{warning_output pr24276.warn}} \
+           "pr24276.so" \
+       ] \
        [list \
            "Build property 1" \
            "" \
-           "" \
+           "-Wa,-mx86-used-note=no" \
            {pass.c property-no-copy.S} \
            {{readelf {-n} property-1.r}} \
            "property-1" \
@@ -941,15 +996,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" \
@@ -957,7 +1012,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" \
@@ -965,15 +1020,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" \
@@ -981,7 +1036,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" \
@@ -989,15 +1044,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" \
@@ -1005,7 +1060,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" \
@@ -1013,15 +1068,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" \
@@ -1029,7 +1084,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" \
@@ -1037,7 +1092,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" \
@@ -1045,15 +1100,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" \
@@ -1061,7 +1116,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" \
@@ -1069,39 +1124,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" \
@@ -1109,7 +1164,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" \
@@ -1117,7 +1172,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" \
@@ -1125,7 +1180,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" \
@@ -1133,13 +1188,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" \
@@ -1147,7 +1202,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}} \
@@ -1156,7 +1211,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}} \
@@ -1165,7 +1220,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}} \
@@ -1174,7 +1229,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}} \
@@ -1183,7 +1238,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}} \
@@ -1192,7 +1247,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" \
@@ -1200,7 +1255,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" \
@@ -1208,13 +1263,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" \
@@ -1222,7 +1277,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" \
@@ -1230,7 +1285,7 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Build pr22842.so" \
            "-shared" \
-           "-fPIC" \
+           "-fPIC -Wa,-mx86-used-note=yes" \
            { pr22842a.c } \
            {} \
            "pr22842.so" \
@@ -1238,7 +1293,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}} \
@@ -1251,7 +1306,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" \
@@ -1260,7 +1315,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" \
@@ -1272,7 +1327,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" \
@@ -1280,7 +1335,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" \
@@ -1293,7 +1348,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" \
@@ -1302,7 +1357,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" \
@@ -1311,7 +1366,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" \
@@ -1319,7 +1374,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" \
@@ -1327,7 +1382,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" \
@@ -1335,7 +1390,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" \
@@ -1343,7 +1398,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" \
@@ -1352,7 +1407,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" \
@@ -1360,112 +1415,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" \
@@ -1474,7 +1529,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" \
@@ -1483,7 +1538,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" \
@@ -1492,7 +1547,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" \
@@ -1501,7 +1556,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" \
@@ -1510,7 +1565,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" \
@@ -1519,7 +1574,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" \
@@ -1528,7 +1583,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" \
@@ -1537,7 +1592,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" \
@@ -1546,7 +1601,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" \
@@ -1555,7 +1610,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" \
@@ -1564,7 +1619,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" \
@@ -1572,20 +1627,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.
@@ -1594,7 +1657,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" \
@@ -1602,7 +1665,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" \
@@ -1610,7 +1673,7 @@ if { [isnative] && [which $CC] != 0 } {
            [list \
                "Build pr19784a.o" \
                "" \
-               "" \
+               "-Wa,-mx86-used-note=yes" \
                { pr19784a.c } \
            ] \
        ]
@@ -1619,7 +1682,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" \
@@ -1627,7 +1690,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" \
@@ -1644,7 +1707,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" \
@@ -1654,7 +1717,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" \
@@ -1664,7 +1727,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" \
@@ -1674,7 +1737,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" \
@@ -1687,7 +1750,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" \
@@ -1697,7 +1760,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" \
@@ -1708,7 +1771,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" \
@@ -1718,7 +1781,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" \
@@ -1727,7 +1790,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" \
@@ -1738,7 +1801,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" \
@@ -1747,7 +1810,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" \
@@ -1771,7 +1834,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" \
@@ -1781,7 +1844,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" \
@@ -1791,7 +1854,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" \
@@ -1801,7 +1864,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" \
@@ -1810,7 +1873,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" \
@@ -1819,7 +1882,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" \
@@ -1832,7 +1895,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" \
@@ -1842,7 +1905,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" \
@@ -1853,7 +1916,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" \
@@ -1863,7 +1926,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" \
@@ -1873,7 +1936,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" \
@@ -1882,7 +1945,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" \
@@ -1894,7 +1957,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" \
@@ -1903,7 +1966,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" \
@@ -1921,6 +1984,7 @@ if { [isnative] && [which $CC] != 0 } {
 }
 
 if { ![istarget "x86_64-*-linux*"]} {
+    set ASFLAGS "$saved_ASFLAGS"
     return
 }
 
@@ -1939,7 +2003,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" \
@@ -1948,7 +2012,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" \
@@ -1991,3 +2055,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"