Merge branch 'PHP-8.4'

Author: petk

cmake/CMakeLists.txt

@@ -18,7 +18,7 @@ project(
   VERSION ${PHP_VERSION}
   DESCRIPTION "Widely-used general-purpose scripting language"
   HOMEPAGE_URL "https://www.php.net"
-  LANGUAGES C
+  LANGUAGES C ASM
 )
 
 set(CMAKE_C_STANDARD 11)

cmake/Zend/CMakeLists.txt

@@ -44,15 +44,9 @@ project(
   Zend
   VERSION ${Zend_VERSION}
   DESCRIPTION "Zend Engine library"
-  LANGUAGES C
+  LANGUAGES C ASM
 )
 
-include(CheckLanguage)
-check_language(ASM)
-if(CMAKE_ASM_COMPILER)
-  enable_language(ASM)
-endif()
-
 string(APPEND Zend_VERSION "${Zend_VERSION_LABEL}")
 message(STATUS "Zend Engine version: ${Zend_VERSION}")
 

cmake/cmake/Bootstrap.cmake

@@ -4,15 +4,12 @@ Configure project after the project() call.
 
 include_guard(GLOBAL)
 
-# Optionally enable CXX for extensions and ASM for Zend Engine. ASM is enabled
-# last so CMake checks whether enabled compilers can also work for assembly.
+# Optionally enable CXX for extensions.
 include(CheckLanguage)
-foreach(language CXX ASM)
-  check_language(${language})
-  if(CMAKE_${language}_COMPILER)
-    enable_language(${language})
-  endif()
-endforeach()
+check_language(CXX)
+if(CMAKE_CXX_COMPILER)
+  enable_language(CXX)
+endif()
 
 # Output linker information.
 if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.29)

cmake/cmake/modules/Zend/Fibers.cmake

@@ -179,8 +179,6 @@ if(ZEND_FIBER_ASM AND zend_fibers_asm_file)
     INTERFACE
       $<IF:$<BOOL:${SHADOW_STACK_SYSCALL}>,SHADOW_STACK_SYSCALL=1,SHADOW_STACK_SYSCALL=0>
   )
-
-  enable_language(ASM)
 else()
   cmake_push_check_state(RESET)
     # To use ucontext.h on macOS, the _XOPEN_SOURCE needs to be defined to any

docs/cmake/variables/ZEND_FIBER_ASM.md

@@ -6,7 +6,7 @@ Values: `ON|OFF`
 
 Enable the use of Boost fiber assembly files using the
 [Zend/Fibers](/docs/cmake/modules/Zend/Fibers.md) module. If disabled or system
-isn't supported, fiber support will be run through ucontext.
+isn't supported, fiber support will be run through the legacy ucontext.
 
 > [!NOTE]
 > When target system is Windows, this option is always set to `ON` and option is