diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2009-07-23 04:58:56 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2009-07-23 05:41:21 -0400 |
| commit | 3acdf4fa294ca935d384762da91b3a37dabb59ca (patch) | |
| tree | 7fed16d5166ae61e9a263964a23e45c06759b1ad | |
| parent | d1031c7f8eba1bb65501144451bd9f1f2af5d8d9 (diff) | |
ldso: fix building for FDPIC systems
The force shareable code missed a spot of using the DL_RELOC_ADDR()
indirection thus leading to invalid operands:
ldso/ldso/ldso.c: In function '_dl_get_ready_to_run':
ldso/ldso/ldso.c:409: error: invalid operands to binary +
(have 'Elf32_Addr' and 'struct elf32_fdpic_loadaddr')
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| -rw-r--r-- | ldso/ldso/ldso.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ldso/ldso/ldso.c b/ldso/ldso/ldso.c index 19a9fae6e..786775a44 100644 --- a/ldso/ldso/ldso.c +++ b/ldso/ldso/ldso.c @@ -406,7 +406,7 @@ void _dl_get_ready_to_run(struct elf_resolve *tpnt, DL_LOADADDR_TYPE load_addr, for (i = 0; i < auxvt[AT_PHNUM].a_un.a_val; i++, ppnt++) { if (ppnt->p_type == PT_LOAD && !(ppnt->p_flags & PF_W)) _dl_mprotect((void *) (DL_RELOC_ADDR(app_tpnt->loadaddr, ppnt->p_vaddr) & PAGE_ALIGN), - ((ppnt->p_vaddr + app_tpnt->loadaddr) & ADDR_ALIGN) + + (DL_RELOC_ADDR(app_tpnt->loadaddr, ppnt->p_vaddr) & ADDR_ALIGN) + (unsigned long) ppnt->p_filesz, PROT_READ | PROT_WRITE | PROT_EXEC); } |