[llvm] 111ec8c - [gn build] (manually) merge 1cf11a4c67a15

[Nico Weber via llvm-commits]

Author: Nico Weber
Date: 2020-01-08T07:44:33-05:00
New Revision: 111ec8c2a435440a72904aeca22c9f3046de5f42

URL: https://github.com/llvm/llvm-project/commit/111ec8c2a435440a72904aeca22c9f3046de5f42
DIFF: https://github.com/llvm/llvm-project/commit/111ec8c2a435440a72904aeca22c9f3046de5f42.diff

LOG: [gn build] (manually) merge 1cf11a4c67a15

Added: 
    llvm/utils/gn/secondary/llvm/lib/DWARFLinker/BUILD.gn

Modified: 
    llvm/utils/gn/secondary/llvm/tools/dsymutil/BUILD.gn

Removed: 
    


################################################################################
diff  --git a/llvm/utils/gn/secondary/llvm/lib/DWARFLinker/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/DWARFLinker/BUILD.gn
new file mode 100644
index 000000000000..57a3a7fe3b06
--- /dev/null
+++ b/llvm/utils/gn/secondary/llvm/lib/DWARFLinker/BUILD.gn
@@ -0,0 +1,16 @@
+static_library("DWARFLinker") {
+  output_name = "LLVMDWARFLinker"
+  deps = [
+    "//llvm/lib/CodeGen",
+    "//llvm/lib/CodeGen/AsmPrinter",
+    "//llvm/lib/DebugInfo/DWARF",
+    "//llvm/lib/MC",
+    "//llvm/lib/Object",
+    "//llvm/lib/Support",
+  ]
+  sources = [
+    "DWARFLinker.cpp",
+    "DWARFLinkerCompileUnit.cpp",
+    "DWARFLinkerDeclContext.cpp",
+  ]
+}

diff  --git a/llvm/utils/gn/secondary/llvm/tools/dsymutil/BUILD.gn b/llvm/utils/gn/secondary/llvm/tools/dsymutil/BUILD.gn
index e05bb9798ae8..48dacea2a0ae 100644
--- a/llvm/utils/gn/secondary/llvm/tools/dsymutil/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/tools/dsymutil/BUILD.gn
@@ -9,6 +9,7 @@ executable("dsymutil") {
   deps = [
     ":Options",
     "//llvm/lib/CodeGen/AsmPrinter",
+    "//llvm/lib/DWARFLinker",
     "//llvm/lib/DebugInfo/DWARF",
     "//llvm/lib/MC",
     "//llvm/lib/Object",
@@ -20,10 +21,8 @@ executable("dsymutil") {
   sources = [
     "BinaryHolder.cpp",
     "CFBundle.cpp",
-    "CompileUnit.cpp",
     "DebugMap.cpp",
-    "DeclContext.cpp",
-    "DwarfLinker.cpp",
+    "DwarfLinkerForBinary.cpp",
     "DwarfStreamer.cpp",
     "MachODebugMapParser.cpp",
     "MachOUtils.cpp",