diff options
| author | Marcel Moolenaar <marcel@FreeBSD.org> | 2006-08-31 19:42:39 +0000 |
|---|---|---|
| committer | Marcel Moolenaar <marcel@FreeBSD.org> | 2006-08-31 19:42:39 +0000 |
| commit | 862894168d5905ce0379a25b28e82aefa4dd0fba (patch) | |
| tree | 864e05759e18daebc6620487139393754d95f514 /libexec/rtld-elf | |
| parent | 07bf564cab8383f067bdaa3d188c1e820367b477 (diff) | |
Notes
Diffstat (limited to 'libexec/rtld-elf')
| -rw-r--r-- | libexec/rtld-elf/ia64/reloc.c | 2 | ||||
| -rw-r--r-- | libexec/rtld-elf/ia64/rtld_machdep.h | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/libexec/rtld-elf/ia64/reloc.c b/libexec/rtld-elf/ia64/reloc.c index a07aeb83ec91..a38afa8e62a8 100644 --- a/libexec/rtld-elf/ia64/reloc.c +++ b/libexec/rtld-elf/ia64/reloc.c @@ -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)); } diff --git a/libexec/rtld-elf/ia64/rtld_machdep.h b/libexec/rtld-elf/ia64/rtld_machdep.h index 21c3a8fd7a49..5cb8bc27acbd 100644 --- a/libexec/rtld-elf/ia64/rtld_machdep.h +++ b/libexec/rtld-elf/ia64/rtld_machdep.h @@ -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)) |