Rename "llvm-gsym" and "llvm-gsymutil" to "gsymutil".

[clayborg]

Summary

This patch renames the llvm-gsymutil tool to "gsymutil" along with all directories and build files. Also removed the unneeded deps from the "gsymutil" tool to allow gsymutil to link against less things.

[aprantl]

llvm/tools/llvm-gsym/llvm-gsymutil.cpp

434

This is not a rename?

[MaskRay]

llvm/tools/llvm-gsym/llvm-gsymutil.cpp

432

Can you recheck whether the remaining are all needed?

[clayborg]

llvm/tools/llvm-gsym/llvm-gsymutil.cpp

432

If I removed all InitializeAllTargetInfos and InitializeAllTargetMCs I got errors when trying to load object files. I didn't try them individually though, so I will try that.

434

Yeah, I modified the description after submitting to say "Also removed the AsmPrinter from the dependencies.".

[clayborg]

Removed more dependencies from the "gsymutil" tool and removed uneeded function calls.

[clayborg]

llvm/tools/llvm-gsym/llvm-gsymutil.cpp

431

I was able to remove more.

[echristo]

Most of the other tools are llvm- any reason for the change?

[aprantl]

In D75291#1896992, @echristo wrote:

Most of the other tools are llvm- any reason for the change?

I was the one to suggest this name, since I found it inconsistent to have dsymutil but llvm-gsymutil. The others are mostly called llvm- to differentiate them from preexisting tools with the same name. I don't think it's necessary for a new tool; unless we want the prefix there it for marketing reasons?

[clayborg]

Renamed back to llvm-gsymutil for everything. So this patch now is renaming from llvm-gsym to llvm-gsymutil for the tool directory.

[clayborg]

Remove an extra fix for triples that I will commit with a new patch.

[clayborg]

Is everyone ok with this naming?

[fpetrogalli]

Hello @clayborg ,

this patch is breaking shared libs builds (cmake path/to/llvm -DBUILD_SHARED_LIBS=ON).

Could you please fix it?

Regards,

Francesco

[MaskRay]

In D75291#1904393, @fpetrogalli wrote:

Hello @clayborg ,

this patch is breaking shared libs builds (cmake path/to/llvm -DBUILD_SHARED_LIBS=ON).

Could you please fix it?

Regards,

Francesco

-DBUILD_SHARED_LIBS=ON build is good.

[fpetrogalli]

In D75291#1906405, @MaskRay wrote:

In D75291#1904393, @fpetrogalli wrote:

Hello @clayborg ,

this patch is breaking shared libs builds (cmake path/to/llvm -DBUILD_SHARED_LIBS=ON).

Could you please fix it?

Regards,

Francesco

-DBUILD_SHARED_LIBS=ON build is good.

Reverting this patch locally worked for me yesterday, so I assumed it was this patch causing the problem. When I pulled upstream today everything was working, so I must have done something wrong. In any case, thank you for double checking.

Francesco

llvm/tools/llvm-gsymutil/CMakeLists.txt

 set(LLVM_LINK_COMPONENTS
   ${LLVM_TARGETS_TO_BUILD}
   DebugInfoDWARF
   DebugInfoGSYM
-  AsmPrinter
-  AllTargetsDescs
-  AllTargetsInfos
-  MC
   Object
   Support
   Target
   )
 
 add_llvm_tool(llvm-gsymutil
   llvm-gsymutil.cpp
 
-  DEPENDS
-  intrinsics_gen
   )

llvm/tools/llvm-gsymutil/llvm-gsymutil.cpp

-//===-- llvm-gsymutil.cpp - GSYM dumping and creation utility for llvm ----===//
+//===-- gsymutil.cpp - GSYM dumping and creation utility for llvm ---------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 

 }
 
 static llvm::Error handleBuffer(StringRef Filename, MemoryBufferRef Buffer,
                                 const std::string &OutFile) {
   Expected<std::unique_ptr<Binary>> BinOrErr = object::createBinary(Buffer);
   error(Filename, errorToErrorCode(BinOrErr.takeError()));
 
   if (auto *Obj = dyn_cast<ObjectFile>(BinOrErr->get())) {
-    auto ArchName = Obj->makeTriple().getArchName();
+    Triple ObjTriple = Obj->makeTriple();
+    StringRef ArchName = ObjTriple.getArchName();
     outs() << "Output file (" << ArchName << "): " << OutFile << "\n";
     if (auto Err = handleObjectFile(*Obj, OutFile.c_str()))
       return Err;
   } else if (auto *Fat = dyn_cast<MachOUniversalBinary>(BinOrErr->get())) {
     // Iterate over all contained architectures and filter out any that were
     // not specified with the "--arch <arch>" option. If the --arch option was
     // not specified on the command line, we will process all architectures.
     std::vector< std::unique_ptr<MachOObjectFile> > FilterObjs;
static llvm::Error convertFileToGSYM(raw_ostream &OS) {
   return Error::success();
 }
 
 int main(int argc, char const *argv[]) {
   // Print a stack trace if we signal out.
   sys::PrintStackTraceOnErrorSignal(argv[0]);
   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"
       "Specify one or more GSYM paths as arguments to dump all of the "
       "information in each GSYM file.\n"
       "Specify a single GSYM file along with one or more --lookup options to "
       "lookup addresses within that GSYM file.\n"
       "Use the --convert option to specify a file with option --out-file "
       "option to convert to GSYM format.\n";

llvm/utils/gn/secondary/llvm/test/BUILD.gn

deps = [
     "//llvm/tools/llvm-cxxmap",
     "//llvm/tools/llvm-diff",
     "//llvm/tools/llvm-dis",
     "//llvm/tools/llvm-dwarfdump",
     "//llvm/tools/llvm-dwp",
     "//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",
     "//llvm/tools/llvm-link",
     "//llvm/tools/llvm-lipo",
     "//llvm/tools/llvm-lto",
     "//llvm/tools/llvm-lto2",
     "//llvm/tools/llvm-mc",

llvm/utils/gn/secondary/llvm/tools/llvm-gsymutil/BUILD.gn

 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",
     "//llvm/lib/Target:TargetsToBuild",
   ]
   sources = [
     # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
     "llvm-gsymutil.cpp",
   ]
 }