about summary refs log tree commit diff
path: root/sysdeps/generic/libc-tls.c
diff options
context:
space:
mode:
Diffstat (limited to 'sysdeps/generic/libc-tls.c')
-rw-r--r--sysdeps/generic/libc-tls.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/sysdeps/generic/libc-tls.c b/sysdeps/generic/libc-tls.c
index af8b8868d4..cc56a44022 100644
--- a/sysdeps/generic/libc-tls.c
+++ b/sysdeps/generic/libc-tls.c
@@ -162,11 +162,15 @@ __libc_setup_tls (size_t tcbsize, size_t tcbalign)
   GL(dl_tls_dtv_slotinfo_list) = &static_slotinfo.si;
 
   /* That is the size of the TLS memory for this object.  */
+  GL(dl_tls_static_size) = (roundup (memsz, align ?: 1)
 # if TLS_TCB_AT_TP
-  GL(dl_tls_static_size) = roundup (memsz, align ?: 1) + tcbsize;
-#else
-  GL(dl_tls_static_size) = roundup (memsz, align ?: 1);
-#endif
+			    + tcbsize
+# endif
+			    );
+  /* The alignment requirement for the static TLS block.  */
+  GL(dl_tls_static_align) = MAX (TLS_TCB_ALIGN, max_align);
+  /* Number of elements in the static TLS block.  */
+  GL(dl_tls_static_nelem) = GL(dl_tls_max_dtv_idx);
 }