Skip to content

Commit 4bb0dd4

Browse files
devnexencmb69
authored andcommitted
Haiku fix ZTS build disabling tsrm_ls_cache usage.
1 parent 52a18a6 commit 4bb0dd4

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

NEWS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ PHP NEWS
22
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
33
?? ??? 2022, PHP 8.0.20
44

5+
- Core:
6+
. Fixed Haiku ZTS builds. (David Carlier)
57

68
12 May 2022, PHP 8.0.19
79

TSRM/TSRM.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -736,13 +736,15 @@ TSRM_API size_t tsrm_get_ls_cache_tcb_offset(void)
736736
#if defined(__APPLE__) && defined(__x86_64__)
737737
// TODO: Implement support for fast JIT ZTS code ???
738738
return 0;
739-
#elif defined(__x86_64__) && defined(__GNUC__) && !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__MUSL__)
739+
#elif defined(__x86_64__) && defined(__GNUC__) && !defined(__FreeBSD__) && \
740+
!defined(__OpenBSD__) && !defined(__MUSL__) && !defined(__HAIKU__)
740741
size_t ret;
741742

742743
asm ("movq _tsrm_ls_cache@gottpoff(%%rip),%0"
743744
: "=r" (ret));
744745
return ret;
745-
#elif defined(__i386__) && defined(__GNUC__) && !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__MUSL__)
746+
#elif defined(__i386__) && defined(__GNUC__) && !defined(__FreeBSD__) && \
747+
!defined(__OpenBSD__) && !defined(__MUSL__) && !defined(__HAIKU__)
746748
size_t ret;
747749

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

0 commit comments

Comments
 (0)