Sync with upstream build system changes

Author: petk

cmake/cmake/ConfigureChecks.cmake

@@ -171,15 +171,6 @@ if(SIZEOF_INT STREQUAL "")
   set(SIZEOF_INT_CODE "#define SIZEOF_INT 0")
 endif()
 
-# The intmax_t is always available by C99 standard and its size varies between
-# 32-bit and 64-bit target platforms. PHP on Windows sets SIZEOF_INTMAX_T to 0,
-# otherwise the type and its size are available on Windows.
-if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
-  set(SIZEOF_INTMAX_T_CODE "#define SIZEOF_INTMAX_T 0")
-else()
-  check_type_size("intmax_t" SIZEOF_INTMAX_T)
-endif()
-
 check_type_size("long" SIZEOF_LONG)
 if(SIZEOF_LONG STREQUAL "")
   set(SIZEOF_LONG_CODE "#define SIZEOF_LONG 0")
@@ -310,6 +301,9 @@ cmake_push_check_state(RESET)
   check_symbol_exists(memfd_create sys/mman.h HAVE_MEMFD_CREATE)
 cmake_pop_check_state()
 
+# The memset_explicit() is available as of C23 standard.
+check_symbol_exists(memset_explicit string.h HAVE_MEMSET_EXPLICIT)
+
 check_symbol_exists(mkstemp stdlib.h HAVE_MKSTEMP)
 check_symbol_exists(mmap sys/mman.h HAVE_MMAP)
 check_symbol_exists(nice unistd.h HAVE_NICE)

cmake/main/cmake/php_config.h.in

@@ -255,6 +255,9 @@
 /* Define to 1 if you have the 'memrchr' function. */
 #cmakedefine HAVE_MEMRCHR 1
 
+/* Define to 1 if you have the 'memset_explicit' function. */
+#cmakedefine HAVE_MEMSET_EXPLICIT 1
+
 /* Define to 1 if you have the 'mkstemp' function. */
 #cmakedefine HAVE_MKSTEMP 1
 
@@ -614,9 +617,6 @@
 /* The size of 'int', as computed by sizeof. */
 @SIZEOF_INT_CODE@
 
-/* The size of 'intmax_t', as computed by sizeof. */
-@SIZEOF_INTMAX_T_CODE@
-
 /* The size of 'long', as computed by sizeof. */
 @SIZEOF_LONG_CODE@
 

docs/evolution.md

@@ -944,6 +944,7 @@ PHP coding standards now use the C11 standard.
 * Bundled file library in ext/fileinfo upgraded to 5.46.
 * Bundled pcre2lib in ext/pcre upgraded from 10.44 to 10.45.
 * Added new extensions lexbor and uri as always enabled.
+* The `SIZEOF_INTMAX_T` preprocessor macro has been removed.
 * The `SIZEOF_PTRDIFF_T` preprocessor macro has been removed.
 
 #### Autotools
@@ -964,6 +965,7 @@ PHP coding standards now use the C11 standard.
 * The `PHP_ODBC_CFLAGS`, `PHP_ODBC_LFLAGS`, `PHP_ODBC_LIBS`, and `PHP_ODBC_TYPE`
   preprocessor macros defined by ext/odbc are now defined in `php_config.h`
   instead of the `build-defs.h` header.
+* The `HAVE_INTMAX_T` preprocessor macro has been removed.
 * The `HAVE_PTRDIFF_T` preprocessor macro has been removed.
 
 #### Windows