X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fldso%2Fdynlink.c;h=a6dbaf0187c1dce0a40c1afceea7f01e0f05c6c2;hp=5353979e31b1ecf4b39b4db1ce3cad38b0613a3c;hb=0a1c2c1c1755d03d7d3db11df612bbe7c5b69c46;hpb=c62b9f39803221e250a490275f4cb23e9f737a6d

diff --git a/src/ldso/dynlink.c b/src/ldso/dynlink.c
index 5353979e..a6dbaf01 100644
--- a/src/ldso/dynlink.c
+++ b/src/ldso/dynlink.c
@@ -539,10 +539,16 @@ static struct dso *load_library(const char *name)
 		}
 		p->tls_id = ++tls_cnt;
 		tls_align = MAXP2(tls_align, p->tls_align);
+#ifdef TLS_ABOVE_TP
+		p->tls_offset = tls_offset + ( (tls_align-1) &
+			-(tls_offset + (uintptr_t)p->tls_image) );
+		tls_offset += p->tls_size;
+#else
 		tls_offset += p->tls_size + p->tls_align - 1;
 		tls_offset -= (tls_offset + (uintptr_t)p->tls_image)
 			& (p->tls_align-1);
 		p->tls_offset = tls_offset;
+#endif
 		p->new_dtv = (void *)(-sizeof(size_t) &
 			(uintptr_t)(p->name+strlen(p->name)+sizeof(size_t)));
 		p->new_tls = (void *)(p->new_dtv + n_th*(tls_cnt+1));
@@ -697,6 +703,18 @@ void *__copy_tls(unsigned char *mem)
 	void **dtv = (void *)mem;
 	dtv[0] = (void *)tls_cnt;
 
+#ifdef TLS_ABOVE_TP
+	mem += sizeof(void *) * (tls_cnt+1);
+	mem += -((uintptr_t)mem + sizeof(struct pthread)) & (tls_align-1);
+	td = (pthread_t)mem;
+	mem += sizeof(struct pthread);
+
+	for (p=head; p; p=p->next) {
+		if (!p->tls_id) continue;
+		dtv[p->tls_id] = mem + p->tls_offset;
+		memcpy(dtv[p->tls_id], p->tls_image, p->tls_len);
+	}
+#else
 	mem += libc.tls_size - sizeof(struct pthread);
 	mem -= (uintptr_t)mem & (tls_align-1);
 	td = (pthread_t)mem;
@@ -706,6 +724,7 @@ void *__copy_tls(unsigned char *mem)
 		dtv[p->tls_id] = mem - p->tls_offset;
 		memcpy(dtv[p->tls_id], p->tls_image, p->tls_len);
 	}
+#endif
 	td->dtv = dtv;
 	return td;
 }
@@ -753,9 +772,12 @@ void *__tls_get_addr(size_t *v)
 
 static void update_tls_size()
 {
-	size_t below_tp = (1+tls_cnt) * sizeof(void *) + tls_offset;
-	size_t above_tp = sizeof(struct pthread) + tls_align;
-	libc.tls_size = ALIGN(below_tp + above_tp, tls_align);
+	libc.tls_size = ALIGN(
+		(1+tls_cnt) * sizeof(void *) +
+		tls_offset +
+		sizeof(struct pthread) +
+		tls_align * 2,
+	tls_align);
 }
 
 void *__dynlink(int argc, char **argv)
@@ -866,9 +888,16 @@ void *__dynlink(int argc, char **argv)
 	}
 	if (app->tls_size) {
 		app->tls_id = tls_cnt = 1;
+#ifdef TLS_ABOVE_TP
+		app->tls_offset = 0;
+		tls_offset = app->tls_size
+			+ ( -((uintptr_t)app->tls_image + app->tls_size)
+			& (app->tls_align-1) );
+#else
 		tls_offset = app->tls_offset = app->tls_size
 			+ ( -((uintptr_t)app->tls_image + app->tls_size)
 			& (app->tls_align-1) );
+#endif
 		tls_align = MAXP2(tls_align, app->tls_align);
 	}
 	app->global = 1;
@@ -1051,12 +1080,17 @@ static void *do_dlsym(struct dso *p, const char *s, void *ra)
 	uint32_t h = 0, gh = 0;
 	Sym *sym;
 	if (p == head || p == RTLD_DEFAULT || p == RTLD_NEXT) {
-		if (p == RTLD_NEXT) {
+		if (p == RTLD_DEFAULT) {
+			p = head;
+		} else if (p == RTLD_NEXT) {
 			for (p=head; p && (unsigned char *)ra-p->map>p->map_len; p=p->next);
 			if (!p) p=head;
+			p = p->next;
 		}
-		struct symdef def = find_sym(p->next, s, 0);
+		struct symdef def = find_sym(p, s, 0);
 		if (!def.sym) goto failed;
+		if ((def.sym->st_info&0xf) == STT_TLS)
+			return __tls_get_addr((size_t []){def.dso->tls_id, def.sym->st_value});
 		return def.dso->base + def.sym->st_value;
 	}
 	if (p->ghashtab) {
@@ -1066,6 +1100,8 @@ static void *do_dlsym(struct dso *p, const char *s, void *ra)
 		h = sysv_hash(s);
 		sym = sysv_lookup(s, h, p);
 	}
+	if (sym && (sym->st_info&0xf) == STT_TLS)
+		return __tls_get_addr((size_t []){p->tls_id, sym->st_value});
 	if (sym && sym->st_value && (1<<(sym->st_info&0xf) & OK_TYPES))
 		return p->base + sym->st_value;
 	if (p->deps) for (i=0; p->deps[i]; i++) {
@@ -1076,6 +1112,8 @@ static void *do_dlsym(struct dso *p, const char *s, void *ra)
 			if (!h) h = sysv_hash(s);
 			sym = sysv_lookup(s, h, p->deps[i]);
 		}
+		if (sym && (sym->st_info&0xf) == STT_TLS)
+			return __tls_get_addr((size_t []){p->deps[i]->tls_id, sym->st_value});
 		if (sym && sym->st_value && (1<<(sym->st_info&0xf) & OK_TYPES))
 			return p->deps[i]->base + sym->st_value;
 	}