[llvm] 32f1a90 - [gn build] (manually) merge 3b29376e3fca43

[Nico Weber via llvm-commits]

Author: Nico Weber
Date: 2020-06-15T13:21:34-04:00
New Revision: 32f1a909b87d19f4011921bbf7dc6d66a86503fe

URL: https://github.com/llvm/llvm-project/commit/32f1a909b87d19f4011921bbf7dc6d66a86503fe
DIFF: https://github.com/llvm/llvm-project/commit/32f1a909b87d19f4011921bbf7dc6d66a86503fe.diff

LOG: [gn build] (manually) merge 3b29376e3fca43

Added: 
    

Modified: 
    llvm/utils/gn/secondary/llvm/lib/Target/WebAssembly/MCTargetDesc/BUILD.gn
    llvm/utils/gn/secondary/llvm/lib/Target/WebAssembly/TargetInfo/BUILD.gn

Removed: 
    


################################################################################
diff  --git a/llvm/utils/gn/secondary/llvm/lib/Target/WebAssembly/MCTargetDesc/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Target/WebAssembly/MCTargetDesc/BUILD.gn
index 146f10b3e766..2249138e85c7 100644
--- a/llvm/utils/gn/secondary/llvm/lib/Target/WebAssembly/MCTargetDesc/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Target/WebAssembly/MCTargetDesc/BUILD.gn
@@ -6,12 +6,6 @@ tablegen("WebAssemblyGenAsmWriter") {
   td_file = "../WebAssembly.td"
 }
 
-tablegen("WebAssemblyGenInstrInfo") {
-  visibility = [ ":MCTargetDesc" ]
-  args = [ "-gen-instr-info" ]
-  td_file = "../WebAssembly.td"
-}
-
 tablegen("WebAssemblyGenMCCodeEmitter") {
   visibility = [ ":MCTargetDesc" ]
   args = [ "-gen-emitter" ]
@@ -37,7 +31,6 @@ static_library("MCTargetDesc") {
   # by other targets. .inc files only used by .cpp files in this directory
   # should be in deps instead.
   public_deps = [
-    ":WebAssemblyGenInstrInfo",
     ":WebAssemblyGenRegisterInfo",
     ":WebAssemblyGenSubtargetInfo",
   ]

diff  --git a/llvm/utils/gn/secondary/llvm/lib/Target/WebAssembly/TargetInfo/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Target/WebAssembly/TargetInfo/BUILD.gn
index c54be3ce27ff..e2f14c099785 100644
--- a/llvm/utils/gn/secondary/llvm/lib/Target/WebAssembly/TargetInfo/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Target/WebAssembly/TargetInfo/BUILD.gn
@@ -1,5 +1,18 @@
+import("//llvm/utils/TableGen/tablegen.gni")
+
+tablegen("WebAssemblyGenInstrInfo") {
+  visibility = [ ":TargetInfo" ]
+  args = [ "-gen-instr-info" ]
+  td_file = "../WebAssembly.td"
+}
+
 static_library("TargetInfo") {
   output_name = "LLVMWebAssemblyInfo"
+
+  # This should contain tablegen targets generating .inc files included
+  # by other targets. .inc files only used by .cpp files in this directory
+  # should be in deps instead.
+  public_deps = [ ":WebAssemblyGenInstrInfo" ]
   deps = [ "//llvm/lib/Support" ]
   include_dirs = [ ".." ]
   sources = [