Index: llvm/trunk/utils/gn/secondary/BUILD.gn
===================================================================
--- llvm/trunk/utils/gn/secondary/BUILD.gn
+++ llvm/trunk/utils/gn/secondary/BUILD.gn
@@ -11,6 +11,11 @@
     "//llvm/tools/llvm-rc",
     "//llvm/tools/llvm-rtdyld",
     "//llvm/tools/llvm-undname",
+    "//llvm/tools/llvm-xray",
+    "//llvm/tools/sancov",
+    "//llvm/tools/sanstats",
+    "//llvm/tools/verify-uselistorder",
+    "//llvm/utils/yaml-bench",
   ]
   if (clang_enable_arcmt) {
     deps += [
Index: llvm/trunk/utils/gn/secondary/llvm/lib/XRay/BUILD.gn
===================================================================
--- llvm/trunk/utils/gn/secondary/llvm/lib/XRay/BUILD.gn
+++ llvm/trunk/utils/gn/secondary/llvm/lib/XRay/BUILD.gn
@@ -0,0 +1,23 @@
+static_library("XRay") {
+  output_name = "LLVMXRay"
+  deps = [
+    "//llvm/lib/Object",
+    "//llvm/lib/Support",
+  ]
+  sources = [
+    "BlockIndexer.cpp",
+    "BlockPrinter.cpp",
+    "BlockVerifier.cpp",
+    "FDRRecordProducer.cpp",
+    "FDRRecords.cpp",
+    "FDRTraceExpander.cpp",
+    "FDRTraceWriter.cpp",
+    "FileHeaderReader.cpp",
+    "InstrumentationMap.cpp",
+    "LogBuilderConsumer.cpp",
+    "Profile.cpp",
+    "RecordInitializer.cpp",
+    "RecordPrinter.cpp",
+    "Trace.cpp",
+  ]
+}
Index: llvm/trunk/utils/gn/secondary/llvm/tools/llvm-xray/BUILD.gn
===================================================================
--- llvm/trunk/utils/gn/secondary/llvm/tools/llvm-xray/BUILD.gn
+++ llvm/trunk/utils/gn/secondary/llvm/tools/llvm-xray/BUILD.gn
@@ -0,0 +1,23 @@
+executable("llvm-xray") {
+  deps = [
+    "//llvm/lib/DebugInfo/DWARF",
+    "//llvm/lib/DebugInfo/Symbolize",
+    "//llvm/lib/Object",
+    "//llvm/lib/Support",
+    "//llvm/lib/Target:TargetsToBuild",
+    "//llvm/lib/XRay",
+  ]
+  sources = [
+    "func-id-helper.cpp",
+    "llvm-xray.cpp",
+    "xray-account.cpp",
+    "xray-color-helper.cpp",
+    "xray-converter.cpp",
+    "xray-extract.cpp",
+    "xray-fdr-dump.cpp",
+    "xray-graph-diff.cpp",
+    "xray-graph.cpp",
+    "xray-registry.cpp",
+    "xray-stacks.cpp",
+  ]
+}
Index: llvm/trunk/utils/gn/secondary/llvm/tools/sancov/BUILD.gn
===================================================================
--- llvm/trunk/utils/gn/secondary/llvm/tools/sancov/BUILD.gn
+++ llvm/trunk/utils/gn/secondary/llvm/tools/sancov/BUILD.gn
@@ -0,0 +1,18 @@
+executable("sancov") {
+  deps = [
+    "//llvm/lib/DebugInfo/DWARF",
+    "//llvm/lib/DebugInfo/PDB",
+    "//llvm/lib/DebugInfo/Symbolize",
+    "//llvm/lib/MC",
+    "//llvm/lib/MC/MCDisassembler",
+    "//llvm/lib/Object",
+    "//llvm/lib/Support",
+    "//llvm/lib/Target:AllTargetsAsmPrinters",
+    "//llvm/lib/Target:AllTargetsDescs",
+    "//llvm/lib/Target:AllTargetsDisassemblers",
+    "//llvm/lib/Target:AllTargetsInfos",
+  ]
+  sources = [
+    "sancov.cpp",
+  ]
+}
Index: llvm/trunk/utils/gn/secondary/llvm/tools/sanstats/BUILD.gn
===================================================================
--- llvm/trunk/utils/gn/secondary/llvm/tools/sanstats/BUILD.gn
+++ llvm/trunk/utils/gn/secondary/llvm/tools/sanstats/BUILD.gn
@@ -0,0 +1,9 @@
+executable("sanstats") {
+  deps = [
+    "//llvm/lib/DebugInfo/Symbolize",
+    "//llvm/lib/Support",
+  ]
+  sources = [
+    "sanstats.cpp",
+  ]
+}
Index: llvm/trunk/utils/gn/secondary/llvm/tools/verify-uselistorder/BUILD.gn
===================================================================
--- llvm/trunk/utils/gn/secondary/llvm/tools/verify-uselistorder/BUILD.gn
+++ llvm/trunk/utils/gn/secondary/llvm/tools/verify-uselistorder/BUILD.gn
@@ -0,0 +1,13 @@
+executable("verify-uselistorder") {
+  deps = [
+    "//llvm/lib/AsmParser",
+    "//llvm/lib/Bitcode/Reader",
+    "//llvm/lib/Bitcode/Writer",
+    "//llvm/lib/IR",
+    "//llvm/lib/IRReader",
+    "//llvm/lib/Support",
+  ]
+  sources = [
+    "verify-uselistorder.cpp",
+  ]
+}
Index: llvm/trunk/utils/gn/secondary/llvm/utils/yaml-bench/BUILD.gn
===================================================================
--- llvm/trunk/utils/gn/secondary/llvm/utils/yaml-bench/BUILD.gn
+++ llvm/trunk/utils/gn/secondary/llvm/utils/yaml-bench/BUILD.gn
@@ -0,0 +1,8 @@
+executable("yaml-bench") {
+  deps = [
+    "//llvm/lib/Support",
+  ]
+  sources = [
+    "YAMLBench.cpp",
+  ]
+}