Merge branch 'PHP-8.4'

Author: petk

bin/make-docs.php

@@ -154,7 +154,6 @@ function generateDocs(
     'ext/posix/cmake',
     'ext/session/cmake',
     'ext/skeleton/cmake/modules/FindPHP.cmake',
-    'ext/standard/cmake',
     'sapi/fpm/cmake',
     'sapi/phpdbg/cmake',
     'Zend/cmake',

cmake/ext/standard/CMakeLists.txt

@@ -283,41 +283,15 @@ endif()
 # Configuration checks.
 ################################################################################
 
+# Check for ARM CRC32 API.
+include(cmake/CheckArmCrc32.cmake)
+
 # Check for fnmatch() implementation.
 include(cmake/CheckFnmatch.cmake)
 
 # Check strptime().
 include(cmake/CheckStrptime.cmake)
 
-# Check for aarch64 CRC32 API.
-message(CHECK_START "Checking for aarch64 CRC32 API availability")
-cmake_push_check_state(RESET)
-  set(CMAKE_REQUIRED_QUIET TRUE)
-  check_source_compiles(C [[
-    #include <arm_acle.h>
-    #if defined(__GNUC__)
-    # if !defined(__clang__)
-    #  pragma GCC push_options
-    #  pragma GCC target ("+nothing+crc")
-    # elif defined(__APPLE__)
-    #  pragma clang attribute push(__attribute__((target("crc"))), apply_to=function)
-    # else
-    #  pragma clang attribute push(__attribute__((target("+nothing+crc"))), apply_to=function)
-    # endif
-    #endif
-    int main(void)
-    {
-      __crc32d(0, 0);
-      return 0;
-    }
-  ]] HAVE_AARCH64_CRC32)
-cmake_pop_check_state()
-if(HAVE_AARCH64_CRC32)
-  message(CHECK_PASS "yes")
-else()
-  message(CHECK_FAIL "no")
-endif()
-
 # Check if there is a support means of creating a new process and defining which
 # handles it receives.
 message(CHECK_START "Checking if OS can spawn processes with inherited handles")

cmake/ext/standard/cmake/CheckArmCrc32.cmake

@@ -0,0 +1,75 @@
+#[=============================================================================[
+Check whether CRC32 API is supported on ARM architecture.
+
+Result variables:
+
+* HAVE_AARCH64_CRC32
+#]=============================================================================]
+
+if(DEFINED PHP_EXT_STANDARD_HAS_ARM_CRC32)
+  set(HAVE_AARCH64_CRC32 FALSE)
+
+  if(PHP_EXT_STANDARD_HAS_ARM_CRC32)
+    set(HAVE_AARCH64_CRC32 TRUE)
+  endif()
+
+  return()
+endif()
+
+include(CheckSourceCompiles)
+include(CMakePushCheckState)
+
+include_guard(GLOBAL)
+
+function(_php_ext_standard_check_arm_crc32 result)
+  message(CHECK_START "Checking for ARM CRC32 API availability")
+
+  set(${result} FALSE)
+
+  if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
+    if(CMAKE_SYSTEM_PROCESSOR STREQUAL "ARM64")
+      set(${result} TRUE)
+    endif()
+
+    set(
+      PHP_EXT_STANDARD_HAS_ARM_CRC32
+      ${${result}}
+      CACHE INTERNAL
+      "Whether ARM has CRC32."
+    )
+  endif()
+
+  cmake_push_check_state(RESET)
+    set(CMAKE_REQUIRED_QUIET TRUE)
+
+    check_source_compiles(C [[
+      #include <arm_acle.h>
+      #ifdef __GNUC__
+      # ifndef __clang__
+      #  pragma GCC push_options
+      #  pragma GCC target ("+nothing+crc")
+      # elif defined(__APPLE__)
+      #  pragma clang attribute push(__attribute__((target("crc"))), apply_to=function)
+      # else
+      #  pragma clang attribute push(__attribute__((target("+nothing+crc"))), apply_to=function)
+      # endif
+      #endif
+      int main(void)
+      {
+        __crc32d(0, 0);
+        return 0;
+      }
+    ]] PHP_EXT_STANDARD_HAS_ARM_CRC32)
+  cmake_pop_check_state()
+
+  if(PHP_EXT_STANDARD_HAS_ARM_CRC32)
+    message(CHECK_PASS "yes")
+    set(${result} TRUE)
+  else()
+    message(CHECK_FAIL "no")
+  endif()
+
+  return(PROPAGATE ${result})
+endfunction()
+
+_php_ext_standard_check_arm_crc32(HAVE_AARCH64_CRC32)