diff --git a/NEWS b/NEWS
index 35d78d928995..df22c2cea467 100644
--- a/NEWS
+++ b/NEWS
@@ -122,7 +122,8 @@ PHP                                                                        NEWS
   . Added the "filter.max_filter_count" stream context option for php://filter
     URLs. Using more than 16 filters without configuring this option is now
     deprecated. (Sjoerd Langkemper)
-  . metaphone() is now deprecated. (Weilin Du)
+  . The metaphone() function is now deprecated, use a userland phonetic
+    matching library instead. (Weilin Du)
   . Improved performance of array_intersect(). (mehmetcansahin)
   . Fixed bug GH-23006 (phpcredits() full-page HTML title says phpinfo()).
     (Weilin Du)
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__)