Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/jloptions.c
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ uint64_t parse_heap_size_option(const char *optarg, const char *option_name, int

static int jl_options_initialized = 0;

JL_DLLEXPORT void jl_init_options(void)
JL_DLLEXPORT void jl_init_options(void) JL_NOTSAFEPOINT
{
if (jl_options_initialized)
return;
Expand Down
2 changes: 1 addition & 1 deletion src/julia_internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -1357,7 +1357,7 @@ jl_task_t *jl_init_root_task(jl_ptls_t ptls, void *stack_lo, void *stack_hi) JL_
void jl_init_serializer(void) JL_CANSAFEPOINT;
void jl_init_uv(void) JL_NOTSAFEPOINT;
void jl_init_box_caches(void) JL_NOTSAFEPOINT;
JL_DLLEXPORT void jl_init_options(void);
JL_DLLEXPORT void jl_init_options(void) JL_NOTSAFEPOINT;

void jl_set_base_ctx(char *__stk);

Expand Down
3 changes: 3 additions & 0 deletions src/threading.c
Original file line number Diff line number Diff line change
Expand Up @@ -487,6 +487,9 @@ JL_DLLEXPORT jl_gcframe_t **jl_autoinit_and_adopt_thread(void) JL_CANSAFEPOINT_E
" (this should not happen, please file a bug report)\n");
exit(1);
}
// normally done by the libjulia loader, but there is none when the
// runtime is linked statically into the image
jl_init_options();
jl_init_with_image_handle(handle);
return &jl_get_current_task()->gcstack;
}
Expand Down