From 7503ff855821be5c37edfeac6464b310ce32ddec Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Sat, 19 Jun 2004 21:38:41 +0000 Subject: Joakim Tjernlund writes: Make old weak symbol handling work, if someone wants to enable it. --- ldso/ldso/dl-hash.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'ldso') diff --git a/ldso/ldso/dl-hash.c b/ldso/ldso/dl-hash.c index 68b2abd63..251ab6466 100644 --- a/ldso/ldso/dl-hash.c +++ b/ldso/ldso/dl-hash.c @@ -163,6 +163,7 @@ char *_dl_find_hash(const char *name, struct dyn_elf *rpnt1, int type_class) unsigned long elf_hash_number, hn; struct dyn_elf *rpnt; const ElfW(Sym) *sym; + char *weak_result = NULL; elf_hash_number = _dl_elf_hash(name); @@ -226,11 +227,9 @@ char *_dl_find_hash(const char *name, struct dyn_elf *rpnt1, int type_class) #if 0 /* Perhaps we should support old style weak symbol handling * per what glibc does when you export LD_DYNAMIC_WEAK */ - if(_dl_symbol((char *)name)) { - if (!weak_result) - weak_result = (char *)tpnt->loadaddr + sym->st_value; - break; - } + if (!weak_result) + weak_result = (char *)tpnt->loadaddr + sym->st_value; + break; #endif case STB_GLOBAL: return (char*)tpnt->loadaddr + sym->st_value; @@ -240,5 +239,5 @@ char *_dl_find_hash(const char *name, struct dyn_elf *rpnt1, int type_class) } } } - return NULL; + return weak_result; } -- cgit v1.2.3