diff options
| author | Eric Andersen <andersen@codepoet.org> | 2004-02-05 01:54:33 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2004-02-05 01:54:33 +0000 |
| commit | 5f84e5c3f3c2c58b1ac48a564bd4ddee8191650a (patch) | |
| tree | 66f66c4abd21e9ebc0775074e76b79dc76ff1ab0 /ldso/ldso/mips/elfinterp.c | |
| parent | 192098126ca421fb4ebecae10698bb6298697e08 (diff) | |
Fixup a badly merged update
-Erik
Diffstat (limited to 'ldso/ldso/mips/elfinterp.c')
| -rw-r--r-- | ldso/ldso/mips/elfinterp.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/ldso/ldso/mips/elfinterp.c b/ldso/ldso/mips/elfinterp.c index 9f1e6839e..59eca691b 100644 --- a/ldso/ldso/mips/elfinterp.c +++ b/ldso/ldso/mips/elfinterp.c @@ -156,7 +156,7 @@ void _dl_parse_lazy_relocation_information(struct dyn_elf *rpnt, unsigned long rel_addr, unsigned long rel_size, int type) { /* Nothing to do */ - return 0; + return; } int _dl_parse_copy_information(struct dyn_elf *rpnt, @@ -167,17 +167,20 @@ int _dl_parse_copy_information(struct dyn_elf *rpnt, } -int _dl_parse_relocation_information(struct dyn_elf *rpnt, +int _dl_parse_relocation_information(struct dyn_elf *xpnt, unsigned long rel_addr, unsigned long rel_size, int type) { Elf32_Sym *symtab; Elf32_Rel *rpnt; char *strtab; unsigned long *got; - unsigned long *reloc_addr=NULL, old_val=0; + unsigned long *reloc_addr=NULL; unsigned long symbol_addr; int i, reloc_type, symtab_index; - struct elf_resolve *tpnt = rpnt->dyn; + struct elf_resolve *tpnt = xpnt->dyn; +#if defined (__SUPPORT_LD_DEBUG__) + unsigned long old_val=0; +#endif /* Now parse the relocation information */ rel_size = rel_size / sizeof(Elf32_Rel); |