espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-25 21:41:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

* elf.c (_bfd_elf_map_sections_to_segments): Force new segment

Browse Source 
for sections with overlapping LMAs.
	(assign_file_positions_for_load_sections): Catch overlap for
	sections that wrap around the address space.  Replace a
	warning that duplicates ld's --check-sections error with a
	warning that lma has been adjusted for overlapping sections.
This commit is contained in:
Alan Modra
2010-07-17 03:10:50 +00:00
parent 34220e965e
commit b559959291
2 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
bfd/ChangeLog
View File

@ -1,3 +1,12 @@
2010-07-17 Alan Modra <amodra@gmail.com>
* elf.c (_bfd_elf_map_sections_to_segments): Force new segment
for sections with overlapping LMAs.
(assign_file_positions_for_load_sections): Catch overlap for
sections that wrap around the address space. Replace a
warning that duplicates ld's --check-sections error with a
warning that lma has been adjusted for overlapping sections.
2010-07-14 Cary Coutant <ccoutant@google.com> 2010-07-14 Cary Coutant <ccoutant@google.com>
PR ld/11817 PR ld/11817

21
bfd/elf.c
View File

@ -3736,6 +3736,13 @@ _bfd_elf_map_sections_to_segments (bfd *abfd, struct bfd_link_info *info)
segment. */ segment. */
new_segment = TRUE; new_segment = TRUE;
} }
else if (hdr->lma < last_hdr->lma + last_size
|| last_hdr->lma + last_size < last_hdr->lma)
{
/* If this section has a load address that makes it overlap
the previous section, then we need a new segment. */
new_segment = TRUE;
}
/* In the next test we have to be careful when last_hdr->lma is close /* In the next test we have to be careful when last_hdr->lma is close
to the end of the address space. If the aligned address wraps to the end of the address space. If the aligned address wraps
around to the start of the address space, then there are no more around to the start of the address space, then there are no more
@ -4457,15 +4464,19 @@ assign_file_positions_for_load_sections (bfd *abfd,
&& ((this_hdr->sh_flags & SHF_TLS) == 0 && ((this_hdr->sh_flags & SHF_TLS) == 0
|| p->p_type == PT_TLS)))) || p->p_type == PT_TLS))))
{ {
bfd_vma adjust = sec->lma - (p->p_paddr + p->p_memsz); bfd_vma p_start = p->p_paddr;
bfd_vma p_end = p_start + p->p_memsz;
bfd_vma s_start = sec->lma;
bfd_vma adjust = s_start - p_end;
if (sec->lma < p->p_paddr + p->p_memsz) if (s_start < p_end
|| p_end < p_start)
{ {
(*_bfd_error_handler) (*_bfd_error_handler)
(_("%B: section %A lma 0x%lx overlaps previous sections"), (_("%B: section %A lma %#lx adjusted to %#lx"), abfd, sec,
abfd, sec, (unsigned long) sec->lma); (unsigned long) s_start, (unsigned long) p_end);
adjust = 0; adjust = 0;
sec->lma = p->p_paddr + p->p_memsz; sec->lma = p_end;
} }
p->p_memsz += adjust; p->p_memsz += adjust;