diff options
| author | Alan Modra <amodra@bigpond.net.au> | 2011-06-21 14:55:25 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@bigpond.net.au> | 2011-06-21 14:55:25 +0000 |
| commit | 322d59cd257179e18d268b26186654dee3a1e817 (patch) | |
| tree | 74cfafed6cfd66cdbdfa7a6cf4bbaf5dfe290860 /bfd/elflink.c | |
| parent | 7f49590066ab8a9d3de1f933f96baeb1d2bd6033 (diff) | |
| download | gdb-322d59cd257179e18d268b26186654dee3a1e817.tar.gz | |
* elflink.c (_bfd_elf_merge_symbol): Allow type changes for
plugin symbols. Fix segfault on linker scrip defined syms.
Diffstat (limited to 'bfd/elflink.c')
| -rw-r--r-- | bfd/elflink.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/bfd/elflink.c b/bfd/elflink.c index a4b7a7ab992..b518da8ad09 100644 --- a/bfd/elflink.c +++ b/bfd/elflink.c @@ -1080,11 +1080,15 @@ _bfd_elf_merge_symbol (bfd *abfd, return TRUE; } + /* Plugin symbol type isn't currently set. Stop bogus errors. */ + if (oldbfd != NULL && (oldbfd->flags & BFD_PLUGIN) != 0) + *type_change_ok = TRUE; + /* Check TLS symbol. We don't check undefined symbol introduced by "ld -u". */ - if ((ELF_ST_TYPE (sym->st_info) == STT_TLS || h->type == STT_TLS) - && ELF_ST_TYPE (sym->st_info) != h->type - && oldbfd != NULL) + else if (oldbfd != NULL + && ELF_ST_TYPE (sym->st_info) != h->type + && (ELF_ST_TYPE (sym->st_info) == STT_TLS || h->type == STT_TLS)) { bfd *ntbfd, *tbfd; bfd_boolean ntdef, tdef; @@ -1423,7 +1427,8 @@ _bfd_elf_merge_symbol (bfd *abfd, if (newdef && olddef && newweak) { /* Don't skip new non-IR weak syms. */ - if (!((oldbfd->flags & BFD_PLUGIN) != 0 + if (!(oldbfd != NULL + && (oldbfd->flags & BFD_PLUGIN) != 0 && (abfd->flags & BFD_PLUGIN) == 0)) *skip = TRUE; |