Skip to content

Commit 7a0beb4

Browse files
committed
Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3: Fix GH-18743: Incompatibility in Inline TLS Assembly on Alpine 3.22
2 parents 5526301 + b3c8afe commit 7a0beb4

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

NEWS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ PHP NEWS
3232
. Fix memory leak in intl_datetime_decompose() on failure. (nielsdos)
3333
. Fix memory leak in locale lookup on failure. (nielsdos)
3434

35+
- Opcache:
36+
. Fixed bug GH-18743 (Incompatibility in Inline TLS Assembly on Alpine 3.22).
37+
(nielsdos, Arnaud)
38+
3539
- ODBC:
3640
. Fix memory leak on php_odbc_fetch_hash() failure. (nielsdos)
3741

ext/opcache/jit/zend_jit_ir.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3458,15 +3458,15 @@ static void zend_jit_setup(bool reattached)
34583458

34593459
__asm__(
34603460
"leaq _tsrm_ls_cache@tlsgd(%%rip), %0\n"
3461-
: "=a" (ti));
3461+
: "=D" (ti));
34623462
tsrm_tls_offset = ti[1];
34633463
tsrm_tls_index = ti[0] * 8;
34643464
#elif defined(__FreeBSD__)
34653465
size_t *ti;
34663466

34673467
__asm__(
34683468
"leaq _tsrm_ls_cache@tlsgd(%%rip), %0\n"
3469-
: "=a" (ti));
3469+
: "=D" (ti));
34703470
tsrm_tls_offset = ti[1];
34713471
/* Index is offset by 1 on FreeBSD (https://github.com/freebsd/freebsd-src/blob/bf56e8b9c8639ac4447d223b83cdc128107cc3cd/libexec/rtld-elf/rtld.c#L5260) */
34723472
tsrm_tls_index = (ti[0] + 1) * 8;
@@ -3475,7 +3475,7 @@ static void zend_jit_setup(bool reattached)
34753475

34763476
__asm__(
34773477
"leaq _tsrm_ls_cache@tlsgd(%%rip), %0\n"
3478-
: "=a" (ti));
3478+
: "=D" (ti));
34793479
tsrm_tls_offset = ti[1];
34803480
tsrm_tls_index = ti[0] * 16;
34813481
#endif

0 commit comments

Comments
 (0)