diff options
| author | DJ Delorie <dj@delorie.com> | 2013-01-29 22:17:52 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@delorie.com> | 2013-01-29 22:17:52 +0000 |
| commit | 570377c717b4d2d973a04d890a9a24fcc1b8feaa (patch) | |
| tree | 89414989541a2a54e6863469ae07a89b0dcc65d5 /bfd/elf32-rx.c | |
| parent | 48bb8263bee1d1ba35896a98b6ae3a69ce76ef88 (diff) | |
| download | binutils-redhat-570377c717b4d2d973a04d890a9a24fcc1b8feaa.tar.gz | |
* config/tc-rl78.c (rl78_cons_fix_new): Handle user-specified
relocs in .word/.etc statements.
Diffstat (limited to 'bfd/elf32-rx.c')
| -rw-r--r-- | bfd/elf32-rx.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/bfd/elf32-rx.c b/bfd/elf32-rx.c index 5000eb7be0..8b61142d4b 100644 --- a/bfd/elf32-rx.c +++ b/bfd/elf32-rx.c @@ -3098,9 +3098,15 @@ 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 @@ -3113,7 +3119,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; } } @@ -3123,9 +3129,15 @@ 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); } |