diff options
| author | marcel <marcel@FreeBSD.org> | 2006-08-31 19:42:39 +0000 |
|---|---|---|
| committer | marcel <marcel@FreeBSD.org> | 2006-08-31 19:42:39 +0000 |
| commit | 6defe18053e4648754b91d7c4f5c3b738f3e6461 (patch) | |
| tree | 864e05759e18daebc6620487139393754d95f514 /libexec | |
| parent | 1c0796f6da3c105f3f9caf33670d9418e75381d7 (diff) | |
| download | FreeBSD-src-6defe18053e4648754b91d7c4f5c3b738f3e6461.zip FreeBSD-src-6defe18053e4648754b91d7c4f5c3b738f3e6461.tar.gz | |
Replace magic 16 with TLS_TCB_SIZE.
Diffstat (limited to 'libexec')
| -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 a07aeb8..a38afa8 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 21c3a8f..5cb8bc2 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)) |
