diff --git a/compiler-rt/lib/hwasan/CMakeLists.txt b/compiler-rt/lib/hwasan/CMakeLists.txt
index 7460abc54bd4..832335825486 100644
--- a/compiler-rt/lib/hwasan/CMakeLists.txt
+++ b/compiler-rt/lib/hwasan/CMakeLists.txt
@@ -2,20 +2,21 @@ include_directories(..)
 
 # Runtime library sources and build flags.
 set(HWASAN_RTL_SOURCES
-  hwasan.cc
-  hwasan_allocator.cc
-  hwasan_dynamic_shadow.cc
-  hwasan_interceptors.cc
-  hwasan_linux.cc
-  hwasan_memintrinsics.cc
-  hwasan_poisoning.cc
-  hwasan_report.cc
-  hwasan_thread.cc
-  hwasan_thread_list.cc
+  hwasan.cpp
+  hwasan_allocator.cpp
+  hwasan_dynamic_shadow.cpp
+  hwasan_interceptors.cpp
+  hwasan_linux.cpp
+  hwasan_memintrinsics.cpp
+  hwasan_poisoning.cpp
+  hwasan_report.cpp
+  hwasan_thread.cpp
+  hwasan_thread_list.cpp
   )
 
 set(HWASAN_RTL_CXX_SOURCES
-  hwasan_new_delete.cc)
+  hwasan_new_delete.cpp
+  )
 
 set(HWASAN_RTL_HEADERS
   hwasan.h
diff --git a/compiler-rt/lib/hwasan/hwasan.cc b/compiler-rt/lib/hwasan/hwasan.cpp
similarity index 99%
rename from compiler-rt/lib/hwasan/hwasan.cc
rename to compiler-rt/lib/hwasan/hwasan.cpp
index 9c83f73bd986..5ac53f2b3087 100644
--- a/compiler-rt/lib/hwasan/hwasan.cc
+++ b/compiler-rt/lib/hwasan/hwasan.cpp
@@ -1,4 +1,4 @@
-//===-- hwasan.cc ---------------------------------------------------------===//
+//===-- hwasan.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/hwasan/hwasan_allocator.cc b/compiler-rt/lib/hwasan/hwasan_allocator.cpp
similarity index 99%
rename from compiler-rt/lib/hwasan/hwasan_allocator.cc
rename to compiler-rt/lib/hwasan/hwasan_allocator.cpp
index 09f1ab94e4b0..19f1bafeb77b 100644
--- a/compiler-rt/lib/hwasan/hwasan_allocator.cc
+++ b/compiler-rt/lib/hwasan/hwasan_allocator.cpp
@@ -1,4 +1,4 @@
-//===-- hwasan_allocator.cc ------------------------- ---------------------===//
+//===-- hwasan_allocator.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/hwasan/hwasan_dynamic_shadow.cc b/compiler-rt/lib/hwasan/hwasan_dynamic_shadow.cpp
similarity index 98%
rename from compiler-rt/lib/hwasan/hwasan_dynamic_shadow.cc
rename to compiler-rt/lib/hwasan/hwasan_dynamic_shadow.cpp
index e2dbe0565596..a04751f44a31 100644
--- a/compiler-rt/lib/hwasan/hwasan_dynamic_shadow.cc
+++ b/compiler-rt/lib/hwasan/hwasan_dynamic_shadow.cpp
@@ -1,4 +1,4 @@
-//===-- hwasan_dynamic_shadow.cc --------------------------------*- C++ -*-===//
+//===-- hwasan_dynamic_shadow.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/hwasan/hwasan_interceptors.cc b/compiler-rt/lib/hwasan/hwasan_interceptors.cpp
similarity index 99%
rename from compiler-rt/lib/hwasan/hwasan_interceptors.cc
rename to compiler-rt/lib/hwasan/hwasan_interceptors.cpp
index baecb1e03345..3b087e157b0d 100644
--- a/compiler-rt/lib/hwasan/hwasan_interceptors.cc
+++ b/compiler-rt/lib/hwasan/hwasan_interceptors.cpp
@@ -1,4 +1,4 @@
-//===-- hwasan_interceptors.cc --------------------------------------------===//
+//===-- hwasan_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/hwasan/hwasan_linux.cc b/compiler-rt/lib/hwasan/hwasan_linux.cpp
similarity index 99%
rename from compiler-rt/lib/hwasan/hwasan_linux.cc
rename to compiler-rt/lib/hwasan/hwasan_linux.cpp
index c922c1110e53..4ab7c323d1f6 100644
--- a/compiler-rt/lib/hwasan/hwasan_linux.cc
+++ b/compiler-rt/lib/hwasan/hwasan_linux.cpp
@@ -1,4 +1,4 @@
-//===-- hwasan_linux.cc -----------------------------------------*- C++ -*-===//
+//===-- hwasan_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/hwasan/hwasan_memintrinsics.cc b/compiler-rt/lib/hwasan/hwasan_memintrinsics.cpp
similarity index 96%
rename from compiler-rt/lib/hwasan/hwasan_memintrinsics.cc
rename to compiler-rt/lib/hwasan/hwasan_memintrinsics.cpp
index 1bfc6c3fa682..e82d77a1bc16 100644
--- a/compiler-rt/lib/hwasan/hwasan_memintrinsics.cc
+++ b/compiler-rt/lib/hwasan/hwasan_memintrinsics.cpp
@@ -1,4 +1,4 @@
-//===-- hwasan_memintrinsics.cc ---------------------------------*- C++ -*-===//
+//===-- hwasan_memintrinsics.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/hwasan/hwasan_new_delete.cc b/compiler-rt/lib/hwasan/hwasan_new_delete.cpp
similarity index 97%
rename from compiler-rt/lib/hwasan/hwasan_new_delete.cc
rename to compiler-rt/lib/hwasan/hwasan_new_delete.cpp
index 9ecc35018d85..438a3699a92b 100644
--- a/compiler-rt/lib/hwasan/hwasan_new_delete.cc
+++ b/compiler-rt/lib/hwasan/hwasan_new_delete.cpp
@@ -1,4 +1,4 @@
-//===-- hwasan_new_delete.cc ----------------------------------------------===//
+//===-- hwasan_new_delete.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/hwasan/hwasan_poisoning.cc b/compiler-rt/lib/hwasan/hwasan_poisoning.cpp
similarity index 96%
rename from compiler-rt/lib/hwasan/hwasan_poisoning.cc
rename to compiler-rt/lib/hwasan/hwasan_poisoning.cpp
index 9404c52feab6..2a0816428e75 100644
--- a/compiler-rt/lib/hwasan/hwasan_poisoning.cc
+++ b/compiler-rt/lib/hwasan/hwasan_poisoning.cpp
@@ -1,4 +1,4 @@
-//===-- hwasan_poisoning.cc -------------------------------------*- C++ -*-===//
+//===-- hwasan_poisoning.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/hwasan/hwasan_report.cc b/compiler-rt/lib/hwasan/hwasan_report.cpp
similarity index 99%
rename from compiler-rt/lib/hwasan/hwasan_report.cc
rename to compiler-rt/lib/hwasan/hwasan_report.cpp
index 762171362501..b1002c546f87 100644
--- a/compiler-rt/lib/hwasan/hwasan_report.cc
+++ b/compiler-rt/lib/hwasan/hwasan_report.cpp
@@ -1,4 +1,4 @@
-//===-- hwasan_report.cc --------------------------------------------------===//
+//===-- hwasan_report.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/hwasan/hwasan_thread.cc b/compiler-rt/lib/hwasan/hwasan_thread.cpp
similarity index 100%
rename from compiler-rt/lib/hwasan/hwasan_thread.cc
rename to compiler-rt/lib/hwasan/hwasan_thread.cpp
diff --git a/compiler-rt/lib/hwasan/hwasan_thread_list.cc b/compiler-rt/lib/hwasan/hwasan_thread_list.cpp
similarity index 100%
rename from compiler-rt/lib/hwasan/hwasan_thread_list.cc
rename to compiler-rt/lib/hwasan/hwasan_thread_list.cpp