6 files changed, 11 insertions, 9 deletions
diff --git a/compiler-rt/lib/interception/tests/CMakeLists.txt b/compiler-rt/lib/interception/tests/CMakeLists.txt
index 96bdda73e9e..b2418110fba 100644
--- a/compiler-rt/lib/interception/tests/CMakeLists.txt
+++ b/compiler-rt/lib/interception/tests/CMakeLists.txt
@@ -3,10 +3,10 @@ include(CompilerRTCompile)
 filter_available_targets(INTERCEPTION_UNITTEST_SUPPORTED_ARCH x86_64 i386 mips64 mips64el)
 
 set(INTERCEPTION_UNITTESTS
-  interception_linux_test.cc
-  interception_test_main.cc
-  interception_win_test.cc
-)
+  interception_linux_test.cpp
+  interception_test_main.cpp
+  interception_win_test.cpp
+  )
 
 set(INTERCEPTION_TEST_HEADERS)
 
diff --git a/compiler-rt/lib/interception/tests/interception_linux_test.cc b/compiler-rt/lib/interception/tests/interception_linux_test.cpp
index 3e859cb1a55..c79fbf2fa86 100644
--- a/compiler-rt/lib/interception/tests/interception_linux_test.cc
+++ b/compiler-rt/lib/interception/tests/interception_linux_test.cpp
@@ -1,4 +1,4 @@
-//===-- interception_linux_test.cc ----------------------------------------===//
+//===-- interception_linux_test.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/interception/tests/interception_test_main.cc b/compiler-rt/lib/interception/tests/interception_test_main.cpp
index 97e5b377a41..1444fd53a58 100644
--- a/compiler-rt/lib/interception/tests/interception_test_main.cc
+++ b/compiler-rt/lib/interception/tests/interception_test_main.cpp
@@ -1,4 +1,4 @@
-//===-- interception_test_main.cc------------------------------------------===//
+//===-- interception_test_main.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/interception/tests/interception_win_test.cc b/compiler-rt/lib/interception/tests/interception_win_test.cpp
index c3affc45bb7..f8ab4ec6744 100644
--- a/compiler-rt/lib/interception/tests/interception_win_test.cc
+++ b/compiler-rt/lib/interception/tests/interception_win_test.cpp
@@ -1,4 +1,4 @@
-//===-- interception_win_test.cc ------------------------------------------===//
+//===-- interception_win_test.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/safestack/CMakeLists.txt b/compiler-rt/lib/safestack/CMakeLists.txt
index aa259e8d6b6..316ab69ecfd 100644
--- a/compiler-rt/lib/safestack/CMakeLists.txt
+++ b/compiler-rt/lib/safestack/CMakeLists.txt
@@ -1,6 +1,8 @@
 add_compiler_rt_component(safestack)
 
-set(SAFESTACK_SOURCES safestack.cc)
+set(SAFESTACK_SOURCES
+  safestack.cpp
+  )
 
 include_directories(..)
 
diff --git a/compiler-rt/lib/safestack/safestack.cc b/compiler-rt/lib/safestack/safestack.cpp
index f713d5e6871..0751f3988b9 100644
--- a/compiler-rt/lib/safestack/safestack.cc
+++ b/compiler-rt/lib/safestack/safestack.cpp
@@ -1,4 +1,4 @@
-//===-- safestack.cc ------------------------------------------------------===//
+//===-- safestack.cpp -----------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.