X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=ld%2Ftestsuite%2Flib%2Fld-lib.exp;h=a44358e0aaace22514f1b3a770ff4e9be1938136;hb=7a8eb317c5bce0f1ff290a9343777db74adec663;hp=15181303977d9978fa337401924295d29e32111d;hpb=4b95cf5c0c75d6efc1b2f96af72317aecca079f1;p=deliverable%2Fbinutils-gdb.git diff --git a/ld/testsuite/lib/ld-lib.exp b/ld/testsuite/lib/ld-lib.exp index 1518130397..a44358e0aa 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-2017 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\]+)?" @@ -79,14 +83,33 @@ proc default_ld_version { ld } { proc run_host_cmd { prog command } { global link_output + global gcc_B_opt + global ld_L_opt if { ![is_remote host] && [which "$prog"] == 0 } then { perror "$prog does not exist" return 0 } - verbose -log "$prog $command" - set status [remote_exec host [concat sh -c [list "$prog $command 2>&1"]] "" "/dev/null" "ld.tmp"] + # If we are compiling with gcc, we want to add gcc_B_opt and + # ld_L_opt to flags. However, if $prog already has -B options, + # which might be the case when running gcc out of a build + # directory, we want our -B options to come first. + set gccexe $prog + set gccparm [string first " " $gccexe] + set gccflags "" + if { $gccparm > 0 } then { + set gccflags [string range $gccexe $gccparm end] + set gccexe [string range $gccexe 0 $gccparm] + set prog $gccexe + } + 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" + } + + verbose -log "$prog $gccflags $command" + set status [remote_exec host [concat sh -c [list "$prog $gccflags $command 2>&1"]] "" "/dev/null" "ld.tmp"] remote_upload host "ld.tmp" set link_output [file_contents "ld.tmp"] regsub "\n$" $link_output "" link_output @@ -106,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; } @@ -172,81 +199,26 @@ proc big_or_little_endian {} { return $flags } -# Link a program using ld. +# Link a program using ld # proc default_ld_link { ld target objects } { - global HOSTING_EMU - global HOSTING_CRT0 - global HOSTING_SCRT0 - global HOSTING_LIBS - global HOSTING_SLIBS - global LIBS global host_triplet - global link_output global exec_output - if { [ string match "* -pie *" $objects ] } { - set objs "$HOSTING_SCRT0 $objects" - set libs "$LIBS $HOSTING_SLIBS" - } else { - set objs "$HOSTING_CRT0 $objects" - set libs "$LIBS $HOSTING_LIBS" - } - + set flags "" if [is_endian_output_format $objects] then { set flags [big_or_little_endian] - } else { - set flags "" } remote_file host delete $target - - return [run_host_cmd_yesno "$ld" "$HOSTING_EMU $flags -o $target $objs $libs"] -} - -# Link a program using ld, without including any libraries. -# -proc default_ld_simple_link { ld target objects } { - global host_triplet - global gcc_ld_flag - global exec_output - - if [is_endian_output_format $objects] then { - set flags [big_or_little_endian] - } else { - set flags "" - } - - # If we are compiling with gcc, we want to add gcc_ld_flag to - # flags. Rather than determine this in some complex way, we guess - # based on the name of the compiler. - set ldexe $ld - set ldparm [string first " " $ld] - set ldflags "" - if { $ldparm > 0 } then { - set ldflags [string range $ld $ldparm end] - set ldexe [string range $ld 0 $ldparm] - set ld $ldexe - } - set ldexe [string replace $ldexe 0 [string last "/" $ldexe] ""] - if {[string match "*gcc*" $ldexe] || [string match "*++*" $ldexe]} then { - set ldflags "$gcc_ld_flag $ldflags" - } - - remote_file host delete $target - - set exec_output [run_host_cmd "$ld" "$ldflags $flags -o $target $objects"] + set exec_output [run_host_cmd "$ld" "$flags -o $target $objects"] set exec_output [prune_warnings $exec_output] # We don't care if we get a warning about a non-existent start # symbol, since the default linker script might use ENTRY. regsub -all "(^|\n)(\[^\n\]*: warning: cannot find entry symbol\[^\n\]*\n?)" $exec_output "\\1" exec_output - if [string match "" $exec_output] then { - return 1 - } else { - return 0 - } + return [string match "" $exec_output] } # Compile an object using cc. @@ -257,7 +229,7 @@ proc default_ld_compile { cc source object } { global srcdir global subdir global host_triplet - global gcc_gas_flag + global gcc_B_opt set cc_prog $cc if {[llength $cc_prog] > 1} then { @@ -271,11 +243,12 @@ proc default_ld_compile { cc source object } { remote_file build delete "$object" remote_file host delete "$object" - set flags "-I$srcdir/$subdir" + set flags "$gcc_B_opt -I$srcdir/$subdir" - # If we are compiling with gcc, we want to add gcc_gas_flag to - # flags. Rather than determine this in some complex way, we guess - # based on the name of the compiler. + # If we are compiling with gcc, we want to add gcc_B_opt to flags. + # However, if $prog already has -B options, which might be the + # case when running gcc out of a build directory, we want our -B + # options to come first. set ccexe $cc set ccparm [string first " " $cc] set ccflags "" @@ -284,15 +257,12 @@ proc default_ld_compile { cc source object } { set ccexe [string range $cc 0 $ccparm] set cc $ccexe } - set ccexe [string replace $ccexe 0 [string last "/" $ccexe] ""] - if {[string match "*gcc*" $ccexe] || [string match "*++*" $ccexe]} then { - set flags "$gcc_gas_flag $flags" - } + set ccexe [string replace $ccexe 0 [string last "/" $ccexe] ""] if {[string match "*++*" $ccexe]} { - set flags "$flags $CXXFLAGS" + append flags " $CXXFLAGS" } else { - set flags "$flags $CFLAGS" + append flags " $CFLAGS" } if [board_info [target_info name] exists cflags] { @@ -303,9 +273,10 @@ proc default_ld_compile { cc source object } { append flags " [board_info [target_info name] multilib_flags]" } - verbose -log "$cc $flags $ccflags -c $source -o $object" + set cmd "$cc $flags $ccflags -c $source -o $object" + verbose -log "$cmd" - set status [remote_exec host [concat sh -c [list "$cc $flags $ccflags -c $source -o $object 2>&1"]] "" "/dev/null" "ld.tmp"] + set status [remote_exec host [concat sh -c [list "$cmd 2>&1"]] "" "/dev/null" "ld.tmp"] remote_upload host "ld.tmp" set exec_output [file_contents "ld.tmp"] remote_file build delete "ld.tmp" @@ -406,7 +377,7 @@ proc default_ld_nm { nm nmflags object } { # Define various symbols needed when not linking against all # target libs. -proc ld_simple_link_defsyms {} { +proc ld_link_defsyms {} { set flags "--defsym __stack_chk_fail=0" @@ -415,9 +386,9 @@ proc ld_simple_link_defsyms {} { append flags " --defsym __gccmain=0" } - # Windows targets need __main, prefixed with underscore. + # Windows targets need __main, some prefixed with underscore. if {[istarget *-*-cygwin* ] || [istarget *-*-mingw*]} { - append flags " --defsym ___main=0" + append flags " --defsym __main=0 --defsym ___main=0" } # PowerPC EABI code calls __eabi. @@ -497,6 +468,11 @@ proc ld_simple_link_defsyms {} { # ld_after_inputfiles: FLAGS # Similar to "ld", but put after all input files. # +# objcopy_objects: FLAGS +# Run objcopy with the specified flags after assembling any source +# that has the special marker RUN_OBJCOPY in the source specific +# flags. +# # objcopy_linked_file: FLAGS # Run objcopy on the linked file with the specified flags. # This lets you transform the linked file using objcopy, before the @@ -509,6 +485,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 +522,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 +560,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 @@ -588,6 +588,7 @@ proc run_dump_test { name {extra_options {}} } { set dumpfile tmpdir/dump.out set run_ld 0 set run_objcopy 0 + set objfile_names {} set opts(as) {} set opts(ld) {} set opts(ld_after_inputfiles) {} @@ -604,7 +605,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] @@ -630,6 +635,22 @@ proc run_dump_test { name {extra_options {}} } { } else { lappend asflags {} } + + # Create the object file name based on nothing but the source + # file name. + set new_objfile \ + [concat tmpdir/[file rootname [file tail [lindex $opt_val 0]]].o] + # But, sometimes, we have the exact same source filename in + # different directories (foo/src.s bar/src.s) which would lead + # us to try and create two src.o files. We detect this + # conflict here, and instead create src.o and src1.o. + set j 0 + while { [lsearch $objfile_names $new_objfile] != -1 } { + incr j + set new_objfile \ + [concat tmpdir/[file rootname [file tail [lindex $opt_val 0]]]${j}.o] + } + lappend objfile_names $new_objfile } default { if [string length $opts($opt_name)] { @@ -709,7 +730,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 } @@ -735,7 +756,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 @@ -751,6 +777,7 @@ proc run_dump_test { name {extra_options {}} } { if { $opts(source) == "" } { set sourcefiles [list ${file}.s] set asflags [list ""] + set objfile_names [list tmpdir/[file tail ${file}].o] } else { set sourcefiles {} foreach sf $opts(source) { @@ -768,12 +795,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 @@ -784,8 +805,14 @@ proc run_dump_test { name {extra_options {}} } { for { set i 0 } { $i < [llength $sourcefiles] } { incr i } { set sourcefile [lindex $sourcefiles $i] set sourceasflags [lindex $asflags $i] + set run_objcopy_objects 0 + + if { [string match "*RUN_OBJCOPY*" $sourceasflags] } { + set run_objcopy_objects 1 + } + regsub "RUN_OBJCOPY" $sourceasflags "" sourceasflags - set objfile "tmpdir/dump$i.o" + set objfile [lindex $objfile_names $i] catch "exec rm -f $objfile" exec_output lappend objfiles $objfile set cmd "$AS $ASFLAGS $opts(as) $sourceasflags -o $objfile $sourcefile" @@ -798,7 +825,7 @@ proc run_dump_test { name {extra_options {}} } { remote_file build delete "ld.tmp" if { [lindex $cmdret 0] != 0 || ![string match "" $comp_output] } then { - send_log "$comp_output\n" + send_log -- "$comp_output\n" verbose "$comp_output" 3 set exitstat "succeeded" @@ -807,15 +834,71 @@ proc run_dump_test { name {extra_options {}} } { fail $testname return } - } - set expmsg $opts(error) - if { $opts(warning) != "" } { - if { $expmsg != "" } { - perror "$testname: mixing error and warning test-directives" - return + if { $run_objcopy_objects } { + set cmd "$OBJCOPY $opts(objcopy_objects) $objfile" + + send_log "$cmd\n" + set cmdret [remote_exec host [concat sh -c [list "$cmd 2>&1"]] \ + "" "/dev/null" "objcopy.tmp"] + remote_upload host "objcopy.tmp" + set comp_output [prune_warnings [file_contents "objcopy.tmp"]] + remote_file host delete "objcopy.tmp" + remote_file build delete "objcopy.tmp" + + if { [lindex $cmdret 0] != 0 \ + || ![string match "" $comp_output] } { + send_log -- "$comp_output\n" + verbose "$comp_output" 3 + + set exitstat "succeeded" + if { $cmdret != 0 } { set exitstat "failed" } + verbose -log "$exitstat with: <$comp_output>" + fail $testname + 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). @@ -825,9 +908,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" @@ -855,29 +952,55 @@ 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>" - send_log "$comp_output\n" + + 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" + set objfile [lindex $objfiles 0] } # We must not have expected failure if we get here. @@ -992,7 +1115,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 { @@ -1025,7 +1148,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 @@ -1039,6 +1164,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] @@ -1047,6 +1179,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] @@ -1095,11 +1231,13 @@ proc run_ld_link_tests { ldtests } { continue } - if { [regexp ".*\\.a$" $binfile] } { + if { $binfile eq "tmpdir/" } { + # compile only + } elseif { [regexp ".*\\.a$" $binfile] } { 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_link $ld $binfile "$ld_extra_opt -L$srcdir/$subdir $ld_options $objfiles $ld_after"] } { set maybe_failed 1 set ld_output "$exec_output" } @@ -1218,7 +1356,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 @@ -1230,8 +1367,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 @@ -1243,9 +1381,20 @@ proc run_ld_link_exec_tests { targets_to_xfail ldtests } { global CXXFLAGS global errcnt global exec_output + global board_cflags + + # When using GCC as the linker driver, we need to specify board cflags when + # linking because cflags may contain linker options. For example when + # linker options are included in GCC spec files then we need the -specs + # option. + if [board_info [target_info name] exists cflags] { + set board_cflags " [board_info [target_info name] cflags]" + } else { + set board_cflags "" + } foreach testitem $ldtests { - foreach target $targets_to_xfail { + foreach target $args { setup_xfail $target } set testname [lindex $testitem 0] @@ -1276,32 +1425,34 @@ proc run_ld_link_exec_tests { targets_to_xfail ldtests } { # incorrect section attributes and the assembler will warn # them. if { [ string match "c++" $lang ] } { - ld_compile "$CXX -c $CXXFLAGS $cflags" $srcdir/$subdir/$src_file $objfile + set cmd "$CXX -c $CXXFLAGS $cflags" } else { - ld_compile "$CC -c $CFLAGS $cflags" $srcdir/$subdir/$src_file $objfile + set cmd "$CC -c $CFLAGS $cflags" + } + if ![ld_compile $cmd $srcdir/$subdir/$src_file $objfile] { + set failed 1 + break } } + if { $failed != 0 } { + unresolved $testname + continue + } - # We have to use $CC to build PIE and shared library. - if { [ string match "c" $lang ] } { - set link_proc ld_simple_link - set link_cmd $CC - } elseif { [ string match "c++" $lang ] } { - set link_proc ld_simple_link + if { [ string match "c++" $lang ] } { + set link_proc ld_link set link_cmd $CXX - } elseif { [ string match "-shared" $ld_options ] \ - || [ string match "-pie" $ld_options ] } { - set link_proc ld_simple_link - set link_cmd $CC } else { set link_proc ld_link - set link_cmd $ld + set link_cmd $CC } - if ![$link_proc $link_cmd $binfile "-L$srcdir/$subdir $ld_options $objfiles"] { + if { $binfile eq "tmpdir/" } { + # compile only + pass $testname + continue; + } elseif ![$link_proc $link_cmd $binfile "$board_cflags -L$srcdir/$subdir $ld_options $objfiles"] { set failed 1 - } else { - set failed 0 } # Check if exec_output is expected. @@ -1314,7 +1465,7 @@ proc run_ld_link_exec_tests { targets_to_xfail ldtests } { } } - if { $failed == 0 } { + if { $failed == 0 && [isnative] } { send_log "Running: $binfile > $binfile.out\n" verbose "Running: $binfile > $binfile.out" catch "exec $binfile > $binfile.out" exec_output @@ -1339,6 +1490,8 @@ proc run_ld_link_exec_tests { targets_to_xfail ldtests } { if { $failed != 0 } { fail $testname + } elseif ![isnative] { + unsupported $testname } else { set errcnt 0 pass $testname @@ -1375,6 +1528,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] @@ -1389,6 +1549,15 @@ proc run_cc_link_tests { ldtests } { set is_unresolved 0 set failed 0 + #verbose -log "testname is $testname" + #verbose -log "ldflags is $ldflags" + #verbose -log "cflags is $cflags" + #verbose -log "src_files is $src_files" + #verbose -log "actions is $actions" + #verbose -log "binfile is $binfile" + #verbose -log "lang is $lang" + #verbose -log "warnings is $warnings" + # Compile each file in the test. foreach src_file $src_files { set fileroot "[file rootname [file tail $src_file]]" @@ -1399,11 +1568,19 @@ proc run_cc_link_tests { ldtests } { # incorrect section attributes and the assembler will warn # them. if { [ string match "c++" $lang ] } { - ld_compile "$CXX -c $CXXFLAGS $cflags" $srcdir/$subdir/$src_file $objfile + set cmd "$CXX -c $CXXFLAGS $cflags" } else { - ld_compile "$CC -c $CFLAGS $cflags" $srcdir/$subdir/$src_file $objfile + set cmd "$CC -c $CFLAGS $cflags" + } + if ![ld_compile $cmd $srcdir/$subdir/$src_file $objfile] { + set failed 1 + break } } + if { $failed != 0 } { + unresolved $testname + continue + } # Clear error and warning counts. reset_vars @@ -1414,18 +1591,15 @@ proc run_cc_link_tests { ldtests } { set cc_cmd $CC } - if { [regexp ".*\\.a$" $binfile] } { + if { $binfile eq "tmpdir/" } { + # compile only + } elseif { [regexp ".*\\.a$" $binfile] } { if { ![ar_simple_create $ar $ldflags $binfile "$objfiles"] } { - fail $testname set failed 1 - } else { - set failed 0 } } else { - if { ![ld_simple_link $cc_cmd $binfile "-L$srcdir/$subdir $ldflags $objfiles"] } { + if { ![ld_link $cc_cmd $binfile "$board_cflags -L$srcdir/$subdir $ldflags $objfiles"] } { set failed 1 - } else { - set failed 0 } # Check if exec_output is expected. @@ -1437,10 +1611,6 @@ proc run_cc_link_tests { ldtests } { set failed 1 } } - - if { $failed == 1 } { - fail $testname - } } if { $failed == 0 } { @@ -1499,18 +1669,14 @@ proc run_cc_link_tests { ldtests } { } } } - - if { $failed != 0 } { - fail $testname - } else { if { $is_unresolved == 0 } { - pass $testname - } } } - # Catch action errors. - if { $is_unresolved != 0 } { + if { $failed } { + fail $testname + } elseif { $is_unresolved } { unresolved $testname - continue + } else { + pass $testname } } } @@ -1524,21 +1690,18 @@ 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 or32-*-*] || [istarget pj*-*-*] + || [istarget pru*-*-*] || [istarget alpha-*-*] || [istarget hppa*64-*-*] || [istarget i370-*-*] || [istarget i860-*-*] || [istarget ia64-*-*] || [istarget mep-*-*] - || [istarget mn10200-*-*] - || [istarget *-*-cygwin] - || [istarget *-*-mingw*] } { + || [istarget mn10200-*-*] } { set gc_sections_available_saved 0 return 0 } @@ -1569,7 +1732,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-*-*] @@ -1581,6 +1744,7 @@ proc check_shared_lib_support { } { && ![istarget epiphany-*-*] && ![istarget fr30-*-*] && ![istarget frv-*-*] + && ![istarget ft32-*-*] && ![istarget h8300-*-*] && ![istarget i860-*-*] && ![istarget i960-*-*] @@ -1601,13 +1765,16 @@ proc check_shared_lib_support { } { && ![istarget msp430-*-*] && ![istarget mt-*-*] && ![istarget nds32*-*-*] - && ![istarget openrisc-*-*] - && ![istarget or32-*-*] + && ![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] } { @@ -1616,6 +1783,26 @@ proc check_shared_lib_support { } { return 0 } +# Return true if target uses genelf.em (assuming it is ELF). +proc is_generic_elf { } { + if { [istarget "d30v-*-*"] + || [istarget "dlx-*-*"] + || [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*-*-*"] } { + return 1; + } + return 0; +} + # Returns true if the target ld supports the plugin API. proc check_plugin_api_available { } { global plugin_api_available_saved @@ -1623,7 +1810,7 @@ proc check_plugin_api_available { } { if {![info exists plugin_api_available_saved]} { # Check if the ld used by gcc supports --plugin. set ld_output [remote_exec host $ld "--help"] - if { [ string first "-plugin" $ld_output ] >= 0 } { + if { [ string first "-plugin PLUGIN" $ld_output ] >= 0 } { set plugin_api_available_saved 1 } else { set plugin_api_available_saved 0 @@ -1632,80 +1819,172 @@ proc check_plugin_api_available { } { return $plugin_api_available_saved } -# Returns true if the target compiler supports LTO -proc check_lto_available { } { - global lto_available_saved - global CC +# 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 ld ld_sysroot + if {![info exists ld_sysroot_available_saved]} { + # 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 + } + } + return $ld_sysroot_available_saved +} - set flags "" +# Returns 1 if plugin is enabled in gcc. Returns 0 otherwise. +proc check_gcc_plugin_enabled { } { + global CC - if [board_info [target_info name] exists cflags] { - append flags " [board_info [target_info name] cflags]" + if {![info exists CC]} { + set CC [find_gcc] } - - if [board_info [target_info name] exists ldflags] { - append flags " [board_info [target_info name] ldflags]" + 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]} { - # Check if gcc supports -flto -fuse-linker-plugin - if { [which $CC] == 0 } { + if { ![check_gcc_plugin_enabled] } { set lto_available_saved 0 return 0 } - set basename "lto" - set src ${basename}[pid].c - set output ${basename}[pid].out + # 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] { + 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/lto[pid]" + set src ${basename}.c + set output ${basename}.out set f [open $src "w"] puts $f "int main() { return 0; }" close $f - set status [remote_exec host $CC "$flags -B[pwd]/tmpdir/ld/ -flto -ffat-lto-objects -fuse-linker-plugin $src -o $output"] - if { [lindex $status 0] == 0 } { - set lto_available_saved 1 - } else { - set lto_available_saved 0 + 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 file delete $src - file delete $output } return $lto_available_saved } -# Returns true if the target compiler supports LTO and -shared -proc check_lto_shared_available { } { - global lto_shared_available_saved +# Returns true if the target compiler supports LTO -ffat-lto-objects +proc check_lto_fat_available { } { + global lto_fat_available_saved global CC - set flags "" + if {![info exists lto_fat_available_saved]} { + 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] { + append flags " [board_info [target_info name] cflags]" + } + if [board_info [target_info name] exists ldflags] { + append flags " [board_info [target_info name] ldflags]" + } - if [board_info [target_info name] exists cflags] { - append flags " [board_info [target_info name] cflags]" + set basename "tmpdir/lto[pid]" + set src ${basename}.c + set output ${basename}.out + set f [open $src "w"] + puts $f "int main() { return 0; }" + close $f + 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 + file delete $src } + return $lto_fat_available_saved +} - if [board_info [target_info name] exists ldflags] { - append flags " [board_info [target_info name] ldflags]" - } +# Returns true if the target compiler supports LTO and -shared +proc check_lto_shared_available { } { + global lto_shared_available_saved + global CC if {![info exists lto_shared_available_saved]} { - # Check if gcc supports -flto -fuse-linker-plugin -shared - if { [which $CC] == 0 } { + if { ![check_gcc_plugin_enabled] } { set lto_shared_available_saved 0 return 0 } - set basename "lto_shared" - set src ${basename}[pid].c - set output ${basename}[pid].so + # 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] { + 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/lto_shared[pid]" + set src ${basename}.c + set output ${basename}.so set f [open $src "w"] puts $f "" close $f - set status [remote_exec host $CC "$flags -shared -fPIC -B[pwd]/tmpdir/ld/ -flto -fuse-linker-plugin $src -o $output"] - if { [lindex $status 0] == 0 } { - set lto_shared_available_saved 1 - } else { - set lto_shared_available_saved 0 + 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 file delete $src - file delete $output } return $lto_shared_available_saved } @@ -1736,6 +2015,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"