gn build: merge r360494 and r360502

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

diff --git a/utils/gn/secondary/llvm/lib/Target/BPF/BUILD.gn b/utils/gn/secondary/llvm/lib/Target/BPF/BUILD.gn
index 180ab94..64a3f80 100644 (file)
--- a/utils/gn/secondary/llvm/lib/Target/BPF/BUILD.gn
+++ b/utils/gn/secondary/llvm/lib/Target/BPF/BUILD.gn
@@ -44,7 +44,6 @@ static_library("LLVMBPFCodeGen") {
     ":BPFGenGlobalISel",
     ":BPFGenMCPseudoLowering",
     ":BPFGenRegisterBank",
-    "InstPrinter",
     "MCTargetDesc",
     "TargetInfo",
     "//llvm/include/llvm/Config:llvm-config",
@@ -87,7 +86,6 @@ group("BPF") {
     ":LLVMBPFCodeGen",
     "AsmParser",
     "Disassembler",
-    "InstPrinter",
     "MCTargetDesc",
     "TargetInfo",
   ]

diff --git a/utils/gn/secondary/llvm/lib/Target/BPF/InstPrinter/BUILD.gn b/utils/gn/secondary/llvm/lib/Target/BPF/InstPrinter/BUILD.gn
deleted file mode 100644 (file)
index 30e2004..0000000
--- a/utils/gn/secondary/llvm/lib/Target/BPF/InstPrinter/BUILD.gn
+++ /dev/null
@@ -1,24 +0,0 @@
-import("//llvm/utils/TableGen/tablegen.gni")
-
-tablegen("BPFGenAsmWriter") {
-  visibility = [ ":InstPrinter" ]
-  args = [ "-gen-asm-writer" ]
-  td_file = "../BPF.td"
-}
-
-static_library("InstPrinter") {
-  output_name = "LLVMBPFAsmPrinter"
-  deps = [
-    ":BPFGenAsmWriter",
-    "//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/BPF/MCTargetDesc:tablegen",
-  ]
-  include_dirs = [ ".." ]
-  sources = [
-    "BPFInstPrinter.cpp",
-  ]
-}

diff --git a/utils/gn/secondary/llvm/lib/Target/BPF/MCTargetDesc/BUILD.gn b/utils/gn/secondary/llvm/lib/Target/BPF/MCTargetDesc/BUILD.gn
index 843e230..ce00e5a 100644 (file)
--- a/utils/gn/secondary/llvm/lib/Target/BPF/MCTargetDesc/BUILD.gn
+++ b/utils/gn/secondary/llvm/lib/Target/BPF/MCTargetDesc/BUILD.gn
@@ -1,5 +1,11 @@
 import("//llvm/utils/TableGen/tablegen.gni")
 
+tablegen("BPFGenAsmWriter") {
+  visibility = [ ":tablegen" ]
+  args = [ "-gen-asm-writer" ]
+  td_file = "../BPF.td"
+}
+
 tablegen("BPFGenInstrInfo") {
   visibility = [ ":tablegen" ]
   args = [ "-gen-instr-info" ]
@@ -27,10 +33,10 @@ tablegen("BPFGenSubtargetInfo") {
 group("tablegen") {
   visibility = [
     ":MCTargetDesc",
-    "../InstPrinter",
     "../TargetInfo",
   ]
   public_deps = [
+    ":BPFGenAsmWriter",
     ":BPFGenInstrInfo",
     ":BPFGenMCCodeEmitter",
     ":BPFGenRegisterInfo",
@@ -47,13 +53,13 @@ static_library("MCTargetDesc") {
     "//llvm/lib/MC",
     "//llvm/lib/MC/MCDisassembler",
     "//llvm/lib/Support",
-    "//llvm/lib/Target/BPF/InstPrinter",
     "//llvm/lib/Target/BPF/TargetInfo",
   ]
   include_dirs = [ ".." ]
   sources = [
     "BPFAsmBackend.cpp",
     "BPFELFObjectWriter.cpp",
+    "BPFInstPrinter.cpp",
     "BPFMCCodeEmitter.cpp",
     "BPFMCTargetDesc.cpp",
   ]

diff --git a/utils/gn/secondary/llvm/lib/Target/PowerPC/BUILD.gn b/utils/gn/secondary/llvm/lib/Target/PowerPC/BUILD.gn
index f7c32d6..2065d0e 100644 (file)
--- a/utils/gn/secondary/llvm/lib/Target/PowerPC/BUILD.gn
+++ b/utils/gn/secondary/llvm/lib/Target/PowerPC/BUILD.gn
@@ -23,7 +23,6 @@ static_library("LLVMPowerPCCodeGen") {
     ":PPCGenCallingConv",
     ":PPCGenDAGISel",
     ":PPCGenFastISel",
-    "InstPrinter",
     "MCTargetDesc",
     "TargetInfo",
     "//llvm/include/llvm/Config:llvm-config",
@@ -86,7 +85,6 @@ group("PowerPC") {
     ":LLVMPowerPCCodeGen",
     "AsmParser",
     "Disassembler",
-    "InstPrinter",
     "MCTargetDesc",
     "TargetInfo",
   ]

diff --git a/utils/gn/secondary/llvm/lib/Target/PowerPC/InstPrinter/BUILD.gn b/utils/gn/secondary/llvm/lib/Target/PowerPC/InstPrinter/BUILD.gn
deleted file mode 100644 (file)
index 8d885d6..0000000
--- a/utils/gn/secondary/llvm/lib/Target/PowerPC/InstPrinter/BUILD.gn
+++ /dev/null
@@ -1,24 +0,0 @@
-import("//llvm/utils/TableGen/tablegen.gni")
-
-tablegen("PPCGenAsmWriter") {
-  visibility = [ ":InstPrinter" ]
-  args = [ "-gen-asm-writer" ]
-  td_file = "../PPC.td"
-}
-
-static_library("InstPrinter") {
-  output_name = "LLVMPowerPCAsmPrinter"
-  deps = [
-    ":PPCGenAsmWriter",
-    "//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/PowerPC/MCTargetDesc:tablegen",
-  ]
-  include_dirs = [ ".." ]
-  sources = [
-    "PPCInstPrinter.cpp",
-  ]
-}

diff --git a/utils/gn/secondary/llvm/lib/Target/PowerPC/MCTargetDesc/BUILD.gn b/utils/gn/secondary/llvm/lib/Target/PowerPC/MCTargetDesc/BUILD.gn
index 4425612..4fafcb6 100644 (file)
--- a/utils/gn/secondary/llvm/lib/Target/PowerPC/MCTargetDesc/BUILD.gn
+++ b/utils/gn/secondary/llvm/lib/Target/PowerPC/MCTargetDesc/BUILD.gn
@@ -1,5 +1,11 @@
 import("//llvm/utils/TableGen/tablegen.gni")
 
+tablegen("PPCGenAsmWriter") {
+  visibility = [ ":tablegen" ]
+  args = [ "-gen-asm-writer" ]
+  td_file = "../PPC.td"
+}
+
 tablegen("PPCGenInstrInfo") {
   visibility = [ ":tablegen" ]
   args = [ "-gen-instr-info" ]
@@ -31,6 +37,7 @@ group("tablegen") {
     "../TargetInfo",
   ]
   public_deps = [
+    ":PPCGenAsmWriter",
     ":PPCGenInstrInfo",
     ":PPCGenMCCodeEmitter",
     ":PPCGenRegisterInfo",
@@ -46,13 +53,13 @@ static_library("MCTargetDesc") {
   deps = [
     "//llvm/lib/MC",
     "//llvm/lib/Support",
-    "//llvm/lib/Target/PowerPC/InstPrinter",
     "//llvm/lib/Target/PowerPC/TargetInfo",
   ]
   include_dirs = [ ".." ]
   sources = [
     "PPCAsmBackend.cpp",
     "PPCELFObjectWriter.cpp",
+    "PPCInstPrinter.cpp",
     "PPCMCAsmInfo.cpp",
     "PPCMCCodeEmitter.cpp",
     "PPCMCExpr.cpp",