diff options
| -rw-r--r-- | bfd/ChangeLog | 4 | ||||
| -rw-r--r-- | bfd/merge.c | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index ae13e06..6e66048 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,7 @@ +2005-04-14 Alan Modra <amodra@bigpond.net.au> + + * merge.c (merge_strings): Round up section size for alignment. + 2005-04-14 David S. Miller <davem@davemloft.net> Add TLS support for 64-bit Sparc ELF. diff --git a/bfd/merge.c b/bfd/merge.c index 3efbd43..da826c7 100644 --- a/bfd/merge.c +++ b/bfd/merge.c @@ -656,6 +656,11 @@ alloc_failure: } } secinfo->sec->size = size; + if (secinfo->sec->alignment_power != 0) + { + bfd_size_type align = (bfd_size_type) 1 << secinfo->sec->alignment_power; + secinfo->sec->size = (secinfo->sec->size + align - 1) & -align; + } /* And now adjust the rest, removing them from the chain (but not hashtable) at the same time. */ |