The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=299617496cc3c525a63833894fd8dbdc4e5de6a7
commit 299617496cc3c525a63833894fd8dbdc4e5de6a7 Author: John Baldwin <[email protected]> AuthorDate: 2021-12-09 21:16:45 +0000 Commit: John Baldwin <[email protected]> CommitDate: 2021-12-09 21:16:45 +0000 amd64: Allocate TCB with alignment of 16 rather than 8. This matches the TLS_TCB_ALIGN definition in libc. Reviewed by: kib, jrtc27 Sponsored by: The University of Cambridge, Google Inc. Differential Revision: https://reviews.freebsd.org/D33349 --- libexec/rtld-elf/amd64/reloc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/rtld-elf/amd64/reloc.c b/libexec/rtld-elf/amd64/reloc.c index 1fec863c063b..62547f1bb4a2 100644 --- a/libexec/rtld-elf/amd64/reloc.c +++ b/libexec/rtld-elf/amd64/reloc.c @@ -530,7 +530,7 @@ allocate_initial_tls(Obj_Entry *objs) */ tls_static_space = tls_last_offset + RTLD_STATIC_TLS_EXTRA; - addr = allocate_tls(objs, 0, 3 * sizeof(Elf_Addr), sizeof(Elf_Addr)); + addr = allocate_tls(objs, 0, 3 * sizeof(Elf_Addr), 16); if (__getosreldate() >= P_OSREL_WRFSBASE && (cpu_stdext_feature & CPUID_STDEXT_FSGSBASE) != 0) wrfsbase((uintptr_t)addr);
