diff options
| -rw-r--r-- | bfd/ChangeLog | 6 | ||||
| -rw-r--r-- | bfd/bfd-in2.h | 4 | ||||
| -rw-r--r-- | bfd/reloc.c | 7 |
3 files changed, 10 insertions, 7 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 183fc0c8195..40fbaaee444 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2001-12-04 Alan Modra <amodra@bigpond.net.au> + + * reloc.c (bfd_install_relocation): Correct reloc address test. + (bfd_perform_relocation): Formatting fix. + * bfd-in2.h: Regenerate for 2001-12-02 reloc.c change. + 2001-12-03 Nick Clifton <nickc@cambridge.redhat.com> * configure.in (LINGUAS): Add tr. diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h index 5f61853dc09..12fe5a9ce62 100644 --- a/bfd/bfd-in2.h +++ b/bfd/bfd-in2.h @@ -2123,16 +2123,12 @@ to compensate for the borrow when the low bits are added. */ /* Like BFD_RELOC_LO16, but PC relative. */ BFD_RELOC_PCREL_LO16, -/* Relocation relative to the global pointer. */ -#define BFD_RELOC_MIPS_GPREL BFD_RELOC_GPREL16 - /* Relocation against a MIPS literal section. */ BFD_RELOC_MIPS_LITERAL, /* MIPS ELF relocations. */ BFD_RELOC_MIPS_GOT16, BFD_RELOC_MIPS_CALL16, -#define BFD_RELOC_MIPS_GPREL32 BFD_RELOC_GPREL32 BFD_RELOC_MIPS_GOT_HI16, BFD_RELOC_MIPS_GOT_LO16, BFD_RELOC_MIPS_CALL_HI16, diff --git a/bfd/reloc.c b/bfd/reloc.c index 78b039b3972..e0e7d1633b6 100644 --- a/bfd/reloc.c +++ b/bfd/reloc.c @@ -627,8 +627,8 @@ bfd_perform_relocation (abfd, reloc_entry, data, input_section, output_bfd, } /* Is the address of the relocation really within the section? */ - if (reloc_entry->address > input_section->_cooked_size / - bfd_octets_per_byte (abfd)) + if (reloc_entry->address > (input_section->_cooked_size + / bfd_octets_per_byte (abfd))) return bfd_reloc_outofrange; /* Work out which section the relocation is targetted at and the @@ -1023,7 +1023,8 @@ bfd_install_relocation (abfd, reloc_entry, data_start, data_start_offset, } /* Is the address of the relocation really within the section? */ - if (reloc_entry->address > input_section->_cooked_size) + if (reloc_entry->address > (input_section->_cooked_size + / bfd_octets_per_byte (abfd))) return bfd_reloc_outofrange; /* Work out which section the relocation is targetted at and the |