gn build: Merge r367463

llvm-svn: 367464

1 files changed, 81 insertions, 64 deletions

diff --git a/llvm/utils/gn/secondary/compiler-rt/lib/sanitizer_common/BUILD.gn b/llvm/utils/gn/secondary/compiler-rt/lib/sanitizer_common/BUILD.gn
index 0c4c2e27785..c5d9ab60832 100644
--- a/llvm/utils/gn/secondary/compiler-rt/lib/sanitizer_common/BUILD.gn
+++ b/llvm/utils/gn/secondary/compiler-rt/lib/sanitizer_common/BUILD.gn
@@ -12,13 +12,13 @@ source_set("sources") {
     libs += [ "rt" ]
   }
   sources = [
-    "sancov_flags.cc",
+    "sancov_flags.cpp",
     "sancov_flags.h",
     "sanitizer_addrhashmap.h",
-    "sanitizer_allocator.cc",
+    "sanitizer_allocator.cpp",
     "sanitizer_allocator.h",
     "sanitizer_allocator_bytemap.h",
-    "sanitizer_allocator_checks.cc",
+    "sanitizer_allocator_checks.cpp",
     "sanitizer_allocator_checks.h",
     "sanitizer_allocator_combined.h",
     "sanitizer_allocator_interface.h",
@@ -26,7 +26,7 @@ source_set("sources") {
     "sanitizer_allocator_local_cache.h",
     "sanitizer_allocator_primary32.h",
     "sanitizer_allocator_primary64.h",
-    "sanitizer_allocator_report.cc",
+    "sanitizer_allocator_report.cpp",
     "sanitizer_allocator_report.h",
     "sanitizer_allocator_secondary.h",
     "sanitizer_allocator_size_class_map.h",
@@ -40,121 +40,138 @@ source_set("sources") {
     "sanitizer_atomic_msvc.h",
     "sanitizer_bitvector.h",
     "sanitizer_bvgraph.h",
-    "sanitizer_common.cc",
+    "sanitizer_common.cpp",
     "sanitizer_common.h",
-    "sanitizer_common_libcdep.cc",
-    "sanitizer_coverage_fuchsia.cc",
-    "sanitizer_coverage_libcdep_new.cc",
-    "sanitizer_coverage_win_sections.cc",
+    "sanitizer_common_libcdep.cpp",
+    "sanitizer_coverage_fuchsia.cpp",
+    "sanitizer_coverage_libcdep_new.cpp",
+    "sanitizer_coverage_win_sections.cpp",
     "sanitizer_dbghelp.h",
     "sanitizer_deadlock_detector.h",
-    "sanitizer_deadlock_detector1.cc",
-    "sanitizer_deadlock_detector2.cc",
+    "sanitizer_deadlock_detector1.cpp",
+    "sanitizer_deadlock_detector2.cpp",
     "sanitizer_deadlock_detector_interface.h",
-    "sanitizer_errno.cc",
+    "sanitizer_errno.cpp",
     "sanitizer_errno.h",
     "sanitizer_errno_codes.h",
-    "sanitizer_file.cc",
+    "sanitizer_file.cpp",
     "sanitizer_file.h",
-    "sanitizer_flag_parser.cc",
+    "sanitizer_flag_parser.cpp",
     "sanitizer_flag_parser.h",
-    "sanitizer_flags.cc",
+    "sanitizer_flags.cpp",
     "sanitizer_flags.h",
     "sanitizer_freebsd.h",
-    "sanitizer_fuchsia.cc",
+    "sanitizer_fuchsia.cpp",
     "sanitizer_fuchsia.h",
     "sanitizer_getauxval.h",
     "sanitizer_hash.h",
     "sanitizer_interface_internal.h",
     "sanitizer_internal_defs.h",
     "sanitizer_lfstack.h",
-    "sanitizer_libc.cc",
+    "sanitizer_libc.cpp",
     "sanitizer_libc.h",
-    "sanitizer_libignore.cc",
+    "sanitizer_libignore.cpp",
     "sanitizer_libignore.h",
-    "sanitizer_linux.cc",
+    "sanitizer_linux.cpp",
     "sanitizer_linux.h",
-    "sanitizer_linux_libcdep.cc",
-    "sanitizer_linux_s390.cc",
+    "sanitizer_linux_libcdep.cpp",
+    "sanitizer_linux_s390.cpp",
     "sanitizer_list.h",
     "sanitizer_local_address_space_view.h",
-    "sanitizer_mac.cc",
+    "sanitizer_mac.cpp",
     "sanitizer_mac.h",
-    "sanitizer_mac_libcdep.cc",
+    "sanitizer_mac_libcdep.cpp",
     "sanitizer_mutex.h",
-    "sanitizer_netbsd.cc",
-    "sanitizer_openbsd.cc",
-    "sanitizer_persistent_allocator.cc",
+    "sanitizer_netbsd.cpp",
+    "sanitizer_openbsd.cpp",
+    "sanitizer_persistent_allocator.cpp",
     "sanitizer_persistent_allocator.h",
     "sanitizer_placement_new.h",
     "sanitizer_platform.h",
     "sanitizer_platform_interceptors.h",
-    "sanitizer_platform_limits_freebsd.cc",
-    "sanitizer_platform_limits_linux.cc",
-    "sanitizer_platform_limits_netbsd.cc",
+    "sanitizer_platform_limits_freebsd.cpp",
+    "sanitizer_platform_limits_linux.cpp",
+    "sanitizer_platform_limits_netbsd.cpp",
     "sanitizer_platform_limits_netbsd.h",
-    "sanitizer_platform_limits_openbsd.cc",
+    "sanitizer_platform_limits_openbsd.cpp",
     "sanitizer_platform_limits_openbsd.h",
-    "sanitizer_platform_limits_posix.cc",
+    "sanitizer_platform_limits_posix.cpp",
     "sanitizer_platform_limits_posix.h",
-    "sanitizer_platform_limits_solaris.cc",
+    "sanitizer_platform_limits_solaris.cpp",
     "sanitizer_platform_limits_solaris.h",
-    "sanitizer_posix.cc",
+    "sanitizer_posix.cpp",
     "sanitizer_posix.h",
-    "sanitizer_posix_libcdep.cc",
-    "sanitizer_printf.cc",
+    "sanitizer_posix_libcdep.cpp",
+    "sanitizer_printf.cpp",
     "sanitizer_procmaps.h",
-    "sanitizer_procmaps_bsd.cc",
-    "sanitizer_procmaps_common.cc",
-    "sanitizer_procmaps_linux.cc",
-    "sanitizer_procmaps_mac.cc",
-    "sanitizer_procmaps_solaris.cc",
+    "sanitizer_procmaps_bsd.cpp",
+    "sanitizer_procmaps_common.cpp",
+    "sanitizer_procmaps_linux.cpp",
+    "sanitizer_procmaps_mac.cpp",
+    "sanitizer_procmaps_solaris.cpp",
     "sanitizer_quarantine.h",
     "sanitizer_report_decorator.h",
     "sanitizer_ring_buffer.h",
-    "sanitizer_rtems.cc",
+    "sanitizer_rtems.cpp",
     "sanitizer_rtems.h",
-    "sanitizer_solaris.cc",
-    "sanitizer_stackdepot.cc",
+    "sanitizer_solaris.cpp",
+    "sanitizer_stackdepot.cpp",
     "sanitizer_stackdepot.h",
     "sanitizer_stackdepotbase.h",
-    "sanitizer_stacktrace.cc",
+    "sanitizer_stacktrace.cpp",
     "sanitizer_stacktrace.h",
-    "sanitizer_stacktrace_libcdep.cc",
-    "sanitizer_stacktrace_printer.cc",
+    "sanitizer_stacktrace_libcdep.cpp",
+    "sanitizer_stacktrace_printer.cpp",
     "sanitizer_stacktrace_printer.h",
-    "sanitizer_stacktrace_sparc.cc",
+    "sanitizer_stacktrace_sparc.cpp",
     "sanitizer_stoptheworld.h",
-    "sanitizer_stoptheworld_linux_libcdep.cc",
-    "sanitizer_stoptheworld_mac.cc",
-    "sanitizer_suppressions.cc",
+    "sanitizer_stoptheworld_linux_libcdep.cpp",
+    "sanitizer_stoptheworld_mac.cpp",
+    "sanitizer_stoptheworld_netbsd_libcdep.cpp",
+    "sanitizer_suppressions.cpp",
     "sanitizer_suppressions.h",
-    "sanitizer_symbolizer.cc",
+    "sanitizer_symbolizer.cpp",
     "sanitizer_symbolizer.h",
     "sanitizer_symbolizer_fuchsia.h",
     "sanitizer_symbolizer_internal.h",
-    "sanitizer_symbolizer_libbacktrace.cc",
+    "sanitizer_symbolizer_libbacktrace.cpp",
     "sanitizer_symbolizer_libbacktrace.h",
-    "sanitizer_symbolizer_libcdep.cc",
-    "sanitizer_symbolizer_mac.cc",
+    "sanitizer_symbolizer_libcdep.cpp",
+    "sanitizer_symbolizer_mac.cpp",
     "sanitizer_symbolizer_mac.h",
-    "sanitizer_symbolizer_markup.cc",
-    "sanitizer_symbolizer_posix_libcdep.cc",
-    "sanitizer_symbolizer_report.cc",
+    "sanitizer_symbolizer_markup.cpp",
+    "sanitizer_symbolizer_posix_libcdep.cpp",
+    "sanitizer_symbolizer_report.cpp",
     "sanitizer_symbolizer_rtems.h",
-    "sanitizer_symbolizer_win.cc",
-    "sanitizer_termination.cc",
-    "sanitizer_thread_registry.cc",
+    "sanitizer_symbolizer_win.cpp",
+    "sanitizer_termination.cpp",
+    "sanitizer_thread_registry.cpp",
     "sanitizer_thread_registry.h",
-    "sanitizer_tls_get_addr.cc",
+    "sanitizer_tls_get_addr.cpp",
     "sanitizer_tls_get_addr.h",
-    "sanitizer_unwind_linux_libcdep.cc",
-    "sanitizer_unwind_win.cc",
+    "sanitizer_type_traits.cpp",
+    "sanitizer_unwind_linux_libcdep.cpp",
+    "sanitizer_unwind_win.cpp",
     "sanitizer_vector.h",
-    "sanitizer_win.cc",
+    "sanitizer_win.cpp",
     "sanitizer_win.h",
     "sanitizer_win_defs.h",
     "sanitizer_win_dll_thunk.h",
     "sanitizer_win_weak_interception.h",
   ]
 }
+
+# Libc functions stubs. These sources should be linked instead of
+# SANITIZER_LIBCDEP_SOURCES when sanitizer_common library must not depend on
+# libc. This is currently unreferenced and exists to make
+# sync_source_lists_from_cmake happy.
+source_set("nolibc_sources") {
+  configs -= [ "//llvm/utils/gn/build:llvm_code" ]
+  configs += [ "//llvm/utils/gn/build:crt_code" ]
+  deps = [
+    "//llvm/utils/gn/build/libs/pthread",
+  ]
+  sources = [
+    "sanitizer_common_nolibc.cpp",
+  ]
+}