diff options
| author | Daan Leijen <daan@microsoft.com> | 2021-02-01 15:47:37 -0800 |
|---|---|---|
| committer | Daan Leijen <daan@microsoft.com> | 2021-02-01 15:47:37 -0800 |
| commit | ba84aa278388d439724b5376c7f86794a43023fa (patch) | |
| tree | ba455b602858c1c9f04dd59098b23b4e5e4c5755 /include/mimalloc-internal.h | |
| parent | 27627843648ef84aee1621976f25bee5946e6bda (diff) | |
| parent | a7c33a3b0eae509463bde8a492470472fad1ca39 (diff) | |
Merge branch 'dev' into dev-slice
Diffstat (limited to 'include/mimalloc-internal.h')
| -rw-r--r-- | include/mimalloc-internal.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/include/mimalloc-internal.h b/include/mimalloc-internal.h index 06d31db..9c898c4 100644 --- a/include/mimalloc-internal.h +++ b/include/mimalloc-internal.h @@ -831,7 +831,7 @@ static inline void* mi_tls_slot(size_t slot) mi_attr_noexcept { res = tcb[slot]; #elif defined(__aarch64__) void** tcb; UNUSED(ofs); -#if defined(__APPLE__) // issue #343 +#if defined(__APPLE__) // M1, issue #343 __asm__ volatile ("mrs %0, tpidrro_el0" : "=r" (tcb)); #else __asm__ volatile ("mrs %0, tpidr_el0" : "=r" (tcb)); @@ -858,7 +858,7 @@ static inline void mi_tls_slot_set(size_t slot, void* value) mi_attr_noexcept { tcb[slot] = value; #elif defined(__aarch64__) void** tcb; UNUSED(ofs); -#if defined(__APPLE__) // issue #343 +#if defined(__APPLE__) // M1, issue #343 __asm__ volatile ("mrs %0, tpidrro_el0" : "=r" (tcb)); #else __asm__ volatile ("mrs %0, tpidr_el0" : "=r" (tcb)); @@ -868,8 +868,13 @@ static inline void mi_tls_slot_set(size_t slot, void* value) mi_attr_noexcept { } static inline uintptr_t _mi_thread_id(void) mi_attr_noexcept { - // in all our targets, slot 0 is the pointer to the thread control block +#if defined(__aarch64__) && defined(__APPLE__) // M1 + // on macOS on the M1, slot 0 does not seem to work, so we fall back to portable C for now. See issue #354 + return (uintptr_t)&_mi_heap_default; +#else + // in all our other targets, slot 0 is the pointer to the thread control block return (uintptr_t)mi_tls_slot(0); +#endif } #else // otherwise use standard C |