--- Libc/Libc-594.9.4/stdlib/FreeBSD/abort.c
+++ Libc/Libc-320/stdlib/FreeBSD/abort.c
@@ -35,17 +35,20 @@
 static char sccsid[] = "@(#)abort.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/abort.c,v 1.9 2003/08/16 11:43:57 davidxu Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/abort.c,v 1.8 2002/07/10 16:35:02 wollman Exp $");
 
-#include "namespace.h"
 #include <signal.h>
 #include <stdlib.h>
 #include <stddef.h>
 #include <unistd.h>
 #include <pthread.h>
-#include "un-namespace.h"
 
 void (*__cleanup)();
+
+/* XXX - why are these declarations here? */
+extern int	__sys_sigprocmask(int, const sigset_t *, sigset_t *);
+extern int	__sys_sigaction(int, const struct sigaction *,
+		    struct sigaction *);
 
 void
 abort()
@@ -65,8 +68,8 @@
 	 * any errors -- ISO C doesn't allow abort to return anyway.
 	 */
 	sigdelset(&act.sa_mask, SIGABRT);
-	(void)_sigprocmask(SIG_SETMASK, &act.sa_mask, NULL);
-	(void)raise(SIGABRT);
+	(void)__sys_sigprocmask(SIG_SETMASK, &act.sa_mask, NULL);
+	(void)kill(getpid(), SIGABRT);
 
 	/*
 	 * If SIGABRT was ignored, or caught and the handler returns, do
@@ -75,9 +78,9 @@
 	act.sa_handler = SIG_DFL;
 	act.sa_flags = 0;
 	sigfillset(&act.sa_mask);
-	(void)_sigaction(SIGABRT, &act, NULL);
+	(void)__sys_sigaction(SIGABRT, &act, NULL);
 	sigdelset(&act.sa_mask, SIGABRT);
-	(void)_sigprocmask(SIG_SETMASK, &act.sa_mask, NULL);
-	(void)raise(SIGABRT);
+	(void)__sys_sigprocmask(SIG_SETMASK, &act.sa_mask, NULL);
+	(void)kill(getpid(), SIGABRT);
 	exit(1);
 }