Merge branch 'PHP-8.4'

Author: petk

cmake/Zend/CMakeLists.txt

@@ -78,9 +78,6 @@ cmake_dependent_option(
 )
 mark_as_advanced(ZEND_FIBER_ASM)
 
-option(ZEND_GLOBAL_REGISTER_VARIABLES "Enable global register variables" ON)
-mark_as_advanced(ZEND_GLOBAL_REGISTER_VARIABLES)
-
 cmake_dependent_option(
   ZEND_SIGNALS
   "Enable Zend signal handling"
@@ -468,14 +465,10 @@ php_search_libraries(
 include(cmake/CheckAsmGoto.cmake)
 include(cmake/CheckCpuidCount.cmake)
 include(cmake/CheckFloatPrecision.cmake)
-
-if(ZEND_GLOBAL_REGISTER_VARIABLES)
-  include(cmake/CheckGlobalRegisterVariables.cmake)
-endif()
-
 include(cmake/CheckMMAlignment.cmake)
 include(cmake/CheckStackDirection.cmake)
 include(cmake/CheckStrerrorR.cmake)
+include(cmake/GlobalRegisterVariables.cmake)
 
 ################################################################################
 # Zend signals.

cmake/Zend/cmake/CheckAsmGoto.cmake

@@ -1,52 +1,45 @@
 #[=============================================================================[
-Check whether the C compiler has support for the asm goto.
+Check whether the C compiler supports the inline assembly __asm__ goto.
 
 Result variables:
 
 * HAVE_ASM_GOTO
 #]=============================================================================]
 
-include_guard(GLOBAL)
-
 include(CheckSourceCompiles)
 include(CMakePushCheckState)
 
-set(HAVE_ASM_GOTO FALSE)
+# The check below otherwise passes on Windows but it is disabled in PHP.
+if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
+  set(HAVE_ASM_GOTO FALSE)
+  return()
+endif()
 
 # Skip in consecutive configuration phases.
-if(DEFINED PHP_ZEND_HAS_ASM_GOTO)
+if(NOT DEFINED PHP_ZEND_HAS_ASM_GOTO)
+  message(CHECK_START "Checking for the inline assembly __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()
-  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()
+set(HAVE_ASM_GOTO ${PHP_ZEND_HAS_ASM_GOTO})

cmake/Zend/cmake/CheckCpuidCount.cmake

@@ -6,42 +6,36 @@ Result variables:
 * HAVE_CPUID_COUNT
 #]=============================================================================]
 
-include_guard(GLOBAL)
-
 include(CheckSourceCompiles)
 include(CMakePushCheckState)
 
-set(HAVE_CPUID_COUNT FALSE)
+if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
+  set(HAVE_CPUID_COUNT FALSE)
+  return()
+endif()
 
 # Skip in consecutive configuration phases.
-if(DEFINED PHP_ZEND_HAS_CPUID_COUNT)
+if(NOT DEFINED PHP_ZEND_HAS_CPUID_COUNT)
+  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()
-  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()
+set(HAVE_CPUID_COUNT ${PHP_ZEND_HAS_CPUID_COUNT})