aboutsummaryrefslogtreecommitdiff
path: root/bfd
diff options
context:
space:
mode:
authorAlan Modra <amodra@gmail.com>2005-04-14 00:27:20 +0000
committerAlan Modra <amodra@gmail.com>2005-04-14 00:27:20 +0000
commit8699aa54a266e568d5c2c59762d64edd96f11211 (patch)
treed093ac2140699499e9a3820558316862819eaedb /bfd
parentee9d5ee534f9c690875036f5cedf66398b1f1ec9 (diff)
downloadgdb-8699aa54a266e568d5c2c59762d64edd96f11211.zip
gdb-8699aa54a266e568d5c2c59762d64edd96f11211.tar.gz
gdb-8699aa54a266e568d5c2c59762d64edd96f11211.tar.bz2
* merge.c (merge_strings): Round up section size for alignment.
Diffstat (limited to 'bfd')
-rw-r--r--bfd/ChangeLog4
-rw-r--r--bfd/merge.c5
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. */