Revert the last checkin on sec_merge_emit.

2010-08-20  H.J. Lu  <hongjiu.lu@intel.com>

	* merge.c (sec_merge_emit): Revert the last checkin.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index e90f4287b58d2afec32cb1fcb0e4fa5c8e29113d..2137b57045f0791b25172428aa600030e15b4ca6 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,7 @@
+2010-08-20  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * merge.c (sec_merge_emit): Revert the last checkin.
+
 2010-08-20  Maciej W. Rozycki  <macro@codesourcery.com>
 
        * elf32-sh.c (sh_elf_relocate_section): Handle non-ELF output

diff --git a/bfd/merge.c b/bfd/merge.c
index 180af267a219bcaf970e19f0d421f4a75b398899..7aa088ff94734a50eb070351849507b567498f38 100644 (file)
--- a/bfd/merge.c
+++ b/bfd/merge.c
@@ -307,9 +307,6 @@ sec_merge_emit (bfd *abfd, struct sec_merge_hash_entry *entry)
       len = -off & (entry->alignment - 1);
       if (len != 0)
        {
-         /* We should never have an entry with an alignment
-            greater than the section's alignment.  */
-         BFD_ASSERT (len <= (bfd_size_type) (1 << alignment_power));
          if (bfd_bwrite (pad, len, abfd) != len)
            goto err;
          off += len;
@@ -327,7 +324,6 @@ sec_merge_emit (bfd *abfd, struct sec_merge_hash_entry *entry)
   /* Trailing alignment needed?  */
   off = sec->size - off;
   if (off != 0
-      && alignment_power
       && bfd_bwrite (pad, off, abfd) != off)
     goto err;