--- libmalloc/libmalloc-657.60.21/tests/xzone_metapool_tests.c
+++ libmalloc/libmalloc-521.120.7/tests/xzone_metapool_tests.c
@@ -1,75 +1,35 @@
 #include <darwintest.h>
+#include <mach/mach_init.h>
+#include <mach/vm_map.h>
 #include <sys/mman.h>
-
-#include "../src/internal.h" // MALLOC_TARGET_EXCLAVES
 
 #if CONFIG_XZONE_MALLOC
 
-#if MALLOC_TARGET_EXCLAVES
-#include <vas/vas.h>
-#else
-#include <mach/mach_init.h>
-#include <mach/vm_map.h>
-#endif // MALLOC_TARGET_EXCLAVES
-
 static void *
-test_mvm_allocate_plat(uintptr_t addr, size_t size, int flags,
-		uint32_t debug_flags, int vm_page_label, plat_map_t *map_out)
+test_mvm_allocate_pages(size_t size, int vm_page_label)
 {
-#if MALLOC_TARGET_EXCLAVES
-	const _liblibc_map_type_t type = LIBLIBC_MAP_TYPE_PRIVATE |
-			((flags & VM_FLAGS_ANYWHERE) ? 0 : LIBLIBC_MAP_TYPE_FIXED) |
-			((debug_flags & MALLOC_NO_POPULATE) ? LIBLIBC_MAP_TYPE_NOCOMMIT : 0);
-	return mmap_plat(map_out, addr, size,
-			LIBLIBC_MAP_PERM_READ | LIBLIBC_MAP_PERM_WRITE, type, 0,
-			(unsigned)vm_page_label);
-#else
 	vm_address_t vm_addr;
 	kern_return_t kr;
 
 	kr = vm_allocate(mach_task_self(), &vm_addr, size,
 			VM_FLAGS_ANYWHERE | VM_MAKE_TAG(vm_page_label));
 	return kr == KERN_SUCCESS ? (void *)vm_addr : NULL;
-#endif // MALLOC_TARGET_EXCLAVES
 }
 #define mvm_allocate_plat(addr, size, align, flags, debug_flags, vm_page_label, plat) \
-	test_mvm_allocate_plat(addr, size, flags, debug_flags, vm_page_label, plat)
+	test_mvm_allocate_pages(size, vm_page_label)
 
 
 static int
-test_mvm_madvise(void *addr, size_t size, int advice, plat_map_t *map)
+test_mvm_madvise(void *addr, size_t size, int advice)
 {
-#if MALLOC_TARGET_EXCLAVES
-	return !madvise_plat(map, addr, size, LIBLIBC_MAP_HINT_UNUSED);
-#else
 	kern_return_t kr = madvise(addr, size, advice);
 	return kr != - 1;
-#endif // MALLOC_TARGET_EXCLAVES
 }
 #define mvm_madvise_plat(addr, size, advice, debug_flags, plat) \
-	test_mvm_madvise(addr, size, advice, plat)
-
-static void test_malloc_lock_lock(_malloc_lock_s *lock) {
-#if MALLOC_HAS_OS_LOCK
-	os_unfair_lock_lock(lock);
-#else
-	T_QUIET; T_ASSERT_EQ(pthread_mutex_lock(lock), 0, "Lock lock");
-#endif // MALLOC_HAS_OS_LOCK
-}
-#define _malloc_lock_lock(lock) test_malloc_lock_lock(lock);
-
-static void test_malloc_lock_unlock(_malloc_lock_s *lock) {
-#if MALLOC_HAS_OS_LOCK
-	os_unfair_lock_unlock(lock);
-#else
-	T_QUIET; T_ASSERT_EQ(pthread_mutex_unlock(lock), 0, "Unlock lock");
-#endif // MALLOC_HAS_OS_LOCK
-}
-#define _malloc_lock_unlock(lock) test_malloc_lock_unlock(lock);
+	test_mvm_madvise(addr, size, advice)
 
 #include "../src/xzone/xzone_metapool.c"
 
-#if !MALLOC_TARGET_EXCLAVES
 bool check_page_is_dirty(void *page) {
 	int disposition = 0;
 	mach_vm_size_t disp_count = 1;
@@ -80,7 +40,6 @@
 	T_QUIET; T_ASSERT_EQ(kr, KERN_SUCCESS, "Query page disposition");
 	return disposition & VM_PAGE_QUERY_PAGE_DIRTY;
 }
-#endif // !MALLOC_TARGET_EXCLAVES
 
 T_DECL(xzone_metapool_metadata,
 		"Check that metapools with metadata allocator madvise blocks") {
@@ -116,19 +75,15 @@
 
 	for (int i = 0; i < num_data_blocks; i++) {
 		memset(data[i], 'A', data_size);
-#if !MALLOC_TARGET_EXCLAVES
 		T_EXPECT_TRUE(check_page_is_dirty(data[i]),
 				"Page is dirty after memset");
-#endif // !MALLOC_TARGET_EXCLAVES
 
 	}
 
 	for (int i = 0; i < num_data_blocks; i++) {
 		xzm_metapool_free(&data_pool, data[i]);
-#if !MALLOC_TARGET_EXCLAVES
 		T_EXPECT_FALSE(check_page_is_dirty(data[i]),
 				"Freed page is not dirty");
-#endif // !MALLOC_TARGET_EXCLAVES
 	}
 }