#include <limits.h>
#include <sys/mman.h>
#include <string.h>
+#include <stddef.h>
#include "pthread_impl.h"
#include "libc.h"
#include "atomic.h"
#include "syscall.h"
+#ifndef SHARED
+static
+#endif
int __init_tp(void *p)
{
pthread_t td = p;
td->self = td;
- if (__set_thread_area(TP_ADJ(p)) < 0)
- return -1;
- td->tid = td->pid = __syscall(SYS_set_tid_address, &td->tid);
- td->errno_ptr = &td->errno_val;
- /* Currently, both of these predicates depend in the same thing:
- * successful initialization of the thread pointer. However, in
- * the future, we may support setups where setting the thread
- * pointer is possible but threads other than the main thread
- * cannot work, so it's best to keep the predicates separate. */
- libc.has_thread_pointer = 1;
- libc.can_do_threads = 1;
+ int r = __set_thread_area(TP_ADJ(p));
+ if (r < 0) return -1;
+ if (!r) libc.can_do_threads = 1;
+ td->tid = __syscall(SYS_set_tid_address, &td->tid);
+ td->locale = &libc.global_locale;
+ td->robust_list.head = &td->robust_list.head;
return 0;
}
#ifndef SHARED
-static long long builtin_tls[(sizeof(struct pthread) + 64)/sizeof(long long)];
+static struct builtin_tls {
+ char c;
+ struct pthread pt;
+ void *space[16];
+} builtin_tls[1];
+#define MIN_TLS_ALIGN offsetof(struct builtin_tls, pt)
struct tls_image {
void *image;
size_t len, size, align;
-} __static_tls ATTR_LIBC_VISIBILITY;
+} __static_tls;
#define T __static_tls
td = (pthread_t)mem;
mem -= T.size;
#endif
- td->dtv = dtv;
+ td->dtv = td->dtv_copy = dtv;
dtv[1] = mem;
memcpy(mem, T.image, T.len);
return td;
}
-void *__tls_get_addr(size_t *v)
-{
- return (char *)__pthread_self()->dtv[1]+v[1];
-}
-
-void *__mmap(void *, size_t, int, int, int, off_t);
-
#if ULONG_MAX == 0xffffffff
typedef Elf32_Phdr Phdr;
#else
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)
}
T.size += (-T.size - (uintptr_t)T.image) & (T.align-1);
- if (T.align < 4*sizeof(size_t)) T.align = 4*sizeof(size_t);
+ 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
+#define SYS_mmap2 SYS_mmap
+#endif
mem = (void *)__syscall(
-#ifdef SYS_mmap2
SYS_mmap2,
-#else
- SYS_mmap,
-#endif
0, libc.tls_size, PROT_READ|PROT_WRITE,
MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);
/* -4095...-1 cast to void * will crash on dereference anyway,
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