Merge branch 'PHP-8.3' into PHP-8.4

petk · petk · commit 885a5be08dd8 · 2025-07-01T02:21:37.000+02:00
diff --git a/cmake/Zend/cmake/CheckFloatPrecision.cmake b/cmake/Zend/cmake/CheckFloatPrecision.cmake
@@ -1,38 +1,16 @@
 #[=============================================================================[
-# CheckFloatPrecision
-
 Check for x87 floating point internal precision control.
 
 See: https://wiki.php.net/rfc/rounding
 
-## Cache variables
-
-* `HAVE__FPU_SETCW`
-
-  Whether `_FPU_SETCW` is present and usable.
-
-* `HAVE_FPSETPREC`
-
-  Whether `fpsetprec` is present and usable.
-
-* `HAVE__CONTROLFP`
-
-  Whether `_controlfp` is present and usable.
-
-* `HAVE__CONTROLFP_S`
-
-  Whether `_controlfp_s` is present and usable.
-
-* `HAVE_FPU_INLINE_ASM_X86`
-
-  Whether FPU control word can be manipulated by inline assembler.
-
-## Usage
+Cache variables:
 
-```cmake
-# CMakeLists.txt
-include(cmake/CheckFloatPrecision.cmake)
-```
+* HAVE__FPU_SETCW - Whether _FPU_SETCW is present and usable.
+* HAVE_FPSETPREC - Whether fpsetprec is present and usable.
+* HAVE__CONTROLFP - Whether _controlfp is present and usable.
+* HAVE__CONTROLFP_S - Whether _controlfp_s is present and usable.
+* HAVE_FPU_INLINE_ASM_X86 - Whether FPU control word can be manipulated by
+  inline assembler.
 #]=============================================================================]
 
 include_guard(GLOBAL)
diff --git a/cmake/Zend/cmake/CheckGlobalRegisterVariables.cmake b/cmake/Zend/cmake/CheckGlobalRegisterVariables.cmake
@@ -1,30 +1,22 @@
 #[=============================================================================[
-# CheckGlobalRegisterVariables
-
 Check whether the compiler and target system support global register variables.
-
 Global register variables are relevant for the GNU C compatible compilers.
+See also https://gcc.gnu.org/onlinedocs/gcc/Global-Register-Variables.html
 
-See also: [GCC global register variables](https://gcc.gnu.org/onlinedocs/gcc/Global-Register-Variables.html)
-
-## Cache variables
-
-* `HAVE_GCC_GLOBAL_REGS`
+Result variables:
 
-  Whether global register variables are supported.
-
-## Usage
-
-```cmake
-# CMakeLists.txt
-include(cmake/CheckGlobalRegisterVariables.cmake)
-```
+* HAVE_GCC_GLOBAL_REGS - Whether global register variables are supported.
 #]=============================================================================]
 
 include_guard(GLOBAL)
 
+set(HAVE_GCC_GLOBAL_REGS FALSE)
+
 # Skip in consecutive configuration phases.
-if(DEFINED HAVE_GCC_GLOBAL_REGS)
+if(DEFINED PHP_ZEND_HAS_GCC_GLOBAL_REGS)
+  if(PHP_ZEND_HAS_GCC_GLOBAL_REGS)
+    set(HAVE_GCC_GLOBAL_REGS TRUE)
+  endif()
   return()
 endif()
 
@@ -83,10 +75,11 @@ cmake_push_check_state(RESET)
     {
       return 0;
     }
-  ]] HAVE_GCC_GLOBAL_REGS)
+  ]] PHP_ZEND_HAS_GCC_GLOBAL_REGS)
 cmake_pop_check_state()
 
-if(HAVE_GCC_GLOBAL_REGS)
+if(PHP_ZEND_HAS_GCC_GLOBAL_REGS)
+  set(HAVE_GCC_GLOBAL_REGS TRUE)
   message(CHECK_PASS "yes")
 else()
   message(CHECK_FAIL "no")
diff --git a/cmake/Zend/cmake/CheckMMAlignment.cmake b/cmake/Zend/cmake/CheckMMAlignment.cmake
@@ -1,21 +1,12 @@
 #[=============================================================================[
-# CheckMMAlignment
-
 Test and set the alignment defines for the Zend memory manager (`ZEND_MM`). This
 also does the logarithmic test.
 
-## Result variables
-
-* `ZEND_MM_ALIGNMENT`
-* `ZEND_MM_ALIGNMENT_LOG2`
-* `ZEND_MM_NEED_EIGHT_BYTE_REALIGNMENT`
-
-## Usage
+Result variables:
 
-```cmake
-# CMakeLists.txt
-include(cmake/CheckMMAlignment.cmake)
-```
+* ZEND_MM_ALIGNMENT
+* ZEND_MM_ALIGNMENT_LOG2
+* ZEND_MM_NEED_EIGHT_BYTE_REALIGNMENT
 #]=============================================================================]
 
 include_guard(GLOBAL)
diff --git a/cmake/Zend/cmake/CheckStackDirection.cmake b/cmake/Zend/cmake/CheckStackDirection.cmake
@@ -1,20 +1,9 @@
 #[=============================================================================[
-# CheckStackDirection
-
 Check whether the stack grows downwards. Assumes contiguous stack.
 
-## Cache variables
-
-* `ZEND_CHECK_STACK_LIMIT`
-
-  Whether checking the stack limit is supported.
-
-## Usage
+Result/cache variables:
 
-```cmake
-# CMakeLists.txt
-include(cmake/CheckStackDirection.cmake)
-```
+* ZEND_CHECK_STACK_LIMIT - Whether checking the stack limit is supported.
 #]=============================================================================]
 
 include_guard(GLOBAL)
@@ -24,6 +13,11 @@ if(DEFINED ZEND_CHECK_STACK_LIMIT)
   return()
 endif()
 
+if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
+  set(ZEND_CHECK_STACK_LIMIT TRUE)
+  return()
+endif()
+
 include(CheckSourceRuns)
 include(CMakePushCheckState)
 
diff --git a/cmake/Zend/cmake/CheckStrerrorR.cmake b/cmake/Zend/cmake/CheckStrerrorR.cmake
@@ -1,26 +1,12 @@
 #[=============================================================================[
-# CheckStrerrorR
-
-Check whether `strerror_r()` is the POSIX-compatible version or the GNU-specific
+Check whether strerror_r() is the POSIX-compatible version or the GNU-specific
 version.
 
-## Cache variables
-
-* `HAVE_STRERROR_R`
-
-  Whether `strerror_r()` is available.
-
-* `STRERROR_R_CHAR_P`
-
-  Whether `strerror_r()` returns a `char *` message, otherwise it returns an
-  `int` error number.
+Result variables:
 
-## Usage
-
-```cmake
-# CMakeLists.txt
-include(cmake/CheckStrerrorR.cmake)
-```
+* HAVE_STRERROR_R - Whether strerror_r() is available.
+* STRERROR_R_CHAR_P - Whether strerror_r() returns a 'char *' message, otherwise
+  it returns an 'int' error number.
 #]=============================================================================]
 
 include_guard(GLOBAL)
@@ -29,14 +15,35 @@ include(CheckSourceCompiles)
 include(CheckSymbolExists)
 include(CMakePushCheckState)
 
-check_symbol_exists(strerror_r string.h HAVE_STRERROR_R)
+set(HAVE_STRERROR_R FALSE)
+set(STRERROR_R_CHAR_P FALSE)
 
-if(NOT HAVE_STRERROR_R)
+if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
   return()
 endif()
 
+check_symbol_exists(strerror_r string.h PHP_ZEND_HAS_STRERROR_R)
+
+if(NOT PHP_ZEND_HAS_STRERROR_R)
+  return()
+endif()
+
+set(HAVE_STRERROR_R TRUE)
+
+# Skip in consecutive configuration phases.
+if(DEFINED PHP_ZEND_HAS_STRERROR_R_CHAR_P)
+  if(PHP_ZEND_HAS_STRERROR_R_CHAR_P)
+    set(STRERROR_R_CHAR_P TRUE)
+    return()
+  endif()
+endif()
+
+message(CHECK_START "Checking strerror_r() return type")
+
 cmake_push_check_state(RESET)
   set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
+  set(CMAKE_REQUIRED_QUIET TRUE)
+
   check_source_compiles(C [[
     #include <string.h>
 
@@ -47,5 +54,12 @@ cmake_push_check_state(RESET)
       char *p = strerror_r (0, buf, sizeof buf);
       return !p || x;
     }
-  ]] STRERROR_R_CHAR_P)
+  ]] PHP_ZEND_HAS_STRERROR_R_CHAR_P)
 cmake_pop_check_state()
+
+if(PHP_ZEND_HAS_STRERROR_R_CHAR_P)
+  set(STRERROR_R_CHAR_P TRUE)
+  message(CHECK_PASS "char *")
+else()
+  message(CHECK_PASS "int")
+endif()
diff --git a/cmake/Zend/cmake/Fibers.cmake b/cmake/Zend/cmake/Fibers.cmake
@@ -1,36 +1,24 @@
 #[=============================================================================[
-# Fibers
-
 Check if Fibers can be used.
 
 This module adds Boost fiber assembly files support if available for the
 platform, otherwise it checks if ucontext can be used.
 
-## Control variables
-
-* `ZEND_FIBER_ASM`
-
-  Whether to use Boost fiber assembly files.
+Control variables:
 
-## Cache variables
+* ZEND_FIBER_ASM - Whether to use Boost fiber assembly files.
 
-* `ZEND_FIBER_UCONTEXT`
+Cache variables:
 
-  Whether `<ucontext.h>` header file is available and should be used.
+* ZEND_FIBER_UCONTEXT - Whether <ucontext.h> header file is available and should
+  be used.
 
-## Interface library
+Interface library:
 
-* `Zend::Fibers`
+* Zend::Fibers
 
   Interface library using Boost fiber assembly files and compile options if
   available.
-
-## Usage
-
-```cmake
-# CMakeLists.txt
-include(cmake/Fibers.cmake)
-```
 #]=============================================================================]
 
 include_guard(GLOBAL)
diff --git a/cmake/Zend/cmake/MaxExecutionTimers.cmake b/cmake/Zend/cmake/MaxExecutionTimers.cmake
@@ -1,38 +1,26 @@
 #[=============================================================================[
-# MaxExecutionTimers
-
 Check whether to enable Zend max execution timers.
 
-## Cache variables
-
-* `ZEND_MAX_EXECUTION_TIMERS`
-
-* `HAVE_TIMER_CREATE`
+Cache variables:
 
-  Whether the system has `timer_create()`.
+* ZEND_MAX_EXECUTION_TIMERS
+* HAVE_TIMER_CREATE - Whether the system has timer_create().
 
-## Result variables
+Result variables:
 
-* `ZEND_MAX_EXECUTION_TIMERS`
+* ZEND_MAX_EXECUTION_TIMERS
 
   A local variable based on the cache variable and thread safety to be able to
-  run consecutive configuration phases. When `ZEND_MAX_EXECUTION_TIMERS` cache
+  run consecutive configuration phases. When ZEND_MAX_EXECUTION_TIMERS cache
   variable is set to 'auto', local variable default value is set to the
-  `PHP_THREAD_SAFETY` value.
+  value of PHP_THREAD_SAFETY variable.
 
-## INTERFACE IMPORTED library
+Interface imported target:
 
-* `Zend::MaxExecutionTimers`
+* Zend::MaxExecutionTimers
 
-  Includes possible additional library to be linked for using `timer_create()`
+  Includes possible additional library to be linked for using timer_create()
   and a compile definition.
-
-## Usage
-
-```cmake
-# CMakeLists.txt
-include(cmake/MaxExecutionTimers.cmake)
-```
 #]=============================================================================]
 
 include_guard(GLOBAL)
diff --git a/cmake/Zend/cmake/Version.cmake b/cmake/Zend/cmake/Version.cmake
@@ -3,10 +3,10 @@ Set Zend Engine version variables from the php-src/Zend/*.h header files.
 
 Variables:
 
-* `Zend_VERSION_EXTENSION_API_NO`
-* `Zend_VERSION_LABEL`
-* `Zend_VERSION_MODULE_API_NO`
-* `Zend_VERSION`
+* Zend_VERSION_EXTENSION_API_NO
+* Zend_VERSION_LABEL
+* Zend_VERSION_MODULE_API_NO
+* Zend_VERSION
 #]=============================================================================]
 
 include_guard(GLOBAL)
diff --git a/cmake/cmake/checks/CheckSegmentsAlignment.cmake b/cmake/cmake/checks/CheckSegmentsAlignment.cmake
@@ -27,7 +27,7 @@ message(
 
 if(
   NOT CMAKE_SYSTEM_NAME STREQUAL "Linux"
-  AND NOT CMAKE_SYSTEM_PROCESSOR MATCHES "^(i[3456]86.*|x86_64)$"
+  OR NOT CMAKE_SYSTEM_PROCESSOR MATCHES "^(i[3456]86.*|x86_64)$"
 )
   message(CHECK_FAIL "no")
   return()

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ message(`
`27`	`27`
`28`	`28`	`if(`
`29`	`29`	`NOT CMAKE_SYSTEM_NAME STREQUAL "Linux"`
`30`		`- AND NOT CMAKE_SYSTEM_PROCESSOR MATCHES "^(i[3456]86.*\|x86_64)$"`
	`30`	`+ OR NOT CMAKE_SYSTEM_PROCESSOR MATCHES "^(i[3456]86.*\|x86_64)$"`
`31`	`31`	`)`
`32`	`32`	`message(CHECK_FAIL "no")`
`33`	`33`	`return()`