kiper220/mimalloc
1
0
Fork 0
mirror of https://github.com/microsoft/mimalloc.git synced 2025-05-05 06:59:32 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

build fix for Apple M1 (issue #354 and pr #356)

Browse source
This commit is contained in:
Daan Leijen 2021-02-02 10:46:30 -08:00
parent a7c33a3b0e
commit 331491e1e8
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/mimalloc-internal.h
View file

@ -324,10 +324,14 @@ static inline mi_heap_t** mi_tls_pthread_heap_slot(void) {
#elif defined(MI_TLS_PTHREAD) #elif defined(MI_TLS_PTHREAD)
#include <pthread.h> #include <pthread.h>
extern pthread_key_t _mi_heap_default_key; extern pthread_key_t _mi_heap_default_key;
#else
extern mi_decl_thread mi_heap_t* _mi_heap_default; // default heap to allocate from
#endif #endif
// Default heap to allocate from (if not using TLS- or pthread slots).
// Do not use this directly but use through `mi_heap_get_default()` (or the unchecked `mi_get_default_heap`).
// This thread local variable is only used when neither MI_TLS_SLOT, MI_TLS_PTHREAD, or MI_TLS_PTHREAD_SLOT_OFS are defined.
// However, on the Apple M1 we do use the address of this variable as the unique thread-id (issue #356).
extern mi_decl_thread mi_heap_t* _mi_heap_default; // default heap to allocate from
static inline mi_heap_t* mi_get_default_heap(void) { static inline mi_heap_t* mi_get_default_heap(void) {
#if defined(MI_TLS_SLOT) #if defined(MI_TLS_SLOT)
mi_heap_t* heap = (mi_heap_t*)mi_tls_slot(MI_TLS_SLOT); mi_heap_t* heap = (mi_heap_t*)mi_tls_slot(MI_TLS_SLOT);