diff options
| author | NAKAMURA Takumi <geek4civic@gmail.com> | 2016-03-21 23:51:50 +0000 |
|---|---|---|
| committer | NAKAMURA Takumi <geek4civic@gmail.com> | 2016-03-21 23:51:50 +0000 |
| commit | 8794f98e2107607b66c6bb30cbfd0a7e6a8c0c62 (patch) | |
| tree | 46ed73aed8254930e2719eda2f2a27ef012f09d6 /clang/lib | |
| parent | 81f7729c3dd975c266d9ee0c8b4dce6a5ca0edc8 (diff) | |
| download | bcm5719-llvm-8794f98e2107607b66c6bb30cbfd0a7e6a8c0c62.tar.gz bcm5719-llvm-8794f98e2107607b66c6bb30cbfd0a7e6a8c0c62.zip | |
Revert r263974, "clang-cl: With -fmsc-version=1900, use MSVS2015 diag formatting."
It seems the test wouldn't expect if default target is *-win32.
llvm-svn: 264007
Diffstat (limited to 'clang/lib')
| -rw-r--r-- | clang/lib/Driver/Tools.cpp | 1 | ||||
| -rw-r--r-- | clang/lib/Frontend/TextDiagnostic.cpp | 10 |
2 files changed, 1 insertions, 10 deletions
diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp index 79002570bf9..9939ce1e315 100644 --- a/clang/lib/Driver/Tools.cpp +++ b/clang/lib/Driver/Tools.cpp @@ -3257,7 +3257,6 @@ VersionTuple visualstudio::getMSVCVersion(const Driver *D, if (Major || Minor || Micro) return VersionTuple(Major, Minor, Micro); - // FIXME: Consider bumping this to 19 (MSVC2015) soon. return VersionTuple(18); } return VersionTuple(); diff --git a/clang/lib/Frontend/TextDiagnostic.cpp b/clang/lib/Frontend/TextDiagnostic.cpp index fdaf44d77b3..5dda151d558 100644 --- a/clang/lib/Frontend/TextDiagnostic.cpp +++ b/clang/lib/Frontend/TextDiagnostic.cpp @@ -819,15 +819,7 @@ void TextDiagnostic::emitDiagnosticLoc(SourceLocation Loc, PresumedLoc PLoc, switch (DiagOpts->getFormat()) { case DiagnosticOptions::Clang: case DiagnosticOptions::Vi: OS << ':'; break; - case DiagnosticOptions::MSVC: - // MSVC2013 and before print 'file(4) : error'. MSVC2015 gets rid of the - // space and prints 'file(4): error'. - OS << ')'; - if (LangOpts.MSCompatibilityVersion && - !LangOpts.isCompatibleWithMSVC(LangOptions::MSVC2015)) - OS << ' '; - OS << ": "; - break; + case DiagnosticOptions::MSVC: OS << ") : "; break; } if (DiagOpts->ShowSourceRanges && !Ranges.empty()) { |
