--- libmalloc/libmalloc-166.220.1/src/platform.h
+++ libmalloc/libmalloc-646.40.3/src/platform.h
@@ -24,11 +24,25 @@
 #ifndef __PLATFORM_H
 #define __PLATFORM_H
 
-#if TARGET_OS_IPHONE && !TARGET_OS_SIMULATOR
+#include <TargetConditionals.h>
+
+#ifndef MALLOC_TARGET_DK_OSX
+#define MALLOC_TARGET_DK_OSX 0
+#endif // MALLOC_TARGET_DK_OSX
+
+#ifndef MALLOC_TARGET_DK_IOS
+#define MALLOC_TARGET_DK_IOS 0
+#endif // MALLOC_TARGET_DK_OSX
+
+#ifndef MALLOC_TARGET_EXCLAVES_INTROSPECTOR
+#define MALLOC_TARGET_EXCLAVES_INTROSPECTOR 0
+#endif // MALLOC_TARGET_EXCLAVES_INTROSPECTOR
+
+#if (TARGET_OS_IPHONE && !TARGET_OS_SIMULATOR) || (TARGET_OS_DRIVERKIT && !MALLOC_TARGET_DK_OSX)
 #define MALLOC_TARGET_IOS 1
-#else // TARGET_OS_IPHONE && !TARGET_OS_SIMULATOR
+#else // (TARGET_OS_IPHONE && !TARGET_OS_SIMULATOR) || (TARGET_OS_DRIVERKIT && !MALLOC_TARGET_DK_OSX)
 #define MALLOC_TARGET_IOS 0
-#endif // TARGET_OS_IPHONE && !TARGET_OS_SIMULATOR
+#endif // (TARGET_OS_IPHONE && !TARGET_OS_SIMULATOR) || (TARGET_OS_DRIVERKIT && !MALLOC_TARGET_DK_OSX)
 
 #ifdef __LP64__
 #define MALLOC_TARGET_64BIT 1
@@ -36,20 +50,32 @@
 #define MALLOC_TARGET_64BIT 0
 #endif
 
+#if !defined(TARGET_OS_EXCLAVECORE)
+#define TARGET_OS_EXCLAVECORE 0
+#endif
+
+#if !defined(TARGET_OS_EXCLAVEKIT)
+#define TARGET_OS_EXCLAVEKIT 0
+#endif
+
+#if TARGET_OS_EXCLAVECORE || TARGET_OS_EXCLAVEKIT
+#define MALLOC_TARGET_EXCLAVES 1
+#else // TARGET_OS_EXCLAVECORE || TARGET_OS_EXCLAVEKIT
+#define MALLOC_TARGET_EXCLAVES 0
+#endif // TARGET_OS_EXCLAVECORE || TARGET_OS_EXCLAVEKIT
+
 // <rdar://problem/12596555>
+#define CONFIG_RECIRC_DEPOT 1
+#define CONFIG_AGGRESSIVE_MADVISE 1
+
 #if MALLOC_TARGET_IOS
+# define DEFAULT_AGGRESSIVE_MADVISE_ENABLED true
+// <rdar://problem/12596555>
 # define CONFIG_MADVISE_PRESSURE_RELIEF 0
 #else // MALLOC_TARGET_IOS
+# define DEFAULT_AGGRESSIVE_MADVISE_ENABLED false
+// <rdar://problem/12596555>
 # define CONFIG_MADVISE_PRESSURE_RELIEF 1
-#endif // MALLOC_TARGET_IOS
-
-// <rdar://problem/12596555>
-#if MALLOC_TARGET_IOS
-# define CONFIG_RECIRC_DEPOT 1
-# define CONFIG_AGGRESSIVE_MADVISE 1
-#else // MALLOC_TARGET_IOS
-# define CONFIG_RECIRC_DEPOT 1
-# define CONFIG_AGGRESSIVE_MADVISE 0
 #endif // MALLOC_TARGET_IOS
 
 // <rdar://problem/10397726>
@@ -69,27 +95,83 @@
 // enable nano checking for corrupt free list
 #define NANO_FREE_DEQUEUE_DILIGENCE 1
 
+// Conditional behaviour depends on MallocSpaceEfficient being set by
+// JetsamProperties which isn't true on iOS
+#if MALLOC_TARGET_IOS || TARGET_OS_DRIVERKIT
+#define NANOV2_DEFAULT_MODE NANO_ENABLED
+#else
+#define NANOV2_DEFAULT_MODE NANO_CONDITIONAL
+#endif
+
+// whether to pre-reserve all available nano regions during initialization
+#define CONFIG_NANO_RESERVE_REGIONS 0
+
+
 // This governs a last-free cache of 1 that bypasses the free-list for each region size
 #define CONFIG_TINY_CACHE 1
 #define CONFIG_SMALL_CACHE 1
+#define CONFIG_MEDIUM_CACHE 1
+
+// medium allocator enabled or disabled
+#if MALLOC_TARGET_64BIT
+#if MALLOC_TARGET_IOS
+#define CONFIG_MEDIUM_ALLOCATOR 0
+#else // MALLOC_TARGET_IOS
+#define CONFIG_MEDIUM_ALLOCATOR 1
+#endif // MALLOC_TARGET_IOS
+#else // MALLOC_TARGET_64BIT
+#define CONFIG_MEDIUM_ALLOCATOR 0
+#endif // MALLOC_TARGET_64BIT
+
+
+#if CONFIG_MEDIUM_ALLOCATOR
+#define DEFAULT_MEDIUM_ALLOCATOR_ENABLED 1
+#else // CONFIG_MEDIUM_ALLOCATOR
+#define DEFAULT_MEDIUM_ALLOCATOR_ENABLED 0
+#endif // CONFIG_MEDIUM_ALLOCATOR
+
 
 // The large last-free cache (aka. death row cache)
+#if TARGET_OS_IOS || TARGET_OS_SIMULATOR || TARGET_OS_DRIVERKIT
+// sdk=iphoneos, simulator, sdk=driverkit
+#define CONFIG_LARGE_CACHE 1
+#elif MALLOC_TARGET_IOS
+// all other embedded
+#define CONFIG_LARGE_CACHE 0
+#else
+// Mac
+#define CONFIG_LARGE_CACHE 1
+#endif
+
+#if CONFIG_LARGE_CACHE
+
+#if MALLOC_TARGET_IOS && MALLOC_TARGET_64BIT
+#define DEFAULT_LARGE_CACHE_ENABLED false
+#define CONFIG_DEFERRED_RECLAIM 1
+
+#elif TARGET_OS_SIMULATOR || (MALLOC_TARGET_IOS && !MALLOC_TARGET_64BIT)
+#define DEFAULT_LARGE_CACHE_ENABLED false
+#define CONFIG_DEFERRED_RECLAIM 0
+
+#else // TARGET_OS_SIMULATOR || (MALLOC_TARGET_IOS && !MALLOC_TARGET_64BIT)
+#define DEFAULT_LARGE_CACHE_ENABLED true
+#define CONFIG_DEFERRED_RECLAIM 0
+
+#endif // TARGET_OS_SIMULATOR || (MALLOC_TARGET_IOS && !MALLOC_TARGET_64BIT)
+
+#else // CONFIG_LARGE_CACHE
+#define  CONFIG_DEFERRED_RECLAIM 0
+
+#endif // CONFIG_LARGE_CACHE
+
 #if MALLOC_TARGET_IOS
-#define CONFIG_LARGE_CACHE 0
-#else
-#define CONFIG_LARGE_CACHE 1
-#endif
-
-// <rdar://problem/26823590> compile-time MALLOC_SMALL cut-off size
-#if MALLOC_TARGET_IOS
-#if MALLOC_TARGET_64BIT
-MALLOC_STATIC_ASSERT(PAGE_MAX_SIZE == 16 * 1024, "Expected 16k pages");
-// TODO: rdar://problem/35395572
-#define CONFIG_SMALL_CUTOFF_DYNAMIC 0
-#endif
-#else
-#define CONFIG_SMALL_CUTOFF_LARGEMEM 1
-#endif // MALLOC_TARGET_IOS
+// The VM system on iOS forces malloc-tagged memory to never be marked as
+// copy-on-write, this would include calls we make to vm_copy. Given that the
+// kernel would just be doing a memcpy, we force it to happen in userpsace.
+#define CONFIG_REALLOC_CAN_USE_VMCOPY 0
+#else
+#define CONFIG_REALLOC_CAN_USE_VMCOPY 1
+#endif
 
 // memory resource exception handling
 #if MALLOC_TARGET_IOS || TARGET_OS_SIMULATOR
@@ -98,14 +180,71 @@
 #define ENABLE_MEMORY_RESOURCE_EXCEPTION_HANDLING 1
 #endif
 
+#if !TARGET_OS_DRIVERKIT && (!TARGET_OS_OSX || MALLOC_TARGET_64BIT)
+#define CONFIG_FEATUREFLAGS_SIMPLE 1
+#else
+#define CONFIG_FEATUREFLAGS_SIMPLE 0
+#endif
+
 // presence of commpage memsize
 #define CONFIG_HAS_COMMPAGE_MEMSIZE 1
 
 // presence of commpage number of cpu count
 #define CONFIG_HAS_COMMPAGE_NCPUS 1
 
+// Distribute magazines by cluster number if nmagazines == nclusters
+#if (TARGET_OS_IOS && !TARGET_OS_SIMULATOR) || \
+		MALLOC_TARGET_DK_IOS || \
+		TARGET_OS_OSX || MALLOC_TARGET_DK_OSX
+#define CONFIG_MAGAZINE_PER_CLUSTER 1
+#else
+#define CONFIG_MAGAZINE_PER_CLUSTER 0
+#endif
+
+
 // Use of hyper-shift for magazine selection.
-#define CONFIG_TINY_USES_HYPER_SHIFT 0
-#define CONFIG_SMALL_USES_HYPER_SHIFT 0
+#define CONFIG_NANO_USES_HYPER_SHIFT 0
+#define CONFIG_SZONE_USES_HYPER_SHIFT 0
+
+#if TARGET_OS_OSX
+#define CONFIG_CHECK_PLATFORM_BINARY 1
+#else
+#define CONFIG_CHECK_PLATFORM_BINARY 0
+#endif
+
+#define CONFIG_CHECK_SECURITY_POLICY 1
+
+#define MALLOC_ZERO_POLICY_DEFAULT MALLOC_ZERO_ON_FREE
+
+
+#ifndef MALLOC_XZONE_ENABLED_DEFAULT
+#define MALLOC_XZONE_ENABLED_DEFAULT false
+#endif
+
+#if MALLOC_TARGET_64BIT
+#define CONFIG_EARLY_MALLOC 1
+#else
+#define CONFIG_EARLY_MALLOC 0
+#endif
+
+#if TARGET_OS_IOS
+#define MALLOC_TARGET_IOS_ONLY 1
+#else
+#define MALLOC_TARGET_IOS_ONLY 0
+#endif
+
+
+#if MALLOC_TARGET_IOS_ONLY || TARGET_OS_OSX
+#define CONFIG_MALLOC_PROCESS_IDENTITY 1
+#else
+#define CONFIG_MALLOC_PROCESS_IDENTITY 0
+#endif
+
+#ifndef CONFIG_SANITIZER
+#define CONFIG_SANITIZER 1
+#endif
+
+#define MALLOC_SECURE_ALLOCATOR_LAUNCHD_ENABLED_DEFAULT true
+
 
 #endif // __PLATFORM_H