Index: llvm/utils/gn/secondary/BUILD.gn
===================================================================
--- llvm/utils/gn/secondary/BUILD.gn
+++ llvm/utils/gn/secondary/BUILD.gn
@@ -5,6 +5,8 @@
   deps = [
     "//clang/test",
     "//lld/test",
+    "//llvm/tools/llvm-diff",
+    "//llvm/tools/llvm-dwp",
     "//llvm/tools/llvm-exegesis",
     "//llvm/tools/llvm-extract",
     "//llvm/tools/llvm-link",
@@ -74,6 +76,11 @@
     "//llvm/tools/llvm-ar:symlinks",
   ]
 }
+group("llvm-dwp") {
+  deps = [
+    "//llvm/tools/llvm-dwp:symlinks",
+  ]
+}
 group("llvm-nm") {
   deps = [
     "//llvm/tools/llvm-nm:symlinks",
Index: llvm/utils/gn/secondary/llvm/tools/llvm-diff/BUILD.gn
===================================================================
--- /dev/null
+++ llvm/utils/gn/secondary/llvm/tools/llvm-diff/BUILD.gn
@@ -0,0 +1,13 @@
+executable("llvm-diff") {
+  deps = [
+    "//llvm/lib/IR",
+    "//llvm/lib/IRReader",
+    "//llvm/lib/Support",
+  ]
+  sources = [
+    "DiffConsumer.cpp",
+    "DiffLog.cpp",
+    "DifferenceEngine.cpp",
+    "llvm-diff.cpp",
+  ]
+}
Index: llvm/utils/gn/secondary/llvm/tools/llvm-dwp/BUILD.gn
===================================================================
--- /dev/null
+++ llvm/utils/gn/secondary/llvm/tools/llvm-dwp/BUILD.gn
@@ -0,0 +1,38 @@
+import("//llvm/tools/binutils_symlinks.gni")
+import("//llvm/utils/gn/build/symlink_or_copy.gni")
+
+if (llvm_install_binutils_symlinks) {
+  symlink_or_copy("dwp") {
+    deps = [
+      ":llvm-dwp",
+    ]
+    source = "llvm-dwp"
+    output = "$root_out_dir/bin/dwp"
+  }
+}
+
+# //:llvm-dwp depends on this symlink target, see comment in //BUILD.gn.
+group("symlinks") {
+  deps = [
+    ":llvm-dwp",
+  ]
+  if (llvm_install_binutils_symlinks) {
+    deps += [ ":dwp" ]
+  }
+}
+
+executable("llvm-dwp") {
+  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 = [
+    "DWPError.cpp",
+    "llvm-dwp.cpp",
+  ]
+}