Merge branch 'PHP-8.3'

* PHP-8.3: Fix TLS access in JIT with MUSL (#13329)
php · Feb 12, 2024 · 71cccc0 · 71cccc0
2 parents eb76a83 + 667b08c
commit 71cccc0
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/ext/opcache/jit/zend_jit_ir.c b/ext/opcache/jit/zend_jit_ir.c
@@ -3256,6 +3256,14 @@ static void zend_jit_setup(void)
 		asm ("movq _tsrm_ls_cache@gottpoff(%%rip),%0"
 			: "=r" (ret));
 		tsrm_ls_cache_tcb_offset = ret;
+#elif defined(__MUSL__)
+		size_t *ti;
+
+		__asm__(
+			"leaq _tsrm_ls_cache@tlsgd(%%rip), %0\n"
+			: "=a" (ti));
+		tsrm_tls_offset = ti[1];
+		tsrm_tls_index = ti[0] * 16;
 #else
 		size_t *ti;