Merge branch 'PHP-8.3' into PHP-8.4

Author: petk

cmake/cmake/checks/CheckReentrantFunctions.cmake

@@ -20,20 +20,24 @@ Result variables:
 * MISSING_LOCALTIME_R_DECL - Whether localtime_r() is not declared.
 * MISSING_STRTOK_R_DECL - Whether `strtok_r()` is not declared.
 
-Also the type of reentrant time-related functions are checked. Type can be irix,
-hpux or POSIX. This check is obsolete as it is relevant for obsolete systems.
+Also the type of reentrant time-related functions are checked. Type can be IRIX,
+HP-UX or POSIX style. This check is obsolete as it is relevant only for obsolete
+systems.
 
 Cache variables:
 
 * PHP_HPUX_TIME_R - Whether HP-UX 10.x is used.
-* PHP_IRIX_TIME_R - Whether IRIX-style functions are used.
+* PHP_IRIX_TIME_R - Whether IRIX-style functions are used (e.g., Solaris <= 11.3
+  and illumos without _POSIX_PTHREAD_SEMANTICS defined).
 #]=============================================================================]
 
 include_guard(GLOBAL)
 
 include(CheckFunctionExists)
 include(CheckSourceRuns)
 include(CheckSymbolExists)
+include(CMakePushCheckState)
+include(PHP/SystemExtensions)
 
 # Define HAVE_<symbol> if linker sees the function, and MISSING_<symbol>_DECL if
 # function is not declared by checking the required header and test body.
@@ -95,46 +99,52 @@ endif()
 
 message(CHECK_START "Checking type of reentrant time-related functions")
 
-check_source_runs(C [[
-  #include <time.h>
+cmake_push_check_state(RESET)
+  # To get the POSIX standard conforming *_r functions declarations:
+  # - _POSIX_PTHREAD_SEMANTICS is needed on Solaris <= 11.3 and illumos
+  set(CMAKE_REQUIRED_LIBRARIES PHP::SystemExtensions)
 
-  int main(void)
-  {
-    char buf[27];
-    struct tm t;
-    time_t old = 0;
-    int r, s;
-
-    s = gmtime_r(&old, &t);
-    r = (int) asctime_r(&t, buf, 26);
-    if (r == s && s == 0) {
-      return 0;
-    }
-
-    return 1;
-  }
-]] PHP_HPUX_TIME_R)
-
-if(NOT PHP_HPUX_TIME_R)
   check_source_runs(C [[
     #include <time.h>
 
     int main(void)
     {
-      struct tm t, *s;
+      char buf[27];
+      struct tm t;
       time_t old = 0;
-      char buf[27], *p;
+      int r, s;
 
-      s = gmtime_r(&old, &t);
-      p = asctime_r(&t, buf, 26);
-      if (p == buf && s == &t) {
+      s = (int) gmtime_r(&old, &t);
+      r = (int) asctime_r(&t, buf, 26);
+      if (r == s && s == 0) {
         return 0;
       }
 
       return 1;
     }
-  ]] PHP_IRIX_TIME_R)
-endif()
+  ]] PHP_HPUX_TIME_R)
+
+  if(NOT PHP_HPUX_TIME_R)
+    check_source_runs(C [[
+      #include <time.h>
+
+      int main(void)
+      {
+        struct tm t, *s;
+        time_t old = 0;
+        char buf[27], *p;
+
+        s = gmtime_r(&old, &t);
+        p = asctime_r(&t, buf, 26);
+        if (p == buf && s == &t) {
+          return 0;
+        }
+
+        return 1;
+      }
+    ]] PHP_IRIX_TIME_R)
+  endif()
+cmake_pop_check_state()
 
 if(PHP_HPUX_TIME_R)
   message(CHECK_PASS "HP-UX")

cmake/cmake/modules/PHP/SystemExtensions.cmake

@@ -28,9 +28,9 @@ Conditionally defined preprocessor macros:
 
   As of Solaris 11.4, the `_POSIX_PTHREAD_SEMANTICS` is obsolete and according
   to documentation no header utilizes this anymore. For illumos-based systems,
-  it's unclear where it is still needed, so at the time of writing, this is
-  enabled unconditionally for all Solaris and illumos-based systems as enabling
-  it doesn't cause issues. For other systems, this is irrelevant.
+  it is still needed at the time of writing, so it is enabled unconditionally
+  for all Solaris and illumos-based systems as enabling it on Solaris 11.4
+  doesn't cause issues. For other systems, this is irrelevant.
 
 ## Result variables
 
@@ -255,7 +255,7 @@ set(PHP_SYSTEM_EXTENSIONS_CODE [[
 #ifndef _OPENBSD_SOURCE
 # define _OPENBSD_SOURCE 1
 #endif
-/* Enable POSIX-compatible threading on Solaris.  */
+/* Enable POSIX-compatible threading on Solaris <= 11.3 and illumos.  */
 #ifndef _POSIX_PTHREAD_SEMANTICS
 # cmakedefine _POSIX_PTHREAD_SEMANTICS
 #endif