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,9 @@
   deps = [
     "//clang/test",
     "//lld/test",
+    "//llvm/tools/llvm-cxxdump",
+    "//llvm/tools/llvm-cxxfilt",
+    "//llvm/tools/llvm-cxxmap",
     "//llvm/tools/llvm-diff",
     "//llvm/tools/llvm-dwp",
     "//llvm/tools/llvm-exegesis",
@@ -86,6 +89,11 @@
     "//llvm/tools/llvm-nm:symlinks",
   ]
 }
+group("llvm-cxxfilt") {
+  deps = [
+    "//llvm/tools/llvm-cxxfilt:symlinks",
+  ]
+}
 group("llvm-objcopy") {
   deps = [
     "//llvm/tools/llvm-objcopy:symlinks",
Index: llvm/trunk/utils/gn/secondary/llvm/tools/llvm-cxxdump/BUILD.gn
===================================================================
--- llvm/trunk/utils/gn/secondary/llvm/tools/llvm-cxxdump/BUILD.gn
+++ llvm/trunk/utils/gn/secondary/llvm/tools/llvm-cxxdump/BUILD.gn
@@ -0,0 +1,11 @@
+executable("llvm-cxxdump") {
+  deps = [
+    "//llvm/lib/Object",
+    "//llvm/lib/Support",
+    "//llvm/lib/Target:TargetsToBuild",
+  ]
+  sources = [
+    "Error.cpp",
+    "llvm-cxxdump.cpp",
+  ]
+}
Index: llvm/trunk/utils/gn/secondary/llvm/tools/llvm-cxxfilt/BUILD.gn
===================================================================
--- llvm/trunk/utils/gn/secondary/llvm/tools/llvm-cxxfilt/BUILD.gn
+++ llvm/trunk/utils/gn/secondary/llvm/tools/llvm-cxxfilt/BUILD.gn
@@ -0,0 +1,32 @@
+import("//llvm/tools/binutils_symlinks.gni")
+import("//llvm/utils/gn/build/symlink_or_copy.gni")
+
+if (llvm_install_binutils_symlinks) {
+  symlink_or_copy("cxxfilt") {  # Can't have '+' in target name.
+    deps = [
+      ":llvm-cxxfilt",
+    ]
+    source = "llvm-cxxfilt"
+    output = "$root_out_dir/bin/c++filt"  # Note: c++filt, not cxxfilt
+  }
+}
+
+# //:llvm-cxxfilt depends on this symlink target, see comment in //BUILD.gn.
+group("symlinks") {
+  deps = [
+    ":llvm-cxxfilt",
+  ]
+  if (llvm_install_binutils_symlinks) {
+    deps += [ ":cxxfilt" ]
+  }
+}
+
+executable("llvm-cxxfilt") {
+  deps = [
+    "//llvm/lib/Demangle",
+    "//llvm/lib/Support",
+  ]
+  sources = [
+    "llvm-cxxfilt.cpp",
+  ]
+}
Index: llvm/trunk/utils/gn/secondary/llvm/tools/llvm-cxxmap/BUILD.gn
===================================================================
--- llvm/trunk/utils/gn/secondary/llvm/tools/llvm-cxxmap/BUILD.gn
+++ llvm/trunk/utils/gn/secondary/llvm/tools/llvm-cxxmap/BUILD.gn
@@ -0,0 +1,10 @@
+executable("llvm-cxxmap") {
+  deps = [
+    "//llvm/lib/IR",
+    "//llvm/lib/Support",
+    "//llvm/lib/Target:TargetsToBuild",
+  ]
+  sources = [
+    "llvm-cxxmap.cpp",
+  ]
+}