[llvm] r360507 - gn build: merge r360494 and r360502

[David L. Jones via llvm-commits]

Author: dlj
Date: Fri May 10 20:20:09 2019
New Revision: 360507

URL: http://llvm.org/viewvc/llvm-project?rev=360507&view=rev
Log:
gn build: merge r360494 and r360502

Removed:
    llvm/trunk/utils/gn/secondary/llvm/lib/Target/BPF/InstPrinter/
    llvm/trunk/utils/gn/secondary/llvm/lib/Target/PowerPC/InstPrinter/
Modified:
    llvm/trunk/utils/gn/secondary/llvm/lib/Target/BPF/BUILD.gn
    llvm/trunk/utils/gn/secondary/llvm/lib/Target/BPF/MCTargetDesc/BUILD.gn
    llvm/trunk/utils/gn/secondary/llvm/lib/Target/PowerPC/BUILD.gn
    llvm/trunk/utils/gn/secondary/llvm/lib/Target/PowerPC/MCTargetDesc/BUILD.gn

Modified: llvm/trunk/utils/gn/secondary/llvm/lib/Target/BPF/BUILD.gn
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/gn/secondary/llvm/lib/Target/BPF/BUILD.gn?rev=360507&r1=360506&r2=360507&view=diff
==============================================================================
--- llvm/trunk/utils/gn/secondary/llvm/lib/Target/BPF/BUILD.gn (original)
+++ llvm/trunk/utils/gn/secondary/llvm/lib/Target/BPF/BUILD.gn Fri May 10 20:20:09 2019
@@ -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",
   ]

Modified: llvm/trunk/utils/gn/secondary/llvm/lib/Target/BPF/MCTargetDesc/BUILD.gn
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/gn/secondary/llvm/lib/Target/BPF/MCTargetDesc/BUILD.gn?rev=360507&r1=360506&r2=360507&view=diff
==============================================================================
--- llvm/trunk/utils/gn/secondary/llvm/lib/Target/BPF/MCTargetDesc/BUILD.gn (original)
+++ llvm/trunk/utils/gn/secondary/llvm/lib/Target/BPF/MCTargetDesc/BUILD.gn Fri May 10 20:20:09 2019
@@ -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",
   ]

Modified: llvm/trunk/utils/gn/secondary/llvm/lib/Target/PowerPC/BUILD.gn
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/gn/secondary/llvm/lib/Target/PowerPC/BUILD.gn?rev=360507&r1=360506&r2=360507&view=diff
==============================================================================
--- llvm/trunk/utils/gn/secondary/llvm/lib/Target/PowerPC/BUILD.gn (original)
+++ llvm/trunk/utils/gn/secondary/llvm/lib/Target/PowerPC/BUILD.gn Fri May 10 20:20:09 2019
@@ -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",
   ]

Modified: llvm/trunk/utils/gn/secondary/llvm/lib/Target/PowerPC/MCTargetDesc/BUILD.gn
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/gn/secondary/llvm/lib/Target/PowerPC/MCTargetDesc/BUILD.gn?rev=360507&r1=360506&r2=360507&view=diff
==============================================================================
--- llvm/trunk/utils/gn/secondary/llvm/lib/Target/PowerPC/MCTargetDesc/BUILD.gn (original)
+++ llvm/trunk/utils/gn/secondary/llvm/lib/Target/PowerPC/MCTargetDesc/BUILD.gn Fri May 10 20:20:09 2019
@@ -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",