Index: llvm/trunk/utils/gn/secondary/BUILD.gn
===================================================================
--- llvm/trunk/utils/gn/secondary/BUILD.gn
+++ llvm/trunk/utils/gn/secondary/BUILD.gn
@@ -5,6 +5,8 @@
   deps = [
     "//clang/test",
     "//lld/test",
+    "//llvm/tools/bugpoint",
+    "//llvm/tools/dsymutil",
     "//llvm/tools/llvm-c-test",
     "//llvm/tools/llvm-cfi-verify",
     "//llvm/tools/llvm-cov",
@@ -19,6 +21,7 @@
     "//llvm/tools/llvm-link",
     "//llvm/tools/llvm-mca",
     "//llvm/tools/llvm-mt",
+    "//llvm/tools/llvm-opt-report",
     "//llvm/tools/llvm-rc",
     "//llvm/tools/llvm-rtdyld",
     "//llvm/tools/llvm-size",
Index: llvm/trunk/utils/gn/secondary/llvm/lib/OptRemarks/BUILD.gn
===================================================================
--- llvm/trunk/utils/gn/secondary/llvm/lib/OptRemarks/BUILD.gn
+++ llvm/trunk/utils/gn/secondary/llvm/lib/OptRemarks/BUILD.gn
@@ -0,0 +1,10 @@
+static_library("OptRemarks") {
+  output_name = "LLVMOptRemarks"
+  deps = [
+    "//llvm/lib/Support",
+  ]
+
+  sources = [
+    "OptRemarksParser.cpp",
+  ]
+}
Index: llvm/trunk/utils/gn/secondary/llvm/tools/bugpoint/BUILD.gn
===================================================================
--- llvm/trunk/utils/gn/secondary/llvm/tools/bugpoint/BUILD.gn
+++ llvm/trunk/utils/gn/secondary/llvm/tools/bugpoint/BUILD.gn
@@ -0,0 +1,41 @@
+executable("bugpoint") {
+  deps = [
+    "//llvm/include/llvm/Config:config",
+    "//llvm/include/llvm/Config:llvm-config",
+    "//llvm/lib/Analysis",
+    "//llvm/lib/Bitcode/Writer",
+    "//llvm/lib/CodeGen",
+    "//llvm/lib/IR",
+    "//llvm/lib/IRReader",
+    "//llvm/lib/Linker",
+    "//llvm/lib/Support",
+    "//llvm/lib/Target",
+    "//llvm/lib/Target:TargetsToBuild",
+    "//llvm/lib/Transforms/AggressiveInstCombine",
+    "//llvm/lib/Transforms/IPO",
+    "//llvm/lib/Transforms/Instrumentation",
+    "//llvm/lib/Transforms/ObjCARC",
+    "//llvm/lib/Transforms/Scalar",
+    "//llvm/lib/Transforms/Utils",
+    "//llvm/lib/Transforms/Vectorize",
+  ]
+  sources = [
+    "BugDriver.cpp",
+    "CrashDebugger.cpp",
+    "ExecutionDriver.cpp",
+    "ExtractFunction.cpp",
+    "FindBugs.cpp",
+    "Miscompilation.cpp",
+    "OptimizerDriver.cpp",
+    "ToolRunner.cpp",
+    "bugpoint.cpp",
+  ]
+
+  # Support plugins.
+  # FIXME: Disable dead stripping once other binaries are dead-stripped.
+  if (host_os == "linux") {
+    # Make sure bugpoint plugins can access bugpoint's symbols.
+    # Corresponds to export_executable_symbols() in cmake.
+    ldflags = [ "-rdynamic" ]
+  }
+}
Index: llvm/trunk/utils/gn/secondary/llvm/tools/dsymutil/BUILD.gn
===================================================================
--- llvm/trunk/utils/gn/secondary/llvm/tools/dsymutil/BUILD.gn
+++ llvm/trunk/utils/gn/secondary/llvm/tools/dsymutil/BUILD.gn
@@ -0,0 +1,27 @@
+executable("dsymutil") {
+  deps = [
+    "//llvm/lib/CodeGen/AsmPrinter",
+    "//llvm/lib/DebugInfo/DWARF",
+    "//llvm/lib/MC",
+    "//llvm/lib/Object",
+    "//llvm/lib/Support",
+    "//llvm/lib/Target",
+    "//llvm/lib/Target:TargetsToBuild",
+  ]
+  sources = [
+    "BinaryHolder.cpp",
+    "CFBundle.cpp",
+    "CompileUnit.cpp",
+    "DebugMap.cpp",
+    "DeclContext.cpp",
+    "DwarfLinker.cpp",
+    "DwarfStreamer.cpp",
+    "MachODebugMapParser.cpp",
+    "MachOUtils.cpp",
+    "NonRelocatableStringpool.cpp",
+    "dsymutil.cpp",
+  ]
+  if (host_os == "mac") {
+    libs = [ "CoreFoundation.framework" ]
+  }
+}
Index: llvm/trunk/utils/gn/secondary/llvm/tools/llvm-opt-report/BUILD.gn
===================================================================
--- llvm/trunk/utils/gn/secondary/llvm/tools/llvm-opt-report/BUILD.gn
+++ llvm/trunk/utils/gn/secondary/llvm/tools/llvm-opt-report/BUILD.gn
@@ -0,0 +1,12 @@
+executable("llvm-opt-report") {
+  deps = [
+    "//llvm/lib/Demangle",
+    "//llvm/lib/IR",
+    "//llvm/lib/Object",
+    "//llvm/lib/OptRemarks",
+    "//llvm/lib/Support",
+  ]
+  sources = [
+    "OptReport.cpp",
+  ]
+}