Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 32ff46b

Browse files
committed
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.
1 parent b0b876d commit 32ff46b

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

‎NEWS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ PHP NEWS
2020
- Intl:
2121
. Bumped ICU requirement to ICU >= 57.1. (cmb)
2222

23+
- OPcache:
24+
. Fixed ZTS OPcache build on Cygwin. (cmb)
25+
2326
- Output:
2427
. Fixed calculation of aligned buffer size. (cmb)
2528

‎TSRM/TSRM.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -778,15 +778,15 @@ TSRM_API size_t tsrm_get_ls_cache_tcb_offset(void)
778778
return 0;
779779
#elif defined(__x86_64__) && defined(__GNUC__) && !defined(__FreeBSD__) && \
780780
!defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__MUSL__) && \
781-
!defined(__HAIKU__)
781+
!defined(__HAIKU__)&& !defined(__CYGWIN__)
782782
size_t ret;
783783

784784
asm ("movq _tsrm_ls_cache@gottpoff(%%rip),%0"
785785
: "=r" (ret));
786786
return ret;
787787
#elif defined(__i386__) && defined(__GNUC__) && !defined(__FreeBSD__) && \
788788
!defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__MUSL__) && \
789-
!defined(__HAIKU__)
789+
!defined(__HAIKU__)&& !defined(__CYGWIN__)
790790
size_t ret;
791791

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

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /