--- libmalloc/libmalloc-657.60.21/src/platform.h
+++ libmalloc/libmalloc-715.100.22/src/platform.h
@@ -32,7 +32,11 @@
 
 #ifndef MALLOC_TARGET_DK_IOS
 #define MALLOC_TARGET_DK_IOS 0
-#endif // MALLOC_TARGET_DK_OSX
+#endif // MALLOC_TARGET_DK_IOS
+
+#ifndef MALLOC_TARGET_DK_VISIONOS
+#define MALLOC_TARGET_DK_VISIONOS 0
+#endif // MALLOC_TARGET_DK_VISIONOS
 
 #ifndef MALLOC_TARGET_EXCLAVES_INTROSPECTOR
 #define MALLOC_TARGET_EXCLAVES_INTROSPECTOR 0
@@ -43,6 +47,12 @@
 #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) || (TARGET_OS_DRIVERKIT && !MALLOC_TARGET_DK_OSX)
+
+#if TARGET_OS_IOS && !TARGET_OS_VISION
+#define MALLOC_TARGET_IOS_ONLY 1
+#else
+#define MALLOC_TARGET_IOS_ONLY 0
+#endif
 
 #ifdef __LP64__
 #define MALLOC_TARGET_64BIT 1
@@ -84,11 +94,15 @@
 // <rdar://problem/19818071>
 #define CONFIG_MADVISE_STYLE MADV_FREE_REUSABLE
 
+#if MALLOC_TARGET_64BIT && !TARGET_OS_WATCH && !MALLOC_TARGET_EXCLAVES
+#define CONFIG_NANOZONE 1
+#else
+#define CONFIG_NANOZONE 0
+#endif
+
 #if MALLOC_TARGET_64BIT
-#define CONFIG_NANOZONE 1
 #define CONFIG_ASLR_INTERNAL 0
 #else // MALLOC_TARGET_64BIT
-#define CONFIG_NANOZONE 0
 #define CONFIG_ASLR_INTERNAL 1
 #endif // MALLOC_TARGET_64BIT
 
@@ -132,42 +146,44 @@
 
 
 // The large last-free cache (aka. death row cache)
-#if TARGET_OS_IOS || TARGET_OS_SIMULATOR || TARGET_OS_DRIVERKIT
-// sdk=iphoneos, simulator, sdk=driverkit
+#if (TARGET_OS_IOS && !TARGET_OS_VISION) || TARGET_OS_OSX || \
+		TARGET_OS_SIMULATOR || TARGET_OS_DRIVERKIT
 #define CONFIG_LARGE_CACHE 1
-#elif MALLOC_TARGET_IOS
-// all other embedded
+#if TARGET_OS_OSX
+# define DEFAULT_LARGE_CACHE_ENABLED true
+#else
+# define DEFAULT_LARGE_CACHE_ENABLED false
+#endif // TARGET_OS_OSX
+#else
 #define CONFIG_LARGE_CACHE 0
-#else
-// Mac
-#define CONFIG_LARGE_CACHE 1
-#endif
-
+#define DEFAULT_LARGE_CACHE_ENABLED false
+#endif
+
+// Deferred reclaim
 #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
-
+#define CONFIG_MAGAZINE_DEFERRED_RECLAIM 1
+#define CONFIG_XZM_DEFERRED_RECLAIM 1
+#elif TARGET_OS_OSX && !MALLOC_TARGET_DK_OSX
+#define CONFIG_MAGAZINE_DEFERRED_RECLAIM 0
+#define CONFIG_XZM_DEFERRED_RECLAIM 1
+#else
+#define CONFIG_MAGAZINE_DEFERRED_RECLAIM 0
+#define CONFIG_XZM_DEFERRED_RECLAIM 0
+#endif // MALLOC_TARGET_IOS && MALLOC_TARGET_64BIT
+#else
+#define CONFIG_MAGAZINE_DEFERRED_RECLAIM 0
+#define CONFIG_XZM_DEFERRED_RECLAIM 0
 #endif // CONFIG_LARGE_CACHE
 
-#if MALLOC_TARGET_IOS
+#if CONFIG_MAGAZINE_DEFERRED_RECLAIM && !CONFIG_LARGE_CACHE
+#error "Deferred reclaim requires large cache"
+#endif // CONFIG_MAGAZINE_DEFERRED_RECLAIM && !CONFIG_LARGE_CACHE
+
+#if MALLOC_TARGET_IOS || MALLOC_TARGET_EXCLAVES
 // 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.
+// kernel would just be doing a memcpy, we force it to happen in userspace.
 #define CONFIG_REALLOC_CAN_USE_VMCOPY 0
 #else
 #define CONFIG_REALLOC_CAN_USE_VMCOPY 1
@@ -193,7 +209,7 @@
 #define CONFIG_HAS_COMMPAGE_NCPUS 1
 
 // Distribute magazines by cluster number if nmagazines == nclusters
-#if (TARGET_OS_IOS && !TARGET_OS_SIMULATOR) || \
+#if (MALLOC_TARGET_IOS_ONLY && !TARGET_OS_SIMULATOR) || \
 		MALLOC_TARGET_DK_IOS || \
 		TARGET_OS_OSX || MALLOC_TARGET_DK_OSX
 #define CONFIG_MAGAZINE_PER_CLUSTER 1
@@ -201,6 +217,21 @@
 #define CONFIG_MAGAZINE_PER_CLUSTER 0
 #endif
 
+// Support cluster-aware policies in xzone malloc
+#if ((TARGET_OS_IOS || TARGET_OS_VISION) && !TARGET_OS_SIMULATOR) || \
+		MALLOC_TARGET_DK_IOS || MALLOC_TARGET_DK_VISIONOS || \
+		TARGET_OS_OSX || MALLOC_TARGET_DK_OSX
+#define CONFIG_XZM_CLUSTER_AWARE 1
+#else
+#define CONFIG_XZM_CLUSTER_AWARE 0
+#endif
+
+// Build with supporting logic for cluster awareness in either allocator
+#if CONFIG_MAGAZINE_PER_CLUSTER || CONFIG_XZM_CLUSTER_AWARE
+#define CONFIG_CLUSTER_AWARE 1
+#else
+#define CONFIG_CLUSTER_AWARE 0
+#endif
 
 // Use of hyper-shift for magazine selection.
 #define CONFIG_NANO_USES_HYPER_SHIFT 0
@@ -212,8 +243,6 @@
 #define CONFIG_CHECK_PLATFORM_BINARY 0
 #endif
 
-#define CONFIG_CHECK_SECURITY_POLICY 1
-
 #define MALLOC_ZERO_POLICY_DEFAULT MALLOC_ZERO_ON_FREE
 
 
@@ -227,14 +256,7 @@
 #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
+#if MALLOC_TARGET_IOS_ONLY || TARGET_OS_VISION || TARGET_OS_OSX
 #define CONFIG_MALLOC_PROCESS_IDENTITY 1
 #else
 #define CONFIG_MALLOC_PROCESS_IDENTITY 0