diff --git a/compiler-rt/lib/lsan/lit_tests/use_globals_initialized.cc b/compiler-rt/lib/lsan/lit_tests/use_globals_initialized.cc
index 53c22c8ac057..48e50b5d5629 100644
--- a/compiler-rt/lib/lsan/lit_tests/use_globals_initialized.cc
+++ b/compiler-rt/lib/lsan/lit_tests/use_globals_initialized.cc
@@ -1,4 +1,4 @@
-// Test that initialized globals are included in the root set. 
+// Test that initialized globals are included in the root set.
 // RUN: LSAN_BASE="report_blocks=1:use_stacks=0:use_registers=0"
 // RUN: %clangxx_lsan %s -o %t
 // RUN: LSAN_OPTIONS=$LSAN_BASE:"use_globals=0" %t 2>&1 | FileCheck %s
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_allocator_internal.h b/compiler-rt/lib/sanitizer_common/sanitizer_allocator_internal.h
index 5eea5243f931..62d19627fdcf 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_allocator_internal.h
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_allocator_internal.h
@@ -19,7 +19,7 @@
 
 namespace __sanitizer {
 
-// TODO: Check if we may use even more compact size class map for internal
+// FIXME: Check if we may use even more compact size class map for internal
 // purposes.
 typedef CompactSizeClassMap InternalSizeClassMap;
 
diff --git a/compiler-rt/lib/tsan/Makefile.old b/compiler-rt/lib/tsan/Makefile.old
index b548f5d2f6ee..3443a07533f7 100644
--- a/compiler-rt/lib/tsan/Makefile.old
+++ b/compiler-rt/lib/tsan/Makefile.old
@@ -21,8 +21,11 @@ GTEST_BUILD_DIR=$(GTEST_ROOT)/build
 GTEST_LIB_NAME=gtest-all.o
 GTEST_LIB=$(GTEST_BUILD_DIR)/$(GTEST_LIB_NAME)
 
-SANITIZER_COMMON_TESTS_SRC=$(wildcard ../sanitizer_common/tests/*_test.cc)
-SANITIZER_COMMON_TESTS_OBJ=$(patsubst %.cc,%.o,$(SANITIZER_COMMON_TESTS_SRC))
+SANITIZER_TESTS_PATH=../sanitizer_common/tests
+SANITIZER_COMMON_TESTS_SRC=$(wildcard $(SANITIZER_TESTS_PATH)/*_test.cc)
+SANITIZER_COMMON_EXCLUDED_TESTS=$(SANITIZER_TESTS_PATH)/sanitizer_nolibc_test.cc
+SANITIZER_COMMON_GOOD_TESTS=$(filter-out $(SANITIZER_COMMON_EXCLUDED_TESTS), $(SANITIZER_COMMON_TESTS_SRC))
+SANITIZER_COMMON_TESTS_OBJ=$(patsubst %.cc,%.o,$(SANITIZER_COMMON_GOOD_TESTS))
 RTL_TEST_SRC=$(wildcard tests/rtl/*.cc)
 RTL_TEST_OBJ=$(patsubst %.cc,%.o,$(RTL_TEST_SRC))
 UNIT_TEST_SRC=$(wildcard tests/unit/*_test.cc)