}
if ![is_remote host] {
- set tempfile tmpdir/bintest.o;
- set copyfile tmpdir/copy;
+ set tempfile tmpdir/bintest.o
+ set copyfile tmpdir/copy
} else {
set tempfile [remote_download host tmpdir/bintest.o]
set copyfile copy
if [is_remote host] {
set src1 tmpdir/bintest.o
set src2 tmpdir/copy.o
- remote_upload host $tempfile $src1;
- remote_upload host ${copyfile}.o $src2;
+ remote_upload host $tempfile $src1
+ remote_upload host ${copyfile}.o $src2
} else {
set src1 ${tempfile}
set src2 ${copyfile}.o
}
- set status [remote_exec build cmp "${src1} ${src2}"];
- set exec_output [lindex $status 1];
+ set status [remote_exec build cmp "${src1} ${src2}"]
+ set exec_output [lindex $status 1]
set exec_output [prune_warnings $exec_output]
# On some systems the result of objcopy will not be identical.
setup_xfail "m8*-*"
setup_xfail "or32-*-rtems*" "or32-*-coff"
setup_xfail "sh-*-coff*" "sh-*-rtems*"
- setup_xfail "tic80-*-*" "w65-*" "z8*-*"
+ setup_xfail "tic4x-*-*" "tic80-*-*" "w65-*" "z8*-*"
clear_xfail "hppa*64*-*-hpux*" "hppa*-*-linux*" "hppa*-*-lites*"
clear_xfail "hppa*-*-*n*bsd*" "hppa*-*-rtems*" "*-*-*elf*" "m68*-*-sysv4*"
fail "objcopy -O srec"
} else {
if [is_remote host] {
- remote_upload host ${srecfile} tmpdir/copy.srec;
- set srecfile tmpdir/copy.srec;
+ remote_upload host ${srecfile} tmpdir/copy.srec
+ set srecfile tmpdir/copy.srec
}
set file [open ${srecfile} r]
perror "objdump can not recognize bintest.o"
set origstart ""
} else {
- set got [binutils_run $OBJCOPY "$OBJCOPYFLAGS -O srec $tempfile ${copyfile}.srec --set-start 0x7654"]
+ set got [binutils_run $OBJCOPY "$OBJCOPYFLAGS -O srec --set-start 0x7654 $tempfile ${copyfile}.srec"]
if ![string match "" $got] then {
fail "objcopy --set-start"
} else {
}
}
- set got [binutils_run $OBJCOPY "$OBJCOPYFLAGS -O srec $tempfile ${copyfile}.srec --adjust-start 0x123"]
+ set got [binutils_run $OBJCOPY "$OBJCOPYFLAGS -O srec --adjust-start 0x123 $tempfile ${copyfile}.srec"]
if ![string match "" $got] then {
fail "objcopy --adjust-start"
} else {
if {$low == "" || $origstart == ""} then {
perror "objdump can not recognize bintest.o"
} else {
- set got [binutils_run $OBJCOPY "$OBJCOPYFLAGS -O srec $tempfile ${copyfile}.srec --adjust-vma 0x123"]
+ set got [binutils_run $OBJCOPY "$OBJCOPYFLAGS -O srec --adjust-vma 0x123 $tempfile ${copyfile}.srec"]
if ![string match "" $got] then {
fail "objcopy --adjust-vma"
} else {
set got $rest
}
- set got [binutils_run $OBJCOPY "$OBJCOPYFLAGS -O srec $tempfile ${copyfile}.srec $arg"]
+ set got [binutils_run $OBJCOPY "$OBJCOPYFLAGS -O srec $arg $tempfile ${copyfile}.srec"]
if ![string match "" $got] then {
fail "objcopy --adjust-section-vma +"
} else {
}
regsub -all "\\+4" $arg "=[expr $low + 4]" argeq
- set got [binutils_run $OBJCOPY "$OBJCOPYFLAGS -O srec $tempfile ${copyfile}.srec $argeq"]
+ set got [binutils_run $OBJCOPY "$OBJCOPYFLAGS -O srec $argeq $tempfile ${copyfile}.srec"]
if ![string match "" $got] then {
fail "objcopy --adjust-section-vma ="
} else {
if [is_remote host] {
set archive libstrip.a
- set objfile [remote_download host tmpdir/testprog.o];
+ set objfile [remote_download host tmpdir/testprog.o]
remote_file host delete $archive
} else {
set archive tmpdir/libstrip.a
}
if [is_remote host] {
- set objfile [remote_download host tmpdir/testprog.o];
+ set objfile [remote_download host tmpdir/testprog.o]
} else {
set objfile tmpdir/testprog.o
}
}
set exec_output [binutils_run $NM "-a $NMFLAGS $objfile"]
- if ![string match "" $exec_output] {
+ if ![string match "*: no symbols*" $exec_output] {
fail $test
return
}
}
if [is_remote host] {
- set objfile [remote_download host tmpdir/testprog.o];
+ set objfile [remote_download host tmpdir/testprog.o]
} else {
set objfile tmpdir/testprog.o
}
# Build a final executable.
+if { [istarget *-*-cygwin] || [istarget *-*-mingw32] } {
+ set test_prog "testprog.exe"
+} else {
+ set test_prog "testprog"
+}
+
proc copy_setup { } {
global srcdir
global subdir
global gcc_gas_flag
+ global test_prog
- set res [build_wrapper testglue.o];
- set flags { debug };
+ set res [build_wrapper testglue.o]
+ set flags { debug }
if { $res != "" } {
- lappend flags "additional_flags=[lindex $res 1]";
- set add_libs "testglue.o";
+ lappend flags "additional_flags=[lindex $res 1]"
+ set add_libs "testglue.o"
} else {
- set add_libs "";
+ set add_libs ""
}
if { [istarget *-*-linux*] } {
set flags "additional_flags=$i $flags"
}
}
- if { [target_compile "$srcdir/$subdir/testprog.c $add_libs" tmpdir/testprog executable $flags] != "" } {
+ if { [target_compile "$srcdir/$subdir/testprog.c $add_libs" tmpdir/$test_prog executable $flags] != "" } {
return 2
}
- set result [remote_load target tmpdir/testprog];
- set status [lindex $result 0];
+ set result [remote_load target tmpdir/$test_prog]
+ set status [lindex $result 0]
if { $status != "pass" } {
perror "unresolved setup, status = $status"
# Test copying an executable.
proc copy_executable { prog flags test1 test2 } {
+ global test_prog
if [is_remote host] {
- set testfile [remote_download host tmpdir/testprog];
+ set testfile [remote_download host tmpdir/$test_prog]
set testcopy copyprog
} else {
- set testfile tmpdir/testprog
+ set testfile tmpdir/$test_prog
set testcopy tmpdir/copyprog
}
- remote_file host delete $testcopy;
+ remote_file host delete $testcopy
set exec_output [binutils_run $prog "$flags $testfile $testcopy"]
remote_upload host $testcopy tmpdir/copyprog
}
- set status [remote_exec build "cmp" "tmpdir/testprog tmpdir/copyprog"]
- set exec_output [lindex $status 1];
+ set status [remote_exec build "cmp" "tmpdir/$test_prog tmpdir/copyprog"]
+ set exec_output [lindex $status 1]
if [string match "" $exec_output] then {
pass $test1
}
set output [remote_load target tmpdir/copyprog]
- set status [lindex $output 0];
+ set status [lindex $output 0]
if { $status != "pass" } {
fail $test2
} else {
remote_download build tmpdir/copyprog tmpdir/striprog
if [is_remote host] {
- set copyfile [remote_download host tmpdir/striprog];
+ set copyfile [remote_download host tmpdir/striprog]
} else {
set copyfile tmpdir/striprog
}
}
if [is_remote host] {
- remote_upload host ${copyfile} tmpdir/striprog;
+ remote_upload host ${copyfile} tmpdir/striprog
}
set result [remote_load target tmpdir/striprog]
- set status [lindex $result 0];
+ set status [lindex $result 0]
if { $status != "pass" } {
fail $test
return
}
set exec_output [binutils_run $NM "$NMFLAGS ${copyfile}"]
- if ![string match "" $exec_output] {
+ if ![string match "*: no symbols*" $exec_output] {
fail $test
return
}
remote_download build tmpdir/copyprog tmpdir/striprog
if [is_remote host] {
- set copyfile [remote_download host tmpdir/striprog];
+ set copyfile [remote_download host tmpdir/striprog]
} else {
set copyfile tmpdir/striprog
}
}
if [is_remote host] {
- remote_upload host ${copyfile} tmpdir/striprog;
+ remote_upload host ${copyfile} tmpdir/striprog
}
set result [remote_load target tmpdir/striprog]
- set status [lindex $result 0];
+ set status [lindex $result 0]
if { $status != "pass" } {
fail $test
return
regsub "^\[0-9a-fA-F\]+\[ \]+T Main\[\n\r\]+" $exec_output "" exec_output
}
- if {![regexp {^[0-9a-fA-F]+ T main} $exec_output] \
- && ![regexp {^[0-9a-fA-F]+ T _main} $exec_output]} {
+ if {![regexp {^([0-9a-fA-F]+)?[ ]+[TD] main} $exec_output] \
+ && ![regexp {^([0-9a-fA-F]+)?[ ]+[TD] _main} $exec_output]} {
fail $test
return
}