Bug#18404381: REMOVE UNNEEDE CMAKE CHECKS AND #IFDEFS IN 5.7.5

Patch mysql#3: This patch does the following:
- Remove the HAVE_WVLA check since all used versions of GCC/Clang now supports -Wvla
- Remove HAVE_GETCURRENTPROCESSORNUMBER as it is true on all supported Windows versions
- Remove workaround for old Intellisense bug
- Unconditionally define S_IROTH/S_IFIFO on Windows rather than doing a check with hardcoded result
- Use SIGTERM/SIGINT explicitly on Windows rather than define SIGQUIT/SIGPIPE to them
- Use isnan() directly on Windows, remove unneeded check 
- Typedef ssize_t on Windows rather than doing check with hardcoded result 
- Remove HAVE_SCHED_H and HAVE_PTHREAD_YIELD_ZERO_ARG checks, results not needed anymore
- Remove HAVE_MMAP, always true
- Remove HAVE_SCHED_YIELD, always true on non-Windows 
- No point in testing size of char, defined to 1 in standard 
- Remove inline check, explicitly define for Visual Studio in C mode instead
- Combine separate C/C++ checks for builtin_unreachable as we now always use the same compiler for C/C++
- Remove HAVE_ACCESS, was never defined. Update code to work like intended.
- Set SOCKET_SIZE_TYPE, size_socket and sigset_t and mode_t using typedef rather than CMake #define 
- Remove unused FN_NO_CASE_SENCE, ulong_to_double() and table_case_convert().
- Remove use of non-standard pthread_yield(), use POSIX standard sched_yield() instead
- Remove unneeded thread pool config.h.cmake, add missing WindowsCache.cmake entry
- Rewrite InnoDB CMake futex check to avoid having to do unset/remove_definitions

Author: jhauglid

cmake/maintainer.cmake

@@ -14,11 +14,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
 # Common warning flags for GCC, G++, Clang and Clang++
-SET(MY_WARNING_FLAGS "-Wall -Wextra -Wformat-security")
-MY_CHECK_C_COMPILER_FLAG("-Wvla" HAVE_WVLA) # Requires GCC 4.3+ or Clang
-IF(HAVE_WVLA)
-  SET(MY_WARNING_FLAGS "${MY_WARNING_FLAGS} -Wvla")
-ENDIF()
+SET(MY_WARNING_FLAGS "-Wall -Wextra -Wformat-security -Wvla")
 
 # Common warning flags for GCC and Clang
 SET(MY_C_WARNING_FLAGS

cmake/os/Windows.cmake

@@ -59,9 +59,6 @@ ADD_DEFINITIONS("-DWIN32_LEAN_AND_MEAN -DNOGDI")
 # We want to use std::min/std::max, not the windows.h macros
 ADD_DEFINITIONS("-DNOMINMAX")
 
-# Should be available on Windows Server 2003 and above.
-ADD_DEFINITIONS(-DHAVE_GETCURRENTPROCESSORNUMBER=1)
-
 IF(MSVC)
   # Enable debug info also in Release build,
   # and create PDB to be able to analyze crashes.
@@ -116,14 +113,6 @@ IF(MSVC)
   #TODO: update the code and remove the disabled warnings
   SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4800 /wd4805 /wd4996")
   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4800 /wd4805 /wd4996 /we4099")
-
-  IF(CMAKE_SIZEOF_VOID_P MATCHES 8)
-    # _WIN64 is defined by the compiler itself. 
-    # Yet, we define it here again   to work around a bug with  Intellisense 
-    # described here: http://tinyurl.com/2cb428. 
-    # Syntax highlighting is important for proper debugger functionality.
-    ADD_DEFINITIONS("-D_WIN64")
-  ENDIF()
 ENDIF()
 
 # Always link with socket library
@@ -142,41 +131,4 @@ IF(NOT HAVE_IPV6_V6ONLY)
   SET(IPV6_V6ONLY 27)
 ENDIF()
 
-# Some standard functions exist there under different
-# names (e.g popen is _popen or strok_r is _strtok_s)
-# If a replacement function exists, HAVE_FUNCTION is
-# defined to 1. CMake variable <function_name> will also
-# be defined to the replacement name.
-# So for example, CHECK_FUNCTION_REPLACEMENT(popen _popen)
-# will define HAVE_POPEN to 1 and set variable named popen
-# to _popen. If the header template, one needs to have
-# cmakedefine popen @popen@ which will expand to 
-# define popen _popen after CONFIGURE_FILE
-
-MACRO(CHECK_SYMBOL_REPLACEMENT symbol replacement header)
-  STRING(TOUPPER ${symbol} symbol_upper)
-  CHECK_SYMBOL_EXISTS(${symbol} ${header} HAVE_${symbol_upper})
-  IF(NOT HAVE_${symbol_upper})
-    CHECK_SYMBOL_EXISTS(${replacement} ${header} HAVE_${replacement})
-    IF(HAVE_${replacement})
-      SET(HAVE_${symbol_upper} 1)
-      SET(${symbol} ${replacement})
-    ENDIF()
-  ENDIF()
-ENDMACRO()
-
-CHECK_SYMBOL_REPLACEMENT(S_IROTH _S_IREAD sys/stat.h)
-CHECK_SYMBOL_REPLACEMENT(S_IFIFO _S_IFIFO sys/stat.h)
-CHECK_SYMBOL_REPLACEMENT(SIGQUIT SIGTERM signal.h)
-CHECK_SYMBOL_REPLACEMENT(SIGPIPE SIGINT signal.h)
-CHECK_SYMBOL_EXISTS(isnan math.h HAVE_ISNAN)
-IF(NOT HAVE_ISNAN)
-  CHECK_SYMBOL_REPLACEMENT(isnan _isnan float.h)
-ENDIF()
-
-CHECK_TYPE_SIZE(ssize_t SIZE_OF_SSIZE_T)
-IF(NOT HAVE_SIZE_OF_SSIZE_T)
- SET(ssize_t SSIZE_T)
-ENDIF()
-
 SET(FN_NO_CASE_SENSE 1)

cmake/os/WindowsCache.cmake

@@ -50,7 +50,6 @@ SET(HAVE_NETINET_IN_H CACHE  INTERNAL "")
 SET(HAVE_PATHS_H CACHE  INTERNAL "")
 SET(HAVE_POLL_H CACHE  INTERNAL "")
 SET(HAVE_PWD_H CACHE  INTERNAL "")
-SET(HAVE_SCHED_H CACHE  INTERNAL "")
 SET(HAVE_STRINGS_H CACHE  INTERNAL "")
 SET(HAVE_SYNCH_H CACHE  INTERNAL "")
 SET(HAVE_SYS_CDEFS_H CACHE  INTERNAL "")
@@ -123,7 +122,6 @@ SET(HAVE_MALLOC_INFO CACHE  INTERNAL "")
 SET(HAVE_MEMRCHR CACHE  INTERNAL "")
 SET(HAVE_MLOCK CACHE  INTERNAL "")
 SET(HAVE_MLOCKALL CACHE  INTERNAL "")
-SET(HAVE_MMAP CACHE  INTERNAL "")
 SET(HAVE_MMAP64 CACHE  INTERNAL "")
 SET(HAVE_POLL CACHE INTERNAL "")
 SET(HAVE_POSIX_FALLOCATE CACHE  INTERNAL "")
@@ -134,7 +132,6 @@ SET(HAVE_PTHREAD_SIGMASK CACHE  INTERNAL "")
 SET(HAVE_READDIR_R CACHE  INTERNAL "")
 SET(HAVE_READLINK CACHE  INTERNAL "")
 SET(HAVE_REALPATH CACHE  INTERNAL "")
-SET(HAVE_SCHED_YIELD CACHE  INTERNAL "")
 SET(HAVE_SETFD CACHE  INTERNAL "")
 SET(HAVE_SIGACTION CACHE  INTERNAL "")
 SET(HAVE_SLEEP CACHE  INTERNAL "")
@@ -192,15 +189,11 @@ SET(HAVE_WORDS_BIGENDIAN TRUE CACHE  INTERNAL "")  # Only needed by CMake
 SET(WORDS_BIGENDIAN CACHE  INTERNAL "")
 
 # Type sizes
-SET(HAVE_SIZEOF_SIGSET_T FALSE CACHE  INTERNAL "")
-SET(HAVE_SIZEOF_MODE_T FALSE CACHE  INTERNAL "")
-# Check needed VOIDP
+# Check needed SIZEOF_VOIDP
 SET(HAVE_SIZEOF_CHARP TRUE CACHE  INTERNAL "")
 SET(SIZEOF_CHARP ${CMAKE_SIZEOF_VOID_P} CACHE  INTERNAL "")
 SET(HAVE_SIZEOF_LONG TRUE CACHE  INTERNAL "")
 SET(SIZEOF_LONG 4 CACHE  INTERNAL "")
-SET(HAVE_SIZEOF_CHAR TRUE CACHE  INTERNAL "")
-SET(SIZEOF_CHAR 1 CACHE  INTERNAL "")
 SET(HAVE_SIZEOF_SHORT TRUE CACHE  INTERNAL "")
 SET(SIZEOF_SHORT 2 CACHE  INTERNAL "")
 SET(HAVE_SIZEOF_INT TRUE CACHE  INTERNAL "")
@@ -209,26 +202,22 @@ SET(HAVE_SIZEOF_LONG_LONG TRUE CACHE  INTERNAL "")
 SET(SIZEOF_LONG_LONG 8 CACHE  INTERNAL "")
 SET(HAVE_SIZEOF_OFF_T TRUE CACHE  INTERNAL "")
 SET(SIZEOF_OFF_T 4 CACHE  INTERNAL "")
+SET(HAVE_SIZEOF_TIME_T TRUE CACHE INTERNAL "")
+SET(SIZEOF_TIME_T 8 CACHE  INTERNAL "")
 SET(HAVE_SIZEOF_UINT FALSE CACHE  INTERNAL "")
 SET(HAVE_SIZEOF_ULONG FALSE CACHE  INTERNAL "")
 SET(HAVE_SIZEOF_U_INT32_T FALSE CACHE  INTERNAL "")
 
 # Code tests
-# Hardcoded in configure.cmake SOCKET_SIZE_TYPE
-SET(HAVE_PTHREAD_YIELD_ZERO_ARG CACHE  INTERNAL "")
 SET(STACK_DIRECTION -1 CACHE INTERNAL "")
 SET(TIME_WITH_SYS_TIME CACHE INTERNAL "")
 SET(HAVE_FCNTL_NONBLOCK CACHE  INTERNAL "") # Only needed by CMake
 # Derived result NO_FCNTL_NONBLOCK
-SET(C_HAS_inline CACHE INTERNAL "")
-SET(C_HAS___inline 1 CACHE INTERNAL "")
 # Not checked for Windows HAVE_PAUSE_INSTRUCTION
 # Not checked for Windows HAVE_FAKE_PAUSE_INSTRUCTION
 # Not checked for Windows HAVE_ABI_CXA_DEMANGLE
 SET(HAVE_BSS_START CACHE  INTERNAL "")
-SET(HAVE_BUILTIN_UNREACHABLE_C CACHE  INTERNAL "")   # Only needed by CMake
-SET(HAVE_BUILTIN_UNREACHABLE_CXX CACHE  INTERNAL "") # Only needed by CMake
-# Derived result HAVE_BUILTIN_UNREACHABLE
+SET(HAVE_BUILTIN_UNREACHABLE CACHE  INTERNAL "")
 SET(HAVE_BUILTIN_EXPECT CACHE  INTERNAL "")
 SET(HAVE_BUILTIN_STPCPY CACHE  INTERNAL "")
 SET(HAVE_GCC_ATOMIC_BUILTINS CACHE  INTERNAL "")
@@ -245,22 +234,10 @@ SET(HAVE_SOCKADDR_IN_SIN_LEN CACHE INTERNAL "")
 SET(HAVE_SOCKADDR_IN6_SIN6_LEN CACHE INTERNAL "")
 
 #
-# Platform specific CMake files
+# Windows.cmake
 #
-# Windows stuff, mostly functions, that have Posix analogs but named differently
 SET(HAVE_IPPROTO_IPV6 CACHE  INTERNAL "")
 SET(HAVE_IPV6_V6ONLY 1 CACHE  INTERNAL "")
-SET(HAVE_S_IROTH CACHE INTERNAL "")
-SET(HAVE__S_IREAD 1 CACHE  INTERNAL "")
-SET(HAVE_S_IFIFO CACHE INTERNAL "")
-SET(HAVE__S_IFIFO 1 CACHE  INTERNAL "")
-SET(HAVE_SIGQUIT CACHE  INTERNAL "")
-SET(HAVE_SIGTERM 1 CACHE  INTERNAL "")
-SET(HAVE_SIGPIPE CACHE  INTERNAL "")
-SET(HAVE_SIGINT 1 CACHE  INTERNAL "")
-SET(HAVE__isnan 1 CACHE  INTERNAL "")
-SET(HAVE_SIZE_OF_SSIZE_T FALSE CACHE  INTERNAL "") # Only needed by CMake
-# Derived result ssize_t
 # Hardcoded in Windows.cmake FN_NO_CASE_SENSE
 
 #
@@ -285,9 +262,6 @@ SET(HAVE_GETPWNAM_R CACHE  INTERNAL "")
 SET(HAVE_GETGRNAM_R CACHE  INTERNAL "")
 
 #
-# Maintainer.cmake.
+# Thread pool
 #
-SET(HAVE_WVLA CACHE INTERNAL "")
-
-# Seems like a bug?
-SET(HAVE_ACCESS 1 CACHE  INTERNAL "")
+SET(HAVE_EPOLL_WAIT CACHE INTERNAL "")

config.h.cmake

@@ -48,7 +48,6 @@
 #cmakedefine HAVE_PATHS_H 1
 #cmakedefine HAVE_POLL_H 1
 #cmakedefine HAVE_PWD_H 1
-#cmakedefine HAVE_SCHED_H 1
 #cmakedefine HAVE_STRINGS_H 1
 #cmakedefine HAVE_SYNCH_H 1
 #cmakedefine HAVE_SYS_CDEFS_H 1
@@ -121,7 +120,6 @@
 #cmakedefine HAVE_MEMRCHR 1
 #cmakedefine HAVE_MLOCK 1
 #cmakedefine HAVE_MLOCKALL 1
-#cmakedefine HAVE_MMAP 1
 #cmakedefine HAVE_MMAP64 1
 #cmakedefine HAVE_POLL 1
 #cmakedefine HAVE_POSIX_FALLOCATE 1
@@ -132,7 +130,6 @@
 #cmakedefine HAVE_READDIR_R 1
 #cmakedefine HAVE_READLINK 1
 #cmakedefine HAVE_REALPATH 1
-#cmakedefine HAVE_SCHED_YIELD 1
 #cmakedefine HAVE_SETFD 1
 #cmakedefine HAVE_SIGACTION 1
 #cmakedefine HAVE_SLEEP 1
@@ -185,48 +182,23 @@
 #cmakedefine WORDS_BIGENDIAN 1 
 
 /* Type sizes */
-#cmakedefine sigset_t @sigset_t@
-#cmakedefine mode_t @mode_t@
-#cmakedefine SIZEOF_SIGSET_T @SIZEOF_SIGSET_T@
-#cmakedefine SIZEOF_VOIDP  @SIZEOF_VOIDP@
-#define HAVE_CHARP 1
-#cmakedefine SIZEOF_CHARP  @SIZEOF_CHARP@
-#define HAVE_LONG 1
-#cmakedefine SIZEOF_LONG   @SIZEOF_LONG@
-#define HAVE_CHAR 1
-#cmakedefine SIZEOF_CHAR @SIZEOF_CHAR@
-#define HAVE_SHORT 1
-#cmakedefine SIZEOF_SHORT @SIZEOF_SHORT@
-#define HAVE_INT 1
-#cmakedefine SIZEOF_INT @SIZEOF_INT@
-#cmakedefine HAVE_LONG_LONG 1
+#cmakedefine SIZEOF_VOIDP     @SIZEOF_VOIDP@
+#cmakedefine SIZEOF_CHARP     @SIZEOF_CHARP@
+#cmakedefine SIZEOF_LONG      @SIZEOF_LONG@
+#cmakedefine SIZEOF_SHORT     @SIZEOF_SHORT@
+#cmakedefine SIZEOF_INT       @SIZEOF_INT@
 #cmakedefine SIZEOF_LONG_LONG @SIZEOF_LONG_LONG@
-#cmakedefine HAVE_OFF_T 1
-#cmakedefine SIZEOF_OFF_T @SIZEOF_OFF_T@
+#cmakedefine SIZEOF_OFF_T     @SIZEOF_OFF_T@
+#cmakedefine SIZEOF_TIME_T    @SIZEOF_TIME_T@
 #cmakedefine HAVE_UINT 1
-#cmakedefine SIZEOF_UINT @SIZEOF_UINT@
 #cmakedefine HAVE_ULONG 1
-#cmakedefine SIZEOF_ULONG @SIZEOF_ULONG@
 #cmakedefine HAVE_U_INT32_T 1
-#cmakedefine SIZEOF_U_INT32_T @SIZEOF_U_INT32_T@
-#cmakedefine SIZEOF_TIME_T @SIZEOF_TIME_T@
 #cmakedefine HAVE_FP_EXCEPT 1
 
 /* Code tests*/
-#cmakedefine SOCKET_SIZE_TYPE @SOCKET_SIZE_TYPE@
-#cmakedefine HAVE_PTHREAD_YIELD_ZERO_ARG 1
 #cmakedefine STACK_DIRECTION @STACK_DIRECTION@
 #cmakedefine TIME_WITH_SYS_TIME 1
 #cmakedefine NO_FCNTL_NONBLOCK 1
-/*
-  Define to `__inline__' or `__inline' if that's what the C compiler calls it.
-*/
-#cmakedefine C_HAS_inline 1
-#if !(C_HAS_inline)
-#ifndef __cplusplus
-# define inline @C_INLINE@
-#endif
-#endif
 #cmakedefine HAVE_PAUSE_INSTRUCTION 1
 #cmakedefine HAVE_FAKE_PAUSE_INSTRUCTION 1
 #cmakedefine HAVE_ABI_CXA_DEMANGLE 1
@@ -259,12 +231,6 @@
 /* Windows stuff, mostly functions, that have Posix analogs but named differently */
 #cmakedefine IPPROTO_IPV6 @IPPROTO_IPV6@
 #cmakedefine IPV6_V6ONLY @IPV6_V6ONLY@
-#cmakedefine S_IROTH @S_IROTH@
-#cmakedefine S_IFIFO @S_IFIFO@
-#cmakedefine SIGQUIT @SIGQUIT@
-#cmakedefine SIGPIPE @SIGPIPE@
-#cmakedefine isnan @isnan@
-#cmakedefine ssize_t @ssize_t@
 /* This should mean case insensitive file system */
 #cmakedefine FN_NO_CASE_SENSE 1
 
@@ -445,5 +411,6 @@
 #define HAVE_STRTOLL 1
 #define HAVE_SYS_STAT_H 1
 #define HAVE_SYS_TYPES_H 1
+#define SIZEOF_CHAR 1
 
 #endif