Skip to content

Commit 3625cbb

Browse files
committed
Fix ZTS+JIT build on non-glibc/musl/freebsd/macos/win platforms
Fixes phpGH-19657 Closes phpGH-19667
1 parent e843931 commit 3625cbb

File tree

4 files changed

+8
-0
lines changed

4 files changed

+8
-0
lines changed

NEWS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ PHP NEWS
1919
. Fixed bug GH-19486 (Incorrect opline after deoptimization). (Arnaud)
2020
. Fixed bug GH-19601 (Wrong JIT stack setup on aarch64/clang). (Arnaud)
2121
. Fixed bug GH-19388 (Broken opcache.huge_code_pages). (Arnaud)
22+
. Fixed bug GH-19657 (Build fails on non-glibc/musl/freebsd/macos/win
23+
platforms). (Arnaud)
2224

2325
- PCRE:
2426
. Upgraded to pcre2lib from 10.45 to 10.46. (nielsdos)

ext/opcache/jit/tls/zend_jit_tls_aarch64.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,7 @@ void *zend_jit_tsrm_ls_cache_address(
238238
size_t module_index,
239239
size_t module_offset
240240
) {
241+
#ifndef USE_FALLBACK
241242
char *thread_pointer;
242243
__asm__ __volatile__(
243244
"mrs %0, tpidr_el0\n"
@@ -251,5 +252,6 @@ void *zend_jit_tsrm_ls_cache_address(
251252
dtv_pointer_t *dtv = *(dtv_pointer_t**)((uintptr_t)thread_pointer + DTV_OFFSET);
252253
return (void*)(((dtv_pointer_t*)((char*)dtv + module_index))->val + module_offset);
253254
}
255+
#endif
254256
return NULL;
255257
}

ext/opcache/jit/tls/zend_jit_tls_x86.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,7 @@ void *zend_jit_tsrm_ls_cache_address(
222222
size_t module_index,
223223
size_t module_offset
224224
) {
225+
#ifndef USE_FALLBACK
225226
char *thread_pointer;
226227
__asm__ __volatile__(
227228
"movl %%gs:0, %0\n"
@@ -235,5 +236,6 @@ void *zend_jit_tsrm_ls_cache_address(
235236
dtv_pointer_t *dtv = *(dtv_pointer_t**)((uintptr_t)thread_pointer + DTV_OFFSET);
236237
return (void*)(((dtv_pointer_t*)((char*)dtv + module_index))->val + module_offset);
237238
}
239+
#endif
238240
return NULL;
239241
}

ext/opcache/jit/tls/zend_jit_tls_x86_64.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,7 @@ void *zend_jit_tsrm_ls_cache_address(
205205
size_t module_index,
206206
size_t module_offset
207207
) {
208+
#ifndef USE_FALLBACK
208209
char *thread_pointer;
209210
__asm__ __volatile__(
210211
"movq %%fs:0, %0\n"
@@ -218,5 +219,6 @@ void *zend_jit_tsrm_ls_cache_address(
218219
dtv_pointer_t *dtv = *(dtv_pointer_t**)((uintptr_t)thread_pointer + DTV_OFFSET);
219220
return (void*)(((dtv_pointer_t*)((char*)dtv + module_index))->val + module_offset);
220221
}
222+
#endif
221223
return NULL;
222224
}

0 commit comments

Comments
 (0)