From 32ff46b6336a33d2c6c1feb73dee3f5c374020f6 Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Sun, 24 Nov 2024 16:09:05 +0100 Subject: [PATCH] Fix ZTS OPcache build on Cygwin `configure --enable-opcache --disable-opcache-jit --enable-zts` won't compile on Cygwin. We fix this, but that does not imply that OPcache properly works in this environment, let alone that JIT would be functional. Closes GH-16920. --- NEWS | 3 +++ TSRM/TSRM.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 2548403b775b..d9709800d8ac 100644 --- a/NEWS +++ b/NEWS @@ -20,6 +20,9 @@ PHP NEWS - Intl: . Bumped ICU requirement to ICU >= 57.1. (cmb) +- OPcache: + . Fixed ZTS OPcache build on Cygwin. (cmb) + - Output: . Fixed calculation of aligned buffer size. (cmb) diff --git a/TSRM/TSRM.c b/TSRM/TSRM.c index 81136bee4daa..e99993204b6f 100644 --- a/TSRM/TSRM.c +++ b/TSRM/TSRM.c @@ -778,7 +778,7 @@ TSRM_API size_t tsrm_get_ls_cache_tcb_offset(void) return 0; #elif defined(__x86_64__) && defined(__GNUC__) && !defined(__FreeBSD__) && \ !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__MUSL__) && \ - !defined(__HAIKU__) + !defined(__HAIKU__) && !defined(__CYGWIN__) size_t ret; asm ("movq _tsrm_ls_cache@gottpoff(%%rip),%0" @@ -786,7 +786,7 @@ TSRM_API size_t tsrm_get_ls_cache_tcb_offset(void) return ret; #elif defined(__i386__) && defined(__GNUC__) && !defined(__FreeBSD__) && \ !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__MUSL__) && \ - !defined(__HAIKU__) + !defined(__HAIKU__) && !defined(__CYGWIN__) size_t ret; asm ("leal _tsrm_ls_cache@ntpoff,%0"