From: Alan Modra Date: Tue, 21 Jan 2025 04:11:54 +0000 (+1030) Subject: More ld testsuite fixes X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=63488ec7b8b4fa720ea5ee157fe5cd1aedbe153a;p=thirdparty%2Fbinutils-gdb.git More ld testsuite fixes * testsuite/ld-elf/indirect.exp: Run compiler capability checks using run_host_noleak. * testsuite/ld-ifunc/ifunc.exp: Don't exit without restoring ASFLAGS. Don't run ifuncmod5 twice. --- diff --git a/ld/testsuite/ld-elf/indirect.exp b/ld/testsuite/ld-elf/indirect.exp index 46e67552b7c..9a0bcb25da3 100644 --- a/ld/testsuite/ld-elf/indirect.exp +++ b/ld/testsuite/ld-elf/indirect.exp @@ -38,7 +38,7 @@ if { ![check_compiler_available] } { } # Some bare-metal targets don't support shared libs or PIC. -if { ![run_host_cmd_yesno $CC_FOR_TARGET "-shared -fPIC $srcdir/$subdir/dummy.c -o tmpdir/t.so"] } { +if { ![run_host_noleak $CC_FOR_TARGET "-shared -fPIC $srcdir/$subdir/dummy.c -o tmpdir/t.so"] } { return } @@ -226,7 +226,7 @@ foreach t [list indirect5a indirect5b indirect6a indirect6b] { } } -if { ![run_host_cmd_yesno $CC_FOR_TARGET "-fPIC -pie $srcdir/$subdir/main.c -o tmpdir/pie"] } { +if { ![run_host_noleak $CC_FOR_TARGET "-fPIC -pie $srcdir/$subdir/main.c -o tmpdir/pie"] } { return } diff --git a/ld/testsuite/ld-ifunc/ifunc.exp b/ld/testsuite/ld-ifunc/ifunc.exp index ea444da0b63..e8b93b347ef 100644 --- a/ld/testsuite/ld-ifunc/ifunc.exp +++ b/ld/testsuite/ld-ifunc/ifunc.exp @@ -59,9 +59,6 @@ if { [istarget "i?86-*-*"] || [istarget "x86_64-*-*"] } { set ASFLAGS "$ASFLAGS -mx86-used-note=no" } -# This test does not need a compiler... -run_dump_test "ifuncmod5" - set test_list [lsort [glob -nocomplain $srcdir/$subdir/*.d]] foreach t $test_list { # We need to strip the ".d", but can leave the dirname. @@ -73,6 +70,7 @@ foreach t $test_list { # not true, we could use target specific assembler files). if { ![check_compiler_available] } { verbose "IFUNC tests not run - no compiler available" + set ASFLAGS "$saved_ASFLAGS" return } @@ -221,162 +219,161 @@ if ![ld_compile "$cc_cmd -fPIC -c" "$srcdir/$subdir/test-2.c" "tmpdir/test-2.o"] set fails [expr $fails + 1] } -if { $fails != 0 } { - return -} - -if ![ld_link $ld "tmpdir/libshared_ifunc.so" "-shared tmpdir/shared_ifunc.o"] { - fail "Could not create a shared library containing an IFUNC symbol" - set fails [expr $fails + 1] -} -if ![ar_simple_create $ar "" "tmpdir/libifunc.a" "tmpdir/static_ifunc.o"] { - fail "Could not create a static library containing an IFUNC symbol" - set fails [expr $fails + 1] -} - -if { $fails != 0 } { - return +if { $fails == 0 } { + if ![ld_link $ld "tmpdir/libshared_ifunc.so" "-shared tmpdir/shared_ifunc.o"] { + fail "Could not create a shared library containing an IFUNC symbol" + set fails [expr $fails + 1] + } + if ![ar_simple_create $ar "" "tmpdir/libifunc.a" "tmpdir/static_ifunc.o"] { + fail "Could not create a static library containing an IFUNC symbol" + set fails [expr $fails + 1] + } } -if ![ld_link $CC_FOR_TARGET "tmpdir/dynamic_prog" "-Wl,--no-as-needed,-rpath=./tmpdir,-Bdynamic -Ltmpdir tmpdir/shared_prog.o -lshared_ifunc"] { - fail "Could not link a dynamic executable" - set fails [expr $fails + 1] -} -if ![ld_link $CC_FOR_TARGET "tmpdir/local_prog" "$NOPIE_LDFLAGS -Wl,--no-as-needed,-rpath=./tmpdir -Ltmpdir tmpdir/static_prog.o -lifunc"] { - fail "Could not link a dynamic executable using local ifunc" - set fails [expr $fails + 1] -} -if ![string match "" $STATIC_LDFLAGS] { - if ![ld_link $CC_FOR_TARGET "tmpdir/static_prog" "-static -Ltmpdir tmpdir/static_prog.o -lifunc"] { - fail "Could not link a static executable" +if { $fails == 0 } { + if ![ld_link $CC_FOR_TARGET "tmpdir/dynamic_prog" "-Wl,--no-as-needed,-rpath=./tmpdir,-Bdynamic -Ltmpdir tmpdir/shared_prog.o -lshared_ifunc"] { + fail "Could not link a dynamic executable" + set fails [expr $fails + 1] + } + if ![ld_link $CC_FOR_TARGET "tmpdir/local_prog" "$NOPIE_LDFLAGS -Wl,--no-as-needed,-rpath=./tmpdir -Ltmpdir tmpdir/static_prog.o -lifunc"] { + fail "Could not link a dynamic executable using local ifunc" + set fails [expr $fails + 1] + } + if ![string match "" $STATIC_LDFLAGS] { + if ![ld_link $CC_FOR_TARGET "tmpdir/static_prog" "-static -Ltmpdir tmpdir/static_prog.o -lifunc"] { + fail "Could not link a static executable" + set fails [expr $fails + 1] + } + } + if ![ld_link $ld "tmpdir/static_nonifunc_prog" "-static tmpdir/empty.o"] { + fail "Could not link a non-ifunc using static executable" + set fails [expr $fails + 1] + } + if ![ld_link $CC_FOR_TARGET "tmpdir/test-1" "-Wl,--no-as-needed,-rpath=./tmpdir tmpdir/test-1.o tmpdir/libshared_ifunc.so"] { + fail "Could not link test-1" + set fails [expr $fails + 1] + } + if ![ld_link $ld "tmpdir/libtest-2.so" "-shared tmpdir/test-2.o"] { + fail "Could not link libtest-2.so" + set fails [expr $fails + 1] + } + if ![ld_link $ld "tmpdir/libtest-2-now.so" "-shared -z now tmpdir/test-2.o"] { + fail "Could not link libtest-2-now.so" set fails [expr $fails + 1] } -} -if ![ld_link $ld "tmpdir/static_nonifunc_prog" "-static tmpdir/empty.o"] { - fail "Could not link a non-ifunc using static executable" - set fails [expr $fails + 1] -} -if ![ld_link $CC_FOR_TARGET "tmpdir/test-1" "-Wl,--no-as-needed,-rpath=./tmpdir tmpdir/test-1.o tmpdir/libshared_ifunc.so"] { - fail "Could not link test-1" - set fails [expr $fails + 1] -} -if ![ld_link $ld "tmpdir/libtest-2.so" "-shared tmpdir/test-2.o"] { - fail "Could not link libtest-2.so" - set fails [expr $fails + 1] -} -if ![ld_link $ld "tmpdir/libtest-2-now.so" "-shared -z now tmpdir/test-2.o"] { - fail "Could not link libtest-2-now.so" - set fails [expr $fails + 1] } if { $fails == 0 } { - pass "Building ifunc binaries" - set fails 0 + pass "Building ifunc binaries" } else { - return + fail "Building ifunc binaries" } -# Check the executables and shared libraries -# -# The linked ifunc using executables and the shared library containing -# ifunc should have an OSABI field of GNU. The linked non-ifunc using -# executable should have an OSABI field of NONE (aka System V). - -switch -glob $target_triplet { - hppa*-*-linux* { set expected_none {UNIX - GNU} } - default { set expected_none {UNIX - System V} } -} +if { $fails == 0 } { + # Check the executables and shared libraries + # + # The linked ifunc using executables and the shared library containing + # ifunc should have an OSABI field of GNU. The linked non-ifunc using + # executable should have an OSABI field of NONE (aka System V). + + switch -glob $target_triplet { + hppa*-*-linux* { set expected_none {UNIX - GNU} } + default { set expected_none {UNIX - System V} } + } -if {! [check_osabi tmpdir/libshared_ifunc.so {UNIX - GNU}]} { - fail "Shared libraries containing ifunc does not have an OS/ABI field of GNU" - set fails [expr $fails + 1] -} -if {! [check_osabi tmpdir/local_prog {UNIX - GNU}]} { - fail "Local ifunc-using executable does not have an OS/ABI field of GNU" - set fails [expr $fails + 1] -} -if { ![string match "" $STATIC_LDFLAGS] \ - && ![check_osabi tmpdir/static_prog {UNIX - GNU}]} { - fail "Static ifunc-using executable does not have an OS/ABI field of GNU" - set fails [expr $fails + 1] -} -if {! [check_osabi tmpdir/dynamic_prog $expected_none]} { - fail "Dynamic ifunc-using executable does not have an OS/ABI field of $expected_none" - set fails [expr $fails + 1] -} -if {! [check_osabi tmpdir/static_nonifunc_prog $expected_none]} { - fail "Static non-ifunc-using executable does not have an OS/ABI field of $expected_none" - set fails [expr $fails + 1] -} + if {! [check_osabi tmpdir/libshared_ifunc.so {UNIX - GNU}]} { + fail "Shared libraries containing ifunc does not have an OS/ABI field of GNU" + set fails [expr $fails + 1] + } + if {! [check_osabi tmpdir/local_prog {UNIX - GNU}]} { + fail "Local ifunc-using executable does not have an OS/ABI field of GNU" + set fails [expr $fails + 1] + } + if { ![string match "" $STATIC_LDFLAGS] \ + && ![check_osabi tmpdir/static_prog {UNIX - GNU}]} { + fail "Static ifunc-using executable does not have an OS/ABI field of GNU" + set fails [expr $fails + 1] + } + if {! [check_osabi tmpdir/dynamic_prog $expected_none]} { + fail "Dynamic ifunc-using executable does not have an OS/ABI field of $expected_none" + set fails [expr $fails + 1] + } + if {! [check_osabi tmpdir/static_nonifunc_prog $expected_none]} { + fail "Static non-ifunc-using executable does not have an OS/ABI field of $expected_none" + set fails [expr $fails + 1] + } -# The linked ifunc using executables and the shared library containing -# ifunc should contain an IFUNC symbol. The non-ifunc using executable -# should not. + # The linked ifunc using executables and the shared library containing + # ifunc should contain an IFUNC symbol. The non-ifunc using executable + # should not. -if {[contains_ifunc_symbol tmpdir/libshared_ifunc.so] != 1} { - fail "Shared libraries containing ifunc does not contain an IFUNC symbol" - set fails [expr $fails + 1] -} -if {[contains_ifunc_symbol tmpdir/local_prog] != 1} { - fail "Local ifunc-using executable does not contain an IFUNC symbol" - set fails [expr $fails + 1] -} -if { ![string match "" $STATIC_LDFLAGS] \ - && [contains_ifunc_symbol tmpdir/static_prog] != 1} { - fail "Static ifunc-using executable does not contain an IFUNC symbol" - set fails [expr $fails + 1] -} -if {[contains_ifunc_symbol tmpdir/dynamic_prog] != 0} { - fail "Dynamic ifunc-using executable contains an IFUNC symbol" - set fails [expr $fails + 1] -} -if {[contains_ifunc_symbol tmpdir/static_nonifunc_prog] != 0} { - fail "Static non-ifunc-using executable contains an IFUNC symbol" - set fails [expr $fails + 1] -} -if {[contains_ifunc_symbol tmpdir/test-1] != 0} { - fail "test-1 contains IFUNC symbols" - set fails [expr $fails + 1] -} -if {[contains_ifunc_symbol tmpdir/libtest-2.so] != 0} { - fail "libtest-2.so contains IFUNC symbols" - set fails [expr $fails + 1] -} -if {[contains_ifunc_symbol tmpdir/libtest-2-now.so] != 0} { - fail "libtest-2-now.so contains IFUNC symbols" - set fails [expr $fails + 1] -} + if {[contains_ifunc_symbol tmpdir/libshared_ifunc.so] != 1} { + fail "Shared libraries containing ifunc does not contain an IFUNC symbol" + set fails [expr $fails + 1] + } + if {[contains_ifunc_symbol tmpdir/local_prog] != 1} { + fail "Local ifunc-using executable does not contain an IFUNC symbol" + set fails [expr $fails + 1] + } + if { ![string match "" $STATIC_LDFLAGS] \ + && [contains_ifunc_symbol tmpdir/static_prog] != 1} { + fail "Static ifunc-using executable does not contain an IFUNC symbol" + set fails [expr $fails + 1] + } + if {[contains_ifunc_symbol tmpdir/dynamic_prog] != 0} { + fail "Dynamic ifunc-using executable contains an IFUNC symbol" + set fails [expr $fails + 1] + } + if {[contains_ifunc_symbol tmpdir/static_nonifunc_prog] != 0} { + fail "Static non-ifunc-using executable contains an IFUNC symbol" + set fails [expr $fails + 1] + } + if {[contains_ifunc_symbol tmpdir/test-1] != 0} { + fail "test-1 contains IFUNC symbols" + set fails [expr $fails + 1] + } + if {[contains_ifunc_symbol tmpdir/libtest-2.so] != 0} { + fail "libtest-2.so contains IFUNC symbols" + set fails [expr $fails + 1] + } + if {[contains_ifunc_symbol tmpdir/libtest-2-now.so] != 0} { + fail "libtest-2-now.so contains IFUNC symbols" + set fails [expr $fails + 1] + } -# The linked ifunc using executables and shared libraries should contain -# a dynamic reloc referencing the IFUNC symbol. (Even the static -# executable which should have a dynamic section created for it). The -# non-ifunc using executable should not. + # The linked ifunc using executables and shared libraries should contain + # a dynamic reloc referencing the IFUNC symbol. (Even the static + # executable which should have a dynamic section created for it). The + # non-ifunc using executable should not. -if {[contains_irelative_reloc tmpdir/libshared_ifunc.so] != 1} { - fail "ifunc-using shared library does not contain R_*_IRELATIVE relocation" - set fails [expr $fails + 1] -} -if {[contains_irelative_reloc tmpdir/local_prog] != 1} { - fail "Local ifunc-using executable does not contain R_*_IRELATIVE relocation" - set fails [expr $fails + 1] -} -if { ![string match "" $STATIC_LDFLAGS] \ - && ![istarget hppa*-*-*] \ - && [contains_irelative_reloc tmpdir/static_prog] != 1} { - fail "Static ifunc-using executable does not contain R_*_IRELATIVE relocation" - set fails [expr $fails + 1] -} -if {[contains_ifunc_reloc tmpdir/dynamic_prog] != 0} { - fail "Dynamic ifunc-using executable contains a reloc against an IFUNC symbol" - set fails [expr $fails + 1] -} -if {[contains_ifunc_reloc tmpdir/static_nonifunc_prog] == 1} { - fail "Static non-ifunc-using executable contains a reloc against an IFUNC symbol!" - set fails [expr $fails + 1] -} + if {[contains_irelative_reloc tmpdir/libshared_ifunc.so] != 1} { + fail "ifunc-using shared library does not contain R_*_IRELATIVE relocation" + set fails [expr $fails + 1] + } + if {[contains_irelative_reloc tmpdir/local_prog] != 1} { + fail "Local ifunc-using executable does not contain R_*_IRELATIVE relocation" + set fails [expr $fails + 1] + } + if { ![string match "" $STATIC_LDFLAGS] \ + && ![istarget hppa*-*-*] \ + && [contains_irelative_reloc tmpdir/static_prog] != 1} { + fail "Static ifunc-using executable does not contain R_*_IRELATIVE relocation" + set fails [expr $fails + 1] + } + if {[contains_ifunc_reloc tmpdir/dynamic_prog] != 0} { + fail "Dynamic ifunc-using executable contains a reloc against an IFUNC symbol" + set fails [expr $fails + 1] + } + if {[contains_ifunc_reloc tmpdir/static_nonifunc_prog] == 1} { + fail "Static non-ifunc-using executable contains a reloc against an IFUNC symbol!" + set fails [expr $fails + 1] + } -if { $fails == 0 } { - pass "Checking ifunc binaries" + if { $fails == 0 } { + pass "Checking ifunc binaries" + } else { + fail "Checking ifunc binaries" + } } run_cc_link_tests [list \ @@ -454,276 +451,272 @@ run_ld_link_exec_tests [list \ ] # Run-time tests which require working IFUNC support. -if { ![check_ifunc_available] } { - return -} - -run_cc_link_tests [list \ - [list \ - "Build ifunc-lib.so" \ - "-shared" \ - "-fPIC" \ - { ifunc-lib.c } \ - {} \ - "libifunc-lib.so" \ - ] \ - [list \ - "Build ifunc-libn.so" \ - "-shared -Wl,-z,now" \ - "-fPIC" \ - { ifunc-lib.c } \ - {} \ - "libifunc-libn.so" \ - ] \ -] - -run_ld_link_exec_tests [list \ - [list \ - "Run pr16467" \ - "-Wl,--no-as-needed tmpdir/pr16467c.o tmpdir/libpr16467b.so tmpdir/libpr16467a.so" \ - "" \ - { dummy.c } \ - "pr16467" \ - "pr16467.out" \ - "" \ - ] \ - [list \ - "Run pr16467 (-z now)" \ - "-Wl,-z,now -Wl,--no-as-needed tmpdir/pr16467c.o tmpdir/libpr16467bn.so tmpdir/libpr16467an.so" \ - "" \ - { dummy.c } \ - "pr16467n" \ - "pr16467.out" \ - "" \ - ] \ - [list \ - "Run ifunc-main" \ - "-Wl,--no-as-needed tmpdir/libifunc-lib.so" \ - "" \ - { ifunc-main.c } \ - "ifunc-main" \ - "ifunc-main.out" \ - ] \ - [list \ - "Run ifunc-main with -fpic" \ - "-Wl,--no-as-needed tmpdir/libifunc-lib.so" \ - "" \ - { ifunc-main.c } \ - "ifunc-main" \ - "ifunc-main.out" \ - "-fpic" \ - ] \ - [list \ - "Run ifunc-main (-z now)" \ - "-Wl,-z,now -Wl,--no-as-needed tmpdir/libifunc-libn.so" \ - "" \ - { ifunc-main.c } \ - "ifunc-mainn" \ - "ifunc-main.out" \ - ] \ - [list \ - "Run ifunc-main with PIE (-z now)" \ - "-pie -Wl,-z,now -Wl,--no-as-needed tmpdir/libifunc-libn.so" \ - "" \ - { ifunc-main.c } \ - "ifunc-mainpn" \ - "ifunc-main.out" \ - "-fpie" \ - ] \ -] +if { [check_ifunc_available] } { + run_cc_link_tests [list \ + [list \ + "Build ifunc-lib.so" \ + "-shared" \ + "-fPIC" \ + { ifunc-lib.c } \ + {} \ + "libifunc-lib.so" \ + ] \ + [list \ + "Build ifunc-libn.so" \ + "-shared -Wl,-z,now" \ + "-fPIC" \ + { ifunc-lib.c } \ + {} \ + "libifunc-libn.so" \ + ] \ + ] -# Run-time tests which require working ifunc attribute support. -if { ![check_ifunc_attribute_available] } { - return + run_ld_link_exec_tests [list \ + [list \ + "Run pr16467" \ + "-Wl,--no-as-needed tmpdir/pr16467c.o tmpdir/libpr16467b.so tmpdir/libpr16467a.so" \ + "" \ + { dummy.c } \ + "pr16467" \ + "pr16467.out" \ + "" \ + ] \ + [list \ + "Run pr16467 (-z now)" \ + "-Wl,-z,now -Wl,--no-as-needed tmpdir/pr16467c.o tmpdir/libpr16467bn.so tmpdir/libpr16467an.so" \ + "" \ + { dummy.c } \ + "pr16467n" \ + "pr16467.out" \ + "" \ + ] \ + [list \ + "Run ifunc-main" \ + "-Wl,--no-as-needed tmpdir/libifunc-lib.so" \ + "" \ + { ifunc-main.c } \ + "ifunc-main" \ + "ifunc-main.out" \ + ] \ + [list \ + "Run ifunc-main with -fpic" \ + "-Wl,--no-as-needed tmpdir/libifunc-lib.so" \ + "" \ + { ifunc-main.c } \ + "ifunc-main" \ + "ifunc-main.out" \ + "-fpic" \ + ] \ + [list \ + "Run ifunc-main (-z now)" \ + "-Wl,-z,now -Wl,--no-as-needed tmpdir/libifunc-libn.so" \ + "" \ + { ifunc-main.c } \ + "ifunc-mainn" \ + "ifunc-main.out" \ + ] \ + [list \ + "Run ifunc-main with PIE (-z now)" \ + "-pie -Wl,-z,now -Wl,--no-as-needed tmpdir/libifunc-libn.so" \ + "" \ + { ifunc-main.c } \ + "ifunc-mainpn" \ + "ifunc-main.out" \ + "-fpie" \ + ] \ + ] } -run_cc_link_tests [list \ - [list \ - "Build pr18808a.o" \ - "" \ - "" \ - { pr18808a.c } \ - "" \ - "" \ - ] \ - [list \ - "Build libpr18808.so" \ - "-shared" \ - "-fPIC -O2 -g" \ - { pr18808b.c } \ - {} \ - "libpr18808.so" \ - ] \ - [list \ - "Build libpr18808n.so" \ - "-shared -Wl,-z,now" \ - "-fPIC -O2 -g" \ - { pr18808b.c } \ - {} \ - "libpr18808n.so" \ - ] \ - [list \ - "Build pr18841a.o" \ - "" \ - "$NOPIE_CFLAGS" \ - { pr18841a.c } \ - "" \ - "" \ - ] \ - [list \ - "Build libpr18841b.so" \ - "-shared" \ - "-fPIC -O0 -g" \ - { pr18841b.c } \ - {} \ - "libpr18841b.so" \ - ] \ - [list \ - "Build libpr18841c.so" \ - "-shared" \ - "-fPIC -O0 -g" \ - { pr18841c.c } \ - {} \ - "libpr18841c.so" \ - ] \ - [list \ - "Build libpr18841bn.so" \ - "-Wl,-z,now -shared" \ - "-fPIC -O0 -g" \ - { pr18841b.c } \ - {} \ - "libpr18841bn.so" \ - ] \ - [list \ - "Build libpr18841cn.so" \ - "-shared" \ - "-Wl,-z,now -fPIC -O0 -g" \ - { pr18841c.c } \ - {} \ - "libpr18841cn.so" \ - ] \ - [list \ - "Build libpr23169a.so" \ - "-shared -Wl,-z,lazy" \ - "-fPIC -O2 -g" \ - { pr23169a.c } \ - {} \ - "libpr23169a.so" \ - ] \ - [list \ - "Build libpr23169b.so" \ - "-shared -Wl,-z,now" \ - "-fPIC -O2 -g" \ - { pr23169a.c } \ - {} \ - "libpr23169b.so" \ - ] \ - [list \ - "Build pr23169a" \ - "$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/libpr23169a.so" \ - "$NOPIE_CFLAGS -O2 -g" \ - { pr23169b.c pr23169c.c } \ - {{readelf {--dyn-syms} pr23169a.rd} \ - {readelf {-r -W} pr23169b.rd}} \ - "pr23169a" \ - ] \ - [list \ - "Build pr23169b" \ - "-pie -Wl,--no-as-needed tmpdir/libpr23169a.so" \ - "-fPIE -O2 -g" \ - { pr23169b.c pr23169c.c } \ - {{readelf {--dyn-syms} pr23169c.rd} \ - {readelf {-r -W} pr23169b.rd}} \ - "pr23169b" \ - ] \ - [list \ - "Build pr23169c" \ - "$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/libpr23169a.so" \ - "-fPIE -O2 -g" \ - { pr23169b.c pr23169c.c } \ - {{readelf {--dyn-syms} pr23169a.rd} \ - {readelf {-r -W} pr23169b.rd}} \ - "pr23169c" \ - ] \ - [list \ - "Build pr23169d" \ - "$NOPIE_LDFLAGS -Wl,--no-as-needed,-z,now tmpdir/libpr23169b.so" \ - "$NOPIE_CFLAGS -O2 -g" \ - { pr23169b.c pr23169c.c } \ - {{readelf {--dyn-syms} pr23169a.rd} \ - {readelf {-r -W} pr23169b.rd}} \ - "pr23169d" \ - ] \ - [list \ - "Build pr23169f" \ - "$NOPIE_LDFLAGS -Wl,--no-as-needed,-z,now tmpdir/libpr23169b.so" \ - "-fPIE -O2 -g" \ - { pr23169b.c pr23169c.c } \ - {{readelf {--dyn-syms} pr23169a.rd} \ - {readelf {-r -W} pr23169b.rd}} \ - "pr23169f" \ - ] \ -] +# Run-time tests which require working ifunc attribute support. +if { [check_ifunc_attribute_available] } { + run_cc_link_tests [list \ + [list \ + "Build pr18808a.o" \ + "" \ + "" \ + { pr18808a.c } \ + "" \ + "" \ + ] \ + [list \ + "Build libpr18808.so" \ + "-shared" \ + "-fPIC -O2 -g" \ + { pr18808b.c } \ + {} \ + "libpr18808.so" \ + ] \ + [list \ + "Build libpr18808n.so" \ + "-shared -Wl,-z,now" \ + "-fPIC -O2 -g" \ + { pr18808b.c } \ + {} \ + "libpr18808n.so" \ + ] \ + [list \ + "Build pr18841a.o" \ + "" \ + "$NOPIE_CFLAGS" \ + { pr18841a.c } \ + "" \ + "" \ + ] \ + [list \ + "Build libpr18841b.so" \ + "-shared" \ + "-fPIC -O0 -g" \ + { pr18841b.c } \ + {} \ + "libpr18841b.so" \ + ] \ + [list \ + "Build libpr18841c.so" \ + "-shared" \ + "-fPIC -O0 -g" \ + { pr18841c.c } \ + {} \ + "libpr18841c.so" \ + ] \ + [list \ + "Build libpr18841bn.so" \ + "-Wl,-z,now -shared" \ + "-fPIC -O0 -g" \ + { pr18841b.c } \ + {} \ + "libpr18841bn.so" \ + ] \ + [list \ + "Build libpr18841cn.so" \ + "-shared" \ + "-Wl,-z,now -fPIC -O0 -g" \ + { pr18841c.c } \ + {} \ + "libpr18841cn.so" \ + ] \ + [list \ + "Build libpr23169a.so" \ + "-shared -Wl,-z,lazy" \ + "-fPIC -O2 -g" \ + { pr23169a.c } \ + {} \ + "libpr23169a.so" \ + ] \ + [list \ + "Build libpr23169b.so" \ + "-shared -Wl,-z,now" \ + "-fPIC -O2 -g" \ + { pr23169a.c } \ + {} \ + "libpr23169b.so" \ + ] \ + [list \ + "Build pr23169a" \ + "$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/libpr23169a.so" \ + "$NOPIE_CFLAGS -O2 -g" \ + { pr23169b.c pr23169c.c } \ + {{readelf {--dyn-syms} pr23169a.rd} \ + {readelf {-r -W} pr23169b.rd}} \ + "pr23169a" \ + ] \ + [list \ + "Build pr23169b" \ + "-pie -Wl,--no-as-needed tmpdir/libpr23169a.so" \ + "-fPIE -O2 -g" \ + { pr23169b.c pr23169c.c } \ + {{readelf {--dyn-syms} pr23169c.rd} \ + {readelf {-r -W} pr23169b.rd}} \ + "pr23169b" \ + ] \ + [list \ + "Build pr23169c" \ + "$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/libpr23169a.so" \ + "-fPIE -O2 -g" \ + { pr23169b.c pr23169c.c } \ + {{readelf {--dyn-syms} pr23169a.rd} \ + {readelf {-r -W} pr23169b.rd}} \ + "pr23169c" \ + ] \ + [list \ + "Build pr23169d" \ + "$NOPIE_LDFLAGS -Wl,--no-as-needed,-z,now tmpdir/libpr23169b.so" \ + "$NOPIE_CFLAGS -O2 -g" \ + { pr23169b.c pr23169c.c } \ + {{readelf {--dyn-syms} pr23169a.rd} \ + {readelf {-r -W} pr23169b.rd}} \ + "pr23169d" \ + ] \ + [list \ + "Build pr23169f" \ + "$NOPIE_LDFLAGS -Wl,--no-as-needed,-z,now tmpdir/libpr23169b.so" \ + "-fPIE -O2 -g" \ + { pr23169b.c pr23169c.c } \ + {{readelf {--dyn-syms} pr23169a.rd} \ + {readelf {-r -W} pr23169b.rd}} \ + "pr23169f" \ + ] \ + ] -run_ld_link_exec_tests [list \ - [list \ - "Run pr18808" \ - "-Wl,--no-as-needed tmpdir/pr18808a.o tmpdir/libpr18808.so" \ - "" \ - { dummy.c } \ - "pr18808" \ - "pr18808.out" \ - ] \ - [list \ - "Run pr18808 (-z now)" \ - "-Wl,-z,now -Wl,--no-as-needed tmpdir/pr18808a.o tmpdir/libpr18808n.so" \ - "" \ - { dummy.c } \ - "pr18808n" \ - "pr18808.out" \ - ] \ - [list \ - "Run pr18841 with libpr18841b.so" \ - "$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/pr18841a.o tmpdir/libpr18841b.so" \ - "$NOPIE_CFLAGS" \ - { dummy.c } \ - "pr18841b" \ - "pr18841.out" \ - ] \ - [list \ - "Run pr18841 with libpr18841c.so" \ - "$NOPIE_LDFLAGS -Wl,--as-needed tmpdir/pr18841a.o tmpdir/libpr18841c.so" \ - "$NOPIE_CFLAGS" \ - { dummy.c } \ - "pr18841c" \ - "pr18841.out" \ - ] \ - [list \ - "Run pr18841 with libpr18841bn.so (-z now)" \ - "$NOPIE_LDFLAGS -Wl,-z,now -Wl,--no-as-needed tmpdir/pr18841a.o tmpdir/libpr18841bn.so" \ - "$NOPIE_CFLAGS" \ - { dummy.c } \ - "pr18841bn" \ - "pr18841.out" \ - ] \ - [list \ - "Run pr18841 with libpr18841cn.so (-z now)" \ - "$NOPIE_LDFLAGS -Wl,-z,now -Wl,--as-needed tmpdir/pr18841a.o tmpdir/libpr18841cn.so" \ - "$NOPIE_CFLAGS" \ - { dummy.c } \ - "pr18841cn" \ - "pr18841.out" \ - ] \ - [list \ - "Run pr29216" \ - "$NOPIE_LDFLAGS" \ - "" \ - { pr29216.c } \ - "pr29216" \ - "pass.out" \ - "-fPIC" \ - ] \ -] + run_ld_link_exec_tests [list \ + [list \ + "Run pr18808" \ + "-Wl,--no-as-needed tmpdir/pr18808a.o tmpdir/libpr18808.so" \ + "" \ + { dummy.c } \ + "pr18808" \ + "pr18808.out" \ + ] \ + [list \ + "Run pr18808 (-z now)" \ + "-Wl,-z,now -Wl,--no-as-needed tmpdir/pr18808a.o tmpdir/libpr18808n.so" \ + "" \ + { dummy.c } \ + "pr18808n" \ + "pr18808.out" \ + ] \ + [list \ + "Run pr18841 with libpr18841b.so" \ + "$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/pr18841a.o tmpdir/libpr18841b.so" \ + "$NOPIE_CFLAGS" \ + { dummy.c } \ + "pr18841b" \ + "pr18841.out" \ + ] \ + [list \ + "Run pr18841 with libpr18841c.so" \ + "$NOPIE_LDFLAGS -Wl,--as-needed tmpdir/pr18841a.o tmpdir/libpr18841c.so" \ + "$NOPIE_CFLAGS" \ + { dummy.c } \ + "pr18841c" \ + "pr18841.out" \ + ] \ + [list \ + "Run pr18841 with libpr18841bn.so (-z now)" \ + "$NOPIE_LDFLAGS -Wl,-z,now -Wl,--no-as-needed tmpdir/pr18841a.o tmpdir/libpr18841bn.so" \ + "$NOPIE_CFLAGS" \ + { dummy.c } \ + "pr18841bn" \ + "pr18841.out" \ + ] \ + [list \ + "Run pr18841 with libpr18841cn.so (-z now)" \ + "$NOPIE_LDFLAGS -Wl,-z,now -Wl,--as-needed tmpdir/pr18841a.o tmpdir/libpr18841cn.so" \ + "$NOPIE_CFLAGS" \ + { dummy.c } \ + "pr18841cn" \ + "pr18841.out" \ + ] \ + [list \ + "Run pr29216" \ + "$NOPIE_LDFLAGS" \ + "" \ + { pr29216.c } \ + "pr29216" \ + "pass.out" \ + "-fPIC" \ + ] \ + ] +} # The pr23169 testcase is not valid. In general, you can't call ifunc # resolvers in another binary unless you know what you're doing. In @@ -733,72 +726,72 @@ run_ld_link_exec_tests [list \ # GOT). # That does not happen for the pr23169 testcase where the resolver is # in the executable (which is relocated last by ld.so). -if { [isnative] +if { [isnative] && [check_ifunc_attribute_available] && !([istarget "powerpc-*-*"] || [istarget "aarch64*-*-*"] || [istarget "arm*-*-*"] || [istarget "sparc*-*-*"] || [istarget "riscv*-*-*"]) } { -run_ld_link_exec_tests [list \ - [list \ - "Run pr23169a" \ - "$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/libpr23169a.so" \ - "" \ - { pr23169b.c pr23169c.c } \ - "pr23169a" \ - "pass.out" \ - "$NOPIE_CFLAGS -O2 -g" \ - ] \ - [list \ - "Run pr23169b" \ - "-pie -Wl,--no-as-needed,-z,lazy tmpdir/libpr23169a.so" \ - "" \ - { pr23169b.c pr23169c.c } \ - "pr23169b" \ - "pass.out" \ - "-fPIE -O2 -g" \ - ] \ - [list \ - "Run pr23169c" \ - "$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/libpr23169a.so" \ - "" \ - { pr23169b.c pr23169c.c } \ - "pr23169c" \ - "pass.out" \ - "-fPIE -O2 -g" \ - ] \ - [list \ - "Run pr23169d" \ - "$NOPIE_LDFLAGS -Wl,--no-as-needed,-z,now tmpdir/libpr23169b.so" \ - "" \ - { pr23169b.c pr23169c.c } \ - "pr23169d" \ - "pass.out" \ - "$NOPIE_CFLAGS -O2 -g" \ - ] \ - [list \ - "Run pr23169f" \ - "$NOPIE_LDFLAGS -Wl,--no-as-needed,-z,now tmpdir/libpr23169b.so" \ - "" \ - { pr23169b.c pr23169c.c } \ - "pr23169f" \ - "pass.out" \ - "-fPIE -O2 -g" \ - ] \ -] -if { $STATIC_PIE_LDFLAGS != "" } then { run_ld_link_exec_tests [list \ [list \ - "Run pr23169g" \ - "$STATIC_PIE_LDFLAGS" \ + "Run pr23169a" \ + "$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/libpr23169a.so" \ + "" \ + { pr23169b.c pr23169c.c } \ + "pr23169a" \ + "pass.out" \ + "$NOPIE_CFLAGS -O2 -g" \ + ] \ + [list \ + "Run pr23169b" \ + "-pie -Wl,--no-as-needed,-z,lazy tmpdir/libpr23169a.so" \ "" \ - { pr23169a.c pr23169b.c pr23169c.c } \ - "pr23169g" \ + { pr23169b.c pr23169c.c } \ + "pr23169b" \ "pass.out" \ "-fPIE -O2 -g" \ ] \ -] -} + [list \ + "Run pr23169c" \ + "$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/libpr23169a.so" \ + "" \ + { pr23169b.c pr23169c.c } \ + "pr23169c" \ + "pass.out" \ + "-fPIE -O2 -g" \ + ] \ + [list \ + "Run pr23169d" \ + "$NOPIE_LDFLAGS -Wl,--no-as-needed,-z,now tmpdir/libpr23169b.so" \ + "" \ + { pr23169b.c pr23169c.c } \ + "pr23169d" \ + "pass.out" \ + "$NOPIE_CFLAGS -O2 -g" \ + ] \ + [list \ + "Run pr23169f" \ + "$NOPIE_LDFLAGS -Wl,--no-as-needed,-z,now tmpdir/libpr23169b.so" \ + "" \ + { pr23169b.c pr23169c.c } \ + "pr23169f" \ + "pass.out" \ + "-fPIE -O2 -g" \ + ] \ + ] + if { $STATIC_PIE_LDFLAGS != "" } then { + run_ld_link_exec_tests [list \ + [list \ + "Run pr23169g" \ + "$STATIC_PIE_LDFLAGS" \ + "" \ + { pr23169a.c pr23169b.c pr23169c.c } \ + "pr23169g" \ + "pass.out" \ + "-fPIE -O2 -g" \ + ] \ + ] + } } set ASFLAGS "$saved_ASFLAGS"