diff -urpN src/gdb/testsuite/lib/gdbserver-support.exp dev/gdb/testsuite/lib/gdbserver-support.exp
--- src/gdb/testsuite/lib/gdbserver-support.exp	2007-07-03 05:52:21.000000000 +0200
+++ dev/gdb/testsuite/lib/gdbserver-support.exp	2007-08-20 06:44:45.000000000 +0200
@@ -179,10 +179,10 @@ proc gdbserver_spawn { child_args } {
     }
 
     # Extract the local and remote host ids from the target board struct.
-    if [target_info exists sockethost] {
-	set debughost  [target_info sockethost]
+    if [target_info exists gdb,sockethost] {
+	set debughost  [target_info gdb,sockethost]
     } else {
-	set debughost "localhost:"
+	set debughost "localhost"
     }
 
     # Extract the protocol
@@ -195,12 +195,12 @@ proc gdbserver_spawn { child_args } {
     set gdbserver [find_gdbserver]
 
     # Export the host:port pair.
-    set gdbport $debughost$portnum
+    set gdbport $debughost:$portnum
 
     # Fire off the debug agent.  This flavour of gdbserver takes as
     # arguments the port information, the name of the executable file to
     # be debugged, and any arguments.
-    set gdbserver_command "$gdbserver :$portnum $gdbserver_server_exec"
+    set gdbserver_command "$gdbserver $gdbport $gdbserver_server_exec"
     if { $child_args != "" } {
 	append gdbserver_command " $child_args"
     }