Index: llvm/utils/gn/secondary/BUILD.gn
===================================================================
--- llvm/utils/gn/secondary/BUILD.gn
+++ llvm/utils/gn/secondary/BUILD.gn
@@ -8,6 +8,7 @@
     "//llvm/tools/llvm-mc",
     "//llvm/tools/llvm-undname",
     "//llvm/tools/obj2yaml",
+    "//llvm/tools/opt",
     "//llvm/tools/yaml2obj",
     "//llvm/utils/FileCheck",
     "//llvm/utils/count",
Index: llvm/utils/gn/secondary/llvm/lib/Transforms/Coroutines/BUILD.gn
===================================================================
--- /dev/null
+++ llvm/utils/gn/secondary/llvm/lib/Transforms/Coroutines/BUILD.gn
@@ -0,0 +1,20 @@
+static_library("Coroutines") {
+  output_name = "LLVMCoroutines"
+  deps = [
+    "//llvm/include/llvm/Config:llvm-config",
+    "//llvm/lib/Analysis",
+    "//llvm/lib/IR",
+    "//llvm/lib/Support",
+    "//llvm/lib/Transforms/IPO",
+    "//llvm/lib/Transforms/Scalar",
+    "//llvm/lib/Transforms/Utils",
+  ]
+  sources = [
+    "CoroCleanup.cpp",
+    "CoroEarly.cpp",
+    "CoroElide.cpp",
+    "CoroFrame.cpp",
+    "CoroSplit.cpp",
+    "Coroutines.cpp",
+  ]
+}
Index: llvm/utils/gn/secondary/llvm/tools/llc/BUILD.gn
===================================================================
--- llvm/utils/gn/secondary/llvm/tools/llc/BUILD.gn
+++ llvm/utils/gn/secondary/llvm/tools/llc/BUILD.gn
@@ -20,7 +20,7 @@
   ]
 
   # Support plugins.
-  # FIXME: Disable dead stripping once other binaries are dead-stripped
+  # FIXME: Disable dead stripping once other binaries are dead-stripped.
   if (host_os == "linux") {
     # Corresponds to export_executable_symbols() in cmake.
     ldflags = [ "-rdynamic" ]
Index: llvm/utils/gn/secondary/llvm/tools/opt/BUILD.gn
===================================================================
--- /dev/null
+++ llvm/utils/gn/secondary/llvm/tools/opt/BUILD.gn
@@ -0,0 +1,39 @@
+executable("opt") {
+  deps = [
+    "//llvm/include/llvm/Config:llvm-config",
+    "//llvm/lib/Analysis",
+    "//llvm/lib/Bitcode/Writer",
+    "//llvm/lib/CodeGen",
+    "//llvm/lib/IR",
+    "//llvm/lib/MC",
+    "//llvm/lib/Passes",
+    "//llvm/lib/Support",
+    "//llvm/lib/Target",
+    "//llvm/lib/Target:TargetsToBuild",
+    "//llvm/lib/Transforms/AggressiveInstCombine",
+    "//llvm/lib/Transforms/Coroutines",
+    "//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 = [
+    "AnalysisWrappers.cpp",
+    "BreakpointPrinter.cpp",
+    "Debugify.cpp",
+    "GraphPrinters.cpp",
+    "NewPMDriver.cpp",
+    "PassPrinters.cpp",
+    "PrintSCC.cpp",
+    "opt.cpp",
+  ]
+
+  # Support plugins.
+  # FIXME: Disable dead stripping once other binaries are dead-stripped.
+  if (host_os == "linux") {
+    # Corresponds to export_executable_symbols() in cmake.
+    ldflags = [ "-rdynamic" ]
+  }
+}