diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2018-11-29 04:44:20 -0800 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2018-12-01 08:59:18 -0800 |
| commit | d97f1f87b31901ccdb711ec88a0ab792c31d1f60 (patch) | |
| tree | 73dd9edd7c8ba8bb20e33d7eec622ba7d6b7b7fa /bfd | |
| parent | 2b55be97d1be8f3fc7008c3cc2fd3baed7c34d73 (diff) | |
| download | gdb-d97f1f87b31901ccdb711ec88a0ab792c31d1f60.zip gdb-d97f1f87b31901ccdb711ec88a0ab792c31d1f60.tar.gz gdb-d97f1f87b31901ccdb711ec88a0ab792c31d1f60.tar.bz2 | |
elf: Don't merge .note.gnu.property section in IR
.note.gnu.property section in IR inputs should be ignored. Don't
merge them.
PR ld/23929
* elf-properties.c (_bfd_elf_link_setup_gnu_properties): Don't
merge .note.gnu.property section in IR inputs.
(cherry picked from commit ffd9e4d0225d45d1603d09e06151c388589e063f)
Diffstat (limited to 'bfd')
| -rw-r--r-- | bfd/ChangeLog | 6 | ||||
| -rw-r--r-- | bfd/elf-properties.c | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index fa4173d..d62a1fe 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2018-12-01 H.J. Lu <hongjiu.lu@intel.com> + + PR ld/23929 + * elf-properties.c (_bfd_elf_link_setup_gnu_properties): Don't + merge .note.gnu.property section in IR inputs. + 2018-11-30 Alan Modra <amodra@gmail.com> PR 23937 diff --git a/bfd/elf-properties.c b/bfd/elf-properties.c index 50c0e9d..944e174 100644 --- a/bfd/elf-properties.c +++ b/bfd/elf-properties.c @@ -350,7 +350,8 @@ _bfd_elf_link_setup_gnu_properties (struct bfd_link_info *info) /* Merge .note.gnu.property sections. */ for (abfd = info->input_bfds; abfd != NULL; abfd = abfd->link.next) - if (abfd != first_pbfd && (abfd->flags & DYNAMIC) == 0) + if (abfd != first_pbfd + && (abfd->flags & (DYNAMIC | BFD_PLUGIN)) == 0) { elf_property_list *null_ptr = NULL; elf_property_list **listp = &null_ptr; |