From: Alan Modra <amodra@gmail.com>
Date: Wed, 8 Jul 2015 12:48:34 +0000 (+0930)
Subject: Make ALIGN(x) behave as ALIGN(.,x)
X-Git-Tag: users/ARM/embedded-binutils-2_26-branch-2016q1~1394
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a2c59f280dda14a2f68d0175c8879238be1aa200;p=platform%2Fupstream%2Fbinutils.git

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 --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;