Loading...
--- Libc/Libc-997.1.1/sys/__libc_init.c
+++ Libc/Libc-583/sys/__libc_init.c
@@ -24,40 +24,34 @@
* __libc_init() is called from libSystem_initializer()
*/
-#include <limits.h>
#include <stdint.h>
-#include <string.h>
-#include <machine/cpu_capabilities.h>
-#include <TargetConditionals.h>
+#include <pthread.h>
+#include <pthread_machdep.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));
-extern void _init_clock_port(void);
-extern void __chk_init(void);
+extern pthread_lock_t _malloc_lock;
extern void __xlocale_init(void);
-extern void __guard_setup(const char *apple[]);
+extern void __guard_setup(void);
-void
-__libc_init(const struct ProgramVars *vars, void (*atfork_prepare)(void), void (*atfork_parent)(void), void (*atfork_child)(void), const char *apple[])
+#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__ void
+__libc_init(const struct ProgramVars *vars)
{
_program_vars_init(vars);
- _libc_fork_init(atfork_prepare, atfork_parent, atfork_child);
- _init_clock_port();
- __chk_init();
+ LOCK_INIT(_malloc_lock);
__xlocale_init();
- __guard_setup(apple);
+ __guard_setup();
+
+#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 */
}
-#endif /* TARGET_IPHONE_SIMULATOR */