Skip to content

Commit f74a02d

Browse files
committed
Revert "Implement fetching TLS TCB offset on MacOS"
This reverts commit 1106ff9. Looks like this sauses segfaults on MacOs ZTS with JIT.
1 parent b10416a commit f74a02d

File tree

2 files changed

+2
-12
lines changed

2 files changed

+2
-12
lines changed

TSRM/TSRM.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -727,10 +727,8 @@ TSRM_API void *tsrm_get_ls_cache(void)
727727
TSRM_API size_t tsrm_get_ls_cache_tcb_offset(void)
728728
{/*{{{*/
729729
#if defined(__APPLE__) && defined(__x86_64__)
730-
size_t ret;
731-
asm ("movq __tsrm_ls_cache(%%rip),%0"
732-
: "=r" (ret));
733-
return ret;
730+
// TODO: Implement support for fast JIT ZTS code ???
731+
return 0;
734732
#elif defined(__x86_64__) && defined(__GNUC__)
735733
size_t ret;
736734

ext/opcache/jit/zend_jit_x86.dasc

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2923,20 +2923,12 @@ static int zend_jit_setup(void)
29232923
# elif defined(__APPLE__) && defined(__x86_64__)
29242924
tsrm_ls_cache_tcb_offset = tsrm_get_ls_cache_tcb_offset();
29252925
if (tsrm_ls_cache_tcb_offset == 0) {
2926-
#if defined(__has_attribute) && __has_attribute(tls_model)
2927-
size_t ret;
2928-
2929-
asm ("movq __tsrm_ls_cache(%%rip),%0"
2930-
: "=r" (ret));
2931-
tsrm_ls_cache_tcb_offset = ret;
2932-
#else
29332926
size_t *ti;
29342927
__asm__(
29352928
"leaq __tsrm_ls_cache(%%rip),%0"
29362929
: "=r" (ti));
29372930
tsrm_tls_offset = ti[2];
29382931
tsrm_tls_index = ti[1] * 8;
2939-
#endif
29402932
}
29412933
# elif defined(__GNUC__) && defined(__x86_64__)
29422934
tsrm_ls_cache_tcb_offset = tsrm_get_ls_cache_tcb_offset();

0 commit comments

Comments
 (0)