update

[l4.git] / l4 / pkg / uclibc / lib / contrib / uclibc / ldso / ldso / avr32 / elfinterp.c

diff --git a/l4/pkg/uclibc/lib/contrib/uclibc/ldso/ldso/avr32/elfinterp.c b/l4/pkg/uclibc/lib/contrib/uclibc/ldso/ldso/avr32/elfinterp.c
index 797f8513ef6526e5d38bc37cc6160272b30f4a8f..2d0dbf366e2b7312e1f7ff8ec7f0d5584b96eab0 100644 (file)
--- a/l4/pkg/uclibc/lib/contrib/uclibc/ldso/ldso/avr32/elfinterp.c
+++ b/l4/pkg/uclibc/lib/contrib/uclibc/ldso/ldso/avr32/elfinterp.c
@@ -50,9 +50,8 @@ unsigned long _dl_linux_resolver(unsigned long got_offset, unsigned long *got)
        strtab = (char *)(tpnt->dynamic_info[DT_STRTAB] + tpnt->loadaddr);
        symname = strtab + sym->st_name;
 
-       new_addr = (unsigned long) _dl_find_hash(strtab + sym->st_name,
-                                                tpnt->symbol_scope, tpnt,
-                                                resolver);
+       new_addr = (unsigned long) _dl_find_hash(symname,
+                                                tpnt->symbol_scope, tpnt, ELF_RTYPE_CLASS_PLT, NULL);
 
        entry = (unsigned long *)(got + local_gotno + sym_index - gotsym);
        *entry = new_addr;
@@ -127,18 +126,20 @@ static int _dl_do_reloc(struct elf_resolve *tpnt, struct dyn_elf *scope,
 #if defined(__SUPPORT_LD_DEBUG__)
        unsigned long old_val;
 #endif
+       struct symbol_ref sym_ref;
 
        reloc_addr = (unsigned long *)(tpnt->loadaddr + rpnt->r_offset);
        reloc_type = ELF32_R_TYPE(rpnt->r_info);
        symtab_index = ELF32_R_SYM(rpnt->r_info);
        symbol_addr = 0;
+       sym_ref.sym = &symtab[symtab_index];
+       sym_ref.tpnt = NULL;
        symname = strtab + symtab[symtab_index].st_name;
 
        if (symtab_index) {
                symbol_addr = (unsigned long)
-                       _dl_find_hash(strtab + symtab[symtab_index].st_name,
-                                     tpnt->symbol_scope, tpnt,
-                                     elf_machine_type_class(reloc_type), NULL);
+                       _dl_find_hash(symname, scope, tpnt,
+                                     elf_machine_type_class(reloc_type), &sym_ref);
 
                /* Allow undefined references to weak symbols */
                if (!symbol_addr &&