diff options
Diffstat (limited to 'ld/testsuite/lib/ld-lib.exp')
| -rw-r--r-- | ld/testsuite/lib/ld-lib.exp | 69 |
1 files changed, 26 insertions, 43 deletions
diff --git a/ld/testsuite/lib/ld-lib.exp b/ld/testsuite/lib/ld-lib.exp index 9615271..d1343eb 100644 --- a/ld/testsuite/lib/ld-lib.exp +++ b/ld/testsuite/lib/ld-lib.exp @@ -253,6 +253,8 @@ proc default_ld_link { ld target objects } { proc default_ld_compile { cc source object } { global CFLAGS_FOR_TARGET global CXXFLAGS_FOR_TARGET + global CFLAGS_FOR_TARGET_TEST + global CXXFLAGS_FOR_TARGET_TEST global srcdir global subdir global host_triplet @@ -286,10 +288,14 @@ proc default_ld_compile { cc source object } { } set ccexe [string replace $ccexe 0 [string last "/" $ccexe] ""] + set cflag_test "" + set cxxflag_test "" if {[string match "*++*" $ccexe]} { append flags " $CXXFLAGS_FOR_TARGET" + set cflag_test "$CXXFLAGS_FOR_TARGET_TEST" } else { append flags " $CFLAGS_FOR_TARGET" + set cflag_test "$CFLAGS_FOR_TARGET_TEST" } if [board_info [target_info name] exists cflags] { @@ -300,7 +306,7 @@ proc default_ld_compile { cc source object } { append flags " [board_info [target_info name] multilib_flags]" } - set cmd "$cc $flags $ccflags -c $source -o $object" + set cmd "$cc $flags $ccflags $cflag_test -c $source -o $object" verbose -log "$cmd" set status [remote_exec host [concat sh -c [list "$cmd 2>&1"]] "" "/dev/null" "ld.tmp"] @@ -727,6 +733,8 @@ proc run_ld_link_exec_tests { ldtests args } { global env global CC_FOR_TARGET global CXX_FOR_TARGET + global CFLAGS_FOR_TARGET_TEST + global CXXFLAGS_FOR_TARGET_TEST global errcnt global exec_output global STATIC_LDFLAGS @@ -780,9 +788,9 @@ proc run_ld_link_exec_tests { ldtests args } { lappend objfiles $objfile if { [ string match "c++" $lang ] } { - set cmd "$CXX_FOR_TARGET -c $cflags" + set cmd "$CXX_FOR_TARGET -c $cflags $CXXFLAGS_FOR_TARGET_TEST" } else { - set cmd "$CC_FOR_TARGET -c $cflags" + set cmd "$CC_FOR_TARGET -c $cflags $CFLAGS_FOR_TARGET_TEST" } if ![ld_compile $cmd $srcdir/$subdir/$src_file $objfile] { set failed 1 @@ -799,10 +807,10 @@ proc run_ld_link_exec_tests { ldtests args } { set link_cmd $ld } elseif { [ string match "c++" $lang ] } { set link_proc ld_link - set link_cmd $CXX_FOR_TARGET + set link_cmd "$CXX_FOR_TARGET $CXXFLAGS_FOR_TARGET_TEST" } else { set link_proc ld_link - set link_cmd $CC_FOR_TARGET + set link_cmd "$CC_FOR_TARGET $CFLAGS_FOR_TARGET_TEST" } if { $binfile eq "tmpdir/" } { @@ -860,14 +868,15 @@ proc run_ld_link_exec_tests { ldtests args } { } # List contains test-items with 3 items followed by 2 lists, one item and -# one optional item: +# 2 optional items: # 0:name -# 1:ld or ar options +# 1:leading ld or ar options # 2:compile options # 3:filenames of source files # 4:action and options. # 5:name of output file # 6:language (optional) +# 7:trailing ld options (optional), placed after object files # # Actions: # objdump: Apply objdump options on result. Compare with regex (last arg). @@ -887,6 +896,8 @@ proc run_cc_link_tests { ldtests } { global env global CC_FOR_TARGET global CXX_FOR_TARGET + global CFLAGS_FOR_TARGET_TEST + global CXXFLAGS_FOR_TARGET_TEST global ar global exec_output global STATIC_LDFLAGS @@ -899,6 +910,7 @@ proc run_cc_link_tests { ldtests } { set actions [lindex $testitem 4] set binfile tmpdir/[lindex $testitem 5] set lang [lindex $testitem 6] + set trailing_ldflags [lindex $testitem 7] set objfiles {} set is_unresolved 0 set failed 0 @@ -927,6 +939,7 @@ proc run_cc_link_tests { ldtests } { #verbose -log "actions is $actions" #verbose -log "binfile is $binfile" #verbose -log "lang is $lang" + #verbose -log "trailing_ldflags is $trailing_ldflags" foreach actionlist $actions { set action [lindex $actionlist 0] @@ -966,9 +979,9 @@ proc run_cc_link_tests { ldtests } { lappend objfiles $objfile if { [ string match "c++" $lang ] } { - set cmd "$CXX_FOR_TARGET -c $cflags" + set cmd "$CXX_FOR_TARGET $CXXFLAGS_FOR_TARGET_TEST -c $cflags" } else { - set cmd "$CC_FOR_TARGET -c $cflags" + set cmd "$CC_FOR_TARGET $CFLAGS_FOR_TARGET_TEST -c $cflags" } if ![ld_compile $cmd $srcdir/$subdir/$src_file $objfile] { set failed 1 @@ -984,9 +997,9 @@ proc run_cc_link_tests { ldtests } { reset_vars if { [ string match "c++" $lang ] } { - set cc_cmd $CXX_FOR_TARGET + set cc_cmd "$CXX_FOR_TARGET $CXXFLAGS_FOR_TARGET_TEST" } else { - set cc_cmd $CC_FOR_TARGET + set cc_cmd "$CC_FOR_TARGET $CFLAGS_FOR_TARGET_TEST" } if { $binfile eq "tmpdir/" } { @@ -1006,7 +1019,7 @@ proc run_cc_link_tests { ldtests } { untested $testname continue } - ld_link $cc_cmd $binfile "-L$srcdir/$subdir $ldflags $objfiles" + ld_link $cc_cmd $binfile "-L$srcdir/$subdir $ldflags $objfiles $trailing_ldflags" set ld_output "$exec_output" if { $check_ld(source) == "regexp" } then { @@ -1665,36 +1678,6 @@ proc skip_ctf_tests { } { return 1 } -# Check if the assembler supports SFrame. - -proc check_as_sframe { } { - global check_as_sframe_result - global as - if [info exists check_as_sframe_result] { - return $check_as_sframe_result - } - - # SFrame generation needs CFI support - if { ![check_as_cfi] } { - set check_as_sframe_result 0; - return 0 - } - - set as_file "tmpdir/check_as_sframe.s" - set as_fh [open $as_file w 0666] - puts $as_fh "# Generated file. DO NOT EDIT" - puts $as_fh "\t.cfi_sections \".sframe\"" - puts $as_fh "\t.cfi_startproc" - puts $as_fh "\t.cfi_endproc" - close $as_fh - remote_download host $as_file - verbose -log "Checking SFrame:" - set success [ld_assemble $as $as_file "/dev/null"] - #remote_file host delete $as_file - set check_as_sframe_result $success - return $success -} - proc skip_sframe_tests { } { # FIXME TODO # global enable_libsframe @@ -1703,7 +1686,7 @@ proc skip_sframe_tests { } { # return 1 # } - if [check_as_sframe] { + if [gas_sframe_check] { return 0 } |