mirrors/binutils-gdb
1
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2024-11-26 03:24:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

SPU overlay headers

Browse Source 
Overlay PT_LOAD headers are moved early for reasons explained by
comments in spu_elf_modify_segment_map.  This patch fixes cases that
shouldn't occur in sane SPU executables.

	* elf32-spu.c (spu_elf_modify_segment_map): Don't insert
	overlays before segment containing headers.
This commit is contained in:
Alan Modra 2018-10-05 23:35:01 +09:30
parent 00bee008e9
commit e0c3dfa2ee
2 changed files with 32 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bfd/ChangeLog
View File

@ -1,3 +1,8 @@
2018-10-08 Alan Modra <amodra@gmail.com>
* elf32-spu.c (spu_elf_modify_segment_map): Don't insert
overlays before segment containing headers.
2018-10-08 Alan Modra <amodra@gmail.com>
* elf.c (make_mapping): Cope with zero size array at end of

38
bfd/elf32-spu.c
View File

@ -5231,7 +5231,7 @@ spu_elf_modify_segment_map (bfd *abfd, struct bfd_link_info *info)
{
asection *toe, *s;
struct elf_segment_map *m, *m_overlay;
struct elf_segment_map **p, **p_overlay;
struct elf_segment_map **p, **p_overlay, **first_load;
unsigned int i;
if (info == NULL)
@ -5290,24 +5290,40 @@ spu_elf_modify_segment_map (bfd *abfd, struct bfd_link_info *info)
/* Move all overlay segments onto a separate list. */
p = &elf_seg_map (abfd);
p_overlay = &m_overlay;
m_overlay = NULL;
first_load = NULL;
while (*p != NULL)
{
if ((*p)->p_type == PT_LOAD && (*p)->count == 1
&& spu_elf_section_data ((*p)->sections[0])->u.o.ovl_index != 0)
if ((*p)->p_type == PT_LOAD)
{
m = *p;
*p = m->next;
*p_overlay = m;
p_overlay = &m->next;
continue;
if (!first_load)
first_load = p;
if ((*p)->count == 1
&& spu_elf_section_data ((*p)->sections[0])->u.o.ovl_index != 0)
{
m = *p;
*p = m->next;
*p_overlay = m;
p_overlay = &m->next;
continue;
}
}
p = &((*p)->next);
}
/* Re-insert overlay segments at the head of the segment map. */
*p_overlay = elf_seg_map (abfd);
elf_seg_map (abfd) = m_overlay;
if (m_overlay != NULL)
{
p = first_load;
if (*p != NULL && (*p)->p_type == PT_LOAD && (*p)->includes_filehdr)
/* It doesn't really make sense for someone to include the ELF
file header into an spu image, but if they do the code that
assigns p_offset needs to see the segment containing the
header first. */
p = &(*p)->next;
*p_overlay = *p;
*p = m_overlay;
}
return TRUE;
}