[llvm] r373534 - gn build: (manually) merge r373527

[Nico Weber via llvm-commits]

Author: nico
Date: Wed Oct  2 15:33:07 2019
New Revision: 373534

URL: http://llvm.org/viewvc/llvm-project?rev=373534&view=rev
Log:
gn build: (manually) merge r373527

Modified:
    llvm/trunk/utils/gn/secondary/llvm/lib/Target/AArch64/BUILD.gn
    llvm/trunk/utils/gn/secondary/llvm/utils/TableGen/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=373534&r1=373533&r2=373534&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 Wed Oct  2 15:33:07 2019
@@ -30,6 +30,15 @@ tablegen("AArch64GenGlobalISel") {
   td_file = "AArch64.td"
 }
 
+tablegen("AArch64GenGICombiner") {
+  visibility = [ ":LLVMAArch64CodeGen" ]
+  args = [
+    "-gen-global-isel-combiner",
+    "-combiners=AArch64PreLegalizerCombinerHelper",
+  ]
+  td_file = "AArch64.td"
+}
+
 tablegen("AArch64GenMCPseudoLowering") {
   visibility = [ ":LLVMAArch64CodeGen" ]
   args = [ "-gen-pseudo-lowering" ]
@@ -48,6 +57,7 @@ static_library("LLVMAArch64CodeGen") {
     ":AArch64GenCallingConv",
     ":AArch64GenDAGISel",
     ":AArch64GenFastISel",
+    ":AArch64GenGICombiner",
     ":AArch64GenGlobalISel",
     ":AArch64GenMCPseudoLowering",
     ":AArch64GenRegisterBank",

Modified: llvm/trunk/utils/gn/secondary/llvm/utils/TableGen/BUILD.gn
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/gn/secondary/llvm/utils/TableGen/BUILD.gn?rev=373534&r1=373533&r2=373534&view=diff
==============================================================================
--- llvm/trunk/utils/gn/secondary/llvm/utils/TableGen/BUILD.gn (original)
+++ llvm/trunk/utils/gn/secondary/llvm/utils/TableGen/BUILD.gn Wed Oct  2 15:33:07 2019
@@ -30,6 +30,7 @@ executable("llvm-tblgen") {
     "ExegesisEmitter.cpp",
     "FastISelEmitter.cpp",
     "FixedLenDecoderEmitter.cpp",
+    "GICombinerEmitter.cpp",
     "GlobalISelEmitter.cpp",
     "InfoByHwMode.cpp",
     "InstrDocsEmitter.cpp",