[binutils-gdb/binutils-2_31-branch] elf: Don't merge .note.gnu.property section in IR

[H.J.Lu]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=d97f1f87b31901ccdb711ec88a0ab792c31d1f60

commit d97f1f87b31901ccdb711ec88a0ab792c31d1f60
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Thu Nov 29 04:44:20 2018 -0800

    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)

Diff:
---
 bfd/ChangeLog        | 6 ++++++
 bfd/elf-properties.c | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

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;