From 5b9c07b2782fb9368f06c2561b7329c384ec5da0 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Sat, 6 Apr 2019 07:25:10 -0700 Subject: x86: Move x86-specific linker options to elf_linker_x86_params Remove x86-specific linker options from bfd_link_info and put them in elf_linker_x86_params. Add _bfd_elf_linker_x86_set_options to pass x86-specific linker options from ld to bfd. bfd/ * elf-linker-x86.h: New file. * elf32-i386.c (elf_i386_convert_load_reloc): Use htab->params to get x86-specific linker options. * elf64-x86-64.c (elf_x86_64_convert_load_reloc): Likewise. (elf_x86_64_check_relocs): Likewise. (elf_x86_64_relocate_section): Likewise. (elf_x86_64_link_setup_gnu_properties): Likewise. * elfxx-x86.c (_bfd_x86_elf_merge_gnu_properties): Likewise. (_bfd_x86_elf_link_setup_gnu_properties): Likewise. (_bfd_elf_linker_x86_set_options): New function. * elfxx-x86.h: Include "elf-linker-x86.h". (elf_x86_link_hash_table): Add params. include/ * bfdlink.h (bfd_link_info): Remove x86-specific linker options. ld/ * Makefile.am (ELF_X86_DEPS): Add $(srcdir)/emultempl/elf-x86.em. (eelf_i386_sol2.c): Also depend on $(srcdir)/emultempl/solaris2-x86.em. (eelf_x86_64_sol2.c): Likewise. * Makefile.in: Regenerated. * emulparams/call_nop.sh: Set x86-specific linker options via params. * emulparams/cet.sh: Likewise. * emulparams/reloc_overflow.sh: Likewise. * emulparams/elf32_x86_64.sh (EXTRA_EM_FILE): New. Set to "elf-x86". * emulparams/elf_i386.sh: Likewise. * emulparams/elf_i386_be.sh: Likewise. * emulparams/elf_i386_chaos.sh: Likewise. * emulparams/elf_i386_ldso.sh: Likewise. * emulparams/elf_i386_vxworks.sh: Likewise. * emulparams/elf_iamcu.sh: Likewise. * emulparams/elf_k1om.sh: Likewise. * emulparams/elf_l1om.sh: Likewise. * emulparams/elf_x86_64.sh: Likewise. * emulparams/elf_i386_sol2.sh (EXTRA_EM_FILE): Changed to "solaris2-x86". * emulparams/elf_x86_64_sol2.sh: Likewise. * emultempl/elf-x86.em: New file. * emultempl/solaris2-x86.em: Likewise. * emultempl/elf32.em (gld${EMULATION_NAME}_before_parse): Don't set link_info.call_nop_byte. --- bfd/elf-linker-x86.h | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 bfd/elf-linker-x86.h (limited to 'bfd/elf-linker-x86.h') diff --git a/bfd/elf-linker-x86.h b/bfd/elf-linker-x86.h new file mode 100644 index 0000000..bd14b71 --- /dev/null +++ b/bfd/elf-linker-x86.h @@ -0,0 +1,47 @@ +/* x86-specific ELF linker support between ld and bfd. + Copyright (C) 2019 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. */ + +/* Used to pass x86-specific linker options from ld to bfd. */ +struct elf_linker_x86_params +{ + /* TRUE if BND prefix in PLT entries is always generated. */ + unsigned int bndplt: 1; + + /* TRUE if IBT-enabled PLT entries should be generated. */ + unsigned int ibtplt: 1; + + /* TRUE if GNU_PROPERTY_X86_FEATURE_1_IBT should be generated. */ + unsigned int ibt: 1; + + /* TRUE if GNU_PROPERTY_X86_FEATURE_1_SHSTK should be generated. */ + unsigned int shstk: 1; + + /* TRUE if we shouldn't check relocation overflow. */ + unsigned int no_reloc_overflow_check: 1; + + /* TRUE if generate a 1-byte NOP as suffix for x86 call instruction. */ + unsigned int call_nop_as_suffix : 1; + + /* The 1-byte NOP for x86 call instruction. */ + char call_nop_byte; +}; + +extern void _bfd_elf_linker_x86_set_options + (struct bfd_link_info *, struct elf_linker_x86_params *); -- cgit v1.1