Loading...
src/dyldAPIsInLibSystem.cpp dyld-832.7.1 dyld-625.13
--- dyld/dyld-832.7.1/src/dyldAPIsInLibSystem.cpp
+++ dyld/dyld-625.13/src/dyldAPIsInLibSystem.cpp
@@ -28,34 +28,26 @@
 #include <sys/mman.h>
 #include <execinfo.h>
 
-#include <TargetConditionals.h>
 #include <System/sys/csr.h>
 #include <crt_externs.h>
 #include <Availability.h>
-#if !TARGET_OS_DRIVERKIT
 #include <vproc_priv.h>
-#endif
+
 #include <dirent.h>
-#include <sys/types.h>
 #include <sys/stat.h>
-#include <fcntl.h>
-#include <System/sys/codesign.h>
-#include <libc_private.h>
-
-#include <mach-o/dyld_images.h>
-#include <mach-o/dyld.h>
-#include <mach-o/dyld_priv.h>
-
+
+#include "mach-o/dyld_images.h"
+#include "mach-o/dyld.h"
+#include "mach-o/dyld_priv.h"
 #include "dyld_cache_format.h"
-#include "objc-shared-cache.h"
 
 #include "ImageLoader.h"
 #include "dyldLock.h"
 
-#include "APIs.h"
-#include "AllImages.h"
-#include "StartGlue.h"
-#include "Tracing.h"
+#include "../dyld3/APIs.h"
+#include "../dyld3/AllImages.h"
+#include "../dyld3/StartGlue.h"
+#include "../dyld3/Tracing.h"
 
 
 // this was in dyld_priv.h but it is no longer exported
@@ -73,65 +65,78 @@
 //
 extern "C" int _dyld_func_lookup(const char* dyld_func_name, void **address);
 
-#if TARGET_OS_IOS && !TARGET_OS_SIMULATOR
-namespace dyld3 {
-    extern int compatFuncLookup(const char* name, void** address) __API_AVAILABLE(ios(13.0));
-}
-extern "C" void setLookupFunc(void*);
+
+extern bool gUseDyld3;
+
+#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
 
-
-extern bool gUseDyld3;
-
-
-// <rdar://problem/61161069> libdyld.dylib should use abort_with_payload() for asserts
-VIS_HIDDEN
-void abort_report_np(const char* format, ...)
-{
-    va_list list;
-    const char *str;
-    _SIMPLE_STRING s = _simple_salloc();
-    if ( s != NULL ) {
-        va_start(list, format);
-        _simple_vsprintf(s, format, list);
-        va_end(list);
-        str = _simple_string(s);
-    }
-    else {
-        // _simple_salloc failed, but at least format may have useful info by itself
-        str = format;
-    }
-    if ( gUseDyld3 ) {
-        dyld3::halt(str);
-    }
-    else {
-        void (*p)(const char* msg) __attribute__((__noreturn__));
-        _dyld_func_lookup("__dyld_halt", (void**)&p);
-        p(str);
-    }
-    // halt() doesn't return, so we can't call _simple_sfree
-}
-
-// libc uses assert()
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Winvalid-noreturn"
-VIS_HIDDEN
-void __assert_rtn(const char* func, const char* file, int line, const char* failedexpr)
-{
-    if (func == NULL) {
-        abort_report_np("Assertion failed: (%s), file %s, line %d.\n", failedexpr, file, line);
-    } else {
-        abort_report_np("Assertion failed: (%s), function %s, file %s, line %d.\n", failedexpr, func, file, line);
-    }
-}
-#pragma clang diagnostic pop
-
+#ifndef LC_VERSION_MIN_IPHONEOS
+	#define LC_VERSION_MIN_IPHONEOS 0x25
+#endif
+
+#ifndef LC_VERSION_MIN_TVOS
+	#define LC_VERSION_MIN_TVOS 0x2F
+#endif
+
+#ifndef LC_VERSION_MIN_WATCHOS
+	#define LC_VERSION_MIN_WATCHOS 0x30
+#endif
+
+
+#ifndef LC_LOAD_UPWARD_DYLIB
+	#define	LC_LOAD_UPWARD_DYLIB (0x23|LC_REQ_DYLD)	/* load of dylib whose initializers run later */
+#endif
+
+#ifndef LC_BUILD_VERSION
+	#define LC_BUILD_VERSION 0x32 /* build for platform min OS version */
+
+	/*
+	 * The build_version_command contains the min OS version on which this 
+	 * binary was built to run for its platform.  The list of known platforms and
+	 * tool values following it.
+	 */
+	struct build_version_command {
+		uint32_t	cmd;		/* LC_BUILD_VERSION */
+		uint32_t	cmdsize;	/* sizeof(struct build_version_command) plus */
+								/* ntools * sizeof(struct build_tool_version) */
+		uint32_t	platform;	/* platform */
+		uint32_t	minos;		/* X.Y.Z is encoded in nibbles xxxx.yy.zz */
+		uint32_t	sdk;		/* X.Y.Z is encoded in nibbles xxxx.yy.zz */
+		uint32_t	ntools;		/* number of tool entries following this */
+	};
+
+	struct build_tool_version {
+		uint32_t	tool;		/* enum for the tool */
+		uint32_t	version;	/* version number of the tool */
+	};
+
+	/* Known values for the platform field above. */
+	#define PLATFORM_MACOS		1
+	#define PLATFORM_IOS		2
+	#define PLATFORM_TVOS		3
+	#define PLATFORM_WATCHOS	4
+	#define PLATFORM_BRIDGEOS	5
+
+	/* Known values for the tool field above. */
+	#define TOOL_CLANG	1
+	#define TOOL_SWIFT	2
+	#define TOOL_LD		3
+#endif
 
 // deprecated APIs are still availble on Mac OS X, but not on iPhone OS
-#if TARGET_OS_OSX
+#if __IPHONE_OS_VERSION_MIN_REQUIRED	
+	#define DEPRECATED_APIS_SUPPORTED 0
+#else
 	#define DEPRECATED_APIS_SUPPORTED 1
-#else
-	#define DEPRECATED_APIS_SUPPORTED 0
 #endif
 
 /*
@@ -675,7 +680,18 @@
     if (gUseDyld3)
         return dyld3::dyld_get_active_platform();
 
-    return (dyld_platform_t)_dyld_get_all_image_infos()->platform;
+    // HACK
+    // Most of the new version SPIs have pure dyld3 implementations, but
+    // They cannot get to the main executable, so we implement this here
+    // and they can use this by calling ::dyld_get_active_platform() in the root namespace
+    static dyld_platform_t sActivePlatform = 0;
+    if (sActivePlatform) return sActivePlatform;
+
+    dyld3::dyld_get_image_versions((mach_header*)_NSGetMachExecuteHeader(), ^(dyld_platform_t platform, uint32_t sdk_version, uint32_t min_version) {
+        sActivePlatform = platform;
+        //FIXME assert there is only one?
+    });
+    return sActivePlatform;
 }
 
 dyld_platform_t dyld_get_base_platform(dyld_platform_t platform) {
@@ -695,11 +711,11 @@
 }
 
 bool dyld_program_sdk_at_least(dyld_build_version_t version) {
-    return dyld3::dyld_program_sdk_at_least(version);
+    return dyld3::dyld_sdk_at_least((mach_header*)_NSGetMachExecuteHeader(),version);
 }
 
 bool dyld_program_minos_at_least(dyld_build_version_t version) {
-    return dyld3::dyld_program_minos_at_least(version);
+    return dyld3::dyld_minos_at_least((mach_header*)_NSGetMachExecuteHeader(), version);
 }
 
 // Function that walks through the load commands and calls the internal block for every version found
@@ -749,15 +765,6 @@
 size_t size, 
 NSObjectFileImage *objectFileImage)
 {
-    // <rdar://problem/51812762> NSCreatObjectFileImageFromMemory fail opaquely if Hardened runtime is enabled
-    uint32_t flags;
-    if ( csops(0, CS_OPS_STATUS, &flags, sizeof(flags)) != -1 ) {
-        if ( (flags & (CS_ENFORCEMENT|CS_KILL)) == (CS_ENFORCEMENT|CS_KILL) ) {
-            //fprintf(stderr, "dyld: warning: NSCreatObjectFileImageFromMemory() cannot be used in harden process 0x%08X\n", flags);
-            return NSObjectFileImageAccess;
-        }
-    }
-
 	if ( gUseDyld3 )
 		return dyld3::NSCreateObjectFileImageFromMemory(address, size, objectFileImage);
 
@@ -1047,9 +1054,6 @@
 void** address,
 NSModule* module)
 {
-	if ( gUseDyld3 )
-		return dyld3::_dyld_lookup_and_bind(symbol_name, address, module);
-
 	DYLD_LOCK_THIS_BLOCK;
     static void (*p)(const char*, void** , NSModule*) = NULL;
 
@@ -1304,23 +1308,17 @@
 // SPI in Mac OS X 10.6
 intptr_t _dyld_get_image_slide(const struct mach_header* mh)
 {
-	// always use dyld3 version because it does better error handling
-	return dyld3::_dyld_get_image_slide(mh);
-}
-
-const struct mach_header *
-_dyld_get_prog_image_header()
-{
-    if ( gUseDyld3 )
-        return dyld3::_dyld_get_prog_image_header();
-
-    DYLD_LOCK_THIS_BLOCK;
-    static const struct mach_header * (*p)(void) = NULL;
-
-    if(p == NULL)
-        _dyld_func_lookup("__dyld_get_prog_image_header", (void**)&p);
-    return p();
-}
+	if ( gUseDyld3 )
+		return dyld3::_dyld_get_image_slide(mh);
+
+	DYLD_NO_LOCK_THIS_BLOCK;
+    static intptr_t (*p)(const struct mach_header*) = NULL;
+
+	if(p == NULL)
+	    _dyld_func_lookup("__dyld_get_image_slide", (void**)&p);
+	return(p(mh));
+}
+
 
 #if DEPRECATED_APIS_SUPPORTED
 bool
@@ -1374,11 +1372,12 @@
 #endif // DEPRECATED_APIS_SUPPORTED
 
 
-#include <dlfcn_private.h>
+#include <dlfcn.h>
 #include <stddef.h>
 #include <pthread.h>
 #include <stdlib.h>
 #include <mach-o/dyld.h>
+#include <servers/bootstrap.h>
 #include "dyldLibSystemInterface.h"
 
 
@@ -1433,12 +1432,6 @@
 	return (pthread_getspecific(dlerrorPerThreadKey) != NULL);
 }
 
-#if TARGET_OS_DRIVERKIT
-static bool isLaunchdOwned()
-{
-    return false;
-}
-#else
 // 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;
@@ -1455,7 +1448,6 @@
     }
     return result;
 }
-#endif
 
 static void shared_cache_missing()
 {
@@ -1485,7 +1477,7 @@
 									&__cxa_finalize_ranges
                                     };
 
-static const objc_opt::objc_opt_t* gObjCOpt = nullptr;
+
 //
 // during initialization of libSystem this routine will run
 // and call dyld, registering the helper functions.
@@ -1495,21 +1487,8 @@
 {	
    void (*p)(dyld::LibSystemHelpers*);
 
-    // Get the optimized objc pointer now that the cache is loaded
-    const dyld_all_image_infos* allInfo = _dyld_get_all_image_infos();
-    if ( allInfo != nullptr  ) {
-        const DyldSharedCache* cache = (const DyldSharedCache*)(allInfo->sharedCacheBaseAddress);
-        if ( cache != nullptr )
-            gObjCOpt = cache->objcOpt();
-    }
-
 	if ( gUseDyld3 ) {
 		dyld3::gAllImages.applyInitialImages();
-#if TARGET_OS_IOS && !TARGET_OS_SIMULATOR
-        // For binaries built before 13.0, set the lookup function if they need it
-        if (dyld_get_program_sdk_version() < DYLD_PACKED_VERSION(13,0,0))
-            setLookupFunc((void*)&dyld3::compatFuncLookup);
-#endif
 	}
 	else {
 		_dyld_func_lookup("__dyld_register_thread_helpers", (void**)&p);
@@ -1520,48 +1499,45 @@
 	tlv_initializer();
 }
 
+
+char* dlerror()
+{
+	if ( gUseDyld3 )
+		return dyld3::dlerror();
+
+	DYLD_LOCK_THIS_BLOCK;
+    static char* (*p)() = NULL;
+
+	if(p == NULL)
+	    _dyld_func_lookup("__dyld_dlerror", (void**)&p);
+	return(p());
+}
+
 int dladdr(const void* addr, Dl_info* info)
 {
     dyld3::ScopedTimer timer(DBG_DYLD_TIMING_DLADDR, (uint64_t)addr, 0, 0);
     int result = 0;
-    if ( gUseDyld3 ) {
-        result = dyld3::dladdr(addr, info);
-    } else {
-        DYLD_LOCK_THIS_BLOCK;
-        static int (*p)(const void* , Dl_info*) = NULL;
-
-        if(p == NULL)
-            _dyld_func_lookup("__dyld_dladdr", (void**)&p);
-        result = p(addr, info);
-    }
+	if ( gUseDyld3 )
+		return dyld3::dladdr(addr, info);
+
+	DYLD_LOCK_THIS_BLOCK;
+    static int (*p)(const void* , Dl_info*) = NULL;
+
+	if(p == NULL)
+	    _dyld_func_lookup("__dyld_dladdr", (void**)&p);
+    result = p(addr, info);
     timer.setData4(result);
     timer.setData5(info != NULL ? info->dli_fbase : 0);
     timer.setData6(info != NULL ? info->dli_saddr : 0);
-    return result;
-}
-
-#if !TARGET_OS_DRIVERKIT
-char* dlerror()
-{
-	if ( gUseDyld3 )
-		return dyld3::dlerror();
-
-	DYLD_LOCK_THIS_BLOCK;
-    static char* (*p)() = NULL;
-
-	if(p == NULL)
-	    _dyld_func_lookup("__dyld_dlerror", (void**)&p);
-	return(p());
+	return result;
 }
 
 int dlclose(void* handle)
 {
     dyld3::ScopedTimer timer(DBG_DYLD_TIMING_DLCLOSE, (uint64_t)handle, 0, 0);
     int result = 0;
-    if ( gUseDyld3 ) {
-        timer.setData4(result);
+	if ( gUseDyld3 )
 		return dyld3::dlclose(handle);
-    }
 
 	DYLD_LOCK_THIS_BLOCK;
     static int (*p)(void* handle) = NULL;
@@ -1569,17 +1545,16 @@
 	if(p == NULL)
 	    _dyld_func_lookup("__dyld_dlclose", (void**)&p);
     result = p(handle);
-    timer.setData4(result);
 	return result;
 }
 
-static void* dlopen_internal(const char* path, int mode, void* callerAddress)
+void* dlopen(const char* path, int mode)
 {
     dyld3::ScopedTimer timer(DBG_DYLD_TIMING_DLOPEN, path, mode, 0);
     void* result = nullptr;
+
     if ( gUseDyld3 ) {
-        result = dyld3::dlopen_internal(path, mode, callerAddress);
-        timer.setData4(result);
+        result = dyld3::dlopen_internal(path, mode, __builtin_return_address(0));
         return result;
     }
 
@@ -1590,40 +1565,41 @@
 
     if(p == NULL)
         _dyld_func_lookup("__dyld_dlopen_internal", (void**)&p);
-    result = p(path, mode, callerAddress);
+    result = p(path, mode, __builtin_return_address(0));
     // use asm block to prevent tail call optimization
     // this is needed because dlopen uses __builtin_return_address() and depends on this glue being in the frame chain
     // <rdar://problem/5313172 dlopen() looks too far up stack, can cause crash>
     __asm__ volatile("");
     timer.setData4(result);
 
+#if TARGET_OS_OSX
+    // HACK for iOSMac bringup rdar://40945421
+    if ( result == nullptr  && dyld_get_active_platform() == PLATFORM_IOSMAC && csr_check(CSR_ALLOW_APPLE_INTERNAL) == 0) {
+        if (hasPerThreadBufferFor_dlerror()) {
+            // first char of buffer is flag whether string (starting at second char) is valid
+            char* buffer = getPerThreadBufferFor_dlerror(2);
+
+            if ( buffer[0] != '\0' && (strstr(&buffer[1], "macOS dylib cannot be loaded into iOSMac process")
+                                       || strstr(&buffer[1], "mach-o, but not built for iOSMac")) ) {
+                // if valid buffer and contains an iOSMac issue
+                fprintf(stderr, "dyld: iOSMac ERROR: process attempted to dlopen() dylib with macOS dependency: \n");
+                fprintf(stderr, "\tdlerror: %s\n", &buffer[1]);
+                fprintf(stderr, "\tBacktrace:\n");
+
+                void* stackPointers[128];
+                int stackPointersCnt = backtrace(stackPointers, 128);
+                char** symbolicatedStack = backtrace_symbols(stackPointers, stackPointersCnt);
+                for (int32_t i = 0; i < stackPointersCnt; ++i) {
+                    fprintf(stderr, "\t\t%s\n", symbolicatedStack[i]);
+                }
+                free(symbolicatedStack);
+            }
+        }
+    }
+#endif
+
 	return result;
 }
-
-void* dlopen(const char* path, int mode)
-{
-    void* result = dlopen_internal(path, mode, __builtin_return_address(0));
-    if ( result )
-        return result;
-
-
-    return nullptr;
-}
-
-void* dlopen_from(const char* path, int mode, void* addressInCaller)
-{
-#if __has_feature(ptrauth_calls)
-    addressInCaller = __builtin_ptrauth_strip(addressInCaller, ptrauth_key_asia);
-#endif
-    return dlopen_internal(path, mode, addressInCaller);
-}
-
-#if !__i386__
-void* dlopen_audited(const char* path, int mode)
-{
-	return dlopen(path, mode);
-}
-#endif // !__i386__
 
 bool dlopen_preflight(const char* path)
 {
@@ -1632,7 +1608,6 @@
 
     if ( gUseDyld3 ) {
         result = dyld3::dlopen_preflight_internal(path);
-        timer.setData4(result);
         return result;
     }
 
@@ -1653,7 +1628,6 @@
 
     if ( gUseDyld3 ) {
         result = dyld3::dlsym_internal(handle, symbol, __builtin_return_address(0));
-        timer.setData4(result);
         return result;
     }
 
@@ -1666,8 +1640,6 @@
     timer.setData4(result);
     return result;
 }
-#endif // !TARGET_OS_DRIVERKIT
-
 
 const struct dyld_all_image_infos* _dyld_get_all_image_infos()
 {
@@ -1778,60 +1750,6 @@
 	return p(length);
 }
 
-bool _dyld_shared_cache_optimized()
-{
-    if ( gUseDyld3 )
-        return dyld3::_dyld_shared_cache_optimized();
-
-    const dyld_all_image_infos* allInfo = _dyld_get_all_image_infos();
-    if ( allInfo != nullptr  ) {
-        const dyld_cache_header* cacheHeader = (dyld_cache_header*)(allInfo->sharedCacheBaseAddress);
-        if ( cacheHeader != nullptr )
-            return (cacheHeader->cacheType == kDyldSharedCacheTypeProduction);
-    }
-    return false;
-}
-
-bool _dyld_shared_cache_is_locally_built()
-{
-    if ( gUseDyld3 )
-        return dyld3::_dyld_shared_cache_is_locally_built();
-
-    const dyld_all_image_infos* allInfo = _dyld_get_all_image_infos();
-    if ( allInfo != nullptr  ) {
-        const dyld_cache_header* cacheHeader = (dyld_cache_header*)(allInfo->sharedCacheBaseAddress);
-        if ( cacheHeader != nullptr )
-            return (cacheHeader->locallyBuiltCache == 1);
-    }
-    return false;
-}
-
-const char* _dyld_shared_cache_real_path(const char* path)
-{
-    const dyld_all_image_infos* allInfo = _dyld_get_all_image_infos();
-    if ( allInfo != nullptr  ) {
-        const DyldSharedCache* cache = (const DyldSharedCache*)(allInfo->sharedCacheBaseAddress);
-        if ( cache != nullptr )
-            return cache->getCanonicalPath(path);
-    }
-    return nullptr;
-}
-
-bool _dyld_shared_cache_contains_path(const char* path)
-{
-    return _dyld_shared_cache_real_path(path) != nullptr;
-}
-
-
-uint32_t _dyld_launch_mode()
-{
-    if ( gUseDyld3 )
-        return dyld3::_dyld_launch_mode();
-
-    // in dyld2 mode all flag bits are zero
-    return 0;
-}
-
 void _dyld_images_for_addresses(unsigned count, const void* addresses[], struct dyld_image_uuid_offset infos[])
 {
     if ( gUseDyld3 )
@@ -1858,24 +1776,6 @@
     return p(func);
 }
 
-void _dyld_register_for_bulk_image_loads(void (*func)(unsigned imageCount, const struct mach_header* mhs[], const char* paths[]))
-{
-    if ( gUseDyld3 )
-        return dyld3::_dyld_register_for_bulk_image_loads(func);
-
-    DYLD_NO_LOCK_THIS_BLOCK;
-    static const void (*p)(void (*)(unsigned imageCount, const mach_header* mhs[], const char* paths[])) = NULL;
-
-    if(p == NULL)
-        _dyld_func_lookup("__dyld_register_for_bulk_image_loads", (void**)&p);
-    return p(func);
-}
-
-bool dyld_need_closure(const char* execPath, const char* dataContainerRootDir)
-{
-    return dyld3::dyld_need_closure(execPath, dataContainerRootDir);
-}
-
 bool dyld_process_is_restricted()
 {
 	if ( gUseDyld3 )
@@ -1902,26 +1802,6 @@
 	return p();
 }
 
-bool dyld_has_inserted_or_interposing_libraries()
-{
-	if ( gUseDyld3 )
-		return dyld3::dyld_has_inserted_or_interposing_libraries();
-
-	DYLD_NO_LOCK_THIS_BLOCK;
-	static bool (*p)() = NULL;
-
-	if (p == NULL)
-	    _dyld_func_lookup("__dyld_has_inserted_or_interposing_libraries", (void**)&p);
-	return p();
-}
-
-bool _dyld_has_fix_for_radar(const char *rdar) {
-    // There is no point in shimming this to dyld3, actual functionality can exist purely in libSystem for
-    // both dyld2 and dyld3.
-    return false;
-}
-
-
 void dyld_dynamic_interpose(const struct mach_header* mh, const struct dyld_interpose_tuple array[], size_t count)
 {
 	if ( gUseDyld3 )
@@ -1935,19 +1815,6 @@
 	p(mh, array, count);
 }
 
-// SPI called __fork
-void _dyld_atfork_prepare()
-{
-    if ( gUseDyld3 )
-        return dyld3::_dyld_atfork_prepare();
-}
-
-// SPI called __fork
-void _dyld_atfork_parent()
-{
-    if ( gUseDyld3 )
-        return dyld3::_dyld_atfork_parent();
-}
 
 // SPI called __fork
 void _dyld_fork_child()
@@ -1968,13 +1835,13 @@
 static void* mapStartOfCache(const char* path, size_t length)
 {
 	struct stat statbuf;
-	if ( dyld3::stat(path, &statbuf) == -1 )
+	if ( ::stat(path, &statbuf) == -1 )
 		return NULL;
 
 	if ( (size_t)statbuf.st_size < length )
 		return NULL;
 
-	int cache_fd = dyld3::open(path, O_RDONLY, 0);
+	int cache_fd = ::open(path, O_RDONLY);
 	if ( cache_fd < 0 )
 		return NULL;
 
@@ -2007,7 +1874,7 @@
 			if ( strlcat(cachePath, entp->d_name, PATH_MAX) >= PATH_MAX )
 				continue;
 			if ( const dyld_cache_header* cacheHeader = (dyld_cache_header*)mapStartOfCache(cachePath, 0x00100000) ) {
-				if ( (::memcmp(cacheHeader, "dyld_", 5) != 0) || (::memcmp(cacheHeader->uuid, cacheUuid, 16) != 0) ) {
+				if ( ::memcmp(cacheHeader->uuid, cacheUuid, 16) != 0 ) {
 					// wrong uuid, unmap and keep looking
 					::munmap((void*)cacheHeader, 0x00100000);
 				}
@@ -2040,11 +1907,12 @@
 	}
 	else {
 		// look first is default location for cache files
-    #if TARGET_OS_IPHONE
-		cacheHeader = findCacheInDirAndMap(cacheUuid, IPHONE_DYLD_SHARED_CACHE_DIR);
-    #else
-		cacheHeader = findCacheInDirAndMap(cacheUuid, MACOSX_MRM_DYLD_SHARED_CACHE_DIR);
-    #endif
+	#if	__IPHONE_OS_VERSION_MIN_REQUIRED
+		const char* defaultSearchDir = IPHONE_DYLD_SHARED_CACHE_DIR;
+	#else
+		const char* defaultSearchDir = MACOSX_DYLD_SHARED_CACHE_DIR;
+	#endif
+		cacheHeader = findCacheInDirAndMap(cacheUuid, defaultSearchDir);
 		// if not there, look in extra search locations
 		if ( cacheHeader == NULL ) {
 			for (const char** p = extraSearchDirs; *p != NULL; ++p) {
@@ -2058,7 +1926,7 @@
 	if ( cacheHeader == NULL )
 		return -1;
 	
-	if ( cacheHeader->mappingOffset <= __offsetof(dyld_cache_header, imagesTextOffset) ) {
+	if ( cacheHeader->mappingOffset < sizeof(dyld_cache_header) ) {
 		// old cache without imagesText array
 		if ( needToUnmap )
 			::munmap((void*)cacheHeader, 0x00100000);
@@ -2126,110 +1994,5 @@
 	p(mapped, init, unmapped);
 }
 
-void _dyld_missing_symbol_abort()
-{
-    return dyld3::_dyld_missing_symbol_abort();
-}
-
-const char* _dyld_get_objc_selector(const char* selName)
-{
-    // Check the shared cache table if it exists.
-    if ( gObjCOpt != nullptr ) {
-        if ( const objc_opt::objc_selopt_t* selopt = gObjCOpt->selopt() ) {
-            const char* name = selopt->get(selName);
-            if (name != nullptr)
-                return name;
-        }
-    }
-
-    if ( gUseDyld3 )
-        return dyld3::_dyld_get_objc_selector(selName);
-
-    return nullptr;
-}
-
-void _dyld_for_each_objc_class(const char* className,
-                           void (^callback)(void* classPtr, bool isLoaded, bool* stop)) {
-    if ( gUseDyld3 )
-        return dyld3::_dyld_for_each_objc_class(className, callback);
-}
-
-void _dyld_for_each_objc_protocol(const char* protocolName,
-                                  void (^callback)(void* protocolPtr, bool isLoaded, bool* stop)) {
-    if ( gUseDyld3 )
-        return dyld3::_dyld_for_each_objc_protocol(protocolName, callback);
-}
-
-void _dyld_register_driverkit_main(void (*mainFunc)(void))
-{
-    if ( gUseDyld3 )
-        return dyld3::_dyld_register_driverkit_main(mainFunc);
-
-    static bool (*p)(void (*mainFunc)(void)) = NULL;
-
-    if(p == NULL)
-        _dyld_func_lookup("__dyld_register_driverkit_main", (void**)&p);
-   p(mainFunc);
-}
-
-// This is populated in the shared cache builder, so that the ranges are protected by __DATA_CONST
-// If we have a root, we can find this range in the shared cache libdyld at runtime
-typedef std::pair<const uint8_t*, const uint8_t*> ObjCConstantRange;
-
-#if TARGET_OS_OSX
-__attribute__((section(("__DATA, __objc_ranges"))))
-#else
-__attribute__((section(("__DATA_CONST, __objc_ranges"))))
-#endif
-__attribute__((used))
-static ObjCConstantRange gSharedCacheObjCConstantRanges[dyld_objc_string_kind + 1];
-
-static std::pair<const void*, uint64_t> getDyldCacheConstantRanges() {
-    const dyld_all_image_infos* allInfo = _dyld_get_all_image_infos();
-    if ( allInfo != nullptr  ) {
-        const DyldSharedCache* cache = (const DyldSharedCache*)(allInfo->sharedCacheBaseAddress);
-        if ( cache != nullptr ) {
-            return cache->getObjCConstantRange();
-        }
-    }
-    return { nullptr, 0 };
-}
-
-bool _dyld_is_objc_constant(DyldObjCConstantKind kind, const void* addr) {
-    assert(kind <= dyld_objc_string_kind);
-    // The common case should be that the value is in range, as this is a security
-    // check, so first test against the values in the struct.  If we have a root then
-    // we'll take the slow path later
-    if ( (addr >= gSharedCacheObjCConstantRanges[kind].first) && (addr < gSharedCacheObjCConstantRanges[kind].second) ) {
-        // Make sure that we are pointing at the start of a constant object, not in to the middle of it
-        uint64_t offset = (uint64_t)addr - (uint64_t)gSharedCacheObjCConstantRanges[kind].first;
-        return (offset % (uint64_t)DyldSharedCache::ConstantClasses::cfStringAtomSize) == 0;
-    }
-
-    // If we are in the shared cache, then the above check was sufficient, so this really isn't a valid constant address
-    extern void* __dso_handle;
-    const dyld3::MachOAnalyzer* ma = (const dyld3::MachOAnalyzer*)&__dso_handle;
-    if ( ma->inDyldCache() )
-        return false;
-
-    // We now know we are a root, so use the pointers in the shared cache libdyld version of gSharedCacheObjCConstantRanges
-    static std::pair<const void*, uint64_t> sharedCacheRanges = { nullptr, ~0ULL };
-
-    // FIXME: Should we fold this in as an inititalizer above?
-    // That would mean we need to link against somewhere to get ___cxa_guard_acquire/___cxa_guard_release
-    if ( sharedCacheRanges.second == ~0ULL )
-        sharedCacheRanges = getDyldCacheConstantRanges();
-
-    // We have the range of the section in libdyld in the shared cache, now get an array of ranges from it
-    uint64_t numRanges = sharedCacheRanges.second / sizeof(ObjCConstantRange);
-    if ( kind >= numRanges )
-        return false;
-
-    const ObjCConstantRange* rangeArrayBase = (const ObjCConstantRange*)sharedCacheRanges.first;
-    if ( (addr >= rangeArrayBase[kind].first) && (addr < rangeArrayBase[kind].second) ) {
-        // Make sure that we are pointing at the start of a constant object, not in to the middle of it
-        uint64_t offset = (uint64_t)addr - (uint64_t)rangeArrayBase[kind].first;
-        return (offset % (uint64_t)DyldSharedCache::ConstantClasses::cfStringAtomSize) == 0;
-    }
-    return false;
-}
+
+