diff options
Diffstat (limited to 'bfd')
| -rw-r--r-- | bfd/ChangeLog | 6 | ||||
| -rw-r--r-- | bfd/elflink.c | 7 |
2 files changed, 13 insertions, 0 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index ce1089b..abcddc9 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2015-10-12 H.J. Lu <hongjiu.lu@intel.com> + + PR ld/19073 + * elflink.c (_bfd_elf_add_default_symbol): Skip the unversioned + definition after the default version. + 2015-10-12 Andreas Krebbel <krebbel@linux.vnet.ibm.com> PR ld/19083 diff --git a/bfd/elflink.c b/bfd/elflink.c index 94bb710..839cebb 100644 --- a/bfd/elflink.c +++ b/bfd/elflink.c @@ -1715,6 +1715,13 @@ _bfd_elf_add_default_symbol (bfd *abfd, h->versioned = versioned; } } + else + { + /* PR ld/19073: We may see an unversioned definition after the + default version. */ + if (p == NULL) + return TRUE; + } bed = get_elf_backend_data (abfd); collect = bed->collect; |