Update.

	* elf/rtld.c (_dl_start): Initialize bootstrap_map.l_info to zero.
	[PR libc/1165].

4 files changed, 59 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 7a8715f084..b315369a8f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 1999-08-19  Ulrich Drepper  <drepper@cygnus.com>
 
+	* elf/rtld.c (_dl_start): Initialize bootstrap_map.l_info to zero.
+	[PR libc/1165].
+
 	* configure.in: Search for programs with prefix gnu* and g* first.
 	[PR libc/1104].
 
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 9c70a6f095..6b2e1c856a 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,5 +1,8 @@
 1999-08-19  Ulrich Drepper  <drepper@cygnus.com>
 
+	* pthread.c (__pthread_reset_main_thread): Reset signal handlers
+	for the signals we used in the thread implementation.
+
 	* Versions: Export __pthread_kill_other_threads_np from libpthread
 	for GLIBC_2.1.2.
 
diff --git a/linuxthreads/pthread.c b/linuxthreads/pthread.c
index c94e7e6f31..7cc6b26866 100644
--- a/linuxthreads/pthread.c
+++ b/linuxthreads/pthread.c
@@ -635,6 +635,7 @@ static void pthread_handle_sigdebug(int sig)
 void __pthread_reset_main_thread()
 {
   pthread_descr self = thread_self();
+  struct sigaction sa;
 
   if (__pthread_manager_request != -1) {
     /* Free the thread manager stack */
@@ -645,6 +646,18 @@ void __pthread_reset_main_thread()
     __libc_close(__pthread_manager_reader);
     __pthread_manager_request = __pthread_manager_reader = -1;
   }
+
+  /* Reset the signal handlers behaviour for the signals the
+     implementation uses since this would be passed to the new
+     process.  */
+  sigemptyset(&sa.sa_mask);
+  sa.sa_flags = 0;
+  sa.sa_handler = SIG_DFL;
+  __sigaction(__pthread_sig_restart, &sa, NULL);
+  __sigaction(__pthread_sig_cancel, &sa, NULL);
+  if (__pthread_sig_debug > 0)
+    __sigaction(__pthread_sig_debug, &sa, NULL);
+
   /* Update the pid of the main thread */
   THREAD_SETMEM(self, p_pid, __getpid());
   /* Make the forked thread the main thread */
diff --git a/sysdeps/unix/sysv/linux/execve.c b/sysdeps/unix/sysv/linux/execve.c
new file mode 100644
index 0000000000..36055ef22f
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/execve.c
@@ -0,0 +1,40 @@
+/* Copyright (C) 1999 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include <errno.h>
+#include <unistd.h>
+
+#include <sysdep.h>
+#include <sys/syscall.h>
+
+extern void __pthread_kill_other_threads_np __P ((void));
+weak_extern (__pthread_kill_other_threads_np)
+
+
+int
+__execve (file, argv, envp)
+     const char *file;
+     char *const argv[];
+     char *const envp[];
+{
+  /* If this is a threaded application kill all other threads.  */
+  if (__pthread_kill_other_threads_np)
+    __pthread_kill_other_threads_np ();
+
+  return INLINE_SYSCALL (execve, 3, file, argv, envp);
+}