Merge branch 'PHP-8.3'

Author: petk

cmake/cmake/Flags.cmake

@@ -283,8 +283,8 @@ if(PHP_ADDRESS_SANITIZER)
   cmake_push_check_state(RESET)
     set(CMAKE_REQUIRED_LINK_OPTIONS "-fsanitize=address")
 
-    php_check_compiler_flag(C "-fsanitize=address" HAVE_ADDRESS_SANITIZER_C)
-    php_check_compiler_flag(CXX "-fsanitize=address" HAVE_ADDRESS_SANITIZER_CXX)
+    php_check_compiler_flag(C -fsanitize=address HAVE_ADDRESS_SANITIZER_C)
+    php_check_compiler_flag(CXX -fsanitize=address HAVE_ADDRESS_SANITIZER_CXX)
   cmake_pop_check_state()
 
   if(HAVE_ADDRESS_SANITIZER_C AND HAVE_ADDRESS_SANITIZER_CXX)
@@ -320,8 +320,16 @@ if(PHP_UNDEFINED_SANITIZER)
   cmake_push_check_state(RESET)
     set(CMAKE_REQUIRED_LINK_OPTIONS "-fsanitize=undefined")
 
-    php_check_compiler_flag(C "-fsanitize=undefined" HAVE_UNDEFINED_SANITIZER_C)
-    php_check_compiler_flag(CXX "-fsanitize=undefined" HAVE_UNDEFINED_SANITIZER_CXX)
+    php_check_compiler_flag(
+      C
+      -fsanitize=undefined
+      HAVE_UNDEFINED_SANITIZER_C
+    )
+    php_check_compiler_flag(
+      CXX
+      -fsanitize=undefined
+      HAVE_UNDEFINED_SANITIZER_CXX
+    )
   cmake_pop_check_state()
 
   if(HAVE_UNDEFINED_SANITIZER_C AND HAVE_UNDEFINED_SANITIZER_CXX)
@@ -342,8 +350,16 @@ if(PHP_UNDEFINED_SANITIZER)
     cmake_push_check_state(RESET)
       set(CMAKE_REQUIRED_LINK_OPTIONS "-fno-sanitize=object-size")
 
-      php_check_compiler_flag(C "-fno-sanitize=object-size" HAVE_OBJECT_SIZE_SANITIZER_C)
-      php_check_compiler_flag(CXX "-fno-sanitize=object-size" HAVE_OBJECT_SIZE_SANITIZER_CXX)
+      php_check_compiler_flag(
+        C
+        -fno-sanitize=object-size
+        HAVE_OBJECT_SIZE_SANITIZER_C
+      )
+      php_check_compiler_flag(
+        CXX
+        -fno-sanitize=object-size
+        HAVE_OBJECT_SIZE_SANITIZER_CXX
+      )
     cmake_pop_check_state()
 
     if(HAVE_OBJECT_SIZE_SANITIZER_C AND HAVE_OBJECT_SIZE_SANITIZER_CXX)
@@ -362,43 +378,60 @@ if(PHP_UNDEFINED_SANITIZER)
 
     # Clang 17 adds stricter function pointer compatibility checks where pointer
     # args cannot be cast to void*. In that case, set -fno-sanitize=function.
-    if(NOT CMAKE_CROSSCOMPILING)
-      cmake_push_check_state(RESET)
-        set(
-          CMAKE_REQUIRED_FLAGS
-          "-fsanitize=undefined -fno-sanitize-recover=undefined"
+    if(
+      NOT DEFINED PHP_HAVE_UBSAN_EXITCODE
+      AND CMAKE_CROSSCOMPILING
+      AND NOT CMAKE_CROSSCOMPILING_EMULATOR
+      AND CMAKE_C_COMPILER_ID STREQUAL "Clang"
+      AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 17
+    )
+      # When cross-compiling without emulator and using Clang 17 and greater,
+      # assume that -fno-sanitize=function needs to be added.
+      set(PHP_HAVE_UBSAN_EXITCODE 1)
+    endif()
+
+    cmake_push_check_state(RESET)
+      set(
+        CMAKE_REQUIRED_FLAGS
+        "-fsanitize=undefined -fno-sanitize-recover=undefined"
+      )
+      check_source_runs(C [[
+        void foo(char *string) { (void)string; }
+        int main(void)
+        {
+          void (*f)(void *) = (void (*)(void *))foo;
+          f("foo");
+          return 0;
+        }
+      ]] PHP_HAVE_UBSAN)
+    cmake_pop_check_state()
+
+    if(NOT PHP_HAVE_UBSAN)
+      php_check_compiler_flag(
+        C
+        -fno-sanitize=function
+        HAVE_FNO_SANITIZE_FUNCTION_C
+      )
+      php_check_compiler_flag(
+        CXX
+        -fno-sanitize=function
+        HAVE_FNO_SANITIZE_FUNCTION_CXX
+      )
+
+      if(HAVE_FNO_SANITIZE_FUNCTION_C)
+        target_compile_options(
+          php_configuration
+          INTERFACE
+            $<$<COMPILE_LANGUAGE:ASM,C>:-fno-sanitize=function>
+        )
+      endif()
+
+      if(HAVE_FNO_SANITIZE_FUNCTION_CXX)
+        target_compile_options(
+          php_configuration
+          INTERFACE
+            $<$<COMPILE_LANGUAGE:CXX>:-fno-sanitize=function>
         )
-        check_source_runs(C [[
-          void foo(char *string) {
-            (void)string;
-          }
-          int main(void) {
-            void (*f)(void *) = (void (*)(void *))foo;
-            f("foo");
-            return 0;
-          }
-        ]] _php_ubsan_works)
-      cmake_pop_check_state()
-
-      if(NOT _php_ubsan_works)
-        php_check_compiler_flag(C -fno-sanitize=function HAVE_FNO_SANITIZE_FUNCTION_C)
-        php_check_compiler_flag(CXX -fno-sanitize=function HAVE_FNO_SANITIZE_FUNCTION_CXX)
-
-        if(HAVE_FNO_SANITIZE_FUNCTION_C)
-          target_compile_options(
-            php_configuration
-            INTERFACE
-              $<$<COMPILE_LANGUAGE:ASM,C>:-fno-sanitize=function>
-          )
-        endif()
-
-        if(HAVE_FNO_SANITIZE_FUNCTION_CXX)
-          target_compile_options(
-            php_configuration
-            INTERFACE
-              $<$<COMPILE_LANGUAGE:CXX>:-fno-sanitize=function>
-          )
-        endif()
       endif()
     endif()
 
@@ -410,8 +443,16 @@ if(PHP_UNDEFINED_SANITIZER)
 endif()
 
 if(PHP_MEMORY_SANITIZER OR PHP_ADDRESS_SANITIZER OR PHP_UNDEFINED_SANITIZER)
-  php_check_compiler_flag(C -fno-omit-frame-pointer HAVE_FNO_OMIT_FRAME_POINTER_C)
-  php_check_compiler_flag(CXX -fno-omit-frame-pointer HAVE_FNO_OMIT_FRAME_POINTER_CXX)
+  php_check_compiler_flag(
+    C
+    -fno-omit-frame-pointer
+    HAVE_FNO_OMIT_FRAME_POINTER_C
+  )
+  php_check_compiler_flag(
+    CXX
+    -fno-omit-frame-pointer
+    HAVE_FNO_OMIT_FRAME_POINTER_CXX
+  )
 
   if(HAVE_FNO_OMIT_FRAME_POINTER_C)
     target_compile_options(

cmake/cmake/modules/PHP/CheckFnmatch.cmake

@@ -22,15 +22,12 @@ include(CMakePushCheckState)
 message(CHECK_START "Checking for a working POSIX fnmatch() function")
 
 if(
-  NOT DEFINED HAVE_FNMATCH
+  NOT DEFINED HAVE_FNMATCH_EXITCODE
   AND CMAKE_CROSSCOMPILING
   AND NOT CMAKE_CROSSCOMPILING_EMULATOR
   AND CMAKE_SYSTEM_NAME STREQUAL "Linux"
 )
-  set(
-    HAVE_FNMATCH 1
-    CACHE INTERNAL "Define to 1 if system has a working POSIX fnmatch function."
-  )
+  set(HAVE_FNMATCH_EXITCODE 0)
 endif()
 
 cmake_push_check_state(RESET)

cmake/cmake/modules/PHP/CheckFopencookie.cmake

@@ -46,18 +46,13 @@ endif()
 message(CHECK_START "Checking whether fopencookie seeker uses off64_t")
 
 if(
-  CMAKE_CROSSCOMPILING
+  NOT DEFINED COOKIE_SEEKER_USES_OFF64_T_EXITCODE
+  AND CMAKE_CROSSCOMPILING
+  AND NOT CMAKE_CROSSCOMPILING_EMULATOR
   AND CMAKE_SYSTEM_NAME STREQUAL "Linux"
   AND PHP_C_STANDARD_LIBRARY STREQUAL "glibc"
 )
-  message(CHECK_PASS "yes (cross-compiling for Linux and GNU C library)")
-
-  set(
-    COOKIE_SEEKER_USES_OFF64_T 1
-    CACHE INTERNAL "Whether fopencookie seeker uses off64_t"
-  )
-
-  return()
+  set(COOKIE_SEEKER_USES_OFF64_T_EXITCODE 0)
 endif()
 
 cmake_push_check_state(RESET)

cmake/cmake/modules/PHP/CheckGetaddrinfo.cmake

@@ -71,15 +71,12 @@ cmake_push_check_state(RESET)
 
   if(_have_getaddrinfo)
     if(
-      NOT DEFINED HAVE_GETADDRINFO
+      NOT DEFINED HAVE_GETADDRINFO_EXITCODE
       AND CMAKE_CROSSCOMPILING
       AND NOT CMAKE_CROSSCOMPILING_EMULATOR
       AND CMAKE_SYSTEM_NAME MATCHES "^(Linux|Midipix)$"
     )
-      set(
-        HAVE_GETADDRINFO 1
-        CACHE INTERNAL "Define if you have the getaddrinfo() function"
-      )
+      set(HAVE_GETADDRINFO_EXITCODE 0)
     endif()
 
     check_source_runs(C [[

cmake/cmake/modules/PHP/CheckSHM.cmake

@@ -117,20 +117,18 @@ endif()
 
 message(CHECK_START "Checking for mmap() using MAP_ANON shared memory support")
 
+if(
+  NOT DEFINED HAVE_SHM_MMAP_ANON_EXITCODE
+  AND CMAKE_CROSSCOMPILING
+  AND NOT CMAKE_CROSSCOMPILING_EMULATOR
+  AND CMAKE_SYSTEM_NAME MATCHES "^(Linux|Midipix)$"
+)
+  set(HAVE_SHM_MMAP_ANON_EXITCODE 0)
+endif()
+
 cmake_push_check_state(RESET)
   set(CMAKE_REQUIRED_QUIET TRUE)
 
-  if(
-    NOT DEFINED HAVE_SHM_MMAP_ANON
-    AND CMAKE_CROSSCOMPILING
-    AND NOT CMAKE_CROSSCOMPILING_EMULATOR
-    AND CMAKE_SYSTEM_NAME MATCHES "^(Linux|Midipix)$"
-  )
-    set(
-      HAVE_SHM_MMAP_ANON 1
-      CACHE INTERNAL "Whether mmap(MAP_ANON) SHM support is available"
-    )
-  endif()
   check_source_runs(C [[
     #include <sys/types.h>
     #include <sys/wait.h>

cmake/cmake/modules/PHP/CheckTtynameR.cmake

@@ -45,40 +45,43 @@ cmake_push_check_state(RESET)
 
   if(NOT _HAVE_TTYNAME_R)
     message(CHECK_FAIL "no (non-standard declaration)")
-  elseif(
-    NOT DEFINED HAVE_TTYNAME_R
+    cmake_pop_check_state()
+    return()
+  endif()
+
+  if(
+    NOT DEFINED HAVE_TTYNAME_R_EXITCODE
     AND CMAKE_CROSSCOMPILING
     AND NOT CMAKE_CROSSCOMPILING_EMULATOR
-    AND _HAVE_TTYNAME_R
   )
-    set(HAVE_TTYNAME_R TRUE CACHE INTERNAL "Whether ttyname_r() works.")
-    message(CHECK_PASS "guessing yes (cross-compiling)")
-  else()
-    # PHP Autotools-based build system check uses a different return below due
-    # to Autoconf's configure using the file descriptor 0 which results in an
-    # error. The file descriptor 0 with CMake script execution is available and
-    # doesn't result in an error when calling ttyname_r().
-    check_source_runs(C [[
-      #include <unistd.h>
+    set(HAVE_TTYNAME_R_EXITCODE 0)
+  endif()
 
-      int main(void) {
-        #ifdef _SC_TTY_NAME_MAX
-          int buflen = sysconf(_SC_TTY_NAME_MAX);
-        #else
-          int buflen = 32; /* Small buffers < 128 */
-        #endif
-        if (buflen < 1) {
-          buflen = 32;
-        }
-        char buf[buflen];
+  # PHP Autotools-based build system check uses a different return below due
+  # to Autoconf's configure using the file descriptor 0 which results in an
+  # error. The file descriptor 0 with CMake script execution is available and
+  # doesn't result in an error when calling ttyname_r().
+  check_source_runs(C [[
+    #include <unistd.h>
 
-        return ttyname_r(0, buf, buflen) ? 1 : 0;
+    int main(void)
+    {
+      #ifdef _SC_TTY_NAME_MAX
+        int buflen = sysconf(_SC_TTY_NAME_MAX);
+      #else
+        int buflen = 32; /* Small buffers < 128 */
+      #endif
+      if (buflen < 1) {
+        buflen = 32;
       }
-    ]] HAVE_TTYNAME_R)
-    if(HAVE_TTYNAME_R)
-      message(CHECK_PASS "yes")
-    else()
-      message(CHECK_FAIL "no (posix_ttyname() will be thread-unsafe)")
-    endif()
+      char buf[buflen];
+
+      return ttyname_r(0, buf, buflen) ? 1 : 0;
+    }
+  ]] HAVE_TTYNAME_R)
+  if(HAVE_TTYNAME_R)
+    message(CHECK_PASS "yes")
+  else()
+    message(CHECK_FAIL "no (posix_ttyname() will be thread-unsafe)")
   endif()
 cmake_pop_check_state()

cmake/cmake/modules/PHP/CheckWrite.cmake

@@ -16,12 +16,12 @@ include(CMakePushCheckState)
 message(CHECK_START "Checking whether writing to stdout works")
 
 if(
-  NOT DEFINED PHP_WRITE_STDOUT
+  NOT DEFINED PHP_WRITE_STDOUT_EXITCODE
   AND CMAKE_CROSSCOMPILING
   AND NOT CMAKE_CROSSCOMPILING_EMULATOR
   AND CMAKE_SYSTEM_NAME MATCHES "^(Linux|Midipix)$"
 )
-  set(PHP_WRITE_STDOUT 1 CACHE INTERNAL "Whether write(2) works")
+  set(PHP_WRITE_STDOUT_EXITCODE 0)
 endif()
 
 cmake_push_check_state(RESET)

cmake/cmake/modules/PHP/PositionIndependentCode.cmake

@@ -5,7 +5,8 @@ https://cmake.org/cmake/help/latest/variable/CMAKE_POSITION_INDEPENDENT_CODE.htm
 ]=============================================================================]#
 
 if(CMAKE_C_COMPILER_ID STREQUAL "Clang" AND CMAKE_SIZEOF_VOID_P EQUAL 4)
-  # On 32-bit Linux and FreeBSD at least when using Clang, the pic is required.
+  # On 32-bit *nix (Linux and FreeBSD at least) when using Clang, the PIC is
+  # required.
   set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 else()
   # Disable PIC for all targets. PIC is enabled for shared extensions manually.