diff --git a/ld/ChangeLog b/ld/ChangeLog
index a6dcf1cc56..f8efc4d4c5 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,7 @@
+2003-10-24  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* ldlang.c (lang_vers_match): Check demangled symbols.
+
 2003-10-24  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* ldlang.c (lang_vers_match): Check "symbol" instead of
diff --git a/ld/ldlang.c b/ld/ldlang.c
index e57f6f9eb6..df415fc411 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