X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=ld%2Ftestsuite%2Flib%2Fld-lib.exp;h=5b2e62b35c5c9e86afc584d3f5bfd839c0413f14;hb=164de317d2fcb0bcecc203d57370b592b51270ae;hp=23e4f698bd9e8ed63aa531ea2d0f82fdbebb93df;hpb=43f9d75bc1bbff5dec60756e9f12de5ae4a3d7dc;p=deliverable%2Fbinutils-gdb.git diff --git a/ld/testsuite/lib/ld-lib.exp b/ld/testsuite/lib/ld-lib.exp index 23e4f698bd..5b2e62b35c 100644 --- a/ld/testsuite/lib/ld-lib.exp +++ b/ld/testsuite/lib/ld-lib.exp @@ -1,10 +1,12 @@ # Support routines for LD testsuite. -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, +# 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. +# +# This file is part of the GNU Binutils. # # This file is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -14,55 +16,79 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# -# default_ld_version -# extract and print the version number of ld +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, +# MA 02110-1301, USA. + +# Extract and print the version number of ld. # proc default_ld_version { ld } { global host_triplet - if { [which $ld] == 0 } then { + if { ![is_remote host] && [which $ld] == 0 } then { perror "$ld does not exist" exit 1 } - catch "exec $ld --version" tmp - set tmp [prune_warnings $tmp] + remote_exec host "$ld --version" "" "/dev/null" "ld.version" + remote_upload host "ld.version" + set tmp [prune_warnings [file_contents "ld.version"]] + remote_file build delete "ld.version" + remote_file host delete "ld.version" + regexp "\[^\n\]* (cygnus-|)(\[-0-9.a-zA-Z-\]+)\[\r\n\].*" $tmp version cyg number if [info exists number] then { clone_output "$ld $number\n" } } -# -# default_ld_relocate -# link an object using relocation -# -proc default_ld_relocate { ld target objects } { - global HOSTING_EMU - global host_triplet +proc run_host_cmd { prog command } { + global link_output - if { [which $ld] == 0 } then { - perror "$ld does not exist" + if { ![is_remote host] && [which "$prog"] == 0 } then { + perror "$prog does not exist" return 0 } - verbose -log "$ld $HOSTING_EMU -o $target -r $objects" + verbose -log "$prog $command" + set status [remote_exec host [concat sh -c [list "$prog $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 + if { [lindex $status 0] != 0 && [string match "" $link_output] } then { + append link_output "child process exited abnormally" + } + remote_file build delete ld.tmp + remote_file host delete ld.tmp + + if [string match "" $link_output] then { + return "" + } - catch "exec $ld $HOSTING_EMU -o $target -r $objects" exec_output - set exec_output [prune_warnings $exec_output] + verbose -log "$link_output" + return "$link_output" +} + +proc run_host_cmd_yesno { prog command } { + global exec_output + + set exec_output [prune_warnings [run_host_cmd "$prog" "$command"]] if [string match "" $exec_output] then { - return 1 - } else { - verbose -log "$exec_output" - return 0 + return 1; } + return 0; } -# Check to see if ld is being invoked with a non-endian output format +# Link an object using relocation. +# +proc default_ld_relocate { ld target objects } { + global HOSTING_EMU + + remote_file host delete $target + return [run_host_cmd_yesno "$ld" "$HOSTING_EMU -o $target -r $objects"] +} +# Check to see if ld is being invoked with a non-endian output format +# proc is_endian_output_format { object_flags } { if {[string match "*-oformat binary*" $object_flags] || \ @@ -86,19 +112,19 @@ proc is_endian_output_format { object_flags } { # the site.exp file will include the switch "-mbig-endian" # (rather than "big-endian") which is not detected by proc # process_multilib_options. - +# proc big_or_little_endian {} { if [board_info [target_info name] exists multilib_flags] { - set tmp_flags " [board_info [target_info name] multilib_flags]"; + set tmp_flags " [board_info [target_info name] multilib_flags]" foreach x $tmp_flags { case $x in { - {*big*endian eb EB -eb -EB -mb} { + {*big*endian eb EB -eb -EB -mb -meb} { set flags " -EB" return $flags } - {*little*endian el EL -el -EL -ml} { + {*little*endian el EL -el -EL -ml -mel} { set flags " -EL" return $flags } @@ -110,9 +136,7 @@ proc big_or_little_endian {} { return $flags } -# -# default_ld_link -# link a program using ld +# Link a program using ld. # proc default_ld_link { ld target objects } { global HOSTING_EMU @@ -121,45 +145,28 @@ proc default_ld_link { ld target objects } { global LIBS global host_triplet global link_output + global exec_output set objs "$HOSTING_CRT0 $objects" set libs "$LIBS $HOSTING_LIBS" - if { [which $ld] == 0 } then { - perror "$ld does not exist" - return 0 - } - if [is_endian_output_format $objects] then { set flags [big_or_little_endian] } else { set flags "" } - verbose -log "$ld $HOSTING_EMU $flags -o $target $objs $libs" - catch "exec $ld $HOSTING_EMU $flags -o $target $objs $libs" link_output - set exec_output [prune_warnings $link_output] - if [string match "" $link_output] then { - return 1 - } else { - verbose -log "$link_output" - return 0 - } + remote_file host delete $target + + return [run_host_cmd_yesno "$ld" "$HOSTING_EMU $flags -o $target $objs $libs"] } -# -# default_ld_simple_link -# link a program using ld, without including any libraries +# Link a program using ld, without including any libraries. # proc default_ld_simple_link { ld target objects } { global host_triplet - global link_output global gcc_ld_flag - - if { [which $ld] == 0 } then { - perror "$ld does not exist" - return 0 - } + global exec_output if [is_endian_output_format $objects] then { set flags [big_or_little_endian] @@ -170,14 +177,20 @@ proc default_ld_simple_link { ld target objects } { # 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. - if {[string match "*gcc*" $ld] || [string match "*++*" $ld]} then { + set ldexe $ld + set ldparm [string first " " $ld] + if { $ldparm > 0 } then { + set ldexe [string range $ld 0 $ldparm] + } + set ldexe [string replace $ldexe 0 [string last "/" $ldexe] ""] + if {[string match "*gcc*" $ldexe] || [string match "*++*" $ldexe]} then { set flags "$gcc_ld_flag $flags" } - verbose -log "$ld $flags -o $target $objects" + remote_file host delete $target - catch "exec $ld $flags -o $target $objects" link_output - set exec_output [prune_warnings $link_output] + 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. @@ -186,17 +199,15 @@ proc default_ld_simple_link { ld target objects } { if [string match "" $exec_output] then { return 1 } else { - verbose -log "$exec_output" return 0 } } -# -# default_ld_compile -# compile an object using cc +# Compile an object using cc. # proc default_ld_compile { cc source object } { global CFLAGS + global CXXFLAGS global srcdir global subdir global host_triplet @@ -206,44 +217,58 @@ proc default_ld_compile { cc source object } { if {[llength $cc_prog] > 1} then { set cc_prog [lindex $cc_prog 0] } - if {[which $cc_prog] == 0} then { + if {![is_remote host] && [which $cc_prog] == 0} then { perror "$cc_prog does not exist" return 0 } - catch "exec rm -f $object" exec_output + remote_file build delete "$object" + remote_file host delete "$object" - set flags "-I$srcdir/$subdir $CFLAGS" + set flags "-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 {[string match "*gcc*" $cc] || [string match "*++*" $cc]} then { + set ccexe $cc + set ccparm [string first " " $cc] + set ccflags "" + if { $ccparm > 0 } then { + set ccflags [string range $cc $ccparm end] + 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" } + if {[string match "*++*" $ccexe]} { + set flags "$flags $CXXFLAGS" + } else { + set flags "$flags $CFLAGS" + } + if [board_info [target_info name] exists multilib_flags] { - append flags " [board_info [target_info name] multilib_flags]"; + append flags " [board_info [target_info name] multilib_flags]" } - verbose -log "$cc $flags -c $source -o $object" + verbose -log "$cc $flags $ccflags -c $source -o $object" - catch "exec $cc $flags -c $source -o $object" exec_output + set status [remote_exec host [concat sh -c [list "$cc $flags $ccflags -c $source -o $object 2>&1"]] "" "/dev/null" "ld.tmp"] + remote_upload host "ld.tmp" + set exec_output [file_contents "ld.tmp"] + remote_file build delete "ld.tmp" + remote_file host delete "ld.tmp" set exec_output [prune_warnings $exec_output] if [string match "" $exec_output] then { if {![file exists $object]} then { regexp ".*/(\[^/\]*)$" $source all dobj regsub "\\.c" $dobj ".o" realobj verbose "looking for $realobj" - if {[file exists $realobj]} then { + if {[remote_file host exists $realobj]} then { verbose -log "mv $realobj $object" - catch "exec mv $realobj $object" exec_output - set exec_output [prune_warnings $exec_output] - if {![string match "" $exec_output]} then { - verbose -log "$exec_output" - perror "could not move $realobj to $object" - return 0 - } + remote_upload "$realobj" "$object" } else { perror "$object not found after compilation" return 0 @@ -257,50 +282,32 @@ proc default_ld_compile { cc source object } { } } -# -# default_ld_assemble -# assemble a file +# Assemble a file. # proc default_ld_assemble { as source object } { global ASFLAGS global host_triplet - if {[which $as] == 0} then { - perror "$as does not exist" - return 0 - } - if ![info exists ASFLAGS] { set ASFLAGS "" } set flags [big_or_little_endian] - - verbose -log "$as $flags $ASFLAGS -o $object $source" - - catch "exec $as $flags $ASFLAGS -o $object $source" exec_output + set exec_output [run_host_cmd "$as" "$flags $ASFLAGS -o $object $source"] set exec_output [prune_warnings $exec_output] if [string match "" $exec_output] then { return 1 } else { - verbose -log "$exec_output" perror "$source: assembly failed" return 0 } } -# -# default_ld_nm -# run nm on a file, putting the result in the array nm_output +# Run nm on a file, putting the result in the array nm_output. # proc default_ld_nm { nm nmflags object } { global NMFLAGS global nm_output global host_triplet - if {[which $nm] == 0} then { - perror "$nm does not exist" - return 0 - } - if {[info exists nm_output]} { unset nm_output } @@ -312,15 +319,20 @@ proc default_ld_nm { nm nmflags object } { set old_lc_all $env(LC_ALL) } set env(LC_ALL) "C" + verbose -log "$nm $NMFLAGS $nmflags $object >tmpdir/nm.out" - catch "exec $nm $NMFLAGS $nmflags $object >tmpdir/nm.out" exec_output + set status [remote_exec host [concat sh -c [list "$nm $NMFLAGS $nmflags $object 2>ld.stderr"]] "" "/dev/null" "tmpdir/nm.out"] if {[info exists old_lc_all]} { set env(LC_ALL) $old_lc_all } else { unset env(LC_ALL) } - set exec_output [prune_warnings $exec_output] + remote_upload host "ld.stderr" + remote_upload host "tmpdir/nm.out" "tmpdir/nm.out" + set exec_output [prune_warnings [file_contents "ld.stderr"]] + remote_file host delete "ld.stderr" + remote_file build delete "ld.stderr" if [string match "" $exec_output] then { set file [open tmpdir/nm.out r] while { [gets $file line] != -1 } { @@ -340,9 +352,48 @@ proc default_ld_nm { nm nmflags object } { } } -# -# is_elf_format -# true if the object format is known to be ELF +# Define various symbols needed when not linking against all +# target libs. +proc ld_simple_link_defsyms {} { + + set flags "--defsym __stack_chk_fail=0" + + # ARM targets call __gccmain + if {[istarget arm*-*-*] || \ + [istarget strongarm*-*-*] || \ + [istarget xscale*-*-*] || \ + [istarget thumb-*-*] } { + append flags " --defsym __gccmain=0" + } + + # PowerPC EABI code calls __eabi. + if {[istarget powerpc*-*-eabi*] || [istarget powerpc*-*-rtems*]} { + append flags " --defsym __eabi=0" + } + + # mn10200 code calls __truncsipsi2_d0_d2. + if {[istarget mn10200*-*-*]} then { + append flags " --defsym __truncsipsi2_d0_d2=0" + } + + # m6811/m6812 code has references to soft registers. + if {[istarget m6811-*-*] || [istarget m6812-*-*]} { + 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" + } + + # Some OpenBSD targets have ProPolice and reference __guard and + # __stack_smash_handler. + if [istarget *-*-openbsd*] { + append flags " --defsym __guard=0" + append flags " --defsym __stack_smash_handler=0" + } + + return $flags +} + +# True if the object format is known to be ELF. # proc is_elf_format {} { if { ![istarget *-*-sysv4*] \ @@ -351,6 +402,8 @@ proc is_elf_format {} { && ![istarget *-*-eabi*] \ && ![istarget hppa*64*-*-hpux*] \ && ![istarget *-*-linux*] \ + && ![istarget frv-*-uclinux*] \ + && ![istarget bfin-*-uclinux] \ && ![istarget *-*-irix5*] \ && ![istarget *-*-irix6*] \ && ![istarget *-*-netbsd*] \ @@ -377,11 +430,76 @@ proc is_elf_format {} { return 1 } +# True if the object format is known to be 64-bit ELF. # -# simple_diff -# compares two files line-by-line -# returns differences if exist -# returns null if file(s) cannot be opened +proc is_elf64 { binary_file } { + global READELF + global READELFFLAGS + + set readelf_size "" + catch "exec $READELF $READELFFLAGS -h $binary_file > readelf.out" got + + if ![string match "" $got] then { + return 0 + } + + if { ![regexp "\n\[ \]*Class:\[ \]*ELF(\[0-9\]+)\n" \ + [file_contents readelf.out] nil readelf_size] } { + return 0 + } + + if { $readelf_size == "64" } { + return 1 + } + + return 0 +} + +# True if the object format is known to be a.out. +# +proc is_aout_format {} { + if { [istarget *-*-*\[ab\]out*] \ + || [istarget *-*-linux*oldld*] \ + || [istarget *-*-msdos*] \ + || [istarget arm-*-netbsd] \ + || [istarget i?86-*-netbsd] \ + || [istarget i?86-*-mach*] \ + || [istarget i?86-*-vsta] \ + || [istarget pdp11-*-*] \ + || [istarget m68*-ericsson-ose] \ + || [istarget m68k-hp-bsd*] \ + || [istarget m68*-*-hpux*] \ + || [istarget m68*-*-netbsd] \ + || [istarget m68*-*-netbsd*4k*] \ + || [istarget m68k-sony-*] \ + || [istarget m68*-sun-sunos\[34\]*] \ + || [istarget m68*-wrs-vxworks*] \ + || [istarget ns32k-*-*] \ + || [istarget sparc*-*-netbsd] \ + || [istarget sparc-sun-sunos4*] \ + || [istarget vax-dec-ultrix*] \ + || [istarget vax-*-netbsd] } { + return 1 + } + return 0 +} + +# True if the object format is known to be PE COFF. +# +proc is_pecoff_format {} { + if { ![istarget *-*-mingw*] \ + && ![istarget *-*-cygwin*] \ + && ![istarget *-*-cegcc*] \ + && ![istarget *-*-pe*] } { + return 0 + } + + return 1 +} + +# Compares two files line-by-line. +# Returns differences if exist. +# Returns null if file(s) cannot be opened. # proc simple_diff { file_1 file_2 } { global target @@ -489,6 +607,9 @@ proc simple_diff { file_1 file_2 } { # Link assembled files using FLAGS, in the order of the "source" # directives, when using multiple files. # +# ld_after_inputfiles: FLAGS +# Similar to "ld", but put after all input files. +# # 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 @@ -523,7 +644,8 @@ proc simple_diff { file_1 file_2 } { # # target: TARGET # Only run the test for TARGET. This may occur more than once; the -# target being tested must match at least one. +# target being tested must match at least one. You may provide target +# name "cfi" for any target supporting the CFI statements. # # notarget: TARGET # Do not run the test for TARGET. This may occur more than once; @@ -532,7 +654,13 @@ proc simple_diff { file_1 file_2 } { # 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. +# meaning and need not supplied if this is present. Multiple "error" +# directives append to the expected linker error message. +# +# 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. # # Each option may occur at most once unless otherwise mentioned. # @@ -540,13 +668,13 @@ proc simple_diff { file_1 file_2 } { # `regexp_diff' to compare the output of the dumping tool against the # regexps in FILE.d. `regexp_diff' is defined later in this file; see # further comments there. - +# proc run_dump_test { name } { global subdir srcdir global OBJDUMP NM AS OBJCOPY READELF LD global OBJDUMPFLAGS NMFLAGS ASFLAGS OBJCOPYFLAGS READELFFLAGS LDFLAGS global host_triplet runtests - global env + global env verbose if [string match "*/*" $name] { set file $name @@ -570,6 +698,7 @@ proc run_dump_test { name } { set run_objcopy 0 set opts(as) {} set opts(ld) {} + set opts(ld_after_inputfiles) {} set opts(xfail) {} set opts(target) {} set opts(notarget) {} @@ -581,6 +710,7 @@ proc run_dump_test { name } { set opts(PROG) {} set opts(source) {} set opts(error) {} + set opts(warning) {} set opts(objcopy_linked_file) {} set asflags(${file}.s) {} @@ -597,6 +727,8 @@ proc run_dump_test { name } { xfail {} target {} notarget {} + warning {} + error {} source { # Move any source-specific as-flags to a separate array to # simplify processing. @@ -624,8 +756,15 @@ 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] } + foreach opt { as ld } { + regsub {\[big_or_little_endian\]} $opts($opt) \ + [big_or_little_endian] opts($opt) + } # Decide early whether we should run the test for this target. if { [llength $opts(target)] > 0 } { @@ -646,49 +785,42 @@ proc run_dump_test { name } { } } - if {$opts(PROG) != ""} { - switch -- $opts(PROG) { - objdump - { set program objdump } - nm - { set program nm } - objcopy - { set program objcopy } - readelf - { set program readelf } - default + set program "" + # It's meaningless to require an output-testing method when we + # expect an error. + if { $opts(error) == "" } { + if {$opts(PROG) != ""} { + switch -- $opts(PROG) { + objdump { set program objdump } + nm { set program nm } + objcopy { set program objcopy } + readelf { set program readelf } + default { perror "unrecognized program option $opts(PROG) in $file.d" unresolved $subdir/$name return } - } - } elseif { $opts(error) != "" } { - # It's meaningless to require an output-testing method when we - # expect an error. For simplicity, we fake an arbitrary method. - set program "nm" - } else { + } + } else { # Guess which program to run, by seeing which option was specified. - set program "" - foreach p {objdump objcopy nm readelf} { - if {$opts($p) != ""} { - if {$program != ""} { - perror "ambiguous dump program in $file.d" - unresolved $subdir/$name - return - } else { - set program $p + foreach p {objdump objcopy nm readelf} { + if {$opts($p) != ""} { + if {$program != ""} { + perror "ambiguous dump program in $file.d" + unresolved $subdir/$name + return + } else { + set program $p + } } } } - if {$program == ""} { + if { $program == "" && $opts(warning) == "" } { perror "dump program unspecified in $file.d" unresolved $subdir/$name return } } - set progopts1 $opts($program) - eval set progopts \$[string toupper $program]FLAGS - eval set binary \$[string toupper $program] if { $opts(name) == "" } { set testname "$subdir/$name" } else { @@ -702,7 +834,7 @@ proc run_dump_test { name } { foreach sf $opts(source) { if { [string match "/*" $sf] } { lappend sourcefiles "$sf" - } { + } else { lappend sourcefiles "$srcdir/$subdir/$sf" } # Must have asflags indexed on source name. @@ -721,78 +853,92 @@ proc run_dump_test { name } { set sourcefile [lindex $sourcefiles $i] 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" send_log "$cmd\n" - set cmdret [catch "exec $cmd" comp_output] - set comp_output [prune_warnings $comp_output] + set cmdret [remote_exec host [concat sh -c [list "$cmd 2>&1"]] "" "/dev/null" "ld.tmp"] + remote_upload host "ld.tmp" + set comp_output [prune_warnings [file_contents "ld.tmp"]] + remote_file host delete "ld.tmp" + remote_file build delete "ld.tmp" - # We accept errors at assembly stage too, unless we're supposed to - # link something. - if { $cmdret != 0 || ![string match "" $comp_output] } then { + if { [lindex $cmdret 0] != 0 || ![string match "" $comp_output] } then { send_log "$comp_output\n" verbose "$comp_output" 3 - if { $opts(error) != "" && $run_ld == 0 } { - if [regexp $opts(error) $comp_output] { - pass $testname - return - } - } + + set exitstat "succeeded" + if { $cmdret != 0 } { set exitstat "failed" } + verbose -log "$exitstat with: <$comp_output>" fail $testname return } } + set expmsg $opts(error) + if { $opts(warning) != "" } { + if { $expmsg != "" } { + perror "$testname: mixing error and warning test-directives" + return + } + set expmsg $opts(warning) + } + # Perhaps link the file(s). if { $run_ld } { set objfile "tmpdir/dump" + catch "exec rm -f $objfile" exec_output # Add -L$srcdir/$subdir so that the linker command can use # linker scripts in the source directory. set cmd "$LD $LDFLAGS -L$srcdir/$subdir \ - $opts(ld) -o $objfile $objfiles" + $opts(ld) -o $objfile $objfiles $opts(ld_after_inputfiles)" send_log "$cmd\n" - set cmdret [catch "exec $cmd" comp_output] - set comp_output [prune_warnings $comp_output] - - if { $cmdret != 0 || ![string match "" $comp_output] } then { - verbose -log "failed with: <$comp_output>, expected: <$opts(error)>" - send_log "$comp_output\n" - verbose "$comp_output" 3 - if { $opts(error) != "" && $run_objcopy == 0 } { - if [regexp $opts(error) $comp_output] { - pass $testname - return - } - } - fail $testname - return - } - - if { $run_objcopy } { + set cmdret [remote_exec host [concat sh -c [list "$cmd 2>&1"]] "" "/dev/null" "ld.tmp"] + remote_upload host "ld.tmp" + set comp_output [file_contents "ld.tmp"] + remote_file host delete "ld.tmp" + remote_file build delete "ld.tmp" + set cmdret [lindex $cmdret 0] + + if { $cmdret == 0 && $run_objcopy } { set infile $objfile set objfile "tmpdir/dump1" + remote_file host delete $objfile # Note that we don't use OBJCOPYFLAGS here; any flags must be # explicitly specified. set cmd "$OBJCOPY $opts(objcopy_linked_file) $infile $objfile" send_log "$cmd\n" - set cmdret [catch "exec $cmd" comp_output] - set comp_output [prune_warnings $comp_output] - - if { $cmdret != 0 || ![string match "" $comp_output] } then { - verbose -log "failed with: <$comp_output>, expected: <$opts(error)>" - send_log "$comp_output\n" - verbose "$comp_output" 3 - if { $opts(error) != "" } { - if [regexp $opts(error) $comp_output] { - pass $testname - return - } + set cmdret [remote_exec host [concat sh -c [list "$cmd 2>&1"]] "" "/dev/null" "ld.tmp"] + remote_upload host "ld.tmp" + append comp_output [file_contents "ld.tmp"] + remote_file host delete "ld.tmp" + remote_file build delete "ld.tmp" + set cmdret [lindex $cmdret 0] + } + + regsub "\n$" $comp_output "" comp_output + if { $cmdret != 0 || $comp_output != "" || $expmsg != "" } then { + set exitstat "succeeded" + if { $cmdret != 0 } { set exitstat "failed" } + verbose -log "$exitstat with: <$comp_output>, expected: <$expmsg>" + 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 == "" } { + pass $testname + return } + } else { + verbose -log "$exitstat with: <$comp_output>, expected: <$expmsg>" fail $testname return } @@ -807,7 +953,11 @@ proc run_dump_test { name } { return } - if { [which $binary] == 0 } { + set progopts1 $opts($program) + eval set progopts \$[string toupper $program]FLAGS + eval set binary \$[string toupper $program] + + if { ![is_remote host] && [which $binary] == 0 } { untested $testname return } @@ -828,23 +978,27 @@ proc run_dump_test { name } { } set env(LC_ALL) "C" send_log "$cmd\n" - catch "exec $cmd" comp_output + set cmdret [remote_exec host [concat sh -c [list "$cmd 2>ld.tmp"]] "" "/dev/null"] + set cmdret [lindex $cmdret 0] + remote_upload host "ld.tmp" + set comp_output [prune_warnings [file_contents "ld.tmp"]] + remote_file host delete "ld.tmp" + remote_file build delete "ld.tmp" if {[info exists old_lc_all]} { set env(LC_ALL) $old_lc_all } else { unset env(LC_ALL) } - set comp_output [prune_warnings $comp_output] - if ![string match "" $comp_output] then { - send_log "$comp_output\n" + if { $cmdret != 0 || $comp_output != "" } { + send_log "exited abnormally with $cmdret, output:$comp_output\n" fail $testname return } - verbose_eval {[file_contents $dumpfile]} 3 + if { $verbose > 2 } then { verbose "output is [file_contents $dumpfile]" 3 } if { [regexp_diff $dumpfile "${file}.d"] } then { fail $testname - verbose "output is [file_contents $dumpfile]" 2 + if { $verbose == 2 } then { verbose "output is [file_contents $dumpfile]" 2 } return } @@ -891,6 +1045,7 @@ proc regexp_diff { file_1 file_2 } { set end_2 0 set differences 0 set diff_pass 0 + set fail_if_match 0 if [file exists $file_1] then { set file_a [open $file_1 r] @@ -923,9 +1078,14 @@ proc regexp_diff { file_1 file_2 } { set end_2 1 set diff_pass 1 break + } elseif [ string match "#failif" $line_b ] { + send_log "fail if no difference\n" + verbose "fail if no difference" 3 + set fail_if_match 1 } elseif [ string match "#..." $line_b ] { if { [gets $file_b line_b] == $eof } { set end_2 1 + set diff_pass 1 break } verbose "looking for \"^$line_b$\"" 3 @@ -974,6 +1134,14 @@ proc regexp_diff { file_1 file_2 } { set differences 1 } + if { $fail_if_match } { + if { $differences == 0 } { + set differences 1 + } else { + set differences 0 + } + } + close $file_a close $file_b @@ -987,21 +1155,38 @@ proc file_contents { filename } { return $contents } +# Create an archive using ar +# +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 [prune_warnings $exec_output] + + if [string match "" $exec_output] then { + send_log "$exec_output\n" + return 1 + } else { + return 0 + } +} + # List contains test-items with 3 items followed by 2 lists, one item and # one optional item: -# 0:name 1:ld options 2:assembler options +# 0:name 1:ld/ar options 2:assembler options # 3:filenames of assembler files 4: action and options. 5: name of output file # 6:compiler flags (optional) - +# # Actions: # objdump: Apply objdump options on result. Compare with regex (last arg). # nm: Apply nm options on result. Compare with regex (last arg). # readelf: Apply readelf options on result. Compare with regex (last arg). - +# proc run_ld_link_tests { ldtests } { global ld global as global nm + global ar global objdump global READELF global srcdir @@ -1009,9 +1194,15 @@ proc run_ld_link_tests { ldtests } { global env global CC global CFLAGS + global runtests foreach testitem $ldtests { set testname [lindex $testitem 0] + + if ![runtest_file_p $runtests $testname] then { + continue + } + set ld_options [lindex $testitem 1] set as_options [lindex $testitem 2] set src_files [lindex $testitem 3] @@ -1055,10 +1246,21 @@ proc run_ld_link_tests { ldtests } { continue } - if ![ld_simple_link $ld $binfile "-L$srcdir/$subdir $ld_options $objfiles"] { + if { [regexp ".*\\.a$" $binfile] } { + if { ![ar_simple_create $ar $ld_options $binfile "$objfiles"] } { + fail $testname + set failed 1 + } else { + set failed 0 + } + } elseif { ![ld_simple_link $ld $binfile "-L$srcdir/$subdir $ld_options $objfiles"] } { fail $testname + set failed 1 } else { set failed 0 + } + + if { $failed == 0 } { foreach actionlist $actions { set action [lindex $actionlist 0] set progopts [lindex $actionlist 1] @@ -1091,15 +1293,19 @@ proc run_ld_link_tests { ldtests } { set old_lc_all $env(LC_ALL) } set env(LC_ALL) "C" - set cmd "$binary $progopts $binfile > dump.out" + set cmd "$binary $progopts $binfile" + set status [remote_exec host [concat sh -c [list "$cmd >dump.out 2>ld.stderr"]] "" "/dev/null"] send_log "$cmd\n" - catch "exec $cmd" comp_output + remote_upload host "ld.stderr" + 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 { unset env(LC_ALL) } - set comp_output [prune_warnings $comp_output] if ![string match "" $comp_output] then { send_log "$comp_output\n" @@ -1107,11 +1313,17 @@ proc run_ld_link_tests { ldtests } { break } + remote_upload host "dump.out" + if { [regexp_diff "dump.out" "$srcdir/$subdir/$dumpfile"] } then { verbose "output is [file_contents "dump.out"]" 2 set failed 1 + remote_file build delete "dump.out" + remote_file host delete "dump.out" break } + remote_file build delete "dump.out" + remote_file host delete "dump.out" } } @@ -1130,12 +1342,6 @@ proc run_ld_link_tests { ldtests } { } } - -proc verbose_eval { expr { level 1 } } { - global verbose - if $verbose>$level then { eval verbose "$expr" $level } -} - # This definition is taken from an unreleased version of DejaGnu. Once # that version gets released, and has been out in the world for a few # months at least, it may be safe to delete this copy. @@ -1158,3 +1364,354 @@ if ![string length [info proc prune_warnings]] { return $text } } + +# 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 +# 1:ld options +# 2:assembler options +# 3:filenames of source files +# 4:name of output file +# 5:expected output +# 6:compiler flags (optional) +# 7:language (optional) +# 8:linker warning (optional) + +proc run_ld_link_exec_tests { targets_to_xfail ldtests } { + global ld + global as + global srcdir + global subdir + global env + global CC + global CXX + global CFLAGS + global CXXFLAGS + global errcnt + global exec_output + + foreach testitem $ldtests { + foreach target $targets_to_xfail { + setup_xfail $target + } + set testname [lindex $testitem 0] + set ld_options [lindex $testitem 1] + set as_options [lindex $testitem 2] + set src_files [lindex $testitem 3] + set binfile tmpdir/[lindex $testitem 4] + set expfile [lindex $testitem 5] + set cflags [lindex $testitem 6] + set lang [lindex $testitem 7] + set warning [lindex $testitem 8] + set objfiles {} + set failed 0 + +# verbose -log "Testname is $testname" +# 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" + lappend objfiles $objfile + + # We ignore warnings since some compilers may generate + # 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 + } 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 ![$link_proc $link_cmd $binfile "-L$srcdir/$subdir $ld_options $objfiles"] { + 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 + } + } + + 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 + } + } + } +} + +# List contains test-items with 3 items followed by 2 lists, one item and +# one optional item: +# 0:name +# 1:ld or ar options +# 2:compile options +# 3:filenames of source files +# 4:action and options. +# 5:name of output file +# 6:language (optional) +# +# Actions: +# objdump: Apply objdump options on result. Compare with regex (last arg). +# nm: Apply nm options on result. Compare with regex (last arg). +# readelf: Apply readelf options on result. Compare with regex (last arg). +# +proc run_cc_link_tests { ldtests } { + global nm + global objdump + global READELF + global srcdir + global subdir + global env + global CC + global CXX + global CFLAGS + global CXXFLAGS + global ar + + foreach testitem $ldtests { + set testname [lindex $testitem 0] + set ldflags [lindex $testitem 1] + set cflags [lindex $testitem 2] + set src_files [lindex $testitem 3] + set actions [lindex $testitem 4] + set binfile tmpdir/[lindex $testitem 5] + set lang [lindex $testitem 6] + set objfiles {} + set is_unresolved 0 + set failed 0 + + # Compile each file in the test. + foreach src_file $src_files { + set objfile "tmpdir/[file rootname $src_file].o" + lappend objfiles $objfile + + # We ignore warnings since some compilers may generate + # 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 + } else { + ld_compile "$CC -c $CFLAGS $cflags" $srcdir/$subdir/$src_file $objfile + } + } + + # Clear error and warning counts. + reset_vars + + if { [ string match "c++" $lang ] } { + set cc_cmd $CXX + } else { + set cc_cmd $CC + } + + if { [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"] } { + fail $testname + set failed 1 + } else { + set failed 0 + } + + if { $failed == 0 } { + foreach actionlist $actions { + set action [lindex $actionlist 0] + set progopts [lindex $actionlist 1] + + # There are actions where we run regexp_diff on the + # output, and there are other actions (presumably). + # Handling of the former look the same. + set dump_prog "" + switch -- $action { + objdump + { set dump_prog $objdump } + nm + { set dump_prog $nm } + readelf + { set dump_prog $READELF } + default + { + perror "Unrecognized action $action" + set is_unresolved 1 + break + } + } + + if { $dump_prog != "" } { + set dumpfile [lindex $actionlist 2] + set binary $dump_prog + + # Ensure consistent sorting of symbols + if {[info exists env(LC_ALL)]} { + set old_lc_all $env(LC_ALL) + } + set env(LC_ALL) "C" + set cmd "$binary $progopts $binfile > dump.out" + send_log "$cmd\n" + catch "exec $cmd" comp_output + if {[info exists old_lc_all]} { + set env(LC_ALL) $old_lc_all + } else { + unset env(LC_ALL) + } + set comp_output [prune_warnings $comp_output] + + if ![string match "" $comp_output] then { + send_log "$comp_output\n" + set failed 1 + break + } + + if { [regexp_diff "dump.out" "$srcdir/$subdir/$dumpfile"] } then { + verbose "output is [file_contents "dump.out"]" 2 + set failed 1 + break + } + } + } + + if { $failed != 0 } { + fail $testname + } else { if { $is_unresolved == 0 } { + pass $testname + } } + } + + # Catch action errors. + if { $is_unresolved != 0 } { + unresolved $testname + continue + } + } +} + +# Returns true if --gc-sections is supported on the target. + +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 alpha*-*-*] + || [istarget mep-*-*] + || [istarget ia64-*-*] + || [istarget *-*-cygwin] + || [istarget *-*-mingw*] } { + set gc_sections_available_saved 0 + return 0 + } + + # elf2flt uses -q (--emit-relocs), which is incompatible with + # --gc-sections. + if { [board_info target exists ldflags] + && [regexp " -elf2flt\[ =\]" " [board_info target ldflags] "] } { + set gc_sections_available_saved 0 + return 0 + } + + # Check if the ld used by gcc supports --gc-sections. + set ld_output [remote_exec host $ld "--help"] + if { [ string first "--gc-sections" $ld_output ] >= 0 } { + set gc_sections_available_saved 1 + } else { + set gc_sections_available_saved 0 + } + } + return $gc_sections_available_saved +} + +# Check if the assembler supports CFI statements. + +proc check_as_cfi { } { + global check_as_cfi_result + global as + if [info exists check_as_cfi_result] { + return $check_as_cfi_result + } + set as_file "tmpdir/check_as_cfi.s" + set as_fh [open $as_file w 0666] + puts $as_fh "# Generated file. DO NOT EDIT" + puts $as_fh "\t.cfi_startproc" + puts $as_fh "\t.cfi_endproc" + close $as_fh + remote_download host $as_file + verbose -log "Checking CFI support:" + rename "perror" "check_as_cfi_perror" + proc perror { args } { } + set success [ld_assemble $as $as_file "/dev/null"] + rename "perror" "" + rename "check_as_cfi_perror" "perror" + #remote_file host delete $as_file + set check_as_cfi_result $success + return $success +} + +# Provide virtual target "cfi" for targets supporting CFI. + +rename "istarget" "istarget_ld" +proc istarget { target } { + if {$target == "cfi"} { + return [check_as_cfi] + } + return [istarget_ld $target] +}