From: David L. Jones <dlj@google.com>
Date: Mon, 13 May 2019 03:43:25 +0000 (+0000)
Subject: gn build: merge r360550
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ce95266bfbadf5026c757ad79a90a42726dcf491;p=llvm

gn build: merge r360550

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@360551 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/utils/gn/secondary/llvm/lib/Target/WebAssembly/BUILD.gn b/utils/gn/secondary/llvm/lib/Target/WebAssembly/BUILD.gn
index 3c8803c19c6..988e529b184 100644
--- a/utils/gn/secondary/llvm/lib/Target/WebAssembly/BUILD.gn
+++ b/utils/gn/secondary/llvm/lib/Target/WebAssembly/BUILD.gn
@@ -44,7 +44,6 @@ static_library("LLVMWebAssemblyCodeGen") {
     ":WebAssemblyGenGlobalISel",
     ":WebAssemblyGenMCPseudoLowering",
     ":WebAssemblyGenRegisterBank",
-    "InstPrinter",
     "MCTargetDesc",
     "TargetInfo",
     "//llvm/include/llvm/Config:llvm-config",
@@ -114,7 +113,6 @@ group("WebAssembly") {
     ":LLVMWebAssemblyCodeGen",
     "AsmParser",
     "Disassembler",
-    "InstPrinter",
     "MCTargetDesc",
     "TargetInfo",
   ]
diff --git a/utils/gn/secondary/llvm/lib/Target/WebAssembly/InstPrinter/BUILD.gn b/utils/gn/secondary/llvm/lib/Target/WebAssembly/InstPrinter/BUILD.gn
deleted file mode 100644
index e63ea79174e..00000000000
--- a/utils/gn/secondary/llvm/lib/Target/WebAssembly/InstPrinter/BUILD.gn
+++ /dev/null
@@ -1,24 +0,0 @@
-import("//llvm/utils/TableGen/tablegen.gni")
-
-tablegen("WebAssemblyGenAsmWriter") {
-  visibility = [ ":InstPrinter" ]
-  args = [ "-gen-asm-writer" ]
-  td_file = "../WebAssembly.td"
-}
-
-static_library("InstPrinter") {
-  output_name = "LLVMWebAssemblyAsmPrinter"
-  deps = [
-    ":WebAssemblyGenAsmWriter",
-    "//llvm/lib/MC",
-    "//llvm/lib/Support",
-
-    # MCTargetDesc depends on InstPrinter, so we can't depend on the full
-    # MCTargetDesc target here: it would form a cycle.
-    "//llvm/lib/Target/WebAssembly/MCTargetDesc:tablegen",
-  ]
-  include_dirs = [ ".." ]
-  sources = [
-    "WebAssemblyInstPrinter.cpp",
-  ]
-}
diff --git a/utils/gn/secondary/llvm/lib/Target/WebAssembly/MCTargetDesc/BUILD.gn b/utils/gn/secondary/llvm/lib/Target/WebAssembly/MCTargetDesc/BUILD.gn
index 8d8e6c0a0e9..bf106cde9c4 100644
--- a/utils/gn/secondary/llvm/lib/Target/WebAssembly/MCTargetDesc/BUILD.gn
+++ b/utils/gn/secondary/llvm/lib/Target/WebAssembly/MCTargetDesc/BUILD.gn
@@ -1,5 +1,11 @@
 import("//llvm/utils/TableGen/tablegen.gni")
 
+tablegen("WebAssemblyGenAsmWriter") {
+  visibility = [ ":tablegen" ]
+  args = [ "-gen-asm-writer" ]
+  td_file = "../WebAssembly.td"
+}
+
 tablegen("WebAssemblyGenInstrInfo") {
   visibility = [ ":tablegen" ]
   args = [ "-gen-instr-info" ]
@@ -32,6 +38,7 @@ group("tablegen") {
     "../Utils",
   ]
   public_deps = [
+    ":WebAssemblyGenAsmWriter",
     ":WebAssemblyGenInstrInfo",
     ":WebAssemblyGenMCCodeEmitter",
     ":WebAssemblyGenRegisterInfo",
@@ -46,12 +53,12 @@ static_library("MCTargetDesc") {
   deps = [
     "//llvm/lib/MC",
     "//llvm/lib/Support",
-    "//llvm/lib/Target/WebAssembly/InstPrinter",
     "//llvm/lib/Target/WebAssembly/TargetInfo",
   ]
   include_dirs = [ ".." ]
   sources = [
     "WebAssemblyAsmBackend.cpp",
+    "WebAssemblyInstPrinter.cpp",
     "WebAssemblyMCAsmInfo.cpp",
     "WebAssemblyMCCodeEmitter.cpp",
     "WebAssemblyMCTargetDesc.cpp",