From: Rich Felker <dalias@aerifal.cx>
Date: Mon, 8 Oct 2012 00:19:11 +0000 (-0400)
Subject: fix breakage due to initializing thread pointer when loading libs
X-Git-Tag: v0.9.7~49
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=017bf140ffb41e9a016df84dc4c1806e0686b28a;p=oweals%2Fmusl.git

fix breakage due to initializing thread pointer when loading libs

at initial program load, all libraries must be loaded before the
thread pointer can be setup, since the TP-relative addresses of all
initial TLS objects must be constant.
---

diff --git a/src/ldso/dynlink.c b/src/ldso/dynlink.c
index 93cfb429..33ef7e55 100644
--- a/src/ldso/dynlink.c
+++ b/src/ldso/dynlink.c
@@ -533,7 +533,7 @@ static struct dso *load_library(const char *name)
 	/* Add a shortname only if name arg was not an explicit pathname. */
 	if (pathname != name) p->shortname = strrchr(p->name, '/')+1;
 	if (p->tls_image) {
-		if (!__pthread_self_init()) {
+		if (runtime && !__pthread_self_init()) {
 			free(p);
 			munmap(map, map_len);
 			return 0;