X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=ld%2Ftestsuite%2Flib%2Fld-lib.exp;h=ffdf8051f3191e00433b632810c25f68b3b6494c;hb=bdd65db9b9cd6d5dbdff9b48e97379029f8a3a1a;hp=202037243737a3fb476dc4585b5e8aea050378af;hpb=894891db7f1ff09f021a0d2c8bb471f3a73a776a;p=deliverable%2Fbinutils-gdb.git diff --git a/ld/testsuite/lib/ld-lib.exp b/ld/testsuite/lib/ld-lib.exp index 2020372437..ffdf8051f3 100644 --- a/ld/testsuite/lib/ld-lib.exp +++ b/ld/testsuite/lib/ld-lib.exp @@ -1,7 +1,5 @@ # Support routines for LD testsuite. -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, -# 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 -# Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # # This file is part of the GNU Binutils. # @@ -27,6 +25,36 @@ proc load_common_lib { name } { load_common_lib binutils-common.exp +# Returns 1 if the gcc for the target is at least version MAJOR.MINOR +# Returns 0 otherwise. +# +proc at_least_gcc_version { major minor } { + + if {![info exists CC]} { + set CC [find_gcc] + } + if { $CC == "" } { + return 0 + } + set state [remote_exec host $CC --version] + 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\]+)?" + regexp $ver_re $tmp fred maj min + verbose "gcc version: $tmp" + if { ![info exists maj] || ![info exists min] } then { + perror "can't decipher gcc version number, fix the framework!" + return 0 + } + verbose "major gcc version is $maj, want at least $major" + if { $maj == $major } then { + verbose "minor gcc version is $min, want at least $minor" + return [expr $min >= $minor] + } else { + return [expr $maj > $major] + } +} + # Extract and print the version number of ld. # proc default_ld_version { ld } { @@ -51,14 +79,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 @@ -149,14 +196,21 @@ proc big_or_little_endian {} { 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 - set objs "$HOSTING_CRT0 $objects" - set libs "$LIBS $HOSTING_LIBS" + 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" + } if [is_endian_output_format $objects] then { set flags [big_or_little_endian] @@ -173,45 +227,22 @@ proc default_ld_link { ld target objects } { # proc default_ld_simple_link { ld target objects } { global host_triplet - global gcc_ld_flag global exec_output + set flags "" 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. @@ -222,7 +253,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 { @@ -236,11 +267,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 "" @@ -249,24 +281,26 @@ 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] { + append flags " [board_info [target_info name] cflags]" } if [board_info [target_info name] exists multilib_flags] { 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" @@ -298,10 +332,12 @@ proc default_ld_compile { cc source object } { proc default_ld_assemble { as in_flags source object } { global ASFLAGS global host_triplet + global srcdir + global subdir if ![info exists ASFLAGS] { set ASFLAGS "" } - set flags [big_or_little_endian] + set flags "[big_or_little_endian] -I$srcdir/$subdir" set exec_output [run_host_cmd "$as" "$flags $in_flags $ASFLAGS -o $object $source"] set exec_output [prune_warnings $exec_output] if [string match "" $exec_output] then { @@ -374,9 +410,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. @@ -390,7 +426,7 @@ proc ld_simple_link_defsyms {} { } # m6811/m6812 code has references to soft registers. - if {[istarget m6811-*-*] || [istarget m6812-*-*]} { + if {[istarget m6811-*-*] || [istarget m6812-*-*] || [istarget m68hc1*-*-*]} { append flags " --defsym _.frame=0 --defsym _.d1=0 --defsym _.d2=0" append flags " --defsym _.d3=0 --defsym _.d4=0" append flags " --defsym _.tmp=0 --defsym _.xy=0 --defsym _.z=0" @@ -406,7 +442,7 @@ proc ld_simple_link_defsyms {} { return $flags } -# run_dump_test FILE +# run_dump_test FILE (optional:) EXTRA_OPTIONS # Copied from gas testsuite, tweaked and further extended. # # Assemble a .s file, then run some utility on it and check the output. @@ -431,6 +467,12 @@ proc ld_simple_link_defsyms {} { # list ends with the first line that doesn't match the above syntax # (hmm, not great for error detection). # +# The optional EXTRA_OPTIONS argument to `run_dump_test' is a list of +# two-element lists. The first element of each is an option name, and +# the second additional arguments to be added on to the end of the +# option list as given in FILE.d. (If omitted, no additional options +# are added.) +# # The interesting options are: # # name: TEST-NAME @@ -450,6 +492,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 @@ -478,6 +525,11 @@ proc ld_simple_link_defsyms {} { # More than one "source" directive can be given, which is useful # when testing linking. # +# dump: DUMP +# Match against DUMP.d. If omitted, this defaults to FILE.d. This +# is useful if several .d files differ by options only. Options are +# always read from FILE.d. +# # xfail: TARGET # The test is expected to fail on TARGET. This may occur more than # once. @@ -509,7 +561,7 @@ proc ld_simple_link_defsyms {} { # regexps in FILE.d. `regexp_diff' is defined in binutils-common.exp; # see further comments there. # -proc run_dump_test { name } { +proc run_dump_test { name {extra_options {}} } { global subdir srcdir global OBJDUMP NM AS OBJCOPY READELF LD global OBJDUMPFLAGS NMFLAGS ASFLAGS OBJCOPYFLAGS READELFFLAGS LDFLAGS @@ -549,10 +601,11 @@ proc run_dump_test { name } { set opts(name) {} set opts(PROG) {} set opts(source) {} + set opts(dump) {} set opts(error) {} set opts(warning) {} set opts(objcopy_linked_file) {} - set asflags(${file}.s) {} + set opts(objcopy_objects) {} foreach i $opt_array { set opt_name [lindex $i 0] @@ -570,13 +623,13 @@ proc run_dump_test { name } { warning {} error {} source { - # Move any source-specific as-flags to a separate array to + # Move any source-specific as-flags to a separate list to # simplify processing. if { [llength $opt_val] > 1 } { - set asflags([lindex $opt_val 0]) [lrange $opt_val 1 end] + lappend asflags [lrange $opt_val 1 end] set opt_val [lindex $opt_val 0] } else { - set asflags($opt_val) {} + lappend asflags {} } } default { @@ -599,8 +652,37 @@ proc run_dump_test { name } { if { $opt_name == "as" || $opt_name == "ld" } { set opt_val [subst $opt_val] } - set opts($opt_name) [concat $opts($opt_name) $opt_val] + + # Append differently whether it's a message (without space) or + # an option or list (with space). + switch -- $opt_name { + warning - + error { + append opts($opt_name) $opt_val + } + default { + set opts($opt_name) [concat $opts($opt_name) $opt_val] + } + } } + + foreach i $extra_options { + set opt_name [lindex $i 0] + set opt_val [lindex $i 1] + if ![info exists opts($opt_name)] { + perror "unknown option $opt_name given in extra_opts" + unresolved $subdir/$name + return + } + # Add extra option to end of existing option, adding space + # if necessary. + if { ![regexp "warning|error" $opt_name] + && [string length $opts($opt_name)] } { + append opts($opt_name) " " + } + append opts($opt_name) $opt_val + } + foreach opt { as ld } { regsub {\[big_or_little_endian\]} $opts($opt) \ [big_or_little_endian] opts($opt) @@ -669,6 +751,7 @@ proc run_dump_test { name } { if { $opts(source) == "" } { set sourcefiles [list ${file}.s] + set asflags [list ""] } else { set sourcefiles {} foreach sf $opts(source) { @@ -677,11 +760,21 @@ proc run_dump_test { name } { } else { lappend sourcefiles "$srcdir/$subdir/$sf" } - # Must have asflags indexed on source name. - set asflags($srcdir/$subdir/$sf) $asflags($sf) } } + if { $opts(dump) == "" } { + set dfile ${file}.d + } else { + 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 @@ -691,11 +784,18 @@ proc run_dump_test { name } { set objfiles {} 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" catch "exec rm -f $objfile" exec_output lappend objfiles $objfile - set cmd "$AS $ASFLAGS $opts(as) $asflags($sourcefile) -o $objfile $sourcefile" + set cmd "$AS $ASFLAGS $opts(as) $sourceasflags -o $objfile $sourcefile" send_log "$cmd\n" set cmdret [remote_exec host [concat sh -c [list "$cmd 2>&1"]] "" "/dev/null" "ld.tmp"] @@ -714,6 +814,30 @@ proc run_dump_test { name } { fail $testname 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(error) @@ -836,7 +960,7 @@ proc run_dump_test { name } { } if { $verbose > 2 } then { verbose "output is [file_contents $dumpfile]" 3 } - if { [regexp_diff $dumpfile "${file}.d"] } then { + if { [regexp_diff $dumpfile "${dfile}"] } then { fail $testname if { $verbose == 2 } then { verbose "output is [file_contents $dumpfile]" 2 } return @@ -846,6 +970,10 @@ proc run_dump_test { name } { } proc slurp_options { file } { + # If options_regsub(foo) is set to {a b}, then the contents of a + # "#foo:" line will have regsub -all applied to replace a with b. + global options_regsub + if [catch { set f [open $file r] } x] { #perror "couldn't open `$file': $x" perror "$x" @@ -863,6 +991,11 @@ proc slurp_options { file } { # Whitespace here is space-tab. if [regexp $pat $line xxx opt_name opt_val] { # match! + if [info exists options_regsub($opt_name)] { + set subst $options_regsub($opt_name) + regsub -all -- [lindex $subst 0] $opt_val [lindex $subst 1] \ + opt_val + } lappend opt_array [list $opt_name $opt_val] } else { break @@ -890,7 +1023,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" "$aropts -rc $target $objects"] set exec_output [prune_warnings $exec_output] if [string match "" $exec_output] then { @@ -904,19 +1037,20 @@ proc ar_simple_create { ar aropts target objects } { # List contains test-items with 3 items followed by 2 lists, one item and # one optional item: # 0:name -# 1:ld/ar options -# 2:assembler options -# 3:filenames of assembler files -# 4:list of actions, options and expected outputs. -# 5:name of output file -# 6:compiler flags (optional) +# 1:ld/ar leading options, placed before object files +# 2:ld/ar trailing options, placed after object files +# 3:assembler options +# 4:filenames of assembler files +# 5:list of actions, options and expected outputs. +# 6:name of output file +# 7:compiler flags (optional) # # Actions: { command command-line-options file-containg-expected-output-regexps } # Commands: # objdump: Apply objdump options on result. # nm: Apply nm options on result. # readelf: Apply readelf options on result. -# ld: Don't apply anything on result. Compare output during linking with +# ld: Don't apply anything on result. Compare output during linking with # the file containing regexps (which is the second arg, not the third). # Note that this *must* be the first action if it is to be used at all; # in all other cases, any output from the linker during linking is @@ -945,11 +1079,12 @@ proc run_ld_link_tests { ldtests } { } set ld_options [lindex $testitem 1] - set as_options [lindex $testitem 2] - set src_files [lindex $testitem 3] - set actions [lindex $testitem 4] - set binfile tmpdir/[lindex $testitem 5] - set cflags [lindex $testitem 6] + set ld_after [lindex $testitem 2] + set as_options [lindex $testitem 3] + set src_files [lindex $testitem 4] + set actions [lindex $testitem 5] + set binfile tmpdir/[lindex $testitem 6] + set cflags [lindex $testitem 7] set objfiles {} set is_unresolved 0 set failed 0 @@ -958,6 +1093,7 @@ proc run_ld_link_tests { ldtests } { # verbose -log "Testname is $testname" # verbose -log "ld_options is $ld_options" +# verbose -log "ld_after is $ld_after" # verbose -log "as_options is $as_options" # verbose -log "src_files is $src_files" # verbose -log "actions is $actions" @@ -965,11 +1101,12 @@ proc run_ld_link_tests { ldtests } { # Assemble each file in the test. foreach src_file $src_files { - set objfile "tmpdir/[file rootname $src_file].o" + set fileroot "[file rootname [file tail $src_file]]" + set objfile "tmpdir/$fileroot.o" lappend objfiles $objfile if { [file extension $src_file] == ".c" } { - set as_file "tmpdir/[file rootname $src_file].s" + set as_file "tmpdir/$fileroot.s" if ![ld_compile "$CC -S $CFLAGS $cflags" $srcdir/$subdir/$src_file $as_file] { set is_unresolved 1 break @@ -989,11 +1126,13 @@ proc run_ld_link_tests { ldtests } { continue } - if { [regexp ".*\\.a$" $binfile] } { - if { ![ar_simple_create $ar $ld_options $binfile "$objfiles"] } { + 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"] } { + } elseif { ![ld_simple_link $ld $binfile "-L$srcdir/$subdir $ld_options $objfiles $ld_after"] } { set maybe_failed 1 set ld_output "$exec_output" } @@ -1051,7 +1190,7 @@ proc run_ld_link_tests { ldtests } { set comp_output [prune_warnings [file_contents "ld.stderr"]] remote_file host delete "ld.stderr" remote_file build delete "ld.stderr" - + if {[info exists old_lc_all]} { set env(LC_ALL) $old_lc_all } else { @@ -1158,12 +1297,12 @@ proc run_ld_link_exec_tests { targets_to_xfail ldtests } { # verbose -log "ld_options is $ld_options" # verbose -log "as_options is $as_options" # verbose -log "src_files is $src_files" -# verbose -log "actions is $actions" # verbose -log "binfile is $binfile" # Assemble each file in the test. foreach src_file $src_files { - set objfile "tmpdir/[file rootname $src_file].o" + set fileroot "[file rootname [file tail $src_file]]" + set objfile "tmpdir/$fileroot.o" lappend objfiles $objfile # We ignore warnings since some compilers may generate @@ -1174,68 +1313,70 @@ proc run_ld_link_exec_tests { targets_to_xfail ldtests } { } else { ld_compile "$CC -c $CFLAGS $cflags" $srcdir/$subdir/$src_file $objfile } + } + + # 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 + 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 + } + + if { $binfile eq "tmpdir/" } { + # compile only + pass $testname + continue; + } elseif ![$link_proc $link_cmd $binfile "-L$srcdir/$subdir $ld_options $objfiles"] { + set failed 1 + } - # 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 - 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 + # Check if exec_output is expected. + if { $warning != "" } then { + verbose -log "returned with: <$exec_output>, expected: <$warning>" + if { [regexp $warning $exec_output] } then { + set failed 0 } else { - set link_proc ld_link - set link_cmd $ld + set failed 1 } + } - if ![$link_proc $link_cmd $binfile "-L$srcdir/$subdir $ld_options $objfiles"] { + if { $failed == 0 } { + send_log "Running: $binfile > $binfile.out\n" + verbose "Running: $binfile > $binfile.out" + catch "exec $binfile > $binfile.out" exec_output + + if ![string match "" $exec_output] then { + send_log "$exec_output\n" + verbose "$exec_output" 1 set failed 1 } else { - set failed 0 - } - - # Check if exec_output is expected. - if { $warning != "" } then { - verbose -log "returned with: <$exec_output>, expected: <$warning>" - if { [regexp $warning $exec_output] } then { - set failed 0 - } else { - set failed 1 - } - } + send_log "diff $binfile.out $srcdir/$subdir/$expfile\n" + verbose "diff $binfile.out $srcdir/$subdir/$expfile" + catch "exec diff $binfile.out $srcdir/$subdir/$expfile" exec_output + set exec_output [prune_warnings $exec_output] - if { $failed == 0 } { - send_log "Running: $binfile > $binfile.out\n" - verbose "Running: $binfile > $binfile.out" - catch "exec $binfile > $binfile.out" exec_output - if ![string match "" $exec_output] then { send_log "$exec_output\n" verbose "$exec_output" 1 set failed 1 - } else { - send_log "diff $binfile.out $srcdir/$subdir/$expfile\n" - verbose "diff $binfile.out $srcdir/$subdir/$expfile" - catch "exec diff $binfile.out $srcdir/$subdir/$expfile" exec_output - set exec_output [prune_warnings $exec_output] - - if ![string match "" $exec_output] then { - send_log "$exec_output\n" - verbose "$exec_output" 1 - set failed 1 - } } } + } - if { $failed != 0 } { - fail $testname - } else { - set errcnt 0 - pass $testname - } + if { $failed != 0 } { + fail $testname + } else { + set errcnt 0 + pass $testname } } } @@ -1283,9 +1424,19 @@ 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 objfile "tmpdir/[file rootname $src_file].o" + set fileroot "[file rootname [file tail $src_file]]" + set objfile "tmpdir/$fileroot.o" lappend objfiles $objfile # We ignore warnings since some compilers may generate @@ -1307,14 +1458,18 @@ 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 } - } elseif { ![ld_simple_link $cc_cmd $binfile "-L$srcdir/$subdir $ldflags $objfiles"] } { + } else { + if { ![ld_simple_link $cc_cmd $binfile "-L$srcdir/$subdir $ldflags $objfiles"] } { + set failed 1 + } + # Check if exec_output is expected. if { $warnings != "" } then { verbose -log "returned with: <$exec_output>, expected: <$warnings>" @@ -1323,12 +1478,11 @@ proc run_cc_link_tests { ldtests } { } else { set failed 1 } - } else { + } + + if { $failed == 1 } { fail $testname - set failed 1 } - } else { - set failed 0 } if { $failed == 0 } { @@ -1387,16 +1541,13 @@ 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 != 0 } { + fail $testname + } elseif { $is_unresolved == 0 } { + pass $testname + } else { unresolved $testname continue } @@ -1408,25 +1559,24 @@ proc run_cc_link_tests { ldtests } { proc check_gc_sections_available { } { global gc_sections_available_saved global ld - + 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-*-*] - || [istarget dlx-*-*] - || [istarget i960-*-*] - || [istarget or32-*-*] - || [istarget pj*-*-*] - || [istarget alpha-*-*] - || [istarget hppa64-*-*] - || [istarget i370-*-*] - || [istarget i860-*-*] - || [istarget ia64-*-*] - || [istarget mep-*-*] - || [istarget mn10200-*-*] - || [istarget *-*-cygwin] - || [istarget *-*-mingw*] } { + if { [istarget arc-*-*] + || [istarget d30v-*-*] + || [istarget dlx-*-*] + || [istarget i960-*-*] + || [istarget pj*-*-*] + || [istarget alpha-*-*] + || [istarget hppa*64-*-*] + || [istarget i370-*-*] + || [istarget i860-*-*] + || [istarget ia64-*-*] + || [istarget mep-*-*] + || [istarget mn10200-*-*] + || [istarget *-*-cygwin] + || [istarget *-*-mingw*] } { set gc_sections_available_saved 0 return 0 } @@ -1440,6 +1590,8 @@ proc check_gc_sections_available { } { } # Check if the ld used by gcc supports --gc-sections. + # FIXME: this test is useless since ld --help always says + # --gc-sections is available set ld_output [remote_exec host $ld "--help"] if { [ string first "--gc-sections" $ld_output ] >= 0 } { set gc_sections_available_saved 1 @@ -1450,6 +1602,57 @@ proc check_gc_sections_available { } { return $gc_sections_available_saved } +# 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-*-*] + && ![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 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 or1k*-*-*] + && ![istarget pj-*-*] + && ![istarget rl78-*-*] + && ![istarget rx-*-*] + && ![istarget spu-*-*] + && ![istarget v850*-*-*] + && ![istarget xstormy16-*-*] + && ![istarget *-*-irix*] + && ![istarget *-*-rtems] } { + return 1 + } + return 0 +} + # Returns true if the target ld supports the plugin API. proc check_plugin_api_available { } { global plugin_api_available_saved @@ -1457,7 +1660,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 @@ -1466,6 +1669,126 @@ proc check_plugin_api_available { } { return $plugin_api_available_saved } +# Returns true if the target ld supports sysroot. +proc check_sysroot_available { } { + global ld_sysroot_available_saved + global ld + 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 } { + set ld_sysroot_available_saved 0 + } else { + set ld_sysroot_available_saved 1 + } + } + return $ld_sysroot_available_saved +} + +# 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 } { + set lto_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/lto[pid]" + set src ${basename}.c + set output ${basename}.out + set f [open $src "w"] + puts $f "int main() { return 0; }" + close $f + 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 + } + return $lto_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 + + if {![info exists lto_fat_available_saved]} { + if { [which $CC] == 0 } { + set lto_fat_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/lto[pid]" + set src ${basename}.c + set output ${basename}.out + set f [open $src "w"] + puts $f "int main() { return 0; }" + close $f + 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 +} + +# 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]} { + if { [which $CC] == 0 } { + set lto_shared_available_saved 0 + return 0 + } + # 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 + 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 + } + return $lto_shared_available_saved +} + # Check if the assembler supports CFI statements. proc check_as_cfi { } {