* 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 3616c0f5c181a4be83abd900372953723c5a0b6d..1b5f018eb9e40bbb3ef756bb00d3e3bf60856173 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-22  Nick Clifton  <nickc@redhat.com>
+
+       * 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  <simonb@google.com>
 
        * elflink.c (elf_link_output_extsym): Set st_size to zero for

diff --git a/bfd/elf.c b/bfd/elf.c
index 24ab2c0bfb977f6397ce7cf97112b4b92c404c5b..a7cc4a596f6a46a686ebe1e13a8c3249f7b68392 100644 (file)
--- 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.  */