[gn build] (manually) merge 6dbf1a1229ba

diff --git a/llvm/utils/gn/secondary/llvm/lib/Target/X86/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Target/X86/BUILD.gn
index 09fcc5f..a03f5e4 100644 (file)
--- a/llvm/utils/gn/secondary/llvm/lib/Target/X86/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Target/X86/BUILD.gn
@@ -59,7 +59,6 @@ static_library("LLVMX86CodeGen") {
     ":X86GenRegisterBank",
     "MCTargetDesc",
     "TargetInfo",
-    "Utils",
     "//llvm/include/llvm/Config:llvm-config",
     "//llvm/lib/Analysis",
     "//llvm/lib/CodeGen",
@@ -142,6 +141,5 @@ group("X86") {
     "Disassembler",
     "MCTargetDesc",
     "TargetInfo",
-    "Utils",
   ]
 }

diff --git a/llvm/utils/gn/secondary/llvm/lib/Target/X86/MCTargetDesc/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Target/X86/MCTargetDesc/BUILD.gn
index 735a84d..5ed89a0 100644 (file)
--- a/llvm/utils/gn/secondary/llvm/lib/Target/X86/MCTargetDesc/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Target/X86/MCTargetDesc/BUILD.gn
@@ -52,7 +52,6 @@ static_library("MCTargetDesc") {
     "//llvm/lib/Object",
     "//llvm/lib/Support",
     "//llvm/lib/Target/X86/TargetInfo",
-    "//llvm/lib/Target/X86/Utils",
   ]
   include_dirs = [ ".." ]
   sources = [
@@ -66,6 +65,7 @@ static_library("MCTargetDesc") {
     "X86MCCodeEmitter.cpp",
     "X86MCTargetDesc.cpp",
     "X86MachObjectWriter.cpp",
+    "X86ShuffleDecode.cpp",
     "X86WinCOFFObjectWriter.cpp",
     "X86WinCOFFStreamer.cpp",
     "X86WinCOFFTargetStreamer.cpp",

diff --git a/llvm/utils/gn/secondary/llvm/lib/Target/X86/Utils/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Target/X86/Utils/BUILD.gn
deleted file mode 100644 (file)
index 40edfaa..0000000
--- a/llvm/utils/gn/secondary/llvm/lib/Target/X86/Utils/BUILD.gn
+++ /dev/null
@@ -1,8 +0,0 @@
-static_library("Utils") {
-  output_name = "LLVMX86Utils"
-  deps = [ "//llvm/lib/Support" ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "X86ShuffleDecode.cpp",
-  ]
-}