diff --git a/compiler-rt/lib/tsan/benchmarks/func_entry_exit.cc b/compiler-rt/lib/tsan/benchmarks/func_entry_exit.cpp
similarity index 100%
rename from compiler-rt/lib/tsan/benchmarks/func_entry_exit.cc
rename to compiler-rt/lib/tsan/benchmarks/func_entry_exit.cpp
diff --git a/compiler-rt/lib/tsan/benchmarks/mini_bench_local.cc b/compiler-rt/lib/tsan/benchmarks/mini_bench_local.cpp
similarity index 100%
rename from compiler-rt/lib/tsan/benchmarks/mini_bench_local.cc
rename to compiler-rt/lib/tsan/benchmarks/mini_bench_local.cpp
diff --git a/compiler-rt/lib/tsan/benchmarks/mini_bench_shared.cc b/compiler-rt/lib/tsan/benchmarks/mini_bench_shared.cpp
similarity index 100%
rename from compiler-rt/lib/tsan/benchmarks/mini_bench_shared.cc
rename to compiler-rt/lib/tsan/benchmarks/mini_bench_shared.cpp
diff --git a/compiler-rt/lib/tsan/benchmarks/mop.cc b/compiler-rt/lib/tsan/benchmarks/mop.cpp
similarity index 100%
rename from compiler-rt/lib/tsan/benchmarks/mop.cc
rename to compiler-rt/lib/tsan/benchmarks/mop.cpp
diff --git a/compiler-rt/lib/tsan/benchmarks/start_many_threads.cc b/compiler-rt/lib/tsan/benchmarks/start_many_threads.cpp
similarity index 100%
rename from compiler-rt/lib/tsan/benchmarks/start_many_threads.cc
rename to compiler-rt/lib/tsan/benchmarks/start_many_threads.cpp
diff --git a/compiler-rt/lib/tsan/benchmarks/vts_many_threads_bench.cc b/compiler-rt/lib/tsan/benchmarks/vts_many_threads_bench.cpp
similarity index 100%
rename from compiler-rt/lib/tsan/benchmarks/vts_many_threads_bench.cc
rename to compiler-rt/lib/tsan/benchmarks/vts_many_threads_bench.cpp
diff --git a/compiler-rt/lib/tsan/dd/CMakeLists.txt b/compiler-rt/lib/tsan/dd/CMakeLists.txt
index c3f5915dd8b2..ec107312d5a4 100644
--- a/compiler-rt/lib/tsan/dd/CMakeLists.txt
+++ b/compiler-rt/lib/tsan/dd/CMakeLists.txt
@@ -6,9 +6,9 @@ set(DD_CFLAGS ${SANITIZER_COMMON_CFLAGS})
 append_rtti_flag(OFF DD_CFLAGS)
 
 set(DD_SOURCES
-  dd_rtl.cc
-  dd_interceptors.cc
-)
+  dd_rtl.cpp
+  dd_interceptors.cpp
+  )
 
 set(DD_LINKLIBS ${SANITIZER_CXX_ABI_LIBRARIES} ${SANITIZER_COMMON_LINK_LIBS})
 
diff --git a/compiler-rt/lib/tsan/dd/dd_interceptors.cc b/compiler-rt/lib/tsan/dd/dd_interceptors.cpp
similarity index 99%
rename from compiler-rt/lib/tsan/dd/dd_interceptors.cc
rename to compiler-rt/lib/tsan/dd/dd_interceptors.cpp
index 35a72eb36a30..35a0beb19196 100644
--- a/compiler-rt/lib/tsan/dd/dd_interceptors.cc
+++ b/compiler-rt/lib/tsan/dd/dd_interceptors.cpp
@@ -1,4 +1,4 @@
-//===-- dd_interceptors.cc ------------------------------------------------===//
+//===-- dd_interceptors.cpp -----------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/compiler-rt/lib/tsan/dd/dd_rtl.cc b/compiler-rt/lib/tsan/dd/dd_rtl.cpp
similarity index 98%
rename from compiler-rt/lib/tsan/dd/dd_rtl.cc
rename to compiler-rt/lib/tsan/dd/dd_rtl.cpp
index 08652ba01cdd..2095217586a8 100644
--- a/compiler-rt/lib/tsan/dd/dd_rtl.cc
+++ b/compiler-rt/lib/tsan/dd/dd_rtl.cpp
@@ -1,4 +1,4 @@
-//===-- dd_rtl.cc ---------------------------------------------------------===//
+//===-- dd_rtl.cpp --------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/compiler-rt/lib/tsan/go/build.bat b/compiler-rt/lib/tsan/go/build.bat
index 9bf13b44b1d2..ee8768b80b03 100644
--- a/compiler-rt/lib/tsan/go/build.bat
+++ b/compiler-rt/lib/tsan/go/build.bat
@@ -1,4 +1,4 @@
-type tsan_go.cc ..\rtl\tsan_interface_atomic.cpp ..\rtl\tsan_clock.cpp ..\rtl\tsan_flags.cpp ..\rtl\tsan_md5.cpp ..\rtl\tsan_mutex.cpp ..\rtl\tsan_report.cpp ..\rtl\tsan_rtl.cpp ..\rtl\tsan_rtl_mutex.cpp ..\rtl\tsan_rtl_report.cpp ..\rtl\tsan_rtl_thread.cpp ..\rtl\tsan_rtl_proc.cpp ..\rtl\tsan_stat.cpp ..\rtl\tsan_suppressions.cpp ..\rtl\tsan_sync.cpp ..\rtl\tsan_stack_trace.cpp ..\..\sanitizer_common\sanitizer_allocator.cpp ..\..\sanitizer_common\sanitizer_common.cpp ..\..\sanitizer_common\sanitizer_flags.cpp ..\..\sanitizer_common\sanitizer_stacktrace.cpp ..\..\sanitizer_common\sanitizer_libc.cpp ..\..\sanitizer_common\sanitizer_printf.cpp ..\..\sanitizer_common\sanitizer_suppressions.cpp ..\..\sanitizer_common\sanitizer_thread_registry.cpp ..\rtl\tsan_platform_windows.cpp ..\..\sanitizer_common\sanitizer_win.cpp ..\..\sanitizer_common\sanitizer_deadlock_detector1.cpp ..\..\sanitizer_common\sanitizer_stackdepot.cpp ..\..\sanitizer_common\sanitizer_persistent_allocator.cpp ..\..\sanitizer_common\sanitizer_flag_parser.cpp ..\..\sanitizer_common\sanitizer_symbolizer.cpp ..\..\sanitizer_common\sanitizer_termination.cpp > gotsan.cc
+type tsan_go.cpp ..\rtl\tsan_interface_atomic.cpp ..\rtl\tsan_clock.cpp ..\rtl\tsan_flags.cpp ..\rtl\tsan_md5.cpp ..\rtl\tsan_mutex.cpp ..\rtl\tsan_report.cpp ..\rtl\tsan_rtl.cpp ..\rtl\tsan_rtl_mutex.cpp ..\rtl\tsan_rtl_report.cpp ..\rtl\tsan_rtl_thread.cpp ..\rtl\tsan_rtl_proc.cpp ..\rtl\tsan_stat.cpp ..\rtl\tsan_suppressions.cpp ..\rtl\tsan_sync.cpp ..\rtl\tsan_stack_trace.cpp ..\..\sanitizer_common\sanitizer_allocator.cpp ..\..\sanitizer_common\sanitizer_common.cpp ..\..\sanitizer_common\sanitizer_flags.cpp ..\..\sanitizer_common\sanitizer_stacktrace.cpp ..\..\sanitizer_common\sanitizer_libc.cpp ..\..\sanitizer_common\sanitizer_printf.cpp ..\..\sanitizer_common\sanitizer_suppressions.cpp ..\..\sanitizer_common\sanitizer_thread_registry.cpp ..\rtl\tsan_platform_windows.cpp ..\..\sanitizer_common\sanitizer_win.cpp ..\..\sanitizer_common\sanitizer_deadlock_detector1.cpp ..\..\sanitizer_common\sanitizer_stackdepot.cpp ..\..\sanitizer_common\sanitizer_persistent_allocator.cpp ..\..\sanitizer_common\sanitizer_flag_parser.cpp ..\..\sanitizer_common\sanitizer_symbolizer.cpp ..\..\sanitizer_common\sanitizer_termination.cpp > gotsan.cpp
 
-gcc -c -o race_windows_amd64.syso gotsan.cc -I..\rtl -I..\.. -I..\..\sanitizer_common -I..\..\..\include -m64 -Wall -fno-exceptions -fno-rtti -DSANITIZER_GO=1 -Wno-error=attributes -Wno-attributes -Wno-format -Wno-maybe-uninitialized -DSANITIZER_DEBUG=0 -O3 -fomit-frame-pointer -std=c++11
+gcc -c -o race_windows_amd64.syso gotsan.cpp -I..\rtl -I..\.. -I..\..\sanitizer_common -I..\..\..\include -m64 -Wall -fno-exceptions -fno-rtti -DSANITIZER_GO=1 -Wno-error=attributes -Wno-attributes -Wno-format -Wno-maybe-uninitialized -DSANITIZER_DEBUG=0 -O3 -fomit-frame-pointer -std=c++11
 
diff --git a/compiler-rt/lib/tsan/go/buildgo.sh b/compiler-rt/lib/tsan/go/buildgo.sh
index 433859632332..99a6a9ea19d3 100755
--- a/compiler-rt/lib/tsan/go/buildgo.sh
+++ b/compiler-rt/lib/tsan/go/buildgo.sh
@@ -3,7 +3,7 @@
 set -e
 
 SRCS="
-	tsan_go.cc
+	tsan_go.cpp
 	../rtl/tsan_clock.cpp
 	../rtl/tsan_external.cpp
 	../rtl/tsan_flags.cpp
@@ -144,9 +144,9 @@ fi
 
 SRCS="$SRCS $ADD_SRCS"
 
-rm -f $DIR/gotsan.cc
+rm -f $DIR/gotsan.cpp
 for F in $SRCS; do
-	cat $F >> $DIR/gotsan.cc
+	cat $F >> $DIR/gotsan.cpp
 done
 
 FLAGS=" -I../rtl -I../.. -I../../sanitizer_common -I../../../include -std=c++11 -Wall -fno-exceptions -fno-rtti -DSANITIZER_GO=1 -DSANITIZER_DEADLOCK_DETECTOR_VERSION=2 $OSCFLAGS $ARCHCFLAGS"
@@ -162,9 +162,9 @@ else
 fi
 
 if [ "$SILENT" != "1" ]; then
-  echo $CC gotsan.cc -c -o $DIR/race_$SUFFIX.syso $FLAGS $CFLAGS
+  echo $CC gotsan.cpp -c -o $DIR/race_$SUFFIX.syso $FLAGS $CFLAGS
 fi
-$CC $DIR/gotsan.cc -c -o $DIR/race_$SUFFIX.syso $FLAGS $CFLAGS
+$CC $DIR/gotsan.cpp -c -o $DIR/race_$SUFFIX.syso $FLAGS $CFLAGS
 
 $CC $OSCFLAGS $ARCHCFLAGS test.c $DIR/race_$SUFFIX.syso -g -o $DIR/test $OSLDFLAGS $LDFLAGS
 
diff --git a/compiler-rt/lib/tsan/go/tsan_go.cc b/compiler-rt/lib/tsan/go/tsan_go.cpp
similarity index 99%
rename from compiler-rt/lib/tsan/go/tsan_go.cc
rename to compiler-rt/lib/tsan/go/tsan_go.cpp
index dfd1e1da158f..271f6bc00cd0 100644
--- a/compiler-rt/lib/tsan/go/tsan_go.cc
+++ b/compiler-rt/lib/tsan/go/tsan_go.cpp
@@ -1,4 +1,4 @@
-//===-- tsan_go.cc --------------------------------------------------------===//
+//===-- tsan_go.cpp -------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.