From: Nick Roberts <nickrob@snap.net.nz>
Date: Fri, 15 Sep 2006 22:51:33 +0000 (+0000)
Subject: (linux_test_for_tracefork): Re-insert call to
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7a8f01926d825e88f3efd881c5fb7ccdd8c78d4d;p=thirdparty%2Fbinutils-gdb.git

(linux_test_for_tracefork): Re-insert call to
my_waitpid (removed inadvertantly).
(linux_nat_detach): Call init_lwp_list for asynchronous case too.
---

diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c
index 11e0d694d2b..4efe16578a7 100644
--- a/gdb/linux-nat.c
+++ b/gdb/linux-nat.c
@@ -278,6 +278,7 @@ linux_test_for_tracefork (int original_pid)
 	  ret = ptrace (PTRACE_KILL, second_pid, 0, 0);
 	  if (ret != 0)
 	    warning (_("linux_test_for_tracefork: failed to kill second child"));
+	  my_waitpid (second_pid, &status, 0);
 	}
     }
   else
@@ -1107,15 +1108,15 @@ linux_nat_detach (char *args, int from_tty)
   if (!target_can_async_p ())
     {
       iterate_over_lwps (detach_callback, NULL);
-
+      
       /* Only the initial process should be left right now.  */
       gdb_assert (num_lwps == 1);
+    }
 
-      trap_ptid = null_ptid;
+  trap_ptid = null_ptid;
 
-      /* Destroy LWP info; it's no longer valid.  */
-      init_lwp_list ();
-    }
+  /* Destroy LWP info; it's no longer valid.  */
+  init_lwp_list ();
 
   /* Restore the original signal mask.  */
   sigprocmask (SIG_SETMASK, &normal_mask, NULL);