34 files changed, 46 insertions, 50 deletions
diff --git a/openmp/runtime/CMakeLists.txt b/openmp/runtime/CMakeLists.txt
index 08469351182..6b896aa3ecd 100644
--- a/openmp/runtime/CMakeLists.txt
+++ b/openmp/runtime/CMakeLists.txt
@@ -157,7 +157,7 @@ set(LIBOMP_USE_HWLOC FALSE CACHE BOOL
 set(LIBOMP_HWLOC_INSTALL_DIR /usr/local CACHE PATH
   "Install path for hwloc library")
 
-# Get the build number from kmp_version.c
+# Get the build number from kmp_version.cpp
 libomp_get_build_number("${CMAKE_CURRENT_SOURCE_DIR}" LIBOMP_VERSION_BUILD)
 math(EXPR LIBOMP_VERSION_BUILD_YEAR "${LIBOMP_VERSION_BUILD}/10000")
 math(EXPR LIBOMP_VERSION_BUILD_MONTH_DAY "${LIBOMP_VERSION_BUILD}%10000")
diff --git a/openmp/runtime/cmake/LibompUtils.cmake b/openmp/runtime/cmake/LibompUtils.cmake
index dd2d4ecebf7..f4cfa8cf551 100644
--- a/openmp/runtime/cmake/LibompUtils.cmake
+++ b/openmp/runtime/cmake/LibompUtils.cmake
@@ -133,12 +133,12 @@ function(libomp_check_variable var)
 endfunction()
 
 # void libomp_get_build_number(string src_dir, string* return_build_number);
-# - grab the eight digit build number (or 00000000) from kmp_version.c
+# - grab the eight digit build number (or 00000000) from kmp_version.cpp
 function(libomp_get_build_number src_dir return_build_number)
-  # sets file_lines_list to a list of all lines in kmp_version.c
-  file(STRINGS "${src_dir}/src/kmp_version.c" file_lines_list)
+  # sets file_lines_list to a list of all lines in kmp_version.cpp
+  file(STRINGS "${src_dir}/src/kmp_version.cpp" file_lines_list)
 
-  # runs through each line in kmp_version.c
+  # runs through each line in kmp_version.cpp
   foreach(line IN LISTS file_lines_list)
     # if the line begins with "#define KMP_VERSION_BUILD" then we take not of the build number
     string(REGEX MATCH "^[ \t]*#define[ \t]+KMP_VERSION_BUILD" valid "${line}")
diff --git a/openmp/runtime/src/CMakeLists.txt b/openmp/runtime/src/CMakeLists.txt
index 7c7927622f9..b0aa4870966 100644
--- a/openmp/runtime/src/CMakeLists.txt
+++ b/openmp/runtime/src/CMakeLists.txt
@@ -56,43 +56,27 @@ set(LIBOMP_CFILES)
 set(LIBOMP_CXXFILES)
 set(LIBOMP_ASMFILES)
 if(${STUBS_LIBRARY})
-  set(LIBOMP_CFILES kmp_stub.c)
+  set(LIBOMP_CFILES kmp_stub.cpp)
 else()
-  # Get C files
-  set(LIBOMP_CFILES
-    kmp_alloc.c
-    kmp_atomic.c
-    kmp_csupport.c
-    kmp_debug.c
-    kmp_itt.c
-    kmp_environment.c
-    kmp_error.c
-    kmp_global.c
-    kmp_i18n.c
-    kmp_io.c
-    kmp_runtime.c
-    kmp_settings.c
-    kmp_str.c
-    kmp_tasking.c
-    kmp_taskq.c
-    kmp_threadprivate.c
-    kmp_utility.c
-  )
-  if(WIN32)
-    # Windows specific files
-    libomp_append(LIBOMP_CFILES z_Windows_NT_util.c)
-    libomp_append(LIBOMP_CFILES z_Windows_NT-586_util.c)
-    libomp_append(LIBOMP_ASMFILES z_Windows_NT-586_asm.asm) # Windows assembly file
-  else()
-    # Unix specific files
-    libomp_append(LIBOMP_CFILES z_Linux_util.c)
-    libomp_append(LIBOMP_CFILES kmp_gsupport.c)
-    libomp_append(LIBOMP_ASMFILES z_Linux_asm.s) # Unix assembly file
-  endif()
-  libomp_append(LIBOMP_CFILES thirdparty/ittnotify/ittnotify_static.c LIBOMP_USE_ITT_NOTIFY)
-  libomp_append(LIBOMP_CFILES kmp_debugger.c LIBOMP_USE_DEBUGGER)
   # Get C++ files
   set(LIBOMP_CXXFILES
+    kmp_alloc.cpp
+    kmp_atomic.cpp
+    kmp_csupport.cpp
+    kmp_debug.cpp
+    kmp_itt.cpp
+    kmp_environment.cpp
+    kmp_error.cpp
+    kmp_global.cpp
+    kmp_i18n.cpp
+    kmp_io.cpp
+    kmp_runtime.cpp
+    kmp_settings.cpp
+    kmp_str.cpp
+    kmp_tasking.cpp
+    kmp_taskq.cpp
+    kmp_threadprivate.cpp
+    kmp_utility.cpp
     kmp_barrier.cpp
     kmp_wait_release.cpp
     kmp_affinity.cpp
@@ -100,6 +84,19 @@ else()
     kmp_lock.cpp
     kmp_sched.cpp
   )
+  if(WIN32)
+    # Windows specific files
+    libomp_append(LIBOMP_CXXFILES z_Windows_NT_util.cpp)
+    libomp_append(LIBOMP_CXXFILES z_Windows_NT-586_util.cpp)
+    libomp_append(LIBOMP_ASMFILES z_Windows_NT-586_asm.asm) # Windows assembly file
+  else()
+    # Unix specific files
+    libomp_append(LIBOMP_CXXFILES z_Linux_util.cpp)
+    libomp_append(LIBOMP_CXXFILES kmp_gsupport.cpp)
+    libomp_append(LIBOMP_ASMFILES z_Linux_asm.s) # Unix assembly file
+  endif()
+  libomp_append(LIBOMP_CFILES thirdparty/ittnotify/ittnotify_static.c LIBOMP_USE_ITT_NOTIFY)
+  libomp_append(LIBOMP_CXXFILES kmp_debugger.cpp LIBOMP_USE_DEBUGGER)
   libomp_append(LIBOMP_CXXFILES kmp_stats.cpp LIBOMP_STATS)
   libomp_append(LIBOMP_CXXFILES kmp_stats_timing.cpp LIBOMP_STATS)
   if(${LIBOMP_OMP_VERSION} GREATER 40 OR ${LIBOMP_OMP_VERSION} EQUAL 40)
@@ -108,12 +105,11 @@ else()
   endif()
 endif()
 # Files common to stubs and normal library
-libomp_append(LIBOMP_CFILES kmp_ftn_cdecl.c)
-libomp_append(LIBOMP_CFILES kmp_ftn_extra.c)
-libomp_append(LIBOMP_CFILES kmp_version.c)
-libomp_append(LIBOMP_CFILES ompt-general.c IF_TRUE LIBOMP_OMPT_SUPPORT)
-
-libomp_append(LIBOMP_CFILES tsan_annotations.c IF_TRUE LIBOMP_TSAN_SUPPORT)
+libomp_append(LIBOMP_CXXFILES kmp_ftn_cdecl.cpp)
+libomp_append(LIBOMP_CXXFILES kmp_ftn_extra.cpp)
+libomp_append(LIBOMP_CXXFILES kmp_version.cpp)
+libomp_append(LIBOMP_CXXFILES ompt-general.cpp IF_TRUE LIBOMP_OMPT_SUPPORT)
+libomp_append(LIBOMP_CXXFILES tsan_annotations.cpp IF_TRUE LIBOMP_TSAN_SUPPORT)
 
 set(LIBOMP_SOURCE_FILES ${LIBOMP_CFILES} ${LIBOMP_CXXFILES} ${LIBOMP_ASMFILES})
 # For Windows, there is a resource file (.rc -> .res) that is also compiled
@@ -202,9 +198,9 @@ if(WIN32)
   set_source_files_properties(thirdparty/ittnotify/ittnotify_static.c PROPERTIES COMPILE_DEFINITIONS "UNICODE")
 
   # Create Windows import library
-  # the import library is "re-linked" to include kmp_import.c which prevents
+  # the import library is "re-linked" to include kmp_import.cpp which prevents
   # linking of both Visual Studio OpenMP and newly built OpenMP
-  set_source_files_properties(kmp_import.c PROPERTIES COMPILE_FLAGS "${LIBOMP_CONFIGURED_CFLAGS}")
+  set_source_files_properties(kmp_import.cpp PROPERTIES COMPILE_FLAGS "${LIBOMP_CONFIGURED_CFLAGS}")
   set(LIBOMP_IMP_LIB_FILE ${LIBOMP_LIB_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX})
   set(LIBOMP_GENERATED_IMP_LIB_FILENAME ${LIBOMP_LIB_FILE}${CMAKE_STATIC_LIBRARY_SUFFIX})
   set_target_properties(omp PROPERTIES
@@ -220,8 +216,8 @@ if(WIN32)
     set(LIBOMP_GENERATED_IMP_LIB ${CMAKE_CURRENT_BINARY_DIR}/${LIBOMP_GENERATED_IMP_LIB_FILENAME})
   endif()
   set_source_files_properties(${LIBOMP_GENERATED_IMP_LIB} PROPERTIES GENERATED TRUE EXTERNAL_OBJECT TRUE)
-  # Create new import library that is just the previously created one + kmp_import.c
-  add_library(ompimp STATIC ${LIBOMP_GENERATED_IMP_LIB} kmp_import.c)
+  # Create new import library that is just the previously created one + kmp_import.cpp
+  add_library(ompimp STATIC ${LIBOMP_GENERATED_IMP_LIB} kmp_import.cpp)
   set_target_properties(ompimp PROPERTIES
     PREFIX "" SUFFIX "" OUTPUT_NAME "${LIBOMP_IMP_LIB_FILE}"
     LINKER_LANGUAGE C
diff --git a/openmp/runtime/src/kmp_alloc.c b/openmp/runtime/src/kmp_alloc.cpp
index f3665eca1b8..f3665eca1b8 100644
--- a/openmp/runtime/src/kmp_alloc.c
+++ b/openmp/runtime/src/kmp_alloc.cpp
diff --git a/openmp/runtime/src/kmp_atomic.c b/openmp/runtime/src/kmp_atomic.cpp
index fec2f88c6c0..fec2f88c6c0 100644
--- a/openmp/runtime/src/kmp_atomic.c
+++ b/openmp/runtime/src/kmp_atomic.cpp
diff --git a/openmp/runtime/src/kmp_csupport.c b/openmp/runtime/src/kmp_csupport.cpp
index 00dc47167a3..00dc47167a3 100644
--- a/openmp/runtime/src/kmp_csupport.c
+++ b/openmp/runtime/src/kmp_csupport.cpp
diff --git a/openmp/runtime/src/kmp_debug.c b/openmp/runtime/src/kmp_debug.cpp
index 3bbffa53f21..3bbffa53f21 100644
--- a/openmp/runtime/src/kmp_debug.c
+++ b/openmp/runtime/src/kmp_debug.cpp
diff --git a/openmp/runtime/src/kmp_debugger.c b/openmp/runtime/src/kmp_debugger.cpp
index 76fe1e03b56..76fe1e03b56 100644
--- a/openmp/runtime/src/kmp_debugger.c
+++ b/openmp/runtime/src/kmp_debugger.cpp
diff --git a/openmp/runtime/src/kmp_environment.c b/openmp/runtime/src/kmp_environment.cpp
index 940235a9298..940235a9298 100644
--- a/openmp/runtime/src/kmp_environment.c
+++ b/openmp/runtime/src/kmp_environment.cpp
diff --git a/openmp/runtime/src/kmp_error.c b/openmp/runtime/src/kmp_error.cpp
index 6866df5d496..6866df5d496 100644
--- a/openmp/runtime/src/kmp_error.c
+++ b/openmp/runtime/src/kmp_error.cpp
diff --git a/openmp/runtime/src/kmp_ftn_cdecl.c b/openmp/runtime/src/kmp_ftn_cdecl.cpp
index 5844bee85bc..5844bee85bc 100644
--- a/openmp/runtime/src/kmp_ftn_cdecl.c
+++ b/openmp/runtime/src/kmp_ftn_cdecl.cpp
diff --git a/openmp/runtime/src/kmp_ftn_extra.c b/openmp/runtime/src/kmp_ftn_extra.cpp
index 73c4e2d45b7..73c4e2d45b7 100644
--- a/openmp/runtime/src/kmp_ftn_extra.c
+++ b/openmp/runtime/src/kmp_ftn_extra.cpp
diff --git a/openmp/runtime/src/kmp_ftn_stdcall.c b/openmp/runtime/src/kmp_ftn_stdcall.cpp
index cf70d74af55..cf70d74af55 100644
--- a/openmp/runtime/src/kmp_ftn_stdcall.c
+++ b/openmp/runtime/src/kmp_ftn_stdcall.cpp
diff --git a/openmp/runtime/src/kmp_global.c b/openmp/runtime/src/kmp_global.cpp
index 86cd3d204ee..86cd3d204ee 100644
--- a/openmp/runtime/src/kmp_global.c
+++ b/openmp/runtime/src/kmp_global.cpp
diff --git a/openmp/runtime/src/kmp_gsupport.c b/openmp/runtime/src/kmp_gsupport.cpp
index e07c09d3c2e..e07c09d3c2e 100644
--- a/openmp/runtime/src/kmp_gsupport.c
+++ b/openmp/runtime/src/kmp_gsupport.cpp
diff --git a/openmp/runtime/src/kmp_i18n.c b/openmp/runtime/src/kmp_i18n.cpp
index 538c5f3279e..538c5f3279e 100644
--- a/openmp/runtime/src/kmp_i18n.c
+++ b/openmp/runtime/src/kmp_i18n.cpp
diff --git a/openmp/runtime/src/kmp_import.c b/openmp/runtime/src/kmp_import.cpp
index 42fba412c1f..42fba412c1f 100644
--- a/openmp/runtime/src/kmp_import.c
+++ b/openmp/runtime/src/kmp_import.cpp
diff --git a/openmp/runtime/src/kmp_io.c b/openmp/runtime/src/kmp_io.cpp
index 4e79e22efe6..4e79e22efe6 100644
--- a/openmp/runtime/src/kmp_io.c
+++ b/openmp/runtime/src/kmp_io.cpp
diff --git a/openmp/runtime/src/kmp_itt.c b/openmp/runtime/src/kmp_itt.cpp
index 3eb548604a1..3eb548604a1 100644
--- a/openmp/runtime/src/kmp_itt.c
+++ b/openmp/runtime/src/kmp_itt.cpp
diff --git a/openmp/runtime/src/kmp_runtime.c b/openmp/runtime/src/kmp_runtime.cpp
index 2a67206f981..2a67206f981 100644
--- a/openmp/runtime/src/kmp_runtime.c
+++ b/openmp/runtime/src/kmp_runtime.cpp
diff --git a/openmp/runtime/src/kmp_settings.c b/openmp/runtime/src/kmp_settings.cpp
index ef7f69eef24..ef7f69eef24 100644
--- a/openmp/runtime/src/kmp_settings.c
+++ b/openmp/runtime/src/kmp_settings.cpp
diff --git a/openmp/runtime/src/kmp_str.c b/openmp/runtime/src/kmp_str.cpp
index c9f913c0bdc..c9f913c0bdc 100644
--- a/openmp/runtime/src/kmp_str.c
+++ b/openmp/runtime/src/kmp_str.cpp
diff --git a/openmp/runtime/src/kmp_stub.c b/openmp/runtime/src/kmp_stub.cpp
index 437bf3d538a..437bf3d538a 100644
--- a/openmp/runtime/src/kmp_stub.c
+++ b/openmp/runtime/src/kmp_stub.cpp
diff --git a/openmp/runtime/src/kmp_tasking.c b/openmp/runtime/src/kmp_tasking.cpp
index 07557890c4d..07557890c4d 100644
--- a/openmp/runtime/src/kmp_tasking.c
+++ b/openmp/runtime/src/kmp_tasking.cpp
diff --git a/openmp/runtime/src/kmp_taskq.c b/openmp/runtime/src/kmp_taskq.cpp
index 3079d45974b..3079d45974b 100644
--- a/openmp/runtime/src/kmp_taskq.c
+++ b/openmp/runtime/src/kmp_taskq.cpp
diff --git a/openmp/runtime/src/kmp_threadprivate.c b/openmp/runtime/src/kmp_threadprivate.cpp
index 2a18d808e62..2a18d808e62 100644
--- a/openmp/runtime/src/kmp_threadprivate.c
+++ b/openmp/runtime/src/kmp_threadprivate.cpp
diff --git a/openmp/runtime/src/kmp_utility.c b/openmp/runtime/src/kmp_utility.cpp
index 761fd06ac2e..761fd06ac2e 100644
--- a/openmp/runtime/src/kmp_utility.c
+++ b/openmp/runtime/src/kmp_utility.cpp
diff --git a/openmp/runtime/src/kmp_version.c b/openmp/runtime/src/kmp_version.cpp
index 15edfd2fd42..15edfd2fd42 100644
--- a/openmp/runtime/src/kmp_version.c
+++ b/openmp/runtime/src/kmp_version.cpp
diff --git a/openmp/runtime/src/ompt-general.c b/openmp/runtime/src/ompt-general.cpp
index 34f1073b3a9..37c1c220d26 100644
--- a/openmp/runtime/src/ompt-general.c
+++ b/openmp/runtime/src/ompt-general.cpp
@@ -15,7 +15,7 @@
  * ompt include files
  ****************************************************************************/
 
-#include "ompt-specific.c"
+#include "ompt-specific.cpp"
 
 
 
diff --git a/openmp/runtime/src/ompt-specific.c b/openmp/runtime/src/ompt-specific.cpp
index 9a962f4e0b6..9a962f4e0b6 100644
--- a/openmp/runtime/src/ompt-specific.c
+++ b/openmp/runtime/src/ompt-specific.cpp
diff --git a/openmp/runtime/src/tsan_annotations.c b/openmp/runtime/src/tsan_annotations.cpp
index edc4e7c9709..edc4e7c9709 100644
--- a/openmp/runtime/src/tsan_annotations.c
+++ b/openmp/runtime/src/tsan_annotations.cpp
diff --git a/openmp/runtime/src/z_Linux_util.c b/openmp/runtime/src/z_Linux_util.cpp
index 34a4f2c9769..34a4f2c9769 100644
--- a/openmp/runtime/src/z_Linux_util.c
+++ b/openmp/runtime/src/z_Linux_util.cpp
diff --git a/openmp/runtime/src/z_Windows_NT-586_util.c b/openmp/runtime/src/z_Windows_NT-586_util.cpp
index 3aeafae9102..3aeafae9102 100644
--- a/openmp/runtime/src/z_Windows_NT-586_util.c
+++ b/openmp/runtime/src/z_Windows_NT-586_util.cpp
diff --git a/openmp/runtime/src/z_Windows_NT_util.c b/openmp/runtime/src/z_Windows_NT_util.cpp
index 1a371303e1a..1a371303e1a 100644
--- a/openmp/runtime/src/z_Windows_NT_util.c
+++ b/openmp/runtime/src/z_Windows_NT_util.cpp