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.1'

Browse source 
* PHP-8.1:
  Fix GH-8160: ZTS support on Alpine is broken
This commit is contained in:
Christoph M. Becker 2022-03-11 14:42:49 +01:00
commit 6b2187bc79
No known key found for this signature in database
GPG key ID: D66C9593118BCCB6
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
TSRM/TSRM.c
View file

@ -736,13 +736,13 @@ 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__) #elif defined(__x86_64__) && defined(__GNUC__) && !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__MUSL__)
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__) #elif defined(__i386__) && defined(__GNUC__) && !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__MUSL__)
size_t ret; size_t ret;
asm ("leal _tsrm_ls_cache@ntpoff,%0" asm ("leal _tsrm_ls_cache@ntpoff,%0"

2
configure.ac
View file

@ -260,7 +260,7 @@ AC_MSG_CHECKING([whether we are using musl libc])
if command -v ldd >/dev/null && ldd --version 2>&1 | grep -q ^musl if command -v ldd >/dev/null && ldd --version 2>&1 | grep -q ^musl
then then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
CPPFLAGS="$CPPFLAGS -D__MUSL__" AC_DEFINE([__MUSL__], [1], [Define when using musl libc])
else else
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
fi fi

4
ext/opcache/jit/zend_jit_x86.dasc
View file

@ -2956,7 +2956,7 @@ static int zend_jit_setup(void)
# elif defined(__GNUC__) && defined(__x86_64__) # elif defined(__GNUC__) && defined(__x86_64__)
tsrm_ls_cache_tcb_offset = tsrm_get_ls_cache_tcb_offset(); tsrm_ls_cache_tcb_offset = tsrm_get_ls_cache_tcb_offset();
if (tsrm_ls_cache_tcb_offset == 0) { if (tsrm_ls_cache_tcb_offset == 0) {
#if defined(__has_attribute) && __has_attribute(tls_model) && !defined(__FreeBSD__) && !defined(__OpenBSD__) #if defined(__has_attribute) && __has_attribute(tls_model) && !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__MUSL__)
size_t ret; size_t ret;
asm ("movq _tsrm_ls_cache@gottpoff(%%rip),%0" asm ("movq _tsrm_ls_cache@gottpoff(%%rip),%0"
@ -2975,7 +2975,7 @@ static int zend_jit_setup(void)
# elif defined(__GNUC__) && defined(__i386__) # elif defined(__GNUC__) && defined(__i386__)
tsrm_ls_cache_tcb_offset = tsrm_get_ls_cache_tcb_offset(); tsrm_ls_cache_tcb_offset = tsrm_get_ls_cache_tcb_offset();
if (tsrm_ls_cache_tcb_offset == 0) { if (tsrm_ls_cache_tcb_offset == 0) {
#if !defined(__FreeBSD__) && !defined(__OpenBSD__) #if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__MUSL__)
size_t ret; size_t ret;
asm ("leal _tsrm_ls_cache@ntpoff,%0\n" asm ("leal _tsrm_ls_cache@ntpoff,%0\n"