Merge branch 'PHP-8.3' into PHP-8.4

Author: petk

cmake/Zend/cmake/CheckGlobalRegisterVariables.cmake

@@ -16,6 +16,11 @@ See also: [GCC global register variables](https://gcc.gnu.org/onlinedocs/gcc/Glo
 
 include_guard(GLOBAL)
 
+# Skip in consecutive configuration phases.
+if(DEFINED HAVE_GCC_GLOBAL_REGS)
+  return()
+endif()
+
 include(CheckSourceCompiles)
 include(CMakePushCheckState)
 

cmake/Zend/cmake/CheckStackDirection.cmake

@@ -12,6 +12,11 @@ Check whether the stack grows downwards. Assumes contiguous stack.
 
 include_guard(GLOBAL)
 
+# Skip in consecutive configuration phases.
+if(DEFINED ZEND_CHECK_STACK_LIMIT)
+  return()
+endif()
+
 include(CheckSourceRuns)
 include(CMakePushCheckState)
 

cmake/Zend/cmake/Fibers.cmake

@@ -35,30 +35,32 @@ include(CMakePushCheckState)
 add_library(zend_fibers INTERFACE)
 add_library(Zend::Fibers ALIAS zend_fibers)
 
-message(CHECK_START "Whether syscall to create shadow stack exists")
-cmake_push_check_state(RESET)
-  set(CMAKE_REQUIRED_QUIET TRUE)
-
-  check_source_runs(C [[
-    #include <unistd.h>
-    #include <sys/mman.h>
-    int main(void)
-    {
-      void* base = (void *)syscall(451, 0, 0x20000, 0x1);
-      if (base != (void*)-1) {
-        munmap(base, 0x20000);
-        return 0;
+if(NOT DEFINED SHADOW_STACK_SYSCALL)
+  message(CHECK_START "Whether syscall to create shadow stack exists")
+  cmake_push_check_state(RESET)
+    set(CMAKE_REQUIRED_QUIET TRUE)
+
+    check_source_runs(C [[
+      #include <unistd.h>
+      #include <sys/mman.h>
+      int main(void)
+      {
+        void* base = (void *)syscall(451, 0, 0x20000, 0x1);
+        if (base != (void*)-1) {
+          munmap(base, 0x20000);
+          return 0;
+        }
+        return 1;
       }
-      return 1;
-    }
-  ]] SHADOW_STACK_SYSCALL)
-cmake_pop_check_state()
-if(SHADOW_STACK_SYSCALL)
-  message(CHECK_PASS "yes")
-else()
-  # If the syscall doesn't exist, we may block the final ELF from
-  # __PROPERTY_SHSTK via redefine macro as "-D__CET__=1".
-  message(CHECK_FAIL "no")
+    ]] SHADOW_STACK_SYSCALL)
+  cmake_pop_check_state()
+  if(SHADOW_STACK_SYSCALL)
+    message(CHECK_PASS "yes")
+  else()
+    # If the syscall doesn't exist, we may block the final ELF from
+    # __PROPERTY_SHSTK via redefine macro as "-D__CET__=1".
+    message(CHECK_FAIL "no")
+  endif()
 endif()
 
 block()

cmake/Zend/cmake/MaxExecutionTimers.cmake

@@ -16,7 +16,7 @@ Check whether to enable 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 runs. 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.
 

cmake/cmake/ConfigureChecks.cmake

@@ -136,8 +136,10 @@ cmake_pop_check_state()
 check_type_size("gid_t" SIZEOF_GID_T)
 if(NOT HAVE_SIZEOF_GID_T)
   set(
-    gid_t int
-    CACHE INTERNAL "Define as 'int' if <sys/types.h> doesn't define."
+    gid_t
+    int
+    CACHE INTERNAL
+    "Define as 'int' if not defined in <sys/types.h>."
   )
 endif()
 
@@ -202,8 +204,10 @@ endif()
 check_type_size("uid_t" SIZEOF_UID_T)
 if(NOT HAVE_SIZEOF_UID_T)
   set(
-    uid_t int
-    CACHE INTERNAL "Define as 'int' if <sys/types.h> doesn't define."
+    uid_t
+    int
+    CACHE INTERNAL
+    "Define as 'int' if not defined in <sys/types.h>."
   )
 endif()
 
@@ -434,9 +438,7 @@ endif()
 include(PHP/CheckByteOrder)
 
 # Check for IPv6 support.
-if(PHP_IPV6)
-  include(PHP/CheckIPv6)
-endif()
+include(PHP/CheckIPv6)
 
 # Check how flush should be called.
 include(PHP/CheckFlushIo)

cmake/cmake/modules/FindACL.cmake

@@ -125,8 +125,10 @@ if(NOT DEFINED ACL_IS_BUILT_IN)
 
     if(_acl_works)
       set(
-        ACL_IS_BUILT_IN TRUE
-        CACHE INTERNAL "Whether ACL is a part of the C library"
+        ACL_IS_BUILT_IN
+        TRUE
+        CACHE INTERNAL
+        "Whether ACL is a part of the C library."
       )
     else()
       set(ACL_IS_BUILT_IN FALSE)

cmake/cmake/modules/PHP/Bison.cmake

@@ -288,14 +288,14 @@ function(php_bison name input output)
 
   _php_bison_config()
 
+  # Skip consecutive find_package() calls when:
+  # - project calls php_bison() multiple times and Bison will be downloaded
+  # - the outer find_package() was called prior to php_bison()
+  # - running consecutive configuration phases and Bison will be downloaded
   if(
-    # Skip consecutive find_package() calls when:
-    # - project calls php_bison() multiple times and Bison will be downloaded:
     NOT TARGET Bison::Bison
-    # - the outer find_package() was called prior to php_bison():
     AND NOT DEFINED BISON_FOUND
-    # - running consecutive configuration phases:
-    AND NOT BISON_EXECUTABLE
+    AND NOT _PHP_BISON_DOWNLOAD
   )
     find_package(BISON ${PHP_BISON_VERSION} ${quiet})
   endif()
@@ -650,5 +650,12 @@ function(_php_bison_download)
   get_property(packagesFound GLOBAL PROPERTY PACKAGES_FOUND)
   set_property(GLOBAL APPEND PROPERTY PACKAGES_FOUND BISON)
 
+  set(
+    _PHP_BISON_DOWNLOAD
+    TRUE
+    CACHE INTERNAL
+    "Internal marker whether the Bison will be downloaded."
+  )
+
   return(PROPAGATE BISON_FOUND BISON_VERSION)
 endfunction()

cmake/cmake/modules/PHP/CheckAVX512.cmake

@@ -20,6 +20,11 @@ TODO: Adjust checks for MSVC.
 
 include_guard(GLOBAL)
 
+# Skip in consecutive configuration phases.
+if(DEFINED PHP_HAVE_AVX512_SUPPORTS AND DEFINED PHP_HAVE_AVX512_VBMI_SUPPORTS)
+  return()
+endif()
+
 include(CheckSourceCompiles)
 include(CMakePushCheckState)
 

cmake/cmake/modules/PHP/CheckAttribute.cmake

@@ -103,6 +103,11 @@ function(_php_check_attribute what attribute result)
     message(FATAL_ERROR "Wrong argument passed: ${what}")
   endif()
 
+  # Skip in consecutive configuration phases.
+  if(DEFINED ${result})
+    return()
+  endif()
+
   message(CHECK_START "Checking for ${what} attribute ${attribute}")
 
   cmake_push_check_state(RESET)

cmake/cmake/modules/PHP/CheckBrokenGccStrlenOpt.cmake

@@ -15,6 +15,11 @@ See: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=86914
 
 include_guard(GLOBAL)
 
+# Skip in consecutive configuration phases.
+if(DEFINED PHP_HAVE_BROKEN_OPTIMIZE_STRLEN)
+  return()
+endif()
+
 include(CheckSourceRuns)
 include(CMakePushCheckState)