--- libmalloc/libmalloc-646.0.13/src/platform.h
+++ libmalloc/libmalloc-409.81.2/src/platform.h
@@ -24,20 +24,6 @@
 #ifndef __PLATFORM_H
 #define __PLATFORM_H
 
-#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) || (TARGET_OS_DRIVERKIT && !MALLOC_TARGET_DK_OSX)
@@ -50,19 +36,12 @@
 #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>
+#if MALLOC_TARGET_IOS
+# define CONFIG_MADVISE_PRESSURE_RELIEF 0
+#else // MALLOC_TARGET_IOS
+# define CONFIG_MADVISE_PRESSURE_RELIEF 1
+#endif // MALLOC_TARGET_IOS
 
 // <rdar://problem/12596555>
 #define CONFIG_RECIRC_DEPOT 1
@@ -70,12 +49,8 @@
 
 #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/10397726>
@@ -103,9 +78,6 @@
 #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
@@ -122,14 +94,6 @@
 #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
@@ -158,10 +122,6 @@
 #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
@@ -186,65 +146,34 @@
 #define CONFIG_FEATUREFLAGS_SIMPLE 0
 #endif
 
+// Quarantine zone, only useful on macOS (+ DriverKit, 64-bit simulators).
+#if (TARGET_OS_OSX || TARGET_OS_DRIVERKIT || TARGET_OS_SIMULATOR) && MALLOC_TARGET_64BIT
+#define CONFIG_QUARANTINE 1
+#else
+#define CONFIG_QUARANTINE 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
+// Use of hyper-shift for magazine selection.
+#define CONFIG_NANO_USES_HYPER_SHIFT 0
+#define CONFIG_TINY_USES_HYPER_SHIFT 0
+#define CONFIG_SMALL_USES_HYPER_SHIFT 0
+
+// FIXME: limit number of malloc_create_zone() wrapper zones for watchOS to remove this
+#if TARGET_OS_OSX || TARGET_OS_IOS
+#define CONFIG_PGM_WRAP_CUSTOM_ZONES 1
 #else
-#define CONFIG_MAGAZINE_PER_CLUSTER 0
+#define CONFIG_PGM_WRAP_CUSTOM_ZONES 0
 #endif
 
 
-// Use of hyper-shift for magazine selection.
-#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
+#ifndef MALLOC_ZERO_POLICY_DEFAULT
+#define MALLOC_ZERO_POLICY_DEFAULT MALLOC_ZERO_ON_FREE
 #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