archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 13:38:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix ZTS OPcache build on Cygwin

Browse source 
`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.
This commit is contained in:
Christoph M. Becker 2024-11-24 16:09:05 +01:00
parent b0b876d076
commit 32ff46b633
No known key found for this signature in database
GPG key ID: D66C9593118BCCB6
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
NEWS
View file

@ -20,6 +20,9 @@ PHP NEWS
- Intl: - Intl:
. Bumped ICU requirement to ICU >= 57.1. (cmb) . Bumped ICU requirement to ICU >= 57.1. (cmb)
- OPcache:
. Fixed ZTS OPcache build on Cygwin. (cmb)
- Output: - Output:
. Fixed calculation of aligned buffer size. (cmb) . Fixed calculation of aligned buffer size. (cmb)

4
TSRM/TSRM.c
View file

@ -778,7 +778,7 @@ TSRM_API size_t tsrm_get_ls_cache_tcb_offset(void)
return 0; return 0;
#elif defined(__x86_64__) && defined(__GNUC__) && !defined(__FreeBSD__) && \ #elif defined(__x86_64__) && defined(__GNUC__) && !defined(__FreeBSD__) && \
!defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__MUSL__) && \ !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__MUSL__) && \
!defined(__HAIKU__) !defined(__HAIKU__) && !defined(__CYGWIN__)
size_t ret; size_t ret;
asm ("movq _tsrm_ls_cache@gottpoff(%%rip),%0" 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; return ret;
#elif defined(__i386__) && defined(__GNUC__) && !defined(__FreeBSD__) && \ #elif defined(__i386__) && defined(__GNUC__) && !defined(__FreeBSD__) && \
!defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__MUSL__) && \ !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__MUSL__) && \
!defined(__HAIKU__) !defined(__HAIKU__) && !defined(__CYGWIN__)
size_t ret; size_t ret;
asm ("leal _tsrm_ls_cache@ntpoff,%0" asm ("leal _tsrm_ls_cache@ntpoff,%0"