2006-09-26  Jan Kratochvil  <jan.kratochvil@redhat.com>

	* remote.c (remote_wait): Suggestion on crash due to nonmatching target.
	(remote_async_wait): Likewise.


Index: gdb/remote.c
===================================================================
RCS file: /cvs/src/src/gdb/remote.c,v
retrieving revision 1.230
diff -u -p -r1.230 remote.c
--- gdb/remote.c	22 Sep 2006 13:50:36 -0000	1.230
+++ gdb/remote.c	26 Sep 2006 15:15:32 -0000
@@ -3103,8 +3103,13 @@ Packet: '%s'\n"),
 					 reg->regnum, regs);
 		  }
 
+		/* It may also occur on amd64 which defaults to 32-bit i386
+		   target.  gdbserver(1) is not aware of the `set architecture'
+		   name itself as it is not using libbfd.  */
 		if (*p++ != ';')
-		  error (_("Remote register badly formatted: %s\nhere: %s"),
+		  error (_("Remote register badly formatted: %s\nhere: %s"
+			   "\nTry to load the executable by `file' first,"
+			   "\nyou may also check `set/show architecture'."),
 			 buf, p);
 	      }
 	  }
@@ -3299,8 +3304,13 @@ Packet: '%s'\n"),
 		    regcache_raw_supply (current_regcache, reg->regnum, regs);
 		  }
 
+		/* It may also occur on amd64 which defaults to 32-bit i386
+		   target.  gdbserver(1) is not aware of the `set architecture'
+		   name itself as it is not using libbfd.  */
 		if (*p++ != ';')
-		  error (_("Remote register badly formatted: %s\nhere: %s"),
+		  error (_("Remote register badly formatted: %s\nhere: %s"
+			   "\nTry to load the executable by `file' first,"
+			   "\nyou may also check `set/show architecture'."),
 			 buf, p);
 	      }
 	  }