--- dyld/dyld-519.2.1/dyld3/libdyldEntryVector.cpp
+++ dyld/dyld-851.27/dyld3/libdyldEntryVector.cpp
@@ -22,20 +22,24 @@
  */
 
 #include <stdarg.h>
-
-#include "dyld_priv.h"
+#include <mach-o/dyld_priv.h>
+#include <mach-o/dyld_images.h>
+
 #include "libdyldEntryVector.h"
 #include "AllImages.h"
+#include "Array.h"
+#include "Loading.h"
 #include "Logging.h"
 #include "PathOverrides.h"
-#include "LaunchCacheFormat.h"
-
-extern "C" void start();
-
+#include "StartGlue.h"
+#include "dyld_process_info_internal.h"
+
+extern "C" char start;
 
 VIS_HIDDEN const char** appleParams;
 
-extern bool gUseDyld3;
+extern void* __ptrauth_dyld_address_auth gUseDyld3;
+extern bool gEnableSharedCacheDataConst;
 
 namespace dyld3 {
 
@@ -54,7 +58,8 @@
         return argv0;
 }
 
-static void entry_setVars(const mach_header* mainMH, int argc, const char* argv[], const char* envp[], const char* apple[])
+static void entry_setVars(const mach_header* mainMH, int argc, const char* argv[], const char* envp[], const char* apple[],
+                          bool keysOff, bool platformBinariesOnly, bool enableSharedCacheDataConst)
 {
     NXArgc       = argc;
     NXArgv       = argv;
@@ -67,11 +72,13 @@
     sVars.NXArgvPtr     = &NXArgv;
     sVars.environPtr    = (const char***)&environ;
     sVars.__prognamePtr = &__progname;
-    gAllImages.setProgramVars(&sVars);
-
-    gUseDyld3 = true;
+    gAllImages.setProgramVars(&sVars, keysOff, platformBinariesOnly);
+
+    gUseDyld3 = (void*)1;
 
     setLoggingFromEnvs(envp);
+
+    gEnableSharedCacheDataConst = enableSharedCacheDataConst;
 }
 
 static void entry_setHaltFunction(void (*func)(const char* message) __attribute__((noreturn)) )
@@ -89,56 +96,119 @@
     gAllImages.setOldAllImageInfo(old);
 }
 
-static void entry_setInitialImageList(const launch_cache::binary_format::Closure* closure,
-                                const void* dyldCacheLoadAddress, const char* dyldCachePath,
-                                const dyld3::launch_cache::DynArray<loader::ImageInfo>& initialImages,
-                                const mach_header* libSystemMH, const launch_cache::binary_format::Image* libSystemImage)
+static void entry_setNotifyMonitoringDyldMain(void (*notifyMonitoringDyldMain)()) {
+#if !TARGET_OS_DRIVERKIT
+    setNotifyMonitoringDyldMain(notifyMonitoringDyldMain);
+#endif
+}
+
+static void entry_setNotifyMonitoringDyld(void (*notifyMonitoringDyld)(bool unloading,unsigned imageCount,
+                                                                               const struct mach_header* loadAddresses[],
+                                                                               const char* imagePaths[])) {
+#if !TARGET_OS_DRIVERKIT
+    setNotifyMonitoringDyld(notifyMonitoringDyld);
+#endif
+}
+
+static void entry_setInitialImageList(const closure::LaunchClosure* closure,
+                                      const DyldSharedCache* dyldCacheLoadAddress, const char* dyldCachePath,
+                                      const Array<LoadedImage>& initialImages, LoadedImage& libSystem,
+                                      mach_port_t mach_task_self)
 {
     gAllImages.init(closure, dyldCacheLoadAddress, dyldCachePath, initialImages);
-    gAllImages.applyInterposingToDyldCache(closure, initialImages);
-
-    const char* mainPath = _simple_getenv(appleParams, "executable_path");
-    if ( (mainPath != nullptr) && (mainPath[0] == '/') )
-        gAllImages.setMainPath(mainPath);
-
-    // ok to call before malloc is ready because 4 slots are reserved.
-    gAllImages.setInitialGroups();
+    gAllImages.applyInterposingToDyldCache(closure, mach_task_self);
 
     // run initializer for libSytem.B.dylib
     // this calls back into _dyld_initializer which calls gAllIimages.addImages()
-    gAllImages.runLibSystemInitializer(libSystemMH, libSystemImage);
+    gAllImages.runLibSystemInitializer(libSystem);
 
     // now that malloc is available, parse DYLD_ env vars
-    gPathOverrides.setEnvVars((const char**)environ);
+    closure::gPathOverrides.setEnvVars((const char**)environ, gAllImages.mainExecutable(), gAllImages.mainExecutableImage()->path());
 }
 
 static void entry_runInitialzersBottomUp(const mach_header* mainExecutableImageLoadAddress)
 {
-    gAllImages.runInitialzersBottomUp(mainExecutableImageLoadAddress);
+    gAllImages.runStartupInitialzers();
+#if !TARGET_OS_DRIVERKIT
     gAllImages.notifyMonitorMain();
+#endif
 }
 
 static void entry_setChildForkFunction(void (*func)() )
 {
     sChildForkFunction = func;
 }
+
+static void entry_setRestrictions(bool allowAtPaths, bool allowEnvPaths, bool allowFallbackPaths)
+{
+    gAllImages.setRestrictions(allowAtPaths, allowEnvPaths);
+    closure::gPathOverrides.setFallbackPathHandling(allowFallbackPaths ?
+                                                    dyld3::closure::PathOverrides::FallbackPathMode::classic :
+                                                    dyld3::closure::PathOverrides::FallbackPathMode::restricted);
+}
+
+static void entry_setHasCacheOverrides(bool someCacheImageOverriden)
+{
+    gAllImages.setHasCacheOverrides(someCacheImageOverriden);
+}
+
+
+static void entry_setProgramVars(ProgramVars* progVars)
+{
+    // this entry only called when running crt1.o based old macOS programs
+    gAllImages.setProgramVars((AllImages::ProgramVars*)progVars, false, false);
+}
+
+static void entry_setLaunchMode(uint32_t flags)
+{
+    gAllImages.setLaunchMode(flags);
+}
+
+static MainFunc entry_getDriverkitMain(void)
+{
+    return gAllImages.getDriverkitMain();
+}
+
+
+static_assert((closure::kFormatVersion & LibDyldEntryVector::kBinaryFormatVersionMask) == closure::kFormatVersion, "binary format version overflow");
 
 const LibDyldEntryVector entryVectorForDyld = {
     LibDyldEntryVector::kCurrentVectorVersion,
-    launch_cache::binary_format::kFormatVersion,
+    closure::kFormatVersion,
     &entry_setVars,
     &entry_setHaltFunction,
     &entry_setOldAllImageInfo,
     &entry_setInitialImageList,
     &entry_runInitialzersBottomUp,
-    &start,
+    (__typeof(LibDyldEntryVector::startFunc))address_of_start,
     &entry_setChildForkFunction,
     &entry_setLogFunction,
+    &entry_setRestrictions,
+    &entry_setNotifyMonitoringDyldMain,
+    &entry_setNotifyMonitoringDyld,
+    &entry_setHasCacheOverrides,
+    &entry_setProgramVars,
+    &entry_setLaunchMode,
+    &entry_getDriverkitMain,
 };
 
+VIS_HIDDEN void _dyld_atfork_prepare()
+{
+    gAllImages.takeLockBeforeFork();
+}
+
+VIS_HIDDEN void _dyld_atfork_parent()
+{
+    gAllImages.releaseLockInForkParent();
+}
+
 VIS_HIDDEN void _dyld_fork_child()
 {
+    // Note the child fork function updates the data structures inside dyld
     (*sChildForkFunction)();
+
+    // And we then need to update the structures for dyld3 in libdyld
+    gAllImages.resetLockInForkChild();
 }