* merge.c (merge_strings): Round up section size for alignment.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index ae13e06a7dce7df5809d8bc908cd003358c96e66..6e6604893995065d5b21c4cb634942aa58ee30af 100644 (file)
--- 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 3efbd43773ee3f61318d2b2064a2b09c13902462..da826c7175e97e2cc1e525f1ec4e87e9ea2a8814 100644 (file)
--- 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.  */