PR ld/10515
* linker.c (bfd_find_version_for_sym): Override a "*" match by any other wildcard match. Warn on multiple wildcard matches.
This commit is contained in:
parent
27b0c844fe
commit
78a0329753
|
@ -1,3 +1,9 @@
|
|||
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.
|
||||
|
||||
2009-08-22 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
||||
|
||||
* Makefile.am (libbfd_la_LDFLAGS): Initialize early, to allow
|
||||
|
|
29
bfd/linker.c
29
bfd/linker.c
|
@ -3276,9 +3276,13 @@ bfd_find_version_for_sym (struct bfd_elf_version_tree *verdefs,
|
|||
{
|
||||
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;
|
||||
star_local_ver = NULL;
|
||||
star_global_ver = NULL;
|
||||
exist_ver = NULL;
|
||||
for (t = verdefs; t != NULL; t = t->next)
|
||||
{
|
||||
|
@ -3288,15 +3292,22 @@ bfd_find_version_for_sym (struct bfd_elf_version_tree *verdefs,
|
|||
|
||||
while ((d = (*t->match) (&t->globals, d, sym_name)) != NULL)
|
||||
{
|
||||
++match_count;
|
||||
if (d->literal || strcmp (d->pattern, "*") != 0)
|
||||
global_ver = t;
|
||||
else
|
||||
star_global_ver = t;
|
||||
if (d->symver)
|
||||
exist_ver = t;
|
||||
d->script = 1;
|
||||
/* If the match is a wildcard pattern, keep looking for
|
||||
a more explicit, perhaps even local, match. */
|
||||
if (d->literal)
|
||||
{
|
||||
match_count = 0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (d != NULL)
|
||||
break;
|
||||
|
@ -3308,13 +3319,19 @@ bfd_find_version_for_sym (struct bfd_elf_version_tree *verdefs,
|
|||
|
||||
while ((d = (*t->match) (&t->locals, d, sym_name)) != NULL)
|
||||
{
|
||||
++match_count;
|
||||
if (d->literal || strcmp (d->pattern, "*") != 0)
|
||||
local_ver = t;
|
||||
else
|
||||
star_local_ver = t;
|
||||
/* If the match is a wildcard pattern, keep looking for
|
||||
a more explicit, perhaps even global, match. */
|
||||
if (d->literal)
|
||||
{
|
||||
/* An exact match overrides a global wildcard. */
|
||||
global_ver = NULL;
|
||||
star_global_ver = NULL;
|
||||
match_count = 0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
@ -3324,6 +3341,14 @@ bfd_find_version_for_sym (struct bfd_elf_version_tree *verdefs,
|
|||
}
|
||||
}
|
||||
|
||||
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;
|
||||
|
||||
if (global_ver != NULL)
|
||||
{
|
||||
/* If we already have a versioned symbol that matches the
|
||||
|
@ -3334,6 +3359,9 @@ bfd_find_version_for_sym (struct bfd_elf_version_tree *verdefs,
|
|||
return global_ver;
|
||||
}
|
||||
|
||||
if (local_ver == NULL)
|
||||
local_ver = star_local_ver;
|
||||
|
||||
if (local_ver != NULL)
|
||||
{
|
||||
*hide = TRUE;
|
||||
|
@ -3342,4 +3370,3 @@ bfd_find_version_for_sym (struct bfd_elf_version_tree *verdefs,
|
|||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue