From: Julian Seward <jseward@acm.org>
Date: Wed, 13 Nov 2002 22:49:54 +0000 (+0000)
Subject: Load weak symbols too, at the recommendation of Josef Weidendorfer.
X-Git-Tag: svn/VALGRIND_1_9_4~134
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9348eeb58c6b873f3a09152c00f1895adca2f7dc;p=thirdparty%2Fvalgrind.git

Load weak symbols too, at the recommendation of Josef Weidendorfer.

MERGE TO STABLE


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@1313
---

diff --git a/coregrind/vg_symtab2.c b/coregrind/vg_symtab2.c
index 6283fad083..9a37eeaae9 100644
--- a/coregrind/vg_symtab2.c
+++ b/coregrind/vg_symtab2.c
@@ -1649,11 +1649,12 @@ Bool vg_read_lib_symbols ( SegInfo* si )
             */
             snaffle_it
                =  ( (ELF32_ST_BIND(o_symtab[i].st_info) == STB_GLOBAL ||
-                     ELF32_ST_BIND(o_symtab[i].st_info) == STB_LOCAL /* ||
-		     ELF32_ST_BIND(o_symtab[i].st_info) == STB_WEAK */)
+                     ELF32_ST_BIND(o_symtab[i].st_info) == STB_LOCAL ||
+		     ELF32_ST_BIND(o_symtab[i].st_info) == STB_WEAK)
                     &&
                     (ELF32_ST_TYPE(o_symtab[i].st_info) == STT_FUNC ||
-                     (VG_(needs).data_syms && ELF32_ST_TYPE(o_symtab[i].st_info) == STT_OBJECT))
+                     (VG_(needs).data_syms 
+                      && ELF32_ST_TYPE(o_symtab[i].st_info) == STT_OBJECT))
                   );
 
             /* Secondly, if it's apparently in a GOT or PLT, it's really