Add a symbol's value to the computed frag offset, rather than overwriting it.

[deliverable/binutils-gdb.git] / gdb / linux-thread.c

diff --git a/gdb/linux-thread.c b/gdb/linux-thread.c
index df982a6f77775cef700812b7b1f1c06e2d0bacb3..dc91edf6a1c45bc542c749ff58959cfd32a1a28c 100644 (file)
--- a/gdb/linux-thread.c
+++ b/gdb/linux-thread.c
@@ -47,18 +47,17 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
    linuxthreads package heavily relies on wait() synchronization to keep
    them correct.  */
 
+#include "defs.h"
 #include <sys/types.h> /* for pid_t */
 #include <sys/ptrace.h> /* for PT_* flags */
-#include <sys/wait.h> /* for WUNTRACED and __WCLONE flags */
+#include "gdb_wait.h" /* for WUNTRACED and __WCLONE flags */
 #include <signal.h> /* for struct sigaction and NSIG */
 #include <sys/utsname.h>
 
-#include "defs.h"
 #include "target.h"
 #include "inferior.h"
 #include "gdbcore.h"
 #include "gdbthread.h"
-#include "wait.h"
 #include "gdbcmd.h"
 #include "breakpoint.h"
 
@@ -1800,4 +1799,6 @@ _initialize_linuxthreads ()
   sigprocmask(SIG_BLOCK, 
              &linuxthreads_wait_mask, 
              &linuxthreads_block_mask);
+  /* Make sure that linuxthreads_block_mask is not blocking SIGCHLD */
+  sigdelset (&linuxthreads_block_mask, SIGCHLD);
 }