diff options
| author | Alan Modra <amodra@bigpond.net.au> | 2013-01-30 10:07:26 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@bigpond.net.au> | 2013-01-30 10:07:26 +0000 |
| commit | 6b0005493a0ede286ae5c1287663199b1ac1a32b (patch) | |
| tree | a2650b121cc43510ec8c7ce63159460188fe9e90 /bfd/elf32-rx.c | |
| parent | cb5c23e8512db9d4fa1edb3611202c55285f2021 (diff) | |
| download | binutils-redhat-6b0005493a0ede286ae5c1287663199b1ac1a32b.tar.gz | |
revert last commit
Diffstat (limited to 'bfd/elf32-rx.c')
| -rw-r--r-- | bfd/elf32-rx.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/bfd/elf32-rx.c b/bfd/elf32-rx.c index 8b61142d4b..5000eb7be0 100644 --- a/bfd/elf32-rx.c +++ b/bfd/elf32-rx.c @@ -3098,15 +3098,9 @@ rx_elf_object_p (bfd * abfd) { Elf_Internal_Shdr *sec = elf_tdata(abfd)->elf_sect_ptr[u]; -<<<<<<< elf32-rx.c - if (phdr[i].p_offset <= (bfd_vma) sec->sh_offset - && (bfd_vma)sec->sh_offset <= phdr[i].p_offset + (phdr[i].p_filesz - 1) - && sec->sh_size > 0) -======= if (phdr[i].p_filesz && phdr[i].p_offset <= (bfd_vma) sec->sh_offset && (bfd_vma)sec->sh_offset <= phdr[i].p_offset + (phdr[i].p_filesz - 1)) ->>>>>>> 1.20 { /* Found one! The difference between the two addresses, plus the difference between the two file offsets, is @@ -3119,7 +3113,7 @@ rx_elf_object_p (bfd * abfd) The correct LMA for the section is fffc0140 + (2050-2010). */ - phdr[i].p_vaddr = sec->sh_addr - (sec->sh_offset - phdr[i].p_offset); + phdr[i].p_vaddr = sec->sh_addr + (sec->sh_offset - phdr[i].p_offset); break; } } @@ -3129,15 +3123,9 @@ rx_elf_object_p (bfd * abfd) bsec = abfd->sections; while (bsec) { -<<<<<<< elf32-rx.c - if (bsec->flags & (SEC_LOAD | SEC_ALLOC) - && phdr[i].p_offset <= (bfd_vma) bsec->filepos - && (bfd_vma) bsec->filepos <= phdr[i].p_offset + (phdr[i].p_filesz - 1)) -======= if (phdr[i].p_filesz && phdr[i].p_vaddr <= bsec->vma && bsec->vma <= phdr[i].p_vaddr + (phdr[i].p_filesz - 1)) ->>>>>>> 1.20 { bsec->lma = phdr[i].p_paddr + (bsec->vma - phdr[i].p_vaddr); } |