]> git.ipfire.org Git - thirdparty/binutils-gdb.git/blobdiff - ld/testsuite/ld-x86-64/x86-64.exp
x86: Support Intel Shadow Stack with SHSTK property
[thirdparty/binutils-gdb.git] / ld / testsuite / ld-x86-64 / x86-64.exp
index 8abccd4b8d67f8ef61a48b983b4647a835525c0b..9b83e1c5ce8d84fd111ec40c9a7b60371f53ef43 100644 (file)
@@ -1,5 +1,5 @@
 # Expect script for ld-x86_64 tests
-#   Copyright (C) 2002-2016 Free Software Foundation, Inc.
+#   Copyright (C) 2002-2017 Free Software Foundation, Inc.
 #
 # This file is part of the GNU Binutils.
 #
@@ -55,6 +55,13 @@ set x86_64tests {
      {{readelf -WSsrl tlspic.rd} {objdump -drj.text\ -Mintel64 tlspic.dd}
       {objdump -sj.got tlspic.sd} {objdump -sj.tdata tlspic.td}}
       "libtlspic.so"}
+    {"TLS -fpic -shared transitions with r15 as GOT base"
+     "-shared -melf_x86_64 --no-ld-generated-unwind-info" ""
+     "--64 -mrelax-relocations=yes"
+     {tlspic3.s tlspic2.s}
+     {{readelf -WSsrl tlspic2.rd} {objdump -drj.text\ -Mintel64 tlspic2.dd}
+      {objdump -sj.got tlspic2.sd} {objdump -sj.tdata tlspic2.td}}
+      "libtlspic2.so"}
     {"TLS descriptor -fpic -shared transitions"
      "-shared -melf_x86_64 --no-ld-generated-unwind-info" ""
      "--64" {tlsdesc.s tlspic2.s}
@@ -69,6 +76,12 @@ set x86_64tests {
      {{readelf -WSsrl tlsbin.rd} {objdump -drj.text tlsbin.dd}
       {objdump -sj.got tlsbin.sd} {objdump -sj.tdata tlsbin.td}}
       "tlsbin"}
+    {"TLS -fpic and -fno-pic exec transitions without PLT"
+     "-melf_x86_64 tmpdir/libtlslib.so --no-ld-generated-unwind-info" ""
+     "-mrelax-relocations=yes --64" {tlsbinpic2.s tlsbin.s}
+     {{readelf -WSsrl tlsbin2.rd} {objdump -drj.text tlsbin2.dd}
+      {objdump -sj.got tlsbin2.sd} {objdump -sj.tdata tlsbin2.td}}
+      "tlsbin2"}
     {"TLS descriptor -fpic and -fno-pic exec transitions"
      "-melf_x86_64 tmpdir/libtlslib.so --no-ld-generated-unwind-info" ""
      "--64" {tlsbindesc.s tlsbin.s}
@@ -114,12 +127,20 @@ set x86_64tests {
      "--64" {tlsgd5b.s} {} "libtlsgd5.so"}
     {"TLS GD->IE transition" "-melf_x86_64 tmpdir/libtlsgd5.so" ""
      "--64" {tlsgd5a.s}
-     {{objdump -dwr tlsgd5.dd}} "tlsgd5"}
+     {{objdump -dwr tlsgd5.dd}} "tlsgd5a"}
+    {"TLS GD->IE transition without PLT"
+     "-melf_x86_64 tmpdir/libtlsgd5.so" ""
+     "-mrelax-relocations=yes --64" {tlsgd5c.s}
+     {{objdump -dwr tlsgd5.dd}} "tlsgd5b"}
     {"Helper TLS X32 GD->IE transition DSO" "-shared -melf32_x86_64" ""
      "--x32" {tlsgd6b.s} {} "libtlsgd6.so"}
     {"TLS X32 GD->IE transition" "-melf32_x86_64 tmpdir/libtlsgd6.so" ""
      "--x32" {tlsgd6a.s}
-     {{objdump -dwr tlsgd6.dd}} "tlsgd6"}
+     {{objdump -dwr tlsgd6.dd}} "tlsgd6a"}
+    {"TLS X32 GD->IE transition without PLT"
+     "-melf32_x86_64 tmpdir/libtlsgd6.so" ""
+     "-mrelax-relocations=yes --x32" {tlsgd6c.s}
+     {{objdump -dwr tlsgd6.dd}} "tlsgd6b"}
     {"TLS X32 LD->LE transition" "-melf32_x86_64" ""
      "--x32" {tlsld2.s}
      {{objdump -dwr tlsld2.dd}} "tlsld2"}
@@ -129,10 +150,38 @@ set x86_64tests {
     {"TLS -mcmodel=large LD->LE transition" "-melf_x86_64" ""
      "--64" {tlsld3.s}
      {{objdump -dwr tlsld3.dd}} "tlsld3"}
+    {"TLS -mcmodel=large LD->LE transition with r15 as GOT base"
+     "-melf_x86_64" ""
+     "--64" {tlsld4.s}
+     {{objdump -dwr tlsld4.dd}} "tlsld4"}
+    {"TLS LD->LE transition without PLT"
+     "-melf_x86_64" ""
+     "--64 -mrelax-relocations=yes"
+     {tlsld5.s}
+     {{objdump -dwr tlsld5.dd}} "tlsld5"}
+    {"TLS X32 LD->LE transition without PLT" "-melf32_x86_64" ""
+     "--x32 -mrelax-relocations=yes"
+     {tlsld6.s}
+     {{objdump -dwr tlsld6.dd}} "tlsld6"}
     {"TLS -mcmodel=large GD->IE transition" "-melf_x86_64 tmpdir/libtlsgd5.so" ""
      "--64" {tlsgd8.s}
      {{objdump -dwrj.text tlsgd8.dd}} "tlsgd8"}
-
+    {"TLS -mcmodel=large GD->LE transition with r15 as GOT base"
+     "-melf_x86_64" ""
+     "--64" {tlsgd9.s}
+     {{objdump -dwr tlsgd9.dd}} "tlsgd9"}
+    {"TLS -mcmodel=large GD->IE transition with r15 as GOT base"
+     "-melf_x86_64 tmpdir/libtlsgd5.so" ""
+     "--64" {tlsgd10.s}
+     {{objdump -dwrj.text tlsgd10.dd}} "tlsgd10"}
+    {"TLS GD->LE transition without PLT"
+     "-melf_x86_64" ""
+     "--64" {tlsgd11.s}
+     {{objdump -dwr tlsgd11.dd}} "tlsgd11"}
+    {"TLS X32 GD->LE transition without PLT"
+     "-melf32_x86_64" ""
+     "--x32" {tlsgd14.s}
+     {{objdump -dwr tlsgd14.dd}} "tlsgd14"}
      {"build 32-bit object with 33 locals" "-melf_x86_64 -e 0" "" "--32" {32bit.s} {{ ld incompatible.l }} "dummy" }
      {"build 64-bit object" "-melf_x86_64 -e 0 --defsym foo=1" "" "--64" {64bit.s} {} "dummy" }
      {"link mixed objects"  "-melf_x86_64 -e 0 tmpdir/32bit.o tmpdir/64bit.o" "" "" {} { { ld incompatible.l } } "mixed"}
@@ -156,6 +205,14 @@ set x86_64tests {
      "--64" { dummy.s } {{readelf {-rW} pr19827.rd}} "pr19827"}
     {"Build pr19827.so" "-melf_x86_64 -shared -Bsymbolic" ""
      "--64" { pr19827a.S }  {{readelf {-rW} pr19827.rd}} "pr19827.so"}
+    {"Build pr19969.so" "-melf_x86_64 -shared" ""
+     "--64" { pr19969a.S } {} "pr19969.so"}
+    {"Build pr20550a.o" "" ""
+     "--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" ""
+     "--64" { dummy.s } {} "pr20550"}
 }
 
 # So as to avoid rewriting every last test case here in a nacl variant,
@@ -190,7 +247,7 @@ global ld
 
 set test_name "Mixed x86_64 and i386 input test 1"
 set test mixed1
-if { ![ld_simple_link $ld tmpdir/$test "-m$emul tmpdir/${test}a.o tmpdir/${test}b.o"] } {
+if { ![ld_link $ld tmpdir/$test "-m$emul tmpdir/${test}a.o tmpdir/${test}b.o"] } {
     if [string match "*i386* architecture of input file `tmpdir/${test}b.o' is incompatible with i386:x86-64* output*" $link_output] {
        pass "$test_name"
     } {
@@ -200,7 +257,7 @@ if { ![ld_simple_link $ld tmpdir/$test "-m$emul tmpdir/${test}a.o tmpdir/${test}
 
 set test_name "Mixed x86_64 and i386 input test 2"
 set test mixed2
-if { ![ld_simple_link $ld tmpdir/$test "-m$emul tmpdir/${test}a.o tmpdir/${test}b.o"] } {
+if { ![ld_link $ld tmpdir/$test "-m$emul tmpdir/${test}a.o tmpdir/${test}b.o"] } {
     if [string match "*i386* architecture of input file `tmpdir/${test}b.o' is incompatible with i386:x86-64* output*" $link_output] {
        pass "$test_name"
     } {
@@ -214,6 +271,8 @@ run_dump_test "pcrel8"
 run_dump_test "pcrel16"
 run_dump_test "tlsgd2"
 run_dump_test "tlsgd3"
+run_dump_test "tlsgd12"
+run_dump_test "tlsgd13"
 run_dump_test "tlsie2"
 run_dump_test "tlsie3"
 run_dump_test "hidden1"
@@ -234,6 +293,9 @@ run_dump_test "protected7a"
 run_dump_test "protected7b"
 run_dump_test "tlsle1"
 run_dump_test "tlspie1"
+run_dump_test "tlspie2a"
+run_dump_test "tlspie2b"
+run_dump_test "tlspie2c"
 run_dump_test "unique1"
 run_dump_test "nogot1"
 run_dump_test "nogot2"
@@ -247,6 +309,8 @@ run_dump_test "pr14215"
 run_dump_test "pr14207"
 run_dump_test "gotplt1"
 run_dump_test "pie1"
+run_dump_test "pie2"
+run_dump_test "pic1"
 run_dump_test "largecomm-1a"
 run_dump_test "largecomm-1b"
 run_dump_test "largecomm-1c"
@@ -262,6 +326,43 @@ run_dump_test "pr19807-2b"
 run_dump_test "pr19807-2c"
 run_dump_test "pr19807-2d"
 run_dump_test "pr19807-2e"
+run_dump_test "pr19969"
+run_dump_test "pr20093-1"
+run_dump_test "pr20093-2"
+run_dump_test "property-x86-3"
+run_dump_test "property-x86-4a"
+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-ibt1a"
+run_dump_test "property-x86-ibt1b"
+run_dump_test "property-x86-ibt1a-x32"
+run_dump_test "property-x86-ibt1b-x32"
+run_dump_test "property-x86-ibt2"
+run_dump_test "property-x86-ibt2-x32"
+run_dump_test "property-x86-ibt3a"
+run_dump_test "property-x86-ibt3b"
+run_dump_test "property-x86-ibt3a-x32"
+run_dump_test "property-x86-ibt3b-x32"
+run_dump_test "property-x86-ibt4"
+run_dump_test "property-x86-ibt4-x32"
+run_dump_test "property-x86-ibt5"
+run_dump_test "property-x86-ibt5-x32"
+run_dump_test "property-x86-shstk1a"
+run_dump_test "property-x86-shstk1b"
+run_dump_test "property-x86-shstk1a-x32"
+run_dump_test "property-x86-shstk1b-x32"
+run_dump_test "property-x86-shstk2"
+run_dump_test "property-x86-shstk2-x32"
+run_dump_test "property-x86-shstk3a"
+run_dump_test "property-x86-shstk3b"
+run_dump_test "property-x86-shstk3a-x32"
+run_dump_test "property-x86-shstk3b-x32"
+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"
 
 if { ![istarget "x86_64-*-linux*"] && ![istarget "x86_64-*-nacl*"]} {
     return
@@ -358,6 +459,7 @@ 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"
 run_dump_test "call1c"
@@ -440,6 +542,29 @@ run_dump_test "pr19609-7c"
 run_dump_test "pr19609-7d"
 run_dump_test "pr19939a"
 run_dump_test "pr19939b"
+run_dump_test "pr19719"
+run_dump_test "pr20253-1a"
+run_dump_test "pr20253-1b"
+run_dump_test "pr20253-1c"
+run_dump_test "pr20253-1d"
+run_dump_test "pr20253-1e"
+run_dump_test "pr20253-1f"
+run_dump_test "pr20253-1g"
+run_dump_test "pr20253-1h"
+run_dump_test "pr20253-1i"
+run_dump_test "pr20253-1j"
+run_dump_test "pr20253-1k"
+run_dump_test "pr20253-1l"
+run_dump_test "pr20253-3"
+run_dump_test "pr20253-4a"
+run_dump_test "pr20253-4b"
+run_dump_test "pr20253-4c"
+run_dump_test "pr20253-4d"
+run_dump_test "pr20253-4e"
+run_dump_test "pr20253-4f"
+run_dump_test "pr20253-5a"
+run_dump_test "pr20253-5b"
+run_dump_test "tlsdesc2"
 
 proc undefined_weak {cflags ldflags} {
     set testname "Undefined weak symbol"
@@ -448,7 +573,7 @@ proc undefined_weak {cflags ldflags} {
     }
 
     if { [ regexp "\-fPIE" $cflags]
-        && ![ regexp "\-z nodynamic-undefined-weak" $ldflags] } {
+        && ![ regexp "nodynamic-undefined-weak" $ldflags] } {
        set weak_symbol "Weak defined"
     } else {
        set weak_symbol "Weak undefined"
@@ -475,10 +600,10 @@ proc undefined_weak {cflags ldflags} {
 
     exec cp tmpdir/libpr19704a.so tmpdir/libpr19704.so
 
-    run_ld_link_exec_tests [] [list \
+    run_ld_link_exec_tests [list \
        [list \
            "Run pr19704" \
-           "$ldflags tmpdir/libpr19704.so -R tmpdir" \
+           "-Wl,--no-as-needed,-R,tmpdir $ldflags tmpdir/libpr19704.so" \
            "" \
            { pr19704a.c } \
            "pr19704" \
@@ -499,6 +624,8 @@ 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 } {
@@ -630,26 +757,33 @@ if { [isnative] && [which $CC] != 0 } {
            "pr17689now.so" \
        ] \
        [list \
-           "Build pr17689 with PIE without -fPIE" \
-           "tmpdir/pr17689.so -pie" \
+           "Build pr17689b.o" \
+           "" \
            "" \
            { pr17689b.S } \
+           {} \
+       ] \
+       [list \
+           "Build pr17689 with PIE without -fPIE" \
+           "tmpdir/pr17689b.o tmpdir/pr17689.so -pie" \
+           "" \
+           { dummy.s } \
            {{readelf {-Wr} pr17689.rd}} \
            "pr17689" \
        ] \
        [list \
            "Build pr17689 with PIE -z now without -fPIE" \
-           "tmpdir/pr17689.so -pie -Wl,-z,now" \
+           "tmpdir/pr17689b.o tmpdir/pr17689.so -pie -Wl,-z,now" \
            "" \
-           { pr17689b.S } \
+           { dummy.s } \
            {{readelf {-Wr} pr17689now.rd}} \
            "pr17689now" \
        ] \
        [list \
            "Build pr17827 with PIE without -fPIE" \
-           "tmpdir/pr17689.so -pie" \
+           "-Wl,--as-needed tmpdir/pr17689b.o tmpdir/pr17689.so -pie" \
            "" \
-           { pr17689b.S } \
+           { dummy.s } \
            {{readelf {-Wr} pr17827.rd}} \
            "pr17827" \
        ] \
@@ -702,10 +836,18 @@ if { [isnative] && [which $CC] != 0 } {
            "gotpcrel1d.so" \
        ] \
        [list \
-           "Build gotpcrel1" \
-           "tmpdir/gotpcrel1d.so" \
+           "Build gotpcrel1a.o gotpcrel1b.o gotpcrel1c.o" \
+           "" \
            "-Wa,-mrelax-relocations=yes" \
            { gotpcrel1a.S gotpcrel1b.c gotpcrel1c.c } \
+       ] \
+       [list \
+           "Build gotpcrel1" \
+           "$NOPIE_LDFLAGS -Wl,--as-needed tmpdir/gotpcrel1a.o \
+            tmpdir/gotpcrel1b.o tmpdir/gotpcrel1c.o \
+            tmpdir/gotpcrel1d.so" \
+           { dummy.s } \
+           "" \
            {{objdump {-dw} gotpcrel1.dd}} \
            "gotpcrel1" \
        ] \
@@ -725,13 +867,181 @@ if { [isnative] && [which $CC] != 0 } {
            {{objdump {-dw} pr19319.dd}} \
            "pr19319" \
        ] \
+       [list \
+           "Build property 1" \
+           "" \
+           "" \
+           {pass.c property-no-copy.S} \
+           {{readelf {-n} property-1.r}} \
+           "property-1" \
+       ] \
+       [list \
+           "Build property 1 (.o)" \
+           "-r -nostdlib" \
+           "" \
+           {pass.c property-no-copy.S} \
+           {{readelf {-n} property-1.r}} \
+           "property-1.o" \
+       ] \
+       [list \
+           "Build property 1 (.so)" \
+           "-shared" \
+           "-fPIC" \
+           {pass.c property-no-copy.S} \
+           {{readelf {-n} property-1.r}} \
+           "property-1.so" \
+       ] \
+       [list \
+           "Build property 2" \
+           "" \
+           "" \
+           {pass.c property-stack.S} \
+           {{readelf {-n} property-2.r}} \
+           "property-2" \
+       ] \
+       [list \
+           "Build property 2 (.o)" \
+           "-r -nostdlib" \
+           "" \
+           {pass.c property-stack.S} \
+           {{readelf {-n} property-2.r}} \
+           "property-2.o" \
+       ] \
+       [list \
+           "Build property 2 (.so)" \
+           "-shared" \
+           "-fPIC" \
+           {pass.c property-stack.S} \
+           {{readelf {-n} property-2.r}} \
+           "property-2.so" \
+       ] \
+       [list \
+           "Build property 3" \
+           "" \
+           "" \
+           {pass.c property-stack.S property-x86-1.S} \
+           {{readelf {-n} property-3.r}} \
+           "property-3" \
+       ] \
+       [list \
+           "Build property 3 (.o)" \
+           "-r -nostdlib" \
+           "" \
+           {pass.c property-x86-1.S property-stack.S} \
+           {{readelf {-n} property-3.r}} \
+           "property-3.o" \
+       ] \
+       [list \
+           "Build property 3 (.so)" \
+           "-shared" \
+           "-fPIC" \
+           {property-x86-1.S pass.c property-stack.S} \
+           {{readelf {-n} property-3.r}} \
+           "property-3.so" \
+       ] \
+       [list \
+           "Build property 4" \
+           "" \
+           "" \
+           {pass.c property-stack.S property-x86-1.S property-x86-2.S} \
+           {{readelf {-n} property-4.r}} \
+           "property-4" \
+       ] \
+       [list \
+           "Build property 4 (.o)" \
+           "-r -nostdlib" \
+           "" \
+           {pass.c property-x86-2.S property-x86-1.S property-stack.S} \
+           {{readelf {-n} property-4.r}} \
+           "property-4.o" \
+       ] \
+       [list \
+           "Build property 4 (.so)" \
+           "-shared" \
+           "-fPIC" \
+           {property-x86-2.S property-x86-1.S pass.c property-stack.S} \
+           {{readelf {-n} property-4.r}} \
+           "property-4.so" \
+       ] \
+       [list \
+           "Build property 4 (-Wl,-z,stack-size=0)" \
+           "-Wl,-z,stack-size=0" \
+           "" \
+           {pass.c property-stack.S property-x86-1.S property-x86-2.S} \
+           {{readelf {-n} property-4.r}} \
+           "property-4" \
+       ] \
+       [list \
+           "Build property 5" \
+           "-Wl,-z,stack-size=0x900000" \
+           "" \
+           {pass.c property-stack.S property-x86-1.S property-x86-2.S} \
+           {{readelf {-n} property-5.r}} \
+           "property-5" \
+       ] \
+       [list \
+           "Build property 5 (.o)" \
+           "-r -nostdlib -Wl,-z,stack-size=0x900000" \
+           "" \
+           {pass.c property-x86-2.S property-x86-1.S property-stack.S} \
+           {{readelf {-n} property-5.r}} \
+           "property-5.o" \
+       ] \
+       [list \
+           "Build property 5 (.so)" \
+           "-shared -Wl,-z,stack-size=0x900000" \
+           "-fPIC" \
+           {property-x86-2.S property-x86-1.S pass.c property-stack.S} \
+           {{readelf {-n} property-5.r}} \
+           "property-5.so" \
+       ] \
+       [list \
+           "Build property-6.so" \
+           "-shared" \
+           "-fPIC" \
+           {property-6a.c property-6c.S} \
+           {{readelf {-n} property-6.r}} \
+           "property-6.so" \
+       ] \
+       [list \
+           "Build property-6.o" \
+           "-r -nostdlib" \
+           "" \
+           {property-6b.c property-stack.S} \
+           {{readelf {-n} property-2.r}} \
+           "property-6.o" \
+       ] \
+       [list \
+           "Build property-6" \
+           "-Wl,--as-needed tmpdir/property-6.o tmpdir/property-6.so" \
+           { dummy.s } \
+           "" \
+           {{readelf {-n} property-2.r}} \
+           "property-6" \
+       ] \
+       [list \
+           "Build property 7a (.o)" \
+           "-r -nostdlib" \
+           "" \
+           {property-unsorted-1.S} \
+           {{readelf {-n} property-7.r}} \
+           "property-7a.o" \
+       ] \
+       [list \
+           "Build property 7b (.o)" \
+           "-r -nostdlib" \
+           "" \
+           {property-unsorted-2.S} \
+           {{readelf {-n} property-7.r}} \
+           "property-7b.o" \
+       ] \
     ]
 
-    run_ld_link_exec_tests [] [list \
+    run_ld_link_exec_tests [list \
        [list \
            "Run plt-main" \
-           "tmpdir/plt-main1.o tmpdir/plt-main2.o tmpdir/plt-main3.o \
-            tmpdir/plt-main4.o tmpdir/libplt-lib.so" \
+           "-Wl,--no-as-needed tmpdir/plt-main1.o tmpdir/plt-main2.o \
+            tmpdir/plt-main3.o tmpdir/plt-main4.o tmpdir/libplt-lib.so" \
            "" \
            { plt-main5.c } \
            "plt-main" \
@@ -739,8 +1049,8 @@ if { [isnative] && [which $CC] != 0 } {
        ] \
        [list \
            "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" \
+           "-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" \
            "" \
            { plt-main5.c } \
            "plt-main-pie" \
@@ -749,7 +1059,7 @@ if { [isnative] && [which $CC] != 0 } {
        ] \
        [list \
            "Run copyreloc-main with PIE without -fPIE" \
-           "--as-needed tmpdir/copyreloc-main.o tmpdir/copyreloc-lib.so -pie" \
+           "-Wl,--as-needed -pie tmpdir/copyreloc-main.o tmpdir/copyreloc-lib.so" \
            "" \
            { dummy.s } \
            "copyreloc-main" \
@@ -757,23 +1067,23 @@ if { [isnative] && [which $CC] != 0 } {
        ] \
        [list \
            "Run pr17689 with PIE without -fPIE" \
-           "tmpdir/pr17689.so -pie" \
+           "-Wl,--no-as-needed -pie tmpdir/pr17689b.o tmpdir/pr17689.so" \
            "" \
-           { pr17689b.S } \
+           { dummy.s } \
            "pr17689" \
            "pr17689.out" \
        ] \
        [list \
            "Run pr17689 with PIE -z now without -fPIE" \
-           "tmpdir/pr17689.so -pie -z now" \
+           "-Wl,--as-needed,-z,now -pie tmpdir/pr17689b.o tmpdir/pr17689.so" \
            "" \
-           { pr17689b.S } \
+           { dummy.s } \
            "pr17689now" \
            "pr17689.out" \
        ] \
        [list \
            "Run pr18900" \
-           "tmpdir/pr18900.o tmpdir/pr18900.so" \
+           "-Wl,--no-as-needed tmpdir/pr18900.o tmpdir/pr18900.so" \
            "" \
            { dummy.s } \
            "pr18900" \
@@ -781,22 +1091,175 @@ if { [isnative] && [which $CC] != 0 } {
        ] \
        [list \
            "Run pr19031" \
-           "tmpdir/pr19031.so" \
+           "$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/pr19031.so" \
            "" \
            { pr19031b.S pr19031c.c } \
            "pr19031" \
            "pr19031.out" \
+           "$NOPIE_CFLAGS" \
        ] \
        [list \
            "Run gotpcrel1" \
-           "tmpdir/gotpcrel1d.so" \
+           "-Wl,--no-as-needed tmpdir/gotpcrel1d.so" \
            "" \
            { gotpcrel1a.S gotpcrel1b.c gotpcrel1c.c } \
            "gotpcrel1" \
            "gotpcrel1.out" \
        ] \
+       [list \
+           "Run property 1" \
+           "" \
+           "" \
+           {pass.c property-no-copy.S} \
+           "property-1" "pass.out" \
+       ] \
+       [list \
+           "Run property 1 (PIE)" \
+           "-pie" \
+           "" \
+           {pass.c property-no-copy.S} \
+           "property-1-pie" "pass.out" "-fPIE" \
+       ] \
+       [list \
+           "Run property 1 (static)" \
+           "-static" \
+           "" \
+           {pass.c property-no-copy.S} \
+           "property-1-static" "pass.out" \
+       ] \
+       [list \
+           "Run property 2" \
+           "" \
+           "" \
+           {pass.c property-stack.S} \
+           "property-2" "pass.out" \
+       ] \
+       [list \
+           "Run property 2 (PIE)" \
+           "-pie" \
+           "" \
+           {pass.c property-stack.S} \
+           "property-2-pie" "pass.out" "-fPIE" \
+       ] \
+       [list \
+           "Run property 2 (static)" \
+           "-static" \
+           "" \
+           {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" \
+       ] \
     ]
 
+    # Run-time tests which require working ifunc attribute support.
+    if { [check_ifunc_attribute_available] } {
+       run_cc_link_tests [list \
+           [list \
+               "Build libpr19784a.so" \
+               "-shared -Wl,-Bsymbolic-functions" \
+               "-fPIC -O2 -g" \
+               { pr19784b.c pr19784c.c } \
+               {} \
+               "libpr19784a.so" \
+           ] \
+           [list \
+               "Build libpr19784b.so" \
+               "-shared -Wl,-Bsymbolic-functions" \
+               "-fPIC -O2 -g" \
+               { pr19784c.c pr19784b.c } \
+               {} \
+               "libpr19784b.so" \
+           ] \
+           [list \
+               "Build pr19784a.o" \
+               "" \
+               "" \
+               { pr19784a.c } \
+           ] \
+       ]
+
+       run_ld_link_exec_tests [list \
+           [list \
+               "Run pr19784a" \
+               "-Wl,--no-as-needed tmpdir/pr19784a.o tmpdir/libpr19784a.so" \
+               "" \
+               { dummy.s } \
+               "pr19784a" \
+               "pass.out" \
+           ] \
+           [list \
+               "Run pr19784b" \
+               "-Wl,--as-needed tmpdir/pr19784a.o tmpdir/libpr19784b.so" \
+               "" \
+               { dummy.s } \
+               "pr19784b" \
+               "pass.out" \
+           ] \
+       ]
+    }
+
     if { [istarget "x86_64-*-linux*"] \
         && ![istarget "x86_64-*-linux*-gnux32"]} {
 
@@ -819,13 +1282,32 @@ if { [isnative] && [which $CC] != 0 } {
                {{objdump {-drw} plt-main-bnd.dd}} \
                "plt-main-pie-bnd" \
            ] \
+           [list \
+               "Build plt-main with -z bndplt -z now" \
+               "tmpdir/plt-main1.o tmpdir/plt-main2.o tmpdir/plt-main3.o \
+                tmpdir/plt-main4.o tmpdir/libplt-lib.so -z bndplt -z now" \
+               "" \
+               { plt-main5.c } \
+               {{readelf {-SW} plt-main-bnd-now.rd} {objdump {-drw} plt-main-bnd.dd}} \
+               "plt-main-bnd-now" \
+           ] \
+           [list \
+               "Build plt-main with PIE and -z bndplt -z now" \
+               "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" \
+               "-fPIC" \
+               { plt-main5.c } \
+               {{readelf {-SW} plt-main-bnd-now.rd} {objdump {-drw} plt-main-bnd.dd}} \
+               "plt-main-pie-bnd-now" \
+           ] \
        ]
 
-       run_ld_link_exec_tests [] [list \
+       run_ld_link_exec_tests [list \
            [list \
                "Run plt-main with -z bndplt" \
-               "tmpdir/plt-main1.o tmpdir/plt-main2.o tmpdir/plt-main3.o \
-                tmpdir/plt-main4.o tmpdir/libplt-lib.so -z bndplt" \
+               "-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" \
                "" \
                { plt-main5.c } \
                "plt-main-bnd" \
@@ -833,29 +1315,289 @@ if { [isnative] && [which $CC] != 0 } {
            ] \
            [list \
                "Run plt-main with PIE and -z bndplt" \
-               "tmpdir/plt-main1.o tmpdir/plt-main2.o tmpdir/plt-main3.o \
-                tmpdir/plt-main4.o tmpdir/libplt-lib.so -z bndplt -pie" \
+               "-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" \
                "" \
                { plt-main5.c } \
                "plt-main-pie-bnd" \
                "plt-main.out" \
                "-fPIC" \
            ] \
+           [list \
+               "Run plt-main with -z bndplt -z now" \
+               "-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" \
+               "" \
+               { plt-main5.c } \
+               "plt-main-bnd-now" \
+               "plt-main.out" \
+           ] \
+           [list \
+               "Run plt-main with PIE and -z bndplt -z now" \
+               "-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" \
+               "" \
+               { plt-main5.c } \
+               "plt-main-pie-bnd-now" \
+               "plt-main.out" \
+               "-fPIC" \
+           ] \
+           [list \
+               "Run pr20800" \
+               "-Wl,-z,now -pie" \
+               "" \
+               { pr20800a.S pr20800b.S } \
+               "pr20800" \
+               "pass.out" \
+           ] \
+       ]
+       if { [check_ifunc_attribute_available] } {
+           run_ld_link_exec_tests [list \
+               [list \
+                   "Run pr21481a" \
+                   "$NOPIE_LDFLAGS -Wl,-z,bndplt" \
+                   "" \
+                   { pr21481a.c pr21481b.S } \
+                   "pr21481a" \
+                   "pass.out" \
+                    "$NOPIE_CFLAGS" \
+               ] \
+               [list \
+                   "Run pr21481b" \
+                   "$NOPIE_LDFLAGS -Wl,-z,bndplt,-z,now" \
+                   "" \
+                   { pr21481a.c pr21481b.S } \
+                   "pr21481b" \
+                   "pass.out" \
+                   "$NOPIE_CFLAGS" \
+               ] \
+           ]
+       }
+    }
+
+    if { [istarget "x86_64-*-linux*"] } {
+       if { [istarget "x86_64-*-linux*-gnux32"] } {
+           set pltdump {{objdump {-drw} plt-main-ibt-x32.dd}}
+           set pltsecdump {{readelf {-SW} plt-main-ibt-now.rd} {objdump {-drw} plt-main-ibt-x32.dd}}
+       } else {
+           set pltdump {{objdump {-drw} plt-main-ibt.dd}}
+           set pltsecdump {{readelf {-SW} plt-main-ibt-now.rd} {objdump {-drw} plt-main-ibt.dd}}
+       }
+       run_cc_link_tests [list \
+           [list \
+               "Build plt-main with -z ibtplt" \
+               "tmpdir/plt-main1.o tmpdir/plt-main2.o tmpdir/plt-main3.o \
+                tmpdir/plt-main4.o tmpdir/libplt-lib.so -z ibtplt" \
+               "" \
+               { plt-main5.c } \
+               $pltdump \
+               "plt-main-ibt" \
+           ] \
+           [list \
+               "Build plt-main with PIE and -z ibtplt" \
+               "tmpdir/plt-main1.o tmpdir/plt-main2.o tmpdir/plt-main3.o \
+                tmpdir/plt-main4.o tmpdir/libplt-lib.so -z ibtplt -pie" \
+               "-fPIC" \
+               { plt-main5.c } \
+               $pltdump \
+               "plt-main-pie-ibt" \
+           ] \
+           [list \
+               "Build plt-main with -z ibtplt -z now" \
+               "tmpdir/plt-main1.o tmpdir/plt-main2.o tmpdir/plt-main3.o \
+                tmpdir/plt-main4.o tmpdir/libplt-lib.so -z ibtplt -z now" \
+               "" \
+               { plt-main5.c } \
+               $pltsecdump \
+               "plt-main-ibt-now" \
+           ] \
+           [list \
+               "Build plt-main with PIE and -z ibtplt -z now" \
+               "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" \
+               "-fPIC" \
+               { plt-main5.c } \
+               $pltsecdump \
+               "plt-main-pie-ibt-now" \
+           ] \
+           [list \
+               "Build libibtplt-lib.so with -z ibtplt" \
+               "-shared -z ibtplt" \
+               "-fPIC" \
+               { plt-main1.c plt-main2.c plt-main3.c plt-main4.c} \
+               $pltdump \
+               "libibtplt-lib.so" \
+           ] \
+           [list \
+               "Build libibtplt--now-lib.so with -z ibtplt -z now" \
+               "-shared -z ibtplt -z now" \
+               "-fPIC" \
+               { plt-main1.c plt-main2.c plt-main3.c plt-main4.c} \
+               $pltdump \
+               "libibtplt-now-lib.so" \
+           ] \
+       ]
+
+       run_ld_link_exec_tests [list \
+           [list \
+               "Run plt-main with -z ibtplt" \
+               "-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" \
+               "" \
+               { plt-main5.c } \
+               "plt-main-ibt" \
+               "plt-main.out" \
+           ] \
+           [list \
+               "Run plt-main with PIE and -z ibtplt" \
+               "-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" \
+               "" \
+               { plt-main5.c } \
+               "plt-main-pie-ibt" \
+               "plt-main.out" \
+               "-fPIC" \
+           ] \
+           [list \
+               "Run plt-main with -z ibtplt -z now" \
+               "-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" \
+               "" \
+               { plt-main5.c } \
+               "plt-main-ibt-now" \
+               "plt-main.out" \
+           ] \
+           [list \
+               "Run plt-main with PIE and -z ibtplt -z now" \
+               "-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" \
+               "" \
+               { plt-main5.c } \
+               "plt-main-pie-ibt-now" \
+               "plt-main.out" \
+               "-fPIC" \
+           ] \
+           [list \
+               "Run plt-main with libibtplt-lib.so -z ibtplt" \
+               "-Wl,--no-as-needed,-z,ibtplt tmpdir/libibtplt-lib.so \
+                tmpdir/libplt-lib.so" \
+               "" \
+               { plt-main5.c } \
+               "plt-main-ibt-lib" \
+               "plt-main.out" \
+           ] \
+           [list \
+               "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" \
+               "" \
+               { plt-main5.c } \
+               "plt-main-ibt-now-lib" \
+               "plt-main.out" \
+           ] \
        ]
+
+       if { [check_ifunc_attribute_available] } {
+           run_ld_link_exec_tests [list \
+               [list \
+                   "Run pr21481a" \
+                   "$NOPIE_LDFLAGS -Wl,-z,ibtplt" \
+                   "" \
+                   { pr21481a.c pr21481b.S } \
+                   "pr21481a" \
+                   "pass.out" \
+                    "$NOPIE_CFLAGS" \
+               ] \
+               [list \
+                   "Run pr21481b" \
+                   "$NOPIE_LDFLAGS -Wl,-z,ibtplt,-z,now" \
+                   "" \
+                   { pr21481a.c pr21481b.S } \
+                   "pr21481b" \
+                   "pass.out" \
+                   "$NOPIE_CFLAGS" \
+               ] \
+           ]
+       }
     }
 
-    undefined_weak "" ""
+    undefined_weak "$NOPIE_CFLAGS" "$NOPIE_LDFLAGS"
     undefined_weak "-fPIE" ""
     undefined_weak "-fPIE" "-pie"
-    undefined_weak "-fPIE" "-nodynamic-undefined-weak"
-    undefined_weak "-fPIE" "-pie -nodynamic-undefined-weak"
+    undefined_weak "-fPIE" "-Wl,-z,nodynamic-undefined-weak"
+    undefined_weak "-fPIE" "-pie -Wl,-z,nodynamic-undefined-weak"
 }
 
 if { ![istarget "x86_64-*-linux*"]} {
     return
 }
 
+run_ld_link_tests [list \
+    [list \
+       "basic PLT generation (-z now)" \
+       "-z now -melf_x86_64 tmpdir/libpltlib.so" \
+       "" \
+       "--64" \
+       {plt2.s} \
+       {{readelf -SW plt2.rd} {objdump -dwr plt2.dd}} \
+       "plt2" \
+    ] \
+    [list \
+       "Build pr21626.so" \
+       "-shared -melf_x86_64" \
+       "" \
+       "--64 -defsym __64_bit__=1" \
+       {property-x86-3.s} \
+       "" \
+       "pr21626.so" \
+    ] \
+    [list \
+       "Build pr21626" \
+       "-melf_x86_64 tmpdir/pr21626.so" \
+       "" \
+       "--64" \
+       {start.s foo.s} \
+       "" \
+       "pr21626" \
+    ] \
+]
+
 # Linux only tests
 run_dump_test "pr17618"
 run_dump_test "pltgot-1"
 run_dump_test "pltgot-2"
+run_dump_test "pr20830a"
+run_dump_test "pr20830b"
+run_dump_test "pr21038a"
+run_dump_test "pr21038b"
+run_dump_test "pr21038c"
+run_dump_test "pr20830a-now"
+run_dump_test "pr20830b-now"
+run_dump_test "pr21038a-now"
+run_dump_test "pr21038b-now"
+run_dump_test "pr21038c-now"
+run_dump_test "ibt-plt-1"
+run_dump_test "ibt-plt-1-x32"
+run_dump_test "ibt-plt-2a"
+run_dump_test "ibt-plt-2b"
+run_dump_test "ibt-plt-2c"
+run_dump_test "ibt-plt-2d"
+run_dump_test "ibt-plt-2a-x32"
+run_dump_test "ibt-plt-2b-x32"
+run_dump_test "ibt-plt-2c-x32"
+run_dump_test "ibt-plt-2d-x32"
+run_dump_test "ibt-plt-3a"
+run_dump_test "ibt-plt-3b"
+run_dump_test "ibt-plt-3c"
+run_dump_test "ibt-plt-3d"
+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"