2009-08-26 Alan Modra <amodra@bigpond.net.au>
PR ld/10515
+ * linker.c (bfd_find_version_for_sym): Revert warning.
+
+2009-08-26 Alan Modra <amodra@bigpond.net.au>
+
+ PR ld/10515
* linker.c (bfd_find_version_for_sym): Override a "*" match by any
other wildcard match. Warn on multiple wildcard matches.
struct bfd_elf_version_tree *t;
struct bfd_elf_version_tree *local_ver, *global_ver, *exist_ver;
struct bfd_elf_version_tree *star_local_ver, *star_global_ver;
- unsigned int match_count = 0;
local_ver = NULL;
global_ver = NULL;
while ((d = (*t->match) (&t->globals, d, sym_name)) != NULL)
{
- ++match_count;
if (d->literal || strcmp (d->pattern, "*") != 0)
global_ver = t;
else
/* If the match is a wildcard pattern, keep looking for
a more explicit, perhaps even local, match. */
if (d->literal)
- {
- match_count = 0;
- break;
- }
+ break;
}
if (d != NULL)
while ((d = (*t->match) (&t->locals, d, sym_name)) != NULL)
{
- ++match_count;
if (d->literal || strcmp (d->pattern, "*") != 0)
local_ver = t;
else
/* An exact match overrides a global wildcard. */
global_ver = NULL;
star_global_ver = NULL;
- match_count = 0;
break;
}
}
}
}
- if (match_count > 1)
- (*_bfd_error_handler)
- (_("warning: multiple wildcard version script matches for %s\n"),
- sym_name);
-
if (global_ver == NULL && local_ver == NULL)
global_ver = star_global_ver;