--- libmalloc/libmalloc-140.1.1/xcodeconfig/libmalloc.xcconfig
+++ libmalloc/libmalloc-283.100.5/xcodeconfig/libmalloc.xcconfig
@@ -4,15 +4,27 @@
 SUPPORTED_PLATFORMS = macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator
 BUILD_VARIANTS = normal debug
 
+SDK_INSTALL_VARIANT = $(SDK_INSTALL_VARIANT_$(DRIVERKIT))
+SDK_INSTALL_VARIANT_1 = driverkit
+SDK_INSTALL_VARIANT_ = default
+SDK_INSTALL_ROOT = $(SDK_INSTALL_ROOT_$(SDK_INSTALL_VARIANT))
+SDK_INSTALL_ROOT_driverkit = $(DRIVERKITROOT)
+SDK_INSTALL_HEADERS_ROOT = $(SDK_INSTALL_HEADERS_ROOT_$(SDK_INSTALL_VARIANT))
+SDK_INSTALL_HEADERS_ROOT_driverkit = $(SDK_INSTALL_ROOT)/$(SDK_RUNTIME_HEADERS_PREFIX)
+SDK_RUNTIME_HEADERS_PREFIX = Runtime
+
 PRODUCT_NAME = libsystem_malloc
-INSTALL_PATH = /usr/lib/system
-PUBLIC_HEADERS_FOLDER_PATH = /usr/include/malloc
-PRIVATE_HEADERS_FOLDER_PATH = /usr/local/include
+INSTALL_PATH = $(SDK_INSTALL_ROOT)/usr/lib/system
+PUBLIC_HEADERS_FOLDER_PATH = $(SDK_INSTALL_HEADERS_ROOT)/usr/include/malloc
+PRIVATE_HEADERS_FOLDER_PATH = $(SDK_INSTALL_HEADERS_ROOT)/usr/local/include
+USE_HEADERMAP = NO
 
-SYSTEM_FRAMEWORK_HEADERS = $(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders
-HEADER_SEARCH_PATHS = $(DERIVED_FILES_DIR)/dtrace $(SRCROOT)/include $(SYSTEM_FRAMEWORK_HEADERS) $(SDKROOT)/usr/local/include $(inherited)
+SYSTEM_FRAMEWORK_HEADERS = $(SDKROOT)/$(SDK_INSTALL_HEADERS_ROOT)/System/Library/Frameworks/System.framework/PrivateHeaders
+HEADER_SEARCH_PATHS = $(DERIVED_FILES_DIR)/dtrace $(SRCROOT)/include $(SRCROOT)/private $(SRCROOT)/resolver $(inherited)
+SYSTEM_HEADER_SEARCH_PATHS = $(SYSTEM_FRAMEWORK_HEADERS) $(SDKROOT)/$(SDK_INSTALL_HEADERS_ROOT)/usr/local/include $(SDKROOT)/$(SDK_INSTALL_HEADERS_ROOT)/usr/include
+SYSTEM_FRAMEWORK_SEARCH_PATHS = $(SDKROOT)/$(SDK_INSTALL_HEADERS_ROOT)/System/Library/Frameworks
 
-GCC_PREPROCESSOR_DEFINITIONS = _FORTIFY_SOURCE=0 NDEBUG $(OSATOMIC_PREPROCESSOR_DEFINITIONS)
+GCC_PREPROCESSOR_DEFINITIONS = _FORTIFY_SOURCE=0 NDEBUG $(OSATOMIC_PREPROCESSOR_DEFINITIONS) $(PLATFORM_PREPROCESSOR_DEFINITIONS)
 OSATOMIC_PREPROCESSOR_DEFINITIONS = OSATOMIC_USE_INLINED=1 OS_UNFAIR_LOCK_INLINE=1
 OSATOMIC_PREPROCESSOR_DEFINITIONS_NOINLINE = OSATOMIC_DEPRECATED=0 OSATOMIC_USE_INLINED=0 OS_UNFAIR_LOCK_INLINE=0
 
@@ -48,12 +60,16 @@
 // clang doesn't understand the simple_printf %y specifier
 WARNING_CFLAGS = -Wno-format-invalid-specifier -Wno-format-extra-args
 
-LLVM_LTO = YES
+LLVM_LTO = LLVM_LTO_$(CURRENT_VARIANT)
+LLVM_LTO_normal = YES
+LLVM_LTO_debug = NO
 DEAD_CODE_STRIPPING = NO
+
+IS_ZIPPERED = YES
 
 SIM_SUFFIX[sdk=*simulator*] = _sim
 LINK_WITH_STANDARD_LIBRARIES = NO
-OTHER_LDFLAGS = -all_load -L/usr/lib/system -umbrella System $(CR_LDFLAGS) $(LIBCOMPILER_RT_LDFLAGS) $(LIBDYLD_LDFLAGS) $(LIBSYSCALL_LDFLAGS) $(LIBPLATFORM_LDFLAGS) $(UPLINK_LDFLAGS) $(INTERPOSE_LDFLAGS)
+OTHER_LDFLAGS = -all_load -L$(SDK_INSTALL_ROOT)/usr/lib/system -umbrella System $(CR_LDFLAGS) $(LIBCOMPILER_RT_LDFLAGS) $(LIBDYLD_LDFLAGS) $(LIBSYSCALL_LDFLAGS) $(LIBPLATFORM_LDFLAGS) $(PLATFORM_LDFLAGS) $(UPLINK_LDFLAGS) $(INTERPOSE_LDFLAGS) $(DIRTY_LDFLAGS)
 LIBCOMPILER_RT_LDFLAGS = -lcompiler_rt
 LIBPLATFORM_LDFLAGS = -lsystem$(SIM_SUFFIX)_platform
 LIBSYSCALL_LDFLAGS = -lsystem$(SIM_SUFFIX)_kernel
@@ -66,6 +82,28 @@
 
 ORDER_FILE = $(SDKROOT)/$(APPLE_INTERNAL_DIR)/OrderFiles/$(PRODUCT_NAME).order
 ORDER_FILE[sdk=*simulator*] =
+ORDER_FILE[sdk=driverkit*] =
 
 DYLIB_CURRENT_VERSION = $(CURRENT_PROJECT_VERSION)
 
+// #ifndef __OPEN_SOURCE__
+CR_LDFLAGS = -lCrashReporterClient
+// on architectures with OSAtomic & os_unfair_lock dyld resolvers we cannot
+// inline and need to callout to libplatform symbols rdar://problem/30155088
+OSATOMIC_PREPROCESSOR_DEFINITIONS[arch=armv7] = $(OSATOMIC_PREPROCESSOR_DEFINITIONS_NOINLINE)
+OSATOMIC_PREPROCESSOR_DEFINITIONS[arch=armv7k] = $(OSATOMIC_PREPROCESSOR_DEFINITIONS_NOINLINE)
+OSATOMIC_PREPROCESSOR_DEFINITIONS[arch=arm64] = $(OSATOMIC_PREPROCESSOR_DEFINITIONS_NOINLINE)
+ARMV81_CFLAGS = -mcpu=monsoon
+
+MALLOC_RESOLVER_SOURCE_FILE_NAMES				= resolver.c
+
+COPY_HEADERS_RUN_UNIFDEF = YES
+COPY_HEADERS_UNIFDEF_FLAGS = $(COPY_HEADERS_UNIFDEF_FLAGS_$(RC_HIDE_HARDWARE_FALL_2018_IOS))
+COPY_HEADERS_UNIFDEF_FLAGS_ = -URC_HIDE_HARDWARE_FALL_2018_IOS
+COPY_HEADERS_UNIFDEF_FLAGS_1 = -DRC_HIDE_HARDWARE_FALL_2018_IOS
+
+// #endif __OPEN_SOURCE__
+
+SUPPORTS_TEXT_BASED_API = YES
+TAPI_VERIFY_MODE = Pedantic
+OTHER_TAPI_FLAGS = -umbrella System -extra-private-header $(SRCROOT)/private/make_tapi_happy.h -extra-private-header $(SRCROOT)/src/frozen_malloc.h -extra-private-header $(SRCROOT)/private/stack_logging.h -extra-private-header $(SRCROOT)/private/malloc_implementation.h