X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=ld%2Ftestsuite%2Flib%2Fld-lib.exp;h=7b190bee2a6e787819afe719a7a90bdd3d261bdc;hb=8be1e36919a884152d7115f4f4b8c0cfcf086a1f;hp=ffdf8051f3191e00433b632810c25f68b3b6494c;hpb=bdd65db9b9cd6d5dbdff9b48e97379029f8a3a1a;p=deliverable%2Fbinutils-gdb.git diff --git a/ld/testsuite/lib/ld-lib.exp b/ld/testsuite/lib/ld-lib.exp index ffdf8051f3..7b190bee2a 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-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2016 Free Software Foundation, Inc. # # This file is part of the GNU Binutils. # @@ -29,14 +29,18 @@ load_common_lib binutils-common.exp # Returns 0 otherwise. # proc at_least_gcc_version { major minor } { + global CC if {![info exists CC]} { set CC [find_gcc] } if { $CC == "" } { - return 0 + return 0 } set state [remote_exec host $CC --version] + if { [lindex $state 0] != 0 } { + return 0; + } set tmp "[lindex $state 1]\n" # Look for (eg) 4.6.1 in the version output. set ver_re "\[^\\.0-9\]+(\[1-9\]\[0-9\]*)\\.(\[0-9\]+)(?:\\.\[0-9\]+)?" @@ -125,8 +129,12 @@ proc run_host_cmd { prog command } { proc run_host_cmd_yesno { prog command } { global exec_output + global errcnt warncnt set exec_output [prune_warnings [run_host_cmd "$prog" "$command"]] + # Ignore error and warning. + set errcnt 0 + set warncnt 0 if [string match "" $exec_output] then { return 1; } @@ -509,6 +517,7 @@ proc ld_simple_link_defsyms {} { # run_dump_test will guess which program to run by seeing which of # the flags options below is present. # +# readelf: FLAGS # objdump: FLAGS # nm: FLAGS # objcopy: FLAGS @@ -545,15 +554,31 @@ proc ld_simple_link_defsyms {} { # # error: REGEX # An error with message matching REGEX must be emitted for the test -# to pass. The PROG, objdump, nm and objcopy options have no -# meaning and need not supplied if this is present. Multiple "error" -# directives append to the expected linker error message. +# to pass. The PROG, readelf, objdump, nm and objcopy options have +# no meaning and need not be supplied if this is present. Multiple +# "error" directives append to the expected linker error message. +# +# error_output: FILE +# Means the same as 'error', except the regular expression lines +# are contains in FILE. # # warning: REGEX # Expect a linker warning matching REGEX. It is an error to issue # both "error" and "warning". Multiple "warning" directives # append to the expected linker warning message. # +# warning_output: FILE +# Means the same as 'warning', except the regular expression +# lines are contains in FILE. +# +# map: FILE +# Adding this option will cause the linker to generate a linker +# map file, using the -Map=MAPFILE command line option. If +# there is no -Map=MAPFILE in the 'ld: FLAGS' then one will be +# added to the linker command line. The contents of the +# generated MAPFILE are then compared against the regexp lines +# in FILE using `regexp_diff' (see below for details). +# # Each option may occur at most once unless otherwise mentioned. # # After the option lines come regexp lines. `run_dump_test' calls @@ -567,6 +592,13 @@ proc run_dump_test { name {extra_options {}} } { global OBJDUMPFLAGS NMFLAGS ASFLAGS OBJCOPYFLAGS READELFFLAGS LDFLAGS global host_triplet runtests global env verbose + global ld_elf_shared_opt + + if { [is_elf_format] && [check_shared_lib_support] } { + set ld_extra_opt "$ld_elf_shared_opt" + } else { + set ld_extra_opt "" + } if [string match "*/*" $name] { set file $name @@ -604,8 +636,11 @@ proc run_dump_test { name {extra_options {}} } { set opts(dump) {} set opts(error) {} set opts(warning) {} + set opts(error_output) {} + set opts(warning_output) {} set opts(objcopy_linked_file) {} set opts(objcopy_objects) {} + set opts(map) {} foreach i $opt_array { set opt_name [lindex $i 0] @@ -710,7 +745,7 @@ proc run_dump_test { name {extra_options {}} } { set program "" # It's meaningless to require an output-testing method when we # expect an error. - if { $opts(error) == "" } { + if { $opts(error) == "" && $opts(error_output) == "" } { if {$opts(PROG) != ""} { switch -- $opts(PROG) { objdump { set program objdump } @@ -736,7 +771,12 @@ proc run_dump_test { name {extra_options {}} } { } } } - if { $program == "" && $opts(warning) == "" } { + if { $program == "" \ + && $opts(map) == "" \ + && $opts(warning) == "" \ + && $opts(warning_output) == "" \ + && $opts(error) == "" \ + && $opts(error_output) == "" } { perror "dump program unspecified in $file.d" unresolved $subdir/$name return @@ -769,12 +809,6 @@ proc run_dump_test { name {extra_options {}} } { set dfile $srcdir/$subdir/$opts(dump) } - if { [string match "*--compress-debug-sections*" $opts(as)] \ - && ![is_zlib_supported] } { - unsupported $testname - return - } - # Time to setup xfailures. foreach targ $opts(xfail) { setup_xfail $targ @@ -840,13 +874,45 @@ proc run_dump_test { name {extra_options {}} } { } } - set expmsg $opts(error) - if { $opts(warning) != "" } { - if { $expmsg != "" } { - perror "$testname: mixing error and warning test-directives" - return - } - set expmsg $opts(warning) + if { (($opts(warning) != "") && ($opts(error) != "")) \ + || (($opts(warning) != "") && ($opts(error_output) != "")) \ + || (($opts(warning) != "") && ($opts(warning_output) != "")) \ + || (($opts(error) != "") && ($opts(warning_output) != "")) \ + || (($opts(error) != "") && ($opts(error_output) != "")) \ + || (($opts(warning_output) != "") && ($opts(error_output) != "")) } { + perror "$testname: bad mix of warning, error, warning_output, and error_output test-directives" + unresolved $testname + return + } + + set check_ld(source) "" + set check_ld(terminal) 0 + if { $opts(error) != "" \ + || $opts(warning) != "" \ + || $opts(error_output) != "" \ + || $opts(warning_output) != "" } { + + if { $opts(error) != "" || $opts(error_output) != "" } { + set check_ld(terminal) 1 + } else { + set check_ld(terminal) 0 + } + + if { $opts(error) != "" || $opts(warning) != "" } { + set check_ld(source) "regex" + if { $opts(error) != "" } { + set check_ld(regex) $opts(error) + } else { + set check_ld(regex) $opts(warning) + } + } else { + set check_ld(source) "file" + if { $opts(error_output) != "" } { + set check_ld(file) $opts(error_output) + } else { + set check_ld(file) $opts(warning_output) + } + } } # Perhaps link the file(s). @@ -856,9 +922,23 @@ proc run_dump_test { name {extra_options {}} } { # Add -L$srcdir/$subdir so that the linker command can use # linker scripts in the source directory. - set cmd "$LD $LDFLAGS -L$srcdir/$subdir \ + set cmd "$LD $ld_extra_opt $LDFLAGS -L$srcdir/$subdir \ $opts(ld) -o $objfile $objfiles $opts(ld_after_inputfiles)" + # If needed then check for, or add a -Map option. + set mapfile "" + if { $opts(map) != "" } then { + if { [regexp -- "-Map=(\[^ \]+)" $cmd all mapfile] } then { + # Found existing mapfile option + verbose -log "Existing mapfile '$mapfile' found" + } else { + # No mapfile option. + set mapfile "tmpdir/dump.map" + verbose -log "Adding mapfile '$mapfile'" + set cmd "$cmd -Map=$mapfile" + } + } + send_log "$cmd\n" set cmdret [remote_exec host [concat sh -c [list "$cmd 2>&1"]] "" "/dev/null" "ld.tmp"] remote_upload host "ld.tmp" @@ -886,27 +966,53 @@ proc run_dump_test { name {extra_options {}} } { } regsub "\n$" $comp_output "" comp_output - if { $cmdret != 0 || $comp_output != "" || $expmsg != "" } then { + if { $cmdret != 0 || $comp_output != "" || $check_ld(source) != "" } then { set exitstat "succeeded" if { $cmdret != 0 } { set exitstat "failed" } - verbose -log "$exitstat with: <$comp_output>, expected: <$expmsg>" + + if { $check_ld(source) == "regexp" } { + verbose -log "$exitstat with: <$comp_output>, expected: <$check_ld(regex)>" + } elseif { $check_ld(source) == "file" } { + verbose -log "$exitstat with: <$comp_output>, expected in file $check_ld(file)" + set_file_contents "tmpdir/ld.messages" "$comp_output" + } else { + verbose -log "$exitstat with: <$comp_output>, no expected output" + } send_log "$comp_output\n" verbose "$comp_output" 3 - if { ($expmsg == "") == ($comp_output == "") \ - && [regexp $expmsg $comp_output] \ - && (($cmdret == 0) == ($opts(error) == "")) } { - # We have the expected output from ld. - if { $opts(error) != "" || $program == "" } { + if { (($check_ld(source) == "") == ($comp_output == "")) \ + && (($cmdret == 0) == ($check_ld(terminal) == 0)) \ + && ((($check_ld(source) == "regex") \ + && ($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 == "" } { pass $testname return } } else { - verbose -log "$exitstat with: <$comp_output>, expected: <$expmsg>" fail $testname return } } + + if { $opts(map) != "" } then { + # Check the map file matches. + set map_pattern_file $srcdir/$subdir/$opts(map) + verbose -log "Compare '$mapfile' against '$map_pattern_file'" + if { [regexp_diff $mapfile $map_pattern_file] } then { + fail "$testname (map file check)" + } else { + pass "$testname (map file check)" + } + + if { $program == "" } then { + return + } + } } else { set objfile "tmpdir/dump0.o" } @@ -1023,7 +1129,7 @@ proc set_file_contents { filename contents } { proc ar_simple_create { ar aropts target objects } { remote_file host delete $target - set exec_output [run_host_cmd "$ar" "$aropts -rc $target $objects"] + set exec_output [run_host_cmd "$ar" "-rc $aropts $target $objects"] set exec_output [prune_warnings $exec_output] if [string match "" $exec_output] then { @@ -1056,7 +1162,9 @@ proc ar_simple_create { ar aropts target objects } { # in all other cases, any output from the linker during linking is # treated as a sign of an error and FAILs the test. # -proc run_ld_link_tests { ldtests } { +# args is an optional list of target triplets to be xfailed. +# +proc run_ld_link_tests { ldtests args } { global ld global as global nm @@ -1070,6 +1178,13 @@ proc run_ld_link_tests { ldtests } { global CFLAGS global runtests global exec_output + global ld_elf_shared_opt + + if { [is_elf_format] && [check_shared_lib_support] } { + set ld_extra_opt "$ld_elf_shared_opt" + } else { + set ld_extra_opt "" + } foreach testitem $ldtests { set testname [lindex $testitem 0] @@ -1078,6 +1193,10 @@ proc run_ld_link_tests { ldtests } { continue } + foreach target $args { + setup_xfail $target + } + set ld_options [lindex $testitem 1] set ld_after [lindex $testitem 2] set as_options [lindex $testitem 3] @@ -1132,7 +1251,7 @@ proc run_ld_link_tests { ldtests } { if { ![ar_simple_create $ar $ld_options $binfile "$objfiles $ld_after"] } { set failed 1 } - } elseif { ![ld_simple_link $ld $binfile "-L$srcdir/$subdir $ld_options $objfiles $ld_after"] } { + } elseif { ![ld_simple_link $ld $binfile "$ld_extra_opt -L$srcdir/$subdir $ld_options $objfiles $ld_after"] } { set maybe_failed 1 set ld_output "$exec_output" } @@ -1251,7 +1370,6 @@ if ![string length [info proc prune_warnings]] { } } -# targets_to_xfail is a list of target triplets to be xfailed. # ldtests contains test-items with 3 items followed by 1 lists, 2 items # and 3 optional items: # 0:name @@ -1263,8 +1381,9 @@ if ![string length [info proc prune_warnings]] { # 6:compiler flags (optional) # 7:language (optional) # 8:linker warning (optional) +# args is an optional list of target triplets to be xfailed. -proc run_ld_link_exec_tests { targets_to_xfail ldtests } { +proc run_ld_link_exec_tests { ldtests args } { global ld global as global srcdir @@ -1278,7 +1397,7 @@ proc run_ld_link_exec_tests { targets_to_xfail ldtests } { global exec_output foreach testitem $ldtests { - foreach target $targets_to_xfail { + foreach target $args { setup_xfail $target } set testname [lindex $testitem 0] @@ -1410,6 +1529,13 @@ proc run_cc_link_tests { ldtests } { global CXXFLAGS global ar global exec_output + global board_cflags + + if [board_info [target_info name] exists cflags] { + set board_cflags " [board_info [target_info name] cflags]" + } else { + set board_cflags "" + } foreach testitem $ldtests { set testname [lindex $testitem 0] @@ -1466,7 +1592,7 @@ proc run_cc_link_tests { ldtests } { set failed 1 } } else { - if { ![ld_simple_link $cc_cmd $binfile "-L$srcdir/$subdir $ldflags $objfiles"] } { + if { ![ld_simple_link $cc_cmd $binfile "$board_cflags -L$srcdir/$subdir $ldflags $objfiles"] } { set failed 1 } @@ -1563,8 +1689,7 @@ 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 arc-*-*] - || [istarget d30v-*-*] + if { [istarget d30v-*-*] || [istarget dlx-*-*] || [istarget i960-*-*] || [istarget pj*-*-*] @@ -1574,9 +1699,7 @@ proc check_gc_sections_available { } { || [istarget i860-*-*] || [istarget ia64-*-*] || [istarget mep-*-*] - || [istarget mn10200-*-*] - || [istarget *-*-cygwin] - || [istarget *-*-mingw*] } { + || [istarget mn10200-*-*] } { set gc_sections_available_saved 0 return 0 } @@ -1607,7 +1730,7 @@ proc check_gc_sections_available { } { proc check_shared_lib_support { } { if {![istarget aarch64*-*-elf] - && ![istarget arc-*-*] + && ![istarget arc*-*-elf*] && ![istarget arm*-*-elf] && ![istarget avr-*-*] && ![istarget cr16-*-*] @@ -1619,6 +1742,7 @@ proc check_shared_lib_support { } { && ![istarget epiphany-*-*] && ![istarget fr30-*-*] && ![istarget frv-*-*] + && ![istarget ft32-*-*] && ![istarget h8300-*-*] && ![istarget i860-*-*] && ![istarget i960-*-*] @@ -1645,6 +1769,8 @@ proc check_shared_lib_support { } { && ![istarget rx-*-*] && ![istarget spu-*-*] && ![istarget v850*-*-*] + && ![istarget visium-*-*] + && ![istarget xgate-*-*] && ![istarget xstormy16-*-*] && ![istarget *-*-irix*] && ![istarget *-*-rtems] } { @@ -1669,16 +1795,14 @@ proc check_plugin_api_available { } { return $plugin_api_available_saved } -# Returns true if the target ld supports sysroot. +# Sets ld_sysroot to the current sysroot (empty if not supported) and +# returns true if the target ld supports sysroot. proc check_sysroot_available { } { - global ld_sysroot_available_saved - global ld + global ld_sysroot_available_saved ld ld_sysroot if {![info exists ld_sysroot_available_saved]} { - # Check if ld supports --sysroot *other* than empty - # (non-sysroot linkers don't emit errors for --sysroot=""). - # The help-text by itself is no indication as it always lists --sysroot. - set status [remote_exec host $ld "--sysroot=ldxyzzy --help >/dev/null"] - if { [lindex $status 0] != 0 } { + # Check if ld supports --sysroot *other* than empty. + set ld_sysroot [string trimright [lindex [remote_exec host $ld "--print-sysroot"] 1]] + if { $ld_sysroot == "" } { set ld_sysroot_available_saved 0 } else { set ld_sysroot_available_saved 1 @@ -1687,16 +1811,48 @@ proc check_sysroot_available { } { return $ld_sysroot_available_saved } +# Returns 1 if plugin is enabled in gcc. Returns 0 otherwise. +proc check_gcc_plugin_enabled { } { + global CC + + if {![info exists CC]} { + set CC [find_gcc] + } + if { $CC == ""} { + return 0 + } + set state [remote_exec host $CC -v] + if { [lindex $state 0] != 0 } { + return 0; + } + for { set i 1 } { $i < [llength $state] } { incr i } { + set v [lindex $state $i] + if { [ string match "*--disable-plugin*" $v ] } { + verbose "plugin is disabled by $v" + return 0; + } + } + + return 1; +} + # Returns true if the target compiler supports LTO proc check_lto_available { } { global lto_available_saved global CC if {![info exists lto_available_saved]} { - if { [which $CC] == 0 } { + if { ![check_gcc_plugin_enabled] } { set lto_available_saved 0 return 0 } + # This test will hide LTO bugs in ld. Since GCC 4.9 adds + # -ffat-lto-objects, we always run LTO tests on Linux with + # GCC 4.9 or newer. + if { [istarget "*-*-linux*"] && [at_least_gcc_version 4 9] } { + set lto_available_saved 1 + return 1 + } # Check if gcc supports -flto -fuse-linker-plugin set flags "" if [board_info [target_info name] exists cflags] { @@ -1712,7 +1868,9 @@ proc check_lto_available { } { set f [open $src "w"] puts $f "int main() { return 0; }" close $f - remote_download host $src + if [is_remote host] { + set src [remote_download host $src] + } set lto_available_saved [run_host_cmd_yesno "$CC" "$flags -flto -fuse-linker-plugin $src -o $output"] remote_file host delete $src remote_file host delete $output @@ -1727,10 +1885,17 @@ proc check_lto_fat_available { } { global CC if {![info exists lto_fat_available_saved]} { - if { [which $CC] == 0 } { + if { ![check_gcc_plugin_enabled] } { set lto_fat_available_saved 0 return 0 } + # This test will hide LTO bugs in ld. Since GCC 4.9 adds + # -ffat-lto-objects, we always run LTO tests on Linux with + # GCC 4.9 or newer. + if { [istarget "*-*-linux*"] && [at_least_gcc_version 4 9] } { + set lto_fat_available_saved 1 + return 1 + } # Check if gcc supports -flto -fuse-linker-plugin set flags "" if [board_info [target_info name] exists cflags] { @@ -1746,7 +1911,9 @@ proc check_lto_fat_available { } { set f [open $src "w"] puts $f "int main() { return 0; }" close $f - remote_download host $src + if [is_remote host] { + set src [remote_download host $src] + } set lto_fat_available_saved [run_host_cmd_yesno "$CC" "$flags -flto -ffat-lto-objects -fuse-linker-plugin $src -o $output"] remote_file host delete $src remote_file host delete $output @@ -1761,10 +1928,17 @@ proc check_lto_shared_available { } { global CC if {![info exists lto_shared_available_saved]} { - if { [which $CC] == 0 } { + if { ![check_gcc_plugin_enabled] } { set lto_shared_available_saved 0 return 0 } + # This test will hide LTO bugs in ld. Since GCC 4.9 adds + # -ffat-lto-objects, we always run LTO tests on Linux with + # GCC 4.9 or newer. + if { [istarget "*-*-linux*"] && [at_least_gcc_version 4 9] } { + set lto_shared_available_saved 1 + return 1 + } # Check if gcc supports -flto -fuse-linker-plugin -shared set flags "" if [board_info [target_info name] exists cflags] { @@ -1780,7 +1954,9 @@ proc check_lto_shared_available { } { set f [open $src "w"] puts $f "" close $f - remote_download host $src + if [is_remote host] { + set src [remote_download host $src] + } set lto_shared_available_saved [run_host_cmd_yesno "$CC" "$flags -shared -fPIC -flto -fuse-linker-plugin $src -o $output"] remote_file host delete $src remote_file host delete $output @@ -1815,6 +1991,102 @@ proc check_as_cfi { } { return $success } +# Returns true if IFUNC works. + +proc check_ifunc_available { } { + global ifunc_available_saved + global CC + + if {![info exists ifunc_available_saved]} { + if { [which $CC] == 0 } { + set ifunc_available_saved 0 + return 0 + } + # Check if gcc supports -flto -fuse-linker-plugin + set flags "" + 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/ifunc[pid]" + set src ${basename}.c + set output ${basename}.out + set f [open $src "w"] + puts $f "extern int library_func2 (void);" + puts $f "int main (void)" + puts $f "{" + puts $f " if (library_func2 () != 2) __builtin_abort ();" + puts $f " return 0; " + puts $f "}" + puts $f "static int library_func1 (void) {return 2; }" + puts $f "void *foo (void) __asm__ (\"library_func2\");" + puts $f "void *foo (void) { return library_func1; }" + puts $f "__asm__(\".type library_func2, %gnu_indirect_function\");" + close $f + if [is_remote host] { + set src [remote_download host $src] + } + set ifunc_available_saved [run_host_cmd_yesno "$CC" "$flags $src -o $output"] + if { $ifunc_available_saved == 1 } { + set ifunc_available_saved [run_host_cmd_yesno "$output" ""] + } + remote_file host delete $src + remote_file host delete $output + file delete $src + } + return $ifunc_available_saved +} + +# Returns true if ifunc attribute works. + +proc check_ifunc_attribute_available { } { + global ifunc_attribute_available_saved + global CC + + if {![info exists ifunc_attribute_available_saved]} { + if { [which $CC] == 0 } { + set ifunc_attribute_available_saved 0 + return 0 + } + # Check if gcc supports -flto -fuse-linker-plugin + set flags "" + 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/ifunc[pid]" + set src ${basename}.c + set output ${basename}.out + set f [open $src "w"] + puts $f "extern int library_func2 (void) __attribute__ ((ifunc (\"foo\")));" + puts $f "int main (void)" + puts $f "{" + puts $f " if (library_func2 () != 2) __builtin_abort ();" + puts $f " return 0; " + puts $f "}" + puts $f "static int library_func1 (void) {return 2; }" + puts $f "void *foo (void) { return library_func1; }" + close $f + if [is_remote host] { + 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 } { + set ifunc_attribute_available_saved [run_host_cmd_yesno "$output" ""] + } + remote_file host delete $src + remote_file host delete $output + file delete $src + } + return $ifunc_attribute_available_saved +} + # Provide virtual target "cfi" for targets supporting CFI. rename "istarget" "istarget_ld"