--- libmalloc/libmalloc-317.140.5/tests/Makefile
+++ libmalloc/libmalloc-140.50.6/tests/Makefile
@@ -5,65 +5,67 @@
 
 include $(DEVELOPER_DIR)/AppleInternal/Makefiles/darwintest/Makefile.common
 
-TRACE_FILES := \
-	$(notdir $(wildcard $(SRCROOT)/../traces/*.mtrace))
-
-# add trace files without the traces/ prefix, fex:
-#   exclude_this_file.mtrace
-EXCLUDED_TRACE_FILES :=
-
-CUSTOM_TARGETS = \
-	MALLOC_BENCH
-
-OTHER_TEST_TARGETS = \
-	$(addprefix nano-trace-replay_, $(basename $(filter-out $(EXCLUDED_TRACE_FILES), $(TRACE_FILES)))) 
-
-MALLOCBENCHTEST_DIR = $(SRCROOT)/MallocBenchTest
-BATS_PLISTS_EXTRACT = \
-	$(patsubst %,$(SYMROOT)/%.plist,$(OTHER_TEST_TARGETS))
-
-EXCLUDED_SOURCES := \
-	nano_trace_replay.c
+MALLOCBENCH_SOURCE := $(wildcard MallocBench/*.cpp)
+EXCLUDED_SOURCES := MallocBench.cpp
 CXX := $(shell $(XCRUN) -sdk "$(TARGETSDK)" -find clang++)
 
-WARNING_CFLAGS := -Wno-format-invalid-specifier -Wno-format-extra-args
 OTHER_CFLAGS += \
 	-DDARWINTEST \
 	-DOS_UNFAIR_LOCK_INLINE=1 \
 	-lCrashReporterClient \
 	-I$(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders \
-	-I$(SRCROOT)/../private \
-	-I$(SRCROOT)/../include \
-	$(WARNING_CFLAGS)
+	-I$(SRCROOT)/../include/malloc
 
-PRIVATE_FRAMEWORKS = $(SDKROOT)/System/Library/PrivateFrameworks
-PERFDATA_FRAMEWORK = perfdata
+$(OBJROOT)/MallocBench/%.o: MallocBench/%.cpp
+	@mkdir -p $(OBJROOT)/MallocBench
+	$(CXX) $(CFLAGS) -I$(SRCROOT)/MallocBench -std=gnu++11 -stdlib=libc++ -c -o $@ $<
 
-nano-trace-replay_%: $(SRCROOT)/nano_trace_replay.c
-	$(CC) \
-		$(CFLAGS) $(DT_CFLAGS) $(OTHER_CFLAGS) \
-		$(LDFLAGS) $(DT_LDFLAGS) $(OTHER_LDFLAGS) \
-		-DTRACE_NAME="$(patsubst nano-trace-replay_%,%,$(notdir $@))" \
-		$(patsubst _Photos_puja,-DTEST_TIMEOUT=3000,$(findstring _Photos_puja,$(notdir $@))) \
-		-o $@ \
-		$(SRCROOT)/nano_trace_replay.c
+single-%: $(addprefix $(OBJROOT)/, $(MALLOCBENCH_SOURCE:.cpp=.o))
+	$(CXX) -c -o $(OBJROOT)/MallocBench-$@.o \
+		-I$(SRCROOT)/MallocBench \
+		$(CFLAGS) \
+		-DBENCHMARK_NAME=\"$*\" \
+		-DPARALLEL=false \
+		$(SRCROOT)/MallocBench.cpp
+	$(CXX) -o $(SYMROOT)/$@ \
+		$(CFLAGS) \
+		$^ \
+		$(OBJROOT)/MallocBench-$@.o
 
-# For now, we only build and run MallocBench on iOS. macOS requires
-# us to adopt installAPI.
-LOWER_SDKROOT  = $(shell echo $(SDKROOT) | tr '[:upper:]' '[:lower:]')
-ifneq (, $(findstring iphoneos,$(LOWER_SDKROOT)))
-include MallocBenchTest/Makefile.malloc-bench
-BATS_PLISTS = $(BATS_PLISTS_EXTRACT) $(MALLOCBENCHTEST_DIR)/MallocBench.plist
-else
-include MallocBenchTest/Makefile.dummy
-BATS_PLISTS = $(BATS_PLISTS_EXTRACT)
-endif
+parallel-%: $(addprefix $(OBJROOT)/, $(MALLOCBENCH_SOURCE:.cpp=.o))
+	$(CXX) -c -o $(OBJROOT)/MallocBench-$@.o \
+		-I$(SRCROOT)/MallocBench \
+		$(CFLAGS) \
+		-DBENCHMARK_NAME=\"$*\" \
+		-DPARALLEL=true \
+		$(SRCROOT)/MallocBench.cpp
+	$(CXX) -o $(SYMROOT)/$@ \
+		$(CFLAGS) \
+		$^ \
+		$(OBJROOT)/MallocBench-$@.o
 
-$(BATS_PLISTS_EXTRACT): %.plist : %
-	$(EXTRACTMETA) extract -i /$(INSTALLPATH)/$(notdir $<) -b $(SYMROOT)/$(notdir $<) -o $@
-	@plutil -convert binary1 $@
+OTHER_TEST_TARGETS = \
+	single-churn \
+	single-list_allocate \
+	single-tree_allocate \
+	single-tree_churn \
+	single-fragment \
+	single-fragment_iterate \
+	single-message_one \
+	single-message_many \
+	parallel-churn \
+	parallel-list_allocate \
+	parallel-tree_allocate \
+	parallel-tree_churn \
+	parallel-fragment \
+	parallel-fragment_iterate
 
-SANITIZER_DYLIB_PATH := /usr/appleinternal/lib/sanitizers/
+#	single-medium \
+#	single-big \
+#	parallel-medium \
+#	parallel-big
+
+SANITIZER_DYLIB_PATH := /usr/local/lib/sanitizers/
 asan: OTHER_CFLAGS += -fsanitize=address
 asan: OTHER_LDFLAGS += -Wl,-rpath -Wl,$(SANITIZER_DYLIB_PATH)
 
@@ -71,10 +73,12 @@
 tsan: CFLAGS := $(filter-out $(ARCH_FLAGS),$(CFLAGS)) -arch x86_64 -fsanitize=thread
 tsan: OTHER_LDFLAGS += -Wl,-rpath -Wl,$(SANITIZER_DYLIB_PATH)
 else
-EXCLUDED_SOURCES += tsan.c magazine_medium_test.c
+EXCLUDED_SOURCES += tsan.c
 endif
 
 madvise: OTHER_CFLAGS += -I../src
+stack_logging_test: OTHER_CFLAGS += -I../private
+radix_tree_test: OTHER_CFLAGS += -I../src -framework Foundation
 
 .DEFAULT_GOAL := all