FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

x86: Add sizeof_reloc to elf_x86_link_hash_table

Browse source 
Initialize htab->sizeof_reloc once, instead of computing it every time.

	* elfxx-x86.c (_bfd_x86_elf_link_hash_table_create): Initialize
	sizeof_reloc.
	(_bfd_x86_elf_adjust_dynamic_symbol): Use sizeof_reloc.
	* elfxx-x86.h (elf_x86_link_hash_table): Add sizeof_reloc.
This commit is contained in:
H.J. Lu 2017-09-02 05:55:25 -07:00
parent 9a742a902f
commit 503294e755
3 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
bfd/ChangeLog
View file

@ -1,3 +1,10 @@
2017-09-02 H.J. Lu <hongjiu.lu@intel.com>
* elfxx-x86.c (_bfd_x86_elf_link_hash_table_create): Initialize
sizeof_reloc.
(_bfd_x86_elf_adjust_dynamic_symbol): Use sizeof_reloc.
* elfxx-x86.h (elf_x86_link_hash_table): Add sizeof_reloc.
2017-09-02 H.J. Lu <hongjiu.lu@intel.com> 2017-09-02 H.J. Lu <hongjiu.lu@intel.com>
* elf32-i386.c (elf_i386_allocate_dynrelocs): Check VxWorks * elf32-i386.c (elf_i386_allocate_dynrelocs): Check VxWorks

7
bfd/elfxx-x86.c
View file

@ -277,6 +277,7 @@ _bfd_x86_elf_link_hash_table_create (bfd *abfd)
{ {
ret->r_info = elf64_r_info; ret->r_info = elf64_r_info;
ret->r_sym = elf64_r_sym; ret->r_sym = elf64_r_sym;
ret->sizeof_reloc = sizeof (Elf64_External_Rela);
ret->pointer_r_type = R_X86_64_64; ret->pointer_r_type = R_X86_64_64;
ret->dynamic_interpreter = ELF64_DYNAMIC_INTERPRETER; ret->dynamic_interpreter = ELF64_DYNAMIC_INTERPRETER;
ret->dynamic_interpreter_size = sizeof ELF64_DYNAMIC_INTERPRETER; ret->dynamic_interpreter_size = sizeof ELF64_DYNAMIC_INTERPRETER;
@ -289,6 +290,7 @@ _bfd_x86_elf_link_hash_table_create (bfd *abfd)
ret->r_sym = elf32_r_sym; ret->r_sym = elf32_r_sym;
if (bed->target_id == X86_64_ELF_DATA) if (bed->target_id == X86_64_ELF_DATA)
{ {
ret->sizeof_reloc = sizeof (Elf32_External_Rela);
ret->pointer_r_type = R_X86_64_32; ret->pointer_r_type = R_X86_64_32;
ret->dynamic_interpreter = ELFX32_DYNAMIC_INTERPRETER; ret->dynamic_interpreter = ELFX32_DYNAMIC_INTERPRETER;
ret->dynamic_interpreter_size ret->dynamic_interpreter_size
@ -297,6 +299,7 @@ _bfd_x86_elf_link_hash_table_create (bfd *abfd)
} }
else else
{ {
ret->sizeof_reloc = sizeof (Elf32_External_Rel);
ret->pointer_r_type = R_386_32; ret->pointer_r_type = R_386_32;
ret->dynamic_interpreter = ELF32_DYNAMIC_INTERPRETER; ret->dynamic_interpreter = ELF32_DYNAMIC_INTERPRETER;
ret->dynamic_interpreter_size ret->dynamic_interpreter_size
@ -735,9 +738,7 @@ _bfd_x86_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
} }
if ((h->root.u.def.section->flags & SEC_ALLOC) != 0 && h->size != 0) if ((h->root.u.def.section->flags & SEC_ALLOC) != 0 && h->size != 0)
{ {
srel->size += ((bed->target_id == I386_ELF_DATA) srel->size += htab->sizeof_reloc;
? sizeof (Elf32_External_Rel)
: bed->s->sizeof_rela);
h->needs_copy = 1; h->needs_copy = 1;
} }

1
bfd/elfxx-x86.h
View file

@ -313,6 +313,7 @@ struct elf_x86_link_hash_table
bfd_vma (*r_info) (bfd_vma, bfd_vma); bfd_vma (*r_info) (bfd_vma, bfd_vma);
bfd_vma (*r_sym) (bfd_vma); bfd_vma (*r_sym) (bfd_vma);
unsigned int sizeof_reloc;
unsigned int pointer_r_type; unsigned int pointer_r_type;
int dynamic_interpreter_size; int dynamic_interpreter_size;
const char *dynamic_interpreter; const char *dynamic_interpreter;