diff options
| author | Stafford Horne <shorne@gmail.com> | 2021-05-06 20:51:24 +0900 |
|---|---|---|
| committer | Stafford Horne <shorne@gmail.com> | 2021-05-06 20:51:24 +0900 |
| commit | a76ef689b60405e494cb99e198acf3c82f467f7d (patch) | |
| tree | 71bb36376cb73095505f6e0fb06dbc58bc4dac52 | |
| parent | 0618ecf6eb99dce0278102a88f622f28e3ecd837 (diff) | |
| download | binutils-a76ef689b60405e494cb99e198acf3c82f467f7d.zip binutils-a76ef689b60405e494cb99e198acf3c82f467f7d.tar.gz binutils-a76ef689b60405e494cb99e198acf3c82f467f7d.tar.bz2 | |
or1k: Fix issue with plt link failure for local calls
When building protobuf we were seeing the assert failure:
/home/giuliobenetti/git/upstream/or1k-binutils-2.36.1/host/lib/gcc/or1k-buildroot-linux-uclibc/9.3.0/../../../../or1k-buildroot-linux-uclibc/bin/ld:
BFD (GNU Binutils) 2.36.1 assertion fail elf32-or1k.c:2377
/home/giuliobenetti/git/upstream/or1k-binutils-2.36.1/host/lib/gcc/or1k-buildroot-linux-uclibc/9.3.0/../../../../or1k-buildroot-linux-uclibc/bin/ld:
BFD (GNU Binutils) 2.36.1 assertion fail elf32-or1k.c:2377
/home/giuliobenetti/git/upstream/or1k-binutils-2.36.1/host/lib/gcc/or1k-buildroot-linux-uclibc/9.3.0/../../../../or1k-buildroot-linux-uclibc/bin/ld:
BFD (GNU Binutils) 2.36.1 assertion fail elf32-or1k.c:2377
collect2: error: ld returned 1 exit status
This failure happens while writing out PLT entries, there is a check
"BFD_ASSERT (h->dynindx != -1)" to confirm all plt entries have dynamic
symbol attributes. This was failing for symbols that were
"forced_local" in previous linking code.
The fix adds logic to or1k_elf_adjust_dynamic_symbol to identify
"forced_local" symbols and exclude them from the the PLT.
bfd/ChangeLog:
PR 27624
* elf32-or1k.c (or1k_elf_adjust_dynamic_symbol): Change
condition used to cleanup plt entries to cleanup forced local
entries.
Cc: Giulio Benetti <giulio.benetti@benettiengineering.com>
| -rw-r--r-- | bfd/ChangeLog | 7 | ||||
| -rw-r--r-- | bfd/elf32-or1k.c | 9 |
2 files changed, 11 insertions, 5 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index e481c1b..7a6b9a1 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,10 @@ +2021-05-06 Stafford Horne <shorne@gmail.com> + + PR 27624 + * elf32-or1k.c (or1k_elf_adjust_dynamic_symbol): Change + condition used to cleanup plt entries to cleanup forced local + entries. + 2021-05-05 H.J. Lu <hongjiu.lu@intel.com> PR ld/27825 diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c index 013deb4..cc6c512 100644 --- a/bfd/elf32-or1k.c +++ b/bfd/elf32-or1k.c @@ -2566,11 +2566,10 @@ or1k_elf_adjust_dynamic_symbol (struct bfd_link_info *info, if (h->type == STT_FUNC || h->needs_plt) { - if (! bfd_link_pic (info) - && !h->def_dynamic - && !h->ref_dynamic - && h->root.type != bfd_link_hash_undefweak - && h->root.type != bfd_link_hash_undefined) + if (h->plt.refcount <= 0 + || (SYMBOL_CALLS_LOCAL (info, h) + || (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT + && h->root.type == bfd_link_hash_undefweak))) { /* This case can occur if we saw a PLT reloc in an input file, but the symbol was never referred to by a dynamic |