Index: llvm/trunk/utils/gn/secondary/BUILD.gn
===================================================================
--- llvm/trunk/utils/gn/secondary/BUILD.gn
+++ llvm/trunk/utils/gn/secondary/BUILD.gn
@@ -1,3 +1,6 @@
+import("//clang/lib/ARCMigrate/enable.gni")
+import("//clang/lib/StaticAnalyzer/Frontend/enable.gni")
+
 group("default") {
   deps = [
     ":clang",
@@ -17,6 +20,15 @@
     "//llvm/tools/llvm-symbolizer:symlinks",
     "//llvm/tools/llvm-undname",
   ]
+  if (clang_enable_arcmt) {
+    deps += [ "//clang/tools/arcmt-test" ]
+  }
+  if (clang_enable_static_analyzer) {
+    deps += [
+      "//clang/tools/clang-check",
+      "//clang/tools/clang-func-mapping",
+    ]
+  }
   testonly = true
 }
 
Index: llvm/trunk/utils/gn/secondary/clang/tools/arcmt-test/BUILD.gn
===================================================================
--- llvm/trunk/utils/gn/secondary/clang/tools/arcmt-test/BUILD.gn
+++ llvm/trunk/utils/gn/secondary/clang/tools/arcmt-test/BUILD.gn
@@ -0,0 +1,13 @@
+executable("arcmt-test") {
+  configs += [ "//llvm/utils/gn/build:clang_code" ]
+  deps = [
+    "//clang/lib/ARCMigrate",
+    "//clang/lib/Basic",
+    "//clang/lib/Frontend",
+    "//clang/lib/Lex",
+    "//llvm/lib/Support",
+  ]
+  sources = [
+    "arcmt-test.cpp",
+  ]
+}
Index: llvm/trunk/utils/gn/secondary/clang/tools/clang-check/BUILD.gn
===================================================================
--- llvm/trunk/utils/gn/secondary/clang/tools/clang-check/BUILD.gn
+++ llvm/trunk/utils/gn/secondary/clang/tools/clang-check/BUILD.gn
@@ -0,0 +1,18 @@
+executable("clang-check") {
+  configs += [ "//llvm/utils/gn/build:clang_code" ]
+  deps = [
+    "//clang/lib/AST",
+    "//clang/lib/Basic",
+    "//clang/lib/Driver",
+    "//clang/lib/Frontend",
+    "//clang/lib/Frontend/Rewrite",
+    "//clang/lib/StaticAnalyzer/Frontend",
+    "//clang/lib/Tooling",
+    "//llvm/lib/Option",
+    "//llvm/lib/Support",
+    "//llvm/lib/Target:TargetsToBuild",
+  ]
+  sources = [
+    "ClangCheck.cpp",
+  ]
+}
Index: llvm/trunk/utils/gn/secondary/clang/tools/clang-func-mapping/BUILD.gn
===================================================================
--- llvm/trunk/utils/gn/secondary/clang/tools/clang-func-mapping/BUILD.gn
+++ llvm/trunk/utils/gn/secondary/clang/tools/clang-func-mapping/BUILD.gn
@@ -0,0 +1,17 @@
+executable("clang-func-mapping") {
+  configs += [ "//llvm/utils/gn/build:clang_code" ]
+  deps = [
+    "//clang/lib/AST",
+    "//clang/lib/Basic",
+    "//clang/lib/CrossTU",
+    "//clang/lib/Frontend",
+    "//clang/lib/Index",
+    "//clang/lib/Tooling",
+    "//llvm/lib/AsmParser",
+    "//llvm/lib/MC",
+    "//llvm/lib/Support",
+  ]
+  sources = [
+    "ClangFnMapGen.cpp",
+  ]
+}