diff options
| author | Jan Kratochvil <jan.kratochvil@redhat.com> | 2008-05-29 07:07:20 +0000 |
|---|---|---|
| committer | Jan Kratochvil <jan.kratochvil@redhat.com> | 2008-05-29 07:07:20 +0000 |
| commit | 3de1dc4af3f0b028089af29d257992f94cb3b485 (patch) | |
| tree | 673eec9f7bd1f53d7858cc57cf506092356a7f9c /bfd | |
| parent | 4e236720eb086ab3d081d85c03cbff11c60d95e9 (diff) | |
| download | gdb-3de1dc4af3f0b028089af29d257992f94cb3b485.tar.gz | |
bfd/
* 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.
binutils/testsuite/
* binutils-all/objcopy.exp: Call KEEP_DEBUG_SYMBOLS_AND_TEST_COPY.
(keep_debug_symbols_and_test_copy): New function.
(test5, test6): New variables.
Diffstat (limited to 'bfd')
| -rw-r--r-- | bfd/ChangeLog | 5 | ||||
| -rw-r--r-- | bfd/elf.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 4fb2a0be0b9..e980d900b19 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 005f8f629f1..37a150191cf 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; } |