Skip to content

Commit

Permalink
update comments, set constructor priority to 101 on macOS
Browse files Browse the repository at this point in the history
  • Loading branch information
daanx committed Oct 28, 2024
1 parent 3cba10e commit f126b50
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 11 deletions.
4 changes: 2 additions & 2 deletions src/prim/osx/alloc-override-zone.c
Original file line number Diff line number Diff line change
Expand Up @@ -418,9 +418,9 @@ static inline malloc_zone_t* mi_get_default_zone(void)
}

#if defined(__clang__)
__attribute__((constructor(0)))
__attribute__((constructor(101))) // highest priority
#else
__attribute__((constructor)) // seems not supported by g++-11 on the M1
__attribute__((constructor)) // priority level is not supported by gcc
#endif
__attribute__((used))
static void _mi_macos_override_malloc(void) {
Expand Down
10 changes: 1 addition & 9 deletions src/prim/prim.c
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ terms of the MIT license. A copy of the license can be found in the file
}
#elif defined(__cplusplus)
// C++: use static initialization to detect process start/end
// This is not guaranteed to be first/last but the best we can generally do?
struct mi_init_done_t {
mi_init_done_t() {
_mi_process_load();
Expand All @@ -55,15 +56,6 @@ terms of the MIT license. A copy of the license can be found in the file
}
};
static mi_init_done_t mi_init_done;
/*
extern mi_heap_t _mi_heap_main;
static bool mi_process_attach(void) {
_mi_process_load();
atexit(&_mi_process_done);
return (_mi_heap_main.thread_id != 0);
}
static bool mi_initialized = mi_process_attach();
*/
#else
#pragma message("define a way to call _mi_process_load/done on your platform")
#endif
Expand Down

0 comments on commit f126b50

Please sign in to comment.