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.

	* elf32-i386.c (elf_i386_size_dynamic_sections): Set
	plt_eh_frame->size to eh_frame_plt_size and use eh_frame_plt.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 83a71169d5ae110a4c6795381998b89c4be7d1af..09121d2fceb8777a3ac564565afdb5100071dc66 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -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

diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c
index e977dd779a9bc32ad2194da7658da7ea6f03669e..a2da987850f2fb9e3ffd7c8ef9df89df9a933d28 100644 (file)
--- 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);
     }