#include <elf.h>
#include <limits.h>
+#include <sys/mman.h>
+#include <string.h>
#include "pthread_impl.h"
#include "libc.h"
#include "atomic.h"
if (!image) return mem;
void **dtv = (void *)mem;
dtv[0] = (void *)1;
+#ifdef TLS_ABOVE_TP
+ mem += sizeof(void *) * 2;
+ mem += -((uintptr_t)mem + sizeof(struct pthread)) & (align-1);
+ td = (pthread_t)mem;
+ mem += sizeof(struct pthread);
+#else
mem += __libc.tls_size - sizeof(struct pthread);
mem -= (uintptr_t)mem & (align-1);
td = (pthread_t)mem;
td->dtv = dtv;
mem -= size;
+#endif
dtv[1] = mem;
memcpy(mem, image, len);
return td;
static void *simple(void *p)
{
*(void **)p = p;
- return __set_thread_area(p) ? 0 : p;
+ return __set_thread_area(TP_ADJ(p)) ? 0 : p;
}
weak_alias(simple, __install_initial_tls);
void __init_tls(size_t *aux)
{
unsigned char *p, *mem;
- size_t n, d;
+ size_t n;
Phdr *phdr, *tls_phdr=0;
size_t base = 0;
+ 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)