aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Carmelo Amoroso <carmelo.amoroso@st.com>2011-06-27 15:26:22 +0200
committerGravatar Carmelo Amoroso <carmelo.amoroso@st.com>2011-07-01 09:49:47 +0200
commit75d95590a35796186436a4cb05fe91a44d9dadae (patch)
tree3cc68eea73dc1731c597d5f6959bcb0efc3bc3ba
parent1c1391e6e507337103f2c7ce4da768b2842a8aa1 (diff)
downloaduClibc-75d95590a35796186436a4cb05fe91a44d9dadae.tar.gz
uClibc-75d95590a35796186436a4cb05fe91a44d9dadae.tar.bz2
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>
-rw-r--r--ldso/ldso/arm/elfinterp.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/ldso/ldso/arm/elfinterp.c b/ldso/ldso/arm/elfinterp.c
index 5ae85dd2e..d8dcb52ac 100644
--- a/ldso/ldso/arm/elfinterp.c
+++ b/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