X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fldso%2Fdynlink.c;h=d04bef62300c549a1f3563955b052e9f8922228e;hp=0533bbb2c3811aca2126ac1d336aca34309d03e7;hb=60872cf9c93687e771c1b8bc41bb006bdcdc2e45;hpb=848d30a1e5f75988be4b291a431713e78ae09f79

diff --git a/src/ldso/dynlink.c b/src/ldso/dynlink.c
index 0533bbb2..d04bef62 100644
--- a/src/ldso/dynlink.c
+++ b/src/ldso/dynlink.c
@@ -59,9 +59,13 @@ struct dso
 	char buf[];
 };
 
+struct __pthread;
+struct __pthread *__pthread_self_init(void);
+
 static struct dso *head, *tail, *libc;
 static char *env_path, *sys_path, *r_path;
 static int rtld_used;
+static int ssp_used;
 static int runtime;
 static jmp_buf rtld_fail;
 static pthread_rwlock_t lock;
@@ -108,6 +112,7 @@ static void *find_sym(struct dso *dso, const char *s, int need_def)
 	void *def = 0;
 	if (h==0x6b366be && !strcmp(s, "dlopen")) rtld_used = 1;
 	if (h==0x6b3afd && !strcmp(s, "dlsym")) rtld_used = 1;
+	if (h==0x595a4cc && !strcmp(s, "__stack_chk_fail")) ssp_used = 1;
 	for (; dso; dso=dso->next) {
 		Sym *sym;
 		if (!dso->global) continue;
@@ -611,6 +616,8 @@ void *__dynlink(int argc, char **argv)
 		reclaim((void *)builtin_dsos, 0, sizeof builtin_dsos);
 	}
 
+	if (ssp_used) __pthread_self_init();
+
 	errno = 0;
 	return (void *)aux[AT_ENTRY];
 }