PR25277, microblaze opcode enumeration vs ISO/IEC TS 18661-3:2015

[deliverable/binutils-gdb.git] / bfd / elf-properties.c

diff --git a/bfd/elf-properties.c b/bfd/elf-properties.c
index 94ef2351cb632828c66127907137e7d523cb719d..199e61728e418f3b1fdb437ef11152b3cb67930b 100644 (file)
--- a/bfd/elf-properties.c
+++ b/bfd/elf-properties.c
@@ -236,12 +236,12 @@ elf_merge_gnu_properties (struct bfd_link_info *info, bfd *abfd, bfd *bbfd,
   return FALSE;
 }
 
-/* Return the property of TYPE on *LISTP and remove it from *LISTP.
-   Return NULL if not found.  */
+/* Return the property of TYPE on *LISTP and remove it from *LISTP if RM is
+   true.  Return NULL if not found.  */
 
 static elf_property *
 elf_find_and_remove_property (elf_property_list **listp,
-                             unsigned int type, bfd_boolean remove)
+                             unsigned int type, bfd_boolean rm)
 {
   elf_property_list *list;
 
@@ -250,7 +250,7 @@ elf_find_and_remove_property (elf_property_list **listp,
       if (type == list->property.pr_type)
        {
          /* Remove this property.  */
-         if (remove)
+         if (rm)
            *listp = list->next;
          return &list->property;
        }
@@ -322,12 +322,10 @@ elf_merge_gnu_property_list (struct bfd_link_info *info, bfd *first_pbfd,
                         (bfd_vma) p->property.pr_type, first_pbfd, abfd);
                  }
              }
-           else
-             {
-               /* Remove this property.  */
-               *lastp = p->next;
-               continue;
-             }
+
+           /* Remove this property.  */
+           *lastp = p->next;
+           continue;
          }
        else if (number_p)
          {
@@ -697,12 +695,12 @@ _bfd_elf_convert_gnu_properties (bfd *ibfd, asection *isec,
   align_shift = bed->s->elfclass == ELFCLASS64 ? 3 : 2;
 
   /* Get the output .note.gnu.property section size.  */
-  size = bfd_get_section_size (isec->output_section);
+  size = bfd_section_size (isec->output_section);
 
   /* Update the output .note.gnu.property section alignment.  */
-  bfd_set_section_alignment (obfd, isec->output_section, align_shift);
+  bfd_set_section_alignment (isec->output_section, align_shift);
 
-  if (size > bfd_get_section_size (isec))
+  if (size > bfd_section_size (isec))
     {
       contents = (bfd_byte *) bfd_malloc (size);
       free (*ptr);