[llvm] 3431f1b - gn build: (manually) merge 75f72f6b

[Nico Weber via llvm-commits]

Author: Nico Weber
Date: 2019-10-28T20:56:21-04:00
New Revision: 3431f1ba4cccf073c5e8774540b3cc3df49868ac

URL: https://github.com/llvm/llvm-project/commit/3431f1ba4cccf073c5e8774540b3cc3df49868ac
DIFF: https://github.com/llvm/llvm-project/commit/3431f1ba4cccf073c5e8774540b3cc3df49868ac.diff

LOG: gn build: (manually) merge 75f72f6b

Added: 
    llvm/utils/gn/secondary/llvm/unittests/Target/X86/BUILD.gn

Modified: 
    llvm/utils/gn/secondary/llvm/lib/CodeGen/BUILD.gn
    llvm/utils/gn/secondary/llvm/unittests/BUILD.gn
    llvm/utils/gn/secondary/llvm/unittests/Transforms/Utils/BUILD.gn

Removed: 
    


################################################################################
diff  --git a/llvm/utils/gn/secondary/llvm/lib/CodeGen/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/CodeGen/BUILD.gn
index 3a48ab138675..849eb1e06db0 100644
--- a/llvm/utils/gn/secondary/llvm/lib/CodeGen/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/CodeGen/BUILD.gn
@@ -117,6 +117,7 @@ static_library("CodeGen") {
     "MachineSSAUpdater.cpp",
     "MachineScheduler.cpp",
     "MachineSink.cpp",
+    "MachineSizeOpts.cpp",
     "MachineTraceMetrics.cpp",
     "MachineVerifier.cpp",
     "MacroFusion.cpp",

diff  --git a/llvm/utils/gn/secondary/llvm/unittests/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/BUILD.gn
index 3ad8f6a50f08..19c9478cc1f1 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/BUILD.gn
@@ -71,7 +71,10 @@ group("unittests") {
     deps += [ "Target/WebAssembly:WebAssemblyTests" ]
   }
   if (llvm_build_X86) {
-    deps += [ "tools/llvm-exegesis/X86:LLVMExegesisX86Tests" ]
+    deps += [
+      "Target/X86:X86Tests",
+      "tools/llvm-exegesis/X86:LLVMExegesisX86Tests",
+    ]
   }
 
   testonly = true

diff  --git a/llvm/utils/gn/secondary/llvm/unittests/Target/X86/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/Target/X86/BUILD.gn
new file mode 100644
index 000000000000..b89bc7547c65
--- /dev/null
+++ b/llvm/utils/gn/secondary/llvm/unittests/Target/X86/BUILD.gn
@@ -0,0 +1,22 @@
+import("//llvm/utils/unittest/unittest.gni")
+
+unittest("X86Tests") {
+  deps = [
+    "//llvm/lib/Analysis",
+    "//llvm/lib/CodeGen",
+    "//llvm/lib/CodeGen/GlobalISel",
+    "//llvm/lib/CodeGen/MIRParser",
+    "//llvm/lib/CodeGen/SelectionDAG",
+    "//llvm/lib/IR",
+    "//llvm/lib/MC",
+    "//llvm/lib/Support",
+    "//llvm/lib/Target",
+    "//llvm/lib/Target/X86:LLVMX86CodeGen",
+    "//llvm/lib/Target/X86/MCTargetDesc",
+    "//llvm/lib/Target/X86/TargetInfo",
+  ]
+  include_dirs = [ "//llvm/lib/Target/X86" ]
+  sources = [
+    "MachineSizeOptsTest.cpp",
+  ]
+}

diff  --git a/llvm/utils/gn/secondary/llvm/unittests/Transforms/Utils/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/Transforms/Utils/BUILD.gn
index e4585e246c28..a937994f1ba7 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/Transforms/Utils/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/Transforms/Utils/BUILD.gn
@@ -16,6 +16,7 @@ unittest("UtilsTests") {
     "FunctionComparatorTest.cpp",
     "IntegerDivisionTest.cpp",
     "LocalTest.cpp",
+    "SizeOptsTests.cpp",
     "SSAUpdaterBulkTest.cpp",
     "UnrollLoopTest.cpp",
     "ValueMapperTest.cpp",