diff options
| author | bapt <bapt@FreeBSD.org> | 2015-09-12 12:03:02 +0000 |
|---|---|---|
| committer | bapt <bapt@FreeBSD.org> | 2015-09-12 12:03:02 +0000 |
| commit | 934c5c6da6753f906bc4a905e249449fd15b850d (patch) | |
| tree | 38501bd60c958b3b5474368fc0834fe6d09c307a /libexec/rtld-elf/aarch64/rtld_machdep.h | |
| parent | ef64c24c72a0a1e4bc5beba3e1c3d78af363773d (diff) | |
| parent | ceb1e1488d523eff8fa06828cf0511fc2556c0ef (diff) | |
| download | FreeBSD-src-934c5c6da6753f906bc4a905e249449fd15b850d.zip FreeBSD-src-934c5c6da6753f906bc4a905e249449fd15b850d.tar.gz | |
Finish merging from head, messed up in previous attempt
Diffstat (limited to 'libexec/rtld-elf/aarch64/rtld_machdep.h')
| -rw-r--r-- | libexec/rtld-elf/aarch64/rtld_machdep.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libexec/rtld-elf/aarch64/rtld_machdep.h b/libexec/rtld-elf/aarch64/rtld_machdep.h index 1cb2029..943e3e6 100644 --- a/libexec/rtld-elf/aarch64/rtld_machdep.h +++ b/libexec/rtld-elf/aarch64/rtld_machdep.h @@ -64,12 +64,12 @@ Elf_Addr reloc_jmpslot(Elf_Addr *where, Elf_Addr target, #define round(size, align) \ (((size) + (align) - 1) & ~((align) - 1)) #define calculate_first_tls_offset(size, align) \ - round(size, align) + round(16, align) #define calculate_tls_offset(prev_offset, prev_size, size, align) \ - round((prev_offset) + (size), align) + round(prev_offset + prev_size, align) #define calculate_tls_end(off, size) ((off) + (size)) -#define TLS_TCB_SIZE 8 +#define TLS_TCB_SIZE 16 typedef struct { unsigned long ti_module; unsigned long ti_offset; |
