Visium: fix bogus overflow check on 32-bit hosts

bfd/
	* elf32-visium.c (visium_elf_howto_parity_reloc): Minor tweak.
	<R_VISIUM_PC16>: Use explicit range test to detect an overflow.
This commit is contained in:
Eric Botcazou
2019-02-07 17:02:24 +01:00
parent 0e7e9601be
commit 68a091326f
2 changed files with 11 additions and 7 deletions

View File

@@ -1,3 +1,8 @@
2019-02-07 Eric Botcazou <ebotcazou@adacore.com>
* elf32-visium.c (visium_elf_howto_parity_reloc): Minor tweak.
<R_VISIUM_PC16>: Use explicit range test to detect an overflow.
2019-02-07 Nick Clifton <nickc@redhat.com> 2019-02-07 Nick Clifton <nickc@redhat.com>
* config.bfd: Move the powerpc-lynxos and powerpc-windiss targets * config.bfd: Move the powerpc-lynxos and powerpc-windiss targets

View File

@@ -312,7 +312,6 @@ visium_elf_howto_parity_reloc (bfd * input_bfd, arelent *reloc_entry,
bfd_vma relocation; bfd_vma relocation;
bfd_byte *inplace_address; bfd_byte *inplace_address;
bfd_vma insn; bfd_vma insn;
const bfd_vma signmask = 0xffff8000;
/* This part is from bfd_elf_generic_reloc. /* This part is from bfd_elf_generic_reloc.
If we're relocating, and this an external symbol, we don't want If we're relocating, and this an external symbol, we don't want
@@ -351,19 +350,19 @@ visium_elf_howto_parity_reloc (bfd * input_bfd, arelent *reloc_entry,
if (reloc_entry->howto->pc_relative) if (reloc_entry->howto->pc_relative)
{ {
relocation -= input_section->output_section->vma relocation -= input_section->output_section->vma;
+ input_section->output_offset; relocation -= input_section->output_offset;
relocation -= reloc_entry->address; relocation -= reloc_entry->address;
} }
switch (reloc_entry->howto->type) switch (reloc_entry->howto->type)
{ {
case R_VISIUM_PC16: case R_VISIUM_PC16:
relocation >>= 2; if (ret == bfd_reloc_ok
if (ret == bfd_reloc_ok && (relocation & signmask) != 0 && ((bfd_signed_vma) relocation < -0x20000
&& (relocation & signmask) != signmask) || (bfd_signed_vma) relocation > 0x1ffff))
ret = bfd_reloc_overflow; ret = bfd_reloc_overflow;
relocation &= 0xffff; relocation = (relocation >> 2) & 0xffff;
break; break;
case R_VISIUM_HI16: case R_VISIUM_HI16:
case R_VISIUM_HI16_PCREL: case R_VISIUM_HI16_PCREL: