Skip to content

Commit 4c72203

Browse files
committed
Merge branch 'PHP-8.4'
* PHP-8.4: Fix GH-18743: Incompatibility in Inline TLS Assembly on Alpine 3.22
2 parents 502c682 + 7a0beb4 commit 4c72203

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

ext/opcache/jit/zend_jit_ir.c

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

34233423
__asm__(
34243424
"leaq _tsrm_ls_cache@tlsgd(%%rip), %0\n"
3425-
: "=a" (ti));
3425+
: "=D" (ti));
34263426
tsrm_tls_offset = ti[1];
34273427
tsrm_tls_index = ti[0] * 8;
34283428
#elif defined(__FreeBSD__)
34293429
size_t *ti;
34303430

34313431
__asm__(
34323432
"leaq _tsrm_ls_cache@tlsgd(%%rip), %0\n"
3433-
: "=a" (ti));
3433+
: "=D" (ti));
34343434
tsrm_tls_offset = ti[1];
34353435
/* Index is offset by 1 on FreeBSD (https://github.com/freebsd/freebsd-src/blob/bf56e8b9c8639ac4447d223b83cdc128107cc3cd/libexec/rtld-elf/rtld.c#L5260) */
34363436
tsrm_tls_index = (ti[0] + 1) * 8;
@@ -3439,7 +3439,7 @@ static void zend_jit_setup(bool reattached)
34393439

34403440
__asm__(
34413441
"leaq _tsrm_ls_cache@tlsgd(%%rip), %0\n"
3442-
: "=a" (ti));
3442+
: "=D" (ti));
34433443
tsrm_tls_offset = ti[1];
34443444
tsrm_tls_index = ti[0] * 16;
34453445
#endif

0 commit comments

Comments
 (0)