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

Author: David Carlier (devnexen)
Date: 2026-07-20T17:27:06+01:00

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

Merge branch 'PHP-8.5'

* PHP-8.5:
  ext/opcache: zend_jit_resolve_tsrm_ls_cache_offsets() TEXTREL from bare __tls_get_addr call.

Changed paths:
  M  ext/opcache/jit/tls/zend_jit_tls_x86_64.c


Diff:

diff --git a/ext/opcache/jit/tls/zend_jit_tls_x86_64.c b/ext/opcache/jit/tls/zend_jit_tls_x86_64.c
index 1b2730c4be92..6c58dbc1c43d 100644
--- a/ext/opcache/jit/tls/zend_jit_tls_x86_64.c
+++ b/ext/opcache/jit/tls/zend_jit_tls_x86_64.c
@@ -100,7 +100,7 @@ zend_result zend_jit_resolve_tsrm_ls_cache_offsets(
 		"leaq   _tsrm_ls_cache@tlsgd(%%rip), %%rdi\n"
 		".word  0x6666\n"
 		"rex64\n"
-		"call   __tls_get_addr\n"
+		"call   __tls_get_addr@PLT\n"
 		/* Load thread pointer address */
 		"movq   %%fs:0, %%rsi\n"
 		: "=a" (addr), "=b" (code), "=S" (thread_pointer)