Skip to content

Commit b56a0e0

Browse files
committed
Merge branch 'PHP-8.5'
* PHP-8.5: ext/opcache: zend_jit_resolve_tsrm_ls_cache_offsets() TEXTREL from bare __tls_get_addr call.
2 parents b82fc3c + 19af2e4 commit b56a0e0

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

ext/opcache/jit/tls/zend_jit_tls_x86_64.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ zend_result zend_jit_resolve_tsrm_ls_cache_offsets(
100100
"leaq _tsrm_ls_cache@tlsgd(%%rip), %%rdi\n"
101101
".word 0x6666\n"
102102
"rex64\n"
103-
"call __tls_get_addr\n"
103+
"call __tls_get_addr@PLT\n"
104104
/* Load thread pointer address */
105105
"movq %%fs:0, %%rsi\n"
106106
: "=a" (addr), "=b" (code), "=S" (thread_pointer)

0 commit comments

Comments
 (0)