X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bfd%2Felf-properties.c;h=21bb0716e78f3fc1a96788e8f57670824ed3aa1e;hb=7b958a48e1322880f23cdb0a1c35643dd27d3ddb;hp=0ac055534d988b1811cffcb113a2b0ac4e979335;hpb=6404ab993797d1d6cd3d9e97cc281e3cb6226c12;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/elf-properties.c b/bfd/elf-properties.c index 0ac055534d..21bb0716e7 100644 --- a/bfd/elf-properties.c +++ b/bfd/elf-properties.c @@ -1,5 +1,5 @@ /* ELF program property support. - Copyright (C) 2017-2018 Free Software Foundation, Inc. + Copyright (C) 2017-2020 Free Software Foundation, Inc. This file is part of BFD, the Binary File Descriptor library. @@ -86,7 +86,7 @@ _bfd_elf_parse_gnu_properties (bfd *abfd, Elf_Internal_Note *note) if (note->descsz < 8 || (note->descsz % align_size) != 0) { -bad_size: + bad_size: _bfd_error_handler (_("warning: %pB: corrupt GNU_PROPERTY_TYPE (%ld) size: %#lx"), abfd, note->type, note->descsz); @@ -186,7 +186,7 @@ bad_size: (_("warning: %pB: unsupported GNU_PROPERTY_TYPE (%ld) type: 0x%x"), abfd, note->type, type); -next: + next: ptr += (datasz + (align_size - 1)) & ~ (align_size - 1); } @@ -198,7 +198,7 @@ next: with ABFD. */ static bfd_boolean -elf_merge_gnu_properties (struct bfd_link_info *info, bfd *abfd, +elf_merge_gnu_properties (struct bfd_link_info *info, bfd *abfd, bfd *bbfd, elf_property *aprop, elf_property *bprop) { const struct elf_backend_data *bed = get_elf_backend_data (abfd); @@ -207,7 +207,7 @@ elf_merge_gnu_properties (struct bfd_link_info *info, bfd *abfd, if (bed->merge_gnu_properties != NULL && pr_type >= GNU_PROPERTY_LOPROC && pr_type < GNU_PROPERTY_LOUSER) - return bed->merge_gnu_properties (info, abfd, aprop, bprop); + return bed->merge_gnu_properties (info, abfd, bbfd, aprop, bprop); switch (pr_type) { @@ -236,12 +236,12 @@ elf_merge_gnu_properties (struct bfd_link_info *info, bfd *abfd, 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) + unsigned int type, bfd_boolean rm) { elf_property_list *list; @@ -250,7 +250,8 @@ elf_find_and_remove_property (elf_property_list **listp, if (type == list->property.pr_type) { /* Remove this property. */ - *listp = list->next; + if (rm) + *listp = list->next; return &list->property; } else if (type < list->property.pr_type) @@ -261,47 +262,142 @@ elf_find_and_remove_property (elf_property_list **listp, return NULL; } -/* Merge GNU property list *LISTP with ABFD. */ +/* Merge GNU property list *LISTP in ABFD with FIRST_PBFD. */ static void -elf_merge_gnu_property_list (struct bfd_link_info *info, bfd *abfd, - elf_property_list **listp) +elf_merge_gnu_property_list (struct bfd_link_info *info, bfd *first_pbfd, + bfd *abfd, elf_property_list **listp) { elf_property_list *p, **lastp; elf_property *pr; + bfd_boolean number_p; + bfd_vma number = 0; - /* Merge each GNU property in ABFD with the one on *LISTP. */ - lastp = &elf_properties (abfd); + /* Merge each GNU property in FIRST_PBFD with the one on *LISTP. */ + lastp = &elf_properties (first_pbfd); for (p = *lastp; p; p = p->next) + if (p->property.pr_kind != property_remove) + { + if (p->property.pr_kind == property_number) + { + number_p = TRUE; + number = p->property.u.number; + } + else + number_p = FALSE; + pr = elf_find_and_remove_property (listp, p->property.pr_type, + TRUE); + /* Pass NULL to elf_merge_gnu_properties for the property which + isn't on *LISTP. */ + elf_merge_gnu_properties (info, first_pbfd, abfd, &p->property, pr); + if (p->property.pr_kind == property_remove) + { + if (info->has_map_file) + { + if (number_p) + { + if (pr != NULL) + info->callbacks->minfo + (_("Removed property %W to merge %pB (0x%v) " + "and %pB (0x%v)\n"), + (bfd_vma) p->property.pr_type, first_pbfd, + number, abfd, pr->u.number); + else + info->callbacks->minfo + (_("Removed property %W to merge %pB (0x%v) " + "and %pB (not found)\n"), + (bfd_vma) p->property.pr_type, first_pbfd, + number, abfd); + } + else + { + if (pr != NULL) + info->callbacks->minfo + (_("Removed property %W to merge %pB and %pB\n"), + (bfd_vma) p->property.pr_type, first_pbfd, abfd); + else + info->callbacks->minfo + (_("Removed property %W to merge %pB and %pB " + "(not found)\n"), + (bfd_vma) p->property.pr_type, first_pbfd, abfd); + } + } + + /* Remove this property. */ + *lastp = p->next; + continue; + } + else if (number_p) + { + if (pr != NULL) + { + if (p->property.u.number != number + || p->property.u.number != pr->u.number) + info->callbacks->minfo + (_("Updated property %W (0x%v) to merge %pB (0x%v) " + "and %pB (0x%v)\n"), + (bfd_vma) p->property.pr_type, p->property.u.number, + first_pbfd, number, abfd, pr->u.number); + } + else + { + if (p->property.u.number != number) + info->callbacks->minfo + (_("Updated property %W (%v) to merge %pB (0x%v) " + "and %pB (not found)\n"), + (bfd_vma) p->property.pr_type, p->property.u.number, + first_pbfd, number, abfd); + } + } + lastp = &p->next; + } + + /* Merge the remaining properties on *LISTP with FIRST_PBFD. */ + for (p = *listp; p != NULL; p = p->next) { - pr = elf_find_and_remove_property (listp, p->property.pr_type); - /* Pass NULL to elf_merge_gnu_properties for the property which - isn't on *LISTP. */ - elf_merge_gnu_properties (info, abfd, &p->property, pr); - if (p->property.pr_kind == property_remove) + if (p->property.pr_kind == property_number) { - /* Remove this property. */ - *lastp = p->next; - continue; + number_p = TRUE; + number = p->property.u.number; } - lastp = &p->next; - } - - /* Merge the remaining properties on *LISTP with ABFD. */ - for (p = *listp; p != NULL; p = p->next) - if (elf_merge_gnu_properties (info, abfd, NULL, &p->property)) - { - if (p->property.pr_type == GNU_PROPERTY_NO_COPY_ON_PROTECTED) - elf_has_no_copy_on_protected (abfd) = TRUE; + else + number_p = FALSE; - pr = _bfd_elf_get_property (abfd, p->property.pr_type, - p->property.pr_datasz); - /* It must be a new property. */ - if (pr->pr_kind != property_unknown) - abort (); - /* Add a new property. */ - *pr = p->property; - } + if (elf_merge_gnu_properties (info, first_pbfd, abfd, NULL, &p->property)) + { + if (p->property.pr_type == GNU_PROPERTY_NO_COPY_ON_PROTECTED) + elf_has_no_copy_on_protected (first_pbfd) = TRUE; + + pr = _bfd_elf_get_property (first_pbfd, p->property.pr_type, + p->property.pr_datasz); + /* It must be a new property. */ + if (pr->pr_kind != property_unknown) + abort (); + /* Add a new property. */ + *pr = p->property; + } + else + { + pr = elf_find_and_remove_property (&elf_properties (first_pbfd), + p->property.pr_type, + FALSE); + if (pr == NULL) + { + if (number_p) + info->callbacks->minfo + (_("Removed property %W to merge %pB (not found) and " + "%pB (0x%v)\n"), + (bfd_vma) p->property.pr_type, first_pbfd, abfd, + number); + else + info->callbacks->minfo + (_("Removed property %W to merge %pB and %pB\n"), + (bfd_vma) p->property.pr_type, first_pbfd, abfd); + } + else if (pr->pr_kind != property_remove) + abort (); + } + } } /* Get GNU property section size. */ @@ -319,8 +415,16 @@ elf_get_gnu_property_section_size (elf_property_list *list, size = descsz; for (; list != NULL; list = list->next) { + unsigned int datasz; + /* Check if this property should be skipped. */ + if (list->property.pr_kind == property_remove) + continue; /* There are 4 byte type + 4 byte datasz for each property. */ - size += 4 + 4 + list->property.pr_datasz; + if (list->property.pr_type == GNU_PROPERTY_STACK_SIZE) + datasz = align_size; + else + datasz = list->property.pr_datasz; + size += 4 + 4 + datasz; /* Align each property. */ size = (size + (align_size - 1)) & ~(align_size - 1); } @@ -336,6 +440,7 @@ elf_write_gnu_properties (bfd *abfd, bfd_byte *contents, unsigned int align_size) { unsigned int descsz; + unsigned int datasz; Elf_External_Note *e_note; e_note = (Elf_External_Note *) contents; @@ -349,18 +454,23 @@ elf_write_gnu_properties (bfd *abfd, bfd_byte *contents, size = descsz; for (; list != NULL; list = list->next) { + /* Check if this property should be skipped. */ + if (list->property.pr_kind == property_remove) + continue; /* There are 4 byte type + 4 byte datasz for each property. */ - bfd_h_put_32 (abfd, list->property.pr_type, - contents + size); - bfd_h_put_32 (abfd, list->property.pr_datasz, - contents + size + 4); + if (list->property.pr_type == GNU_PROPERTY_STACK_SIZE) + datasz = align_size; + else + datasz = list->property.pr_datasz; + bfd_h_put_32 (abfd, list->property.pr_type, contents + size); + bfd_h_put_32 (abfd, datasz, contents + size + 4); size += 4 + 4; /* Write out property value. */ switch (list->property.pr_kind) { case property_number: - switch (list->property.pr_datasz) + switch (datasz) { default: /* Never should happen. */ @@ -385,7 +495,7 @@ elf_write_gnu_properties (bfd *abfd, bfd_byte *contents, /* Never should happen. */ abort (); } - size += list->property.pr_datasz; + size += datasz; /* Align each property. */ size = (size + (align_size - 1)) & ~ (align_size - 1); @@ -437,8 +547,13 @@ _bfd_elf_link_setup_gnu_properties (struct bfd_link_info *info) return NULL; /* Merge .note.gnu.property sections. */ + info->callbacks->minfo (_("\n")); + info->callbacks->minfo (_("Merging program properties\n")); + info->callbacks->minfo (_("\n")); + 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 | BFD_LINKER_CREATED)) == 0) { elf_property_list *null_ptr = NULL; elf_property_list **listp = &null_ptr; @@ -462,7 +577,7 @@ _bfd_elf_link_setup_gnu_properties (struct bfd_link_info *info) when all properties are from ELF objects with different machine code or class. */ if (first_pbfd != NULL) - elf_merge_gnu_property_list (info, first_pbfd, listp); + elf_merge_gnu_property_list (info, first_pbfd, abfd, listp); if (list != NULL) { @@ -480,7 +595,7 @@ _bfd_elf_link_setup_gnu_properties (struct bfd_link_info *info) { bfd_size_type size; bfd_byte *contents; - unsigned int align_size = bed->s->elfclass == ELFCLASS64 ? 8 : 4; + unsigned int align_size = elfclass == ELFCLASS64 ? 8 : 4; sec = bfd_get_section_by_name (first_pbfd, NOTE_GNU_PROPERTY_SECTION_NAME); @@ -512,6 +627,18 @@ _bfd_elf_link_setup_gnu_properties (struct bfd_link_info *info) return NULL; } + /* Fix up GNU properties. */ + if (bed->fixup_gnu_properties) + bed->fixup_gnu_properties (info, &elf_properties (first_pbfd)); + + if (elf_properties (first_pbfd) == NULL) + { + /* Discard .note.gnu.property section if all properties have + been removed. */ + sec->output_section = bfd_abs_section_ptr; + return NULL; + } + /* Compute the section size. */ list = elf_properties (first_pbfd); size = elf_get_gnu_property_section_size (list, align_size); @@ -568,14 +695,16 @@ _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); + if (contents == NULL) + return FALSE; free (*ptr); *ptr = contents; }