2012-01-13 Pedro Alves <palves@redhat.com>

	* server.c (attach_inferior): Clear `cont_thread'.

diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 89a4cdde127f28f7fa86ba26cf970ed283759570..14950fbadbe30162f0ea03ae41519cf2b8d01798 100644 (file)
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,7 @@
+2012-01-13  Pedro Alves  <palves@redhat.com>
+
+       * server.c (attach_inferior): Clear `cont_thread'.
+
 2012-01-13  Pedro Alves  <palves@redhat.com>
 
        * server.c (main): Avoid infinite loop while detaching/killing

diff --git a/gdb/gdbserver/server.c b/gdb/gdbserver/server.c
index f312a5c650a876e349c25b55fe7296a756eafc1f..bebccf5a6a0b5638591d2c6973d8dd64003e0c3f 100644 (file)
--- a/gdb/gdbserver/server.c
+++ b/gdb/gdbserver/server.c
@@ -338,6 +338,10 @@ attach_inferior (int pid)
      whichever we were told to attach to.  */
   signal_pid = pid;
 
+  /* Clear this so the backend doesn't get confused, thinking
+     CONT_THREAD died, and it needs to resume all threads.  */
+  cont_thread = null_ptid;
+
   if (!non_stop)
     {
       last_ptid = mywait (pid_to_ptid (pid), &last_status, 0, 0);