--- /dev/null
+++ dyld/dyld-1340/mach_o/Error.cpp
@@ -0,0 +1,139 @@
+/*
+ * Copyright (c) 2017 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ *
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ *
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+#include <assert.h>
+#include <uuid/uuid.h>
+#include <errno.h>
+#include <TargetConditionals.h>
+#if !TARGET_OS_EXCLAVEKIT
+  #include <_simple.h>
+#endif // !TARGET_OS_EXCLAVEKIT
+
+#include <mach/machine.h>
+#include <mach-o/fat.h>
+
+#include "Error.h"
+
+namespace mach_o {
+
+
+Error::Error(Error&& other)
+{
+    _buffer = other._buffer;
+    other._buffer = nullptr;
+}
+
+Error& Error::operator=(Error&& other)
+{
+    _buffer = other._buffer;
+    other._buffer = nullptr;
+    return *this;
+}
+
+
+Error Error::copy(const Error& other)
+{
+    if ( other.noError() )
+        return Error::none();
+    return Error("%s", other.message());
+}
+
+Error::~Error()
+{
+#if TARGET_OS_EXCLAVEKIT
+    *_strBuf = '\0';
+#else
+   if ( _buffer )
+        _simple_sfree(_buffer);
+    _buffer = nullptr;
+#endif
+}
+
+Error::Error(const char* format, ...)
+{
+    va_list    list;
+    va_start(list, format);
+#if TARGET_OS_EXCLAVEKIT
+    vsnprintf(_strBuf, sizeof(_strBuf), format, list);
+#else
+    if ( _buffer == nullptr )
+        _buffer = _simple_salloc();
+    _simple_vsprintf(_buffer, format, list);
+#endif
+    va_end(list);
+}
+
+Error::Error(const char* format, va_list_wrap vaWrap)
+{
+#if TARGET_OS_EXCLAVEKIT
+    vsnprintf(_strBuf, sizeof(_strBuf), format, vaWrap.list);
+#else
+    if ( _buffer == nullptr )
+        _buffer = _simple_salloc();
+    _simple_vsprintf(_buffer, format, vaWrap.list);
+#endif
+}
+
+const char* Error::message() const
+{
+#if TARGET_OS_EXCLAVEKIT
+    return _strBuf;
+#else
+    return _buffer ? _simple_string(_buffer) : "";
+#endif
+}
+
+bool Error::messageContains(const char* subString) const
+{
+    if ( _buffer == nullptr )
+        return false;
+#if TARGET_OS_EXCLAVEKIT
+    return (strstr(_strBuf, subString) != nullptr);
+#else
+    return (strstr(_simple_string(_buffer), subString) != nullptr);
+#endif
+}
+
+void Error::append(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
+    assert(_buffer != nullptr);
+    _simple_sresize(_buffer);   // move insertion point to end of existing string in buffer
+    va_list list;
+    va_start(list, format);
+    _simple_vsprintf(_buffer, format, list);
+    va_end(list);
+#endif
+}
+
+
+} // namespace mach_o