* remote-utils.c (prepare_resume_reply): Always supply "thread:".

diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 5066aaf..3f94cbb 100644 (file)
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,5 +1,9 @@
 2004-02-29  Daniel Jacobowitz  <drow@mvista.com>
 
+       * remote-utils.c (prepare_resume_reply): Always supply "thread:".
+
+2004-02-29  Daniel Jacobowitz  <drow@mvista.com>
+
        * linux-low.c (linux_wait): Unblock async I/O.
        (linux_resume): Block and enable async I/O.
        * remote-utils.c (block_async_io, unblock_async_io): New functions.

diff --git a/gdb/gdbserver/remote-utils.c b/gdb/gdbserver/remote-utils.c
index cd8c3c5..26b267a 100644 (file)
--- a/gdb/gdbserver/remote-utils.c
+++ b/gdb/gdbserver/remote-utils.c
@@ -630,7 +630,11 @@ prepare_resume_reply (char *buf, char status, unsigned char signo)
          thread_from_wait = ((struct inferior_list_entry *)current_inferior)->id;
          if (debug_threads)
            fprintf (stderr, "Writing resume reply for %d\n\n", thread_from_wait);
-         if (old_thread_from_wait != thread_from_wait)
+         /* This if (1) ought to be unnecessary.  But remote_wait in GDB
+            will claim this event belongs to inferior_ptid if we do not
+            specify a thread, and there's no way for gdbserver to know
+            what inferior_ptid is.  */
+         if (1 || old_thread_from_wait != thread_from_wait)
            {
              general_thread = thread_from_wait;
              sprintf (buf, "thread:%x;", thread_from_wait);