[PATCH] D79026: Add vendor macro to "lld"

[Steven Wan via Phabricator via llvm-commits]

stevewan created this revision.
Herald added subscribers: llvm-commits, mgorny.
Herald added a project: LLVM.
stevewan added reviewers: hubert.reinterpretcast, kbarton, cebowleratibm, rzurob.
stevewan added a reviewer: ruiu.

Add the vendor macro to "lld" for extended version output support, 
such that it's able to print additional version info. This is 
consistent with the Clang and LLVM version printer, and the 
additional version message can be provided via PACKAGE_VENDOR.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D79026

Files:
  lld/CMakeLists.txt
  lld/Common/Version.cpp


Index: lld/Common/Version.cpp
===================================================================
--- lld/Common/Version.cpp
+++ lld/Common/Version.cpp
@@ -19,9 +19,15 @@
 // Returns a version string, e.g.:
 // lld 9.0.0 (https://github.com/llvm/llvm-project.git 9efdd7ac5e914d3c9fa1ef)
 std::string lld::getLLDVersion() {
+#ifdef LLD_VENDOR
+#define LLD_VENDOR_DISPLAY LLD_VENDOR " "
+#else
+#define LLD_VENDOR_DISPLAY
+#endif
 #if defined(LLD_REPOSITORY) && defined(LLD_REVISION)
-  return "LLD " LLD_VERSION_STRING " (" LLD_REPOSITORY " " LLD_REVISION ")";
+  return LLD_VENDOR_DISPLAY "LLD " LLD_VERSION_STRING " (" LLD_REPOSITORY " " LLD_REVISION ")";
 #else
-  return "LLD " LLD_VERSION_STRING;
+  return LLD_VENDOR_DISPLAY "LLD " LLD_VERSION_STRING;
 #endif
+#undef LLD_VENDOR_DISPLAY
 }
Index: lld/CMakeLists.txt
===================================================================
--- lld/CMakeLists.txt
+++ lld/CMakeLists.txt
@@ -120,6 +120,13 @@
 set(LLD_INCLUDE_DIR ${LLD_SOURCE_DIR}/include )
 set(LLD_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
 
+set(LLD_VENDOR ${PACKAGE_VENDOR} CACHE STRING
+  "Vendor-specific text for showing with version information.")
+
+if(LLD_VENDOR)
+  add_definitions(-DLLD_VENDOR="${LLD_VENDOR}")
+endif()
+
 # Compute the LLD version from the LLVM version.
 string(REGEX MATCH "[0-9]+\\.[0-9]+(\\.[0-9]+)?" LLD_VERSION
   ${PACKAGE_VERSION})


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D79026.260692.patch
Type: text/x-patch
Size: 1381 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20200428/82e76f23/attachment.bin>