TLS (GNU/C11 thread-local storage) support for static-linked programs

[musl] / src / ldso / dynlink.c

diff --git a/src/ldso/dynlink.c b/src/ldso/dynlink.c
index 960e089..1447e20 100644 (file)
--- a/src/ldso/dynlink.c
+++ b/src/ldso/dynlink.c
@@ -17,6 +17,9 @@
 #include <pthread.h>
 #include <ctype.h>
 #include <dlfcn.h>
+#include "pthread_impl.h"
+#include "libc.h"
+#undef libc
 
 static int errflag;
 static char errbuf[128];
@@ -788,6 +791,8 @@ void *__dynlink(int argc, char **argv)
        debug.state = 0;
        _dl_debug_state();
 
+       /* Stand-in until real TLS support is added to dynamic linker */
+       __libc.tls_size = sizeof(struct pthread) + 4*sizeof(size_t);
        if (ssp_used) __init_ssp(auxv);
 
        do_init_fini(tail);
@@ -802,6 +807,11 @@ void *__dynlink(int argc, char **argv)
        return (void *)aux[AT_ENTRY];
 }
 
+void *__copy_tls(unsigned char *mem, size_t cnt)
+{
+       return mem;
+}
+
 void *dlopen(const char *file, int mode)
 {
        struct dso *volatile p, *orig_tail = tail, *next;