gn build: merge r360490

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

diff --git a/utils/gn/secondary/llvm/lib/Target/ARM/BUILD.gn b/utils/gn/secondary/llvm/lib/Target/ARM/BUILD.gn
index f4bc1ed..6b70200 100644 (file)
--- a/utils/gn/secondary/llvm/lib/Target/ARM/BUILD.gn
+++ b/utils/gn/secondary/llvm/lib/Target/ARM/BUILD.gn
@@ -44,7 +44,6 @@ static_library("LLVMARMCodeGen") {
     ":ARMGenGlobalISel",
     ":ARMGenMCPseudoLowering",
     ":ARMGenRegisterBank",
-    "InstPrinter",
     "MCTargetDesc",
     "TargetInfo",
     "Utils",
@@ -114,7 +113,6 @@ group("ARM") {
     ":LLVMARMCodeGen",
     "AsmParser",
     "Disassembler",
-    "InstPrinter",
     "MCTargetDesc",
     "TargetInfo",
     "Utils",

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

diff --git a/utils/gn/secondary/llvm/lib/Target/ARM/MCTargetDesc/BUILD.gn b/utils/gn/secondary/llvm/lib/Target/ARM/MCTargetDesc/BUILD.gn
index 3ef2f43..185f2cb 100644 (file)
--- a/utils/gn/secondary/llvm/lib/Target/ARM/MCTargetDesc/BUILD.gn
+++ b/utils/gn/secondary/llvm/lib/Target/ARM/MCTargetDesc/BUILD.gn
@@ -1,5 +1,11 @@
 import("//llvm/utils/TableGen/tablegen.gni")
 
+tablegen("ARMGenAsmWriter") {
+  visibility = [ ":tablegen" ]
+  args = [ "-gen-asm-writer" ]
+  td_file = "../ARM.td"
+}
+
 tablegen("ARMGenInstrInfo") {
   visibility = [ ":tablegen" ]
   args = [ "-gen-instr-info" ]
@@ -27,11 +33,11 @@ tablegen("ARMGenSubtargetInfo") {
 group("tablegen") {
   visibility = [
     ":MCTargetDesc",
-    "../InstPrinter",
     "../TargetInfo",
     "../Utils",
   ]
   public_deps = [
+    ":ARMGenAsmWriter",
     ":ARMGenInstrInfo",
     ":ARMGenMCCodeEmitter",
     ":ARMGenRegisterInfo",
@@ -47,7 +53,6 @@ static_library("MCTargetDesc") {
     "//llvm/lib/MC",
     "//llvm/lib/MC/MCDisassembler",
     "//llvm/lib/Support",
-    "//llvm/lib/Target/ARM/InstPrinter",
     "//llvm/lib/Target/ARM/TargetInfo",
     "//llvm/lib/Target/ARM/Utils",
   ]
@@ -56,6 +61,7 @@ static_library("MCTargetDesc") {
     "ARMAsmBackend.cpp",
     "ARMELFObjectWriter.cpp",
     "ARMELFStreamer.cpp",
+    "ARMInstPrinter.cpp",
     "ARMMCAsmInfo.cpp",
     "ARMMCCodeEmitter.cpp",
     "ARMMCExpr.cpp",