--- Libc/Libc-1725.40.4/tests/Makefile
+++ Libc/Libc-1669.40.2/tests/Makefile
@@ -1,7 +1,7 @@
 PROJECT := Libc
 TEST_DIR := tests/
 
-CUSTOM_TARGETS += locales osvariantutil subsystem_test_helper thread_stack_pcs_helper
+CUSTOM_TARGETS += osvariantutil subsystem_test_helper
 
 ifeq ($(DEVELOPER_DIR),)
     DEVELOPER_DIR := $(shell xcode-select -p)
@@ -34,10 +34,8 @@
 
 OTHER_LDFLAGS := -umbrella System -L/usr/lib/system -lsystem_collections
 
-fbounds_safety_assumes: OTHER_CFLAGS += -fbounds-safety -fbounds-safety-bringup-missing-checks
-fbounds_safety_includes: OTHER_CFLAGS += -fbounds-safety -fbounds-safety-bringup-missing-checks -D__LIBC_STAGED_BOUNDS_SAFETY_ATTRIBUTES
+assumes_fbounds_safety: OTHER_CFLAGS += -fbounds-safety
 abort_tests: OTHER_CFLAGS += -fstack-check
-execvp: OTHER_CFLAGS += -Wno-pre-c11-compat
 strtod: OTHER_CFLAGS += -Wno-float-equal -Wno-ignored-pragmas
 strtof: OTHER_CFLAGS += -Wno-float-equal -Wno-ignored-pragmas
 strtold: OTHER_CFLAGS += -Wno-float-equal -Wno-ignored-pragmas
@@ -61,7 +59,6 @@
 
 ifeq ($(PLATFORM),MacOSX)
 include $(SRCROOT)/FreeBSD/gen/Makefile.targets
-include $(SRCROOT)/FreeBSD/string/Makefile.targets
 endif
 include $(SRCROOT)/regex/Makefile.targets
 
@@ -69,7 +66,6 @@
 
 ifeq ($(PLATFORM),MacOSX)
 include $(SRCROOT)/FreeBSD/gen/Makefile
-include $(SRCROOT)/FreeBSD/string/Makefile
 endif
 include $(SRCROOT)/regex/Makefile
 
@@ -92,17 +88,3 @@
 	cp -R $(SYMROOT)/subsystem_test_helper.dSYM $(INSTALLDIR)/
 endif
 
-thread_stack_pcs: CODE_SIGN_ENTITLEMENTS=get_task_allow_entitlement.plist
-
-thread_stack_pcs_helper: OTHER_LDFLAGS += -dynamiclib
-
-install-thread_stack_pcs_helper: thread_stack_pcs_helper
-	mkdir -p $(INSTALLDIR)
-	cp $(SYMROOT)/thread_stack_pcs_helper $(INSTALLDIR)/
-ifeq ($(DWARF_DSYM_FILE_SHOULD_ACCOMPANY_PRODUCT),YES)
-	cp -R $(SYMROOT)/thread_stack_pcs_helper.dSYM $(INSTALLDIR)/
-endif
-
-install-locales:
-	mkdir -p $(INSTALLDIR)
-	cp -R $(SRCROOT)/locales $(INSTALLDIR)/