diff options
Diffstat (limited to 'ldso/ldso/ldso.c')
| -rw-r--r-- | ldso/ldso/ldso.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/ldso/ldso/ldso.c b/ldso/ldso/ldso.c index 0b0cb1389..71fadd4dd 100644 --- a/ldso/ldso/ldso.c +++ b/ldso/ldso/ldso.c @@ -172,13 +172,8 @@ void _dl_get_ready_to_run(struct elf_resolve *tpnt, struct elf_resolve *app_tpnt ppnt = (ElfW(Phdr) *) auxvt[AT_PHDR].a_un.a_ptr; for (i = 0; i < auxvt[AT_PHNUM].a_un.a_val; i++, ppnt++) { if (ppnt->p_type == PT_LOAD) { -#ifndef __UCLIBC_PIE_SUPPORT__ - if (ppnt->p_vaddr + ppnt->p_memsz > brk_addr) - brk_addr = ppnt->p_vaddr + ppnt->p_memsz; -#else if (ppnt->p_vaddr + app_tpnt->loadaddr + ppnt->p_memsz > brk_addr) brk_addr = ppnt->p_vaddr + app_tpnt->loadaddr + ppnt->p_memsz; -#endif } if (ppnt->p_type == PT_DYNAMIC) { #ifndef ALLOW_ZERO_PLTGOT @@ -187,13 +182,8 @@ void _dl_get_ready_to_run(struct elf_resolve *tpnt, struct elf_resolve *app_tpnt continue; #endif /* OK, we have what we need - slip this one into the list. */ -#ifndef __UCLIBC_PIE_SUPPORT__ - app_tpnt = _dl_add_elf_hash_table("", 0, - app_tpnt->dynamic_info, ppnt->p_vaddr, ppnt->p_filesz); -#else app_tpnt = _dl_add_elf_hash_table("", (char *)app_tpnt->loadaddr, app_tpnt->dynamic_info, ppnt->p_vaddr + app_tpnt->loadaddr, ppnt->p_filesz); -#endif _dl_loaded_modules->libtype = elf_executable; _dl_loaded_modules->ppnt = (ElfW(Phdr) *) auxvt[AT_PHDR].a_un.a_ptr; _dl_loaded_modules->n_phent = auxvt[AT_PHNUM].a_un.a_val; @@ -202,11 +192,7 @@ void _dl_get_ready_to_run(struct elf_resolve *tpnt, struct elf_resolve *app_tpnt rpnt->dyn = _dl_loaded_modules; app_tpnt->usage_count++; app_tpnt->symbol_scope = _dl_symbol_tables; -#ifndef __UCLIBC_PIE_SUPPORT__ - lpnt = (unsigned long *) (app_tpnt->dynamic_info[DT_PLTGOT]); -#else lpnt = (unsigned long *) (app_tpnt->dynamic_info[DT_PLTGOT] + app_tpnt->loadaddr); -#endif #ifdef ALLOW_ZERO_PLTGOT if (lpnt) #endif |