Add is_solaris to elf_x86_target_os since Solaris is quite different.
* elf32-i386.c (elf_i386_get_synthetic_symtab): Also handle
is_solaris.
(i386_elf32_sol2_vec): Don't declare.
(elf_i386_link_setup_gnu_properties): Also handle is_solaris.
Don't set need_global_offset_table.
(elf_i386_solaris_arch_bed): New.
(elf_backend_arch_data): Set to elf_i386_solaris_arch_bed for
Solaris.
* elf64-x86-64.c (elf_x86_64_get_synthetic_symtab): Check
target_os != is_nacl instead of target_os == is_normal.
(x86_64_elf64_sol2_vec): Don't declare.
(elf_x86_64_link_setup_gnu_properties): Check target_os !=
is_nacl instead of target_os == is_normal. Don't set
need_global_offset_table.
(elf_x86_64_solaris_arch_bed): New.
(elf_backend_arch_data): Set to elf_x86_64_solaris_arch_bed for
Solaris.
* elfxx-x86.c (_bfd_x86_elf_size_dynamic_sections): Keep
_GLOBAL_OFFSET_TABLE_ for Solaris.
(_bfd_x86_elf_link_setup_gnu_properties): Don't copy
need_global_offset_table.
* elfxx-x86.h (elf_x86_target_os): Add is_solaris.
(elf_x86_link_hash_table): Remove need_global_offset_table.
(elf_x86_init_table): Likewise.
+2018-02-09 H.J. Lu <hongjiu.lu@intel.com>
+
+ * elf32-i386.c (elf_i386_get_synthetic_symtab): Also handle
+ is_solaris.
+ (i386_elf32_sol2_vec): Don't declare.
+ (elf_i386_link_setup_gnu_properties): Also handle is_solaris.
+ Don't set need_global_offset_table.
+ (elf_i386_solaris_arch_bed): New.
+ (elf_backend_arch_data): Set to elf_i386_solaris_arch_bed for
+ Solaris.
+ * elf64-x86-64.c (elf_x86_64_get_synthetic_symtab): Check
+ target_os != is_nacl instead of target_os == is_normal.
+ (x86_64_elf64_sol2_vec): Don't declare.
+ (elf_x86_64_link_setup_gnu_properties): Check target_os !=
+ is_nacl instead of target_os == is_normal. Don't set
+ need_global_offset_table.
+ (elf_x86_64_solaris_arch_bed): New.
+ (elf_backend_arch_data): Set to elf_x86_64_solaris_arch_bed for
+ Solaris.
+ * elfxx-x86.c (_bfd_x86_elf_size_dynamic_sections): Keep
+ _GLOBAL_OFFSET_TABLE_ for Solaris.
+ (_bfd_x86_elf_link_setup_gnu_properties): Don't copy
+ need_global_offset_table.
+ * elfxx-x86.h (elf_x86_target_os): Add is_solaris.
+ (elf_x86_link_hash_table): Remove need_global_offset_table.
+ (elf_x86_init_table): Likewise.
+
2018-02-08 H.J. Lu <hongjiu.lu@intel.com>
* elf32-i386.c (elf32_i386_copy_solaris_special_section_fields):
switch (get_elf_x86_backend_data (abfd)->target_os)
{
case is_normal:
+ case is_solaris:
non_lazy_plt = &elf_i386_non_lazy_plt;
lazy_ibt_plt = &elf_i386_lazy_ibt_plt;
non_lazy_ibt_plt = &elf_i386_non_lazy_ibt_plt;
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. */
switch (get_elf_x86_backend_data (info->output_bfd)->target_os)
{
case is_normal:
+ case is_solaris:
init_table.plt0_pad_byte = 0x0;
init_table.lazy_plt = &elf_i386_lazy_plt;
init_table.non_lazy_plt = &elf_i386_non_lazy_plt;
init_table.r_info = elf32_r_info;
init_table.r_sym = elf32_r_sym;
- init_table.need_global_offset_table
- = info->output_bfd->xvec == &i386_elf32_sol2_vec;
-
return _bfd_x86_elf_link_setup_gnu_properties (info, &init_table);
}
#undef TARGET_LITTLE_NAME
#define TARGET_LITTLE_NAME "elf32-i386-sol2"
+static const struct elf_x86_backend_data elf_i386_solaris_arch_bed =
+ {
+ is_solaris /* os */
+ };
+
+#undef elf_backend_arch_data
+#define elf_backend_arch_data &elf_i386_solaris_arch_bed
+
#undef elf_backend_post_process_headers
/* Restore default: we cannot use ELFOSABI_SOLARIS, otherwise ELFOSABI_NONE
#undef ELF_MACHINE_CODE
#define ELF_MACHINE_CODE EM_IAMCU
+#undef elf_backend_arch_data
+#define elf_backend_arch_data &elf_i386_arch_bed
+
#undef ELF_OSABI
#undef elf32_bed
if (relsize <= 0)
return -1;
- if (get_elf_x86_backend_data (abfd)->target_os == is_normal)
+ if (get_elf_x86_backend_data (abfd)->target_os != is_nacl)
{
lazy_plt = &elf_x86_64_lazy_plt;
non_lazy_plt = &elf_x86_64_non_lazy_plt;
&& _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. */
/* This is unused for x86-64. */
init_table.plt0_pad_byte = 0x90;
- if (get_elf_x86_backend_data (info->output_bfd)->target_os
- == is_normal)
+ if (get_elf_x86_backend_data (info->output_bfd)->target_os != is_nacl)
{
if (info->bndplt)
{
init_table.r_sym = elf32_r_sym;
}
- init_table.need_global_offset_table
- = info->output_bfd->xvec == &x86_64_elf64_sol2_vec;
-
return _bfd_x86_elf_link_setup_gnu_properties (info, &init_table);
}
#undef TARGET_LITTLE_NAME
#define TARGET_LITTLE_NAME "elf64-x86-64-sol2"
+static const struct elf_x86_backend_data elf_x86_64_solaris_arch_bed =
+ {
+ is_solaris /* os */
+ };
+
+#undef elf_backend_arch_data
+#define elf_backend_arch_data &elf_x86_64_solaris_arch_bed
+
/* Restore default: we cannot use ELFOSABI_SOLARIS, otherwise ELFOSABI_NONE
objects won't be recognized. */
#undef ELF_OSABI
|| htab->elf.igotplt->size == 0))
{
htab->elf.sgotplt->size = 0;
- if (htab->elf.hgot != NULL
- && !htab->need_global_offset_table)
+ /* Solaris requires to keep _GLOBAL_OFFSET_TABLE_ even if it
+ isn't used. */
+ if (htab->elf.hgot != NULL && htab->target_os != is_solaris)
{
/* Remove the unused _GLOBAL_OFFSET_TABLE_ from symbol
table. */
return pbfd;
htab->plt0_pad_byte = init_table->plt0_pad_byte;
- htab->need_global_offset_table = init_table->need_global_offset_table;
use_ibt_plt = info->ibtplt || info->ibt;
if (!use_ibt_plt && pbfd != NULL)
enum elf_x86_target_os
{
is_normal,
+ is_solaris,
is_vxworks,
is_nacl
};
/* TRUE if GOT is referenced. */
unsigned int got_referenced : 1;
- /* TRUE if _GLOBAL_OFFSET_TABLE_ is needed. */
- unsigned int need_global_offset_table : 1;
-
bfd_vma (*r_info) (bfd_vma, bfd_vma);
bfd_vma (*r_sym) (bfd_vma);
bfd_boolean (*is_reloc_section) (const char *);
bfd_byte plt0_pad_byte;
- /* TRUE if _GLOBAL_OFFSET_TABLE_ is needed. */
- unsigned int need_global_offset_table : 1;
-
bfd_vma (*r_info) (bfd_vma, bfd_vma);
bfd_vma (*r_sym) (bfd_vma);
};
projects / binutils-gdb.git / commitdiff