X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fenv%2F__init_tls.c;h=b125eb1f543abd34b28524019bd7b8043977b1ca;hb=131276809fe3b7bed6086772bc5e3e9941dc6c6c;hp=0107a545f282a2cf6d4d1c3a40ee31e9fa0f6209;hpb=d56460c939c94a6c547abe8238f442b8de10bfbd;p=musl diff --git a/src/env/__init_tls.c b/src/env/__init_tls.c index 0107a545..b125eb1f 100644 --- a/src/env/__init_tls.c +++ b/src/env/__init_tls.c @@ -71,6 +71,9 @@ typedef Elf32_Phdr Phdr; typedef Elf64_Phdr Phdr; #endif +__attribute__((__weak__, __visibility__("hidden"))) +extern const size_t _DYNAMIC[]; + static void static_init_tls(size_t *aux) { unsigned char *p; @@ -83,6 +86,8 @@ static void static_init_tls(size_t *aux) phdr = (void *)p; if (phdr->p_type == PT_PHDR) base = aux[AT_PHDR] - phdr->p_vaddr; + if (phdr->p_type == PT_DYNAMIC && _DYNAMIC) + base = (size_t)_DYNAMIC - phdr->p_vaddr; if (phdr->p_type == PT_TLS) tls_phdr = phdr; }