This is the mail archive of the
binutils-cvs@sourceware.org
mailing list for the binutils project.
[binutils-gdb] Make ALIGN(x) behave as ALIGN(.,x)
- From: Alan Modra <amodra at sourceware dot org>
- To: bfd-cvs at sourceware dot org
- Date: 10 Jul 2015 10:39:31 -0000
- Subject: [binutils-gdb] Make ALIGN(x) behave as ALIGN(.,x)
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=a2c59f280dda14a2f68d0175c8879238be1aa200
commit a2c59f280dda14a2f68d0175c8879238be1aa200
Author: Alan Modra <amodra@gmail.com>
Date: Wed Jul 8 22:18:34 2015 +0930
Make ALIGN(x) behave as ALIGN(.,x)
Inside output sections, ALIGN(.,x) uses a section-relative value for
dot. The unary ALIGN always used the absolute value of dot.
* ldexp.c (align_dot_val): New function.
(fold_unary <ALIGN_K, NEXT>): Use it.
Diff:
---
ld/ChangeLog | 5 +++++
ld/ldexp.c | 12 ++++++++++--
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/ld/ChangeLog b/ld/ChangeLog
index 9228ead..aec6288 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2015-07-10 Alan Modra <amodra@gmail.com>
+
+ * ldexp.c (align_dot_val): New function.
+ (fold_unary <ALIGN_K, NEXT>): Use it.
+
2015-07-03 Kai Tietz <ktietz@redhat.com>
PR ld/11539
diff --git a/ld/ldexp.c b/ld/ldexp.c
index a5192b1..2c0fe5a 100644
--- a/ld/ldexp.c
+++ b/ld/ldexp.c
@@ -257,6 +257,14 @@ new_rel_from_abs (bfd_vma value)
expld.result.section = s;
}
+static void
+align_dot_val (bfd_vma align)
+{
+ bfd_vma base = expld.section->vma;
+
+ new_rel_from_abs (base + align_n (expld.dot - base, align));
+}
+
/* New-function for the definedness hash table. */
static struct bfd_hash_entry *
@@ -335,7 +343,7 @@ fold_unary (etree_type *tree)
{
case ALIGN_K:
if (expld.phase != lang_first_phase_enum)
- new_rel_from_abs (align_n (expld.dot, expld.result.value));
+ align_dot_val (expld.result.value);
else
expld.result.valid_p = FALSE;
break;
@@ -365,7 +373,7 @@ fold_unary (etree_type *tree)
if (expld.phase != lang_first_phase_enum)
{
make_abs ();
- expld.result.value = align_n (expld.dot, expld.result.value);
+ align_dot_val (expld.result.value);
}
else
expld.result.valid_p = FALSE;