diff options
| author | David L. Jones <dlj@google.com> | 2019-05-13 03:43:25 +0000 |
|---|---|---|
| committer | David L. Jones <dlj@google.com> | 2019-05-13 03:43:25 +0000 |
| commit | 3e6d69063d71dfa04add3628a93f8ac6acc0c1e0 (patch) | |
| tree | 9ffabf883465ae0919b6add6563d554e57ff7d4b /llvm | |
| parent | a263aa25e1f8851bc0e1ff7d391e0d9abd860454 (diff) | |
| download | bcm5719-llvm-3e6d69063d71dfa04add3628a93f8ac6acc0c1e0.tar.gz bcm5719-llvm-3e6d69063d71dfa04add3628a93f8ac6acc0c1e0.zip | |
gn build: merge r360550
llvm-svn: 360551
Diffstat (limited to 'llvm')
3 files changed, 8 insertions, 27 deletions
diff --git a/llvm/utils/gn/secondary/llvm/lib/Target/WebAssembly/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Target/WebAssembly/BUILD.gn index 3c8803c19c6..988e529b184 100644 --- a/llvm/utils/gn/secondary/llvm/lib/Target/WebAssembly/BUILD.gn +++ b/llvm/utils/gn/secondary/llvm/lib/Target/WebAssembly/BUILD.gn @@ -44,7 +44,6 @@ static_library("LLVMWebAssemblyCodeGen") { ":WebAssemblyGenGlobalISel", ":WebAssemblyGenMCPseudoLowering", ":WebAssemblyGenRegisterBank", - "InstPrinter", "MCTargetDesc", "TargetInfo", "//llvm/include/llvm/Config:llvm-config", @@ -114,7 +113,6 @@ group("WebAssembly") { ":LLVMWebAssemblyCodeGen", "AsmParser", "Disassembler", - "InstPrinter", "MCTargetDesc", "TargetInfo", ] diff --git a/llvm/utils/gn/secondary/llvm/lib/Target/WebAssembly/InstPrinter/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Target/WebAssembly/InstPrinter/BUILD.gn deleted file mode 100644 index e63ea79174e..00000000000 --- a/llvm/utils/gn/secondary/llvm/lib/Target/WebAssembly/InstPrinter/BUILD.gn +++ /dev/null @@ -1,24 +0,0 @@ -import("//llvm/utils/TableGen/tablegen.gni") - -tablegen("WebAssemblyGenAsmWriter") { - visibility = [ ":InstPrinter" ] - args = [ "-gen-asm-writer" ] - td_file = "../WebAssembly.td" -} - -static_library("InstPrinter") { - output_name = "LLVMWebAssemblyAsmPrinter" - deps = [ - ":WebAssemblyGenAsmWriter", - "//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/WebAssembly/MCTargetDesc:tablegen", - ] - include_dirs = [ ".." ] - sources = [ - "WebAssemblyInstPrinter.cpp", - ] -} 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 8d8e6c0a0e9..bf106cde9c4 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 @@ -1,5 +1,11 @@ import("//llvm/utils/TableGen/tablegen.gni") +tablegen("WebAssemblyGenAsmWriter") { + visibility = [ ":tablegen" ] + args = [ "-gen-asm-writer" ] + td_file = "../WebAssembly.td" +} + tablegen("WebAssemblyGenInstrInfo") { visibility = [ ":tablegen" ] args = [ "-gen-instr-info" ] @@ -32,6 +38,7 @@ group("tablegen") { "../Utils", ] public_deps = [ + ":WebAssemblyGenAsmWriter", ":WebAssemblyGenInstrInfo", ":WebAssemblyGenMCCodeEmitter", ":WebAssemblyGenRegisterInfo", @@ -46,12 +53,12 @@ static_library("MCTargetDesc") { deps = [ "//llvm/lib/MC", "//llvm/lib/Support", - "//llvm/lib/Target/WebAssembly/InstPrinter", "//llvm/lib/Target/WebAssembly/TargetInfo", ] include_dirs = [ ".." ] sources = [ "WebAssemblyAsmBackend.cpp", + "WebAssemblyInstPrinter.cpp", "WebAssemblyMCAsmInfo.cpp", "WebAssemblyMCCodeEmitter.cpp", "WebAssemblyMCTargetDesc.cpp", |
