* elf.c (assign_file_positions_for_segments): Use maximum of

maxpagesize and section alignment when adjusting initial
	segment offset and section offsets.

bfd/ChangeLog

@@ -1,3 +1,9 @@
+2005-05-19  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf.c (assign_file_positions_for_segments): Use maximum of
+	maxpagesize and section alignment when adjusting initial
+	segment offset and section offsets.
+
 2005-05-18  Zack Weinberg  <zack@codesourcery.com>
 
 	* elf32-arm.c: Make all #ifndef OLD_ARM_ABI blocks

bfd/elf.c

@@ -4151,12 +4151,8 @@ assign_file_positions_for_segments (bfd *abfd, struct bfd_link_info *link_info)
 	{
 	  bfd_size_type align;
 	  bfd_vma adjust;
-
-	  if ((abfd->flags & D_PAGED) != 0)
-	    align = bed->maxpagesize;
-	  else
-	    {
 	  unsigned int align_power = 0;
+
 	  for (i = 0, secpp = m->sections; i < m->count; i++, secpp++)
 	    {
 	      unsigned int secalign;
@@ -4166,7 +4162,9 @@ assign_file_positions_for_segments (bfd *abfd, struct bfd_link_info *link_info)
 		align_power = secalign;
 	    }
 	  align = (bfd_size_type) 1 << align_power;
-	    }
+
+	  if ((abfd->flags & D_PAGED) != 0 && bed->maxpagesize > align)
+	    align = bed->maxpagesize;
 
 	  adjust = vma_page_aligned_bias (m->sections[0]->vma, off, align);
 	  off += adjust;
@@ -4352,7 +4350,7 @@ assign_file_positions_for_segments (bfd *abfd, struct bfd_link_info *link_info)
 		  /* The section VMA must equal the file position
 		     modulo the page size.  */
 		  bfd_size_type page = align;
-		  if ((abfd->flags & D_PAGED) != 0)
+		  if ((abfd->flags & D_PAGED) != 0 && bed->maxpagesize > page)
 		    page = bed->maxpagesize;
 		  adjust = vma_page_aligned_bias (sec->vma,
 						  p->p_vaddr + p->p_memsz,