aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@linux-m68k.org>2004-09-07 15:54:47 +0000
committerAndreas Schwab <schwab@linux-m68k.org>2004-09-07 15:54:47 +0000
commit875c4330ff527a8b51ee8c3e31738b8462603f59 (patch)
tree9bf827f50853dfbf820e24a09aa784c72157beae
parentee75fd9567be17c012f4e85508bd2cafb7859aa5 (diff)
downloadbinutils-875c4330ff527a8b51ee8c3e31738b8462603f59.zip
binutils-875c4330ff527a8b51ee8c3e31738b8462603f59.tar.gz
binutils-875c4330ff527a8b51ee8c3e31738b8462603f59.tar.bz2
* ldexp.c (fold_binary) [DATA_SEGMENT_ALIGN]: Apply data segment
alignment before adjusting DATA_SEGMENT_RELRO_END.
-rw-r--r--ld/ChangeLog5
-rw-r--r--ld/ldexp.c1
2 files changed, 6 insertions, 0 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog
index e61f719..0f55622 100644
--- 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 e7587c1..c19070f 100644
--- 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;