ld: Remove x86 ISA level run-time tests
[deliverable/binutils-gdb.git] / ld / testsuite / ld-x86-64 / x86-64.exp
index 563e782e2e52cedff58af0519edf55087a75adff..232c9dfa3a2dbc56bbdd6a55a23a69ccd651ffd0 100644 (file)
@@ -1,5 +1,5 @@
 # Expect script for ld-x86_64 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.
 #
 # Test x86_64 linking; all types of relocs.  This tests the assembler and
 # tools like objdump as well as the linker.
 
-if { !([istarget "x86_64-*-elf*"]
-       || [istarget "x86_64-*-nacl*"]
-       || [istarget "x86_64-*-linux*"]) } {
+if { !([istarget "x86_64-*-elf*"] || [istarget "x86_64-*-linux*"]) } {
     return
 }
 
-if [istarget "*-*-nacl*"] {
-    set emul "elf_x86_64_nacl"
-} else {
-    set emul "elf_x86_64"
-}
+set emul "elf_x86_64"
+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
@@ -208,9 +204,12 @@ set x86_64tests {
      "--64" { pr19827a.S }}
     {"Build pr19827b.so" "-melf_x86_64 -shared" ""
      "--64" { pr19827b.S } {} "pr19827b.so"}
-    {"Build pr19827" "-melf_x86_64 -pie tmpdir/pr19827a.o tmpdir/pr19827b.so" ""
+    {"Build pr19827"
+     "-melf_x86_64 -pie -z notext tmpdir/pr19827a.o tmpdir/pr19827b.so"
+     ""
      "--64" { dummy.s } {{readelf {-rW} pr19827.rd}} "pr19827"}
-    {"Build pr19827.so" "-melf_x86_64 -shared -Bsymbolic" ""
+    {"Build pr19827.so"
+     "-melf_x86_64 -shared -Bsymbolic -z notext" ""
      "--64" { pr19827a.S }  {{readelf {-rW} pr19827.rd}} "pr19827.so"}
     {"Build pr19969.so" "-melf_x86_64 -shared" ""
      "--64" { pr19969a.S } {} "pr19969.so"}
@@ -218,47 +217,14 @@ set x86_64tests {
      "--64" { pr20550a.s }}
     {"Build pr20550b.so" "-melf_x86_64 -shared" ""
      "--64" { pr20550b.s } {} "pr20550b.so"}
-    {"Build pr20550" "-melf_x86_64 -pie tmpdir/pr20550a.o tmpdir/pr20550b.so" ""
+    {"Build pr20550"
+     "-melf_x86_64 -pie -z notext tmpdir/pr20550a.o tmpdir/pr20550b.so"
+     ""
      "--64" { dummy.s } {} "pr20550"}
 }
 
-# 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*"] {
-    set emul elf_x86_64_nacl
-
-    set lhs {elf(32)?_(i386|x86_64)[[:>:]]}
-    set rhs {&_nacl}
-
-    # Change all the -melf_x86_64 to -melf_x86_64_nacl so linking can succeed.
-    regsub -all -- $lhs $x86_64tests $rhs x86_64tests
-
-    set zlhs {-z noseparate-code -z max-page-size=0x200000}
-    set zrhs {}
-
-    # Remove -z max-page-size=0x200000 -z noseparate-code since they
-    # generate different addresses for nacl targets.
-    regsub -all -- $zlhs $x86_64tests $zrhs x86_64tests
-
-    # Same, applied to all the run_dump_test cases.
-    set options_regsub(ld) [list $lhs $rhs]
-
-    # 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} $x86_64tests {\1-nacl.rd} x86_64tests
-
-    # Likewise for PLTs.
-    regsub -all -- {([a-z0-9]+)\.pd} $x86_64tests {\1-nacl.pd} x86_64tests
-} else {
-    set emul elf_x86_64
-}
-
 run_ld_link_tests $x86_64tests
 
-global link_output
-global ld
-
 set test_name "Mixed x86_64 and i386 input test 1"
 set test mixed1
 if { ![ld_link $ld tmpdir/$test "-m$emul tmpdir/${test}a.o tmpdir/${test}b.o"] } {
@@ -280,6 +246,7 @@ if { ![ld_link $ld tmpdir/$test "-m$emul tmpdir/${test}a.o tmpdir/${test}b.o"] }
 }
 
 run_dump_test "abs"
+run_dump_test "abs-k1om"
 run_dump_test "abs-l1om"
 run_dump_test "apic"
 run_dump_test "pcrel8"
@@ -297,8 +264,10 @@ run_dump_test "hidden4"
 run_dump_test "hidden5"
 run_dump_test "protected1"
 run_dump_test "protected2"
+run_dump_test "protected2-k1om"
 run_dump_test "protected2-l1om"
 run_dump_test "protected3"
+run_dump_test "protected3-k1om"
 run_dump_test "protected3-l1om"
 run_dump_test "protected4"
 run_dump_test "protected5"
@@ -327,7 +296,6 @@ run_dump_test "gotplt1"
 run_dump_test "pie1"
 run_dump_test "pie2"
 run_dump_test "pie3"
-run_dump_test "pie3-nacl"
 run_dump_test "pic1"
 run_dump_test "largecomm-1a"
 run_dump_test "largecomm-1b"
@@ -353,6 +321,10 @@ run_dump_test "property-x86-4b"
 run_dump_test "property-x86-3-x32"
 run_dump_test "property-x86-4a-x32"
 run_dump_test "property-x86-4b-x32"
+run_dump_test "property-x86-5"
+run_dump_test "property-x86-5-x32"
+run_dump_test "property-x86-6"
+run_dump_test "property-x86-6-x32"
 run_dump_test "property-x86-ibt1a"
 run_dump_test "property-x86-ibt1b"
 run_dump_test "property-x86-ibt1a-x32"
@@ -381,8 +353,41 @@ 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 "property-x86-lam-u48-1a"
+run_dump_test "property-x86-lam-u48-1b"
+run_dump_test "property-x86-lam-u48-2"
+run_dump_test "property-x86-lam-u48-3a"
+run_dump_test "property-x86-lam-u48-3b"
+run_dump_test "property-x86-lam-u48-4"
+run_dump_test "property-x86-lam-u48-5"
+run_dump_test "property-x86-lam-u57-1a"
+run_dump_test "property-x86-lam-u57-1b"
+run_dump_test "property-x86-lam-u57-2"
+run_dump_test "property-x86-lam-u57-3a"
+run_dump_test "property-x86-lam-u57-3b"
+run_dump_test "property-x86-lam-u57-4"
+run_dump_test "property-x86-lam-u57-5"
 run_dump_test "pr21884"
-run_dump_test "pr21884-nacl"
 run_dump_test "pr22071"
 run_dump_test "pr22115-1a"
 run_dump_test "pr22115-1a-x32"
@@ -395,38 +400,100 @@ run_dump_test "pr22115-1d-x32"
 run_dump_test "pr22135"
 run_dump_test "pr22782a"
 run_dump_test "pr22782b"
+run_dump_test "pr23189"
+run_dump_test "pr23194"
+run_dump_test "pr23324a"
+run_dump_test "pr23324b"
+run_dump_test "pr23372a"
+run_dump_test "pr23372a-x32"
+run_dump_test "pr23372b"
+run_dump_test "pr23372b-x32"
+run_dump_test "pr23372c"
+run_dump_test "pr23372c-x32"
+run_dump_test "pr23372d"
+run_dump_test "pr23372d-x32"
+run_dump_test "pr23486a"
+run_dump_test "pr23486a-x32"
+run_dump_test "pr23486b"
+run_dump_test "pr23486b-x32"
+run_dump_test "pr23486c"
+run_dump_test "pr23486c-x32"
+run_dump_test "pr23486d"
+run_dump_test "pr23486d-x32"
+run_dump_test "pr23854"
+run_dump_test "pr23930"
+run_dump_test "pr23930-x32"
+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"
+run_dump_test "pr25416-1a"
+run_dump_test "pr25416-2b"
+run_dump_test "pr25416-2a"
+run_dump_test "pr25416-2b"
+run_dump_test "pr25416-3"
+run_dump_test "pr25416-4"
+run_dump_test "pr26018"
+run_dump_test "pr26263"
+run_dump_test "pr26711-1"
+run_dump_test "pr26711-1-x32"
+run_dump_test "pr26711-2"
+run_dump_test "pr26711-2-x32"
+run_dump_test "pr26711-3"
+run_dump_test "pr26711-3-x32"
+run_dump_test "property-x86-isa1"
+run_dump_test "property-x86-isa1-x32"
+run_dump_test "property-x86-isa2"
+run_dump_test "property-x86-isa2-x32"
+run_dump_test "property-x86-isa3"
+run_dump_test "property-x86-isa3-x32"
+run_dump_test "property-x86-isa4"
+run_dump_test "property-x86-isa4-x32"
 
-if { ![istarget "x86_64-*-linux*"] && ![istarget "x86_64-*-nacl*"]} {
+if ![istarget "x86_64-*-linux*"] {
     return
 }
 
 if ![ld_assemble $as "--x32 $srcdir/$subdir/start.s" tmpdir/startx32.o] {
-    unresolved "Build ILP32 start.o"
+    fail "Build ILP32 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 "--64 $srcdir/$subdir/start.s" tmpdir/start64.o] {
-    unresolved "Build LP64 start.o"
+    fail "Build LP64 start.o"
     return
 }
 
 if ![ld_assemble $as "--x32 $srcdir/$subdir/foo.s" tmpdir/foox32.o] {
-    unresolved "Build ILP32 foo.o"
+    fail "Build ILP32 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
 }
 
 if ![ld_assemble $as "--64 $srcdir/$subdir/foo.s" tmpdir/foo64.o] {
-    unresolved "Build LP64 foo.o"
+    fail "Build LP64 foo.o"
     return
 }
 
@@ -435,7 +502,6 @@ run_dump_test "ilp32-1"
 run_dump_test "ilp32-2"
 run_dump_test "ilp32-3"
 run_dump_test "ilp32-4"
-run_dump_test "ilp32-4-nacl"
 run_dump_test "ilp32-5"
 run_dump_test "ilp32-6"
 run_dump_test "ilp32-7"
@@ -483,14 +549,12 @@ run_dump_test "mov2a"
 run_dump_test "mov2b"
 run_dump_test "mov2c"
 run_dump_test "mov2d"
+run_dump_test "ljmp1"
+run_dump_test "ljmp2"
 run_dump_test "load1a"
 run_dump_test "load1b"
 run_dump_test "load1c"
 run_dump_test "load1d"
-run_dump_test "load1a-nacl"
-run_dump_test "load1b-nacl"
-run_dump_test "load1c-nacl"
-run_dump_test "load1d-nacl"
 run_dump_test "load2"
 run_dump_test "call1a"
 run_dump_test "call1b"
@@ -505,11 +569,15 @@ 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 "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 "pr19013"
 run_dump_test "pr19013-x32"
-run_dump_test "pr19013-nacl"
 run_dump_test "pr19162"
 run_dump_test "pr19175"
 run_dump_test "pr18591"
@@ -528,7 +596,6 @@ run_dump_test "pr19636-2a"
 run_dump_test "pr19636-2b"
 run_dump_test "pr19636-2c"
 run_dump_test "pr19636-2d"
-run_dump_test "pr19636-2d-nacl"
 run_dump_test "pr19636-2e"
 run_dump_test "pr19636-2f"
 run_dump_test "pr19636-2g"
@@ -606,7 +673,12 @@ run_dump_test "pr20253-5b"
 run_dump_test "tlsdesc2"
 run_dump_test "pr22048"
 run_dump_test "pr22929"
-run_dump_test "pr23189"
+run_dump_test "pr26939"
+run_dump_test "pr26939-x32"
+run_dump_test "pr27016a"
+run_dump_test "pr27016b"
+run_dump_test "report-reloc-1"
+run_dump_test "report-reloc-1-x32"
 
 proc undefined_weak {cflags ldflags} {
     set testname "Undefined weak symbol"
@@ -664,17 +736,15 @@ proc undefined_weak {cflags ldflags} {
     }
 }
 
-# Add $PLT_CFLAGS if PLT is expected.
-global PLT_CFLAGS
-# Add $NOPIE_CFLAGS and $NOPIE_LDFLAGS if non-PIE is required.
-global NOPIE_CFLAGS NOPIE_LDFLAGS
-
 # Must be native with the C compiler
-if { [isnative] && [which $CC] != 0 } {
-    run_cc_link_tests {
-       {"Helper X32 DSO from x86-64 object" "" "-m64 -fPIC -g"
-        {simple.c} {} "libsimple.a"}
-    }
+if { [isnative] && [check_compiler_available] } {
+    run_cc_link_tests [list \
+       [list \
+           "Helper X32 DSO from x86-64 object" "" \
+           "-m64 $NOSANITIZE_CFLAGS -fPIC -g" \
+           {simple.c} {} "libsimple.a" \
+       ] \
+    ]
 
     set convertx32 "$objcopy -O elf32-x86-64 tmpdir/simple.o tmpdir/simple-x32.o"
     send_log "$convertx32\n"
@@ -685,17 +755,22 @@ if { [isnative] && [which $CC] != 0 } {
        return
     }
 
-    run_ld_link_tests {
-       {"X32 DSO from x86-64 object"
-        "-shared -melf32_x86_64 tmpdir/simple-x32.o" "" "--x32"
-       {dummy.s} {{readelf {-s --wide} x86-64-x32.rd}} "x86-64-x32"}
-    }
+    run_ld_link_tests [list \
+       [list \
+           "X32 DSO from x86-64 object" \
+           "-shared -melf32_x86_64 tmpdir/simple-x32.o" \
+           "$NOSANITIZE_CFLAGS" \
+           "--x32 -mx86-used-note=yes" \
+           {dummy.s} {{readelf {-s --wide} x86-64-x32.rd}} \
+           "x86-64-x32" \
+       ] \
+    ]
 
     run_cc_link_tests [list \
        [list \
            "Build plt-lib.so" \
            "-shared" \
-           "-fPIC" \
+           "-fPIC -Wa,-mx86-used-note=yes" \
            { plt-lib.c } \
            {} \
            "libplt-lib.so" \
@@ -703,7 +778,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" \
@@ -711,7 +786,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" \
@@ -719,7 +794,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" \
@@ -727,7 +802,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" \
@@ -745,7 +820,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" \
@@ -753,7 +828,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" \
@@ -761,7 +836,7 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Build libcopyreloc-main.a" \
            "" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { copyreloc-main.S } \
            {} \
            "libcopyreloc-main.a" \
@@ -769,7 +844,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" \
@@ -777,7 +852,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" \
@@ -785,7 +860,7 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Build pr17689.so" \
            "-shared" \
-           "-fPIC" \
+           "-fPIC -Wa,-mx86-used-note=yes" \
            { pr17689a.c } \
            {} \
            "pr17689.so" \
@@ -793,7 +868,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" \
@@ -801,14 +876,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" \
@@ -816,7 +891,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" \
@@ -824,7 +899,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" \
@@ -832,7 +907,7 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Build pr18900.so" \
            "-shared" \
-           "-fPIC" \
+           "-fPIC -Wa,-mx86-used-note=yes" \
            { pr18900a.c } \
            "" \
            "pr18900.so" \
@@ -840,7 +915,7 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Build pr18900.o" \
            "-r -nostdlib" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { pr18900b.c pr18900c.c } \
            "" \
            "pr18900.o" \
@@ -848,7 +923,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" \
@@ -856,7 +931,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" \
@@ -864,7 +939,7 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Build pr19031.so" \
            "-shared" \
-           "-fPIC" \
+           "-fPIC -Wa,-mx86-used-note=yes" \
            { pr19031a.c } \
            "" \
            "pr19031.so" \
@@ -872,7 +947,7 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Build gotpcrel1d.so" \
            "-shared" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { gotpcrel1d.S } \
            "" \
            "gotpcrel1d.so" \
@@ -880,7 +955,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 \
@@ -888,15 +963,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" \
@@ -904,15 +979,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" \
@@ -920,15 +1004,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" \
@@ -936,7 +1020,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" \
@@ -944,15 +1028,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" \
@@ -960,7 +1044,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" \
@@ -968,15 +1052,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" \
@@ -984,7 +1068,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" \
@@ -992,15 +1076,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" \
@@ -1008,7 +1092,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" \
@@ -1016,7 +1100,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" \
@@ -1024,15 +1108,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" \
@@ -1040,7 +1124,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" \
@@ -1048,47 +1132,47 @@ 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" \
        ] \
        [list \
            "Build pr22001-1a" \
-           "$NOPIE_LDFLAGS -Wl,-z,nocopyreloc,--no-as-needed tmpdir/pr22001-1.so" \
-           "$NOPIE_CFLAGS" \
+           "$NOPIE_LDFLAGS -Wl,-z,nocopyreloc,--no-as-needed,-z,notext tmpdir/pr22001-1.so" \
+           "$NOPIE_CFLAGS -Wa,-mx86-used-note=yes" \
            { pr22001-1b.c } \
            {{error_output "pr22001-1a.err"}} \
            "pr22001-1a" \
@@ -1096,15 +1180,15 @@ 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" \
        ] \
        [list \
            "Build pr21997-1a" \
-           "$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/pr21997-1.so" \
-           "$NOPIE_CFLAGS" \
+           "$NOPIE_LDFLAGS -Wl,--no-as-needed,-z,notext tmpdir/pr21997-1.so" \
+           "$NOPIE_CFLAGS -Wa,-mx86-used-note=yes" \
            { pr21997-1b.c } \
            {{error_output "pr21997-1a.err"}} \
            "pr21997-1a" \
@@ -1112,13 +1196,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" \
@@ -1126,7 +1210,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}} \
@@ -1135,7 +1219,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}} \
@@ -1144,7 +1228,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}} \
@@ -1153,7 +1237,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}} \
@@ -1162,7 +1246,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}} \
@@ -1171,15 +1255,15 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Build pr22791-1.so" \
            "-shared" \
-           "-fPIC" \
+           "-fPIC -Wa,-mx86-used-note=yes" \
            { pr22791-1a.c } \
            {} \
            "pr22791-1.so" \
        ] \
        [list \
            "Build pr22791-1" \
-           "-pie -Wl,--no-as-needed tmpdir/pr22791-1.so" \
-           "$NOPIE_CFLAGS" \
+           "-pie -Wl,--no-as-needed,-z,notext tmpdir/pr22791-1.so" \
+           "$NOPIE_CFLAGS -Wa,-mx86-used-note=yes" \
            { pr22791-1b.s } \
            {{error_output "pr22791-1.err"}} \
            "pr22791-1" \
@@ -1187,13 +1271,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" \
@@ -1201,7 +1285,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" \
@@ -1209,7 +1293,7 @@ if { [isnative] && [which $CC] != 0 } {
        [list \
            "Build pr22842.so" \
            "-shared" \
-           "-fPIC" \
+           "-fPIC -Wa,-mx86-used-note=yes" \
            { pr22842a.c } \
            {} \
            "pr22842.so" \
@@ -1217,7 +1301,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}} \
@@ -1226,11 +1310,56 @@ if { [isnative] && [which $CC] != 0 } {
     ]
 
     if  {[istarget "x86_64-*-linux*-gnux32"]} {
+       run_cc_link_tests [list \
+           [list \
+               "Build pr25416-5b.o (GDesc -maddress-mode=short)" \
+               "" \
+               "-Wa,-mx86-used-note=yes" \
+               { pr25416-5b.s } \
+           ] \
+           [list \
+               "Build pr25416-5b.so (GDesc -> IE -maddress-mode=short)" \
+               "-shared" \
+               "-fPIC -Wa,-mx86-used-note=yes" \
+               { pr25416-5b.s pr25416-5d.s } \
+               {} \
+               "pr25416-5b.so" \
+           ] \
+           [list \
+               "Build pr25416-5c.o (GDesc -maddress-mode=long)" \
+               "" \
+               "-Wa,-mx86-used-note=yes" \
+               { pr25416-5c.s } \
+           ] \
+           [list \
+               "Build pr25416-5c.so (GDesc -> IE -maddress-mode=long)" \
+               "-shared" \
+               "-fPIC -Wa,-mx86-used-note=yes" \
+               { pr25416-5c.s pr25416-5d.s } \
+               {} \
+               "pr25416-5c.so" \
+           ] \
+           [list \
+               "Build pr25416-5d.so (GDesc -maddress-mode=short)" \
+               "-shared" \
+               "-fPIC -Wa,-mx86-used-note=yes" \
+               { pr25416-5b.s pr25416-5e.s } \
+               {} \
+               "pr25416-5d.so" \
+           ] \
+           [list \
+               "Build pr25416-5d.o (IE -maddress-mode=short)" \
+               "" \
+               "-Wa,-mx86-used-note=yes" \
+               { pr25416-5d.s } \
+           ] \
+       ]
+
        run_ld_link_exec_tests [list \
            [list \
                "Run pr22001-1b" \
-               "$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-1c.c } \
                "pr22001-1b" \
                "pass.out" \
@@ -1238,32 +1367,109 @@ if { [isnative] && [which $CC] != 0 } {
            ] \
            [list \
                "Run pr21997-1b" \
-               "$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-1c.c } \
                "pr21997-1b" \
                "pass.out" \
                "$NOPIE_CFLAGS" \
            ] \
+           [list \
+               "Run pr25416-5a (GDesc -> IE -maddress-mode=short)" \
+               "$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/pr25416-5b.so" \
+               "-Wa,-mx86-used-note=yes" \
+               { pr25416-5a.c } \
+               "pr25416-5a" \
+               "pass.out" \
+               "$NOPIE_CFLAGS" \
+           ] \
+           [list \
+               "Run pr25416-5b (GDesc -> LE -maddress-mode=short" \
+               "$NOPIE_LDFLAGS tmpdir/pr25416-5b.o tmpdir/pr25416-5d.o" \
+               "-Wa,-mx86-used-note=yes" \
+               { pr25416-5a.c } \
+               "pr25416-5b" \
+               "pass.out" \
+               "$NOPIE_CFLAGS" \
+           ] \
+           [list \
+               "Run pr25416-5c (GDesc -> IE -maddress-mode=long)" \
+               "$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/pr25416-5c.so" \
+               "-Wa,-mx86-used-note=yes" \
+               { pr25416-5a.c } \
+               "pr25416-5c" \
+               "pass.out" \
+               "$NOPIE_CFLAGS" \
+           ] \
+           [list \
+               "Run pr25416-5d (GDesc -> LE -maddress-mode=long)" \
+               "$NOPIE_LDFLAGS tmpdir/pr25416-5c.o tmpdir/pr25416-5d.o" \
+               "-Wa,-mx86-used-note=yes" \
+               { pr25416-5a.c } \
+               "pr25416-5d" \
+               "pass.out" \
+               "$NOPIE_CFLAGS" \
+           ] \
+           [list \
+               "Run pr25416-5e (GDesc -maddress-mode=short)" \
+               "$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/pr25416-5d.so" \
+               "-Wa,-mx86-used-note=yes" \
+               { pr25416-5a.c } \
+               "pr25416-5e" \
+               "pass.out" \
+               "$NOPIE_CFLAGS" \
+           ] \
+           [list \
+               "Run pr25416-5f (PIE GDesc -> LE -maddress-mode=short)" \
+               "-pie -Wl,-z,notext tmpdir/pr25416-5b.o tmpdir/pr25416-5d.o" \
+               "-Wa,-mx86-used-note=yes" \
+               { pr25416-5a.c } \
+               "pr25416-5f" \
+               "pass.out" \
+           ] \
+           [list \
+               "Run pr25416-5g (PIE GDesc -> LE -maddress-mode=long)" \
+               "-pie -Wl,-z,notext tmpdir/pr25416-5c.o tmpdir/pr25416-5d.o" \
+               "-Wa,-mx86-used-note=yes" \
+               { pr25416-5a.c } \
+               "pr25416-5g" \
+               "pass.out" \
+           ] \
        ]
     } else {
        run_cc_link_tests [list \
            [list \
                "Build pr22001-1b" \
-               "$NOPIE_LDFLAGS -Wl,-z,nocopyreloc,--no-as-needed tmpdir/pr22001-1.so" \
-               "$NOPIE_CFLAGS" \
+               "$NOPIE_LDFLAGS -Wl,-z,nocopyreloc,--no-as-needed,-z,notext tmpdir/pr22001-1.so" \
+               "$NOPIE_CFLAGS -Wa,-mx86-used-note=yes" \
                { pr22001-1c.c } \
                {{error_output "pr22001-1b.err"}} \
                "pr22001-1b" \
            ] \
            [list \
                "Build pr21997-1b" \
-               "$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/pr21997-1.so" \
-               "$NOPIE_CFLAGS" \
+               "$NOPIE_LDFLAGS -Wl,--no-as-needed,-z,notext tmpdir/pr21997-1.so" \
+               "$NOPIE_CFLAGS -Wa,-mx86-used-note=yes" \
                { pr21997-1c.c } \
                {{error_output "pr21997-1b.err"}} \
                "pr21997-1b" \
            ] \
+           [list \
+               "Build lam-u48.so" \
+               "-shared -Wl,-z,lam-u48" \
+               "" \
+               {dummy.s} \
+               {{readelf -n lam-u48.rd}}  \
+               "lam-u48.so" \
+           ] \
+           [list \
+               "Build lam-u57.so" \
+               "-shared -Wl,-z,lam-u57" \
+               "" \
+               {dummy.s} \
+               {{readelf -n lam-u57.rd}}  \
+               "lam-u57.so" \
+           ] \
        ]
     }
 
@@ -1272,7 +1478,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" \
@@ -1281,7 +1487,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" \
@@ -1290,7 +1496,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" \
@@ -1298,7 +1504,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" \
@@ -1306,7 +1512,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" \
@@ -1314,7 +1520,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" \
@@ -1322,7 +1528,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" \
@@ -1331,7 +1537,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" \
@@ -1339,112 +1545,49 @@ 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" \
-           "" \
-           "" \
-           {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" \
-       ] \
        [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" \
@@ -1453,7 +1596,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" \
@@ -1462,7 +1605,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" \
@@ -1471,7 +1614,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" \
@@ -1480,7 +1623,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" \
@@ -1489,7 +1632,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" \
@@ -1498,7 +1641,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" \
@@ -1507,7 +1650,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" \
@@ -1516,7 +1659,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" \
@@ -1525,7 +1668,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" \
@@ -1534,7 +1677,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" \
@@ -1543,7 +1686,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" \
@@ -1551,20 +1694,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.
@@ -1573,7 +1724,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" \
@@ -1581,7 +1732,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" \
@@ -1589,7 +1740,7 @@ if { [isnative] && [which $CC] != 0 } {
            [list \
                "Build pr19784a.o" \
                "" \
-               "" \
+               "-Wa,-mx86-used-note=yes" \
                { pr19784a.c } \
            ] \
        ]
@@ -1598,7 +1749,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" \
@@ -1606,7 +1757,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" \
@@ -1623,7 +1774,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 $NOCF_PROTECTION_CFLAGS" \
                { plt-main5.c } \
                {{objdump {-drw} plt-main-bnd.dd}} \
                "plt-main-bnd" \
@@ -1633,7 +1784,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 $NOCF_PROTECTION_CFLAGS" \
                { plt-main5.c } \
                {{objdump {-drw} plt-main-bnd.dd}} \
                "plt-main-pie-bnd" \
@@ -1643,7 +1794,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 $NOCF_PROTECTION_CFLAGS" \
                { plt-main5.c } \
                {{readelf {-SW} plt-main-bnd-now.rd} {objdump {-drw} plt-main-bnd.dd}} \
                "plt-main-bnd-now" \
@@ -1653,7 +1804,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 $NOCF_PROTECTION_CFLAGS" \
                { plt-main5.c } \
                {{readelf {-SW} plt-main-bnd-now.rd} {objdump {-drw} plt-main-bnd.dd}} \
                "plt-main-pie-bnd-now" \
@@ -1666,7 +1817,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" \
@@ -1676,7 +1827,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" \
@@ -1687,7 +1838,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" \
@@ -1697,7 +1848,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" \
@@ -1706,7 +1857,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" \
@@ -1717,7 +1868,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" \
@@ -1726,7 +1877,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" \
@@ -1750,7 +1901,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" \
@@ -1760,7 +1911,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" \
@@ -1770,7 +1921,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" \
@@ -1780,7 +1931,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" \
@@ -1789,7 +1940,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" \
@@ -1798,7 +1949,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" \
@@ -1811,7 +1962,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" \
@@ -1821,7 +1972,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" \
@@ -1832,7 +1983,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" \
@@ -1842,7 +1993,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" \
@@ -1852,7 +2003,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" \
@@ -1861,7 +2012,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" \
@@ -1873,7 +2024,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" \
@@ -1882,7 +2033,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" \
@@ -1900,6 +2051,7 @@ if { [isnative] && [which $CC] != 0 } {
 }
 
 if { ![istarget "x86_64-*-linux*"]} {
+    set ASFLAGS "$saved_ASFLAGS"
     return
 }
 
@@ -1918,7 +2070,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" \
@@ -1927,7 +2079,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" \
@@ -1935,7 +2087,6 @@ run_ld_link_tests [list \
 ]
 
 # Linux only tests
-global LD_CLASS
 if { "$LD_CLASS" == "64bit" } then {
     # This test needs 64-bit linker.
     run_dump_test "pr17618"
@@ -1970,3 +2121,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"
This page took 0.050152 seconds and 4 git commands to generate.