--- Libc/Libc-583/stdlib/FreeBSD/exit.c
+++ Libc/Libc-1669.40.2/stdlib/FreeBSD/exit.c
@@ -10,10 +10,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -31,43 +27,53 @@
  * SUCH DAMAGE.
  */
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wstrict-prototypes"
+
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)exit.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/exit.c,v 1.7 2003/12/19 17:11:20 kan Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/exit.c,v 1.9 2007/01/09 00:28:09 imp Exp $");
 
 #include "namespace.h"
 #include <stdlib.h>
 #include <unistd.h>
 #include "un-namespace.h"
+
 #include "atexit.h"
+#include "libc_private.h"
+#include "stdio/FreeBSD/local.h" // for __cleanup
 
-void (*__cleanup)();
+#include <TargetConditionals.h>
 
-/*
- * This variable is zero until a process has created a thread.
- * It is used to avoid calling locking functions in libc when they
- * are not required. By default, libc is intended to be(come)
- * thread-safe, but without a (significant) penalty to non-threaded
- * processes.
- */
-int	__isthreaded	= 0;
+#if __APPLE__
+int __cleanup = 0;
+#else
+void (* CLEANUP_PTRAUTH __cleanup)(void);
+#endif // __APPLE__
+
+extern void __exit(int) __attribute__((noreturn));
+#if __has_feature(cxx_thread_local) || __has_feature(c_thread_local)
+extern void _tlv_exit();
+#endif // __has_feature(cxx_thread_local) || __has_feature(c_thread_local)
 
 /*
  * Exit, flushing stdio buffers if necessary.
  */
 void
-exit(status)
-	int status;
+exit(int status)
 {
-	/* Ensure that the auto-initialization routine is linked in: */
-	extern int _thread_autoinit_dummy_decl;
-
-	_thread_autoinit_dummy_decl = 1;
-
+#if __has_feature(cxx_thread_local) || __has_feature(c_thread_local)
+	_tlv_exit(); // C++11 requires thread_local objects to be destroyed before global objects
+#endif // __has_feature(cxx_thread_local) || __has_feature(c_thread_local)
 	__cxa_finalize(NULL);
 	if (__cleanup)
+#ifdef __APPLE__
+		_cleanup();
+#else
 		(*__cleanup)();
-	_exit(status);
+#endif // __APPLE__
+	__exit(status);
 }
+#pragma clang diagnostic pop