aboutsummaryrefslogtreecommitdiff
path: root/ld/ldlang.c
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2003-10-24 15:40:20 +0000
committerH.J. Lu <hjl.tools@gmail.com>2003-10-24 15:40:20 +0000
commit7a995eb391ac0ac2b3c59f4dd63d7fdfcb9dc70a (patch)
tree262c9f826d3856dfd2f8e89efe054d5b65d1973d /ld/ldlang.c
parent5f72444609f5780f39bb60c1b04b1616a3fbc888 (diff)
downloadfsf-binutils-gdb-7a995eb391ac0ac2b3c59f4dd63d7fdfcb9dc70a.zip
fsf-binutils-gdb-7a995eb391ac0ac2b3c59f4dd63d7fdfcb9dc70a.tar.gz
fsf-binutils-gdb-7a995eb391ac0ac2b3c59f4dd63d7fdfcb9dc70a.tar.bz2
2003-10-24 H.J. Lu <hongjiu.lu@intel.com>
* ldlang.c (lang_vers_match): Check demangled symbols.
Diffstat (limited to 'ld/ldlang.c')
-rw-r--r--ld/ldlang.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/ld/ldlang.c b/ld/ldlang.c
index e57f6f9..df415fc 100644
--- a/ld/ldlang.c
+++ b/ld/ldlang.c
@@ -4993,7 +4993,7 @@ lang_vers_match (struct bfd_elf_version_expr_head *head,
if (!cxx_sym)
cxx_sym = sym;
}
- if (head->mask & BFD_ELF_VERSION_JAVA_TYPE)
+ else if (head->mask & BFD_ELF_VERSION_JAVA_TYPE)
{
java_sym = cplus_demangle (sym, DMGL_JAVA);
if (!java_sym)
@@ -5023,7 +5023,7 @@ lang_vers_match (struct bfd_elf_version_expr_head *head,
{
e.symbol = cxx_sym;
expr = htab_find (head->htab, &e);
- while (expr && strcmp (expr->symbol, sym) == 0)
+ while (expr && strcmp (expr->symbol, cxx_sym) == 0)
if (expr->mask == BFD_ELF_VERSION_CXX_TYPE)
goto out_ret;
else
@@ -5035,7 +5035,7 @@ lang_vers_match (struct bfd_elf_version_expr_head *head,
{
e.symbol = java_sym;
expr = htab_find (head->htab, &e);
- while (expr && strcmp (expr->symbol, sym) == 0)
+ while (expr && strcmp (expr->symbol, java_sym) == 0)
if (expr->mask == BFD_ELF_VERSION_JAVA_TYPE)
goto out_ret;
else