PR 4144

	* elf.c (assign_file_positions_for_load_sections): Don't
	adjust p_memsz for !SEC_LOAD section vma modulo page size.
	Instead, use the same lma based adjustment for SEC_LOAD
	sections.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 37b3c2df2ee00af098c7a646a40ec7b96601d683..915b6898a45466310b9e3c6ff0b8f0f914036703 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,11 @@
+2007-03-07  Alan Modra  <amodra@bigpond.net.au>
+
+       PR 4144
+       * elf.c (assign_file_positions_for_load_sections): Don't
+       adjust p_memsz for !SEC_LOAD section vma modulo page size.
+       Instead, use the same lma based adjustment for SEC_LOAD
+       sections.
+
 2007-03-01  Bob Wilson  <bob.wilson@acm.org>
 
        * elf32-xtensa.c (analyze_relocations): Zero src_count if not relaxing.

diff --git a/bfd/elf.c b/bfd/elf.c
index e2b0f0526666a318b4d176dceaa38e86ef860e69..d8828828d869694e8c3fe2e8bbe15b19c21e583c 100644 (file)
--- a/bfd/elf.c
+++ b/bfd/elf.c
@@ -1,7 +1,7 @@
 /* ELF executable support for BFD.
 
    Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-   2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+   2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
 
@@ -4495,11 +4495,13 @@ assign_file_positions_for_load_sections (bfd *abfd,
          if (p->p_type == PT_LOAD
              || p->p_type == PT_TLS)
            {
-             bfd_signed_vma adjust;
+             bfd_signed_vma adjust = sec->lma - (p->p_paddr + p->p_filesz);
 
-             if ((flags & SEC_LOAD) != 0)
+             if ((flags & SEC_LOAD) != 0
+                 || ((flags & SEC_ALLOC) != 0
+                     && ((flags & SEC_THREAD_LOCAL) == 0
+                         || p->p_type == PT_TLS)))
                {
-                 adjust = sec->lma - (p->p_paddr + p->p_filesz);
                  if (adjust < 0)
                    {
                      (*_bfd_error_handler)
@@ -4507,25 +4509,13 @@ assign_file_positions_for_load_sections (bfd *abfd,
                         abfd, sec, (unsigned long) sec->lma);
                      adjust = 0;
                    }
-                 off += adjust;
-                 p->p_filesz += adjust;
-                 p->p_memsz += adjust;
-               }
-             /* .tbss is special.  It doesn't contribute to p_memsz of
-                normal segments.  */
-             else if ((flags & SEC_ALLOC) != 0
-                      && ((flags & SEC_THREAD_LOCAL) == 0
-                          || p->p_type == PT_TLS))
-               {
-                 /* The section VMA must equal the file position
-                    modulo the page size.  */
-                 bfd_size_type page = align;
-                 if (page < maxpagesize)
-                   page = maxpagesize;
-                 adjust = vma_page_aligned_bias (sec->vma,
-                                                 p->p_vaddr + p->p_memsz,
-                                                 page);
                  p->p_memsz += adjust;
+
+                 if ((flags & SEC_LOAD) != 0)
+                   {
+                     off += adjust;
+                     p->p_filesz += adjust;
+                   }
                }
            }