update

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

diff --git a/l4/pkg/uclibc/lib/contrib/uclibc/ldso/ldso/i386/elfinterp.c b/l4/pkg/uclibc/lib/contrib/uclibc/ldso/ldso/i386/elfinterp.c
index b019c61a8e781af300aee0f0d47824eb30d2b817..2835a038f5a79aa183c3387885176afb578f57bb 100644 (file)
--- a/l4/pkg/uclibc/lib/contrib/uclibc/ldso/ldso/i386/elfinterp.c
+++ b/l4/pkg/uclibc/lib/contrib/uclibc/ldso/ldso/i386/elfinterp.c
@@ -162,24 +162,25 @@ _dl_do_reloc(struct elf_resolve *tpnt, struct dyn_elf *scope,
        int reloc_type;
        int symtab_index;
        char *symname;
-       struct elf_resolve *tls_tpnt = 0;
+       struct elf_resolve *tls_tpnt = NULL;
        unsigned long *reloc_addr;
        unsigned long symbol_addr;
 #if defined (__SUPPORT_LD_DEBUG__)
        unsigned long old_val;
 #endif
+       struct symbol_ref sym_ref;
 
        reloc_addr = (unsigned long *)(intptr_t)(tpnt->loadaddr + (unsigned long)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 &&
-           (ELF32_ST_VISIBILITY(symtab[symtab_index].st_other)
-            != STV_PROTECTED)) {
+       if (symtab_index) {
                symbol_addr = (unsigned long)_dl_find_hash(symname, scope, tpnt,
-                                                          elf_machine_type_class(reloc_type), &tls_tpnt);
+                                                          elf_machine_type_class(reloc_type), &sym_ref);
 
                /*
                 * We want to allow undefined references to weak symbols - this
@@ -189,12 +190,9 @@ _dl_do_reloc(struct elf_resolve *tpnt, struct dyn_elf *scope,
                if (unlikely(!symbol_addr && (ELF_ST_TYPE(symtab[symtab_index].st_info) != STT_TLS)
                                        && ELF32_ST_BIND(symtab[symtab_index].st_info) != STB_WEAK))
                        return 1;
+               tls_tpnt = sym_ref.tpnt;
        } else {
-               if (symtab_index)
-                       symbol_addr = DL_FIND_HASH_VALUE(tpnt, elf_machine_type_class(reloc_type),
-                                                        &symtab[symtab_index]);
-               else
-                       symbol_addr = symtab[symtab_index].st_value;
+               symbol_addr = symtab[symtab_index].st_value;
                tls_tpnt = tpnt;
        }