diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index a21b72f00b..6361dba624 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-29  Joseph Myers  <joseph@codesourcery.com>
+
+	* lib/gdb.exp (is_amd64_regs_target, is_x86_like_target): Allow
+	for 64-bit multilibs from i?86-* targets.
+
 2011-09-29  Marek Polacek  <mpolacek@redhat.com>
 
 	* lib/gdb.exp: Fix a typo in one of the comments.
diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index ca105828be..4a4708ef69 100644
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -1626,7 +1626,7 @@ proc is_lp64_target {} {
 proc is_amd64_regs_target {} {
     global is_amd64_regs_target_saved
 
-    if {![istarget "x86_64-*-*"]} {
+    if {![istarget "x86_64-*-*"] && ![istarget "i?86-*"]} {
 	return 0
     }
 
@@ -1665,10 +1665,7 @@ proc is_amd64_regs_target {} {
 
 # Return 1 if this target is an x86 or x86-64 with -m32.
 proc is_x86_like_target {} {
-    if {[istarget i?86-*]} {
-	return 1
-    }
-    if {![istarget "x86_64-*-*"]} {
+    if {![istarget "x86_64-*-*"] && ![istarget i?86-*]} {
 	return 0
     }
     return [expr [is_ilp32_target] && ![is_amd64_regs_target]]