mirrors/binutils-gdb
0
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2024-12-18 23:03:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't use elf_i386_eh_frame_plt directly

Browse Source 
Use eh_frame_plt_size and eh_frame_plt from elf_i386_plt_layout for
.eh_frame covering the .plt section.

	* elf32-i386.c (elf_i386_size_dynamic_sections): Set
	plt_eh_frame->size to eh_frame_plt_size and use eh_frame_plt.
This commit is contained in:
H.J. Lu 2017-01-10 11:30:25 -08:00
parent e92372274e
commit f129e49f4d
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bfd/ChangeLog
View File

@ -1,3 +1,8 @@
2017-01-10 H.J. Lu <hongjiu.lu@intel.com>
* elf32-i386.c (elf_i386_size_dynamic_sections): Set
plt_eh_frame->size to eh_frame_plt_size and use eh_frame_plt.
2017-01-09 Nick Clifton <nickc@redhat.com>
* dwarf2.c (lookup_address_in_function_table): Return early if

8
bfd/elf32-i386.c
View File

@ -3385,7 +3385,8 @@ elf_i386_size_dynamic_sections (bfd *output_bfd, struct bfd_link_info *info)
&& htab->elf.splt->size != 0
&& !bfd_is_abs_section (htab->elf.splt->output_section)
&& _bfd_elf_eh_frame_present (info))
htab->plt_eh_frame->size = sizeof (elf_i386_eh_frame_plt);
htab->plt_eh_frame->size
= get_elf_i386_backend_data (output_bfd)->plt->eh_frame_plt_size;
/* We now have determined the sizes of the various dynamic sections.
Allocate memory for them. */
@ -3468,8 +3469,9 @@ elf_i386_size_dynamic_sections (bfd *output_bfd, struct bfd_link_info *info)
if (htab->plt_eh_frame != NULL
&& htab->plt_eh_frame->contents != NULL)
{
memcpy (htab->plt_eh_frame->contents, elf_i386_eh_frame_plt,
sizeof (elf_i386_eh_frame_plt));
memcpy (htab->plt_eh_frame->contents,
get_elf_i386_backend_data (output_bfd)->plt->eh_frame_plt,
htab->plt_eh_frame->size);
bfd_put_32 (dynobj, htab->elf.splt->size,
htab->plt_eh_frame->contents + PLT_FDE_LEN_OFFSET);
}