Replace magic 16 with TLS_TCB_SIZE.
This commit is contained in:
parent
07bf564cab
commit
862894168d
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=161783
@ -603,7 +603,7 @@ allocate_initial_tls(Obj_Entry *list)
|
||||
*/
|
||||
tls_static_space = tls_last_offset + tls_last_size + RTLD_STATIC_TLS_EXTRA;
|
||||
|
||||
tpval = allocate_tls(list, 0, 16, 16);
|
||||
tpval = allocate_tls(list, 0, TLS_TCB_SIZE, 16);
|
||||
__asm __volatile("mov r13 = %0" :: "r"(tpval));
|
||||
}
|
||||
|
||||
|
@ -55,10 +55,12 @@ Elf_Addr reloc_jmpslot(Elf_Addr *, Elf_Addr, const struct Struct_Obj_Entry *,
|
||||
void *make_function_pointer(const Elf_Sym *, const struct Struct_Obj_Entry *);
|
||||
void call_initfini_pointer(const struct Struct_Obj_Entry *, Elf_Addr);
|
||||
|
||||
#define TLS_TCB_SIZE 16
|
||||
|
||||
#define round(size, align) \
|
||||
(((size) + (align) - 1) & ~((align) - 1))
|
||||
#define calculate_first_tls_offset(size, align) \
|
||||
round(16, align)
|
||||
round(TLS_TCB_SIZE, align)
|
||||
#define calculate_tls_offset(prev_offset, prev_size, size, align) \
|
||||
round(prev_offset + prev_size, align)
|
||||
#define calculate_tls_end(off, size) ((off) + (size))
|
||||
|
Loading…
Reference in New Issue
Block a user