diff --git a/llvm/tools/llvm-gsym/CMakeLists.txt b/llvm/tools/llvm-gsymutil/CMakeLists.txt
rename from llvm/tools/llvm-gsym/CMakeLists.txt
rename to llvm/tools/llvm-gsymutil/CMakeLists.txt
--- a/llvm/tools/llvm-gsym/CMakeLists.txt
+++ b/llvm/tools/llvm-gsymutil/CMakeLists.txt
@@ -2,10 +2,6 @@
   ${LLVM_TARGETS_TO_BUILD}
   DebugInfoDWARF
   DebugInfoGSYM
-  AsmPrinter
-  AllTargetsDescs
-  AllTargetsInfos
-  MC
   Object
   Support
   Target
@@ -14,6 +10,4 @@
 add_llvm_tool(llvm-gsymutil
   llvm-gsymutil.cpp
 
-  DEPENDS
-  intrinsics_gen
   )
diff --git a/llvm/tools/llvm-gsym/llvm-gsymutil.cpp b/llvm/tools/llvm-gsymutil/llvm-gsymutil.cpp
rename from llvm/tools/llvm-gsym/llvm-gsymutil.cpp
rename to llvm/tools/llvm-gsymutil/llvm-gsymutil.cpp
--- a/llvm/tools/llvm-gsym/llvm-gsymutil.cpp
+++ b/llvm/tools/llvm-gsymutil/llvm-gsymutil.cpp
@@ -1,4 +1,4 @@
-//===-- llvm-gsymutil.cpp - GSYM dumping and creation utility for llvm ----===//
+//===-- gsymutil.cpp - GSYM dumping and creation utility for llvm ---------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -431,10 +431,7 @@
   PrettyStackTraceProgram X(argc, argv);
   llvm_shutdown_obj Y; // Call llvm_shutdown() on exit.
 
-  llvm::InitializeAllTargetInfos();
-  llvm::InitializeAllTargetMCs();
   llvm::InitializeAllTargets();
-  llvm::InitializeAllAsmPrinters();
 
   const char *Overview =
       "A tool for dumping, searching and creating GSYM files.\n\n"
diff --git a/llvm/utils/gn/secondary/llvm/test/BUILD.gn b/llvm/utils/gn/secondary/llvm/test/BUILD.gn
--- a/llvm/utils/gn/secondary/llvm/test/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/test/BUILD.gn
@@ -216,7 +216,7 @@
     "//llvm/tools/llvm-elfabi",
     "//llvm/tools/llvm-exegesis",
     "//llvm/tools/llvm-extract",
-    "//llvm/tools/llvm-gsym:llvm-gsymutil",
+    "//llvm/tools/llvm-gsymutil:llvm-gsymutil"
     "//llvm/tools/llvm-ifs",
     "//llvm/tools/llvm-isel-fuzzer",
     "//llvm/tools/llvm-jitlink",
diff --git a/llvm/utils/gn/secondary/llvm/tools/llvm-gsym/BUILD.gn b/llvm/utils/gn/secondary/llvm/tools/llvm-gsymutil/BUILD.gn
rename from llvm/utils/gn/secondary/llvm/tools/llvm-gsym/BUILD.gn
rename to llvm/utils/gn/secondary/llvm/tools/llvm-gsymutil/BUILD.gn
--- a/llvm/utils/gn/secondary/llvm/tools/llvm-gsym/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/tools/llvm-gsymutil/BUILD.gn
@@ -1,9 +1,7 @@
 executable("llvm-gsymutil") {
   deps = [
-    "//llvm/lib/CodeGen/AsmPrinter",
     "//llvm/lib/DebugInfo/DWARF",
     "//llvm/lib/DebugInfo/GSYM",
-    "//llvm/lib/MC",
     "//llvm/lib/Object",
     "//llvm/lib/Support",
     "//llvm/lib/Target",