mirror of
https://github.com/espressif/binutils-gdb.git
synced 2025-06-01 20:12:01 +08:00
PR ld/10515
* linker.c (bfd_find_version_for_sym): Revert warning.
This commit is contained in:
14
bfd/linker.c
14
bfd/linker.c
@ -3277,7 +3277,6 @@ 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;
|
||||
@ -3292,7 +3291,6 @@ 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
|
||||
@ -3303,10 +3301,7 @@ bfd_find_version_for_sym (struct bfd_elf_version_tree *verdefs,
|
||||
/* 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)
|
||||
@ -3319,7 +3314,6 @@ 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
|
||||
@ -3331,7 +3325,6 @@ bfd_find_version_for_sym (struct bfd_elf_version_tree *verdefs,
|
||||
/* An exact match overrides a global wildcard. */
|
||||
global_ver = NULL;
|
||||
star_global_ver = NULL;
|
||||
match_count = 0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
@ -3341,11 +3334,6 @@ 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;
|
||||
|
||||
|
Reference in New Issue
Block a user