diff options
| -rw-r--r-- | docs/ReleaseNotes.rst | 5 | ||||
| -rw-r--r-- | lib/Driver/ToolChains/MSVC.cpp | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/docs/ReleaseNotes.rst b/docs/ReleaseNotes.rst index b65c3bf988..49c26b449d 100644 --- a/docs/ReleaseNotes.rst +++ b/docs/ReleaseNotes.rst @@ -89,6 +89,11 @@ Non-comprehensive list of changes in this release - Bitrig OS was merged back into OpenBSD, so Bitrig support has been removed from Clang/LLVM. +- The default value of _MSC_VER was raised from 1800 to 1911, making it + compatible with the Visual Studio 2015 and 2017 C++ standard library headers. + Users should generally expect this to be regularly raised to match the most + recently released version of the Visual C++ compiler. + New Compiler Flags ------------------ diff --git a/lib/Driver/ToolChains/MSVC.cpp b/lib/Driver/ToolChains/MSVC.cpp index 4d2fa45136..ae41ee9e22 100644 --- a/lib/Driver/ToolChains/MSVC.cpp +++ b/lib/Driver/ToolChains/MSVC.cpp @@ -1266,9 +1266,8 @@ VersionTuple MSVCToolChain::computeMSVCVersion(const Driver *D, if (MSVT.empty() && Args.hasFlag(options::OPT_fms_extensions, options::OPT_fno_ms_extensions, IsWindowsMSVC)) { - // -fms-compatibility-version=18.00 is default. - // FIXME: Consider bumping this to 19 (MSVC2015) soon. - MSVT = VersionTuple(18); + // -fms-compatibility-version=19.11 is default, aka 2017 + MSVT = VersionTuple(19, 11); } return MSVT; } |