--- dyld/dyld-1330/common/FileManager.cpp
+++ dyld/dyld-1042.1/common/FileManager.cpp
@@ -21,10 +21,6 @@
  *
  * @APPLE_LICENSE_HEADER_END@
  */
-
-#include <TargetConditionals.h>
-
-#if !TARGET_OS_EXCLAVEKIT
 
 #include <fcntl.h>
 #include <unistd.h>
@@ -47,9 +43,6 @@
 FileManager::FileManager(Allocator& allocator, const SyscallDelegate* syscall)
 : _syscall(syscall), _allocator(&allocator), _fsUUIDMap(_allocator->makeUnique<OrderedMap<uint64_t,UUID>>(*_allocator)) {}
 
-FileManager::FileManager(Allocator& allocator)
-    : _syscall(nullptr), _allocator(&allocator), _fsUUIDMap(_allocator->makeUnique<OrderedMap<uint64_t,UUID>>(*_allocator)) {}
-
 void FileManager::swap(FileManager& other) {
     using std::swap;
 
@@ -57,14 +50,13 @@
     std::swap(_fsUUIDMap,   other._fsUUIDMap);
 }
 
-FileRecord FileManager::fileRecordForPath(Allocator& allocator, const char* filePath) {
-    const char* str = nullptr;
-    if ( filePath )
-        str = allocator.strdup(filePath);
+
+FileRecord FileManager::fileRecordForPath(const char* filePath) {
+    auto str = _allocator->strdup(filePath);
     return FileRecord(*this, UniquePtr<const char>(str));
 }
 
-FileRecord FileManager::fileRecordForStat(const struct stat& sb) {
+FileRecord FileManager::fileRecordForStat(struct stat& sb) {
     return FileRecord(*this, sb);
 }
 
@@ -97,7 +89,6 @@
     } __attribute__((aligned(4), packed));
     typedef struct VolAttrBuf VolAttrBuf;
 
-    STACK_ALLOCATOR(ephemeralAllocator, 0);
     while (1) {
         int fsCount = getfsstat(nullptr, 0, MNT_NOWAIT);
         if (fsCount == -1) {
@@ -105,10 +96,10 @@
             break;
         }
         int fsInfoSize = fsCount*sizeof(struct statfs);
-        auto fsInfos = (struct statfs *)ephemeralAllocator.malloc(fsInfoSize);
+        auto fsInfos = (struct statfs *)_allocator->malloc(fsInfoSize);
         if (this->getfsstat(fsInfos, fsInfoSize, MNT_NOWAIT) != fsCount) {
             // Retry
-            ephemeralAllocator.free((void*)fsInfos);
+            _allocator->free((void*)fsInfos);
             continue;
         }
         for (auto i = 0; i < fsCount; ++i) {
@@ -117,13 +108,13 @@
             // groups that are not relevent here.
             uint64_t f_fsid = (*((uint64_t*)&fsInfos[i].f_fsid)) & 0x00ffffffff;
             if (_fsUUIDMap->find(f_fsid) != _fsUUIDMap->end()) { continue; }
-
-            // getattrlist() can upcall when used against a non-root volume which results in a deadlock.
+#if TARGET_OS_OSX
+            // On macOS getattrlist() can upcall when used against a non-root volume which results in a deadlock.
             if ((fsInfos[i].f_flags & MNT_ROOTFS) == 0) {
                 _fsUUIDMap->insert({f_fsid, UUID()});
                 continue;
             }
-
+#endif
             int             err;
             attrlist        attrList;
             VolAttrBuf      attrBuf;
@@ -141,7 +132,7 @@
                 _fsUUIDMap->insert({f_fsid, UUID()});
             }
         }
-        ephemeralAllocator.free((void*)fsInfos);
+        _allocator->free((void*)fsInfos);
         break;
     }
 }
@@ -193,13 +184,13 @@
 
 UniquePtr<char> FileManager::getPath(uint64_t fsid, uint64_t OID) {
     if ((fsid == 0) || (OID == 0)) { return nullptr; }
-    char path[PATH_MAX];
-    ssize_t result = this->fsgetpath(&path[0], PATH_MAX, fsid, OID);
+    char path[MAXPATHLEN];
+    ssize_t result = this->fsgetpath(&path[0], MAXPATHLEN, fsid, OID);
 #if !__LP64__
     //FIXME: Workaround for missing stat high bit on 32 bit platforms
     if (result == -1) {
         OID = 0x0fffffff00000000ULL | OID;
-        result = this->fsgetpath(&path[0], PATH_MAX, fsid, OID);
+        result = this->fsgetpath(&path[0], MAXPATHLEN, fsid, OID);
     }
 #endif
     if (result == -1) {
@@ -252,7 +243,7 @@
         }
     }
 
-FileRecord::FileRecord(FileManager& fileManager, const struct stat& sb)
+FileRecord::FileRecord(FileManager& fileManager, struct stat& sb)
     :  _fileManager(&fileManager), _objectID(sb.st_ino), _device(sb.st_dev), _volume(_fileManager->uuidForFileSystem(_device)), _mtime(sb.st_mtime), _statResult(0) {}
 
 FileRecord::FileRecord(const FileRecord& other)
@@ -386,5 +377,3 @@
 }
 
 }; /* namedpace dyld4 */
-
-#endif // !TARGET_OS_EXCLAVEKIT