gn build: Merge r367452 and add standalone sources

llvm-svn: 367454

1 files changed, 23 insertions, 10 deletions

diff --git a/llvm/utils/gn/secondary/compiler-rt/lib/ubsan/BUILD.gn b/llvm/utils/gn/secondary/compiler-rt/lib/ubsan/BUILD.gn
index 6fa8663523c..d38040c2623 100644
--- a/llvm/utils/gn/secondary/compiler-rt/lib/ubsan/BUILD.gn
+++ b/llvm/utils/gn/secondary/compiler-rt/lib/ubsan/BUILD.gn
@@ -7,34 +7,47 @@ source_set("sources") {
     "//compiler-rt/lib/sanitizer_common:sources",
   ]
   sources = [
-    "ubsan_diag.cc",
+    "ubsan_diag.cpp",
     "ubsan_diag.h",
-    "ubsan_flags.cc",
+    "ubsan_flags.cpp",
     "ubsan_flags.h",
-    "ubsan_handlers.cc",
+    "ubsan_handlers.cpp",
     "ubsan_handlers.h",
-    "ubsan_init.cc",
+    "ubsan_init.cpp",
     "ubsan_init.h",
-    "ubsan_monitor.cc",
+    "ubsan_monitor.cpp",
     "ubsan_monitor.h",
     "ubsan_platform.h",
     "ubsan_signals_standalone.h",
     "ubsan_type_hash.h",
-    "ubsan_value.cc",
+    "ubsan_value.cpp",
     "ubsan_value.h",
   ]
 }
 
+# Unreferenced; at the moment exists to make sync_source_lists_from_cmake happy.
+source_set("standalone_sources") {
+  configs -= [ "//llvm/utils/gn/build:llvm_code" ]
+  configs -= [ "//llvm/utils/gn/build:no_rtti" ]
+  configs += [ "//llvm/utils/gn/build:crt_code" ]
+  defines = [ "UBSAN_CAN_USE_CXXABI" ]
+  sources = [
+    "ubsan_diag_standalone.cpp",
+    "ubsan_init_standalone.cpp",
+    "ubsan_signals_standalone.cpp",
+  ]
+}
+
 source_set("cxx_sources") {
   configs -= [ "//llvm/utils/gn/build:llvm_code" ]
   configs -= [ "//llvm/utils/gn/build:no_rtti" ]
   configs += [ "//llvm/utils/gn/build:crt_code" ]
   defines = [ "UBSAN_CAN_USE_CXXABI" ]
   sources = [
-    "ubsan_handlers_cxx.cc",
+    "ubsan_handlers_cxx.cpp",
     "ubsan_handlers_cxx.h",
-    "ubsan_type_hash.cc",
-    "ubsan_type_hash_itanium.cc",
-    "ubsan_type_hash_win.cc",
+    "ubsan_type_hash.cpp",
+    "ubsan_type_hash_itanium.cpp",
+    "ubsan_type_hash_win.cpp",
   ]
 }