diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 827c9f9fc3..b9c192c5a9 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-04  Michael Snyder  <msnyder@vmware.com>
+
+	* lib/gdb.exp (gdb_continue_to_breakpoint): Accept "in" as well
+	as "at" (for non-debug functions such as _start).
+
 2008-09-03  Ulrich Weigand  <Ulrich.Weigand@de.ibm.com>
 
 	* gdb.base/value-double-free.exp: Respect gdb,no_hardware_watchpoints.
diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index 3761d7a170..3fbd97f158 100644
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -456,7 +456,7 @@ proc gdb_continue_to_breakpoint {name {location_pattern .*}} {
 
     send_gdb "continue\n"
     gdb_expect {
-	-re "Breakpoint .* at $location_pattern\r\n$gdb_prompt $" {
+	-re "Breakpoint .* (at|in) $location_pattern\r\n$gdb_prompt $" {
 	    pass $full_name
 	}
 	-re ".*$gdb_prompt $" {