Bug#35667284 Update compiler version requirements to gcc 10 and clang 10

Reject older compilers known to break the build.
Also prepare for the switch from C++17 to C++20.

Change-Id: Idfccfc38c6065d09523b020e27c8061db517a849

Author: Tor Didriksen

CMakeLists.txt

@@ -655,12 +655,6 @@ IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
   SET(MY_COMPILER_IS_CLANG 1)
 ELSEIF(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
   SET(MY_COMPILER_IS_GNU 1)
-  IF(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9 AND
-      CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 8)
-    SET(MY_COMPILER_IS_GNU_8 1)
-  ENDIF()
-ELSEIF(CMAKE_CXX_COMPILER_ID MATCHES "SunPro")
-  SET(MY_COMPILER_IS_SUNPRO 1)
 ENDIF()
 
 IF(MY_COMPILER_IS_CLANG OR MY_COMPILER_IS_GNU)
@@ -797,15 +791,6 @@ OPTION(WITH_EXPERIMENTAL_CPP20
   "Build with -std=c++20, note: this is experimental" OFF)
 
 IF(WITH_EXPERIMENTAL_CPP20)
-  IF(MY_COMPILER_IS_GNU)
-    IF(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10.0)
-      MESSAGE(FATAL_ERROR "GCC 10 or newer is required for -std=c++20")
-    ENDIF()
-  ELSEIF(MY_COMPILER_IS_CLANG)
-    IF(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 11.0)
-      MESSAGE(FATAL_ERROR "Clang 11 or newer is required for -std=c++20")
-    ENDIF()
-  ENDIF()
   IF(UNIX)
     STRING(REPLACE "-std=c++17" "-std=c++20"
       CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")

cmake/fastcov.cmake

@@ -44,9 +44,8 @@ IF(NOT FASTCOV_EXECUTABLE)
   RETURN()
 ENDIF()
 
-IF(NOT CMAKE_COMPILER_IS_GNUCXX OR
-    CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9)
-  MESSAGE(WARNING "You should upgrade to gcc version >= 9")
+IF(NOT CMAKE_COMPILER_IS_GNUCXX)
+  MESSAGE(WARNING "You should upgrade to gcc version >= 10")
   RETURN()
 ENDIF()
 
@@ -88,9 +87,9 @@ IF(CMAKE_MATCH_1)
   SET(GCOV_VERSION "${CMAKE_MATCH_1}")
 ENDIF()
 
-IF(GCOV_VERSION AND GCOV_VERSION VERSION_LESS 9)
+IF(GCOV_VERSION AND GCOV_VERSION VERSION_LESS 10)
   MESSAGE(FATAL_ERROR "${GCOV_EXECUTABLE} has version ${GCOV_VERSION}\n"
-    "At least version 9 is required")
+    "At least version 10 is required")
 ENDIF()
 
 IF(WITH_ROUTER)

cmake/fprofile.cmake

@@ -22,24 +22,6 @@
 
 # Options for doing PGO (profile guided optimization) with gcc/clang.
 #
-# gcc8 and gcc9 handle naming and location of the .gcda files
-# (containing profile data) completely differently, hence the slightly
-# different HowTos below:
-#
-# HowTo for gcc8:
-# Assuming we have three build directories
-#   <some path>/build-gen
-#   <some path>/build-use
-#   <some path>/profile-data
-#
-# in build-gen
-#   cmake <path to source> -DFPROFILE_GENERATE=1
-#   make
-#   run whatever test suite is an appropriate training set
-# in build-use
-#   cmake <path to source> -DFPROFILE_USE=1
-#   make
-#
 # HowTo for gcc9 and above:
 # Assuming we have two build directories
 #   <some path>/build
@@ -82,11 +64,7 @@ IF(NOT MY_COMPILER_IS_GNU_OR_CLANG)
 ENDIF()
 
 IF(MY_COMPILER_IS_GNU)
-  IF(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.0)
-    SET(FPROFILE_DIR_DEFAULT "${CMAKE_BINARY_DIR}/../profile-data")
-  ELSE()
-    SET(FPROFILE_DIR_DEFAULT "${CMAKE_BINARY_DIR}-profile-data")
-  ENDIF()
+  SET(FPROFILE_DIR_DEFAULT "${CMAKE_BINARY_DIR}-profile-data")
 ELSE()
   SET(FPROFILE_DIR_DEFAULT "${CMAKE_BINARY_DIR}/../profile-data")
 ENDIF()
@@ -123,10 +101,8 @@ IF(FPROFILE_USE)
     # to be optimized as if they were compiled without profile feedback.
     # This leads to better performance when train run is not representative
     # but also leads to significantly bigger code.
-    IF(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 10)
-      STRING_APPEND(CMAKE_C_FLAGS " -fprofile-partial-training")
-      STRING_APPEND(CMAKE_CXX_FLAGS " -fprofile-partial-training")
-    ENDIF()
+    STRING_APPEND(CMAKE_C_FLAGS " -fprofile-partial-training")
+    STRING_APPEND(CMAKE_CXX_FLAGS " -fprofile-partial-training")
 
   ENDIF()
 ENDIF()

cmake/maintainer.cmake

@@ -60,10 +60,7 @@ IF(MY_COMPILER_IS_GNU)
   # This is included in -Wall on some platforms, enable it explicitly.
   MY_ADD_C_WARNING_FLAG("Wstringop-truncation")
   MY_ADD_CXX_WARNING_FLAG("Wstringop-truncation")
-  IF(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 9)
-    # GCC 8 has bugs with "final".
-    MY_ADD_CXX_WARNING_FLAG("Wsuggest-override")
-  ENDIF()
+  MY_ADD_CXX_WARNING_FLAG("Wsuggest-override")
   MY_ADD_C_WARNING_FLAG("Wmissing-include-dirs")
   MY_ADD_CXX_WARNING_FLAG("Wmissing-include-dirs")
 
@@ -193,10 +190,9 @@ IF(MY_COMPILER_IS_GNU_OR_CLANG)
 ENDIF()
 
 MACRO(ADD_WSHADOW_WARNING)
-  IF(MY_COMPILER_IS_GNU AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 7)
+  IF(MY_COMPILER_IS_GNU)
     ADD_COMPILE_OPTIONS("-Wshadow=local")
-  ELSEIF(MY_COMPILER_IS_CLANG AND
-      CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 5)
+  ELSEIF(MY_COMPILER_IS_CLANG)
     # added in clang-5.0
     ADD_COMPILE_OPTIONS("-Wshadow-uncaptured-local")
   ENDIF()

cmake/os/FreeBSD.cmake

@@ -33,23 +33,17 @@ LIST(APPEND CMAKE_REQUIRED_INCLUDES "/usr/local/include")
 # in order to search include/boost_1_70_0/patches
 # INCLUDE_DIRECTORIES(SYSTEM /usr/local/include)
 
-# We require at least Clang 6.0 (FreeBSD 12).
+# We require at least GCC 10 Clang 10
 IF(NOT FORCE_UNSUPPORTED_COMPILER)
-  IF(MY_COMPILER_IS_CLANG)
-    CHECK_C_SOURCE_RUNS("
-      int main()
-      {
-        return (__clang_major__ < 6);
-      }" HAVE_SUPPORTED_CLANG_VERSION)
-    IF(NOT HAVE_SUPPORTED_CLANG_VERSION)
-      MESSAGE(FATAL_ERROR "Clang 6.0 or newer is required!")
+  IF(MY_COMPILER_IS_GNU)
+    IF(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10)
+      MESSAGE(FATAL_ERROR "GCC 10 or newer is required")
     ENDIF()
-  ELSEIF(MY_COMPILER_IS_GNU)
-    IF(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.1)
-      MESSAGE(FATAL_ERROR "GCC 7.1 or newer is required")
+  ELSEIF(MY_COMPILER_IS_CLANG)
+    IF(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10)
+      MESSAGE(FATAL_ERROR "Clang 10 or newer is required!")
     ENDIF()
   ELSE()
     MESSAGE(FATAL_ERROR "Unsupported compiler!")
   ENDIF()
 ENDIF()
-

cmake/os/Linux.cmake

@@ -64,15 +64,17 @@ IF(LINUX_FEDORA OR LINUX_RHEL OR LINUX_SUSE)
   SET(LINUX_RPM_PLATFORM 1)
 ENDIF()
 
-# We require at least GCC 7.1 Clang 5
+# We require at least GCC 10 Clang 10
 IF(NOT FORCE_UNSUPPORTED_COMPILER)
   IF(MY_COMPILER_IS_GNU)
-    IF(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.1)
-      MESSAGE(FATAL_ERROR "GCC 7.1 or newer is required")
+    # gcc9 is known to fail
+    IF(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10)
+      MESSAGE(FATAL_ERROR "GCC 10 or newer is required")
     ENDIF()
   ELSEIF(MY_COMPILER_IS_CLANG)
-    IF(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5)
-      MESSAGE(FATAL_ERROR "Clang 5 or newer is required!")
+    # This is the lowest version tested
+    IF(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10)
+      MESSAGE(FATAL_ERROR "Clang 10 or newer is required!")
     ENDIF()
   ELSE()
     MESSAGE(FATAL_ERROR "Unsupported compiler!")

cmake/os/SunOS.cmake

@@ -46,9 +46,7 @@ STRING_APPEND(CMAKE_C_LINK_FLAGS   " -m64")
 STRING_APPEND(CMAKE_CXX_LINK_FLAGS " -m64")
 
 IF(NOT FORCE_UNSUPPORTED_COMPILER)
-  IF(MY_COMPILER_IS_SUNPRO)
-    MESSAGE(FATAL_ERROR "Oracle Studio is not supported.")
-  ELSEIF(MY_COMPILER_IS_CLANG)
+  IF(MY_COMPILER_IS_CLANG)
     MESSAGE(WARNING "Clang is experimental!!")
   ELSEIF(MY_COMPILER_IS_GNU)
     # 9.2.0 generated code which dumped core in optimized mode.

plugin/group_replication/libmysqlgcs/CMakeLists.txt

@@ -227,11 +227,7 @@ IF(MYSQL_MAINTAINER_MODE)
   IF(MY_COMPILER_IS_CLANG)
     ADD_COMPILE_OPTIONS("-Wshadow")
   ELSEIF(MY_COMPILER_IS_GNU)
-    # GCC's -Wshadow is too noisy. Starting with GCC 7 we can use the
-    # more surgical -Wshadow=compatible-local
-    IF(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0)
-      ADD_COMPILE_OPTIONS("-Wshadow=compatible-local")
-    ENDIF()
+    ADD_COMPILE_OPTIONS("-Wshadow=compatible-local")
   ENDIF()
 ENDIF()
 

sql/CMakeLists.txt

@@ -27,7 +27,7 @@ ADD_WSHADOW_WARNING()
 # Lots of warnings about -Walloc-size-larger-than= from my_malloc.cc
 # but it is basically impossible to trace the actual origin.
 IF(FPROFILE_GENERATE OR FPROFILE_USE)
-  IF(MY_COMPILER_IS_GNU AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 10)
+  IF(MY_COMPILER_IS_GNU)
     # -Walloc-size-larger-than=PTRDIFF_MAX is enabled by default.
     STRING_APPEND(CMAKE_EXE_LINKER_FLAGS " -Wno-alloc-size-larger-than")
   ENDIF()

storage/ndb/nodejs/CMakeLists.txt

@@ -144,7 +144,7 @@ FOREACH(warning
   ENDIF()
 ENDFOREACH()
 
-IF(MY_COMPILER_IS_GNU AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 10)
+IF(MY_COMPILER_IS_GNU)
   # It's tricky to check alloc-size-larger-than warning in
   # MY_CHECK_CXX_COMPILER_WARNING(). Handle it differently
   # as done in sql/CMakeLists.txt

storage/ndb/src/kernel/CMakeLists.txt

@@ -26,8 +26,7 @@
 # Memory allocation in NDB kernel relies on object properties that
 # are set before calling the object constructor.
 #
-IF(CMAKE_COMPILER_IS_GNUCXX
-   AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "6.0.0")
+IF(CMAKE_COMPILER_IS_GNUCXX)
   STRING_APPEND(CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE_UPPER} " -flifetime-dse=1")
 ENDIF()
 

unittest/gunit/innodb/CMakeLists.txt

@@ -28,7 +28,7 @@ INCLUDE_DIRECTORIES(
 INCLUDE(${CMAKE_SOURCE_DIR}/storage/innobase/innodb.cmake)
 
 IF(WITH_LTO OR CMAKE_COMPILER_FLAG_WITH_LTO)
-  IF(MY_COMPILER_IS_GNU AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 10)
+  IF(MY_COMPILER_IS_GNU)
     # -Walloc-size-larger-than=PTRDIFF_MAX is enabled by default.
     STRING_APPEND(CMAKE_EXE_LINKER_FLAGS " -Wno-alloc-size-larger-than")
   ENDIF()

utilities/CMakeLists.txt

@@ -165,13 +165,6 @@ IF(MY_COMPILER_IS_GNU_OR_CLANG)
     COMPILE_FLAGS "-Wno-unused-parameter -Wno-cast-qual")
 ENDIF()
 
-# This compiler says -Werror=stringop-overflow= for:
-# memcmp(&space_id, buf.begin() + FIL_PAGE_ARCH_LOG_NO_OR_SPACE_ID, 4)
-IF(MY_COMPILER_IS_GNU_8)
-  ADD_COMPILE_FLAGS(innochecksum.cc COMPILE_FLAGS "-Wno-stringop-overflow")
-  MY_TARGET_LINK_OPTIONS(innochecksum "-Wno-stringop-overflow")
-ENDIF()
-
 MYSQL_ADD_EXECUTABLE(ibd2sdi
   ibd2sdi.cc
   COMPONENT Server