diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2015-09-02 05:13:08 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2015-09-02 05:13:08 -0700 |
| commit | c74be520ba8ed2d013d43916b923b837294343cc (patch) | |
| tree | 8a5aef42de5fbd4441a3e9e50685675351cec0b4 | |
| parent | 358de98820c5e9caa222846ba8b646de6cc091c8 (diff) | |
| download | binutils-gdb-c74be520ba8ed2d013d43916b923b837294343cc.tar.gz | |
Rename R_386_irelative to R_386_ext2
* elf32-i386.c (R_386_irelative): Renamed to ...
(R_386_ext2): This.
(R_386_vt_offset): Updated.
(elf_i386_rtype_to_howto): Likewise.
(elf_i386_relocate_section): Likewise.
| -rw-r--r-- | bfd/ChangeLog | 8 | ||||
| -rw-r--r-- | bfd/elf32-i386.c | 12 |
2 files changed, 14 insertions, 6 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index b614e3c10de..cfd5f3961d0 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,11 @@ +2015-09-02 H.J. Lu <hongjiu.lu@intel.com> + + * elf32-i386.c (R_386_irelative): Renamed to ... + (R_386_ext2): This. + (R_386_vt_offset): Updated. + (elf_i386_rtype_to_howto): Likewise. + (elf_i386_relocate_section): Likewise. + 2015-09-01 H.J. Lu <hongjiu.lu@intel.com> PR ld/18900 diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c index 85b70093d87..85885f71e17 100644 --- a/bfd/elf32-i386.c +++ b/bfd/elf32-i386.c @@ -148,8 +148,8 @@ static reloc_howto_type elf_howto_table[]= TRUE, 0xffffffff, 0xffffffff, FALSE), /* Another gap. */ -#define R_386_irelative (R_386_IRELATIVE + 1 - R_386_tls_offset) -#define R_386_vt_offset (R_386_GNU_VTINHERIT - R_386_irelative) +#define R_386_ext2 (R_386_IRELATIVE + 1 - R_386_tls_offset) +#define R_386_vt_offset (R_386_GNU_VTINHERIT - R_386_ext2) /* GNU extension to record C++ vtable hierarchy. */ HOWTO (R_386_GNU_VTINHERIT, /* type */ @@ -371,9 +371,9 @@ elf_i386_rtype_to_howto (bfd *abfd, unsigned r_type) && ((indx = r_type - R_386_ext_offset) - R_386_standard >= R_386_ext - R_386_standard) && ((indx = r_type - R_386_tls_offset) - R_386_ext - >= R_386_irelative - R_386_ext) - && ((indx = r_type - R_386_vt_offset) - R_386_irelative - >= R_386_vt - R_386_irelative)) + >= R_386_ext2 - R_386_ext) + && ((indx = r_type - R_386_vt_offset) - R_386_ext2 + >= R_386_vt - R_386_ext2)) { (*_bfd_error_handler) (_("%B: invalid relocation type %d"), abfd, (int) r_type); @@ -3422,7 +3422,7 @@ elf_i386_relocate_section (bfd *output_bfd, && ((indx = r_type - R_386_ext_offset) - R_386_standard >= R_386_ext - R_386_standard) && ((indx = r_type - R_386_tls_offset) - R_386_ext - >= R_386_irelative - R_386_ext)) + >= R_386_ext2 - R_386_ext)) { (*_bfd_error_handler) (_("%B: unrecognized relocation (0x%x) in section `%A'"), |