From e05b36f6045598eed19bceb03e1fad6eeaa8abd0 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 25 Mar 2019 18:06:20 +0000 Subject: [PATCH] clang -dumpversion returns 4.2.1 for legacy reason, update it Summary: It has been introduced in 2011 for gcc compat: https://github.com/llvm-mirror/clang/commit/95a907fc0f2f717dca38a379c1d2353bfea06d4f it is probably time to remove it to remove the confusion. reported: https://bugs.llvm.org/show_bug.cgi?id=38836 https://bugs.launchpad.net/ubuntu/+source/llvm-defaults/+bug/1810860 Reviewers: ddunbar, rnk Reviewed By: rnk Subscribers: jdoerfert, cfe-commits Tags: #clang Differential Revision: https://reviews.llvm.org/D56803 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@356931 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Driver/Driver.cpp | 6 +----- test/Driver/immediate-options.c | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp index de6a67bd6e..954c42ef9b 100644 --- a/lib/Driver/Driver.cpp +++ b/lib/Driver/Driver.cpp @@ -1640,11 +1640,7 @@ bool Driver::HandleImmediateArgs(const Compilation &C) { if (C.getArgs().hasArg(options::OPT_dumpversion)) { // Since -dumpversion is only implemented for pedantic GCC compatibility, we // return an answer which matches our definition of __VERSION__. - // - // If we want to return a more correct answer some day, then we should - // introduce a non-pedantically GCC compatible mode to Clang in which we - // provide sensible definitions for -dumpversion, __VERSION__, etc. - llvm::outs() << "4.2.1\n"; + llvm::outs() << CLANG_VERSION_STRING << "\n"; return false; } diff --git a/test/Driver/immediate-options.c b/test/Driver/immediate-options.c index 935c948321..71494eec61 100644 --- a/test/Driver/immediate-options.c +++ b/test/Driver/immediate-options.c @@ -7,7 +7,7 @@ // HELP-HIDDEN: driver-mode // RUN: %clang -dumpversion | FileCheck %s -check-prefix=DUMPVERSION -// DUMPVERSION: 4.2.1 +// DUMPVERSION: {{[0-9]+\.[0-9.]+}} // RUN: %clang -print-search-dirs | FileCheck %s -check-prefix=PRINT-SEARCH-DIRS // PRINT-SEARCH-DIRS: programs: ={{.*}} -- 2.50.1