cb347a4
--- a/bfd/merge.c	2010-08-20 12:19:33.000000000 +0100
cb347a4
+++ b/bfd/merge.c	2010-08-20 12:18:01.000000000 +0100
cb347a4
@@ -307,6 +307,9 @@
cb347a4
       len = -off & (entry->alignment - 1);
cb347a4
       if (len != 0)
cb347a4
 	{
cb347a4
+	  /* We should never have an entry with an alignment
cb347a4
+	     greater than the section's alignment.  */
cb347a4
+	  BFD_ASSERT (len <= (bfd_size_type) (1 << alignment_power));
cb347a4
 	  if (bfd_bwrite (pad, len, abfd) != len)
cb347a4
 	    goto err;
cb347a4
 	  off += len;
cb347a4
@@ -324,6 +327,7 @@
cb347a4
   /* Trailing alignment needed?  */
cb347a4
   off = sec->size - off;
cb347a4
   if (off != 0
cb347a4
+      && alignment_power
cb347a4
       && bfd_bwrite (pad, off, abfd) != off)
cb347a4
     goto err;
cb347a4