Commit cc4058e21aa for php.net

commit cc4058e21aa48522d1daaa7d01e94d56f2ae5176
Merge: 4226d16a6f6 f29141910b1
Author: Arnaud Le Blanc <arnaud.lb@gmail.com>
Date:   Tue Aug 11 10:11:12 2026 +0200

    Merge branch 'PHP-8.5'

    * PHP-8.5:
      TSRM: don't use initial-exec on AIX (#23145)

diff --cc TSRM/TSRM.h
index 752ea1803f9,4911233d948..6a72dd3c02f
--- a/TSRM/TSRM.h
+++ b/TSRM/TSRM.h
@@@ -162,10 -152,11 +162,11 @@@ TSRM_API bool tsrm_is_managed_thread(vo
  # define __has_attribute(x) 0
  #endif

- #if !__has_attribute(tls_model) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__MUSL__) || defined(__HAIKU__)
+ #if !__has_attribute(tls_model) || defined(__FreeBSD__) || defined(__NetBSD__) \
+ 	|| defined(__MUSL__) || defined(__HAIKU__) || defined(_AIX)
  # define TSRM_TLS_MODEL_ATTR
  # define TSRM_TLS_MODEL_DEFAULT
 -#elif __PIC__
 +#elif defined(__PIC__) && !defined(__PIE__)
  # define TSRM_TLS_MODEL_ATTR __attribute__((tls_model("initial-exec")))
  # define TSRM_TLS_MODEL_INITIAL_EXEC
  #else