fix misalignment of dtv in static-linked programs with odd-sized TLS

[musl] / src / env / __init_tls.c

diff --git a/src/env/__init_tls.c b/src/env/__init_tls.c
index ac4d9e7..73551e6 100644 (file)
--- a/src/env/__init_tls.c
+++ b/src/env/__init_tls.c
@@ -8,6 +8,9 @@
 #include "atomic.h"
 #include "syscall.h"
 
+#ifndef SHARED
+static
+#endif
 int __init_tp(void *p)
 {
        pthread_t td = p;
@@ -15,7 +18,6 @@ int __init_tp(void *p)
        int r = __set_thread_area(TP_ADJ(p));
        if (r < 0) return -1;
        if (!r) libc.can_do_threads = 1;
-       libc.has_thread_pointer = 1;
        td->tid = __syscall(SYS_set_tid_address, &td->tid);
        td->locale = &libc.global_locale;
        td->robust_list.head = &td->robust_list.head;
@@ -34,7 +36,7 @@ static struct builtin_tls {
 struct tls_image {
        void *image;
        size_t len, size, align;
-} __static_tls ATTR_LIBC_VISIBILITY;
+} __static_tls;
 
 #define T __static_tls
 
@@ -75,8 +77,6 @@ void __init_tls(size_t *aux)
        size_t base = 0;
        void *mem;
 
-       libc.tls_size = sizeof(struct pthread);
-
        for (p=(void *)aux[AT_PHDR],n=aux[AT_PHNUM]; n; n--,p+=aux[AT_PHENT]) {
                phdr = (void *)p;
                if (phdr->p_type == PT_PHDR)
@@ -95,7 +95,8 @@ void __init_tls(size_t *aux)
        T.size += (-T.size - (uintptr_t)T.image) & (T.align-1);
        if (T.align < MIN_TLS_ALIGN) T.align = MIN_TLS_ALIGN;
 
-       libc.tls_size = 2*sizeof(void *)+T.size+T.align+sizeof(struct pthread);
+       libc.tls_size = 2*sizeof(void *)+T.size+T.align+sizeof(struct pthread)
+               + MIN_TLS_ALIGN-1 & -MIN_TLS_ALIGN;
 
        if (libc.tls_size > sizeof builtin_tls) {
 #ifndef SYS_mmap2
@@ -112,8 +113,8 @@ void __init_tls(size_t *aux)
                mem = builtin_tls;
        }
 
-       /* Failure to initialize thread pointer is fatal if TLS is used. */
-       if (__init_tp(__copy_tls(mem)) < 0 && tls_phdr)
+       /* Failure to initialize thread pointer is always fatal. */
+       if (__init_tp(__copy_tls(mem)) < 0)
                a_crash();
 }
 #else