Add elfxx-x86.h and elfxx-x86.c
Move common codes in elf32-i386.c and elf64-x86-64.c to elfxx-x86.c.
* Makefile.am (BFD32_BACKENDS): Add elfxx-x86.lo.
(BFD64_BACKENDS): Likewise.
(BFD32_BACKENDS_CFILES): Add elfxx-x86.c.
(BFD64_BACKENDS_CFILES): Likewise.
* Makefile.in: Regenerated.
* configure.ac (bfd_backends): Add elfxx-x86.lo together with
elf32-i386.lo and elf64-x86-64.lo.
* configure: Regenerated.
* elf32-i386.c: Include "elfxx-x86.h" instead of "sysdep.h",
"bfd.h", "bfdlink.h", "libbfd.h", "elf-bfd.h", "bfd_stdint.h",
"objalloc.h" and "hashtab.h".
(ELIMINATE_COPY_RELOCS): Removed.
(UNDEFINED_WEAK_RESOLVED_TO_ZERO):Likewise.
(SYMBOL_NO_COPYRELOC): Likewise.
(elf_i386_link_hash_entry): Likewise.
(GOT_UNKNOWN): Likewise.
(GOT_NORMAL): Likewise.
(GOT_TLS_GD): Likewise.
(elf_i386_hash_entry): Likewise.
(elf_i386_obj_tdata): Likewise.
(elf_i386_tdata): Likewise.
(elf_i386_local_got_tls_type): Likewise.
(elf_i386_local_tlsdesc_gotent): Likewise.
(elf_i386_hash_table): Likewise.
(elf_i386_link_hash_newfunc): Likewise.
(elf_i386_local_htab_hash): Likewise.
(elf_i386_local_htab_eq): Likewise.
(elf_i386_get_local_sym_hash): Likewise.
(elf_i386_link_hash_table_free): Likewise.
(elf_i386_copy_indirect_symbol): Likewise.
(elf_i386_fixup_symbol): Likewise.
(elf_i386_readonly_dynrelocs): Likewise.
(elf_i386_always_size_sections): Likewise.
(elf_i386_set_tls_module_base): Likewise.
(elf_i386_dtpoff_base): Likewise.
(compare_relocs): Likewise.
(elf_i386_hash_symbol): Likewise.
(elf_i386_parse_gnu_properties): Likewise.
(elf_i386_merge_gnu_properties): Likewise.
(elf_i386_link_check_relocs): Likewise.
(elf_i386_merge_symbol_attribute): Likewise.
(bfd_elf32_bfd_link_check_relocs): Likewise.
(elf_backend_copy_indirect_symbol): Likewise.
(elf_backend_always_size_sections): Likewise.
(elf_backend_omit_section_dynsym): Likewise.
(elf_backend_hash_symbol): Likewise.
(elf_backend_fixup_symbol): Likewise.
(elf_backend_parse_gnu_properties): Likewise.
(elf_backend_merge_gnu_properties): Likewise.
(elf_backend_merge_symbol_attribute): Likewise.
(elf_i386_mkobject): Updated.
(elf_i386_link_hash_table_create): Likewise.
(elf_i386_check_tls_transition): Likewise.
(elf_i386_tls_transition): Likewise.
(elf_i386_convert_load_reloc): Likewise.
(elf_i386_check_relocs): Likewise.
(elf_i386_adjust_dynamic_symbol): Likewise.
(elf_i386_allocate_dynrelocs): Likewise.
(elf_i386_convert_load): Likewise.
(elf_i386_size_dynamic_sections): Likewise.
(elf_i386_relocate_section): Likewise.
(elf_i386_finish_dynamic_symbol ): Likewise.
(elf_i386_finish_dynamic_sections): Likewise.
(elf_i386_output_arch_local_syms): Likewise.
(elf_i386_get_synthetic_symtab): Likewise.
(elf_i386_link_setup_gnu_properties): Likewise.
(elf_i386_link_hash_table): Use elf_x86_link_hash_table, instead
of elf_link_hash_table, as base.
(elf_i386_next_tls_desc_index): New.
(elf_i386_srelplt2): Likewise.
(elf_i386_plt): Likewise.
(elf_i386_lazy_plt): Likewise.
(elf_i386_non_lazy_plt): Likewise.
* elf32-x86-64.c: Include "elfxx-x86.h" instead of "sysdep.h",
"bfd.h", "bfdlink.h", "libbfd.h", "elf-bfd.h", "bfd_stdint.h",
"objalloc.h" and "hashtab.h".
(ELIMINATE_COPY_RELOCS): Removed.
(UNDEFINED_WEAK_RESOLVED_TO_ZERO):Likewise.
(SYMBOL_NO_COPYRELOC): Likewise.
(elf_x86_64_link_hash_entry): Likewise.
(GOT_UNKNOWN): Likewise.
(GOT_NORMAL): Likewise.
(GOT_TLS_GD): Likewise.
(elf_x86_64_hash_entry): Likewise.
(elf_x86_64_obj_tdata): Likewise.
(elf_x86_64_tdata): Likewise.
(elf_x86_64_local_got_tls_type): Likewise.
(elf_x86_64_local_tlsdesc_gotent): Likewise.
(elf_x86_64_hash_table): Likewise.
(elf_x86_64_link_hash_newfunc): Likewise.
(elf_x86_64_local_htab_hash): Likewise.
(elf_x86_64_local_htab_eq): Likewise.
(elf_x86_64_get_local_sym_hash): Likewise.
(elf_x86_64_link_hash_table_free): Likewise.
(elf_x86_64_copy_indirect_symbol): Likewise.
(elf_x86_64_fixup_symbol): Likewise.
(elf_x86_64_readonly_dynrelocs): Likewise.
(elf_x86_64_always_size_sections): Likewise.
(elf_x86_64_set_tls_module_base): Likewise.
(elf_x86_64_dtpoff_base): Likewise.
(compare_relocs): Likewise.
(elf_x86_64_merge_symbol_attribute): Likewise.
(elf_x86_64_hash_symbol): Likewise.
(elf_x86_64_parse_gnu_properties): Likewise.
(elf_x86_64_merge_gnu_properties): Likewise.
(elf_x86_64_link_check_relocs): Likewise.
(elf_backend_copy_indirect_symbol): Likewise.
(elf_backend_always_size_sections): Likewise.
(bfd_elf64_bfd_link_check_relocs): Likewise.
(elf_backend_merge_symbol_attribute): Likewise.
(elf_backend_hash_symbol): Likewise.
(elf_backend_omit_section_dynsym): Likewise.
(elf_backend_fixup_symbol): Likewise.
(elf_backend_parse_gnu_properties): Likewise.
(elf_backend_merge_gnu_properties): Likewise.
(bfd_elf32_bfd_link_check_relocs): Likewise.
(elf_x86_64_mkobject): Updated.
(elf_x86_64_link_hash_table_create): Likewise.
(elf_x86_64_check_tls_transition): Likewise.
(elf_x86_64_tls_transition): Likewise.
(elf_x86_64_convert_load_reloc): Likewise.
(elf_x86_64_check_relocs): Likewise.
(elf_x86_64_adjust_dynamic_symbol): Likewise.
(elf_x86_64_allocate_dynrelocs): Likewise.
(elf_x86_64_convert_load): Likewise.
(elf_x86_64_size_dynamic_sections): Likewise.
(elf_x86_64_relocate_section): Likewise.
(elf_x86_64_finish_dynamic_symbol ): Likewise.
(elf_x86_64_finish_dynamic_sections): Likewise.
(elf_x86_64_output_arch_local_syms): Likewise.
(elf_x86_64_get_synthetic_symtab): Likewise.
(elf_x86_64_link_setup_gnu_properties): Likewise.
(elf_x86_64_link_hash_table): Use elf_x86_link_hash_table,
instead of elf_link_hash_table, as base.
(elf_x86_64_next_tls_desc_index): New.
(elf_x86_64_srelplt2): Likewise.
(elf_x86_64_plt): Likewise.
(elf_x86_64_lazy_plt): Likewise.
(elf_x86_64_non_lazy_plt): Likewise.
* elfxx-x86.c: New file.
* elfxx-x86.h: Likewise.
2017-08-28 21:23:25 +08:00
|
|
|
/* x86 specific support for ELF
|
|
|
|
Copyright (C) 2017 Free Software Foundation, Inc.
|
|
|
|
|
|
|
|
This file is part of BFD, the Binary File Descriptor library.
|
|
|
|
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
|
|
it under the terms of the GNU General Public License as published by
|
|
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
|
|
(at your option) any later version.
|
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
GNU General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
along with this program; if not, write to the Free Software
|
|
|
|
Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
|
|
|
|
MA 02110-1301, USA. */
|
|
|
|
|
|
|
|
#include "elfxx-x86.h"
|
2017-09-01 23:00:36 +08:00
|
|
|
#include "elf-vxworks.h"
|
x86: Add _bfd_x86_elf_link_hash_table_create
Share _bfd_x86_elf_link_hash_table_create in elf32-i386.c and
elf64-x86-64.c by:
1. Replace elf_i386_lazy_plt_layout, elf_i386_non_lazy_plt_layout,
elf_i386_plt_layout, elf_x86_64_lazy_plt_layout,
elf_x86_64_non_lazy_plt_layout and elf_x86_64_plt_layout with
elf_x86_lazy_plt_layout, elf_x86_non_lazy_plt_layout and
elf_x86_plt_layout.
2. Move plt, lazy_plt, non_lazy_plt, srelplt2 and next_tls_desc_index
from elf_i386_link_hash_table to elf_x86_link_hash_table.
3. Remove elf_i386_link_hash_table and elf_x86_64_link_hash_table.
* elf32-i386.c (ELF_DYNAMIC_INTERPRETER): Removed.
(elf_i386_lazy_plt_layout): Likewise.
(elf_i386_non_lazy_plt_layout): Likewise.
(elf_i386_plt_layout): Likewise.
(elf_i386_link_hash_table): Likewise.
(elf_i386_next_tls_desc_index): Likewise.
(elf_i386_srelplt2): Likewise.
(elf_i386_plt): Likewise.
(elf_i386_lazy_plt): Likewise.
(elf_i386_non_lazy_plt): Likewise.
(elf_i386_link_hash_table_create): Likewise.
(bfd_elf32_bfd_link_hash_table_create): Likewise.
(elf_i386_lazy_plt): Updated.
(elf_i386_non_lazy_plt): Likewise.
(elf_i386_lazy_ibt_plt): Likewise.
(elf_i386_non_lazy_ibt_plt): Likewise.
(elf_i386_allocate_dynrelocs): Likewise.
(elf_i386_size_dynamic_sections): Likewise.
(elf_i386_relocate_section): Likewise.
(elf_i386_finish_dynamic_symbol): Likewise.
(elf_i386_finish_dynamic_sections): Likewise.
(elf_i386_get_synthetic_symtab): Likewise.
(elf_i386_link_setup_gnu_properties): Likewise.
(elf_i386_nacl_plt): Likewise.
* elf64-x86-64.c (ABI_64_P): Removed.
(ELF64_DYNAMIC_INTERPRETER): Likewise.
(ELF32_DYNAMIC_INTERPRETER): Likewise.
(elf_x86_64_lazy_plt_layout): Likewise.
(elf_x86_64_non_lazy_plt_layout): Likewise.
(elf_x86_64_plt_layout): Likewise.
(elf_x86_64_link_hash_table): Likewise.
(elf_x86_64_plt): Likewise.
(elf_x86_64_lazy_plt): Likewise.
(elf_x86_64_non_lazy_plt): Likewise.
(elf_x86_64_link_hash_table_create): Likewise.
(bfd_elf64_bfd_link_hash_table_create): Likewise.
(bfd_elf32_bfd_link_hash_table_create): Likewise.
(elf_x86_64_lazy_plt): Updated.
(elf_x86_64_non_lazy_plt): Likewise.
(elf_x86_64_lazy_bnd_plt): Likewise.
(elf_x86_64_non_lazy_bnd_plt): Likewise.
(elf_x86_64_lazy_ibt_plt): Likewise.
(elf_x32_lazy_ibt_plt): Likewise.
(elf_x86_64_non_lazy_ibt_plt): Likewise.
(elf_x32_non_lazy_ibt_plt): Likewise.
(elf_x86_64_allocate_dynrelocs): Likewise.
(elf_x86_64_size_dynamic_sections): Likewise.
(elf_x86_64_relocate_section): Likewise.
(elf_x86_64_finish_dynamic_symbol): Likewise.
(elf_x86_64_finish_dynamic_sections): Likewise.
(elf_x86_64_get_synthetic_symtab): Likewise.
(elf_x86_64_link_setup_gnu_properties): Likewise.
(elf_x86_64_nacl_plt): Likewise.
* elfxx-x86.c: Include "objalloc.h", "elf/i386.h" and
"elf/x86-64.h".
(ELF32_DYNAMIC_INTERPRETER): New.
(ELF64_DYNAMIC_INTERPRETER): Likewise.
(ELFX32_DYNAMIC_INTERPRETER): Likewise.
(_bfd_x86_elf_link_hash_table_create): Likewise.
(_bfd_x86_elf_link_hash_table_free): Renamed to ...
(elf_x86_link_hash_table_free): This. Make it static.
* elfxx-x86.h: Don't include "objalloc.h".
(ABI_64_P): New.
(elf_x86_lazy_plt_layout): Likewise.
(elf_x86_non_lazy_plt_layout): Likewise.
(elf_x86_plt_layout): Likewise.
(_bfd_x86_elf_link_hash_table_create): Likewise.
(bfd_elf64_bfd_link_hash_table_create): Likewise.
(bfd_elf32_bfd_link_hash_table_create): Likewise.
(elf_x86_link_hash_table): Add plt, lazy_plt, non_lazy_plt,
srelplt2 and next_tls_desc_index.
(_bfd_x86_elf_link_hash_table_free): Removed.
2017-08-31 00:10:08 +08:00
|
|
|
#include "objalloc.h"
|
|
|
|
#include "elf/i386.h"
|
|
|
|
#include "elf/x86-64.h"
|
|
|
|
|
|
|
|
/* The name of the dynamic interpreter. This is put in the .interp
|
|
|
|
section. */
|
|
|
|
|
|
|
|
#define ELF32_DYNAMIC_INTERPRETER "/usr/lib/libc.so.1"
|
|
|
|
#define ELF64_DYNAMIC_INTERPRETER "/lib/ld64.so.1"
|
|
|
|
#define ELFX32_DYNAMIC_INTERPRETER "/lib/ldx32.so.1"
|
Add elfxx-x86.h and elfxx-x86.c
Move common codes in elf32-i386.c and elf64-x86-64.c to elfxx-x86.c.
* Makefile.am (BFD32_BACKENDS): Add elfxx-x86.lo.
(BFD64_BACKENDS): Likewise.
(BFD32_BACKENDS_CFILES): Add elfxx-x86.c.
(BFD64_BACKENDS_CFILES): Likewise.
* Makefile.in: Regenerated.
* configure.ac (bfd_backends): Add elfxx-x86.lo together with
elf32-i386.lo and elf64-x86-64.lo.
* configure: Regenerated.
* elf32-i386.c: Include "elfxx-x86.h" instead of "sysdep.h",
"bfd.h", "bfdlink.h", "libbfd.h", "elf-bfd.h", "bfd_stdint.h",
"objalloc.h" and "hashtab.h".
(ELIMINATE_COPY_RELOCS): Removed.
(UNDEFINED_WEAK_RESOLVED_TO_ZERO):Likewise.
(SYMBOL_NO_COPYRELOC): Likewise.
(elf_i386_link_hash_entry): Likewise.
(GOT_UNKNOWN): Likewise.
(GOT_NORMAL): Likewise.
(GOT_TLS_GD): Likewise.
(elf_i386_hash_entry): Likewise.
(elf_i386_obj_tdata): Likewise.
(elf_i386_tdata): Likewise.
(elf_i386_local_got_tls_type): Likewise.
(elf_i386_local_tlsdesc_gotent): Likewise.
(elf_i386_hash_table): Likewise.
(elf_i386_link_hash_newfunc): Likewise.
(elf_i386_local_htab_hash): Likewise.
(elf_i386_local_htab_eq): Likewise.
(elf_i386_get_local_sym_hash): Likewise.
(elf_i386_link_hash_table_free): Likewise.
(elf_i386_copy_indirect_symbol): Likewise.
(elf_i386_fixup_symbol): Likewise.
(elf_i386_readonly_dynrelocs): Likewise.
(elf_i386_always_size_sections): Likewise.
(elf_i386_set_tls_module_base): Likewise.
(elf_i386_dtpoff_base): Likewise.
(compare_relocs): Likewise.
(elf_i386_hash_symbol): Likewise.
(elf_i386_parse_gnu_properties): Likewise.
(elf_i386_merge_gnu_properties): Likewise.
(elf_i386_link_check_relocs): Likewise.
(elf_i386_merge_symbol_attribute): Likewise.
(bfd_elf32_bfd_link_check_relocs): Likewise.
(elf_backend_copy_indirect_symbol): Likewise.
(elf_backend_always_size_sections): Likewise.
(elf_backend_omit_section_dynsym): Likewise.
(elf_backend_hash_symbol): Likewise.
(elf_backend_fixup_symbol): Likewise.
(elf_backend_parse_gnu_properties): Likewise.
(elf_backend_merge_gnu_properties): Likewise.
(elf_backend_merge_symbol_attribute): Likewise.
(elf_i386_mkobject): Updated.
(elf_i386_link_hash_table_create): Likewise.
(elf_i386_check_tls_transition): Likewise.
(elf_i386_tls_transition): Likewise.
(elf_i386_convert_load_reloc): Likewise.
(elf_i386_check_relocs): Likewise.
(elf_i386_adjust_dynamic_symbol): Likewise.
(elf_i386_allocate_dynrelocs): Likewise.
(elf_i386_convert_load): Likewise.
(elf_i386_size_dynamic_sections): Likewise.
(elf_i386_relocate_section): Likewise.
(elf_i386_finish_dynamic_symbol ): Likewise.
(elf_i386_finish_dynamic_sections): Likewise.
(elf_i386_output_arch_local_syms): Likewise.
(elf_i386_get_synthetic_symtab): Likewise.
(elf_i386_link_setup_gnu_properties): Likewise.
(elf_i386_link_hash_table): Use elf_x86_link_hash_table, instead
of elf_link_hash_table, as base.
(elf_i386_next_tls_desc_index): New.
(elf_i386_srelplt2): Likewise.
(elf_i386_plt): Likewise.
(elf_i386_lazy_plt): Likewise.
(elf_i386_non_lazy_plt): Likewise.
* elf32-x86-64.c: Include "elfxx-x86.h" instead of "sysdep.h",
"bfd.h", "bfdlink.h", "libbfd.h", "elf-bfd.h", "bfd_stdint.h",
"objalloc.h" and "hashtab.h".
(ELIMINATE_COPY_RELOCS): Removed.
(UNDEFINED_WEAK_RESOLVED_TO_ZERO):Likewise.
(SYMBOL_NO_COPYRELOC): Likewise.
(elf_x86_64_link_hash_entry): Likewise.
(GOT_UNKNOWN): Likewise.
(GOT_NORMAL): Likewise.
(GOT_TLS_GD): Likewise.
(elf_x86_64_hash_entry): Likewise.
(elf_x86_64_obj_tdata): Likewise.
(elf_x86_64_tdata): Likewise.
(elf_x86_64_local_got_tls_type): Likewise.
(elf_x86_64_local_tlsdesc_gotent): Likewise.
(elf_x86_64_hash_table): Likewise.
(elf_x86_64_link_hash_newfunc): Likewise.
(elf_x86_64_local_htab_hash): Likewise.
(elf_x86_64_local_htab_eq): Likewise.
(elf_x86_64_get_local_sym_hash): Likewise.
(elf_x86_64_link_hash_table_free): Likewise.
(elf_x86_64_copy_indirect_symbol): Likewise.
(elf_x86_64_fixup_symbol): Likewise.
(elf_x86_64_readonly_dynrelocs): Likewise.
(elf_x86_64_always_size_sections): Likewise.
(elf_x86_64_set_tls_module_base): Likewise.
(elf_x86_64_dtpoff_base): Likewise.
(compare_relocs): Likewise.
(elf_x86_64_merge_symbol_attribute): Likewise.
(elf_x86_64_hash_symbol): Likewise.
(elf_x86_64_parse_gnu_properties): Likewise.
(elf_x86_64_merge_gnu_properties): Likewise.
(elf_x86_64_link_check_relocs): Likewise.
(elf_backend_copy_indirect_symbol): Likewise.
(elf_backend_always_size_sections): Likewise.
(bfd_elf64_bfd_link_check_relocs): Likewise.
(elf_backend_merge_symbol_attribute): Likewise.
(elf_backend_hash_symbol): Likewise.
(elf_backend_omit_section_dynsym): Likewise.
(elf_backend_fixup_symbol): Likewise.
(elf_backend_parse_gnu_properties): Likewise.
(elf_backend_merge_gnu_properties): Likewise.
(bfd_elf32_bfd_link_check_relocs): Likewise.
(elf_x86_64_mkobject): Updated.
(elf_x86_64_link_hash_table_create): Likewise.
(elf_x86_64_check_tls_transition): Likewise.
(elf_x86_64_tls_transition): Likewise.
(elf_x86_64_convert_load_reloc): Likewise.
(elf_x86_64_check_relocs): Likewise.
(elf_x86_64_adjust_dynamic_symbol): Likewise.
(elf_x86_64_allocate_dynrelocs): Likewise.
(elf_x86_64_convert_load): Likewise.
(elf_x86_64_size_dynamic_sections): Likewise.
(elf_x86_64_relocate_section): Likewise.
(elf_x86_64_finish_dynamic_symbol ): Likewise.
(elf_x86_64_finish_dynamic_sections): Likewise.
(elf_x86_64_output_arch_local_syms): Likewise.
(elf_x86_64_get_synthetic_symtab): Likewise.
(elf_x86_64_link_setup_gnu_properties): Likewise.
(elf_x86_64_link_hash_table): Use elf_x86_link_hash_table,
instead of elf_link_hash_table, as base.
(elf_x86_64_next_tls_desc_index): New.
(elf_x86_64_srelplt2): Likewise.
(elf_x86_64_plt): Likewise.
(elf_x86_64_lazy_plt): Likewise.
(elf_x86_64_non_lazy_plt): Likewise.
* elfxx-x86.c: New file.
* elfxx-x86.h: Likewise.
2017-08-28 21:23:25 +08:00
|
|
|
|
2017-09-02 03:09:03 +08:00
|
|
|
bfd_boolean
|
|
|
|
_bfd_x86_elf_mkobject (bfd *abfd)
|
|
|
|
{
|
|
|
|
return bfd_elf_allocate_object (abfd,
|
|
|
|
sizeof (struct elf_x86_obj_tdata),
|
|
|
|
get_elf_backend_data (abfd)->target_id);
|
|
|
|
}
|
|
|
|
|
Add elfxx-x86.h and elfxx-x86.c
Move common codes in elf32-i386.c and elf64-x86-64.c to elfxx-x86.c.
* Makefile.am (BFD32_BACKENDS): Add elfxx-x86.lo.
(BFD64_BACKENDS): Likewise.
(BFD32_BACKENDS_CFILES): Add elfxx-x86.c.
(BFD64_BACKENDS_CFILES): Likewise.
* Makefile.in: Regenerated.
* configure.ac (bfd_backends): Add elfxx-x86.lo together with
elf32-i386.lo and elf64-x86-64.lo.
* configure: Regenerated.
* elf32-i386.c: Include "elfxx-x86.h" instead of "sysdep.h",
"bfd.h", "bfdlink.h", "libbfd.h", "elf-bfd.h", "bfd_stdint.h",
"objalloc.h" and "hashtab.h".
(ELIMINATE_COPY_RELOCS): Removed.
(UNDEFINED_WEAK_RESOLVED_TO_ZERO):Likewise.
(SYMBOL_NO_COPYRELOC): Likewise.
(elf_i386_link_hash_entry): Likewise.
(GOT_UNKNOWN): Likewise.
(GOT_NORMAL): Likewise.
(GOT_TLS_GD): Likewise.
(elf_i386_hash_entry): Likewise.
(elf_i386_obj_tdata): Likewise.
(elf_i386_tdata): Likewise.
(elf_i386_local_got_tls_type): Likewise.
(elf_i386_local_tlsdesc_gotent): Likewise.
(elf_i386_hash_table): Likewise.
(elf_i386_link_hash_newfunc): Likewise.
(elf_i386_local_htab_hash): Likewise.
(elf_i386_local_htab_eq): Likewise.
(elf_i386_get_local_sym_hash): Likewise.
(elf_i386_link_hash_table_free): Likewise.
(elf_i386_copy_indirect_symbol): Likewise.
(elf_i386_fixup_symbol): Likewise.
(elf_i386_readonly_dynrelocs): Likewise.
(elf_i386_always_size_sections): Likewise.
(elf_i386_set_tls_module_base): Likewise.
(elf_i386_dtpoff_base): Likewise.
(compare_relocs): Likewise.
(elf_i386_hash_symbol): Likewise.
(elf_i386_parse_gnu_properties): Likewise.
(elf_i386_merge_gnu_properties): Likewise.
(elf_i386_link_check_relocs): Likewise.
(elf_i386_merge_symbol_attribute): Likewise.
(bfd_elf32_bfd_link_check_relocs): Likewise.
(elf_backend_copy_indirect_symbol): Likewise.
(elf_backend_always_size_sections): Likewise.
(elf_backend_omit_section_dynsym): Likewise.
(elf_backend_hash_symbol): Likewise.
(elf_backend_fixup_symbol): Likewise.
(elf_backend_parse_gnu_properties): Likewise.
(elf_backend_merge_gnu_properties): Likewise.
(elf_backend_merge_symbol_attribute): Likewise.
(elf_i386_mkobject): Updated.
(elf_i386_link_hash_table_create): Likewise.
(elf_i386_check_tls_transition): Likewise.
(elf_i386_tls_transition): Likewise.
(elf_i386_convert_load_reloc): Likewise.
(elf_i386_check_relocs): Likewise.
(elf_i386_adjust_dynamic_symbol): Likewise.
(elf_i386_allocate_dynrelocs): Likewise.
(elf_i386_convert_load): Likewise.
(elf_i386_size_dynamic_sections): Likewise.
(elf_i386_relocate_section): Likewise.
(elf_i386_finish_dynamic_symbol ): Likewise.
(elf_i386_finish_dynamic_sections): Likewise.
(elf_i386_output_arch_local_syms): Likewise.
(elf_i386_get_synthetic_symtab): Likewise.
(elf_i386_link_setup_gnu_properties): Likewise.
(elf_i386_link_hash_table): Use elf_x86_link_hash_table, instead
of elf_link_hash_table, as base.
(elf_i386_next_tls_desc_index): New.
(elf_i386_srelplt2): Likewise.
(elf_i386_plt): Likewise.
(elf_i386_lazy_plt): Likewise.
(elf_i386_non_lazy_plt): Likewise.
* elf32-x86-64.c: Include "elfxx-x86.h" instead of "sysdep.h",
"bfd.h", "bfdlink.h", "libbfd.h", "elf-bfd.h", "bfd_stdint.h",
"objalloc.h" and "hashtab.h".
(ELIMINATE_COPY_RELOCS): Removed.
(UNDEFINED_WEAK_RESOLVED_TO_ZERO):Likewise.
(SYMBOL_NO_COPYRELOC): Likewise.
(elf_x86_64_link_hash_entry): Likewise.
(GOT_UNKNOWN): Likewise.
(GOT_NORMAL): Likewise.
(GOT_TLS_GD): Likewise.
(elf_x86_64_hash_entry): Likewise.
(elf_x86_64_obj_tdata): Likewise.
(elf_x86_64_tdata): Likewise.
(elf_x86_64_local_got_tls_type): Likewise.
(elf_x86_64_local_tlsdesc_gotent): Likewise.
(elf_x86_64_hash_table): Likewise.
(elf_x86_64_link_hash_newfunc): Likewise.
(elf_x86_64_local_htab_hash): Likewise.
(elf_x86_64_local_htab_eq): Likewise.
(elf_x86_64_get_local_sym_hash): Likewise.
(elf_x86_64_link_hash_table_free): Likewise.
(elf_x86_64_copy_indirect_symbol): Likewise.
(elf_x86_64_fixup_symbol): Likewise.
(elf_x86_64_readonly_dynrelocs): Likewise.
(elf_x86_64_always_size_sections): Likewise.
(elf_x86_64_set_tls_module_base): Likewise.
(elf_x86_64_dtpoff_base): Likewise.
(compare_relocs): Likewise.
(elf_x86_64_merge_symbol_attribute): Likewise.
(elf_x86_64_hash_symbol): Likewise.
(elf_x86_64_parse_gnu_properties): Likewise.
(elf_x86_64_merge_gnu_properties): Likewise.
(elf_x86_64_link_check_relocs): Likewise.
(elf_backend_copy_indirect_symbol): Likewise.
(elf_backend_always_size_sections): Likewise.
(bfd_elf64_bfd_link_check_relocs): Likewise.
(elf_backend_merge_symbol_attribute): Likewise.
(elf_backend_hash_symbol): Likewise.
(elf_backend_omit_section_dynsym): Likewise.
(elf_backend_fixup_symbol): Likewise.
(elf_backend_parse_gnu_properties): Likewise.
(elf_backend_merge_gnu_properties): Likewise.
(bfd_elf32_bfd_link_check_relocs): Likewise.
(elf_x86_64_mkobject): Updated.
(elf_x86_64_link_hash_table_create): Likewise.
(elf_x86_64_check_tls_transition): Likewise.
(elf_x86_64_tls_transition): Likewise.
(elf_x86_64_convert_load_reloc): Likewise.
(elf_x86_64_check_relocs): Likewise.
(elf_x86_64_adjust_dynamic_symbol): Likewise.
(elf_x86_64_allocate_dynrelocs): Likewise.
(elf_x86_64_convert_load): Likewise.
(elf_x86_64_size_dynamic_sections): Likewise.
(elf_x86_64_relocate_section): Likewise.
(elf_x86_64_finish_dynamic_symbol ): Likewise.
(elf_x86_64_finish_dynamic_sections): Likewise.
(elf_x86_64_output_arch_local_syms): Likewise.
(elf_x86_64_get_synthetic_symtab): Likewise.
(elf_x86_64_link_setup_gnu_properties): Likewise.
(elf_x86_64_link_hash_table): Use elf_x86_link_hash_table,
instead of elf_link_hash_table, as base.
(elf_x86_64_next_tls_desc_index): New.
(elf_x86_64_srelplt2): Likewise.
(elf_x86_64_plt): Likewise.
(elf_x86_64_lazy_plt): Likewise.
(elf_x86_64_non_lazy_plt): Likewise.
* elfxx-x86.c: New file.
* elfxx-x86.h: Likewise.
2017-08-28 21:23:25 +08:00
|
|
|
/* _TLS_MODULE_BASE_ needs to be treated especially when linking
|
|
|
|
executables. Rather than setting it to the beginning of the TLS
|
|
|
|
section, we have to set it to the end. This function may be called
|
|
|
|
multiple times, it is idempotent. */
|
|
|
|
|
|
|
|
void
|
|
|
|
_bfd_x86_elf_set_tls_module_base (struct bfd_link_info *info)
|
|
|
|
{
|
|
|
|
struct elf_x86_link_hash_table *htab;
|
|
|
|
struct bfd_link_hash_entry *base;
|
|
|
|
const struct elf_backend_data *bed;
|
|
|
|
|
|
|
|
if (!bfd_link_executable (info))
|
|
|
|
return;
|
|
|
|
|
|
|
|
bed = get_elf_backend_data (info->output_bfd);
|
|
|
|
htab = elf_x86_hash_table (info, bed->target_id);
|
|
|
|
if (htab == NULL)
|
|
|
|
return;
|
|
|
|
|
|
|
|
base = htab->tls_module_base;
|
|
|
|
if (base == NULL)
|
|
|
|
return;
|
|
|
|
|
|
|
|
base->u.def.value = htab->elf.tls_size;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Return the base VMA address which should be subtracted from real addresses
|
|
|
|
when resolving @dtpoff relocation.
|
|
|
|
This is PT_TLS segment p_vaddr. */
|
|
|
|
|
|
|
|
bfd_vma
|
|
|
|
_bfd_x86_elf_dtpoff_base (struct bfd_link_info *info)
|
|
|
|
{
|
|
|
|
/* If tls_sec is NULL, we should have signalled an error already. */
|
|
|
|
if (elf_hash_table (info)->tls_sec == NULL)
|
|
|
|
return 0;
|
|
|
|
return elf_hash_table (info)->tls_sec->vma;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Find any dynamic relocs that apply to read-only sections. */
|
|
|
|
|
|
|
|
bfd_boolean
|
|
|
|
_bfd_x86_elf_readonly_dynrelocs (struct elf_link_hash_entry *h,
|
|
|
|
void *inf)
|
|
|
|
{
|
|
|
|
struct elf_x86_link_hash_entry *eh;
|
|
|
|
struct elf_dyn_relocs *p;
|
|
|
|
|
|
|
|
/* Skip local IFUNC symbols. */
|
|
|
|
if (h->forced_local && h->type == STT_GNU_IFUNC)
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
eh = (struct elf_x86_link_hash_entry *) h;
|
|
|
|
for (p = eh->dyn_relocs; p != NULL; p = p->next)
|
|
|
|
{
|
|
|
|
asection *s = p->sec->output_section;
|
|
|
|
|
|
|
|
if (s != NULL && (s->flags & SEC_READONLY) != 0)
|
|
|
|
{
|
|
|
|
struct bfd_link_info *info = (struct bfd_link_info *) inf;
|
|
|
|
|
|
|
|
info->flags |= DF_TEXTREL;
|
|
|
|
|
|
|
|
if ((info->warn_shared_textrel && bfd_link_pic (info))
|
|
|
|
|| info->error_textrel)
|
|
|
|
/* xgettext:c-format */
|
|
|
|
info->callbacks->einfo (_("%P: %B: warning: relocation against `%s' in readonly section `%A'\n"),
|
|
|
|
p->sec->owner, h->root.root.string,
|
|
|
|
p->sec);
|
|
|
|
|
|
|
|
/* Not an error, just cut short the traversal. */
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Find and/or create a hash entry for local symbol. */
|
|
|
|
|
|
|
|
struct elf_link_hash_entry *
|
|
|
|
_bfd_elf_x86_get_local_sym_hash (struct elf_x86_link_hash_table *htab,
|
|
|
|
bfd *abfd, const Elf_Internal_Rela *rel,
|
|
|
|
bfd_boolean create)
|
|
|
|
{
|
|
|
|
struct elf_x86_link_hash_entry e, *ret;
|
|
|
|
asection *sec = abfd->sections;
|
|
|
|
hashval_t h = ELF_LOCAL_SYMBOL_HASH (sec->id,
|
|
|
|
htab->r_sym (rel->r_info));
|
|
|
|
void **slot;
|
|
|
|
|
|
|
|
e.elf.indx = sec->id;
|
|
|
|
e.elf.dynstr_index = htab->r_sym (rel->r_info);
|
|
|
|
slot = htab_find_slot_with_hash (htab->loc_hash_table, &e, h,
|
|
|
|
create ? INSERT : NO_INSERT);
|
|
|
|
|
|
|
|
if (!slot)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
if (*slot)
|
|
|
|
{
|
|
|
|
ret = (struct elf_x86_link_hash_entry *) *slot;
|
|
|
|
return &ret->elf;
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = (struct elf_x86_link_hash_entry *)
|
|
|
|
objalloc_alloc ((struct objalloc *) htab->loc_hash_memory,
|
|
|
|
sizeof (struct elf_x86_link_hash_entry));
|
|
|
|
if (ret)
|
|
|
|
{
|
|
|
|
memset (ret, 0, sizeof (*ret));
|
|
|
|
ret->elf.indx = sec->id;
|
|
|
|
ret->elf.dynstr_index = htab->r_sym (rel->r_info);
|
|
|
|
ret->elf.dynindx = -1;
|
|
|
|
ret->plt_got.offset = (bfd_vma) -1;
|
|
|
|
*slot = ret;
|
|
|
|
}
|
|
|
|
return &ret->elf;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Create an entry in a x86 ELF linker hash table. NB: THIS MUST BE IN
|
|
|
|
SYNC WITH _bfd_elf_link_hash_newfunc. */
|
|
|
|
|
|
|
|
struct bfd_hash_entry *
|
|
|
|
_bfd_x86_elf_link_hash_newfunc (struct bfd_hash_entry *entry,
|
|
|
|
struct bfd_hash_table *table,
|
|
|
|
const char *string)
|
|
|
|
{
|
|
|
|
/* Allocate the structure if it has not already been allocated by a
|
|
|
|
subclass. */
|
|
|
|
if (entry == NULL)
|
|
|
|
{
|
|
|
|
entry = (struct bfd_hash_entry *)
|
|
|
|
bfd_hash_allocate (table,
|
|
|
|
sizeof (struct elf_x86_link_hash_entry));
|
|
|
|
if (entry == NULL)
|
|
|
|
return entry;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Call the allocation method of the superclass. */
|
|
|
|
entry = _bfd_link_hash_newfunc (entry, table, string);
|
|
|
|
if (entry != NULL)
|
|
|
|
{
|
|
|
|
struct elf_x86_link_hash_entry *eh
|
|
|
|
= (struct elf_x86_link_hash_entry *) entry;
|
|
|
|
struct elf_link_hash_table *htab
|
|
|
|
= (struct elf_link_hash_table *) table;
|
|
|
|
|
|
|
|
memset (&eh->elf.size, 0,
|
|
|
|
(sizeof (struct elf_x86_link_hash_entry)
|
|
|
|
- offsetof (struct elf_link_hash_entry, size)));
|
|
|
|
/* Set local fields. */
|
|
|
|
eh->elf.indx = -1;
|
|
|
|
eh->elf.dynindx = -1;
|
|
|
|
eh->elf.got = htab->init_got_refcount;
|
|
|
|
eh->elf.plt = htab->init_plt_refcount;
|
|
|
|
/* Assume that we have been called by a non-ELF symbol reader.
|
|
|
|
This flag is then reset by the code which reads an ELF input
|
|
|
|
file. This ensures that a symbol created by a non-ELF symbol
|
|
|
|
reader will have the flag set correctly. */
|
|
|
|
eh->elf.non_elf = 1;
|
|
|
|
eh->plt_second.offset = (bfd_vma) -1;
|
|
|
|
eh->plt_got.offset = (bfd_vma) -1;
|
|
|
|
eh->tlsdesc_got = (bfd_vma) -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return entry;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Compute a hash of a local hash entry. We use elf_link_hash_entry
|
|
|
|
for local symbol so that we can handle local STT_GNU_IFUNC symbols
|
|
|
|
as global symbol. We reuse indx and dynstr_index for local symbol
|
|
|
|
hash since they aren't used by global symbols in this backend. */
|
|
|
|
|
|
|
|
hashval_t
|
|
|
|
_bfd_x86_elf_local_htab_hash (const void *ptr)
|
|
|
|
{
|
|
|
|
struct elf_link_hash_entry *h
|
|
|
|
= (struct elf_link_hash_entry *) ptr;
|
|
|
|
return ELF_LOCAL_SYMBOL_HASH (h->indx, h->dynstr_index);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Compare local hash entries. */
|
|
|
|
|
|
|
|
int
|
|
|
|
_bfd_x86_elf_local_htab_eq (const void *ptr1, const void *ptr2)
|
|
|
|
{
|
|
|
|
struct elf_link_hash_entry *h1
|
|
|
|
= (struct elf_link_hash_entry *) ptr1;
|
|
|
|
struct elf_link_hash_entry *h2
|
|
|
|
= (struct elf_link_hash_entry *) ptr2;
|
|
|
|
|
|
|
|
return h1->indx == h2->indx && h1->dynstr_index == h2->dynstr_index;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Destroy an x86 ELF linker hash table. */
|
|
|
|
|
x86: Add _bfd_x86_elf_link_hash_table_create
Share _bfd_x86_elf_link_hash_table_create in elf32-i386.c and
elf64-x86-64.c by:
1. Replace elf_i386_lazy_plt_layout, elf_i386_non_lazy_plt_layout,
elf_i386_plt_layout, elf_x86_64_lazy_plt_layout,
elf_x86_64_non_lazy_plt_layout and elf_x86_64_plt_layout with
elf_x86_lazy_plt_layout, elf_x86_non_lazy_plt_layout and
elf_x86_plt_layout.
2. Move plt, lazy_plt, non_lazy_plt, srelplt2 and next_tls_desc_index
from elf_i386_link_hash_table to elf_x86_link_hash_table.
3. Remove elf_i386_link_hash_table and elf_x86_64_link_hash_table.
* elf32-i386.c (ELF_DYNAMIC_INTERPRETER): Removed.
(elf_i386_lazy_plt_layout): Likewise.
(elf_i386_non_lazy_plt_layout): Likewise.
(elf_i386_plt_layout): Likewise.
(elf_i386_link_hash_table): Likewise.
(elf_i386_next_tls_desc_index): Likewise.
(elf_i386_srelplt2): Likewise.
(elf_i386_plt): Likewise.
(elf_i386_lazy_plt): Likewise.
(elf_i386_non_lazy_plt): Likewise.
(elf_i386_link_hash_table_create): Likewise.
(bfd_elf32_bfd_link_hash_table_create): Likewise.
(elf_i386_lazy_plt): Updated.
(elf_i386_non_lazy_plt): Likewise.
(elf_i386_lazy_ibt_plt): Likewise.
(elf_i386_non_lazy_ibt_plt): Likewise.
(elf_i386_allocate_dynrelocs): Likewise.
(elf_i386_size_dynamic_sections): Likewise.
(elf_i386_relocate_section): Likewise.
(elf_i386_finish_dynamic_symbol): Likewise.
(elf_i386_finish_dynamic_sections): Likewise.
(elf_i386_get_synthetic_symtab): Likewise.
(elf_i386_link_setup_gnu_properties): Likewise.
(elf_i386_nacl_plt): Likewise.
* elf64-x86-64.c (ABI_64_P): Removed.
(ELF64_DYNAMIC_INTERPRETER): Likewise.
(ELF32_DYNAMIC_INTERPRETER): Likewise.
(elf_x86_64_lazy_plt_layout): Likewise.
(elf_x86_64_non_lazy_plt_layout): Likewise.
(elf_x86_64_plt_layout): Likewise.
(elf_x86_64_link_hash_table): Likewise.
(elf_x86_64_plt): Likewise.
(elf_x86_64_lazy_plt): Likewise.
(elf_x86_64_non_lazy_plt): Likewise.
(elf_x86_64_link_hash_table_create): Likewise.
(bfd_elf64_bfd_link_hash_table_create): Likewise.
(bfd_elf32_bfd_link_hash_table_create): Likewise.
(elf_x86_64_lazy_plt): Updated.
(elf_x86_64_non_lazy_plt): Likewise.
(elf_x86_64_lazy_bnd_plt): Likewise.
(elf_x86_64_non_lazy_bnd_plt): Likewise.
(elf_x86_64_lazy_ibt_plt): Likewise.
(elf_x32_lazy_ibt_plt): Likewise.
(elf_x86_64_non_lazy_ibt_plt): Likewise.
(elf_x32_non_lazy_ibt_plt): Likewise.
(elf_x86_64_allocate_dynrelocs): Likewise.
(elf_x86_64_size_dynamic_sections): Likewise.
(elf_x86_64_relocate_section): Likewise.
(elf_x86_64_finish_dynamic_symbol): Likewise.
(elf_x86_64_finish_dynamic_sections): Likewise.
(elf_x86_64_get_synthetic_symtab): Likewise.
(elf_x86_64_link_setup_gnu_properties): Likewise.
(elf_x86_64_nacl_plt): Likewise.
* elfxx-x86.c: Include "objalloc.h", "elf/i386.h" and
"elf/x86-64.h".
(ELF32_DYNAMIC_INTERPRETER): New.
(ELF64_DYNAMIC_INTERPRETER): Likewise.
(ELFX32_DYNAMIC_INTERPRETER): Likewise.
(_bfd_x86_elf_link_hash_table_create): Likewise.
(_bfd_x86_elf_link_hash_table_free): Renamed to ...
(elf_x86_link_hash_table_free): This. Make it static.
* elfxx-x86.h: Don't include "objalloc.h".
(ABI_64_P): New.
(elf_x86_lazy_plt_layout): Likewise.
(elf_x86_non_lazy_plt_layout): Likewise.
(elf_x86_plt_layout): Likewise.
(_bfd_x86_elf_link_hash_table_create): Likewise.
(bfd_elf64_bfd_link_hash_table_create): Likewise.
(bfd_elf32_bfd_link_hash_table_create): Likewise.
(elf_x86_link_hash_table): Add plt, lazy_plt, non_lazy_plt,
srelplt2 and next_tls_desc_index.
(_bfd_x86_elf_link_hash_table_free): Removed.
2017-08-31 00:10:08 +08:00
|
|
|
static void
|
|
|
|
elf_x86_link_hash_table_free (bfd *obfd)
|
Add elfxx-x86.h and elfxx-x86.c
Move common codes in elf32-i386.c and elf64-x86-64.c to elfxx-x86.c.
* Makefile.am (BFD32_BACKENDS): Add elfxx-x86.lo.
(BFD64_BACKENDS): Likewise.
(BFD32_BACKENDS_CFILES): Add elfxx-x86.c.
(BFD64_BACKENDS_CFILES): Likewise.
* Makefile.in: Regenerated.
* configure.ac (bfd_backends): Add elfxx-x86.lo together with
elf32-i386.lo and elf64-x86-64.lo.
* configure: Regenerated.
* elf32-i386.c: Include "elfxx-x86.h" instead of "sysdep.h",
"bfd.h", "bfdlink.h", "libbfd.h", "elf-bfd.h", "bfd_stdint.h",
"objalloc.h" and "hashtab.h".
(ELIMINATE_COPY_RELOCS): Removed.
(UNDEFINED_WEAK_RESOLVED_TO_ZERO):Likewise.
(SYMBOL_NO_COPYRELOC): Likewise.
(elf_i386_link_hash_entry): Likewise.
(GOT_UNKNOWN): Likewise.
(GOT_NORMAL): Likewise.
(GOT_TLS_GD): Likewise.
(elf_i386_hash_entry): Likewise.
(elf_i386_obj_tdata): Likewise.
(elf_i386_tdata): Likewise.
(elf_i386_local_got_tls_type): Likewise.
(elf_i386_local_tlsdesc_gotent): Likewise.
(elf_i386_hash_table): Likewise.
(elf_i386_link_hash_newfunc): Likewise.
(elf_i386_local_htab_hash): Likewise.
(elf_i386_local_htab_eq): Likewise.
(elf_i386_get_local_sym_hash): Likewise.
(elf_i386_link_hash_table_free): Likewise.
(elf_i386_copy_indirect_symbol): Likewise.
(elf_i386_fixup_symbol): Likewise.
(elf_i386_readonly_dynrelocs): Likewise.
(elf_i386_always_size_sections): Likewise.
(elf_i386_set_tls_module_base): Likewise.
(elf_i386_dtpoff_base): Likewise.
(compare_relocs): Likewise.
(elf_i386_hash_symbol): Likewise.
(elf_i386_parse_gnu_properties): Likewise.
(elf_i386_merge_gnu_properties): Likewise.
(elf_i386_link_check_relocs): Likewise.
(elf_i386_merge_symbol_attribute): Likewise.
(bfd_elf32_bfd_link_check_relocs): Likewise.
(elf_backend_copy_indirect_symbol): Likewise.
(elf_backend_always_size_sections): Likewise.
(elf_backend_omit_section_dynsym): Likewise.
(elf_backend_hash_symbol): Likewise.
(elf_backend_fixup_symbol): Likewise.
(elf_backend_parse_gnu_properties): Likewise.
(elf_backend_merge_gnu_properties): Likewise.
(elf_backend_merge_symbol_attribute): Likewise.
(elf_i386_mkobject): Updated.
(elf_i386_link_hash_table_create): Likewise.
(elf_i386_check_tls_transition): Likewise.
(elf_i386_tls_transition): Likewise.
(elf_i386_convert_load_reloc): Likewise.
(elf_i386_check_relocs): Likewise.
(elf_i386_adjust_dynamic_symbol): Likewise.
(elf_i386_allocate_dynrelocs): Likewise.
(elf_i386_convert_load): Likewise.
(elf_i386_size_dynamic_sections): Likewise.
(elf_i386_relocate_section): Likewise.
(elf_i386_finish_dynamic_symbol ): Likewise.
(elf_i386_finish_dynamic_sections): Likewise.
(elf_i386_output_arch_local_syms): Likewise.
(elf_i386_get_synthetic_symtab): Likewise.
(elf_i386_link_setup_gnu_properties): Likewise.
(elf_i386_link_hash_table): Use elf_x86_link_hash_table, instead
of elf_link_hash_table, as base.
(elf_i386_next_tls_desc_index): New.
(elf_i386_srelplt2): Likewise.
(elf_i386_plt): Likewise.
(elf_i386_lazy_plt): Likewise.
(elf_i386_non_lazy_plt): Likewise.
* elf32-x86-64.c: Include "elfxx-x86.h" instead of "sysdep.h",
"bfd.h", "bfdlink.h", "libbfd.h", "elf-bfd.h", "bfd_stdint.h",
"objalloc.h" and "hashtab.h".
(ELIMINATE_COPY_RELOCS): Removed.
(UNDEFINED_WEAK_RESOLVED_TO_ZERO):Likewise.
(SYMBOL_NO_COPYRELOC): Likewise.
(elf_x86_64_link_hash_entry): Likewise.
(GOT_UNKNOWN): Likewise.
(GOT_NORMAL): Likewise.
(GOT_TLS_GD): Likewise.
(elf_x86_64_hash_entry): Likewise.
(elf_x86_64_obj_tdata): Likewise.
(elf_x86_64_tdata): Likewise.
(elf_x86_64_local_got_tls_type): Likewise.
(elf_x86_64_local_tlsdesc_gotent): Likewise.
(elf_x86_64_hash_table): Likewise.
(elf_x86_64_link_hash_newfunc): Likewise.
(elf_x86_64_local_htab_hash): Likewise.
(elf_x86_64_local_htab_eq): Likewise.
(elf_x86_64_get_local_sym_hash): Likewise.
(elf_x86_64_link_hash_table_free): Likewise.
(elf_x86_64_copy_indirect_symbol): Likewise.
(elf_x86_64_fixup_symbol): Likewise.
(elf_x86_64_readonly_dynrelocs): Likewise.
(elf_x86_64_always_size_sections): Likewise.
(elf_x86_64_set_tls_module_base): Likewise.
(elf_x86_64_dtpoff_base): Likewise.
(compare_relocs): Likewise.
(elf_x86_64_merge_symbol_attribute): Likewise.
(elf_x86_64_hash_symbol): Likewise.
(elf_x86_64_parse_gnu_properties): Likewise.
(elf_x86_64_merge_gnu_properties): Likewise.
(elf_x86_64_link_check_relocs): Likewise.
(elf_backend_copy_indirect_symbol): Likewise.
(elf_backend_always_size_sections): Likewise.
(bfd_elf64_bfd_link_check_relocs): Likewise.
(elf_backend_merge_symbol_attribute): Likewise.
(elf_backend_hash_symbol): Likewise.
(elf_backend_omit_section_dynsym): Likewise.
(elf_backend_fixup_symbol): Likewise.
(elf_backend_parse_gnu_properties): Likewise.
(elf_backend_merge_gnu_properties): Likewise.
(bfd_elf32_bfd_link_check_relocs): Likewise.
(elf_x86_64_mkobject): Updated.
(elf_x86_64_link_hash_table_create): Likewise.
(elf_x86_64_check_tls_transition): Likewise.
(elf_x86_64_tls_transition): Likewise.
(elf_x86_64_convert_load_reloc): Likewise.
(elf_x86_64_check_relocs): Likewise.
(elf_x86_64_adjust_dynamic_symbol): Likewise.
(elf_x86_64_allocate_dynrelocs): Likewise.
(elf_x86_64_convert_load): Likewise.
(elf_x86_64_size_dynamic_sections): Likewise.
(elf_x86_64_relocate_section): Likewise.
(elf_x86_64_finish_dynamic_symbol ): Likewise.
(elf_x86_64_finish_dynamic_sections): Likewise.
(elf_x86_64_output_arch_local_syms): Likewise.
(elf_x86_64_get_synthetic_symtab): Likewise.
(elf_x86_64_link_setup_gnu_properties): Likewise.
(elf_x86_64_link_hash_table): Use elf_x86_link_hash_table,
instead of elf_link_hash_table, as base.
(elf_x86_64_next_tls_desc_index): New.
(elf_x86_64_srelplt2): Likewise.
(elf_x86_64_plt): Likewise.
(elf_x86_64_lazy_plt): Likewise.
(elf_x86_64_non_lazy_plt): Likewise.
* elfxx-x86.c: New file.
* elfxx-x86.h: Likewise.
2017-08-28 21:23:25 +08:00
|
|
|
{
|
|
|
|
struct elf_x86_link_hash_table *htab
|
|
|
|
= (struct elf_x86_link_hash_table *) obfd->link.hash;
|
|
|
|
|
|
|
|
if (htab->loc_hash_table)
|
|
|
|
htab_delete (htab->loc_hash_table);
|
|
|
|
if (htab->loc_hash_memory)
|
|
|
|
objalloc_free ((struct objalloc *) htab->loc_hash_memory);
|
|
|
|
_bfd_elf_link_hash_table_free (obfd);
|
|
|
|
}
|
|
|
|
|
x86: Add _bfd_x86_elf_link_hash_table_create
Share _bfd_x86_elf_link_hash_table_create in elf32-i386.c and
elf64-x86-64.c by:
1. Replace elf_i386_lazy_plt_layout, elf_i386_non_lazy_plt_layout,
elf_i386_plt_layout, elf_x86_64_lazy_plt_layout,
elf_x86_64_non_lazy_plt_layout and elf_x86_64_plt_layout with
elf_x86_lazy_plt_layout, elf_x86_non_lazy_plt_layout and
elf_x86_plt_layout.
2. Move plt, lazy_plt, non_lazy_plt, srelplt2 and next_tls_desc_index
from elf_i386_link_hash_table to elf_x86_link_hash_table.
3. Remove elf_i386_link_hash_table and elf_x86_64_link_hash_table.
* elf32-i386.c (ELF_DYNAMIC_INTERPRETER): Removed.
(elf_i386_lazy_plt_layout): Likewise.
(elf_i386_non_lazy_plt_layout): Likewise.
(elf_i386_plt_layout): Likewise.
(elf_i386_link_hash_table): Likewise.
(elf_i386_next_tls_desc_index): Likewise.
(elf_i386_srelplt2): Likewise.
(elf_i386_plt): Likewise.
(elf_i386_lazy_plt): Likewise.
(elf_i386_non_lazy_plt): Likewise.
(elf_i386_link_hash_table_create): Likewise.
(bfd_elf32_bfd_link_hash_table_create): Likewise.
(elf_i386_lazy_plt): Updated.
(elf_i386_non_lazy_plt): Likewise.
(elf_i386_lazy_ibt_plt): Likewise.
(elf_i386_non_lazy_ibt_plt): Likewise.
(elf_i386_allocate_dynrelocs): Likewise.
(elf_i386_size_dynamic_sections): Likewise.
(elf_i386_relocate_section): Likewise.
(elf_i386_finish_dynamic_symbol): Likewise.
(elf_i386_finish_dynamic_sections): Likewise.
(elf_i386_get_synthetic_symtab): Likewise.
(elf_i386_link_setup_gnu_properties): Likewise.
(elf_i386_nacl_plt): Likewise.
* elf64-x86-64.c (ABI_64_P): Removed.
(ELF64_DYNAMIC_INTERPRETER): Likewise.
(ELF32_DYNAMIC_INTERPRETER): Likewise.
(elf_x86_64_lazy_plt_layout): Likewise.
(elf_x86_64_non_lazy_plt_layout): Likewise.
(elf_x86_64_plt_layout): Likewise.
(elf_x86_64_link_hash_table): Likewise.
(elf_x86_64_plt): Likewise.
(elf_x86_64_lazy_plt): Likewise.
(elf_x86_64_non_lazy_plt): Likewise.
(elf_x86_64_link_hash_table_create): Likewise.
(bfd_elf64_bfd_link_hash_table_create): Likewise.
(bfd_elf32_bfd_link_hash_table_create): Likewise.
(elf_x86_64_lazy_plt): Updated.
(elf_x86_64_non_lazy_plt): Likewise.
(elf_x86_64_lazy_bnd_plt): Likewise.
(elf_x86_64_non_lazy_bnd_plt): Likewise.
(elf_x86_64_lazy_ibt_plt): Likewise.
(elf_x32_lazy_ibt_plt): Likewise.
(elf_x86_64_non_lazy_ibt_plt): Likewise.
(elf_x32_non_lazy_ibt_plt): Likewise.
(elf_x86_64_allocate_dynrelocs): Likewise.
(elf_x86_64_size_dynamic_sections): Likewise.
(elf_x86_64_relocate_section): Likewise.
(elf_x86_64_finish_dynamic_symbol): Likewise.
(elf_x86_64_finish_dynamic_sections): Likewise.
(elf_x86_64_get_synthetic_symtab): Likewise.
(elf_x86_64_link_setup_gnu_properties): Likewise.
(elf_x86_64_nacl_plt): Likewise.
* elfxx-x86.c: Include "objalloc.h", "elf/i386.h" and
"elf/x86-64.h".
(ELF32_DYNAMIC_INTERPRETER): New.
(ELF64_DYNAMIC_INTERPRETER): Likewise.
(ELFX32_DYNAMIC_INTERPRETER): Likewise.
(_bfd_x86_elf_link_hash_table_create): Likewise.
(_bfd_x86_elf_link_hash_table_free): Renamed to ...
(elf_x86_link_hash_table_free): This. Make it static.
* elfxx-x86.h: Don't include "objalloc.h".
(ABI_64_P): New.
(elf_x86_lazy_plt_layout): Likewise.
(elf_x86_non_lazy_plt_layout): Likewise.
(elf_x86_plt_layout): Likewise.
(_bfd_x86_elf_link_hash_table_create): Likewise.
(bfd_elf64_bfd_link_hash_table_create): Likewise.
(bfd_elf32_bfd_link_hash_table_create): Likewise.
(elf_x86_link_hash_table): Add plt, lazy_plt, non_lazy_plt,
srelplt2 and next_tls_desc_index.
(_bfd_x86_elf_link_hash_table_free): Removed.
2017-08-31 00:10:08 +08:00
|
|
|
/* Create an x86 ELF linker hash table. */
|
|
|
|
|
|
|
|
struct bfd_link_hash_table *
|
|
|
|
_bfd_x86_elf_link_hash_table_create (bfd *abfd)
|
|
|
|
{
|
|
|
|
struct elf_x86_link_hash_table *ret;
|
|
|
|
const struct elf_backend_data *bed;
|
|
|
|
bfd_size_type amt = sizeof (struct elf_x86_link_hash_table);
|
|
|
|
|
|
|
|
ret = (struct elf_x86_link_hash_table *) bfd_zmalloc (amt);
|
|
|
|
if (ret == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
bed = get_elf_backend_data (abfd);
|
|
|
|
if (!_bfd_elf_link_hash_table_init (&ret->elf, abfd,
|
|
|
|
_bfd_x86_elf_link_hash_newfunc,
|
|
|
|
sizeof (struct elf_x86_link_hash_entry),
|
|
|
|
bed->target_id))
|
|
|
|
{
|
|
|
|
free (ret);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef BFD64
|
|
|
|
if (ABI_64_P (abfd))
|
|
|
|
{
|
|
|
|
ret->r_info = elf64_r_info;
|
|
|
|
ret->r_sym = elf64_r_sym;
|
2017-09-02 20:55:25 +08:00
|
|
|
ret->sizeof_reloc = sizeof (Elf64_External_Rela);
|
x86: Add _bfd_x86_elf_link_hash_table_create
Share _bfd_x86_elf_link_hash_table_create in elf32-i386.c and
elf64-x86-64.c by:
1. Replace elf_i386_lazy_plt_layout, elf_i386_non_lazy_plt_layout,
elf_i386_plt_layout, elf_x86_64_lazy_plt_layout,
elf_x86_64_non_lazy_plt_layout and elf_x86_64_plt_layout with
elf_x86_lazy_plt_layout, elf_x86_non_lazy_plt_layout and
elf_x86_plt_layout.
2. Move plt, lazy_plt, non_lazy_plt, srelplt2 and next_tls_desc_index
from elf_i386_link_hash_table to elf_x86_link_hash_table.
3. Remove elf_i386_link_hash_table and elf_x86_64_link_hash_table.
* elf32-i386.c (ELF_DYNAMIC_INTERPRETER): Removed.
(elf_i386_lazy_plt_layout): Likewise.
(elf_i386_non_lazy_plt_layout): Likewise.
(elf_i386_plt_layout): Likewise.
(elf_i386_link_hash_table): Likewise.
(elf_i386_next_tls_desc_index): Likewise.
(elf_i386_srelplt2): Likewise.
(elf_i386_plt): Likewise.
(elf_i386_lazy_plt): Likewise.
(elf_i386_non_lazy_plt): Likewise.
(elf_i386_link_hash_table_create): Likewise.
(bfd_elf32_bfd_link_hash_table_create): Likewise.
(elf_i386_lazy_plt): Updated.
(elf_i386_non_lazy_plt): Likewise.
(elf_i386_lazy_ibt_plt): Likewise.
(elf_i386_non_lazy_ibt_plt): Likewise.
(elf_i386_allocate_dynrelocs): Likewise.
(elf_i386_size_dynamic_sections): Likewise.
(elf_i386_relocate_section): Likewise.
(elf_i386_finish_dynamic_symbol): Likewise.
(elf_i386_finish_dynamic_sections): Likewise.
(elf_i386_get_synthetic_symtab): Likewise.
(elf_i386_link_setup_gnu_properties): Likewise.
(elf_i386_nacl_plt): Likewise.
* elf64-x86-64.c (ABI_64_P): Removed.
(ELF64_DYNAMIC_INTERPRETER): Likewise.
(ELF32_DYNAMIC_INTERPRETER): Likewise.
(elf_x86_64_lazy_plt_layout): Likewise.
(elf_x86_64_non_lazy_plt_layout): Likewise.
(elf_x86_64_plt_layout): Likewise.
(elf_x86_64_link_hash_table): Likewise.
(elf_x86_64_plt): Likewise.
(elf_x86_64_lazy_plt): Likewise.
(elf_x86_64_non_lazy_plt): Likewise.
(elf_x86_64_link_hash_table_create): Likewise.
(bfd_elf64_bfd_link_hash_table_create): Likewise.
(bfd_elf32_bfd_link_hash_table_create): Likewise.
(elf_x86_64_lazy_plt): Updated.
(elf_x86_64_non_lazy_plt): Likewise.
(elf_x86_64_lazy_bnd_plt): Likewise.
(elf_x86_64_non_lazy_bnd_plt): Likewise.
(elf_x86_64_lazy_ibt_plt): Likewise.
(elf_x32_lazy_ibt_plt): Likewise.
(elf_x86_64_non_lazy_ibt_plt): Likewise.
(elf_x32_non_lazy_ibt_plt): Likewise.
(elf_x86_64_allocate_dynrelocs): Likewise.
(elf_x86_64_size_dynamic_sections): Likewise.
(elf_x86_64_relocate_section): Likewise.
(elf_x86_64_finish_dynamic_symbol): Likewise.
(elf_x86_64_finish_dynamic_sections): Likewise.
(elf_x86_64_get_synthetic_symtab): Likewise.
(elf_x86_64_link_setup_gnu_properties): Likewise.
(elf_x86_64_nacl_plt): Likewise.
* elfxx-x86.c: Include "objalloc.h", "elf/i386.h" and
"elf/x86-64.h".
(ELF32_DYNAMIC_INTERPRETER): New.
(ELF64_DYNAMIC_INTERPRETER): Likewise.
(ELFX32_DYNAMIC_INTERPRETER): Likewise.
(_bfd_x86_elf_link_hash_table_create): Likewise.
(_bfd_x86_elf_link_hash_table_free): Renamed to ...
(elf_x86_link_hash_table_free): This. Make it static.
* elfxx-x86.h: Don't include "objalloc.h".
(ABI_64_P): New.
(elf_x86_lazy_plt_layout): Likewise.
(elf_x86_non_lazy_plt_layout): Likewise.
(elf_x86_plt_layout): Likewise.
(_bfd_x86_elf_link_hash_table_create): Likewise.
(bfd_elf64_bfd_link_hash_table_create): Likewise.
(bfd_elf32_bfd_link_hash_table_create): Likewise.
(elf_x86_link_hash_table): Add plt, lazy_plt, non_lazy_plt,
srelplt2 and next_tls_desc_index.
(_bfd_x86_elf_link_hash_table_free): Removed.
2017-08-31 00:10:08 +08:00
|
|
|
ret->pointer_r_type = R_X86_64_64;
|
|
|
|
ret->dynamic_interpreter = ELF64_DYNAMIC_INTERPRETER;
|
|
|
|
ret->dynamic_interpreter_size = sizeof ELF64_DYNAMIC_INTERPRETER;
|
|
|
|
ret->tls_get_addr = "__tls_get_addr";
|
|
|
|
}
|
|
|
|
else
|
|
|
|
#endif
|
|
|
|
{
|
|
|
|
ret->r_info = elf32_r_info;
|
|
|
|
ret->r_sym = elf32_r_sym;
|
2017-08-31 02:13:32 +08:00
|
|
|
if (bed->target_id == X86_64_ELF_DATA)
|
x86: Add _bfd_x86_elf_link_hash_table_create
Share _bfd_x86_elf_link_hash_table_create in elf32-i386.c and
elf64-x86-64.c by:
1. Replace elf_i386_lazy_plt_layout, elf_i386_non_lazy_plt_layout,
elf_i386_plt_layout, elf_x86_64_lazy_plt_layout,
elf_x86_64_non_lazy_plt_layout and elf_x86_64_plt_layout with
elf_x86_lazy_plt_layout, elf_x86_non_lazy_plt_layout and
elf_x86_plt_layout.
2. Move plt, lazy_plt, non_lazy_plt, srelplt2 and next_tls_desc_index
from elf_i386_link_hash_table to elf_x86_link_hash_table.
3. Remove elf_i386_link_hash_table and elf_x86_64_link_hash_table.
* elf32-i386.c (ELF_DYNAMIC_INTERPRETER): Removed.
(elf_i386_lazy_plt_layout): Likewise.
(elf_i386_non_lazy_plt_layout): Likewise.
(elf_i386_plt_layout): Likewise.
(elf_i386_link_hash_table): Likewise.
(elf_i386_next_tls_desc_index): Likewise.
(elf_i386_srelplt2): Likewise.
(elf_i386_plt): Likewise.
(elf_i386_lazy_plt): Likewise.
(elf_i386_non_lazy_plt): Likewise.
(elf_i386_link_hash_table_create): Likewise.
(bfd_elf32_bfd_link_hash_table_create): Likewise.
(elf_i386_lazy_plt): Updated.
(elf_i386_non_lazy_plt): Likewise.
(elf_i386_lazy_ibt_plt): Likewise.
(elf_i386_non_lazy_ibt_plt): Likewise.
(elf_i386_allocate_dynrelocs): Likewise.
(elf_i386_size_dynamic_sections): Likewise.
(elf_i386_relocate_section): Likewise.
(elf_i386_finish_dynamic_symbol): Likewise.
(elf_i386_finish_dynamic_sections): Likewise.
(elf_i386_get_synthetic_symtab): Likewise.
(elf_i386_link_setup_gnu_properties): Likewise.
(elf_i386_nacl_plt): Likewise.
* elf64-x86-64.c (ABI_64_P): Removed.
(ELF64_DYNAMIC_INTERPRETER): Likewise.
(ELF32_DYNAMIC_INTERPRETER): Likewise.
(elf_x86_64_lazy_plt_layout): Likewise.
(elf_x86_64_non_lazy_plt_layout): Likewise.
(elf_x86_64_plt_layout): Likewise.
(elf_x86_64_link_hash_table): Likewise.
(elf_x86_64_plt): Likewise.
(elf_x86_64_lazy_plt): Likewise.
(elf_x86_64_non_lazy_plt): Likewise.
(elf_x86_64_link_hash_table_create): Likewise.
(bfd_elf64_bfd_link_hash_table_create): Likewise.
(bfd_elf32_bfd_link_hash_table_create): Likewise.
(elf_x86_64_lazy_plt): Updated.
(elf_x86_64_non_lazy_plt): Likewise.
(elf_x86_64_lazy_bnd_plt): Likewise.
(elf_x86_64_non_lazy_bnd_plt): Likewise.
(elf_x86_64_lazy_ibt_plt): Likewise.
(elf_x32_lazy_ibt_plt): Likewise.
(elf_x86_64_non_lazy_ibt_plt): Likewise.
(elf_x32_non_lazy_ibt_plt): Likewise.
(elf_x86_64_allocate_dynrelocs): Likewise.
(elf_x86_64_size_dynamic_sections): Likewise.
(elf_x86_64_relocate_section): Likewise.
(elf_x86_64_finish_dynamic_symbol): Likewise.
(elf_x86_64_finish_dynamic_sections): Likewise.
(elf_x86_64_get_synthetic_symtab): Likewise.
(elf_x86_64_link_setup_gnu_properties): Likewise.
(elf_x86_64_nacl_plt): Likewise.
* elfxx-x86.c: Include "objalloc.h", "elf/i386.h" and
"elf/x86-64.h".
(ELF32_DYNAMIC_INTERPRETER): New.
(ELF64_DYNAMIC_INTERPRETER): Likewise.
(ELFX32_DYNAMIC_INTERPRETER): Likewise.
(_bfd_x86_elf_link_hash_table_create): Likewise.
(_bfd_x86_elf_link_hash_table_free): Renamed to ...
(elf_x86_link_hash_table_free): This. Make it static.
* elfxx-x86.h: Don't include "objalloc.h".
(ABI_64_P): New.
(elf_x86_lazy_plt_layout): Likewise.
(elf_x86_non_lazy_plt_layout): Likewise.
(elf_x86_plt_layout): Likewise.
(_bfd_x86_elf_link_hash_table_create): Likewise.
(bfd_elf64_bfd_link_hash_table_create): Likewise.
(bfd_elf32_bfd_link_hash_table_create): Likewise.
(elf_x86_link_hash_table): Add plt, lazy_plt, non_lazy_plt,
srelplt2 and next_tls_desc_index.
(_bfd_x86_elf_link_hash_table_free): Removed.
2017-08-31 00:10:08 +08:00
|
|
|
{
|
2017-09-02 20:55:25 +08:00
|
|
|
ret->sizeof_reloc = sizeof (Elf32_External_Rela);
|
x86: Add _bfd_x86_elf_link_hash_table_create
Share _bfd_x86_elf_link_hash_table_create in elf32-i386.c and
elf64-x86-64.c by:
1. Replace elf_i386_lazy_plt_layout, elf_i386_non_lazy_plt_layout,
elf_i386_plt_layout, elf_x86_64_lazy_plt_layout,
elf_x86_64_non_lazy_plt_layout and elf_x86_64_plt_layout with
elf_x86_lazy_plt_layout, elf_x86_non_lazy_plt_layout and
elf_x86_plt_layout.
2. Move plt, lazy_plt, non_lazy_plt, srelplt2 and next_tls_desc_index
from elf_i386_link_hash_table to elf_x86_link_hash_table.
3. Remove elf_i386_link_hash_table and elf_x86_64_link_hash_table.
* elf32-i386.c (ELF_DYNAMIC_INTERPRETER): Removed.
(elf_i386_lazy_plt_layout): Likewise.
(elf_i386_non_lazy_plt_layout): Likewise.
(elf_i386_plt_layout): Likewise.
(elf_i386_link_hash_table): Likewise.
(elf_i386_next_tls_desc_index): Likewise.
(elf_i386_srelplt2): Likewise.
(elf_i386_plt): Likewise.
(elf_i386_lazy_plt): Likewise.
(elf_i386_non_lazy_plt): Likewise.
(elf_i386_link_hash_table_create): Likewise.
(bfd_elf32_bfd_link_hash_table_create): Likewise.
(elf_i386_lazy_plt): Updated.
(elf_i386_non_lazy_plt): Likewise.
(elf_i386_lazy_ibt_plt): Likewise.
(elf_i386_non_lazy_ibt_plt): Likewise.
(elf_i386_allocate_dynrelocs): Likewise.
(elf_i386_size_dynamic_sections): Likewise.
(elf_i386_relocate_section): Likewise.
(elf_i386_finish_dynamic_symbol): Likewise.
(elf_i386_finish_dynamic_sections): Likewise.
(elf_i386_get_synthetic_symtab): Likewise.
(elf_i386_link_setup_gnu_properties): Likewise.
(elf_i386_nacl_plt): Likewise.
* elf64-x86-64.c (ABI_64_P): Removed.
(ELF64_DYNAMIC_INTERPRETER): Likewise.
(ELF32_DYNAMIC_INTERPRETER): Likewise.
(elf_x86_64_lazy_plt_layout): Likewise.
(elf_x86_64_non_lazy_plt_layout): Likewise.
(elf_x86_64_plt_layout): Likewise.
(elf_x86_64_link_hash_table): Likewise.
(elf_x86_64_plt): Likewise.
(elf_x86_64_lazy_plt): Likewise.
(elf_x86_64_non_lazy_plt): Likewise.
(elf_x86_64_link_hash_table_create): Likewise.
(bfd_elf64_bfd_link_hash_table_create): Likewise.
(bfd_elf32_bfd_link_hash_table_create): Likewise.
(elf_x86_64_lazy_plt): Updated.
(elf_x86_64_non_lazy_plt): Likewise.
(elf_x86_64_lazy_bnd_plt): Likewise.
(elf_x86_64_non_lazy_bnd_plt): Likewise.
(elf_x86_64_lazy_ibt_plt): Likewise.
(elf_x32_lazy_ibt_plt): Likewise.
(elf_x86_64_non_lazy_ibt_plt): Likewise.
(elf_x32_non_lazy_ibt_plt): Likewise.
(elf_x86_64_allocate_dynrelocs): Likewise.
(elf_x86_64_size_dynamic_sections): Likewise.
(elf_x86_64_relocate_section): Likewise.
(elf_x86_64_finish_dynamic_symbol): Likewise.
(elf_x86_64_finish_dynamic_sections): Likewise.
(elf_x86_64_get_synthetic_symtab): Likewise.
(elf_x86_64_link_setup_gnu_properties): Likewise.
(elf_x86_64_nacl_plt): Likewise.
* elfxx-x86.c: Include "objalloc.h", "elf/i386.h" and
"elf/x86-64.h".
(ELF32_DYNAMIC_INTERPRETER): New.
(ELF64_DYNAMIC_INTERPRETER): Likewise.
(ELFX32_DYNAMIC_INTERPRETER): Likewise.
(_bfd_x86_elf_link_hash_table_create): Likewise.
(_bfd_x86_elf_link_hash_table_free): Renamed to ...
(elf_x86_link_hash_table_free): This. Make it static.
* elfxx-x86.h: Don't include "objalloc.h".
(ABI_64_P): New.
(elf_x86_lazy_plt_layout): Likewise.
(elf_x86_non_lazy_plt_layout): Likewise.
(elf_x86_plt_layout): Likewise.
(_bfd_x86_elf_link_hash_table_create): Likewise.
(bfd_elf64_bfd_link_hash_table_create): Likewise.
(bfd_elf32_bfd_link_hash_table_create): Likewise.
(elf_x86_link_hash_table): Add plt, lazy_plt, non_lazy_plt,
srelplt2 and next_tls_desc_index.
(_bfd_x86_elf_link_hash_table_free): Removed.
2017-08-31 00:10:08 +08:00
|
|
|
ret->pointer_r_type = R_X86_64_32;
|
|
|
|
ret->dynamic_interpreter = ELFX32_DYNAMIC_INTERPRETER;
|
|
|
|
ret->dynamic_interpreter_size
|
|
|
|
= sizeof ELFX32_DYNAMIC_INTERPRETER;
|
|
|
|
ret->tls_get_addr = "__tls_get_addr";
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2017-09-02 20:55:25 +08:00
|
|
|
ret->sizeof_reloc = sizeof (Elf32_External_Rel);
|
x86: Add _bfd_x86_elf_link_hash_table_create
Share _bfd_x86_elf_link_hash_table_create in elf32-i386.c and
elf64-x86-64.c by:
1. Replace elf_i386_lazy_plt_layout, elf_i386_non_lazy_plt_layout,
elf_i386_plt_layout, elf_x86_64_lazy_plt_layout,
elf_x86_64_non_lazy_plt_layout and elf_x86_64_plt_layout with
elf_x86_lazy_plt_layout, elf_x86_non_lazy_plt_layout and
elf_x86_plt_layout.
2. Move plt, lazy_plt, non_lazy_plt, srelplt2 and next_tls_desc_index
from elf_i386_link_hash_table to elf_x86_link_hash_table.
3. Remove elf_i386_link_hash_table and elf_x86_64_link_hash_table.
* elf32-i386.c (ELF_DYNAMIC_INTERPRETER): Removed.
(elf_i386_lazy_plt_layout): Likewise.
(elf_i386_non_lazy_plt_layout): Likewise.
(elf_i386_plt_layout): Likewise.
(elf_i386_link_hash_table): Likewise.
(elf_i386_next_tls_desc_index): Likewise.
(elf_i386_srelplt2): Likewise.
(elf_i386_plt): Likewise.
(elf_i386_lazy_plt): Likewise.
(elf_i386_non_lazy_plt): Likewise.
(elf_i386_link_hash_table_create): Likewise.
(bfd_elf32_bfd_link_hash_table_create): Likewise.
(elf_i386_lazy_plt): Updated.
(elf_i386_non_lazy_plt): Likewise.
(elf_i386_lazy_ibt_plt): Likewise.
(elf_i386_non_lazy_ibt_plt): Likewise.
(elf_i386_allocate_dynrelocs): Likewise.
(elf_i386_size_dynamic_sections): Likewise.
(elf_i386_relocate_section): Likewise.
(elf_i386_finish_dynamic_symbol): Likewise.
(elf_i386_finish_dynamic_sections): Likewise.
(elf_i386_get_synthetic_symtab): Likewise.
(elf_i386_link_setup_gnu_properties): Likewise.
(elf_i386_nacl_plt): Likewise.
* elf64-x86-64.c (ABI_64_P): Removed.
(ELF64_DYNAMIC_INTERPRETER): Likewise.
(ELF32_DYNAMIC_INTERPRETER): Likewise.
(elf_x86_64_lazy_plt_layout): Likewise.
(elf_x86_64_non_lazy_plt_layout): Likewise.
(elf_x86_64_plt_layout): Likewise.
(elf_x86_64_link_hash_table): Likewise.
(elf_x86_64_plt): Likewise.
(elf_x86_64_lazy_plt): Likewise.
(elf_x86_64_non_lazy_plt): Likewise.
(elf_x86_64_link_hash_table_create): Likewise.
(bfd_elf64_bfd_link_hash_table_create): Likewise.
(bfd_elf32_bfd_link_hash_table_create): Likewise.
(elf_x86_64_lazy_plt): Updated.
(elf_x86_64_non_lazy_plt): Likewise.
(elf_x86_64_lazy_bnd_plt): Likewise.
(elf_x86_64_non_lazy_bnd_plt): Likewise.
(elf_x86_64_lazy_ibt_plt): Likewise.
(elf_x32_lazy_ibt_plt): Likewise.
(elf_x86_64_non_lazy_ibt_plt): Likewise.
(elf_x32_non_lazy_ibt_plt): Likewise.
(elf_x86_64_allocate_dynrelocs): Likewise.
(elf_x86_64_size_dynamic_sections): Likewise.
(elf_x86_64_relocate_section): Likewise.
(elf_x86_64_finish_dynamic_symbol): Likewise.
(elf_x86_64_finish_dynamic_sections): Likewise.
(elf_x86_64_get_synthetic_symtab): Likewise.
(elf_x86_64_link_setup_gnu_properties): Likewise.
(elf_x86_64_nacl_plt): Likewise.
* elfxx-x86.c: Include "objalloc.h", "elf/i386.h" and
"elf/x86-64.h".
(ELF32_DYNAMIC_INTERPRETER): New.
(ELF64_DYNAMIC_INTERPRETER): Likewise.
(ELFX32_DYNAMIC_INTERPRETER): Likewise.
(_bfd_x86_elf_link_hash_table_create): Likewise.
(_bfd_x86_elf_link_hash_table_free): Renamed to ...
(elf_x86_link_hash_table_free): This. Make it static.
* elfxx-x86.h: Don't include "objalloc.h".
(ABI_64_P): New.
(elf_x86_lazy_plt_layout): Likewise.
(elf_x86_non_lazy_plt_layout): Likewise.
(elf_x86_plt_layout): Likewise.
(_bfd_x86_elf_link_hash_table_create): Likewise.
(bfd_elf64_bfd_link_hash_table_create): Likewise.
(bfd_elf32_bfd_link_hash_table_create): Likewise.
(elf_x86_link_hash_table): Add plt, lazy_plt, non_lazy_plt,
srelplt2 and next_tls_desc_index.
(_bfd_x86_elf_link_hash_table_free): Removed.
2017-08-31 00:10:08 +08:00
|
|
|
ret->pointer_r_type = R_386_32;
|
|
|
|
ret->dynamic_interpreter = ELF32_DYNAMIC_INTERPRETER;
|
|
|
|
ret->dynamic_interpreter_size
|
|
|
|
= sizeof ELF32_DYNAMIC_INTERPRETER;
|
|
|
|
ret->tls_get_addr = "___tls_get_addr";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
ret->loc_hash_table = htab_try_create (1024,
|
|
|
|
_bfd_x86_elf_local_htab_hash,
|
|
|
|
_bfd_x86_elf_local_htab_eq,
|
|
|
|
NULL);
|
|
|
|
ret->loc_hash_memory = objalloc_create ();
|
|
|
|
if (!ret->loc_hash_table || !ret->loc_hash_memory)
|
|
|
|
{
|
|
|
|
elf_x86_link_hash_table_free (abfd);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
ret->elf.root.hash_table_free = elf_x86_link_hash_table_free;
|
|
|
|
|
|
|
|
return &ret->elf.root;
|
|
|
|
}
|
|
|
|
|
Add elfxx-x86.h and elfxx-x86.c
Move common codes in elf32-i386.c and elf64-x86-64.c to elfxx-x86.c.
* Makefile.am (BFD32_BACKENDS): Add elfxx-x86.lo.
(BFD64_BACKENDS): Likewise.
(BFD32_BACKENDS_CFILES): Add elfxx-x86.c.
(BFD64_BACKENDS_CFILES): Likewise.
* Makefile.in: Regenerated.
* configure.ac (bfd_backends): Add elfxx-x86.lo together with
elf32-i386.lo and elf64-x86-64.lo.
* configure: Regenerated.
* elf32-i386.c: Include "elfxx-x86.h" instead of "sysdep.h",
"bfd.h", "bfdlink.h", "libbfd.h", "elf-bfd.h", "bfd_stdint.h",
"objalloc.h" and "hashtab.h".
(ELIMINATE_COPY_RELOCS): Removed.
(UNDEFINED_WEAK_RESOLVED_TO_ZERO):Likewise.
(SYMBOL_NO_COPYRELOC): Likewise.
(elf_i386_link_hash_entry): Likewise.
(GOT_UNKNOWN): Likewise.
(GOT_NORMAL): Likewise.
(GOT_TLS_GD): Likewise.
(elf_i386_hash_entry): Likewise.
(elf_i386_obj_tdata): Likewise.
(elf_i386_tdata): Likewise.
(elf_i386_local_got_tls_type): Likewise.
(elf_i386_local_tlsdesc_gotent): Likewise.
(elf_i386_hash_table): Likewise.
(elf_i386_link_hash_newfunc): Likewise.
(elf_i386_local_htab_hash): Likewise.
(elf_i386_local_htab_eq): Likewise.
(elf_i386_get_local_sym_hash): Likewise.
(elf_i386_link_hash_table_free): Likewise.
(elf_i386_copy_indirect_symbol): Likewise.
(elf_i386_fixup_symbol): Likewise.
(elf_i386_readonly_dynrelocs): Likewise.
(elf_i386_always_size_sections): Likewise.
(elf_i386_set_tls_module_base): Likewise.
(elf_i386_dtpoff_base): Likewise.
(compare_relocs): Likewise.
(elf_i386_hash_symbol): Likewise.
(elf_i386_parse_gnu_properties): Likewise.
(elf_i386_merge_gnu_properties): Likewise.
(elf_i386_link_check_relocs): Likewise.
(elf_i386_merge_symbol_attribute): Likewise.
(bfd_elf32_bfd_link_check_relocs): Likewise.
(elf_backend_copy_indirect_symbol): Likewise.
(elf_backend_always_size_sections): Likewise.
(elf_backend_omit_section_dynsym): Likewise.
(elf_backend_hash_symbol): Likewise.
(elf_backend_fixup_symbol): Likewise.
(elf_backend_parse_gnu_properties): Likewise.
(elf_backend_merge_gnu_properties): Likewise.
(elf_backend_merge_symbol_attribute): Likewise.
(elf_i386_mkobject): Updated.
(elf_i386_link_hash_table_create): Likewise.
(elf_i386_check_tls_transition): Likewise.
(elf_i386_tls_transition): Likewise.
(elf_i386_convert_load_reloc): Likewise.
(elf_i386_check_relocs): Likewise.
(elf_i386_adjust_dynamic_symbol): Likewise.
(elf_i386_allocate_dynrelocs): Likewise.
(elf_i386_convert_load): Likewise.
(elf_i386_size_dynamic_sections): Likewise.
(elf_i386_relocate_section): Likewise.
(elf_i386_finish_dynamic_symbol ): Likewise.
(elf_i386_finish_dynamic_sections): Likewise.
(elf_i386_output_arch_local_syms): Likewise.
(elf_i386_get_synthetic_symtab): Likewise.
(elf_i386_link_setup_gnu_properties): Likewise.
(elf_i386_link_hash_table): Use elf_x86_link_hash_table, instead
of elf_link_hash_table, as base.
(elf_i386_next_tls_desc_index): New.
(elf_i386_srelplt2): Likewise.
(elf_i386_plt): Likewise.
(elf_i386_lazy_plt): Likewise.
(elf_i386_non_lazy_plt): Likewise.
* elf32-x86-64.c: Include "elfxx-x86.h" instead of "sysdep.h",
"bfd.h", "bfdlink.h", "libbfd.h", "elf-bfd.h", "bfd_stdint.h",
"objalloc.h" and "hashtab.h".
(ELIMINATE_COPY_RELOCS): Removed.
(UNDEFINED_WEAK_RESOLVED_TO_ZERO):Likewise.
(SYMBOL_NO_COPYRELOC): Likewise.
(elf_x86_64_link_hash_entry): Likewise.
(GOT_UNKNOWN): Likewise.
(GOT_NORMAL): Likewise.
(GOT_TLS_GD): Likewise.
(elf_x86_64_hash_entry): Likewise.
(elf_x86_64_obj_tdata): Likewise.
(elf_x86_64_tdata): Likewise.
(elf_x86_64_local_got_tls_type): Likewise.
(elf_x86_64_local_tlsdesc_gotent): Likewise.
(elf_x86_64_hash_table): Likewise.
(elf_x86_64_link_hash_newfunc): Likewise.
(elf_x86_64_local_htab_hash): Likewise.
(elf_x86_64_local_htab_eq): Likewise.
(elf_x86_64_get_local_sym_hash): Likewise.
(elf_x86_64_link_hash_table_free): Likewise.
(elf_x86_64_copy_indirect_symbol): Likewise.
(elf_x86_64_fixup_symbol): Likewise.
(elf_x86_64_readonly_dynrelocs): Likewise.
(elf_x86_64_always_size_sections): Likewise.
(elf_x86_64_set_tls_module_base): Likewise.
(elf_x86_64_dtpoff_base): Likewise.
(compare_relocs): Likewise.
(elf_x86_64_merge_symbol_attribute): Likewise.
(elf_x86_64_hash_symbol): Likewise.
(elf_x86_64_parse_gnu_properties): Likewise.
(elf_x86_64_merge_gnu_properties): Likewise.
(elf_x86_64_link_check_relocs): Likewise.
(elf_backend_copy_indirect_symbol): Likewise.
(elf_backend_always_size_sections): Likewise.
(bfd_elf64_bfd_link_check_relocs): Likewise.
(elf_backend_merge_symbol_attribute): Likewise.
(elf_backend_hash_symbol): Likewise.
(elf_backend_omit_section_dynsym): Likewise.
(elf_backend_fixup_symbol): Likewise.
(elf_backend_parse_gnu_properties): Likewise.
(elf_backend_merge_gnu_properties): Likewise.
(bfd_elf32_bfd_link_check_relocs): Likewise.
(elf_x86_64_mkobject): Updated.
(elf_x86_64_link_hash_table_create): Likewise.
(elf_x86_64_check_tls_transition): Likewise.
(elf_x86_64_tls_transition): Likewise.
(elf_x86_64_convert_load_reloc): Likewise.
(elf_x86_64_check_relocs): Likewise.
(elf_x86_64_adjust_dynamic_symbol): Likewise.
(elf_x86_64_allocate_dynrelocs): Likewise.
(elf_x86_64_convert_load): Likewise.
(elf_x86_64_size_dynamic_sections): Likewise.
(elf_x86_64_relocate_section): Likewise.
(elf_x86_64_finish_dynamic_symbol ): Likewise.
(elf_x86_64_finish_dynamic_sections): Likewise.
(elf_x86_64_output_arch_local_syms): Likewise.
(elf_x86_64_get_synthetic_symtab): Likewise.
(elf_x86_64_link_setup_gnu_properties): Likewise.
(elf_x86_64_link_hash_table): Use elf_x86_link_hash_table,
instead of elf_link_hash_table, as base.
(elf_x86_64_next_tls_desc_index): New.
(elf_x86_64_srelplt2): Likewise.
(elf_x86_64_plt): Likewise.
(elf_x86_64_lazy_plt): Likewise.
(elf_x86_64_non_lazy_plt): Likewise.
* elfxx-x86.c: New file.
* elfxx-x86.h: Likewise.
2017-08-28 21:23:25 +08:00
|
|
|
/* Sort relocs into address order. */
|
|
|
|
|
|
|
|
int
|
|
|
|
_bfd_x86_elf_compare_relocs (const void *ap, const void *bp)
|
|
|
|
{
|
|
|
|
const arelent *a = * (const arelent **) ap;
|
|
|
|
const arelent *b = * (const arelent **) bp;
|
|
|
|
|
|
|
|
if (a->address > b->address)
|
|
|
|
return 1;
|
|
|
|
else if (a->address < b->address)
|
|
|
|
return -1;
|
|
|
|
else
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
bfd_boolean
|
|
|
|
_bfd_x86_elf_link_check_relocs (bfd *abfd, struct bfd_link_info *info)
|
|
|
|
{
|
|
|
|
if (!bfd_link_relocatable (info))
|
|
|
|
{
|
|
|
|
/* Check for __tls_get_addr reference. */
|
|
|
|
struct elf_x86_link_hash_table *htab;
|
|
|
|
const struct elf_backend_data *bed = get_elf_backend_data (abfd);
|
|
|
|
htab = elf_x86_hash_table (info, bed->target_id);
|
|
|
|
if (htab)
|
|
|
|
{
|
|
|
|
struct elf_link_hash_entry *h
|
|
|
|
= elf_link_hash_lookup (elf_hash_table (info),
|
|
|
|
htab->tls_get_addr,
|
|
|
|
FALSE, FALSE, FALSE);
|
|
|
|
if (h != NULL)
|
|
|
|
((struct elf_x86_link_hash_entry *) h)->tls_get_addr = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Invoke the regular ELF backend linker to do all the work. */
|
|
|
|
return _bfd_elf_link_check_relocs (abfd, info);
|
|
|
|
}
|
|
|
|
|
|
|
|
bfd_boolean
|
|
|
|
_bfd_x86_elf_always_size_sections (bfd *output_bfd,
|
|
|
|
struct bfd_link_info *info)
|
|
|
|
{
|
|
|
|
asection *tls_sec = elf_hash_table (info)->tls_sec;
|
|
|
|
|
|
|
|
if (tls_sec)
|
|
|
|
{
|
|
|
|
struct elf_link_hash_entry *tlsbase;
|
|
|
|
|
|
|
|
tlsbase = elf_link_hash_lookup (elf_hash_table (info),
|
|
|
|
"_TLS_MODULE_BASE_",
|
|
|
|
FALSE, FALSE, FALSE);
|
|
|
|
|
|
|
|
if (tlsbase && tlsbase->type == STT_TLS)
|
|
|
|
{
|
|
|
|
struct elf_x86_link_hash_table *htab;
|
|
|
|
struct bfd_link_hash_entry *bh = NULL;
|
|
|
|
const struct elf_backend_data *bed
|
|
|
|
= get_elf_backend_data (output_bfd);
|
|
|
|
|
|
|
|
htab = elf_x86_hash_table (info, bed->target_id);
|
|
|
|
if (htab == NULL)
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
if (!(_bfd_generic_link_add_one_symbol
|
|
|
|
(info, output_bfd, "_TLS_MODULE_BASE_", BSF_LOCAL,
|
|
|
|
tls_sec, 0, NULL, FALSE,
|
|
|
|
bed->collect, &bh)))
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
htab->tls_module_base = bh;
|
|
|
|
|
|
|
|
tlsbase = (struct elf_link_hash_entry *)bh;
|
|
|
|
tlsbase->def_regular = 1;
|
|
|
|
tlsbase->other = STV_HIDDEN;
|
|
|
|
tlsbase->root.linker_def = 1;
|
|
|
|
(*bed->elf_backend_hide_symbol) (info, tlsbase, TRUE);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
_bfd_x86_elf_merge_symbol_attribute (struct elf_link_hash_entry *h,
|
|
|
|
const Elf_Internal_Sym *isym,
|
|
|
|
bfd_boolean definition,
|
|
|
|
bfd_boolean dynamic ATTRIBUTE_UNUSED)
|
|
|
|
{
|
|
|
|
if (definition)
|
|
|
|
{
|
|
|
|
struct elf_x86_link_hash_entry *eh
|
|
|
|
= (struct elf_x86_link_hash_entry *) h;
|
|
|
|
eh->def_protected = (ELF_ST_VISIBILITY (isym->st_other)
|
|
|
|
== STV_PROTECTED);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Copy the extra info we tack onto an elf_link_hash_entry. */
|
|
|
|
|
|
|
|
void
|
|
|
|
_bfd_x86_elf_copy_indirect_symbol (struct bfd_link_info *info,
|
|
|
|
struct elf_link_hash_entry *dir,
|
|
|
|
struct elf_link_hash_entry *ind)
|
|
|
|
{
|
|
|
|
struct elf_x86_link_hash_entry *edir, *eind;
|
|
|
|
|
|
|
|
edir = (struct elf_x86_link_hash_entry *) dir;
|
|
|
|
eind = (struct elf_x86_link_hash_entry *) ind;
|
|
|
|
|
|
|
|
if (eind->dyn_relocs != NULL)
|
|
|
|
{
|
|
|
|
if (edir->dyn_relocs != NULL)
|
|
|
|
{
|
|
|
|
struct elf_dyn_relocs **pp;
|
|
|
|
struct elf_dyn_relocs *p;
|
|
|
|
|
|
|
|
/* Add reloc counts against the indirect sym to the direct sym
|
|
|
|
list. Merge any entries against the same section. */
|
|
|
|
for (pp = &eind->dyn_relocs; (p = *pp) != NULL; )
|
|
|
|
{
|
|
|
|
struct elf_dyn_relocs *q;
|
|
|
|
|
|
|
|
for (q = edir->dyn_relocs; q != NULL; q = q->next)
|
|
|
|
if (q->sec == p->sec)
|
|
|
|
{
|
|
|
|
q->pc_count += p->pc_count;
|
|
|
|
q->count += p->count;
|
|
|
|
*pp = p->next;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (q == NULL)
|
|
|
|
pp = &p->next;
|
|
|
|
}
|
|
|
|
*pp = edir->dyn_relocs;
|
|
|
|
}
|
|
|
|
|
|
|
|
edir->dyn_relocs = eind->dyn_relocs;
|
|
|
|
eind->dyn_relocs = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ind->root.type == bfd_link_hash_indirect
|
|
|
|
&& dir->got.refcount <= 0)
|
|
|
|
{
|
|
|
|
edir->tls_type = eind->tls_type;
|
|
|
|
eind->tls_type = GOT_UNKNOWN;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Copy gotoff_ref so that elf_i386_adjust_dynamic_symbol will
|
|
|
|
generate a R_386_COPY reloc. */
|
|
|
|
edir->gotoff_ref |= eind->gotoff_ref;
|
|
|
|
|
|
|
|
edir->has_got_reloc |= eind->has_got_reloc;
|
|
|
|
edir->has_non_got_reloc |= eind->has_non_got_reloc;
|
|
|
|
|
|
|
|
if (ELIMINATE_COPY_RELOCS
|
|
|
|
&& ind->root.type != bfd_link_hash_indirect
|
|
|
|
&& dir->dynamic_adjusted)
|
|
|
|
{
|
|
|
|
/* If called to transfer flags for a weakdef during processing
|
|
|
|
of elf_adjust_dynamic_symbol, don't copy non_got_ref.
|
|
|
|
We clear it ourselves for ELIMINATE_COPY_RELOCS. */
|
|
|
|
if (dir->versioned != versioned_hidden)
|
|
|
|
dir->ref_dynamic |= ind->ref_dynamic;
|
|
|
|
dir->ref_regular |= ind->ref_regular;
|
|
|
|
dir->ref_regular_nonweak |= ind->ref_regular_nonweak;
|
|
|
|
dir->needs_plt |= ind->needs_plt;
|
|
|
|
dir->pointer_equality_needed |= ind->pointer_equality_needed;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (eind->func_pointer_refcount > 0)
|
|
|
|
{
|
|
|
|
edir->func_pointer_refcount += eind->func_pointer_refcount;
|
|
|
|
eind->func_pointer_refcount = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
_bfd_elf_link_hash_copy_indirect (info, dir, ind);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Remove undefined weak symbol from the dynamic symbol table if it
|
|
|
|
is resolved to 0. */
|
|
|
|
|
|
|
|
bfd_boolean
|
|
|
|
_bfd_x86_elf_fixup_symbol (struct bfd_link_info *info,
|
|
|
|
struct elf_link_hash_entry *h)
|
|
|
|
{
|
|
|
|
if (h->dynindx != -1)
|
|
|
|
{
|
|
|
|
const struct elf_backend_data *bed
|
|
|
|
= get_elf_backend_data (info->output_bfd);
|
|
|
|
if (UNDEFINED_WEAK_RESOLVED_TO_ZERO (info,
|
|
|
|
bed->target_id,
|
|
|
|
elf_x86_hash_entry (h)->has_got_reloc,
|
|
|
|
elf_x86_hash_entry (h)))
|
|
|
|
{
|
|
|
|
h->dynindx = -1;
|
|
|
|
_bfd_elf_strtab_delref (elf_hash_table (info)->dynstr,
|
|
|
|
h->dynstr_index);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Return TRUE if symbol should be hashed in the `.gnu.hash' section. */
|
|
|
|
|
|
|
|
bfd_boolean
|
|
|
|
_bfd_x86_elf_hash_symbol (struct elf_link_hash_entry *h)
|
|
|
|
{
|
|
|
|
if (h->plt.offset != (bfd_vma) -1
|
|
|
|
&& !h->def_regular
|
|
|
|
&& !h->pointer_equality_needed)
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
return _bfd_elf_hash_symbol (h);
|
|
|
|
}
|
|
|
|
|
2017-09-02 04:03:40 +08:00
|
|
|
/* Adjust a symbol defined by a dynamic object and referenced by a
|
|
|
|
regular object. The current definition is in some section of the
|
|
|
|
dynamic object, but we're not including those sections. We have to
|
|
|
|
change the definition to something the rest of the link can
|
|
|
|
understand. */
|
|
|
|
|
|
|
|
bfd_boolean
|
|
|
|
_bfd_x86_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
|
|
|
|
struct elf_link_hash_entry *h)
|
|
|
|
{
|
|
|
|
struct elf_x86_link_hash_table *htab;
|
|
|
|
asection *s, *srel;
|
|
|
|
struct elf_x86_link_hash_entry *eh;
|
|
|
|
struct elf_dyn_relocs *p;
|
|
|
|
const struct elf_backend_data *bed
|
|
|
|
= get_elf_backend_data (info->output_bfd);
|
|
|
|
|
|
|
|
/* STT_GNU_IFUNC symbol must go through PLT. */
|
|
|
|
if (h->type == STT_GNU_IFUNC)
|
|
|
|
{
|
|
|
|
/* All local STT_GNU_IFUNC references must be treate as local
|
|
|
|
calls via local PLT. */
|
|
|
|
if (h->ref_regular
|
|
|
|
&& SYMBOL_CALLS_LOCAL (info, h))
|
|
|
|
{
|
|
|
|
bfd_size_type pc_count = 0, count = 0;
|
|
|
|
struct elf_dyn_relocs **pp;
|
|
|
|
|
|
|
|
eh = (struct elf_x86_link_hash_entry *) h;
|
|
|
|
for (pp = &eh->dyn_relocs; (p = *pp) != NULL; )
|
|
|
|
{
|
|
|
|
pc_count += p->pc_count;
|
|
|
|
p->count -= p->pc_count;
|
|
|
|
p->pc_count = 0;
|
|
|
|
count += p->count;
|
|
|
|
if (p->count == 0)
|
|
|
|
*pp = p->next;
|
|
|
|
else
|
|
|
|
pp = &p->next;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (pc_count || count)
|
|
|
|
{
|
|
|
|
h->non_got_ref = 1;
|
|
|
|
if (pc_count)
|
|
|
|
{
|
|
|
|
/* Increment PLT reference count only for PC-relative
|
|
|
|
references. */
|
|
|
|
h->needs_plt = 1;
|
|
|
|
if (h->plt.refcount <= 0)
|
|
|
|
h->plt.refcount = 1;
|
|
|
|
else
|
|
|
|
h->plt.refcount += 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (h->plt.refcount <= 0)
|
|
|
|
{
|
|
|
|
h->plt.offset = (bfd_vma) -1;
|
|
|
|
h->needs_plt = 0;
|
|
|
|
}
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If this is a function, put it in the procedure linkage table. We
|
|
|
|
will fill in the contents of the procedure linkage table later,
|
|
|
|
when we know the address of the .got section. */
|
|
|
|
if (h->type == STT_FUNC
|
|
|
|
|| h->needs_plt)
|
|
|
|
{
|
|
|
|
if (h->plt.refcount <= 0
|
|
|
|
|| SYMBOL_CALLS_LOCAL (info, h)
|
|
|
|
|| (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT
|
|
|
|
&& h->root.type == bfd_link_hash_undefweak))
|
|
|
|
{
|
|
|
|
/* This case can occur if we saw a PLT32 reloc in an input
|
|
|
|
file, but the symbol was never referred to by a dynamic
|
|
|
|
object, or if all references were garbage collected. In
|
|
|
|
such a case, we don't actually need to build a procedure
|
|
|
|
linkage table, and we can just do a PC32 reloc instead. */
|
|
|
|
h->plt.offset = (bfd_vma) -1;
|
|
|
|
h->needs_plt = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
/* It's possible that we incorrectly decided a .plt reloc was needed
|
|
|
|
* for an R_386_PC32/R_X86_64_PC32 reloc to a non-function sym in
|
|
|
|
check_relocs. We can't decide accurately between function and
|
|
|
|
non-function syms in check-relocs; Objects loaded later in
|
|
|
|
the link may change h->type. So fix it now. */
|
|
|
|
h->plt.offset = (bfd_vma) -1;
|
|
|
|
|
|
|
|
eh = (struct elf_x86_link_hash_entry *) h;
|
|
|
|
|
|
|
|
/* If this is a weak symbol, and there is a real definition, the
|
|
|
|
processor independent code will have arranged for us to see the
|
|
|
|
real definition first, and we can just use the same value. */
|
|
|
|
if (h->u.weakdef != NULL)
|
|
|
|
{
|
|
|
|
BFD_ASSERT (h->u.weakdef->root.type == bfd_link_hash_defined
|
|
|
|
|| h->u.weakdef->root.type == bfd_link_hash_defweak);
|
|
|
|
h->root.u.def.section = h->u.weakdef->root.u.def.section;
|
|
|
|
h->root.u.def.value = h->u.weakdef->root.u.def.value;
|
|
|
|
if (ELIMINATE_COPY_RELOCS
|
|
|
|
|| info->nocopyreloc
|
|
|
|
|| SYMBOL_NO_COPYRELOC (info, eh))
|
|
|
|
{
|
|
|
|
/* NB: needs_copy is always 0 for i386. */
|
|
|
|
h->non_got_ref = h->u.weakdef->non_got_ref;
|
|
|
|
eh->needs_copy = h->u.weakdef->needs_copy;
|
|
|
|
}
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* This is a reference to a symbol defined by a dynamic object which
|
|
|
|
is not a function. */
|
|
|
|
|
|
|
|
/* If we are creating a shared library, we must presume that the
|
|
|
|
only references to the symbol are via the global offset table.
|
|
|
|
For such cases we need not do anything here; the relocations will
|
|
|
|
be handled correctly by relocate_section. */
|
|
|
|
if (!bfd_link_executable (info))
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
/* If there are no references to this symbol that do not use the
|
|
|
|
GOT nor R_386_GOTOFF relocation, we don't need to generate a copy
|
|
|
|
reloc. NB: gotoff_ref is always 0 for x86-64. */
|
|
|
|
if (!h->non_got_ref && !eh->gotoff_ref)
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
/* If -z nocopyreloc was given, we won't generate them either. */
|
|
|
|
if (info->nocopyreloc || SYMBOL_NO_COPYRELOC (info, eh))
|
|
|
|
{
|
|
|
|
h->non_got_ref = 0;
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
htab = elf_x86_hash_table (info, bed->target_id);
|
|
|
|
if (htab == NULL)
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
/* If there aren't any dynamic relocs in read-only sections nor
|
|
|
|
R_386_GOTOFF relocation, then we can keep the dynamic relocs and
|
|
|
|
avoid the copy reloc. This doesn't work on VxWorks, where we can
|
|
|
|
not have dynamic relocations (other than copy and jump slot
|
|
|
|
relocations) in an executable. */
|
|
|
|
if (ELIMINATE_COPY_RELOCS
|
|
|
|
&& (bed->target_id == X86_64_ELF_DATA
|
|
|
|
|| (!eh->gotoff_ref
|
|
|
|
&& !htab->is_vxworks)))
|
|
|
|
{
|
|
|
|
for (p = eh->dyn_relocs; p != NULL; p = p->next)
|
|
|
|
{
|
|
|
|
s = p->sec->output_section;
|
|
|
|
if (s != NULL && (s->flags & SEC_READONLY) != 0)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If we didn't find any dynamic relocs in read-only sections,
|
|
|
|
then we'll be keeping the dynamic relocs and avoiding the copy
|
|
|
|
reloc. */
|
|
|
|
if (p == NULL)
|
|
|
|
{
|
|
|
|
h->non_got_ref = 0;
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* We must allocate the symbol in our .dynbss section, which will
|
|
|
|
become part of the .bss section of the executable. There will be
|
|
|
|
an entry for this symbol in the .dynsym section. The dynamic
|
|
|
|
object will contain position independent code, so all references
|
|
|
|
from the dynamic object to this symbol will go through the global
|
|
|
|
offset table. The dynamic linker will use the .dynsym entry to
|
|
|
|
determine the address it must put in the global offset table, so
|
|
|
|
both the dynamic object and the regular object will refer to the
|
|
|
|
same memory location for the variable. */
|
|
|
|
|
|
|
|
/* We must generate a R_386_COPY/R_X86_64_COPY reloc to tell the
|
|
|
|
dynamic linker to copy the initial value out of the dynamic object
|
|
|
|
and into the runtime process image. */
|
|
|
|
if ((h->root.u.def.section->flags & SEC_READONLY) != 0)
|
|
|
|
{
|
|
|
|
s = htab->elf.sdynrelro;
|
|
|
|
srel = htab->elf.sreldynrelro;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
s = htab->elf.sdynbss;
|
|
|
|
srel = htab->elf.srelbss;
|
|
|
|
}
|
|
|
|
if ((h->root.u.def.section->flags & SEC_ALLOC) != 0 && h->size != 0)
|
|
|
|
{
|
2017-09-02 20:55:25 +08:00
|
|
|
srel->size += htab->sizeof_reloc;
|
2017-09-02 04:03:40 +08:00
|
|
|
h->needs_copy = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return _bfd_elf_adjust_dynamic_copy (info, h, s);
|
|
|
|
}
|
|
|
|
|
2017-09-02 05:51:58 +08:00
|
|
|
/* Return the section that should be marked against GC for a given
|
|
|
|
relocation. */
|
|
|
|
|
|
|
|
asection *
|
|
|
|
_bfd_x86_elf_gc_mark_hook (asection *sec,
|
|
|
|
struct bfd_link_info *info,
|
|
|
|
Elf_Internal_Rela *rel,
|
|
|
|
struct elf_link_hash_entry *h,
|
|
|
|
Elf_Internal_Sym *sym)
|
|
|
|
{
|
|
|
|
/* Compiler should optimize this out. */
|
|
|
|
if (((unsigned int) R_X86_64_GNU_VTINHERIT
|
|
|
|
!= (unsigned int) R_386_GNU_VTINHERIT)
|
|
|
|
|| ((unsigned int) R_X86_64_GNU_VTENTRY
|
|
|
|
!= (unsigned int) R_386_GNU_VTENTRY))
|
|
|
|
abort ();
|
|
|
|
|
|
|
|
if (h != NULL)
|
|
|
|
switch (ELF32_R_TYPE (rel->r_info))
|
|
|
|
{
|
|
|
|
case R_X86_64_GNU_VTINHERIT:
|
|
|
|
case R_X86_64_GNU_VTENTRY:
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
return _bfd_elf_gc_mark_hook (sec, info, rel, h, sym);
|
|
|
|
}
|
|
|
|
|
2017-08-31 03:27:17 +08:00
|
|
|
static bfd_vma
|
|
|
|
elf_i386_get_plt_got_vma (struct elf_x86_plt *plt_p ATTRIBUTE_UNUSED,
|
|
|
|
bfd_vma off,
|
|
|
|
bfd_vma offset ATTRIBUTE_UNUSED,
|
|
|
|
bfd_vma got_addr)
|
|
|
|
{
|
|
|
|
return got_addr + off;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bfd_vma
|
|
|
|
elf_x86_64_get_plt_got_vma (struct elf_x86_plt *plt_p,
|
|
|
|
bfd_vma off,
|
|
|
|
bfd_vma offset,
|
|
|
|
bfd_vma got_addr ATTRIBUTE_UNUSED)
|
|
|
|
{
|
|
|
|
return plt_p->sec->vma + offset + off + plt_p->plt_got_insn_size;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
elf_i386_valid_plt_reloc_p (unsigned int type)
|
|
|
|
{
|
|
|
|
return (type == R_386_JUMP_SLOT
|
|
|
|
|| type == R_386_GLOB_DAT
|
|
|
|
|| type == R_386_IRELATIVE);
|
|
|
|
}
|
|
|
|
|
|
|
|
static bfd_boolean
|
|
|
|
elf_x86_64_valid_plt_reloc_p (unsigned int type)
|
|
|
|
{
|
|
|
|
return (type == R_X86_64_JUMP_SLOT
|
|
|
|
|| type == R_X86_64_GLOB_DAT
|
|
|
|
|| type == R_X86_64_IRELATIVE);
|
|
|
|
}
|
|
|
|
|
|
|
|
long
|
|
|
|
_bfd_x86_elf_get_synthetic_symtab (bfd *abfd,
|
|
|
|
long count,
|
|
|
|
long relsize,
|
|
|
|
bfd_vma got_addr,
|
|
|
|
struct elf_x86_plt plts[],
|
|
|
|
asymbol **dynsyms,
|
|
|
|
asymbol **ret)
|
|
|
|
{
|
|
|
|
long size, i, n, len;
|
|
|
|
int j;
|
|
|
|
unsigned int plt_got_offset, plt_entry_size;
|
|
|
|
asymbol *s;
|
|
|
|
bfd_byte *plt_contents;
|
|
|
|
long dynrelcount;
|
|
|
|
arelent **dynrelbuf, *p;
|
|
|
|
char *names;
|
|
|
|
const struct elf_backend_data *bed;
|
|
|
|
bfd_vma (*get_plt_got_vma) (struct elf_x86_plt *, bfd_vma, bfd_vma,
|
|
|
|
bfd_vma);
|
|
|
|
bfd_boolean (*valid_plt_reloc_p) (unsigned int);
|
|
|
|
|
|
|
|
if (count == 0)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
dynrelbuf = (arelent **) bfd_malloc (relsize);
|
|
|
|
if (dynrelbuf == NULL)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
dynrelcount = bfd_canonicalize_dynamic_reloc (abfd, dynrelbuf,
|
|
|
|
dynsyms);
|
|
|
|
|
|
|
|
/* Sort the relocs by address. */
|
|
|
|
qsort (dynrelbuf, dynrelcount, sizeof (arelent *),
|
|
|
|
_bfd_x86_elf_compare_relocs);
|
|
|
|
|
|
|
|
size = count * sizeof (asymbol);
|
|
|
|
|
|
|
|
/* Allocate space for @plt suffixes. */
|
|
|
|
n = 0;
|
|
|
|
for (i = 0; i < dynrelcount; i++)
|
|
|
|
{
|
|
|
|
p = dynrelbuf[i];
|
|
|
|
size += strlen ((*p->sym_ptr_ptr)->name) + sizeof ("@plt");
|
|
|
|
if (p->addend != 0)
|
|
|
|
size += sizeof ("+0x") - 1 + 8 + 8 * ABI_64_P (abfd);
|
|
|
|
}
|
|
|
|
|
|
|
|
s = *ret = (asymbol *) bfd_zmalloc (size);
|
|
|
|
if (s == NULL)
|
|
|
|
goto bad_return;
|
|
|
|
|
|
|
|
bed = get_elf_backend_data (abfd);
|
|
|
|
|
|
|
|
if (bed->target_id == X86_64_ELF_DATA)
|
|
|
|
{
|
|
|
|
get_plt_got_vma = elf_x86_64_get_plt_got_vma;
|
|
|
|
valid_plt_reloc_p = elf_x86_64_valid_plt_reloc_p;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
get_plt_got_vma = elf_i386_get_plt_got_vma;
|
|
|
|
valid_plt_reloc_p = elf_i386_valid_plt_reloc_p;
|
|
|
|
if (got_addr)
|
|
|
|
{
|
|
|
|
/* Check .got.plt and then .got to get the _GLOBAL_OFFSET_TABLE_
|
|
|
|
address. */
|
|
|
|
asection *sec = bfd_get_section_by_name (abfd, ".got.plt");
|
|
|
|
if (sec != NULL)
|
|
|
|
got_addr = sec->vma;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
sec = bfd_get_section_by_name (abfd, ".got");
|
|
|
|
if (sec != NULL)
|
|
|
|
got_addr = sec->vma;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (got_addr == (bfd_vma) -1)
|
|
|
|
goto bad_return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Check for each PLT section. */
|
|
|
|
names = (char *) (s + count);
|
|
|
|
size = 0;
|
|
|
|
n = 0;
|
|
|
|
for (j = 0; plts[j].name != NULL; j++)
|
|
|
|
if ((plt_contents = plts[j].contents) != NULL)
|
|
|
|
{
|
|
|
|
long k;
|
|
|
|
bfd_vma offset;
|
|
|
|
asection *plt;
|
|
|
|
struct elf_x86_plt *plt_p = &plts[j];
|
|
|
|
|
|
|
|
plt_got_offset = plt_p->plt_got_offset;
|
|
|
|
plt_entry_size = plt_p->plt_entry_size;
|
|
|
|
|
|
|
|
plt = plt_p->sec;
|
|
|
|
|
|
|
|
if ((plt_p->type & plt_lazy))
|
|
|
|
{
|
|
|
|
/* Skip PLT0 in lazy PLT. */
|
|
|
|
k = 1;
|
|
|
|
offset = plt_entry_size;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
k = 0;
|
|
|
|
offset = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Check each PLT entry against dynamic relocations. */
|
|
|
|
for (; k < plt_p->count; k++)
|
|
|
|
{
|
|
|
|
int off;
|
|
|
|
bfd_vma got_vma;
|
|
|
|
long min, max, mid;
|
|
|
|
|
|
|
|
/* Get the GOT offset for i386 or the PC-relative offset
|
|
|
|
for x86-64, a signed 32-bit integer. */
|
|
|
|
off = H_GET_32 (abfd, (plt_contents + offset
|
|
|
|
+ plt_got_offset));
|
|
|
|
got_vma = get_plt_got_vma (plt_p, off, offset, got_addr);
|
|
|
|
|
|
|
|
/* Binary search. */
|
|
|
|
p = dynrelbuf[0];
|
|
|
|
min = 0;
|
|
|
|
max = dynrelcount;
|
|
|
|
while ((min + 1) < max)
|
|
|
|
{
|
|
|
|
arelent *r;
|
|
|
|
|
|
|
|
mid = (min + max) / 2;
|
|
|
|
r = dynrelbuf[mid];
|
|
|
|
if (got_vma > r->address)
|
|
|
|
min = mid;
|
|
|
|
else if (got_vma < r->address)
|
|
|
|
max = mid;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
p = r;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Skip unknown relocation. PR 17512: file: bc9d6cf5. */
|
|
|
|
if (got_vma == p->address
|
|
|
|
&& p->howto != NULL
|
|
|
|
&& valid_plt_reloc_p (p->howto->type))
|
|
|
|
{
|
|
|
|
*s = **p->sym_ptr_ptr;
|
|
|
|
/* Undefined syms won't have BSF_LOCAL or BSF_GLOBAL
|
|
|
|
set. Since we are defining a symbol, ensure one
|
|
|
|
of them is set. */
|
|
|
|
if ((s->flags & BSF_LOCAL) == 0)
|
|
|
|
s->flags |= BSF_GLOBAL;
|
|
|
|
s->flags |= BSF_SYNTHETIC;
|
|
|
|
/* This is no longer a section symbol. */
|
|
|
|
s->flags &= ~BSF_SECTION_SYM;
|
|
|
|
s->section = plt;
|
|
|
|
s->the_bfd = plt->owner;
|
|
|
|
s->value = offset;
|
|
|
|
s->udata.p = NULL;
|
|
|
|
s->name = names;
|
|
|
|
len = strlen ((*p->sym_ptr_ptr)->name);
|
|
|
|
memcpy (names, (*p->sym_ptr_ptr)->name, len);
|
|
|
|
names += len;
|
|
|
|
if (p->addend != 0)
|
|
|
|
{
|
|
|
|
char buf[30], *a;
|
|
|
|
|
|
|
|
memcpy (names, "+0x", sizeof ("+0x") - 1);
|
|
|
|
names += sizeof ("+0x") - 1;
|
|
|
|
bfd_sprintf_vma (abfd, buf, p->addend);
|
|
|
|
for (a = buf; *a == '0'; ++a)
|
|
|
|
;
|
|
|
|
size = strlen (a);
|
|
|
|
memcpy (names, a, size);
|
|
|
|
names += size;
|
|
|
|
}
|
|
|
|
memcpy (names, "@plt", sizeof ("@plt"));
|
|
|
|
names += sizeof ("@plt");
|
|
|
|
n++;
|
|
|
|
s++;
|
|
|
|
}
|
|
|
|
offset += plt_entry_size;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* PLT entries with R_386_TLS_DESC relocations are skipped. */
|
|
|
|
if (n == 0)
|
|
|
|
{
|
|
|
|
bad_return:
|
|
|
|
count = -1;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
count = n;
|
|
|
|
|
|
|
|
for (j = 0; plts[j].name != NULL; j++)
|
|
|
|
if (plts[j].contents != NULL)
|
|
|
|
free (plts[j].contents);
|
|
|
|
|
|
|
|
free (dynrelbuf);
|
|
|
|
|
|
|
|
return count;
|
|
|
|
}
|
|
|
|
|
Add elfxx-x86.h and elfxx-x86.c
Move common codes in elf32-i386.c and elf64-x86-64.c to elfxx-x86.c.
* Makefile.am (BFD32_BACKENDS): Add elfxx-x86.lo.
(BFD64_BACKENDS): Likewise.
(BFD32_BACKENDS_CFILES): Add elfxx-x86.c.
(BFD64_BACKENDS_CFILES): Likewise.
* Makefile.in: Regenerated.
* configure.ac (bfd_backends): Add elfxx-x86.lo together with
elf32-i386.lo and elf64-x86-64.lo.
* configure: Regenerated.
* elf32-i386.c: Include "elfxx-x86.h" instead of "sysdep.h",
"bfd.h", "bfdlink.h", "libbfd.h", "elf-bfd.h", "bfd_stdint.h",
"objalloc.h" and "hashtab.h".
(ELIMINATE_COPY_RELOCS): Removed.
(UNDEFINED_WEAK_RESOLVED_TO_ZERO):Likewise.
(SYMBOL_NO_COPYRELOC): Likewise.
(elf_i386_link_hash_entry): Likewise.
(GOT_UNKNOWN): Likewise.
(GOT_NORMAL): Likewise.
(GOT_TLS_GD): Likewise.
(elf_i386_hash_entry): Likewise.
(elf_i386_obj_tdata): Likewise.
(elf_i386_tdata): Likewise.
(elf_i386_local_got_tls_type): Likewise.
(elf_i386_local_tlsdesc_gotent): Likewise.
(elf_i386_hash_table): Likewise.
(elf_i386_link_hash_newfunc): Likewise.
(elf_i386_local_htab_hash): Likewise.
(elf_i386_local_htab_eq): Likewise.
(elf_i386_get_local_sym_hash): Likewise.
(elf_i386_link_hash_table_free): Likewise.
(elf_i386_copy_indirect_symbol): Likewise.
(elf_i386_fixup_symbol): Likewise.
(elf_i386_readonly_dynrelocs): Likewise.
(elf_i386_always_size_sections): Likewise.
(elf_i386_set_tls_module_base): Likewise.
(elf_i386_dtpoff_base): Likewise.
(compare_relocs): Likewise.
(elf_i386_hash_symbol): Likewise.
(elf_i386_parse_gnu_properties): Likewise.
(elf_i386_merge_gnu_properties): Likewise.
(elf_i386_link_check_relocs): Likewise.
(elf_i386_merge_symbol_attribute): Likewise.
(bfd_elf32_bfd_link_check_relocs): Likewise.
(elf_backend_copy_indirect_symbol): Likewise.
(elf_backend_always_size_sections): Likewise.
(elf_backend_omit_section_dynsym): Likewise.
(elf_backend_hash_symbol): Likewise.
(elf_backend_fixup_symbol): Likewise.
(elf_backend_parse_gnu_properties): Likewise.
(elf_backend_merge_gnu_properties): Likewise.
(elf_backend_merge_symbol_attribute): Likewise.
(elf_i386_mkobject): Updated.
(elf_i386_link_hash_table_create): Likewise.
(elf_i386_check_tls_transition): Likewise.
(elf_i386_tls_transition): Likewise.
(elf_i386_convert_load_reloc): Likewise.
(elf_i386_check_relocs): Likewise.
(elf_i386_adjust_dynamic_symbol): Likewise.
(elf_i386_allocate_dynrelocs): Likewise.
(elf_i386_convert_load): Likewise.
(elf_i386_size_dynamic_sections): Likewise.
(elf_i386_relocate_section): Likewise.
(elf_i386_finish_dynamic_symbol ): Likewise.
(elf_i386_finish_dynamic_sections): Likewise.
(elf_i386_output_arch_local_syms): Likewise.
(elf_i386_get_synthetic_symtab): Likewise.
(elf_i386_link_setup_gnu_properties): Likewise.
(elf_i386_link_hash_table): Use elf_x86_link_hash_table, instead
of elf_link_hash_table, as base.
(elf_i386_next_tls_desc_index): New.
(elf_i386_srelplt2): Likewise.
(elf_i386_plt): Likewise.
(elf_i386_lazy_plt): Likewise.
(elf_i386_non_lazy_plt): Likewise.
* elf32-x86-64.c: Include "elfxx-x86.h" instead of "sysdep.h",
"bfd.h", "bfdlink.h", "libbfd.h", "elf-bfd.h", "bfd_stdint.h",
"objalloc.h" and "hashtab.h".
(ELIMINATE_COPY_RELOCS): Removed.
(UNDEFINED_WEAK_RESOLVED_TO_ZERO):Likewise.
(SYMBOL_NO_COPYRELOC): Likewise.
(elf_x86_64_link_hash_entry): Likewise.
(GOT_UNKNOWN): Likewise.
(GOT_NORMAL): Likewise.
(GOT_TLS_GD): Likewise.
(elf_x86_64_hash_entry): Likewise.
(elf_x86_64_obj_tdata): Likewise.
(elf_x86_64_tdata): Likewise.
(elf_x86_64_local_got_tls_type): Likewise.
(elf_x86_64_local_tlsdesc_gotent): Likewise.
(elf_x86_64_hash_table): Likewise.
(elf_x86_64_link_hash_newfunc): Likewise.
(elf_x86_64_local_htab_hash): Likewise.
(elf_x86_64_local_htab_eq): Likewise.
(elf_x86_64_get_local_sym_hash): Likewise.
(elf_x86_64_link_hash_table_free): Likewise.
(elf_x86_64_copy_indirect_symbol): Likewise.
(elf_x86_64_fixup_symbol): Likewise.
(elf_x86_64_readonly_dynrelocs): Likewise.
(elf_x86_64_always_size_sections): Likewise.
(elf_x86_64_set_tls_module_base): Likewise.
(elf_x86_64_dtpoff_base): Likewise.
(compare_relocs): Likewise.
(elf_x86_64_merge_symbol_attribute): Likewise.
(elf_x86_64_hash_symbol): Likewise.
(elf_x86_64_parse_gnu_properties): Likewise.
(elf_x86_64_merge_gnu_properties): Likewise.
(elf_x86_64_link_check_relocs): Likewise.
(elf_backend_copy_indirect_symbol): Likewise.
(elf_backend_always_size_sections): Likewise.
(bfd_elf64_bfd_link_check_relocs): Likewise.
(elf_backend_merge_symbol_attribute): Likewise.
(elf_backend_hash_symbol): Likewise.
(elf_backend_omit_section_dynsym): Likewise.
(elf_backend_fixup_symbol): Likewise.
(elf_backend_parse_gnu_properties): Likewise.
(elf_backend_merge_gnu_properties): Likewise.
(bfd_elf32_bfd_link_check_relocs): Likewise.
(elf_x86_64_mkobject): Updated.
(elf_x86_64_link_hash_table_create): Likewise.
(elf_x86_64_check_tls_transition): Likewise.
(elf_x86_64_tls_transition): Likewise.
(elf_x86_64_convert_load_reloc): Likewise.
(elf_x86_64_check_relocs): Likewise.
(elf_x86_64_adjust_dynamic_symbol): Likewise.
(elf_x86_64_allocate_dynrelocs): Likewise.
(elf_x86_64_convert_load): Likewise.
(elf_x86_64_size_dynamic_sections): Likewise.
(elf_x86_64_relocate_section): Likewise.
(elf_x86_64_finish_dynamic_symbol ): Likewise.
(elf_x86_64_finish_dynamic_sections): Likewise.
(elf_x86_64_output_arch_local_syms): Likewise.
(elf_x86_64_get_synthetic_symtab): Likewise.
(elf_x86_64_link_setup_gnu_properties): Likewise.
(elf_x86_64_link_hash_table): Use elf_x86_link_hash_table,
instead of elf_link_hash_table, as base.
(elf_x86_64_next_tls_desc_index): New.
(elf_x86_64_srelplt2): Likewise.
(elf_x86_64_plt): Likewise.
(elf_x86_64_lazy_plt): Likewise.
(elf_x86_64_non_lazy_plt): Likewise.
* elfxx-x86.c: New file.
* elfxx-x86.h: Likewise.
2017-08-28 21:23:25 +08:00
|
|
|
/* Parse x86 GNU properties. */
|
|
|
|
|
|
|
|
enum elf_property_kind
|
|
|
|
_bfd_x86_elf_parse_gnu_properties (bfd *abfd, unsigned int type,
|
|
|
|
bfd_byte *ptr, unsigned int datasz)
|
|
|
|
{
|
|
|
|
elf_property *prop;
|
|
|
|
|
|
|
|
switch (type)
|
|
|
|
{
|
|
|
|
case GNU_PROPERTY_X86_ISA_1_USED:
|
|
|
|
case GNU_PROPERTY_X86_ISA_1_NEEDED:
|
|
|
|
case GNU_PROPERTY_X86_FEATURE_1_AND:
|
|
|
|
if (datasz != 4)
|
|
|
|
{
|
|
|
|
_bfd_error_handler
|
|
|
|
((type == GNU_PROPERTY_X86_ISA_1_USED
|
|
|
|
? _("error: %B: <corrupt x86 ISA used size: 0x%x>")
|
|
|
|
: (type == GNU_PROPERTY_X86_ISA_1_NEEDED
|
|
|
|
? _("error: %B: <corrupt x86 ISA needed size: 0x%x>")
|
|
|
|
: _("error: %B: <corrupt x86 feature size: 0x%x>"))),
|
|
|
|
abfd, datasz);
|
|
|
|
return property_corrupt;
|
|
|
|
}
|
|
|
|
prop = _bfd_elf_get_property (abfd, type, datasz);
|
|
|
|
/* Combine properties of the same type. */
|
|
|
|
prop->u.number |= bfd_h_get_32 (abfd, ptr);
|
|
|
|
prop->pr_kind = property_number;
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
return property_ignored;
|
|
|
|
}
|
|
|
|
|
|
|
|
return property_number;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Merge x86 GNU property BPROP with APROP. If APROP isn't NULL,
|
|
|
|
return TRUE if APROP is updated. Otherwise, return TRUE if BPROP
|
|
|
|
should be merged with ABFD. */
|
|
|
|
|
|
|
|
bfd_boolean
|
|
|
|
_bfd_x86_elf_merge_gnu_properties (struct bfd_link_info *info,
|
|
|
|
bfd *abfd ATTRIBUTE_UNUSED,
|
|
|
|
elf_property *aprop,
|
|
|
|
elf_property *bprop)
|
|
|
|
{
|
|
|
|
unsigned int number, features;
|
|
|
|
bfd_boolean updated = FALSE;
|
|
|
|
unsigned int pr_type = aprop != NULL ? aprop->pr_type : bprop->pr_type;
|
|
|
|
|
|
|
|
switch (pr_type)
|
|
|
|
{
|
|
|
|
case GNU_PROPERTY_X86_ISA_1_USED:
|
|
|
|
case GNU_PROPERTY_X86_ISA_1_NEEDED:
|
|
|
|
if (aprop != NULL && bprop != NULL)
|
|
|
|
{
|
|
|
|
number = aprop->u.number;
|
|
|
|
aprop->u.number = number | bprop->u.number;
|
|
|
|
updated = number != (unsigned int) aprop->u.number;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* Return TRUE if APROP is NULL to indicate that BPROP should
|
|
|
|
be added to ABFD. */
|
|
|
|
updated = aprop == NULL;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case GNU_PROPERTY_X86_FEATURE_1_AND:
|
|
|
|
/* Only one of APROP and BPROP can be NULL:
|
|
|
|
1. APROP & BPROP when both APROP and BPROP aren't NULL.
|
|
|
|
2. If APROP is NULL, remove x86 feature.
|
|
|
|
3. Otherwise, do nothing.
|
|
|
|
*/
|
|
|
|
if (aprop != NULL && bprop != NULL)
|
|
|
|
{
|
|
|
|
features = 0;
|
|
|
|
if (info->ibt)
|
|
|
|
features = GNU_PROPERTY_X86_FEATURE_1_IBT;
|
|
|
|
if (info->shstk)
|
|
|
|
features |= GNU_PROPERTY_X86_FEATURE_1_SHSTK;
|
|
|
|
number = aprop->u.number;
|
|
|
|
/* Add GNU_PROPERTY_X86_FEATURE_1_IBT and
|
|
|
|
GNU_PROPERTY_X86_FEATURE_1_SHSTK. */
|
|
|
|
aprop->u.number = (number & bprop->u.number) | features;
|
|
|
|
updated = number != (unsigned int) aprop->u.number;
|
|
|
|
/* Remove the property if all feature bits are cleared. */
|
|
|
|
if (aprop->u.number == 0)
|
|
|
|
aprop->pr_kind = property_remove;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
features = 0;
|
|
|
|
if (info->ibt)
|
|
|
|
features = GNU_PROPERTY_X86_FEATURE_1_IBT;
|
|
|
|
if (info->shstk)
|
|
|
|
features |= GNU_PROPERTY_X86_FEATURE_1_SHSTK;
|
|
|
|
if (features)
|
|
|
|
{
|
|
|
|
/* Add GNU_PROPERTY_X86_FEATURE_1_IBT and
|
|
|
|
GNU_PROPERTY_X86_FEATURE_1_SHSTK. */
|
|
|
|
if (aprop != NULL)
|
|
|
|
{
|
|
|
|
number = aprop->u.number;
|
|
|
|
aprop->u.number = number | features;
|
|
|
|
updated = number != (unsigned int) aprop->u.number;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
bprop->u.number |= features;
|
|
|
|
updated = TRUE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (aprop != NULL)
|
|
|
|
{
|
|
|
|
aprop->pr_kind = property_remove;
|
|
|
|
updated = TRUE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
/* Never should happen. */
|
|
|
|
abort ();
|
|
|
|
}
|
|
|
|
|
|
|
|
return updated;
|
|
|
|
}
|
2017-09-01 23:00:36 +08:00
|
|
|
|
|
|
|
/* Set up x86 GNU properties. Return the first relocatable ELF input
|
|
|
|
with GNU properties if found. Otherwise, return NULL. */
|
|
|
|
|
|
|
|
bfd *
|
|
|
|
_bfd_x86_elf_link_setup_gnu_properties
|
|
|
|
(struct bfd_link_info *info,
|
|
|
|
struct elf_x86_plt_layout_table *plt_layout)
|
|
|
|
{
|
|
|
|
bfd_boolean normal_target;
|
|
|
|
bfd_boolean lazy_plt;
|
|
|
|
asection *sec, *pltsec;
|
|
|
|
bfd *dynobj;
|
|
|
|
bfd_boolean use_ibt_plt;
|
|
|
|
unsigned int plt_alignment, features;
|
|
|
|
struct elf_x86_link_hash_table *htab;
|
|
|
|
bfd *pbfd;
|
|
|
|
bfd *ebfd = NULL;
|
|
|
|
elf_property *prop;
|
|
|
|
const struct elf_backend_data *bed;
|
|
|
|
unsigned int class_align = ABI_64_P (info->output_bfd) ? 3 : 2;
|
|
|
|
unsigned int got_align;
|
|
|
|
|
|
|
|
features = 0;
|
|
|
|
if (info->ibt)
|
|
|
|
features = GNU_PROPERTY_X86_FEATURE_1_IBT;
|
|
|
|
if (info->shstk)
|
|
|
|
features |= GNU_PROPERTY_X86_FEATURE_1_SHSTK;
|
|
|
|
|
|
|
|
/* Find a normal input file with GNU property note. */
|
|
|
|
for (pbfd = info->input_bfds;
|
|
|
|
pbfd != NULL;
|
|
|
|
pbfd = pbfd->link.next)
|
|
|
|
if (bfd_get_flavour (pbfd) == bfd_target_elf_flavour
|
|
|
|
&& bfd_count_sections (pbfd) != 0)
|
|
|
|
{
|
|
|
|
ebfd = pbfd;
|
|
|
|
|
|
|
|
if (elf_properties (pbfd) != NULL)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ebfd != NULL && features)
|
|
|
|
{
|
|
|
|
/* If features is set, add GNU_PROPERTY_X86_FEATURE_1_IBT and
|
|
|
|
GNU_PROPERTY_X86_FEATURE_1_SHSTK. */
|
|
|
|
prop = _bfd_elf_get_property (ebfd,
|
|
|
|
GNU_PROPERTY_X86_FEATURE_1_AND,
|
|
|
|
4);
|
|
|
|
prop->u.number |= features;
|
|
|
|
prop->pr_kind = property_number;
|
|
|
|
|
|
|
|
/* Create the GNU property note section if needed. */
|
|
|
|
if (pbfd == NULL)
|
|
|
|
{
|
|
|
|
sec = bfd_make_section_with_flags (ebfd,
|
|
|
|
NOTE_GNU_PROPERTY_SECTION_NAME,
|
|
|
|
(SEC_ALLOC
|
|
|
|
| SEC_LOAD
|
|
|
|
| SEC_IN_MEMORY
|
|
|
|
| SEC_READONLY
|
|
|
|
| SEC_HAS_CONTENTS
|
|
|
|
| SEC_DATA));
|
|
|
|
if (sec == NULL)
|
|
|
|
info->callbacks->einfo (_("%F: failed to create GNU property section\n"));
|
|
|
|
|
|
|
|
if (!bfd_set_section_alignment (ebfd, sec, class_align))
|
|
|
|
{
|
|
|
|
error_alignment:
|
|
|
|
info->callbacks->einfo (_("%F%A: failed to align section\n"),
|
|
|
|
sec);
|
|
|
|
}
|
|
|
|
|
|
|
|
elf_section_type (sec) = SHT_NOTE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
pbfd = _bfd_elf_link_setup_gnu_properties (info);
|
|
|
|
|
|
|
|
if (bfd_link_relocatable (info))
|
|
|
|
return pbfd;
|
|
|
|
|
|
|
|
bed = get_elf_backend_data (info->output_bfd);
|
|
|
|
|
|
|
|
htab = elf_x86_hash_table (info, bed->target_id);
|
|
|
|
if (htab == NULL)
|
|
|
|
return pbfd;
|
|
|
|
|
2017-09-02 04:03:40 +08:00
|
|
|
htab->is_vxworks = plt_layout->is_vxworks;
|
|
|
|
|
2017-09-01 23:00:36 +08:00
|
|
|
use_ibt_plt = info->ibtplt || info->ibt;
|
|
|
|
if (!use_ibt_plt && pbfd != NULL)
|
|
|
|
{
|
|
|
|
/* Check if GNU_PROPERTY_X86_FEATURE_1_IBT is on. */
|
|
|
|
elf_property_list *p;
|
|
|
|
|
|
|
|
/* The property list is sorted in order of type. */
|
|
|
|
for (p = elf_properties (pbfd); p; p = p->next)
|
|
|
|
{
|
|
|
|
if (GNU_PROPERTY_X86_FEATURE_1_AND == p->property.pr_type)
|
|
|
|
{
|
|
|
|
use_ibt_plt = !!(p->property.u.number
|
|
|
|
& GNU_PROPERTY_X86_FEATURE_1_IBT);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
else if (GNU_PROPERTY_X86_FEATURE_1_AND < p->property.pr_type)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
dynobj = htab->elf.dynobj;
|
|
|
|
|
|
|
|
/* Set htab->elf.dynobj here so that there is no need to check and
|
|
|
|
set it in check_relocs. */
|
|
|
|
if (dynobj == NULL)
|
|
|
|
{
|
|
|
|
if (pbfd != NULL)
|
|
|
|
{
|
|
|
|
htab->elf.dynobj = pbfd;
|
|
|
|
dynobj = pbfd;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
bfd *abfd;
|
|
|
|
|
|
|
|
/* Find a normal input file to hold linker created
|
|
|
|
sections. */
|
|
|
|
for (abfd = info->input_bfds;
|
|
|
|
abfd != NULL;
|
|
|
|
abfd = abfd->link.next)
|
|
|
|
if (bfd_get_flavour (abfd) == bfd_target_elf_flavour
|
|
|
|
&& (abfd->flags
|
|
|
|
& (DYNAMIC | BFD_LINKER_CREATED | BFD_PLUGIN)) == 0)
|
|
|
|
{
|
|
|
|
htab->elf.dynobj = abfd;
|
|
|
|
dynobj = abfd;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Even when lazy binding is disabled by "-z now", the PLT0 entry may
|
|
|
|
still be used with LD_AUDIT or LD_PROFILE if PLT entry is used for
|
|
|
|
canonical function address. */
|
|
|
|
htab->plt.has_plt0 = 1;
|
|
|
|
normal_target = plt_layout->normal_target;
|
|
|
|
|
|
|
|
if (normal_target)
|
|
|
|
{
|
|
|
|
if (use_ibt_plt)
|
|
|
|
{
|
|
|
|
htab->lazy_plt = plt_layout->lazy_ibt_plt;
|
|
|
|
htab->non_lazy_plt = plt_layout->non_lazy_ibt_plt;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
htab->lazy_plt = plt_layout->lazy_plt;
|
|
|
|
htab->non_lazy_plt = plt_layout->non_lazy_plt;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
htab->lazy_plt = plt_layout->lazy_plt;
|
|
|
|
htab->non_lazy_plt = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
pltsec = htab->elf.splt;
|
|
|
|
|
|
|
|
/* If the non-lazy PLT is available, use it for all PLT entries if
|
|
|
|
there are no PLT0 or no .plt section. */
|
|
|
|
if (htab->non_lazy_plt != NULL
|
|
|
|
&& (!htab->plt.has_plt0 || pltsec == NULL))
|
|
|
|
{
|
|
|
|
lazy_plt = FALSE;
|
|
|
|
if (bfd_link_pic (info))
|
|
|
|
htab->plt.plt_entry = htab->non_lazy_plt->pic_plt_entry;
|
|
|
|
else
|
|
|
|
htab->plt.plt_entry = htab->non_lazy_plt->plt_entry;
|
|
|
|
htab->plt.plt_entry_size = htab->non_lazy_plt->plt_entry_size;
|
|
|
|
htab->plt.plt_got_offset = htab->non_lazy_plt->plt_got_offset;
|
|
|
|
htab->plt.plt_got_insn_size
|
|
|
|
= htab->non_lazy_plt->plt_got_insn_size;
|
|
|
|
htab->plt.eh_frame_plt_size
|
|
|
|
= htab->non_lazy_plt->eh_frame_plt_size;
|
|
|
|
htab->plt.eh_frame_plt = htab->non_lazy_plt->eh_frame_plt;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
lazy_plt = TRUE;
|
|
|
|
if (bfd_link_pic (info))
|
|
|
|
{
|
|
|
|
htab->plt.plt0_entry = htab->lazy_plt->pic_plt0_entry;
|
|
|
|
htab->plt.plt_entry = htab->lazy_plt->pic_plt_entry;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
htab->plt.plt0_entry = htab->lazy_plt->plt0_entry;
|
|
|
|
htab->plt.plt_entry = htab->lazy_plt->plt_entry;
|
|
|
|
}
|
|
|
|
htab->plt.plt_entry_size = htab->lazy_plt->plt_entry_size;
|
|
|
|
htab->plt.plt_got_offset = htab->lazy_plt->plt_got_offset;
|
|
|
|
htab->plt.plt_got_insn_size
|
|
|
|
= htab->lazy_plt->plt_got_insn_size;
|
|
|
|
htab->plt.eh_frame_plt_size
|
|
|
|
= htab->lazy_plt->eh_frame_plt_size;
|
|
|
|
htab->plt.eh_frame_plt = htab->lazy_plt->eh_frame_plt;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Return if there are no normal input files. */
|
|
|
|
if (dynobj == NULL)
|
|
|
|
return pbfd;
|
|
|
|
|
2017-09-02 04:03:40 +08:00
|
|
|
if (htab->is_vxworks
|
2017-09-01 23:00:36 +08:00
|
|
|
&& !elf_vxworks_create_dynamic_sections (dynobj, info,
|
|
|
|
&htab->srelplt2))
|
|
|
|
{
|
|
|
|
info->callbacks->einfo (_("%F: failed to create VxWorks dynamic sections\n"));
|
|
|
|
return pbfd;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Since create_dynamic_sections isn't always called, but GOT
|
|
|
|
relocations need GOT relocations, create them here so that we
|
|
|
|
don't need to do it in check_relocs. */
|
|
|
|
if (htab->elf.sgot == NULL
|
|
|
|
&& !_bfd_elf_create_got_section (dynobj, info))
|
|
|
|
info->callbacks->einfo (_("%F: failed to create GOT sections\n"));
|
|
|
|
|
|
|
|
got_align = (bed->target_id == X86_64_ELF_DATA) ? 3 : 2;
|
|
|
|
|
|
|
|
/* Align .got and .got.plt sections to their entry size. Do it here
|
|
|
|
instead of in create_dynamic_sections so that they are always
|
|
|
|
properly aligned even if create_dynamic_sections isn't called. */
|
|
|
|
sec = htab->elf.sgot;
|
|
|
|
if (!bfd_set_section_alignment (dynobj, sec, got_align))
|
|
|
|
goto error_alignment;
|
|
|
|
|
|
|
|
sec = htab->elf.sgotplt;
|
|
|
|
if (!bfd_set_section_alignment (dynobj, sec, got_align))
|
|
|
|
goto error_alignment;
|
|
|
|
|
|
|
|
/* Create the ifunc sections here so that check_relocs can be
|
|
|
|
simplified. */
|
|
|
|
if (!_bfd_elf_create_ifunc_sections (dynobj, info))
|
|
|
|
info->callbacks->einfo (_("%F: failed to create ifunc sections\n"));
|
|
|
|
|
|
|
|
plt_alignment = bfd_log2 (htab->plt.plt_entry_size);
|
|
|
|
|
|
|
|
if (pltsec != NULL)
|
|
|
|
{
|
|
|
|
/* Whe creating executable, set the contents of the .interp
|
|
|
|
section to the interpreter. */
|
|
|
|
if (bfd_link_executable (info) && !info->nointerp)
|
|
|
|
{
|
|
|
|
asection *s = bfd_get_linker_section (dynobj, ".interp");
|
|
|
|
if (s == NULL)
|
|
|
|
abort ();
|
|
|
|
s->size = htab->dynamic_interpreter_size;
|
|
|
|
s->contents = (unsigned char *) htab->dynamic_interpreter;
|
|
|
|
htab->interp = s;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Don't change PLT section alignment for NaCl since it uses
|
|
|
|
64-byte PLT entry and sets PLT section alignment to 32
|
|
|
|
bytes. Don't create additional PLT sections for NaCl. */
|
|
|
|
if (normal_target)
|
|
|
|
{
|
|
|
|
flagword pltflags = (bed->dynamic_sec_flags
|
|
|
|
| SEC_ALLOC
|
|
|
|
| SEC_CODE
|
|
|
|
| SEC_LOAD
|
|
|
|
| SEC_READONLY);
|
|
|
|
unsigned int non_lazy_plt_alignment
|
|
|
|
= bfd_log2 (htab->non_lazy_plt->plt_entry_size);
|
|
|
|
|
|
|
|
sec = pltsec;
|
|
|
|
if (!bfd_set_section_alignment (sec->owner, sec,
|
|
|
|
plt_alignment))
|
|
|
|
goto error_alignment;
|
|
|
|
|
|
|
|
/* Create the GOT procedure linkage table. */
|
|
|
|
sec = bfd_make_section_anyway_with_flags (dynobj,
|
|
|
|
".plt.got",
|
|
|
|
pltflags);
|
|
|
|
if (sec == NULL)
|
|
|
|
info->callbacks->einfo (_("%F: failed to create GOT PLT section\n"));
|
|
|
|
|
|
|
|
if (!bfd_set_section_alignment (dynobj, sec,
|
|
|
|
non_lazy_plt_alignment))
|
|
|
|
goto error_alignment;
|
|
|
|
|
|
|
|
htab->plt_got = sec;
|
|
|
|
|
|
|
|
if (lazy_plt)
|
|
|
|
{
|
|
|
|
sec = NULL;
|
|
|
|
|
|
|
|
if (use_ibt_plt)
|
|
|
|
{
|
|
|
|
/* Create the second PLT for Intel IBT support. IBT
|
|
|
|
PLT is supported only for non-NaCl target and is
|
|
|
|
is needed only for lazy binding. */
|
|
|
|
sec = bfd_make_section_anyway_with_flags (dynobj,
|
|
|
|
".plt.sec",
|
|
|
|
pltflags);
|
|
|
|
if (sec == NULL)
|
|
|
|
info->callbacks->einfo (_("%F: failed to create IBT-enabled PLT section\n"));
|
|
|
|
|
|
|
|
if (!bfd_set_section_alignment (dynobj, sec,
|
|
|
|
plt_alignment))
|
|
|
|
goto error_alignment;
|
|
|
|
}
|
|
|
|
else if (info->bndplt && ABI_64_P (dynobj))
|
|
|
|
{
|
|
|
|
/* Create the second PLT for Intel MPX support. MPX
|
|
|
|
PLT is supported only for non-NaCl target in 64-bit
|
|
|
|
mode and is needed only for lazy binding. */
|
|
|
|
sec = bfd_make_section_anyway_with_flags (dynobj,
|
|
|
|
".plt.sec",
|
|
|
|
pltflags);
|
|
|
|
if (sec == NULL)
|
|
|
|
info->callbacks->einfo (_("%F: failed to create BND PLT section\n"));
|
|
|
|
|
|
|
|
if (!bfd_set_section_alignment (dynobj, sec,
|
|
|
|
non_lazy_plt_alignment))
|
|
|
|
goto error_alignment;
|
|
|
|
}
|
|
|
|
|
|
|
|
htab->plt_second = sec;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!info->no_ld_generated_unwind_info)
|
|
|
|
{
|
|
|
|
flagword flags = (SEC_ALLOC | SEC_LOAD | SEC_READONLY
|
|
|
|
| SEC_HAS_CONTENTS | SEC_IN_MEMORY
|
|
|
|
| SEC_LINKER_CREATED);
|
|
|
|
|
|
|
|
sec = bfd_make_section_anyway_with_flags (dynobj,
|
|
|
|
".eh_frame",
|
|
|
|
flags);
|
|
|
|
if (sec == NULL)
|
|
|
|
info->callbacks->einfo (_("%F: failed to create PLT .eh_frame section\n"));
|
|
|
|
|
|
|
|
if (!bfd_set_section_alignment (dynobj, sec, class_align))
|
|
|
|
goto error_alignment;
|
|
|
|
|
|
|
|
htab->plt_eh_frame = sec;
|
|
|
|
|
|
|
|
if (htab->plt_got != NULL)
|
|
|
|
{
|
|
|
|
sec = bfd_make_section_anyway_with_flags (dynobj,
|
|
|
|
".eh_frame",
|
|
|
|
flags);
|
|
|
|
if (sec == NULL)
|
|
|
|
info->callbacks->einfo (_("%F: failed to create GOT PLT .eh_frame section\n"));
|
|
|
|
|
|
|
|
if (!bfd_set_section_alignment (dynobj, sec, class_align))
|
|
|
|
goto error_alignment;
|
|
|
|
|
|
|
|
htab->plt_got_eh_frame = sec;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (htab->plt_second != NULL)
|
|
|
|
{
|
|
|
|
sec = bfd_make_section_anyway_with_flags (dynobj,
|
|
|
|
".eh_frame",
|
|
|
|
flags);
|
|
|
|
if (sec == NULL)
|
|
|
|
info->callbacks->einfo (_("%F: failed to create the second PLT .eh_frame section\n"));
|
|
|
|
|
|
|
|
if (!bfd_set_section_alignment (dynobj, sec, class_align))
|
|
|
|
goto error_alignment;
|
|
|
|
|
|
|
|
htab->plt_second_eh_frame = sec;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (normal_target)
|
|
|
|
{
|
|
|
|
/* The .iplt section is used for IFUNC symbols in static
|
|
|
|
executables. */
|
|
|
|
sec = htab->elf.iplt;
|
|
|
|
if (sec != NULL
|
|
|
|
&& !bfd_set_section_alignment (sec->owner, sec,
|
|
|
|
plt_alignment))
|
|
|
|
goto error_alignment;
|
|
|
|
}
|
|
|
|
|
|
|
|
return pbfd;
|
|
|
|
}
|