21 files changed, 63 insertions, 49 deletions
diff --git a/compiler-rt/lib/xray/CMakeLists.txt b/compiler-rt/lib/xray/CMakeLists.txt
index 0a86c52e620..3798f557c42 100644
--- a/compiler-rt/lib/xray/CMakeLists.txt
+++ b/compiler-rt/lib/xray/CMakeLists.txt
@@ -2,63 +2,76 @@
 
 # XRay runtime library implementation files.
 set(XRAY_SOURCES
-    xray_buffer_queue.cc
-    xray_init.cc
-    xray_flags.cc
-    xray_interface.cc
-    xray_log_interface.cc
-    xray_utils.cc)
+  xray_buffer_queue.cpp
+  xray_init.cpp
+  xray_flags.cpp
+  xray_interface.cpp
+  xray_log_interface.cpp
+  xray_utils.cpp
+  )
 
 # Implementation files for all XRay modes.
 set(XRAY_FDR_MODE_SOURCES
-    xray_fdr_flags.cc
-    xray_fdr_logging.cc)
+  xray_fdr_flags.cpp
+  xray_fdr_logging.cpp
+  )
 
 set(XRAY_BASIC_MODE_SOURCES
-    xray_basic_flags.cc
-    xray_basic_logging.cc)
+  xray_basic_flags.cpp
+  xray_basic_logging.cpp
+  )
 
 set(XRAY_PROFILING_MODE_SOURCES
-    xray_profile_collector.cc
-    xray_profiling.cc
-    xray_profiling_flags.cc)
+  xray_profile_collector.cpp
+  xray_profiling.cpp
+  xray_profiling_flags.cpp
+  )
 
 # Implementation files for all XRay architectures.
 set(x86_64_SOURCES
-    xray_x86_64.cc
-    xray_trampoline_x86_64.S)
+  xray_x86_64.cpp
+  xray_trampoline_x86_64.S
+  )
 
 set(arm_SOURCES
-    xray_arm.cc
-    xray_trampoline_arm.S)
+  xray_arm.cpp
+  xray_trampoline_arm.S
+  )
 
 set(armhf_SOURCES
-    ${arm_SOURCES})
+  ${arm_SOURCES}
+  )
 
 set(aarch64_SOURCES
-    xray_AArch64.cc
-    xray_trampoline_AArch64.S)
+  xray_AArch64.cpp
+  xray_trampoline_AArch64.S
+  )
 
 set(mips_SOURCES
-    xray_mips.cc
-    xray_trampoline_mips.S)
+  xray_mips.cpp
+  xray_trampoline_mips.S
+  )
 
 set(mipsel_SOURCES
-    xray_mips.cc
-    xray_trampoline_mips.S)
+  xray_mips.cpp
+  xray_trampoline_mips.S
+  )
 
 set(mips64_SOURCES
-    xray_mips64.cc
-    xray_trampoline_mips64.S)
+  xray_mips64.cpp
+  xray_trampoline_mips64.S
+  )
 
 set(mips64el_SOURCES
-    xray_mips64.cc
-    xray_trampoline_mips64.S)
+  xray_mips64.cpp
+  xray_trampoline_mips64.S
+  )
 
 set(powerpc64le_SOURCES
-    xray_powerpc64.cc
-    xray_trampoline_powerpc64.cc
-    xray_trampoline_powerpc64_asm.S)
+  xray_powerpc64.cpp
+  xray_trampoline_powerpc64.cpp
+  xray_trampoline_powerpc64_asm.S
+  )
 
 set(XRAY_IMPL_HEADERS
   xray_allocator.h
@@ -85,7 +98,8 @@ set(XRAY_IMPL_HEADERS
   xray_segmented_array.h
   xray_tsc.h
   xray_utils.h
-  xray_x86_64.inc)
+  xray_x86_64.inc
+  )
 
 # Create list of all source files for
 # consumption by tests.
@@ -103,7 +117,7 @@ set(XRAY_ALL_SOURCE_FILES
   ${mips64el_SOURCES}
   ${powerpc64le_SOURCES}
   ${XRAY_IMPL_HEADERS}
-)
+  )
 list(REMOVE_DUPLICATES XRAY_ALL_SOURCE_FILES)
 # Make list that uses absolute paths
 set(XRAY_ALL_SOURCE_FILES_ABS_PATHS "")
diff --git a/compiler-rt/lib/xray/xray_AArch64.cc b/compiler-rt/lib/xray/xray_AArch64.cpp
index 4c7805488ab..081941b7037 100644
--- a/compiler-rt/lib/xray/xray_AArch64.cc
+++ b/compiler-rt/lib/xray/xray_AArch64.cpp
@@ -1,4 +1,4 @@
-//===-- xray_AArch64.cc -----------------------------------------*- C++ -*-===//
+//===-- xray_AArch64.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/xray/xray_arm.cc b/compiler-rt/lib/xray/xray_arm.cpp
index db26efaa782..9ad8065eb88 100644
--- a/compiler-rt/lib/xray/xray_arm.cc
+++ b/compiler-rt/lib/xray/xray_arm.cpp
@@ -1,4 +1,4 @@
-//===-- xray_arm.cc ---------------------------------------------*- C++ -*-===//
+//===-- xray_arm.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/xray/xray_basic_flags.cc b/compiler-rt/lib/xray/xray_basic_flags.cpp
index 75b674c8565..e0a5e7bb29e 100644
--- a/compiler-rt/lib/xray/xray_basic_flags.cc
+++ b/compiler-rt/lib/xray/xray_basic_flags.cpp
@@ -1,4 +1,4 @@
-//===-- xray_basic_flags.cc -------------------------------------*- C++ -*-===//
+//===-- xray_basic_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/xray/xray_basic_logging.cc b/compiler-rt/lib/xray/xray_basic_logging.cpp
index 553041ce0c3..6e8e9313145 100644
--- a/compiler-rt/lib/xray/xray_basic_logging.cc
+++ b/compiler-rt/lib/xray/xray_basic_logging.cpp
@@ -1,4 +1,4 @@
-//===-- xray_basic_logging.cc -----------------------------------*- C++ -*-===//
+//===-- xray_basic_logging.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/xray/xray_buffer_queue.cc b/compiler-rt/lib/xray/xray_buffer_queue.cpp
index 4cfa717de20..bad91e036ce 100644
--- a/compiler-rt/lib/xray/xray_buffer_queue.cc
+++ b/compiler-rt/lib/xray/xray_buffer_queue.cpp
@@ -1,4 +1,4 @@
-//===-- xray_buffer_queue.cc -----------------------------------*- C++ -*-===//
+//===-- xray_buffer_queue.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/xray/xray_fdr_flags.cc b/compiler-rt/lib/xray/xray_fdr_flags.cpp
index 8d432d298d8..272b0b7cb1f 100644
--- a/compiler-rt/lib/xray/xray_fdr_flags.cc
+++ b/compiler-rt/lib/xray/xray_fdr_flags.cpp
@@ -1,4 +1,4 @@
-//===-- xray_fdr_flags.cc ---------------------------------------*- C++ -*-===//
+//===-- xray_fdr_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/xray/xray_fdr_logging.cc b/compiler-rt/lib/xray/xray_fdr_logging.cpp
index abba06576da..16ce483502f 100644
--- a/compiler-rt/lib/xray/xray_fdr_logging.cc
+++ b/compiler-rt/lib/xray/xray_fdr_logging.cpp
@@ -1,4 +1,4 @@
-//===-- xray_fdr_logging.cc ------------------------------------*- C++ -*-===//
+//===-- xray_fdr_logging.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/xray/xray_flags.cc b/compiler-rt/lib/xray/xray_flags.cpp
index b9e8324a787..e4c6906dc44 100644
--- a/compiler-rt/lib/xray/xray_flags.cc
+++ b/compiler-rt/lib/xray/xray_flags.cpp
@@ -1,4 +1,4 @@
-//===-- xray_flags.cc -------------------------------------------*- C++ -*-===//
+//===-- xray_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/xray/xray_init.cc b/compiler-rt/lib/xray/xray_init.cpp
index b79bc08c5f4..40839647797 100644
--- a/compiler-rt/lib/xray/xray_init.cc
+++ b/compiler-rt/lib/xray/xray_init.cpp
@@ -1,4 +1,4 @@
-//===-- xray_init.cc --------------------------------------------*- C++ -*-===//
+//===-- xray_init.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/xray/xray_interface.cc b/compiler-rt/lib/xray/xray_interface.cpp
index 0d22893eb30..0d22893eb30 100644
--- a/compiler-rt/lib/xray/xray_interface.cc
+++ b/compiler-rt/lib/xray/xray_interface.cpp
diff --git a/compiler-rt/lib/xray/xray_log_interface.cc b/compiler-rt/lib/xray/xray_log_interface.cpp
index 7916a9e2b8a..fc70373f9da 100644
--- a/compiler-rt/lib/xray/xray_log_interface.cc
+++ b/compiler-rt/lib/xray/xray_log_interface.cpp
@@ -1,4 +1,4 @@
-//===-- xray_log_interface.cc ---------------------------------------------===//
+//===-- xray_log_interface.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/xray/xray_mips.cc b/compiler-rt/lib/xray/xray_mips.cpp
index 80990ab8d63..26fc5037447 100644
--- a/compiler-rt/lib/xray/xray_mips.cc
+++ b/compiler-rt/lib/xray/xray_mips.cpp
@@ -1,4 +1,4 @@
-//===-- xray_mips.cc --------------------------------------------*- C++ -*-===//
+//===-- xray_mips.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/xray/xray_mips64.cc b/compiler-rt/lib/xray/xray_mips64.cpp
index 73c8924f9a0..62c67ff7376 100644
--- a/compiler-rt/lib/xray/xray_mips64.cc
+++ b/compiler-rt/lib/xray/xray_mips64.cpp
@@ -1,4 +1,4 @@
-//===-- xray_mips64.cc ------------------------------------------*- C++ -*-===//
+//===-- xray_mips64.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/xray/xray_powerpc64.cc b/compiler-rt/lib/xray/xray_powerpc64.cpp
index abc2becf5b4..b41f1bce6f2 100644
--- a/compiler-rt/lib/xray/xray_powerpc64.cc
+++ b/compiler-rt/lib/xray/xray_powerpc64.cpp
@@ -1,4 +1,4 @@
-//===-- xray_powerpc64.cc ---------------------------------------*- C++ -*-===//
+//===-- xray_powerpc64.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/xray/xray_profile_collector.cc b/compiler-rt/lib/xray/xray_profile_collector.cpp
index 97b52e1d9a2..bef2504f2a1 100644
--- a/compiler-rt/lib/xray/xray_profile_collector.cc
+++ b/compiler-rt/lib/xray/xray_profile_collector.cpp
@@ -1,4 +1,4 @@
-//===-- xray_profile_collector.cc ------------------------------*- C++ -*-===//
+//===-- xray_profile_collector.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/xray/xray_profiling.cc b/compiler-rt/lib/xray/xray_profiling.cpp
index 66def6cf248..ef16691562c 100644
--- a/compiler-rt/lib/xray/xray_profiling.cc
+++ b/compiler-rt/lib/xray/xray_profiling.cpp
@@ -1,4 +1,4 @@
-//===-- xray_profiling.cc ---------------------------------------*- C++ -*-===//
+//===-- xray_profiling.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/xray/xray_profiling_flags.cc b/compiler-rt/lib/xray/xray_profiling_flags.cpp
index 0e89b7420f8..0e89b7420f8 100644
--- a/compiler-rt/lib/xray/xray_profiling_flags.cc
+++ b/compiler-rt/lib/xray/xray_profiling_flags.cpp
diff --git a/compiler-rt/lib/xray/xray_trampoline_powerpc64.cc b/compiler-rt/lib/xray/xray_trampoline_powerpc64.cpp
index 878c46930fe..878c46930fe 100644
--- a/compiler-rt/lib/xray/xray_trampoline_powerpc64.cc
+++ b/compiler-rt/lib/xray/xray_trampoline_powerpc64.cpp
diff --git a/compiler-rt/lib/xray/xray_utils.cc b/compiler-rt/lib/xray/xray_utils.cpp
index 82674baa5a0..1036d17a772 100644
--- a/compiler-rt/lib/xray/xray_utils.cc
+++ b/compiler-rt/lib/xray/xray_utils.cpp
@@ -1,4 +1,4 @@
-//===-- xray_utils.cc -------------------------------------------*- C++ -*-===//
+//===-- xray_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/xray/xray_x86_64.cc b/compiler-rt/lib/xray/xray_x86_64.cpp
index e63ee1b3bd0..e63ee1b3bd0 100644
--- a/compiler-rt/lib/xray/xray_x86_64.cc
+++ b/compiler-rt/lib/xray/xray_x86_64.cpp