Sfoglia il codice sorgente

ldso: arm: fix build when prelinking is enabled.

This is a post merge fix to address build issue when PRELINK
support is enabled.

Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
Carmelo Amoroso 13 anni fa
parent
commit
75d95590a3
1 ha cambiato i file con 4 aggiunte e 3 eliminazioni
  1. 4 3
      ldso/ldso/arm/elfinterp.c

+ 4 - 3
ldso/ldso/arm/elfinterp.c

@@ -186,9 +186,9 @@ _dl_do_reloc (struct elf_resolve *tpnt,struct r_scope_elem *scope,
 {
 	int reloc_type;
 	int symtab_index;
+	char *symname;
 	unsigned long *reloc_addr;
 	unsigned long symbol_addr;
-	const Elf32_Sym *def = 0;
 	struct symbol_ref sym_ref;
 	struct elf_resolve *def_mod = 0;
 	int goof = 0;
@@ -200,10 +200,11 @@ _dl_do_reloc (struct elf_resolve *tpnt,struct r_scope_elem *scope,
 	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 = _dl_find_hash(strtab + symtab[symtab_index].st_name,
-			scope, tpnt, elf_machine_type_class(reloc_type), &sym_ref);
+		symbol_addr = _dl_find_hash(symname, scope, tpnt,
+						elf_machine_type_class(reloc_type), &sym_ref);
 
 		/*
 		 * We want to allow undefined references to weak symbols - this might