Merge branch 'PHP-8.4'

Author: petk

cmake/Zend/CMakeLists.txt

@@ -536,7 +536,7 @@ if(HAVE_SIGACTION AND ZEND_SIGNALS)
   # files, therefore also compilation definition is added.
   target_compile_definitions(zend PUBLIC ZEND_SIGNALS)
 else()
-  set_property(CACHE ZEND_SIGNALS PROPERTY VALUE OFF)
+  set(ZEND_SIGNALS OFF)
   message(CHECK_FAIL "no")
 endif()
 add_feature_info(

cmake/cmake/ConfigureChecks.cmake

@@ -15,6 +15,23 @@ include(FeatureSummary)
 include(PHP/CheckAttribute)
 include(PHP/SearchLibraries)
 
+################################################################################
+# General checks.
+################################################################################
+
+message(CHECK_START "Checking target system endianness (byte ordering)")
+if(CMAKE_C_BYTE_ORDER STREQUAL "BIG_ENDIAN")
+  message(CHECK_PASS "big-endian")
+  set(WORDS_BIGENDIAN TRUE)
+elseif(CMAKE_C_BYTE_ORDER STREQUAL "LITTLE_ENDIAN")
+  message(CHECK_PASS "little-endian")
+  set(WORDS_BIGENDIAN FALSE)
+else()
+  set(WORDS_BIGENDIAN FALSE)
+  message(CHECK_FAIL "unknown")
+  message(WARNING "Endianness could not be determined. Assuming little-endian.")
+endif()
+
 ################################################################################
 # Check headers.
 ################################################################################
@@ -435,9 +452,6 @@ else()
   message(CHECK_PASS "using system default")
 endif()
 
-# Check target system byte order.
-include(PHP/CheckByteOrder)
-
 # Check for IPv6 support.
 include(PHP/CheckIPv6)
 

cmake/cmake/modules/PHP/CheckByteOrder.cmake

@@ -48,10 +48,6 @@ set(PHP_IRIX_TIME_R_EXITCODE 1)
 # Set the exit code for the writing to stdout check.
 set(PHP_WRITE_STDOUT_EXITCODE 0)
 
-# Set the exit code of the byte ordering fallback check. When targeting a
-# big-endian system, set it to 0, and for little-endian set it to 1.
-set(WORDS_BIGENDIAN_EXITCODE 1)
-
 ################################################################################
 # Zend Engine
 ################################################################################

cmake/cmake/toolchains/template.cmake

@@ -105,9 +105,9 @@ target_sources(
         xxhash/xxhash.h
 )
 
-if(WORDS_BIGENDIAN)
+if(CMAKE_C_BYTE_ORDER STREQUAL "BIG_ENDIAN")
   set(HAVE_SLOW_HASH3 TRUE)
-  message(WARNING "Using slow SHA3 implementation on bigendian")
+  message(WARNING "Using slow SHA3 implementation on big-endian")
 else()
   block()
     if(CMAKE_SIZEOF_VOID_P EQUAL 4)