* ldexp.c (fold_binary) [DATA_SEGMENT_ALIGN]: Apply data segment

	alignment before adjusting DATA_SEGMENT_RELRO_END.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index e61f71960bdb3b9b95d1e9873b5d9f762b56202d..0f5562268c03aa47a2f16ebbf4be9bb4fdc86e13 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-07  Andreas Schwab  <schwab@suse.de>
+
+       * ldexp.c (fold_binary) [DATA_SEGMENT_ALIGN]: Apply data segment
+       alignment before adjusting DATA_SEGMENT_RELRO_END.
+
 2004-09-06  Mark Mitchell  <mark@codesourcery.com>
 
        * emulparams/armsymbian.sh: Use armbpabi script.

diff --git a/ld/ldexp.c b/ld/ldexp.c
index e7587c17100d755fdcbffddde3deabba65cf7556..c19070f41dc1fa9b5b5772744eba9f9b72046001 100644 (file)
--- a/ld/ldexp.c
+++ b/ld/ldexp.c
@@ -427,6 +427,7 @@ fold_binary (etree_type *tree,
                         a common page boundary.  */
                      bfd_vma relro;
 
+                     result.value += dot & (maxpage - 1);
                      relro = exp_data_seg.relro_end - exp_data_seg.base;
                      result.value += -relro & (other.value - 1);
                      exp_data_seg.base = result.value;