From edeb3039772c52ebe0a67d3554bc760206dde2af Mon Sep 17 00:00:00 2001
From: Nico Weber <nicolasweber@gmx.de>
Date: Wed, 7 Aug 2019 15:29:01 +0000
Subject: [PATCH] gn build: Merge r368119

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@368178 91177308-0d34-0410-b5e6-96231b3b80d8
---
 utils/gn/secondary/llvm/lib/ObjectYAML/BUILD.gn       | 8 ++++++++
 utils/gn/secondary/llvm/tools/yaml2obj/BUILD.gn       | 8 --------
 utils/gn/secondary/llvm/unittests/ObjectYAML/BUILD.gn | 1 +
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/utils/gn/secondary/llvm/lib/ObjectYAML/BUILD.gn b/utils/gn/secondary/llvm/lib/ObjectYAML/BUILD.gn
index 84575f2be23..fbb4187ab4a 100644
--- a/utils/gn/secondary/llvm/lib/ObjectYAML/BUILD.gn
+++ b/utils/gn/secondary/llvm/lib/ObjectYAML/BUILD.gn
@@ -2,9 +2,12 @@ static_library("ObjectYAML") {
   output_name = "LLVMObjectYAML"
   deps = [
     "//llvm/lib/DebugInfo/CodeView",
+    "//llvm/lib/MC",
+    "//llvm/lib/Object",
     "//llvm/lib/Support",
   ]
   sources = [
+    "COFFEmitter.cpp",
     "COFFYAML.cpp",
     "CodeViewYAMLDebugSections.cpp",
     "CodeViewYAMLSymbols.cpp",
@@ -13,12 +16,17 @@ static_library("ObjectYAML") {
     "DWARFEmitter.cpp",
     "DWARFVisitor.cpp",
     "DWARFYAML.cpp",
+    "ELFEmitter.cpp",
     "ELFYAML.cpp",
+    "MachOEmitter.cpp",
     "MachOYAML.cpp",
+    "MinidumpEmitter.cpp",
     "MinidumpYAML.cpp",
     "ObjectYAML.cpp",
+    "WasmEmitter.cpp",
     "WasmYAML.cpp",
     "XCOFFYAML.cpp",
     "YAML.cpp",
+    "yaml2obj.cpp",
   ]
 }
diff --git a/utils/gn/secondary/llvm/tools/yaml2obj/BUILD.gn b/utils/gn/secondary/llvm/tools/yaml2obj/BUILD.gn
index a36004d3384..b0e2fe03c0f 100644
--- a/utils/gn/secondary/llvm/tools/yaml2obj/BUILD.gn
+++ b/utils/gn/secondary/llvm/tools/yaml2obj/BUILD.gn
@@ -1,17 +1,9 @@
 executable("yaml2obj") {
   deps = [
-    "//llvm/lib/DebugInfo/CodeView",
-    "//llvm/lib/MC",
-    "//llvm/lib/Object",
     "//llvm/lib/ObjectYAML",
     "//llvm/lib/Support",
   ]
   sources = [
-    "yaml2coff.cpp",
-    "yaml2elf.cpp",
-    "yaml2macho.cpp",
-    "yaml2minidump.cpp",
     "yaml2obj.cpp",
-    "yaml2wasm.cpp",
   ]
 }
diff --git a/utils/gn/secondary/llvm/unittests/ObjectYAML/BUILD.gn b/utils/gn/secondary/llvm/unittests/ObjectYAML/BUILD.gn
index 4e7d6105626..2fbcaa94334 100644
--- a/utils/gn/secondary/llvm/unittests/ObjectYAML/BUILD.gn
+++ b/utils/gn/secondary/llvm/unittests/ObjectYAML/BUILD.gn
@@ -8,6 +8,7 @@ unittest("ObjectYAMLTests") {
   ]
   sources = [
     "MinidumpYAMLTest.cpp",
+    "YAML2ObjTest.cpp",
     "YAMLTest.cpp",
   ]
 }
-- 
2.40.0