2010-07-28 Oleg Nesterov <oleg@redhat.com>

	* remote.c (readchar): Call pop_target in case of SERIAL_ERROR.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 19e9e061d70e18bf3067b79a7d271f0e9fbbec05..6fca089516a2d2ac3547faea5ed9843a2616eb89 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2010-07-28  Oleg Nesterov  <oleg@redhat.com>
+
+       * remote.c (readchar): Call pop_target in case of SERIAL_ERROR.
+
 2010-07-27  Tom Tromey  <tromey@redhat.com>
 
        * dwarf2read.c (dwarf2_const_value_data): Never sign extend.

diff --git a/gdb/remote.c b/gdb/remote.c
index e42e57f33511c63bc98be101386f15d1fa67779a..d6c20f343f202aee4c75443142187aa1b02a6d1b 100644 (file)
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -6667,7 +6667,8 @@ readchar (int timeout)
       error (_("Remote connection closed"));
       /* no return */
     case SERIAL_ERROR:
-      perror_with_name (_("Remote communication error"));
+      pop_target ();
+      perror_with_name (_("Remote communication error.  Target disconnected."));
       /* no return */
     case SERIAL_TIMEOUT:
       break;