Loading...
src/dyldAPIsInLibSystem.cpp dyld-132.13 dyld-353.2.3
--- dyld/dyld-132.13/src/dyldAPIsInLibSystem.cpp
+++ dyld/dyld-353.2.3/src/dyldAPIsInLibSystem.cpp
@@ -1,6 +1,6 @@
 /* -*- mode: C++; c-basic-offset: 4; tab-width: 4 -*-
  *
- * Copyright (c) 2004-2009 Apple Inc. All rights reserved.
+ * Copyright (c) 2004-2012 Apple Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
@@ -25,18 +25,44 @@
 #include <stddef.h>
 #include <string.h>
 #include <malloc/malloc.h>
+#include <sys/mman.h>
 
 #include <crt_externs.h>
 #include <Availability.h>
+#include <vproc_priv.h>
 
 #include "mach-o/dyld.h"
 #include "mach-o/dyld_priv.h"
 
+#include "ImageLoader.h"
 #include "dyldLock.h"
-
-extern "C" int __cxa_atexit(void (*func)(void *), void *arg, void *dso);
-
-#define DYLD_SHARED_CACHE_SUPPORT (__ppc__ || __i386__ || __ppc64__ || __x86_64__)
+#include "start_glue.h"
+
+extern "C" int  __cxa_atexit(void (*func)(void *), void *arg, void *dso);
+extern "C" void __cxa_finalize(const void *dso);
+extern "C" void __cxa_finalize_ranges(const struct __cxa_range_t ranges[], int count);
+
+
+#ifndef LC_VERSION_MIN_MACOSX
+	#define LC_VERSION_MIN_MACOSX 0x24
+	struct version_min_command {
+		uint32_t	cmd;		/* LC_VERSION_MIN_MACOSX or
+					   LC_VERSION_MIN_IPHONEOS  */
+		uint32_t	cmdsize;	/* sizeof(struct min_version_command) */
+		uint32_t	version;	/* X.Y.Z is encoded in nibbles xxxx.yy.zz */
+		uint32_t	sdk;		/* X.Y.Z is encoded in nibbles xxxx.yy.zz */
+	};
+#endif
+
+#ifndef LC_VERSION_MIN_IPHONEOS
+	#define LC_VERSION_MIN_IPHONEOS 0x25
+#endif
+
+
+#ifndef LC_LOAD_UPWARD_DYLIB
+	#define	LC_LOAD_UPWARD_DYLIB (0x23|LC_REQ_DYLD)	/* load of dylib whose initializers run later */
+#endif
+
 
 // deprecated APIs are still availble on Mac OS X, but not on iPhone OS
 #if __IPHONE_OS_VERSION_MIN_REQUIRED	
@@ -54,10 +80,10 @@
 static
 bool
 names_match(
-char *install_name,
+const char *install_name,
 const char* libraryName)
 {
-    char *basename;
+    const char *basename;
     unsigned long n;
 
 	/*
@@ -78,7 +104,7 @@
 	 * of the -framework cases.
 	 */
 	if(strcmp(basename, libraryName) == 0)
-	    return(TRUE);
+	    return true;
 
 	/*
 	 * Now check the base name for "lib" if so proceed to check for the
@@ -88,14 +114,14 @@
 	    n = strlen(libraryName);
 	    if(strncmp(basename+3, libraryName, n) == 0){
 		if(strncmp(basename+3+n, ".dylib", 6) == 0)
-		    return(TRUE);
+		    return true;
 		if(basename[3+n] == '.' &&
 		   basename[3+n+1] != '\0' &&
 		   strncmp(basename+3+n+2, ".dylib", 6) == 0)
-		    return(TRUE);
+		    return true;
 	    }
 	}
-	return(FALSE);
+	return false;
 }
 
 #if DEPRECATED_APIS_SUPPORTED
@@ -104,15 +130,16 @@
 const NSLinkEditErrorHandlers* handlers)
 {
 	DYLD_LOCK_THIS_BLOCK;
-    static void (*p)(
-	void     (*undefined)(const char* symbol_name),
-	NSModule (*multiple)(NSSymbol s, NSModule old, NSModule newhandler),
-	void     (*linkEdit)(NSLinkEditErrors c, int errorNumber,
-		     const char* fileName, const char* errorString)) = NULL;
+	typedef void (*ucallback_t)(const char* symbol_name);
+ 	typedef NSModule (*mcallback_t)(NSSymbol s, NSModule old, NSModule newhandler);
+	typedef void (*lcallback_t)(NSLinkEditErrors c, int errorNumber,
+								const char* fileName, const char* errorString);
+	static void (*p)(ucallback_t undefined, mcallback_t multiple, lcallback_t linkEdit) = NULL;
 
 	if(p == NULL)
 	    _dyld_func_lookup("__dyld_install_handlers", (void**)&p);
-	p(handlers->undefined, handlers->multiple, handlers->linkEdit);
+	mcallback_t m = handlers->multiple;
+	p(handlers->undefined, m, handlers->linkEdit);
 }
 
 const char* 
@@ -320,41 +347,35 @@
  * and not a list of current versions that dependent libraries and bundles the
  * program is using were built with.
  */
-int32_t
-NSVersionOfLinkTimeLibrary(
-const char* libraryName)
-{
-    unsigned long i;
-    struct load_command *load_commands, *lc;
-    struct dylib_command *dl;
-    char *install_name;
+int32_t NSVersionOfLinkTimeLibrary(const char* libraryName)
+{
+	// Lazily call _NSGetMachExecuteHeader() and cache result
 #if __LP64__
-    static struct mach_header_64 *mh = NULL;
+    static mach_header_64* mh = NULL;
 #else
-    static struct mach_header *mh = NULL;
-#endif
-	if(mh == NULL)
+    static mach_header* mh = NULL;
+#endif
+	if ( mh == NULL )
 	    mh = _NSGetMachExecuteHeader();
-	load_commands = (struct load_command *)
 #if __LP64__
-			    ((char *)mh + sizeof(struct mach_header_64));
+	const load_command* lc = (load_command*)((char*)mh + sizeof(mach_header_64));
 #else
-			    ((char *)mh + sizeof(struct mach_header));
-#endif
-	lc = load_commands;
-	for(i = 0; i < mh->ncmds; i++){
+	const load_command* lc = (load_command*)((char*)mh + sizeof(mach_header));
+#endif
+	for(uint32_t i = 0; i < mh->ncmds; i++){
 		switch ( lc->cmd ) { 
 			case LC_LOAD_DYLIB:
 			case LC_LOAD_WEAK_DYLIB:
-				dl = (struct dylib_command *)lc;
-				install_name = (char *)dl + dl->dylib.name.offset;
-				if(names_match(install_name, libraryName) == TRUE)
-					return(dl->dylib.current_version);
+			case LC_LOAD_UPWARD_DYLIB:
+				const dylib_command* dl = (dylib_command *)lc;
+				const char* install_name = (char*)dl + dl->dylib.name.offset;
+				if ( names_match(install_name, libraryName) )
+					return dl->dylib.current_version;
 				break;
 		}
-	    lc = (struct load_command *)((char *)lc + lc->cmdsize);
+	    lc = (load_command*)((char*)lc + lc->cmdsize);
 	}
-	return(-1);
+	return (-1);
 }
 
 /*
@@ -364,40 +385,217 @@
  * it would be "x" and with -framework Foo it would be "Foo").  If the program
  * is not using the specified library it returns -1.
  */
-int32_t
-NSVersionOfRunTimeLibrary(
-const char* libraryName)
-{
-    unsigned long i, j, n;
-    char *install_name;
-    struct load_command *load_commands, *lc;
-    struct dylib_command *dl;
-    const struct mach_header *mh;
-
-	n = _dyld_image_count();
-	for(i = 0; i < n; i++){
-	    mh = _dyld_get_image_header(i);
-	    if(mh->filetype != MH_DYLIB)
-		continue;
-	    load_commands = (struct load_command *)
+int32_t NSVersionOfRunTimeLibrary(const char* libraryName)
+{
+	uint32_t n = _dyld_image_count();
+	for(uint32_t i = 0; i < n; i++){
+	    const mach_header* mh = _dyld_get_image_header(i);
+		if ( mh == NULL )
+			continue;
+	    if ( mh->filetype != MH_DYLIB )
+			continue;
 #if __LP64__
-			    ((char *)mh + sizeof(struct mach_header_64));
+	    const load_command* lc = (load_command*)((char*)mh + sizeof(mach_header_64));
 #else
-			    ((char *)mh + sizeof(struct mach_header));
-#endif
-	    lc = load_commands;
-	    for(j = 0; j < mh->ncmds; j++){
-		if(lc->cmd == LC_ID_DYLIB){
-		    dl = (struct dylib_command *)lc;
-		    install_name = (char *)dl + dl->dylib.name.offset;
-		    if(names_match(install_name, libraryName) == TRUE)
-			return(dl->dylib.current_version);
-		}
-		lc = (struct load_command *)((char *)lc + lc->cmdsize);
+	    const load_command* lc = (load_command*)((char*)mh + sizeof(mach_header));
+#endif
+	    for(uint32_t j = 0; j < mh->ncmds; j++){
+			if ( lc->cmd == LC_ID_DYLIB ) {
+				const dylib_command* dl = (dylib_command*)lc;
+				const char* install_name = (char *)dl + dl->dylib.name.offset;
+				if ( names_match(install_name, libraryName) )
+					return dl->dylib.current_version;
+			}
+			lc = (load_command*)((char*)lc + lc->cmdsize);
 	    }
 	}
-	return(-1);
-}
+	return (-1);
+}
+
+#define PACKED_VERSION(major, minor, tiny) ((((major) & 0xffff) << 16) | (((minor) & 0xff) << 8) | ((tiny) & 0xff))
+
+
+/*
+ * Returns the sdk version (encode as nibble XXXX.YY.ZZ) the
+ * specified binary was built against.
+ *
+ * First looks for LC_VERSION_MIN_MACOSX/LC_VERSION_MIN_IPHONEOS
+ * in binary and if sdk field is not zero, return that value.
+ * Otherwise, looks for the libSystem.B.dylib the binary linked
+ * against and uses a table to convert that to an sdk version.
+ */
+uint32_t dyld_get_sdk_version(const mach_header* mh)
+{
+	const load_command* startCmds = NULL;
+	if ( mh->magic == MH_MAGIC_64 )
+		startCmds = (load_command*)((char *)mh + sizeof(mach_header_64));
+	else if ( mh->magic == MH_MAGIC )
+		startCmds = (load_command*)((char *)mh + sizeof(mach_header));
+	else
+		return 0;  // not a mach-o file, or wrong endianness
+		
+	const load_command* const cmdsEnd = (load_command*)((char*)startCmds + mh->sizeofcmds);
+	const version_min_command* versCmd;
+	const dylib_command* dylibCmd;
+	const load_command* cmd = startCmds;
+	const char* dylibName;
+#if __IPHONE_OS_VERSION_MIN_REQUIRED 
+	uint32_t foundationVers = 0;
+#else
+	uint32_t libSystemVers = 0;
+#endif
+	for(uint32_t i = 0; i < mh->ncmds; ++i) {
+	    const load_command* nextCmd = (load_command*)((char *)cmd + cmd->cmdsize);
+		// <rdar://problem/14381579&16050962> sanity check size of command
+		if ( (cmd->cmdsize < 8) || (nextCmd > cmdsEnd) || (nextCmd < startCmds)) {
+			return 0;
+		}
+		switch ( cmd->cmd ) {
+#if __IPHONE_OS_VERSION_MIN_REQUIRED 
+			case LC_VERSION_MIN_IPHONEOS:
+#else
+			case LC_VERSION_MIN_MACOSX:
+#endif
+				versCmd = (version_min_command*)cmd;
+#ifdef DICE_KIND_DATA
+				if ( versCmd->sdk != 0 )
+					return versCmd->sdk;	// found explicit SDK version
+#else
+				if ( versCmd->reserved != 0 )
+					return versCmd->reserved;	// found explicit SDK version
+#endif
+				break;
+			case LC_LOAD_DYLIB:
+			case LC_LOAD_WEAK_DYLIB:
+			case LC_LOAD_UPWARD_DYLIB:
+				dylibCmd = (dylib_command*)cmd;
+				// sanity check dylib command layout
+				if ( dylibCmd->dylib.name.offset > cmd->cmdsize )
+					return 0;
+				dylibName = (char*)dylibCmd + dylibCmd->dylib.name.offset;
+#if __IPHONE_OS_VERSION_MIN_REQUIRED          
+				if ( strcmp(dylibName, "/System/Library/Frameworks/Foundation.framework/Foundation") == 0 )
+					foundationVers = dylibCmd->dylib.current_version;
+#else
+				if ( strcmp(dylibName, "/usr/lib/libSystem.B.dylib") == 0 )
+					libSystemVers = dylibCmd->dylib.current_version;
+#endif
+				break;
+		}
+		cmd = nextCmd;
+	}
+
+	struct DylibToOSMapping {
+		uint32_t dylibVersion;
+		uint32_t osVersion;
+	};
+	
+#if __IPHONE_OS_VERSION_MIN_REQUIRED
+	static const DylibToOSMapping foundationMapping[] = {
+		{ PACKED_VERSION(678,24,0), DYLD_IOS_VERSION_2_0 },
+		{ PACKED_VERSION(678,26,0), DYLD_IOS_VERSION_2_1 },
+		{ PACKED_VERSION(678,29,0), DYLD_IOS_VERSION_2_2 },
+		{ PACKED_VERSION(678,47,0), DYLD_IOS_VERSION_3_0 },
+		{ PACKED_VERSION(678,51,0), DYLD_IOS_VERSION_3_1 },
+		{ PACKED_VERSION(678,60,0), DYLD_IOS_VERSION_3_2 },
+		{ PACKED_VERSION(751,32,0), DYLD_IOS_VERSION_4_0 },
+		{ PACKED_VERSION(751,37,0), DYLD_IOS_VERSION_4_1 },
+		{ PACKED_VERSION(751,49,0), DYLD_IOS_VERSION_4_2 },
+		{ PACKED_VERSION(751,58,0), DYLD_IOS_VERSION_4_3 },
+		{ PACKED_VERSION(881,0,0),  DYLD_IOS_VERSION_5_0 },
+		{ PACKED_VERSION(890,1,0),  DYLD_IOS_VERSION_5_1 },
+		{ PACKED_VERSION(992,0,0),  DYLD_IOS_VERSION_6_0 },
+		{ PACKED_VERSION(993,0,0),  DYLD_IOS_VERSION_6_1 },  
+		{ PACKED_VERSION(1038,14,0),DYLD_IOS_VERSION_7_0 }, // check final
+		{ PACKED_VERSION(0,0,0),    DYLD_IOS_VERSION_7_0 } 
+	};
+
+	if ( foundationVers != 0 ) {
+		uint32_t lastOsVersion = 0;
+		for (const DylibToOSMapping* p=foundationMapping; ; ++p) {
+			if ( p->dylibVersion == 0 )
+				return p->osVersion;
+			if ( foundationVers < p->dylibVersion )
+				return lastOsVersion;
+			lastOsVersion = p->osVersion;
+		}
+	}
+
+#else
+	// Note: versions are for the GM release.  The last entry should
+	// always be zero.  At the start of the next major version,
+	// a new last entry needs to be added and the previous zero
+	// updated to the GM dylib version.
+	static const DylibToOSMapping libSystemMapping[] = {
+		{ PACKED_VERSION(88,1,3),   DYLD_MACOSX_VERSION_10_4 },
+		{ PACKED_VERSION(111,0,0),  DYLD_MACOSX_VERSION_10_5 },
+		{ PACKED_VERSION(123,0,0),  DYLD_MACOSX_VERSION_10_6 },
+		{ PACKED_VERSION(159,0,0),  DYLD_MACOSX_VERSION_10_7 },
+		{ PACKED_VERSION(169,3,0),  DYLD_MACOSX_VERSION_10_8 },
+		{ PACKED_VERSION(1197,0,0), DYLD_MACOSX_VERSION_10_9 },
+		{ PACKED_VERSION(0,0,0),    DYLD_MACOSX_VERSION_10_9 }
+	};
+
+	if ( libSystemVers != 0 ) {
+		uint32_t lastOsVersion = 0;
+		for (const DylibToOSMapping* p=libSystemMapping; ; ++p) {
+			if ( p->dylibVersion == 0 )
+				return p->osVersion;
+			if ( libSystemVers < p->dylibVersion )
+				return lastOsVersion;
+			lastOsVersion = p->osVersion;
+		}
+	}
+#endif
+	
+	return 0;
+}
+
+uint32_t dyld_get_program_sdk_version()
+{
+	return dyld_get_sdk_version((mach_header*)_NSGetMachExecuteHeader());
+}
+
+uint32_t dyld_get_min_os_version(const struct mach_header* mh)
+{
+	const load_command* startCmds = NULL;
+	if ( mh->magic == MH_MAGIC_64 )
+		startCmds = (load_command*)((char *)mh + sizeof(mach_header_64));
+	else if ( mh->magic == MH_MAGIC )
+		startCmds = (load_command*)((char *)mh + sizeof(mach_header));
+	else
+		return 0;  // not a mach-o file, or wrong endianness
+		
+	const load_command* const cmdsEnd = (load_command*)((char*)startCmds + mh->sizeofcmds);
+	const version_min_command* versCmd;
+	const load_command* cmd = startCmds;
+	for(uint32_t i = 0; i < mh->ncmds; ++i) {
+	    const load_command* nextCmd = (load_command*)((char *)cmd + cmd->cmdsize);
+		// <rdar://problem/14381579&16050962> sanity check size of command
+		if ( (cmd->cmdsize < 8) || (nextCmd > cmdsEnd) || (nextCmd < startCmds)) {
+			return 0;
+		}
+		switch ( cmd->cmd ) {
+#if __IPHONE_OS_VERSION_MIN_REQUIRED          
+			case LC_VERSION_MIN_IPHONEOS:
+#else
+			case LC_VERSION_MIN_MACOSX:
+#endif
+				versCmd = (version_min_command*)cmd;
+				return versCmd->version;	// found explicit min OS version
+				break;
+		}
+		cmd = nextCmd;
+	}
+	return 0;
+}
+
+
+uint32_t dyld_get_program_min_os_version()
+{
+	return dyld_get_min_os_version((mach_header*)_NSGetMachExecuteHeader());
+}
+
 
 #if DEPRECATED_APIS_SUPPORTED
 /*
@@ -765,7 +963,8 @@
 void (*func)(const struct mach_header *mh, intptr_t vmaddr_slide))
 {
 	DYLD_LOCK_THIS_BLOCK;
-    static void (*p)(void (*func)(const struct mach_header *mh, intptr_t vmaddr_slide)) = NULL;
+	typedef void (*callback_t)(const struct mach_header *mh, intptr_t vmaddr_slide);
+    static void (*p)(callback_t func) = NULL;
 
 	if(p == NULL)
 	    _dyld_func_lookup("__dyld_register_func_for_add_image", (void**)&p);
@@ -782,7 +981,8 @@
 void (*func)(const struct mach_header *mh, intptr_t vmaddr_slide))
 {
 	DYLD_LOCK_THIS_BLOCK;
-    static void (*p)(void (*func)(const struct mach_header *mh, intptr_t vmaddr_slide)) = NULL;
+	typedef void (*callback_t)(const struct mach_header *mh, intptr_t vmaddr_slide);
+    static void (*p)(callback_t func) = NULL;
 
 	if(p == NULL)
 	    _dyld_func_lookup("__dyld_register_func_for_remove_image", (void**)&p);
@@ -893,7 +1093,7 @@
 _dyld_image_count(void)
 {
 	DYLD_NO_LOCK_THIS_BLOCK;
-    static unsigned long (*p)(void) = NULL;
+    static uint32_t (*p)(void) = NULL;
 
 	if(p == NULL)
 	    _dyld_func_lookup("__dyld_image_count", (void**)&p);
@@ -968,16 +1168,6 @@
 	return p(address);
 }
 
-void _dyld_moninit(
-void (*monaddition)(char *lowpc, char *highpc))
-{
-	DYLD_LOCK_THIS_BLOCK;
-    static void (*p)(void (*monaddition)(char *lowpc, char *highpc)) = NULL;
-
-	if(p == NULL)
-	    _dyld_func_lookup("__dyld_moninit", (void**)&p);
-	p(monaddition);
-}
 
 #if DEPRECATED_APIS_SUPPORTED
 bool _dyld_launched_prebound(void)
@@ -1018,12 +1208,12 @@
 // data kept per-thread
 struct dlerrorPerThreadData
 {
-	uint32_t	sizeAllocated;
+	size_t		sizeAllocated;
 	char		message[1];
 };
 
 // function called by dyld to get buffer to store dlerror message
-static char* getPerThreadBufferFor_dlerror(uint32_t sizeRequired)
+static char* getPerThreadBufferFor_dlerror(size_t sizeRequired)
 {
 	// ok to create key lazily because this function is called within dyld lock, so there is no race condition
 	if (!dlerrorPerThreadKeyInitialized ) {
@@ -1032,11 +1222,11 @@
 		dlerrorPerThreadKeyInitialized = true;
 	}
 
-	const int size = (sizeRequired < 256) ? 256 : sizeRequired;
+	const size_t size = (sizeRequired < 256) ? 256 : sizeRequired;
 	dlerrorPerThreadData* data = (dlerrorPerThreadData*)pthread_getspecific(dlerrorPerThreadKey);
 	if ( data == NULL ) {
 		//int mallocSize = offsetof(dlerrorPerThreadData, message[size]);
-		const int mallocSize = sizeof(dlerrorPerThreadData)+size;
+		const size_t mallocSize = sizeof(dlerrorPerThreadData)+size;
 		data = (dlerrorPerThreadData*)malloc(mallocSize);
 		data->sizeAllocated = size;
 		pthread_setspecific(dlerrorPerThreadKey, data);
@@ -1044,7 +1234,7 @@
 	else if ( data->sizeAllocated < sizeRequired ) {
 		free(data);
 		//int mallocSize = offsetof(dlerrorPerThreadData, message[size]);
-		const int mallocSize = sizeof(dlerrorPerThreadData)+size;
+		const size_t mallocSize = sizeof(dlerrorPerThreadData)+size;
 		data = (dlerrorPerThreadData*)malloc(mallocSize);
 		data->sizeAllocated = size;
 		pthread_setspecific(dlerrorPerThreadKey, data);
@@ -1052,6 +1242,32 @@
 	return data->message;
 }
 
+// <rdar://problem/10595338> dlerror buffer leak
+// Only allocate buffer if an actual error message needs to be set
+static bool hasPerThreadBufferFor_dlerror()
+{
+	if (!dlerrorPerThreadKeyInitialized ) 
+		return false;
+		
+	return (pthread_getspecific(dlerrorPerThreadKey) != NULL);
+}
+
+// use non-lazy pointer to vproc_swap_integer so that lazy binding does not recurse
+typedef vproc_err_t (*vswapproc)(vproc_t vp, vproc_gsk_t key,int64_t *inval, int64_t *outval);
+static vswapproc swapProc = &vproc_swap_integer;
+
+static bool isLaunchdOwned() {
+	static bool first = true;
+	static bool result;
+	if ( first ) {
+		int64_t val = 0;
+		(*swapProc)(NULL, VPROC_GSK_IS_MANAGED, NULL, &val);
+		result = ( val != 0 );
+		first = false;
+	}
+	return result;
+}
+
 
 #if DYLD_SHARED_CACHE_SUPPORT
 static void shared_cache_missing()
@@ -1067,7 +1283,7 @@
 
 
 // the table passed to dyld containing thread helpers
-static dyld::LibSystemHelpers sHelpers = { 6, &dyldGlobalLockAcquire, &dyldGlobalLockRelease,  
+static dyld::LibSystemHelpers sHelpers = { 13, &dyldGlobalLockAcquire, &dyldGlobalLockRelease,
 									&getPerThreadBufferFor_dlerror, &malloc, &free, &__cxa_atexit,
 						#if DYLD_SHARED_CACHE_SUPPORT
 									&shared_cache_missing, &shared_cache_out_of_date,
@@ -1076,23 +1292,32 @@
 						#endif
 									NULL, NULL,
 									&pthread_key_create, &pthread_setspecific,
-									&malloc_size };
+									&malloc_size,
+									&pthread_getspecific,
+									&__cxa_finalize,
+									address_of_start,
+									&hasPerThreadBufferFor_dlerror,
+									&isLaunchdOwned,
+									&vm_allocate,
+									&mmap,
+									&__cxa_finalize_ranges};
 
 
 //
 // during initialization of libSystem this routine will run
 // and call dyld, registering the helper functions.
 //
-extern "C" void _dyld_initializer() __attribute__((visibility("hidden")));
+extern "C" void tlv_initializer();
+extern "C" void _dyld_initializer();
 void _dyld_initializer()
-{
-	DYLD_LOCK_INITIALIZER;
-	
+{	
    void (*p)(dyld::LibSystemHelpers*);
 
 	_dyld_func_lookup("__dyld_register_thread_helpers", (void**)&p);
 	if(p != NULL)
 		p(&sHelpers);
+		
+	tlv_initializer();
 }
 
 
@@ -1186,8 +1411,7 @@
 	return p();
 }
 
-#if !__arm__
-__attribute__((visibility("hidden"))) 
+#if SUPPORT_ZERO_COST_EXCEPTIONS
 bool _dyld_find_unwind_sections(void* addr, dyld_unwind_sections* info)
 {
 	DYLD_NO_LOCK_THIS_BLOCK;
@@ -1200,7 +1424,7 @@
 #endif
 
 
-#if __i386__ || __x86_64__
+#if __i386__ || __x86_64__ || __arm__ || __arm64__
 __attribute__((visibility("hidden"))) 
 void* _dyld_fast_stub_entry(void* loadercache, long lazyinfo)
 {
@@ -1224,4 +1448,50 @@
 	return p(addr);
 }
 
-
+bool dyld_shared_cache_some_image_overridden()
+{
+	DYLD_NO_LOCK_THIS_BLOCK;
+    static bool (*p)() = NULL;
+
+	if(p == NULL)
+	    _dyld_func_lookup("__dyld_shared_cache_some_image_overridden", (void**)&p);
+	return p();
+}
+
+
+bool dyld_process_is_restricted()
+{
+	DYLD_NO_LOCK_THIS_BLOCK;
+    static bool (*p)() = NULL;
+	
+	if(p == NULL)
+	    _dyld_func_lookup("__dyld_process_is_restricted", (void**)&p);
+	return p();
+}
+
+
+void dyld_dynamic_interpose(const struct mach_header* mh, const struct dyld_interpose_tuple array[], size_t count)
+{
+	DYLD_LOCK_THIS_BLOCK;
+    static void (*p)(const struct mach_header* mh, const struct dyld_interpose_tuple array[], size_t count) = NULL;
+
+	if (p == NULL)
+	    _dyld_func_lookup("__dyld_dynamic_interpose", (void**)&p);
+	p(mh, array, count);
+}
+
+
+// SPI called __fork
+void _dyld_fork_child()
+{
+	DYLD_NO_LOCK_THIS_BLOCK;
+    static void (*p)() = NULL;
+
+	if(p == NULL)
+	    _dyld_func_lookup("__dyld_fork_child", (void**)&p);
+	return p();
+}
+
+
+
+