x86: Add -z cet-report=[none|warning|error]

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

diff --git a/ld/testsuite/ld-i386/i386.exp b/ld/testsuite/ld-i386/i386.exp
index 8a5bdf0cfe585f060a88c95dc726ad69282bcecd..e9c2cfb9f6b970ce7ce661fcb3fabaa9008eeefa 100644 (file)
--- a/ld/testsuite/ld-i386/i386.exp
+++ b/ld/testsuite/ld-i386/i386.exp
@@ -1,5 +1,5 @@
 # Expect script for ld-i386 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.
 #
@@ -19,6 +19,13 @@
 # MA 02110-1301, USA.
 #
 
+global ASFLAGS
+set saved_ASFLAGS "$ASFLAGS"
+if { [is_elf_format] \
+     && ([istarget "i?86-*-*"] || [istarget "x86_64-*-*"]) } {
+    set ASFLAGS "$ASFLAGS -mx86-used-note=no"
+}
+
 # Test i386 linking; all types of relocs.  This tests the assembler and
 # tools like objdump as well as the linker.
 
@@ -102,6 +109,7 @@ if { !([istarget "i?86-*-elf*"]
        || [istarget "i?86-*-linux*"]
        || [istarget "i?86-*-gnu*"]
        || [istarget "i?86-*-nacl*"]
+       || [istarget "x86_64-*-elf*"]
        || [istarget "x86_64-*-nacl*"]
        || [istarget "x86_64-*-linux*"]
        || [istarget "amd64-*-linux*"]) } {
@@ -213,25 +221,29 @@ set i386tests {
      "--32" {tlsie1.s}
      {{objdump -dwr tlsie1.dd}} "tlsie1"}
     {"PR ld/17313 (1)" "-melf_i386" ""
-     "--32" {zero.s} {} ""}
+     "--32 -mx86-used-note=yes" {zero.s} {} ""}
     {"PR ld/17313 (2)" "-melf_i386 -shared --just-symbols=tmpdir/zero.o" ""
-     "--32" {lea1.s} {} "libpr17313.so"}
+     "--32 -mx86-used-note=yes" {lea1.s} {} "libpr17313.so"}
     {"PR ld/17306 (1)" "-melf_i386" ""
-     "--32" {pr17306b.s} {} ""}
+     "--32 -mx86-used-note=yes" {pr17306b.s} {} ""}
     {"PR ld/17306 (2)" "-melf_i386 -shared -Bsymbolic --just-symbols=tmpdir/pr17306b.o" ""
-     "--32" {pr17306a.s} {} "libpr17306.so"}
+     "--32 -mx86-used-note=yes" {pr17306a.s} {} "libpr17306.so"}
     {"PR ld/17709 (1)" "-melf_i386 -shared" ""
-     "--32" {pr17709a.s} {} "libpr17709.so"}
+     "--32 -mx86-used-note=yes" {pr17709a.s} {} "libpr17709.so"}
     {"PR ld/17709 (2)" "-melf_i386 tmpdir/libpr17709.so" ""
-     "--32" {pr17709b.s} {{readelf -r pr17709.rd}} "pr17709"}
+     "--32 -mx86-used-note=yes"
+     {pr17709b.s} {{readelf -r pr17709.rd}} "pr17709"}
     {"Build pr19827a.o" "" ""
-     "--32" { pr19827a.S }}
+     "--32 -mx86-used-note=yes" { pr19827a.S }}
     {"Build pr19827b.so" "-melf_i386 -shared" ""
-     "--32" { pr19827b.S } {} "pr19827b.so"}
+     "--32 -mx86-used-note=yes"
+     { pr19827b.S } {} "pr19827b.so"}
     {"Build pr19827" "-melf_i386 -pie tmpdir/pr19827a.o tmpdir/pr19827b.so" ""
-     "--32" { dummy.s } {{readelf {-rW} pr19827.rd}} "pr19827"}
+     "--32 -mx86-used-note=yes"
+     { dummy.s } {{readelf {-rW} pr19827.rd}} "pr19827"}
     {"Build pr19827.so" "-melf_i386 -shared -Bsymbolic" ""
-     "--32" { pr19827a.S }  {{readelf {-rW} pr19827.rd}} "pr19827.so"}
+     "--32 -mx86-used-note=yes"
+     { pr19827a.S }  {{readelf {-rW} pr19827.rd}} "pr19827.so"}
 }
 
 # So as to avoid rewriting every last test case here in a nacl variant,
@@ -448,6 +460,16 @@ run_dump_test "property-x86-shstk3a"
 run_dump_test "property-x86-shstk3b"
 run_dump_test "property-x86-shstk4"
 run_dump_test "property-x86-shstk5"
+run_dump_test "property-x86-cet1"
+run_dump_test "property-x86-cet2a"
+run_dump_test "property-x86-cet2b"
+run_dump_test "property-x86-cet3a"
+run_dump_test "property-x86-cet3b"
+run_dump_test "property-x86-cet4a"
+run_dump_test "property-x86-cet4b"
+run_dump_test "property-x86-cet5a"
+run_dump_test "property-x86-cet5b"
+run_dump_test "property-x86-cet6"
 run_dump_test "pie1"
 run_dump_test "pie1-nacl"
 run_dump_test "pr21884"
@@ -469,12 +491,17 @@ run_dump_test "pr23486a"
 run_dump_test "pr23486b"
 run_dump_test "pr23486c"
 run_dump_test "pr23486d"
+run_dump_test "pr23854"
+run_dump_test "pr23930"
+run_dump_test "pr24322a"
+run_dump_test "pr24322b"
 
 if { !([istarget "i?86-*-linux*"]
        || [istarget "i?86-*-gnu*"]
        || [istarget "i?86-*-nacl*"]
        || [istarget "x86_64-*-nacl*"]
        || [istarget "x86_64-*-linux*"]) } {
+    set ASFLAGS "$saved_ASFLAGS"
     return
 }
 
@@ -508,7 +535,7 @@ proc undefined_weak {cflags ldflags} {
        [list \
            "Build libpr19704a.so" \
            "-shared -Wl,-soname,libpr19704.so" \
-           "" \
+           "-Wa,-mrelax-relocations=yes" \
            { dummy.s } \
            {} \
            "libpr19704a.so" \
@@ -516,7 +543,7 @@ proc undefined_weak {cflags ldflags} {
        [list \
            "Build libpr19704b.so" \
            "-shared -Wl,-soname,libpr19704.so" \
-           "-fPIC" \
+           "-fPIC -Wa,-mrelax-relocations=yes" \
            { pr19704b.c } \
            {} \
            "libpr19704b.so" \
@@ -529,7 +556,7 @@ proc undefined_weak {cflags ldflags} {
        [list \
            "Run pr19704" \
            "$ldflags tmpdir/libpr19704.so -Wl,-R,tmpdir" \
-           "" \
+           "-Wa,-mrelax-relocations=yes" \
            { pr19704a.c } \
            "pr19704" \
            "pr19704.out" \
@@ -558,7 +585,7 @@ if { [isnative]
        [list \
            "Build plt-lib.so" \
            "-shared" \
-           "-fPIC" \
+           "-fPIC -Wa,-mrelax-relocations=yes" \
            { plt-lib.c } \
            {} \
            "libplt-lib.so" \
@@ -566,7 +593,7 @@ if { [isnative]
        [list \
            "Build libplt-main1.a" \
            "" \
-           "-fPIC -Wa,-mrelax-relocations=yes" \
+           "-fPIC -Wa,-mrelax-relocations=yes,-mrelax-relocations=yes" \
            { plt-main1.c } \
            {{readelf {-Wr} plt-main1.rd}} \
            "libplt-main1.a" \
@@ -574,7 +601,7 @@ if { [isnative]
        [list \
            "Build libplt-main2.a" \
            "" \
-           "-fPIC -Wa,-mrelax-relocations=yes" \
+           "-fPIC -Wa,-mrelax-relocations=yes,-mrelax-relocations=yes" \
            { plt-main2.c } \
            {{readelf {-Wr} plt-main2.rd}} \
            "libplt-main2.a" \
@@ -582,7 +609,7 @@ if { [isnative]
        [list \
            "Build libplt-main3.a" \
            "" \
-           "-fPIC -Wa,-mrelax-relocations=yes $PLT_CFLAGS" \
+           "-fPIC -Wa,-mrelax-relocations=yes,-mrelax-relocations=yes $PLT_CFLAGS" \
            { plt-main3.c } \
            {{readelf {-Wr} plt-main3.rd}} \
            "libplt-main3.a" \
@@ -590,7 +617,7 @@ if { [isnative]
        [list \
            "Build libplt-main4.a" \
            "" \
-           "-fPIC -Wa,-mrelax-relocations=yes $PLT_CFLAGS" \
+           "-fPIC -Wa,-mrelax-relocations=yes,-mrelax-relocations=yes $PLT_CFLAGS" \
            { plt-main4.c } \
            {{readelf {-Wr} plt-main4.rd}} \
            "libplt-main4.a" \
@@ -599,7 +626,7 @@ if { [isnative]
            "Build plt-main" \
            "tmpdir/plt-main1.o tmpdir/plt-main2.o tmpdir/plt-main3.o \
             tmpdir/plt-main4.o tmpdir/libplt-lib.so" \
-           "" \
+           "-Wa,-mrelax-relocations=yes" \
            { plt-main5.c } \
            {{readelf {-Wr} plt-main.rd}} \
            "plt-main" \
@@ -608,7 +635,7 @@ if { [isnative]
            "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,-mrelax-relocations=yes" \
            { plt-main5.c } \
            {{readelf {-Wr} plt-main.rd}} \
            "plt-main" \
@@ -616,7 +643,7 @@ if { [isnative]
        [list \
            "Build copyreloc-lib.so" \
            "-shared" \
-           "-fPIC" \
+           "-fPIC -Wa,-mrelax-relocations=yes" \
            { copyreloc-lib.c } \
            {} \
            "copyreloc-lib.so" \
@@ -624,7 +651,7 @@ if { [isnative]
        [list \
            "Build libcopyreloc-main.a" \
            "" \
-           "" \
+           "-Wa,-mrelax-relocations=yes" \
            { copyreloc-main.S } \
            {} \
            "libcopyreloc-main.a" \
@@ -632,7 +659,7 @@ if { [isnative]
        [list \
            "Build copyreloc-main with PIE and GOTOFF (1)" \
            "tmpdir/copyreloc-main.o tmpdir/copyreloc-lib.so -pie" \
-           "" \
+           "-Wa,-mrelax-relocations=yes" \
            { dummy.s } \
            {{readelf {-Wr} copyreloc-main1.rd}} \
            "copyreloc-main" \
@@ -640,7 +667,7 @@ if { [isnative]
        [list \
            "Build copyreloc-main with PIE and GOTOFF (2)" \
            "tmpdir/copyreloc-main.o tmpdir/copyreloc-lib.so -pie" \
-           "" \
+           "-Wa,-mrelax-relocations=yes" \
            { dummy.s } \
            {{readelf {-Wr} copyreloc-main2.rd}} \
            "copyreloc-main" \
@@ -648,7 +675,7 @@ if { [isnative]
        [list \
            "Build pr17689.so" \
            "-shared" \
-           "-fPIC" \
+           "-fPIC -Wa,-mrelax-relocations=yes" \
            { pr17689a.c } \
            {} \
            "pr17689.so" \
@@ -656,7 +683,7 @@ if { [isnative]
        [list \
            "Build pr17689.so with -z now" \
            "-shared -Wl,-z,now" \
-           "-fPIC" \
+           "-fPIC -Wa,-mrelax-relocations=yes" \
            { pr17689a.c } \
            {{readelf {-Wr} pr17689now.rd}} \
            "pr17689now.so" \
@@ -664,7 +691,7 @@ if { [isnative]
        [list \
            "Build pr17689ver.so" \
            "-shared -Wl,--version-script,pr17689a.t" \
-           "-fPIC" \
+           "-fPIC -Wa,-mrelax-relocations=yes" \
            { pr17689a.c } \
            {} \
            "pr17689ver.so" \
@@ -672,7 +699,7 @@ if { [isnative]
        [list \
            "Build pr17689.a" \
            "" \
-           "" \
+           "-Wa,-mrelax-relocations=yes" \
            { pr17689b.S } \
            {} \
            "pr17689.a" \
@@ -680,7 +707,7 @@ if { [isnative]
        [list \
            "Build pr17689 with PIE and GOTOFF" \
            "tmpdir/pr17689b.o tmpdir/pr17689.so -pie" \
-           "" \
+           "-Wa,-mrelax-relocations=yes" \
            { dummy.c } \
            {{readelf {-Wr} pr17689.rd}} \
            "pr17689" \
@@ -688,7 +715,7 @@ if { [isnative]
        [list \
            "Build pr17689 with PIE, -z now and GOTOFF" \
            "tmpdir/pr17689b.o tmpdir/pr17689.so -pie -Wl,-z,now" \
-           "" \
+           "-Wa,-mrelax-relocations=yes" \
            { dummy.c } \
            {{readelf {-Wr} pr17689now.rd}} \
            "pr17689now" \
@@ -696,7 +723,7 @@ if { [isnative]
        [list \
            "Build pr17689ver with PIE and GOTOFF" \
            "tmpdir/pr17689b.o tmpdir/pr17689ver.so -pie" \
-           "" \
+           "-Wa,-mrelax-relocations=yes" \
            { dummy.c } \
            {{readelf {-Wr} pr17689ver.rd}} \
            "pr17689ver" \
@@ -704,7 +731,7 @@ if { [isnative]
        [list \
            "Build pr17827 with PIE and GOTOFF" \
            "tmpdir/pr17689b.o tmpdir/pr17689.so -pie" \
-           "" \
+           "-Wa,-mrelax-relocations=yes" \
            { dummy.c } \
            {{readelf {-Wr} pr17827.rd}} \
            "pr17827" \
@@ -712,7 +739,7 @@ if { [isnative]
        [list \
            "Build pr18900.so" \
            "-shared" \
-           "-fPIC" \
+           "-fPIC -Wa,-mrelax-relocations=yes" \
            { pr18900a.c } \
            "" \
            "pr18900.so" \
@@ -720,7 +747,7 @@ if { [isnative]
        [list \
            "Build pr18900.o" \
            "-r -nostdlib" \
-           "" \
+           "-Wa,-mrelax-relocations=yes" \
            { pr18900b.c pr18900c.c } \
            "" \
            "pr18900.o" \
@@ -728,7 +755,7 @@ if { [isnative]
        [list \
            "Build pr18900a" \
            "tmpdir/pr18900.o tmpdir/pr18900.so" \
-           "" \
+           "-Wa,-mrelax-relocations=yes" \
            { dummy.s } \
            {{readelf {-Wrd} pr18900a.rd}} \
            "pr18900a" \
@@ -736,7 +763,7 @@ if { [isnative]
        [list \
            "Build pr18900b" \
            "-Wl,--as-needed tmpdir/pr18900.o tmpdir/pr18900.so" \
-           "" \
+           "-Wa,-mrelax-relocations=yes" \
            { dummy.s } \
            {{readelf {-Wrd} pr18900b.rd}} \
            "pr18900b" \
@@ -744,7 +771,7 @@ if { [isnative]
        [list \
            "Build pr19031.so" \
            "-shared" \
-           "-fPIC" \
+           "-fPIC -Wa,-mrelax-relocations=yes" \
            { pr19031a.c } \
            "" \
            "pr19031.so" \
@@ -752,7 +779,7 @@ if { [isnative]
        [list \
            "Build got1d.so" \
            "-shared" \
-           "" \
+           "-Wa,-mrelax-relocations=yes" \
            { got1d.S } \
            "" \
            "got1d.so" \
@@ -768,7 +795,7 @@ if { [isnative]
        [list \
            "Build gotpc1" \
            "$NOPIE_LDFLAGS -Wl,--as-needed tmpdir/gotpc1.o tmpdir/got1d.so" \
-           "" \
+           "-Wa,-mx86-used-note=no" \
            { dummy.s } \
            {{objdump {-dw} got1.dd}} \
            "got1" \
@@ -776,7 +803,7 @@ if { [isnative]
        [list \
            "Build pr19319.so" \
            "-shared" \
-           "" \
+           "-Wa,-mx86-used-note=no" \
            { pr19319a.S } \
            "" \
            "pr19319.so" \
@@ -789,10 +816,19 @@ if { [isnative]
            {{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" \
@@ -800,15 +836,15 @@ if { [isnative]
        [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" \
@@ -816,7 +852,7 @@ if { [isnative]
        [list \
            "Build property 2" \
            "" \
-           "" \
+           "-Wa,-mx86-used-note=no" \
            {pass.c property-stack.S} \
            {{readelf {-n} property-2.r}} \
            "property-2" \
@@ -824,15 +860,15 @@ if { [isnative]
        [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=no" \
            {pass.c property-stack.S} \
            {{readelf {-n} property-2.r}} \
            "property-2.so" \
@@ -840,7 +876,7 @@ if { [isnative]
        [list \
            "Build property 3" \
            "" \
-           "" \
+           "-Wa,-mx86-used-note=no" \
            {pass.c property-stack.S property-x86-1.S} \
            {{readelf {-n} property-3.r}} \
            "property-3" \
@@ -848,15 +884,15 @@ if { [isnative]
        [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=no" \
            {property-x86-1.S pass.c property-stack.S} \
            {{readelf {-n} property-3.r}} \
            "property-3.so" \
@@ -864,7 +900,7 @@ if { [isnative]
        [list \
            "Build property 4" \
            "" \
-           "" \
+           "-Wa,-mx86-used-note=no" \
            {pass.c property-stack.S property-x86-1.S property-x86-2.S} \
            {{readelf {-n} property-4.r}} \
            "property-4" \
@@ -872,15 +908,15 @@ if { [isnative]
        [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=no" \
            {property-x86-2.S property-x86-1.S pass.c property-stack.S} \
            {{readelf {-n} property-4.r}} \
            "property-4.so" \
@@ -888,7 +924,7 @@ if { [isnative]
        [list \
            "Build property 4 (-Wl,-z,stack-size=0)" \
            "-Wl,-z,stack-size=0" \
-           "" \
+           "-Wa,-mx86-used-note=no" \
            {pass.c property-stack.S property-x86-1.S property-x86-2.S} \
            {{readelf {-n} property-4.r}} \
            "property-4" \
@@ -896,7 +932,7 @@ if { [isnative]
        [list \
            "Build property 5" \
            "-Wl,-z,stack-size=0x900000" \
-           "" \
+           "-Wa,-mx86-used-note=no" \
            {pass.c property-stack.S property-x86-1.S property-x86-2.S} \
            {{readelf {-n} property-5.r}} \
            "property-5" \
@@ -904,15 +940,15 @@ if { [isnative]
        [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=no" \
            {property-x86-2.S property-x86-1.S pass.c property-stack.S} \
            {{readelf {-n} property-5.r}} \
            "property-5.so" \
@@ -920,7 +956,7 @@ if { [isnative]
        [list \
            "Build property-6.so" \
            "-shared" \
-           "-fPIC" \
+           "-fPIC -Wa,-mx86-used-note=no" \
            {property-6a.c property-6c.S} \
            {{readelf {-n} property-6.r}} \
            "property-6.so" \
@@ -928,33 +964,33 @@ if { [isnative]
        [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=no" \
            { 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" \
        ] \
     ]
@@ -964,7 +1000,7 @@ if { [isnative]
            "Run plt-main" \
            "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" \
@@ -973,7 +1009,7 @@ if { [isnative]
            "Run 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" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { plt-main5.c } \
            "plt-main-pie" \
            "plt-main.out" \
@@ -982,7 +1018,7 @@ if { [isnative]
        [list \
            "Run copyreloc-main with PIE and GOTOFF" \
            "-Wl,--as-needed tmpdir/copyreloc-main.o tmpdir/copyreloc-lib.so -pie" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { dummy.s } \
            "copyreloc-main" \
            "copyreloc-main.out" \
@@ -990,7 +1026,7 @@ if { [isnative]
        [list \
            "Run pr17689 with PIE and GOTOFF" \
            "tmpdir/pr17689b.o tmpdir/pr17689.so -pie" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { dummy.c } \
            "pr17689" \
            "pr17689.out" \
@@ -998,7 +1034,7 @@ if { [isnative]
        [list \
            "Run pr17689 with PIE, -z now and GOTOFF" \
            "tmpdir/pr17689b.o tmpdir/pr17689.so -pie -z now" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { dummy.c } \
            "pr17689now" \
            "pr17689.out" \
@@ -1006,7 +1042,7 @@ if { [isnative]
        [list \
            "Run pr17689ver with PIE and GOTOFF" \
            "tmpdir/pr17689b.o tmpdir/pr17689ver.so -pie" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { dummy.c } \
            "pr17689ver" \
            "pr17689.out" \
@@ -1014,7 +1050,7 @@ if { [isnative]
        [list \
            "Run pr18900" \
            "tmpdir/pr18900.o tmpdir/pr18900.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { dummy.s } \
            "pr18900" \
            "pr18900.out" \
@@ -1022,7 +1058,7 @@ if { [isnative]
        [list \
            "Run pr19031" \
            "$NOPIE_LDFLAGS tmpdir/pr19031.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { pr19031b.S pr19031c.c } \
            "pr19031" \
            "pr19031.out" \
@@ -1031,7 +1067,7 @@ if { [isnative]
        [list \
            "Run got1" \
            "$NOPIE_LDFLAGS tmpdir/got1d.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { got1a.S got1b.c got1c.c } \
            "got1" \
            "got1.out" \
@@ -1039,105 +1075,105 @@ if { [isnative]
        [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" \
        ] \
@@ -1161,19 +1197,19 @@ if { [isnative]
        [list \
            "Build ifunc-1a.o ifunc-1b.o ifunc-1c.o ifunc-1d.o" \
            "" \
-           "-fPIC -O2 -g" \
+           "-fPIC -O2 -g -Wa,-mx86-used-note=yes" \
            { ifunc-1a.c ifunc-1b.S ifunc-1c.S ifunc-1d.S } \
        ] \
        [list \
            "Build pr21168a.o" \
            "" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { pr21168a.c } \
        ] \
        [list \
            "Build pr21168.so" \
            "-shared" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { pr21168b.S } \
            "" \
            "pr21168.so" \
@@ -1185,7 +1221,7 @@ if { [isnative]
            "Run ifunc-1a" \
            "tmpdir/ifunc-1a.o tmpdir/ifunc-1b.o \
             tmpdir/ifunc-1c.o tmpdir/ifunc-1d.o" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { dummy.c } \
            "ifunc-1a" \
            "pass.out" \
@@ -1194,7 +1230,7 @@ if { [isnative]
            "Run ifunc-1b" \
            "--static tmpdir/ifunc-1a.o tmpdir/ifunc-1b.o \
            tmpdir/ifunc-1c.o tmpdir/ifunc-1d.o" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { dummy.c } \
            "ifunc-1b" \
            "pass.out" \
@@ -1202,7 +1238,7 @@ if { [isnative]
        [list \
            "Run pr21168" \
            "tmpdir/pr21168a.o tmpdir/pr21168.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { dummy.c } \
            "pr21168" \
            "pass.out" \
@@ -1214,7 +1250,7 @@ if { [isnative]
            [list \
                "Build pr21168.so with -z ibtplt" \
                "-shared -Wl,-z,ibtplt" \
-               "" \
+               "-Wa,-mx86-used-note=yes" \
                { pr21168b.S } \
                "" \
                "pr21168-ibt.so" \
@@ -1223,7 +1259,7 @@ if { [isnative]
                "Build ifunc-1a with -z ibtplt" \
                "-Wl,-z,ibtplt $NOPIE_LDFLAGS tmpdir/ifunc-1a.o \
                 tmpdir/ifunc-1b.o tmpdir/ifunc-1c.o tmpdir/ifunc-1d.o" \
-               "" \
+               "-Wa,-mx86-used-note=yes" \
                { dummy.c } \
                {{objdump {-dw} plt-main-ibt.dd}} \
                "ifunc-1a-ibt" \
@@ -1232,7 +1268,7 @@ if { [isnative]
                "Build ifunc-1a with PIE -z ibtplt" \
                "-Wl,-z,ibtplt -pie tmpdir/ifunc-1a.o \
                 tmpdir/ifunc-1b.o tmpdir/ifunc-1c.o tmpdir/ifunc-1d.o" \
-               "" \
+               "-Wa,-mx86-used-note=yes" \
                { dummy.c } \
                {{objdump {-dw} plt-pie-ibt.dd}} \
                "ifunc-1a-pie-ibt" \
@@ -1244,7 +1280,7 @@ if { [isnative]
                "Run ifunc-1a with -z ibtplt" \
                "-Wl,-z,ibtplt $NOPIE_LDFLAGS tmpdir/ifunc-1a.o \
                 tmpdir/ifunc-1b.o tmpdir/ifunc-1c.o tmpdir/ifunc-1d.o" \
-               "" \
+               "-Wa,-mx86-used-note=yes" \
                { dummy.c } \
                "ifunc-1a-ibt" \
                "pass.out" \
@@ -1253,7 +1289,7 @@ if { [isnative]
                "Run ifunc-1a with PIE -z ibtplt" \
                "-Wl,-z,ibtplt -pie tmpdir/ifunc-1a.o \
                 tmpdir/ifunc-1b.o tmpdir/ifunc-1c.o tmpdir/ifunc-1d.o" \
-               "" \
+               "-Wa,-mx86-used-note=yes" \
                { dummy.c } \
                "ifunc-1a-pie-ibt" \
                "pass.out" \
@@ -1261,7 +1297,7 @@ if { [isnative]
            [list \
                "Run pr21168 with -z ibtplt" \
                "tmpdir/pr21168a.o tmpdir/pr21168-ibt.so" \
-               "" \
+               "-Wa,-mx86-used-note=yes" \
                { dummy.c } \
                "pr21168-ibt" \
                "pass.out" \
@@ -1278,7 +1314,7 @@ if { [isnative]
        [list \
            "Build pr22001-1.so" \
            "-shared" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { pr22001-1a.c } \
            {} \
            "pr22001-1.so" \
@@ -1286,7 +1322,7 @@ if { [isnative]
        [list \
            "Build pr21997-1.so" \
            "-shared" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { property-stack.S property-no-copy.S pr21997-1a.S } \
            {} \
            "pr21997-1.so" \
@@ -1294,7 +1330,7 @@ if { [isnative]
        [list \
            "Build pr22842.so" \
            "-shared" \
-           "-fPIC" \
+           "-fPIC -Wa,-mx86-used-note=yes" \
            { pr22842a.c } \
            {} \
            "pr22842.so" \
@@ -1305,7 +1341,7 @@ if { [isnative]
        [list \
            "Run weakundef1 without PIE" \
            "$NOPIE_LDFLAGS" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { weakundef1.c } \
            "weakundef1pie" \
            "pass.out" \
@@ -1314,7 +1350,7 @@ if { [isnative]
        [list \
            "Run pr22001-1" \
            "$NOPIE_LDFLAGS -Wl,-z,nocopyreloc,--no-as-needed tmpdir/pr22001-1.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { pr22001-1b.c } \
            "pr22001-1" \
            "pass.out" \
@@ -1323,7 +1359,7 @@ if { [isnative]
        [list \
            "Run pr22001-1 (PIE 1)" \
            "$NOPIE_LDFLAGS -Wl,-z,nocopyreloc,--no-as-needed tmpdir/pr22001-1.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { pr22001-1c.S } \
            "pr22001-1-pie-1" \
            "pass.out" \
@@ -1331,7 +1367,7 @@ if { [isnative]
        [list \
            "Run pr22001-1 (PIE 2)" \
            "-pie -Wl,-z,nocopyreloc,--no-as-needed tmpdir/pr22001-1.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { pr22001-1c.S } \
            "pr22001-1-pie-2" \
            "pass.out" \
@@ -1339,7 +1375,7 @@ if { [isnative]
        [list \
            "Run pr22001-1 (PIC 1)" \
            "$NOPIE_LDFLAGS -Wl,-z,nocopyreloc,--no-as-needed tmpdir/pr22001-1.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { pr22001-1b.c } \
            "pr22001-1-pic-1" \
            "pass.out" \
@@ -1348,7 +1384,7 @@ if { [isnative]
        [list \
            "Run pr22001-1 (PIC 2)" \
            "-pie -Wl,-z,nocopyreloc,--no-as-needed tmpdir/pr22001-1.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { pr22001-1b.c } \
            "pr22001-1-pic-2" \
            "pass.out" \
@@ -1357,7 +1393,7 @@ if { [isnative]
        [list \
            "Run pr21997-1" \
            "$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/pr21997-1.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { pr21997-1b.c } \
            "pr21997-1" \
            "pass.out" \
@@ -1366,7 +1402,7 @@ if { [isnative]
        [list \
            "Run pr21997-1 (PIC 1)" \
            "$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/pr21997-1.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { pr21997-1b.c } \
            "pr21997-1-pic-1" \
            "pass.out" \
@@ -1375,7 +1411,7 @@ if { [isnative]
        [list \
            "Run pr21997-1 (PIC 2)" \
            "-pie -Wl,--no-as-needed tmpdir/pr21997-1.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { pr21997-1b.c } \
            "pr21997-1-pic-2" \
            "pass.out" \
@@ -1384,7 +1420,7 @@ if { [isnative]
        [list \
            "Run pr21997-1 (PIE 1)" \
            "$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/pr21997-1.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { pr21997-1c.S } \
            "pr21997-1-pie-1" \
            "pass.out" \
@@ -1392,7 +1428,7 @@ if { [isnative]
        [list \
            "Run pr21997-1 (PIE 2)" \
            "-pie -Wl,--no-as-needed tmpdir/pr21997-1.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { pr21997-1c.S } \
            "pr21997-1-pie-2" \
            "pass.out" \
@@ -1400,11 +1436,20 @@ if { [isnative]
        [list \
            "Build pr22842" \
            "-pie -Wl,--no-as-needed tmpdir/pr22842.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { pr22842b.S } \
            "pr22842" \
            "pass.out" \
        ] \
+       [list \
+           "Run pr23997" \
+           "" \
+           "" \
+           { ../ld-x86-64/pr23997a.s ../ld-x86-64/pr23997b.c \
+             ../ld-x86-64/pr23997c.c } \
+           "pr23997" \
+           "pass.out" \
+       ] \
     ]
 
     if { [at_least_gcc_version 5 0] } {
@@ -1412,7 +1457,7 @@ if { [isnative]
            [list \
                "Run weakundef1 with PIE" \
                "-pie" \
-               "" \
+               "-Wa,-mx86-used-note=yes" \
                { weakundef1.c } \
                "weakundef1pie" \
                "pass.out" \
@@ -1424,6 +1469,7 @@ if { [isnative]
 
 if { !([istarget "i?86-*-linux*"]
        || [istarget "x86_64-*-linux*"]) } {
+    set ASFLAGS "$saved_ASFLAGS"
     return
 }
 
@@ -1442,7 +1488,7 @@ run_ld_link_tests [list \
        "basic PLT generation (PIC, -z now)" \
        "-z now -shared -melf_i386 tmpdir/libpltlib.so" \
        "" \
-       "--32" \
+       "--32 -mx86-used-note=yes" \
        {plt-pic.s} \
        {{objdump -dwr plt-pic2.dd}} \
        "plt-pic2.so" \
@@ -1451,7 +1497,7 @@ run_ld_link_tests [list \
        "Build pr21626.so" \
        "-shared -melf_i386" \
        "" \
-       "--32" \
+       "--32 -mx86-used-note=yes" \
        {property-x86-3.s} \
        "" \
        "pr21626.so" \
@@ -1460,7 +1506,7 @@ run_ld_link_tests [list \
        "Build pr21626" \
        "-melf_i386 tmpdir/pr21626.so" \
        "" \
-       "--32" \
+       "--32 -mx86-used-note=yes" \
        {start.s foo.s} \
        "" \
        "pr21626" \
@@ -1480,3 +1526,5 @@ run_dump_test "ibt-plt-3a"
 run_dump_test "ibt-plt-3b"
 run_dump_test "ibt-plt-3c"
 run_dump_test "ibt-plt-3d"
+
+set ASFLAGS "$saved_ASFLAGS"