* infrun.c (handle_inferior_event): On a TARGET_WAITKIND_EXITED or

	TARGET_WAITKIND_SIGNALLED, switch inferior_ptid to the event ptid.
	* linux_thread_db.c (thread_db_wait): On a TARGET_WAITKIND_EXITED
	or TARGET_WAITKIND_SIGNALLED, return the ptid the beneath target
	returned.
	* inf-ptrace.c (inf_ptrace_wait): Return inferior_ptid instead of
	minus_one_ptid if the inferior disappeared.
	* rs6000-nat.c (rs6000_wait): Likewise.
	* spu-linux-nat.c (spu_child_wait): Likewise.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index f157b5a9ed94b26a77039772f728633faa798a86..29839cd8713312dd4891bf7f959d02b69df79ff3 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,15 @@
+2008-12-11  Pedro Alves  <pedro@codesourcery.com>
+
+       * infrun.c (handle_inferior_event): On a TARGET_WAITKIND_EXITED or
+       TARGET_WAITKIND_SIGNALLED, switch inferior_ptid to the event ptid.
+       * linux_thread_db.c (thread_db_wait): On a TARGET_WAITKIND_EXITED
+       or TARGET_WAITKIND_SIGNALLED, return the ptid the beneath target
+       returned.
+       * inf-ptrace.c (inf_ptrace_wait): Return inferior_ptid instead of
+       minus_one_ptid if the inferior disappeared.
+       * rs6000-nat.c (rs6000_wait): Likewise.
+       * spu-linux-nat.c (spu_child_wait): Likewise.
+
 2008-12-11  Tom Tromey  <tromey@redhat.com>
 
        PR macros/2564:

diff --git a/gdb/inf-ptrace.c b/gdb/inf-ptrace.c
index bf3d0a868c507667d01d51582137acee7ae28d9b..7bdf2fac36cecdeb8d8b490924e427d449705fbc 100644 (file)
--- a/gdb/inf-ptrace.c
+++ b/gdb/inf-ptrace.c
@@ -410,7 +410,7 @@ inf_ptrace_wait (ptid_t ptid, struct target_waitstatus *ourstatus)
          /* Claim it exited with unknown signal.  */
          ourstatus->kind = TARGET_WAITKIND_SIGNALLED;
          ourstatus->value.sig = TARGET_SIGNAL_UNKNOWN;
-         return minus_one_ptid;
+         return inferior_ptid;
        }
 
       /* Ignore terminated detached child processes.  */

diff --git a/gdb/infrun.c b/gdb/infrun.c
index 605495082f9a0ff564176e99eedf049e693650f6..e65704a06b23dab36d898f7b55c1b47257a84b14 100644 (file)
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -2271,6 +2271,7 @@ handle_inferior_event (struct execution_control_state *ecs)
     case TARGET_WAITKIND_EXITED:
       if (debug_infrun)
         fprintf_unfiltered (gdb_stdlog, "infrun: TARGET_WAITKIND_EXITED\n");
+      inferior_ptid = ecs->ptid;
       target_terminal_ours (); /* Must do this before mourn anyway */
       print_stop_reason (EXITED, ecs->ws.value.integer);
 
@@ -2289,6 +2290,7 @@ handle_inferior_event (struct execution_control_state *ecs)
     case TARGET_WAITKIND_SIGNALLED:
       if (debug_infrun)
         fprintf_unfiltered (gdb_stdlog, "infrun: TARGET_WAITKIND_SIGNALLED\n");
+      inferior_ptid = ecs->ptid;
       stop_print_frame = 0;
       target_terminal_ours (); /* Must do this before mourn anyway */
 

diff --git a/gdb/linux-thread-db.c b/gdb/linux-thread-db.c
index 5f98e99b6710a6d62e61f23054c9b25dc90e36ea..cf0dd6a8ff5b5814e5a674ea253a51e6a064bde2 100644 (file)
--- a/gdb/linux-thread-db.c
+++ b/gdb/linux-thread-db.c
@@ -888,8 +888,8 @@ thread_db_wait (ptid_t ptid, struct target_waitstatus *ourstatus)
     return ptid;
 
   if (ourstatus->kind == TARGET_WAITKIND_EXITED
-    || ourstatus->kind == TARGET_WAITKIND_SIGNALLED)
-    return pid_to_ptid (-1);
+      || ourstatus->kind == TARGET_WAITKIND_SIGNALLED)
+    return ptid;
 
   if (ourstatus->kind == TARGET_WAITKIND_EXECD)
     {

diff --git a/gdb/rs6000-nat.c b/gdb/rs6000-nat.c
index 6501def221066780dead21ae1605ae83b0e9d094..efdfaa68fddb295a8f59f35a787ce76a0955395d 100644 (file)
--- a/gdb/rs6000-nat.c
+++ b/gdb/rs6000-nat.c
@@ -546,7 +546,7 @@ rs6000_wait (ptid_t ptid, struct target_waitstatus *ourstatus)
          /* Claim it exited with unknown signal.  */
          ourstatus->kind = TARGET_WAITKIND_SIGNALLED;
          ourstatus->value.sig = TARGET_SIGNAL_UNKNOWN;
-         return minus_one_ptid;
+         return inferior_ptid;
        }
 
       /* Ignore terminated detached child processes.  */

diff --git a/gdb/spu-linux-nat.c b/gdb/spu-linux-nat.c
index 5d763009b30d66c7fd2c0d5479bca66cfd369444..7223a968a9e84ad438b4b83f2ffdc35ae56ba98d 100644 (file)
--- a/gdb/spu-linux-nat.c
+++ b/gdb/spu-linux-nat.c
@@ -444,7 +444,7 @@ spu_child_wait (ptid_t ptid, struct target_waitstatus *ourstatus)
       /* Claim it exited with unknown signal.  */
       ourstatus->kind = TARGET_WAITKIND_SIGNALLED;
       ourstatus->value.sig = TARGET_SIGNAL_UNKNOWN;
-      return minus_one_ptid;
+      return inferior_ptid;
     }
 
   store_waitstatus (ourstatus, status);