Index: llvm/trunk/utils/gn/secondary/BUILD.gn
===================================================================
--- llvm/trunk/utils/gn/secondary/BUILD.gn
+++ llvm/trunk/utils/gn/secondary/BUILD.gn
@@ -8,6 +8,8 @@
     "//llvm/tools/llvm-exegesis",
     "//llvm/tools/llvm-extract",
     "//llvm/tools/llvm-link",
+    "//llvm/tools/llvm-mca",
+    "//llvm/tools/llvm-mt",
     "//llvm/tools/llvm-rc",
     "//llvm/tools/llvm-rtdyld",
     "//llvm/tools/llvm-size",
Index: llvm/trunk/utils/gn/secondary/llvm/lib/MCA/BUILD.gn
===================================================================
--- llvm/trunk/utils/gn/secondary/llvm/lib/MCA/BUILD.gn
+++ llvm/trunk/utils/gn/secondary/llvm/lib/MCA/BUILD.gn
@@ -0,0 +1,29 @@
+static_library("MCA") {
+  output_name = "LLVMMCA"
+  deps = [
+    "//llvm/lib/CodeGen",
+    "//llvm/lib/MC",
+    "//llvm/lib/Support",
+  ]
+  include_dirs = [ "../include" ]
+  sources = [
+    "Context.cpp",
+    "HWEventListener.cpp",
+    "HardwareUnits/HardwareUnit.cpp",
+    "HardwareUnits/LSUnit.cpp",
+    "HardwareUnits/RegisterFile.cpp",
+    "HardwareUnits/ResourceManager.cpp",
+    "HardwareUnits/RetireControlUnit.cpp",
+    "HardwareUnits/Scheduler.cpp",
+    "InstrBuilder.cpp",
+    "Instruction.cpp",
+    "Pipeline.cpp",
+    "Stages/DispatchStage.cpp",
+    "Stages/EntryStage.cpp",
+    "Stages/ExecuteStage.cpp",
+    "Stages/InstructionTables.cpp",
+    "Stages/RetireStage.cpp",
+    "Stages/Stage.cpp",
+    "Support.cpp",
+  ]
+}
Index: llvm/trunk/utils/gn/secondary/llvm/tools/llvm-mca/BUILD.gn
===================================================================
--- llvm/trunk/utils/gn/secondary/llvm/tools/llvm-mca/BUILD.gn
+++ llvm/trunk/utils/gn/secondary/llvm/tools/llvm-mca/BUILD.gn
@@ -0,0 +1,32 @@
+executable("llvm-mca") {
+  deps = [
+    "//llvm/lib/MC",
+    "//llvm/lib/MC/MCParser",
+    "//llvm/lib/MCA",
+    "//llvm/lib/Support",
+    "//llvm/lib/Target:AllTargetsAsmParsers",
+    "//llvm/lib/Target:AllTargetsAsmPrinters",
+    "//llvm/lib/Target:AllTargetsDescs",
+    "//llvm/lib/Target:AllTargetsDisassemblers",
+    "//llvm/lib/Target:AllTargetsInfos",
+  ]
+  include_dirs = [
+    ".",
+    "include",
+  ]
+  sources = [
+    "CodeRegion.cpp",
+    "CodeRegionGenerator.cpp",
+    "PipelinePrinter.cpp",
+    "Views/DispatchStatistics.cpp",
+    "Views/InstructionInfoView.cpp",
+    "Views/RegisterFileStatistics.cpp",
+    "Views/ResourcePressureView.cpp",
+    "Views/RetireControlUnitStatistics.cpp",
+    "Views/SchedulerStatistics.cpp",
+    "Views/SummaryView.cpp",
+    "Views/TimelineView.cpp",
+    "Views/View.cpp",
+    "llvm-mca.cpp",
+  ]
+}
Index: llvm/trunk/utils/gn/secondary/llvm/tools/llvm-mt/BUILD.gn
===================================================================
--- llvm/trunk/utils/gn/secondary/llvm/tools/llvm-mt/BUILD.gn
+++ llvm/trunk/utils/gn/secondary/llvm/tools/llvm-mt/BUILD.gn
@@ -0,0 +1,18 @@
+import("//llvm/utils/TableGen/tablegen.gni")
+
+tablegen("Opts") {
+  visibility = [ ":llvm-mt" ]
+  args = [ "-gen-opt-parser-defs" ]
+}
+
+executable("llvm-mt") {
+  deps = [
+    ":Opts",
+    "//llvm/lib/Option",
+    "//llvm/lib/Support",
+    "//llvm/lib/WindowsManifest",
+  ]
+  sources = [
+    "llvm-mt.cpp",
+  ]
+}