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.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 57633e4fcf9a4fe1ccdeafea711f8eb51a052fc1..602e0a2ead386d4a4eb8f0aacefdbb857a3f7d1a 100644 (file)
--- 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 861db73170b8b0ef815025c9def67f503a9c93e1..cd44ed6194bbfbb9d8a519af05e9ee75d015d678 100644 (file)
--- 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;