Update.

2002-09-14  Ulrich Drepper  <drepper@redhat.com>

	* include/unistd.h: Declare __exit_thread.
	* sysdeps/generic/libc-start.c: Remove dummy_addr.
	Wrap call to main in setjmp if HAVE_CANCELBUF is defined.
	* sysdeps/unix/sysv/linux/exit-thread.S: New file.
	* sysdeps/unix/sysv/linux/_exit.c: New file.
	* sysdeps/unix/sysv/linux/i386/_exit.S: New file.
	* sysdeps/unix/sysv/linux/Makefile [subdir==posix] (sysdep_routines):
	Add exit-thread.

	* configure.in: Add dl_iterate_phdr to test using -nostdlib.

4 files changed, 106 insertions, 0 deletions

diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
index cc37196526..13430d1a87 100644
--- a/sysdeps/unix/sysv/linux/Makefile
+++ b/sysdeps/unix/sysv/linux/Makefile
@@ -88,6 +88,8 @@ endif
 
 ifeq ($(subdir),posix)
 sysdep_headers += bits/pthreadtypes.h bits/initspin.h
+
+sysdep_routines += exit-thread
 endif
 
 ifeq ($(subdir),inet)
diff --git a/sysdeps/unix/sysv/linux/_exit.c b/sysdeps/unix/sysv/linux/_exit.c
new file mode 100644
index 0000000000..3bd6b6db4c
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/_exit.c
@@ -0,0 +1,38 @@
+/* Copyright (C) 2002 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 Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 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
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <stdlib.h>
+#include <unistd.h>
+#include <sysdep.h>
+#include <abort-instr.h>
+
+
+void
+_exit (status)
+     int status;
+{
+  while (1)
+    {
+#ifdef __NR_exit_group
+      INLINE_SYSCALL (exit_group, 1, status);
+#endif
+      INLINE_SYSCALL (exit, 1, status);
+
+      ABORT_INSTRUCTION;
+    }
+}
diff --git a/sysdeps/unix/sysv/linux/exit-thread.S b/sysdeps/unix/sysv/linux/exit-thread.S
new file mode 100644
index 0000000000..bb996fecf7
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/exit-thread.S
@@ -0,0 +1,23 @@
+/* Copyright (C) 1991,92,97,99,2002 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 Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 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
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <sysdep.h>
+
+PSEUDO (__exit_thread, exit, 1)
+	/* Shouldn't get here.  */
+PSEUDO_END(__exit_thread)
diff --git a/sysdeps/unix/sysv/linux/i386/_exit.S b/sysdeps/unix/sysv/linux/i386/_exit.S
new file mode 100644
index 0000000000..56561e94bb
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/i386/_exit.S
@@ -0,0 +1,43 @@
+/* Copyright (C) 2002 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 Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 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
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <sysdep.h>
+
+	.text
+	.type	_exit,@function
+	.global	_exit
+_exit:
+	movl	4(%esp), %ebx
+
+	/* Try the new syscall first.  */
+#ifdef __NR_exit_group
+	movl	$__NR_exit_group, %eax
+	int	$0x80
+#endif
+
+	/* Not available.  Now the old one.  */
+	movl	$__NR_exit, %eax
+	int	$0x80
+
+	/* This must not fail.  Be sure we don't return.  */
+	hlt
+	.size	_exit,.-_exit
+
+	.globl	_Exit
+	.weak	_Exit
+_Exit	= _exit