Merge branch 'PHP-8.3'

* PHP-8.3: Fix TLS access in JIT on FreeBSD/amd64
Girgias · May 28, 2024 · cc6d952 · cc6d952
2 parents 7c5d655 + 5e895dd
commit cc6d952
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/ext/opcache/jit/zend_jit_ir.c b/ext/opcache/jit/zend_jit_ir.c
@@ -3260,6 +3260,15 @@ static void zend_jit_setup(void)
 			: "=a" (ti));
 		tsrm_tls_offset = ti[1];
 		tsrm_tls_index = ti[0] * 8;
+#elif defined(__FreeBSD__)
+		size_t *ti;
+
+		__asm__(
+			"leaq _tsrm_ls_cache@tlsgd(%%rip), %0\n"
+			: "=a" (ti));
+		tsrm_tls_offset = ti[1];
+		/* Index is offset by 1 on FreeBSD (https://github.com/freebsd/freebsd-src/blob/bf56e8b9c8639ac4447d223b83cdc128107cc3cd/libexec/rtld-elf/rtld.c#L5260) */
+		tsrm_tls_index = (ti[0] + 1) * 8;
 #else
 		size_t *ti;