X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=ld%2Ftestsuite%2Fld-i386%2Fi386.exp;h=d0b3f69fb8d2baa27931c690bcc930856e9fc394;hb=a7664973b24a242cd9ea17deb5eaf503065fc0bd;hp=243c0a57a1111816b2e9ebf1bad1561a641f0086;hpb=347a87745eab23d8427349787bde4a938a1e8c3e;p=deliverable%2Fbinutils-gdb.git

diff --git a/ld/testsuite/ld-i386/i386.exp b/ld/testsuite/ld-i386/i386.exp
index 243c0a57a1..d0b3f69fb8 100644
--- 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-2021 Free Software Foundation, Inc.
 #
 # This file is part of the GNU Binutils.
 #
@@ -19,6 +19,12 @@
 # MA 02110-1301, USA.
 #
 
+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.
 
@@ -33,7 +39,7 @@ if {[istarget "i?86-*-vxworks"]} {
 	{"VxWorks executable test 1 (dynamic)" \
 	 "tmpdir/libvxworks1.so -Tvxworks1.ld --hash-style=sysv -q --force-dynamic" ""
 	 "" {vxworks1.s}
-	 {{readelf --relocs vxworks1.rd} {objdump -dr vxworks1.dd}}
+	 {{readelf {--relocs --wide} vxworks1.rd} {objdump -dr vxworks1.dd}}
 	 "vxworks1"}
 	{"VxWorks executable test 2 (dynamic)" \
 	 "-Tvxworks1.ld --hash-style=sysv -q --force-dynamic" ""
@@ -99,12 +105,9 @@ if [istarget "*-*-go32*"] {
 }
 
 if { !([istarget "i?86-*-elf*"]
-       || (([istarget "i?86-*-linux*"]
-	    || [istarget "i?86-*-gnu*"])
-	   && ![istarget "*-*-*aout*"]
-	   && ![istarget "*-*-*oldld*"])
-       || [istarget "i?86-*-nacl*"]
-       || [istarget "x86_64-*-nacl*"]
+       || [istarget "i?86-*-linux*"]
+       || [istarget "i?86-*-gnu*"]
+       || [istarget "x86_64-*-elf*"]
        || [istarget "x86_64-*-linux*"]
        || [istarget "amd64-*-linux*"]) } {
     return
@@ -175,7 +178,7 @@ set i386tests {
       {objdump -sj.got tlsbindesc.sd} {objdump -sj.tdata tlsbindesc.td}}
       "tlsbindesc"}
     {"TLS -fno-pic -shared"
-     "-shared -melf_i386 --no-ld-generated-unwind-info \
+     "-shared -melf_i386 --no-ld-generated-unwind-info -z notext \
       -z noseparate-code --hash-style=sysv" ""
      "--32" {tlsnopic1.s tlsnopic2.s}
      {{readelf -Ssrl tlsnopic.rd} {objdump -drj.text tlsnopic.dd}
@@ -191,7 +194,8 @@ set i386tests {
      {{objdump -sj.debug_foobar tlsg.sd}} "tlsg"}
     {"TLS @indntpoff with %eax" "-melf_i386" "" "--32" {tlsindntpoff.s}
      {{objdump -drj.text tlsindntpoff.dd}} "tlsindntpoff"}
-    {"Reloc section order" "-shared -melf_i386 -z nocombreloc" "" "--32"
+    {"Reloc section order"
+     "-shared -melf_i386 -z nocombreloc -z notext" "" "--32"
      {reloc.s} {{objdump -hw reloc.d}} "reloc.so"}
     {"Basic --emit-relocs support" "-shared -melf_i386 --emit-relocs" "" "--32"
      {emit-relocs.s} {{readelf --relocs emit-relocs.rd}} "emit-relocs.so"}
@@ -215,71 +219,66 @@ 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"}
-    {"Build pr19827" "-melf_i386 -pie tmpdir/pr19827a.o tmpdir/pr19827b.so" ""
-     "--32" { dummy.s } {{readelf {-rW} pr19827.rd}} "pr19827"}
-    {"Build pr19827.so" "-melf_i386 -shared -Bsymbolic" ""
-     "--32" { pr19827a.S }  {{readelf {-rW} pr19827.rd}} "pr19827.so"}
-}
-
-# So as to avoid rewriting every last test case here in a nacl variant,
-# we use black magic to massage the generic cases into nacl-variant cases.
-if [istarget "*-*-nacl*"] {
-    # Change all the -melf_i386 to -melf_i386_nacl so linking can succeed.
-    regsub -all elf_i386 $i386tests elf_i386_nacl i386tests
-
-    # Same, applied to all the run_dump_test cases.
-    set options_regsub(ld) {elf_i386 elf_i386_nacl}
-
-    # The section/segment layout differs too much for the vanilla
-    # readelf output files to match.  So massage the cases so that
-    # they refer to a foo-nacl.rd file instead of a foo.rd file.
-    regsub -all {([a-z0-9]+)\.rd} $i386tests {\1-nacl.rd} i386tests
-
-    # Likewise for PLTs.
-    regsub -all -- {([a-z0-9]+)\.pd} $i386tests {\1-nacl.pd} i386tests
+     "--32 -mx86-used-note=yes"
+     { pr19827b.S } {} "pr19827b.so"}
+    {"Build pr19827"
+     "-melf_i386 -pie -z notext tmpdir/pr19827a.o tmpdir/pr19827b.so"
+     ""
+     "--32 -mx86-used-note=yes"
+     { dummy.s } {{readelf {-rW} pr19827.rd}} "pr19827"}
+    {"Build pr19827.so"
+     "-melf_i386 -shared -Bsymbolic -z notext" ""
+     "--32 -mx86-used-note=yes"
+     { pr19827a.S }  {{readelf {-rW} pr19827.rd}} "pr19827.so"}
+    {"Build pr27193a.so"
+     "-melf_i386 -shared" ""
+     "--32"
+     { pr27193a.o.bz2 pr27193b.s }
+     {{objdump {-dw} pr27193.dd}} "pr27193a.so"}
+    {"Build pr27193b.so"
+     "-melf_i386 -shared --reduce-memory-overheads" ""
+     "--32"
+     { pr27193a.o.bz2 pr27193b.s }
+     {{objdump {-dw} pr27193.dd}} "pr27193b.so"}
 }
 
 proc iamcu_tests {} {
-    if {[istarget "*-*-nacl*"]} then {
-	return
-    }
-
     global as
     global srcdir
     global subdir
 
     if ![ld_assemble $as "--32 -march=iamcu $srcdir/$subdir/start.s" tmpdir/startiamcu.o] {
-	unresolved "Build Intel MCU start.o"
+	fail "Build Intel MCU start.o"
 	return
     }
 
     if ![ld_assemble $as "--32 $srcdir/$subdir/start.s" tmpdir/start32.o] {
-	unresolved "Build ia32 start.o"
+	fail "Build ia32 start.o"
 	return
      }
 
     if ![ld_assemble $as "--32 -march=iamcu $srcdir/$subdir/foo.s" tmpdir/fooiamcu.o] {
-	unresolved "Build Intel MCU foo.o"
+	fail "Build Intel MCU foo.o"
 	return
     }
 
     if ![ld_assemble $as "--32 $srcdir/$subdir/foo.s" tmpdir/foo32.o] {
-	unresolved "Build ia32 foo.o"
+	fail "Build ia32 foo.o"
 	return
     }
 
@@ -298,6 +297,7 @@ run_dump_test "abs"
 run_dump_test "pcrel8"
 run_dump_test "pcrel16"
 run_dump_test "pcrel16abs"
+run_dump_test "pcrel16-2"
 run_dump_test "alloc"
 run_dump_test "warn1"
 run_dump_test "tlsgd2"
@@ -353,8 +353,9 @@ run_dump_test "call3g"
 run_dump_test "call3h"
 run_dump_test "jmp1"
 run_dump_test "jmp2"
+run_dump_test "ljmp1"
+run_dump_test "ljmp2"
 run_dump_test "load1"
-run_dump_test "load1-nacl"
 run_dump_test "load2"
 run_dump_test "load3"
 run_dump_test "load4a"
@@ -369,7 +370,6 @@ run_dump_test "pr19636-1a"
 run_dump_test "pr19636-1b"
 run_dump_test "pr19636-1c"
 run_dump_test "pr19636-1d"
-run_dump_test "pr19636-1d-nacl"
 run_dump_test "pr19636-1e"
 run_dump_test "pr19636-1f"
 run_dump_test "pr19636-1g"
@@ -381,11 +381,8 @@ run_dump_test "pr19636-1l"
 run_dump_test "pr19636-2a"
 run_dump_test "pr19636-2b"
 run_dump_test "pr19636-2c"
-run_dump_test "pr19636-2c-nacl"
 run_dump_test "pr19636-2d"
-run_dump_test "pr19636-2d-nacl"
 run_dump_test "pr19636-2e"
-run_dump_test "pr19636-2e-nacl"
 run_dump_test "pr19636-3a"
 run_dump_test "pr19636-3b"
 run_dump_test "pr19636-3c"
@@ -435,6 +432,8 @@ run_dump_test "pr20515"
 run_dump_test "property-x86-3"
 run_dump_test "property-x86-4a"
 run_dump_test "property-x86-4b"
+run_dump_test "property-x86-5"
+run_dump_test "property-x86-6"
 run_dump_test "property-x86-ibt1a"
 run_dump_test "property-x86-ibt1b"
 run_dump_test "property-x86-ibt2"
@@ -449,10 +448,18 @@ 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"
-run_dump_test "pr21884-nacl"
 run_dump_test "pr22115-1a"
 run_dump_test "pr22115-1b"
 run_dump_test "pr22115-1c"
@@ -460,12 +467,36 @@ run_dump_test "pr22115-1d"
 run_dump_test "pr22135"
 run_dump_test "pr22782"
 run_dump_test "pr22929"
+run_dump_test "pr23189"
+run_dump_test "pr23194"
+run_dump_test "pr23372a"
+run_dump_test "pr23372b"
+run_dump_test "pr23372c"
+run_dump_test "pr23372d"
+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"
+run_dump_test "align-branch-1"
+run_dump_test "pr26018"
+run_dump_test "pr26263"
+run_dump_test "pr26711-1"
+run_dump_test "pr26711-2"
+run_dump_test "pr26711-3"
+run_dump_test "property-x86-isa1"
+run_dump_test "property-x86-isa2"
+run_dump_test "property-x86-isa3"
+run_dump_test "property-x86-isa4"
+run_dump_test "pr26869"
 
 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
 }
 
@@ -476,11 +507,17 @@ run_dump_test "pr14215"
 run_dump_test "pr17057"
 run_dump_test "pr17935-1"
 run_dump_test "pr17935-2"
-run_dump_test "pr18801"
+run_dump_test "pr18801a"
+run_dump_test "pr18801b"
+run_dump_test "ifunc-textrel-1a"
+run_dump_test "ifunc-textrel-1b"
+run_dump_test "ifunc-textrel-2a"
+run_dump_test "ifunc-textrel-2b"
 run_dump_test "pr18815"
 run_dump_test "pr19939a"
 run_dump_test "pr19939b"
 run_dump_test "tlsdesc2"
+run_dump_test "report-reloc-1"
 
 proc undefined_weak {cflags ldflags} {
     set testname "Undefined weak symbol"
@@ -499,7 +536,7 @@ proc undefined_weak {cflags ldflags} {
 	[list \
 	    "Build libpr19704a.so" \
 	    "-shared -Wl,-soname,libpr19704.so" \
-	    "" \
+	    "-Wa,-mrelax-relocations=yes" \
 	    { dummy.s } \
 	    {} \
 	    "libpr19704a.so" \
@@ -507,7 +544,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" \
@@ -520,7 +557,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" \
@@ -538,18 +575,15 @@ proc undefined_weak {cflags ldflags} {
     }
 }
 
-# Add $PLT_CFLAGS if PLT is expected.
-global PLT_CFLAGS
-
 # Must be Linux native with the C compiler
 if { [isnative]
      && [istarget "i?86-*-linux*"]
-     && [which $CC] != 0 } {
+     && [check_compiler_available] } {
     run_cc_link_tests [list \
 	[list \
 	    "Build plt-lib.so" \
 	    "-shared" \
-	    "-fPIC" \
+	    "-fPIC -Wa,-mrelax-relocations=yes" \
 	    { plt-lib.c } \
 	    {} \
 	    "libplt-lib.so" \
@@ -557,7 +591,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" \
@@ -565,7 +599,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" \
@@ -573,7 +607,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" \
@@ -581,7 +615,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" \
@@ -590,7 +624,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" \
@@ -599,7 +633,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" \
@@ -607,7 +641,7 @@ if { [isnative]
 	[list \
 	    "Build copyreloc-lib.so" \
 	    "-shared" \
-	    "-fPIC" \
+	    "-fPIC -Wa,-mrelax-relocations=yes" \
 	    { copyreloc-lib.c } \
 	    {} \
 	    "copyreloc-lib.so" \
@@ -615,7 +649,7 @@ if { [isnative]
 	[list \
 	    "Build libcopyreloc-main.a" \
 	    "" \
-	    "" \
+	    "-Wa,-mrelax-relocations=yes" \
 	    { copyreloc-main.S } \
 	    {} \
 	    "libcopyreloc-main.a" \
@@ -623,7 +657,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" \
@@ -631,7 +665,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" \
@@ -639,7 +673,7 @@ if { [isnative]
 	[list \
 	    "Build pr17689.so" \
 	    "-shared" \
-	    "-fPIC" \
+	    "-fPIC -Wa,-mrelax-relocations=yes" \
 	    { pr17689a.c } \
 	    {} \
 	    "pr17689.so" \
@@ -647,7 +681,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" \
@@ -655,7 +689,7 @@ if { [isnative]
 	[list \
 	    "Build pr17689ver.so" \
 	    "-shared -Wl,--version-script,pr17689a.t" \
-	    "-fPIC" \
+	    "-fPIC -Wa,-mrelax-relocations=yes" \
 	    { pr17689a.c } \
 	    {} \
 	    "pr17689ver.so" \
@@ -663,7 +697,7 @@ if { [isnative]
 	[list \
 	    "Build pr17689.a" \
 	    "" \
-	    "" \
+	    "-Wa,-mrelax-relocations=yes" \
 	    { pr17689b.S } \
 	    {} \
 	    "pr17689.a" \
@@ -671,7 +705,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" \
@@ -679,7 +713,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" \
@@ -687,7 +721,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" \
@@ -695,7 +729,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" \
@@ -703,7 +737,7 @@ if { [isnative]
 	[list \
 	    "Build pr18900.so" \
 	    "-shared" \
-	    "-fPIC" \
+	    "-fPIC -Wa,-mrelax-relocations=yes" \
 	    { pr18900a.c } \
 	    "" \
 	    "pr18900.so" \
@@ -711,7 +745,7 @@ if { [isnative]
 	[list \
 	    "Build pr18900.o" \
 	    "-r -nostdlib" \
-	    "" \
+	    "-Wa,-mrelax-relocations=yes" \
 	    { pr18900b.c pr18900c.c } \
 	    "" \
 	    "pr18900.o" \
@@ -719,7 +753,7 @@ if { [isnative]
 	[list \
 	    "Build pr18900a" \
 	    "tmpdir/pr18900.o tmpdir/pr18900.so" \
-	    "" \
+	    "-Wa,-mrelax-relocations=yes" \
 	    { dummy.s } \
 	    {{readelf {-Wrd} pr18900a.rd}} \
 	    "pr18900a" \
@@ -727,7 +761,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" \
@@ -735,7 +769,7 @@ if { [isnative]
 	[list \
 	    "Build pr19031.so" \
 	    "-shared" \
-	    "-fPIC" \
+	    "-fPIC -Wa,-mrelax-relocations=yes" \
 	    { pr19031a.c } \
 	    "" \
 	    "pr19031.so" \
@@ -743,7 +777,7 @@ if { [isnative]
 	[list \
 	    "Build got1d.so" \
 	    "-shared" \
-	    "" \
+	    "-Wa,-mrelax-relocations=yes" \
 	    { got1d.S } \
 	    "" \
 	    "got1d.so" \
@@ -759,7 +793,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" \
@@ -767,7 +801,7 @@ if { [isnative]
 	[list \
 	    "Build pr19319.so" \
 	    "-shared" \
-	    "" \
+	    "-Wa,-mx86-used-note=no" \
 	    { pr19319a.S } \
 	    "" \
 	    "pr19319.so" \
@@ -780,10 +814,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" \
@@ -791,15 +834,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" \
@@ -807,7 +850,7 @@ if { [isnative]
 	[list \
 	    "Build property 2" \
 	    "" \
-	    "" \
+	    "-Wa,-mx86-used-note=no" \
 	    {pass.c property-stack.S} \
 	    {{readelf {-n} property-2.r}} \
 	    "property-2" \
@@ -815,15 +858,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" \
@@ -831,7 +874,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" \
@@ -839,15 +882,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" \
@@ -855,7 +898,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" \
@@ -863,15 +906,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" \
@@ -879,7 +922,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" \
@@ -887,7 +930,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" \
@@ -895,15 +938,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" \
@@ -911,7 +954,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" \
@@ -919,33 +962,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" \
 	] \
     ]
@@ -955,7 +998,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" \
@@ -964,7 +1007,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" \
@@ -973,7 +1016,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" \
@@ -981,7 +1024,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" \
@@ -989,7 +1032,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" \
@@ -997,7 +1040,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" \
@@ -1005,7 +1048,7 @@ if { [isnative]
 	[list \
 	    "Run pr18900" \
 	    "tmpdir/pr18900.o tmpdir/pr18900.so" \
-	    "" \
+	    "-Wa,-mx86-used-note=yes" \
 	    { dummy.s } \
 	    "pr18900" \
 	    "pr18900.out" \
@@ -1013,7 +1056,7 @@ if { [isnative]
 	[list \
 	    "Run pr19031" \
 	    "$NOPIE_LDFLAGS tmpdir/pr19031.so" \
-	    "" \
+	    "-Wa,-mx86-used-note=yes" \
 	    { pr19031b.S pr19031c.c } \
 	    "pr19031" \
 	    "pr19031.out" \
@@ -1022,7 +1065,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" \
@@ -1030,108 +1073,45 @@ 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" \
-	    "" \
-	    "" \
-	    {pass.c property-stack.S property-x86-1.S} \
-	    "property-3" "pass.out" \
-	] \
-	[list \
-	    "Run property 3 (PIE)" \
-	    "-pie" \
-	    "" \
-	    {pass.c property-x86-1.S property-stack.S} \
-	    "property-3-pie" "pass.out" "-fPIE" \
-	] \
-	[list \
-	    "Run property 3 (static)" \
-	    "-static" \
-	    "" \
-	    {property-x86-1.S pass.c property-stack.S} \
-	    "property-3-static" "pass.out" \
-	] \
-	[list \
-	    "Run property 4" \
-	    "" \
-	    "" \
-	    {pass.c property-stack.S property-x86-1.S property-x86-2.S} \
-	    "property-4" "pass.out" \
-	] \
-	[list \
-	    "Run property 4 (PIE)" \
-	    "-pie" \
-	    "" \
-	    {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" \
-	    "" \
-	    {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" \
-	    "" \
-	    {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" \
-	    "" \
-	    {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" \
-	    "" \
-	    {property-x86-2.S property-x86-1.S pass.c property-stack.S} \
-	    "property-5-static" "pass.out" \
-	] \
     ]
 
     undefined_weak "$NOPIE_CFLAGS" "$NOPIE_LDFLAGS"
@@ -1141,30 +1121,28 @@ if { [isnative]
     undefined_weak "-fPIE" "-pie -z nodynamic-undefined-weak"
 }
 
-global NOPIE_CFLAGS NOPIE_LDFLAGS
-
 # Must be native with the C compiler and working IFUNC support,
 if { [isnative]
      && [check_ifunc_available]
      && [istarget "i?86-*-*"]
-     && [which $CC] != 0 } {
+     && [check_compiler_available] } {
     run_cc_link_tests [list \
 	[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" \
@@ -1176,7 +1154,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" \
@@ -1185,7 +1163,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" \
@@ -1193,7 +1171,7 @@ if { [isnative]
 	[list \
 	    "Run pr21168" \
 	    "tmpdir/pr21168a.o tmpdir/pr21168.so" \
-	    "" \
+	    "-Wa,-mx86-used-note=yes" \
 	    { dummy.c } \
 	    "pr21168" \
 	    "pass.out" \
@@ -1205,7 +1183,7 @@ if { [isnative]
 	    [list \
 		"Build pr21168.so with -z ibtplt" \
 		"-shared -Wl,-z,ibtplt" \
-		"" \
+		"-Wa,-mx86-used-note=yes" \
 		{ pr21168b.S } \
 		"" \
 		"pr21168-ibt.so" \
@@ -1214,7 +1192,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" \
@@ -1223,7 +1201,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" \
@@ -1235,7 +1213,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" \
@@ -1244,7 +1222,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" \
@@ -1252,7 +1230,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" \
@@ -1264,12 +1242,12 @@ if { [isnative]
 # Must be native with the C compiler.
 if { [isnative]
      && [istarget "i?86-*-*"]
-     && [which $CC] != 0 } {
+     && [check_compiler_available] } {
     run_cc_link_tests [list \
 	[list \
 	    "Build pr22001-1.so" \
-	    "-shared" \
-	    "" \
+	    "-shared -Wl,-z,notext" \
+	    "-Wa,-mx86-used-note=yes" \
 	    { pr22001-1a.c } \
 	    {} \
 	    "pr22001-1.so" \
@@ -1277,7 +1255,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" \
@@ -1285,7 +1263,7 @@ if { [isnative]
 	[list \
 	    "Build pr22842.so" \
 	    "-shared" \
-	    "-fPIC" \
+	    "-fPIC -Wa,-mx86-used-note=yes" \
 	    { pr22842a.c } \
 	    {} \
 	    "pr22842.so" \
@@ -1296,7 +1274,7 @@ if { [isnative]
 	[list \
 	    "Run weakundef1 without PIE" \
 	    "$NOPIE_LDFLAGS" \
-	    "" \
+	    "-Wa,-mx86-used-note=yes" \
 	    { weakundef1.c } \
 	    "weakundef1pie" \
 	    "pass.out" \
@@ -1304,8 +1282,8 @@ if { [isnative]
 	] \
 	[list \
 	    "Run pr22001-1" \
-	    "$NOPIE_LDFLAGS -Wl,-z,nocopyreloc,--no-as-needed tmpdir/pr22001-1.so" \
-	    "" \
+	    "$NOPIE_LDFLAGS -Wl,-z,nocopyreloc,--no-as-needed,-z,notext tmpdir/pr22001-1.so" \
+	    "-Wa,-mx86-used-note=yes" \
 	    { pr22001-1b.c } \
 	    "pr22001-1" \
 	    "pass.out" \
@@ -1314,7 +1292,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" \
@@ -1322,7 +1300,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" \
@@ -1330,7 +1308,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" \
@@ -1339,7 +1317,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" \
@@ -1347,8 +1325,8 @@ if { [isnative]
 	] \
 	[list \
 	    "Run pr21997-1" \
-	    "$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/pr21997-1.so" \
-	    "" \
+	    "$NOPIE_LDFLAGS -Wl,--no-as-needed,-z,notext tmpdir/pr21997-1.so" \
+	    "-Wa,-mx86-used-note=yes" \
 	    { pr21997-1b.c } \
 	    "pr21997-1" \
 	    "pass.out" \
@@ -1357,7 +1335,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" \
@@ -1366,7 +1344,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" \
@@ -1375,7 +1353,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" \
@@ -1383,7 +1361,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" \
@@ -1391,11 +1369,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] } {
@@ -1403,7 +1390,7 @@ if { [isnative]
 	    [list \
 		"Run weakundef1 with PIE" \
 		"-pie" \
-		"" \
+		"-Wa,-mx86-used-note=yes" \
 		{ weakundef1.c } \
 		"weakundef1pie" \
 		"pass.out" \
@@ -1415,6 +1402,7 @@ if { [isnative]
 
 if { !([istarget "i?86-*-linux*"]
        || [istarget "x86_64-*-linux*"]) } {
+    set ASFLAGS "$saved_ASFLAGS"
     return
 }
 
@@ -1433,7 +1421,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" \
@@ -1442,7 +1430,7 @@ run_ld_link_tests [list \
 	"Build pr21626.so" \
 	"-shared -melf_i386" \
 	"" \
-	"--32" \
+	"--32 -mx86-used-note=yes" \
 	{property-x86-3.s} \
 	"" \
 	"pr21626.so" \
@@ -1451,7 +1439,7 @@ run_ld_link_tests [list \
 	"Build pr21626" \
 	"-melf_i386 tmpdir/pr21626.so" \
 	"" \
-	"--32" \
+	"--32 -mx86-used-note=yes" \
 	{start.s foo.s} \
 	"" \
 	"pr21626" \
@@ -1471,3 +1459,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"