diff --git a/compiler-rt/lib/scudo/standalone/CMakeLists.txt b/compiler-rt/lib/scudo/standalone/CMakeLists.txt
index ae4a483f3eb0..b793b42461d2 100644
--- a/compiler-rt/lib/scudo/standalone/CMakeLists.txt
+++ b/compiler-rt/lib/scudo/standalone/CMakeLists.txt
@@ -65,36 +65,40 @@ set(SCUDO_HEADERS
   tsd_shared.h
   vector.h
   wrappers_c_checks.h
-  wrappers_c.h)
+  wrappers_c.h
+  )
 
 set(SCUDO_SOURCES
-  checksum.cc
-  crc32_hw.cc
-  common.cc
-  flags.cc
-  flags_parser.cc
-  fuchsia.cc
-  linux.cc
-  report.cc
-  secondary.cc
-  string_utils.cc)
+  checksum.cpp
+  crc32_hw.cpp
+  common.cpp
+  flags.cpp
+  flags_parser.cpp
+  fuchsia.cpp
+  linux.cpp
+  report.cpp
+  secondary.cpp
+  string_utils.cpp
+  )
 
-# Enable the SSE 4.2 instruction set for crc32_hw.cc, if available.
+# Enable the SSE 4.2 instruction set for crc32_hw.cpp, if available.
 if (COMPILER_RT_HAS_MSSE4_2_FLAG)
-  set_source_files_properties(crc32_hw.cc PROPERTIES COMPILE_FLAGS -msse4.2)
+  set_source_files_properties(crc32_hw.cpp PROPERTIES COMPILE_FLAGS -msse4.2)
 endif()
 
-# Enable the AArch64 CRC32 feature for crc32_hw.cc, if available.
+# Enable the AArch64 CRC32 feature for crc32_hw.cpp, if available.
 # Note that it is enabled by default starting with armv8.1-a.
 if (COMPILER_RT_HAS_MCRC_FLAG)
-  set_source_files_properties(crc32_hw.cc PROPERTIES COMPILE_FLAGS -mcrc)
+  set_source_files_properties(crc32_hw.cpp PROPERTIES COMPILE_FLAGS -mcrc)
 endif()
 
 set(SCUDO_SOURCES_C_WRAPPERS
-  wrappers_c.cc)
+  wrappers_c.cpp
+  )
 
 set(SCUDO_SOURCES_CXX_WRAPPERS
-  wrappers_cpp.cc)
+  wrappers_cpp.cpp
+  )
 
 if(COMPILER_RT_HAS_SCUDO_STANDALONE)
   add_compiler_rt_object_libraries(RTScudoStandalone
diff --git a/compiler-rt/lib/scudo/standalone/checksum.cc b/compiler-rt/lib/scudo/standalone/checksum.cpp
similarity index 96%
rename from compiler-rt/lib/scudo/standalone/checksum.cc
rename to compiler-rt/lib/scudo/standalone/checksum.cpp
index 0896d5bdccd5..f713f5a81609 100644
--- a/compiler-rt/lib/scudo/standalone/checksum.cc
+++ b/compiler-rt/lib/scudo/standalone/checksum.cpp
@@ -1,4 +1,4 @@
-//===-- checksum.cc ---------------------------------------------*- C++ -*-===//
+//===-- checksum.cpp --------------------------------------------*- C++ -*-===//
 //
 // 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/scudo/standalone/chunk.h b/compiler-rt/lib/scudo/standalone/chunk.h
index 8fb03e482d95..9ae75823ba77 100644
--- a/compiler-rt/lib/scudo/standalone/chunk.h
+++ b/compiler-rt/lib/scudo/standalone/chunk.h
@@ -22,9 +22,9 @@ extern Checksum HashAlgorithm;
 
 INLINE u16 computeChecksum(u32 Seed, uptr Value, uptr *Array, uptr ArraySize) {
   // If the hardware CRC32 feature is defined here, it was enabled everywhere,
-  // as opposed to only for crc32_hw.cc. This means that other hardware specific
-  // instructions were likely emitted at other places, and as a result there is
-  // no reason to not use it here.
+  // as opposed to only for crc32_hw.cpp. This means that other hardware
+  // specific instructions were likely emitted at other places, and as a result
+  // there is no reason to not use it here.
 #if defined(__SSE4_2__) || defined(__ARM_FEATURE_CRC32)
   u32 Crc = static_cast<u32>(CRC32_INTRINSIC(Seed, Value));
   for (uptr I = 0; I < ArraySize; I++)
diff --git a/compiler-rt/lib/scudo/standalone/common.cc b/compiler-rt/lib/scudo/standalone/common.cpp
similarity index 92%
rename from compiler-rt/lib/scudo/standalone/common.cc
rename to compiler-rt/lib/scudo/standalone/common.cpp
index 2a26efbb9c89..d93bfc59b3ca 100644
--- a/compiler-rt/lib/scudo/standalone/common.cc
+++ b/compiler-rt/lib/scudo/standalone/common.cpp
@@ -1,4 +1,4 @@
-//===-- common.cc -----------------------------------------------*- C++ -*-===//
+//===-- common.cpp ----------------------------------------------*- C++ -*-===//
 //
 // 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/scudo/standalone/crc32_hw.cc b/compiler-rt/lib/scudo/standalone/crc32_hw.cpp
similarity index 100%
rename from compiler-rt/lib/scudo/standalone/crc32_hw.cc
rename to compiler-rt/lib/scudo/standalone/crc32_hw.cpp
diff --git a/compiler-rt/lib/scudo/standalone/flags.cc b/compiler-rt/lib/scudo/standalone/flags.cpp
similarity index 95%
rename from compiler-rt/lib/scudo/standalone/flags.cc
rename to compiler-rt/lib/scudo/standalone/flags.cpp
index 21144f211102..1e970ae49505 100644
--- a/compiler-rt/lib/scudo/standalone/flags.cc
+++ b/compiler-rt/lib/scudo/standalone/flags.cpp
@@ -1,4 +1,4 @@
-//===-- flags.cc ------------------------------------------------*- C++ -*-===//
+//===-- flags.cpp -----------------------------------------------*- C++ -*-===//
 //
 // 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/scudo/standalone/flags_parser.cc b/compiler-rt/lib/scudo/standalone/flags_parser.cpp
similarity index 98%
rename from compiler-rt/lib/scudo/standalone/flags_parser.cc
rename to compiler-rt/lib/scudo/standalone/flags_parser.cpp
index 5f1253f58d52..070c08b01938 100644
--- a/compiler-rt/lib/scudo/standalone/flags_parser.cc
+++ b/compiler-rt/lib/scudo/standalone/flags_parser.cpp
@@ -1,4 +1,4 @@
-//===-- flags_parser.cc -----------------------------------------*- C++ -*-===//
+//===-- flags_parser.cpp ----------------------------------------*- C++ -*-===//
 //
 // 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/scudo/standalone/fuchsia.cc b/compiler-rt/lib/scudo/standalone/fuchsia.cpp
similarity index 98%
rename from compiler-rt/lib/scudo/standalone/fuchsia.cc
rename to compiler-rt/lib/scudo/standalone/fuchsia.cpp
index 7e6c45182b1f..27346707924c 100644
--- a/compiler-rt/lib/scudo/standalone/fuchsia.cc
+++ b/compiler-rt/lib/scudo/standalone/fuchsia.cpp
@@ -1,4 +1,4 @@
-//===-- fuchsia.cc ----------------------------------------------*- C++ -*-===//
+//===-- fuchsia.cpp ---------------------------------------------*- C++ -*-===//
 //
 // 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/scudo/standalone/linux.cc b/compiler-rt/lib/scudo/standalone/linux.cpp
similarity index 98%
rename from compiler-rt/lib/scudo/standalone/linux.cc
rename to compiler-rt/lib/scudo/standalone/linux.cpp
index 049477bba8b0..e9873274a43e 100644
--- a/compiler-rt/lib/scudo/standalone/linux.cc
+++ b/compiler-rt/lib/scudo/standalone/linux.cpp
@@ -1,4 +1,4 @@
-//===-- linux.cc ------------------------------------------------*- C++ -*-===//
+//===-- linux.cpp -----------------------------------------------*- C++ -*-===//
 //
 // 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/scudo/standalone/report.cc b/compiler-rt/lib/scudo/standalone/report.cpp
similarity index 99%
rename from compiler-rt/lib/scudo/standalone/report.cc
rename to compiler-rt/lib/scudo/standalone/report.cpp
index 47cd951e8ed4..12d851ff019a 100644
--- a/compiler-rt/lib/scudo/standalone/report.cc
+++ b/compiler-rt/lib/scudo/standalone/report.cpp
@@ -1,4 +1,4 @@
-//===-- report.cc -----------------------------------------------*- C++ -*-===//
+//===-- report.cpp ----------------------------------------------*- C++ -*-===//
 //
 // 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/scudo/standalone/secondary.cc b/compiler-rt/lib/scudo/standalone/secondary.cpp
similarity index 98%
rename from compiler-rt/lib/scudo/standalone/secondary.cc
rename to compiler-rt/lib/scudo/standalone/secondary.cpp
index e48f58db49b1..4f35b020c1e3 100644
--- a/compiler-rt/lib/scudo/standalone/secondary.cc
+++ b/compiler-rt/lib/scudo/standalone/secondary.cpp
@@ -1,4 +1,4 @@
-//===-- secondary.cc --------------------------------------------*- C++ -*-===//
+//===-- secondary.cpp -------------------------------------------*- C++ -*-===//
 //
 // 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/scudo/standalone/string_utils.cc b/compiler-rt/lib/scudo/standalone/string_utils.cpp
similarity index 99%
rename from compiler-rt/lib/scudo/standalone/string_utils.cc
rename to compiler-rt/lib/scudo/standalone/string_utils.cpp
index d4ce62607860..22b4fbd74470 100644
--- a/compiler-rt/lib/scudo/standalone/string_utils.cc
+++ b/compiler-rt/lib/scudo/standalone/string_utils.cpp
@@ -1,4 +1,4 @@
-//===-- string_utils.cc -----------------------------------------*- C++ -*-===//
+//===-- string_utils.cpp ----------------------------------------*- C++ -*-===//
 //
 // 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/scudo/standalone/wrappers_c.cc b/compiler-rt/lib/scudo/standalone/wrappers_c.cpp
similarity index 94%
rename from compiler-rt/lib/scudo/standalone/wrappers_c.cc
rename to compiler-rt/lib/scudo/standalone/wrappers_c.cpp
index 5908c600be33..dffd7cc26fe8 100644
--- a/compiler-rt/lib/scudo/standalone/wrappers_c.cc
+++ b/compiler-rt/lib/scudo/standalone/wrappers_c.cpp
@@ -1,4 +1,4 @@
-//===-- wrappers_c.cc -------------------------------------------*- C++ -*-===//
+//===-- wrappers_c.cpp ------------------------------------------*- C++ -*-===//
 //
 // 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/scudo/standalone/wrappers_c_bionic.cc b/compiler-rt/lib/scudo/standalone/wrappers_c_bionic.cpp
similarity index 95%
rename from compiler-rt/lib/scudo/standalone/wrappers_c_bionic.cc
rename to compiler-rt/lib/scudo/standalone/wrappers_c_bionic.cpp
index f6e863deb973..fa4145c066b6 100644
--- a/compiler-rt/lib/scudo/standalone/wrappers_c_bionic.cc
+++ b/compiler-rt/lib/scudo/standalone/wrappers_c_bionic.cpp
@@ -1,4 +1,4 @@
-//===-- wrappers_c_bionic.cc ------------------------------------*- C++ -*-===//
+//===-- wrappers_c_bionic.cpp -----------------------------------*- C++ -*-===//
 //
 // 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/scudo/standalone/wrappers_cpp.cc b/compiler-rt/lib/scudo/standalone/wrappers_cpp.cpp
similarity index 98%
rename from compiler-rt/lib/scudo/standalone/wrappers_cpp.cc
rename to compiler-rt/lib/scudo/standalone/wrappers_cpp.cpp
index 3ae1cdc05a06..72235e9c9820 100644
--- a/compiler-rt/lib/scudo/standalone/wrappers_cpp.cc
+++ b/compiler-rt/lib/scudo/standalone/wrappers_cpp.cpp
@@ -1,4 +1,4 @@
-//===-- wrappers_cpp.cc -----------------------------------------*- C++ -*-===//
+//===-- wrappers_cpp.cpp ----------------------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.