* linux-nat.c (lin_lwp_attach_lwp): For !WIPSTOPPED case,

	adding missing call to restore_child_signals_mask.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 0d9b20f7f5a7a5ff3550366f791bfaed5e1fb870..580ce56dfcd166a2563a23f10be416bffd0ef3b8 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-09  Doug Evans  <dje@google.com>
+
+       * linux-nat.c (lin_lwp_attach_lwp): For !WIPSTOPPED case,
+       adding missing call to restore_child_signals_mask.
+
 2011-05-09  Pedro Alves  <pedro@codesourcery.com>
 
        * inferior.h (wait_for_inferior): Remove `thread_exec_as_sigtrap'

diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c
index 9442088c3334b967777c4f0b840c1f119d65d99a..641a619727cce8ba78d616294c9367f38751685d 100644 (file)
--- a/gdb/linux-nat.c
+++ b/gdb/linux-nat.c
@@ -1476,7 +1476,10 @@ lin_lwp_attach_lwp (ptid_t ptid)
 
       status = linux_nat_post_attach_wait (ptid, 0, &cloned, &signalled);
       if (!WIFSTOPPED (status))
-       return -1;
+       {
+         restore_child_signals_mask (&prev_mask);
+         return -1;
+       }
 
       lp = add_lwp (ptid);
       lp->stopped = 1;