[binutils-gdb/binutils-2_28-branch] Don't use elf_i386_eh_frame_plt directly

[H.J.Lu]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=cd3ffd4ed23eeb517f28c7c761e1f2def6268ca2

commit cd3ffd4ed23eeb517f28c7c761e1f2def6268ca2
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Tue Jan 10 11:30:25 2017 -0800

    Don't use elf_i386_eh_frame_plt directly
    
    Use eh_frame_plt_size and eh_frame_plt from elf_i386_plt_layout for
    .eh_frame covering the .plt section.
    
    	Backport from master
    	* elf32-i386.c (elf_i386_size_dynamic_sections): Set
    	plt_eh_frame->size to eh_frame_plt_size and use eh_frame_plt.

Diff:
---
 bfd/ChangeLog    | 8 ++++++++
 bfd/elf32-i386.c | 8 +++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 0ee240d..7f9e4ef 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,11 @@
+2017-01-13  H.J. Lu  <hongjiu.lu@intel.com>
+
+	Backport from master
+	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-12  Nick Clifton  <nickc@redhat.com>
 
 	PR binutils/20876
diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c
index e977dd7..a2da987 100644
--- a/bfd/elf32-i386.c
+++ b/bfd/elf32-i386.c
@@ -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);
     }