Merge branch 'PHP-8.4'

Author: petk

cmake/Zend/CMakeLists.txt

@@ -438,6 +438,28 @@ if(NOT CMAKE_SYSTEM_NAME STREQUAL "Windows")
   endif()
 endif()
 
+message(CHECK_START "Checking for asm goto support")
+cmake_push_check_state(RESET)
+  set(CMAKE_REQUIRED_QUIET TRUE)
+  check_source_compiles(C [[
+    int main(void)
+    {
+      #if defined(__x86_64__) || defined(__i386__)
+        __asm__ goto("jmp %l0\n" :::: end);
+      #elif defined(__aarch64__)
+        __asm__ goto("b %l0\n" :::: end);
+      #endif
+      end:
+        return 0;
+    }
+  ]] HAVE_ASM_GOTO)
+cmake_pop_check_state()
+if(HAVE_ASM_GOTO)
+  message(CHECK_PASS "yes")
+else()
+  message(CHECK_FAIL "no")
+endif()
+
 message(CHECK_START "Checking whether __cpuid_count is available")
 cmake_push_check_state(RESET)
   set(CMAKE_REQUIRED_QUIET TRUE)

cmake/Zend/zend_config.cmake.h.in

@@ -7,6 +7,9 @@
 /* Define to 1 if _FPU_SETCW is present and usable. */
 #cmakedefine HAVE__FPU_SETCW 1
 
+/* Define to 1 if asm goto support is available. */
+#cmakedefine HAVE_ASM_GOTO 1
+
 /* Define to 1 if '__cpuid_count' is available. */
 #cmakedefine HAVE_CPUID_COUNT 1
 

cmake/cmake/ConfigureChecks.cmake

@@ -247,29 +247,6 @@ php_check_builtin(__builtin_usub_overflow PHP_HAVE_BUILTIN_USUB_OVERFLOW)
 # Check AVX-512 extensions.
 include(PHP/CheckAVX512)
 
-# Check for asm goto.
-message(CHECK_START "Checking for asm goto support")
-cmake_push_check_state(RESET)
-  set(CMAKE_REQUIRED_QUIET TRUE)
-  check_source_compiles(C [[
-    int main(void)
-    {
-      #if defined(__x86_64__) || defined(__i386__)
-        __asm__ goto("jmp %l0\n" :::: end);
-      #elif defined(__aarch64__)
-        __asm__ goto("b %l0\n" :::: end);
-      #endif
-      end:
-        return 0;
-    }
-  ]] HAVE_ASM_GOTO)
-cmake_pop_check_state()
-if(HAVE_ASM_GOTO)
-  message(CHECK_PASS "yes")
-else()
-  message(CHECK_FAIL "no")
-endif()
-
 ################################################################################
 # Check functions.
 ################################################################################
@@ -469,35 +446,6 @@ endif()
 # Check how flush should be called.
 include(PHP/CheckFlushIo)
 
-# 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()
-
 if(HAVE_ALLOCA_H)
   # Most *.nix systems.
   check_symbol_exists(alloca "alloca.h" HAVE_ALLOCA)

cmake/ext/standard/CMakeLists.txt

@@ -279,6 +279,35 @@ 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/config.cmake.h.in

@@ -10,6 +10,9 @@
 /* Define to 1 to enable the 'chroot' function. */
 #cmakedefine ENABLE_CHROOT_FUNC 1
 
+/* Define to 1 when aarch64 CRC32 API is available. */
+#cmakedefine HAVE_AARCH64_CRC32 1
+
 /* Define to 1 if the system has the 'libargon2' library. */
 #cmakedefine HAVE_ARGON2LIB 1
 

cmake/main/php_config.cmake.h.in

@@ -48,9 +48,6 @@
    and to string "0" if they are not. */
 #define DEFAULT_SHORT_OPEN_TAG "@DEFAULT_SHORT_OPEN_TAG@"
 
-/* Define to 1 when aarch64 CRC32 API is available. */
-#cmakedefine HAVE_AARCH64_CRC32 1
-
 /* Define to 1 if the compiler supports '__alignof__'. */
 #cmakedefine HAVE_ALIGNOF 1
 
@@ -72,9 +69,6 @@
 /* Define to 1 if you have the 'asctime_r' function. */
 #cmakedefine HAVE_ASCTIME_R 1
 
-/* Define to 1 if asm goto support is available. */
-#cmakedefine HAVE_ASM_GOTO 1
-
 /* Define to 1 if you have the 'asprintf' function. */
 #cmakedefine HAVE_ASPRINTF 1