[PHP-CVS] [php-src] master: Merge branch 'PHP-8.4' into PHP-8.5

Author: Arnaud Le Blanc (arnaud-lb)
Date: 2026-08-11T10:11:02+02:00

Commit: https://github.com/php/php-src/commit/f29141910b1b6258821745f507855ea4ed23a92f
Raw diff: https://github.com/php/php-src/commit/f29141910b1b6258821745f507855ea4ed23a92f.diff

Merge branch 'PHP-8.4' into PHP-8.5

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

Changed paths:
  M  TSRM/TSRM.h


Diff:

diff --git a/TSRM/TSRM.h b/TSRM/TSRM.h
index 80d6cbad0443..4911233d948f 100644
--- a/TSRM/TSRM.h
+++ b/TSRM/TSRM.h
@@ -152,7 +152,8 @@ TSRM_API bool tsrm_is_managed_thread(void);
 # 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__