Skip to content

Commit 0040571

Browse files
committed
Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0: OpenBSD ZTS build fix
2 parents c02aa46 + fb3e646 commit 0040571

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

TSRM/TSRM.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -729,13 +729,13 @@ TSRM_API size_t tsrm_get_ls_cache_tcb_offset(void)
729729
#if defined(__APPLE__) && defined(__x86_64__)
730730
// TODO: Implement support for fast JIT ZTS code ???
731731
return 0;
732-
#elif defined(__x86_64__) && defined(__GNUC__) && !defined(__FreeBSD__)
732+
#elif defined(__x86_64__) && defined(__GNUC__) && !defined(__FreeBSD__) && !defined(__OpenBSD__)
733733
size_t ret;
734734

735735
asm ("movq _tsrm_ls_cache@gottpoff(%%rip),%0"
736736
: "=r" (ret));
737737
return ret;
738-
#elif defined(__i386__) && defined(__GNUC__) && !defined(__FreeBSD__)
738+
#elif defined(__i386__) && defined(__GNUC__) && !defined(__FreeBSD__) && !defined(__OpenBSD__)
739739
size_t ret;
740740

741741
asm ("leal _tsrm_ls_cache@ntpoff,%0"

ext/opcache/jit/zend_jit_x86.dasc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2950,7 +2950,7 @@ static int zend_jit_setup(void)
29502950
# elif defined(__GNUC__) && defined(__x86_64__)
29512951
tsrm_ls_cache_tcb_offset = tsrm_get_ls_cache_tcb_offset();
29522952
if (tsrm_ls_cache_tcb_offset == 0) {
2953-
#if defined(__has_attribute) && __has_attribute(tls_model) && !defined(__FreeBSD__)
2953+
#if defined(__has_attribute) && __has_attribute(tls_model) && !defined(__FreeBSD__) && !defined(__OpenBSD__)
29542954
size_t ret;
29552955

29562956
asm ("movq _tsrm_ls_cache@gottpoff(%%rip),%0"
@@ -2969,7 +2969,7 @@ static int zend_jit_setup(void)
29692969
# elif defined(__GNUC__) && defined(__i386__)
29702970
tsrm_ls_cache_tcb_offset = tsrm_get_ls_cache_tcb_offset();
29712971
if (tsrm_ls_cache_tcb_offset == 0) {
2972-
#if !defined(__FreeBSD__)
2972+
#if !defined(__FreeBSD__) && !defined(__OpenBSD__)
29732973
size_t ret;
29742974

29752975
asm ("leal _tsrm_ls_cache@ntpoff,%0\n"

0 commit comments

Comments
 (0)