bfd:

2007-08-28  Mark Shinwell  <shinwell@codesourcery.com>
            Joseph Myers  <joseph@codesourcery.com>

	* elf32-arm.c (elf32_arm_compare_mapping): Compare first on vma,
	then on type.

binutils/testsuite:
2007-08-28  Mark Shinwell  <shinwell@codesourcery.com>
            Joseph Myers  <joseph@codesourcery.com>

	* binutils-all/ar.exp (long_filenames): Delete temporary files on
	the host.
	* binutils-all/arm/objdump.exp: Only check "which $OBJDUMP" if
	host is local.
	* binutils-all/objcopy.exp: Use ${srecfile} to get the name of the
	srec file to be passed to binutils_run.
	(objcopy_test_readelf): Use remote_exec.
	* binutils-all/readelf.exp (readelf_find_size): Use remote_exec.
	(readelf_test): Likewise.
	(readelf_wi_test): Likewise.
	* lib/utils-lib.exp (run_dump_test): Only check "which $binary" if
	host is local.  Use remote_exec.  Use $tempfile not
	tmpdir/bintest.o.

gas:
2007-08-28  Mark Shinwell  <shinwell@codesourcery.com>
            Joseph Myers  <joseph@codesourcery.com>

	* as.c (main): Flush stderr before printing listings to ensure
	consistent output order across platforms.

gas/testsuite:
2007-08-28  Mark Shinwell  <shinwell@codesourcery.com>
            Joseph Myers  <joseph@codesourcery.com>

	* lib/gas-defs.exp (gas_version): Use remote_* functions instead
	of exec.
	(gas_host_run): New.
	(gas_run): Use gas_host_run.
	(gas_start): Likewise.
	(run_dump_test): Likewise.
	(objdump): Use gas_host_run.
	(objdump_start_no_subdir): Likewise.
	* lib/gas-dg.exp (gas-dg-test): Use "remote_file host delete".
	* lib/run: Remove.
	* gas/macros/macros.exp: Download app4b.s to host.
	* gas/i386/i386.exp (gas_64_check): Use gas_host_run.
	(gas_32_check): Likewise.
	* gas/maxq10/maxq10.exp (gas_64_check): Likewise
	(gas_32_check): Likewise.
	* gas/maxq20/maxq20.exp (gas_64_check): Likewise
	(gas_32_check): Likewise.
	* gas/sparc/sparc.exp (gas_64_check): Likewise.
	* gas/cfi/cfi.exp: Likewise.
	* gas/elf/elf.exp (run_list_test): Likewise.  Use temporary file
	for readelf output in place of pipe.
	* gas/all/gas.exp: Download incbin.dat to host.
	(do_comment): Allow \r\r\n.

ld:
2007-08-28  Mark Shinwell  <shinwell@codesourcery.com>
            Joseph Myers  <joseph@codesourcery.com>

	* ldlang.c (sort_sections_by_lma): Sort by internal id after lma
	for stable sort.

ld/testsuite:
2007-08-28  Mark Shinwell  <shinwell@codesourcery.com>
            Joseph Myers  <joseph@codesourcery.com>

	* ld-elfcomm/elfcomm.exp: Use run_host_cmd.  Only check "which
	$CC" if host is local.
	* ld-checks/checks.exp: Use run_host_cmd.
	* ld-elf/exclude.exp: Likewise.
	* ld-elf/elf.exp: Download merge.ld if host is remote.
	* ld-elf/binutils.exp (binutils_test): Use remote_exec.
	* ld-elf/tls_common.exp: Use run_host_cmd.
	* lib/ld-lib.exp (ld_version): Only check "which $ld" if host is
	local.  Use remote_exec.
	(run_host_cmd): New.
	(run_host_cmd_yesno): New.
	(default_ld_relocate): Use run_host_cmd_yesno.
	(default_ld_link): Likewise.
	(default_ld_simple_link): Use run_host_cmd.
	(default_ld_compile): Only check "which $ccprog" if host is local.
	Use remote_file and remote_exec.
	(default_ld_assemble): Only check "which $as" if host is local.
	Use run_host_cmd.
	(default_ld_nm): Use remote_exec, remote_upload and remote_file.
	(run_dump_test): Use remote_exec, remote_upload and remote_file.
	Only check "which $binary" if host is local.
	(run_ld_link_tests): Use remote_exec, remote_upload and
	remote_file.
	* ld-selective/selective.exp: Only check "which $CXX" if host is
	local.  Use remote_exec.
	* ld-scripts/phdrs.exp: Only check "which $objdump" if host is
	local.  Use run_host_cmd.
	* ld-scripts/phdrs2.exp: Likewise.
	* ld-scripts/weak.exp: Likewise.
	* ld-undefined/weak-undef.exp: Likewise.
	* ld-scripts/crossref.exp: Only check "which $CC" if host is local.
	Use run_host_cmd.
	* ld-scripts/map-address.exp: Upload map_address.map if host is
	remote.
	* ld-srec/srec.exp (run_srec_tests): Use run_host_cmd.  Only check
	"which $CC" and "which $CXX" if host is local.
	* ld-undefined/undefined.exp: Only check "which $CC" if host is
	local.  Use remote_file and run_host_cmd.
	* config/default.exp: Use remote_exec to create tmpdir.

3 files changed, 91 insertions, 28 deletions

diff --git a/gas/testsuite/lib/gas-defs.exp b/gas/testsuite/lib/gas-defs.exp
index 8d4902a4d0..112bb5270a 100644
--- a/gas/testsuite/lib/gas-defs.exp
+++ b/gas/testsuite/lib/gas-defs.exp
@@ -23,17 +23,80 @@
 
 proc gas_version {} {
     global AS
-    catch "exec $AS -version < /dev/null" tmp
+    if [is_remote host] then {
+	remote_exec host "$AS -version < /dev/null" "" "" "gas.version"
+	remote_exec host "which $AS" "" "" "gas.which"
+
+	remote_upload host "gas.version"
+	remote_upload host "gas.which"
+
+	set which_as [file_contents "gas.which"]
+	set tmp [file_contents "gas.version"]
+
+    	remote_file build delete "gas.version"
+   	remote_file build delete "gas.which"
+    	remote_file host delete "gas.version"
+    	remote_file host delete "gas.which"
+    } else {
+	set which_as [which $AS]
+	catch "exec $AS -version < /dev/null" tmp
+    }
+
     # Should find a way to discard constant parts, keep whatever's
     # left, so the version string could be almost anything at all...
     regexp "\[^\n\]* (cygnus-|)(\[-0-9.a-zA-Z-\]+)\[\r\n\].*" $tmp version cyg number
     if ![info exists number] then {
-        return "[which $AS] (no version number)\n"
+        return "$which_as (no version number)\n"
     }
-    clone_output "[which $AS] $number\n"
+    clone_output "$which_as $number\n"
     unset version
 }
 
+proc gas_host_run { cmd redir } {
+    verbose "Executing $cmd $redir"
+    set return_contents_of ""
+    if [regexp ">& */dev/null" $redir] then {
+	set output_file ""
+	set command "$cmd $redir"
+    } elseif [regexp "> */dev/null" $redir] then {
+	set output_file ""
+	set command "$cmd 2>gas.stderr"
+	set return_contents_of "gas.stderr"
+    } elseif [regexp ">&.*" $redir] then {
+	set output_file [regsub ">&" $redir ""]
+	set command "$cmd 2>&1"
+    } elseif [regexp "2>.*" $redir] then {
+	set output_file "gas.out"
+	set command "$cmd $redir"
+	set return_contents_of "gas.out"
+    } elseif [regexp ">.*" $redir] then {
+	set output_file ""
+	set command "$cmd $redir 2>gas.stderr"
+	set return_contents_of "gas.stderr"
+    } elseif { "$redir" == "" } then {
+	set output_file "gas.out"
+	set command "$cmd 2>&1"
+	set return_contents_of "gas.out"
+    } else {
+	fail "gas_host_run: unknown form of redirection string"
+    }
+
+    set status [remote_exec host [concat sh -c [list $command]] "" "/dev/null" "$output_file"]
+    set to_return ""
+    if { "$return_contents_of" != "" } then {
+	remote_upload host "$return_contents_of"
+	set to_return [file_contents "$return_contents_of"]
+	regsub "\n$" $to_return "" to_return
+    }
+
+    if { [lindex $status 0] == 0 && "$output_file" != ""
+	 && "$output_file" != "$return_contents_of" } then {
+	remote_upload host "$output_file"
+    }
+
+    return [list [lindex $status 0] "$to_return"]
+}
+
 proc gas_run { prog as_opts redir } {
     global AS
     global ASFLAGS
@@ -42,8 +105,11 @@ proc gas_run { prog as_opts redir } {
     global subdir
     global host_triplet
 
-    verbose -log "Executing $srcdir/lib/run $AS $ASFLAGS $as_opts $srcdir/$subdir/$prog $redir"
-    catch "exec $srcdir/lib/run $AS $ASFLAGS $as_opts $srcdir/$subdir/$prog $redir" comp_output
+    set status [gas_host_run "$AS $ASFLAGS $as_opts $srcdir/$subdir/$prog" "$redir"]
+    set comp_output [lindex $status 1]
+    if { [lindex $status 0] != 0 && [regexp "2>.*" $redir] } then {
+	append comp_output "child process exited abnormally"
+    }
     set comp_output [prune_warnings $comp_output]
     verbose "output was $comp_output"
     return [list $comp_output ""]
@@ -71,12 +137,8 @@ proc gas_start { prog as_opts } {
     set gas_started 1
 
     verbose -log "Starting $AS $ASFLAGS $as_opts $prog" 2
-    catch {
-	spawn -noecho -nottycopy $srcdir/lib/run $AS $ASFLAGS $as_opts $srcdir/$subdir/$prog
-    } foo
-    if ![regexp {^[0-9]+} $foo] then {
-	perror "Can't run $subdir/$prog: $foo"
-    }
+    set status [gas_host_run "$AS $ASFLAGS $as_opts $srcdir/$subdir/$prog" ">&gas.out"]
+    spawn -noecho -nottycopy cat gas.out
 }
 
 proc gas_finish { } {
@@ -422,6 +484,9 @@ proc run_dump_test { name {extra_options {}} } {
 	    unresolved $subdir/$name
 	    return
 	}
+	if { $opt_name == "as" } {
+	    set opt_val [subst $opt_val]
+	}
 	set opts($opt_name) $opt_val
     }
 
@@ -554,10 +619,11 @@ proc run_dump_test { name {extra_options {}} } {
 	set sourcefile $srcdir/$subdir/$opts(source)
     }
 
-    set cmd "$srcdir/lib/run $AS $ASFLAGS $opts(as) -o dump.o $sourcefile"
+    set cmd "$AS $ASFLAGS $opts(as) -o dump.o $sourcefile"
     send_log "$cmd\n"
-    set cmdret [catch "exec $cmd" comp_output]
-    set comp_output [prune_warnings $comp_output]
+    set status [gas_host_run $cmd ""]
+    set cmdret [lindex $status 0]
+    set comp_output [prune_warnings [lindex $status 1]]
 
     set expmsg $opts(error)
     if { $opts(warning) != "" } {
@@ -632,7 +698,7 @@ proc run_dump_test { name {extra_options {}} } {
     eval set progopts \$[string toupper $program]FLAGS
     eval set binary \$[string toupper $program]
 
-    if { [which $binary] == 0 } {
+    if { ![is_remote host] && [which $binary] == 0 } {
 	untested $testname
 	return
     }
@@ -642,9 +708,11 @@ proc run_dump_test { name {extra_options {}} } {
 
     # Objcopy, unlike the other two, won't send its output to stdout,
     # so we have to run it specially.
-    set cmd "$binary $progopts $progopts1 dump.o > dump.out"
+    set cmd "$binary $progopts $progopts1 dump.o"
+    set redir ">dump.out"
     if { $program == "objcopy" } {
 	set cmd "$binary $progopts $progopts1 dump.o dump.out"
+	set redir ""
     }
 
     # Ensure consistent sorting of symbols
@@ -653,7 +721,8 @@ proc run_dump_test { name {extra_options {}} } {
     }
     set env(LC_ALL) "C"
     send_log "$cmd\n"
-    catch "exec $cmd" comp_output
+    set status [gas_host_run "$cmd" "$redir"]
+    set comp_output [prune_warnings [lindex $status 1]]
     if {[info exists old_lc_all]} {
 	set env(LC_ALL) $old_lc_all
     } else {
@@ -708,8 +777,8 @@ proc objdump { opts } {
     global comp_output
     global host_triplet
 
-    catch "exec $OBJDUMP $opts" comp_output
-    set comp_output [prune_warnings $comp_output]
+    set status [gas_host_run "$OBJDUMP $opts" ""]
+    set comp_output [prune_warnings [lindex $status 1]]
     verbose "objdump output=$comp_output\n" 3
 }
 
@@ -719,12 +788,8 @@ proc objdump_start_no_subdir { prog opts } {
     global spawn_id
 
     verbose "Starting $OBJDUMP $opts $prog" 2
-    catch {
-	spawn -noecho -nottyinit $srcdir/lib/run $OBJDUMP $opts $prog
-    } foo
-    if ![regexp {^[0-9]+} $foo] then {
-	perror "Can't run $prog: $foo"
-    }
+    set status [gas_host_run "$OBJDUMP $opts $prog" ">&gas.out"]
+    spawn -noecho -nottycopy cat gas.out
 }
 
 proc objdump_finish { } {
diff --git a/gas/testsuite/lib/gas-dg.exp b/gas/testsuite/lib/gas-dg.exp
index 801b9b4e93..3b90548cac 100644
--- a/gas/testsuite/lib/gas-dg.exp
+++ b/gas/testsuite/lib/gas-dg.exp
@@ -21,7 +21,7 @@ proc gas-dg-test { prog do_what tool_flags } {
 	"run" {
 	    # This is the only place where we care if an executable was
 	    # created or not.  If it was, dg.exp will try to run it.
-	    catch "exec rm -f $output_file"
+	    remote_file host delete "$output_file"
 	}
 	default {
 	    perror "$do_what: not a valid dg-do keyword"
diff --git a/gas/testsuite/lib/run b/gas/testsuite/lib/run
deleted file mode 100755
index d4150f8d4c..0000000000
--- a/gas/testsuite/lib/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-eval exec $@