From 4bb0dd49d836c14754823d03f978794a48058005 Mon Sep 17 00:00:00 2001 From: David Carlier Date: Mon, 11 Apr 2022 18:23:33 +0000 Subject: [PATCH] Haiku fix ZTS build disabling `tsrm_ls_cache` usage. --- NEWS | 2 ++ TSRM/TSRM.c | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 19706b19b06..b3bfd952d87 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,8 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 2022, PHP 8.0.20 +- Core: + . Fixed Haiku ZTS builds. (David Carlier) 12 May 2022, PHP 8.0.19 diff --git a/TSRM/TSRM.c b/TSRM/TSRM.c index 1401ab2d885..11f9cdb8ed4 100644 --- a/TSRM/TSRM.c +++ b/TSRM/TSRM.c @@ -736,13 +736,15 @@ 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__) && !defined(__OpenBSD__) && !defined(__MUSL__) +#elif defined(__x86_64__) && defined(__GNUC__) && !defined(__FreeBSD__) && \ + !defined(__OpenBSD__) && !defined(__MUSL__) && !defined(__HAIKU__) size_t ret; asm ("movq _tsrm_ls_cache@gottpoff(%%rip),%0" : "=r" (ret)); return ret; -#elif defined(__i386__) && defined(__GNUC__) && !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__MUSL__) +#elif defined(__i386__) && defined(__GNUC__) && !defined(__FreeBSD__) && \ + !defined(__OpenBSD__) && !defined(__MUSL__) && !defined(__HAIKU__) size_t ret; asm ("leal _tsrm_ls_cache@ntpoff,%0"