[php-src] master: Merge branch 'PHP-8.5'
| From: | Arnaud Le Blanc | Date: | Tue, 11 Aug 2026 08:11:30 +0000 |
| Subject: | [php-src] master: Merge branch 'PHP-8.5' | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-140623@lists.php.net to get a copy of this message | ||
Author: Arnaud Le Blanc (arnaud-lb)
Date: 2026-08-11T10:11:12+02:00
Commit: https://github.com/php/php-src/commit/cc4058e21aa48522d1daaa7d01e94d56f2ae5176
Raw diff: https://github.com/php/php-src/commit/cc4058e21aa48522d1daaa7d01e94d56f2ae5176.diff
Merge branch 'PHP-8.5'
* PHP-8.5:
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 752ea1803f9c..6a72dd3c02f3 100644
--- a/TSRM/TSRM.h
+++ b/TSRM/TSRM.h
@@ -162,7 +162,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 defined(__PIC__) && !defined(__PIE__)