espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-23 19:50:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rename R_386_irelative to R_386_ext2

Browse Source 
* 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.
This commit is contained in:
H.J. Lu
2015-09-02 05:13:08 -07:00
parent 358de98820
commit c74be520ba
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bfd/ChangeLog
View File

@ -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> 2015-09-01 H.J. Lu <hongjiu.lu@intel.com>
PR ld/18900 PR ld/18900

12
bfd/elf32-i386.c
View File

@ -148,8 +148,8 @@ static reloc_howto_type elf_howto_table[]=
TRUE, 0xffffffff, 0xffffffff, FALSE), TRUE, 0xffffffff, 0xffffffff, FALSE),
/* Another gap. */ /* Another gap. */
#define R_386_irelative (R_386_IRELATIVE + 1 - R_386_tls_offset) #define R_386_ext2 (R_386_IRELATIVE + 1 - R_386_tls_offset)
#define R_386_vt_offset (R_386_GNU_VTINHERIT - R_386_irelative) #define R_386_vt_offset (R_386_GNU_VTINHERIT - R_386_ext2)
/* GNU extension to record C++ vtable hierarchy. */ /* GNU extension to record C++ vtable hierarchy. */
HOWTO (R_386_GNU_VTINHERIT, /* type */ 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 && ((indx = r_type - R_386_ext_offset) - R_386_standard
>= R_386_ext - R_386_standard) >= R_386_ext - R_386_standard)
&& ((indx = r_type - R_386_tls_offset) - R_386_ext && ((indx = r_type - R_386_tls_offset) - R_386_ext
>= R_386_irelative - R_386_ext) >= R_386_ext2 - R_386_ext)
&& ((indx = r_type - R_386_vt_offset) - R_386_irelative && ((indx = r_type - R_386_vt_offset) - R_386_ext2
>= R_386_vt - R_386_irelative)) >= R_386_vt - R_386_ext2))
{ {
(*_bfd_error_handler) (_("%B: invalid relocation type %d"), (*_bfd_error_handler) (_("%B: invalid relocation type %d"),
abfd, (int) r_type); 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 && ((indx = r_type - R_386_ext_offset) - R_386_standard
>= R_386_ext - R_386_standard) >= R_386_ext - R_386_standard)
&& ((indx = r_type - R_386_tls_offset) - R_386_ext && ((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) (*_bfd_error_handler)
(_("%B: unrecognized relocation (0x%x) in section `%A'"), (_("%B: unrecognized relocation (0x%x) in section `%A'"),