Merge branch 'PHP-8.2' into PHP-8.3

* PHP-8.2: Fix TLS access in JIT on FreeBSD/amd64
Girgias · May 28, 2024 · 5e895dd · 5e895dd
2 parents 3b2764b + 79862f2
commit 5e895dd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/NEWS b/NEWS
@@ -13,6 +13,7 @@ PHP                                                                        NEWS
 - Opcache:
   . Fixed bug GH-14267 (opcache.jit=off does not allow enabling JIT at runtime).
     (ilutov)
+  . Fixed TLS access in JIT on FreeBSD/amd64. (Arnaud)
 
 - Soap:
   . Fixed bug #47925 (PHPClient can't decompress response). (nielsdos)

diff --git a/ext/opcache/jit/zend_jit_x86.dasc b/ext/opcache/jit/zend_jit_x86.dasc
@@ -2910,6 +2910,15 @@ static int 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;