[*] always link to the aurora runtime heap

This commit is contained in:
Reece Wilson 2023-08-26 21:56:01 +01:00
parent 18c0ff282b
commit ff62c6ffea
2 changed files with 9 additions and 2 deletions

View File

@ -292,7 +292,13 @@ We try to circumvent this in an efficient way:
extern const mi_heap_t _mi_heap_empty; // read-only empty heap, initial value of the thread local default heap extern const mi_heap_t _mi_heap_empty; // read-only empty heap, initial value of the thread local default heap
extern bool _mi_process_is_initialized; extern bool _mi_process_is_initialized;
mi_heap_t* _mi_heap_main_get(void); // statically allocated main backing heap #if defined (MI_TLS_RECURSE_GUARD_HOST)
#define MI_MAIN_VIS __declspec(dllexport)
#else
#define MI_MAIN_VIS
#endif
MI_MAIN_VIS mi_heap_t *_mi_heap_main_get(void); // statically allocated main backing heap
#if defined(MI_MALLOC_OVERRIDE) #if defined(MI_MALLOC_OVERRIDE)
#if defined(__MACH__) // OSX #if defined(__MACH__) // OSX

View File

@ -148,11 +148,12 @@ static void mi_heap_main_init(void) {
} }
} }
#if defined(MI_TLS_RECURSE_GUARD_HOST) || !defined(MI_TLS_RECURSE_GUARD)
mi_heap_t* _mi_heap_main_get(void) { mi_heap_t* _mi_heap_main_get(void) {
mi_heap_main_init(); mi_heap_main_init();
return &_mi_heap_main; return &_mi_heap_main;
} }
#endif
/* ----------------------------------------------------------- /* -----------------------------------------------------------
Initialization and freeing of the thread local heaps Initialization and freeing of the thread local heaps