diff options
| author | Sylvestre Ledru <sylvestre@debian.org> | 2019-03-25 18:06:20 +0000 |
|---|---|---|
| committer | Sylvestre Ledru <sylvestre@debian.org> | 2019-03-25 18:06:20 +0000 |
| commit | a199a9ba40c722a78f6e76a91c1a2263468c48cb (patch) | |
| tree | 37992a99434779027fb482291d01f311db68e45b | |
| parent | f49e33e252c411d38672b006673b64cbe921ccc1 (diff) | |
| download | bcm5719-llvm-a199a9ba40c722a78f6e76a91c1a2263468c48cb.tar.gz bcm5719-llvm-a199a9ba40c722a78f6e76a91c1a2263468c48cb.zip | |
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
llvm-svn: 356931
| -rw-r--r-- | clang/lib/Driver/Driver.cpp | 6 | ||||
| -rw-r--r-- | clang/test/Driver/immediate-options.c | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp index de6a67bd6e1..954c42ef9bf 100644 --- a/clang/lib/Driver/Driver.cpp +++ b/clang/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/clang/test/Driver/immediate-options.c b/clang/test/Driver/immediate-options.c index 935c948321f..71494eec616 100644 --- a/clang/test/Driver/immediate-options.c +++ b/clang/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: ={{.*}} |
