From: Nick Clifton Date: Tue, 22 Jul 2008 11:19:01 +0000 (+0000) Subject: * elf.c (_bfd_elf_map_sections_to_segments): Allow sections in X-Git-Tag: sid-snapshot-20080801~96 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=39948a609d7a459fbf1872bcc3a656929f5b6798;p=platform%2Fupstream%2Fbinutils.git * elf.c (_bfd_elf_map_sections_to_segments): Allow sections in adjoining pages to be included in the same segment. --- diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 3616c0f..1b5f018 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2008-07-22 Nick Clifton + + * elf.c (_bfd_elf_map_sections_to_segments): Allow sections in + adjoining pages to be included in the same segment. + 2008-07-22 Simon Baldwin * elflink.c (elf_link_output_extsym): Set st_size to zero for diff --git a/bfd/elf.c b/bfd/elf.c index 24ab2c0..a7cc4a5 100644 --- a/bfd/elf.c +++ b/bfd/elf.c @@ -3720,8 +3720,15 @@ _bfd_elf_map_sections_to_segments (bfd *abfd, struct bfd_link_info *info) segment. */ new_segment = TRUE; } - else if (BFD_ALIGN (last_hdr->lma + last_size, maxpagesize) - < BFD_ALIGN (hdr->lma, maxpagesize)) + /* 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 + around to the start of the address space, then there are no more + pages left in memory and it is OK to assume that the current + section can be included in the current segment. */ + else if ((BFD_ALIGN (last_hdr->lma + last_size, maxpagesize) + maxpagesize + > last_hdr->lma) + && (BFD_ALIGN (last_hdr->lma + last_size, maxpagesize) + maxpagesize + < hdr->lma)) { /* If putting this section in this segment would force us to skip a page in the segment, then we need a new segment. */