Libc-997.1.1.tar.gz

[apple/libc.git] / sys / __libc_init.c

diff --git a/sys/__libc_init.c b/sys/__libc_init.c
index 72f0718712f16020e2902fb1cc1e7d5b66a49fe9..6bce8dba29663b1d2af39f73c96ddfabc576cd9a 100644 (file)
--- a/sys/__libc_init.c
+++ b/sys/__libc_init.c
@@ -24,59 +24,40 @@
  * __libc_init() is called from libSystem_initializer()
  */
 
  * __libc_init() is called from libSystem_initializer()
  */
 

+#include <limits.h>

 #include <stdint.h>
 #include <stdint.h>

-#include <pthread.h>
-#include <pthread_machdep.h>
+#include <string.h>

 #include <machine/cpu_capabilities.h>
 #include <machine/cpu_capabilities.h>

+#include <TargetConditionals.h>

 
 

+#if TARGET_IPHONE_SIMULATOR
+extern void __chk_init(void);
+extern void __xlocale_init(void);
+
+void
+_libc_sim_init(void) {
+       __chk_init();
+       __xlocale_init();
+}
+
+#else /* TARGET_IPHONE_SIMULATOR */

 struct ProgramVars; /* forward reference */
 
 extern void _program_vars_init(const struct ProgramVars *vars);
 extern void _libc_fork_init(void (*prepare)(void), void (*parent)(void), void (*child)(void));
 struct ProgramVars; /* forward reference */
 
 extern void _program_vars_init(const struct ProgramVars *vars);
 extern void _libc_fork_init(void (*prepare)(void), void (*parent)(void), void (*child)(void));

-extern void _init_clock_port();
-extern pthread_lock_t _malloc_lock;
+extern void _init_clock_port(void);
+extern void __chk_init(void);

 extern void __xlocale_init(void);
 extern void __xlocale_init(void);

-extern void __pthread_pfz_setup(const char *apple[]);

 extern void __guard_setup(const char *apple[]);
 extern void __guard_setup(const char *apple[]);

-extern void __malloc_entropy_setup(const char *apple[]);
-extern int usenew_impl;
-
-__private_extern__ uintptr_t commpage_pfz_base;
-
-#ifdef PR_5243343
-/* 5243343 - temporary hack to detect if we are running the conformance test */
-#include <stdlib.h>
-__private_extern__ int PR_5243343_flag = 0;
-#endif /* PR_5243343 */
-__private_extern__ int __pthread_lock_debug = 0;
-__private_extern__ int __pthread_lock_old = 0;
-

 
 void
 __libc_init(const struct ProgramVars *vars, void (*atfork_prepare)(void), void (*atfork_parent)(void), void (*atfork_child)(void), const char *apple[])
 {
        _program_vars_init(vars);
        _libc_fork_init(atfork_prepare, atfork_parent, atfork_child);
 
 void
 __libc_init(const struct ProgramVars *vars, void (*atfork_prepare)(void), void (*atfork_parent)(void), void (*atfork_child)(void), const char *apple[])
 {
        _program_vars_init(vars);
        _libc_fork_init(atfork_prepare, atfork_parent, atfork_child);

-       LOCK_INIT(_malloc_lock);

        _init_clock_port();
        _init_clock_port();

+       __chk_init();

        __xlocale_init();
        __guard_setup(apple);
        __xlocale_init();
        __guard_setup(apple);

-       __pthread_pfz_setup(apple);
-       __malloc_entropy_setup(apple);
-
-
-#ifdef PR_5243343
-       /* 5243343 - temporary hack to detect if we are running the conformance test */
-       if(getenv("TET_EXECUTE"))
-               PR_5243343_flag = 1;
-#endif /* PR_5243343 */
-#if defined(__i386__) || defined(__x86_64__)
-        if(getenv("__PTHREAD_LOCK_DEBUG__"))
-                __pthread_lock_debug = 1;
-        if(getenv("__PTHREAD_LOCK_OLD__")) {
-                __pthread_lock_old = 1;
-                usenew_impl = 0;
-        }
-#endif
-

 }
 }

+#endif /* TARGET_IPHONE_SIMULATOR */