Blame binutils-2.20.51.0.10-sec-merge-emit.patch
|
 |
fa26cbc |
*** ../binutils-2.20.51.0.10.orig/bfd/merge.c 2010-08-20 12:19:33.000000000 +0100
|
|
|
fa26cbc |
--- bfd/merge.c 2010-08-20 12:18:01.000000000 +0100
|
|
|
fa26cbc |
*************** sec_merge_emit (bfd *abfd, struct sec_me
|
|
|
fa26cbc |
*** 307,312 ****
|
|
|
fa26cbc |
--- 307,315 ----
|
|
|
fa26cbc |
len = -off & (entry->alignment - 1);
|
|
|
fa26cbc |
if (len != 0)
|
|
|
fa26cbc |
{
|
|
|
fa26cbc |
+ /* We should never have an entry with an alignment
|
|
|
fa26cbc |
+ greater than the section's alignment. */
|
|
|
fa26cbc |
+ BFD_ASSERT (len <= (bfd_size_type) (1 << alignment_power));
|
|
|
fa26cbc |
if (bfd_bwrite (pad, len, abfd) != len)
|
|
|
fa26cbc |
goto err;
|
|
|
fa26cbc |
off += len;
|
|
|
fa26cbc |
*************** sec_merge_emit (bfd *abfd, struct sec_me
|
|
|
fa26cbc |
*** 324,329 ****
|
|
|
fa26cbc |
--- 327,333 ----
|
|
|
fa26cbc |
/* Trailing alignment needed? */
|
|
|
fa26cbc |
off = sec->size - off;
|
|
|
fa26cbc |
if (off != 0
|
|
|
fa26cbc |
+ && alignment_power
|
|
|
fa26cbc |
&& bfd_bwrite (pad, off, abfd) != off)
|
|
|
fa26cbc |
goto err;
|
|
|
fa26cbc |
|