Index: llvm/trunk/utils/gn/secondary/BUILD.gn
===================================================================
--- llvm/trunk/utils/gn/secondary/BUILD.gn
+++ llvm/trunk/utils/gn/secondary/BUILD.gn
@@ -1,7 +1,10 @@
 group("default") {
   deps = [
     ":clang",
+    "//clang/tools/clang-diff",
     "//clang/tools/clang-format",
+    "//clang/tools/clang-import-test",
+    "//clang/tools/diagtool",
     "//lld/test",
     "//llvm/tools/llvm-cat",
     "//llvm/tools/llvm-lto",
Index: llvm/trunk/utils/gn/secondary/clang/lib/Tooling/ASTDiff/BUILD.gn
===================================================================
--- llvm/trunk/utils/gn/secondary/clang/lib/Tooling/ASTDiff/BUILD.gn
+++ llvm/trunk/utils/gn/secondary/clang/lib/Tooling/ASTDiff/BUILD.gn
@@ -0,0 +1,13 @@
+static_library("ASTDiff") {
+  output_name = "clangToolingASTDiff"
+  configs += [ "//llvm/utils/gn/build:clang_code" ]
+  deps = [
+    "//clang/lib/AST",
+    "//clang/lib/Basic",
+    "//clang/lib/Lex",
+    "//llvm/lib/Support",
+  ]
+  sources = [
+    "ASTDiff.cpp",
+  ]
+}
Index: llvm/trunk/utils/gn/secondary/clang/lib/Tooling/BUILD.gn
===================================================================
--- llvm/trunk/utils/gn/secondary/clang/lib/Tooling/BUILD.gn
+++ llvm/trunk/utils/gn/secondary/clang/lib/Tooling/BUILD.gn
@@ -0,0 +1,31 @@
+static_library("Tooling") {
+  output_name = "clangTooling"
+  configs += [ "//llvm/utils/gn/build:clang_code" ]
+  deps = [
+    "//clang/include/clang/Driver:Options",
+    "//clang/lib/AST",
+    "//clang/lib/ASTMatchers",
+    "//clang/lib/Basic",
+    "//clang/lib/Driver",
+    "//clang/lib/Format",
+    "//clang/lib/Frontend",
+    "//clang/lib/Lex",
+    "//clang/lib/Rewrite",
+    "//clang/lib/Tooling/Core",
+  ]
+  sources = [
+    "AllTUsExecution.cpp",
+    "ArgumentsAdjusters.cpp",
+    "CommonOptionsParser.cpp",
+    "CompilationDatabase.cpp",
+    "Execution.cpp",
+    "FileMatchTrie.cpp",
+    "FixIt.cpp",
+    "InterpolatingCompilationDatabase.cpp",
+    "JSONCompilationDatabase.cpp",
+    "Refactoring.cpp",
+    "RefactoringCallbacks.cpp",
+    "StandaloneExecution.cpp",
+    "Tooling.cpp",
+  ]
+}
Index: llvm/trunk/utils/gn/secondary/clang/tools/clang-diff/BUILD.gn
===================================================================
--- llvm/trunk/utils/gn/secondary/clang/tools/clang-diff/BUILD.gn
+++ llvm/trunk/utils/gn/secondary/clang/tools/clang-diff/BUILD.gn
@@ -0,0 +1,13 @@
+executable("clang-diff") {
+  configs += [ "//llvm/utils/gn/build:clang_code" ]
+  deps = [
+    "//clang/lib/Basic",
+    "//clang/lib/Frontend",
+    "//clang/lib/Tooling",
+    "//clang/lib/Tooling/ASTDiff",
+    "//llvm/lib/Support",
+  ]
+  sources = [
+    "ClangDiff.cpp",
+  ]
+}
Index: llvm/trunk/utils/gn/secondary/clang/tools/clang-import-test/BUILD.gn
===================================================================
--- llvm/trunk/utils/gn/secondary/clang/tools/clang-import-test/BUILD.gn
+++ llvm/trunk/utils/gn/secondary/clang/tools/clang-import-test/BUILD.gn
@@ -0,0 +1,17 @@
+executable("clang-import-test") {
+  configs += [ "//llvm/utils/gn/build:clang_code" ]
+  deps = [
+    "//clang/lib/AST",
+    "//clang/lib/Basic",
+    "//clang/lib/CodeGen",
+    "//clang/lib/Driver",
+    "//clang/lib/Frontend",
+    "//clang/lib/Lex",
+    "//clang/lib/Parse",
+    "//llvm/lib/IR",
+    "//llvm/lib/Support",
+  ]
+  sources = [
+    "clang-import-test.cpp",
+  ]
+}
Index: llvm/trunk/utils/gn/secondary/clang/tools/diagtool/BUILD.gn
===================================================================
--- llvm/trunk/utils/gn/secondary/clang/tools/diagtool/BUILD.gn
+++ llvm/trunk/utils/gn/secondary/clang/tools/diagtool/BUILD.gn
@@ -0,0 +1,18 @@
+executable("diagtool") {
+  configs += [ "//llvm/utils/gn/build:clang_code" ]
+  deps = [
+    "//clang/include/clang/Basic:DiagnosticIndexName",
+    "//clang/lib/Basic",
+    "//clang/lib/Frontend",
+    "//llvm/lib/Support",
+  ]
+  sources = [
+    "DiagTool.cpp",
+    "DiagnosticNames.cpp",
+    "FindDiagnosticID.cpp",
+    "ListWarnings.cpp",
+    "ShowEnabledWarnings.cpp",
+    "TreeView.cpp",
+    "diagtool_main.cpp",
+  ]
+}