[gn build] (manually) port 387d3c2479

llvm/utils/gn/secondary/llvm/lib/Target/RISCV/AsmParser/BUILD.gn

@@ -18,7 +18,6 @@ static_library("AsmParser") {
     "//llvm/lib/Support",
     "//llvm/lib/Target/RISCV:RISCVGenCompressInstEmitter",
     "//llvm/lib/Target/RISCV/MCTargetDesc",
-    "//llvm/lib/Target/RISCV/Utils",
   ]
   include_dirs = [ ".." ]
   sources = [ "RISCVAsmParser.cpp" ]

llvm/utils/gn/secondary/llvm/lib/Target/RISCV/BUILD.gn

@@ -50,7 +50,6 @@ static_library("LLVMRISCVCodeGen") {
     "AsmParser:RISCVGenAsmMatcher",
     "MCTargetDesc",
     "TargetInfo",
-    "Utils",
     "//llvm/include/llvm/Config:llvm-config",
     "//llvm/lib/CodeGen",
     "//llvm/lib/CodeGen/AsmPrinter",
@@ -97,6 +96,5 @@ group("RISCV") {
     "Disassembler",
     "MCTargetDesc",
     "TargetInfo",
-    "Utils",
   ]
 }

llvm/utils/gn/secondary/llvm/lib/Target/RISCV/Disassembler/BUILD.gn

@@ -13,7 +13,6 @@ static_library("Disassembler") {
     "//llvm/lib/MC/MCDisassembler",
     "//llvm/lib/Support",
     "//llvm/lib/Target/RISCV/MCTargetDesc",
-    "//llvm/lib/Target/RISCV/Utils",
   ]
   include_dirs = [ ".." ]
   sources = [ "RISCVDisassembler.cpp" ]

llvm/utils/gn/secondary/llvm/lib/Target/RISCV/MCTargetDesc/BUILD.gn

@@ -24,6 +24,12 @@ tablegen("RISCVGenRegisterInfo") {
   td_file = "../RISCV.td"
 }
 
+tablegen("RISCVGenSearchableTables") {
+  visibility = [ ":tablegen" ]
+  args = [ "-gen-searchable-tables" ]
+  td_file = "../RISCV.td"
+}
+
 tablegen("RISCVGenSubtargetInfo") {
   visibility = [ ":tablegen" ]
   args = [ "-gen-subtarget" ]
@@ -36,11 +42,11 @@ tablegen("RISCVGenSubtargetInfo") {
 group("tablegen") {
   visibility = [
     ":MCTargetDesc",
-    "../Utils",
   ]
   public_deps = [
     ":RISCVGenInstrInfo",
     ":RISCVGenRegisterInfo",
+    ":RISCVGenSearchableTables",
     ":RISCVGenSubtargetInfo",
   ]
 }
@@ -54,11 +60,11 @@ static_library("MCTargetDesc") {
     "//llvm/lib/MC",
     "//llvm/lib/Support",
     "//llvm/lib/Target/RISCV:RISCVGenCompressInstEmitter",
-    "//llvm/lib/Target/RISCV/Utils",
   ]
   include_dirs = [ ".." ]
   sources = [
     "RISCVAsmBackend.cpp",
+    "RISCVBaseInfo.cpp",
     "RISCVELFObjectWriter.cpp",
     "RISCVELFStreamer.cpp",
     "RISCVInstPrinter.cpp",
@@ -66,6 +72,7 @@ static_library("MCTargetDesc") {
     "RISCVMCCodeEmitter.cpp",
     "RISCVMCExpr.cpp",
     "RISCVMCTargetDesc.cpp",
+    "RISCVMatInt.cpp",
     "RISCVTargetStreamer.cpp",
   ]
 }

llvm/utils/gn/secondary/llvm/lib/Target/RISCV/Utils/BUILD.gn

@@ -1,27 +0,0 @@
-import("//llvm/utils/TableGen/tablegen.gni")
-
-# Generates RISCVGenSearchableTables.inc
-tablegen("RISCVGenSearchableTables") {
-  visibility = [ ":Utils" ]
-  args = [ "-gen-searchable-tables" ]
-  td_file = "../RISCV.td"
-}
-
-static_library("Utils") {
-  output_name = "LLVMRISCVUtils"
-  public_deps = [ ":RISCVGenSearchableTables" ]
-  deps = [
-    "//llvm/lib/MC",
-    "//llvm/lib/Support",
-
-    # MCTargetDesc depends on Utils, so we can't depend on the full
-    # MCTargetDesc target here: it would form a cycle.
-    "//llvm/lib/Target/RISCV/MCTargetDesc:tablegen",
-  ]
-
-  include_dirs = [ ".." ]
-  sources = [
-    "RISCVBaseInfo.cpp",
-    "RISCVMatInt.cpp",
-  ]
-}