Skip to content

Commit f291419

Browse files
committed
Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4: TSRM: don't use initial-exec on AIX (#23145)
2 parents a2dd29d + 618d99b commit f291419

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

‎TSRM/TSRM.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,8 @@ TSRM_API bool tsrm_is_managed_thread(void);
152152
# define __has_attribute(x) 0
153153
#endif
154154

155-
#if !__has_attribute(tls_model) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__MUSL__) || defined(__HAIKU__)
155+
#if !__has_attribute(tls_model) || defined(__FreeBSD__) || defined(__NetBSD__) \
156+
|| defined(__MUSL__) || defined(__HAIKU__) || defined(_AIX)
156157
# define TSRM_TLS_MODEL_ATTR
157158
# define TSRM_TLS_MODEL_DEFAULT
158159
#elif __PIC__

0 commit comments

Comments
 (0)