diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2010-08-20 22:29:28 +0000 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2010-08-20 22:29:28 +0000 |
| commit | 3409e291c1c178630a26ca916cd178c0c07e2fd9 (patch) | |
| tree | d7e8ee384f5401c04d9e8d8264b5af568242caee /bfd | |
| parent | d820eaae5f353b0bdec1b24439da7bca35295d59 (diff) | |
| download | gdb-3409e291c1c178630a26ca916cd178c0c07e2fd9.zip gdb-3409e291c1c178630a26ca916cd178c0c07e2fd9.tar.gz gdb-3409e291c1c178630a26ca916cd178c0c07e2fd9.tar.bz2 | |
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.
Diffstat (limited to 'bfd')
| -rw-r--r-- | bfd/ChangeLog | 4 | ||||
| -rw-r--r-- | bfd/merge.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index e90f428..2137b57 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 180af26..7aa088f 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; |