X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fldso%2Fdynlink.c;h=6801d5fd6762f01f74ef894aadfdfa8598a3206e;hb=59f4086cb157ab15ab59474d7cfab3a5cb92c5bd;hp=08f9118d34b46a3a230ad9a06086932b0a04665a;hpb=87d13a4c33b8f75afac357f46341847ac92e2978;p=musl diff --git a/src/ldso/dynlink.c b/src/ldso/dynlink.c index 08f9118d..6801d5fd 100644 --- a/src/ldso/dynlink.c +++ b/src/ldso/dynlink.c @@ -22,8 +22,6 @@ static char errbuf[128]; #ifdef SHARED -#include "reloc.h" - #if ULONG_MAX == 0xffffffff typedef Elf32_Ehdr Ehdr; typedef Elf32_Phdr Phdr; @@ -68,6 +66,8 @@ struct dso { char buf[]; }; +#include "reloc.h" + void __init_ssp(size_t *); static struct dso *head, *tail, *libc; @@ -487,6 +487,9 @@ static void reloc_all(struct dso *p) for (; p; p=p->next) { if (p->relocated) continue; decode_vec(p->dynv, dyn, DYN_CNT); +#ifdef NEED_ARCH_RELOCS + do_arch_relocs(p, head); +#endif do_relocs(p, (void *)(p->base+dyn[DT_JMPREL]), dyn[DT_PLTRELSZ], 2+(dyn[DT_PLTREL]==DT_RELA)); do_relocs(p, (void *)(p->base+dyn[DT_REL]), dyn[DT_RELSZ], 2);