From b58a631942341b6ccb62ab400e862f404e22dbbf Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Tue, 1 Oct 2002 05:30:25 +0000 Subject: This commit contains a patch from Stefan Allius to change how uClibc handles _init and _fini, allowing shared lib constructors and destructors to initialize things in the correct sequence. Stefan ported the SH architecture. I then ported x86, arm, and mips. x86 and arm are working fine, but I don't think I quite got things correct for mips. --- ldso/ldso/sh/elfinterp.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'ldso/ldso/sh/elfinterp.c') diff --git a/ldso/ldso/sh/elfinterp.c b/ldso/ldso/sh/elfinterp.c index 3e0bb87be..d94389ef7 100644 --- a/ldso/ldso/sh/elfinterp.c +++ b/ldso/ldso/sh/elfinterp.c @@ -236,8 +236,7 @@ _dl_parse(struct elf_resolve *tpnt, struct dyn_elf *scope, } else if (res >0) { - _dl_dprintf(2, "%s: can't resolve symbol '%s'\n", - _dl_progname, strtab + symtab[symtab_index].st_name); + _dl_dprintf(2, "can't resolve symbol\n"); goof += res; } } @@ -289,17 +288,17 @@ _dl_do_reloc (struct elf_resolve *tpnt,struct dyn_elf *scope, /* handled later on */ break; case R_SH_DIR32: - *reloc_addr += symbol_addr + rpnt->r_addend; + *reloc_addr = symbol_addr + rpnt->r_addend; break; case R_SH_JMP_SLOT: *reloc_addr = symbol_addr + rpnt->r_addend; break; case R_SH_REL32: - *reloc_addr += rpnt->r_addend - - (unsigned long) tpnt->loadaddr; + *reloc_addr = symbol_addr + rpnt->r_addend - + (unsigned long) reloc_addr; break; case R_SH_RELATIVE: - *reloc_addr += (unsigned long) tpnt->loadaddr; + *reloc_addr = (unsigned long) tpnt->loadaddr + rpnt->r_addend; break; default: return -1; /*call _dl_exit(1) */ -- cgit v1.2.3