Loading...
dyld3/libdyldEntryVector.cpp dyld-851.27 dyld-733.6
--- dyld/dyld-851.27/dyld3/libdyldEntryVector.cpp
+++ dyld/dyld-733.6/dyld3/libdyldEntryVector.cpp
@@ -38,8 +38,7 @@
 
 VIS_HIDDEN const char** appleParams;
 
-extern void* __ptrauth_dyld_address_auth gUseDyld3;
-extern bool gEnableSharedCacheDataConst;
+extern bool gUseDyld3;
 
 namespace dyld3 {
 
@@ -58,8 +57,7 @@
         return argv0;
 }
 
-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)
+static void entry_setVars(const mach_header* mainMH, int argc, const char* argv[], const char* envp[], const char* apple[])
 {
     NXArgc       = argc;
     NXArgv       = argv;
@@ -72,13 +70,11 @@
     sVars.NXArgvPtr     = &NXArgv;
     sVars.environPtr    = (const char***)&environ;
     sVars.__prognamePtr = &__progname;
-    gAllImages.setProgramVars(&sVars, keysOff, platformBinariesOnly);
+    gAllImages.setProgramVars(&sVars);
 
-    gUseDyld3 = (void*)1;
+    gUseDyld3 = true;
 
     setLoggingFromEnvs(envp);
-
-    gEnableSharedCacheDataConst = enableSharedCacheDataConst;
 }
 
 static void entry_setHaltFunction(void (*func)(const char* message) __attribute__((noreturn)) )
@@ -111,12 +107,11 @@
 }
 
 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)
+                                const DyldSharedCache* dyldCacheLoadAddress, const char* dyldCachePath,
+                                const Array<LoadedImage>& initialImages, LoadedImage& libSystem)
 {
     gAllImages.init(closure, dyldCacheLoadAddress, dyldCachePath, initialImages);
-    gAllImages.applyInterposingToDyldCache(closure, mach_task_self);
+    gAllImages.applyInterposingToDyldCache(closure);
 
     // run initializer for libSytem.B.dylib
     // this calls back into _dyld_initializer which calls gAllIimages.addImages()
@@ -152,24 +147,6 @@
     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 = {
@@ -186,10 +163,7 @@
     &entry_setRestrictions,
     &entry_setNotifyMonitoringDyldMain,
     &entry_setNotifyMonitoringDyld,
-    &entry_setHasCacheOverrides,
-    &entry_setProgramVars,
-    &entry_setLaunchMode,
-    &entry_getDriverkitMain,
+    &entry_setHasCacheOverrides
 };
 
 VIS_HIDDEN void _dyld_atfork_prepare()