Libc-1439.40.11.tar.gz

[apple/libc.git] / stdlib / FreeBSD / exit.c

diff --git a/stdlib/FreeBSD/exit.c b/stdlib/FreeBSD/exit.c
index e71b3db4ff8fbb3e9c3b9c163c1d946236e9cd93..03d8c093882bc073ee7d31d8b0f5eed7ad35544b 100644 (file)
--- a/stdlib/FreeBSD/exit.c
+++ b/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.
  * 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.
  * 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,43 @@
  * SUCH DAMAGE.
  */
 
  * 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>
 #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 "namespace.h"
 #include <stdlib.h>
 #include <unistd.h>
 #include "un-namespace.h"

+

 #include "atexit.h"
 #include "atexit.h"

+#include "libc_private.h"

 
 

-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;
+void (*__cleanup)(void);
+extern void __exit(int) __attribute__((noreturn));
+#if !TARGET_IPHONE_SIMULATOR && (__i386__ || __x86_64__)
+extern void _tlv_exit();
+#endif

 
 /*
  * Exit, flushing stdio buffers if necessary.
  */
 void
 
 /*
  * 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 !TARGET_IPHONE_SIMULATOR && (__i386__ || __x86_64__)
+       _tlv_exit(); // C++11 requires thread_local objects to be destroyed before global objects
+#endif

        __cxa_finalize(NULL);
        if (__cleanup)
                (*__cleanup)();
        __cxa_finalize(NULL);
        if (__cleanup)
                (*__cleanup)();

-       _exit(status);
+       __exit(status);

 }
 }

+#pragma clang diagnostic pop