thieta created this revision. thieta added reviewers: mehdi_amini, jyknight, jhenderson, hans, tstellar, cor3ntin, MaskRay. Herald added subscribers: ayermolo, StephenFan, mgorny. Herald added a reviewer: rafauler. Herald added a reviewer: Amir. Herald added a reviewer: maksfb. Herald added a project: All. thieta requested review of this revision. Herald added subscribers: lldb-commits, cfe-commits, yota9. Herald added projects: clang, LLDB, LLVM.
Also make the soft toolchain requirements hard. This allows us to use C++17 features in LLVM now. Remember that if we want to adopt some new feature in a bigger way it should be discussed and added to the CodingStandard document. Repository: rG LLVM Github Monorepo https://reviews.llvm.org/D130689 Files: bolt/runtime/CMakeLists.txt clang/CMakeLists.txt lld/CMakeLists.txt lldb/CMakeLists.txt llvm/CMakeLists.txt llvm/cmake/modules/CheckCompilerVersion.cmake llvm/docs/CodingStandards.rst llvm/docs/ReleaseNotes.rst
Index: llvm/docs/ReleaseNotes.rst =================================================================== --- llvm/docs/ReleaseNotes.rst +++ llvm/docs/ReleaseNotes.rst @@ -47,6 +47,18 @@ Update on required toolchains to build LLVM ------------------------------------------- +LLVM is now built with C++17 by default. This means C++17 can be used in +the code base. + +The previous "soft" toolchain requirements have now been changed to "hard". +This means that the the following versions are now required to build LLVM +and there is no way to supress this error. + +* GCC >= 7.1 +* Clang >= 5.0 +* Apple Clang >= 9.3 +* Visual Studio 2019 >= 16.7 + Changes to the LLVM IR ---------------------- Index: llvm/docs/CodingStandards.rst =================================================================== --- llvm/docs/CodingStandards.rst +++ llvm/docs/CodingStandards.rst @@ -53,7 +53,7 @@ C++ Standard Versions --------------------- -Unless otherwise documented, LLVM subprojects are written using standard C++14 +Unless otherwise documented, LLVM subprojects are written using standard C++17 code and avoid unnecessary vendor-specific extensions. Nevertheless, we restrict ourselves to features which are available in the @@ -63,7 +63,7 @@ Each toolchain provides a good reference for what it accepts: * Clang: https://clang.llvm.org/cxx_status.html -* GCC: https://gcc.gnu.org/projects/cxx-status.html#cxx14 +* GCC: https://gcc.gnu.org/projects/cxx-status.html#cxx17 * MSVC: https://msdn.microsoft.com/en-us/library/hh567368.aspx Index: llvm/cmake/modules/CheckCompilerVersion.cmake =================================================================== --- llvm/cmake/modules/CheckCompilerVersion.cmake +++ llvm/cmake/modules/CheckCompilerVersion.cmake @@ -4,21 +4,21 @@ include(CheckCXXSourceCompiles) -set(GCC_MIN 5.1) +set(GCC_MIN 7.1) set(GCC_SOFT_ERROR 7.1) -set(CLANG_MIN 3.5) +set(CLANG_MIN 5.0) set(CLANG_SOFT_ERROR 5.0) -set(APPLECLANG_MIN 6.0) +set(APPLECLANG_MIN 9.3) set(APPLECLANG_SOFT_ERROR 9.3) # https://en.wikipedia.org/wiki/Microsoft_Visual_C#Internal_version_numbering # _MSC_VER == 1920 MSVC++ 14.20 Visual Studio 2019 Version 16.0 # _MSC_VER == 1927 MSVC++ 14.27 Visual Studio 2019 Version 16.7 -set(MSVC_MIN 19.20) +set(MSVC_MIN 19.27) set(MSVC_SOFT_ERROR 19.27) # Map the above GCC versions to dates: https://gcc.gnu.org/develop.html#timeline -set(GCC_MIN_DATE 20150422) +set(LIBSTDCXX_MIN 7) set(LIBSTDCXX_SOFT_ERROR 7) @@ -79,20 +79,14 @@ # Test for libstdc++ version of at least 4.8 by checking for _ZNKSt17bad_function_call4whatEv. # Note: We should check _GLIBCXX_RELEASE when possible (i.e., for GCC 7.1 and up). check_cxx_source_compiles(" -#include <iosfwd> -#if defined(__GLIBCXX__) -#if __GLIBCXX__ < ${GCC_MIN_DATE} -#error Unsupported libstdc++ version -#endif -#endif -#if defined(__GLIBCXX__) -extern const char _ZNKSt17bad_function_call4whatEv[]; -const char *chk = _ZNKSt17bad_function_call4whatEv; -#else -const char *chk = \"\"; -#endif -int main() { ++chk; return 0; } -" + #include <iosfwd> + #if defined(__GLIBCXX__) + #if !defined(_GLIBCXX_RELEASE) || _GLIBCXX_RELEASE < ${LIBSTDCXX_MIN} + #error Unsupported libstdc++ version + #endif + #endif + int main() { return 0; } + " LLVM_LIBSTDCXX_MIN) if(NOT LLVM_LIBSTDCXX_MIN) message(FATAL_ERROR "libstdc++ version must be at least ${GCC_MIN}.") Index: llvm/CMakeLists.txt =================================================================== --- llvm/CMakeLists.txt +++ llvm/CMakeLists.txt @@ -58,7 +58,7 @@ # Must go after project(..) include(GNUInstallDirs) -set(CMAKE_CXX_STANDARD 14 CACHE STRING "C++ standard to conform to") +set(CMAKE_CXX_STANDARD 17 CACHE STRING "C++ standard to conform to") set(CMAKE_CXX_STANDARD_REQUIRED YES) if (CYGWIN) # Cygwin is a bit stricter and lack things like 'strdup', 'stricmp', etc in Index: lldb/CMakeLists.txt =================================================================== --- lldb/CMakeLists.txt +++ lldb/CMakeLists.txt @@ -20,7 +20,7 @@ if(LLDB_BUILT_STANDALONE) include(LLDBStandalone) - set(CMAKE_CXX_STANDARD 14 CACHE STRING "C++ standard to conform to") + set(CMAKE_CXX_STANDARD 17 CACHE STRING "C++ standard to conform to") set(CMAKE_CXX_STANDARD_REQUIRED YES) set(CMAKE_CXX_EXTENSIONS NO) endif() Index: lld/CMakeLists.txt =================================================================== --- lld/CMakeLists.txt +++ lld/CMakeLists.txt @@ -11,7 +11,7 @@ include(GNUInstallDirs) if(LLD_BUILT_STANDALONE) - set(CMAKE_CXX_STANDARD 14 CACHE STRING "C++ standard to conform to") + set(CMAKE_CXX_STANDARD 17 CACHE STRING "C++ standard to conform to") set(CMAKE_CXX_STANDARD_REQUIRED YES) set(CMAKE_CXX_EXTENSIONS NO) Index: clang/CMakeLists.txt =================================================================== --- clang/CMakeLists.txt +++ clang/CMakeLists.txt @@ -11,7 +11,7 @@ include(GNUInstallDirs) if(CLANG_BUILT_STANDALONE) - set(CMAKE_CXX_STANDARD 14 CACHE STRING "C++ standard to conform to") + set(CMAKE_CXX_STANDARD 17 CACHE STRING "C++ standard to conform to") set(CMAKE_CXX_STANDARD_REQUIRED YES) set(CMAKE_CXX_EXTENSIONS NO) Index: bolt/runtime/CMakeLists.txt =================================================================== --- bolt/runtime/CMakeLists.txt +++ bolt/runtime/CMakeLists.txt @@ -2,7 +2,7 @@ include(CheckIncludeFiles) set(CMAKE_CXX_EXTENSIONS OFF) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) project(libbolt_rt_project)
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
