gn build: merge r360484 and r360486

llvm-svn: 360491

14 files changed, 40 insertions, 95 deletions

diff --git a/llvm/utils/gn/secondary/llvm/lib/Target/AArch64/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Target/AArch64/BUILD.gn
index d0d0164ee99..6c683d2a024 100644
--- a/llvm/utils/gn/secondary/llvm/lib/Target/AArch64/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Target/AArch64/BUILD.gn
@@ -51,7 +51,6 @@ static_library("LLVMAArch64CodeGen") {
     ":AArch64GenGlobalISel",
     ":AArch64GenMCPseudoLowering",
     ":AArch64GenRegisterBank",
-    "InstPrinter",
     "MCTargetDesc",
     "TargetInfo",
     "Utils",
@@ -123,7 +122,6 @@ group("AArch64") {
     ":LLVMAArch64CodeGen",
     "AsmParser",
     "Disassembler",
-    "InstPrinter",
     "MCTargetDesc",
     "TargetInfo",
     "Utils",
diff --git a/llvm/utils/gn/secondary/llvm/lib/Target/AArch64/InstPrinter/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Target/AArch64/InstPrinter/BUILD.gn
deleted file mode 100644
index 6c1749545d3..00000000000
--- a/llvm/utils/gn/secondary/llvm/lib/Target/AArch64/InstPrinter/BUILD.gn
+++ /dev/null
@@ -1,35 +0,0 @@
-import("//llvm/utils/TableGen/tablegen.gni")
-
-tablegen("AArch64GenAsmWriter") {
-  visibility = [ ":InstPrinter" ]
-  args = [ "-gen-asm-writer" ]
-  td_file = "../AArch64.td"
-}
-
-tablegen("AArch64GenAsmWriter1") {
-  visibility = [ ":InstPrinter" ]
-  args = [
-    "-gen-asm-writer",
-    "-asmwriternum=1",
-  ]
-  td_file = "../AArch64.td"
-}
-
-static_library("InstPrinter") {
-  output_name = "LLVMAArch64AsmPrinter"
-  deps = [
-    ":AArch64GenAsmWriter",
-    ":AArch64GenAsmWriter1",
-    "//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/AArch64/MCTargetDesc:tablegen",
-    "//llvm/lib/Target/AArch64/Utils",
-  ]
-  include_dirs = [ ".." ]
-  sources = [
-    "AArch64InstPrinter.cpp",
-  ]
-}
diff --git a/llvm/utils/gn/secondary/llvm/lib/Target/AArch64/MCTargetDesc/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Target/AArch64/MCTargetDesc/BUILD.gn
index 6303fbef17a..c505af6177d 100644
--- a/llvm/utils/gn/secondary/llvm/lib/Target/AArch64/MCTargetDesc/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Target/AArch64/MCTargetDesc/BUILD.gn
@@ -24,14 +24,30 @@ tablegen("AArch64GenSubtargetInfo") {
   td_file = "../AArch64.td"
 }
 
+tablegen("AArch64GenAsmWriter") {
+  visibility = [ ":tablegen" ]
+  args = [ "-gen-asm-writer" ]
+  td_file = "../AArch64.td"
+}
+
+tablegen("AArch64GenAsmWriter1") {
+  visibility = [ ":tablegen" ]
+  args = [
+    "-gen-asm-writer",
+    "-asmwriternum=1",
+  ]
+  td_file = "../AArch64.td"
+}
+
 group("tablegen") {
   visibility = [
     ":MCTargetDesc",
-    "../InstPrinter",
     "../TargetInfo",
     "../Utils",
   ]
   public_deps = [
+    ":AArch64GenAsmWriter",
+    ":AArch64GenAsmWriter1",
     ":AArch64GenInstrInfo",
     ":AArch64GenMCCodeEmitter",
     ":AArch64GenRegisterInfo",
@@ -47,7 +63,6 @@ static_library("MCTargetDesc") {
   deps = [
     "//llvm/lib/MC",
     "//llvm/lib/Support",
-    "//llvm/lib/Target/AArch64/InstPrinter",
     "//llvm/lib/Target/AArch64/TargetInfo",
     "//llvm/lib/Target/AArch64/Utils",
   ]
@@ -56,6 +71,7 @@ static_library("MCTargetDesc") {
     "AArch64AsmBackend.cpp",
     "AArch64ELFObjectWriter.cpp",
     "AArch64ELFStreamer.cpp",
+    "AArch64InstPrinter.cpp",
     "AArch64MCAsmInfo.cpp",
     "AArch64MCCodeEmitter.cpp",
     "AArch64MCExpr.cpp",
diff --git a/llvm/utils/gn/secondary/llvm/lib/Target/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Target/BUILD.gn
index 54b6082feda..519ecf67ed8 100644
--- a/llvm/utils/gn/secondary/llvm/lib/Target/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Target/BUILD.gn
@@ -61,13 +61,6 @@ group("AllTargetsAsmParsers") {
   }
 }
 
-group("AllTargetsAsmPrinters") {
-  deps = []
-  foreach(target, llvm_targets_to_build) {
-    deps += [ "$target/InstPrinter" ]
-  }
-}
-
 group("AllTargetsDescs") {
   deps = []
   foreach(target, llvm_targets_to_build) {
diff --git a/llvm/utils/gn/secondary/llvm/lib/Target/X86/AsmParser/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Target/X86/AsmParser/BUILD.gn
index d18c5e60af7..16124f6f0ce 100644
--- a/llvm/utils/gn/secondary/llvm/lib/Target/X86/AsmParser/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Target/X86/AsmParser/BUILD.gn
@@ -13,7 +13,6 @@ static_library("AsmParser") {
     "//llvm/lib/MC",
     "//llvm/lib/MC/MCParser",
     "//llvm/lib/Support",
-    "//llvm/lib/Target/X86/InstPrinter",
     "//llvm/lib/Target/X86/MCTargetDesc",
     "//llvm/lib/Target/X86/TargetInfo",
   ]
diff --git a/llvm/utils/gn/secondary/llvm/lib/Target/X86/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Target/X86/BUILD.gn
index 545c3284064..3748189d61d 100644
--- a/llvm/utils/gn/secondary/llvm/lib/Target/X86/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Target/X86/BUILD.gn
@@ -57,7 +57,6 @@ static_library("LLVMX86CodeGen") {
     ":X86GenFastISel",
     ":X86GenGlobalISel",
     ":X86GenRegisterBank",
-    "InstPrinter",
     "MCTargetDesc",
     "TargetInfo",
     "Utils",
@@ -136,7 +135,6 @@ group("X86") {
     ":LLVMX86CodeGen",
     "AsmParser",
     "Disassembler",
-    "InstPrinter",
     "MCTargetDesc",
     "TargetInfo",
     "Utils",
diff --git a/llvm/utils/gn/secondary/llvm/lib/Target/X86/InstPrinter/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Target/X86/InstPrinter/BUILD.gn
deleted file mode 100644
index 4ca806dba94..00000000000
--- a/llvm/utils/gn/secondary/llvm/lib/Target/X86/InstPrinter/BUILD.gn
+++ /dev/null
@@ -1,38 +0,0 @@
-import("//llvm/utils/TableGen/tablegen.gni")
-
-tablegen("X86GenAsmWriter") {
-  visibility = [ ":InstPrinter" ]
-  args = [ "-gen-asm-writer" ]
-  td_file = "../X86.td"
-}
-
-tablegen("X86GenAsmWriter1") {
-  visibility = [ ":InstPrinter" ]
-  args = [
-    "-gen-asm-writer",
-    "-asmwriternum=1",
-  ]
-  td_file = "../X86.td"
-}
-
-static_library("InstPrinter") {
-  output_name = "LLVMX86AsmPrinter"
-  deps = [
-    ":X86GenAsmWriter",
-    ":X86GenAsmWriter1",
-    "//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/X86/MCTargetDesc:tablegen",
-    "//llvm/lib/Target/X86/Utils",
-  ]
-  include_dirs = [ ".." ]
-  sources = [
-    "X86ATTInstPrinter.cpp",
-    "X86InstComments.cpp",
-    "X86InstPrinterCommon.cpp",
-    "X86IntelInstPrinter.cpp",
-  ]
-}
diff --git a/llvm/utils/gn/secondary/llvm/lib/Target/X86/MCTargetDesc/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Target/X86/MCTargetDesc/BUILD.gn
index 426f9a5244c..db7046acd1d 100644
--- a/llvm/utils/gn/secondary/llvm/lib/Target/X86/MCTargetDesc/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Target/X86/MCTargetDesc/BUILD.gn
@@ -18,13 +18,29 @@ tablegen("X86GenSubtargetInfo") {
   td_file = "../X86.td"
 }
 
+tablegen("X86GenAsmWriter") {
+  visibility = [ ":tablegen" ]
+  args = [ "-gen-asm-writer" ]
+  td_file = "../X86.td"
+}
+
+tablegen("X86GenAsmWriter1") {
+  visibility = [ ":tablegen" ]
+  args = [
+    "-gen-asm-writer",
+    "-asmwriternum=1",
+  ]
+  td_file = "../X86.td"
+}
+
 group("tablegen") {
   visibility = [
     ":MCTargetDesc",
-    "../InstPrinter",
     "../TargetInfo",
   ]
   public_deps = [
+    ":X86GenAsmWriter",
+    ":X86GenAsmWriter1",
     ":X86GenInstrInfo",
     ":X86GenRegisterInfo",
     ":X86GenSubtargetInfo",
@@ -41,13 +57,17 @@ static_library("MCTargetDesc") {
     "//llvm/lib/MC/MCDisassembler",
     "//llvm/lib/Object",
     "//llvm/lib/Support",
-    "//llvm/lib/Target/X86/InstPrinter",
     "//llvm/lib/Target/X86/TargetInfo",
+    "//llvm/lib/Target/X86/Utils",
   ]
   include_dirs = [ ".." ]
   sources = [
+    "X86ATTInstPrinter.cpp",
     "X86AsmBackend.cpp",
     "X86ELFObjectWriter.cpp",
+    "X86InstComments.cpp",
+    "X86InstPrinterCommon.cpp",
+    "X86IntelInstPrinter.cpp",
     "X86MCAsmInfo.cpp",
     "X86MCCodeEmitter.cpp",
     "X86MCTargetDesc.cpp",
diff --git a/llvm/utils/gn/secondary/llvm/tools/llvm-cfi-verify/BUILD.gn b/llvm/utils/gn/secondary/llvm/tools/llvm-cfi-verify/BUILD.gn
index e5779aeb29f..2f0c08cd7ea 100644
--- a/llvm/utils/gn/secondary/llvm/tools/llvm-cfi-verify/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/tools/llvm-cfi-verify/BUILD.gn
@@ -7,7 +7,6 @@ executable("llvm-cfi-verify") {
     "//llvm/lib/Object",
     "//llvm/lib/Support",
     "//llvm/lib/Target:AllTargetsAsmParsers",
-    "//llvm/lib/Target:AllTargetsAsmPrinters",
     "//llvm/lib/Target:AllTargetsDescs",
     "//llvm/lib/Target:AllTargetsDisassemblers",
     "//llvm/lib/Target:AllTargetsInfos",
diff --git a/llvm/utils/gn/secondary/llvm/tools/llvm-mc/BUILD.gn b/llvm/utils/gn/secondary/llvm/tools/llvm-mc/BUILD.gn
index ddaae808e7a..653c5c01d59 100644
--- a/llvm/utils/gn/secondary/llvm/tools/llvm-mc/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/tools/llvm-mc/BUILD.gn
@@ -4,7 +4,6 @@ executable("llvm-mc") {
     "//llvm/lib/MC/MCParser",
     "//llvm/lib/Support",
     "//llvm/lib/Target:AllTargetsAsmParsers",
-    "//llvm/lib/Target:AllTargetsAsmPrinters",
     "//llvm/lib/Target:AllTargetsDescs",
     "//llvm/lib/Target:AllTargetsDisassemblers",
     "//llvm/lib/Target:AllTargetsInfos",
diff --git a/llvm/utils/gn/secondary/llvm/tools/llvm-mca/BUILD.gn b/llvm/utils/gn/secondary/llvm/tools/llvm-mca/BUILD.gn
index 461047b8886..f703de7685a 100644
--- a/llvm/utils/gn/secondary/llvm/tools/llvm-mca/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/tools/llvm-mca/BUILD.gn
@@ -5,7 +5,6 @@ executable("llvm-mca") {
     "//llvm/lib/MCA",
     "//llvm/lib/Support",
     "//llvm/lib/Target:AllTargetsAsmParsers",
-    "//llvm/lib/Target:AllTargetsAsmPrinters",
     "//llvm/lib/Target:AllTargetsDescs",
     "//llvm/lib/Target:AllTargetsDisassemblers",
     "//llvm/lib/Target:AllTargetsInfos",
diff --git a/llvm/utils/gn/secondary/llvm/tools/llvm-objdump/BUILD.gn b/llvm/utils/gn/secondary/llvm/tools/llvm-objdump/BUILD.gn
index 2b1b0917e76..3b1670bb8d4 100644
--- a/llvm/utils/gn/secondary/llvm/tools/llvm-objdump/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/tools/llvm-objdump/BUILD.gn
@@ -33,7 +33,6 @@ executable("llvm-objdump") {
     "//llvm/lib/MC/MCDisassembler",
     "//llvm/lib/Object",
     "//llvm/lib/Support",
-    "//llvm/lib/Target:AllTargetsAsmPrinters",
     "//llvm/lib/Target:AllTargetsDescs",
     "//llvm/lib/Target:AllTargetsDisassemblers",
     "//llvm/lib/Target:AllTargetsInfos",
diff --git a/llvm/utils/gn/secondary/llvm/tools/sancov/BUILD.gn b/llvm/utils/gn/secondary/llvm/tools/sancov/BUILD.gn
index c07af7b6ca1..9c3f5855ecb 100644
--- a/llvm/utils/gn/secondary/llvm/tools/sancov/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/tools/sancov/BUILD.gn
@@ -7,7 +7,6 @@ executable("sancov") {
     "//llvm/lib/MC/MCDisassembler",
     "//llvm/lib/Object",
     "//llvm/lib/Support",
-    "//llvm/lib/Target:AllTargetsAsmPrinters",
     "//llvm/lib/Target:AllTargetsDescs",
     "//llvm/lib/Target:AllTargetsDisassemblers",
     "//llvm/lib/Target:AllTargetsInfos",
diff --git a/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-cfi-verify/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-cfi-verify/BUILD.gn
index e9731264e6e..e25d8383b08 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-cfi-verify/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-cfi-verify/BUILD.gn
@@ -8,7 +8,6 @@ unittest("CFIVerifyTests") {
     "//llvm/lib/Object",
     "//llvm/lib/Support",
     "//llvm/lib/Target:AllTargetsAsmParsers",
-    "//llvm/lib/Target:AllTargetsAsmPrinters",
     "//llvm/lib/Target:AllTargetsDescs",
     "//llvm/lib/Target:AllTargetsDisassemblers",
     "//llvm/lib/Target:AllTargetsInfos",