Merge branch 'PHP-8.4' into PHP-8.5

Author: petk

cmake/Zend/cmake/CheckMMAlignment.cmake

@@ -20,13 +20,16 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
 endif()
 
 if(
-  (NOT DEFINED ZEND_MM_EXITCODE OR NOT DEFINED ZEND_MM_EXITCODE__TRYRUN_OUTPUT)
+  (
+    NOT DEFINED PHP_ZEND_MM_EXITCODE
+    OR NOT DEFINED PHP_ZEND_MM_EXITCODE__TRYRUN_OUTPUT
+  )
   AND CMAKE_CROSSCOMPILING
   AND NOT CMAKE_CROSSCOMPILING_EMULATOR
 )
   # Set some sensible defaults when cross-compiling.
-  set(ZEND_MM_EXITCODE 0)
-  set(ZEND_MM_EXITCODE__TRYRUN_OUTPUT "(size_t)8 (size_t)3 0")
+  set(PHP_ZEND_MM_EXITCODE 0)
+  set(PHP_ZEND_MM_EXITCODE__TRYRUN_OUTPUT "(size_t)8 (size_t)3 0")
 endif()
 
 block(
@@ -36,8 +39,8 @@ block(
     ZEND_MM_NEED_EIGHT_BYTE_REALIGNMENT
 )
   try_run(
-    ZEND_MM_EXITCODE
-    ZEND_MM_COMPILED
+    PHP_ZEND_MM_EXITCODE
+    PHP_ZEND_MM_COMPILED
     SOURCE_FROM_CONTENT src.c [[
       #include <stdio.h>
       #include <stdlib.h>
@@ -74,18 +77,22 @@ block(
         return 0;
       }
     ]]
-    RUN_OUTPUT_VARIABLE ZEND_MM_OUTPUT
+    RUN_OUTPUT_VARIABLE PHP_ZEND_MM_OUTPUT
   )
 
-  if(ZEND_MM_COMPILED AND ZEND_MM_EXITCODE EQUAL 0 AND ZEND_MM_OUTPUT)
+  if(
+    PHP_ZEND_MM_COMPILED
+    AND PHP_ZEND_MM_EXITCODE EQUAL 0
+    AND PHP_ZEND_MM_OUTPUT
+  )
     message(CHECK_PASS "done")
 
-    string(STRIP "${ZEND_MM_OUTPUT}" ZEND_MM_OUTPUT)
-    string(REPLACE " " ";" ZEND_MM_OUTPUT "${ZEND_MM_OUTPUT}")
+    string(STRIP "${PHP_ZEND_MM_OUTPUT}" PHP_ZEND_MM_OUTPUT)
+    string(REPLACE " " ";" PHP_ZEND_MM_OUTPUT "${PHP_ZEND_MM_OUTPUT}")
 
-    list(GET ZEND_MM_OUTPUT 0 ZEND_MM_ALIGNMENT)
-    list(GET ZEND_MM_OUTPUT 1 ZEND_MM_ALIGNMENT_LOG2)
-    list(GET ZEND_MM_OUTPUT 2 ZEND_MM_NEED_EIGHT_BYTE_REALIGNMENT)
+    list(GET PHP_ZEND_MM_OUTPUT 0 ZEND_MM_ALIGNMENT)
+    list(GET PHP_ZEND_MM_OUTPUT 1 ZEND_MM_ALIGNMENT_LOG2)
+    list(GET PHP_ZEND_MM_OUTPUT 2 ZEND_MM_NEED_EIGHT_BYTE_REALIGNMENT)
   else()
     message(CHECK_FAIL "failed")
     message(

cmake/cmake/ConfigureChecks.cmake

@@ -918,12 +918,16 @@ if(
     AND CMAKE_SYSTEM_VERSION VERSION_GREATER_EQUAL 12
   )
 )
-  php_check_function_attribute(ifunc HAVE_FUNC_ATTRIBUTE_IFUNC)
-  php_check_function_attribute(target HAVE_FUNC_ATTRIBUTE_TARGET)
+  php_check_function_attribute(ifunc PHP_HAVE_FUNC_ATTRIBUTE_IFUNC)
+  set(HAVE_FUNC_ATTRIBUTE_IFUNC ${PHP_HAVE_FUNC_ATTRIBUTE_IFUNC})
+
+  php_check_function_attribute(target PHP_HAVE_FUNC_ATTRIBUTE_TARGET)
+  set(HAVE_FUNC_ATTRIBUTE_TARGET ${PHP_HAVE_FUNC_ATTRIBUTE_TARGET})
 endif()
 
 # Check for variable __attribute__((aligned)) support in the compiler.
-php_check_variable_attribute(aligned HAVE_ATTRIBUTE_ALIGNED)
+php_check_variable_attribute(aligned PHP_HAVE_ATTRIBUTE_ALIGNED)
+set(HAVE_ATTRIBUTE_ALIGNED ${PHP_HAVE_ATTRIBUTE_ALIGNED})
 
 ################################################################################
 # Check for additional tools.

cmake/cmake/toolchains/template.cmake

@@ -47,8 +47,8 @@ set(PHP_ZEND_SHADOW_STACK_SYSCALL_EXITCODE 1)
 
 # Set the exit code and the output of the ZEND_MM check.
 # See CheckMMAlignment.cmake.
-set(ZEND_MM_EXITCODE 0)
-set(ZEND_MM_EXITCODE__TRYRUN_OUTPUT "(size_t)8 (size_t)3 0")
+set(PHP_ZEND_MM_EXITCODE 0)
+set(PHP_ZEND_MM_EXITCODE__TRYRUN_OUTPUT "(size_t)8 (size_t)3 0")
 
 ################################################################################
 # sapi/fpm