PR ld/15222

ld/
	* ldlang.c (lang_size_sections_1): When given an lma_region align
	LMA as per VMA only if lma_region is the same as region.
ld/testsuite/
	* ld-scripts/rgn-at6.s, * ld-scripts/rgn-at6.t, * ld-scripts/rgn-at6.d,
	* ld-scripts/rgn-at7.t, * ld-scripts/rgn-at7.d: New tests.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 670b51e7fe6d4f0d4bbd7bf1e105b1093b2b1e59..20c59c77ca67ed30e209fc5ddf9bffcd4639ffd9 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,9 @@
+2013-03-05  Alan Modra  <amodra@gmail.com>
+
+       PR ld/15222
+       * ldlang.c (lang_size_sections_1): When given an lma_region align
+       LMA as per VMA only if lma_region is the same as region.
+
 2013-01-22  Alan Modra  <amodra@gmail.com>
 
        Apply mainline patches

diff --git a/ld/ldlang.c b/ld/ldlang.c
index 01c12df2c5250d826964bbbb6438b11f231eaad6..459f277a3ea5baa2f38e7b95db0ac9ef67d648b8 100644 (file)
--- a/ld/ldlang.c
+++ b/ld/ldlang.c
@@ -4961,6 +4961,13 @@ lang_size_sections_1
              {
                bfd_vma lma = os->lma_region->current;
 
+               /* When LMA_REGION is the same as REGION, align the LMA
+                  as we did for the VMA, possibly including alignment
+                  from the bfd section.  If a different region, then
+                  only align according to the value in the output
+                  statement.  */
+               if (os->lma_region != os->region)
+                 section_alignment = os->section_alignment;
                if (section_alignment > 0)
                  lma = align_power (lma, section_alignment);
                os->bfd_section->lma = lma;

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 2d963681789f40cbc87b974399a4b796fbe71c59..6d516e08a42b63b2cce969ce6df05b8677c988e7 100644 (file)
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-05  Alan Modra  <amodra@gmail.com>
+
+       * ld-scripts/rgn-at6.s, * ld-scripts/rgn-at6.t, * ld-scripts/rgn-at6.d,
+       * ld-scripts/rgn-at7.t, * ld-scripts/rgn-at7.d: New tests.
+
 2013-02-12  Yufeng Zhang  <yufeng.zhang@arm.com>
 
        * ld-aarch64/emit-relocs-264.d: Append the '-Mno-aliases' option to