[git commit] ldso: arm: fix build when prelinking is enabled.
Carmelo Amoroso
carmelo.amoroso at st.com
Fri Jul 1 07:49:47 UTC 2011
commit: http://git.uclibc.org/uClibc/commit/?id=75d95590a35796186436a4cb05fe91a44d9dadae
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/master
This is a post merge fix to address build issue when PRELINK
support is enabled.
Signed-off-by: Carmelo Amoroso <carmelo.amoroso at st.com>
---
ldso/ldso/arm/elfinterp.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ldso/ldso/arm/elfinterp.c b/ldso/ldso/arm/elfinterp.c
index 5ae85dd..d8dcb52 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
--
1.7.3.4
More information about the uClibc-cvs
mailing list