[PATCH] D102321: [llvm-nm] Support the -V option, print that the tool is compatible with GNU nm

[Martin Storsjö via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rGb42fb6811e25: [llvm-nm] Support the -V option, print that the tool is compatible with GNU nm (authored by mstorsjo).

Changed prior to commit:
  https://reviews.llvm.org/D102321?vs=344884&id=345254#toc

Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D102321/new/

https://reviews.llvm.org/D102321

Files:
  llvm/docs/CommandGuide/llvm-nm.rst
  llvm/test/tools/llvm-nm/libtool-version.test
  llvm/tools/llvm-nm/llvm-nm.cpp


Index: llvm/tools/llvm-nm/llvm-nm.cpp
===================================================================
--- llvm/tools/llvm-nm/llvm-nm.cpp
+++ llvm/tools/llvm-nm/llvm-nm.cpp
@@ -229,6 +229,8 @@
                                       "TBD(Mach-O) only"),
                              cl::cat(NMCat));
 
+cl::opt<bool> Version("V", cl::desc("Print version info"), cl::cat(NMCat));
+
 cl::extrahelp HelpResponse("\nPass @FILE as argument to read options from FILE.\n");
 
 bool PrintAddress = true;
@@ -2235,11 +2237,23 @@
   }
 }
 
+static void printExtraVersionInfo(raw_ostream &Outs) {
+  // This needs to contain the word "GNU", libtool looks for that string.
+  Outs << "llvm-nm, compatible with GNU nm\n";
+}
+
 int main(int argc, char **argv) {
   InitLLVM X(argc, argv);
   cl::HideUnrelatedOptions(NMCat);
+  cl::AddExtraVersionPrinter(printExtraVersionInfo);
   cl::ParseCommandLineOptions(argc, argv, "llvm symbol table dumper\n");
 
+  if (Version) {
+    cl::PrintVersionMessage();
+    printExtraVersionInfo(outs());
+    return 0;
+  }
+
   // llvm-nm only reads binary files.
   if (error(sys::ChangeStdinToBinary()))
     return 1;
Index: llvm/test/tools/llvm-nm/libtool-version.test
===================================================================
--- /dev/null
+++ llvm/test/tools/llvm-nm/libtool-version.test
@@ -0,0 +1,8 @@
+# Check that the output of llvm-nm -V (and --version) contains the text
+# "GNU" somewhere, to let libtool know that it is compatible with GNU nm.
+# Also check that it contains the LLVM version.
+
+RUN: llvm-nm -V | FileCheck %s
+RUN: llvm-nm --version | FileCheck %s
+CHECK: LLVM version
+CHECK: GNU
Index: llvm/docs/CommandGuide/llvm-nm.rst
===================================================================
--- llvm/docs/CommandGuide/llvm-nm.rst
+++ llvm/docs/CommandGuide/llvm-nm.rst
@@ -230,10 +230,10 @@
 
  Print only undefined symbols.
 
-.. option:: --version
+.. option:: --version, -V
 
- Display the version of the :program:`llvm-nm` executable. Does not stack with
- other commands.
+ Display the version of the :program:`llvm-nm` executable, then exit. Does not
+ stack with other commands.
 
 .. option:: --without-aliases
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D102321.345254.patch
Type: text/x-patch
Size: 2191 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20210513/cb4c79e5/attachment.bin>