RKSimon updated this revision to Diff 390283. RKSimon added a comment. rebase and add FIXME
Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D114639/new/ https://reviews.llvm.org/D114639 Files: clang/docs/ClangFormatStyleOptions.rst clang/docs/UsersManual.rst llvm/cmake/modules/CheckCompilerVersion.cmake llvm/docs/CMake.rst llvm/docs/GettingStarted.rst llvm/docs/GettingStartedVS.rst llvm/docs/ReleaseNotes.rst llvm/include/llvm/Support/Compiler.h
Index: llvm/include/llvm/Support/Compiler.h =================================================================== --- llvm/include/llvm/Support/Compiler.h +++ llvm/include/llvm/Support/Compiler.h @@ -80,12 +80,21 @@ /// * 1916: VS2017, version 15.9 /// * 1920: VS2019, version 16.0 /// * 1921: VS2019, version 16.1 +/// * 1922: VS2019, version 16.2 +/// * 1923: VS2019, version 16.3 +/// * 1924: VS2019, version 16.4 +/// * 1925: VS2019, version 16.5 +/// * 1926: VS2019, version 16.6 +/// * 1927: VS2019, version 16.7 +/// * 1928: VS2019, version 16.8 + 16.9 +/// * 1929: VS2019, version 16.10 + 16.11 +/// * 1930: VS2022, version 17.0 #ifdef _MSC_VER #define LLVM_MSC_PREREQ(version) (_MSC_VER >= (version)) -// We require at least MSVC 2017. -#if !LLVM_MSC_PREREQ(1910) -#error LLVM requires at least MSVC 2017. +// We require at least VS 2019. +#if !LLVM_MSC_PREREQ(1920) +#error LLVM requires at least VS 2019. #endif #else @@ -97,12 +106,8 @@ /// Sadly, this is separate from just rvalue reference support because GCC /// and MSVC implemented this later than everything else. This appears to be /// corrected in MSVC 2019 but not MSVC 2017. -#if __has_feature(cxx_rvalue_references) || defined(__GNUC__) || \ - LLVM_MSC_PREREQ(1920) +/// FIXME: Remove LLVM_HAS_RVALUE_REFERENCE_THIS macro #define LLVM_HAS_RVALUE_REFERENCE_THIS 1 -#else -#define LLVM_HAS_RVALUE_REFERENCE_THIS 0 -#endif /// Expands to '&' if ref-qualifiers for *this are supported. /// Index: llvm/docs/ReleaseNotes.rst =================================================================== --- llvm/docs/ReleaseNotes.rst +++ llvm/docs/ReleaseNotes.rst @@ -65,7 +65,7 @@ Changes to building LLVM ------------------------ -* ... +* Building LLVM with Visual Studio now requires version 2019 or later. Changes to TableGen ------------------- Index: llvm/docs/GettingStartedVS.rst =================================================================== --- llvm/docs/GettingStartedVS.rst +++ llvm/docs/GettingStartedVS.rst @@ -36,7 +36,7 @@ Hardware -------- -Any system that can adequately run Visual Studio 2017 is fine. The LLVM +Any system that can adequately run Visual Studio 2019 is fine. The LLVM source tree including the git index consumes approximately 3GB. Object files, libraries and executables consume approximately 5GB in Release mode and much more in Debug mode. SSD drive and >16GB RAM are @@ -45,8 +45,8 @@ Software -------- -You will need `Visual Studio <https://visualstudio.microsoft.com/>`_ 2017 or -higher, with the latest Update installed. Visual Studio Community Edition +You will need `Visual Studio <https://visualstudio.microsoft.com/>`_ 2019 or +later, with the latest Update installed. Visual Studio Community Edition suffices. You will also need the `CMake <http://www.cmake.org/>`_ build system since it Index: llvm/docs/GettingStarted.rst =================================================================== --- llvm/docs/GettingStarted.rst +++ llvm/docs/GettingStarted.rst @@ -238,7 +238,7 @@ * Clang 3.5 * Apple Clang 6.0 * GCC 5.1 -* Visual Studio 2017 +* Visual Studio 2019 Anything older than these toolchains *may* work, but will require forcing the build system with a special option and is not really a supported host platform. @@ -273,8 +273,8 @@ This section mostly applies to Linux and older BSDs. On macOS, you should have a sufficiently modern Xcode, or you will likely need to upgrade until you do. Windows does not have a "system compiler", so you must install either Visual -Studio 2017 or a recent version of mingw64. FreeBSD 10.0 and newer have a modern -Clang as the system compiler. +Studio 2019 (or later), or a recent version of mingw64. FreeBSD 10.0 and newer +have a modern Clang as the system compiler. However, some Linux distributions and some other or older BSDs sometimes have extremely old versions of GCC. These steps attempt to help you upgrade you Index: llvm/docs/CMake.rst =================================================================== --- llvm/docs/CMake.rst +++ llvm/docs/CMake.rst @@ -447,9 +447,7 @@ creation of certain convenience build system targets, such as the various ``install-*`` and ``check-*`` targets, since IDEs don't always deal well with a large number of targets. This is usually autodetected, but it can be - configured manually to explicitly control the generation of those targets. One - scenario where a manual override may be desirable is when using Visual Studio - 2017's CMake integration, which would not be detected as an IDE otherwise. + configured manually to explicitly control the generation of those targets. **LLVM_ENABLE_LIBCXX**:BOOL If the host compiler and linker supports the stdlib flag, -stdlib=libc++ is Index: llvm/cmake/modules/CheckCompilerVersion.cmake =================================================================== --- llvm/cmake/modules/CheckCompilerVersion.cmake +++ llvm/cmake/modules/CheckCompilerVersion.cmake @@ -12,9 +12,10 @@ set(APPLECLANG_SOFT_ERROR 6.0) # https://en.wikipedia.org/wiki/Microsoft_Visual_C#Internal_version_numbering -# _MSC_VER == 1914 MSVC++ 14.14 (Visual Studio 2017 version 15.4) -set(MSVC_MIN 19.14) -set(MSVC_SOFT_ERROR 19.14) +# _MSC_VER == 1920 MSVC++ 14.20 Visual Studio 2019 Version 16.0 +# _MSC_VER == 1929 MSVC++ 14.29 Visual Studio 2019 Version 16.10 & 16.11 +set(MSVC_MIN 19.20) +set(MSVC_SOFT_ERROR 19.29) # Map the above GCC versions to dates: https://gcc.gnu.org/develop.html#timeline set(GCC_MIN_DATE 20150422) Index: clang/docs/UsersManual.rst =================================================================== --- clang/docs/UsersManual.rst +++ clang/docs/UsersManual.rst @@ -3543,7 +3543,7 @@ :: - cmake -G"Visual Studio 15 2017" -T LLVM .. + cmake -G"Visual Studio 17 2022" -T LLVM .. When using CMake with the Ninja generator, set the ``CMAKE_C_COMPILER`` and ``CMAKE_CXX_COMPILER`` variables to clang-cl: Index: clang/docs/ClangFormatStyleOptions.rst =================================================================== --- clang/docs/ClangFormatStyleOptions.rst +++ clang/docs/ClangFormatStyleOptions.rst @@ -158,7 +158,7 @@ <https://www.webkit.org/coding/coding-style.html>`_ * ``Microsoft`` A style complying with `Microsoft's style guide - <https://docs.microsoft.com/en-us/visualstudio/ide/editorconfig-code-style-settings-reference?view=vs-2017>`_ + <https://docs.microsoft.com/en-us/visualstudio/ide/editorconfig-code-style-settings-reference>`_ * ``GNU`` A style complying with the `GNU coding standards <https://www.gnu.org/prep/standards/standards.html>`_
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
