* config/vr4300.exp: New file.

	* gdb.*/*.exp: Call gdb_expect instead of expect.

	* lib/gdb.exp(gdb_expect): New function.

5 files changed, 147 insertions, 145 deletions

diff --git a/gdb/testsuite/config/.Sanitize b/gdb/testsuite/config/.Sanitize
index 6484edb..0be60aa 100644
--- a/gdb/testsuite/config/.Sanitize
+++ b/gdb/testsuite/config/.Sanitize
@@ -62,6 +62,7 @@ slite.exp
 udi.exp
 unix.exp
 unknown.exp
+vr4300.exp
 vx.exp
 vxworks.exp
 vxworks29k.exp
diff --git a/gdb/testsuite/config/sparclet-old.exp b/gdb/testsuite/config/sparclet-old.exp
index 41f5c2f..0b4e4e8 100644
--- a/gdb/testsuite/config/sparclet-old.exp
+++ b/gdb/testsuite/config/sparclet-old.exp
@@ -69,18 +69,18 @@ proc gdb_run_cmd {} {
 	send_gdb "target $protocol udp [target_info netport]\n";
     }
 
-    expect {
-	-i $gdb_spawn_id -re "A program is being debug.*Kill it.*y or n. $" {
+    gdb_expect {
+	 -re "A program is being debug.*Kill it.*y or n. $" {
 	    send_gdb "y\n"
 	    exp_continue
 	}
-	-i $gdb_spawn_id -re "Remote target.*$gdb_prompt $" { }
-	-i $gdb_spawn_id -re ".*SPARCLET appears to be alive.*$gdb_prompt $" {
+	 -re "Remote target.*$gdb_prompt $" { }
+	 -re ".*SPARCLET appears to be alive.*$gdb_prompt $" {
 	    if $verbose>1 then {
 		send_user "Set target to $targetname\n"
 	    }
 	}
-	-i $gdb_spawn_id timeout { 
+	 timeout { 
 	    set timeout 10
 	    verbose "Timeout is now $timeout seconds" 2
 	    perror "Couldn't set SPARCLET target."
@@ -89,36 +89,36 @@ proc gdb_run_cmd {} {
     }
 
     send_gdb "disable\n";
-    expect {
-	-i $gdb_spawn_id -re ".*$gdb_prompt $" {
+    gdb_expect {
+	 -re ".*$gdb_prompt $" {
 	    verbose "Breakpoints disabled" 2
 	}
-	-i $gdb_spawn_id timeout { 
+	 timeout { 
 	    perror "(timeout) disabling breakpoints";
 	    return -1 
 	}
-	-i $gdb_spawn_id default {
+	 default {
 	    perror "error disabling breakpoints";
 	}
     }
     send_gdb "run\n";
-    expect {
-	-i $gdb_spawn_id -re "A program is being debug.*Kill it.*y or n. $" {
+    gdb_expect {
+	 -re "A program is being debug.*Kill it.*y or n. $" {
 	    send_gdb "y\n"
 	    exp_continue
 	}
-	-i $gdb_spawn_id -re "The program being debugged .*y or n. $" {
+	 -re "The program being debugged .*y or n. $" {
 	    send_gdb "y\n"
 	    exp_continue
 	}
-	-i $gdb_spawn_id -re ".*Starting program:.*$" { 
+	 -re ".*Starting program:.*$" { 
 	    verbose "Starting remote stub succeeded" 
 	}
-	-i $gdb_spawn_id timeout { 
+	 timeout { 
 	    perror "(timeout) starting the remote stub" ; 
 	    return -1 
 	}
-	-i $gdb_spawn_id default {
+	 default {
 	    perror "error starting the remote stub";
 	}
     }
@@ -127,34 +127,34 @@ proc gdb_run_cmd {} {
     sleep 1;
     send_gdb ""
     verbose "Sent ^C^C"
-    expect {
-	-i $gdb_spawn_id -re ".*Give up .and stop debugging it.*$" {
+    gdb_expect {
+	 -re ".*Give up .and stop debugging it.*$" {
 	    send_gdb "y\n"
 	    exp_continue
 	}
-	-i $gdb_spawn_id -re ".*$gdb_prompt $" { 
+	 -re ".*$gdb_prompt $" { 
 	    verbose "interrupting remote stub succeeded"
 	}
-	-i $gdb_spawn_id timeout { 
+	 timeout { 
 	    perror "(timeout) interrupting the remote stub";
 	    return -1 
 	}
-	-i $gdb_spawn_id default {
+	 default {
 	    perror "error interrupting the remote stub";
 	}
     }
 
     if [target_info exists gdb_serial] {
 	send_gdb "target remote [target_info gdb_serial]\n"
-	expect {
-	    -i $gdb_spawn_id -re ".*Kill it?.*y or n.*" {
+	gdb_expect {
+	     -re ".*Kill it?.*y or n.*" {
 		send_gdb "y\n";
 		exp_continue
 	    }
-	    -i $gdb_spawn_id -re ".*$gdb_prompt $"	{
+	     -re ".*$gdb_prompt $"	{
 		verbose "connected to stub at [target_info gdb_serial]" 2
 	    }
-	    -i $gdb_spawn_id timeout { 
+	     timeout { 
 		set timeout 10
 		verbose "Timeout is now $timeout seconds" 2
 		perror "Couldn't set remote target."
@@ -164,15 +164,15 @@ proc gdb_run_cmd {} {
     }
 
     send_gdb "enable\n";
-    expect {
-	-i $gdb_spawn_id -re ".*$gdb_prompt $" {
+    gdb_expect {
+	 -re ".*$gdb_prompt $" {
 	    verbose "Breakpoints enabled" 2
 	}
-	-i $gdb_spawn_id timeout { 
+	 timeout { 
 	    perror "(timeout) enabling breakpoints";
 	    return -1 
 	}
-	-i $gdb_spawn_id default {
+	 default {
 	    perror "error enabling breakpoints";
 	}
     }
@@ -206,18 +206,18 @@ proc gdb_load { arg } {
 
     # get the stub-based loader for faster loading
     send_gdb "file [target_info gdb_loader]\n"
-    expect {
-	-i $gdb_spawn_id -re "A program is being debug.*Kill it.*y or n. $" {
+    gdb_expect {
+	 -re "A program is being debug.*Kill it.*y or n. $" {
 	    send_gdb "y\n"
 	    exp_continue
 	}
-        -i $gdb_spawn_id -re "Load new symbol table.*y or n. $" {
+         -re "Load new symbol table.*y or n. $" {
 	    send_gdb "y\n"
 	    exp_continue
 	}
-	-i $gdb_spawn_id -re "Reading symbols from.*done..*$gdb_prompt $" {}
-	-i $gdb_spawn_id -re "$gdb_prompt $" { perror "GDB couldn't find loader" }
-	-i $gdb_spawn_id timeout { 
+	 -re "Reading symbols from.*done..*$gdb_prompt $" {}
+	 -re "$gdb_prompt $" { perror "GDB couldn't find loader" }
+	 timeout { 
 	    perror "(timeout) read symbol file" ; 
 	    return -1
 	}
@@ -234,14 +234,14 @@ proc gdb_load { arg } {
 	set targetname [target_info netport];
 	send_gdb "target $protocol udp [target_info netport]\n";
     }
-    expect {
-	-i $gdb_spawn_id -re "Remote target.*$gdb_prompt $" { }
-	-i $gdb_spawn_id -re ".*SPARCLET appears to be alive.*$gdb_prompt $" {
+    gdb_expect {
+	 -re "Remote target.*$gdb_prompt $" { }
+	 -re ".*SPARCLET appears to be alive.*$gdb_prompt $" {
 	    if $verbose>1 then {
 		send_user "Set target to $targetname\n"
 	    }
 	}
-	-i $gdb_spawn_id timeout { 
+	 timeout { 
 	    set timeout 10
 	    verbose "Timeout is now $timeout seconds" 2
 	    perror "Couldn't set SPARCLET target."
@@ -250,23 +250,23 @@ proc gdb_load { arg } {
     }
 
     send_gdb "run\n";
-    expect {
-	-i $gdb_spawn_id -re "A program is being debug.*Kill it.*y or n. $" {
+    gdb_expect {
+	 -re "A program is being debug.*Kill it.*y or n. $" {
 	    send_gdb "y\n"
 	    exp_continue
 	}
-	-i $gdb_spawn_id -re "The program being debugged .*y or n. $" {
+	 -re "The program being debugged .*y or n. $" {
 	    send_gdb "y\n"
 	    exp_continue
 	}
-	-i $gdb_spawn_id -re ".*Starting program:.*loader.*$" { 
+	 -re ".*Starting program:.*loader.*$" { 
 	    verbose "Starting loader succeeded" 
 	}
-	-i $gdb_spawn_id timeout { 
+	 timeout { 
 	    perror "(timeout) starting the loader" ; 
 	    return -1 
 	}
-	-i $gdb_spawn_id default {
+	 default {
 	    perror "error starting the loader";
 	}
     }
@@ -275,19 +275,19 @@ proc gdb_load { arg } {
     sleep 1;
     send_gdb ""
     verbose "Sent ^C^C"
-    expect {
-	-i $gdb_spawn_id -re ".*Give up .and stop debugging it.*$" {
+    gdb_expect {
+	 -re ".*Give up .and stop debugging it.*$" {
 	    send_gdb "y\n"
 	    exp_continue
 	}
-	-i $gdb_spawn_id -re ".*$gdb_prompt $" { 
+	 -re ".*$gdb_prompt $" { 
 	    verbose "Running loader succeeded" 
 	}
-	-i $gdb_spawn_id timeout { 
+	 timeout { 
 	    perror "(timeout) interrupting the loader" ; 
 	    return -1 
 	}
-	-i $gdb_spawn_id default {
+	 default {
 	    perror "error interrupting the loader";
 	}
     }
@@ -295,18 +295,18 @@ proc gdb_load { arg } {
     # Now ready to actually load the file:
 
     send_gdb "file $arg\n"
-    expect {
-	-i $gdb_spawn_id -re "A program is being debug.*Kill it.*y or n. $" {
+    gdb_expect {
+	 -re "A program is being debug.*Kill it.*y or n. $" {
 	    send_gdb "y\n"
 	    exp_continue
 	}
-        -i $gdb_spawn_id -re "Load new symbol table.*y or n. $" {
+         -re "Load new symbol table.*y or n. $" {
 	    send_gdb "y\n"
 	    exp_continue
 	}
-	-i $gdb_spawn_id -re "Reading symbols from.*done..*$gdb_prompt $" {}
-	-i $gdb_spawn_id -re "$gdb_prompt $" { perror "GDB couldn't read file" }
-	-i $gdb_spawn_id timeout { 
+	 -re "Reading symbols from.*done..*$gdb_prompt $" {}
+	 -re "$gdb_prompt $" { perror "GDB couldn't read file" }
+	 timeout { 
 	    perror "(timeout) read symbol file" ; 
 	    return -1 
 	}
@@ -314,15 +314,15 @@ proc gdb_load { arg } {
 
     if [target_info exists gdb_serial] {
 	send_gdb "target remote [target_info gdb_serial]\n"
-	expect {
-	    -i $gdb_spawn_id -re ".*Kill it?.*y or n.*" {
+	gdb_expect {
+	     -re ".*Kill it?.*y or n.*" {
 		send_gdb "y\n";
 		exp_continue
 	    }
-	    -i $gdb_spawn_id -re ".*$gdb_prompt $"	{
+	     -re ".*$gdb_prompt $"	{
 		verbose "Set remote target to [target_info serial]" 2
 	    }
-	    -i $gdb_spawn_id timeout { 
+	     timeout { 
 		set timeout 10
 		verbose "Timeout is now $timeout seconds" 2
 		perror "Couldn't set remote target."
@@ -339,18 +339,18 @@ proc gdb_load { arg } {
     verbose "Loading $arg into $GDB" 2
     set timeout 1200
     verbose "Timeout is now $timeout seconds" 2
-    expect {
-	-i $gdb_spawn_id -re "Loading.*$gdb_prompt $" {
+    gdb_expect {
+	 -re "Loading.*$gdb_prompt $" {
 	    verbose "Loaded $arg into $GDB" 1
 	    set timeout 60
 	    verbose "Timeout is now $timeout seconds" 2
 	}
-	-i $gdb_spawn_id -re "$gdb_prompt $"     {
+	 -re "$gdb_prompt $"     {
 	    if $verbose>1 then {
 		perror "GDB couldn't load."
 	    }
 	}
-	-i $gdb_spawn_id timeout {
+	 timeout {
 	    if $verbose>1 then {
 		perror "Timed out trying to load $arg."
 	    }
@@ -379,18 +379,18 @@ proc gdb_load { arg } {
 	send_gdb "target $protocol udp [target_info netport]\n";
     }
 
-    expect {
-	-i $gdb_spawn_id -re "A program is being debug.*Kill it.*y or n. $" {
+    gdb_expect {
+	 -re "A program is being debug.*Kill it.*y or n. $" {
 	    send_gdb "y\n"
 	    exp_continue
 	}
-	-i $gdb_spawn_id -re "Remote target.*$gdb_prompt $" { }
-	-i $gdb_spawn_id -re ".*SPARCLET appears to be alive.*$gdb_prompt $" {
+	 -re "Remote target.*$gdb_prompt $" { }
+	 -re ".*SPARCLET appears to be alive.*$gdb_prompt $" {
 	    if $verbose>1 then {
 		send_user "Set target to $targetname\n"
 	    }
 	}
-	-i $gdb_spawn_id timeout { 
+	 timeout { 
 	    set timeout 10
 	    verbose "Timeout is now $timeout seconds" 2
 	    perror "Couldn't set SPARCLET target."
@@ -399,23 +399,23 @@ proc gdb_load { arg } {
     }
 
     send_gdb "run\n";
-    expect {
-	-i $gdb_spawn_id -re "A program is being debug.*Kill it.*y or n. $" {
+    gdb_expect {
+	 -re "A program is being debug.*Kill it.*y or n. $" {
 	    send_gdb "y\n"
 	    exp_continue
 	}
-	-i $gdb_spawn_id -re "The program being debugged .*y or n. $" {
+	 -re "The program being debugged .*y or n. $" {
 	    send_gdb "y\n"
 	    exp_continue
 	}
-	-i $gdb_spawn_id -re ".*Starting program:.*$" { 
+	 -re ".*Starting program:.*$" { 
 	    verbose "Starting remote stub succeeded" 
 	}
-	-i $gdb_spawn_id timeout { 
+	 timeout { 
 	    perror "(timeout) starting the remote stub" ; 
 	    return -1 
 	}
-	-i $gdb_spawn_id default {
+	 default {
 	    perror "error starting the remote stub";
 	}
     }
@@ -424,34 +424,34 @@ proc gdb_load { arg } {
     sleep 1;
     send_gdb ""
     verbose "Sent ^C^C"
-    expect {
-	-i $gdb_spawn_id -re ".*Give up .and stop debugging it.*$" {
+    gdb_expect {
+	 -re ".*Give up .and stop debugging it.*$" {
 	    send_gdb "y\n"
 	    exp_continue
 	}
-	-i $gdb_spawn_id -re ".*$gdb_prompt $" { 
+	 -re ".*$gdb_prompt $" { 
 	    verbose "interrupting remote stub succeeded"
 	}
-	-i $gdb_spawn_id timeout { 
+	 timeout { 
 	    perror "(timeout) interrupting the remote stub";
 	    return -1 
 	}
-	-i $gdb_spawn_id default {
+	 default {
 	    perror "error interrupting the remote stub";
 	}
     }
 
     if [target_info exists gdb_serial] {
 	send_gdb "target remote [target_info gdb_serial]\n"
-	expect {
-	    -i $gdb_spawn_id -re ".*Kill it?.*y or n.*" {
+	gdb_expect {
+	     -re ".*Kill it?.*y or n.*" {
 		send_gdb "y\n";
 		exp_continue
 	    }
-	    -i $gdb_spawn_id -re ".*$gdb_prompt $"	{
+	     -re ".*$gdb_prompt $"	{
 		verbose "connected to stub at [target_info gdb_serial]" 2
 	    }
-	    -i $gdb_spawn_id timeout { 
+	     timeout { 
 		set timeout 10
 		verbose "Timeout is now $timeout seconds" 2
 		perror "Couldn't set remote target."
diff --git a/gdb/testsuite/config/sparclet.exp b/gdb/testsuite/config/sparclet.exp
index dc6199d..6c7832e 100644
--- a/gdb/testsuite/config/sparclet.exp
+++ b/gdb/testsuite/config/sparclet.exp
@@ -47,9 +47,9 @@ proc gdb_start { } {
 
     if [target_info exists baud] {
 	send_gdb "set remotebaud [target_info baud]\n"
-	expect {
-	    -i $gdb_spawn_id -re ".*$gdb_prompt" { }
-	    -i $gdb_spawn_id default { 
+	gdb_expect {
+	     -re ".*$gdb_prompt" { }
+	     default { 
 		perror "Error setting baud rate."
 		return -1;
 	    }
@@ -74,31 +74,31 @@ proc gdb_sparclet_startup { } {
     set is_running_stub 0;
 
     send_gdb "target sparclet [target_info serial]\n";
-    expect {
-	-i $gdb_spawn_id -re ".*already.*y or n." {
+    gdb_expect {
+	 -re ".*already.*y or n." {
 	    gdb_send "y\n";
 	    exp_continue;
 	}
-	-i $gdb_spawn_id -re "Remote target.*connected to.*$gdb_prompt" { }
-	-i $gdb_spawn_id timeout {
+	 -re "Remote target.*connected to.*$gdb_prompt" { }
+	 timeout {
 	    verbose "timed out, checking if stub is already running"
 	    set timeout 10
 	    send_gdb "\003";
-	    expect {
-		-i $gdb_spawn_id -re ".*$gdb_prompt" {
+	    gdb_expect {
+		 -re ".*$gdb_prompt" {
 		}
-		-i $gdb_spawn_id default {
+		 default {
 		    perror "sparclet board isn't responding";
 		    return -1;
 		}
 	    }
 	    send_gdb "target remote [target_info gdb_serial]\n";
-	    expect {
-		-i $gdb_spawn_id -re ".*Remote debugging.*$gdb_prompt" {
+	    gdb_expect {
+		 -re ".*Remote debugging.*$gdb_prompt" {
 		    verbose "stub is already running"
 		    set is_running_stub 1;
 		}
-		-i $gdb_spawn_id default {
+		 default {
 		    perror "sparclet board isn't responding";
 		    return -1;
 		}
@@ -114,27 +114,27 @@ proc gdb_sparclet_startup { } {
 	}
 	set loader "loader";
 	send_gdb "file $loader\n";
-	expect {
-	    -i $gdb_spawn_id -re "A program is being debug.*Kill it.*y or n. $" {
+	gdb_expect {
+	     -re "A program is being debug.*Kill it.*y or n. $" {
 		send_gdb "y\n"
 		exp_continue
 	    }
-	    -i $gdb_spawn_id -re "Load new symbol table.*y or n. $" {
+	     -re "Load new symbol table.*y or n. $" {
 		send_gdb "y\n"
 		exp_continue
 	    }
-	    -i $gdb_spawn_id -re "Reading symbols from.*done..*$gdb_prompt $" {}
-	    -i $gdb_spawn_id -re "$gdb_prompt $" { perror "GDB couldn't find loader" }
-	    -i $gdb_spawn_id timeout { 
+	     -re "Reading symbols from.*done..*$gdb_prompt $" {}
+	     -re "$gdb_prompt $" { perror "GDB couldn't find loader" }
+	     timeout { 
 		perror "(timeout) read symbol file" ; 
 		return -1
 	    }
 	}
 
 	send_gdb "target [target_info gdb_protocol] [target_info serial]\n";
-	expect {
-	    -i $gdb_spawn_id -re "Remote target.*connected to.*$gdb_prompt" { }
-	    -i $gdb_spawn_id default {
+	gdb_expect {
+	     -re "Remote target.*connected to.*$gdb_prompt" { }
+	     default {
 		perror "Error reconnecting to sparclet.";
 		return -1;
 	    }
@@ -144,18 +144,18 @@ proc gdb_sparclet_startup { } {
 	verbose "Loading $loader into $GDB" 2
 	set timeout 1200
 	verbose "Timeout is now $timeout seconds" 2
-	expect {
-	    -i $gdb_spawn_id -re "Loading.*$gdb_prompt $" {
+	gdb_expect {
+	     -re "Loading.*$gdb_prompt $" {
 		verbose "Loaded $loader into $GDB" 1
 		set timeout 60
 		verbose "Timeout is now $timeout seconds" 2
 	    }
-	    -i $gdb_spawn_id -re "$gdb_prompt $"     {
+	     -re "$gdb_prompt $"     {
 		if $verbose>1 then {
 		    perror "GDB couldn't load."
 		}
 	    }
-	    -i $gdb_spawn_id timeout {
+	     timeout {
 		if $verbose>1 then {
 		    perror "Timed out trying to load $arg."
 		}
@@ -163,23 +163,23 @@ proc gdb_sparclet_startup { } {
 	}
 
 	send_gdb "run\n";
-	expect {
-	    -i $gdb_spawn_id -re "A program is being debug.*Kill it.*y or n. $" {
+	gdb_expect {
+	     -re "A program is being debug.*Kill it.*y or n. $" {
 		send_gdb "y\n"
 		exp_continue
 	    }
-	    -i $gdb_spawn_id -re "The program being debugged .*y or n. $" {
+	     -re "The program being debugged .*y or n. $" {
 		send_gdb "y\n"
 		exp_continue
 	    }
-	    -i $gdb_spawn_id -re ".*Starting program:.*loader.*$" { 
+	     -re ".*Starting program:.*loader.*$" { 
 		verbose "Starting loader succeeded" 
 	    }
-	    -i $gdb_spawn_id timeout { 
+	     timeout { 
 		perror "(timeout) starting the loader" ; 
 		return -1 
 	    }
-	    -i $gdb_spawn_id default {
+	     default {
 		perror "error starting the loader";
 	    }
 	}
@@ -188,19 +188,19 @@ proc gdb_sparclet_startup { } {
 	sleep 1;
 	send_gdb ""
 	verbose "Sent ^C^C"
-	expect {
-	    -i $gdb_spawn_id -re ".*Give up .and stop debugging it.*$" {
+	gdb_expect {
+	     -re ".*Give up .and stop debugging it.*$" {
 		send_gdb "y\n"
 		exp_continue
 	    }
-	    -i $gdb_spawn_id -re ".*$gdb_prompt $" { 
+	     -re ".*$gdb_prompt $" { 
 		verbose "Running loader succeeded" 
 	    }
-	    -i $gdb_spawn_id timeout { 
+	     timeout { 
 		perror "(timeout) interrupting the loader" ;
 		return -1 
 	    }
-	    -i $gdb_spawn_id default {
+	     default {
 		perror "error interrupting the loader";
 	    }
 	}
@@ -217,16 +217,16 @@ proc gdb_run_cmd { args } {
 
     gdb_breakpoint exit;
     send_gdb "set \$fp=0\n";
-    expect {
-	-i $gdb_spawn_id -re ".*$gdb_prompt" { }
+    gdb_expect {
+	 -re ".*$gdb_prompt" { }
     }
     send_gdb "jump start\n";
-    expect {
-	-i $gdb_spawn_id -re ".*y or n. $" {
+    gdb_expect {
+	 -re ".*y or n. $" {
 	    send_gdb "y\n"
 	}
-	-i $gdb_spawn_id -re "Continuing at.*\[\r\n\]" { }
-	-i $gdb_spawn_id default {
+	 -re "Continuing at.*\[\r\n\]" { }
+	 default {
 	    return "failed"
 	}
     }
@@ -258,18 +258,18 @@ proc gdb_load { arg } {
     }
 
     send_gdb "file $arg\n"
-    expect {
-	-i $gdb_spawn_id -re "A program is being debug.*Kill it.*y or n. $" {
+    gdb_expect {
+	 -re "A program is being debug.*Kill it.*y or n. $" {
 	    send_gdb "y\n"
 	    exp_continue
 	}
-        -i $gdb_spawn_id -re "Load new symbol table.*y or n. $" {
+         -re "Load new symbol table.*y or n. $" {
 	    send_gdb "y\n"
 	    exp_continue
 	}
-	-i $gdb_spawn_id -re "Reading symbols from.*done..*$gdb_prompt $" {}
-	-i $gdb_spawn_id -re "$gdb_prompt $" { perror "GDB couldn't read file" }
-	-i $gdb_spawn_id timeout { 
+	 -re "Reading symbols from.*done..*$gdb_prompt $" {}
+	 -re "$gdb_prompt $" { perror "GDB couldn't read file" }
+	 timeout { 
 	    perror "(timeout) read symbol file" ; 
 	    return -1 
 	}
@@ -277,15 +277,15 @@ proc gdb_load { arg } {
 
     if [target_info exists gdb_serial] {
 	send_gdb "target remote [target_info gdb_serial]\n"
-	expect {
-	    -i $gdb_spawn_id -re ".*Kill it?.*y or n.*" {
+	gdb_expect {
+	     -re ".*Kill it?.*y or n.*" {
 		send_gdb "y\n";
 		exp_continue
 	    }
-	    -i $gdb_spawn_id -re ".*$gdb_prompt $"	{
+	     -re ".*$gdb_prompt $"	{
 		verbose "Set remote target to [target_info serial]" 2
 	    }
-	    -i $gdb_spawn_id timeout { 
+	     timeout { 
 		set timeout 10
 		verbose "Timeout is now $timeout seconds" 2
 		perror "Couldn't set remote target."
@@ -302,27 +302,27 @@ proc gdb_load { arg } {
     verbose "Loading $arg into $GDB" 2
     set timeout 1200
     verbose "Timeout is now $timeout seconds" 2
-    expect {
-	-i $gdb_spawn_id -re "Loading.*$gdb_prompt $" {
+    gdb_expect {
+	 -re "Loading.*$gdb_prompt $" {
 	    verbose "Loaded $arg into $GDB" 1
 	    set timeout 60
 	    verbose "Timeout is now $timeout seconds" 2
 	}
-	-i $gdb_spawn_id -re "$gdb_prompt $"     {
+	 -re "$gdb_prompt $"     {
 	    if $verbose>1 then {
 		perror "GDB couldn't load."
 	    }
 	}
-	-i $gdb_spawn_id timeout {
+	 timeout {
 	    if $verbose>1 then {
 		perror "Timed out trying to load $arg."
 	    }
 	}
     }
     send_gdb "list main\n";
-    expect {
-	-i $gdb_spawn_id -re ".*$gdb_prompt" { }
-	-i $gdb_spawn_id default {
+    gdb_expect {
+	 -re ".*$gdb_prompt" { }
+	 default {
 	    perror "command for list main never completed";
 	    return -1;
 	}
diff --git a/gdb/testsuite/config/udi.exp b/gdb/testsuite/config/udi.exp
index 1f4fcb2..0c32de5 100644
--- a/gdb/testsuite/config/udi.exp
+++ b/gdb/testsuite/config/udi.exp
@@ -33,10 +33,10 @@ proc gdb_target_udi { } {
 
     set targetname [target_info mondfe,name];
     # set targets hostname
-    send "target udi $targetname\n"
+    send_gdb "target udi $targetname\n"
     set timeout 60
     verbose "Timeout is now $timeout seconds" 2
-    expect {
+    gdb_expect {
 	-re "target udi $targetname\[\r\n\]+" {
 	    exp_continue
 	}
diff --git a/gdb/testsuite/config/vr4300.exp b/gdb/testsuite/config/vr4300.exp
new file mode 100644
index 0000000..1a2f7a9
--- /dev/null
+++ b/gdb/testsuite/config/vr4300.exp
@@ -0,0 +1 @@
+load_lib ../config/monitor.exp