From 8de1a8131e42f96f8dcfbca9073896d249ff7d2c Mon Sep 17 00:00:00 2001 From: John Baldwin Date: Tue, 25 Jan 2022 11:38:34 -0800 Subject: [PATCH] libthr: Use TLS_TCB_* in _tcb_[cd]tor. This matches libc and rtld in using the alignment (TLS_TCB_ALIGN) from machine/tls.h instead of hardcoding 16. Reviewed by: kib Sponsored by: The University of Cambridge, Google Inc. Differential Revision: https://reviews.freebsd.org/D34023 --- lib/libthr/thread/thr_ctrdtr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libthr/thread/thr_ctrdtr.c b/lib/libthr/thread/thr_ctrdtr.c index 9d4301ef719f..9ce068072524 100644 --- a/lib/libthr/thread/thr_ctrdtr.c +++ b/lib/libthr/thread/thr_ctrdtr.c @@ -42,7 +42,7 @@ _tcb_ctor(struct pthread *thread, int initial) if (initial) tcb = _tcb_get(); else - tcb = _rtld_allocate_tls(NULL, sizeof(struct tcb), 16); + tcb = _rtld_allocate_tls(NULL, TLS_TCB_SIZE, TLS_TCB_ALIGN); if (tcb) tcb->tcb_thread = thread; return (tcb); @@ -52,5 +52,5 @@ void _tcb_dtor(struct tcb *tcb) { - _rtld_free_tls(tcb, sizeof(struct tcb), 16); + _rtld_free_tls(tcb, TLS_TCB_SIZE, TLS_TCB_ALIGN); }