aboutsummaryrefslogtreecommitdiff
path: root/ld/ldlang.c
diff options
context:
space:
mode:
authorAlan Modra <amodra@gmail.com>2010-12-04 03:30:45 +0000
committerAlan Modra <amodra@gmail.com>2010-12-04 03:30:45 +0000
commitc5b0a9ef7e4cef42c02aa446fd6e4481823df62c (patch)
tree0902dd95ca5de42010108f60942d3d8f5b179596 /ld/ldlang.c
parent97fc68fe161dfd4b989420f3439cdcbf47b078e7 (diff)
downloadgdb-c5b0a9ef7e4cef42c02aa446fd6e4481823df62c.zip
gdb-c5b0a9ef7e4cef42c02aa446fd6e4481823df62c.tar.gz
gdb-c5b0a9ef7e4cef42c02aa446fd6e4481823df62c.tar.bz2
* ldlang.c (lang_size_sections_1): Align lma using same alignment
as for vma.
Diffstat (limited to 'ld/ldlang.c')
-rw-r--r--ld/ldlang.c19
1 files changed, 9 insertions, 10 deletions
diff --git a/ld/ldlang.c b/ld/ldlang.c
index f74c1b5..2927ec8 100644
--- a/ld/ldlang.c
+++ b/ld/ldlang.c
@@ -4788,6 +4788,7 @@ lang_size_sections_1
bfd_vma newdot, after;
lang_output_section_statement_type *os;
lang_memory_region_type *r;
+ int section_alignment = 0;
os = &s->output_section_statement;
if (os->constraint == -1)
@@ -4857,8 +4858,6 @@ lang_size_sections_1
}
else
{
- int align;
-
if (os->addr_tree == NULL)
{
/* No address specified for this section, get one
@@ -4909,16 +4908,16 @@ lang_size_sections_1
}
newdot = os->region->current;
- align = os->bfd_section->alignment_power;
+ section_alignment = os->bfd_section->alignment_power;
}
else
- align = os->section_alignment;
+ section_alignment = os->section_alignment;
/* Align to what the section needs. */
- if (align > 0)
+ if (section_alignment > 0)
{
bfd_vma savedot = newdot;
- newdot = align_power (newdot, align);
+ newdot = align_power (newdot, section_alignment);
if (newdot != savedot
&& (config.warn_section_align
@@ -4974,8 +4973,8 @@ lang_size_sections_1
{
bfd_vma lma = os->lma_region->current;
- if (os->section_alignment != -1)
- lma = align_power (lma, os->section_alignment);
+ if (section_alignment > 0)
+ lma = align_power (lma, section_alignment);
os->bfd_section->lma = lma;
}
else if (r->last_os != NULL
@@ -5016,8 +5015,8 @@ lang_size_sections_1
else
lma = dot + last->lma - last->vma;
- if (os->section_alignment != -1)
- lma = align_power (lma, os->section_alignment);
+ if (section_alignment > 0)
+ lma = align_power (lma, section_alignment);
os->bfd_section->lma = lma;
}
}