X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=ld%2Ftestsuite%2Flib%2Fld-lib.exp;h=edf6e93de54268327a65b3f2c8cd01616f44296f;hb=99bcaeaf0ff692348194ed6f30162c3a0cfb9655;hp=b60fcadf0582357ab6b12d4418b903b9afc06326;hpb=6f9dbcd42f2cf034a9a21f46842c08d2e88449db;p=deliverable%2Fbinutils-gdb.git diff --git a/ld/testsuite/lib/ld-lib.exp b/ld/testsuite/lib/ld-lib.exp index b60fcadf05..edf6e93de5 100644 --- a/ld/testsuite/lib/ld-lib.exp +++ b/ld/testsuite/lib/ld-lib.exp @@ -1,5 +1,5 @@ # Support routines for LD testsuite. -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # # This file is part of the GNU Binutils. # @@ -85,6 +85,8 @@ proc run_host_cmd { prog command } { global link_output global gcc_B_opt global ld_L_opt + global gcc_ld_B_opt_tested + global ld if { ![is_remote host] && [which "$prog"] == 0 } then { perror "$prog does not exist" @@ -106,6 +108,22 @@ proc run_host_cmd { prog command } { set gccexe [string replace $gccexe 0 [string last "/" $gccexe] ""] if {[string match "*cc*" $gccexe] || [string match "*++*" $gccexe]} then { set gccflags "$gcc_B_opt $gccflags $ld_L_opt" + if {![info exists gcc_ld_B_opt_tested]} { + set gcc_ld_B_opt_tested 1 + set ld_version_message [run_host_cmd "$ld" "--version"] + set gcc_ld_version_message [run_host_cmd "$prog" "$gccflags -Wl,--version"] + if {[string first $ld_version_message $gcc_ld_version_message] < 0} { + perror "************************************************************************" + perror "Your compiler driver ignores -B when choosing ld." + perror "You will not be testing the new ld in many of the following tests." + set gcc_ld_version [run_host_cmd "$prog" "$gccflags --print-prog-name=ld"] + if {![string match "" $gcc_ld_version] && ![string match "ld" $gcc_ld_version]} { + + perror "It seems you will be testing $gcc_ld_version instead." + } + perror "************************************************************************" + } + } } verbose -log "$prog $gccflags $command" @@ -484,7 +502,7 @@ proc ld_link_defsyms {} { # result is analyzed by an analyzer program specified below (which # may in turn *also* be objcopy). # -# PROG: PROGRAM-NAME +# DUMPPROG: PROGRAM-NAME # The name of the program to run to analyze the .o file produced # by the assembler or the linker output. This can be omitted; # run_dump_test will guess which program to run by seeing which of @@ -493,7 +511,6 @@ proc ld_link_defsyms {} { # readelf: FLAGS # objdump: FLAGS # nm: FLAGS -# objcopy: FLAGS # Use the specified program to analyze the assembler or linker # output file, and pass it FLAGS, in addition to the output name. # Note that they are run with LC_ALL=C in the environment to give @@ -517,17 +534,40 @@ proc ld_link_defsyms {} { # once. # # target: TARGET -# Only run the test for TARGET. This may occur more than once; the -# target being tested must match at least one. You may provide target -# name "cfi" for any target supporting the CFI statements. +# Only run the test for TARGET. +# You may provide target name "cfi" for any target supporting the +# CFI statements. You may provide target name "shared" for any +# target supporting shared libraries. Otherwise TARGET is called +# as a TCL procedure if surrounded by square brackets, or passed +# to "istarget" if not. +# This may occur more than once; the target being tested must match +# at least one. Otherwise the test will be marked unsupported. +# +# alltargets: TARGET +# Only run the test for TARGET. +# The syntax for TARGET is as with 'target'. +# This may occur more than once; the target being tested must match +# all of them. Otherwise the test will be marked unsupported. # # notarget: TARGET -# Do not run the test for TARGET. This may occur more than once; -# the target being tested must not match any of them. +# Do not run the test for TARGET. +# The syntax for TARGET is as with 'target'. +# This may occur more than once; the target being tested must not +# match any of them. Otherwise the test will be marked unsupported. +# +# skip: TARGET +# anyskip: TARGET +# noskip: TARGET +# These are exactly the same as "notarget", "alltargets" and +# "target" respectively, except that they do nothing at all if the +# check fails. They should only be used in groups, to construct a +# single test which is run on all targets but with variant options +# or expected output on some targets. (For example, see +# gas/arm/inst.d and gas/arm/wince_inst.d.) # # error: REGEX # An error with message matching REGEX must be emitted for the test -# to pass. The PROG, readelf, objdump, nm and objcopy options have +# to pass. The DUMPPROG, readelf, objdump, and nm options have # no meaning and need not be supplied if this is present. Multiple # "error" directives append to the expected linker error message. # @@ -599,13 +639,16 @@ proc run_dump_test { name {extra_options {}} } { set opts(ld_after_inputfiles) {} set opts(xfail) {} set opts(target) {} + set opts(alltargets) {} set opts(notarget) {} + set opts(skip) {} + set opts(anyskip) {} + set opts(noskip) {} set opts(objdump) {} set opts(nm) {} - set opts(objcopy) {} set opts(readelf) {} set opts(name) {} - set opts(PROG) {} + set opts(DUMPPROG) {} set opts(source) {} set opts(dump) {} set opts(error) {} @@ -628,7 +671,11 @@ proc run_dump_test { name {extra_options {}} } { switch -- $opt_name { xfail {} target {} + alltargets {} notarget {} + skip {} + anyskip {} + noskip {} warning {} error {} source { @@ -713,72 +760,102 @@ proc run_dump_test { name {extra_options {}} } { [big_or_little_endian] opts($opt) } + if { $opts(name) == "" } { + set testname "$subdir/$name" + } else { + set testname $opts(name) + } + # Decide early whether we should run the test for this target. + if { [llength $opts(noskip)] > 0 } { + set targmatch 0 + foreach targ $opts(noskip) { + if [match_target $targ] { + set targmatch 1 + break + } + } + if { $targmatch == 0 } { + return + } + } + foreach targ $opts(anyskip) { + if ![match_target $targ] { + return + } + } + foreach targ $opts(skip) { + if [match_target $targ] { + return + } + } if { [llength $opts(target)] > 0 } { set targmatch 0 foreach targ $opts(target) { - if [istarget $targ] { + if [match_target $targ] { set targmatch 1 break } } if { $targmatch == 0 } { + unsupported $testname + return + } + } + foreach targ $opts(alltargets) { + if ![match_target $targ] { + unsupported $testname return } } foreach targ $opts(notarget) { - if [istarget $targ] { + if [match_target $targ] { + unsupported $testname return } } - set program "" + set dumpprogram "" # It's meaningless to require an output-testing method when we # expect an error. if { $opts(error) == "" && $opts(error_output) == "" } { - if {$opts(PROG) != ""} { - switch -- $opts(PROG) { - objdump { set program objdump } - nm { set program nm } - objcopy { set program objcopy } - readelf { set program readelf } - default - { perror "unrecognized program option $opts(PROG) in $file.d" - unresolved $subdir/$name - return } + if { $opts(DUMPPROG) != "" } { + switch -- $opts(DUMPPROG) { + objdump { set dumpprogram objdump } + nm { set dumpprogram nm } + readelf { set dumpprogram readelf } + default { + perror "unrecognized DUMPPROG option $opts(DUMPPROG) in $file.d" + unresolved $testname + return + } } } else { # Guess which program to run, by seeing which option was specified. - foreach p {objdump objcopy nm readelf} { + foreach p {objdump nm readelf} { if {$opts($p) != ""} { - if {$program != ""} { + if {$dumpprogram != ""} { perror "ambiguous dump program in $file.d" - unresolved $subdir/$name + unresolved $testname return } else { - set program $p + set dumpprogram $p } } } } - if { $program == "" \ + if { $dumpprogram == "" \ && $opts(map) == "" \ && $opts(warning) == "" \ && $opts(warning_output) == "" \ && $opts(error) == "" \ && $opts(error_output) == "" } { perror "dump program unspecified in $file.d" - unresolved $subdir/$name + unresolved $testname return } } - if { $opts(name) == "" } { - set testname "$subdir/$name" - } else { - set testname $opts(name) - } - if { $opts(source) == "" } { set sourcefiles [list ${file}.s] set asflags [list ""] @@ -976,11 +1053,11 @@ proc run_dump_test { name {extra_options {}} } { && (($cmdret == 0) == ($check_ld(terminal) == 0)) \ && ((($check_ld(source) == "regex") \ && ($check_ld(regex) == "") == ($comp_output == "") \ - && [regexp $check_ld(regex) $comp_output]) \ + && [regexp -- $check_ld(regex) $comp_output]) \ || (($check_ld(source) == "file") \ && (![regexp_diff "tmpdir/ld.messages" "$srcdir/$subdir/$check_ld(file)"]))) } { # We have the expected output from ld. - if { $check_ld(terminal) || $program == "" } { + if { $check_ld(terminal) || $dumpprogram == "" } { pass $testname return } @@ -1000,7 +1077,7 @@ proc run_dump_test { name {extra_options {}} } { pass "$testname (map file check)" } - if { $program == "" } then { + if { $dumpprogram == "" } then { return } } @@ -1014,9 +1091,9 @@ proc run_dump_test { name {extra_options {}} } { return } - set progopts1 $opts($program) - eval set progopts \$[string toupper $program]FLAGS - eval set binary \$[string toupper $program] + set progopts1 $opts($dumpprogram) + eval set progopts \$[string toupper $dumpprogram]FLAGS + eval set binary \$[string toupper $dumpprogram] if { ![is_remote host] && [which $binary] == 0 } { untested $testname @@ -1025,13 +1102,7 @@ proc run_dump_test { name {extra_options {}} } { if { $progopts1 == "" } { set $progopts1 "-r" } verbose "running $binary $progopts $progopts1" 3 - - # Objcopy, unlike the other two, won't send its output to stdout, - # so we have to run it specially. set cmd "$binary $progopts $progopts1 $objfile > $dumpfile" - if { $program == "objcopy" } { - set cmd "$binary $progopts $progopts1 $objfile $dumpfile" - } # Ensure consistent sorting of symbols if {[info exists env(LC_ALL)]} { @@ -1338,33 +1409,10 @@ proc run_ld_link_tests { ldtests args } { } } -# This definition is taken from an unreleased version of DejaGnu. Once -# that version gets released, and has been out in the world for a few -# months at least, it may be safe to delete this copy. -if ![string length [info proc prune_warnings]] { - # - # prune_warnings -- delete various system verbosities from TEXT - # - # An example is: - # ld.so: warning: /usr/lib/libc.so.1.8.1 has older revision than expected 9 - # - # Sites with particular verbose os's may wish to override this in site.exp. - # - proc prune_warnings { text } { - # This is from sun4's. Do it for all machines for now. - # The "\\1" is to try to preserve a "\n" but only if necessary. - regsub -all "(^|\n)(ld.so: warning:\[^\n\]*\n?)+" $text "\\1" text - - # It might be tempting to get carried away and delete blank lines, etc. - # Just delete *exactly* what we're ask to, and that's it. - return $text - } -} - # ldtests contains test-items with 3 items followed by 1 lists, 2 items # and 3 optional items: # 0:name -# 1:ld options +# 1:ld leading options, placed before object files # 2:assembler options # 3:filenames of source files # 4:name of output file @@ -1372,6 +1420,7 @@ if ![string length [info proc prune_warnings]] { # 6:compiler flags (optional) # 7:language (optional) # 8:linker warning (optional) +# 9:ld trailing options, placed after object files (optional) # args is an optional list of target triplets to be xfailed. proc run_ld_link_exec_tests { ldtests args } { @@ -1387,6 +1436,7 @@ proc run_ld_link_exec_tests { ldtests args } { global errcnt global exec_output global board_cflags + global STATIC_LDFLAGS # When using GCC as the linker driver, we need to specify board cflags when # linking because cflags may contain linker options. For example when @@ -1411,6 +1461,7 @@ proc run_ld_link_exec_tests { ldtests args } { set cflags [lindex $testitem 6] set lang [lindex $testitem 7] set warning [lindex $testitem 8] + set ld_after [lindex $testitem 9] set objfiles {} set failed 0 @@ -1441,7 +1492,10 @@ proc run_ld_link_exec_tests { ldtests args } { continue } - if { [ string match "c++" $lang ] } { + if { [ string match "asm" $lang ] } { + set link_proc ld_link + set link_cmd $ld + } elseif { [ string match "c++" $lang ] } { set link_proc ld_link set link_cmd $CXX } else { @@ -1453,8 +1507,15 @@ proc run_ld_link_exec_tests { ldtests args } { # compile only pass $testname continue; - } elseif ![$link_proc $link_cmd $binfile "$board_cflags -L$srcdir/$subdir $ld_options $objfiles"] { - set failed 1 + } else { + if { [string match "" $STATIC_LDFLAGS] \ + && [regexp -- ".* \[-\]+static .*" " $board_cflags $ld_options $objfiles $ld_after "] } { + untested $testname + continue + } + if ![$link_proc $link_cmd $binfile "$board_cflags -L$srcdir/$subdir $ld_options $objfiles $ld_after"] { + set failed 1 + } } # Check if exec_output is expected. @@ -1534,6 +1595,7 @@ proc run_cc_link_tests { ldtests } { global ar global exec_output global board_cflags + global STATIC_LDFLAGS if [board_info [target_info name] exists cflags] { set board_cflags " [board_info [target_info name] cflags]" @@ -1631,6 +1693,11 @@ proc run_cc_link_tests { ldtests } { set failed 1 } } else { + if { [string match "" $STATIC_LDFLAGS] \ + && [regexp -- ".* \[-\]+static .*" " $board_cflags $ldflags $objfiles "] } { + untested $testname + continue + } ld_link $cc_cmd $binfile "$board_cflags -L$srcdir/$subdir $ldflags $objfiles" set ld_output "$exec_output" @@ -1744,18 +1811,16 @@ proc check_gc_sections_available { } { if {![info exists gc_sections_available_saved]} { # Some targets don't support gc-sections despite whatever's # advertised by ld's options. - if { [istarget d30v-*-*] + if { [istarget alpha-*-*] + || [istarget d30v-*-*] || [istarget dlx-*-*] - || [istarget i960-*-*] - || [istarget pj*-*-*] - || [istarget pru*-*-*] - || [istarget alpha-*-*] || [istarget hppa*64-*-*] - || [istarget i370-*-*] - || [istarget i860-*-*] || [istarget ia64-*-*] || [istarget mep-*-*] - || [istarget mn10200-*-*] } { + || [istarget mn10200-*-*] + || [istarget pj*-*-*] + || [istarget pru*-*-*] + || [istarget xgate-*-*] } { set gc_sections_available_saved 0 return 0 } @@ -1782,60 +1847,20 @@ proc check_gc_sections_available { } { } # Returns true if -shared is supported on the target -# Only used and accurate for ELF targets at the moment proc check_shared_lib_support { } { - if {![istarget aarch64*-*-elf] - && ![istarget arc*-*-elf*] - && ![istarget arm*-*-elf] - && ![istarget avr-*-*] - && ![istarget cr16-*-*] - && ![istarget cris*-*-elf] - && ![istarget crx-*-*] - && ![istarget d10v-*-*] - && ![istarget d30v-*-*] - && ![istarget dlx-*-*] - && ![istarget epiphany-*-*] - && ![istarget fr30-*-*] - && ![istarget frv-*-*] - && ![istarget ft32-*-*] - && ![istarget h8300-*-*] - && ![istarget i860-*-*] - && ![istarget i960-*-*] - && ![istarget ip2k-*-*] - && ![istarget iq2000-*-*] - && ![istarget lm32-*-*] - && ![istarget m32c-*-*] - && ![istarget m32r-*-*] - && ![istarget m6811-*-*] - && ![istarget m6812-*-*] - && ![istarget m68hc1*-*-*] - && ![istarget mcore*-*-*] - && ![istarget mep-*-*] - && ![istarget microblaze-*-*] - && ![istarget mips*-*-elf] - && ![istarget mn10200-*-*] - && ![istarget moxie-*-*] - && ![istarget msp430-*-*] - && ![istarget mt-*-*] - && ![istarget nds32*-*-*] - && ![istarget nios2-*-elf] - && ![istarget or1k*-*-*] - && ![istarget pj-*-*] - && ![istarget pru-*-*] - && ![istarget rl78-*-*] - && ![istarget rx-*-*] - && ![istarget spu-*-*] - && ![istarget v850*-*-*] - && ![istarget visium-*-*] - && ![istarget xc16x-*-elf] - && ![istarget xgate-*-*] - && ![istarget xstormy16-*-*] - && ![istarget *-*-irix*] - && ![istarget *-*-rtems] } { - return 1 + global shared_available_saved + global ld + + if {![info exists shared_available_saved]} { + set ld_output [remote_exec host $ld "-shared"] + if { [ string first "not supported" $ld_output ] >= 0 } { + set shared_available_saved 0 + } else { + set shared_available_saved 1 + } } - return 0 + return $shared_available_saved } # Return true if target uses genelf.em (assuming it is ELF). @@ -1845,19 +1870,37 @@ proc is_generic_elf { } { || [istarget "fr30-*-*"] || ([istarget "frv-*-*"] && ![istarget "frv-*-linux*"]) || [istarget "ft32-*-*"] - || [istarget "i860-*-*"] - || [istarget "i960-*-*"] || [istarget "iq2000-*-*"] || [istarget "mn10200-*-*"] || [istarget "moxie-*-*"] || [istarget "msp430-*-*"] || [istarget "mt-*-*"] - || [istarget "pj*-*-*"] } { + || [istarget "pj*-*-*"] + || [istarget "xgate-*-*"] } { return 1; } return 0; } +proc is_underscore_target { } { + global is_underscore_target_saved + global target_triplet + global srcdir + + if { ![info exists is_underscore_target_saved] } { + set cmd "targ=$target_triplet . $srcdir/../../bfd/config.bfd &&" + append cmd { echo "$targ_underscore"} + verbose -log "$cmd" + set status [catch {exec sh -c $cmd} result] + if { $status == 0 && [string match "yes" $result] } { + set is_underscore_target_saved 1 + } else { + set is_underscore_target_saved 0 + } + } + return $is_underscore_target_saved +} + # Returns true if the target ld supports the plugin API. proc check_plugin_api_available { } { global plugin_api_available_saved @@ -2109,7 +2152,7 @@ proc check_ifunc_available { } { set src [remote_download host $src] } set ifunc_available_saved [run_host_cmd_yesno "$CC" "$flags $src -o $output"] - if { $ifunc_available_saved == 1 } { + if { [isnative] && $ifunc_available_saved == 1 } { set ifunc_available_saved [run_host_cmd_yesno "$output" ""] } remote_file host delete $src @@ -2156,7 +2199,7 @@ proc check_ifunc_attribute_available { } { set src [remote_download host $src] } set ifunc_attribute_available_saved [run_host_cmd_yesno "$CC" "$flags $src -o $output"] - if { $ifunc_attribute_available_saved == 1 } { + if { [isnative] && $ifunc_attribute_available_saved == 1 } { set ifunc_attribute_available_saved [run_host_cmd_yesno "$output" ""] } remote_file host delete $src @@ -2173,6 +2216,9 @@ proc istarget { target } { if {$target == "cfi"} { return [check_as_cfi] } + if {$target == "shared"} { + return [check_shared_lib_support] + } return [istarget_ld $target] } @@ -2210,3 +2256,67 @@ proc check_libdl_available { } { } return $libdl_available_saved } + +# Returns true if GNU2 TLS works. + +proc check_gnu2_tls_available { } { + global gnu2_tls_available_saved + global CC + global GNU2_CFLAGS + + if {![info exists gnu2_tls_available_saved]} { + if { [which $CC] == 0 || "$GNU2_CFLAGS" == "" } { + set gnu2_tls_available_saved 0 + return 0 + } + # Check if GNU2 TLS works. + set flags "$GNU2_CFLAGS" + if [board_info [target_info name] exists cflags] { + append flags " [board_info [target_info name] cflags]" + } + if [board_info [target_info name] exists ldflags] { + append flags " [board_info [target_info name] ldflags]" + } + + set basename "tmpdir/gnu2_tls[pid]" + set src1 ${basename}1.c + set output1 ${basename}.so + set f [open $src1 "w"] + puts $f "extern __thread int zzz;" + puts $f "int foo (void)" + puts $f "{" + puts $f " return zzz;" + puts $f "}" + close $f + if [is_remote host] { + set src1 [remote_download host $src1] + } + set src2 ${basename}2.c + set output2 ${basename}.exe + set f [open $src2 "w"] + puts $f "__thread int zzz = 20;" + puts $f "extern int foo (void);" + puts $f "int main (void)" + puts $f "{" + puts $f " if (foo () != 20) __builtin_abort ();" + puts $f " return 0; " + puts $f "}" + close $f + if [is_remote host] { + set src2 [remote_download host $src2] + } + set gnu2_tls_available_saved [run_host_cmd_yesno "$CC" "-fPIC -shared $flags $src1 -o $output1"] + if { $gnu2_tls_available_saved == 1 } { + set gnu2_tls_available_saved [run_host_cmd_yesno "$CC" "$flags $src2 $output1 -o $output2"] + if { $gnu2_tls_available_saved == 1 } { + set gnu2_tls_available_saved [run_host_cmd_yesno "$output2" ""] + } + } + remote_file host delete $src1 + remote_file host delete $output1 + remote_file host delete $src2 + remote_file host delete $output2 + file delete $src1 $src2 + } + return $gnu2_tls_available_saved +}