[uClibc-cvs] uClibc/ldso/ldso/cris elfinterp.c,1.5,1.6
Tobias Anderberg
tobiasa at uclibc.org
Tue Sep 30 11:51:15 UTC 2003
Update of /var/cvs/uClibc/ldso/ldso/cris
In directory winder:/tmp/cvs-serv30091
Modified Files:
elfinterp.c
Log Message:
Don't forget addend on relocations + minor other fixes.
Index: elfinterp.c
===================================================================
RCS file: /var/cvs/uClibc/ldso/ldso/cris/elfinterp.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- elfinterp.c 19 Sep 2003 12:12:29 -0000 1.5
+++ elfinterp.c 30 Sep 2003 11:51:11 -0000 1.6
@@ -123,7 +123,7 @@
rel_addr = (char *) (tpnt->dynamic_info[DT_JMPREL] + tpnt->loadaddr);
- this_reloc = (ELF_RELOC *) (intptr_t)(rel_addr + (reloc_entry >> 3));
+ this_reloc = (ELF_RELOC *) (intptr_t)(rel_addr + reloc_entry);
reloc_type = ELF32_R_TYPE(this_reloc->r_info);
symtab_index = ELF32_R_SYM(this_reloc->r_info);
@@ -255,8 +255,14 @@
symname = strtab + symtab[symtab_index].st_name;
if (symtab_index) {
- symbol_addr = (unsigned long) _dl_find_hash(symname, scope,
- (reloc_type == R_CRIS_JUMP_SLOT ? tpnt : NULL), symbolrel);
+ if (symtab[symtab_index].st_shndx != SHN_UNDEF &&
+ ELF32_ST_BIND(symtab[symtab_index].st_info) == STB_LOCAL) {
+ symbol_addr = (unsigned long) tpnt->loadaddr;
+ }
+ else {
+ symbol_addr = (unsigned long) _dl_find_hash(symname, scope,
+ (reloc_type == R_CRIS_JUMP_SLOT ? tpnt : NULL), symbolrel);
+ }
if (!symbol_addr && ELF32_ST_BIND(symtab[symtab_index].st_info) == STB_GLOBAL) {
#if defined (__SUPPORT_LD_DEBUG__)
@@ -265,6 +271,8 @@
#endif
return 0;
}
+
+ symbol_addr += rpnt->r_addend;
}
#if defined (__SUPPORT_LD_DEBUG__)
More information about the uClibc-cvs
mailing list