From 174fe1d758594de2589e64e00273338593218201 Mon Sep 17 00:00:00 2001
From: Dmitri Gribenko <gribozavr@gmail.com>
Date: Tue, 6 Aug 2019 13:39:27 +0000
Subject: [PATCH] Revert "gn build: Merge r368021"

This reverts commit r368025, which depends on r368021, which needs to be
reverted.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@368034 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, 8 insertions(+), 9 deletions(-)

diff --git a/utils/gn/secondary/llvm/lib/ObjectYAML/BUILD.gn b/utils/gn/secondary/llvm/lib/ObjectYAML/BUILD.gn
index fbb4187ab4a..84575f2be23 100644
--- a/utils/gn/secondary/llvm/lib/ObjectYAML/BUILD.gn
+++ b/utils/gn/secondary/llvm/lib/ObjectYAML/BUILD.gn
@@ -2,12 +2,9 @@ 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",
@@ -16,17 +13,12 @@ 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 b0e2fe03c0f..a36004d3384 100644
--- a/utils/gn/secondary/llvm/tools/yaml2obj/BUILD.gn
+++ b/utils/gn/secondary/llvm/tools/yaml2obj/BUILD.gn
@@ -1,9 +1,17 @@
 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 2fbcaa94334..4e7d6105626 100644
--- a/utils/gn/secondary/llvm/unittests/ObjectYAML/BUILD.gn
+++ b/utils/gn/secondary/llvm/unittests/ObjectYAML/BUILD.gn
@@ -8,7 +8,6 @@ unittest("ObjectYAMLTests") {
   ]
   sources = [
     "MinidumpYAMLTest.cpp",
-    "YAML2ObjTest.cpp",
     "YAMLTest.cpp",
   ]
 }
-- 
2.40.0