--- dyld/dyld-750.6/src/dyld2.cpp
+++ dyld/dyld-733.8/src/dyld2.cpp
@@ -1474,7 +1474,7 @@
 	}
 
 	// If this image is the potential canonical definition of any weak defs, then set them to a tombstone value
-	if ( gLinkContext.weakDefMapInitialized && image->hasCoalescedExports() && (image->getState() >= dyld_image_state_bound) ) {
+	if ( gLinkContext.weakDefMapInitialized && image->hasCoalescedExports() ) {
 		Diagnostics diag;
 		const dyld3::MachOAnalyzer* ma = (const dyld3::MachOAnalyzer*)image->machHeader();
 		ma->forEachWeakDef(diag, ^(const char *symbolName, uintptr_t imageOffset, bool isFromExportTrie) {
@@ -3374,36 +3374,19 @@
 			return sAllCacheImagesProxy;
 	}
 #endif
+#if TARGET_OS_SIMULATOR
+	// in simulators, 'path' has DYLD_ROOT_PATH prepended, but cache index does not have the prefix, so use orgPath
+	const char* pathToFindInCache = orgPath;
+#else
+	const char* pathToFindInCache = path;
+#endif
 	uint statErrNo;
 	struct stat statBuf;
 	bool didStat = false;
 	bool existsOnDisk;
-	__block dyld3::SharedCacheFindDylibResults shareCacheResults;
+	dyld3::SharedCacheFindDylibResults shareCacheResults;
 	shareCacheResults.image = nullptr;
-
-#if TARGET_OS_SIMULATOR
-
-	auto findSharedCacheImage = ^() {
-		// in simulators, 'path' has DYLD_ROOT_PATH prepended, but cache index does not have the prefix, so use orgPath
-		return dyld3::findInSharedCacheImage(sSharedCacheLoadInfo, orgPath, &shareCacheResults);
-	};
-
-#else
-
-	auto findSharedCacheImage = ^() {
-#if __MAC_OS_X_VERSION_MIN_REQUIRED
-		if ( gLinkContext.iOSonMac ) {
-			// On iOSMac, we are also running with DYLD_ROOT_PATH set, but want to look up the orgPath
-			if ( dyld3::findInSharedCacheImage(sSharedCacheLoadInfo, orgPath, &shareCacheResults) )
-				return true;
-		}
-#endif
-		return dyld3::findInSharedCacheImage(sSharedCacheLoadInfo, path, &shareCacheResults);
-	};
-
-#endif
-
-	if ( findSharedCacheImage() ) {
+	if ( dyld3::findInSharedCacheImage(sSharedCacheLoadInfo, pathToFindInCache, &shareCacheResults) ) {
 		// see if this image in the cache was already loaded via a different path
 		for (std::vector<ImageLoader*>::iterator it=sAllImages.begin(); it != sAllImages.end(); ++it) {
 			ImageLoader* anImage = *it;
@@ -5227,11 +5210,14 @@
 }
 
 #if __MAC_OS_X_VERSION_MIN_REQUIRED
+typedef int (*open_proc_t)(const char*, int, int);
+typedef int (*fcntl_proc_t)(int, int, void*);
+typedef int (*ioctl_proc_t)(int, unsigned long, void*);
 static void* getProcessInfo() { return dyld::gProcessInfo; }
 static const SyscallHelpers sSysCalls = {
 		12,
 		// added in version 1
-		&open,
+		(open_proc_t)&open, 
 		&close, 
 		&pread, 
 		&write, 
@@ -5239,8 +5225,8 @@
 		&munmap, 
 		&madvise,
 		&stat, 
-		&fcntl,
-		&ioctl, 
+		(fcntl_proc_t)&fcntl, 
+		(ioctl_proc_t)&ioctl, 
 		&issetugid, 
 		&getcwd, 
 		&realpath, 
@@ -5918,21 +5904,6 @@
 
 	// send info on all images to libdyld.dylb
 	libDyldEntry->setVars(mainExecutableMH, argc, argv, envp, apple);
-#if __MAC_OS_X_VERSION_MIN_REQUIRED
-	uint32_t progVarsOffset;
-	if ( mainClosure->hasProgramVars(progVarsOffset) ) {
-		if ( libDyldEntry->vectorVersion >= 8 ) {
-			// main executable contains globals to hold argc, argv, envp, and progname, but they need to be filled in
-			ProgramVars* vars = (ProgramVars*)((uint8_t*)mainExecutableMH + progVarsOffset);
-			*vars->NXArgcPtr 	= argc;
-			*vars->NXArgvPtr 	= argv;
-			*vars->environPtr 	= envp;
-			*vars->__prognamePtr = (argv[0] != NULL) ? basename(argv[0]) : "";
-			// set up so libSystem gets ProgramVars struct embedded in main executable
-			libDyldEntry->setProgramVars(vars);
-		}
-	}
-#endif
 	if ( libDyldEntry->vectorVersion > 4 )
 		libDyldEntry->setRestrictions(gLinkContext.allowAtPaths, gLinkContext.allowEnvVarsPath, gLinkContext.allowClassicFallbackPaths);
 	libDyldEntry->setHaltFunction(&halt);
@@ -6495,7 +6466,6 @@
 				}
 			}
 			if ( launched ) {
-				gLinkContext.startedInitializingMainExecutable = true;
 #if __has_feature(ptrauth_calls)
 				// start() calls the result pointer as a function pointer so we need to sign it.
 				result = (uintptr_t)__builtin_ptrauth_sign_unauthenticated((void*)result, 0, 0);