[llvm] r360491 - gn build: merge r360484 and r360486

David L. Jones via llvm-commits llvm-commits at lists.llvm.org
Fri May 10 17:35:53 PDT 2019


Author: dlj
Date: Fri May 10 17:35:53 2019
New Revision: 360491

URL: http://llvm.org/viewvc/llvm-project?rev=360491&view=rev
Log:
gn build: merge r360484 and r360486

Removed:
    llvm/trunk/utils/gn/secondary/llvm/lib/Target/AArch64/InstPrinter/
    llvm/trunk/utils/gn/secondary/llvm/lib/Target/X86/InstPrinter/
Modified:
    llvm/trunk/utils/gn/secondary/llvm/lib/Target/AArch64/BUILD.gn
    llvm/trunk/utils/gn/secondary/llvm/lib/Target/AArch64/MCTargetDesc/BUILD.gn
    llvm/trunk/utils/gn/secondary/llvm/lib/Target/BUILD.gn
    llvm/trunk/utils/gn/secondary/llvm/lib/Target/X86/AsmParser/BUILD.gn
    llvm/trunk/utils/gn/secondary/llvm/lib/Target/X86/BUILD.gn
    llvm/trunk/utils/gn/secondary/llvm/lib/Target/X86/MCTargetDesc/BUILD.gn
    llvm/trunk/utils/gn/secondary/llvm/tools/llvm-cfi-verify/BUILD.gn
    llvm/trunk/utils/gn/secondary/llvm/tools/llvm-mc/BUILD.gn
    llvm/trunk/utils/gn/secondary/llvm/tools/llvm-mca/BUILD.gn
    llvm/trunk/utils/gn/secondary/llvm/tools/llvm-objdump/BUILD.gn
    llvm/trunk/utils/gn/secondary/llvm/tools/sancov/BUILD.gn
    llvm/trunk/utils/gn/secondary/llvm/unittests/tools/llvm-cfi-verify/BUILD.gn

Modified: llvm/trunk/utils/gn/secondary/llvm/lib/Target/AArch64/BUILD.gn
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/gn/secondary/llvm/lib/Target/AArch64/BUILD.gn?rev=360491&r1=360490&r2=360491&view=diff
==============================================================================
--- llvm/trunk/utils/gn/secondary/llvm/lib/Target/AArch64/BUILD.gn (original)
+++ llvm/trunk/utils/gn/secondary/llvm/lib/Target/AArch64/BUILD.gn Fri May 10 17:35:53 2019
@@ -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",

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

Modified: llvm/trunk/utils/gn/secondary/llvm/lib/Target/BUILD.gn
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/gn/secondary/llvm/lib/Target/BUILD.gn?rev=360491&r1=360490&r2=360491&view=diff
==============================================================================
--- llvm/trunk/utils/gn/secondary/llvm/lib/Target/BUILD.gn (original)
+++ llvm/trunk/utils/gn/secondary/llvm/lib/Target/BUILD.gn Fri May 10 17:35:53 2019
@@ -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) {

Modified: llvm/trunk/utils/gn/secondary/llvm/lib/Target/X86/AsmParser/BUILD.gn
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/gn/secondary/llvm/lib/Target/X86/AsmParser/BUILD.gn?rev=360491&r1=360490&r2=360491&view=diff
==============================================================================
--- llvm/trunk/utils/gn/secondary/llvm/lib/Target/X86/AsmParser/BUILD.gn (original)
+++ llvm/trunk/utils/gn/secondary/llvm/lib/Target/X86/AsmParser/BUILD.gn Fri May 10 17:35:53 2019
@@ -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",
   ]

Modified: llvm/trunk/utils/gn/secondary/llvm/lib/Target/X86/BUILD.gn
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/gn/secondary/llvm/lib/Target/X86/BUILD.gn?rev=360491&r1=360490&r2=360491&view=diff
==============================================================================
--- llvm/trunk/utils/gn/secondary/llvm/lib/Target/X86/BUILD.gn (original)
+++ llvm/trunk/utils/gn/secondary/llvm/lib/Target/X86/BUILD.gn Fri May 10 17:35:53 2019
@@ -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",

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

Modified: llvm/trunk/utils/gn/secondary/llvm/tools/llvm-cfi-verify/BUILD.gn
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/gn/secondary/llvm/tools/llvm-cfi-verify/BUILD.gn?rev=360491&r1=360490&r2=360491&view=diff
==============================================================================
--- llvm/trunk/utils/gn/secondary/llvm/tools/llvm-cfi-verify/BUILD.gn (original)
+++ llvm/trunk/utils/gn/secondary/llvm/tools/llvm-cfi-verify/BUILD.gn Fri May 10 17:35:53 2019
@@ -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",

Modified: llvm/trunk/utils/gn/secondary/llvm/tools/llvm-mc/BUILD.gn
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/gn/secondary/llvm/tools/llvm-mc/BUILD.gn?rev=360491&r1=360490&r2=360491&view=diff
==============================================================================
--- llvm/trunk/utils/gn/secondary/llvm/tools/llvm-mc/BUILD.gn (original)
+++ llvm/trunk/utils/gn/secondary/llvm/tools/llvm-mc/BUILD.gn Fri May 10 17:35:53 2019
@@ -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",

Modified: llvm/trunk/utils/gn/secondary/llvm/tools/llvm-mca/BUILD.gn
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/gn/secondary/llvm/tools/llvm-mca/BUILD.gn?rev=360491&r1=360490&r2=360491&view=diff
==============================================================================
--- llvm/trunk/utils/gn/secondary/llvm/tools/llvm-mca/BUILD.gn (original)
+++ llvm/trunk/utils/gn/secondary/llvm/tools/llvm-mca/BUILD.gn Fri May 10 17:35:53 2019
@@ -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",

Modified: llvm/trunk/utils/gn/secondary/llvm/tools/llvm-objdump/BUILD.gn
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/gn/secondary/llvm/tools/llvm-objdump/BUILD.gn?rev=360491&r1=360490&r2=360491&view=diff
==============================================================================
--- llvm/trunk/utils/gn/secondary/llvm/tools/llvm-objdump/BUILD.gn (original)
+++ llvm/trunk/utils/gn/secondary/llvm/tools/llvm-objdump/BUILD.gn Fri May 10 17:35:53 2019
@@ -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",

Modified: llvm/trunk/utils/gn/secondary/llvm/tools/sancov/BUILD.gn
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/gn/secondary/llvm/tools/sancov/BUILD.gn?rev=360491&r1=360490&r2=360491&view=diff
==============================================================================
--- llvm/trunk/utils/gn/secondary/llvm/tools/sancov/BUILD.gn (original)
+++ llvm/trunk/utils/gn/secondary/llvm/tools/sancov/BUILD.gn Fri May 10 17:35:53 2019
@@ -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",

Modified: llvm/trunk/utils/gn/secondary/llvm/unittests/tools/llvm-cfi-verify/BUILD.gn
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/gn/secondary/llvm/unittests/tools/llvm-cfi-verify/BUILD.gn?rev=360491&r1=360490&r2=360491&view=diff
==============================================================================
--- llvm/trunk/utils/gn/secondary/llvm/unittests/tools/llvm-cfi-verify/BUILD.gn (original)
+++ llvm/trunk/utils/gn/secondary/llvm/unittests/tools/llvm-cfi-verify/BUILD.gn Fri May 10 17:35:53 2019
@@ -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",




More information about the llvm-commits mailing list