x86: Set need_global_offset_table with info->output_bfd->xvec

	* elf32-i386.c (elf32_i386_copy_solaris_special_section_fields):
	Remove prototype.
	(i386_elf32_sol2_vec): Declared.
	(elf_i386_link_setup_gnu_properties): Set
	need_global_offset_table with info->output_bfd->xvec.
	* elf64-x86-64.c (elf64_x86_64_copy_solaris_special_section_fields):
	Remove prototype.
	(x86_64_elf64_sol2_vec): Declared.
	(elf_x86_64_link_setup_gnu_properties): Set
	need_global_offset_table with info->output_bfd->xvec.

3 files changed, 19 insertions, 14 deletions

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 0b27eb0..c25542d 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,6 +1,19 @@
 2018-02-08  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* elf32-i386.c (elf32_i386_copy_solaris_special_section_fields):
+	Remove prototype.
+	(i386_elf32_sol2_vec): Declared.
+	(elf_i386_link_setup_gnu_properties): Set
+	need_global_offset_table with info->output_bfd->xvec.
+	* elf64-x86-64.c (elf64_x86_64_copy_solaris_special_section_fields):
+	Remove prototype.
+	(x86_64_elf64_sol2_vec): Declared.
+	(elf_x86_64_link_setup_gnu_properties): Set
+	need_global_offset_table with info->output_bfd->xvec.
+
+2018-02-08  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf32-i386.c (elf32_i386_copy_solaris_special_section_fields):
 	New prototype.
 	(elf_i386_link_setup_gnu_properties): Set need_global_offset_table
 	for Solaris.
diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c
index 4988359..4a6df19 100644
--- a/bfd/elf32-i386.c
+++ b/bfd/elf32-i386.c
@@ -29,9 +29,6 @@
 
 #include "elf/i386.h"
 
-static bfd_boolean elf32_i386_copy_solaris_special_section_fields
-  (const bfd *, bfd *, const Elf_Internal_Shdr *, Elf_Internal_Shdr *);
-
 static reloc_howto_type elf_howto_table[]=
 {
   HOWTO(R_386_NONE, 0, 3, 0, FALSE, 0, complain_overflow_dont,
@@ -4341,6 +4338,8 @@ elf_i386_get_synthetic_symtab (bfd *abfd,
 					    ret);
 }
 
+extern const bfd_target i386_elf32_sol2_vec;
+
 /* Set up i386 GNU properties.  Return the first relocatable ELF input
    with GNU properties if found.  Otherwise, return NULL.  */
 
@@ -4348,7 +4347,6 @@ static bfd *
 elf_i386_link_setup_gnu_properties (struct bfd_link_info *info)
 {
   struct elf_x86_init_table init_table;
-  const struct elf_backend_data *bed;
 
   switch (get_elf_x86_backend_data (info->output_bfd)->target_os)
     {
@@ -4378,10 +4376,8 @@ elf_i386_link_setup_gnu_properties (struct bfd_link_info *info)
   init_table.r_info = elf32_r_info;
   init_table.r_sym = elf32_r_sym;
 
-  bed = get_elf_backend_data (info->output_bfd);
   init_table.need_global_offset_table
-    = (bed->elf_backend_copy_special_section_fields
-       == elf32_i386_copy_solaris_special_section_fields);
+    = info->output_bfd->xvec == &i386_elf32_sol2_vec;
 
   return _bfd_x86_elf_link_setup_gnu_properties (info, &init_table);
 }
diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c
index 7fa0408..149543f 100644
--- a/bfd/elf64-x86-64.c
+++ b/bfd/elf64-x86-64.c
@@ -27,9 +27,6 @@
 #include "opcode/i386.h"
 #include "elf/x86-64.h"
 
-static bfd_boolean elf64_x86_64_copy_solaris_special_section_fields
-  (const bfd *, bfd *, const Elf_Internal_Shdr *, Elf_Internal_Shdr *);
-
 #ifdef CORE_HEADER
 #include <stdarg.h>
 #include CORE_HEADER
@@ -4854,6 +4851,8 @@ elf_x86_64_relocs_compatible (const bfd_target *input,
 	  && _bfd_elf_relocs_compatible (input, output));
 }
 
+extern const bfd_target x86_64_elf64_sol2_vec;
+
 /* Set up x86-64 GNU properties.  Return the first relocatable ELF input
    with GNU properties if found.  Otherwise, return NULL.  */
 
@@ -4861,7 +4860,6 @@ static bfd *
 elf_x86_64_link_setup_gnu_properties (struct bfd_link_info *info)
 {
   struct elf_x86_init_table init_table;
-  const struct elf_backend_data *bed;
 
   if ((int) R_X86_64_standard >= (int) R_X86_64_converted_reloc_bit
       || (int) R_X86_64_max <= (int) R_X86_64_converted_reloc_bit
@@ -4918,10 +4916,8 @@ elf_x86_64_link_setup_gnu_properties (struct bfd_link_info *info)
       init_table.r_sym = elf32_r_sym;
     }
 
-  bed = get_elf_backend_data (info->output_bfd);
   init_table.need_global_offset_table
-    = (bed->elf_backend_copy_special_section_fields
-       == elf64_x86_64_copy_solaris_special_section_fields);
+    = info->output_bfd->xvec == &x86_64_elf64_sol2_vec;
 
   return _bfd_x86_elf_link_setup_gnu_properties (info, &init_table);
 }