Add the /v option which prints out the LLD version string.

[ruiu]

Summary

Add the /v option which prints out the LLD version string.

[hans]

Would it be easy to print the version number as part of /? instead? Maybe that's safer.

It's a little bit confusing that for gcc/clang, -v means verbose, for ld it means version, we can't use /version for lld-link because for link.exe that means something else..

[ruiu]

• Removed /v
• Added the version string to help message

[hans]

Thanks!

Nico, this addresses your needs, right?

lld/test/COFF/help.test

3 ↗

(On Diff #119207)

Maybe add a regex to check that it prints something that looks like a version?

[mstorsjo]

FWIW, I've got code elsewhere that detects lld-link, that looks like this:

https://git.libav.org/?p=libav.git;a=blob;f=configure;h=e45b3201fc9a92acd7ff71778b67d227e4178297;hb=1c5f264787b1c1cf67e5e71d08b8d8b03b0c8248#l3380

elif $_cc -? 2>/dev/null | grep -q 'LLVM.*Linker'; then

and then for getting the actual version from that linker:

_ident=$($_cc -flavor gnu --version 2>/dev/null)

Once this goes in, at least the first test needs to be adjusted, in case I want the code to work both with LLD <= 5.0 and >= 6.0.

[thakis]

This would work for me, but it sounds like it'd break mstorsjo :-( Maybe lld-link and clang-cl should both just have a --version. That won't clash, does what it says, and won't break existing code.

[ruiu]

Are you suggesting we implement the Unix-style, double-hyphen --version to lld-link? It would work, but it seem a bit strange to me, as all the other options starts with "/".

[thakis]

Yes, that's what I meant. clang-cl also has a bunch of Unix style flags. I agree it's a bit strange, but it'd be llvm-consistent.

[ruiu]

Instead of including version information to the --help message, add the --version option.

[thakis]

Thanks!

lld/trunk/COFF/Driver.cpp

 #include "Error.h"
 #include "InputFiles.h"
 #include "Memory.h"
 #include "MinGW.h"
 #include "SymbolTable.h"
 #include "Symbols.h"
 #include "Writer.h"
 #include "lld/Common/Driver.h"
+#include "lld/Common/Version.h"
 #include "llvm/ADT/Optional.h"
 #include "llvm/ADT/StringSwitch.h"
 #include "llvm/BinaryFormat/Magic.h"
 #include "llvm/Object/ArchiveWriter.h"
 #include "llvm/Object/COFFImportFile.h"
 #include "llvm/Object/COFFModuleDefinition.h"
 #include "llvm/Option/Arg.h"
 #include "llvm/Option/ArgList.h"
void LinkerDriver::link(ArrayRef<const char *> ArgsArr) {
   }
 
   // Handle /help
   if (Args.hasArg(OPT_help)) {
     printHelp(ArgsArr[0]);
     return;
   }
 
+  // Handle --version, which is an lld extension. This option is a bit odd
+  // because it doesn't start with "/", but we deliberately chose "--" to
+  // avoid conflict with /version and for compatibility with clang-cl.
+  if (Args.hasArg(OPT_dash_dash_version)) {
+    outs() << getLLDVersion() << "\n";
+    return;
+  }
+
   // Handle /lldmingw early, since it can potentially affect how other
   // options are handled.
   Config->MinGW = Args.hasArg(OPT_lldmingw);
 
   if (auto *Arg = Args.getLastArg(OPT_linkrepro)) {
     SmallString<64> Path = StringRef(Arg->getValue());
     sys::path::append(Path, "repro.tar");
 

lld/trunk/COFF/Options.td

 def export_all_symbols : F<"export-all-symbols">;
 def nopdb : F<"nopdb">, HelpText<"Disable PDB generation for DWARF users">;
 def nosymtab : F<"nosymtab">;
 def lldmingw : F<"lldmingw">;
 def msvclto : F<"msvclto">;
 def output_def : Joined<["/", "-"], "output-def:">;
 def rsp_quoting : Joined<["--"], "rsp-quoting=">,
   HelpText<"Quoting style for response files, 'windows' (default) or 'posix'">;
+def dash_dash_version : Flag<["--"], "version">,
+  HelpText<"Print version information">;
 
 // Flags for debugging
 def lldmap : F<"lldmap">;
 def lldmap_file : Joined<["/", "-"], "lldmap:">;
 
 //==============================================================================
 // The flags below do nothing. They are defined only for link.exe compatibility.
 //==============================================================================

lld/trunk/test/COFF/driver.test

 # RUN: not lld-link nosuchfile.obj >& %t.log
 # RUN: FileCheck -check-prefix=MISSING %s < %t.log
 MISSING: nosuchfile.obj: {{[Nn]}}o such file or directory
+
+# RUN: lld-link --version | FileCheck -check-prefix=VERSION %s
+VERSION: {{LLD [0-9]+\.[0-9]+}}