From a2f6ba8a200cb26cc13718dd3fee0adbc2c2cf2d Mon Sep 17 00:00:00 2001 From: David Carlier Date: Tue, 16 Nov 2021 15:35:15 +0000 Subject: [PATCH] OpenBSD ZTS build fix. --- TSRM/TSRM.c | 4 ++-- ext/opcache/jit/zend_jit_x86.dasc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/TSRM/TSRM.c b/TSRM/TSRM.c index 2d60b6a9d6eee..fc6c932065b0e 100644 --- a/TSRM/TSRM.c +++ b/TSRM/TSRM.c @@ -729,13 +729,13 @@ TSRM_API size_t tsrm_get_ls_cache_tcb_offset(void) #if defined(__APPLE__) && defined(__x86_64__) // TODO: Implement support for fast JIT ZTS code ??? return 0; -#elif defined(__x86_64__) && defined(__GNUC__) && !defined(__FreeBSD__) +#elif defined(__x86_64__) && defined(__GNUC__) && !defined(__FreeBSD__) && !defined(__OpenBSD__) size_t ret; asm ("movq _tsrm_ls_cache@gottpoff(%%rip),%0" : "=r" (ret)); return ret; -#elif defined(__i386__) && defined(__GNUC__) && !defined(__FreeBSD__) +#elif defined(__i386__) && defined(__GNUC__) && !defined(__FreeBSD__) && !defined(__OpenBSD__) size_t ret; asm ("leal _tsrm_ls_cache@ntpoff,%0" diff --git a/ext/opcache/jit/zend_jit_x86.dasc b/ext/opcache/jit/zend_jit_x86.dasc index 52e2388ca37e9..fa7edc9279a7b 100644 --- a/ext/opcache/jit/zend_jit_x86.dasc +++ b/ext/opcache/jit/zend_jit_x86.dasc @@ -2968,7 +2968,7 @@ static int zend_jit_setup(void) # elif defined(__GNUC__) && defined(__x86_64__) tsrm_ls_cache_tcb_offset = tsrm_get_ls_cache_tcb_offset(); if (tsrm_ls_cache_tcb_offset == 0) { -#if defined(__has_attribute) && __has_attribute(tls_model) && !defined(__FreeBSD__) +#if defined(__has_attribute) && __has_attribute(tls_model) && !defined(__FreeBSD__) && !defined(__OpenBSD__) size_t ret; asm ("movq _tsrm_ls_cache@gottpoff(%%rip),%0" @@ -2987,7 +2987,7 @@ static int zend_jit_setup(void) # elif defined(__GNUC__) && defined(__i386__) tsrm_ls_cache_tcb_offset = tsrm_get_ls_cache_tcb_offset(); if (tsrm_ls_cache_tcb_offset == 0) { -#if !defined(__FreeBSD__) +#if !defined(__FreeBSD__) && !defined(__OpenBSD__) size_t ret; asm ("leal _tsrm_ls_cache@ntpoff,%0\n"