Merge branch 'PHP-8.4'

Author: petk

cmake/Zend/CMakeLists.txt

@@ -456,47 +456,6 @@ 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)
-  check_source_compiles(C [[
-    #include <cpuid.h>
-    int main(void)
-    {
-      unsigned eax, ebx, ecx, edx;
-      __cpuid_count(0, 0, eax, ebx, ecx, edx);
-      return 0;
-    }
-  ]] HAVE_CPUID_COUNT)
-cmake_pop_check_state()
-if(HAVE_CPUID_COUNT)
-  message(CHECK_PASS "yes")
-else()
-  message(CHECK_FAIL "no")
-endif()
-
 # Check for Solaris/illumos process mapping.
 php_search_libraries(
   Pgrab
@@ -505,6 +464,8 @@ php_search_libraries(
   TARGET zend PRIVATE
 )
 
+include(cmake/CheckAsmGoto.cmake)
+include(cmake/CheckCpuidCount.cmake)
 include(cmake/CheckFloatPrecision.cmake)
 
 if(ZEND_GLOBAL_REGISTER_VARIABLES)
@@ -542,9 +503,6 @@ add_feature_info(
 ################################################################################
 
 include(cmake/MaxExecutionTimers.cmake)
-if(TARGET Zend::MaxExecutionTimers)
-  target_link_libraries(zend PUBLIC Zend::MaxExecutionTimers)
-endif()
 
 ################################################################################
 # Generate parser and lexer files.

cmake/Zend/cmake/CheckAsmGoto.cmake

@@ -0,0 +1,52 @@
+#[=============================================================================[
+Check whether the C compiler has support for the asm goto.
+
+Result variables:
+
+* HAVE_ASM_GOTO
+#]=============================================================================]
+
+include_guard(GLOBAL)
+
+include(CheckSourceCompiles)
+include(CMakePushCheckState)
+
+set(HAVE_ASM_GOTO FALSE)
+
+# Skip in consecutive configuration phases.
+if(DEFINED PHP_ZEND_HAS_ASM_GOTO)
+  if(PHP_ZEND_HAS_ASM_GOTO)
+    set(HAVE_ASM_GOTO TRUE)
+  endif()
+  return()
+endif()
+
+# TODO: The check in this module otherwise passes on Windows. Should this be
+# enabled on Windows?
+if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
+  return()
+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;
+    }
+  ]] PHP_ZEND_HAS_ASM_GOTO)
+cmake_pop_check_state()
+
+if(PHP_ZEND_HAS_ASM_GOTO)
+  set(HAVE_ASM_GOTO TRUE)
+  message(CHECK_PASS "yes")
+else()
+  message(CHECK_FAIL "no")
+endif()

cmake/Zend/cmake/CheckCpuidCount.cmake

@@ -0,0 +1,47 @@
+#[=============================================================================[
+Check for the __cpuid_count support.
+
+Result variables:
+
+* HAVE_CPUID_COUNT
+#]=============================================================================]
+
+include_guard(GLOBAL)
+
+include(CheckSourceCompiles)
+include(CMakePushCheckState)
+
+set(HAVE_CPUID_COUNT FALSE)
+
+# Skip in consecutive configuration phases.
+if(DEFINED PHP_ZEND_HAS_CPUID_COUNT)
+  if(PHP_ZEND_HAS_CPUID_COUNT)
+    set(HAVE_CPUID_COUNT TRUE)
+  endif()
+  return()
+endif()
+
+if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
+  return()
+endif()
+
+message(CHECK_START "Checking whether __cpuid_count is available")
+cmake_push_check_state(RESET)
+  set(CMAKE_REQUIRED_QUIET TRUE)
+  check_source_compiles(C [[
+    #include <cpuid.h>
+    int main(void)
+    {
+      unsigned eax, ebx, ecx, edx;
+      __cpuid_count(0, 0, eax, ebx, ecx, edx);
+      return 0;
+    }
+  ]] PHP_ZEND_HAS_CPUID_COUNT)
+cmake_pop_check_state()
+
+if(PHP_ZEND_HAS_CPUID_COUNT)
+  set(HAVE_CPUID_COUNT TRUE)
+  message(CHECK_PASS "yes")
+else()
+  message(CHECK_FAIL "no")
+endif()