X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=ld%2Ftestsuite%2Fld-elfvers%2Fvers.exp;h=ebaaa785320ccc709fce7c645a9513d71c96ef0f;hb=44ed80923ab89e141120defa8c1209b69869a7ac;hp=198a7f6cf28f0b13e759eac9bd3a946823643c5e;hpb=f96b4a7b0f17a2bf74a83908c6245053310560fd;p=deliverable%2Fbinutils-gdb.git diff --git a/ld/testsuite/ld-elfvers/vers.exp b/ld/testsuite/ld-elfvers/vers.exp index 198a7f6cf2..ebaaa78532 100644 --- a/ld/testsuite/ld-elfvers/vers.exp +++ b/ld/testsuite/ld-elfvers/vers.exp @@ -1,6 +1,5 @@ # Expect script for ld-version tests -# Copyright 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005, 2007 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2019 Free Software Foundation, Inc. # # This file is part of the GNU Binutils. # @@ -23,40 +22,40 @@ # -# This test can only be run if ld generates native executables. -if ![isnative] then {return} +# Check to see if the C compiler works +if { ![check_compiler_available] } { + return +} # This test can only be run on a couple of ELF platforms. # Square bracket expressions seem to confuse istarget. # This is similar to the test that is used in ld-shared, BTW. -if { ![istarget hppa*64*-*-hpux*] \ - && ![istarget hppa*-*-linux*] \ - && ![istarget i?86-*-sysv4*] \ - && ![istarget i?86-*-unixware] \ - && ![istarget i?86-*-elf*] \ - && ![istarget i?86-*-linux*] \ - && ![istarget ia64-*-elf*] \ - && ![istarget ia64-*-linux*] \ - && ![istarget m68k-*-linux*] \ - && ![istarget mips*-*-irix5*] \ - && ![istarget powerpc-*-elf*] \ - && ![istarget powerpc-*-linux*] \ - && ![istarget powerpc-*-sysv4*] \ - && ![istarget sparc*-*-elf] \ - && ![istarget sparc*-*-solaris2*] \ - && ![istarget sparc*-*-linux*] \ - && ![istarget arm*-*-linux*] \ - && ![istarget mips*-*-linux*] \ - && ![istarget alpha*-*-linux*] \ - && ![istarget s390*-*-linux*] \ - && ![istarget sh\[34\]*-*-linux*] \ - && ![istarget x86_64-*-linux*] } { - return -} - -if { [istarget i?86-*-linux*aout*] \ - || [istarget i?86-*-linux*oldld*] \ - || [istarget m68k-*-linux*aout*] } { +if { ![istarget hppa*64*-*-hpux*] + && ![istarget hppa*-*-linux*] + && ![istarget i?86-*-sysv4*] + && ![istarget i?86-*-unixware] + && ![istarget i?86-*-elf*] + && ![istarget i?86-*-linux*] + && ![istarget i?86-*-gnu*] + && ![istarget i?86-*-nacl*] + && ![istarget ia64-*-elf*] + && ![istarget ia64-*-linux*] + && ![istarget m68k-*-linux*] + && ![istarget mips*-*-irix5*] + && ![istarget powerpc*-*-elf*] + && ![istarget powerpc*-*-linux*] + && ![istarget powerpc*-*-sysv4*] + && ![istarget sparc*-*-elf] + && ![istarget sparc*-*-solaris2*] + && ![istarget sparc*-*-linux*] + && ![istarget aarch64*-*-linux*] + && ![istarget arm*-*-linux*] + && ![istarget mips*-*-linux*] + && ![istarget alpha*-*-linux*] + && ![istarget s390*-*-linux*] + && ![istarget sh\[34\]*-*-linux*] + && ![istarget x86_64-*-linux*] + && ![istarget x86_64-*-nacl*] } { return } @@ -72,7 +71,9 @@ set SOBJDUMP_FLAGS --syms set shared "--shared --no-undefined-version" set script --version-script -if [istarget mips*-*-*] { +# Old version of GCC for MIPS default to enabling -fpic +# and get confused if it is used on the command line. +if { [istarget mips*-*-*] && ! [at_least_gcc_version 4 3] } then { set picflag "" } else { # Unfortunately, the gcc argument is -fpic and the cc argument is @@ -83,20 +84,17 @@ if [istarget mips*-*-*] { catch "exec $CC $picflag" exec_output send_log "$exec_output\n" verbose "--" "$exec_output" - if { [string match "*illegal option*" $exec_output] \ - || [string match "*option ignored*" $exec_output] \ - || [string match "*unrecognized option*" $exec_output] \ + if { [string match "*illegal option*" $exec_output] + || [string match "*option ignored*" $exec_output] + || [string match "*unrecognized option*" $exec_output] || [string match "*passed to ld*" $exec_output] } { - if [istarget *-*-sunos4*] { - set picflag "-pic" - } else { - set picflag "-KPIC" - } + set picflag "-KPIC" } } case $target_triplet in { { ia64-*-* } { set as_options "-x" } + { sparc-*-* } { set as_options "-Av9a" } default { set as_options "" } } @@ -116,12 +114,12 @@ proc test_ar { test lib object expect } { unresolved "$test" return } - - verbose -log "$nm --print-armap $tmpdir/$lib | grep \" in \" | egrep \"VERS\\|bar\\|foo\" | sort > $tmpdir/nm.out" - catch "exec $nm --print-armap $tmpdir/$lib | grep \\\ in\\\ | egrep VERS\\\|bar\\\|foo | sort > $tmpdir/nm.out" exec_output + set cmd "$nm --print-armap $tmpdir/$lib | grep \\\ in\\\ | egrep VERS\\\|bar\\\|foo | grep -v ^\\\\. | sort > $tmpdir/nm.out" + verbose -log $cmd + catch "exec $cmd" exec_output if [string match "" $exec_output] then { - catch "exec $diff $tmpdir/nm.out $srcdir/$subdir/$expect" exec_output + catch "exec sort $srcdir/$subdir/$expect | $diff $tmpdir/nm.out -" exec_output set exec_output [prune_warnings $exec_output] if [string match "" $exec_output] then { pass $test @@ -240,9 +238,9 @@ proc objdump_symstuff { objdump object expectfile } { if ![info exists SOBJDUMP_FLAGS] { set SOBJDUMP_FLAGS "" } - verbose -log "$objdump $SOBJDUMP_FLAGS $object | grep \@ | sort > $tmpdir/objdump.out" - - catch "exec $objdump $SOBJDUMP_FLAGS $object | grep \@ | sort > $tmpdir/objdump.out" exec_output + set cmd "$objdump $SOBJDUMP_FLAGS $object | sed -n {s/^\\(\[0-9a-f\]* *\\)\\(\[gw\]\\)\\( *\\)\\(\[FO\]\\)/\\1\\2\\4\\3/;/\@/p} | sort -k 5 > $tmpdir/objdump.out" + verbose -log $cmd + catch "exec $cmd" exec_output set exec_output [prune_warnings $exec_output] if [string match "" $exec_output] then { @@ -258,7 +256,7 @@ proc objdump_symstuff { objdump object expectfile } { perror "$expectfile doesn't exist" return 0 } - + if [file exists $tmpdir/objdump.out] then { set file_b [open $tmpdir/objdump.out r] } else { @@ -281,18 +279,19 @@ proc objdump_symstuff { objdump object expectfile } { close $file_a while { [gets $file_b line] != $eof } { - if [regexp "^#.*$" $line] then { + if [regexp {\.text.* \.[^ ]*$} $line] then { + # Discard defined powerpc64 dot-symbols continue } else { lappend list_b $line } } close $file_b - + for { set i 0 } { $i < [llength $list_a] } { incr i } { set line_a [lindex $list_a $i] set line_b [lindex $list_b $i] - + verbose "\t$expectfile: $i: $line_a" 3 verbose "\t/tmp/objdump.out: $i: $line_b" 3 @@ -301,20 +300,20 @@ proc objdump_symstuff { objdump object expectfile } { } else { verbose -log "\t$expectfile: $i: $line_a" verbose -log "\t$tmpdir/objdump.out: $i: $line_b" - + return 0 } } - + if { [llength $list_a] != [llength $list_b] } { verbose -log "Line count" return 0 } - + if $differences<1 then { return 1 } - + return 0 } else { verbose -log "$exec_output" @@ -335,9 +334,9 @@ proc objdump_dynsymstuff { objdump object expectfile } { if ![info exists DOBJDUMP_FLAGS] { set DOBJDUMP_FLAGS "" } - verbose -log "$objdump $DOBJDUMP_FLAGS $object | sed -n /VERS/p\\\;/show/p | sort | uniq > $tmpdir/objdump.out" - - catch "exec $objdump $DOBJDUMP_FLAGS $object | sed -n /VERS/p\\\;/show/p | sort | uniq > $tmpdir/objdump.out" exec_output + set cmd "$objdump $DOBJDUMP_FLAGS $object | sed -n /VERS/p\\\;/show/p | sort | uniq > $tmpdir/objdump.out" + verbose -log $cmd + catch "exec $cmd" exec_output set exec_output [prune_warnings $exec_output] if [string match "" $exec_output] then { @@ -353,7 +352,7 @@ proc objdump_dynsymstuff { objdump object expectfile } { warning "$expectfile doesn't exist" return 0 } - + if [file exists $tmpdir/objdump.out] then { set file_b [open $tmpdir/objdump.out r] } else { @@ -376,27 +375,32 @@ proc objdump_dynsymstuff { objdump object expectfile } { close $file_a while { [gets $file_b line] != $eof } { - if [regexp "^#.*$" $line] then { + if [regexp {\.text.* \.[^ ]*$} $line] then { + # Discard defined powerpc64 dot-symbols continue } else { lappend list_b $line } } close $file_b - + # Support empty files. - if { ![info exists list_a] && ![info exists list_b] } then { - return 1 + if { ![info exists list_a] } then { + if { ![info exists list_b] } then { + return 1 + } + verbose -log "\t$tmpdir/objdump.out: $list_b" + return 0 } for { set i 0 } { $i < [llength $list_b] } { incr i } { set line_b [lindex $list_b $i] - + # The tests are rigged so that we should never export a symbol with the # word 'hide' in it. Thus we just search for it, and bail if we find it. if [regexp "hide" $line_b] then { verbose -log "\t$tmpdir/objdump.out: $i: $line_b" - + return 0 } @@ -416,20 +420,20 @@ proc objdump_dynsymstuff { objdump object expectfile } { if { $j >= [llength $list_a] } { verbose -log "\t$tmpdir/objdump.out: $i: $line_b" - + return 0 } } - + if { [llength $list_a] != [llength $list_b] } { verbose -log "Line count" return 0 } - + if $differences<1 then { return 1 } - + return 0 } else { verbose -log "$exec_output" @@ -533,7 +537,7 @@ proc build_binary { shared pic test source libname other mapfile verexp versymex set script_arg "$script $srcdir/$subdir/$mapfile" } - if {![ld_simple_link $ld $tmpdir/$libname.so "$shared $tmpdir/$libname.o $other_lib $script_arg $ldargs"]} { + if {![ld_link $ld $tmpdir/$libname.so "$shared $tmpdir/$libname.o $other_lib $script_arg $ldargs"]} { fail "$test" return } @@ -561,7 +565,7 @@ proc build_binary { shared pic test source libname other mapfile verexp versymex } pass $test - + } proc build_executable { test source libname other mapfile verexp versymexp symexp } { @@ -570,7 +574,9 @@ proc build_executable { test source libname other mapfile verexp versymexp symex proc build_vers_lib_no_pic { test source libname other mapfile verexp versymexp symexp } { global shared - build_binary $shared "" $test $source $libname $other $mapfile $verexp $versymexp $symexp "" + # Make sure that PLT is used since PLT is expected. + global PLT_CFLAGS + build_binary $shared $PLT_CFLAGS $test $source $libname $other $mapfile $verexp $versymexp $symexp "" } proc build_vers_lib_pic { test source libname other mapfile verexp versymexp symexp } { @@ -622,7 +628,7 @@ proc test_ldfail { test flag source execname other mapfile whyfail } { set script_arg "-Wl,$script $srcdir/$subdir/$mapfile" } - if {![ld_simple_link $CC $tmpdir/$execname "$tmpdir/$execname.o $other_lib $script_arg"]} { + if {![ld_link $CC $tmpdir/$execname "$tmpdir/$execname.o $other_lib $script_arg"]} { pass "$test" return } @@ -675,12 +681,12 @@ proc test_strip_vers_lib { test srclib libname verexp versymexp } { fail "$test" return } - + if {![objdump_dynsymstuff $objdump $tmpdir/$libname.so $srcdir/$subdir/$versymexp ]} { fail "$test" return } - + } else { verbose -log "$exec_output" fail "$test" @@ -720,7 +726,7 @@ proc build_exec { test source execname flags solibname verexp versymexp symexp } set solibname_lib $tmpdir/$solibname } - if {![ld_simple_link $CC $tmpdir/$execname "$flags $tmpdir/$execname.o $solibname_lib"]} { + if {![ld_link $CC $tmpdir/$execname "$flags $tmpdir/$execname.o $solibname_lib"]} { fail "$test" return } @@ -767,8 +773,10 @@ proc build_exec { test source execname flags solibname verexp versymexp symexp } pass $test } -if [istarget x86_64-*-linux*] { - # x86_64 doesn't like non-pic shared libraries +if { [istarget x86_64-*-linux*] \ + || [istarget arm*-*-*] \ + || ( [istarget mips*-*-linux*] && [at_least_gcc_version 4 3] ) } { + # x86_64, ARM and newer MIPS toolchains do not like non-pic shared libraries set pic "yes" } else { set pic "no" @@ -789,7 +797,7 @@ build_vers_lib_pic "vers2" vers2.c vers2 vers1.so vers2.map vers2.ver vers2.dsym # # Test #3 - build an executable, and link it against vers1.so. # -build_exec "vers3" vers3.c vers3 "" vers1.so vers3.ver vers3.dsym "" +build_exec "vers3" vers3.c vers3 "-Wl,--no-as-needed" vers1.so vers3.ver vers3.dsym "" # # Test #4 - Make sure a version implicitly defined in an executable @@ -802,7 +810,11 @@ build_exec "vers3" vers3.c vers3 "" vers1.so vers3.ver vers3.dsym "" setup_xfail "mips*-*-*" build_exec "vers4" vers4.c vers4 "" "" "" "" vers4.sym -build_exec "vers4a" vers4.c vers4a "-export-dynamic" "" vers4a.ver vers4a.dsym vers4a.sym +build_exec "vers4a" vers4.c vers4a "-Wl,-export-dynamic" "" vers4a.ver vers4a.dsym vers4a.sym + +# Verify that --no-export-dynamic undoes the effect of --export-dynamic. +setup_xfail "mips*-*-*" +build_exec "vers4b" vers4.c vers4b "-Wl,-export-dynamic -Wl,--no-export-dynamic" "" "" "" vers4.sym # @@ -816,7 +828,7 @@ test_ldfail "vers5" "" vers5.c vers5 "" "" "multiple definition of foo@VERS_1.2" # Now build a test that should reference a bunch of versioned symbols. # All of them should be correctly referenced. # -build_exec "vers6" vers6.c vers6 "" vers1.so vers6.ver vers6.dsym vers6.sym +build_exec "vers6" vers6.c vers6 "-Wl,--no-as-needed" vers1.so vers6.ver vers6.dsym vers6.sym # # Another test to verify that something made local via 'local' is truly not @@ -843,7 +855,7 @@ build_vers_lib_pic "vers8" vers1.c vers8 vers8.map "" vers8.ver vers1.dsym vers1 # This test tries to make sure that version references to versioned symbols # don't collide with default definitions with the same symbol. # -build_exec "vers9" vers9.c vers9 "-export-dynamic" "" vers9.ver vers9.dsym vers9.sym +build_exec "vers9" vers9.c vers9 "-Wl,-export-dynamic" "" vers9.ver vers9.dsym vers9.sym # @@ -868,27 +880,27 @@ test_ar "ar with versioned solib" vers13.a vers1.so vers13.asym # # Strip a shared library, and make sure we didn't screw something up in there. # -test_strip_vers_lib "vers14" vers1.so vers14 vers1.ver vers1.dsym +test_strip_vers_lib "vers14" vers1.so vers14 vers1.ver vers1.dsym # -# Build another test with some versioned symbols. Here we are going to +# Build another test with some versioned symbols. Here we are going to # try and override something from the library, and we shouldn't get # any errors. # -build_exec "vers15" vers15.c vers15 "" vers1.so vers15.ver vers15.dsym vers15.sym +build_exec "vers15" vers15.c vers15 "-Wl,--no-as-needed" vers1.so vers15.ver vers15.dsym vers15.sym # # Test that when we override a versioned symbol from the library this # symbol appears in the dynamic symbol table of the executable. # build_vers_lib_pic "vers16a" vers16a.c vers16a "" vers16.map vers16a.ver vers16a.dsym "" -build_exec "vers16" vers16.c vers16 "" vers16a.so "" vers16.dsym "" +build_exec "vers16" vers16.c vers16 "-Wl,--no-as-needed" vers16a.so "" vers16.dsym "" # Test a weak versioned symbol. build_vers_lib_pic "vers17" vers17.c vers17 "" vers17.map vers17.ver vers17.dsym "" build_vers_lib_pic "vers18" vers18.c vers18 vers17.so vers18.map vers18.ver vers18.dsym vers18.sym -build_exec "vers19" vers19.c vers19 "-Wl,-rpath,." vers18.so vers19.ver vers19.dsym "" +build_exec "vers19" vers19.c vers19 "-Wl,--no-as-needed,-rpath,.,-rpath-link,." vers18.so vers19.ver vers19.dsym "" build_vers_lib_no_pic "vers20a" vers20.c vers20a "" vers20.map vers20a.ver vers20.dsym "" exec cp $tmpdir/vers20a.so $tmpdir/vers20b.so @@ -904,7 +916,7 @@ build_vers_lib_pic "vers22" vers22.c vers22 "vers22a.so vers22b.so" "" vers22.ve # Test versioned definitions in different files. if [string match "yes" $pic] then { - xfail "vers23a" + xfail "vers23a" xfail "vers23b" xfail "vers23c" xfail "vers23d" @@ -913,8 +925,8 @@ if [string match "yes" $pic] then { build_vers_lib_no_pic "vers23a" vers23a.c vers23a "" vers23a.map vers23a.ver vers23a.dsym vers23a.sym build_vers_lib_no_pic "vers23b" vers23b.c vers23b "" vers23b.map vers23b.ver vers23b.dsym "" build_vers_lib_no_pic "vers23c" vers23b.c vers23c "vers23a.so" vers23b.map vers23c.ver vers23b.dsym "" - build_exec "vers23d" vers23.c vers23d "tmpdir/vers23a.so tmpdir/vers23c.so" "" vers23.ver vers23d.dsym "" - build_exec "vers23" vers23.c vers23 "tmpdir/vers23a.so tmpdir/vers23b.o tmpdir/vers23b.so" "" vers23.ver vers23.dsym "" + build_exec "vers23d" vers23.c vers23d "-Wl,--no-as-needed tmpdir/vers23a.so tmpdir/vers23c.so" "" vers23.ver vers23d.dsym "" + build_exec "vers23" vers23.c vers23 "-Wl,--no-as-needed tmpdir/vers23a.so tmpdir/vers23b.o tmpdir/vers23b.so" "" vers23.ver vers23.dsym "" } # Test .symver x,x@VERS.0 @@ -923,15 +935,15 @@ if [istarget sparc*-*-*] { set as_pic_flags "-K PIC" } run_ld_link_tests [list "\"vers24a\" - \"-shared --version-script $srcdir/$subdir/vers24.map\" + \"-shared --version-script $srcdir/$subdir/vers24.map\" \"\" \"$as_pic_flags $as_options\" {vers24a.c vers24b.c} { { readelf -Wrs vers24.rd } } \"libvers24a.so\" \"-fpic\""] run_ld_link_tests [list "\"vers24b\" - \"-shared --version-script $srcdir/$subdir/vers24.map\" + \"-shared --version-script $srcdir/$subdir/vers24.map\" \"\" \"$as_pic_flags $as_options\" {vers24b.c vers24a.c} { { readelf -Wrs vers24.rd } } \"libvers24b.so\" \"-fpic\""] run_ld_link_tests [list "\"vers24c\" - \"-shared --version-script $srcdir/$subdir/vers24.map\" + \"-shared --version-script $srcdir/$subdir/vers24.map\" \"\" \"$as_pic_flags $as_options\" {vers24c.c} { { readelf -Wrs vers24.rd } } \"libvers24c.so\" \"-fpic\""] @@ -991,3 +1003,7 @@ build_vers_lib_pic "vers30" vers30.c vers30 "" vers30.map vers30.ver vers30.dsym # Test #31 -- quoted strings in version sections. build_vers_lib_pic "vers31" vers31.c vers31 "" vers31.map vers31.ver vers31.dsym "" + +# Test #32 -- linker --defsym +build_vers_lib_pic "vers32a" vers32a.c vers32a "" vers32.map vers32a.ver vers32a.dsym "" +build_vers_lib_pic_flags "vers32b" vers32b.c vers32b "vers32a.so" vers32.map vers32b.ver vers32b.dsym "" "--defsym foo=0"