[ELF] Reinstate the former spelling in the version message

[MaskRay]

With LLVM_APPEND_VC_REV=off, the new version message after #97323
looks like:

% /tmp/out/custom2/bin/ld.lld --version
LLD 19.0.0, compatible with GNU linkers

A trailing comma after the version string might cause issues with
version detection tools that don't strip it, as seen in the Linux
kernel's scripts/ld-version.sh script.

[llvmbot]

@llvm/pr-subscribers-lld

@llvm/pr-subscribers-lld-elf

Author: Fangrui Song (MaskRay)

Changes

With LLVM_APPEND_VC_REV=off, the new version message after #97323
looks like:

% /tmp/out/custom2/bin/ld.lld --version
LLD 19.0.0, compatible with GNU linkers

A trailing comma after the version string might cause issues with
version detection tools that don't strip it, as seen in the Linux
kernel's scripts/ld-version.sh script.

---

Full diff: https://github.com/llvm/llvm-project/pull/97942.diff

2 Files Affected:

• (modified) lld/ELF/Driver.cpp (+1-1)
• (modified) lld/test/ELF/version.test (+1-1)

diff --git a/lld/ELF/Driver.cpp b/lld/ELF/Driver.cpp
index 7800c2919a2bd..a4863d6717efb 100644
--- a/lld/ELF/Driver.cpp
+++ b/lld/ELF/Driver.cpp
@@ -631,7 +631,7 @@ void LinkerDriver::linkerMain(ArrayRef<const char *> argsArr) {
   // of Libtool. We cannot convince every software developer to migrate to
   // the latest version and re-generate scripts. So we have this hack.
   if (args.hasArg(OPT_v) || args.hasArg(OPT_version))
-    message(getLLDVersion() + ", compatible with GNU linkers");
+    message(getLLDVersion() + " (compatible with GNU linkers)");
 
   if (const char *path = getReproduceOption(args)) {
     // Note that --reproduce is a debug option so you can ignore it
diff --git a/lld/test/ELF/version.test b/lld/test/ELF/version.test
index 383c1ac976d96..72bd2ab56a126 100644
--- a/lld/test/ELF/version.test
+++ b/lld/test/ELF/version.test
@@ -7,4 +7,4 @@
 # RUN: ld.lld -V 2>&1 | FileCheck %s
 # RUN: not ld.lld -V %t/not-exist 2>&1 | FileCheck %s
 
-# CHECK: LLD {{.*}}, compatible with GNU linkers
+# CHECK: LLD {{.+}} (compatible with GNU linkers)

[nathanchance]

LGTM, appreciate this! I will still send a v2 of the change to make scripts/ld-version.sh more robust, now that we know it can be :) but it won’t be urgent now, so thank you!

[yugier]

Thank you for making this change!