aboutsummaryrefslogtreecommitdiff
path: root/bfd
diff options
context:
space:
mode:
Diffstat (limited to 'bfd')
-rw-r--r--bfd/ChangeLog5
-rw-r--r--bfd/elf.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 4fb2a0b..e980d90 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-29 Jan Kratochvil <jan.kratochvil@redhat.com>
+
+ * elf.c (assign_file_positions_for_load_sections): Adjust pre-section
+ gaps based on VMA and P_VADDR instead of LMA and P_PADDR addresses.
+
2008-05-28 Alan Modra <amodra@bigpond.net.au>
* elf32-spu.c (spu_elf_object_p): New function.
diff --git a/bfd/elf.c b/bfd/elf.c
index 005f8f6..37a1501 100644
--- a/bfd/elf.c
+++ b/bfd/elf.c
@@ -4371,12 +4371,12 @@ assign_file_positions_for_load_sections (bfd *abfd,
&& ((this_hdr->sh_flags & SHF_TLS) == 0
|| p->p_type == PT_TLS))))
{
- bfd_signed_vma adjust = sec->lma - (p->p_paddr + p->p_memsz);
+ bfd_signed_vma adjust = sec->vma - (p->p_vaddr + p->p_memsz);
if (adjust < 0)
{
(*_bfd_error_handler)
- (_("%B: section %A lma 0x%lx overlaps previous sections"),
+ (_("%B: section %A vma 0x%lx overlaps previous sections"),
abfd, sec, (unsigned long) sec->lma);
adjust = 0;
}