This is a temporary experimental fix.
Signed-off-by: Carmelo Amoroso <[email protected]>
---
ldso/ldso/dl-elf.c | 4 +---
ldso/ldso/dl-startup.c | 4 +---
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/ldso/ldso/dl-elf.c b/ldso/ldso/dl-elf.c
index b9de199..09857ef 100644
--- a/ldso/ldso/dl-elf.c
+++ b/ldso/ldso/dl-elf.c
@@ -954,11 +954,9 @@ int _dl_fixup(struct dyn_elf *rpnt, struct r_scope_elem
*scope, int now_flag)
relative_count = tpnt->dynamic_info[DT_RELCONT_IDX];
if (relative_count) { /* Optimize the XX_RELATIVE relocations
if possible */
reloc_size -= relative_count * sizeof(ELF_RELOC);
- if (tpnt->loadaddr
#ifdef __LDSO_PRELINK_SUPPORT__
- || (!tpnt->dynamic_info[DT_GNU_PRELINKED_IDX])
+ if (tpnt->loadaddr ||
(!tpnt->dynamic_info[DT_GNU_PRELINKED_IDX]))
#endif
- )
elf_machine_relative(tpnt->loadaddr,
reloc_addr, relative_count);
reloc_addr += relative_count * sizeof(ELF_RELOC);
}
diff --git a/ldso/ldso/dl-startup.c b/ldso/ldso/dl-startup.c
index 75ea564..8044ba4 100644
--- a/ldso/ldso/dl-startup.c
+++ b/ldso/ldso/dl-startup.c
@@ -278,11 +278,9 @@ DL_START(unsigned long args)
if (!indx && relative_count) {
rel_size -= relative_count * sizeof(ELF_RELOC);
- if (load_addr
#ifdef __LDSO_PRELINK_SUPPORT__
- ||
!tpnt->dynamic_info[DT_GNU_PRELINKED_IDX]
+ if (load_addr ||
!tpnt->dynamic_info[DT_GNU_PRELINKED_IDX])
#endif
- )
elf_machine_relative(load_addr,
rel_addr, relative_count);
rel_addr += relative_count * sizeof(ELF_RELOC);
}
--
1.7.4.4
_______________________________________________
uClibc mailing list
[email protected]
http://lists.busybox.net/mailman/listinfo/uclibc
