Skip to content

Commit ad9b54f

Browse files
authored
rename jl_tls_offset in sysimage to avoid naming clash with libjulia-internal (#49442)
1 parent 0a374d5 commit ad9b54f

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/llvm-ptls.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ bool LowerPTLS::run(bool *CFGModified)
329329
if (imaging_mode) {
330330
pgcstack_func_slot = create_aliased_global(T_pgcstack_getter, "jl_pgcstack_func_slot");
331331
pgcstack_key_slot = create_aliased_global(getSizeTy(M->getContext()), "jl_pgcstack_key_slot"); // >= sizeof(jl_pgcstack_key_t)
332-
pgcstack_offset = create_aliased_global(getSizeTy(M->getContext()), "jl_tls_offset");
332+
pgcstack_offset = create_aliased_global(getSizeTy(M->getContext()), "jl_tls_offset_image");
333333
}
334334
need_init = false;
335335
}

src/staticdata.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,7 @@ static void jl_load_sysimg_so(void)
481481
jl_pgcstack_getkey((jl_get_pgcstack_func**)pgcstack_func_slot, (jl_pgcstack_key_t*)pgcstack_key_slot);
482482

483483
size_t *tls_offset_idx;
484-
jl_dlsym(jl_sysimg_handle, "jl_tls_offset", (void **)&tls_offset_idx, 1);
484+
jl_dlsym(jl_sysimg_handle, "jl_tls_offset_image", (void **)&tls_offset_idx, 1);
485485
*tls_offset_idx = (uintptr_t)(jl_tls_offset == -1 ? 0 : jl_tls_offset);
486486

487487
#ifdef _OS_WINDOWS_
@@ -3475,7 +3475,7 @@ JL_DLLEXPORT jl_value_t *jl_restore_package_image_from_file(const char *fname, j
34753475
jl_pgcstack_getkey((jl_get_pgcstack_func**)pgcstack_func_slot, (jl_pgcstack_key_t*)pgcstack_key_slot);
34763476

34773477
size_t *tls_offset_idx;
3478-
jl_dlsym(pkgimg_handle, "jl_tls_offset", (void **)&tls_offset_idx, 1);
3478+
jl_dlsym(pkgimg_handle, "jl_tls_offset_image", (void **)&tls_offset_idx, 1);
34793479
*tls_offset_idx = (uintptr_t)(jl_tls_offset == -1 ? 0 : jl_tls_offset);
34803480
}
34813481

0 commit comments

Comments
 (0)