diff options
author | Andrew Hsieh <andrewhsieh@google.com> | 2014-12-09 17:57:18 +0800 |
---|---|---|
committer | Andrew Hsieh <andrewhsieh@google.com> | 2014-12-09 19:50:14 +0800 |
commit | 5e8c1cf25beccac1d22d10dc866912394f42771b (patch) | |
tree | ee16b70f804484dc8e434e647e699ab50da2620f /binutils-2.25/ld/testsuite/lib | |
parent | 8eebd7953384e6662ca926b003f2cdda8ccd3ee5 (diff) | |
download | toolchain_binutils-5e8c1cf25beccac1d22d10dc866912394f42771b.tar.gz toolchain_binutils-5e8c1cf25beccac1d22d10dc866912394f42771b.tar.bz2 toolchain_binutils-5e8c1cf25beccac1d22d10dc866912394f42771b.zip |
[2.25] sync to a30720e3e633f275250e26f85ccae5dbdddfb6c6
local patches will be re-applied later
commit a30720e3e633f275250e26f85ccae5dbdddfb6c6
Author: Alan Modra <amodra@gmail.com>
Date: Wed Nov 19 10:30:16 2014 +1030
daily update
Change-Id: Ieb2a3f4dd2ecb289ac5305ff08d428b2847494ab
Diffstat (limited to 'binutils-2.25/ld/testsuite/lib')
-rw-r--r-- | binutils-2.25/ld/testsuite/lib/ld-lib.exp | 292 |
1 files changed, 213 insertions, 79 deletions
diff --git a/binutils-2.25/ld/testsuite/lib/ld-lib.exp b/binutils-2.25/ld/testsuite/lib/ld-lib.exp index 67c429ff..7d2df221 100644 --- a/binutils-2.25/ld/testsuite/lib/ld-lib.exp +++ b/binutils-2.25/ld/testsuite/lib/ld-lib.exp @@ -1,5 +1,5 @@ # Support routines for LD testsuite. -# Copyright 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # # This file is part of the GNU Binutils. # @@ -79,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 @@ -179,6 +198,7 @@ proc default_ld_link { ld target objects } { global HOSTING_CRT0 global HOSTING_SCRT0 global HOSTING_LIBS + global HOSTING_SLIBS global LIBS global host_triplet global link_output @@ -186,10 +206,11 @@ proc default_ld_link { ld target objects } { 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 libs "$LIBS $HOSTING_LIBS" if [is_endian_output_format $objects] then { set flags [big_or_little_endian] @@ -206,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. @@ -255,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 { @@ -269,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 "" @@ -282,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" @@ -409,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. @@ -491,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 @@ -599,6 +605,7 @@ proc run_dump_test { name {extra_options {}} } { set opts(error) {} set opts(warning) {} set opts(objcopy_linked_file) {} + set opts(objcopy_objects) {} foreach i $opt_array { set opt_name [lindex $i 0] @@ -778,6 +785,12 @@ 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" catch "exec rm -f $objfile" exec_output @@ -801,6 +814,30 @@ proc run_dump_test { name {extra_options {}} } { 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) @@ -1089,7 +1126,9 @@ 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 } @@ -1292,10 +1331,12 @@ proc run_ld_link_exec_tests { targets_to_xfail ldtests } { set link_cmd $ld } - 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 "-L$srcdir/$subdir $ld_options $objfiles"] { set failed 1 - } else { - set failed 0 } # Check if exec_output is expected. @@ -1383,6 +1424,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]]" @@ -1408,18 +1458,16 @@ 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"] } { set failed 1 - } else { - set failed 0 } # Check if exec_output is expected. @@ -1493,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 } @@ -1522,7 +1567,6 @@ proc check_gc_sections_available { } { || [istarget d30v-*-*] || [istarget dlx-*-*] || [istarget i960-*-*] - || [istarget or32-*-*] || [istarget pj*-*-*] || [istarget alpha-*-*] || [istarget hppa*64-*-*] @@ -1594,8 +1638,8 @@ proc check_shared_lib_support { } { && ![istarget moxie-*-*] && ![istarget msp430-*-*] && ![istarget mt-*-*] - && ![istarget openrisc-*-*] - && ![istarget or32-*-*] + && ![istarget nds32*-*-*] + && ![istarget or1k*-*-*] && ![istarget pj-*-*] && ![istarget rl78-*-*] && ![istarget rx-*-*] @@ -1616,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 @@ -1625,34 +1669,124 @@ proc check_plugin_api_available { } { return $plugin_api_available_saved } +# 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 +} + # 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 { [which $CC] == 0 } { set lto_available_saved 0 return 0 } - set basename "lto" - set src ${basename}[pid].c - set output ${basename}[pid].so + # 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 "" + puts $f "int main() { return 0; }" close $f - set status [remote_exec host $CC "-shared -B[pwd]/tmpdir/ld/ -flto -fuse-linker-plugin $src -o $output"] - if { [lindex $status 0] == 0 } { - set lto_available_saved 1 - } else { - set lto_available_saved 0 - } + 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 -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 { } { |