From df9750064e85a877ecffb35198fb6690f310c480 Mon Sep 17 00:00:00 2001 From: Arnaud Le Blanc Date: Tue, 28 May 2024 14:20:17 +0200 Subject: [PATCH] Fix TLS access in JIT on FreeBSD/amd64 DTV elements are 8 bytes in size a per ABI [1], and the index is offset by 1 on FreeBSD [2] [1] http://people.redhat.com/drepper/tls.pdf [2] https://github.com/freebsd/freebsd-src/blob/bf56e8b9c8639ac4447d223b83cdc128107cc3cd/libexec/rtld-elf/rtld.c#L5260 --- ext/opcache/jit/zend_jit_x86.dasc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ext/opcache/jit/zend_jit_x86.dasc b/ext/opcache/jit/zend_jit_x86.dasc index d083bf47c76d9..7b28b2a767a82 100644 --- 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;