[Downstream change] Implement Arm Toolchain ID (#126)

Since there are potentially different versions of the toolchain that can
be built (e.g. Arm Toolchain for Embedded and Arm Toolchain for Linux),
we need a way to uniquely identify the toolchain from the version
output, and differentiate from the upstream version. This can be done by
appending an additional message:
`Arm Toolchain ID: tag.`

The contents of the tag will need to be generated by the product's build
script. This patch add the field to version output, which can be set by
the CMake option ARM_TOOLCHAIN_ID when building the toolchain.

Clang and clang-format have their own version functions, whereas the
other LLVM tools use a shared utility function. This patch appends the
new message into both.

---

Downstream issue: #124

Author: dcandler

clang/CMakeLists.txt

@@ -334,6 +334,12 @@ set(CLANG_VERSION "${CLANG_VERSION_MAJOR}.${CLANG_VERSION_MINOR}.${CLANG_VERSION
 set(MAX_CLANG_ABI_COMPAT_VERSION "${LLVM_VERSION_MAJOR}")
 message(STATUS "Clang version: ${CLANG_VERSION}")
 
+# Downstream change issue: #124 (Arm Toolchain ID)
+if(NOT DEFINED ARM_TOOLCHAIN_ID)
+  set(ARM_TOOLCHAIN_ID "unset")
+endif()
+# End downstream change: #124
+
 # Configure the Version.inc file.
 configure_file(
   ${CMAKE_CURRENT_SOURCE_DIR}/include/clang/Basic/Version.inc.in

clang/include/clang/Basic/Version.inc.in

@@ -5,3 +5,5 @@
 #define CLANG_VERSION_MINOR @CLANG_VERSION_MINOR@
 #define CLANG_VERSION_PATCHLEVEL @CLANG_VERSION_PATCHLEVEL@
 #define MAX_CLANG_ABI_COMPAT_VERSION @MAX_CLANG_ABI_COMPAT_VERSION@
+// Downstream change issue: #124 (Arm Toolchain ID)
+#define ARM_TOOLCHAIN_ID "@ARM_TOOLCHAIN_ID@"

clang/lib/Driver/Driver.cpp

@@ -2325,6 +2325,9 @@ void Driver::PrintVersion(const Compilation &C, raw_ostream &OS) const {
   // If configuration files were used, print their paths.
   for (auto ConfigFile : ConfigFiles)
     OS << "Configuration file: " << ConfigFile << '\n';
+
+  // Downstream change issue: #124 (Arm Toolchain ID)
+  OS << "Arm Toolchain ID: " << ARM_TOOLCHAIN_ID << '\n';
 }
 
 /// PrintDiagnosticCategories - Implement the --print-diagnostic-categories

clang/tools/clang-format/ClangFormat.cpp

@@ -554,6 +554,8 @@ static bool format(StringRef FileName, bool ErrorOnIncompleteFormat = false) {
 
 static void PrintVersion(raw_ostream &OS) {
   OS << clang::getClangToolFullVersion("clang-format") << '\n';
+  // Downstream change issue: #124 (Arm Toolchain ID)
+  OS << "Arm Toolchain ID: " << ARM_TOOLCHAIN_ID << '\n';
 }
 
 // Dump the configuration.

llvm/CMakeLists.txt

@@ -1164,6 +1164,12 @@ if (NOT TENSORFLOW_AOT_PATH STREQUAL "")
 
 endif()
 
+# Downstream change issue: #124 (Arm Toolchain ID)
+if(NOT DEFINED ARM_TOOLCHAIN_ID)
+  set(ARM_TOOLCHAIN_ID "unset")
+endif()
+# End downstream change: #124
+
 # Configure the three LLVM configuration header files.
 configure_file(
   ${LLVM_MAIN_INCLUDE_DIR}/llvm/Config/config.h.cmake

llvm/include/llvm/Config/config.h.cmake

@@ -297,4 +297,7 @@
 
 #cmakedefine HAVE_GETAUXVAL ${HAVE_GETAUXVAL}
 
+/* Downstream change issue: #124 (Arm Toolchain ID) */
+#cmakedefine ARM_TOOLCHAIN_ID "${ARM_TOOLCHAIN_ID}"
+
 #endif

llvm/lib/Support/CommandLine.cpp

@@ -2540,6 +2540,8 @@ class VersionPrinter {
     OS << " with assertions";
 #endif
     OS << ".\n";
+    // Downstream change issue: #124 (Arm Toolchain ID)
+    OS << "Arm Toolchain ID: " << ARM_TOOLCHAIN_ID << '\n';
 
     // Iterate over any registered extra printers and call them to add further
     // information.