--- dyld/dyld-1284.13/common/Diagnostics.cpp
+++ dyld/dyld-1042.1/common/Diagnostics.cpp
@@ -21,23 +21,33 @@
  * @APPLE_LICENSE_HEADER_END@
  */
 
+#include <iostream>
 
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
-#include <TargetConditionals.h>
-#include "Defines.h"
-#if TARGET_OS_EXCLAVEKIT
-  extern "C" void abort_report_np(const char* format, ...) __attribute__((noreturn,format(printf, 1, 2)));
-#else
-  #include <_simple.h>
-  #include <libc_private.h>
-#endif
-#if BUILDING_CACHE_BUILDER || BUILDING_UNIT_TESTS || BUILDING_CACHE_BUILDER_UNIT_TESTS
-  #include <mach/mach_time.h> // mach_absolute_time()
-  #include <iostream>
-#endif
+#include <uuid/uuid.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <_simple.h>
+#include <unistd.h>
+#include <sys/uio.h>
+#include <sys/param.h>
+#include <sys/sysctl.h>
+#include <sys/resource.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/mman.h>
+#include <dirent.h>
+#include <mach/mach.h>
+#include <mach/machine.h>
+#include <mach/mach_time.h>
+#include <mach-o/loader.h>
+#include <mach-o/nlist.h>
+#include <mach-o/fat.h>
+#include <pthread.h>
+#include <libc_private.h>
 
 #include "Diagnostics.h"
 
@@ -51,9 +61,6 @@
     : _prefix(""), _verbose(verbose)
 #endif
 {
-#if TARGET_OS_EXCLAVEKIT
-    _strBuf[0] = '\0';
-#endif
 }
 
 #if BUILDING_CACHE_BUILDER || BUILDING_UNIT_TESTS || BUILDING_CACHE_BUILDER_UNIT_TESTS
@@ -72,19 +79,15 @@
 {
     va_list    list;
     va_start(list, format);
-    error(format, va_list_wrap(list));
-    va_end(list);
-}
-
-void Diagnostics::error(const char* format, va_list_wrap vaWrap)
-{
-#if TARGET_OS_EXCLAVEKIT
-    vsnprintf(_strBuf, sizeof(_strBuf), format, vaWrap.list);
-#else
+    error(format, list);
+    va_end(list);
+}
+
+void Diagnostics::error(const char* format, va_list list)
+{
     if ( _buffer == nullptr )
         _buffer = _simple_salloc();
-    _simple_vsprintf(_buffer, format, vaWrap.list);
-#endif
+    _simple_vsprintf(_buffer, format, list);
 
 #if BUILDING_CACHE_BUILDER || BUILDING_UNIT_TESTS || BUILDING_CACHE_BUILDER_UNIT_TESTS
     if ( !_verbose )
@@ -100,62 +103,42 @@
 
  void Diagnostics::appendError(const char* format, ...)
  {
-#if TARGET_OS_EXCLAVEKIT
-    size_t len = strlen(_strBuf);
-    va_list list;
-    va_start(list, format);
-    vsnprintf(&_strBuf[len], sizeof(_strBuf)-len, format, list);
-    va_end(list);
-#else
-   if ( _buffer != nullptr )
+    if ( _buffer != nullptr )
         _simple_sresize(_buffer);
     va_list list;
     va_start(list, format);
-    error(format, va_list_wrap(list));
-    va_end(list);
-#endif
+    error(format, list);
+    va_end(list);
  }
 
 bool Diagnostics::hasError() const
 {
-#if TARGET_OS_EXCLAVEKIT
-    return (*_strBuf != '\0');
-#else
     return _buffer != nullptr;
-#endif
 }
 
 bool Diagnostics::noError() const
 {
-#if TARGET_OS_EXCLAVEKIT
-    return (*_strBuf == '\0');
-#else
     return _buffer == nullptr;
-#endif
 }
 
 void Diagnostics::clearError()
 {
-#if TARGET_OS_EXCLAVEKIT
-    *_strBuf = '\0';
-#else
     if ( _buffer )
         _simple_sfree(_buffer);
     _buffer = nullptr;
-#endif
 }
 
 void Diagnostics::assertNoError() const
 {
-    if ( hasError() )
-        abort_report_np("%s", errorMessageCStr());
+    if ( _buffer != nullptr )
+        abort_report_np("%s", _simple_string(_buffer));
 }
 
 bool Diagnostics::errorMessageContains(const char* subString) const
 {
-    if ( noError() )
+    if ( _buffer == nullptr )
         return false;
-    return (strstr(errorMessageCStr(), subString) != nullptr);
+    return (strstr(_simple_string(_buffer), subString) != nullptr);
 }
 
 #if BUILDING_CACHE_BUILDER || BUILDING_UNIT_TESTS || BUILDING_CACHE_BUILDER_UNIT_TESTS
@@ -237,13 +220,7 @@
 
 const char* Diagnostics::errorMessage() const
 {
-    if ( noError() )
-        return "";
-#if TARGET_OS_EXCLAVEKIT
-    return _strBuf;
-#else
-    return _simple_string(_buffer);
-#endif
+    return _buffer ? _simple_string(_buffer) : "";
 }
 
 #endif
@@ -299,21 +276,3 @@
 
 #endif
 
-#if BUILDING_LD || BUILDING_UNIT_TESTS || BUILDING_SHARED_CACHE_LINKER || BUILDING_CACHE_BUILDER || BUILDING_CACHE_BUILDER_UNIT_TESTS
-
-mach_o::Error Diagnostics::toError() const
-{
-    if ( hasError() )
-        return mach_o::Error("%s", errorMessageCStr());
-    return mach_o::Error::none();
-}
-
-void Diagnostics::error(const mach_o::Error& err)
-{
-    if ( err.noError() )
-        return;
-
-    error("%s", err.message());
-}
-
-#endif