bfd: support section groups with preceding SHF_GROUP sections
GAS always places section groups (SHT_GROUP) before the rest of the sections in the output file. However, other assemblers may place section groups after the group members. This patch fixes handlign such situations, and removes some duplicated logic. bfd/ChangeLog: 2017-06-06 Jose E. Marchesi <jose.marchesi@oracle.com> * elf.c (setup_group): Make sure BFD sections are created for all group sections in the input file when processing SHF_GROUP sections. (bfd_section_from_shdr): Avoid duplicating logic already implemented in `setup_group'.
This commit is contained in:
parent
f4a6504277
commit
78e8a2ff5f
|
@ -1,3 +1,11 @@
|
|||
2017-06-06 Jose E. Marchesi <jose.marchesi@oracle.com>
|
||||
|
||||
* elf.c (setup_group): Make sure BFD sections are created for all
|
||||
group sections in the input file when processing SHF_GROUP
|
||||
sections.
|
||||
(bfd_section_from_shdr): Avoid duplicating logic already
|
||||
implemented in `setup_group'.
|
||||
|
||||
2017-06-06 Daniel Bonniot de Ruisselet <bonniot@gmail.com>
|
||||
|
||||
PR binutils/21546
|
||||
|
|
33
bfd/elf.c
33
bfd/elf.c
|
@ -636,6 +636,11 @@ setup_group (bfd *abfd, Elf_Internal_Shdr *hdr, asection *newsect)
|
|||
unsigned char *src;
|
||||
Elf_Internal_Group *dest;
|
||||
|
||||
/* Make sure the group section has a BFD section
|
||||
attached to it. */
|
||||
if (!bfd_section_from_shdr (abfd, i))
|
||||
return FALSE;
|
||||
|
||||
/* Add to list of sections. */
|
||||
elf_tdata (abfd)->group_sect_ptr[num_group] = shdr;
|
||||
num_group += 1;
|
||||
|
@ -2421,34 +2426,6 @@ bfd_section_from_shdr (bfd *abfd, unsigned int shindex)
|
|||
if (!_bfd_elf_make_section_from_shdr (abfd, hdr, name, shindex))
|
||||
goto fail;
|
||||
|
||||
if (hdr->contents != NULL)
|
||||
{
|
||||
Elf_Internal_Group *idx = (Elf_Internal_Group *) hdr->contents;
|
||||
unsigned int n_elt = hdr->sh_size / sizeof (* idx);
|
||||
asection *s;
|
||||
|
||||
if (n_elt == 0)
|
||||
goto fail;
|
||||
if (idx->flags & GRP_COMDAT)
|
||||
hdr->bfd_section->flags
|
||||
|= SEC_LINK_ONCE | SEC_LINK_DUPLICATES_DISCARD;
|
||||
|
||||
/* We try to keep the same section order as it comes in. */
|
||||
idx += n_elt;
|
||||
|
||||
while (--n_elt != 0)
|
||||
{
|
||||
--idx;
|
||||
|
||||
if (idx->shdr != NULL
|
||||
&& (s = idx->shdr->bfd_section) != NULL
|
||||
&& elf_next_in_group (s) != NULL)
|
||||
{
|
||||
elf_next_in_group (hdr->bfd_section) = s;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
goto success;
|
||||
|
||||
default:
|
||||
|
|
Loading…
Reference in New Issue