aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2018-11-29 04:44:20 -0800
committerH.J. Lu <hjl.tools@gmail.com>2018-11-29 04:45:16 -0800
commitffd9e4d0225d45d1603d09e06151c388589e063f (patch)
treedd17f645d401d9ef6b35f769ae07a11191260425
parent8936f76804c2908e4abe911441dd03641204df9d (diff)
downloadgdb-ffd9e4d0225d45d1603d09e06151c388589e063f.zip
gdb-ffd9e4d0225d45d1603d09e06151c388589e063f.tar.gz
gdb-ffd9e4d0225d45d1603d09e06151c388589e063f.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.
-rw-r--r--bfd/ChangeLog6
-rw-r--r--bfd/elf-properties.c3
2 files changed, 8 insertions, 1 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 57633e4..602e0a2 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2018-11-29 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-27 Thomas Preud'homme <thomas.preudhomme@linaro.org>
* cpu-arm.c (processors): Add processors known to GAS but missing here
diff --git a/bfd/elf-properties.c b/bfd/elf-properties.c
index 861db73..cd44ed6 100644
--- a/bfd/elf-properties.c
+++ b/bfd/elf-properties.c
@@ -446,7 +446,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;