From: H.J. Lu <hjl.tools@gmail.com>
Date: Fri, 20 Aug 2010 22:29:28 +0000 (+0000)
Subject: Revert the last checkin on sec_merge_emit.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3409e291c1c178630a26ca916cd178c0c07e2fd9;p=binutils-gdb.git

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 e90f4287b58..2137b57045f 100644
--- 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 180af267a21..7aa088ff947 100644
--- 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;