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

Merge branch 'PHP-8.0' into PHP-8.1

Browse source 
* PHP-8.0:
  Haiku fix ZTS build disabling `tsrm_ls_cache` usage.
This commit is contained in:
Christoph M. Becker 2022-04-26 14:17:44 +02:00
commit 4c0639df1c
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

1
NEWS
View file

@ -7,6 +7,7 @@ PHP NEWS
. Fixed potential race condition during resource ID allocation. (ryancaicse) . Fixed potential race condition during resource ID allocation. (ryancaicse)
. Fixed bug GH-8133 (Preloading of constants containing arrays with enums . Fixed bug GH-8133 (Preloading of constants containing arrays with enums
segfaults). (ilutov) segfaults). (ilutov)
. Fixed Haiku ZTS builds. (David Carlier)
- Date: - Date:
. Fixed bug GH-7752 (DateTimeZone::getTransitions() returns insufficient . Fixed bug GH-7752 (DateTimeZone::getTransitions() returns insufficient

6
TSRM/TSRM.c
View file

@ -736,13 +736,15 @@ TSRM_API size_t tsrm_get_ls_cache_tcb_offset(void)
#if defined(__APPLE__) && defined(__x86_64__) #if defined(__APPLE__) && defined(__x86_64__)
// TODO: Implement support for fast JIT ZTS code ??? // TODO: Implement support for fast JIT ZTS code ???
return 0; 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; size_t ret;
asm ("movq _tsrm_ls_cache@gottpoff(%%rip),%0" asm ("movq _tsrm_ls_cache@gottpoff(%%rip),%0"
: "=r" (ret)); : "=r" (ret));
return 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; size_t ret;
asm ("leal _tsrm_ls_cache@ntpoff,%0" asm ("leal _tsrm_ls_cache@ntpoff,%0"