Entering era zero

Author: gmh5225

clang/tools/driver/cc1_main.cpp

@@ -11,7 +11,6 @@
 // demonstration and testing purposes.
 //
 //===----------------------------------------------------------------------===//
-#include "version.h"
 #include "clang/Basic/Stack.h"
 #include "clang/Basic/TargetOptions.h"
 #include "clang/CodeGen/ObjectFilePCHContainerOperations.h"
@@ -226,11 +225,14 @@ static int PrintSupportedExtensions(std::string TargetStr) {
 
 int cc1_main(ArrayRef<const char *> Argv, const char *Argv0, void *MainAddr) {
   clock_t StartTime = clock();
+  std::string ClangVersion = "v" + std::to_string(LLVM_VERSION_MAJOR) + "." +
+                             std::to_string(LLVM_VERSION_MINOR) + "." +
+                             std::to_string(LLVM_VERSION_PATCH);
   StringRef FileName = StringRef(Argv[Argv.size() - 1]);
   auto ExitClock = llvm::make_scope_exit([&]() {
     clock_t EndTime = clock();
     auto Delta = (double)(EndTime - StartTime) / CLOCKS_PER_SEC;
-    llvm::outs() << "llvm-msvc(" << CLANG_LLVM_MSVC_VERSION << ") spent "
+    llvm::outs() << "llvm-msvc(" << ClangVersion << ") spent "
                  << llvm::format("%.3f", Delta) << "s in " << FileName << "\n";
   });
 

clang/tools/driver/driver.cpp

@@ -10,7 +10,6 @@
 // for functionality in the Driver clang library.
 //
 //===----------------------------------------------------------------------===//
-#include "version.h"
 #include "clang/Driver/Driver.h"
 #include "clang/Basic/DiagnosticOptions.h"
 #include "clang/Basic/HeaderInclude.h"

clang/tools/driver/version.h

@@ -22,16 +22,16 @@ if(NOT LLVM_NO_INSTALL_NAME_DIR_FOR_BUILD_TREE)
 endif()
 
 if(NOT DEFINED LLVM_VERSION_MAJOR)
-  set(LLVM_VERSION_MAJOR 18)
+  set(LLVM_VERSION_MAJOR 0)
 endif()
 if(NOT DEFINED LLVM_VERSION_MINOR)
   set(LLVM_VERSION_MINOR 0)
 endif()
 if(NOT DEFINED LLVM_VERSION_PATCH)
-  set(LLVM_VERSION_PATCH 0)
+  set(LLVM_VERSION_PATCH 1)
 endif()
 if(NOT DEFINED LLVM_VERSION_SUFFIX)
-  set(LLVM_VERSION_SUFFIX git)
+  set(LLVM_VERSION_SUFFIX newworld)
 endif()
 
 if (NOT PACKAGE_VERSION)