[php-src] PHP-8.4: TSRM: don't use initial-exec on AIX (#23145)
| From: | Calvin Buckley via GitHub | Date: | Tue, 11 Aug 2026 08:10:32 +0000 |
| Subject: | [php-src] PHP-8.4: TSRM: don't use initial-exec on AIX (#23145) | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-140621@lists.php.net to get a copy of this message | ||
Author: Calvin Buckley (NattyNarwhal)
Committer: GitHub (web-flow)
Pusher: arnaud-lb
Date: 2026-08-11T10:10:29+02:00
Commit: https://github.com/php/php-src/commit/618d99bed4d670039e7bd348110fa8ac10081588
Raw diff: https://github.com/php/php-src/commit/618d99bed4d670039e7bd348110fa8ac10081588.diff
TSRM: don't use initial-exec on AIX (#23145)
If building for ZTS, it seems that local-exec can sneak in:
```
PHP Warning: PHP Startup: Unable to load dynamic library 'intl' (tried:
/QOpenSys/pkgs/lib/php-8.6/extensions/intl ( 0509-022 Cannot load module
/QOpenSys/pkgs/lib/php-8.6/extensions/intl.
0509-026 System error: A file or directory in the path name does not exist.),
/QOpenSys/pkgs/lib/php-8.6/extensions/intl.so ( 0509-130 Symbol resolution failed for
/QOpenSys/pkgs/lib/php-8.6/extensions/intl.so because:
0509-189 Module /QOpenSys/pkgs/lib/php-8.6/extensions/intl.so is loaded dynamically,
but the initial-exec model is used by the module
to refer to its own thread-local variables.
0509-191 Examine .loader section relocation entries with the
'dump -Rv' command.
0509-192 Examine .loader section symbols with the
'dump -Tv' command.)) in Unknown on line 0
```
When inspecting the module for initial-exec:
```
$ dump -Rv /QOpenSys/pkgs/lib/php-8.6/extensions/intl.so | grep TLS_In
0x20014370 0x000001fb TLS_InExc 0x0003 _tsrm_ls_cache
```
It seems it only was in
ext/intl/timezone/timezone_class.cpp. However,
it seems prudent to just not use local-exec for this case since it seems
to be an optimization only really possible on glibc; play it safe
elsewhere. (Perhaps this should be really an ifdef GLIBC check?)
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__