--- Libc/Libc-583/stdlib/FreeBSD/abort.c.patch
+++ Libc/Libc-763.13/stdlib/FreeBSD/abort.c.patch
@@ -1,6 +1,6 @@
---- abort.c.orig	2008-09-07 11:37:51.000000000 -0700
-+++ abort.c	2008-09-07 11:56:01.000000000 -0700
-@@ -39,19 +39,26 @@ __FBSDID("$FreeBSD: src/lib/libc/stdlib/
+--- abort.c.orig	2010-09-07 22:42:56.000000000 -0700
++++ abort.c	2010-09-07 22:46:29.000000000 -0700
+@@ -35,6 +35,7 @@ __FBSDID("$FreeBSD: src/lib/libc/stdlib/
  
  #include "namespace.h"
  #include <signal.h>
@@ -8,30 +8,54 @@
  #include <stdlib.h>
  #include <stddef.h>
  #include <unistd.h>
- #include <pthread.h>
- #include "un-namespace.h"
+@@ -43,11 +44,22 @@ __FBSDID("$FreeBSD: src/lib/libc/stdlib/
  
--void (*__cleanup)();
+ #include "libc_private.h"
+ 
++#include "CrashReporterClient.h"
++#include "_simple.h"
++
 +extern void (*__cleanup)();
 +extern void __abort(void) __dead2;
-+extern const char *__crashreporter_info__;
 +
 +#define TIMEOUT	10000	/* 10 milliseconds */
- 
++
  void
  abort()
  {
  	struct sigaction act;
  
-+	if (!__crashreporter_info__)
-+		__crashreporter_info__ = "abort() called";
++	if (!CRGetCrashLogMessage())
++		CRSetCrashLogMessage("abort() called");
++
  	/*
  	 * POSIX requires we flush stdio buffers on abort.
  	 * XXX ISO C requires that abort() be async-signal-safe.
-@@ -67,11 +74,22 @@ abort()
+@@ -61,19 +73,90 @@ abort()
+ 	 * 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)_sigprocmask(SIG_SETMASK, &act.sa_mask, NULL);
+-	(void)raise(SIGABRT);
++
++	/* <rdar://problem/7397932> abort() should call pthread_kill to deliver a signal to the aborting thread 
++	 * This helps gdb focus on the thread calling abort()
++	 */
++	if (__is_threaded) {
++	    /* Block all signals on all other threads */
++	    sigset_t fullmask;
++	    sigfillset(&fullmask);
++	    (void)_sigprocmask(SIG_SETMASK, &fullmask, NULL);
++
++	    /* <rdar://problem/8400096> Set the workqueue killable */
++	    __pthread_workqueue_setkill(1);
++
++	    (void)pthread_sigmask(SIG_SETMASK, &act.sa_mask, NULL);
++	    (void)pthread_kill(pthread_self(), SIGABRT);
++	} else {
++	    (void)_sigprocmask(SIG_SETMASK, &act.sa_mask, NULL);
++	    (void)kill(getpid(), SIGABRT);
++	}
 +	usleep(TIMEOUT); /* give time for signal to happen */
  
  	/*
@@ -46,29 +70,59 @@
 +{
 +	struct sigaction act;
 +
-+	if (!__crashreporter_info__)
-+		__crashreporter_info__ = "__abort() called";
++	if (!CRGetCrashLogMessage())
++		CRSetCrashLogMessage("__abort() called");
  	act.sa_handler = SIG_DFL;
  	act.sa_flags = 0;
  	sigfillset(&act.sa_mask);
-@@ -79,5 +97,19 @@ abort()
+ 	(void)_sigaction(SIGABRT, &act, NULL);
  	sigdelset(&act.sa_mask, SIGABRT);
++
++	/* <rdar://problem/7397932> abort() should call pthread_kill to deliver a signal to the aborting thread 
++	 * This helps gdb focus on the thread calling abort()
++	 */
++	if (__is_threaded) {
++	    /* Block all signals on all other threads */
++	    sigset_t fullmask;
++	    sigfillset(&fullmask);
++	    (void)_sigprocmask(SIG_SETMASK, &fullmask, NULL);
++
++	    /* <rdar://problem/8400096> Set the workqueue killable */
++	    __pthread_workqueue_setkill(1);
++
++	    (void)pthread_sigmask(SIG_SETMASK, &act.sa_mask, NULL);
++	    (void)pthread_kill(pthread_self(), SIGABRT);
++	} else {
++	    (void)_sigprocmask(SIG_SETMASK, &act.sa_mask, NULL);
++	    (void)kill(getpid(), SIGABRT);
++	}
++	usleep(TIMEOUT); /* give time for signal to happen */
++
++	/* If for some reason SIGABRT was not delivered, we exit using __builtin_trap
++	 * which generates an illegal instruction on i386: <rdar://problem/8400958>
++	 * and SIGTRAP on arm.
++	 */
++	sigfillset(&act.sa_mask);
++	sigdelset(&act.sa_mask, SIGILL);
++	sigdelset(&act.sa_mask, SIGTRAP);
  	(void)_sigprocmask(SIG_SETMASK, &act.sa_mask, NULL);
- 	(void)raise(SIGABRT);
+-	(void)raise(SIGABRT);
 -	exit(1);
-+	usleep(TIMEOUT); /* give time for signal to happen */
-+	__builtin_trap(); /* never exit normally */
++	__builtin_trap();
 +}
 +
 +__private_extern__ void
 +abort_report_np(const char *fmt, ...)
 +{
-+	char *str;
++	_SIMPLE_STRING s;
 +	va_list ap;
 +
-+	va_start(ap, fmt);
-+	vasprintf(&str, fmt, ap);
-+	va_end(ap);
-+	__crashreporter_info__ = str ? str : fmt;
++	if ((s = _simple_salloc()) != NULL) {
++		va_start(ap, fmt);
++		_simple_vsprintf(s, fmt, ap);
++		va_end(ap);
++		CRSetCrashLogMessage(_simple_string(s));
++	} else
++		CRSetCrashLogMessage(fmt); /* the format string is better than nothing */
 +	abort();
  }