diff --git a/src/llvm-ptls.cpp b/src/llvm-ptls.cpp index c8d7ffbf0240b..a39a73c5393a2 100644 --- a/src/llvm-ptls.cpp +++ b/src/llvm-ptls.cpp @@ -329,7 +329,7 @@ bool LowerPTLS::run(bool *CFGModified) if (imaging_mode) { pgcstack_func_slot = create_aliased_global(T_pgcstack_getter, "jl_pgcstack_func_slot"); pgcstack_key_slot = create_aliased_global(getSizeTy(M->getContext()), "jl_pgcstack_key_slot"); // >= sizeof(jl_pgcstack_key_t) - pgcstack_offset = create_aliased_global(getSizeTy(M->getContext()), "jl_tls_offset"); + pgcstack_offset = create_aliased_global(getSizeTy(M->getContext()), "jl_tls_offset_image"); } need_init = false; } diff --git a/src/staticdata.c b/src/staticdata.c index f3725dc1508dc..2e84e72df3b42 100644 --- a/src/staticdata.c +++ b/src/staticdata.c @@ -481,7 +481,7 @@ static void jl_load_sysimg_so(void) jl_pgcstack_getkey((jl_get_pgcstack_func**)pgcstack_func_slot, (jl_pgcstack_key_t*)pgcstack_key_slot); size_t *tls_offset_idx; - jl_dlsym(jl_sysimg_handle, "jl_tls_offset", (void **)&tls_offset_idx, 1); + jl_dlsym(jl_sysimg_handle, "jl_tls_offset_image", (void **)&tls_offset_idx, 1); *tls_offset_idx = (uintptr_t)(jl_tls_offset == -1 ? 0 : jl_tls_offset); #ifdef _OS_WINDOWS_ @@ -3475,7 +3475,7 @@ JL_DLLEXPORT jl_value_t *jl_restore_package_image_from_file(const char *fname, j jl_pgcstack_getkey((jl_get_pgcstack_func**)pgcstack_func_slot, (jl_pgcstack_key_t*)pgcstack_key_slot); size_t *tls_offset_idx; - jl_dlsym(pkgimg_handle, "jl_tls_offset", (void **)&tls_offset_idx, 1); + jl_dlsym(pkgimg_handle, "jl_tls_offset_image", (void **)&tls_offset_idx, 1); *tls_offset_idx = (uintptr_t)(jl_tls_offset == -1 ? 0 : jl_tls_offset); }