diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2010-08-20 22:29:27 +0000 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2010-08-20 22:29:27 +0000 |
| commit | abe41e8ca9c0cf1bad8e29e22d84dfb6c9d67cec (patch) | |
| tree | 7c73b63e072b583c62d07b81fdf17a090309f4d8 /bfd/merge.c | |
| parent | 43663f33c62eb924e10f439bf8b64ab4b76ecbd8 (diff) | |
| download | binutils-redhat-abe41e8ca9c0cf1bad8e29e22d84dfb6c9d67cec.tar.gz | |
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/merge.c')
| -rw-r--r-- | bfd/merge.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/bfd/merge.c b/bfd/merge.c index 180af267a2..7aa088ff94 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; |