2006-08-19 06:29:20 +08:00
|
|
|
// i386.cc -- i386 target support for gold.
|
|
|
|
|
2011-06-29 05:15:42 +08:00
|
|
|
// Copyright 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
|
2007-09-23 05:02:10 +08:00
|
|
|
// Written by Ian Lance Taylor <iant@google.com>.
|
|
|
|
|
|
|
|
// This file is part of gold.
|
|
|
|
|
|
|
|
// 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.
|
|
|
|
|
2006-08-19 06:29:20 +08:00
|
|
|
#include "gold.h"
|
2006-11-04 02:26:11 +08:00
|
|
|
|
|
|
|
#include <cstring>
|
|
|
|
|
2006-08-19 06:29:20 +08:00
|
|
|
#include "elfcpp.h"
|
PR gold/12571
* options.h (class General_options): Add
--ld-generated-unwind-info.
* ehframe.cc (Fde::write): Add address parameter. Change all
callers. If associated with PLT, fill in address and size.
(Cie::set_output_offset): Only add merge mapping if there is an
object.
(Cie::write): Add address parameter. Change all callers.
(Eh_frame::add_ehframe_for_plt): New function.
* ehframe.h (class Fde): Update declarations. Move shndx_ and
input_offset_ fields into union u_, with new plt field.
(Fde::Fde): Adjust for new union field.
(Fde::Fde) [Output_data version]: New constructor.
(Fde::add_mapping): Only add merge mapping if there is an object.
(class Cie): Update declarations.
(class Eh_frame): Declare add_ehframe_for_plt.
* layout.cc (Layout::layout_eh_frame): Break out code into
make_eh_frame_section, and call it.
(Layout::make_eh_frame_section): New function.
(Layout::add_eh_frame_for_plt): New function.
* layout.h (class Layout): Update declarations.
* merge.cc (Merge_map::add_mapping): Add assertion.
* i386.cc: Include "dwarf.h".
(class Output_data_plt_i386): Make first_plt_entry,
dyn_first_plt_entry, exec_plt_entry, and dyn_plt_entry const. Add
plt_eh_frame_cie_size, plt_eh_frame_fde_size, plt_eh_frame_cie,
and plt_eh_frame_fde.
(Output_data_plt_i386::Output_data_plt_i386): Align to 16-byte
boundary. Call add_eh_frame_for_plt if appropriate.
* x86_64.cc: Include "dwarf.h".
(class Output_data_plt_x86_64): Align to 16-byte boundary. Make
first_plt_entry, plt_entry and tlsdesc_plt_entry const. Add
plt_eh_frame_cie_size, plt_eh_frame_fde_size, plt_eh_frame_cie,
and plt_eh_frame_fde.
(Output_data_plt_x86_64::init): Call add_eh_frame_for_plt if
appropriate.
2011-07-02 06:05:01 +08:00
|
|
|
#include "dwarf.h"
|
2007-09-21 15:20:01 +08:00
|
|
|
#include "parameters.h"
|
2006-10-21 04:40:49 +08:00
|
|
|
#include "reloc.h"
|
2006-09-30 03:58:17 +08:00
|
|
|
#include "i386.h"
|
|
|
|
#include "object.h"
|
2006-11-04 02:26:11 +08:00
|
|
|
#include "symtab.h"
|
2006-10-21 04:40:49 +08:00
|
|
|
#include "layout.h"
|
|
|
|
#include "output.h"
|
2008-04-17 06:54:29 +08:00
|
|
|
#include "copy-relocs.h"
|
2006-08-19 06:29:20 +08:00
|
|
|
#include "target.h"
|
2006-09-30 03:58:17 +08:00
|
|
|
#include "target-reloc.h"
|
2006-08-19 06:29:20 +08:00
|
|
|
#include "target-select.h"
|
2007-10-08 13:12:59 +08:00
|
|
|
#include "tls.h"
|
2009-03-24 08:31:29 +08:00
|
|
|
#include "freebsd.h"
|
2009-10-13 08:39:31 +08:00
|
|
|
#include "gc.h"
|
2006-08-19 06:29:20 +08:00
|
|
|
|
|
|
|
namespace
|
|
|
|
{
|
|
|
|
|
|
|
|
using namespace gold;
|
|
|
|
|
2010-08-20 06:50:16 +08:00
|
|
|
// A class to handle the PLT data.
|
|
|
|
|
|
|
|
class Output_data_plt_i386 : public Output_section_data
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
typedef Output_data_reloc<elfcpp::SHT_REL, true, 32, false> Reloc_section;
|
|
|
|
|
PR gold/12372
* target.h (Target::plt_address_for_global): New function.
(Target::plt_address_for_local): New function.
(Target::plt_section_for_global): Remove.
(Target::plt_section_for_local): Remove.
(Target::do_plt_address_for_global): New virtual function.
(Target::do_plt_address_for_local): New virtual function.
(Target::do_plt_section_for_global): Remove.
(Target::do_plt_section_for_local): Remove.
(Target::register_global_plt_entry): Add Symbol_table and Layout
parameters.
* output.cc (Output_data_got::Got_entry::write): Use
plt_address_for_global and plt_address_for_local.
* layout.cc (Layout::add_target_dynamic_tags): Use size and
address of output section.
* i386.cc (class Output_data_plt_i386): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_i386::has_irelative_section): New function.
(Output_data_plt_i386::entry_count): Add irelative_count_.
(Output_data_plt_i386::set_final_data_size): Likewise.
(class Target_i386): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_i386::Target_i386): Initialize new fields.
(Target_i386::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_i386::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_i386::got_section): Create got_irelative_.
(Target_i386::rel_irelative_section): New function.
(Output_data_plt_i386::Output_data_plt_i386): Initialize new
fields. Don't define __rel_iplt_{start,end}.
(Output_data_plt_i386::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_i386::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_i386::rel_tls_desc): Fix formatting.
(Output_data_plt_i386::rel_irelative): New function.
(Output_data_plt_i386::address_for_global): New function.
(Output_data_plt_i386::address_for_local): New function.
(Output_data_plt_i386::do_write): Write out IRELATIVE area. Use
IRELATIVE GOT when changing IFUNC GOT entries.
(Target_i386::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_i386::do_finalize_sections): Create the __rel_iplt symbols
if we didn't create an IRELATIVE GOT.
(Target_i386::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_i386::do_dynsym_value): Use plt_address_for_global.
* x86_64.cc (class Output_data_plt_x86_64): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_x86_64::Output_data_plt_x86_64) [both versions]:
Initialize new fields. Remove symtab parameter. Change all
callers.
(Output_data_plt_x86_64::get_tlsdesc_plt_offset): Add
irelative_count_.
(Output_data_plt_x86_64::has_irelative_section): New function.
(Output_data_plt_x86_64::entry_count): Add irelative_count_.
(class Target_x86_64): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_x86_64::Target_x86_64): Initialize new fields.
(Target_x86_64::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_x86_64::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_x86_64::got_section): Create got_irelative_.
(Target_x86_64::rela_irelative_section): New function.
(Output_data_plt_x86_64::init): Remove symtab parameter. Change
all callers. Don't create __rel_iplt_{start,end}.
(Output_data_plt_x86_64::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_x86_64::add_relocation): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::rela_tlsdesc): Fix formatting.
(Output_data_plt_x86_64::rela_irelative): New function.
(Output_data_plt_x86_64::address_for_global): New function.
(Output_data_plt_x86_64::address_for_local): New function.
(Output_data_plt_x86_64::set_final_data_size): Likewise.
(Output_data_plt_x86_64::do_write): Write out IRELATIVE area.
(Target_x86_64::init_got_plt_for_update): Create got_irelative_.
(Target_x86_64::register_global_plt_entry): Add symtab and layout
parameters.
(Target_x86_64::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_x86_64::do_finalize_sections): Create the __rela_iplt
symbols if we didn't create an IRELATIVE GOT.
(Target_x86_64::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_x86_64::do_dynsym_value): Use plt_address_for_global.
* testsuite/ifuncvar1.c: New test file.
* testsuite/ifuncvar2.c: New test file.
* testsuite/ifuncvar3.c: New test file.
* testsuite/Makefile.am (check_PROGRAMS): Add ifuncvar.
(ifuncvar1_pic.o, ifuncvar2_pic.o, ifuncvar.so): New targets.
(ifuncvar_SOURCES, ifuncvar_DEPENDENCIES): New variables.
(ifuncvar_LDFLAGS, ifuncvar_LDADD): New variables.
* testsuite/Makefile.in: Rebuild.
2011-07-09 06:48:08 +08:00
|
|
|
Output_data_plt_i386(Layout*, Output_data_space*, Output_data_space*);
|
2010-08-20 06:50:16 +08:00
|
|
|
|
|
|
|
// Add an entry to the PLT.
|
|
|
|
void
|
PR gold/12372
* target.h (Target::plt_address_for_global): New function.
(Target::plt_address_for_local): New function.
(Target::plt_section_for_global): Remove.
(Target::plt_section_for_local): Remove.
(Target::do_plt_address_for_global): New virtual function.
(Target::do_plt_address_for_local): New virtual function.
(Target::do_plt_section_for_global): Remove.
(Target::do_plt_section_for_local): Remove.
(Target::register_global_plt_entry): Add Symbol_table and Layout
parameters.
* output.cc (Output_data_got::Got_entry::write): Use
plt_address_for_global and plt_address_for_local.
* layout.cc (Layout::add_target_dynamic_tags): Use size and
address of output section.
* i386.cc (class Output_data_plt_i386): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_i386::has_irelative_section): New function.
(Output_data_plt_i386::entry_count): Add irelative_count_.
(Output_data_plt_i386::set_final_data_size): Likewise.
(class Target_i386): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_i386::Target_i386): Initialize new fields.
(Target_i386::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_i386::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_i386::got_section): Create got_irelative_.
(Target_i386::rel_irelative_section): New function.
(Output_data_plt_i386::Output_data_plt_i386): Initialize new
fields. Don't define __rel_iplt_{start,end}.
(Output_data_plt_i386::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_i386::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_i386::rel_tls_desc): Fix formatting.
(Output_data_plt_i386::rel_irelative): New function.
(Output_data_plt_i386::address_for_global): New function.
(Output_data_plt_i386::address_for_local): New function.
(Output_data_plt_i386::do_write): Write out IRELATIVE area. Use
IRELATIVE GOT when changing IFUNC GOT entries.
(Target_i386::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_i386::do_finalize_sections): Create the __rel_iplt symbols
if we didn't create an IRELATIVE GOT.
(Target_i386::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_i386::do_dynsym_value): Use plt_address_for_global.
* x86_64.cc (class Output_data_plt_x86_64): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_x86_64::Output_data_plt_x86_64) [both versions]:
Initialize new fields. Remove symtab parameter. Change all
callers.
(Output_data_plt_x86_64::get_tlsdesc_plt_offset): Add
irelative_count_.
(Output_data_plt_x86_64::has_irelative_section): New function.
(Output_data_plt_x86_64::entry_count): Add irelative_count_.
(class Target_x86_64): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_x86_64::Target_x86_64): Initialize new fields.
(Target_x86_64::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_x86_64::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_x86_64::got_section): Create got_irelative_.
(Target_x86_64::rela_irelative_section): New function.
(Output_data_plt_x86_64::init): Remove symtab parameter. Change
all callers. Don't create __rel_iplt_{start,end}.
(Output_data_plt_x86_64::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_x86_64::add_relocation): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::rela_tlsdesc): Fix formatting.
(Output_data_plt_x86_64::rela_irelative): New function.
(Output_data_plt_x86_64::address_for_global): New function.
(Output_data_plt_x86_64::address_for_local): New function.
(Output_data_plt_x86_64::set_final_data_size): Likewise.
(Output_data_plt_x86_64::do_write): Write out IRELATIVE area.
(Target_x86_64::init_got_plt_for_update): Create got_irelative_.
(Target_x86_64::register_global_plt_entry): Add symtab and layout
parameters.
(Target_x86_64::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_x86_64::do_finalize_sections): Create the __rela_iplt
symbols if we didn't create an IRELATIVE GOT.
(Target_x86_64::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_x86_64::do_dynsym_value): Use plt_address_for_global.
* testsuite/ifuncvar1.c: New test file.
* testsuite/ifuncvar2.c: New test file.
* testsuite/ifuncvar3.c: New test file.
* testsuite/Makefile.am (check_PROGRAMS): Add ifuncvar.
(ifuncvar1_pic.o, ifuncvar2_pic.o, ifuncvar.so): New targets.
(ifuncvar_SOURCES, ifuncvar_DEPENDENCIES): New variables.
(ifuncvar_LDFLAGS, ifuncvar_LDADD): New variables.
* testsuite/Makefile.in: Rebuild.
2011-07-09 06:48:08 +08:00
|
|
|
add_entry(Symbol_table*, Layout*, Symbol* gsym);
|
2010-08-20 06:50:16 +08:00
|
|
|
|
|
|
|
// Add an entry to the PLT for a local STT_GNU_IFUNC symbol.
|
|
|
|
unsigned int
|
PR gold/12372
* target.h (Target::plt_address_for_global): New function.
(Target::plt_address_for_local): New function.
(Target::plt_section_for_global): Remove.
(Target::plt_section_for_local): Remove.
(Target::do_plt_address_for_global): New virtual function.
(Target::do_plt_address_for_local): New virtual function.
(Target::do_plt_section_for_global): Remove.
(Target::do_plt_section_for_local): Remove.
(Target::register_global_plt_entry): Add Symbol_table and Layout
parameters.
* output.cc (Output_data_got::Got_entry::write): Use
plt_address_for_global and plt_address_for_local.
* layout.cc (Layout::add_target_dynamic_tags): Use size and
address of output section.
* i386.cc (class Output_data_plt_i386): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_i386::has_irelative_section): New function.
(Output_data_plt_i386::entry_count): Add irelative_count_.
(Output_data_plt_i386::set_final_data_size): Likewise.
(class Target_i386): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_i386::Target_i386): Initialize new fields.
(Target_i386::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_i386::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_i386::got_section): Create got_irelative_.
(Target_i386::rel_irelative_section): New function.
(Output_data_plt_i386::Output_data_plt_i386): Initialize new
fields. Don't define __rel_iplt_{start,end}.
(Output_data_plt_i386::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_i386::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_i386::rel_tls_desc): Fix formatting.
(Output_data_plt_i386::rel_irelative): New function.
(Output_data_plt_i386::address_for_global): New function.
(Output_data_plt_i386::address_for_local): New function.
(Output_data_plt_i386::do_write): Write out IRELATIVE area. Use
IRELATIVE GOT when changing IFUNC GOT entries.
(Target_i386::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_i386::do_finalize_sections): Create the __rel_iplt symbols
if we didn't create an IRELATIVE GOT.
(Target_i386::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_i386::do_dynsym_value): Use plt_address_for_global.
* x86_64.cc (class Output_data_plt_x86_64): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_x86_64::Output_data_plt_x86_64) [both versions]:
Initialize new fields. Remove symtab parameter. Change all
callers.
(Output_data_plt_x86_64::get_tlsdesc_plt_offset): Add
irelative_count_.
(Output_data_plt_x86_64::has_irelative_section): New function.
(Output_data_plt_x86_64::entry_count): Add irelative_count_.
(class Target_x86_64): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_x86_64::Target_x86_64): Initialize new fields.
(Target_x86_64::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_x86_64::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_x86_64::got_section): Create got_irelative_.
(Target_x86_64::rela_irelative_section): New function.
(Output_data_plt_x86_64::init): Remove symtab parameter. Change
all callers. Don't create __rel_iplt_{start,end}.
(Output_data_plt_x86_64::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_x86_64::add_relocation): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::rela_tlsdesc): Fix formatting.
(Output_data_plt_x86_64::rela_irelative): New function.
(Output_data_plt_x86_64::address_for_global): New function.
(Output_data_plt_x86_64::address_for_local): New function.
(Output_data_plt_x86_64::set_final_data_size): Likewise.
(Output_data_plt_x86_64::do_write): Write out IRELATIVE area.
(Target_x86_64::init_got_plt_for_update): Create got_irelative_.
(Target_x86_64::register_global_plt_entry): Add symtab and layout
parameters.
(Target_x86_64::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_x86_64::do_finalize_sections): Create the __rela_iplt
symbols if we didn't create an IRELATIVE GOT.
(Target_x86_64::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_x86_64::do_dynsym_value): Use plt_address_for_global.
* testsuite/ifuncvar1.c: New test file.
* testsuite/ifuncvar2.c: New test file.
* testsuite/ifuncvar3.c: New test file.
* testsuite/Makefile.am (check_PROGRAMS): Add ifuncvar.
(ifuncvar1_pic.o, ifuncvar2_pic.o, ifuncvar.so): New targets.
(ifuncvar_SOURCES, ifuncvar_DEPENDENCIES): New variables.
(ifuncvar_LDFLAGS, ifuncvar_LDADD): New variables.
* testsuite/Makefile.in: Rebuild.
2011-07-09 06:48:08 +08:00
|
|
|
add_local_ifunc_entry(Symbol_table*, Layout*,
|
|
|
|
Sized_relobj_file<32, false>* relobj,
|
2010-08-20 06:50:16 +08:00
|
|
|
unsigned int local_sym_index);
|
|
|
|
|
|
|
|
// Return the .rel.plt section data.
|
|
|
|
Reloc_section*
|
|
|
|
rel_plt() const
|
|
|
|
{ return this->rel_; }
|
|
|
|
|
|
|
|
// Return where the TLS_DESC relocations should go.
|
|
|
|
Reloc_section*
|
|
|
|
rel_tls_desc(Layout*);
|
|
|
|
|
PR gold/12372
* target.h (Target::plt_address_for_global): New function.
(Target::plt_address_for_local): New function.
(Target::plt_section_for_global): Remove.
(Target::plt_section_for_local): Remove.
(Target::do_plt_address_for_global): New virtual function.
(Target::do_plt_address_for_local): New virtual function.
(Target::do_plt_section_for_global): Remove.
(Target::do_plt_section_for_local): Remove.
(Target::register_global_plt_entry): Add Symbol_table and Layout
parameters.
* output.cc (Output_data_got::Got_entry::write): Use
plt_address_for_global and plt_address_for_local.
* layout.cc (Layout::add_target_dynamic_tags): Use size and
address of output section.
* i386.cc (class Output_data_plt_i386): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_i386::has_irelative_section): New function.
(Output_data_plt_i386::entry_count): Add irelative_count_.
(Output_data_plt_i386::set_final_data_size): Likewise.
(class Target_i386): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_i386::Target_i386): Initialize new fields.
(Target_i386::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_i386::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_i386::got_section): Create got_irelative_.
(Target_i386::rel_irelative_section): New function.
(Output_data_plt_i386::Output_data_plt_i386): Initialize new
fields. Don't define __rel_iplt_{start,end}.
(Output_data_plt_i386::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_i386::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_i386::rel_tls_desc): Fix formatting.
(Output_data_plt_i386::rel_irelative): New function.
(Output_data_plt_i386::address_for_global): New function.
(Output_data_plt_i386::address_for_local): New function.
(Output_data_plt_i386::do_write): Write out IRELATIVE area. Use
IRELATIVE GOT when changing IFUNC GOT entries.
(Target_i386::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_i386::do_finalize_sections): Create the __rel_iplt symbols
if we didn't create an IRELATIVE GOT.
(Target_i386::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_i386::do_dynsym_value): Use plt_address_for_global.
* x86_64.cc (class Output_data_plt_x86_64): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_x86_64::Output_data_plt_x86_64) [both versions]:
Initialize new fields. Remove symtab parameter. Change all
callers.
(Output_data_plt_x86_64::get_tlsdesc_plt_offset): Add
irelative_count_.
(Output_data_plt_x86_64::has_irelative_section): New function.
(Output_data_plt_x86_64::entry_count): Add irelative_count_.
(class Target_x86_64): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_x86_64::Target_x86_64): Initialize new fields.
(Target_x86_64::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_x86_64::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_x86_64::got_section): Create got_irelative_.
(Target_x86_64::rela_irelative_section): New function.
(Output_data_plt_x86_64::init): Remove symtab parameter. Change
all callers. Don't create __rel_iplt_{start,end}.
(Output_data_plt_x86_64::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_x86_64::add_relocation): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::rela_tlsdesc): Fix formatting.
(Output_data_plt_x86_64::rela_irelative): New function.
(Output_data_plt_x86_64::address_for_global): New function.
(Output_data_plt_x86_64::address_for_local): New function.
(Output_data_plt_x86_64::set_final_data_size): Likewise.
(Output_data_plt_x86_64::do_write): Write out IRELATIVE area.
(Target_x86_64::init_got_plt_for_update): Create got_irelative_.
(Target_x86_64::register_global_plt_entry): Add symtab and layout
parameters.
(Target_x86_64::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_x86_64::do_finalize_sections): Create the __rela_iplt
symbols if we didn't create an IRELATIVE GOT.
(Target_x86_64::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_x86_64::do_dynsym_value): Use plt_address_for_global.
* testsuite/ifuncvar1.c: New test file.
* testsuite/ifuncvar2.c: New test file.
* testsuite/ifuncvar3.c: New test file.
* testsuite/Makefile.am (check_PROGRAMS): Add ifuncvar.
(ifuncvar1_pic.o, ifuncvar2_pic.o, ifuncvar.so): New targets.
(ifuncvar_SOURCES, ifuncvar_DEPENDENCIES): New variables.
(ifuncvar_LDFLAGS, ifuncvar_LDADD): New variables.
* testsuite/Makefile.in: Rebuild.
2011-07-09 06:48:08 +08:00
|
|
|
// Return where the IRELATIVE relocations should go.
|
|
|
|
Reloc_section*
|
|
|
|
rel_irelative(Symbol_table*, Layout*);
|
|
|
|
|
|
|
|
// Return whether we created a section for IRELATIVE relocations.
|
|
|
|
bool
|
|
|
|
has_irelative_section() const
|
|
|
|
{ return this->irelative_rel_ != NULL; }
|
|
|
|
|
2010-08-20 06:50:16 +08:00
|
|
|
// Return the number of PLT entries.
|
|
|
|
unsigned int
|
|
|
|
entry_count() const
|
PR gold/12372
* target.h (Target::plt_address_for_global): New function.
(Target::plt_address_for_local): New function.
(Target::plt_section_for_global): Remove.
(Target::plt_section_for_local): Remove.
(Target::do_plt_address_for_global): New virtual function.
(Target::do_plt_address_for_local): New virtual function.
(Target::do_plt_section_for_global): Remove.
(Target::do_plt_section_for_local): Remove.
(Target::register_global_plt_entry): Add Symbol_table and Layout
parameters.
* output.cc (Output_data_got::Got_entry::write): Use
plt_address_for_global and plt_address_for_local.
* layout.cc (Layout::add_target_dynamic_tags): Use size and
address of output section.
* i386.cc (class Output_data_plt_i386): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_i386::has_irelative_section): New function.
(Output_data_plt_i386::entry_count): Add irelative_count_.
(Output_data_plt_i386::set_final_data_size): Likewise.
(class Target_i386): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_i386::Target_i386): Initialize new fields.
(Target_i386::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_i386::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_i386::got_section): Create got_irelative_.
(Target_i386::rel_irelative_section): New function.
(Output_data_plt_i386::Output_data_plt_i386): Initialize new
fields. Don't define __rel_iplt_{start,end}.
(Output_data_plt_i386::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_i386::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_i386::rel_tls_desc): Fix formatting.
(Output_data_plt_i386::rel_irelative): New function.
(Output_data_plt_i386::address_for_global): New function.
(Output_data_plt_i386::address_for_local): New function.
(Output_data_plt_i386::do_write): Write out IRELATIVE area. Use
IRELATIVE GOT when changing IFUNC GOT entries.
(Target_i386::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_i386::do_finalize_sections): Create the __rel_iplt symbols
if we didn't create an IRELATIVE GOT.
(Target_i386::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_i386::do_dynsym_value): Use plt_address_for_global.
* x86_64.cc (class Output_data_plt_x86_64): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_x86_64::Output_data_plt_x86_64) [both versions]:
Initialize new fields. Remove symtab parameter. Change all
callers.
(Output_data_plt_x86_64::get_tlsdesc_plt_offset): Add
irelative_count_.
(Output_data_plt_x86_64::has_irelative_section): New function.
(Output_data_plt_x86_64::entry_count): Add irelative_count_.
(class Target_x86_64): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_x86_64::Target_x86_64): Initialize new fields.
(Target_x86_64::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_x86_64::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_x86_64::got_section): Create got_irelative_.
(Target_x86_64::rela_irelative_section): New function.
(Output_data_plt_x86_64::init): Remove symtab parameter. Change
all callers. Don't create __rel_iplt_{start,end}.
(Output_data_plt_x86_64::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_x86_64::add_relocation): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::rela_tlsdesc): Fix formatting.
(Output_data_plt_x86_64::rela_irelative): New function.
(Output_data_plt_x86_64::address_for_global): New function.
(Output_data_plt_x86_64::address_for_local): New function.
(Output_data_plt_x86_64::set_final_data_size): Likewise.
(Output_data_plt_x86_64::do_write): Write out IRELATIVE area.
(Target_x86_64::init_got_plt_for_update): Create got_irelative_.
(Target_x86_64::register_global_plt_entry): Add symtab and layout
parameters.
(Target_x86_64::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_x86_64::do_finalize_sections): Create the __rela_iplt
symbols if we didn't create an IRELATIVE GOT.
(Target_x86_64::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_x86_64::do_dynsym_value): Use plt_address_for_global.
* testsuite/ifuncvar1.c: New test file.
* testsuite/ifuncvar2.c: New test file.
* testsuite/ifuncvar3.c: New test file.
* testsuite/Makefile.am (check_PROGRAMS): Add ifuncvar.
(ifuncvar1_pic.o, ifuncvar2_pic.o, ifuncvar.so): New targets.
(ifuncvar_SOURCES, ifuncvar_DEPENDENCIES): New variables.
(ifuncvar_LDFLAGS, ifuncvar_LDADD): New variables.
* testsuite/Makefile.in: Rebuild.
2011-07-09 06:48:08 +08:00
|
|
|
{ return this->count_ + this->irelative_count_; }
|
2010-08-20 06:50:16 +08:00
|
|
|
|
|
|
|
// Return the offset of the first non-reserved PLT entry.
|
|
|
|
static unsigned int
|
|
|
|
first_plt_entry_offset()
|
|
|
|
{ return plt_entry_size; }
|
|
|
|
|
|
|
|
// Return the size of a PLT entry.
|
|
|
|
static unsigned int
|
|
|
|
get_plt_entry_size()
|
|
|
|
{ return plt_entry_size; }
|
|
|
|
|
PR gold/12372
* target.h (Target::plt_address_for_global): New function.
(Target::plt_address_for_local): New function.
(Target::plt_section_for_global): Remove.
(Target::plt_section_for_local): Remove.
(Target::do_plt_address_for_global): New virtual function.
(Target::do_plt_address_for_local): New virtual function.
(Target::do_plt_section_for_global): Remove.
(Target::do_plt_section_for_local): Remove.
(Target::register_global_plt_entry): Add Symbol_table and Layout
parameters.
* output.cc (Output_data_got::Got_entry::write): Use
plt_address_for_global and plt_address_for_local.
* layout.cc (Layout::add_target_dynamic_tags): Use size and
address of output section.
* i386.cc (class Output_data_plt_i386): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_i386::has_irelative_section): New function.
(Output_data_plt_i386::entry_count): Add irelative_count_.
(Output_data_plt_i386::set_final_data_size): Likewise.
(class Target_i386): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_i386::Target_i386): Initialize new fields.
(Target_i386::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_i386::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_i386::got_section): Create got_irelative_.
(Target_i386::rel_irelative_section): New function.
(Output_data_plt_i386::Output_data_plt_i386): Initialize new
fields. Don't define __rel_iplt_{start,end}.
(Output_data_plt_i386::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_i386::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_i386::rel_tls_desc): Fix formatting.
(Output_data_plt_i386::rel_irelative): New function.
(Output_data_plt_i386::address_for_global): New function.
(Output_data_plt_i386::address_for_local): New function.
(Output_data_plt_i386::do_write): Write out IRELATIVE area. Use
IRELATIVE GOT when changing IFUNC GOT entries.
(Target_i386::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_i386::do_finalize_sections): Create the __rel_iplt symbols
if we didn't create an IRELATIVE GOT.
(Target_i386::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_i386::do_dynsym_value): Use plt_address_for_global.
* x86_64.cc (class Output_data_plt_x86_64): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_x86_64::Output_data_plt_x86_64) [both versions]:
Initialize new fields. Remove symtab parameter. Change all
callers.
(Output_data_plt_x86_64::get_tlsdesc_plt_offset): Add
irelative_count_.
(Output_data_plt_x86_64::has_irelative_section): New function.
(Output_data_plt_x86_64::entry_count): Add irelative_count_.
(class Target_x86_64): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_x86_64::Target_x86_64): Initialize new fields.
(Target_x86_64::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_x86_64::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_x86_64::got_section): Create got_irelative_.
(Target_x86_64::rela_irelative_section): New function.
(Output_data_plt_x86_64::init): Remove symtab parameter. Change
all callers. Don't create __rel_iplt_{start,end}.
(Output_data_plt_x86_64::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_x86_64::add_relocation): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::rela_tlsdesc): Fix formatting.
(Output_data_plt_x86_64::rela_irelative): New function.
(Output_data_plt_x86_64::address_for_global): New function.
(Output_data_plt_x86_64::address_for_local): New function.
(Output_data_plt_x86_64::set_final_data_size): Likewise.
(Output_data_plt_x86_64::do_write): Write out IRELATIVE area.
(Target_x86_64::init_got_plt_for_update): Create got_irelative_.
(Target_x86_64::register_global_plt_entry): Add symtab and layout
parameters.
(Target_x86_64::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_x86_64::do_finalize_sections): Create the __rela_iplt
symbols if we didn't create an IRELATIVE GOT.
(Target_x86_64::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_x86_64::do_dynsym_value): Use plt_address_for_global.
* testsuite/ifuncvar1.c: New test file.
* testsuite/ifuncvar2.c: New test file.
* testsuite/ifuncvar3.c: New test file.
* testsuite/Makefile.am (check_PROGRAMS): Add ifuncvar.
(ifuncvar1_pic.o, ifuncvar2_pic.o, ifuncvar.so): New targets.
(ifuncvar_SOURCES, ifuncvar_DEPENDENCIES): New variables.
(ifuncvar_LDFLAGS, ifuncvar_LDADD): New variables.
* testsuite/Makefile.in: Rebuild.
2011-07-09 06:48:08 +08:00
|
|
|
// Return the PLT address to use for a global symbol.
|
|
|
|
uint64_t
|
|
|
|
address_for_global(const Symbol*);
|
|
|
|
|
|
|
|
// Return the PLT address to use for a local symbol.
|
|
|
|
uint64_t
|
|
|
|
address_for_local(const Relobj*, unsigned int symndx);
|
|
|
|
|
2010-08-20 06:50:16 +08:00
|
|
|
protected:
|
|
|
|
void
|
|
|
|
do_adjust_output_section(Output_section* os);
|
|
|
|
|
|
|
|
// Write to a map file.
|
|
|
|
void
|
|
|
|
do_print_to_mapfile(Mapfile* mapfile) const
|
|
|
|
{ mapfile->print_output_data(this, _("** PLT")); }
|
|
|
|
|
|
|
|
private:
|
|
|
|
// The size of an entry in the PLT.
|
|
|
|
static const int plt_entry_size = 16;
|
|
|
|
|
|
|
|
// The first entry in the PLT for an executable.
|
PR gold/12571
* options.h (class General_options): Add
--ld-generated-unwind-info.
* ehframe.cc (Fde::write): Add address parameter. Change all
callers. If associated with PLT, fill in address and size.
(Cie::set_output_offset): Only add merge mapping if there is an
object.
(Cie::write): Add address parameter. Change all callers.
(Eh_frame::add_ehframe_for_plt): New function.
* ehframe.h (class Fde): Update declarations. Move shndx_ and
input_offset_ fields into union u_, with new plt field.
(Fde::Fde): Adjust for new union field.
(Fde::Fde) [Output_data version]: New constructor.
(Fde::add_mapping): Only add merge mapping if there is an object.
(class Cie): Update declarations.
(class Eh_frame): Declare add_ehframe_for_plt.
* layout.cc (Layout::layout_eh_frame): Break out code into
make_eh_frame_section, and call it.
(Layout::make_eh_frame_section): New function.
(Layout::add_eh_frame_for_plt): New function.
* layout.h (class Layout): Update declarations.
* merge.cc (Merge_map::add_mapping): Add assertion.
* i386.cc: Include "dwarf.h".
(class Output_data_plt_i386): Make first_plt_entry,
dyn_first_plt_entry, exec_plt_entry, and dyn_plt_entry const. Add
plt_eh_frame_cie_size, plt_eh_frame_fde_size, plt_eh_frame_cie,
and plt_eh_frame_fde.
(Output_data_plt_i386::Output_data_plt_i386): Align to 16-byte
boundary. Call add_eh_frame_for_plt if appropriate.
* x86_64.cc: Include "dwarf.h".
(class Output_data_plt_x86_64): Align to 16-byte boundary. Make
first_plt_entry, plt_entry and tlsdesc_plt_entry const. Add
plt_eh_frame_cie_size, plt_eh_frame_fde_size, plt_eh_frame_cie,
and plt_eh_frame_fde.
(Output_data_plt_x86_64::init): Call add_eh_frame_for_plt if
appropriate.
2011-07-02 06:05:01 +08:00
|
|
|
static const unsigned char exec_first_plt_entry[plt_entry_size];
|
2010-08-20 06:50:16 +08:00
|
|
|
|
|
|
|
// The first entry in the PLT for a shared object.
|
PR gold/12571
* options.h (class General_options): Add
--ld-generated-unwind-info.
* ehframe.cc (Fde::write): Add address parameter. Change all
callers. If associated with PLT, fill in address and size.
(Cie::set_output_offset): Only add merge mapping if there is an
object.
(Cie::write): Add address parameter. Change all callers.
(Eh_frame::add_ehframe_for_plt): New function.
* ehframe.h (class Fde): Update declarations. Move shndx_ and
input_offset_ fields into union u_, with new plt field.
(Fde::Fde): Adjust for new union field.
(Fde::Fde) [Output_data version]: New constructor.
(Fde::add_mapping): Only add merge mapping if there is an object.
(class Cie): Update declarations.
(class Eh_frame): Declare add_ehframe_for_plt.
* layout.cc (Layout::layout_eh_frame): Break out code into
make_eh_frame_section, and call it.
(Layout::make_eh_frame_section): New function.
(Layout::add_eh_frame_for_plt): New function.
* layout.h (class Layout): Update declarations.
* merge.cc (Merge_map::add_mapping): Add assertion.
* i386.cc: Include "dwarf.h".
(class Output_data_plt_i386): Make first_plt_entry,
dyn_first_plt_entry, exec_plt_entry, and dyn_plt_entry const. Add
plt_eh_frame_cie_size, plt_eh_frame_fde_size, plt_eh_frame_cie,
and plt_eh_frame_fde.
(Output_data_plt_i386::Output_data_plt_i386): Align to 16-byte
boundary. Call add_eh_frame_for_plt if appropriate.
* x86_64.cc: Include "dwarf.h".
(class Output_data_plt_x86_64): Align to 16-byte boundary. Make
first_plt_entry, plt_entry and tlsdesc_plt_entry const. Add
plt_eh_frame_cie_size, plt_eh_frame_fde_size, plt_eh_frame_cie,
and plt_eh_frame_fde.
(Output_data_plt_x86_64::init): Call add_eh_frame_for_plt if
appropriate.
2011-07-02 06:05:01 +08:00
|
|
|
static const unsigned char dyn_first_plt_entry[plt_entry_size];
|
2010-08-20 06:50:16 +08:00
|
|
|
|
|
|
|
// Other entries in the PLT for an executable.
|
PR gold/12571
* options.h (class General_options): Add
--ld-generated-unwind-info.
* ehframe.cc (Fde::write): Add address parameter. Change all
callers. If associated with PLT, fill in address and size.
(Cie::set_output_offset): Only add merge mapping if there is an
object.
(Cie::write): Add address parameter. Change all callers.
(Eh_frame::add_ehframe_for_plt): New function.
* ehframe.h (class Fde): Update declarations. Move shndx_ and
input_offset_ fields into union u_, with new plt field.
(Fde::Fde): Adjust for new union field.
(Fde::Fde) [Output_data version]: New constructor.
(Fde::add_mapping): Only add merge mapping if there is an object.
(class Cie): Update declarations.
(class Eh_frame): Declare add_ehframe_for_plt.
* layout.cc (Layout::layout_eh_frame): Break out code into
make_eh_frame_section, and call it.
(Layout::make_eh_frame_section): New function.
(Layout::add_eh_frame_for_plt): New function.
* layout.h (class Layout): Update declarations.
* merge.cc (Merge_map::add_mapping): Add assertion.
* i386.cc: Include "dwarf.h".
(class Output_data_plt_i386): Make first_plt_entry,
dyn_first_plt_entry, exec_plt_entry, and dyn_plt_entry const. Add
plt_eh_frame_cie_size, plt_eh_frame_fde_size, plt_eh_frame_cie,
and plt_eh_frame_fde.
(Output_data_plt_i386::Output_data_plt_i386): Align to 16-byte
boundary. Call add_eh_frame_for_plt if appropriate.
* x86_64.cc: Include "dwarf.h".
(class Output_data_plt_x86_64): Align to 16-byte boundary. Make
first_plt_entry, plt_entry and tlsdesc_plt_entry const. Add
plt_eh_frame_cie_size, plt_eh_frame_fde_size, plt_eh_frame_cie,
and plt_eh_frame_fde.
(Output_data_plt_x86_64::init): Call add_eh_frame_for_plt if
appropriate.
2011-07-02 06:05:01 +08:00
|
|
|
static const unsigned char exec_plt_entry[plt_entry_size];
|
2010-08-20 06:50:16 +08:00
|
|
|
|
|
|
|
// Other entries in the PLT for a shared object.
|
PR gold/12571
* options.h (class General_options): Add
--ld-generated-unwind-info.
* ehframe.cc (Fde::write): Add address parameter. Change all
callers. If associated with PLT, fill in address and size.
(Cie::set_output_offset): Only add merge mapping if there is an
object.
(Cie::write): Add address parameter. Change all callers.
(Eh_frame::add_ehframe_for_plt): New function.
* ehframe.h (class Fde): Update declarations. Move shndx_ and
input_offset_ fields into union u_, with new plt field.
(Fde::Fde): Adjust for new union field.
(Fde::Fde) [Output_data version]: New constructor.
(Fde::add_mapping): Only add merge mapping if there is an object.
(class Cie): Update declarations.
(class Eh_frame): Declare add_ehframe_for_plt.
* layout.cc (Layout::layout_eh_frame): Break out code into
make_eh_frame_section, and call it.
(Layout::make_eh_frame_section): New function.
(Layout::add_eh_frame_for_plt): New function.
* layout.h (class Layout): Update declarations.
* merge.cc (Merge_map::add_mapping): Add assertion.
* i386.cc: Include "dwarf.h".
(class Output_data_plt_i386): Make first_plt_entry,
dyn_first_plt_entry, exec_plt_entry, and dyn_plt_entry const. Add
plt_eh_frame_cie_size, plt_eh_frame_fde_size, plt_eh_frame_cie,
and plt_eh_frame_fde.
(Output_data_plt_i386::Output_data_plt_i386): Align to 16-byte
boundary. Call add_eh_frame_for_plt if appropriate.
* x86_64.cc: Include "dwarf.h".
(class Output_data_plt_x86_64): Align to 16-byte boundary. Make
first_plt_entry, plt_entry and tlsdesc_plt_entry const. Add
plt_eh_frame_cie_size, plt_eh_frame_fde_size, plt_eh_frame_cie,
and plt_eh_frame_fde.
(Output_data_plt_x86_64::init): Call add_eh_frame_for_plt if
appropriate.
2011-07-02 06:05:01 +08:00
|
|
|
static const unsigned char dyn_plt_entry[plt_entry_size];
|
|
|
|
|
|
|
|
// The .eh_frame unwind information for the PLT.
|
|
|
|
static const int plt_eh_frame_cie_size = 16;
|
|
|
|
static const int plt_eh_frame_fde_size = 32;
|
|
|
|
static const unsigned char plt_eh_frame_cie[plt_eh_frame_cie_size];
|
|
|
|
static const unsigned char plt_eh_frame_fde[plt_eh_frame_fde_size];
|
2010-08-20 06:50:16 +08:00
|
|
|
|
|
|
|
// Set the final size.
|
|
|
|
void
|
|
|
|
set_final_data_size()
|
PR gold/12372
* target.h (Target::plt_address_for_global): New function.
(Target::plt_address_for_local): New function.
(Target::plt_section_for_global): Remove.
(Target::plt_section_for_local): Remove.
(Target::do_plt_address_for_global): New virtual function.
(Target::do_plt_address_for_local): New virtual function.
(Target::do_plt_section_for_global): Remove.
(Target::do_plt_section_for_local): Remove.
(Target::register_global_plt_entry): Add Symbol_table and Layout
parameters.
* output.cc (Output_data_got::Got_entry::write): Use
plt_address_for_global and plt_address_for_local.
* layout.cc (Layout::add_target_dynamic_tags): Use size and
address of output section.
* i386.cc (class Output_data_plt_i386): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_i386::has_irelative_section): New function.
(Output_data_plt_i386::entry_count): Add irelative_count_.
(Output_data_plt_i386::set_final_data_size): Likewise.
(class Target_i386): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_i386::Target_i386): Initialize new fields.
(Target_i386::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_i386::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_i386::got_section): Create got_irelative_.
(Target_i386::rel_irelative_section): New function.
(Output_data_plt_i386::Output_data_plt_i386): Initialize new
fields. Don't define __rel_iplt_{start,end}.
(Output_data_plt_i386::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_i386::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_i386::rel_tls_desc): Fix formatting.
(Output_data_plt_i386::rel_irelative): New function.
(Output_data_plt_i386::address_for_global): New function.
(Output_data_plt_i386::address_for_local): New function.
(Output_data_plt_i386::do_write): Write out IRELATIVE area. Use
IRELATIVE GOT when changing IFUNC GOT entries.
(Target_i386::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_i386::do_finalize_sections): Create the __rel_iplt symbols
if we didn't create an IRELATIVE GOT.
(Target_i386::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_i386::do_dynsym_value): Use plt_address_for_global.
* x86_64.cc (class Output_data_plt_x86_64): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_x86_64::Output_data_plt_x86_64) [both versions]:
Initialize new fields. Remove symtab parameter. Change all
callers.
(Output_data_plt_x86_64::get_tlsdesc_plt_offset): Add
irelative_count_.
(Output_data_plt_x86_64::has_irelative_section): New function.
(Output_data_plt_x86_64::entry_count): Add irelative_count_.
(class Target_x86_64): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_x86_64::Target_x86_64): Initialize new fields.
(Target_x86_64::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_x86_64::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_x86_64::got_section): Create got_irelative_.
(Target_x86_64::rela_irelative_section): New function.
(Output_data_plt_x86_64::init): Remove symtab parameter. Change
all callers. Don't create __rel_iplt_{start,end}.
(Output_data_plt_x86_64::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_x86_64::add_relocation): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::rela_tlsdesc): Fix formatting.
(Output_data_plt_x86_64::rela_irelative): New function.
(Output_data_plt_x86_64::address_for_global): New function.
(Output_data_plt_x86_64::address_for_local): New function.
(Output_data_plt_x86_64::set_final_data_size): Likewise.
(Output_data_plt_x86_64::do_write): Write out IRELATIVE area.
(Target_x86_64::init_got_plt_for_update): Create got_irelative_.
(Target_x86_64::register_global_plt_entry): Add symtab and layout
parameters.
(Target_x86_64::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_x86_64::do_finalize_sections): Create the __rela_iplt
symbols if we didn't create an IRELATIVE GOT.
(Target_x86_64::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_x86_64::do_dynsym_value): Use plt_address_for_global.
* testsuite/ifuncvar1.c: New test file.
* testsuite/ifuncvar2.c: New test file.
* testsuite/ifuncvar3.c: New test file.
* testsuite/Makefile.am (check_PROGRAMS): Add ifuncvar.
(ifuncvar1_pic.o, ifuncvar2_pic.o, ifuncvar.so): New targets.
(ifuncvar_SOURCES, ifuncvar_DEPENDENCIES): New variables.
(ifuncvar_LDFLAGS, ifuncvar_LDADD): New variables.
* testsuite/Makefile.in: Rebuild.
2011-07-09 06:48:08 +08:00
|
|
|
{
|
|
|
|
this->set_data_size((this->count_ + this->irelative_count_ + 1)
|
|
|
|
* plt_entry_size);
|
|
|
|
}
|
2010-08-20 06:50:16 +08:00
|
|
|
|
|
|
|
// Write out the PLT data.
|
|
|
|
void
|
|
|
|
do_write(Output_file*);
|
|
|
|
|
|
|
|
// We keep a list of global STT_GNU_IFUNC symbols, each with its
|
|
|
|
// offset in the GOT.
|
|
|
|
struct Global_ifunc
|
|
|
|
{
|
|
|
|
Symbol* sym;
|
|
|
|
unsigned int got_offset;
|
|
|
|
};
|
|
|
|
|
|
|
|
// We keep a list of local STT_GNU_IFUNC symbols, each with its
|
|
|
|
// offset in the GOT.
|
|
|
|
struct Local_ifunc
|
|
|
|
{
|
2011-05-25 05:41:10 +08:00
|
|
|
Sized_relobj_file<32, false>* object;
|
2010-08-20 06:50:16 +08:00
|
|
|
unsigned int local_sym_index;
|
|
|
|
unsigned int got_offset;
|
|
|
|
};
|
|
|
|
|
|
|
|
// The reloc section.
|
|
|
|
Reloc_section* rel_;
|
|
|
|
// The TLS_DESC relocations, if necessary. These must follow the
|
|
|
|
// regular PLT relocs.
|
|
|
|
Reloc_section* tls_desc_rel_;
|
PR gold/12372
* target.h (Target::plt_address_for_global): New function.
(Target::plt_address_for_local): New function.
(Target::plt_section_for_global): Remove.
(Target::plt_section_for_local): Remove.
(Target::do_plt_address_for_global): New virtual function.
(Target::do_plt_address_for_local): New virtual function.
(Target::do_plt_section_for_global): Remove.
(Target::do_plt_section_for_local): Remove.
(Target::register_global_plt_entry): Add Symbol_table and Layout
parameters.
* output.cc (Output_data_got::Got_entry::write): Use
plt_address_for_global and plt_address_for_local.
* layout.cc (Layout::add_target_dynamic_tags): Use size and
address of output section.
* i386.cc (class Output_data_plt_i386): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_i386::has_irelative_section): New function.
(Output_data_plt_i386::entry_count): Add irelative_count_.
(Output_data_plt_i386::set_final_data_size): Likewise.
(class Target_i386): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_i386::Target_i386): Initialize new fields.
(Target_i386::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_i386::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_i386::got_section): Create got_irelative_.
(Target_i386::rel_irelative_section): New function.
(Output_data_plt_i386::Output_data_plt_i386): Initialize new
fields. Don't define __rel_iplt_{start,end}.
(Output_data_plt_i386::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_i386::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_i386::rel_tls_desc): Fix formatting.
(Output_data_plt_i386::rel_irelative): New function.
(Output_data_plt_i386::address_for_global): New function.
(Output_data_plt_i386::address_for_local): New function.
(Output_data_plt_i386::do_write): Write out IRELATIVE area. Use
IRELATIVE GOT when changing IFUNC GOT entries.
(Target_i386::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_i386::do_finalize_sections): Create the __rel_iplt symbols
if we didn't create an IRELATIVE GOT.
(Target_i386::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_i386::do_dynsym_value): Use plt_address_for_global.
* x86_64.cc (class Output_data_plt_x86_64): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_x86_64::Output_data_plt_x86_64) [both versions]:
Initialize new fields. Remove symtab parameter. Change all
callers.
(Output_data_plt_x86_64::get_tlsdesc_plt_offset): Add
irelative_count_.
(Output_data_plt_x86_64::has_irelative_section): New function.
(Output_data_plt_x86_64::entry_count): Add irelative_count_.
(class Target_x86_64): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_x86_64::Target_x86_64): Initialize new fields.
(Target_x86_64::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_x86_64::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_x86_64::got_section): Create got_irelative_.
(Target_x86_64::rela_irelative_section): New function.
(Output_data_plt_x86_64::init): Remove symtab parameter. Change
all callers. Don't create __rel_iplt_{start,end}.
(Output_data_plt_x86_64::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_x86_64::add_relocation): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::rela_tlsdesc): Fix formatting.
(Output_data_plt_x86_64::rela_irelative): New function.
(Output_data_plt_x86_64::address_for_global): New function.
(Output_data_plt_x86_64::address_for_local): New function.
(Output_data_plt_x86_64::set_final_data_size): Likewise.
(Output_data_plt_x86_64::do_write): Write out IRELATIVE area.
(Target_x86_64::init_got_plt_for_update): Create got_irelative_.
(Target_x86_64::register_global_plt_entry): Add symtab and layout
parameters.
(Target_x86_64::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_x86_64::do_finalize_sections): Create the __rela_iplt
symbols if we didn't create an IRELATIVE GOT.
(Target_x86_64::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_x86_64::do_dynsym_value): Use plt_address_for_global.
* testsuite/ifuncvar1.c: New test file.
* testsuite/ifuncvar2.c: New test file.
* testsuite/ifuncvar3.c: New test file.
* testsuite/Makefile.am (check_PROGRAMS): Add ifuncvar.
(ifuncvar1_pic.o, ifuncvar2_pic.o, ifuncvar.so): New targets.
(ifuncvar_SOURCES, ifuncvar_DEPENDENCIES): New variables.
(ifuncvar_LDFLAGS, ifuncvar_LDADD): New variables.
* testsuite/Makefile.in: Rebuild.
2011-07-09 06:48:08 +08:00
|
|
|
// The IRELATIVE relocations, if necessary. These must follow the
|
|
|
|
// regular relocatoins and the TLS_DESC relocations.
|
|
|
|
Reloc_section* irelative_rel_;
|
2010-08-20 06:50:16 +08:00
|
|
|
// The .got.plt section.
|
|
|
|
Output_data_space* got_plt_;
|
PR gold/12372
* target.h (Target::plt_address_for_global): New function.
(Target::plt_address_for_local): New function.
(Target::plt_section_for_global): Remove.
(Target::plt_section_for_local): Remove.
(Target::do_plt_address_for_global): New virtual function.
(Target::do_plt_address_for_local): New virtual function.
(Target::do_plt_section_for_global): Remove.
(Target::do_plt_section_for_local): Remove.
(Target::register_global_plt_entry): Add Symbol_table and Layout
parameters.
* output.cc (Output_data_got::Got_entry::write): Use
plt_address_for_global and plt_address_for_local.
* layout.cc (Layout::add_target_dynamic_tags): Use size and
address of output section.
* i386.cc (class Output_data_plt_i386): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_i386::has_irelative_section): New function.
(Output_data_plt_i386::entry_count): Add irelative_count_.
(Output_data_plt_i386::set_final_data_size): Likewise.
(class Target_i386): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_i386::Target_i386): Initialize new fields.
(Target_i386::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_i386::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_i386::got_section): Create got_irelative_.
(Target_i386::rel_irelative_section): New function.
(Output_data_plt_i386::Output_data_plt_i386): Initialize new
fields. Don't define __rel_iplt_{start,end}.
(Output_data_plt_i386::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_i386::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_i386::rel_tls_desc): Fix formatting.
(Output_data_plt_i386::rel_irelative): New function.
(Output_data_plt_i386::address_for_global): New function.
(Output_data_plt_i386::address_for_local): New function.
(Output_data_plt_i386::do_write): Write out IRELATIVE area. Use
IRELATIVE GOT when changing IFUNC GOT entries.
(Target_i386::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_i386::do_finalize_sections): Create the __rel_iplt symbols
if we didn't create an IRELATIVE GOT.
(Target_i386::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_i386::do_dynsym_value): Use plt_address_for_global.
* x86_64.cc (class Output_data_plt_x86_64): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_x86_64::Output_data_plt_x86_64) [both versions]:
Initialize new fields. Remove symtab parameter. Change all
callers.
(Output_data_plt_x86_64::get_tlsdesc_plt_offset): Add
irelative_count_.
(Output_data_plt_x86_64::has_irelative_section): New function.
(Output_data_plt_x86_64::entry_count): Add irelative_count_.
(class Target_x86_64): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_x86_64::Target_x86_64): Initialize new fields.
(Target_x86_64::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_x86_64::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_x86_64::got_section): Create got_irelative_.
(Target_x86_64::rela_irelative_section): New function.
(Output_data_plt_x86_64::init): Remove symtab parameter. Change
all callers. Don't create __rel_iplt_{start,end}.
(Output_data_plt_x86_64::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_x86_64::add_relocation): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::rela_tlsdesc): Fix formatting.
(Output_data_plt_x86_64::rela_irelative): New function.
(Output_data_plt_x86_64::address_for_global): New function.
(Output_data_plt_x86_64::address_for_local): New function.
(Output_data_plt_x86_64::set_final_data_size): Likewise.
(Output_data_plt_x86_64::do_write): Write out IRELATIVE area.
(Target_x86_64::init_got_plt_for_update): Create got_irelative_.
(Target_x86_64::register_global_plt_entry): Add symtab and layout
parameters.
(Target_x86_64::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_x86_64::do_finalize_sections): Create the __rela_iplt
symbols if we didn't create an IRELATIVE GOT.
(Target_x86_64::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_x86_64::do_dynsym_value): Use plt_address_for_global.
* testsuite/ifuncvar1.c: New test file.
* testsuite/ifuncvar2.c: New test file.
* testsuite/ifuncvar3.c: New test file.
* testsuite/Makefile.am (check_PROGRAMS): Add ifuncvar.
(ifuncvar1_pic.o, ifuncvar2_pic.o, ifuncvar.so): New targets.
(ifuncvar_SOURCES, ifuncvar_DEPENDENCIES): New variables.
(ifuncvar_LDFLAGS, ifuncvar_LDADD): New variables.
* testsuite/Makefile.in: Rebuild.
2011-07-09 06:48:08 +08:00
|
|
|
// The part of the .got.plt section used for IRELATIVE relocs.
|
|
|
|
Output_data_space* got_irelative_;
|
2010-08-20 06:50:16 +08:00
|
|
|
// The number of PLT entries.
|
|
|
|
unsigned int count_;
|
PR gold/12372
* target.h (Target::plt_address_for_global): New function.
(Target::plt_address_for_local): New function.
(Target::plt_section_for_global): Remove.
(Target::plt_section_for_local): Remove.
(Target::do_plt_address_for_global): New virtual function.
(Target::do_plt_address_for_local): New virtual function.
(Target::do_plt_section_for_global): Remove.
(Target::do_plt_section_for_local): Remove.
(Target::register_global_plt_entry): Add Symbol_table and Layout
parameters.
* output.cc (Output_data_got::Got_entry::write): Use
plt_address_for_global and plt_address_for_local.
* layout.cc (Layout::add_target_dynamic_tags): Use size and
address of output section.
* i386.cc (class Output_data_plt_i386): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_i386::has_irelative_section): New function.
(Output_data_plt_i386::entry_count): Add irelative_count_.
(Output_data_plt_i386::set_final_data_size): Likewise.
(class Target_i386): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_i386::Target_i386): Initialize new fields.
(Target_i386::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_i386::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_i386::got_section): Create got_irelative_.
(Target_i386::rel_irelative_section): New function.
(Output_data_plt_i386::Output_data_plt_i386): Initialize new
fields. Don't define __rel_iplt_{start,end}.
(Output_data_plt_i386::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_i386::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_i386::rel_tls_desc): Fix formatting.
(Output_data_plt_i386::rel_irelative): New function.
(Output_data_plt_i386::address_for_global): New function.
(Output_data_plt_i386::address_for_local): New function.
(Output_data_plt_i386::do_write): Write out IRELATIVE area. Use
IRELATIVE GOT when changing IFUNC GOT entries.
(Target_i386::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_i386::do_finalize_sections): Create the __rel_iplt symbols
if we didn't create an IRELATIVE GOT.
(Target_i386::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_i386::do_dynsym_value): Use plt_address_for_global.
* x86_64.cc (class Output_data_plt_x86_64): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_x86_64::Output_data_plt_x86_64) [both versions]:
Initialize new fields. Remove symtab parameter. Change all
callers.
(Output_data_plt_x86_64::get_tlsdesc_plt_offset): Add
irelative_count_.
(Output_data_plt_x86_64::has_irelative_section): New function.
(Output_data_plt_x86_64::entry_count): Add irelative_count_.
(class Target_x86_64): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_x86_64::Target_x86_64): Initialize new fields.
(Target_x86_64::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_x86_64::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_x86_64::got_section): Create got_irelative_.
(Target_x86_64::rela_irelative_section): New function.
(Output_data_plt_x86_64::init): Remove symtab parameter. Change
all callers. Don't create __rel_iplt_{start,end}.
(Output_data_plt_x86_64::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_x86_64::add_relocation): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::rela_tlsdesc): Fix formatting.
(Output_data_plt_x86_64::rela_irelative): New function.
(Output_data_plt_x86_64::address_for_global): New function.
(Output_data_plt_x86_64::address_for_local): New function.
(Output_data_plt_x86_64::set_final_data_size): Likewise.
(Output_data_plt_x86_64::do_write): Write out IRELATIVE area.
(Target_x86_64::init_got_plt_for_update): Create got_irelative_.
(Target_x86_64::register_global_plt_entry): Add symtab and layout
parameters.
(Target_x86_64::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_x86_64::do_finalize_sections): Create the __rela_iplt
symbols if we didn't create an IRELATIVE GOT.
(Target_x86_64::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_x86_64::do_dynsym_value): Use plt_address_for_global.
* testsuite/ifuncvar1.c: New test file.
* testsuite/ifuncvar2.c: New test file.
* testsuite/ifuncvar3.c: New test file.
* testsuite/Makefile.am (check_PROGRAMS): Add ifuncvar.
(ifuncvar1_pic.o, ifuncvar2_pic.o, ifuncvar.so): New targets.
(ifuncvar_SOURCES, ifuncvar_DEPENDENCIES): New variables.
(ifuncvar_LDFLAGS, ifuncvar_LDADD): New variables.
* testsuite/Makefile.in: Rebuild.
2011-07-09 06:48:08 +08:00
|
|
|
// Number of PLT entries with R_386_IRELATIVE relocs. These follow
|
|
|
|
// the regular PLT entries.
|
|
|
|
unsigned int irelative_count_;
|
2010-08-20 06:50:16 +08:00
|
|
|
// Global STT_GNU_IFUNC symbols.
|
|
|
|
std::vector<Global_ifunc> global_ifuncs_;
|
|
|
|
// Local STT_GNU_IFUNC symbols.
|
|
|
|
std::vector<Local_ifunc> local_ifuncs_;
|
|
|
|
};
|
2006-11-30 01:56:40 +08:00
|
|
|
|
2006-08-19 06:29:20 +08:00
|
|
|
// The i386 target class.
|
2007-10-13 08:15:07 +08:00
|
|
|
// TLS info comes from
|
|
|
|
// http://people.redhat.com/drepper/tls.pdf
|
|
|
|
// http://www.lsd.ic.unicamp.br/~oliva/writeups/TLS/RFC-TLSDESC-x86.txt
|
2006-08-19 06:29:20 +08:00
|
|
|
|
2011-06-29 06:25:14 +08:00
|
|
|
class Target_i386 : public Sized_target<32, false>
|
2006-08-19 06:29:20 +08:00
|
|
|
{
|
|
|
|
public:
|
2006-12-01 07:52:50 +08:00
|
|
|
typedef Output_data_reloc<elfcpp::SHT_REL, true, 32, false> Reloc_section;
|
|
|
|
|
2006-08-19 06:29:20 +08:00
|
|
|
Target_i386()
|
2011-06-29 06:25:14 +08:00
|
|
|
: Sized_target<32, false>(&i386_info),
|
PR gold/12372
* target.h (Target::plt_address_for_global): New function.
(Target::plt_address_for_local): New function.
(Target::plt_section_for_global): Remove.
(Target::plt_section_for_local): Remove.
(Target::do_plt_address_for_global): New virtual function.
(Target::do_plt_address_for_local): New virtual function.
(Target::do_plt_section_for_global): Remove.
(Target::do_plt_section_for_local): Remove.
(Target::register_global_plt_entry): Add Symbol_table and Layout
parameters.
* output.cc (Output_data_got::Got_entry::write): Use
plt_address_for_global and plt_address_for_local.
* layout.cc (Layout::add_target_dynamic_tags): Use size and
address of output section.
* i386.cc (class Output_data_plt_i386): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_i386::has_irelative_section): New function.
(Output_data_plt_i386::entry_count): Add irelative_count_.
(Output_data_plt_i386::set_final_data_size): Likewise.
(class Target_i386): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_i386::Target_i386): Initialize new fields.
(Target_i386::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_i386::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_i386::got_section): Create got_irelative_.
(Target_i386::rel_irelative_section): New function.
(Output_data_plt_i386::Output_data_plt_i386): Initialize new
fields. Don't define __rel_iplt_{start,end}.
(Output_data_plt_i386::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_i386::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_i386::rel_tls_desc): Fix formatting.
(Output_data_plt_i386::rel_irelative): New function.
(Output_data_plt_i386::address_for_global): New function.
(Output_data_plt_i386::address_for_local): New function.
(Output_data_plt_i386::do_write): Write out IRELATIVE area. Use
IRELATIVE GOT when changing IFUNC GOT entries.
(Target_i386::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_i386::do_finalize_sections): Create the __rel_iplt symbols
if we didn't create an IRELATIVE GOT.
(Target_i386::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_i386::do_dynsym_value): Use plt_address_for_global.
* x86_64.cc (class Output_data_plt_x86_64): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_x86_64::Output_data_plt_x86_64) [both versions]:
Initialize new fields. Remove symtab parameter. Change all
callers.
(Output_data_plt_x86_64::get_tlsdesc_plt_offset): Add
irelative_count_.
(Output_data_plt_x86_64::has_irelative_section): New function.
(Output_data_plt_x86_64::entry_count): Add irelative_count_.
(class Target_x86_64): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_x86_64::Target_x86_64): Initialize new fields.
(Target_x86_64::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_x86_64::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_x86_64::got_section): Create got_irelative_.
(Target_x86_64::rela_irelative_section): New function.
(Output_data_plt_x86_64::init): Remove symtab parameter. Change
all callers. Don't create __rel_iplt_{start,end}.
(Output_data_plt_x86_64::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_x86_64::add_relocation): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::rela_tlsdesc): Fix formatting.
(Output_data_plt_x86_64::rela_irelative): New function.
(Output_data_plt_x86_64::address_for_global): New function.
(Output_data_plt_x86_64::address_for_local): New function.
(Output_data_plt_x86_64::set_final_data_size): Likewise.
(Output_data_plt_x86_64::do_write): Write out IRELATIVE area.
(Target_x86_64::init_got_plt_for_update): Create got_irelative_.
(Target_x86_64::register_global_plt_entry): Add symtab and layout
parameters.
(Target_x86_64::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_x86_64::do_finalize_sections): Create the __rela_iplt
symbols if we didn't create an IRELATIVE GOT.
(Target_x86_64::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_x86_64::do_dynsym_value): Use plt_address_for_global.
* testsuite/ifuncvar1.c: New test file.
* testsuite/ifuncvar2.c: New test file.
* testsuite/ifuncvar3.c: New test file.
* testsuite/Makefile.am (check_PROGRAMS): Add ifuncvar.
(ifuncvar1_pic.o, ifuncvar2_pic.o, ifuncvar.so): New targets.
(ifuncvar_SOURCES, ifuncvar_DEPENDENCIES): New variables.
(ifuncvar_LDFLAGS, ifuncvar_LDADD): New variables.
* testsuite/Makefile.in: Rebuild.
2011-07-09 06:48:08 +08:00
|
|
|
got_(NULL), plt_(NULL), got_plt_(NULL), got_irelative_(NULL),
|
|
|
|
got_tlsdesc_(NULL), global_offset_table_(NULL), rel_dyn_(NULL),
|
|
|
|
rel_irelative_(NULL), copy_relocs_(elfcpp::R_386_COPY), dynbss_(NULL),
|
2008-04-17 10:00:54 +08:00
|
|
|
got_mod_index_offset_(-1U), tls_base_symbol_defined_(false)
|
2006-08-19 06:29:20 +08:00
|
|
|
{ }
|
2006-09-28 06:53:42 +08:00
|
|
|
|
2009-01-28 10:25:33 +08:00
|
|
|
// Process the relocations to determine unreferenced sections for
|
|
|
|
// garbage collection.
|
|
|
|
void
|
* object.h (class Relobj): Drop options parameter from
gc_process_relocs, scan_relocs, relocate, do_gc_process_relocs,
do_scan_relocs, do_relocate. Change all callers.
(class Sized_relobj): Drop options parameters from
do_gc_process_relocs, do_scan_relocs, do_relocate,
do_relocate_sections, relocate_sections, emit_relocs_scan,
emit_relocs_scan_reltype. Change all callers.
(struct Relocate_info): Remove options field and all references to
it.
* reloc.h (class Read_relocs): Remove options constructor
parameter and options_ field. Change all callers.
(class Gc_process_relocs, class Scan_relocs): Likewise.
(class Relocate_task): Likewise.
* target-reloc.h (scan_relocs): Remove options parameter. Change
all callers.
(scan_relocatable_relocs): Likewise.
* target.h (class Sized_target): Remove options parameter from
gc_process_relocs, scan_relocs, scan_relocatable_relocs. Change
all callers.
* gc.h (gc_process_relocs): Remove options parameter. Change all
callers.
* arm.cc: Update functions to remove options parameters.
* i386.cc: Likewise.
* powerpc.cc: Likewise.
* sparc.cc: Likewise.
* x86_64.cc: Likewise.
* testsuite/testfile.cc: Likewise.
2009-10-29 13:16:23 +08:00
|
|
|
gc_process_relocs(Symbol_table* symtab,
|
2009-01-28 10:25:33 +08:00
|
|
|
Layout* layout,
|
2011-05-25 05:41:10 +08:00
|
|
|
Sized_relobj_file<32, false>* object,
|
2009-01-28 10:25:33 +08:00
|
|
|
unsigned int data_shndx,
|
|
|
|
unsigned int sh_type,
|
|
|
|
const unsigned char* prelocs,
|
|
|
|
size_t reloc_count,
|
|
|
|
Output_section* output_section,
|
|
|
|
bool needs_special_offset_handling,
|
|
|
|
size_t local_symbol_count,
|
|
|
|
const unsigned char* plocal_symbols);
|
|
|
|
|
2006-10-21 04:40:49 +08:00
|
|
|
// Scan the relocations to look for symbol adjustments.
|
2006-09-30 03:58:17 +08:00
|
|
|
void
|
* object.h (class Relobj): Drop options parameter from
gc_process_relocs, scan_relocs, relocate, do_gc_process_relocs,
do_scan_relocs, do_relocate. Change all callers.
(class Sized_relobj): Drop options parameters from
do_gc_process_relocs, do_scan_relocs, do_relocate,
do_relocate_sections, relocate_sections, emit_relocs_scan,
emit_relocs_scan_reltype. Change all callers.
(struct Relocate_info): Remove options field and all references to
it.
* reloc.h (class Read_relocs): Remove options constructor
parameter and options_ field. Change all callers.
(class Gc_process_relocs, class Scan_relocs): Likewise.
(class Relocate_task): Likewise.
* target-reloc.h (scan_relocs): Remove options parameter. Change
all callers.
(scan_relocatable_relocs): Likewise.
* target.h (class Sized_target): Remove options parameter from
gc_process_relocs, scan_relocs, scan_relocatable_relocs. Change
all callers.
* gc.h (gc_process_relocs): Remove options parameter. Change all
callers.
* arm.cc: Update functions to remove options parameters.
* i386.cc: Likewise.
* powerpc.cc: Likewise.
* sparc.cc: Likewise.
* x86_64.cc: Likewise.
* testsuite/testfile.cc: Likewise.
2009-10-29 13:16:23 +08:00
|
|
|
scan_relocs(Symbol_table* symtab,
|
2006-11-04 02:26:11 +08:00
|
|
|
Layout* layout,
|
2011-05-25 05:41:10 +08:00
|
|
|
Sized_relobj_file<32, false>* object,
|
2006-11-30 01:56:40 +08:00
|
|
|
unsigned int data_shndx,
|
2006-10-21 04:40:49 +08:00
|
|
|
unsigned int sh_type,
|
|
|
|
const unsigned char* prelocs,
|
|
|
|
size_t reloc_count,
|
2007-11-09 15:00:15 +08:00
|
|
|
Output_section* output_section,
|
|
|
|
bool needs_special_offset_handling,
|
2006-10-21 04:40:49 +08:00
|
|
|
size_t local_symbol_count,
|
2007-11-09 15:00:15 +08:00
|
|
|
const unsigned char* plocal_symbols);
|
2006-09-30 03:58:17 +08:00
|
|
|
|
2006-12-01 07:52:50 +08:00
|
|
|
// Finalize the sections.
|
|
|
|
void
|
2009-12-04 07:13:55 +08:00
|
|
|
do_finalize_sections(Layout*, const Input_objects*, Symbol_table*);
|
2006-12-01 07:52:50 +08:00
|
|
|
|
2007-09-23 13:31:48 +08:00
|
|
|
// Return the value to use for a dynamic which requires special
|
|
|
|
// treatment.
|
|
|
|
uint64_t
|
|
|
|
do_dynsym_value(const Symbol*) const;
|
|
|
|
|
2006-10-21 04:40:49 +08:00
|
|
|
// Relocate a section.
|
|
|
|
void
|
|
|
|
relocate_section(const Relocate_info<32, false>*,
|
|
|
|
unsigned int sh_type,
|
|
|
|
const unsigned char* prelocs,
|
|
|
|
size_t reloc_count,
|
2007-11-09 15:00:15 +08:00
|
|
|
Output_section* output_section,
|
|
|
|
bool needs_special_offset_handling,
|
2006-10-21 04:40:49 +08:00
|
|
|
unsigned char* view,
|
|
|
|
elfcpp::Elf_types<32>::Elf_Addr view_address,
|
2009-10-07 06:58:27 +08:00
|
|
|
section_size_type view_size,
|
|
|
|
const Reloc_symbol_changes*);
|
2006-10-21 04:40:49 +08:00
|
|
|
|
2008-02-06 16:13:50 +08:00
|
|
|
// Scan the relocs during a relocatable link.
|
|
|
|
void
|
* object.h (class Relobj): Drop options parameter from
gc_process_relocs, scan_relocs, relocate, do_gc_process_relocs,
do_scan_relocs, do_relocate. Change all callers.
(class Sized_relobj): Drop options parameters from
do_gc_process_relocs, do_scan_relocs, do_relocate,
do_relocate_sections, relocate_sections, emit_relocs_scan,
emit_relocs_scan_reltype. Change all callers.
(struct Relocate_info): Remove options field and all references to
it.
* reloc.h (class Read_relocs): Remove options constructor
parameter and options_ field. Change all callers.
(class Gc_process_relocs, class Scan_relocs): Likewise.
(class Relocate_task): Likewise.
* target-reloc.h (scan_relocs): Remove options parameter. Change
all callers.
(scan_relocatable_relocs): Likewise.
* target.h (class Sized_target): Remove options parameter from
gc_process_relocs, scan_relocs, scan_relocatable_relocs. Change
all callers.
* gc.h (gc_process_relocs): Remove options parameter. Change all
callers.
* arm.cc: Update functions to remove options parameters.
* i386.cc: Likewise.
* powerpc.cc: Likewise.
* sparc.cc: Likewise.
* x86_64.cc: Likewise.
* testsuite/testfile.cc: Likewise.
2009-10-29 13:16:23 +08:00
|
|
|
scan_relocatable_relocs(Symbol_table* symtab,
|
2008-02-06 16:13:50 +08:00
|
|
|
Layout* layout,
|
2011-05-25 05:41:10 +08:00
|
|
|
Sized_relobj_file<32, false>* object,
|
2008-02-06 16:13:50 +08:00
|
|
|
unsigned int data_shndx,
|
|
|
|
unsigned int sh_type,
|
|
|
|
const unsigned char* prelocs,
|
|
|
|
size_t reloc_count,
|
|
|
|
Output_section* output_section,
|
|
|
|
bool needs_special_offset_handling,
|
|
|
|
size_t local_symbol_count,
|
|
|
|
const unsigned char* plocal_symbols,
|
|
|
|
Relocatable_relocs*);
|
|
|
|
|
|
|
|
// Relocate a section during a relocatable link.
|
|
|
|
void
|
|
|
|
relocate_for_relocatable(const Relocate_info<32, false>*,
|
|
|
|
unsigned int sh_type,
|
|
|
|
const unsigned char* prelocs,
|
|
|
|
size_t reloc_count,
|
|
|
|
Output_section* output_section,
|
|
|
|
off_t offset_in_output_section,
|
|
|
|
const Relocatable_relocs*,
|
|
|
|
unsigned char* view,
|
|
|
|
elfcpp::Elf_types<32>::Elf_Addr view_address,
|
|
|
|
section_size_type view_size,
|
|
|
|
unsigned char* reloc_view,
|
|
|
|
section_size_type reloc_view_size);
|
|
|
|
|
2007-09-21 13:31:19 +08:00
|
|
|
// Return a string used to fill a code section with nops.
|
|
|
|
std::string
|
2008-02-28 08:18:24 +08:00
|
|
|
do_code_fill(section_size_type length) const;
|
2007-09-21 13:31:19 +08:00
|
|
|
|
2007-11-15 00:53:25 +08:00
|
|
|
// Return whether SYM is defined by the ABI.
|
|
|
|
bool
|
2008-09-17 01:23:37 +08:00
|
|
|
do_is_defined_by_abi(const Symbol* sym) const
|
2007-11-15 00:53:25 +08:00
|
|
|
{ return strcmp(sym->name(), "___tls_get_addr") == 0; }
|
|
|
|
|
2009-06-06 05:32:57 +08:00
|
|
|
// Return whether a symbol name implies a local label. The UnixWare
|
|
|
|
// 2.1 cc generates temporary symbols that start with .X, so we
|
|
|
|
// recognize them here. FIXME: do other SVR4 compilers also use .X?.
|
|
|
|
// If so, we should move the .X recognition into
|
|
|
|
// Target::do_is_local_label_name.
|
|
|
|
bool
|
|
|
|
do_is_local_label_name(const char* name) const
|
|
|
|
{
|
|
|
|
if (name[0] == '.' && name[1] == 'X')
|
|
|
|
return true;
|
|
|
|
return Target::do_is_local_label_name(name);
|
|
|
|
}
|
|
|
|
|
PR gold/12372
* target.h (Target::plt_address_for_global): New function.
(Target::plt_address_for_local): New function.
(Target::plt_section_for_global): Remove.
(Target::plt_section_for_local): Remove.
(Target::do_plt_address_for_global): New virtual function.
(Target::do_plt_address_for_local): New virtual function.
(Target::do_plt_section_for_global): Remove.
(Target::do_plt_section_for_local): Remove.
(Target::register_global_plt_entry): Add Symbol_table and Layout
parameters.
* output.cc (Output_data_got::Got_entry::write): Use
plt_address_for_global and plt_address_for_local.
* layout.cc (Layout::add_target_dynamic_tags): Use size and
address of output section.
* i386.cc (class Output_data_plt_i386): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_i386::has_irelative_section): New function.
(Output_data_plt_i386::entry_count): Add irelative_count_.
(Output_data_plt_i386::set_final_data_size): Likewise.
(class Target_i386): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_i386::Target_i386): Initialize new fields.
(Target_i386::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_i386::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_i386::got_section): Create got_irelative_.
(Target_i386::rel_irelative_section): New function.
(Output_data_plt_i386::Output_data_plt_i386): Initialize new
fields. Don't define __rel_iplt_{start,end}.
(Output_data_plt_i386::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_i386::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_i386::rel_tls_desc): Fix formatting.
(Output_data_plt_i386::rel_irelative): New function.
(Output_data_plt_i386::address_for_global): New function.
(Output_data_plt_i386::address_for_local): New function.
(Output_data_plt_i386::do_write): Write out IRELATIVE area. Use
IRELATIVE GOT when changing IFUNC GOT entries.
(Target_i386::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_i386::do_finalize_sections): Create the __rel_iplt symbols
if we didn't create an IRELATIVE GOT.
(Target_i386::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_i386::do_dynsym_value): Use plt_address_for_global.
* x86_64.cc (class Output_data_plt_x86_64): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_x86_64::Output_data_plt_x86_64) [both versions]:
Initialize new fields. Remove symtab parameter. Change all
callers.
(Output_data_plt_x86_64::get_tlsdesc_plt_offset): Add
irelative_count_.
(Output_data_plt_x86_64::has_irelative_section): New function.
(Output_data_plt_x86_64::entry_count): Add irelative_count_.
(class Target_x86_64): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_x86_64::Target_x86_64): Initialize new fields.
(Target_x86_64::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_x86_64::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_x86_64::got_section): Create got_irelative_.
(Target_x86_64::rela_irelative_section): New function.
(Output_data_plt_x86_64::init): Remove symtab parameter. Change
all callers. Don't create __rel_iplt_{start,end}.
(Output_data_plt_x86_64::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_x86_64::add_relocation): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::rela_tlsdesc): Fix formatting.
(Output_data_plt_x86_64::rela_irelative): New function.
(Output_data_plt_x86_64::address_for_global): New function.
(Output_data_plt_x86_64::address_for_local): New function.
(Output_data_plt_x86_64::set_final_data_size): Likewise.
(Output_data_plt_x86_64::do_write): Write out IRELATIVE area.
(Target_x86_64::init_got_plt_for_update): Create got_irelative_.
(Target_x86_64::register_global_plt_entry): Add symtab and layout
parameters.
(Target_x86_64::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_x86_64::do_finalize_sections): Create the __rela_iplt
symbols if we didn't create an IRELATIVE GOT.
(Target_x86_64::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_x86_64::do_dynsym_value): Use plt_address_for_global.
* testsuite/ifuncvar1.c: New test file.
* testsuite/ifuncvar2.c: New test file.
* testsuite/ifuncvar3.c: New test file.
* testsuite/Makefile.am (check_PROGRAMS): Add ifuncvar.
(ifuncvar1_pic.o, ifuncvar2_pic.o, ifuncvar.so): New targets.
(ifuncvar_SOURCES, ifuncvar_DEPENDENCIES): New variables.
(ifuncvar_LDFLAGS, ifuncvar_LDADD): New variables.
* testsuite/Makefile.in: Rebuild.
2011-07-09 06:48:08 +08:00
|
|
|
// Return the PLT address to use for a global symbol.
|
|
|
|
uint64_t
|
|
|
|
do_plt_address_for_global(const Symbol* gsym) const
|
|
|
|
{ return this->plt_section()->address_for_global(gsym); }
|
2010-08-20 06:50:16 +08:00
|
|
|
|
PR gold/12372
* target.h (Target::plt_address_for_global): New function.
(Target::plt_address_for_local): New function.
(Target::plt_section_for_global): Remove.
(Target::plt_section_for_local): Remove.
(Target::do_plt_address_for_global): New virtual function.
(Target::do_plt_address_for_local): New virtual function.
(Target::do_plt_section_for_global): Remove.
(Target::do_plt_section_for_local): Remove.
(Target::register_global_plt_entry): Add Symbol_table and Layout
parameters.
* output.cc (Output_data_got::Got_entry::write): Use
plt_address_for_global and plt_address_for_local.
* layout.cc (Layout::add_target_dynamic_tags): Use size and
address of output section.
* i386.cc (class Output_data_plt_i386): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_i386::has_irelative_section): New function.
(Output_data_plt_i386::entry_count): Add irelative_count_.
(Output_data_plt_i386::set_final_data_size): Likewise.
(class Target_i386): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_i386::Target_i386): Initialize new fields.
(Target_i386::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_i386::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_i386::got_section): Create got_irelative_.
(Target_i386::rel_irelative_section): New function.
(Output_data_plt_i386::Output_data_plt_i386): Initialize new
fields. Don't define __rel_iplt_{start,end}.
(Output_data_plt_i386::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_i386::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_i386::rel_tls_desc): Fix formatting.
(Output_data_plt_i386::rel_irelative): New function.
(Output_data_plt_i386::address_for_global): New function.
(Output_data_plt_i386::address_for_local): New function.
(Output_data_plt_i386::do_write): Write out IRELATIVE area. Use
IRELATIVE GOT when changing IFUNC GOT entries.
(Target_i386::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_i386::do_finalize_sections): Create the __rel_iplt symbols
if we didn't create an IRELATIVE GOT.
(Target_i386::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_i386::do_dynsym_value): Use plt_address_for_global.
* x86_64.cc (class Output_data_plt_x86_64): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_x86_64::Output_data_plt_x86_64) [both versions]:
Initialize new fields. Remove symtab parameter. Change all
callers.
(Output_data_plt_x86_64::get_tlsdesc_plt_offset): Add
irelative_count_.
(Output_data_plt_x86_64::has_irelative_section): New function.
(Output_data_plt_x86_64::entry_count): Add irelative_count_.
(class Target_x86_64): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_x86_64::Target_x86_64): Initialize new fields.
(Target_x86_64::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_x86_64::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_x86_64::got_section): Create got_irelative_.
(Target_x86_64::rela_irelative_section): New function.
(Output_data_plt_x86_64::init): Remove symtab parameter. Change
all callers. Don't create __rel_iplt_{start,end}.
(Output_data_plt_x86_64::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_x86_64::add_relocation): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::rela_tlsdesc): Fix formatting.
(Output_data_plt_x86_64::rela_irelative): New function.
(Output_data_plt_x86_64::address_for_global): New function.
(Output_data_plt_x86_64::address_for_local): New function.
(Output_data_plt_x86_64::set_final_data_size): Likewise.
(Output_data_plt_x86_64::do_write): Write out IRELATIVE area.
(Target_x86_64::init_got_plt_for_update): Create got_irelative_.
(Target_x86_64::register_global_plt_entry): Add symtab and layout
parameters.
(Target_x86_64::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_x86_64::do_finalize_sections): Create the __rela_iplt
symbols if we didn't create an IRELATIVE GOT.
(Target_x86_64::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_x86_64::do_dynsym_value): Use plt_address_for_global.
* testsuite/ifuncvar1.c: New test file.
* testsuite/ifuncvar2.c: New test file.
* testsuite/ifuncvar3.c: New test file.
* testsuite/Makefile.am (check_PROGRAMS): Add ifuncvar.
(ifuncvar1_pic.o, ifuncvar2_pic.o, ifuncvar.so): New targets.
(ifuncvar_SOURCES, ifuncvar_DEPENDENCIES): New variables.
(ifuncvar_LDFLAGS, ifuncvar_LDADD): New variables.
* testsuite/Makefile.in: Rebuild.
2011-07-09 06:48:08 +08:00
|
|
|
uint64_t
|
|
|
|
do_plt_address_for_local(const Relobj* relobj, unsigned int symndx) const
|
|
|
|
{ return this->plt_section()->address_for_local(relobj, symndx); }
|
2010-08-20 06:50:16 +08:00
|
|
|
|
2011-06-29 05:15:42 +08:00
|
|
|
// We can tell whether we take the address of a function.
|
|
|
|
inline bool
|
|
|
|
do_can_check_for_function_pointers() const
|
|
|
|
{ return true; }
|
|
|
|
|
2011-07-02 08:03:25 +08:00
|
|
|
// Return the base for a DW_EH_PE_datarel encoding.
|
|
|
|
uint64_t
|
|
|
|
do_ehframe_datarel_base() const;
|
|
|
|
|
2010-03-11 09:10:53 +08:00
|
|
|
// Return whether SYM is call to a non-split function.
|
|
|
|
bool
|
|
|
|
do_is_call_to_non_split(const Symbol* sym, unsigned int) const;
|
|
|
|
|
2010-12-15 03:03:30 +08:00
|
|
|
// Adjust -fsplit-stack code which calls non-split-stack code.
|
2009-10-07 06:58:27 +08:00
|
|
|
void
|
|
|
|
do_calls_non_split(Relobj* object, unsigned int shndx,
|
|
|
|
section_offset_type fnoffset, section_size_type fnsize,
|
|
|
|
unsigned char* view, section_size_type view_size,
|
|
|
|
std::string* from, std::string* to) const;
|
|
|
|
|
2007-11-01 08:19:30 +08:00
|
|
|
// Return the size of the GOT section.
|
2007-12-21 05:21:24 +08:00
|
|
|
section_size_type
|
2010-08-13 06:15:00 +08:00
|
|
|
got_size() const
|
2007-11-01 08:19:30 +08:00
|
|
|
{
|
|
|
|
gold_assert(this->got_ != NULL);
|
|
|
|
return this->got_->data_size();
|
|
|
|
}
|
|
|
|
|
2010-08-13 06:15:00 +08:00
|
|
|
// Return the number of entries in the GOT.
|
|
|
|
unsigned int
|
|
|
|
got_entry_count() const
|
|
|
|
{
|
|
|
|
if (this->got_ == NULL)
|
|
|
|
return 0;
|
|
|
|
return this->got_size() / 4;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Return the number of entries in the PLT.
|
|
|
|
unsigned int
|
|
|
|
plt_entry_count() const;
|
|
|
|
|
|
|
|
// Return the offset of the first non-reserved PLT entry.
|
|
|
|
unsigned int
|
|
|
|
first_plt_entry_offset() const;
|
|
|
|
|
|
|
|
// Return the size of each PLT entry.
|
|
|
|
unsigned int
|
|
|
|
plt_entry_size() const;
|
|
|
|
|
2006-10-21 04:40:49 +08:00
|
|
|
private:
|
|
|
|
// The class which scans relocations.
|
|
|
|
struct Scan
|
2006-09-30 03:58:17 +08:00
|
|
|
{
|
2010-11-11 18:43:30 +08:00
|
|
|
static inline int
|
|
|
|
|
|
|
|
get_reference_flags(unsigned int r_type);
|
|
|
|
|
2006-09-30 03:58:17 +08:00
|
|
|
inline void
|
* object.h (class Relobj): Drop options parameter from
gc_process_relocs, scan_relocs, relocate, do_gc_process_relocs,
do_scan_relocs, do_relocate. Change all callers.
(class Sized_relobj): Drop options parameters from
do_gc_process_relocs, do_scan_relocs, do_relocate,
do_relocate_sections, relocate_sections, emit_relocs_scan,
emit_relocs_scan_reltype. Change all callers.
(struct Relocate_info): Remove options field and all references to
it.
* reloc.h (class Read_relocs): Remove options constructor
parameter and options_ field. Change all callers.
(class Gc_process_relocs, class Scan_relocs): Likewise.
(class Relocate_task): Likewise.
* target-reloc.h (scan_relocs): Remove options parameter. Change
all callers.
(scan_relocatable_relocs): Likewise.
* target.h (class Sized_target): Remove options parameter from
gc_process_relocs, scan_relocs, scan_relocatable_relocs. Change
all callers.
* gc.h (gc_process_relocs): Remove options parameter. Change all
callers.
* arm.cc: Update functions to remove options parameters.
* i386.cc: Likewise.
* powerpc.cc: Likewise.
* sparc.cc: Likewise.
* x86_64.cc: Likewise.
* testsuite/testfile.cc: Likewise.
2009-10-29 13:16:23 +08:00
|
|
|
local(Symbol_table* symtab, Layout* layout, Target_i386* target,
|
2011-05-25 05:41:10 +08:00
|
|
|
Sized_relobj_file<32, false>* object,
|
2006-11-30 01:56:40 +08:00
|
|
|
unsigned int data_shndx,
|
2007-11-15 06:31:02 +08:00
|
|
|
Output_section* output_section,
|
2006-10-21 04:40:49 +08:00
|
|
|
const elfcpp::Rel<32, false>& reloc, unsigned int r_type,
|
|
|
|
const elfcpp::Sym<32, false>& lsym);
|
2006-09-30 03:58:17 +08:00
|
|
|
|
2006-10-21 04:40:49 +08:00
|
|
|
inline void
|
* object.h (class Relobj): Drop options parameter from
gc_process_relocs, scan_relocs, relocate, do_gc_process_relocs,
do_scan_relocs, do_relocate. Change all callers.
(class Sized_relobj): Drop options parameters from
do_gc_process_relocs, do_scan_relocs, do_relocate,
do_relocate_sections, relocate_sections, emit_relocs_scan,
emit_relocs_scan_reltype. Change all callers.
(struct Relocate_info): Remove options field and all references to
it.
* reloc.h (class Read_relocs): Remove options constructor
parameter and options_ field. Change all callers.
(class Gc_process_relocs, class Scan_relocs): Likewise.
(class Relocate_task): Likewise.
* target-reloc.h (scan_relocs): Remove options parameter. Change
all callers.
(scan_relocatable_relocs): Likewise.
* target.h (class Sized_target): Remove options parameter from
gc_process_relocs, scan_relocs, scan_relocatable_relocs. Change
all callers.
* gc.h (gc_process_relocs): Remove options parameter. Change all
callers.
* arm.cc: Update functions to remove options parameters.
* i386.cc: Likewise.
* powerpc.cc: Likewise.
* sparc.cc: Likewise.
* x86_64.cc: Likewise.
* testsuite/testfile.cc: Likewise.
2009-10-29 13:16:23 +08:00
|
|
|
global(Symbol_table* symtab, Layout* layout, Target_i386* target,
|
2011-05-25 05:41:10 +08:00
|
|
|
Sized_relobj_file<32, false>* object,
|
2006-11-30 01:56:40 +08:00
|
|
|
unsigned int data_shndx,
|
2007-11-15 06:31:02 +08:00
|
|
|
Output_section* output_section,
|
2006-10-21 04:40:49 +08:00
|
|
|
const elfcpp::Rel<32, false>& reloc, unsigned int r_type,
|
|
|
|
Symbol* gsym);
|
2007-10-08 13:12:59 +08:00
|
|
|
|
2010-02-13 10:04:21 +08:00
|
|
|
inline bool
|
2010-03-04 09:33:22 +08:00
|
|
|
local_reloc_may_be_function_pointer(Symbol_table* symtab, Layout* layout,
|
|
|
|
Target_i386* target,
|
2011-05-25 05:41:10 +08:00
|
|
|
Sized_relobj_file<32, false>* object,
|
2010-03-04 09:33:22 +08:00
|
|
|
unsigned int data_shndx,
|
|
|
|
Output_section* output_section,
|
|
|
|
const elfcpp::Rel<32, false>& reloc,
|
|
|
|
unsigned int r_type,
|
|
|
|
const elfcpp::Sym<32, false>& lsym);
|
|
|
|
|
|
|
|
inline bool
|
|
|
|
global_reloc_may_be_function_pointer(Symbol_table* symtab, Layout* layout,
|
|
|
|
Target_i386* target,
|
2011-05-25 05:41:10 +08:00
|
|
|
Sized_relobj_file<32, false>* object,
|
2010-03-04 09:33:22 +08:00
|
|
|
unsigned int data_shndx,
|
|
|
|
Output_section* output_section,
|
|
|
|
const elfcpp::Rel<32, false>& reloc,
|
|
|
|
unsigned int r_type,
|
|
|
|
Symbol* gsym);
|
2010-02-13 10:04:21 +08:00
|
|
|
|
|
|
|
inline bool
|
2010-03-04 09:33:22 +08:00
|
|
|
possible_function_pointer_reloc(unsigned int r_type);
|
2010-02-13 10:04:21 +08:00
|
|
|
|
2010-08-20 06:50:16 +08:00
|
|
|
bool
|
2011-05-25 05:41:10 +08:00
|
|
|
reloc_needs_plt_for_ifunc(Sized_relobj_file<32, false>*,
|
|
|
|
unsigned int r_type);
|
2010-08-20 06:50:16 +08:00
|
|
|
|
2007-10-08 13:12:59 +08:00
|
|
|
static void
|
2011-05-25 05:41:10 +08:00
|
|
|
unsupported_reloc_local(Sized_relobj_file<32, false>*, unsigned int r_type);
|
2007-10-08 13:12:59 +08:00
|
|
|
|
|
|
|
static void
|
2011-05-25 05:41:10 +08:00
|
|
|
unsupported_reloc_global(Sized_relobj_file<32, false>*, unsigned int r_type,
|
2007-10-08 13:12:59 +08:00
|
|
|
Symbol*);
|
2006-09-30 03:58:17 +08:00
|
|
|
};
|
|
|
|
|
2006-10-21 04:40:49 +08:00
|
|
|
// The class which implements relocation.
|
|
|
|
class Relocate
|
|
|
|
{
|
|
|
|
public:
|
2006-11-04 02:26:11 +08:00
|
|
|
Relocate()
|
2007-10-08 01:05:07 +08:00
|
|
|
: skip_call_tls_get_addr_(false),
|
2009-10-15 08:33:18 +08:00
|
|
|
local_dynamic_type_(LOCAL_DYNAMIC_NONE)
|
2006-11-04 02:26:11 +08:00
|
|
|
{ }
|
|
|
|
|
|
|
|
~Relocate()
|
|
|
|
{
|
|
|
|
if (this->skip_call_tls_get_addr_)
|
|
|
|
{
|
|
|
|
// FIXME: This needs to specify the location somehow.
|
2007-10-14 14:49:14 +08:00
|
|
|
gold_error(_("missing expected TLS relocation"));
|
2006-11-04 02:26:11 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-11-02 12:08:52 +08:00
|
|
|
// Return whether the static relocation needs to be applied.
|
|
|
|
inline bool
|
|
|
|
should_apply_static_reloc(const Sized_symbol<32>* gsym,
|
2010-11-11 18:43:30 +08:00
|
|
|
unsigned int r_type,
|
2009-03-04 14:46:27 +08:00
|
|
|
bool is_32bit,
|
|
|
|
Output_section* output_section);
|
2007-11-02 12:08:52 +08:00
|
|
|
|
2006-11-04 02:26:11 +08:00
|
|
|
// Do a relocation. Return false if the caller should not issue
|
|
|
|
// any warnings about this relocation.
|
|
|
|
inline bool
|
2009-03-04 14:46:27 +08:00
|
|
|
relocate(const Relocate_info<32, false>*, Target_i386*, Output_section*,
|
|
|
|
size_t relnum, const elfcpp::Rel<32, false>&,
|
2006-11-16 08:38:25 +08:00
|
|
|
unsigned int r_type, const Sized_symbol<32>*,
|
2007-05-17 01:42:48 +08:00
|
|
|
const Symbol_value<32>*,
|
2006-10-21 04:40:49 +08:00
|
|
|
unsigned char*, elfcpp::Elf_types<32>::Elf_Addr,
|
2007-12-21 05:21:24 +08:00
|
|
|
section_size_type);
|
2006-10-21 04:40:49 +08:00
|
|
|
|
|
|
|
private:
|
|
|
|
// Do a TLS relocation.
|
2006-11-04 02:26:11 +08:00
|
|
|
inline void
|
2007-11-15 06:31:02 +08:00
|
|
|
relocate_tls(const Relocate_info<32, false>*, Target_i386* target,
|
|
|
|
size_t relnum, const elfcpp::Rel<32, false>&,
|
2006-11-16 08:38:25 +08:00
|
|
|
unsigned int r_type, const Sized_symbol<32>*,
|
2007-05-17 01:42:48 +08:00
|
|
|
const Symbol_value<32>*,
|
2007-12-21 05:21:24 +08:00
|
|
|
unsigned char*, elfcpp::Elf_types<32>::Elf_Addr,
|
|
|
|
section_size_type);
|
2006-10-21 04:40:49 +08:00
|
|
|
|
2007-11-15 06:31:02 +08:00
|
|
|
// Do a TLS General-Dynamic to Initial-Exec transition.
|
|
|
|
inline void
|
|
|
|
tls_gd_to_ie(const Relocate_info<32, false>*, size_t relnum,
|
|
|
|
Output_segment* tls_segment,
|
|
|
|
const elfcpp::Rel<32, false>&, unsigned int r_type,
|
|
|
|
elfcpp::Elf_types<32>::Elf_Addr value,
|
|
|
|
unsigned char* view,
|
2007-12-21 05:21:24 +08:00
|
|
|
section_size_type view_size);
|
2007-11-15 06:31:02 +08:00
|
|
|
|
2007-10-30 04:09:35 +08:00
|
|
|
// Do a TLS General-Dynamic to Local-Exec transition.
|
|
|
|
inline void
|
|
|
|
tls_gd_to_le(const Relocate_info<32, false>*, size_t relnum,
|
2006-10-21 04:40:49 +08:00
|
|
|
Output_segment* tls_segment,
|
|
|
|
const elfcpp::Rel<32, false>&, unsigned int r_type,
|
|
|
|
elfcpp::Elf_types<32>::Elf_Addr value,
|
|
|
|
unsigned char* view,
|
2007-12-21 05:21:24 +08:00
|
|
|
section_size_type view_size);
|
2006-10-21 04:40:49 +08:00
|
|
|
|
2008-04-12 05:24:30 +08:00
|
|
|
// Do a TLS_GOTDESC or TLS_DESC_CALL General-Dynamic to Initial-Exec
|
|
|
|
// transition.
|
|
|
|
inline void
|
|
|
|
tls_desc_gd_to_ie(const Relocate_info<32, false>*, size_t relnum,
|
|
|
|
Output_segment* tls_segment,
|
|
|
|
const elfcpp::Rel<32, false>&, unsigned int r_type,
|
|
|
|
elfcpp::Elf_types<32>::Elf_Addr value,
|
|
|
|
unsigned char* view,
|
|
|
|
section_size_type view_size);
|
|
|
|
|
|
|
|
// Do a TLS_GOTDESC or TLS_DESC_CALL General-Dynamic to Local-Exec
|
|
|
|
// transition.
|
|
|
|
inline void
|
|
|
|
tls_desc_gd_to_le(const Relocate_info<32, false>*, size_t relnum,
|
|
|
|
Output_segment* tls_segment,
|
|
|
|
const elfcpp::Rel<32, false>&, unsigned int r_type,
|
|
|
|
elfcpp::Elf_types<32>::Elf_Addr value,
|
|
|
|
unsigned char* view,
|
|
|
|
section_size_type view_size);
|
|
|
|
|
2007-10-30 04:09:35 +08:00
|
|
|
// Do a TLS Local-Dynamic to Local-Exec transition.
|
2006-11-04 02:26:11 +08:00
|
|
|
inline void
|
2007-10-30 04:09:35 +08:00
|
|
|
tls_ld_to_le(const Relocate_info<32, false>*, size_t relnum,
|
2006-11-04 02:26:11 +08:00
|
|
|
Output_segment* tls_segment,
|
|
|
|
const elfcpp::Rel<32, false>&, unsigned int r_type,
|
|
|
|
elfcpp::Elf_types<32>::Elf_Addr value,
|
|
|
|
unsigned char* view,
|
2007-12-21 05:21:24 +08:00
|
|
|
section_size_type view_size);
|
2006-11-04 02:26:11 +08:00
|
|
|
|
2007-10-30 04:09:35 +08:00
|
|
|
// Do a TLS Initial-Exec to Local-Exec transition.
|
|
|
|
static inline void
|
|
|
|
tls_ie_to_le(const Relocate_info<32, false>*, size_t relnum,
|
2007-10-08 01:05:07 +08:00
|
|
|
Output_segment* tls_segment,
|
|
|
|
const elfcpp::Rel<32, false>&, unsigned int r_type,
|
|
|
|
elfcpp::Elf_types<32>::Elf_Addr value,
|
|
|
|
unsigned char* view,
|
2007-12-21 05:21:24 +08:00
|
|
|
section_size_type view_size);
|
2007-10-08 01:05:07 +08:00
|
|
|
|
|
|
|
// We need to keep track of which type of local dynamic relocation
|
|
|
|
// we have seen, so that we can optimize R_386_TLS_LDO_32 correctly.
|
|
|
|
enum Local_dynamic_type
|
|
|
|
{
|
|
|
|
LOCAL_DYNAMIC_NONE,
|
|
|
|
LOCAL_DYNAMIC_SUN,
|
|
|
|
LOCAL_DYNAMIC_GNU
|
|
|
|
};
|
|
|
|
|
2006-11-04 02:26:11 +08:00
|
|
|
// This is set if we should skip the next reloc, which should be a
|
|
|
|
// PLT32 reloc against ___tls_get_addr.
|
|
|
|
bool skip_call_tls_get_addr_;
|
2007-10-08 01:05:07 +08:00
|
|
|
// The type of local dynamic relocation we have seen in the section
|
|
|
|
// being relocated, if any.
|
|
|
|
Local_dynamic_type local_dynamic_type_;
|
2006-10-21 04:40:49 +08:00
|
|
|
};
|
|
|
|
|
2008-02-06 16:13:50 +08:00
|
|
|
// A class which returns the size required for a relocation type,
|
|
|
|
// used while scanning relocs during a relocatable link.
|
|
|
|
class Relocatable_size_for_reloc
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
unsigned int
|
|
|
|
get_size_for_reloc(unsigned int, Relobj*);
|
|
|
|
};
|
|
|
|
|
2006-10-21 04:40:49 +08:00
|
|
|
// Adjust TLS relocation type based on the options and whether this
|
|
|
|
// is a local symbol.
|
2007-10-08 13:12:59 +08:00
|
|
|
static tls::Tls_optimization
|
2007-09-21 15:20:01 +08:00
|
|
|
optimize_tls_reloc(bool is_final, int r_type);
|
2006-10-21 04:40:49 +08:00
|
|
|
|
2006-11-04 02:26:11 +08:00
|
|
|
// Get the GOT section, creating it if necessary.
|
2006-11-15 03:21:05 +08:00
|
|
|
Output_data_got<32, false>*
|
2007-09-21 15:20:01 +08:00
|
|
|
got_section(Symbol_table*, Layout*);
|
2006-11-30 01:56:40 +08:00
|
|
|
|
2007-11-01 08:19:30 +08:00
|
|
|
// Get the GOT PLT section.
|
|
|
|
Output_data_space*
|
|
|
|
got_plt_section() const
|
|
|
|
{
|
|
|
|
gold_assert(this->got_plt_ != NULL);
|
|
|
|
return this->got_plt_;
|
|
|
|
}
|
|
|
|
|
2010-08-02 18:07:03 +08:00
|
|
|
// Get the GOT section for TLSDESC entries.
|
|
|
|
Output_data_got<32, false>*
|
|
|
|
got_tlsdesc_section() const
|
|
|
|
{
|
|
|
|
gold_assert(this->got_tlsdesc_ != NULL);
|
|
|
|
return this->got_tlsdesc_;
|
|
|
|
}
|
|
|
|
|
2010-08-20 06:50:16 +08:00
|
|
|
// Create the PLT section.
|
|
|
|
void
|
|
|
|
make_plt_section(Symbol_table* symtab, Layout* layout);
|
|
|
|
|
2006-11-30 01:56:40 +08:00
|
|
|
// Create a PLT entry for a global symbol.
|
|
|
|
void
|
2007-09-21 15:20:01 +08:00
|
|
|
make_plt_entry(Symbol_table*, Layout*, Symbol*);
|
2006-11-30 01:56:40 +08:00
|
|
|
|
2010-08-20 06:50:16 +08:00
|
|
|
// Create a PLT entry for a local STT_GNU_IFUNC symbol.
|
|
|
|
void
|
|
|
|
make_local_ifunc_plt_entry(Symbol_table*, Layout*,
|
2011-05-25 05:41:10 +08:00
|
|
|
Sized_relobj_file<32, false>* relobj,
|
2010-08-20 06:50:16 +08:00
|
|
|
unsigned int local_sym_index);
|
|
|
|
|
2008-09-16 12:31:25 +08:00
|
|
|
// Define the _TLS_MODULE_BASE_ symbol in the TLS segment.
|
2008-04-17 10:00:54 +08:00
|
|
|
void
|
|
|
|
define_tls_base_symbol(Symbol_table*, Layout*);
|
|
|
|
|
2007-12-11 12:23:05 +08:00
|
|
|
// Create a GOT entry for the TLS module index.
|
|
|
|
unsigned int
|
|
|
|
got_mod_index_entry(Symbol_table* symtab, Layout* layout,
|
2011-05-25 05:41:10 +08:00
|
|
|
Sized_relobj_file<32, false>* object);
|
2007-12-11 12:23:05 +08:00
|
|
|
|
2006-11-30 01:56:40 +08:00
|
|
|
// Get the PLT section.
|
2010-01-09 03:33:18 +08:00
|
|
|
Output_data_plt_i386*
|
2006-11-30 01:56:40 +08:00
|
|
|
plt_section() const
|
|
|
|
{
|
|
|
|
gold_assert(this->plt_ != NULL);
|
|
|
|
return this->plt_;
|
|
|
|
}
|
|
|
|
|
2006-12-01 07:52:50 +08:00
|
|
|
// Get the dynamic reloc section, creating it if necessary.
|
|
|
|
Reloc_section*
|
|
|
|
rel_dyn_section(Layout*);
|
|
|
|
|
2010-01-09 03:33:18 +08:00
|
|
|
// Get the section to use for TLS_DESC relocations.
|
|
|
|
Reloc_section*
|
|
|
|
rel_tls_desc_section(Layout*) const;
|
|
|
|
|
PR gold/12372
* target.h (Target::plt_address_for_global): New function.
(Target::plt_address_for_local): New function.
(Target::plt_section_for_global): Remove.
(Target::plt_section_for_local): Remove.
(Target::do_plt_address_for_global): New virtual function.
(Target::do_plt_address_for_local): New virtual function.
(Target::do_plt_section_for_global): Remove.
(Target::do_plt_section_for_local): Remove.
(Target::register_global_plt_entry): Add Symbol_table and Layout
parameters.
* output.cc (Output_data_got::Got_entry::write): Use
plt_address_for_global and plt_address_for_local.
* layout.cc (Layout::add_target_dynamic_tags): Use size and
address of output section.
* i386.cc (class Output_data_plt_i386): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_i386::has_irelative_section): New function.
(Output_data_plt_i386::entry_count): Add irelative_count_.
(Output_data_plt_i386::set_final_data_size): Likewise.
(class Target_i386): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_i386::Target_i386): Initialize new fields.
(Target_i386::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_i386::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_i386::got_section): Create got_irelative_.
(Target_i386::rel_irelative_section): New function.
(Output_data_plt_i386::Output_data_plt_i386): Initialize new
fields. Don't define __rel_iplt_{start,end}.
(Output_data_plt_i386::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_i386::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_i386::rel_tls_desc): Fix formatting.
(Output_data_plt_i386::rel_irelative): New function.
(Output_data_plt_i386::address_for_global): New function.
(Output_data_plt_i386::address_for_local): New function.
(Output_data_plt_i386::do_write): Write out IRELATIVE area. Use
IRELATIVE GOT when changing IFUNC GOT entries.
(Target_i386::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_i386::do_finalize_sections): Create the __rel_iplt symbols
if we didn't create an IRELATIVE GOT.
(Target_i386::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_i386::do_dynsym_value): Use plt_address_for_global.
* x86_64.cc (class Output_data_plt_x86_64): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_x86_64::Output_data_plt_x86_64) [both versions]:
Initialize new fields. Remove symtab parameter. Change all
callers.
(Output_data_plt_x86_64::get_tlsdesc_plt_offset): Add
irelative_count_.
(Output_data_plt_x86_64::has_irelative_section): New function.
(Output_data_plt_x86_64::entry_count): Add irelative_count_.
(class Target_x86_64): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_x86_64::Target_x86_64): Initialize new fields.
(Target_x86_64::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_x86_64::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_x86_64::got_section): Create got_irelative_.
(Target_x86_64::rela_irelative_section): New function.
(Output_data_plt_x86_64::init): Remove symtab parameter. Change
all callers. Don't create __rel_iplt_{start,end}.
(Output_data_plt_x86_64::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_x86_64::add_relocation): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::rela_tlsdesc): Fix formatting.
(Output_data_plt_x86_64::rela_irelative): New function.
(Output_data_plt_x86_64::address_for_global): New function.
(Output_data_plt_x86_64::address_for_local): New function.
(Output_data_plt_x86_64::set_final_data_size): Likewise.
(Output_data_plt_x86_64::do_write): Write out IRELATIVE area.
(Target_x86_64::init_got_plt_for_update): Create got_irelative_.
(Target_x86_64::register_global_plt_entry): Add symtab and layout
parameters.
(Target_x86_64::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_x86_64::do_finalize_sections): Create the __rela_iplt
symbols if we didn't create an IRELATIVE GOT.
(Target_x86_64::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_x86_64::do_dynsym_value): Use plt_address_for_global.
* testsuite/ifuncvar1.c: New test file.
* testsuite/ifuncvar2.c: New test file.
* testsuite/ifuncvar3.c: New test file.
* testsuite/Makefile.am (check_PROGRAMS): Add ifuncvar.
(ifuncvar1_pic.o, ifuncvar2_pic.o, ifuncvar.so): New targets.
(ifuncvar_SOURCES, ifuncvar_DEPENDENCIES): New variables.
(ifuncvar_LDFLAGS, ifuncvar_LDADD): New variables.
* testsuite/Makefile.in: Rebuild.
2011-07-09 06:48:08 +08:00
|
|
|
// Get the section to use for IRELATIVE relocations.
|
|
|
|
Reloc_section*
|
|
|
|
rel_irelative_section(Layout*);
|
|
|
|
|
2008-04-17 06:54:29 +08:00
|
|
|
// Add a potential copy relocation.
|
2006-11-30 01:56:40 +08:00
|
|
|
void
|
2008-07-11 07:01:20 +08:00
|
|
|
copy_reloc(Symbol_table* symtab, Layout* layout,
|
2011-05-25 05:41:10 +08:00
|
|
|
Sized_relobj_file<32, false>* object,
|
2008-04-17 06:54:29 +08:00
|
|
|
unsigned int shndx, Output_section* output_section,
|
|
|
|
Symbol* sym, const elfcpp::Rel<32, false>& reloc)
|
|
|
|
{
|
|
|
|
this->copy_relocs_.copy_reloc(symtab, layout,
|
|
|
|
symtab->get_sized_symbol<32>(sym),
|
|
|
|
object, shndx, output_section, reloc,
|
|
|
|
this->rel_dyn_section(layout));
|
|
|
|
}
|
2006-11-04 02:26:11 +08:00
|
|
|
|
2006-10-21 04:40:49 +08:00
|
|
|
// Information about this specific target which we pass to the
|
|
|
|
// general Target structure.
|
2006-09-28 06:53:42 +08:00
|
|
|
static const Target::Target_info i386_info;
|
2006-11-04 02:26:11 +08:00
|
|
|
|
2008-03-26 02:37:16 +08:00
|
|
|
// The types of GOT entries needed for this platform.
|
2010-08-13 06:15:00 +08:00
|
|
|
// These values are exposed to the ABI in an incremental link.
|
|
|
|
// Do not renumber existing values without changing the version
|
|
|
|
// number of the .gnu_incremental_inputs section.
|
2008-03-26 02:37:16 +08:00
|
|
|
enum Got_type
|
|
|
|
{
|
|
|
|
GOT_TYPE_STANDARD = 0, // GOT entry for a regular symbol
|
2008-04-12 05:24:30 +08:00
|
|
|
GOT_TYPE_TLS_NOFFSET = 1, // GOT entry for negative TLS offset
|
|
|
|
GOT_TYPE_TLS_OFFSET = 2, // GOT entry for positive TLS offset
|
|
|
|
GOT_TYPE_TLS_PAIR = 3, // GOT entry for TLS module/offset pair
|
|
|
|
GOT_TYPE_TLS_DESC = 4 // GOT entry for TLS_DESC pair
|
2008-03-26 02:37:16 +08:00
|
|
|
};
|
|
|
|
|
2006-11-04 02:26:11 +08:00
|
|
|
// The GOT section.
|
2006-11-15 03:21:05 +08:00
|
|
|
Output_data_got<32, false>* got_;
|
2006-11-30 01:56:40 +08:00
|
|
|
// The PLT section.
|
|
|
|
Output_data_plt_i386* plt_;
|
|
|
|
// The GOT PLT section.
|
|
|
|
Output_data_space* got_plt_;
|
PR gold/12372
* target.h (Target::plt_address_for_global): New function.
(Target::plt_address_for_local): New function.
(Target::plt_section_for_global): Remove.
(Target::plt_section_for_local): Remove.
(Target::do_plt_address_for_global): New virtual function.
(Target::do_plt_address_for_local): New virtual function.
(Target::do_plt_section_for_global): Remove.
(Target::do_plt_section_for_local): Remove.
(Target::register_global_plt_entry): Add Symbol_table and Layout
parameters.
* output.cc (Output_data_got::Got_entry::write): Use
plt_address_for_global and plt_address_for_local.
* layout.cc (Layout::add_target_dynamic_tags): Use size and
address of output section.
* i386.cc (class Output_data_plt_i386): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_i386::has_irelative_section): New function.
(Output_data_plt_i386::entry_count): Add irelative_count_.
(Output_data_plt_i386::set_final_data_size): Likewise.
(class Target_i386): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_i386::Target_i386): Initialize new fields.
(Target_i386::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_i386::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_i386::got_section): Create got_irelative_.
(Target_i386::rel_irelative_section): New function.
(Output_data_plt_i386::Output_data_plt_i386): Initialize new
fields. Don't define __rel_iplt_{start,end}.
(Output_data_plt_i386::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_i386::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_i386::rel_tls_desc): Fix formatting.
(Output_data_plt_i386::rel_irelative): New function.
(Output_data_plt_i386::address_for_global): New function.
(Output_data_plt_i386::address_for_local): New function.
(Output_data_plt_i386::do_write): Write out IRELATIVE area. Use
IRELATIVE GOT when changing IFUNC GOT entries.
(Target_i386::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_i386::do_finalize_sections): Create the __rel_iplt symbols
if we didn't create an IRELATIVE GOT.
(Target_i386::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_i386::do_dynsym_value): Use plt_address_for_global.
* x86_64.cc (class Output_data_plt_x86_64): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_x86_64::Output_data_plt_x86_64) [both versions]:
Initialize new fields. Remove symtab parameter. Change all
callers.
(Output_data_plt_x86_64::get_tlsdesc_plt_offset): Add
irelative_count_.
(Output_data_plt_x86_64::has_irelative_section): New function.
(Output_data_plt_x86_64::entry_count): Add irelative_count_.
(class Target_x86_64): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_x86_64::Target_x86_64): Initialize new fields.
(Target_x86_64::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_x86_64::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_x86_64::got_section): Create got_irelative_.
(Target_x86_64::rela_irelative_section): New function.
(Output_data_plt_x86_64::init): Remove symtab parameter. Change
all callers. Don't create __rel_iplt_{start,end}.
(Output_data_plt_x86_64::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_x86_64::add_relocation): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::rela_tlsdesc): Fix formatting.
(Output_data_plt_x86_64::rela_irelative): New function.
(Output_data_plt_x86_64::address_for_global): New function.
(Output_data_plt_x86_64::address_for_local): New function.
(Output_data_plt_x86_64::set_final_data_size): Likewise.
(Output_data_plt_x86_64::do_write): Write out IRELATIVE area.
(Target_x86_64::init_got_plt_for_update): Create got_irelative_.
(Target_x86_64::register_global_plt_entry): Add symtab and layout
parameters.
(Target_x86_64::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_x86_64::do_finalize_sections): Create the __rela_iplt
symbols if we didn't create an IRELATIVE GOT.
(Target_x86_64::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_x86_64::do_dynsym_value): Use plt_address_for_global.
* testsuite/ifuncvar1.c: New test file.
* testsuite/ifuncvar2.c: New test file.
* testsuite/ifuncvar3.c: New test file.
* testsuite/Makefile.am (check_PROGRAMS): Add ifuncvar.
(ifuncvar1_pic.o, ifuncvar2_pic.o, ifuncvar.so): New targets.
(ifuncvar_SOURCES, ifuncvar_DEPENDENCIES): New variables.
(ifuncvar_LDFLAGS, ifuncvar_LDADD): New variables.
* testsuite/Makefile.in: Rebuild.
2011-07-09 06:48:08 +08:00
|
|
|
// The GOT section for IRELATIVE relocations.
|
|
|
|
Output_data_space* got_irelative_;
|
2010-08-02 18:07:03 +08:00
|
|
|
// The GOT section for TLSDESC relocations.
|
|
|
|
Output_data_got<32, false>* got_tlsdesc_;
|
2009-12-30 15:22:06 +08:00
|
|
|
// The _GLOBAL_OFFSET_TABLE_ symbol.
|
|
|
|
Symbol* global_offset_table_;
|
2006-12-01 07:52:50 +08:00
|
|
|
// The dynamic reloc section.
|
|
|
|
Reloc_section* rel_dyn_;
|
PR gold/12372
* target.h (Target::plt_address_for_global): New function.
(Target::plt_address_for_local): New function.
(Target::plt_section_for_global): Remove.
(Target::plt_section_for_local): Remove.
(Target::do_plt_address_for_global): New virtual function.
(Target::do_plt_address_for_local): New virtual function.
(Target::do_plt_section_for_global): Remove.
(Target::do_plt_section_for_local): Remove.
(Target::register_global_plt_entry): Add Symbol_table and Layout
parameters.
* output.cc (Output_data_got::Got_entry::write): Use
plt_address_for_global and plt_address_for_local.
* layout.cc (Layout::add_target_dynamic_tags): Use size and
address of output section.
* i386.cc (class Output_data_plt_i386): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_i386::has_irelative_section): New function.
(Output_data_plt_i386::entry_count): Add irelative_count_.
(Output_data_plt_i386::set_final_data_size): Likewise.
(class Target_i386): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_i386::Target_i386): Initialize new fields.
(Target_i386::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_i386::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_i386::got_section): Create got_irelative_.
(Target_i386::rel_irelative_section): New function.
(Output_data_plt_i386::Output_data_plt_i386): Initialize new
fields. Don't define __rel_iplt_{start,end}.
(Output_data_plt_i386::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_i386::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_i386::rel_tls_desc): Fix formatting.
(Output_data_plt_i386::rel_irelative): New function.
(Output_data_plt_i386::address_for_global): New function.
(Output_data_plt_i386::address_for_local): New function.
(Output_data_plt_i386::do_write): Write out IRELATIVE area. Use
IRELATIVE GOT when changing IFUNC GOT entries.
(Target_i386::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_i386::do_finalize_sections): Create the __rel_iplt symbols
if we didn't create an IRELATIVE GOT.
(Target_i386::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_i386::do_dynsym_value): Use plt_address_for_global.
* x86_64.cc (class Output_data_plt_x86_64): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_x86_64::Output_data_plt_x86_64) [both versions]:
Initialize new fields. Remove symtab parameter. Change all
callers.
(Output_data_plt_x86_64::get_tlsdesc_plt_offset): Add
irelative_count_.
(Output_data_plt_x86_64::has_irelative_section): New function.
(Output_data_plt_x86_64::entry_count): Add irelative_count_.
(class Target_x86_64): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_x86_64::Target_x86_64): Initialize new fields.
(Target_x86_64::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_x86_64::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_x86_64::got_section): Create got_irelative_.
(Target_x86_64::rela_irelative_section): New function.
(Output_data_plt_x86_64::init): Remove symtab parameter. Change
all callers. Don't create __rel_iplt_{start,end}.
(Output_data_plt_x86_64::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_x86_64::add_relocation): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::rela_tlsdesc): Fix formatting.
(Output_data_plt_x86_64::rela_irelative): New function.
(Output_data_plt_x86_64::address_for_global): New function.
(Output_data_plt_x86_64::address_for_local): New function.
(Output_data_plt_x86_64::set_final_data_size): Likewise.
(Output_data_plt_x86_64::do_write): Write out IRELATIVE area.
(Target_x86_64::init_got_plt_for_update): Create got_irelative_.
(Target_x86_64::register_global_plt_entry): Add symtab and layout
parameters.
(Target_x86_64::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_x86_64::do_finalize_sections): Create the __rela_iplt
symbols if we didn't create an IRELATIVE GOT.
(Target_x86_64::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_x86_64::do_dynsym_value): Use plt_address_for_global.
* testsuite/ifuncvar1.c: New test file.
* testsuite/ifuncvar2.c: New test file.
* testsuite/ifuncvar3.c: New test file.
* testsuite/Makefile.am (check_PROGRAMS): Add ifuncvar.
(ifuncvar1_pic.o, ifuncvar2_pic.o, ifuncvar.so): New targets.
(ifuncvar_SOURCES, ifuncvar_DEPENDENCIES): New variables.
(ifuncvar_LDFLAGS, ifuncvar_LDADD): New variables.
* testsuite/Makefile.in: Rebuild.
2011-07-09 06:48:08 +08:00
|
|
|
// The section to use for IRELATIVE relocs.
|
|
|
|
Reloc_section* rel_irelative_;
|
2006-12-01 07:52:50 +08:00
|
|
|
// Relocs saved to avoid a COPY reloc.
|
2008-04-17 06:54:29 +08:00
|
|
|
Copy_relocs<elfcpp::SHT_REL, 32, false> copy_relocs_;
|
2006-12-01 07:52:50 +08:00
|
|
|
// Space for variables copied with a COPY reloc.
|
|
|
|
Output_data_space* dynbss_;
|
2008-04-12 05:24:30 +08:00
|
|
|
// Offset of the GOT entry for the TLS module index.
|
2007-12-11 12:23:05 +08:00
|
|
|
unsigned int got_mod_index_offset_;
|
2008-04-17 10:00:54 +08:00
|
|
|
// True if the _TLS_MODULE_BASE_ symbol has been defined.
|
|
|
|
bool tls_base_symbol_defined_;
|
2006-09-28 06:53:42 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
const Target::Target_info Target_i386::i386_info =
|
|
|
|
{
|
2006-09-30 03:58:17 +08:00
|
|
|
32, // size
|
|
|
|
false, // is_big_endian
|
|
|
|
elfcpp::EM_386, // machine_code
|
|
|
|
false, // has_make_symbol
|
2006-11-15 03:21:05 +08:00
|
|
|
false, // has_resolve
|
2007-09-21 13:31:19 +08:00
|
|
|
true, // has_code_fill
|
2007-10-23 13:05:48 +08:00
|
|
|
true, // is_default_stack_executable
|
2011-06-29 05:15:42 +08:00
|
|
|
true, // can_icf_inline_merge_sections
|
2008-04-09 08:48:13 +08:00
|
|
|
'\0', // wrap_char
|
2006-11-15 03:21:05 +08:00
|
|
|
"/usr/lib/libc.so.1", // dynamic_linker
|
2007-10-17 06:38:36 +08:00
|
|
|
0x08048000, // default_text_segment_address
|
2008-02-27 06:10:32 +08:00
|
|
|
0x1000, // abi_pagesize (overridable by -z max-page-size)
|
2009-06-22 14:51:53 +08:00
|
|
|
0x1000, // common_pagesize (overridable by -z common-page-size)
|
|
|
|
elfcpp::SHN_UNDEF, // small_common_shndx
|
|
|
|
elfcpp::SHN_UNDEF, // large_common_shndx
|
|
|
|
0, // small_common_section_flags
|
2009-12-06 10:49:46 +08:00
|
|
|
0, // large_common_section_flags
|
|
|
|
NULL, // attributes_section
|
|
|
|
NULL // attributes_vendor
|
2006-08-19 06:29:20 +08:00
|
|
|
};
|
|
|
|
|
2006-11-04 02:26:11 +08:00
|
|
|
// Get the GOT section, creating it if necessary.
|
|
|
|
|
2006-11-15 03:21:05 +08:00
|
|
|
Output_data_got<32, false>*
|
2007-09-21 15:20:01 +08:00
|
|
|
Target_i386::got_section(Symbol_table* symtab, Layout* layout)
|
2006-11-04 02:26:11 +08:00
|
|
|
{
|
|
|
|
if (this->got_ == NULL)
|
|
|
|
{
|
2007-09-21 15:20:01 +08:00
|
|
|
gold_assert(symtab != NULL && layout != NULL);
|
2006-11-30 01:56:40 +08:00
|
|
|
|
2007-09-21 15:20:01 +08:00
|
|
|
this->got_ = new Output_data_got<32, false>();
|
2006-11-04 02:26:11 +08:00
|
|
|
|
2010-07-13 20:04:03 +08:00
|
|
|
layout->add_output_section_data(".got", elfcpp::SHT_PROGBITS,
|
|
|
|
(elfcpp::SHF_ALLOC
|
|
|
|
| elfcpp::SHF_WRITE),
|
2010-08-03 Ian Lance Taylor <iant@google.com>
PR 11805
* layout.h (enum Output_section_order): Define.
(class Layout): Update declarations.
* layout.cc (Layout::get_output_section): Add order parameter.
Remove is_interp, is_dynamic_linker_section, is_last_relro, and
is_first_non_relro parameters. Change all callers.
(Layout::choose_output_section): Likewise.
(Layout::add_output_section_data): Likewise.
(Layout::make_output_section): Likewise. Set order.
(Layout::default_section_order): New function.
(Layout::layout_eh_frame): Call add_output_section_to_nonload.
* output.cc (Output_section::Output_section): Initialize order_.
Don't initialize deleted fields.
(Output_segment::Output_segment): Don't initialize deleted
fields.
(Output_segment::add_output_section_to_load): New function
replacing add_output_section. Change all callers to call this or
add_output_section_to_nonload.
(Output_segment::add_output_section_to_nonload): New function.
(Output_segment::remove_output_section): Rewrite.
(Output_segment::add_initial_output_data): Likewise.
(Output_segment::has_any_data_sections): Likewise.
(Output_segment::is_first_section_relro): Likewise.
(Output_segment::maximum_alignment): Likewise.
(Output_segment::has_dynamic_reloc): New function replacing
dynamic_reloc_count. Change all callers.
(Output_segment::has_dynamic_reloc_list): New function replacing
dynamic_reloc_count_list. Change all callers.
(Output_segment::set_section_addresses): Rewrite.
(Output_segment::set_offset): Rewrite.
(Output_segment::find_first_and_last_list): Remove.
(Output_segment::set_tls_offsets): Rewrite.
(Output_segment::first_section_load_address): Likewise.
(Output_segment::output_section_count): Likewise.
(Output_segment::section_with_lowest_load_address): Likewise.
(Output_segment::write_section_headers): Likewise.
(Output_segment::print_sections_to_map): Likewise.
* output.h (class Output_data): Remove dynamic_reloc_count_
field. Add has_dynamic_reloc_ field. Make bools into bitfields.
(Output_data::add_dynamic_reloc): Rewrite.
(Output_data::has_dynamic_reloc): New function.
(Output_data::dynamic_reloc_count): Remove.
(class Output_section): Add order_ field. Remvoe is_relro_local_,
is_last_relro_, is_first_non_relro_, is_interp_,
is_dynamic_linker_section_ fields. Add order and set_order
functions. Remove is_relro_local, set_is_relro_local,
is_last_relro, set_is_last_relro, is_first_non_relro,
set_is_first_non_relro functions, is_interp, set_is_interp,
is_dynamic_linker_section, and set_is_dynamic_linker_section
functions.
(class Output_segment): Change Output_data_list from std::list to
std:;vector. Add output_lists_ field. Remove output_data_ and
output_bss_ fields. Update declarations.
2010-08-03 22:07:13 +08:00
|
|
|
this->got_, ORDER_RELRO_LAST, true);
|
2006-11-04 02:26:11 +08:00
|
|
|
|
2008-05-22 05:37:44 +08:00
|
|
|
this->got_plt_ = new Output_data_space(4, "** GOT PLT");
|
2010-07-13 20:04:03 +08:00
|
|
|
layout->add_output_section_data(".got.plt", elfcpp::SHT_PROGBITS,
|
|
|
|
(elfcpp::SHF_ALLOC
|
|
|
|
| elfcpp::SHF_WRITE),
|
2010-08-03 Ian Lance Taylor <iant@google.com>
PR 11805
* layout.h (enum Output_section_order): Define.
(class Layout): Update declarations.
* layout.cc (Layout::get_output_section): Add order parameter.
Remove is_interp, is_dynamic_linker_section, is_last_relro, and
is_first_non_relro parameters. Change all callers.
(Layout::choose_output_section): Likewise.
(Layout::add_output_section_data): Likewise.
(Layout::make_output_section): Likewise. Set order.
(Layout::default_section_order): New function.
(Layout::layout_eh_frame): Call add_output_section_to_nonload.
* output.cc (Output_section::Output_section): Initialize order_.
Don't initialize deleted fields.
(Output_segment::Output_segment): Don't initialize deleted
fields.
(Output_segment::add_output_section_to_load): New function
replacing add_output_section. Change all callers to call this or
add_output_section_to_nonload.
(Output_segment::add_output_section_to_nonload): New function.
(Output_segment::remove_output_section): Rewrite.
(Output_segment::add_initial_output_data): Likewise.
(Output_segment::has_any_data_sections): Likewise.
(Output_segment::is_first_section_relro): Likewise.
(Output_segment::maximum_alignment): Likewise.
(Output_segment::has_dynamic_reloc): New function replacing
dynamic_reloc_count. Change all callers.
(Output_segment::has_dynamic_reloc_list): New function replacing
dynamic_reloc_count_list. Change all callers.
(Output_segment::set_section_addresses): Rewrite.
(Output_segment::set_offset): Rewrite.
(Output_segment::find_first_and_last_list): Remove.
(Output_segment::set_tls_offsets): Rewrite.
(Output_segment::first_section_load_address): Likewise.
(Output_segment::output_section_count): Likewise.
(Output_segment::section_with_lowest_load_address): Likewise.
(Output_segment::write_section_headers): Likewise.
(Output_segment::print_sections_to_map): Likewise.
* output.h (class Output_data): Remove dynamic_reloc_count_
field. Add has_dynamic_reloc_ field. Make bools into bitfields.
(Output_data::add_dynamic_reloc): Rewrite.
(Output_data::has_dynamic_reloc): New function.
(Output_data::dynamic_reloc_count): Remove.
(class Output_section): Add order_ field. Remvoe is_relro_local_,
is_last_relro_, is_first_non_relro_, is_interp_,
is_dynamic_linker_section_ fields. Add order and set_order
functions. Remove is_relro_local, set_is_relro_local,
is_last_relro, set_is_last_relro, is_first_non_relro,
set_is_first_non_relro functions, is_interp, set_is_interp,
is_dynamic_linker_section, and set_is_dynamic_linker_section
functions.
(class Output_segment): Change Output_data_list from std::list to
std:;vector. Add output_lists_ field. Remove output_data_ and
output_bss_ fields. Update declarations.
2010-08-03 22:07:13 +08:00
|
|
|
this->got_plt_, ORDER_NON_RELRO_FIRST,
|
|
|
|
false);
|
2006-11-30 01:56:40 +08:00
|
|
|
|
2006-11-04 02:26:11 +08:00
|
|
|
// The first three entries are reserved.
|
2007-11-30 04:10:17 +08:00
|
|
|
this->got_plt_->set_current_data_size(3 * 4);
|
2006-11-04 02:26:11 +08:00
|
|
|
|
2009-12-30 14:57:17 +08:00
|
|
|
// Those bytes can go into the relro segment.
|
|
|
|
layout->increase_relro(3 * 4);
|
|
|
|
|
2006-11-30 01:56:40 +08:00
|
|
|
// Define _GLOBAL_OFFSET_TABLE_ at the start of the PLT.
|
2009-12-30 15:22:06 +08:00
|
|
|
this->global_offset_table_ =
|
|
|
|
symtab->define_in_output_data("_GLOBAL_OFFSET_TABLE_", NULL,
|
|
|
|
Symbol_table::PREDEFINED,
|
|
|
|
this->got_plt_,
|
|
|
|
0, 0, elfcpp::STT_OBJECT,
|
|
|
|
elfcpp::STB_LOCAL,
|
|
|
|
elfcpp::STV_HIDDEN, 0,
|
|
|
|
false, false);
|
2010-08-02 18:07:03 +08:00
|
|
|
|
PR gold/12372
* target.h (Target::plt_address_for_global): New function.
(Target::plt_address_for_local): New function.
(Target::plt_section_for_global): Remove.
(Target::plt_section_for_local): Remove.
(Target::do_plt_address_for_global): New virtual function.
(Target::do_plt_address_for_local): New virtual function.
(Target::do_plt_section_for_global): Remove.
(Target::do_plt_section_for_local): Remove.
(Target::register_global_plt_entry): Add Symbol_table and Layout
parameters.
* output.cc (Output_data_got::Got_entry::write): Use
plt_address_for_global and plt_address_for_local.
* layout.cc (Layout::add_target_dynamic_tags): Use size and
address of output section.
* i386.cc (class Output_data_plt_i386): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_i386::has_irelative_section): New function.
(Output_data_plt_i386::entry_count): Add irelative_count_.
(Output_data_plt_i386::set_final_data_size): Likewise.
(class Target_i386): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_i386::Target_i386): Initialize new fields.
(Target_i386::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_i386::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_i386::got_section): Create got_irelative_.
(Target_i386::rel_irelative_section): New function.
(Output_data_plt_i386::Output_data_plt_i386): Initialize new
fields. Don't define __rel_iplt_{start,end}.
(Output_data_plt_i386::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_i386::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_i386::rel_tls_desc): Fix formatting.
(Output_data_plt_i386::rel_irelative): New function.
(Output_data_plt_i386::address_for_global): New function.
(Output_data_plt_i386::address_for_local): New function.
(Output_data_plt_i386::do_write): Write out IRELATIVE area. Use
IRELATIVE GOT when changing IFUNC GOT entries.
(Target_i386::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_i386::do_finalize_sections): Create the __rel_iplt symbols
if we didn't create an IRELATIVE GOT.
(Target_i386::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_i386::do_dynsym_value): Use plt_address_for_global.
* x86_64.cc (class Output_data_plt_x86_64): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_x86_64::Output_data_plt_x86_64) [both versions]:
Initialize new fields. Remove symtab parameter. Change all
callers.
(Output_data_plt_x86_64::get_tlsdesc_plt_offset): Add
irelative_count_.
(Output_data_plt_x86_64::has_irelative_section): New function.
(Output_data_plt_x86_64::entry_count): Add irelative_count_.
(class Target_x86_64): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_x86_64::Target_x86_64): Initialize new fields.
(Target_x86_64::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_x86_64::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_x86_64::got_section): Create got_irelative_.
(Target_x86_64::rela_irelative_section): New function.
(Output_data_plt_x86_64::init): Remove symtab parameter. Change
all callers. Don't create __rel_iplt_{start,end}.
(Output_data_plt_x86_64::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_x86_64::add_relocation): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::rela_tlsdesc): Fix formatting.
(Output_data_plt_x86_64::rela_irelative): New function.
(Output_data_plt_x86_64::address_for_global): New function.
(Output_data_plt_x86_64::address_for_local): New function.
(Output_data_plt_x86_64::set_final_data_size): Likewise.
(Output_data_plt_x86_64::do_write): Write out IRELATIVE area.
(Target_x86_64::init_got_plt_for_update): Create got_irelative_.
(Target_x86_64::register_global_plt_entry): Add symtab and layout
parameters.
(Target_x86_64::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_x86_64::do_finalize_sections): Create the __rela_iplt
symbols if we didn't create an IRELATIVE GOT.
(Target_x86_64::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_x86_64::do_dynsym_value): Use plt_address_for_global.
* testsuite/ifuncvar1.c: New test file.
* testsuite/ifuncvar2.c: New test file.
* testsuite/ifuncvar3.c: New test file.
* testsuite/Makefile.am (check_PROGRAMS): Add ifuncvar.
(ifuncvar1_pic.o, ifuncvar2_pic.o, ifuncvar.so): New targets.
(ifuncvar_SOURCES, ifuncvar_DEPENDENCIES): New variables.
(ifuncvar_LDFLAGS, ifuncvar_LDADD): New variables.
* testsuite/Makefile.in: Rebuild.
2011-07-09 06:48:08 +08:00
|
|
|
// If there are any IRELATIVE relocations, they get GOT entries
|
|
|
|
// in .got.plt after the jump slot relocations.
|
|
|
|
this->got_irelative_ = new Output_data_space(4, "** GOT IRELATIVE PLT");
|
|
|
|
layout->add_output_section_data(".got.plt", elfcpp::SHT_PROGBITS,
|
|
|
|
(elfcpp::SHF_ALLOC
|
|
|
|
| elfcpp::SHF_WRITE),
|
|
|
|
this->got_irelative_,
|
|
|
|
ORDER_NON_RELRO_FIRST, false);
|
|
|
|
|
2010-08-02 18:07:03 +08:00
|
|
|
// If there are any TLSDESC relocations, they get GOT entries in
|
|
|
|
// .got.plt after the jump slot entries.
|
|
|
|
this->got_tlsdesc_ = new Output_data_got<32, false>();
|
|
|
|
layout->add_output_section_data(".got.plt", elfcpp::SHT_PROGBITS,
|
|
|
|
(elfcpp::SHF_ALLOC
|
|
|
|
| elfcpp::SHF_WRITE),
|
2010-08-03 Ian Lance Taylor <iant@google.com>
PR 11805
* layout.h (enum Output_section_order): Define.
(class Layout): Update declarations.
* layout.cc (Layout::get_output_section): Add order parameter.
Remove is_interp, is_dynamic_linker_section, is_last_relro, and
is_first_non_relro parameters. Change all callers.
(Layout::choose_output_section): Likewise.
(Layout::add_output_section_data): Likewise.
(Layout::make_output_section): Likewise. Set order.
(Layout::default_section_order): New function.
(Layout::layout_eh_frame): Call add_output_section_to_nonload.
* output.cc (Output_section::Output_section): Initialize order_.
Don't initialize deleted fields.
(Output_segment::Output_segment): Don't initialize deleted
fields.
(Output_segment::add_output_section_to_load): New function
replacing add_output_section. Change all callers to call this or
add_output_section_to_nonload.
(Output_segment::add_output_section_to_nonload): New function.
(Output_segment::remove_output_section): Rewrite.
(Output_segment::add_initial_output_data): Likewise.
(Output_segment::has_any_data_sections): Likewise.
(Output_segment::is_first_section_relro): Likewise.
(Output_segment::maximum_alignment): Likewise.
(Output_segment::has_dynamic_reloc): New function replacing
dynamic_reloc_count. Change all callers.
(Output_segment::has_dynamic_reloc_list): New function replacing
dynamic_reloc_count_list. Change all callers.
(Output_segment::set_section_addresses): Rewrite.
(Output_segment::set_offset): Rewrite.
(Output_segment::find_first_and_last_list): Remove.
(Output_segment::set_tls_offsets): Rewrite.
(Output_segment::first_section_load_address): Likewise.
(Output_segment::output_section_count): Likewise.
(Output_segment::section_with_lowest_load_address): Likewise.
(Output_segment::write_section_headers): Likewise.
(Output_segment::print_sections_to_map): Likewise.
* output.h (class Output_data): Remove dynamic_reloc_count_
field. Add has_dynamic_reloc_ field. Make bools into bitfields.
(Output_data::add_dynamic_reloc): Rewrite.
(Output_data::has_dynamic_reloc): New function.
(Output_data::dynamic_reloc_count): Remove.
(class Output_section): Add order_ field. Remvoe is_relro_local_,
is_last_relro_, is_first_non_relro_, is_interp_,
is_dynamic_linker_section_ fields. Add order and set_order
functions. Remove is_relro_local, set_is_relro_local,
is_last_relro, set_is_last_relro, is_first_non_relro,
set_is_first_non_relro functions, is_interp, set_is_interp,
is_dynamic_linker_section, and set_is_dynamic_linker_section
functions.
(class Output_segment): Change Output_data_list from std::list to
std:;vector. Add output_lists_ field. Remove output_data_ and
output_bss_ fields. Update declarations.
2010-08-03 22:07:13 +08:00
|
|
|
this->got_tlsdesc_,
|
|
|
|
ORDER_NON_RELRO_FIRST, false);
|
2006-11-04 02:26:11 +08:00
|
|
|
}
|
2006-11-30 01:56:40 +08:00
|
|
|
|
2006-11-04 02:26:11 +08:00
|
|
|
return this->got_;
|
|
|
|
}
|
|
|
|
|
2006-12-01 07:52:50 +08:00
|
|
|
// Get the dynamic reloc section, creating it if necessary.
|
|
|
|
|
|
|
|
Target_i386::Reloc_section*
|
|
|
|
Target_i386::rel_dyn_section(Layout* layout)
|
|
|
|
{
|
|
|
|
if (this->rel_dyn_ == NULL)
|
|
|
|
{
|
|
|
|
gold_assert(layout != NULL);
|
2008-05-06 13:03:15 +08:00
|
|
|
this->rel_dyn_ = new Reloc_section(parameters->options().combreloc());
|
2006-12-01 07:52:50 +08:00
|
|
|
layout->add_output_section_data(".rel.dyn", elfcpp::SHT_REL,
|
2010-08-03 Ian Lance Taylor <iant@google.com>
PR 11805
* layout.h (enum Output_section_order): Define.
(class Layout): Update declarations.
* layout.cc (Layout::get_output_section): Add order parameter.
Remove is_interp, is_dynamic_linker_section, is_last_relro, and
is_first_non_relro parameters. Change all callers.
(Layout::choose_output_section): Likewise.
(Layout::add_output_section_data): Likewise.
(Layout::make_output_section): Likewise. Set order.
(Layout::default_section_order): New function.
(Layout::layout_eh_frame): Call add_output_section_to_nonload.
* output.cc (Output_section::Output_section): Initialize order_.
Don't initialize deleted fields.
(Output_segment::Output_segment): Don't initialize deleted
fields.
(Output_segment::add_output_section_to_load): New function
replacing add_output_section. Change all callers to call this or
add_output_section_to_nonload.
(Output_segment::add_output_section_to_nonload): New function.
(Output_segment::remove_output_section): Rewrite.
(Output_segment::add_initial_output_data): Likewise.
(Output_segment::has_any_data_sections): Likewise.
(Output_segment::is_first_section_relro): Likewise.
(Output_segment::maximum_alignment): Likewise.
(Output_segment::has_dynamic_reloc): New function replacing
dynamic_reloc_count. Change all callers.
(Output_segment::has_dynamic_reloc_list): New function replacing
dynamic_reloc_count_list. Change all callers.
(Output_segment::set_section_addresses): Rewrite.
(Output_segment::set_offset): Rewrite.
(Output_segment::find_first_and_last_list): Remove.
(Output_segment::set_tls_offsets): Rewrite.
(Output_segment::first_section_load_address): Likewise.
(Output_segment::output_section_count): Likewise.
(Output_segment::section_with_lowest_load_address): Likewise.
(Output_segment::write_section_headers): Likewise.
(Output_segment::print_sections_to_map): Likewise.
* output.h (class Output_data): Remove dynamic_reloc_count_
field. Add has_dynamic_reloc_ field. Make bools into bitfields.
(Output_data::add_dynamic_reloc): Rewrite.
(Output_data::has_dynamic_reloc): New function.
(Output_data::dynamic_reloc_count): Remove.
(class Output_section): Add order_ field. Remvoe is_relro_local_,
is_last_relro_, is_first_non_relro_, is_interp_,
is_dynamic_linker_section_ fields. Add order and set_order
functions. Remove is_relro_local, set_is_relro_local,
is_last_relro, set_is_last_relro, is_first_non_relro,
set_is_first_non_relro functions, is_interp, set_is_interp,
is_dynamic_linker_section, and set_is_dynamic_linker_section
functions.
(class Output_segment): Change Output_data_list from std::list to
std:;vector. Add output_lists_ field. Remove output_data_ and
output_bss_ fields. Update declarations.
2010-08-03 22:07:13 +08:00
|
|
|
elfcpp::SHF_ALLOC, this->rel_dyn_,
|
|
|
|
ORDER_DYNAMIC_RELOCS, false);
|
2006-12-01 07:52:50 +08:00
|
|
|
}
|
|
|
|
return this->rel_dyn_;
|
|
|
|
}
|
|
|
|
|
PR gold/12372
* target.h (Target::plt_address_for_global): New function.
(Target::plt_address_for_local): New function.
(Target::plt_section_for_global): Remove.
(Target::plt_section_for_local): Remove.
(Target::do_plt_address_for_global): New virtual function.
(Target::do_plt_address_for_local): New virtual function.
(Target::do_plt_section_for_global): Remove.
(Target::do_plt_section_for_local): Remove.
(Target::register_global_plt_entry): Add Symbol_table and Layout
parameters.
* output.cc (Output_data_got::Got_entry::write): Use
plt_address_for_global and plt_address_for_local.
* layout.cc (Layout::add_target_dynamic_tags): Use size and
address of output section.
* i386.cc (class Output_data_plt_i386): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_i386::has_irelative_section): New function.
(Output_data_plt_i386::entry_count): Add irelative_count_.
(Output_data_plt_i386::set_final_data_size): Likewise.
(class Target_i386): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_i386::Target_i386): Initialize new fields.
(Target_i386::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_i386::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_i386::got_section): Create got_irelative_.
(Target_i386::rel_irelative_section): New function.
(Output_data_plt_i386::Output_data_plt_i386): Initialize new
fields. Don't define __rel_iplt_{start,end}.
(Output_data_plt_i386::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_i386::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_i386::rel_tls_desc): Fix formatting.
(Output_data_plt_i386::rel_irelative): New function.
(Output_data_plt_i386::address_for_global): New function.
(Output_data_plt_i386::address_for_local): New function.
(Output_data_plt_i386::do_write): Write out IRELATIVE area. Use
IRELATIVE GOT when changing IFUNC GOT entries.
(Target_i386::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_i386::do_finalize_sections): Create the __rel_iplt symbols
if we didn't create an IRELATIVE GOT.
(Target_i386::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_i386::do_dynsym_value): Use plt_address_for_global.
* x86_64.cc (class Output_data_plt_x86_64): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_x86_64::Output_data_plt_x86_64) [both versions]:
Initialize new fields. Remove symtab parameter. Change all
callers.
(Output_data_plt_x86_64::get_tlsdesc_plt_offset): Add
irelative_count_.
(Output_data_plt_x86_64::has_irelative_section): New function.
(Output_data_plt_x86_64::entry_count): Add irelative_count_.
(class Target_x86_64): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_x86_64::Target_x86_64): Initialize new fields.
(Target_x86_64::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_x86_64::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_x86_64::got_section): Create got_irelative_.
(Target_x86_64::rela_irelative_section): New function.
(Output_data_plt_x86_64::init): Remove symtab parameter. Change
all callers. Don't create __rel_iplt_{start,end}.
(Output_data_plt_x86_64::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_x86_64::add_relocation): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::rela_tlsdesc): Fix formatting.
(Output_data_plt_x86_64::rela_irelative): New function.
(Output_data_plt_x86_64::address_for_global): New function.
(Output_data_plt_x86_64::address_for_local): New function.
(Output_data_plt_x86_64::set_final_data_size): Likewise.
(Output_data_plt_x86_64::do_write): Write out IRELATIVE area.
(Target_x86_64::init_got_plt_for_update): Create got_irelative_.
(Target_x86_64::register_global_plt_entry): Add symtab and layout
parameters.
(Target_x86_64::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_x86_64::do_finalize_sections): Create the __rela_iplt
symbols if we didn't create an IRELATIVE GOT.
(Target_x86_64::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_x86_64::do_dynsym_value): Use plt_address_for_global.
* testsuite/ifuncvar1.c: New test file.
* testsuite/ifuncvar2.c: New test file.
* testsuite/ifuncvar3.c: New test file.
* testsuite/Makefile.am (check_PROGRAMS): Add ifuncvar.
(ifuncvar1_pic.o, ifuncvar2_pic.o, ifuncvar.so): New targets.
(ifuncvar_SOURCES, ifuncvar_DEPENDENCIES): New variables.
(ifuncvar_LDFLAGS, ifuncvar_LDADD): New variables.
* testsuite/Makefile.in: Rebuild.
2011-07-09 06:48:08 +08:00
|
|
|
// Get the section to use for IRELATIVE relocs, creating it if
|
|
|
|
// necessary. These go in .rel.dyn, but only after all other dynamic
|
|
|
|
// relocations. They need to follow the other dynamic relocations so
|
|
|
|
// that they can refer to global variables initialized by those
|
|
|
|
// relocs.
|
|
|
|
|
|
|
|
Target_i386::Reloc_section*
|
|
|
|
Target_i386::rel_irelative_section(Layout* layout)
|
|
|
|
{
|
|
|
|
if (this->rel_irelative_ == NULL)
|
|
|
|
{
|
|
|
|
// Make sure we have already create the dynamic reloc section.
|
|
|
|
this->rel_dyn_section(layout);
|
|
|
|
this->rel_irelative_ = new Reloc_section(false);
|
|
|
|
layout->add_output_section_data(".rel.dyn", elfcpp::SHT_REL,
|
|
|
|
elfcpp::SHF_ALLOC, this->rel_irelative_,
|
|
|
|
ORDER_DYNAMIC_RELOCS, false);
|
|
|
|
gold_assert(this->rel_dyn_->output_section()
|
|
|
|
== this->rel_irelative_->output_section());
|
|
|
|
}
|
|
|
|
return this->rel_irelative_;
|
|
|
|
}
|
|
|
|
|
2006-11-30 01:56:40 +08:00
|
|
|
// Create the PLT section. The ordinary .got section is an argument,
|
|
|
|
// since we need to refer to the start. We also create our own .got
|
|
|
|
// section just for PLT entries.
|
|
|
|
|
PR gold/12372
* target.h (Target::plt_address_for_global): New function.
(Target::plt_address_for_local): New function.
(Target::plt_section_for_global): Remove.
(Target::plt_section_for_local): Remove.
(Target::do_plt_address_for_global): New virtual function.
(Target::do_plt_address_for_local): New virtual function.
(Target::do_plt_section_for_global): Remove.
(Target::do_plt_section_for_local): Remove.
(Target::register_global_plt_entry): Add Symbol_table and Layout
parameters.
* output.cc (Output_data_got::Got_entry::write): Use
plt_address_for_global and plt_address_for_local.
* layout.cc (Layout::add_target_dynamic_tags): Use size and
address of output section.
* i386.cc (class Output_data_plt_i386): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_i386::has_irelative_section): New function.
(Output_data_plt_i386::entry_count): Add irelative_count_.
(Output_data_plt_i386::set_final_data_size): Likewise.
(class Target_i386): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_i386::Target_i386): Initialize new fields.
(Target_i386::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_i386::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_i386::got_section): Create got_irelative_.
(Target_i386::rel_irelative_section): New function.
(Output_data_plt_i386::Output_data_plt_i386): Initialize new
fields. Don't define __rel_iplt_{start,end}.
(Output_data_plt_i386::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_i386::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_i386::rel_tls_desc): Fix formatting.
(Output_data_plt_i386::rel_irelative): New function.
(Output_data_plt_i386::address_for_global): New function.
(Output_data_plt_i386::address_for_local): New function.
(Output_data_plt_i386::do_write): Write out IRELATIVE area. Use
IRELATIVE GOT when changing IFUNC GOT entries.
(Target_i386::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_i386::do_finalize_sections): Create the __rel_iplt symbols
if we didn't create an IRELATIVE GOT.
(Target_i386::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_i386::do_dynsym_value): Use plt_address_for_global.
* x86_64.cc (class Output_data_plt_x86_64): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_x86_64::Output_data_plt_x86_64) [both versions]:
Initialize new fields. Remove symtab parameter. Change all
callers.
(Output_data_plt_x86_64::get_tlsdesc_plt_offset): Add
irelative_count_.
(Output_data_plt_x86_64::has_irelative_section): New function.
(Output_data_plt_x86_64::entry_count): Add irelative_count_.
(class Target_x86_64): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_x86_64::Target_x86_64): Initialize new fields.
(Target_x86_64::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_x86_64::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_x86_64::got_section): Create got_irelative_.
(Target_x86_64::rela_irelative_section): New function.
(Output_data_plt_x86_64::init): Remove symtab parameter. Change
all callers. Don't create __rel_iplt_{start,end}.
(Output_data_plt_x86_64::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_x86_64::add_relocation): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::rela_tlsdesc): Fix formatting.
(Output_data_plt_x86_64::rela_irelative): New function.
(Output_data_plt_x86_64::address_for_global): New function.
(Output_data_plt_x86_64::address_for_local): New function.
(Output_data_plt_x86_64::set_final_data_size): Likewise.
(Output_data_plt_x86_64::do_write): Write out IRELATIVE area.
(Target_x86_64::init_got_plt_for_update): Create got_irelative_.
(Target_x86_64::register_global_plt_entry): Add symtab and layout
parameters.
(Target_x86_64::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_x86_64::do_finalize_sections): Create the __rela_iplt
symbols if we didn't create an IRELATIVE GOT.
(Target_x86_64::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_x86_64::do_dynsym_value): Use plt_address_for_global.
* testsuite/ifuncvar1.c: New test file.
* testsuite/ifuncvar2.c: New test file.
* testsuite/ifuncvar3.c: New test file.
* testsuite/Makefile.am (check_PROGRAMS): Add ifuncvar.
(ifuncvar1_pic.o, ifuncvar2_pic.o, ifuncvar.so): New targets.
(ifuncvar_SOURCES, ifuncvar_DEPENDENCIES): New variables.
(ifuncvar_LDFLAGS, ifuncvar_LDADD): New variables.
* testsuite/Makefile.in: Rebuild.
2011-07-09 06:48:08 +08:00
|
|
|
Output_data_plt_i386::Output_data_plt_i386(Layout* layout,
|
|
|
|
Output_data_space* got_plt,
|
|
|
|
Output_data_space* got_irelative)
|
|
|
|
: Output_section_data(16), tls_desc_rel_(NULL), irelative_rel_(NULL),
|
|
|
|
got_plt_(got_plt), got_irelative_(got_irelative), count_(0),
|
|
|
|
irelative_count_(0), global_ifuncs_(), local_ifuncs_()
|
2006-11-30 01:56:40 +08:00
|
|
|
{
|
2008-05-06 13:03:15 +08:00
|
|
|
this->rel_ = new Reloc_section(false);
|
2006-11-30 01:56:40 +08:00
|
|
|
layout->add_output_section_data(".rel.plt", elfcpp::SHT_REL,
|
2010-08-03 Ian Lance Taylor <iant@google.com>
PR 11805
* layout.h (enum Output_section_order): Define.
(class Layout): Update declarations.
* layout.cc (Layout::get_output_section): Add order parameter.
Remove is_interp, is_dynamic_linker_section, is_last_relro, and
is_first_non_relro parameters. Change all callers.
(Layout::choose_output_section): Likewise.
(Layout::add_output_section_data): Likewise.
(Layout::make_output_section): Likewise. Set order.
(Layout::default_section_order): New function.
(Layout::layout_eh_frame): Call add_output_section_to_nonload.
* output.cc (Output_section::Output_section): Initialize order_.
Don't initialize deleted fields.
(Output_segment::Output_segment): Don't initialize deleted
fields.
(Output_segment::add_output_section_to_load): New function
replacing add_output_section. Change all callers to call this or
add_output_section_to_nonload.
(Output_segment::add_output_section_to_nonload): New function.
(Output_segment::remove_output_section): Rewrite.
(Output_segment::add_initial_output_data): Likewise.
(Output_segment::has_any_data_sections): Likewise.
(Output_segment::is_first_section_relro): Likewise.
(Output_segment::maximum_alignment): Likewise.
(Output_segment::has_dynamic_reloc): New function replacing
dynamic_reloc_count. Change all callers.
(Output_segment::has_dynamic_reloc_list): New function replacing
dynamic_reloc_count_list. Change all callers.
(Output_segment::set_section_addresses): Rewrite.
(Output_segment::set_offset): Rewrite.
(Output_segment::find_first_and_last_list): Remove.
(Output_segment::set_tls_offsets): Rewrite.
(Output_segment::first_section_load_address): Likewise.
(Output_segment::output_section_count): Likewise.
(Output_segment::section_with_lowest_load_address): Likewise.
(Output_segment::write_section_headers): Likewise.
(Output_segment::print_sections_to_map): Likewise.
* output.h (class Output_data): Remove dynamic_reloc_count_
field. Add has_dynamic_reloc_ field. Make bools into bitfields.
(Output_data::add_dynamic_reloc): Rewrite.
(Output_data::has_dynamic_reloc): New function.
(Output_data::dynamic_reloc_count): Remove.
(class Output_section): Add order_ field. Remvoe is_relro_local_,
is_last_relro_, is_first_non_relro_, is_interp_,
is_dynamic_linker_section_ fields. Add order and set_order
functions. Remove is_relro_local, set_is_relro_local,
is_last_relro, set_is_last_relro, is_first_non_relro,
set_is_first_non_relro functions, is_interp, set_is_interp,
is_dynamic_linker_section, and set_is_dynamic_linker_section
functions.
(class Output_segment): Change Output_data_list from std::list to
std:;vector. Add output_lists_ field. Remove output_data_ and
output_bss_ fields. Update declarations.
2010-08-03 22:07:13 +08:00
|
|
|
elfcpp::SHF_ALLOC, this->rel_,
|
|
|
|
ORDER_DYNAMIC_PLT_RELOCS, false);
|
2010-08-20 06:50:16 +08:00
|
|
|
|
PR gold/12571
* options.h (class General_options): Add
--ld-generated-unwind-info.
* ehframe.cc (Fde::write): Add address parameter. Change all
callers. If associated with PLT, fill in address and size.
(Cie::set_output_offset): Only add merge mapping if there is an
object.
(Cie::write): Add address parameter. Change all callers.
(Eh_frame::add_ehframe_for_plt): New function.
* ehframe.h (class Fde): Update declarations. Move shndx_ and
input_offset_ fields into union u_, with new plt field.
(Fde::Fde): Adjust for new union field.
(Fde::Fde) [Output_data version]: New constructor.
(Fde::add_mapping): Only add merge mapping if there is an object.
(class Cie): Update declarations.
(class Eh_frame): Declare add_ehframe_for_plt.
* layout.cc (Layout::layout_eh_frame): Break out code into
make_eh_frame_section, and call it.
(Layout::make_eh_frame_section): New function.
(Layout::add_eh_frame_for_plt): New function.
* layout.h (class Layout): Update declarations.
* merge.cc (Merge_map::add_mapping): Add assertion.
* i386.cc: Include "dwarf.h".
(class Output_data_plt_i386): Make first_plt_entry,
dyn_first_plt_entry, exec_plt_entry, and dyn_plt_entry const. Add
plt_eh_frame_cie_size, plt_eh_frame_fde_size, plt_eh_frame_cie,
and plt_eh_frame_fde.
(Output_data_plt_i386::Output_data_plt_i386): Align to 16-byte
boundary. Call add_eh_frame_for_plt if appropriate.
* x86_64.cc: Include "dwarf.h".
(class Output_data_plt_x86_64): Align to 16-byte boundary. Make
first_plt_entry, plt_entry and tlsdesc_plt_entry const. Add
plt_eh_frame_cie_size, plt_eh_frame_fde_size, plt_eh_frame_cie,
and plt_eh_frame_fde.
(Output_data_plt_x86_64::init): Call add_eh_frame_for_plt if
appropriate.
2011-07-02 06:05:01 +08:00
|
|
|
// Add unwind information if requested.
|
|
|
|
if (parameters->options().ld_generated_unwind_info())
|
|
|
|
layout->add_eh_frame_for_plt(this, plt_eh_frame_cie, plt_eh_frame_cie_size,
|
|
|
|
plt_eh_frame_fde, plt_eh_frame_fde_size);
|
2006-11-30 01:56:40 +08:00
|
|
|
}
|
|
|
|
|
2006-12-02 00:51:25 +08:00
|
|
|
void
|
|
|
|
Output_data_plt_i386::do_adjust_output_section(Output_section* os)
|
|
|
|
{
|
|
|
|
// UnixWare sets the entsize of .plt to 4, and so does the old GNU
|
|
|
|
// linker, and so do we.
|
|
|
|
os->set_entsize(4);
|
|
|
|
}
|
|
|
|
|
2006-11-30 01:56:40 +08:00
|
|
|
// Add an entry to the PLT.
|
|
|
|
|
|
|
|
void
|
PR gold/12372
* target.h (Target::plt_address_for_global): New function.
(Target::plt_address_for_local): New function.
(Target::plt_section_for_global): Remove.
(Target::plt_section_for_local): Remove.
(Target::do_plt_address_for_global): New virtual function.
(Target::do_plt_address_for_local): New virtual function.
(Target::do_plt_section_for_global): Remove.
(Target::do_plt_section_for_local): Remove.
(Target::register_global_plt_entry): Add Symbol_table and Layout
parameters.
* output.cc (Output_data_got::Got_entry::write): Use
plt_address_for_global and plt_address_for_local.
* layout.cc (Layout::add_target_dynamic_tags): Use size and
address of output section.
* i386.cc (class Output_data_plt_i386): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_i386::has_irelative_section): New function.
(Output_data_plt_i386::entry_count): Add irelative_count_.
(Output_data_plt_i386::set_final_data_size): Likewise.
(class Target_i386): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_i386::Target_i386): Initialize new fields.
(Target_i386::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_i386::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_i386::got_section): Create got_irelative_.
(Target_i386::rel_irelative_section): New function.
(Output_data_plt_i386::Output_data_plt_i386): Initialize new
fields. Don't define __rel_iplt_{start,end}.
(Output_data_plt_i386::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_i386::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_i386::rel_tls_desc): Fix formatting.
(Output_data_plt_i386::rel_irelative): New function.
(Output_data_plt_i386::address_for_global): New function.
(Output_data_plt_i386::address_for_local): New function.
(Output_data_plt_i386::do_write): Write out IRELATIVE area. Use
IRELATIVE GOT when changing IFUNC GOT entries.
(Target_i386::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_i386::do_finalize_sections): Create the __rel_iplt symbols
if we didn't create an IRELATIVE GOT.
(Target_i386::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_i386::do_dynsym_value): Use plt_address_for_global.
* x86_64.cc (class Output_data_plt_x86_64): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_x86_64::Output_data_plt_x86_64) [both versions]:
Initialize new fields. Remove symtab parameter. Change all
callers.
(Output_data_plt_x86_64::get_tlsdesc_plt_offset): Add
irelative_count_.
(Output_data_plt_x86_64::has_irelative_section): New function.
(Output_data_plt_x86_64::entry_count): Add irelative_count_.
(class Target_x86_64): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_x86_64::Target_x86_64): Initialize new fields.
(Target_x86_64::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_x86_64::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_x86_64::got_section): Create got_irelative_.
(Target_x86_64::rela_irelative_section): New function.
(Output_data_plt_x86_64::init): Remove symtab parameter. Change
all callers. Don't create __rel_iplt_{start,end}.
(Output_data_plt_x86_64::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_x86_64::add_relocation): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::rela_tlsdesc): Fix formatting.
(Output_data_plt_x86_64::rela_irelative): New function.
(Output_data_plt_x86_64::address_for_global): New function.
(Output_data_plt_x86_64::address_for_local): New function.
(Output_data_plt_x86_64::set_final_data_size): Likewise.
(Output_data_plt_x86_64::do_write): Write out IRELATIVE area.
(Target_x86_64::init_got_plt_for_update): Create got_irelative_.
(Target_x86_64::register_global_plt_entry): Add symtab and layout
parameters.
(Target_x86_64::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_x86_64::do_finalize_sections): Create the __rela_iplt
symbols if we didn't create an IRELATIVE GOT.
(Target_x86_64::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_x86_64::do_dynsym_value): Use plt_address_for_global.
* testsuite/ifuncvar1.c: New test file.
* testsuite/ifuncvar2.c: New test file.
* testsuite/ifuncvar3.c: New test file.
* testsuite/Makefile.am (check_PROGRAMS): Add ifuncvar.
(ifuncvar1_pic.o, ifuncvar2_pic.o, ifuncvar.so): New targets.
(ifuncvar_SOURCES, ifuncvar_DEPENDENCIES): New variables.
(ifuncvar_LDFLAGS, ifuncvar_LDADD): New variables.
* testsuite/Makefile.in: Rebuild.
2011-07-09 06:48:08 +08:00
|
|
|
Output_data_plt_i386::add_entry(Symbol_table* symtab, Layout* layout,
|
|
|
|
Symbol* gsym)
|
2006-11-30 01:56:40 +08:00
|
|
|
{
|
|
|
|
gold_assert(!gsym->has_plt_offset());
|
|
|
|
|
|
|
|
// Every PLT entry needs a reloc.
|
2010-08-20 06:50:16 +08:00
|
|
|
if (gsym->type() == elfcpp::STT_GNU_IFUNC
|
|
|
|
&& gsym->can_use_relative_reloc(false))
|
|
|
|
{
|
PR gold/12372
* target.h (Target::plt_address_for_global): New function.
(Target::plt_address_for_local): New function.
(Target::plt_section_for_global): Remove.
(Target::plt_section_for_local): Remove.
(Target::do_plt_address_for_global): New virtual function.
(Target::do_plt_address_for_local): New virtual function.
(Target::do_plt_section_for_global): Remove.
(Target::do_plt_section_for_local): Remove.
(Target::register_global_plt_entry): Add Symbol_table and Layout
parameters.
* output.cc (Output_data_got::Got_entry::write): Use
plt_address_for_global and plt_address_for_local.
* layout.cc (Layout::add_target_dynamic_tags): Use size and
address of output section.
* i386.cc (class Output_data_plt_i386): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_i386::has_irelative_section): New function.
(Output_data_plt_i386::entry_count): Add irelative_count_.
(Output_data_plt_i386::set_final_data_size): Likewise.
(class Target_i386): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_i386::Target_i386): Initialize new fields.
(Target_i386::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_i386::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_i386::got_section): Create got_irelative_.
(Target_i386::rel_irelative_section): New function.
(Output_data_plt_i386::Output_data_plt_i386): Initialize new
fields. Don't define __rel_iplt_{start,end}.
(Output_data_plt_i386::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_i386::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_i386::rel_tls_desc): Fix formatting.
(Output_data_plt_i386::rel_irelative): New function.
(Output_data_plt_i386::address_for_global): New function.
(Output_data_plt_i386::address_for_local): New function.
(Output_data_plt_i386::do_write): Write out IRELATIVE area. Use
IRELATIVE GOT when changing IFUNC GOT entries.
(Target_i386::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_i386::do_finalize_sections): Create the __rel_iplt symbols
if we didn't create an IRELATIVE GOT.
(Target_i386::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_i386::do_dynsym_value): Use plt_address_for_global.
* x86_64.cc (class Output_data_plt_x86_64): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_x86_64::Output_data_plt_x86_64) [both versions]:
Initialize new fields. Remove symtab parameter. Change all
callers.
(Output_data_plt_x86_64::get_tlsdesc_plt_offset): Add
irelative_count_.
(Output_data_plt_x86_64::has_irelative_section): New function.
(Output_data_plt_x86_64::entry_count): Add irelative_count_.
(class Target_x86_64): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_x86_64::Target_x86_64): Initialize new fields.
(Target_x86_64::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_x86_64::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_x86_64::got_section): Create got_irelative_.
(Target_x86_64::rela_irelative_section): New function.
(Output_data_plt_x86_64::init): Remove symtab parameter. Change
all callers. Don't create __rel_iplt_{start,end}.
(Output_data_plt_x86_64::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_x86_64::add_relocation): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::rela_tlsdesc): Fix formatting.
(Output_data_plt_x86_64::rela_irelative): New function.
(Output_data_plt_x86_64::address_for_global): New function.
(Output_data_plt_x86_64::address_for_local): New function.
(Output_data_plt_x86_64::set_final_data_size): Likewise.
(Output_data_plt_x86_64::do_write): Write out IRELATIVE area.
(Target_x86_64::init_got_plt_for_update): Create got_irelative_.
(Target_x86_64::register_global_plt_entry): Add symtab and layout
parameters.
(Target_x86_64::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_x86_64::do_finalize_sections): Create the __rela_iplt
symbols if we didn't create an IRELATIVE GOT.
(Target_x86_64::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_x86_64::do_dynsym_value): Use plt_address_for_global.
* testsuite/ifuncvar1.c: New test file.
* testsuite/ifuncvar2.c: New test file.
* testsuite/ifuncvar3.c: New test file.
* testsuite/Makefile.am (check_PROGRAMS): Add ifuncvar.
(ifuncvar1_pic.o, ifuncvar2_pic.o, ifuncvar.so): New targets.
(ifuncvar_SOURCES, ifuncvar_DEPENDENCIES): New variables.
(ifuncvar_LDFLAGS, ifuncvar_LDADD): New variables.
* testsuite/Makefile.in: Rebuild.
2011-07-09 06:48:08 +08:00
|
|
|
gsym->set_plt_offset(this->irelative_count_ * plt_entry_size);
|
|
|
|
++this->irelative_count_;
|
|
|
|
section_offset_type got_offset =
|
|
|
|
this->got_irelative_->current_data_size();
|
|
|
|
this->got_irelative_->set_current_data_size(got_offset + 4);
|
|
|
|
Reloc_section* rel = this->rel_irelative(symtab, layout);
|
|
|
|
rel->add_symbolless_global_addend(gsym, elfcpp::R_386_IRELATIVE,
|
|
|
|
this->got_irelative_, got_offset);
|
2010-08-20 06:50:16 +08:00
|
|
|
struct Global_ifunc gi;
|
|
|
|
gi.sym = gsym;
|
|
|
|
gi.got_offset = got_offset;
|
|
|
|
this->global_ifuncs_.push_back(gi);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
PR gold/12372
* target.h (Target::plt_address_for_global): New function.
(Target::plt_address_for_local): New function.
(Target::plt_section_for_global): Remove.
(Target::plt_section_for_local): Remove.
(Target::do_plt_address_for_global): New virtual function.
(Target::do_plt_address_for_local): New virtual function.
(Target::do_plt_section_for_global): Remove.
(Target::do_plt_section_for_local): Remove.
(Target::register_global_plt_entry): Add Symbol_table and Layout
parameters.
* output.cc (Output_data_got::Got_entry::write): Use
plt_address_for_global and plt_address_for_local.
* layout.cc (Layout::add_target_dynamic_tags): Use size and
address of output section.
* i386.cc (class Output_data_plt_i386): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_i386::has_irelative_section): New function.
(Output_data_plt_i386::entry_count): Add irelative_count_.
(Output_data_plt_i386::set_final_data_size): Likewise.
(class Target_i386): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_i386::Target_i386): Initialize new fields.
(Target_i386::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_i386::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_i386::got_section): Create got_irelative_.
(Target_i386::rel_irelative_section): New function.
(Output_data_plt_i386::Output_data_plt_i386): Initialize new
fields. Don't define __rel_iplt_{start,end}.
(Output_data_plt_i386::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_i386::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_i386::rel_tls_desc): Fix formatting.
(Output_data_plt_i386::rel_irelative): New function.
(Output_data_plt_i386::address_for_global): New function.
(Output_data_plt_i386::address_for_local): New function.
(Output_data_plt_i386::do_write): Write out IRELATIVE area. Use
IRELATIVE GOT when changing IFUNC GOT entries.
(Target_i386::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_i386::do_finalize_sections): Create the __rel_iplt symbols
if we didn't create an IRELATIVE GOT.
(Target_i386::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_i386::do_dynsym_value): Use plt_address_for_global.
* x86_64.cc (class Output_data_plt_x86_64): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_x86_64::Output_data_plt_x86_64) [both versions]:
Initialize new fields. Remove symtab parameter. Change all
callers.
(Output_data_plt_x86_64::get_tlsdesc_plt_offset): Add
irelative_count_.
(Output_data_plt_x86_64::has_irelative_section): New function.
(Output_data_plt_x86_64::entry_count): Add irelative_count_.
(class Target_x86_64): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_x86_64::Target_x86_64): Initialize new fields.
(Target_x86_64::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_x86_64::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_x86_64::got_section): Create got_irelative_.
(Target_x86_64::rela_irelative_section): New function.
(Output_data_plt_x86_64::init): Remove symtab parameter. Change
all callers. Don't create __rel_iplt_{start,end}.
(Output_data_plt_x86_64::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_x86_64::add_relocation): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::rela_tlsdesc): Fix formatting.
(Output_data_plt_x86_64::rela_irelative): New function.
(Output_data_plt_x86_64::address_for_global): New function.
(Output_data_plt_x86_64::address_for_local): New function.
(Output_data_plt_x86_64::set_final_data_size): Likewise.
(Output_data_plt_x86_64::do_write): Write out IRELATIVE area.
(Target_x86_64::init_got_plt_for_update): Create got_irelative_.
(Target_x86_64::register_global_plt_entry): Add symtab and layout
parameters.
(Target_x86_64::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_x86_64::do_finalize_sections): Create the __rela_iplt
symbols if we didn't create an IRELATIVE GOT.
(Target_x86_64::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_x86_64::do_dynsym_value): Use plt_address_for_global.
* testsuite/ifuncvar1.c: New test file.
* testsuite/ifuncvar2.c: New test file.
* testsuite/ifuncvar3.c: New test file.
* testsuite/Makefile.am (check_PROGRAMS): Add ifuncvar.
(ifuncvar1_pic.o, ifuncvar2_pic.o, ifuncvar.so): New targets.
(ifuncvar_SOURCES, ifuncvar_DEPENDENCIES): New variables.
(ifuncvar_LDFLAGS, ifuncvar_LDADD): New variables.
* testsuite/Makefile.in: Rebuild.
2011-07-09 06:48:08 +08:00
|
|
|
// When setting the PLT offset we skip the initial reserved PLT
|
|
|
|
// entry.
|
|
|
|
gsym->set_plt_offset((this->count_ + 1) * plt_entry_size);
|
|
|
|
|
|
|
|
++this->count_;
|
|
|
|
|
|
|
|
section_offset_type got_offset = this->got_plt_->current_data_size();
|
|
|
|
|
|
|
|
// Every PLT entry needs a GOT entry which points back to the
|
|
|
|
// PLT entry (this will be changed by the dynamic linker,
|
|
|
|
// normally lazily when the function is called).
|
|
|
|
this->got_plt_->set_current_data_size(got_offset + 4);
|
|
|
|
|
2010-08-20 06:50:16 +08:00
|
|
|
gsym->set_needs_dynsym_entry();
|
|
|
|
this->rel_->add_global(gsym, elfcpp::R_386_JUMP_SLOT, this->got_plt_,
|
|
|
|
got_offset);
|
|
|
|
}
|
2006-11-30 01:56:40 +08:00
|
|
|
|
|
|
|
// Note that we don't need to save the symbol. The contents of the
|
|
|
|
// PLT are independent of which symbols are used. The symbols only
|
|
|
|
// appear in the relocations.
|
|
|
|
}
|
|
|
|
|
2010-08-20 06:50:16 +08:00
|
|
|
// Add an entry to the PLT for a local STT_GNU_IFUNC symbol. Return
|
|
|
|
// the PLT offset.
|
|
|
|
|
|
|
|
unsigned int
|
2011-05-25 05:41:10 +08:00
|
|
|
Output_data_plt_i386::add_local_ifunc_entry(
|
PR gold/12372
* target.h (Target::plt_address_for_global): New function.
(Target::plt_address_for_local): New function.
(Target::plt_section_for_global): Remove.
(Target::plt_section_for_local): Remove.
(Target::do_plt_address_for_global): New virtual function.
(Target::do_plt_address_for_local): New virtual function.
(Target::do_plt_section_for_global): Remove.
(Target::do_plt_section_for_local): Remove.
(Target::register_global_plt_entry): Add Symbol_table and Layout
parameters.
* output.cc (Output_data_got::Got_entry::write): Use
plt_address_for_global and plt_address_for_local.
* layout.cc (Layout::add_target_dynamic_tags): Use size and
address of output section.
* i386.cc (class Output_data_plt_i386): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_i386::has_irelative_section): New function.
(Output_data_plt_i386::entry_count): Add irelative_count_.
(Output_data_plt_i386::set_final_data_size): Likewise.
(class Target_i386): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_i386::Target_i386): Initialize new fields.
(Target_i386::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_i386::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_i386::got_section): Create got_irelative_.
(Target_i386::rel_irelative_section): New function.
(Output_data_plt_i386::Output_data_plt_i386): Initialize new
fields. Don't define __rel_iplt_{start,end}.
(Output_data_plt_i386::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_i386::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_i386::rel_tls_desc): Fix formatting.
(Output_data_plt_i386::rel_irelative): New function.
(Output_data_plt_i386::address_for_global): New function.
(Output_data_plt_i386::address_for_local): New function.
(Output_data_plt_i386::do_write): Write out IRELATIVE area. Use
IRELATIVE GOT when changing IFUNC GOT entries.
(Target_i386::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_i386::do_finalize_sections): Create the __rel_iplt symbols
if we didn't create an IRELATIVE GOT.
(Target_i386::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_i386::do_dynsym_value): Use plt_address_for_global.
* x86_64.cc (class Output_data_plt_x86_64): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_x86_64::Output_data_plt_x86_64) [both versions]:
Initialize new fields. Remove symtab parameter. Change all
callers.
(Output_data_plt_x86_64::get_tlsdesc_plt_offset): Add
irelative_count_.
(Output_data_plt_x86_64::has_irelative_section): New function.
(Output_data_plt_x86_64::entry_count): Add irelative_count_.
(class Target_x86_64): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_x86_64::Target_x86_64): Initialize new fields.
(Target_x86_64::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_x86_64::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_x86_64::got_section): Create got_irelative_.
(Target_x86_64::rela_irelative_section): New function.
(Output_data_plt_x86_64::init): Remove symtab parameter. Change
all callers. Don't create __rel_iplt_{start,end}.
(Output_data_plt_x86_64::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_x86_64::add_relocation): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::rela_tlsdesc): Fix formatting.
(Output_data_plt_x86_64::rela_irelative): New function.
(Output_data_plt_x86_64::address_for_global): New function.
(Output_data_plt_x86_64::address_for_local): New function.
(Output_data_plt_x86_64::set_final_data_size): Likewise.
(Output_data_plt_x86_64::do_write): Write out IRELATIVE area.
(Target_x86_64::init_got_plt_for_update): Create got_irelative_.
(Target_x86_64::register_global_plt_entry): Add symtab and layout
parameters.
(Target_x86_64::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_x86_64::do_finalize_sections): Create the __rela_iplt
symbols if we didn't create an IRELATIVE GOT.
(Target_x86_64::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_x86_64::do_dynsym_value): Use plt_address_for_global.
* testsuite/ifuncvar1.c: New test file.
* testsuite/ifuncvar2.c: New test file.
* testsuite/ifuncvar3.c: New test file.
* testsuite/Makefile.am (check_PROGRAMS): Add ifuncvar.
(ifuncvar1_pic.o, ifuncvar2_pic.o, ifuncvar.so): New targets.
(ifuncvar_SOURCES, ifuncvar_DEPENDENCIES): New variables.
(ifuncvar_LDFLAGS, ifuncvar_LDADD): New variables.
* testsuite/Makefile.in: Rebuild.
2011-07-09 06:48:08 +08:00
|
|
|
Symbol_table* symtab,
|
|
|
|
Layout* layout,
|
2011-05-25 05:41:10 +08:00
|
|
|
Sized_relobj_file<32, false>* relobj,
|
|
|
|
unsigned int local_sym_index)
|
2010-08-20 06:50:16 +08:00
|
|
|
{
|
PR gold/12372
* target.h (Target::plt_address_for_global): New function.
(Target::plt_address_for_local): New function.
(Target::plt_section_for_global): Remove.
(Target::plt_section_for_local): Remove.
(Target::do_plt_address_for_global): New virtual function.
(Target::do_plt_address_for_local): New virtual function.
(Target::do_plt_section_for_global): Remove.
(Target::do_plt_section_for_local): Remove.
(Target::register_global_plt_entry): Add Symbol_table and Layout
parameters.
* output.cc (Output_data_got::Got_entry::write): Use
plt_address_for_global and plt_address_for_local.
* layout.cc (Layout::add_target_dynamic_tags): Use size and
address of output section.
* i386.cc (class Output_data_plt_i386): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_i386::has_irelative_section): New function.
(Output_data_plt_i386::entry_count): Add irelative_count_.
(Output_data_plt_i386::set_final_data_size): Likewise.
(class Target_i386): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_i386::Target_i386): Initialize new fields.
(Target_i386::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_i386::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_i386::got_section): Create got_irelative_.
(Target_i386::rel_irelative_section): New function.
(Output_data_plt_i386::Output_data_plt_i386): Initialize new
fields. Don't define __rel_iplt_{start,end}.
(Output_data_plt_i386::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_i386::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_i386::rel_tls_desc): Fix formatting.
(Output_data_plt_i386::rel_irelative): New function.
(Output_data_plt_i386::address_for_global): New function.
(Output_data_plt_i386::address_for_local): New function.
(Output_data_plt_i386::do_write): Write out IRELATIVE area. Use
IRELATIVE GOT when changing IFUNC GOT entries.
(Target_i386::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_i386::do_finalize_sections): Create the __rel_iplt symbols
if we didn't create an IRELATIVE GOT.
(Target_i386::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_i386::do_dynsym_value): Use plt_address_for_global.
* x86_64.cc (class Output_data_plt_x86_64): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_x86_64::Output_data_plt_x86_64) [both versions]:
Initialize new fields. Remove symtab parameter. Change all
callers.
(Output_data_plt_x86_64::get_tlsdesc_plt_offset): Add
irelative_count_.
(Output_data_plt_x86_64::has_irelative_section): New function.
(Output_data_plt_x86_64::entry_count): Add irelative_count_.
(class Target_x86_64): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_x86_64::Target_x86_64): Initialize new fields.
(Target_x86_64::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_x86_64::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_x86_64::got_section): Create got_irelative_.
(Target_x86_64::rela_irelative_section): New function.
(Output_data_plt_x86_64::init): Remove symtab parameter. Change
all callers. Don't create __rel_iplt_{start,end}.
(Output_data_plt_x86_64::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_x86_64::add_relocation): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::rela_tlsdesc): Fix formatting.
(Output_data_plt_x86_64::rela_irelative): New function.
(Output_data_plt_x86_64::address_for_global): New function.
(Output_data_plt_x86_64::address_for_local): New function.
(Output_data_plt_x86_64::set_final_data_size): Likewise.
(Output_data_plt_x86_64::do_write): Write out IRELATIVE area.
(Target_x86_64::init_got_plt_for_update): Create got_irelative_.
(Target_x86_64::register_global_plt_entry): Add symtab and layout
parameters.
(Target_x86_64::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_x86_64::do_finalize_sections): Create the __rela_iplt
symbols if we didn't create an IRELATIVE GOT.
(Target_x86_64::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_x86_64::do_dynsym_value): Use plt_address_for_global.
* testsuite/ifuncvar1.c: New test file.
* testsuite/ifuncvar2.c: New test file.
* testsuite/ifuncvar3.c: New test file.
* testsuite/Makefile.am (check_PROGRAMS): Add ifuncvar.
(ifuncvar1_pic.o, ifuncvar2_pic.o, ifuncvar.so): New targets.
(ifuncvar_SOURCES, ifuncvar_DEPENDENCIES): New variables.
(ifuncvar_LDFLAGS, ifuncvar_LDADD): New variables.
* testsuite/Makefile.in: Rebuild.
2011-07-09 06:48:08 +08:00
|
|
|
unsigned int plt_offset = this->irelative_count_ * plt_entry_size;
|
|
|
|
++this->irelative_count_;
|
2010-08-20 06:50:16 +08:00
|
|
|
|
PR gold/12372
* target.h (Target::plt_address_for_global): New function.
(Target::plt_address_for_local): New function.
(Target::plt_section_for_global): Remove.
(Target::plt_section_for_local): Remove.
(Target::do_plt_address_for_global): New virtual function.
(Target::do_plt_address_for_local): New virtual function.
(Target::do_plt_section_for_global): Remove.
(Target::do_plt_section_for_local): Remove.
(Target::register_global_plt_entry): Add Symbol_table and Layout
parameters.
* output.cc (Output_data_got::Got_entry::write): Use
plt_address_for_global and plt_address_for_local.
* layout.cc (Layout::add_target_dynamic_tags): Use size and
address of output section.
* i386.cc (class Output_data_plt_i386): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_i386::has_irelative_section): New function.
(Output_data_plt_i386::entry_count): Add irelative_count_.
(Output_data_plt_i386::set_final_data_size): Likewise.
(class Target_i386): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_i386::Target_i386): Initialize new fields.
(Target_i386::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_i386::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_i386::got_section): Create got_irelative_.
(Target_i386::rel_irelative_section): New function.
(Output_data_plt_i386::Output_data_plt_i386): Initialize new
fields. Don't define __rel_iplt_{start,end}.
(Output_data_plt_i386::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_i386::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_i386::rel_tls_desc): Fix formatting.
(Output_data_plt_i386::rel_irelative): New function.
(Output_data_plt_i386::address_for_global): New function.
(Output_data_plt_i386::address_for_local): New function.
(Output_data_plt_i386::do_write): Write out IRELATIVE area. Use
IRELATIVE GOT when changing IFUNC GOT entries.
(Target_i386::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_i386::do_finalize_sections): Create the __rel_iplt symbols
if we didn't create an IRELATIVE GOT.
(Target_i386::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_i386::do_dynsym_value): Use plt_address_for_global.
* x86_64.cc (class Output_data_plt_x86_64): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_x86_64::Output_data_plt_x86_64) [both versions]:
Initialize new fields. Remove symtab parameter. Change all
callers.
(Output_data_plt_x86_64::get_tlsdesc_plt_offset): Add
irelative_count_.
(Output_data_plt_x86_64::has_irelative_section): New function.
(Output_data_plt_x86_64::entry_count): Add irelative_count_.
(class Target_x86_64): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_x86_64::Target_x86_64): Initialize new fields.
(Target_x86_64::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_x86_64::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_x86_64::got_section): Create got_irelative_.
(Target_x86_64::rela_irelative_section): New function.
(Output_data_plt_x86_64::init): Remove symtab parameter. Change
all callers. Don't create __rel_iplt_{start,end}.
(Output_data_plt_x86_64::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_x86_64::add_relocation): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::rela_tlsdesc): Fix formatting.
(Output_data_plt_x86_64::rela_irelative): New function.
(Output_data_plt_x86_64::address_for_global): New function.
(Output_data_plt_x86_64::address_for_local): New function.
(Output_data_plt_x86_64::set_final_data_size): Likewise.
(Output_data_plt_x86_64::do_write): Write out IRELATIVE area.
(Target_x86_64::init_got_plt_for_update): Create got_irelative_.
(Target_x86_64::register_global_plt_entry): Add symtab and layout
parameters.
(Target_x86_64::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_x86_64::do_finalize_sections): Create the __rela_iplt
symbols if we didn't create an IRELATIVE GOT.
(Target_x86_64::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_x86_64::do_dynsym_value): Use plt_address_for_global.
* testsuite/ifuncvar1.c: New test file.
* testsuite/ifuncvar2.c: New test file.
* testsuite/ifuncvar3.c: New test file.
* testsuite/Makefile.am (check_PROGRAMS): Add ifuncvar.
(ifuncvar1_pic.o, ifuncvar2_pic.o, ifuncvar.so): New targets.
(ifuncvar_SOURCES, ifuncvar_DEPENDENCIES): New variables.
(ifuncvar_LDFLAGS, ifuncvar_LDADD): New variables.
* testsuite/Makefile.in: Rebuild.
2011-07-09 06:48:08 +08:00
|
|
|
section_offset_type got_offset = this->got_irelative_->current_data_size();
|
2010-08-20 06:50:16 +08:00
|
|
|
|
|
|
|
// Every PLT entry needs a GOT entry which points back to the PLT
|
|
|
|
// entry.
|
PR gold/12372
* target.h (Target::plt_address_for_global): New function.
(Target::plt_address_for_local): New function.
(Target::plt_section_for_global): Remove.
(Target::plt_section_for_local): Remove.
(Target::do_plt_address_for_global): New virtual function.
(Target::do_plt_address_for_local): New virtual function.
(Target::do_plt_section_for_global): Remove.
(Target::do_plt_section_for_local): Remove.
(Target::register_global_plt_entry): Add Symbol_table and Layout
parameters.
* output.cc (Output_data_got::Got_entry::write): Use
plt_address_for_global and plt_address_for_local.
* layout.cc (Layout::add_target_dynamic_tags): Use size and
address of output section.
* i386.cc (class Output_data_plt_i386): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_i386::has_irelative_section): New function.
(Output_data_plt_i386::entry_count): Add irelative_count_.
(Output_data_plt_i386::set_final_data_size): Likewise.
(class Target_i386): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_i386::Target_i386): Initialize new fields.
(Target_i386::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_i386::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_i386::got_section): Create got_irelative_.
(Target_i386::rel_irelative_section): New function.
(Output_data_plt_i386::Output_data_plt_i386): Initialize new
fields. Don't define __rel_iplt_{start,end}.
(Output_data_plt_i386::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_i386::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_i386::rel_tls_desc): Fix formatting.
(Output_data_plt_i386::rel_irelative): New function.
(Output_data_plt_i386::address_for_global): New function.
(Output_data_plt_i386::address_for_local): New function.
(Output_data_plt_i386::do_write): Write out IRELATIVE area. Use
IRELATIVE GOT when changing IFUNC GOT entries.
(Target_i386::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_i386::do_finalize_sections): Create the __rel_iplt symbols
if we didn't create an IRELATIVE GOT.
(Target_i386::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_i386::do_dynsym_value): Use plt_address_for_global.
* x86_64.cc (class Output_data_plt_x86_64): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_x86_64::Output_data_plt_x86_64) [both versions]:
Initialize new fields. Remove symtab parameter. Change all
callers.
(Output_data_plt_x86_64::get_tlsdesc_plt_offset): Add
irelative_count_.
(Output_data_plt_x86_64::has_irelative_section): New function.
(Output_data_plt_x86_64::entry_count): Add irelative_count_.
(class Target_x86_64): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_x86_64::Target_x86_64): Initialize new fields.
(Target_x86_64::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_x86_64::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_x86_64::got_section): Create got_irelative_.
(Target_x86_64::rela_irelative_section): New function.
(Output_data_plt_x86_64::init): Remove symtab parameter. Change
all callers. Don't create __rel_iplt_{start,end}.
(Output_data_plt_x86_64::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_x86_64::add_relocation): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::rela_tlsdesc): Fix formatting.
(Output_data_plt_x86_64::rela_irelative): New function.
(Output_data_plt_x86_64::address_for_global): New function.
(Output_data_plt_x86_64::address_for_local): New function.
(Output_data_plt_x86_64::set_final_data_size): Likewise.
(Output_data_plt_x86_64::do_write): Write out IRELATIVE area.
(Target_x86_64::init_got_plt_for_update): Create got_irelative_.
(Target_x86_64::register_global_plt_entry): Add symtab and layout
parameters.
(Target_x86_64::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_x86_64::do_finalize_sections): Create the __rela_iplt
symbols if we didn't create an IRELATIVE GOT.
(Target_x86_64::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_x86_64::do_dynsym_value): Use plt_address_for_global.
* testsuite/ifuncvar1.c: New test file.
* testsuite/ifuncvar2.c: New test file.
* testsuite/ifuncvar3.c: New test file.
* testsuite/Makefile.am (check_PROGRAMS): Add ifuncvar.
(ifuncvar1_pic.o, ifuncvar2_pic.o, ifuncvar.so): New targets.
(ifuncvar_SOURCES, ifuncvar_DEPENDENCIES): New variables.
(ifuncvar_LDFLAGS, ifuncvar_LDADD): New variables.
* testsuite/Makefile.in: Rebuild.
2011-07-09 06:48:08 +08:00
|
|
|
this->got_irelative_->set_current_data_size(got_offset + 4);
|
2010-08-20 06:50:16 +08:00
|
|
|
|
|
|
|
// Every PLT entry needs a reloc.
|
PR gold/12372
* target.h (Target::plt_address_for_global): New function.
(Target::plt_address_for_local): New function.
(Target::plt_section_for_global): Remove.
(Target::plt_section_for_local): Remove.
(Target::do_plt_address_for_global): New virtual function.
(Target::do_plt_address_for_local): New virtual function.
(Target::do_plt_section_for_global): Remove.
(Target::do_plt_section_for_local): Remove.
(Target::register_global_plt_entry): Add Symbol_table and Layout
parameters.
* output.cc (Output_data_got::Got_entry::write): Use
plt_address_for_global and plt_address_for_local.
* layout.cc (Layout::add_target_dynamic_tags): Use size and
address of output section.
* i386.cc (class Output_data_plt_i386): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_i386::has_irelative_section): New function.
(Output_data_plt_i386::entry_count): Add irelative_count_.
(Output_data_plt_i386::set_final_data_size): Likewise.
(class Target_i386): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_i386::Target_i386): Initialize new fields.
(Target_i386::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_i386::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_i386::got_section): Create got_irelative_.
(Target_i386::rel_irelative_section): New function.
(Output_data_plt_i386::Output_data_plt_i386): Initialize new
fields. Don't define __rel_iplt_{start,end}.
(Output_data_plt_i386::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_i386::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_i386::rel_tls_desc): Fix formatting.
(Output_data_plt_i386::rel_irelative): New function.
(Output_data_plt_i386::address_for_global): New function.
(Output_data_plt_i386::address_for_local): New function.
(Output_data_plt_i386::do_write): Write out IRELATIVE area. Use
IRELATIVE GOT when changing IFUNC GOT entries.
(Target_i386::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_i386::do_finalize_sections): Create the __rel_iplt symbols
if we didn't create an IRELATIVE GOT.
(Target_i386::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_i386::do_dynsym_value): Use plt_address_for_global.
* x86_64.cc (class Output_data_plt_x86_64): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_x86_64::Output_data_plt_x86_64) [both versions]:
Initialize new fields. Remove symtab parameter. Change all
callers.
(Output_data_plt_x86_64::get_tlsdesc_plt_offset): Add
irelative_count_.
(Output_data_plt_x86_64::has_irelative_section): New function.
(Output_data_plt_x86_64::entry_count): Add irelative_count_.
(class Target_x86_64): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_x86_64::Target_x86_64): Initialize new fields.
(Target_x86_64::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_x86_64::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_x86_64::got_section): Create got_irelative_.
(Target_x86_64::rela_irelative_section): New function.
(Output_data_plt_x86_64::init): Remove symtab parameter. Change
all callers. Don't create __rel_iplt_{start,end}.
(Output_data_plt_x86_64::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_x86_64::add_relocation): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::rela_tlsdesc): Fix formatting.
(Output_data_plt_x86_64::rela_irelative): New function.
(Output_data_plt_x86_64::address_for_global): New function.
(Output_data_plt_x86_64::address_for_local): New function.
(Output_data_plt_x86_64::set_final_data_size): Likewise.
(Output_data_plt_x86_64::do_write): Write out IRELATIVE area.
(Target_x86_64::init_got_plt_for_update): Create got_irelative_.
(Target_x86_64::register_global_plt_entry): Add symtab and layout
parameters.
(Target_x86_64::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_x86_64::do_finalize_sections): Create the __rela_iplt
symbols if we didn't create an IRELATIVE GOT.
(Target_x86_64::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_x86_64::do_dynsym_value): Use plt_address_for_global.
* testsuite/ifuncvar1.c: New test file.
* testsuite/ifuncvar2.c: New test file.
* testsuite/ifuncvar3.c: New test file.
* testsuite/Makefile.am (check_PROGRAMS): Add ifuncvar.
(ifuncvar1_pic.o, ifuncvar2_pic.o, ifuncvar.so): New targets.
(ifuncvar_SOURCES, ifuncvar_DEPENDENCIES): New variables.
(ifuncvar_LDFLAGS, ifuncvar_LDADD): New variables.
* testsuite/Makefile.in: Rebuild.
2011-07-09 06:48:08 +08:00
|
|
|
Reloc_section* rel = this->rel_irelative(symtab, layout);
|
|
|
|
rel->add_symbolless_local_addend(relobj, local_sym_index,
|
|
|
|
elfcpp::R_386_IRELATIVE,
|
|
|
|
this->got_irelative_, got_offset);
|
2010-08-20 06:50:16 +08:00
|
|
|
|
|
|
|
struct Local_ifunc li;
|
|
|
|
li.object = relobj;
|
|
|
|
li.local_sym_index = local_sym_index;
|
|
|
|
li.got_offset = got_offset;
|
|
|
|
this->local_ifuncs_.push_back(li);
|
|
|
|
|
|
|
|
return plt_offset;
|
|
|
|
}
|
|
|
|
|
2010-01-09 03:33:18 +08:00
|
|
|
// Return where the TLS_DESC relocations should go, creating it if
|
|
|
|
// necessary. These follow the JUMP_SLOT relocations.
|
|
|
|
|
|
|
|
Output_data_plt_i386::Reloc_section*
|
|
|
|
Output_data_plt_i386::rel_tls_desc(Layout* layout)
|
|
|
|
{
|
|
|
|
if (this->tls_desc_rel_ == NULL)
|
|
|
|
{
|
|
|
|
this->tls_desc_rel_ = new Reloc_section(false);
|
|
|
|
layout->add_output_section_data(".rel.plt", elfcpp::SHT_REL,
|
|
|
|
elfcpp::SHF_ALLOC, this->tls_desc_rel_,
|
2010-08-03 Ian Lance Taylor <iant@google.com>
PR 11805
* layout.h (enum Output_section_order): Define.
(class Layout): Update declarations.
* layout.cc (Layout::get_output_section): Add order parameter.
Remove is_interp, is_dynamic_linker_section, is_last_relro, and
is_first_non_relro parameters. Change all callers.
(Layout::choose_output_section): Likewise.
(Layout::add_output_section_data): Likewise.
(Layout::make_output_section): Likewise. Set order.
(Layout::default_section_order): New function.
(Layout::layout_eh_frame): Call add_output_section_to_nonload.
* output.cc (Output_section::Output_section): Initialize order_.
Don't initialize deleted fields.
(Output_segment::Output_segment): Don't initialize deleted
fields.
(Output_segment::add_output_section_to_load): New function
replacing add_output_section. Change all callers to call this or
add_output_section_to_nonload.
(Output_segment::add_output_section_to_nonload): New function.
(Output_segment::remove_output_section): Rewrite.
(Output_segment::add_initial_output_data): Likewise.
(Output_segment::has_any_data_sections): Likewise.
(Output_segment::is_first_section_relro): Likewise.
(Output_segment::maximum_alignment): Likewise.
(Output_segment::has_dynamic_reloc): New function replacing
dynamic_reloc_count. Change all callers.
(Output_segment::has_dynamic_reloc_list): New function replacing
dynamic_reloc_count_list. Change all callers.
(Output_segment::set_section_addresses): Rewrite.
(Output_segment::set_offset): Rewrite.
(Output_segment::find_first_and_last_list): Remove.
(Output_segment::set_tls_offsets): Rewrite.
(Output_segment::first_section_load_address): Likewise.
(Output_segment::output_section_count): Likewise.
(Output_segment::section_with_lowest_load_address): Likewise.
(Output_segment::write_section_headers): Likewise.
(Output_segment::print_sections_to_map): Likewise.
* output.h (class Output_data): Remove dynamic_reloc_count_
field. Add has_dynamic_reloc_ field. Make bools into bitfields.
(Output_data::add_dynamic_reloc): Rewrite.
(Output_data::has_dynamic_reloc): New function.
(Output_data::dynamic_reloc_count): Remove.
(class Output_section): Add order_ field. Remvoe is_relro_local_,
is_last_relro_, is_first_non_relro_, is_interp_,
is_dynamic_linker_section_ fields. Add order and set_order
functions. Remove is_relro_local, set_is_relro_local,
is_last_relro, set_is_last_relro, is_first_non_relro,
set_is_first_non_relro functions, is_interp, set_is_interp,
is_dynamic_linker_section, and set_is_dynamic_linker_section
functions.
(class Output_segment): Change Output_data_list from std::list to
std:;vector. Add output_lists_ field. Remove output_data_ and
output_bss_ fields. Update declarations.
2010-08-03 22:07:13 +08:00
|
|
|
ORDER_DYNAMIC_PLT_RELOCS, false);
|
PR gold/12372
* target.h (Target::plt_address_for_global): New function.
(Target::plt_address_for_local): New function.
(Target::plt_section_for_global): Remove.
(Target::plt_section_for_local): Remove.
(Target::do_plt_address_for_global): New virtual function.
(Target::do_plt_address_for_local): New virtual function.
(Target::do_plt_section_for_global): Remove.
(Target::do_plt_section_for_local): Remove.
(Target::register_global_plt_entry): Add Symbol_table and Layout
parameters.
* output.cc (Output_data_got::Got_entry::write): Use
plt_address_for_global and plt_address_for_local.
* layout.cc (Layout::add_target_dynamic_tags): Use size and
address of output section.
* i386.cc (class Output_data_plt_i386): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_i386::has_irelative_section): New function.
(Output_data_plt_i386::entry_count): Add irelative_count_.
(Output_data_plt_i386::set_final_data_size): Likewise.
(class Target_i386): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_i386::Target_i386): Initialize new fields.
(Target_i386::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_i386::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_i386::got_section): Create got_irelative_.
(Target_i386::rel_irelative_section): New function.
(Output_data_plt_i386::Output_data_plt_i386): Initialize new
fields. Don't define __rel_iplt_{start,end}.
(Output_data_plt_i386::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_i386::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_i386::rel_tls_desc): Fix formatting.
(Output_data_plt_i386::rel_irelative): New function.
(Output_data_plt_i386::address_for_global): New function.
(Output_data_plt_i386::address_for_local): New function.
(Output_data_plt_i386::do_write): Write out IRELATIVE area. Use
IRELATIVE GOT when changing IFUNC GOT entries.
(Target_i386::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_i386::do_finalize_sections): Create the __rel_iplt symbols
if we didn't create an IRELATIVE GOT.
(Target_i386::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_i386::do_dynsym_value): Use plt_address_for_global.
* x86_64.cc (class Output_data_plt_x86_64): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_x86_64::Output_data_plt_x86_64) [both versions]:
Initialize new fields. Remove symtab parameter. Change all
callers.
(Output_data_plt_x86_64::get_tlsdesc_plt_offset): Add
irelative_count_.
(Output_data_plt_x86_64::has_irelative_section): New function.
(Output_data_plt_x86_64::entry_count): Add irelative_count_.
(class Target_x86_64): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_x86_64::Target_x86_64): Initialize new fields.
(Target_x86_64::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_x86_64::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_x86_64::got_section): Create got_irelative_.
(Target_x86_64::rela_irelative_section): New function.
(Output_data_plt_x86_64::init): Remove symtab parameter. Change
all callers. Don't create __rel_iplt_{start,end}.
(Output_data_plt_x86_64::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_x86_64::add_relocation): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::rela_tlsdesc): Fix formatting.
(Output_data_plt_x86_64::rela_irelative): New function.
(Output_data_plt_x86_64::address_for_global): New function.
(Output_data_plt_x86_64::address_for_local): New function.
(Output_data_plt_x86_64::set_final_data_size): Likewise.
(Output_data_plt_x86_64::do_write): Write out IRELATIVE area.
(Target_x86_64::init_got_plt_for_update): Create got_irelative_.
(Target_x86_64::register_global_plt_entry): Add symtab and layout
parameters.
(Target_x86_64::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_x86_64::do_finalize_sections): Create the __rela_iplt
symbols if we didn't create an IRELATIVE GOT.
(Target_x86_64::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_x86_64::do_dynsym_value): Use plt_address_for_global.
* testsuite/ifuncvar1.c: New test file.
* testsuite/ifuncvar2.c: New test file.
* testsuite/ifuncvar3.c: New test file.
* testsuite/Makefile.am (check_PROGRAMS): Add ifuncvar.
(ifuncvar1_pic.o, ifuncvar2_pic.o, ifuncvar.so): New targets.
(ifuncvar_SOURCES, ifuncvar_DEPENDENCIES): New variables.
(ifuncvar_LDFLAGS, ifuncvar_LDADD): New variables.
* testsuite/Makefile.in: Rebuild.
2011-07-09 06:48:08 +08:00
|
|
|
gold_assert(this->tls_desc_rel_->output_section()
|
|
|
|
== this->rel_->output_section());
|
2010-01-09 03:33:18 +08:00
|
|
|
}
|
|
|
|
return this->tls_desc_rel_;
|
|
|
|
}
|
|
|
|
|
PR gold/12372
* target.h (Target::plt_address_for_global): New function.
(Target::plt_address_for_local): New function.
(Target::plt_section_for_global): Remove.
(Target::plt_section_for_local): Remove.
(Target::do_plt_address_for_global): New virtual function.
(Target::do_plt_address_for_local): New virtual function.
(Target::do_plt_section_for_global): Remove.
(Target::do_plt_section_for_local): Remove.
(Target::register_global_plt_entry): Add Symbol_table and Layout
parameters.
* output.cc (Output_data_got::Got_entry::write): Use
plt_address_for_global and plt_address_for_local.
* layout.cc (Layout::add_target_dynamic_tags): Use size and
address of output section.
* i386.cc (class Output_data_plt_i386): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_i386::has_irelative_section): New function.
(Output_data_plt_i386::entry_count): Add irelative_count_.
(Output_data_plt_i386::set_final_data_size): Likewise.
(class Target_i386): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_i386::Target_i386): Initialize new fields.
(Target_i386::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_i386::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_i386::got_section): Create got_irelative_.
(Target_i386::rel_irelative_section): New function.
(Output_data_plt_i386::Output_data_plt_i386): Initialize new
fields. Don't define __rel_iplt_{start,end}.
(Output_data_plt_i386::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_i386::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_i386::rel_tls_desc): Fix formatting.
(Output_data_plt_i386::rel_irelative): New function.
(Output_data_plt_i386::address_for_global): New function.
(Output_data_plt_i386::address_for_local): New function.
(Output_data_plt_i386::do_write): Write out IRELATIVE area. Use
IRELATIVE GOT when changing IFUNC GOT entries.
(Target_i386::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_i386::do_finalize_sections): Create the __rel_iplt symbols
if we didn't create an IRELATIVE GOT.
(Target_i386::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_i386::do_dynsym_value): Use plt_address_for_global.
* x86_64.cc (class Output_data_plt_x86_64): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_x86_64::Output_data_plt_x86_64) [both versions]:
Initialize new fields. Remove symtab parameter. Change all
callers.
(Output_data_plt_x86_64::get_tlsdesc_plt_offset): Add
irelative_count_.
(Output_data_plt_x86_64::has_irelative_section): New function.
(Output_data_plt_x86_64::entry_count): Add irelative_count_.
(class Target_x86_64): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_x86_64::Target_x86_64): Initialize new fields.
(Target_x86_64::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_x86_64::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_x86_64::got_section): Create got_irelative_.
(Target_x86_64::rela_irelative_section): New function.
(Output_data_plt_x86_64::init): Remove symtab parameter. Change
all callers. Don't create __rel_iplt_{start,end}.
(Output_data_plt_x86_64::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_x86_64::add_relocation): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::rela_tlsdesc): Fix formatting.
(Output_data_plt_x86_64::rela_irelative): New function.
(Output_data_plt_x86_64::address_for_global): New function.
(Output_data_plt_x86_64::address_for_local): New function.
(Output_data_plt_x86_64::set_final_data_size): Likewise.
(Output_data_plt_x86_64::do_write): Write out IRELATIVE area.
(Target_x86_64::init_got_plt_for_update): Create got_irelative_.
(Target_x86_64::register_global_plt_entry): Add symtab and layout
parameters.
(Target_x86_64::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_x86_64::do_finalize_sections): Create the __rela_iplt
symbols if we didn't create an IRELATIVE GOT.
(Target_x86_64::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_x86_64::do_dynsym_value): Use plt_address_for_global.
* testsuite/ifuncvar1.c: New test file.
* testsuite/ifuncvar2.c: New test file.
* testsuite/ifuncvar3.c: New test file.
* testsuite/Makefile.am (check_PROGRAMS): Add ifuncvar.
(ifuncvar1_pic.o, ifuncvar2_pic.o, ifuncvar.so): New targets.
(ifuncvar_SOURCES, ifuncvar_DEPENDENCIES): New variables.
(ifuncvar_LDFLAGS, ifuncvar_LDADD): New variables.
* testsuite/Makefile.in: Rebuild.
2011-07-09 06:48:08 +08:00
|
|
|
// Return where the IRELATIVE relocations should go in the PLT. These
|
|
|
|
// follow the JUMP_SLOT and TLS_DESC relocations.
|
|
|
|
|
|
|
|
Output_data_plt_i386::Reloc_section*
|
|
|
|
Output_data_plt_i386::rel_irelative(Symbol_table* symtab, Layout* layout)
|
|
|
|
{
|
|
|
|
if (this->irelative_rel_ == NULL)
|
|
|
|
{
|
|
|
|
// Make sure we have a place for the TLS_DESC relocations, in
|
|
|
|
// case we see any later on.
|
|
|
|
this->rel_tls_desc(layout);
|
|
|
|
this->irelative_rel_ = new Reloc_section(false);
|
|
|
|
layout->add_output_section_data(".rel.plt", elfcpp::SHT_REL,
|
|
|
|
elfcpp::SHF_ALLOC, this->irelative_rel_,
|
|
|
|
ORDER_DYNAMIC_PLT_RELOCS, false);
|
|
|
|
gold_assert(this->irelative_rel_->output_section()
|
|
|
|
== this->rel_->output_section());
|
|
|
|
|
|
|
|
if (parameters->doing_static_link())
|
|
|
|
{
|
|
|
|
// A statically linked executable will only have a .rel.plt
|
|
|
|
// section to hold R_386_IRELATIVE relocs for STT_GNU_IFUNC
|
|
|
|
// symbols. The library will use these symbols to locate
|
|
|
|
// the IRELATIVE relocs at program startup time.
|
|
|
|
symtab->define_in_output_data("__rel_iplt_start", NULL,
|
|
|
|
Symbol_table::PREDEFINED,
|
|
|
|
this->irelative_rel_, 0, 0,
|
|
|
|
elfcpp::STT_NOTYPE, elfcpp::STB_GLOBAL,
|
|
|
|
elfcpp::STV_HIDDEN, 0, false, true);
|
|
|
|
symtab->define_in_output_data("__rel_iplt_end", NULL,
|
|
|
|
Symbol_table::PREDEFINED,
|
|
|
|
this->irelative_rel_, 0, 0,
|
|
|
|
elfcpp::STT_NOTYPE, elfcpp::STB_GLOBAL,
|
|
|
|
elfcpp::STV_HIDDEN, 0, true, true);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return this->irelative_rel_;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Return the PLT address to use for a global symbol.
|
|
|
|
|
|
|
|
uint64_t
|
|
|
|
Output_data_plt_i386::address_for_global(const Symbol* gsym)
|
|
|
|
{
|
|
|
|
uint64_t offset = 0;
|
|
|
|
if (gsym->type() == elfcpp::STT_GNU_IFUNC
|
|
|
|
&& gsym->can_use_relative_reloc(false))
|
|
|
|
offset = (this->count_ + 1) * plt_entry_size;
|
|
|
|
return this->address() + offset;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Return the PLT address to use for a local symbol. These are always
|
|
|
|
// IRELATIVE relocs.
|
|
|
|
|
|
|
|
uint64_t
|
|
|
|
Output_data_plt_i386::address_for_local(const Relobj*, unsigned int)
|
|
|
|
{
|
|
|
|
return this->address() + (this->count_ + 1) * plt_entry_size;
|
|
|
|
}
|
|
|
|
|
2006-11-30 01:56:40 +08:00
|
|
|
// The first entry in the PLT for an executable.
|
|
|
|
|
PR gold/12571
* options.h (class General_options): Add
--ld-generated-unwind-info.
* ehframe.cc (Fde::write): Add address parameter. Change all
callers. If associated with PLT, fill in address and size.
(Cie::set_output_offset): Only add merge mapping if there is an
object.
(Cie::write): Add address parameter. Change all callers.
(Eh_frame::add_ehframe_for_plt): New function.
* ehframe.h (class Fde): Update declarations. Move shndx_ and
input_offset_ fields into union u_, with new plt field.
(Fde::Fde): Adjust for new union field.
(Fde::Fde) [Output_data version]: New constructor.
(Fde::add_mapping): Only add merge mapping if there is an object.
(class Cie): Update declarations.
(class Eh_frame): Declare add_ehframe_for_plt.
* layout.cc (Layout::layout_eh_frame): Break out code into
make_eh_frame_section, and call it.
(Layout::make_eh_frame_section): New function.
(Layout::add_eh_frame_for_plt): New function.
* layout.h (class Layout): Update declarations.
* merge.cc (Merge_map::add_mapping): Add assertion.
* i386.cc: Include "dwarf.h".
(class Output_data_plt_i386): Make first_plt_entry,
dyn_first_plt_entry, exec_plt_entry, and dyn_plt_entry const. Add
plt_eh_frame_cie_size, plt_eh_frame_fde_size, plt_eh_frame_cie,
and plt_eh_frame_fde.
(Output_data_plt_i386::Output_data_plt_i386): Align to 16-byte
boundary. Call add_eh_frame_for_plt if appropriate.
* x86_64.cc: Include "dwarf.h".
(class Output_data_plt_x86_64): Align to 16-byte boundary. Make
first_plt_entry, plt_entry and tlsdesc_plt_entry const. Add
plt_eh_frame_cie_size, plt_eh_frame_fde_size, plt_eh_frame_cie,
and plt_eh_frame_fde.
(Output_data_plt_x86_64::init): Call add_eh_frame_for_plt if
appropriate.
2011-07-02 06:05:01 +08:00
|
|
|
const unsigned char Output_data_plt_i386::exec_first_plt_entry[plt_entry_size] =
|
2006-11-30 01:56:40 +08:00
|
|
|
{
|
|
|
|
0xff, 0x35, // pushl contents of memory address
|
|
|
|
0, 0, 0, 0, // replaced with address of .got + 4
|
|
|
|
0xff, 0x25, // jmp indirect
|
|
|
|
0, 0, 0, 0, // replaced with address of .got + 8
|
|
|
|
0, 0, 0, 0 // unused
|
|
|
|
};
|
|
|
|
|
|
|
|
// The first entry in the PLT for a shared object.
|
|
|
|
|
PR gold/12571
* options.h (class General_options): Add
--ld-generated-unwind-info.
* ehframe.cc (Fde::write): Add address parameter. Change all
callers. If associated with PLT, fill in address and size.
(Cie::set_output_offset): Only add merge mapping if there is an
object.
(Cie::write): Add address parameter. Change all callers.
(Eh_frame::add_ehframe_for_plt): New function.
* ehframe.h (class Fde): Update declarations. Move shndx_ and
input_offset_ fields into union u_, with new plt field.
(Fde::Fde): Adjust for new union field.
(Fde::Fde) [Output_data version]: New constructor.
(Fde::add_mapping): Only add merge mapping if there is an object.
(class Cie): Update declarations.
(class Eh_frame): Declare add_ehframe_for_plt.
* layout.cc (Layout::layout_eh_frame): Break out code into
make_eh_frame_section, and call it.
(Layout::make_eh_frame_section): New function.
(Layout::add_eh_frame_for_plt): New function.
* layout.h (class Layout): Update declarations.
* merge.cc (Merge_map::add_mapping): Add assertion.
* i386.cc: Include "dwarf.h".
(class Output_data_plt_i386): Make first_plt_entry,
dyn_first_plt_entry, exec_plt_entry, and dyn_plt_entry const. Add
plt_eh_frame_cie_size, plt_eh_frame_fde_size, plt_eh_frame_cie,
and plt_eh_frame_fde.
(Output_data_plt_i386::Output_data_plt_i386): Align to 16-byte
boundary. Call add_eh_frame_for_plt if appropriate.
* x86_64.cc: Include "dwarf.h".
(class Output_data_plt_x86_64): Align to 16-byte boundary. Make
first_plt_entry, plt_entry and tlsdesc_plt_entry const. Add
plt_eh_frame_cie_size, plt_eh_frame_fde_size, plt_eh_frame_cie,
and plt_eh_frame_fde.
(Output_data_plt_x86_64::init): Call add_eh_frame_for_plt if
appropriate.
2011-07-02 06:05:01 +08:00
|
|
|
const unsigned char Output_data_plt_i386::dyn_first_plt_entry[plt_entry_size] =
|
2006-11-30 01:56:40 +08:00
|
|
|
{
|
|
|
|
0xff, 0xb3, 4, 0, 0, 0, // pushl 4(%ebx)
|
|
|
|
0xff, 0xa3, 8, 0, 0, 0, // jmp *8(%ebx)
|
|
|
|
0, 0, 0, 0 // unused
|
|
|
|
};
|
|
|
|
|
|
|
|
// Subsequent entries in the PLT for an executable.
|
|
|
|
|
PR gold/12571
* options.h (class General_options): Add
--ld-generated-unwind-info.
* ehframe.cc (Fde::write): Add address parameter. Change all
callers. If associated with PLT, fill in address and size.
(Cie::set_output_offset): Only add merge mapping if there is an
object.
(Cie::write): Add address parameter. Change all callers.
(Eh_frame::add_ehframe_for_plt): New function.
* ehframe.h (class Fde): Update declarations. Move shndx_ and
input_offset_ fields into union u_, with new plt field.
(Fde::Fde): Adjust for new union field.
(Fde::Fde) [Output_data version]: New constructor.
(Fde::add_mapping): Only add merge mapping if there is an object.
(class Cie): Update declarations.
(class Eh_frame): Declare add_ehframe_for_plt.
* layout.cc (Layout::layout_eh_frame): Break out code into
make_eh_frame_section, and call it.
(Layout::make_eh_frame_section): New function.
(Layout::add_eh_frame_for_plt): New function.
* layout.h (class Layout): Update declarations.
* merge.cc (Merge_map::add_mapping): Add assertion.
* i386.cc: Include "dwarf.h".
(class Output_data_plt_i386): Make first_plt_entry,
dyn_first_plt_entry, exec_plt_entry, and dyn_plt_entry const. Add
plt_eh_frame_cie_size, plt_eh_frame_fde_size, plt_eh_frame_cie,
and plt_eh_frame_fde.
(Output_data_plt_i386::Output_data_plt_i386): Align to 16-byte
boundary. Call add_eh_frame_for_plt if appropriate.
* x86_64.cc: Include "dwarf.h".
(class Output_data_plt_x86_64): Align to 16-byte boundary. Make
first_plt_entry, plt_entry and tlsdesc_plt_entry const. Add
plt_eh_frame_cie_size, plt_eh_frame_fde_size, plt_eh_frame_cie,
and plt_eh_frame_fde.
(Output_data_plt_x86_64::init): Call add_eh_frame_for_plt if
appropriate.
2011-07-02 06:05:01 +08:00
|
|
|
const unsigned char Output_data_plt_i386::exec_plt_entry[plt_entry_size] =
|
2006-11-30 01:56:40 +08:00
|
|
|
{
|
|
|
|
0xff, 0x25, // jmp indirect
|
|
|
|
0, 0, 0, 0, // replaced with address of symbol in .got
|
|
|
|
0x68, // pushl immediate
|
|
|
|
0, 0, 0, 0, // replaced with offset into relocation table
|
|
|
|
0xe9, // jmp relative
|
|
|
|
0, 0, 0, 0 // replaced with offset to start of .plt
|
|
|
|
};
|
|
|
|
|
|
|
|
// Subsequent entries in the PLT for a shared object.
|
|
|
|
|
PR gold/12571
* options.h (class General_options): Add
--ld-generated-unwind-info.
* ehframe.cc (Fde::write): Add address parameter. Change all
callers. If associated with PLT, fill in address and size.
(Cie::set_output_offset): Only add merge mapping if there is an
object.
(Cie::write): Add address parameter. Change all callers.
(Eh_frame::add_ehframe_for_plt): New function.
* ehframe.h (class Fde): Update declarations. Move shndx_ and
input_offset_ fields into union u_, with new plt field.
(Fde::Fde): Adjust for new union field.
(Fde::Fde) [Output_data version]: New constructor.
(Fde::add_mapping): Only add merge mapping if there is an object.
(class Cie): Update declarations.
(class Eh_frame): Declare add_ehframe_for_plt.
* layout.cc (Layout::layout_eh_frame): Break out code into
make_eh_frame_section, and call it.
(Layout::make_eh_frame_section): New function.
(Layout::add_eh_frame_for_plt): New function.
* layout.h (class Layout): Update declarations.
* merge.cc (Merge_map::add_mapping): Add assertion.
* i386.cc: Include "dwarf.h".
(class Output_data_plt_i386): Make first_plt_entry,
dyn_first_plt_entry, exec_plt_entry, and dyn_plt_entry const. Add
plt_eh_frame_cie_size, plt_eh_frame_fde_size, plt_eh_frame_cie,
and plt_eh_frame_fde.
(Output_data_plt_i386::Output_data_plt_i386): Align to 16-byte
boundary. Call add_eh_frame_for_plt if appropriate.
* x86_64.cc: Include "dwarf.h".
(class Output_data_plt_x86_64): Align to 16-byte boundary. Make
first_plt_entry, plt_entry and tlsdesc_plt_entry const. Add
plt_eh_frame_cie_size, plt_eh_frame_fde_size, plt_eh_frame_cie,
and plt_eh_frame_fde.
(Output_data_plt_x86_64::init): Call add_eh_frame_for_plt if
appropriate.
2011-07-02 06:05:01 +08:00
|
|
|
const unsigned char Output_data_plt_i386::dyn_plt_entry[plt_entry_size] =
|
2006-11-30 01:56:40 +08:00
|
|
|
{
|
|
|
|
0xff, 0xa3, // jmp *offset(%ebx)
|
|
|
|
0, 0, 0, 0, // replaced with offset of symbol in .got
|
|
|
|
0x68, // pushl immediate
|
|
|
|
0, 0, 0, 0, // replaced with offset into relocation table
|
|
|
|
0xe9, // jmp relative
|
|
|
|
0, 0, 0, 0 // replaced with offset to start of .plt
|
|
|
|
};
|
|
|
|
|
PR gold/12571
* options.h (class General_options): Add
--ld-generated-unwind-info.
* ehframe.cc (Fde::write): Add address parameter. Change all
callers. If associated with PLT, fill in address and size.
(Cie::set_output_offset): Only add merge mapping if there is an
object.
(Cie::write): Add address parameter. Change all callers.
(Eh_frame::add_ehframe_for_plt): New function.
* ehframe.h (class Fde): Update declarations. Move shndx_ and
input_offset_ fields into union u_, with new plt field.
(Fde::Fde): Adjust for new union field.
(Fde::Fde) [Output_data version]: New constructor.
(Fde::add_mapping): Only add merge mapping if there is an object.
(class Cie): Update declarations.
(class Eh_frame): Declare add_ehframe_for_plt.
* layout.cc (Layout::layout_eh_frame): Break out code into
make_eh_frame_section, and call it.
(Layout::make_eh_frame_section): New function.
(Layout::add_eh_frame_for_plt): New function.
* layout.h (class Layout): Update declarations.
* merge.cc (Merge_map::add_mapping): Add assertion.
* i386.cc: Include "dwarf.h".
(class Output_data_plt_i386): Make first_plt_entry,
dyn_first_plt_entry, exec_plt_entry, and dyn_plt_entry const. Add
plt_eh_frame_cie_size, plt_eh_frame_fde_size, plt_eh_frame_cie,
and plt_eh_frame_fde.
(Output_data_plt_i386::Output_data_plt_i386): Align to 16-byte
boundary. Call add_eh_frame_for_plt if appropriate.
* x86_64.cc: Include "dwarf.h".
(class Output_data_plt_x86_64): Align to 16-byte boundary. Make
first_plt_entry, plt_entry and tlsdesc_plt_entry const. Add
plt_eh_frame_cie_size, plt_eh_frame_fde_size, plt_eh_frame_cie,
and plt_eh_frame_fde.
(Output_data_plt_x86_64::init): Call add_eh_frame_for_plt if
appropriate.
2011-07-02 06:05:01 +08:00
|
|
|
// The .eh_frame unwind information for the PLT.
|
|
|
|
|
|
|
|
const unsigned char
|
|
|
|
Output_data_plt_i386::plt_eh_frame_cie[plt_eh_frame_cie_size] =
|
|
|
|
{
|
|
|
|
1, // CIE version.
|
|
|
|
'z', // Augmentation: augmentation size included.
|
|
|
|
'R', // Augmentation: FDE encoding included.
|
|
|
|
'\0', // End of augmentation string.
|
|
|
|
1, // Code alignment factor.
|
|
|
|
0x7c, // Data alignment factor.
|
|
|
|
8, // Return address column.
|
|
|
|
1, // Augmentation size.
|
|
|
|
(elfcpp::DW_EH_PE_pcrel // FDE encoding.
|
|
|
|
| elfcpp::DW_EH_PE_sdata4),
|
|
|
|
elfcpp::DW_CFA_def_cfa, 4, 4, // DW_CFA_def_cfa: r4 (esp) ofs 4.
|
|
|
|
elfcpp::DW_CFA_offset + 8, 1, // DW_CFA_offset: r8 (eip) at cfa-4.
|
|
|
|
elfcpp::DW_CFA_nop, // Align to 16 bytes.
|
|
|
|
elfcpp::DW_CFA_nop
|
|
|
|
};
|
|
|
|
|
|
|
|
const unsigned char
|
|
|
|
Output_data_plt_i386::plt_eh_frame_fde[plt_eh_frame_fde_size] =
|
|
|
|
{
|
|
|
|
0, 0, 0, 0, // Replaced with offset to .plt.
|
|
|
|
0, 0, 0, 0, // Replaced with size of .plt.
|
|
|
|
0, // Augmentation size.
|
|
|
|
elfcpp::DW_CFA_def_cfa_offset, 8, // DW_CFA_def_cfa_offset: 8.
|
|
|
|
elfcpp::DW_CFA_advance_loc + 6, // Advance 6 to __PLT__ + 6.
|
|
|
|
elfcpp::DW_CFA_def_cfa_offset, 12, // DW_CFA_def_cfa_offset: 12.
|
|
|
|
elfcpp::DW_CFA_advance_loc + 10, // Advance 10 to __PLT__ + 16.
|
|
|
|
elfcpp::DW_CFA_def_cfa_expression, // DW_CFA_def_cfa_expression.
|
|
|
|
11, // Block length.
|
|
|
|
elfcpp::DW_OP_breg4, 4, // Push %esp + 4.
|
|
|
|
elfcpp::DW_OP_breg8, 0, // Push %eip.
|
|
|
|
elfcpp::DW_OP_lit15, // Push 0xf.
|
|
|
|
elfcpp::DW_OP_and, // & (%eip & 0xf).
|
|
|
|
elfcpp::DW_OP_lit11, // Push 0xb.
|
|
|
|
elfcpp::DW_OP_ge, // >= ((%eip & 0xf) >= 0xb)
|
|
|
|
elfcpp::DW_OP_lit2, // Push 2.
|
|
|
|
elfcpp::DW_OP_shl, // << (((%eip & 0xf) >= 0xb) << 2)
|
2011-07-02 06:54:04 +08:00
|
|
|
elfcpp::DW_OP_plus, // + ((((%eip&0xf)>=0xb)<<2)+%esp+4
|
PR gold/12571
* options.h (class General_options): Add
--ld-generated-unwind-info.
* ehframe.cc (Fde::write): Add address parameter. Change all
callers. If associated with PLT, fill in address and size.
(Cie::set_output_offset): Only add merge mapping if there is an
object.
(Cie::write): Add address parameter. Change all callers.
(Eh_frame::add_ehframe_for_plt): New function.
* ehframe.h (class Fde): Update declarations. Move shndx_ and
input_offset_ fields into union u_, with new plt field.
(Fde::Fde): Adjust for new union field.
(Fde::Fde) [Output_data version]: New constructor.
(Fde::add_mapping): Only add merge mapping if there is an object.
(class Cie): Update declarations.
(class Eh_frame): Declare add_ehframe_for_plt.
* layout.cc (Layout::layout_eh_frame): Break out code into
make_eh_frame_section, and call it.
(Layout::make_eh_frame_section): New function.
(Layout::add_eh_frame_for_plt): New function.
* layout.h (class Layout): Update declarations.
* merge.cc (Merge_map::add_mapping): Add assertion.
* i386.cc: Include "dwarf.h".
(class Output_data_plt_i386): Make first_plt_entry,
dyn_first_plt_entry, exec_plt_entry, and dyn_plt_entry const. Add
plt_eh_frame_cie_size, plt_eh_frame_fde_size, plt_eh_frame_cie,
and plt_eh_frame_fde.
(Output_data_plt_i386::Output_data_plt_i386): Align to 16-byte
boundary. Call add_eh_frame_for_plt if appropriate.
* x86_64.cc: Include "dwarf.h".
(class Output_data_plt_x86_64): Align to 16-byte boundary. Make
first_plt_entry, plt_entry and tlsdesc_plt_entry const. Add
plt_eh_frame_cie_size, plt_eh_frame_fde_size, plt_eh_frame_cie,
and plt_eh_frame_fde.
(Output_data_plt_x86_64::init): Call add_eh_frame_for_plt if
appropriate.
2011-07-02 06:05:01 +08:00
|
|
|
elfcpp::DW_CFA_nop, // Align to 32 bytes.
|
|
|
|
elfcpp::DW_CFA_nop,
|
|
|
|
elfcpp::DW_CFA_nop,
|
|
|
|
elfcpp::DW_CFA_nop
|
|
|
|
};
|
|
|
|
|
2006-11-30 01:56:40 +08:00
|
|
|
// Write out the PLT. This uses the hand-coded instructions above,
|
|
|
|
// and adjusts them as needed. This is all specified by the i386 ELF
|
|
|
|
// Processor Supplement.
|
|
|
|
|
|
|
|
void
|
|
|
|
Output_data_plt_i386::do_write(Output_file* of)
|
|
|
|
{
|
2009-12-15 03:53:05 +08:00
|
|
|
const off_t offset = this->offset();
|
2007-12-21 05:21:24 +08:00
|
|
|
const section_size_type oview_size =
|
|
|
|
convert_to_section_size_type(this->data_size());
|
2009-12-15 03:53:05 +08:00
|
|
|
unsigned char* const oview = of->get_output_view(offset, oview_size);
|
2006-11-30 01:56:40 +08:00
|
|
|
|
|
|
|
const off_t got_file_offset = this->got_plt_->offset();
|
PR gold/12372
* target.h (Target::plt_address_for_global): New function.
(Target::plt_address_for_local): New function.
(Target::plt_section_for_global): Remove.
(Target::plt_section_for_local): Remove.
(Target::do_plt_address_for_global): New virtual function.
(Target::do_plt_address_for_local): New virtual function.
(Target::do_plt_section_for_global): Remove.
(Target::do_plt_section_for_local): Remove.
(Target::register_global_plt_entry): Add Symbol_table and Layout
parameters.
* output.cc (Output_data_got::Got_entry::write): Use
plt_address_for_global and plt_address_for_local.
* layout.cc (Layout::add_target_dynamic_tags): Use size and
address of output section.
* i386.cc (class Output_data_plt_i386): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_i386::has_irelative_section): New function.
(Output_data_plt_i386::entry_count): Add irelative_count_.
(Output_data_plt_i386::set_final_data_size): Likewise.
(class Target_i386): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_i386::Target_i386): Initialize new fields.
(Target_i386::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_i386::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_i386::got_section): Create got_irelative_.
(Target_i386::rel_irelative_section): New function.
(Output_data_plt_i386::Output_data_plt_i386): Initialize new
fields. Don't define __rel_iplt_{start,end}.
(Output_data_plt_i386::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_i386::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_i386::rel_tls_desc): Fix formatting.
(Output_data_plt_i386::rel_irelative): New function.
(Output_data_plt_i386::address_for_global): New function.
(Output_data_plt_i386::address_for_local): New function.
(Output_data_plt_i386::do_write): Write out IRELATIVE area. Use
IRELATIVE GOT when changing IFUNC GOT entries.
(Target_i386::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_i386::do_finalize_sections): Create the __rel_iplt symbols
if we didn't create an IRELATIVE GOT.
(Target_i386::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_i386::do_dynsym_value): Use plt_address_for_global.
* x86_64.cc (class Output_data_plt_x86_64): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_x86_64::Output_data_plt_x86_64) [both versions]:
Initialize new fields. Remove symtab parameter. Change all
callers.
(Output_data_plt_x86_64::get_tlsdesc_plt_offset): Add
irelative_count_.
(Output_data_plt_x86_64::has_irelative_section): New function.
(Output_data_plt_x86_64::entry_count): Add irelative_count_.
(class Target_x86_64): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_x86_64::Target_x86_64): Initialize new fields.
(Target_x86_64::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_x86_64::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_x86_64::got_section): Create got_irelative_.
(Target_x86_64::rela_irelative_section): New function.
(Output_data_plt_x86_64::init): Remove symtab parameter. Change
all callers. Don't create __rel_iplt_{start,end}.
(Output_data_plt_x86_64::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_x86_64::add_relocation): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::rela_tlsdesc): Fix formatting.
(Output_data_plt_x86_64::rela_irelative): New function.
(Output_data_plt_x86_64::address_for_global): New function.
(Output_data_plt_x86_64::address_for_local): New function.
(Output_data_plt_x86_64::set_final_data_size): Likewise.
(Output_data_plt_x86_64::do_write): Write out IRELATIVE area.
(Target_x86_64::init_got_plt_for_update): Create got_irelative_.
(Target_x86_64::register_global_plt_entry): Add symtab and layout
parameters.
(Target_x86_64::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_x86_64::do_finalize_sections): Create the __rela_iplt
symbols if we didn't create an IRELATIVE GOT.
(Target_x86_64::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_x86_64::do_dynsym_value): Use plt_address_for_global.
* testsuite/ifuncvar1.c: New test file.
* testsuite/ifuncvar2.c: New test file.
* testsuite/ifuncvar3.c: New test file.
* testsuite/Makefile.am (check_PROGRAMS): Add ifuncvar.
(ifuncvar1_pic.o, ifuncvar2_pic.o, ifuncvar.so): New targets.
(ifuncvar_SOURCES, ifuncvar_DEPENDENCIES): New variables.
(ifuncvar_LDFLAGS, ifuncvar_LDADD): New variables.
* testsuite/Makefile.in: Rebuild.
2011-07-09 06:48:08 +08:00
|
|
|
gold_assert(parameters->incremental_update()
|
|
|
|
|| (got_file_offset + this->got_plt_->data_size()
|
|
|
|
== this->got_irelative_->offset()));
|
2007-12-21 05:21:24 +08:00
|
|
|
const section_size_type got_size =
|
PR gold/12372
* target.h (Target::plt_address_for_global): New function.
(Target::plt_address_for_local): New function.
(Target::plt_section_for_global): Remove.
(Target::plt_section_for_local): Remove.
(Target::do_plt_address_for_global): New virtual function.
(Target::do_plt_address_for_local): New virtual function.
(Target::do_plt_section_for_global): Remove.
(Target::do_plt_section_for_local): Remove.
(Target::register_global_plt_entry): Add Symbol_table and Layout
parameters.
* output.cc (Output_data_got::Got_entry::write): Use
plt_address_for_global and plt_address_for_local.
* layout.cc (Layout::add_target_dynamic_tags): Use size and
address of output section.
* i386.cc (class Output_data_plt_i386): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_i386::has_irelative_section): New function.
(Output_data_plt_i386::entry_count): Add irelative_count_.
(Output_data_plt_i386::set_final_data_size): Likewise.
(class Target_i386): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_i386::Target_i386): Initialize new fields.
(Target_i386::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_i386::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_i386::got_section): Create got_irelative_.
(Target_i386::rel_irelative_section): New function.
(Output_data_plt_i386::Output_data_plt_i386): Initialize new
fields. Don't define __rel_iplt_{start,end}.
(Output_data_plt_i386::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_i386::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_i386::rel_tls_desc): Fix formatting.
(Output_data_plt_i386::rel_irelative): New function.
(Output_data_plt_i386::address_for_global): New function.
(Output_data_plt_i386::address_for_local): New function.
(Output_data_plt_i386::do_write): Write out IRELATIVE area. Use
IRELATIVE GOT when changing IFUNC GOT entries.
(Target_i386::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_i386::do_finalize_sections): Create the __rel_iplt symbols
if we didn't create an IRELATIVE GOT.
(Target_i386::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_i386::do_dynsym_value): Use plt_address_for_global.
* x86_64.cc (class Output_data_plt_x86_64): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_x86_64::Output_data_plt_x86_64) [both versions]:
Initialize new fields. Remove symtab parameter. Change all
callers.
(Output_data_plt_x86_64::get_tlsdesc_plt_offset): Add
irelative_count_.
(Output_data_plt_x86_64::has_irelative_section): New function.
(Output_data_plt_x86_64::entry_count): Add irelative_count_.
(class Target_x86_64): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_x86_64::Target_x86_64): Initialize new fields.
(Target_x86_64::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_x86_64::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_x86_64::got_section): Create got_irelative_.
(Target_x86_64::rela_irelative_section): New function.
(Output_data_plt_x86_64::init): Remove symtab parameter. Change
all callers. Don't create __rel_iplt_{start,end}.
(Output_data_plt_x86_64::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_x86_64::add_relocation): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::rela_tlsdesc): Fix formatting.
(Output_data_plt_x86_64::rela_irelative): New function.
(Output_data_plt_x86_64::address_for_global): New function.
(Output_data_plt_x86_64::address_for_local): New function.
(Output_data_plt_x86_64::set_final_data_size): Likewise.
(Output_data_plt_x86_64::do_write): Write out IRELATIVE area.
(Target_x86_64::init_got_plt_for_update): Create got_irelative_.
(Target_x86_64::register_global_plt_entry): Add symtab and layout
parameters.
(Target_x86_64::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_x86_64::do_finalize_sections): Create the __rela_iplt
symbols if we didn't create an IRELATIVE GOT.
(Target_x86_64::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_x86_64::do_dynsym_value): Use plt_address_for_global.
* testsuite/ifuncvar1.c: New test file.
* testsuite/ifuncvar2.c: New test file.
* testsuite/ifuncvar3.c: New test file.
* testsuite/Makefile.am (check_PROGRAMS): Add ifuncvar.
(ifuncvar1_pic.o, ifuncvar2_pic.o, ifuncvar.so): New targets.
(ifuncvar_SOURCES, ifuncvar_DEPENDENCIES): New variables.
(ifuncvar_LDFLAGS, ifuncvar_LDADD): New variables.
* testsuite/Makefile.in: Rebuild.
2011-07-09 06:48:08 +08:00
|
|
|
convert_to_section_size_type(this->got_plt_->data_size()
|
|
|
|
+ this->got_irelative_->data_size());
|
2006-11-30 01:56:40 +08:00
|
|
|
unsigned char* const got_view = of->get_output_view(got_file_offset,
|
|
|
|
got_size);
|
|
|
|
|
|
|
|
unsigned char* pov = oview;
|
|
|
|
|
|
|
|
elfcpp::Elf_types<32>::Elf_Addr plt_address = this->address();
|
|
|
|
elfcpp::Elf_types<32>::Elf_Addr got_address = this->got_plt_->address();
|
|
|
|
|
2009-10-14 13:25:02 +08:00
|
|
|
if (parameters->options().output_is_position_independent())
|
2006-11-30 01:56:40 +08:00
|
|
|
memcpy(pov, dyn_first_plt_entry, plt_entry_size);
|
|
|
|
else
|
|
|
|
{
|
|
|
|
memcpy(pov, exec_first_plt_entry, plt_entry_size);
|
|
|
|
elfcpp::Swap_unaligned<32, false>::writeval(pov + 2, got_address + 4);
|
|
|
|
elfcpp::Swap<32, false>::writeval(pov + 8, got_address + 8);
|
|
|
|
}
|
|
|
|
pov += plt_entry_size;
|
|
|
|
|
|
|
|
unsigned char* got_pov = got_view;
|
|
|
|
|
|
|
|
memset(got_pov, 0, 12);
|
|
|
|
got_pov += 12;
|
|
|
|
|
|
|
|
const int rel_size = elfcpp::Elf_sizes<32>::rel_size;
|
|
|
|
|
|
|
|
unsigned int plt_offset = plt_entry_size;
|
|
|
|
unsigned int plt_rel_offset = 0;
|
|
|
|
unsigned int got_offset = 12;
|
PR gold/12372
* target.h (Target::plt_address_for_global): New function.
(Target::plt_address_for_local): New function.
(Target::plt_section_for_global): Remove.
(Target::plt_section_for_local): Remove.
(Target::do_plt_address_for_global): New virtual function.
(Target::do_plt_address_for_local): New virtual function.
(Target::do_plt_section_for_global): Remove.
(Target::do_plt_section_for_local): Remove.
(Target::register_global_plt_entry): Add Symbol_table and Layout
parameters.
* output.cc (Output_data_got::Got_entry::write): Use
plt_address_for_global and plt_address_for_local.
* layout.cc (Layout::add_target_dynamic_tags): Use size and
address of output section.
* i386.cc (class Output_data_plt_i386): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_i386::has_irelative_section): New function.
(Output_data_plt_i386::entry_count): Add irelative_count_.
(Output_data_plt_i386::set_final_data_size): Likewise.
(class Target_i386): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_i386::Target_i386): Initialize new fields.
(Target_i386::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_i386::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_i386::got_section): Create got_irelative_.
(Target_i386::rel_irelative_section): New function.
(Output_data_plt_i386::Output_data_plt_i386): Initialize new
fields. Don't define __rel_iplt_{start,end}.
(Output_data_plt_i386::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_i386::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_i386::rel_tls_desc): Fix formatting.
(Output_data_plt_i386::rel_irelative): New function.
(Output_data_plt_i386::address_for_global): New function.
(Output_data_plt_i386::address_for_local): New function.
(Output_data_plt_i386::do_write): Write out IRELATIVE area. Use
IRELATIVE GOT when changing IFUNC GOT entries.
(Target_i386::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_i386::do_finalize_sections): Create the __rel_iplt symbols
if we didn't create an IRELATIVE GOT.
(Target_i386::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_i386::do_dynsym_value): Use plt_address_for_global.
* x86_64.cc (class Output_data_plt_x86_64): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_x86_64::Output_data_plt_x86_64) [both versions]:
Initialize new fields. Remove symtab parameter. Change all
callers.
(Output_data_plt_x86_64::get_tlsdesc_plt_offset): Add
irelative_count_.
(Output_data_plt_x86_64::has_irelative_section): New function.
(Output_data_plt_x86_64::entry_count): Add irelative_count_.
(class Target_x86_64): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_x86_64::Target_x86_64): Initialize new fields.
(Target_x86_64::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_x86_64::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_x86_64::got_section): Create got_irelative_.
(Target_x86_64::rela_irelative_section): New function.
(Output_data_plt_x86_64::init): Remove symtab parameter. Change
all callers. Don't create __rel_iplt_{start,end}.
(Output_data_plt_x86_64::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_x86_64::add_relocation): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::rela_tlsdesc): Fix formatting.
(Output_data_plt_x86_64::rela_irelative): New function.
(Output_data_plt_x86_64::address_for_global): New function.
(Output_data_plt_x86_64::address_for_local): New function.
(Output_data_plt_x86_64::set_final_data_size): Likewise.
(Output_data_plt_x86_64::do_write): Write out IRELATIVE area.
(Target_x86_64::init_got_plt_for_update): Create got_irelative_.
(Target_x86_64::register_global_plt_entry): Add symtab and layout
parameters.
(Target_x86_64::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_x86_64::do_finalize_sections): Create the __rela_iplt
symbols if we didn't create an IRELATIVE GOT.
(Target_x86_64::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_x86_64::do_dynsym_value): Use plt_address_for_global.
* testsuite/ifuncvar1.c: New test file.
* testsuite/ifuncvar2.c: New test file.
* testsuite/ifuncvar3.c: New test file.
* testsuite/Makefile.am (check_PROGRAMS): Add ifuncvar.
(ifuncvar1_pic.o, ifuncvar2_pic.o, ifuncvar.so): New targets.
(ifuncvar_SOURCES, ifuncvar_DEPENDENCIES): New variables.
(ifuncvar_LDFLAGS, ifuncvar_LDADD): New variables.
* testsuite/Makefile.in: Rebuild.
2011-07-09 06:48:08 +08:00
|
|
|
const unsigned int count = this->count_ + this->irelative_count_;
|
2006-11-30 01:56:40 +08:00
|
|
|
for (unsigned int i = 0;
|
|
|
|
i < count;
|
|
|
|
++i,
|
|
|
|
pov += plt_entry_size,
|
|
|
|
got_pov += 4,
|
|
|
|
plt_offset += plt_entry_size,
|
|
|
|
plt_rel_offset += rel_size,
|
|
|
|
got_offset += 4)
|
|
|
|
{
|
|
|
|
// Set and adjust the PLT entry itself.
|
|
|
|
|
2009-10-14 13:25:02 +08:00
|
|
|
if (parameters->options().output_is_position_independent())
|
2006-11-30 01:56:40 +08:00
|
|
|
{
|
|
|
|
memcpy(pov, dyn_plt_entry, plt_entry_size);
|
|
|
|
elfcpp::Swap_unaligned<32, false>::writeval(pov + 2, got_offset);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
memcpy(pov, exec_plt_entry, plt_entry_size);
|
|
|
|
elfcpp::Swap_unaligned<32, false>::writeval(pov + 2,
|
|
|
|
(got_address
|
|
|
|
+ got_offset));
|
|
|
|
}
|
|
|
|
|
|
|
|
elfcpp::Swap_unaligned<32, false>::writeval(pov + 7, plt_rel_offset);
|
|
|
|
elfcpp::Swap<32, false>::writeval(pov + 12,
|
|
|
|
- (plt_offset + plt_entry_size));
|
|
|
|
|
|
|
|
// Set the entry in the GOT.
|
|
|
|
elfcpp::Swap<32, false>::writeval(got_pov, plt_address + plt_offset + 6);
|
|
|
|
}
|
|
|
|
|
2010-08-20 06:50:16 +08:00
|
|
|
// If any STT_GNU_IFUNC symbols have PLT entries, we need to change
|
|
|
|
// the GOT to point to the actual symbol value, rather than point to
|
|
|
|
// the PLT entry. That will let the dynamic linker call the right
|
|
|
|
// function when resolving IRELATIVE relocations.
|
PR gold/12372
* target.h (Target::plt_address_for_global): New function.
(Target::plt_address_for_local): New function.
(Target::plt_section_for_global): Remove.
(Target::plt_section_for_local): Remove.
(Target::do_plt_address_for_global): New virtual function.
(Target::do_plt_address_for_local): New virtual function.
(Target::do_plt_section_for_global): Remove.
(Target::do_plt_section_for_local): Remove.
(Target::register_global_plt_entry): Add Symbol_table and Layout
parameters.
* output.cc (Output_data_got::Got_entry::write): Use
plt_address_for_global and plt_address_for_local.
* layout.cc (Layout::add_target_dynamic_tags): Use size and
address of output section.
* i386.cc (class Output_data_plt_i386): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_i386::has_irelative_section): New function.
(Output_data_plt_i386::entry_count): Add irelative_count_.
(Output_data_plt_i386::set_final_data_size): Likewise.
(class Target_i386): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_i386::Target_i386): Initialize new fields.
(Target_i386::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_i386::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_i386::got_section): Create got_irelative_.
(Target_i386::rel_irelative_section): New function.
(Output_data_plt_i386::Output_data_plt_i386): Initialize new
fields. Don't define __rel_iplt_{start,end}.
(Output_data_plt_i386::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_i386::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_i386::rel_tls_desc): Fix formatting.
(Output_data_plt_i386::rel_irelative): New function.
(Output_data_plt_i386::address_for_global): New function.
(Output_data_plt_i386::address_for_local): New function.
(Output_data_plt_i386::do_write): Write out IRELATIVE area. Use
IRELATIVE GOT when changing IFUNC GOT entries.
(Target_i386::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_i386::do_finalize_sections): Create the __rel_iplt symbols
if we didn't create an IRELATIVE GOT.
(Target_i386::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_i386::do_dynsym_value): Use plt_address_for_global.
* x86_64.cc (class Output_data_plt_x86_64): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_x86_64::Output_data_plt_x86_64) [both versions]:
Initialize new fields. Remove symtab parameter. Change all
callers.
(Output_data_plt_x86_64::get_tlsdesc_plt_offset): Add
irelative_count_.
(Output_data_plt_x86_64::has_irelative_section): New function.
(Output_data_plt_x86_64::entry_count): Add irelative_count_.
(class Target_x86_64): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_x86_64::Target_x86_64): Initialize new fields.
(Target_x86_64::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_x86_64::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_x86_64::got_section): Create got_irelative_.
(Target_x86_64::rela_irelative_section): New function.
(Output_data_plt_x86_64::init): Remove symtab parameter. Change
all callers. Don't create __rel_iplt_{start,end}.
(Output_data_plt_x86_64::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_x86_64::add_relocation): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::rela_tlsdesc): Fix formatting.
(Output_data_plt_x86_64::rela_irelative): New function.
(Output_data_plt_x86_64::address_for_global): New function.
(Output_data_plt_x86_64::address_for_local): New function.
(Output_data_plt_x86_64::set_final_data_size): Likewise.
(Output_data_plt_x86_64::do_write): Write out IRELATIVE area.
(Target_x86_64::init_got_plt_for_update): Create got_irelative_.
(Target_x86_64::register_global_plt_entry): Add symtab and layout
parameters.
(Target_x86_64::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_x86_64::do_finalize_sections): Create the __rela_iplt
symbols if we didn't create an IRELATIVE GOT.
(Target_x86_64::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_x86_64::do_dynsym_value): Use plt_address_for_global.
* testsuite/ifuncvar1.c: New test file.
* testsuite/ifuncvar2.c: New test file.
* testsuite/ifuncvar3.c: New test file.
* testsuite/Makefile.am (check_PROGRAMS): Add ifuncvar.
(ifuncvar1_pic.o, ifuncvar2_pic.o, ifuncvar.so): New targets.
(ifuncvar_SOURCES, ifuncvar_DEPENDENCIES): New variables.
(ifuncvar_LDFLAGS, ifuncvar_LDADD): New variables.
* testsuite/Makefile.in: Rebuild.
2011-07-09 06:48:08 +08:00
|
|
|
unsigned char* got_irelative_view = got_view + this->got_plt_->data_size();
|
2010-08-20 06:50:16 +08:00
|
|
|
for (std::vector<Global_ifunc>::const_iterator p =
|
|
|
|
this->global_ifuncs_.begin();
|
|
|
|
p != this->global_ifuncs_.end();
|
|
|
|
++p)
|
|
|
|
{
|
|
|
|
const Sized_symbol<32>* ssym =
|
|
|
|
static_cast<const Sized_symbol<32>*>(p->sym);
|
PR gold/12372
* target.h (Target::plt_address_for_global): New function.
(Target::plt_address_for_local): New function.
(Target::plt_section_for_global): Remove.
(Target::plt_section_for_local): Remove.
(Target::do_plt_address_for_global): New virtual function.
(Target::do_plt_address_for_local): New virtual function.
(Target::do_plt_section_for_global): Remove.
(Target::do_plt_section_for_local): Remove.
(Target::register_global_plt_entry): Add Symbol_table and Layout
parameters.
* output.cc (Output_data_got::Got_entry::write): Use
plt_address_for_global and plt_address_for_local.
* layout.cc (Layout::add_target_dynamic_tags): Use size and
address of output section.
* i386.cc (class Output_data_plt_i386): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_i386::has_irelative_section): New function.
(Output_data_plt_i386::entry_count): Add irelative_count_.
(Output_data_plt_i386::set_final_data_size): Likewise.
(class Target_i386): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_i386::Target_i386): Initialize new fields.
(Target_i386::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_i386::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_i386::got_section): Create got_irelative_.
(Target_i386::rel_irelative_section): New function.
(Output_data_plt_i386::Output_data_plt_i386): Initialize new
fields. Don't define __rel_iplt_{start,end}.
(Output_data_plt_i386::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_i386::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_i386::rel_tls_desc): Fix formatting.
(Output_data_plt_i386::rel_irelative): New function.
(Output_data_plt_i386::address_for_global): New function.
(Output_data_plt_i386::address_for_local): New function.
(Output_data_plt_i386::do_write): Write out IRELATIVE area. Use
IRELATIVE GOT when changing IFUNC GOT entries.
(Target_i386::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_i386::do_finalize_sections): Create the __rel_iplt symbols
if we didn't create an IRELATIVE GOT.
(Target_i386::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_i386::do_dynsym_value): Use plt_address_for_global.
* x86_64.cc (class Output_data_plt_x86_64): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_x86_64::Output_data_plt_x86_64) [both versions]:
Initialize new fields. Remove symtab parameter. Change all
callers.
(Output_data_plt_x86_64::get_tlsdesc_plt_offset): Add
irelative_count_.
(Output_data_plt_x86_64::has_irelative_section): New function.
(Output_data_plt_x86_64::entry_count): Add irelative_count_.
(class Target_x86_64): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_x86_64::Target_x86_64): Initialize new fields.
(Target_x86_64::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_x86_64::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_x86_64::got_section): Create got_irelative_.
(Target_x86_64::rela_irelative_section): New function.
(Output_data_plt_x86_64::init): Remove symtab parameter. Change
all callers. Don't create __rel_iplt_{start,end}.
(Output_data_plt_x86_64::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_x86_64::add_relocation): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::rela_tlsdesc): Fix formatting.
(Output_data_plt_x86_64::rela_irelative): New function.
(Output_data_plt_x86_64::address_for_global): New function.
(Output_data_plt_x86_64::address_for_local): New function.
(Output_data_plt_x86_64::set_final_data_size): Likewise.
(Output_data_plt_x86_64::do_write): Write out IRELATIVE area.
(Target_x86_64::init_got_plt_for_update): Create got_irelative_.
(Target_x86_64::register_global_plt_entry): Add symtab and layout
parameters.
(Target_x86_64::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_x86_64::do_finalize_sections): Create the __rela_iplt
symbols if we didn't create an IRELATIVE GOT.
(Target_x86_64::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_x86_64::do_dynsym_value): Use plt_address_for_global.
* testsuite/ifuncvar1.c: New test file.
* testsuite/ifuncvar2.c: New test file.
* testsuite/ifuncvar3.c: New test file.
* testsuite/Makefile.am (check_PROGRAMS): Add ifuncvar.
(ifuncvar1_pic.o, ifuncvar2_pic.o, ifuncvar.so): New targets.
(ifuncvar_SOURCES, ifuncvar_DEPENDENCIES): New variables.
(ifuncvar_LDFLAGS, ifuncvar_LDADD): New variables.
* testsuite/Makefile.in: Rebuild.
2011-07-09 06:48:08 +08:00
|
|
|
elfcpp::Swap<32, false>::writeval(got_irelative_view + p->got_offset,
|
2010-08-20 06:50:16 +08:00
|
|
|
ssym->value());
|
|
|
|
}
|
|
|
|
|
|
|
|
for (std::vector<Local_ifunc>::const_iterator p =
|
|
|
|
this->local_ifuncs_.begin();
|
|
|
|
p != this->local_ifuncs_.end();
|
|
|
|
++p)
|
|
|
|
{
|
|
|
|
const Symbol_value<32>* psymval =
|
|
|
|
p->object->local_symbol(p->local_sym_index);
|
PR gold/12372
* target.h (Target::plt_address_for_global): New function.
(Target::plt_address_for_local): New function.
(Target::plt_section_for_global): Remove.
(Target::plt_section_for_local): Remove.
(Target::do_plt_address_for_global): New virtual function.
(Target::do_plt_address_for_local): New virtual function.
(Target::do_plt_section_for_global): Remove.
(Target::do_plt_section_for_local): Remove.
(Target::register_global_plt_entry): Add Symbol_table and Layout
parameters.
* output.cc (Output_data_got::Got_entry::write): Use
plt_address_for_global and plt_address_for_local.
* layout.cc (Layout::add_target_dynamic_tags): Use size and
address of output section.
* i386.cc (class Output_data_plt_i386): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_i386::has_irelative_section): New function.
(Output_data_plt_i386::entry_count): Add irelative_count_.
(Output_data_plt_i386::set_final_data_size): Likewise.
(class Target_i386): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_i386::Target_i386): Initialize new fields.
(Target_i386::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_i386::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_i386::got_section): Create got_irelative_.
(Target_i386::rel_irelative_section): New function.
(Output_data_plt_i386::Output_data_plt_i386): Initialize new
fields. Don't define __rel_iplt_{start,end}.
(Output_data_plt_i386::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_i386::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_i386::rel_tls_desc): Fix formatting.
(Output_data_plt_i386::rel_irelative): New function.
(Output_data_plt_i386::address_for_global): New function.
(Output_data_plt_i386::address_for_local): New function.
(Output_data_plt_i386::do_write): Write out IRELATIVE area. Use
IRELATIVE GOT when changing IFUNC GOT entries.
(Target_i386::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_i386::do_finalize_sections): Create the __rel_iplt symbols
if we didn't create an IRELATIVE GOT.
(Target_i386::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_i386::do_dynsym_value): Use plt_address_for_global.
* x86_64.cc (class Output_data_plt_x86_64): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_x86_64::Output_data_plt_x86_64) [both versions]:
Initialize new fields. Remove symtab parameter. Change all
callers.
(Output_data_plt_x86_64::get_tlsdesc_plt_offset): Add
irelative_count_.
(Output_data_plt_x86_64::has_irelative_section): New function.
(Output_data_plt_x86_64::entry_count): Add irelative_count_.
(class Target_x86_64): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_x86_64::Target_x86_64): Initialize new fields.
(Target_x86_64::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_x86_64::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_x86_64::got_section): Create got_irelative_.
(Target_x86_64::rela_irelative_section): New function.
(Output_data_plt_x86_64::init): Remove symtab parameter. Change
all callers. Don't create __rel_iplt_{start,end}.
(Output_data_plt_x86_64::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_x86_64::add_relocation): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::rela_tlsdesc): Fix formatting.
(Output_data_plt_x86_64::rela_irelative): New function.
(Output_data_plt_x86_64::address_for_global): New function.
(Output_data_plt_x86_64::address_for_local): New function.
(Output_data_plt_x86_64::set_final_data_size): Likewise.
(Output_data_plt_x86_64::do_write): Write out IRELATIVE area.
(Target_x86_64::init_got_plt_for_update): Create got_irelative_.
(Target_x86_64::register_global_plt_entry): Add symtab and layout
parameters.
(Target_x86_64::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_x86_64::do_finalize_sections): Create the __rela_iplt
symbols if we didn't create an IRELATIVE GOT.
(Target_x86_64::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_x86_64::do_dynsym_value): Use plt_address_for_global.
* testsuite/ifuncvar1.c: New test file.
* testsuite/ifuncvar2.c: New test file.
* testsuite/ifuncvar3.c: New test file.
* testsuite/Makefile.am (check_PROGRAMS): Add ifuncvar.
(ifuncvar1_pic.o, ifuncvar2_pic.o, ifuncvar.so): New targets.
(ifuncvar_SOURCES, ifuncvar_DEPENDENCIES): New variables.
(ifuncvar_LDFLAGS, ifuncvar_LDADD): New variables.
* testsuite/Makefile.in: Rebuild.
2011-07-09 06:48:08 +08:00
|
|
|
elfcpp::Swap<32, false>::writeval(got_irelative_view + p->got_offset,
|
2010-08-20 06:50:16 +08:00
|
|
|
psymval->value(p->object, 0));
|
|
|
|
}
|
|
|
|
|
2007-12-21 05:21:24 +08:00
|
|
|
gold_assert(static_cast<section_size_type>(pov - oview) == oview_size);
|
|
|
|
gold_assert(static_cast<section_size_type>(got_pov - got_view) == got_size);
|
2006-11-30 01:56:40 +08:00
|
|
|
|
2009-12-15 03:53:05 +08:00
|
|
|
of->write_output_view(offset, oview_size, oview);
|
2006-11-30 01:56:40 +08:00
|
|
|
of->write_output_view(got_file_offset, got_size, got_view);
|
|
|
|
}
|
|
|
|
|
2010-08-20 06:50:16 +08:00
|
|
|
// Create the PLT section.
|
2006-11-30 01:56:40 +08:00
|
|
|
|
|
|
|
void
|
2010-08-20 06:50:16 +08:00
|
|
|
Target_i386::make_plt_section(Symbol_table* symtab, Layout* layout)
|
2006-11-30 01:56:40 +08:00
|
|
|
{
|
|
|
|
if (this->plt_ == NULL)
|
|
|
|
{
|
|
|
|
// Create the GOT sections first.
|
2007-09-21 15:20:01 +08:00
|
|
|
this->got_section(symtab, layout);
|
2006-11-30 01:56:40 +08:00
|
|
|
|
PR gold/12372
* target.h (Target::plt_address_for_global): New function.
(Target::plt_address_for_local): New function.
(Target::plt_section_for_global): Remove.
(Target::plt_section_for_local): Remove.
(Target::do_plt_address_for_global): New virtual function.
(Target::do_plt_address_for_local): New virtual function.
(Target::do_plt_section_for_global): Remove.
(Target::do_plt_section_for_local): Remove.
(Target::register_global_plt_entry): Add Symbol_table and Layout
parameters.
* output.cc (Output_data_got::Got_entry::write): Use
plt_address_for_global and plt_address_for_local.
* layout.cc (Layout::add_target_dynamic_tags): Use size and
address of output section.
* i386.cc (class Output_data_plt_i386): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_i386::has_irelative_section): New function.
(Output_data_plt_i386::entry_count): Add irelative_count_.
(Output_data_plt_i386::set_final_data_size): Likewise.
(class Target_i386): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_i386::Target_i386): Initialize new fields.
(Target_i386::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_i386::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_i386::got_section): Create got_irelative_.
(Target_i386::rel_irelative_section): New function.
(Output_data_plt_i386::Output_data_plt_i386): Initialize new
fields. Don't define __rel_iplt_{start,end}.
(Output_data_plt_i386::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_i386::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_i386::rel_tls_desc): Fix formatting.
(Output_data_plt_i386::rel_irelative): New function.
(Output_data_plt_i386::address_for_global): New function.
(Output_data_plt_i386::address_for_local): New function.
(Output_data_plt_i386::do_write): Write out IRELATIVE area. Use
IRELATIVE GOT when changing IFUNC GOT entries.
(Target_i386::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_i386::do_finalize_sections): Create the __rel_iplt symbols
if we didn't create an IRELATIVE GOT.
(Target_i386::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_i386::do_dynsym_value): Use plt_address_for_global.
* x86_64.cc (class Output_data_plt_x86_64): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_x86_64::Output_data_plt_x86_64) [both versions]:
Initialize new fields. Remove symtab parameter. Change all
callers.
(Output_data_plt_x86_64::get_tlsdesc_plt_offset): Add
irelative_count_.
(Output_data_plt_x86_64::has_irelative_section): New function.
(Output_data_plt_x86_64::entry_count): Add irelative_count_.
(class Target_x86_64): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_x86_64::Target_x86_64): Initialize new fields.
(Target_x86_64::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_x86_64::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_x86_64::got_section): Create got_irelative_.
(Target_x86_64::rela_irelative_section): New function.
(Output_data_plt_x86_64::init): Remove symtab parameter. Change
all callers. Don't create __rel_iplt_{start,end}.
(Output_data_plt_x86_64::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_x86_64::add_relocation): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::rela_tlsdesc): Fix formatting.
(Output_data_plt_x86_64::rela_irelative): New function.
(Output_data_plt_x86_64::address_for_global): New function.
(Output_data_plt_x86_64::address_for_local): New function.
(Output_data_plt_x86_64::set_final_data_size): Likewise.
(Output_data_plt_x86_64::do_write): Write out IRELATIVE area.
(Target_x86_64::init_got_plt_for_update): Create got_irelative_.
(Target_x86_64::register_global_plt_entry): Add symtab and layout
parameters.
(Target_x86_64::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_x86_64::do_finalize_sections): Create the __rela_iplt
symbols if we didn't create an IRELATIVE GOT.
(Target_x86_64::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_x86_64::do_dynsym_value): Use plt_address_for_global.
* testsuite/ifuncvar1.c: New test file.
* testsuite/ifuncvar2.c: New test file.
* testsuite/ifuncvar3.c: New test file.
* testsuite/Makefile.am (check_PROGRAMS): Add ifuncvar.
(ifuncvar1_pic.o, ifuncvar2_pic.o, ifuncvar.so): New targets.
(ifuncvar_SOURCES, ifuncvar_DEPENDENCIES): New variables.
(ifuncvar_LDFLAGS, ifuncvar_LDADD): New variables.
* testsuite/Makefile.in: Rebuild.
2011-07-09 06:48:08 +08:00
|
|
|
this->plt_ = new Output_data_plt_i386(layout, this->got_plt_,
|
|
|
|
this->got_irelative_);
|
2006-12-02 00:51:25 +08:00
|
|
|
layout->add_output_section_data(".plt", elfcpp::SHT_PROGBITS,
|
|
|
|
(elfcpp::SHF_ALLOC
|
|
|
|
| elfcpp::SHF_EXECINSTR),
|
2010-08-03 Ian Lance Taylor <iant@google.com>
PR 11805
* layout.h (enum Output_section_order): Define.
(class Layout): Update declarations.
* layout.cc (Layout::get_output_section): Add order parameter.
Remove is_interp, is_dynamic_linker_section, is_last_relro, and
is_first_non_relro parameters. Change all callers.
(Layout::choose_output_section): Likewise.
(Layout::add_output_section_data): Likewise.
(Layout::make_output_section): Likewise. Set order.
(Layout::default_section_order): New function.
(Layout::layout_eh_frame): Call add_output_section_to_nonload.
* output.cc (Output_section::Output_section): Initialize order_.
Don't initialize deleted fields.
(Output_segment::Output_segment): Don't initialize deleted
fields.
(Output_segment::add_output_section_to_load): New function
replacing add_output_section. Change all callers to call this or
add_output_section_to_nonload.
(Output_segment::add_output_section_to_nonload): New function.
(Output_segment::remove_output_section): Rewrite.
(Output_segment::add_initial_output_data): Likewise.
(Output_segment::has_any_data_sections): Likewise.
(Output_segment::is_first_section_relro): Likewise.
(Output_segment::maximum_alignment): Likewise.
(Output_segment::has_dynamic_reloc): New function replacing
dynamic_reloc_count. Change all callers.
(Output_segment::has_dynamic_reloc_list): New function replacing
dynamic_reloc_count_list. Change all callers.
(Output_segment::set_section_addresses): Rewrite.
(Output_segment::set_offset): Rewrite.
(Output_segment::find_first_and_last_list): Remove.
(Output_segment::set_tls_offsets): Rewrite.
(Output_segment::first_section_load_address): Likewise.
(Output_segment::output_section_count): Likewise.
(Output_segment::section_with_lowest_load_address): Likewise.
(Output_segment::write_section_headers): Likewise.
(Output_segment::print_sections_to_map): Likewise.
* output.h (class Output_data): Remove dynamic_reloc_count_
field. Add has_dynamic_reloc_ field. Make bools into bitfields.
(Output_data::add_dynamic_reloc): Rewrite.
(Output_data::has_dynamic_reloc): New function.
(Output_data::dynamic_reloc_count): Remove.
(class Output_section): Add order_ field. Remvoe is_relro_local_,
is_last_relro_, is_first_non_relro_, is_interp_,
is_dynamic_linker_section_ fields. Add order and set_order
functions. Remove is_relro_local, set_is_relro_local,
is_last_relro, set_is_last_relro, is_first_non_relro,
set_is_first_non_relro functions, is_interp, set_is_interp,
is_dynamic_linker_section, and set_is_dynamic_linker_section
functions.
(class Output_segment): Change Output_data_list from std::list to
std:;vector. Add output_lists_ field. Remove output_data_ and
output_bss_ fields. Update declarations.
2010-08-03 22:07:13 +08:00
|
|
|
this->plt_, ORDER_PLT, false);
|
2010-08-20 06:50:16 +08:00
|
|
|
|
|
|
|
// Make the sh_info field of .rel.plt point to .plt.
|
|
|
|
Output_section* rel_plt_os = this->plt_->rel_plt()->output_section();
|
|
|
|
rel_plt_os->set_info_section(this->plt_->output_section());
|
2006-11-30 01:56:40 +08:00
|
|
|
}
|
2010-08-20 06:50:16 +08:00
|
|
|
}
|
2006-11-30 01:56:40 +08:00
|
|
|
|
2010-08-20 06:50:16 +08:00
|
|
|
// Create a PLT entry for a global symbol.
|
|
|
|
|
|
|
|
void
|
|
|
|
Target_i386::make_plt_entry(Symbol_table* symtab, Layout* layout, Symbol* gsym)
|
|
|
|
{
|
|
|
|
if (gsym->has_plt_offset())
|
|
|
|
return;
|
|
|
|
if (this->plt_ == NULL)
|
|
|
|
this->make_plt_section(symtab, layout);
|
PR gold/12372
* target.h (Target::plt_address_for_global): New function.
(Target::plt_address_for_local): New function.
(Target::plt_section_for_global): Remove.
(Target::plt_section_for_local): Remove.
(Target::do_plt_address_for_global): New virtual function.
(Target::do_plt_address_for_local): New virtual function.
(Target::do_plt_section_for_global): Remove.
(Target::do_plt_section_for_local): Remove.
(Target::register_global_plt_entry): Add Symbol_table and Layout
parameters.
* output.cc (Output_data_got::Got_entry::write): Use
plt_address_for_global and plt_address_for_local.
* layout.cc (Layout::add_target_dynamic_tags): Use size and
address of output section.
* i386.cc (class Output_data_plt_i386): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_i386::has_irelative_section): New function.
(Output_data_plt_i386::entry_count): Add irelative_count_.
(Output_data_plt_i386::set_final_data_size): Likewise.
(class Target_i386): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_i386::Target_i386): Initialize new fields.
(Target_i386::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_i386::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_i386::got_section): Create got_irelative_.
(Target_i386::rel_irelative_section): New function.
(Output_data_plt_i386::Output_data_plt_i386): Initialize new
fields. Don't define __rel_iplt_{start,end}.
(Output_data_plt_i386::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_i386::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_i386::rel_tls_desc): Fix formatting.
(Output_data_plt_i386::rel_irelative): New function.
(Output_data_plt_i386::address_for_global): New function.
(Output_data_plt_i386::address_for_local): New function.
(Output_data_plt_i386::do_write): Write out IRELATIVE area. Use
IRELATIVE GOT when changing IFUNC GOT entries.
(Target_i386::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_i386::do_finalize_sections): Create the __rel_iplt symbols
if we didn't create an IRELATIVE GOT.
(Target_i386::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_i386::do_dynsym_value): Use plt_address_for_global.
* x86_64.cc (class Output_data_plt_x86_64): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_x86_64::Output_data_plt_x86_64) [both versions]:
Initialize new fields. Remove symtab parameter. Change all
callers.
(Output_data_plt_x86_64::get_tlsdesc_plt_offset): Add
irelative_count_.
(Output_data_plt_x86_64::has_irelative_section): New function.
(Output_data_plt_x86_64::entry_count): Add irelative_count_.
(class Target_x86_64): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_x86_64::Target_x86_64): Initialize new fields.
(Target_x86_64::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_x86_64::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_x86_64::got_section): Create got_irelative_.
(Target_x86_64::rela_irelative_section): New function.
(Output_data_plt_x86_64::init): Remove symtab parameter. Change
all callers. Don't create __rel_iplt_{start,end}.
(Output_data_plt_x86_64::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_x86_64::add_relocation): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::rela_tlsdesc): Fix formatting.
(Output_data_plt_x86_64::rela_irelative): New function.
(Output_data_plt_x86_64::address_for_global): New function.
(Output_data_plt_x86_64::address_for_local): New function.
(Output_data_plt_x86_64::set_final_data_size): Likewise.
(Output_data_plt_x86_64::do_write): Write out IRELATIVE area.
(Target_x86_64::init_got_plt_for_update): Create got_irelative_.
(Target_x86_64::register_global_plt_entry): Add symtab and layout
parameters.
(Target_x86_64::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_x86_64::do_finalize_sections): Create the __rela_iplt
symbols if we didn't create an IRELATIVE GOT.
(Target_x86_64::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_x86_64::do_dynsym_value): Use plt_address_for_global.
* testsuite/ifuncvar1.c: New test file.
* testsuite/ifuncvar2.c: New test file.
* testsuite/ifuncvar3.c: New test file.
* testsuite/Makefile.am (check_PROGRAMS): Add ifuncvar.
(ifuncvar1_pic.o, ifuncvar2_pic.o, ifuncvar.so): New targets.
(ifuncvar_SOURCES, ifuncvar_DEPENDENCIES): New variables.
(ifuncvar_LDFLAGS, ifuncvar_LDADD): New variables.
* testsuite/Makefile.in: Rebuild.
2011-07-09 06:48:08 +08:00
|
|
|
this->plt_->add_entry(symtab, layout, gsym);
|
2006-11-30 01:56:40 +08:00
|
|
|
}
|
|
|
|
|
2010-08-20 06:50:16 +08:00
|
|
|
// Make a PLT entry for a local STT_GNU_IFUNC symbol.
|
|
|
|
|
|
|
|
void
|
|
|
|
Target_i386::make_local_ifunc_plt_entry(Symbol_table* symtab, Layout* layout,
|
2011-05-25 05:41:10 +08:00
|
|
|
Sized_relobj_file<32, false>* relobj,
|
2010-08-20 06:50:16 +08:00
|
|
|
unsigned int local_sym_index)
|
|
|
|
{
|
|
|
|
if (relobj->local_has_plt_offset(local_sym_index))
|
|
|
|
return;
|
|
|
|
if (this->plt_ == NULL)
|
|
|
|
this->make_plt_section(symtab, layout);
|
PR gold/12372
* target.h (Target::plt_address_for_global): New function.
(Target::plt_address_for_local): New function.
(Target::plt_section_for_global): Remove.
(Target::plt_section_for_local): Remove.
(Target::do_plt_address_for_global): New virtual function.
(Target::do_plt_address_for_local): New virtual function.
(Target::do_plt_section_for_global): Remove.
(Target::do_plt_section_for_local): Remove.
(Target::register_global_plt_entry): Add Symbol_table and Layout
parameters.
* output.cc (Output_data_got::Got_entry::write): Use
plt_address_for_global and plt_address_for_local.
* layout.cc (Layout::add_target_dynamic_tags): Use size and
address of output section.
* i386.cc (class Output_data_plt_i386): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_i386::has_irelative_section): New function.
(Output_data_plt_i386::entry_count): Add irelative_count_.
(Output_data_plt_i386::set_final_data_size): Likewise.
(class Target_i386): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_i386::Target_i386): Initialize new fields.
(Target_i386::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_i386::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_i386::got_section): Create got_irelative_.
(Target_i386::rel_irelative_section): New function.
(Output_data_plt_i386::Output_data_plt_i386): Initialize new
fields. Don't define __rel_iplt_{start,end}.
(Output_data_plt_i386::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_i386::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_i386::rel_tls_desc): Fix formatting.
(Output_data_plt_i386::rel_irelative): New function.
(Output_data_plt_i386::address_for_global): New function.
(Output_data_plt_i386::address_for_local): New function.
(Output_data_plt_i386::do_write): Write out IRELATIVE area. Use
IRELATIVE GOT when changing IFUNC GOT entries.
(Target_i386::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_i386::do_finalize_sections): Create the __rel_iplt symbols
if we didn't create an IRELATIVE GOT.
(Target_i386::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_i386::do_dynsym_value): Use plt_address_for_global.
* x86_64.cc (class Output_data_plt_x86_64): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_x86_64::Output_data_plt_x86_64) [both versions]:
Initialize new fields. Remove symtab parameter. Change all
callers.
(Output_data_plt_x86_64::get_tlsdesc_plt_offset): Add
irelative_count_.
(Output_data_plt_x86_64::has_irelative_section): New function.
(Output_data_plt_x86_64::entry_count): Add irelative_count_.
(class Target_x86_64): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_x86_64::Target_x86_64): Initialize new fields.
(Target_x86_64::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_x86_64::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_x86_64::got_section): Create got_irelative_.
(Target_x86_64::rela_irelative_section): New function.
(Output_data_plt_x86_64::init): Remove symtab parameter. Change
all callers. Don't create __rel_iplt_{start,end}.
(Output_data_plt_x86_64::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_x86_64::add_relocation): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::rela_tlsdesc): Fix formatting.
(Output_data_plt_x86_64::rela_irelative): New function.
(Output_data_plt_x86_64::address_for_global): New function.
(Output_data_plt_x86_64::address_for_local): New function.
(Output_data_plt_x86_64::set_final_data_size): Likewise.
(Output_data_plt_x86_64::do_write): Write out IRELATIVE area.
(Target_x86_64::init_got_plt_for_update): Create got_irelative_.
(Target_x86_64::register_global_plt_entry): Add symtab and layout
parameters.
(Target_x86_64::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_x86_64::do_finalize_sections): Create the __rela_iplt
symbols if we didn't create an IRELATIVE GOT.
(Target_x86_64::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_x86_64::do_dynsym_value): Use plt_address_for_global.
* testsuite/ifuncvar1.c: New test file.
* testsuite/ifuncvar2.c: New test file.
* testsuite/ifuncvar3.c: New test file.
* testsuite/Makefile.am (check_PROGRAMS): Add ifuncvar.
(ifuncvar1_pic.o, ifuncvar2_pic.o, ifuncvar.so): New targets.
(ifuncvar_SOURCES, ifuncvar_DEPENDENCIES): New variables.
(ifuncvar_LDFLAGS, ifuncvar_LDADD): New variables.
* testsuite/Makefile.in: Rebuild.
2011-07-09 06:48:08 +08:00
|
|
|
unsigned int plt_offset = this->plt_->add_local_ifunc_entry(symtab, layout,
|
|
|
|
relobj,
|
2010-08-20 06:50:16 +08:00
|
|
|
local_sym_index);
|
|
|
|
relobj->set_local_plt_offset(local_sym_index, plt_offset);
|
|
|
|
}
|
|
|
|
|
2010-08-13 06:15:00 +08:00
|
|
|
// Return the number of entries in the PLT.
|
|
|
|
|
|
|
|
unsigned int
|
|
|
|
Target_i386::plt_entry_count() const
|
|
|
|
{
|
|
|
|
if (this->plt_ == NULL)
|
|
|
|
return 0;
|
|
|
|
return this->plt_->entry_count();
|
|
|
|
}
|
|
|
|
|
|
|
|
// Return the offset of the first non-reserved PLT entry.
|
|
|
|
|
|
|
|
unsigned int
|
|
|
|
Target_i386::first_plt_entry_offset() const
|
|
|
|
{
|
|
|
|
return Output_data_plt_i386::first_plt_entry_offset();
|
|
|
|
}
|
|
|
|
|
|
|
|
// Return the size of each PLT entry.
|
|
|
|
|
|
|
|
unsigned int
|
|
|
|
Target_i386::plt_entry_size() const
|
|
|
|
{
|
|
|
|
return Output_data_plt_i386::get_plt_entry_size();
|
|
|
|
}
|
|
|
|
|
2010-01-09 03:33:18 +08:00
|
|
|
// Get the section to use for TLS_DESC relocations.
|
|
|
|
|
|
|
|
Target_i386::Reloc_section*
|
|
|
|
Target_i386::rel_tls_desc_section(Layout* layout) const
|
|
|
|
{
|
|
|
|
return this->plt_section()->rel_tls_desc(layout);
|
|
|
|
}
|
|
|
|
|
2008-09-16 12:31:25 +08:00
|
|
|
// Define the _TLS_MODULE_BASE_ symbol in the TLS segment.
|
2008-04-17 10:00:54 +08:00
|
|
|
|
|
|
|
void
|
|
|
|
Target_i386::define_tls_base_symbol(Symbol_table* symtab, Layout* layout)
|
|
|
|
{
|
|
|
|
if (this->tls_base_symbol_defined_)
|
|
|
|
return;
|
|
|
|
|
|
|
|
Output_segment* tls_segment = layout->tls_segment();
|
|
|
|
if (tls_segment != NULL)
|
|
|
|
{
|
2008-09-16 12:23:29 +08:00
|
|
|
bool is_exec = parameters->options().output_is_executable();
|
2008-04-17 10:00:54 +08:00
|
|
|
symtab->define_in_output_segment("_TLS_MODULE_BASE_", NULL,
|
2009-12-29 08:31:48 +08:00
|
|
|
Symbol_table::PREDEFINED,
|
2008-04-17 10:00:54 +08:00
|
|
|
tls_segment, 0, 0,
|
|
|
|
elfcpp::STT_TLS,
|
|
|
|
elfcpp::STB_LOCAL,
|
|
|
|
elfcpp::STV_HIDDEN, 0,
|
2008-09-16 12:23:29 +08:00
|
|
|
(is_exec
|
|
|
|
? Symbol::SEGMENT_END
|
|
|
|
: Symbol::SEGMENT_START),
|
|
|
|
true);
|
2008-04-17 10:00:54 +08:00
|
|
|
}
|
|
|
|
this->tls_base_symbol_defined_ = true;
|
|
|
|
}
|
|
|
|
|
2007-12-11 12:23:05 +08:00
|
|
|
// Create a GOT entry for the TLS module index.
|
|
|
|
|
|
|
|
unsigned int
|
|
|
|
Target_i386::got_mod_index_entry(Symbol_table* symtab, Layout* layout,
|
2011-05-25 05:41:10 +08:00
|
|
|
Sized_relobj_file<32, false>* object)
|
2007-12-11 12:23:05 +08:00
|
|
|
{
|
|
|
|
if (this->got_mod_index_offset_ == -1U)
|
|
|
|
{
|
|
|
|
gold_assert(symtab != NULL && layout != NULL && object != NULL);
|
|
|
|
Reloc_section* rel_dyn = this->rel_dyn_section(layout);
|
|
|
|
Output_data_got<32, false>* got = this->got_section(symtab, layout);
|
|
|
|
unsigned int got_offset = got->add_constant(0);
|
|
|
|
rel_dyn->add_local(object, 0, elfcpp::R_386_TLS_DTPMOD32, got,
|
|
|
|
got_offset);
|
2008-04-12 07:37:24 +08:00
|
|
|
got->add_constant(0);
|
2007-12-11 12:23:05 +08:00
|
|
|
this->got_mod_index_offset_ = got_offset;
|
|
|
|
}
|
|
|
|
return this->got_mod_index_offset_;
|
|
|
|
}
|
|
|
|
|
2006-10-21 04:40:49 +08:00
|
|
|
// Optimize the TLS relocation type based on what we know about the
|
2006-11-30 01:56:40 +08:00
|
|
|
// symbol. IS_FINAL is true if the final address of this symbol is
|
|
|
|
// known at link time.
|
2006-10-21 04:40:49 +08:00
|
|
|
|
2007-10-08 13:12:59 +08:00
|
|
|
tls::Tls_optimization
|
2007-09-21 15:20:01 +08:00
|
|
|
Target_i386::optimize_tls_reloc(bool is_final, int r_type)
|
2006-10-21 04:40:49 +08:00
|
|
|
{
|
|
|
|
// If we are generating a shared library, then we can't do anything
|
|
|
|
// in the linker.
|
2008-02-28 08:18:24 +08:00
|
|
|
if (parameters->options().shared())
|
2007-10-08 13:12:59 +08:00
|
|
|
return tls::TLSOPT_NONE;
|
2006-10-21 04:40:49 +08:00
|
|
|
|
|
|
|
switch (r_type)
|
|
|
|
{
|
|
|
|
case elfcpp::R_386_TLS_GD:
|
|
|
|
case elfcpp::R_386_TLS_GOTDESC:
|
|
|
|
case elfcpp::R_386_TLS_DESC_CALL:
|
2007-10-13 08:15:07 +08:00
|
|
|
// These are General-Dynamic which permits fully general TLS
|
2006-10-21 04:40:49 +08:00
|
|
|
// access. Since we know that we are generating an executable,
|
|
|
|
// we can convert this to Initial-Exec. If we also know that
|
|
|
|
// this is a local symbol, we can further switch to Local-Exec.
|
2006-11-30 01:56:40 +08:00
|
|
|
if (is_final)
|
2007-10-08 13:12:59 +08:00
|
|
|
return tls::TLSOPT_TO_LE;
|
|
|
|
return tls::TLSOPT_TO_IE;
|
2006-10-21 04:40:49 +08:00
|
|
|
|
|
|
|
case elfcpp::R_386_TLS_LDM:
|
|
|
|
// This is Local-Dynamic, which refers to a local symbol in the
|
|
|
|
// dynamic TLS block. Since we know that we generating an
|
|
|
|
// executable, we can switch to Local-Exec.
|
2007-10-08 13:12:59 +08:00
|
|
|
return tls::TLSOPT_TO_LE;
|
2006-10-21 04:40:49 +08:00
|
|
|
|
|
|
|
case elfcpp::R_386_TLS_LDO_32:
|
2007-10-08 13:12:59 +08:00
|
|
|
// Another type of Local-Dynamic relocation.
|
|
|
|
return tls::TLSOPT_TO_LE;
|
2006-10-21 04:40:49 +08:00
|
|
|
|
|
|
|
case elfcpp::R_386_TLS_IE:
|
|
|
|
case elfcpp::R_386_TLS_GOTIE:
|
|
|
|
case elfcpp::R_386_TLS_IE_32:
|
|
|
|
// These are Initial-Exec relocs which get the thread offset
|
|
|
|
// from the GOT. If we know that we are linking against the
|
|
|
|
// local symbol, we can switch to Local-Exec, which links the
|
|
|
|
// thread offset into the instruction.
|
2006-11-30 01:56:40 +08:00
|
|
|
if (is_final)
|
2007-10-08 13:12:59 +08:00
|
|
|
return tls::TLSOPT_TO_LE;
|
|
|
|
return tls::TLSOPT_NONE;
|
2007-09-13 00:38:04 +08:00
|
|
|
|
2006-10-21 04:40:49 +08:00
|
|
|
case elfcpp::R_386_TLS_LE:
|
|
|
|
case elfcpp::R_386_TLS_LE_32:
|
|
|
|
// When we already have Local-Exec, there is nothing further we
|
|
|
|
// can do.
|
2007-10-08 13:12:59 +08:00
|
|
|
return tls::TLSOPT_NONE;
|
2006-10-21 04:40:49 +08:00
|
|
|
|
|
|
|
default:
|
2006-11-30 01:56:40 +08:00
|
|
|
gold_unreachable();
|
2006-10-21 04:40:49 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-11-11 18:43:30 +08:00
|
|
|
// Get the Reference_flags for a particular relocation.
|
2007-10-08 13:12:59 +08:00
|
|
|
|
2010-11-11 18:43:30 +08:00
|
|
|
int
|
|
|
|
Target_i386::Scan::get_reference_flags(unsigned int r_type)
|
2010-08-20 06:50:16 +08:00
|
|
|
{
|
|
|
|
switch (r_type)
|
|
|
|
{
|
|
|
|
case elfcpp::R_386_NONE:
|
|
|
|
case elfcpp::R_386_GNU_VTINHERIT:
|
|
|
|
case elfcpp::R_386_GNU_VTENTRY:
|
2010-11-11 18:43:30 +08:00
|
|
|
case elfcpp::R_386_GOTPC:
|
|
|
|
// No symbol reference.
|
|
|
|
return 0;
|
2010-08-20 06:50:16 +08:00
|
|
|
|
|
|
|
case elfcpp::R_386_32:
|
|
|
|
case elfcpp::R_386_16:
|
|
|
|
case elfcpp::R_386_8:
|
2010-11-11 18:43:30 +08:00
|
|
|
return Symbol::ABSOLUTE_REF;
|
|
|
|
|
2010-08-20 06:50:16 +08:00
|
|
|
case elfcpp::R_386_PC32:
|
|
|
|
case elfcpp::R_386_PC16:
|
|
|
|
case elfcpp::R_386_PC8:
|
|
|
|
case elfcpp::R_386_GOTOFF:
|
2010-11-11 18:43:30 +08:00
|
|
|
return Symbol::RELATIVE_REF;
|
|
|
|
|
|
|
|
case elfcpp::R_386_PLT32:
|
|
|
|
return Symbol::FUNCTION_CALL | Symbol::RELATIVE_REF;
|
|
|
|
|
2010-08-20 06:50:16 +08:00
|
|
|
case elfcpp::R_386_GOT32:
|
2010-11-11 18:43:30 +08:00
|
|
|
// Absolute in GOT.
|
|
|
|
return Symbol::ABSOLUTE_REF;
|
|
|
|
|
|
|
|
case elfcpp::R_386_TLS_GD: // Global-dynamic
|
|
|
|
case elfcpp::R_386_TLS_GOTDESC: // Global-dynamic (from ~oliva url)
|
|
|
|
case elfcpp::R_386_TLS_DESC_CALL:
|
|
|
|
case elfcpp::R_386_TLS_LDM: // Local-dynamic
|
|
|
|
case elfcpp::R_386_TLS_LDO_32: // Alternate local-dynamic
|
|
|
|
case elfcpp::R_386_TLS_IE: // Initial-exec
|
|
|
|
case elfcpp::R_386_TLS_IE_32:
|
|
|
|
case elfcpp::R_386_TLS_GOTIE:
|
|
|
|
case elfcpp::R_386_TLS_LE: // Local-exec
|
|
|
|
case elfcpp::R_386_TLS_LE_32:
|
|
|
|
return Symbol::TLS_REF;
|
2010-08-20 06:50:16 +08:00
|
|
|
|
|
|
|
case elfcpp::R_386_COPY:
|
|
|
|
case elfcpp::R_386_GLOB_DAT:
|
|
|
|
case elfcpp::R_386_JUMP_SLOT:
|
|
|
|
case elfcpp::R_386_RELATIVE:
|
|
|
|
case elfcpp::R_386_IRELATIVE:
|
|
|
|
case elfcpp::R_386_TLS_TPOFF:
|
|
|
|
case elfcpp::R_386_TLS_DTPMOD32:
|
|
|
|
case elfcpp::R_386_TLS_DTPOFF32:
|
|
|
|
case elfcpp::R_386_TLS_TPOFF32:
|
|
|
|
case elfcpp::R_386_TLS_DESC:
|
|
|
|
case elfcpp::R_386_32PLT:
|
|
|
|
case elfcpp::R_386_TLS_GD_32:
|
|
|
|
case elfcpp::R_386_TLS_GD_PUSH:
|
|
|
|
case elfcpp::R_386_TLS_GD_CALL:
|
|
|
|
case elfcpp::R_386_TLS_GD_POP:
|
|
|
|
case elfcpp::R_386_TLS_LDM_32:
|
|
|
|
case elfcpp::R_386_TLS_LDM_PUSH:
|
|
|
|
case elfcpp::R_386_TLS_LDM_CALL:
|
|
|
|
case elfcpp::R_386_TLS_LDM_POP:
|
|
|
|
case elfcpp::R_386_USED_BY_INTEL_200:
|
|
|
|
default:
|
2010-11-11 18:43:30 +08:00
|
|
|
// Not expected. We will give an error later.
|
|
|
|
return 0;
|
2010-08-20 06:50:16 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-11-11 18:43:30 +08:00
|
|
|
// Report an unsupported relocation against a local symbol.
|
|
|
|
|
|
|
|
void
|
2011-05-25 05:41:10 +08:00
|
|
|
Target_i386::Scan::unsupported_reloc_local(Sized_relobj_file<32, false>* object,
|
2010-11-11 18:43:30 +08:00
|
|
|
unsigned int r_type)
|
|
|
|
{
|
|
|
|
gold_error(_("%s: unsupported reloc %u against local symbol"),
|
|
|
|
object->name().c_str(), r_type);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Return whether we need to make a PLT entry for a relocation of a
|
|
|
|
// given type against a STT_GNU_IFUNC symbol.
|
|
|
|
|
|
|
|
bool
|
2011-05-25 05:41:10 +08:00
|
|
|
Target_i386::Scan::reloc_needs_plt_for_ifunc(
|
|
|
|
Sized_relobj_file<32, false>* object,
|
|
|
|
unsigned int r_type)
|
2010-11-11 18:43:30 +08:00
|
|
|
{
|
|
|
|
int flags = Scan::get_reference_flags(r_type);
|
|
|
|
if (flags & Symbol::TLS_REF)
|
|
|
|
gold_error(_("%s: unsupported TLS reloc %u for IFUNC symbol"),
|
|
|
|
object->name().c_str(), r_type);
|
|
|
|
return flags != 0;
|
|
|
|
}
|
|
|
|
|
2006-10-21 04:40:49 +08:00
|
|
|
// Scan a relocation for a local symbol.
|
|
|
|
|
|
|
|
inline void
|
* object.h (class Relobj): Drop options parameter from
gc_process_relocs, scan_relocs, relocate, do_gc_process_relocs,
do_scan_relocs, do_relocate. Change all callers.
(class Sized_relobj): Drop options parameters from
do_gc_process_relocs, do_scan_relocs, do_relocate,
do_relocate_sections, relocate_sections, emit_relocs_scan,
emit_relocs_scan_reltype. Change all callers.
(struct Relocate_info): Remove options field and all references to
it.
* reloc.h (class Read_relocs): Remove options constructor
parameter and options_ field. Change all callers.
(class Gc_process_relocs, class Scan_relocs): Likewise.
(class Relocate_task): Likewise.
* target-reloc.h (scan_relocs): Remove options parameter. Change
all callers.
(scan_relocatable_relocs): Likewise.
* target.h (class Sized_target): Remove options parameter from
gc_process_relocs, scan_relocs, scan_relocatable_relocs. Change
all callers.
* gc.h (gc_process_relocs): Remove options parameter. Change all
callers.
* arm.cc: Update functions to remove options parameters.
* i386.cc: Likewise.
* powerpc.cc: Likewise.
* sparc.cc: Likewise.
* x86_64.cc: Likewise.
* testsuite/testfile.cc: Likewise.
2009-10-29 13:16:23 +08:00
|
|
|
Target_i386::Scan::local(Symbol_table* symtab,
|
2006-11-04 02:26:11 +08:00
|
|
|
Layout* layout,
|
|
|
|
Target_i386* target,
|
2011-05-25 05:41:10 +08:00
|
|
|
Sized_relobj_file<32, false>* object,
|
2007-10-16 08:42:36 +08:00
|
|
|
unsigned int data_shndx,
|
2007-11-15 06:31:02 +08:00
|
|
|
Output_section* output_section,
|
2007-10-16 08:42:36 +08:00
|
|
|
const elfcpp::Rel<32, false>& reloc,
|
2006-11-30 01:56:40 +08:00
|
|
|
unsigned int r_type,
|
2007-12-06 13:55:50 +08:00
|
|
|
const elfcpp::Sym<32, false>& lsym)
|
2006-10-21 04:40:49 +08:00
|
|
|
{
|
2010-08-20 06:50:16 +08:00
|
|
|
// A local STT_GNU_IFUNC symbol may require a PLT entry.
|
|
|
|
if (lsym.get_st_type() == elfcpp::STT_GNU_IFUNC
|
|
|
|
&& this->reloc_needs_plt_for_ifunc(object, r_type))
|
|
|
|
{
|
|
|
|
unsigned int r_sym = elfcpp::elf_r_sym<32>(reloc.get_r_info());
|
|
|
|
target->make_local_ifunc_plt_entry(symtab, layout, object, r_sym);
|
|
|
|
}
|
|
|
|
|
2006-10-21 04:40:49 +08:00
|
|
|
switch (r_type)
|
|
|
|
{
|
|
|
|
case elfcpp::R_386_NONE:
|
|
|
|
case elfcpp::R_386_GNU_VTINHERIT:
|
|
|
|
case elfcpp::R_386_GNU_VTENTRY:
|
|
|
|
break;
|
|
|
|
|
|
|
|
case elfcpp::R_386_32:
|
2007-10-17 07:23:08 +08:00
|
|
|
// If building a shared library (or a position-independent
|
|
|
|
// executable), we need to create a dynamic relocation for
|
|
|
|
// this location. The relocation applied at link time will
|
|
|
|
// apply the link-time value, so we flag the location with
|
|
|
|
// an R_386_RELATIVE relocation so the dynamic loader can
|
|
|
|
// relocate it easily.
|
2008-02-28 08:18:24 +08:00
|
|
|
if (parameters->options().output_is_position_independent())
|
2007-10-17 07:23:08 +08:00
|
|
|
{
|
|
|
|
Reloc_section* rel_dyn = target->rel_dyn_section(layout);
|
2007-12-08 03:32:59 +08:00
|
|
|
unsigned int r_sym = elfcpp::elf_r_sym<32>(reloc.get_r_info());
|
2010-08-20 06:50:16 +08:00
|
|
|
rel_dyn->add_local_relative(object, r_sym, elfcpp::R_386_RELATIVE,
|
|
|
|
output_section, data_shndx,
|
|
|
|
reloc.get_r_offset());
|
2007-11-10 03:45:08 +08:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case elfcpp::R_386_16:
|
|
|
|
case elfcpp::R_386_8:
|
|
|
|
// If building a shared library (or a position-independent
|
|
|
|
// executable), we need to create a dynamic relocation for
|
|
|
|
// this location. Because the addend needs to remain in the
|
|
|
|
// data section, we need to be careful not to apply this
|
|
|
|
// relocation statically.
|
2008-02-28 08:18:24 +08:00
|
|
|
if (parameters->options().output_is_position_independent())
|
2007-11-10 03:45:08 +08:00
|
|
|
{
|
|
|
|
Reloc_section* rel_dyn = target->rel_dyn_section(layout);
|
2008-04-20 02:30:58 +08:00
|
|
|
unsigned int r_sym = elfcpp::elf_r_sym<32>(reloc.get_r_info());
|
2008-02-12 08:28:48 +08:00
|
|
|
if (lsym.get_st_type() != elfcpp::STT_SECTION)
|
2008-04-20 02:30:58 +08:00
|
|
|
rel_dyn->add_local(object, r_sym, r_type, output_section,
|
|
|
|
data_shndx, reloc.get_r_offset());
|
2008-02-12 08:28:48 +08:00
|
|
|
else
|
|
|
|
{
|
|
|
|
gold_assert(lsym.get_st_value() == 0);
|
2008-04-20 02:30:58 +08:00
|
|
|
unsigned int shndx = lsym.get_st_shndx();
|
|
|
|
bool is_ordinary;
|
|
|
|
shndx = object->adjust_sym_shndx(r_sym, shndx,
|
|
|
|
&is_ordinary);
|
|
|
|
if (!is_ordinary)
|
|
|
|
object->error(_("section symbol %u has bad shndx %u"),
|
|
|
|
r_sym, shndx);
|
|
|
|
else
|
|
|
|
rel_dyn->add_local_section(object, shndx,
|
|
|
|
r_type, output_section,
|
|
|
|
data_shndx, reloc.get_r_offset());
|
2008-02-12 08:28:48 +08:00
|
|
|
}
|
2007-10-17 07:23:08 +08:00
|
|
|
}
|
2006-10-21 04:40:49 +08:00
|
|
|
break;
|
|
|
|
|
|
|
|
case elfcpp::R_386_PC32:
|
|
|
|
case elfcpp::R_386_PC16:
|
|
|
|
case elfcpp::R_386_PC8:
|
|
|
|
break;
|
|
|
|
|
2007-10-20 08:33:31 +08:00
|
|
|
case elfcpp::R_386_PLT32:
|
|
|
|
// Since we know this is a local symbol, we can handle this as a
|
|
|
|
// PC32 reloc.
|
|
|
|
break;
|
|
|
|
|
2006-11-04 02:26:11 +08:00
|
|
|
case elfcpp::R_386_GOTOFF:
|
|
|
|
case elfcpp::R_386_GOTPC:
|
|
|
|
// We need a GOT section.
|
2007-09-21 15:20:01 +08:00
|
|
|
target->got_section(symtab, layout);
|
2006-11-04 02:26:11 +08:00
|
|
|
break;
|
|
|
|
|
2007-10-16 08:42:36 +08:00
|
|
|
case elfcpp::R_386_GOT32:
|
|
|
|
{
|
|
|
|
// The symbol requires a GOT entry.
|
|
|
|
Output_data_got<32, false>* got = target->got_section(symtab, layout);
|
|
|
|
unsigned int r_sym = elfcpp::elf_r_sym<32>(reloc.get_r_info());
|
2010-08-20 06:50:16 +08:00
|
|
|
|
|
|
|
// For a STT_GNU_IFUNC symbol we want the PLT offset. That
|
|
|
|
// lets function pointers compare correctly with shared
|
|
|
|
// libraries. Otherwise we would need an IRELATIVE reloc.
|
|
|
|
bool is_new;
|
|
|
|
if (lsym.get_st_type() == elfcpp::STT_GNU_IFUNC)
|
|
|
|
is_new = got->add_local_plt(object, r_sym, GOT_TYPE_STANDARD);
|
|
|
|
else
|
|
|
|
is_new = got->add_local(object, r_sym, GOT_TYPE_STANDARD);
|
|
|
|
if (is_new)
|
2007-10-16 08:42:36 +08:00
|
|
|
{
|
|
|
|
// If we are generating a shared object, we need to add a
|
2007-12-06 13:55:50 +08:00
|
|
|
// dynamic RELATIVE relocation for this symbol's GOT entry.
|
2008-02-28 08:18:24 +08:00
|
|
|
if (parameters->options().output_is_position_independent())
|
2007-10-16 08:42:36 +08:00
|
|
|
{
|
|
|
|
Reloc_section* rel_dyn = target->rel_dyn_section(layout);
|
2010-08-20 06:50:16 +08:00
|
|
|
unsigned int got_offset =
|
|
|
|
object->local_got_offset(r_sym, GOT_TYPE_STANDARD);
|
|
|
|
rel_dyn->add_local_relative(object, r_sym,
|
|
|
|
elfcpp::R_386_RELATIVE,
|
|
|
|
got, got_offset);
|
2007-10-16 08:42:36 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
2007-10-08 13:12:59 +08:00
|
|
|
// These are relocations which should only be seen by the
|
|
|
|
// dynamic linker, and should never be seen here.
|
2006-10-21 04:40:49 +08:00
|
|
|
case elfcpp::R_386_COPY:
|
|
|
|
case elfcpp::R_386_GLOB_DAT:
|
|
|
|
case elfcpp::R_386_JUMP_SLOT:
|
|
|
|
case elfcpp::R_386_RELATIVE:
|
2010-08-20 06:50:16 +08:00
|
|
|
case elfcpp::R_386_IRELATIVE:
|
2006-10-21 04:40:49 +08:00
|
|
|
case elfcpp::R_386_TLS_TPOFF:
|
|
|
|
case elfcpp::R_386_TLS_DTPMOD32:
|
|
|
|
case elfcpp::R_386_TLS_DTPOFF32:
|
|
|
|
case elfcpp::R_386_TLS_TPOFF32:
|
|
|
|
case elfcpp::R_386_TLS_DESC:
|
2007-10-14 14:57:58 +08:00
|
|
|
gold_error(_("%s: unexpected reloc %u in object file"),
|
2007-10-14 14:49:14 +08:00
|
|
|
object->name().c_str(), r_type);
|
2006-10-21 04:40:49 +08:00
|
|
|
break;
|
|
|
|
|
2007-10-08 13:12:59 +08:00
|
|
|
// These are initial TLS relocs, which are expected when
|
2007-10-05 06:28:36 +08:00
|
|
|
// linking.
|
2007-10-30 04:09:35 +08:00
|
|
|
case elfcpp::R_386_TLS_GD: // Global-dynamic
|
|
|
|
case elfcpp::R_386_TLS_GOTDESC: // Global-dynamic (from ~oliva url)
|
|
|
|
case elfcpp::R_386_TLS_DESC_CALL:
|
|
|
|
case elfcpp::R_386_TLS_LDM: // Local-dynamic
|
|
|
|
case elfcpp::R_386_TLS_LDO_32: // Alternate local-dynamic
|
|
|
|
case elfcpp::R_386_TLS_IE: // Initial-exec
|
2006-10-21 04:40:49 +08:00
|
|
|
case elfcpp::R_386_TLS_IE_32:
|
2007-10-30 04:09:35 +08:00
|
|
|
case elfcpp::R_386_TLS_GOTIE:
|
|
|
|
case elfcpp::R_386_TLS_LE: // Local-exec
|
2006-10-21 04:40:49 +08:00
|
|
|
case elfcpp::R_386_TLS_LE_32:
|
2007-09-21 15:20:01 +08:00
|
|
|
{
|
2008-02-28 08:18:24 +08:00
|
|
|
bool output_is_shared = parameters->options().shared();
|
2007-10-08 13:12:59 +08:00
|
|
|
const tls::Tls_optimization optimized_type
|
|
|
|
= Target_i386::optimize_tls_reloc(!output_is_shared, r_type);
|
2007-09-21 15:20:01 +08:00
|
|
|
switch (r_type)
|
|
|
|
{
|
2007-10-30 04:09:35 +08:00
|
|
|
case elfcpp::R_386_TLS_GD: // Global-dynamic
|
2007-11-15 06:31:02 +08:00
|
|
|
if (optimized_type == tls::TLSOPT_NONE)
|
|
|
|
{
|
|
|
|
// Create a pair of GOT entries for the module index and
|
|
|
|
// dtv-relative offset.
|
|
|
|
Output_data_got<32, false>* got
|
|
|
|
= target->got_section(symtab, layout);
|
|
|
|
unsigned int r_sym = elfcpp::elf_r_sym<32>(reloc.get_r_info());
|
2008-04-20 02:30:58 +08:00
|
|
|
unsigned int shndx = lsym.get_st_shndx();
|
|
|
|
bool is_ordinary;
|
|
|
|
shndx = object->adjust_sym_shndx(r_sym, shndx, &is_ordinary);
|
|
|
|
if (!is_ordinary)
|
|
|
|
object->error(_("local symbol %u has bad shndx %u"),
|
|
|
|
r_sym, shndx);
|
|
|
|
else
|
|
|
|
got->add_local_pair_with_rel(object, r_sym, shndx,
|
|
|
|
GOT_TYPE_TLS_PAIR,
|
|
|
|
target->rel_dyn_section(layout),
|
|
|
|
elfcpp::R_386_TLS_DTPMOD32, 0);
|
2007-11-15 06:31:02 +08:00
|
|
|
}
|
|
|
|
else if (optimized_type != tls::TLSOPT_TO_LE)
|
|
|
|
unsupported_reloc_local(object, r_type);
|
|
|
|
break;
|
|
|
|
|
2007-10-30 04:09:35 +08:00
|
|
|
case elfcpp::R_386_TLS_GOTDESC: // Global-dynamic (from ~oliva)
|
2008-04-17 10:00:54 +08:00
|
|
|
target->define_tls_base_symbol(symtab, layout);
|
2008-04-12 05:24:30 +08:00
|
|
|
if (optimized_type == tls::TLSOPT_NONE)
|
|
|
|
{
|
2010-08-02 18:07:03 +08:00
|
|
|
// Create a double GOT entry with an R_386_TLS_DESC
|
|
|
|
// reloc. The R_386_TLS_DESC reloc is resolved
|
|
|
|
// lazily, so the GOT entry needs to be in an area in
|
|
|
|
// .got.plt, not .got. Call got_section to make sure
|
|
|
|
// the section has been created.
|
|
|
|
target->got_section(symtab, layout);
|
|
|
|
Output_data_got<32, false>* got = target->got_tlsdesc_section();
|
2008-04-12 05:24:30 +08:00
|
|
|
unsigned int r_sym = elfcpp::elf_r_sym<32>(reloc.get_r_info());
|
2010-01-09 03:33:18 +08:00
|
|
|
if (!object->local_has_got_offset(r_sym, GOT_TYPE_TLS_DESC))
|
|
|
|
{
|
|
|
|
unsigned int got_offset = got->add_constant(0);
|
|
|
|
// The local symbol value is stored in the second
|
|
|
|
// GOT entry.
|
|
|
|
got->add_local(object, r_sym, GOT_TYPE_TLS_DESC);
|
|
|
|
// That set the GOT offset of the local symbol to
|
|
|
|
// point to the second entry, but we want it to
|
|
|
|
// point to the first.
|
|
|
|
object->set_local_got_offset(r_sym, GOT_TYPE_TLS_DESC,
|
|
|
|
got_offset);
|
|
|
|
Reloc_section* rt = target->rel_tls_desc_section(layout);
|
|
|
|
rt->add_absolute(elfcpp::R_386_TLS_DESC, got, got_offset);
|
|
|
|
}
|
2008-04-12 05:24:30 +08:00
|
|
|
}
|
|
|
|
else if (optimized_type != tls::TLSOPT_TO_LE)
|
2007-12-06 13:55:50 +08:00
|
|
|
unsupported_reloc_local(object, r_type);
|
2007-10-08 13:12:59 +08:00
|
|
|
break;
|
|
|
|
|
2008-04-12 05:24:30 +08:00
|
|
|
case elfcpp::R_386_TLS_DESC_CALL:
|
|
|
|
break;
|
|
|
|
|
2007-10-30 04:09:35 +08:00
|
|
|
case elfcpp::R_386_TLS_LDM: // Local-dynamic
|
2007-11-15 06:31:02 +08:00
|
|
|
if (optimized_type == tls::TLSOPT_NONE)
|
|
|
|
{
|
|
|
|
// Create a GOT entry for the module index.
|
2007-12-11 12:23:05 +08:00
|
|
|
target->got_mod_index_entry(symtab, layout, object);
|
2007-11-15 06:31:02 +08:00
|
|
|
}
|
|
|
|
else if (optimized_type != tls::TLSOPT_TO_LE)
|
2007-10-08 13:12:59 +08:00
|
|
|
unsupported_reloc_local(object, r_type);
|
|
|
|
break;
|
|
|
|
|
2007-10-30 04:09:35 +08:00
|
|
|
case elfcpp::R_386_TLS_LDO_32: // Alternate local-dynamic
|
2007-10-08 01:05:07 +08:00
|
|
|
break;
|
|
|
|
|
2007-10-30 04:09:35 +08:00
|
|
|
case elfcpp::R_386_TLS_IE: // Initial-exec
|
|
|
|
case elfcpp::R_386_TLS_IE_32:
|
|
|
|
case elfcpp::R_386_TLS_GOTIE:
|
2007-12-12 07:30:52 +08:00
|
|
|
layout->set_has_static_tls();
|
2007-11-15 06:31:02 +08:00
|
|
|
if (optimized_type == tls::TLSOPT_NONE)
|
|
|
|
{
|
2007-12-06 13:55:50 +08:00
|
|
|
// For the R_386_TLS_IE relocation, we need to create a
|
|
|
|
// dynamic relocation when building a shared library.
|
|
|
|
if (r_type == elfcpp::R_386_TLS_IE
|
2008-02-28 08:18:24 +08:00
|
|
|
&& parameters->options().shared())
|
2007-12-06 13:55:50 +08:00
|
|
|
{
|
|
|
|
Reloc_section* rel_dyn = target->rel_dyn_section(layout);
|
2007-12-08 03:32:59 +08:00
|
|
|
unsigned int r_sym
|
|
|
|
= elfcpp::elf_r_sym<32>(reloc.get_r_info());
|
|
|
|
rel_dyn->add_local_relative(object, r_sym,
|
|
|
|
elfcpp::R_386_RELATIVE,
|
|
|
|
output_section, data_shndx,
|
|
|
|
reloc.get_r_offset());
|
2007-12-06 13:55:50 +08:00
|
|
|
}
|
2007-11-15 06:31:02 +08:00
|
|
|
// Create a GOT entry for the tp-relative offset.
|
|
|
|
Output_data_got<32, false>* got
|
|
|
|
= target->got_section(symtab, layout);
|
|
|
|
unsigned int r_sym = elfcpp::elf_r_sym<32>(reloc.get_r_info());
|
2007-12-06 13:55:50 +08:00
|
|
|
unsigned int dyn_r_type = (r_type == elfcpp::R_386_TLS_IE_32
|
|
|
|
? elfcpp::R_386_TLS_TPOFF32
|
|
|
|
: elfcpp::R_386_TLS_TPOFF);
|
2008-04-12 05:24:30 +08:00
|
|
|
unsigned int got_type = (r_type == elfcpp::R_386_TLS_IE_32
|
|
|
|
? GOT_TYPE_TLS_OFFSET
|
|
|
|
: GOT_TYPE_TLS_NOFFSET);
|
|
|
|
got->add_local_with_rel(object, r_sym, got_type,
|
2007-12-06 13:55:50 +08:00
|
|
|
target->rel_dyn_section(layout),
|
|
|
|
dyn_r_type);
|
2007-11-15 06:31:02 +08:00
|
|
|
}
|
|
|
|
else if (optimized_type != tls::TLSOPT_TO_LE)
|
2007-10-08 13:12:59 +08:00
|
|
|
unsupported_reloc_local(object, r_type);
|
2007-09-21 15:20:01 +08:00
|
|
|
break;
|
2007-10-08 13:12:59 +08:00
|
|
|
|
2007-10-30 04:09:35 +08:00
|
|
|
case elfcpp::R_386_TLS_LE: // Local-exec
|
|
|
|
case elfcpp::R_386_TLS_LE_32:
|
2007-12-12 07:30:52 +08:00
|
|
|
layout->set_has_static_tls();
|
2007-11-15 06:31:02 +08:00
|
|
|
if (output_is_shared)
|
2007-12-06 13:55:50 +08:00
|
|
|
{
|
|
|
|
// We need to create a dynamic relocation.
|
2008-02-12 08:28:48 +08:00
|
|
|
gold_assert(lsym.get_st_type() != elfcpp::STT_SECTION);
|
2007-12-06 13:55:50 +08:00
|
|
|
unsigned int r_sym = elfcpp::elf_r_sym<32>(reloc.get_r_info());
|
|
|
|
unsigned int dyn_r_type = (r_type == elfcpp::R_386_TLS_LE_32
|
|
|
|
? elfcpp::R_386_TLS_TPOFF32
|
|
|
|
: elfcpp::R_386_TLS_TPOFF);
|
|
|
|
Reloc_section* rel_dyn = target->rel_dyn_section(layout);
|
|
|
|
rel_dyn->add_local(object, r_sym, dyn_r_type, output_section,
|
|
|
|
data_shndx, reloc.get_r_offset());
|
|
|
|
}
|
2007-10-30 04:09:35 +08:00
|
|
|
break;
|
|
|
|
|
2007-10-08 13:12:59 +08:00
|
|
|
default:
|
|
|
|
gold_unreachable();
|
2007-09-21 15:20:01 +08:00
|
|
|
}
|
|
|
|
}
|
2006-10-21 04:40:49 +08:00
|
|
|
break;
|
|
|
|
|
|
|
|
case elfcpp::R_386_32PLT:
|
|
|
|
case elfcpp::R_386_TLS_GD_32:
|
|
|
|
case elfcpp::R_386_TLS_GD_PUSH:
|
|
|
|
case elfcpp::R_386_TLS_GD_CALL:
|
|
|
|
case elfcpp::R_386_TLS_GD_POP:
|
|
|
|
case elfcpp::R_386_TLS_LDM_32:
|
|
|
|
case elfcpp::R_386_TLS_LDM_PUSH:
|
|
|
|
case elfcpp::R_386_TLS_LDM_CALL:
|
|
|
|
case elfcpp::R_386_TLS_LDM_POP:
|
|
|
|
case elfcpp::R_386_USED_BY_INTEL_200:
|
|
|
|
default:
|
2007-10-08 13:12:59 +08:00
|
|
|
unsupported_reloc_local(object, r_type);
|
2006-10-21 04:40:49 +08:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-10-08 13:12:59 +08:00
|
|
|
// Report an unsupported relocation against a global symbol.
|
|
|
|
|
|
|
|
void
|
2011-05-25 05:41:10 +08:00
|
|
|
Target_i386::Scan::unsupported_reloc_global(
|
|
|
|
Sized_relobj_file<32, false>* object,
|
|
|
|
unsigned int r_type,
|
|
|
|
Symbol* gsym)
|
2007-10-08 13:12:59 +08:00
|
|
|
{
|
2007-10-14 14:49:14 +08:00
|
|
|
gold_error(_("%s: unsupported reloc %u against global symbol %s"),
|
2007-11-15 09:12:55 +08:00
|
|
|
object->name().c_str(), r_type, gsym->demangled_name().c_str());
|
2007-10-08 13:12:59 +08:00
|
|
|
}
|
|
|
|
|
2010-03-04 09:33:22 +08:00
|
|
|
inline bool
|
|
|
|
Target_i386::Scan::possible_function_pointer_reloc(unsigned int r_type)
|
|
|
|
{
|
|
|
|
switch (r_type)
|
|
|
|
{
|
|
|
|
case elfcpp::R_386_32:
|
|
|
|
case elfcpp::R_386_16:
|
|
|
|
case elfcpp::R_386_8:
|
|
|
|
case elfcpp::R_386_GOTOFF:
|
|
|
|
case elfcpp::R_386_GOT32:
|
|
|
|
{
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
default:
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
inline bool
|
|
|
|
Target_i386::Scan::local_reloc_may_be_function_pointer(
|
|
|
|
Symbol_table* ,
|
|
|
|
Layout* ,
|
|
|
|
Target_i386* ,
|
2011-05-25 05:41:10 +08:00
|
|
|
Sized_relobj_file<32, false>* ,
|
2010-03-04 09:33:22 +08:00
|
|
|
unsigned int ,
|
|
|
|
Output_section* ,
|
|
|
|
const elfcpp::Rel<32, false>& ,
|
|
|
|
unsigned int r_type,
|
|
|
|
const elfcpp::Sym<32, false>&)
|
|
|
|
{
|
|
|
|
return possible_function_pointer_reloc(r_type);
|
|
|
|
}
|
|
|
|
|
|
|
|
inline bool
|
|
|
|
Target_i386::Scan::global_reloc_may_be_function_pointer(
|
|
|
|
Symbol_table* ,
|
|
|
|
Layout* ,
|
|
|
|
Target_i386* ,
|
2011-05-25 05:41:10 +08:00
|
|
|
Sized_relobj_file<32, false>* ,
|
2010-03-04 09:33:22 +08:00
|
|
|
unsigned int ,
|
|
|
|
Output_section* ,
|
|
|
|
const elfcpp::Rel<32, false>& ,
|
|
|
|
unsigned int r_type,
|
|
|
|
Symbol*)
|
|
|
|
{
|
|
|
|
return possible_function_pointer_reloc(r_type);
|
|
|
|
}
|
|
|
|
|
2006-10-21 04:40:49 +08:00
|
|
|
// Scan a relocation for a global symbol.
|
|
|
|
|
|
|
|
inline void
|
* object.h (class Relobj): Drop options parameter from
gc_process_relocs, scan_relocs, relocate, do_gc_process_relocs,
do_scan_relocs, do_relocate. Change all callers.
(class Sized_relobj): Drop options parameters from
do_gc_process_relocs, do_scan_relocs, do_relocate,
do_relocate_sections, relocate_sections, emit_relocs_scan,
emit_relocs_scan_reltype. Change all callers.
(struct Relocate_info): Remove options field and all references to
it.
* reloc.h (class Read_relocs): Remove options constructor
parameter and options_ field. Change all callers.
(class Gc_process_relocs, class Scan_relocs): Likewise.
(class Relocate_task): Likewise.
* target-reloc.h (scan_relocs): Remove options parameter. Change
all callers.
(scan_relocatable_relocs): Likewise.
* target.h (class Sized_target): Remove options parameter from
gc_process_relocs, scan_relocs, scan_relocatable_relocs. Change
all callers.
* gc.h (gc_process_relocs): Remove options parameter. Change all
callers.
* arm.cc: Update functions to remove options parameters.
* i386.cc: Likewise.
* powerpc.cc: Likewise.
* sparc.cc: Likewise.
* x86_64.cc: Likewise.
* testsuite/testfile.cc: Likewise.
2009-10-29 13:16:23 +08:00
|
|
|
Target_i386::Scan::global(Symbol_table* symtab,
|
2006-11-04 02:26:11 +08:00
|
|
|
Layout* layout,
|
|
|
|
Target_i386* target,
|
2011-05-25 05:41:10 +08:00
|
|
|
Sized_relobj_file<32, false>* object,
|
2006-11-30 01:56:40 +08:00
|
|
|
unsigned int data_shndx,
|
2007-11-15 06:31:02 +08:00
|
|
|
Output_section* output_section,
|
2006-11-30 01:56:40 +08:00
|
|
|
const elfcpp::Rel<32, false>& reloc,
|
|
|
|
unsigned int r_type,
|
2006-10-21 04:40:49 +08:00
|
|
|
Symbol* gsym)
|
|
|
|
{
|
2010-08-20 06:50:16 +08:00
|
|
|
// A STT_GNU_IFUNC symbol may require a PLT entry.
|
|
|
|
if (gsym->type() == elfcpp::STT_GNU_IFUNC
|
|
|
|
&& this->reloc_needs_plt_for_ifunc(object, r_type))
|
|
|
|
target->make_plt_entry(symtab, layout, gsym);
|
|
|
|
|
2006-10-21 04:40:49 +08:00
|
|
|
switch (r_type)
|
|
|
|
{
|
|
|
|
case elfcpp::R_386_NONE:
|
|
|
|
case elfcpp::R_386_GNU_VTINHERIT:
|
2007-09-13 00:38:04 +08:00
|
|
|
case elfcpp::R_386_GNU_VTENTRY:
|
2006-10-21 04:40:49 +08:00
|
|
|
break;
|
|
|
|
|
|
|
|
case elfcpp::R_386_32:
|
|
|
|
case elfcpp::R_386_16:
|
|
|
|
case elfcpp::R_386_8:
|
2007-11-01 08:19:30 +08:00
|
|
|
{
|
2007-11-10 03:45:08 +08:00
|
|
|
// Make a PLT entry if necessary.
|
|
|
|
if (gsym->needs_plt_entry())
|
|
|
|
{
|
|
|
|
target->make_plt_entry(symtab, layout, gsym);
|
|
|
|
// Since this is not a PC-relative relocation, we may be
|
|
|
|
// taking the address of a function. In that case we need to
|
|
|
|
// set the entry in the dynamic symbol table to the address of
|
|
|
|
// the PLT entry.
|
2008-02-28 08:18:24 +08:00
|
|
|
if (gsym->is_from_dynobj() && !parameters->options().shared())
|
2007-11-10 03:45:08 +08:00
|
|
|
gsym->set_needs_dynsym_value();
|
|
|
|
}
|
|
|
|
// Make a dynamic relocation if necessary.
|
2010-11-11 18:43:30 +08:00
|
|
|
if (gsym->needs_dynamic_reloc(Scan::get_reference_flags(r_type)))
|
2007-11-10 03:45:08 +08:00
|
|
|
{
|
2009-10-01 08:58:38 +08:00
|
|
|
if (gsym->may_need_copy_reloc())
|
2007-11-10 03:45:08 +08:00
|
|
|
{
|
2008-04-17 06:54:29 +08:00
|
|
|
target->copy_reloc(symtab, layout, object,
|
2007-11-16 07:46:46 +08:00
|
|
|
data_shndx, output_section, gsym, reloc);
|
2007-11-10 03:45:08 +08:00
|
|
|
}
|
2010-08-20 06:50:16 +08:00
|
|
|
else if (r_type == elfcpp::R_386_32
|
|
|
|
&& gsym->type() == elfcpp::STT_GNU_IFUNC
|
|
|
|
&& gsym->can_use_relative_reloc(false)
|
|
|
|
&& !gsym->is_from_dynobj()
|
|
|
|
&& !gsym->is_undefined()
|
|
|
|
&& !gsym->is_preemptible())
|
|
|
|
{
|
|
|
|
// Use an IRELATIVE reloc for a locally defined
|
|
|
|
// STT_GNU_IFUNC symbol. This makes a function
|
|
|
|
// address in a PIE executable match the address in a
|
|
|
|
// shared library that it links against.
|
PR gold/12372
* target.h (Target::plt_address_for_global): New function.
(Target::plt_address_for_local): New function.
(Target::plt_section_for_global): Remove.
(Target::plt_section_for_local): Remove.
(Target::do_plt_address_for_global): New virtual function.
(Target::do_plt_address_for_local): New virtual function.
(Target::do_plt_section_for_global): Remove.
(Target::do_plt_section_for_local): Remove.
(Target::register_global_plt_entry): Add Symbol_table and Layout
parameters.
* output.cc (Output_data_got::Got_entry::write): Use
plt_address_for_global and plt_address_for_local.
* layout.cc (Layout::add_target_dynamic_tags): Use size and
address of output section.
* i386.cc (class Output_data_plt_i386): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_i386::has_irelative_section): New function.
(Output_data_plt_i386::entry_count): Add irelative_count_.
(Output_data_plt_i386::set_final_data_size): Likewise.
(class Target_i386): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_i386::Target_i386): Initialize new fields.
(Target_i386::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_i386::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_i386::got_section): Create got_irelative_.
(Target_i386::rel_irelative_section): New function.
(Output_data_plt_i386::Output_data_plt_i386): Initialize new
fields. Don't define __rel_iplt_{start,end}.
(Output_data_plt_i386::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_i386::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_i386::rel_tls_desc): Fix formatting.
(Output_data_plt_i386::rel_irelative): New function.
(Output_data_plt_i386::address_for_global): New function.
(Output_data_plt_i386::address_for_local): New function.
(Output_data_plt_i386::do_write): Write out IRELATIVE area. Use
IRELATIVE GOT when changing IFUNC GOT entries.
(Target_i386::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_i386::do_finalize_sections): Create the __rel_iplt symbols
if we didn't create an IRELATIVE GOT.
(Target_i386::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_i386::do_dynsym_value): Use plt_address_for_global.
* x86_64.cc (class Output_data_plt_x86_64): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_x86_64::Output_data_plt_x86_64) [both versions]:
Initialize new fields. Remove symtab parameter. Change all
callers.
(Output_data_plt_x86_64::get_tlsdesc_plt_offset): Add
irelative_count_.
(Output_data_plt_x86_64::has_irelative_section): New function.
(Output_data_plt_x86_64::entry_count): Add irelative_count_.
(class Target_x86_64): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_x86_64::Target_x86_64): Initialize new fields.
(Target_x86_64::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_x86_64::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_x86_64::got_section): Create got_irelative_.
(Target_x86_64::rela_irelative_section): New function.
(Output_data_plt_x86_64::init): Remove symtab parameter. Change
all callers. Don't create __rel_iplt_{start,end}.
(Output_data_plt_x86_64::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_x86_64::add_relocation): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::rela_tlsdesc): Fix formatting.
(Output_data_plt_x86_64::rela_irelative): New function.
(Output_data_plt_x86_64::address_for_global): New function.
(Output_data_plt_x86_64::address_for_local): New function.
(Output_data_plt_x86_64::set_final_data_size): Likewise.
(Output_data_plt_x86_64::do_write): Write out IRELATIVE area.
(Target_x86_64::init_got_plt_for_update): Create got_irelative_.
(Target_x86_64::register_global_plt_entry): Add symtab and layout
parameters.
(Target_x86_64::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_x86_64::do_finalize_sections): Create the __rela_iplt
symbols if we didn't create an IRELATIVE GOT.
(Target_x86_64::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_x86_64::do_dynsym_value): Use plt_address_for_global.
* testsuite/ifuncvar1.c: New test file.
* testsuite/ifuncvar2.c: New test file.
* testsuite/ifuncvar3.c: New test file.
* testsuite/Makefile.am (check_PROGRAMS): Add ifuncvar.
(ifuncvar1_pic.o, ifuncvar2_pic.o, ifuncvar.so): New targets.
(ifuncvar_SOURCES, ifuncvar_DEPENDENCIES): New variables.
(ifuncvar_LDFLAGS, ifuncvar_LDADD): New variables.
* testsuite/Makefile.in: Rebuild.
2011-07-09 06:48:08 +08:00
|
|
|
Reloc_section* rel_dyn = target->rel_irelative_section(layout);
|
2010-08-20 06:50:16 +08:00
|
|
|
rel_dyn->add_symbolless_global_addend(gsym,
|
|
|
|
elfcpp::R_386_IRELATIVE,
|
|
|
|
output_section,
|
|
|
|
object, data_shndx,
|
|
|
|
reloc.get_r_offset());
|
|
|
|
}
|
2007-11-10 03:45:08 +08:00
|
|
|
else if (r_type == elfcpp::R_386_32
|
|
|
|
&& gsym->can_use_relative_reloc(false))
|
|
|
|
{
|
|
|
|
Reloc_section* rel_dyn = target->rel_dyn_section(layout);
|
2010-08-20 06:50:16 +08:00
|
|
|
rel_dyn->add_global_relative(gsym, elfcpp::R_386_RELATIVE,
|
|
|
|
output_section, object,
|
|
|
|
data_shndx, reloc.get_r_offset());
|
2007-11-10 03:45:08 +08:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2007-11-01 08:19:30 +08:00
|
|
|
Reloc_section* rel_dyn = target->rel_dyn_section(layout);
|
2007-11-16 07:46:46 +08:00
|
|
|
rel_dyn->add_global(gsym, r_type, output_section, object,
|
|
|
|
data_shndx, reloc.get_r_offset());
|
2007-11-10 03:45:08 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case elfcpp::R_386_PC32:
|
|
|
|
case elfcpp::R_386_PC16:
|
|
|
|
case elfcpp::R_386_PC8:
|
|
|
|
{
|
|
|
|
// Make a PLT entry if necessary.
|
|
|
|
if (gsym->needs_plt_entry())
|
2007-12-06 13:55:50 +08:00
|
|
|
{
|
|
|
|
// These relocations are used for function calls only in
|
|
|
|
// non-PIC code. For a 32-bit relocation in a shared library,
|
|
|
|
// we'll need a text relocation anyway, so we can skip the
|
|
|
|
// PLT entry and let the dynamic linker bind the call directly
|
|
|
|
// to the target. For smaller relocations, we should use a
|
|
|
|
// PLT entry to ensure that the call can reach.
|
2008-02-28 08:18:24 +08:00
|
|
|
if (!parameters->options().shared()
|
2007-12-06 13:55:50 +08:00
|
|
|
|| r_type != elfcpp::R_386_PC32)
|
|
|
|
target->make_plt_entry(symtab, layout, gsym);
|
|
|
|
}
|
2007-11-10 03:45:08 +08:00
|
|
|
// Make a dynamic relocation if necessary.
|
2010-11-11 18:43:30 +08:00
|
|
|
if (gsym->needs_dynamic_reloc(Scan::get_reference_flags(r_type)))
|
2007-11-01 08:19:30 +08:00
|
|
|
{
|
2009-10-01 08:58:38 +08:00
|
|
|
if (gsym->may_need_copy_reloc())
|
2007-11-10 03:45:08 +08:00
|
|
|
{
|
2008-04-17 06:54:29 +08:00
|
|
|
target->copy_reloc(symtab, layout, object,
|
2007-11-16 07:46:46 +08:00
|
|
|
data_shndx, output_section, gsym, reloc);
|
2007-11-10 03:45:08 +08:00
|
|
|
}
|
2007-11-02 12:08:52 +08:00
|
|
|
else
|
2007-11-10 03:45:08 +08:00
|
|
|
{
|
|
|
|
Reloc_section* rel_dyn = target->rel_dyn_section(layout);
|
2007-11-16 07:46:46 +08:00
|
|
|
rel_dyn->add_global(gsym, r_type, output_section, object,
|
|
|
|
data_shndx, reloc.get_r_offset());
|
2007-11-10 03:45:08 +08:00
|
|
|
}
|
2007-11-01 08:19:30 +08:00
|
|
|
}
|
|
|
|
}
|
2006-10-21 04:40:49 +08:00
|
|
|
break;
|
|
|
|
|
2006-11-04 02:26:11 +08:00
|
|
|
case elfcpp::R_386_GOT32:
|
2007-09-13 00:38:04 +08:00
|
|
|
{
|
|
|
|
// The symbol requires a GOT entry.
|
2007-09-21 15:20:01 +08:00
|
|
|
Output_data_got<32, false>* got = target->got_section(symtab, layout);
|
2007-12-06 13:55:50 +08:00
|
|
|
if (gsym->final_value_is_known())
|
2010-08-20 06:50:16 +08:00
|
|
|
{
|
|
|
|
// For a STT_GNU_IFUNC symbol we want the PLT address.
|
|
|
|
if (gsym->type() == elfcpp::STT_GNU_IFUNC)
|
|
|
|
got->add_global_plt(gsym, GOT_TYPE_STANDARD);
|
|
|
|
else
|
|
|
|
got->add_global(gsym, GOT_TYPE_STANDARD);
|
|
|
|
}
|
2007-12-06 13:55:50 +08:00
|
|
|
else
|
|
|
|
{
|
2007-09-13 00:38:04 +08:00
|
|
|
// If this symbol is not fully resolved, we need to add a
|
2007-12-06 13:55:50 +08:00
|
|
|
// GOT entry with a dynamic relocation.
|
|
|
|
Reloc_section* rel_dyn = target->rel_dyn_section(layout);
|
2011-07-13 06:29:09 +08:00
|
|
|
|
|
|
|
// Use a GLOB_DAT rather than a RELATIVE reloc if:
|
|
|
|
//
|
|
|
|
// 1) The symbol may be defined in some other module.
|
|
|
|
//
|
|
|
|
// 2) We are building a shared library and this is a
|
|
|
|
// protected symbol; using GLOB_DAT means that the dynamic
|
|
|
|
// linker can use the address of the PLT in the main
|
|
|
|
// executable when appropriate so that function address
|
|
|
|
// comparisons work.
|
|
|
|
//
|
|
|
|
// 3) This is a STT_GNU_IFUNC symbol in position dependent
|
|
|
|
// code, again so that function address comparisons work.
|
2008-02-09 06:49:22 +08:00
|
|
|
if (gsym->is_from_dynobj()
|
|
|
|
|| gsym->is_undefined()
|
2010-08-20 06:50:16 +08:00
|
|
|
|| gsym->is_preemptible()
|
2011-07-13 06:29:09 +08:00
|
|
|
|| (gsym->visibility() == elfcpp::STV_PROTECTED
|
|
|
|
&& parameters->options().shared())
|
2010-08-20 06:50:16 +08:00
|
|
|
|| (gsym->type() == elfcpp::STT_GNU_IFUNC
|
|
|
|
&& parameters->options().output_is_position_independent()))
|
2008-03-26 02:37:16 +08:00
|
|
|
got->add_global_with_rel(gsym, GOT_TYPE_STANDARD,
|
|
|
|
rel_dyn, elfcpp::R_386_GLOB_DAT);
|
2007-12-06 13:55:50 +08:00
|
|
|
else
|
2007-09-13 00:38:04 +08:00
|
|
|
{
|
2010-08-20 06:50:16 +08:00
|
|
|
// For a STT_GNU_IFUNC symbol we want to write the PLT
|
|
|
|
// offset into the GOT, so that function pointer
|
|
|
|
// comparisons work correctly.
|
|
|
|
bool is_new;
|
|
|
|
if (gsym->type() != elfcpp::STT_GNU_IFUNC)
|
|
|
|
is_new = got->add_global(gsym, GOT_TYPE_STANDARD);
|
|
|
|
else
|
|
|
|
{
|
|
|
|
is_new = got->add_global_plt(gsym, GOT_TYPE_STANDARD);
|
|
|
|
// Tell the dynamic linker to use the PLT address
|
|
|
|
// when resolving relocations.
|
|
|
|
if (gsym->is_from_dynobj()
|
|
|
|
&& !parameters->options().shared())
|
|
|
|
gsym->set_needs_dynsym_value();
|
|
|
|
}
|
|
|
|
if (is_new)
|
|
|
|
{
|
|
|
|
unsigned int got_off = gsym->got_offset(GOT_TYPE_STANDARD);
|
|
|
|
rel_dyn->add_global_relative(gsym, elfcpp::R_386_RELATIVE,
|
|
|
|
got, got_off);
|
|
|
|
}
|
2007-09-13 00:38:04 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2006-11-04 02:26:11 +08:00
|
|
|
break;
|
|
|
|
|
|
|
|
case elfcpp::R_386_PLT32:
|
2006-11-30 01:56:40 +08:00
|
|
|
// If the symbol is fully resolved, this is just a PC32 reloc.
|
|
|
|
// Otherwise we need a PLT entry.
|
2007-09-21 15:20:01 +08:00
|
|
|
if (gsym->final_value_is_known())
|
2006-11-04 02:26:11 +08:00
|
|
|
break;
|
2007-10-17 07:23:08 +08:00
|
|
|
// If building a shared library, we can also skip the PLT entry
|
|
|
|
// if the symbol is defined in the output file and is protected
|
|
|
|
// or hidden.
|
|
|
|
if (gsym->is_defined()
|
|
|
|
&& !gsym->is_from_dynobj()
|
|
|
|
&& !gsym->is_preemptible())
|
|
|
|
break;
|
2007-09-21 15:20:01 +08:00
|
|
|
target->make_plt_entry(symtab, layout, gsym);
|
2006-11-04 02:26:11 +08:00
|
|
|
break;
|
|
|
|
|
|
|
|
case elfcpp::R_386_GOTOFF:
|
|
|
|
case elfcpp::R_386_GOTPC:
|
|
|
|
// We need a GOT section.
|
2007-09-21 15:20:01 +08:00
|
|
|
target->got_section(symtab, layout);
|
2006-11-04 02:26:11 +08:00
|
|
|
break;
|
|
|
|
|
2007-10-08 13:12:59 +08:00
|
|
|
// These are relocations which should only be seen by the
|
|
|
|
// dynamic linker, and should never be seen here.
|
2006-10-21 04:40:49 +08:00
|
|
|
case elfcpp::R_386_COPY:
|
|
|
|
case elfcpp::R_386_GLOB_DAT:
|
|
|
|
case elfcpp::R_386_JUMP_SLOT:
|
|
|
|
case elfcpp::R_386_RELATIVE:
|
2010-08-20 06:50:16 +08:00
|
|
|
case elfcpp::R_386_IRELATIVE:
|
2006-10-21 04:40:49 +08:00
|
|
|
case elfcpp::R_386_TLS_TPOFF:
|
|
|
|
case elfcpp::R_386_TLS_DTPMOD32:
|
|
|
|
case elfcpp::R_386_TLS_DTPOFF32:
|
|
|
|
case elfcpp::R_386_TLS_TPOFF32:
|
|
|
|
case elfcpp::R_386_TLS_DESC:
|
2007-10-14 14:49:14 +08:00
|
|
|
gold_error(_("%s: unexpected reloc %u in object file"),
|
|
|
|
object->name().c_str(), r_type);
|
2006-10-21 04:40:49 +08:00
|
|
|
break;
|
|
|
|
|
2007-10-05 06:28:36 +08:00
|
|
|
// These are initial tls relocs, which are expected when
|
|
|
|
// linking.
|
2007-10-30 04:09:35 +08:00
|
|
|
case elfcpp::R_386_TLS_GD: // Global-dynamic
|
|
|
|
case elfcpp::R_386_TLS_GOTDESC: // Global-dynamic (from ~oliva url)
|
|
|
|
case elfcpp::R_386_TLS_DESC_CALL:
|
|
|
|
case elfcpp::R_386_TLS_LDM: // Local-dynamic
|
|
|
|
case elfcpp::R_386_TLS_LDO_32: // Alternate local-dynamic
|
|
|
|
case elfcpp::R_386_TLS_IE: // Initial-exec
|
2006-10-21 04:40:49 +08:00
|
|
|
case elfcpp::R_386_TLS_IE_32:
|
2007-10-30 04:09:35 +08:00
|
|
|
case elfcpp::R_386_TLS_GOTIE:
|
|
|
|
case elfcpp::R_386_TLS_LE: // Local-exec
|
2006-10-21 04:40:49 +08:00
|
|
|
case elfcpp::R_386_TLS_LE_32:
|
2006-11-30 01:56:40 +08:00
|
|
|
{
|
2007-09-21 15:20:01 +08:00
|
|
|
const bool is_final = gsym->final_value_is_known();
|
2007-10-08 13:12:59 +08:00
|
|
|
const tls::Tls_optimization optimized_type
|
|
|
|
= Target_i386::optimize_tls_reloc(is_final, r_type);
|
2006-11-30 01:56:40 +08:00
|
|
|
switch (r_type)
|
|
|
|
{
|
2007-10-30 04:09:35 +08:00
|
|
|
case elfcpp::R_386_TLS_GD: // Global-dynamic
|
2007-11-15 06:31:02 +08:00
|
|
|
if (optimized_type == tls::TLSOPT_NONE)
|
|
|
|
{
|
|
|
|
// Create a pair of GOT entries for the module index and
|
|
|
|
// dtv-relative offset.
|
|
|
|
Output_data_got<32, false>* got
|
|
|
|
= target->got_section(symtab, layout);
|
2008-03-26 02:37:16 +08:00
|
|
|
got->add_global_pair_with_rel(gsym, GOT_TYPE_TLS_PAIR,
|
2007-12-06 13:55:50 +08:00
|
|
|
target->rel_dyn_section(layout),
|
|
|
|
elfcpp::R_386_TLS_DTPMOD32,
|
|
|
|
elfcpp::R_386_TLS_DTPOFF32);
|
2007-11-15 06:31:02 +08:00
|
|
|
}
|
|
|
|
else if (optimized_type == tls::TLSOPT_TO_IE)
|
|
|
|
{
|
|
|
|
// Create a GOT entry for the tp-relative offset.
|
|
|
|
Output_data_got<32, false>* got
|
|
|
|
= target->got_section(symtab, layout);
|
2008-04-12 05:24:30 +08:00
|
|
|
got->add_global_with_rel(gsym, GOT_TYPE_TLS_NOFFSET,
|
2008-03-26 02:37:16 +08:00
|
|
|
target->rel_dyn_section(layout),
|
2008-04-12 05:24:30 +08:00
|
|
|
elfcpp::R_386_TLS_TPOFF);
|
2007-11-15 06:31:02 +08:00
|
|
|
}
|
|
|
|
else if (optimized_type != tls::TLSOPT_TO_LE)
|
|
|
|
unsupported_reloc_global(object, r_type, gsym);
|
|
|
|
break;
|
|
|
|
|
2007-10-30 04:09:35 +08:00
|
|
|
case elfcpp::R_386_TLS_GOTDESC: // Global-dynamic (~oliva url)
|
2008-04-17 10:00:54 +08:00
|
|
|
target->define_tls_base_symbol(symtab, layout);
|
2008-04-12 05:24:30 +08:00
|
|
|
if (optimized_type == tls::TLSOPT_NONE)
|
|
|
|
{
|
2010-08-02 18:07:03 +08:00
|
|
|
// Create a double GOT entry with an R_386_TLS_DESC
|
|
|
|
// reloc. The R_386_TLS_DESC reloc is resolved
|
|
|
|
// lazily, so the GOT entry needs to be in an area in
|
|
|
|
// .got.plt, not .got. Call got_section to make sure
|
|
|
|
// the section has been created.
|
|
|
|
target->got_section(symtab, layout);
|
|
|
|
Output_data_got<32, false>* got = target->got_tlsdesc_section();
|
2010-01-09 03:33:18 +08:00
|
|
|
Reloc_section* rt = target->rel_tls_desc_section(layout);
|
|
|
|
got->add_global_pair_with_rel(gsym, GOT_TYPE_TLS_DESC, rt,
|
2008-04-12 05:24:30 +08:00
|
|
|
elfcpp::R_386_TLS_DESC, 0);
|
|
|
|
}
|
|
|
|
else if (optimized_type == tls::TLSOPT_TO_IE)
|
|
|
|
{
|
|
|
|
// Create a GOT entry for the tp-relative offset.
|
|
|
|
Output_data_got<32, false>* got
|
|
|
|
= target->got_section(symtab, layout);
|
|
|
|
got->add_global_with_rel(gsym, GOT_TYPE_TLS_NOFFSET,
|
|
|
|
target->rel_dyn_section(layout),
|
|
|
|
elfcpp::R_386_TLS_TPOFF);
|
|
|
|
}
|
|
|
|
else if (optimized_type != tls::TLSOPT_TO_LE)
|
2007-12-06 13:55:50 +08:00
|
|
|
unsupported_reloc_global(object, r_type, gsym);
|
2008-04-12 05:24:30 +08:00
|
|
|
break;
|
|
|
|
|
|
|
|
case elfcpp::R_386_TLS_DESC_CALL:
|
2007-10-08 13:12:59 +08:00
|
|
|
break;
|
|
|
|
|
2007-10-30 04:09:35 +08:00
|
|
|
case elfcpp::R_386_TLS_LDM: // Local-dynamic
|
2007-11-15 06:31:02 +08:00
|
|
|
if (optimized_type == tls::TLSOPT_NONE)
|
|
|
|
{
|
|
|
|
// Create a GOT entry for the module index.
|
2007-12-11 12:23:05 +08:00
|
|
|
target->got_mod_index_entry(symtab, layout, object);
|
2007-11-15 06:31:02 +08:00
|
|
|
}
|
|
|
|
else if (optimized_type != tls::TLSOPT_TO_LE)
|
2007-10-08 13:12:59 +08:00
|
|
|
unsupported_reloc_global(object, r_type, gsym);
|
|
|
|
break;
|
|
|
|
|
2007-10-30 04:09:35 +08:00
|
|
|
case elfcpp::R_386_TLS_LDO_32: // Alternate local-dynamic
|
2007-10-08 01:05:07 +08:00
|
|
|
break;
|
|
|
|
|
2007-10-30 04:09:35 +08:00
|
|
|
case elfcpp::R_386_TLS_IE: // Initial-exec
|
|
|
|
case elfcpp::R_386_TLS_IE_32:
|
|
|
|
case elfcpp::R_386_TLS_GOTIE:
|
2007-12-12 07:30:52 +08:00
|
|
|
layout->set_has_static_tls();
|
2007-11-15 06:31:02 +08:00
|
|
|
if (optimized_type == tls::TLSOPT_NONE)
|
|
|
|
{
|
2007-12-06 13:55:50 +08:00
|
|
|
// For the R_386_TLS_IE relocation, we need to create a
|
|
|
|
// dynamic relocation when building a shared library.
|
|
|
|
if (r_type == elfcpp::R_386_TLS_IE
|
2008-02-28 08:18:24 +08:00
|
|
|
&& parameters->options().shared())
|
2007-11-15 06:31:02 +08:00
|
|
|
{
|
|
|
|
Reloc_section* rel_dyn = target->rel_dyn_section(layout);
|
2007-12-08 03:32:59 +08:00
|
|
|
rel_dyn->add_global_relative(gsym, elfcpp::R_386_RELATIVE,
|
|
|
|
output_section, object,
|
|
|
|
data_shndx,
|
|
|
|
reloc.get_r_offset());
|
2007-11-15 06:31:02 +08:00
|
|
|
}
|
2007-12-06 13:55:50 +08:00
|
|
|
// Create a GOT entry for the tp-relative offset.
|
|
|
|
Output_data_got<32, false>* got
|
|
|
|
= target->got_section(symtab, layout);
|
|
|
|
unsigned int dyn_r_type = (r_type == elfcpp::R_386_TLS_IE_32
|
|
|
|
? elfcpp::R_386_TLS_TPOFF32
|
|
|
|
: elfcpp::R_386_TLS_TPOFF);
|
2008-04-12 05:24:30 +08:00
|
|
|
unsigned int got_type = (r_type == elfcpp::R_386_TLS_IE_32
|
|
|
|
? GOT_TYPE_TLS_OFFSET
|
|
|
|
: GOT_TYPE_TLS_NOFFSET);
|
|
|
|
got->add_global_with_rel(gsym, got_type,
|
2007-12-06 13:55:50 +08:00
|
|
|
target->rel_dyn_section(layout),
|
|
|
|
dyn_r_type);
|
2007-11-15 06:31:02 +08:00
|
|
|
}
|
|
|
|
else if (optimized_type != tls::TLSOPT_TO_LE)
|
2007-10-08 13:12:59 +08:00
|
|
|
unsupported_reloc_global(object, r_type, gsym);
|
2006-11-30 01:56:40 +08:00
|
|
|
break;
|
2007-10-08 13:12:59 +08:00
|
|
|
|
2007-10-30 04:09:35 +08:00
|
|
|
case elfcpp::R_386_TLS_LE: // Local-exec
|
|
|
|
case elfcpp::R_386_TLS_LE_32:
|
2007-12-12 07:30:52 +08:00
|
|
|
layout->set_has_static_tls();
|
2008-02-28 08:18:24 +08:00
|
|
|
if (parameters->options().shared())
|
2007-12-06 13:55:50 +08:00
|
|
|
{
|
|
|
|
// We need to create a dynamic relocation.
|
|
|
|
unsigned int dyn_r_type = (r_type == elfcpp::R_386_TLS_LE_32
|
|
|
|
? elfcpp::R_386_TLS_TPOFF32
|
|
|
|
: elfcpp::R_386_TLS_TPOFF);
|
|
|
|
Reloc_section* rel_dyn = target->rel_dyn_section(layout);
|
|
|
|
rel_dyn->add_global(gsym, dyn_r_type, output_section, object,
|
|
|
|
data_shndx, reloc.get_r_offset());
|
|
|
|
}
|
2007-10-30 04:09:35 +08:00
|
|
|
break;
|
|
|
|
|
2007-10-08 13:12:59 +08:00
|
|
|
default:
|
|
|
|
gold_unreachable();
|
2006-11-30 01:56:40 +08:00
|
|
|
}
|
|
|
|
}
|
2006-10-21 04:40:49 +08:00
|
|
|
break;
|
|
|
|
|
|
|
|
case elfcpp::R_386_32PLT:
|
|
|
|
case elfcpp::R_386_TLS_GD_32:
|
|
|
|
case elfcpp::R_386_TLS_GD_PUSH:
|
|
|
|
case elfcpp::R_386_TLS_GD_CALL:
|
|
|
|
case elfcpp::R_386_TLS_GD_POP:
|
|
|
|
case elfcpp::R_386_TLS_LDM_32:
|
|
|
|
case elfcpp::R_386_TLS_LDM_PUSH:
|
|
|
|
case elfcpp::R_386_TLS_LDM_CALL:
|
|
|
|
case elfcpp::R_386_TLS_LDM_POP:
|
|
|
|
case elfcpp::R_386_USED_BY_INTEL_200:
|
|
|
|
default:
|
2007-10-08 13:12:59 +08:00
|
|
|
unsupported_reloc_global(object, r_type, gsym);
|
2006-10-21 04:40:49 +08:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-01-28 10:25:33 +08:00
|
|
|
// Process relocations for gc.
|
|
|
|
|
|
|
|
void
|
* object.h (class Relobj): Drop options parameter from
gc_process_relocs, scan_relocs, relocate, do_gc_process_relocs,
do_scan_relocs, do_relocate. Change all callers.
(class Sized_relobj): Drop options parameters from
do_gc_process_relocs, do_scan_relocs, do_relocate,
do_relocate_sections, relocate_sections, emit_relocs_scan,
emit_relocs_scan_reltype. Change all callers.
(struct Relocate_info): Remove options field and all references to
it.
* reloc.h (class Read_relocs): Remove options constructor
parameter and options_ field. Change all callers.
(class Gc_process_relocs, class Scan_relocs): Likewise.
(class Relocate_task): Likewise.
* target-reloc.h (scan_relocs): Remove options parameter. Change
all callers.
(scan_relocatable_relocs): Likewise.
* target.h (class Sized_target): Remove options parameter from
gc_process_relocs, scan_relocs, scan_relocatable_relocs. Change
all callers.
* gc.h (gc_process_relocs): Remove options parameter. Change all
callers.
* arm.cc: Update functions to remove options parameters.
* i386.cc: Likewise.
* powerpc.cc: Likewise.
* sparc.cc: Likewise.
* x86_64.cc: Likewise.
* testsuite/testfile.cc: Likewise.
2009-10-29 13:16:23 +08:00
|
|
|
Target_i386::gc_process_relocs(Symbol_table* symtab,
|
2009-01-28 10:25:33 +08:00
|
|
|
Layout* layout,
|
2011-05-25 05:41:10 +08:00
|
|
|
Sized_relobj_file<32, false>* object,
|
2009-01-28 10:25:33 +08:00
|
|
|
unsigned int data_shndx,
|
|
|
|
unsigned int,
|
|
|
|
const unsigned char* prelocs,
|
|
|
|
size_t reloc_count,
|
|
|
|
Output_section* output_section,
|
|
|
|
bool needs_special_offset_handling,
|
|
|
|
size_t local_symbol_count,
|
|
|
|
const unsigned char* plocal_symbols)
|
|
|
|
{
|
|
|
|
gold::gc_process_relocs<32, false, Target_i386, elfcpp::SHT_REL,
|
2010-07-30 02:57:28 +08:00
|
|
|
Target_i386::Scan,
|
|
|
|
Target_i386::Relocatable_size_for_reloc>(
|
2009-01-28 10:25:33 +08:00
|
|
|
symtab,
|
|
|
|
layout,
|
|
|
|
this,
|
|
|
|
object,
|
|
|
|
data_shndx,
|
|
|
|
prelocs,
|
|
|
|
reloc_count,
|
|
|
|
output_section,
|
|
|
|
needs_special_offset_handling,
|
|
|
|
local_symbol_count,
|
|
|
|
plocal_symbols);
|
|
|
|
}
|
|
|
|
|
2006-10-21 04:40:49 +08:00
|
|
|
// Scan relocations for a section.
|
|
|
|
|
|
|
|
void
|
* object.h (class Relobj): Drop options parameter from
gc_process_relocs, scan_relocs, relocate, do_gc_process_relocs,
do_scan_relocs, do_relocate. Change all callers.
(class Sized_relobj): Drop options parameters from
do_gc_process_relocs, do_scan_relocs, do_relocate,
do_relocate_sections, relocate_sections, emit_relocs_scan,
emit_relocs_scan_reltype. Change all callers.
(struct Relocate_info): Remove options field and all references to
it.
* reloc.h (class Read_relocs): Remove options constructor
parameter and options_ field. Change all callers.
(class Gc_process_relocs, class Scan_relocs): Likewise.
(class Relocate_task): Likewise.
* target-reloc.h (scan_relocs): Remove options parameter. Change
all callers.
(scan_relocatable_relocs): Likewise.
* target.h (class Sized_target): Remove options parameter from
gc_process_relocs, scan_relocs, scan_relocatable_relocs. Change
all callers.
* gc.h (gc_process_relocs): Remove options parameter. Change all
callers.
* arm.cc: Update functions to remove options parameters.
* i386.cc: Likewise.
* powerpc.cc: Likewise.
* sparc.cc: Likewise.
* x86_64.cc: Likewise.
* testsuite/testfile.cc: Likewise.
2009-10-29 13:16:23 +08:00
|
|
|
Target_i386::scan_relocs(Symbol_table* symtab,
|
2006-11-04 02:26:11 +08:00
|
|
|
Layout* layout,
|
2011-05-25 05:41:10 +08:00
|
|
|
Sized_relobj_file<32, false>* object,
|
2006-11-30 01:56:40 +08:00
|
|
|
unsigned int data_shndx,
|
2006-10-21 04:40:49 +08:00
|
|
|
unsigned int sh_type,
|
|
|
|
const unsigned char* prelocs,
|
|
|
|
size_t reloc_count,
|
2007-11-09 15:00:15 +08:00
|
|
|
Output_section* output_section,
|
|
|
|
bool needs_special_offset_handling,
|
2006-10-21 04:40:49 +08:00
|
|
|
size_t local_symbol_count,
|
2007-11-09 15:00:15 +08:00
|
|
|
const unsigned char* plocal_symbols)
|
2006-10-21 04:40:49 +08:00
|
|
|
{
|
|
|
|
if (sh_type == elfcpp::SHT_RELA)
|
|
|
|
{
|
2007-10-14 14:49:14 +08:00
|
|
|
gold_error(_("%s: unsupported RELA reloc section"),
|
|
|
|
object->name().c_str());
|
|
|
|
return;
|
2006-10-21 04:40:49 +08:00
|
|
|
}
|
|
|
|
|
2006-11-04 02:26:11 +08:00
|
|
|
gold::scan_relocs<32, false, Target_i386, elfcpp::SHT_REL,
|
|
|
|
Target_i386::Scan>(
|
2006-10-21 04:40:49 +08:00
|
|
|
symtab,
|
2006-11-04 02:26:11 +08:00
|
|
|
layout,
|
|
|
|
this,
|
2006-10-21 04:40:49 +08:00
|
|
|
object,
|
2006-11-30 01:56:40 +08:00
|
|
|
data_shndx,
|
2006-10-21 04:40:49 +08:00
|
|
|
prelocs,
|
|
|
|
reloc_count,
|
2007-11-09 15:00:15 +08:00
|
|
|
output_section,
|
|
|
|
needs_special_offset_handling,
|
2006-10-21 04:40:49 +08:00
|
|
|
local_symbol_count,
|
2007-11-09 15:00:15 +08:00
|
|
|
plocal_symbols);
|
2006-10-21 04:40:49 +08:00
|
|
|
}
|
|
|
|
|
2006-12-02 00:51:25 +08:00
|
|
|
// Finalize the sections.
|
2006-12-01 07:52:50 +08:00
|
|
|
|
|
|
|
void
|
2009-12-04 07:13:55 +08:00
|
|
|
Target_i386::do_finalize_sections(
|
|
|
|
Layout* layout,
|
|
|
|
const Input_objects*,
|
2009-12-30 15:22:06 +08:00
|
|
|
Symbol_table* symtab)
|
2006-12-01 07:52:50 +08:00
|
|
|
{
|
2010-01-08 04:43:35 +08:00
|
|
|
const Reloc_section* rel_plt = (this->plt_ == NULL
|
|
|
|
? NULL
|
|
|
|
: this->plt_->rel_plt());
|
|
|
|
layout->add_target_dynamic_tags(true, this->got_plt_, rel_plt,
|
2010-02-10 04:29:44 +08:00
|
|
|
this->rel_dyn_, true, false);
|
2006-12-02 00:51:25 +08:00
|
|
|
|
|
|
|
// Emit any relocs we saved in an attempt to avoid generating COPY
|
|
|
|
// relocs.
|
2008-04-17 06:54:29 +08:00
|
|
|
if (this->copy_relocs_.any_saved_relocs())
|
|
|
|
this->copy_relocs_.emit(this->rel_dyn_section(layout));
|
2009-12-30 15:22:06 +08:00
|
|
|
|
|
|
|
// Set the size of the _GLOBAL_OFFSET_TABLE_ symbol to the size of
|
|
|
|
// the .got.plt section.
|
|
|
|
Symbol* sym = this->global_offset_table_;
|
|
|
|
if (sym != NULL)
|
|
|
|
{
|
|
|
|
uint32_t data_size = this->got_plt_->current_data_size();
|
|
|
|
symtab->get_sized_symbol<32>(sym)->set_symsize(data_size);
|
|
|
|
}
|
2011-07-06 13:12:03 +08:00
|
|
|
|
PR gold/12372
* target.h (Target::plt_address_for_global): New function.
(Target::plt_address_for_local): New function.
(Target::plt_section_for_global): Remove.
(Target::plt_section_for_local): Remove.
(Target::do_plt_address_for_global): New virtual function.
(Target::do_plt_address_for_local): New virtual function.
(Target::do_plt_section_for_global): Remove.
(Target::do_plt_section_for_local): Remove.
(Target::register_global_plt_entry): Add Symbol_table and Layout
parameters.
* output.cc (Output_data_got::Got_entry::write): Use
plt_address_for_global and plt_address_for_local.
* layout.cc (Layout::add_target_dynamic_tags): Use size and
address of output section.
* i386.cc (class Output_data_plt_i386): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_i386::has_irelative_section): New function.
(Output_data_plt_i386::entry_count): Add irelative_count_.
(Output_data_plt_i386::set_final_data_size): Likewise.
(class Target_i386): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_i386::Target_i386): Initialize new fields.
(Target_i386::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_i386::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_i386::got_section): Create got_irelative_.
(Target_i386::rel_irelative_section): New function.
(Output_data_plt_i386::Output_data_plt_i386): Initialize new
fields. Don't define __rel_iplt_{start,end}.
(Output_data_plt_i386::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_i386::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_i386::rel_tls_desc): Fix formatting.
(Output_data_plt_i386::rel_irelative): New function.
(Output_data_plt_i386::address_for_global): New function.
(Output_data_plt_i386::address_for_local): New function.
(Output_data_plt_i386::do_write): Write out IRELATIVE area. Use
IRELATIVE GOT when changing IFUNC GOT entries.
(Target_i386::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_i386::do_finalize_sections): Create the __rel_iplt symbols
if we didn't create an IRELATIVE GOT.
(Target_i386::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_i386::do_dynsym_value): Use plt_address_for_global.
* x86_64.cc (class Output_data_plt_x86_64): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_x86_64::Output_data_plt_x86_64) [both versions]:
Initialize new fields. Remove symtab parameter. Change all
callers.
(Output_data_plt_x86_64::get_tlsdesc_plt_offset): Add
irelative_count_.
(Output_data_plt_x86_64::has_irelative_section): New function.
(Output_data_plt_x86_64::entry_count): Add irelative_count_.
(class Target_x86_64): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_x86_64::Target_x86_64): Initialize new fields.
(Target_x86_64::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_x86_64::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_x86_64::got_section): Create got_irelative_.
(Target_x86_64::rela_irelative_section): New function.
(Output_data_plt_x86_64::init): Remove symtab parameter. Change
all callers. Don't create __rel_iplt_{start,end}.
(Output_data_plt_x86_64::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_x86_64::add_relocation): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::rela_tlsdesc): Fix formatting.
(Output_data_plt_x86_64::rela_irelative): New function.
(Output_data_plt_x86_64::address_for_global): New function.
(Output_data_plt_x86_64::address_for_local): New function.
(Output_data_plt_x86_64::set_final_data_size): Likewise.
(Output_data_plt_x86_64::do_write): Write out IRELATIVE area.
(Target_x86_64::init_got_plt_for_update): Create got_irelative_.
(Target_x86_64::register_global_plt_entry): Add symtab and layout
parameters.
(Target_x86_64::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_x86_64::do_finalize_sections): Create the __rela_iplt
symbols if we didn't create an IRELATIVE GOT.
(Target_x86_64::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_x86_64::do_dynsym_value): Use plt_address_for_global.
* testsuite/ifuncvar1.c: New test file.
* testsuite/ifuncvar2.c: New test file.
* testsuite/ifuncvar3.c: New test file.
* testsuite/Makefile.am (check_PROGRAMS): Add ifuncvar.
(ifuncvar1_pic.o, ifuncvar2_pic.o, ifuncvar.so): New targets.
(ifuncvar_SOURCES, ifuncvar_DEPENDENCIES): New variables.
(ifuncvar_LDFLAGS, ifuncvar_LDADD): New variables.
* testsuite/Makefile.in: Rebuild.
2011-07-09 06:48:08 +08:00
|
|
|
if (parameters->doing_static_link()
|
|
|
|
&& (this->plt_ == NULL || !this->plt_->has_irelative_section()))
|
2011-07-06 13:12:03 +08:00
|
|
|
{
|
|
|
|
// If linking statically, make sure that the __rel_iplt symbols
|
|
|
|
// were defined if necessary, even if we didn't create a PLT.
|
|
|
|
static const Define_symbol_in_segment syms[] =
|
|
|
|
{
|
|
|
|
{
|
|
|
|
"__rel_iplt_start", // name
|
|
|
|
elfcpp::PT_LOAD, // segment_type
|
|
|
|
elfcpp::PF_W, // segment_flags_set
|
|
|
|
elfcpp::PF(0), // segment_flags_clear
|
|
|
|
0, // value
|
|
|
|
0, // size
|
|
|
|
elfcpp::STT_NOTYPE, // type
|
|
|
|
elfcpp::STB_GLOBAL, // binding
|
|
|
|
elfcpp::STV_HIDDEN, // visibility
|
|
|
|
0, // nonvis
|
|
|
|
Symbol::SEGMENT_START, // offset_from_base
|
|
|
|
true // only_if_ref
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"__rel_iplt_end", // name
|
|
|
|
elfcpp::PT_LOAD, // segment_type
|
|
|
|
elfcpp::PF_W, // segment_flags_set
|
|
|
|
elfcpp::PF(0), // segment_flags_clear
|
|
|
|
0, // value
|
|
|
|
0, // size
|
|
|
|
elfcpp::STT_NOTYPE, // type
|
|
|
|
elfcpp::STB_GLOBAL, // binding
|
|
|
|
elfcpp::STV_HIDDEN, // visibility
|
|
|
|
0, // nonvis
|
|
|
|
Symbol::SEGMENT_START, // offset_from_base
|
|
|
|
true // only_if_ref
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
symtab->define_symbols(layout, 2, syms,
|
|
|
|
layout->script_options()->saw_sections_clause());
|
|
|
|
}
|
2006-12-01 07:52:50 +08:00
|
|
|
}
|
|
|
|
|
2007-11-02 12:08:52 +08:00
|
|
|
// Return whether a direct absolute static relocation needs to be applied.
|
|
|
|
// In cases where Scan::local() or Scan::global() has created
|
|
|
|
// a dynamic relocation other than R_386_RELATIVE, the addend
|
|
|
|
// of the relocation is carried in the data, and we must not
|
|
|
|
// apply the static relocation.
|
|
|
|
|
|
|
|
inline bool
|
|
|
|
Target_i386::Relocate::should_apply_static_reloc(const Sized_symbol<32>* gsym,
|
2010-11-11 18:43:30 +08:00
|
|
|
unsigned int r_type,
|
2009-03-04 14:46:27 +08:00
|
|
|
bool is_32bit,
|
|
|
|
Output_section* output_section)
|
2007-11-02 12:08:52 +08:00
|
|
|
{
|
2009-03-04 14:46:27 +08:00
|
|
|
// If the output section is not allocated, then we didn't call
|
|
|
|
// scan_relocs, we didn't create a dynamic reloc, and we must apply
|
|
|
|
// the reloc here.
|
|
|
|
if ((output_section->flags() & elfcpp::SHF_ALLOC) == 0)
|
|
|
|
return true;
|
|
|
|
|
2010-11-11 18:43:30 +08:00
|
|
|
int ref_flags = Scan::get_reference_flags(r_type);
|
|
|
|
|
2007-11-10 03:45:08 +08:00
|
|
|
// For local symbols, we will have created a non-RELATIVE dynamic
|
|
|
|
// relocation only if (a) the output is position independent,
|
|
|
|
// (b) the relocation is absolute (not pc- or segment-relative), and
|
|
|
|
// (c) the relocation is not 32 bits wide.
|
2007-11-02 12:08:52 +08:00
|
|
|
if (gsym == NULL)
|
2008-02-28 08:18:24 +08:00
|
|
|
return !(parameters->options().output_is_position_independent()
|
2008-01-23 15:15:59 +08:00
|
|
|
&& (ref_flags & Symbol::ABSOLUTE_REF)
|
2007-11-10 03:45:08 +08:00
|
|
|
&& !is_32bit);
|
2007-11-02 12:08:52 +08:00
|
|
|
|
2008-01-23 15:15:59 +08:00
|
|
|
// For global symbols, we use the same helper routines used in the
|
|
|
|
// scan pass. If we did not create a dynamic relocation, or if we
|
|
|
|
// created a RELATIVE dynamic relocation, we should apply the static
|
|
|
|
// relocation.
|
|
|
|
bool has_dyn = gsym->needs_dynamic_reloc(ref_flags);
|
|
|
|
bool is_rel = (ref_flags & Symbol::ABSOLUTE_REF)
|
|
|
|
&& gsym->can_use_relative_reloc(ref_flags
|
|
|
|
& Symbol::FUNCTION_CALL);
|
|
|
|
return !has_dyn || is_rel;
|
2007-11-02 12:08:52 +08:00
|
|
|
}
|
|
|
|
|
2006-09-30 03:58:17 +08:00
|
|
|
// Perform a relocation.
|
|
|
|
|
2006-11-04 02:26:11 +08:00
|
|
|
inline bool
|
2006-10-21 04:40:49 +08:00
|
|
|
Target_i386::Relocate::relocate(const Relocate_info<32, false>* relinfo,
|
2006-11-04 02:26:11 +08:00
|
|
|
Target_i386* target,
|
2010-08-25 16:36:54 +08:00
|
|
|
Output_section* output_section,
|
2006-10-21 04:40:49 +08:00
|
|
|
size_t relnum,
|
|
|
|
const elfcpp::Rel<32, false>& rel,
|
|
|
|
unsigned int r_type,
|
2006-11-16 08:38:25 +08:00
|
|
|
const Sized_symbol<32>* gsym,
|
2007-05-17 01:42:48 +08:00
|
|
|
const Symbol_value<32>* psymval,
|
2006-10-21 04:40:49 +08:00
|
|
|
unsigned char* view,
|
|
|
|
elfcpp::Elf_types<32>::Elf_Addr address,
|
2007-12-21 05:21:24 +08:00
|
|
|
section_size_type view_size)
|
2006-09-30 03:58:17 +08:00
|
|
|
{
|
2006-11-04 02:26:11 +08:00
|
|
|
if (this->skip_call_tls_get_addr_)
|
|
|
|
{
|
2009-01-30 08:21:46 +08:00
|
|
|
if ((r_type != elfcpp::R_386_PLT32
|
|
|
|
&& r_type != elfcpp::R_386_PC32)
|
2006-11-04 02:26:11 +08:00
|
|
|
|| gsym == NULL
|
|
|
|
|| strcmp(gsym->name(), "___tls_get_addr") != 0)
|
2007-10-14 14:49:14 +08:00
|
|
|
gold_error_at_location(relinfo, relnum, rel.get_r_offset(),
|
|
|
|
_("missing expected TLS relocation"));
|
|
|
|
else
|
2006-11-04 02:26:11 +08:00
|
|
|
{
|
2007-10-14 14:49:14 +08:00
|
|
|
this->skip_call_tls_get_addr_ = false;
|
|
|
|
return false;
|
2006-11-04 02:26:11 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-05-25 05:41:10 +08:00
|
|
|
const Sized_relobj_file<32, false>* object = relinfo->object;
|
2010-08-20 06:50:16 +08:00
|
|
|
|
2006-11-30 01:56:40 +08:00
|
|
|
// Pick the value to use for symbols defined in shared objects.
|
2007-05-17 01:42:48 +08:00
|
|
|
Symbol_value<32> symval;
|
2007-10-17 07:23:08 +08:00
|
|
|
if (gsym != NULL
|
2010-08-20 06:50:16 +08:00
|
|
|
&& gsym->type() == elfcpp::STT_GNU_IFUNC
|
|
|
|
&& r_type == elfcpp::R_386_32
|
2010-11-11 18:43:30 +08:00
|
|
|
&& gsym->needs_dynamic_reloc(Scan::get_reference_flags(r_type))
|
2010-08-20 06:50:16 +08:00
|
|
|
&& gsym->can_use_relative_reloc(false)
|
|
|
|
&& !gsym->is_from_dynobj()
|
|
|
|
&& !gsym->is_undefined()
|
|
|
|
&& !gsym->is_preemptible())
|
|
|
|
{
|
|
|
|
// In this case we are generating a R_386_IRELATIVE reloc. We
|
|
|
|
// want to use the real value of the symbol, not the PLT offset.
|
|
|
|
}
|
|
|
|
else if (gsym != NULL
|
2010-11-11 18:43:30 +08:00
|
|
|
&& gsym->use_plt_offset(Scan::get_reference_flags(r_type)))
|
2006-11-30 01:56:40 +08:00
|
|
|
{
|
PR gold/12372
* target.h (Target::plt_address_for_global): New function.
(Target::plt_address_for_local): New function.
(Target::plt_section_for_global): Remove.
(Target::plt_section_for_local): Remove.
(Target::do_plt_address_for_global): New virtual function.
(Target::do_plt_address_for_local): New virtual function.
(Target::do_plt_section_for_global): Remove.
(Target::do_plt_section_for_local): Remove.
(Target::register_global_plt_entry): Add Symbol_table and Layout
parameters.
* output.cc (Output_data_got::Got_entry::write): Use
plt_address_for_global and plt_address_for_local.
* layout.cc (Layout::add_target_dynamic_tags): Use size and
address of output section.
* i386.cc (class Output_data_plt_i386): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_i386::has_irelative_section): New function.
(Output_data_plt_i386::entry_count): Add irelative_count_.
(Output_data_plt_i386::set_final_data_size): Likewise.
(class Target_i386): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_i386::Target_i386): Initialize new fields.
(Target_i386::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_i386::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_i386::got_section): Create got_irelative_.
(Target_i386::rel_irelative_section): New function.
(Output_data_plt_i386::Output_data_plt_i386): Initialize new
fields. Don't define __rel_iplt_{start,end}.
(Output_data_plt_i386::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_i386::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_i386::rel_tls_desc): Fix formatting.
(Output_data_plt_i386::rel_irelative): New function.
(Output_data_plt_i386::address_for_global): New function.
(Output_data_plt_i386::address_for_local): New function.
(Output_data_plt_i386::do_write): Write out IRELATIVE area. Use
IRELATIVE GOT when changing IFUNC GOT entries.
(Target_i386::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_i386::do_finalize_sections): Create the __rel_iplt symbols
if we didn't create an IRELATIVE GOT.
(Target_i386::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_i386::do_dynsym_value): Use plt_address_for_global.
* x86_64.cc (class Output_data_plt_x86_64): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_x86_64::Output_data_plt_x86_64) [both versions]:
Initialize new fields. Remove symtab parameter. Change all
callers.
(Output_data_plt_x86_64::get_tlsdesc_plt_offset): Add
irelative_count_.
(Output_data_plt_x86_64::has_irelative_section): New function.
(Output_data_plt_x86_64::entry_count): Add irelative_count_.
(class Target_x86_64): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_x86_64::Target_x86_64): Initialize new fields.
(Target_x86_64::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_x86_64::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_x86_64::got_section): Create got_irelative_.
(Target_x86_64::rela_irelative_section): New function.
(Output_data_plt_x86_64::init): Remove symtab parameter. Change
all callers. Don't create __rel_iplt_{start,end}.
(Output_data_plt_x86_64::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_x86_64::add_relocation): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::rela_tlsdesc): Fix formatting.
(Output_data_plt_x86_64::rela_irelative): New function.
(Output_data_plt_x86_64::address_for_global): New function.
(Output_data_plt_x86_64::address_for_local): New function.
(Output_data_plt_x86_64::set_final_data_size): Likewise.
(Output_data_plt_x86_64::do_write): Write out IRELATIVE area.
(Target_x86_64::init_got_plt_for_update): Create got_irelative_.
(Target_x86_64::register_global_plt_entry): Add symtab and layout
parameters.
(Target_x86_64::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_x86_64::do_finalize_sections): Create the __rela_iplt
symbols if we didn't create an IRELATIVE GOT.
(Target_x86_64::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_x86_64::do_dynsym_value): Use plt_address_for_global.
* testsuite/ifuncvar1.c: New test file.
* testsuite/ifuncvar2.c: New test file.
* testsuite/ifuncvar3.c: New test file.
* testsuite/Makefile.am (check_PROGRAMS): Add ifuncvar.
(ifuncvar1_pic.o, ifuncvar2_pic.o, ifuncvar.so): New targets.
(ifuncvar_SOURCES, ifuncvar_DEPENDENCIES): New variables.
(ifuncvar_LDFLAGS, ifuncvar_LDADD): New variables.
* testsuite/Makefile.in: Rebuild.
2011-07-09 06:48:08 +08:00
|
|
|
symval.set_output_value(target->plt_address_for_global(gsym)
|
2007-05-17 01:42:48 +08:00
|
|
|
+ gsym->plt_offset());
|
|
|
|
psymval = &symval;
|
2006-11-30 01:56:40 +08:00
|
|
|
}
|
2010-08-20 06:50:16 +08:00
|
|
|
else if (gsym == NULL && psymval->is_ifunc_symbol())
|
|
|
|
{
|
|
|
|
unsigned int r_sym = elfcpp::elf_r_sym<32>(rel.get_r_info());
|
|
|
|
if (object->local_has_plt_offset(r_sym))
|
|
|
|
{
|
PR gold/12372
* target.h (Target::plt_address_for_global): New function.
(Target::plt_address_for_local): New function.
(Target::plt_section_for_global): Remove.
(Target::plt_section_for_local): Remove.
(Target::do_plt_address_for_global): New virtual function.
(Target::do_plt_address_for_local): New virtual function.
(Target::do_plt_section_for_global): Remove.
(Target::do_plt_section_for_local): Remove.
(Target::register_global_plt_entry): Add Symbol_table and Layout
parameters.
* output.cc (Output_data_got::Got_entry::write): Use
plt_address_for_global and plt_address_for_local.
* layout.cc (Layout::add_target_dynamic_tags): Use size and
address of output section.
* i386.cc (class Output_data_plt_i386): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_i386::has_irelative_section): New function.
(Output_data_plt_i386::entry_count): Add irelative_count_.
(Output_data_plt_i386::set_final_data_size): Likewise.
(class Target_i386): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_i386::Target_i386): Initialize new fields.
(Target_i386::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_i386::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_i386::got_section): Create got_irelative_.
(Target_i386::rel_irelative_section): New function.
(Output_data_plt_i386::Output_data_plt_i386): Initialize new
fields. Don't define __rel_iplt_{start,end}.
(Output_data_plt_i386::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_i386::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_i386::rel_tls_desc): Fix formatting.
(Output_data_plt_i386::rel_irelative): New function.
(Output_data_plt_i386::address_for_global): New function.
(Output_data_plt_i386::address_for_local): New function.
(Output_data_plt_i386::do_write): Write out IRELATIVE area. Use
IRELATIVE GOT when changing IFUNC GOT entries.
(Target_i386::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_i386::do_finalize_sections): Create the __rel_iplt symbols
if we didn't create an IRELATIVE GOT.
(Target_i386::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_i386::do_dynsym_value): Use plt_address_for_global.
* x86_64.cc (class Output_data_plt_x86_64): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_x86_64::Output_data_plt_x86_64) [both versions]:
Initialize new fields. Remove symtab parameter. Change all
callers.
(Output_data_plt_x86_64::get_tlsdesc_plt_offset): Add
irelative_count_.
(Output_data_plt_x86_64::has_irelative_section): New function.
(Output_data_plt_x86_64::entry_count): Add irelative_count_.
(class Target_x86_64): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_x86_64::Target_x86_64): Initialize new fields.
(Target_x86_64::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_x86_64::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_x86_64::got_section): Create got_irelative_.
(Target_x86_64::rela_irelative_section): New function.
(Output_data_plt_x86_64::init): Remove symtab parameter. Change
all callers. Don't create __rel_iplt_{start,end}.
(Output_data_plt_x86_64::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_x86_64::add_relocation): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::rela_tlsdesc): Fix formatting.
(Output_data_plt_x86_64::rela_irelative): New function.
(Output_data_plt_x86_64::address_for_global): New function.
(Output_data_plt_x86_64::address_for_local): New function.
(Output_data_plt_x86_64::set_final_data_size): Likewise.
(Output_data_plt_x86_64::do_write): Write out IRELATIVE area.
(Target_x86_64::init_got_plt_for_update): Create got_irelative_.
(Target_x86_64::register_global_plt_entry): Add symtab and layout
parameters.
(Target_x86_64::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_x86_64::do_finalize_sections): Create the __rela_iplt
symbols if we didn't create an IRELATIVE GOT.
(Target_x86_64::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_x86_64::do_dynsym_value): Use plt_address_for_global.
* testsuite/ifuncvar1.c: New test file.
* testsuite/ifuncvar2.c: New test file.
* testsuite/ifuncvar3.c: New test file.
* testsuite/Makefile.am (check_PROGRAMS): Add ifuncvar.
(ifuncvar1_pic.o, ifuncvar2_pic.o, ifuncvar.so): New targets.
(ifuncvar_SOURCES, ifuncvar_DEPENDENCIES): New variables.
(ifuncvar_LDFLAGS, ifuncvar_LDADD): New variables.
* testsuite/Makefile.in: Rebuild.
2011-07-09 06:48:08 +08:00
|
|
|
symval.set_output_value(target->plt_address_for_local(object, r_sym)
|
2010-08-20 06:50:16 +08:00
|
|
|
+ object->local_plt_offset(r_sym));
|
|
|
|
psymval = &symval;
|
|
|
|
}
|
|
|
|
}
|
2007-05-17 01:42:48 +08:00
|
|
|
|
2007-10-16 08:42:36 +08:00
|
|
|
// Get the GOT offset if needed.
|
2007-11-01 08:19:30 +08:00
|
|
|
// The GOT pointer points to the end of the GOT section.
|
|
|
|
// We need to subtract the size of the GOT section to get
|
|
|
|
// the actual offset to use in the relocation.
|
2007-10-16 08:42:36 +08:00
|
|
|
bool have_got_offset = false;
|
|
|
|
unsigned int got_offset = 0;
|
|
|
|
switch (r_type)
|
|
|
|
{
|
|
|
|
case elfcpp::R_386_GOT32:
|
|
|
|
if (gsym != NULL)
|
|
|
|
{
|
2008-03-26 02:37:16 +08:00
|
|
|
gold_assert(gsym->has_got_offset(GOT_TYPE_STANDARD));
|
|
|
|
got_offset = (gsym->got_offset(GOT_TYPE_STANDARD)
|
|
|
|
- target->got_size());
|
2007-10-16 08:42:36 +08:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
unsigned int r_sym = elfcpp::elf_r_sym<32>(rel.get_r_info());
|
2008-03-26 02:37:16 +08:00
|
|
|
gold_assert(object->local_has_got_offset(r_sym, GOT_TYPE_STANDARD));
|
|
|
|
got_offset = (object->local_got_offset(r_sym, GOT_TYPE_STANDARD)
|
|
|
|
- target->got_size());
|
2007-10-16 08:42:36 +08:00
|
|
|
}
|
|
|
|
have_got_offset = true;
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2006-09-30 03:58:17 +08:00
|
|
|
switch (r_type)
|
|
|
|
{
|
|
|
|
case elfcpp::R_386_NONE:
|
2006-10-21 04:40:49 +08:00
|
|
|
case elfcpp::R_386_GNU_VTINHERIT:
|
|
|
|
case elfcpp::R_386_GNU_VTENTRY:
|
2006-09-30 03:58:17 +08:00
|
|
|
break;
|
|
|
|
|
|
|
|
case elfcpp::R_386_32:
|
2010-11-11 18:43:30 +08:00
|
|
|
if (should_apply_static_reloc(gsym, r_type, true, output_section))
|
2007-11-02 12:08:52 +08:00
|
|
|
Relocate_functions<32, false>::rel32(view, object, psymval);
|
2006-09-30 03:58:17 +08:00
|
|
|
break;
|
|
|
|
|
|
|
|
case elfcpp::R_386_PC32:
|
2010-11-11 18:43:30 +08:00
|
|
|
if (should_apply_static_reloc(gsym, r_type, true, output_section))
|
|
|
|
Relocate_functions<32, false>::pcrel32(view, object, psymval, address);
|
2006-10-21 04:40:49 +08:00
|
|
|
break;
|
|
|
|
|
|
|
|
case elfcpp::R_386_16:
|
2010-11-11 18:43:30 +08:00
|
|
|
if (should_apply_static_reloc(gsym, r_type, false, output_section))
|
2007-11-02 12:08:52 +08:00
|
|
|
Relocate_functions<32, false>::rel16(view, object, psymval);
|
2006-10-21 04:40:49 +08:00
|
|
|
break;
|
|
|
|
|
|
|
|
case elfcpp::R_386_PC16:
|
2010-11-11 18:43:30 +08:00
|
|
|
if (should_apply_static_reloc(gsym, r_type, false, output_section))
|
|
|
|
Relocate_functions<32, false>::pcrel16(view, object, psymval, address);
|
2006-09-30 03:58:17 +08:00
|
|
|
break;
|
|
|
|
|
2006-10-21 04:40:49 +08:00
|
|
|
case elfcpp::R_386_8:
|
2010-11-11 18:43:30 +08:00
|
|
|
if (should_apply_static_reloc(gsym, r_type, false, output_section))
|
2007-11-02 12:08:52 +08:00
|
|
|
Relocate_functions<32, false>::rel8(view, object, psymval);
|
2006-10-21 04:40:49 +08:00
|
|
|
break;
|
|
|
|
|
|
|
|
case elfcpp::R_386_PC8:
|
2010-11-11 18:43:30 +08:00
|
|
|
if (should_apply_static_reloc(gsym, r_type, false, output_section))
|
|
|
|
Relocate_functions<32, false>::pcrel8(view, object, psymval, address);
|
2006-10-21 04:40:49 +08:00
|
|
|
break;
|
|
|
|
|
2006-11-04 02:26:11 +08:00
|
|
|
case elfcpp::R_386_PLT32:
|
2007-10-20 08:33:31 +08:00
|
|
|
gold_assert(gsym == NULL
|
|
|
|
|| gsym->has_plt_offset()
|
2007-12-22 07:31:19 +08:00
|
|
|
|| gsym->final_value_is_known()
|
|
|
|
|| (gsym->is_defined()
|
|
|
|
&& !gsym->is_from_dynobj()
|
|
|
|
&& !gsym->is_preemptible()));
|
2007-05-17 01:42:48 +08:00
|
|
|
Relocate_functions<32, false>::pcrel32(view, object, psymval, address);
|
2006-11-04 02:26:11 +08:00
|
|
|
break;
|
|
|
|
|
|
|
|
case elfcpp::R_386_GOT32:
|
2007-10-16 08:42:36 +08:00
|
|
|
gold_assert(have_got_offset);
|
|
|
|
Relocate_functions<32, false>::rel32(view, got_offset);
|
2006-11-04 02:26:11 +08:00
|
|
|
break;
|
|
|
|
|
|
|
|
case elfcpp::R_386_GOTOFF:
|
2007-05-17 01:42:48 +08:00
|
|
|
{
|
|
|
|
elfcpp::Elf_types<32>::Elf_Addr value;
|
|
|
|
value = (psymval->value(object, 0)
|
2007-11-01 08:19:30 +08:00
|
|
|
- target->got_plt_section()->address());
|
2007-05-17 01:42:48 +08:00
|
|
|
Relocate_functions<32, false>::rel32(view, value);
|
|
|
|
}
|
2006-11-04 02:26:11 +08:00
|
|
|
break;
|
|
|
|
|
|
|
|
case elfcpp::R_386_GOTPC:
|
2007-05-17 01:42:48 +08:00
|
|
|
{
|
|
|
|
elfcpp::Elf_types<32>::Elf_Addr value;
|
2007-11-01 08:19:30 +08:00
|
|
|
value = target->got_plt_section()->address();
|
2007-05-17 01:42:48 +08:00
|
|
|
Relocate_functions<32, false>::pcrel32(view, value, address);
|
|
|
|
}
|
2006-11-04 02:26:11 +08:00
|
|
|
break;
|
|
|
|
|
2006-10-21 04:40:49 +08:00
|
|
|
case elfcpp::R_386_COPY:
|
|
|
|
case elfcpp::R_386_GLOB_DAT:
|
|
|
|
case elfcpp::R_386_JUMP_SLOT:
|
|
|
|
case elfcpp::R_386_RELATIVE:
|
2010-08-20 06:50:16 +08:00
|
|
|
case elfcpp::R_386_IRELATIVE:
|
2007-10-05 06:28:36 +08:00
|
|
|
// These are outstanding tls relocs, which are unexpected when
|
|
|
|
// linking.
|
2006-10-21 04:40:49 +08:00
|
|
|
case elfcpp::R_386_TLS_TPOFF:
|
|
|
|
case elfcpp::R_386_TLS_DTPMOD32:
|
|
|
|
case elfcpp::R_386_TLS_DTPOFF32:
|
|
|
|
case elfcpp::R_386_TLS_TPOFF32:
|
|
|
|
case elfcpp::R_386_TLS_DESC:
|
2007-10-14 14:49:14 +08:00
|
|
|
gold_error_at_location(relinfo, relnum, rel.get_r_offset(),
|
|
|
|
_("unexpected reloc %u in object file"),
|
|
|
|
r_type);
|
2006-10-21 04:40:49 +08:00
|
|
|
break;
|
|
|
|
|
2007-10-05 06:28:36 +08:00
|
|
|
// These are initial tls relocs, which are expected when
|
|
|
|
// linking.
|
2007-10-30 04:09:35 +08:00
|
|
|
case elfcpp::R_386_TLS_GD: // Global-dynamic
|
|
|
|
case elfcpp::R_386_TLS_GOTDESC: // Global-dynamic (from ~oliva url)
|
|
|
|
case elfcpp::R_386_TLS_DESC_CALL:
|
|
|
|
case elfcpp::R_386_TLS_LDM: // Local-dynamic
|
|
|
|
case elfcpp::R_386_TLS_LDO_32: // Alternate local-dynamic
|
|
|
|
case elfcpp::R_386_TLS_IE: // Initial-exec
|
2006-10-21 04:40:49 +08:00
|
|
|
case elfcpp::R_386_TLS_IE_32:
|
2007-10-30 04:09:35 +08:00
|
|
|
case elfcpp::R_386_TLS_GOTIE:
|
|
|
|
case elfcpp::R_386_TLS_LE: // Local-exec
|
2006-10-21 04:40:49 +08:00
|
|
|
case elfcpp::R_386_TLS_LE_32:
|
2007-11-15 06:31:02 +08:00
|
|
|
this->relocate_tls(relinfo, target, relnum, rel, r_type, gsym, psymval,
|
|
|
|
view, address, view_size);
|
2006-10-21 04:40:49 +08:00
|
|
|
break;
|
|
|
|
|
|
|
|
case elfcpp::R_386_32PLT:
|
|
|
|
case elfcpp::R_386_TLS_GD_32:
|
|
|
|
case elfcpp::R_386_TLS_GD_PUSH:
|
|
|
|
case elfcpp::R_386_TLS_GD_CALL:
|
|
|
|
case elfcpp::R_386_TLS_GD_POP:
|
|
|
|
case elfcpp::R_386_TLS_LDM_32:
|
|
|
|
case elfcpp::R_386_TLS_LDM_PUSH:
|
|
|
|
case elfcpp::R_386_TLS_LDM_CALL:
|
|
|
|
case elfcpp::R_386_TLS_LDM_POP:
|
|
|
|
case elfcpp::R_386_USED_BY_INTEL_200:
|
2006-09-30 03:58:17 +08:00
|
|
|
default:
|
2007-10-14 14:49:14 +08:00
|
|
|
gold_error_at_location(relinfo, relnum, rel.get_r_offset(),
|
|
|
|
_("unsupported reloc %u"),
|
|
|
|
r_type);
|
2006-10-21 04:40:49 +08:00
|
|
|
break;
|
|
|
|
}
|
2006-11-04 02:26:11 +08:00
|
|
|
|
|
|
|
return true;
|
2006-10-21 04:40:49 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
// Perform a TLS relocation.
|
|
|
|
|
|
|
|
inline void
|
|
|
|
Target_i386::Relocate::relocate_tls(const Relocate_info<32, false>* relinfo,
|
2007-11-15 06:31:02 +08:00
|
|
|
Target_i386* target,
|
2006-10-21 04:40:49 +08:00
|
|
|
size_t relnum,
|
|
|
|
const elfcpp::Rel<32, false>& rel,
|
|
|
|
unsigned int r_type,
|
2006-11-16 08:38:25 +08:00
|
|
|
const Sized_symbol<32>* gsym,
|
2007-05-17 01:42:48 +08:00
|
|
|
const Symbol_value<32>* psymval,
|
2006-10-21 04:40:49 +08:00
|
|
|
unsigned char* view,
|
|
|
|
elfcpp::Elf_types<32>::Elf_Addr,
|
2007-12-21 05:21:24 +08:00
|
|
|
section_size_type view_size)
|
2006-10-21 04:40:49 +08:00
|
|
|
{
|
|
|
|
Output_segment* tls_segment = relinfo->layout->tls_segment();
|
|
|
|
|
2011-05-25 05:41:10 +08:00
|
|
|
const Sized_relobj_file<32, false>* object = relinfo->object;
|
2007-11-15 06:31:02 +08:00
|
|
|
|
|
|
|
elfcpp::Elf_types<32>::Elf_Addr value = psymval->value(object, 0);
|
2007-05-17 01:42:48 +08:00
|
|
|
|
2010-02-11 07:00:29 +08:00
|
|
|
const bool is_final = (gsym == NULL
|
|
|
|
? !parameters->options().shared()
|
|
|
|
: gsym->final_value_is_known());
|
2007-10-08 13:12:59 +08:00
|
|
|
const tls::Tls_optimization optimized_type
|
|
|
|
= Target_i386::optimize_tls_reloc(is_final, r_type);
|
2006-10-21 04:40:49 +08:00
|
|
|
switch (r_type)
|
|
|
|
{
|
2007-10-30 04:09:35 +08:00
|
|
|
case elfcpp::R_386_TLS_GD: // Global-dynamic
|
2007-10-08 13:12:59 +08:00
|
|
|
if (optimized_type == tls::TLSOPT_TO_LE)
|
2006-10-21 04:40:49 +08:00
|
|
|
{
|
2011-07-09 07:49:11 +08:00
|
|
|
if (tls_segment == NULL)
|
|
|
|
{
|
2011-07-09 08:47:12 +08:00
|
|
|
gold_assert(parameters->errors()->error_count() > 0
|
|
|
|
|| issue_undefined_symbol_error(gsym));
|
2011-07-09 07:49:11 +08:00
|
|
|
return;
|
|
|
|
}
|
2007-10-30 04:09:35 +08:00
|
|
|
this->tls_gd_to_le(relinfo, relnum, tls_segment,
|
|
|
|
rel, r_type, value, view,
|
|
|
|
view_size);
|
2006-10-21 04:40:49 +08:00
|
|
|
break;
|
|
|
|
}
|
2007-11-15 06:31:02 +08:00
|
|
|
else
|
|
|
|
{
|
2008-04-12 05:24:30 +08:00
|
|
|
unsigned int got_type = (optimized_type == tls::TLSOPT_TO_IE
|
|
|
|
? GOT_TYPE_TLS_NOFFSET
|
|
|
|
: GOT_TYPE_TLS_PAIR);
|
2007-11-15 06:31:02 +08:00
|
|
|
unsigned int got_offset;
|
|
|
|
if (gsym != NULL)
|
|
|
|
{
|
2008-04-12 05:24:30 +08:00
|
|
|
gold_assert(gsym->has_got_offset(got_type));
|
|
|
|
got_offset = gsym->got_offset(got_type) - target->got_size();
|
2007-11-15 06:31:02 +08:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
unsigned int r_sym = elfcpp::elf_r_sym<32>(rel.get_r_info());
|
2008-04-12 05:24:30 +08:00
|
|
|
gold_assert(object->local_has_got_offset(r_sym, got_type));
|
|
|
|
got_offset = (object->local_got_offset(r_sym, got_type)
|
2007-11-15 06:31:02 +08:00
|
|
|
- target->got_size());
|
|
|
|
}
|
|
|
|
if (optimized_type == tls::TLSOPT_TO_IE)
|
|
|
|
{
|
2011-07-09 07:49:11 +08:00
|
|
|
if (tls_segment == NULL)
|
|
|
|
{
|
2011-07-09 08:47:12 +08:00
|
|
|
gold_assert(parameters->errors()->error_count() > 0
|
|
|
|
|| issue_undefined_symbol_error(gsym));
|
2011-07-09 07:49:11 +08:00
|
|
|
return;
|
|
|
|
}
|
2007-12-06 13:55:50 +08:00
|
|
|
this->tls_gd_to_ie(relinfo, relnum, tls_segment, rel, r_type,
|
|
|
|
got_offset, view, view_size);
|
2007-11-15 06:31:02 +08:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
else if (optimized_type == tls::TLSOPT_NONE)
|
|
|
|
{
|
|
|
|
// Relocate the field with the offset of the pair of GOT
|
|
|
|
// entries.
|
|
|
|
Relocate_functions<32, false>::rel32(view, got_offset);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2007-10-14 14:49:14 +08:00
|
|
|
gold_error_at_location(relinfo, relnum, rel.get_r_offset(),
|
|
|
|
_("unsupported reloc %u"),
|
|
|
|
r_type);
|
2006-10-21 04:40:49 +08:00
|
|
|
break;
|
|
|
|
|
2007-10-30 04:09:35 +08:00
|
|
|
case elfcpp::R_386_TLS_GOTDESC: // Global-dynamic (from ~oliva url)
|
|
|
|
case elfcpp::R_386_TLS_DESC_CALL:
|
2008-05-17 04:44:22 +08:00
|
|
|
this->local_dynamic_type_ = LOCAL_DYNAMIC_GNU;
|
2008-04-12 05:24:30 +08:00
|
|
|
if (optimized_type == tls::TLSOPT_TO_LE)
|
|
|
|
{
|
2011-07-09 07:49:11 +08:00
|
|
|
if (tls_segment == NULL)
|
|
|
|
{
|
2011-07-09 08:47:12 +08:00
|
|
|
gold_assert(parameters->errors()->error_count() > 0
|
|
|
|
|| issue_undefined_symbol_error(gsym));
|
2011-07-09 07:49:11 +08:00
|
|
|
return;
|
|
|
|
}
|
2008-04-12 05:24:30 +08:00
|
|
|
this->tls_desc_gd_to_le(relinfo, relnum, tls_segment,
|
|
|
|
rel, r_type, value, view,
|
|
|
|
view_size);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
unsigned int got_type = (optimized_type == tls::TLSOPT_TO_IE
|
|
|
|
? GOT_TYPE_TLS_NOFFSET
|
|
|
|
: GOT_TYPE_TLS_DESC);
|
2010-08-02 18:07:03 +08:00
|
|
|
unsigned int got_offset = 0;
|
|
|
|
if (r_type == elfcpp::R_386_TLS_GOTDESC
|
|
|
|
&& optimized_type == tls::TLSOPT_NONE)
|
|
|
|
{
|
|
|
|
// We created GOT entries in the .got.tlsdesc portion of
|
|
|
|
// the .got.plt section, but the offset stored in the
|
|
|
|
// symbol is the offset within .got.tlsdesc.
|
|
|
|
got_offset = (target->got_size()
|
|
|
|
+ target->got_plt_section()->data_size());
|
|
|
|
}
|
2008-04-12 05:24:30 +08:00
|
|
|
if (gsym != NULL)
|
|
|
|
{
|
|
|
|
gold_assert(gsym->has_got_offset(got_type));
|
2010-08-02 18:07:03 +08:00
|
|
|
got_offset += gsym->got_offset(got_type) - target->got_size();
|
2008-04-12 05:24:30 +08:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
unsigned int r_sym = elfcpp::elf_r_sym<32>(rel.get_r_info());
|
|
|
|
gold_assert(object->local_has_got_offset(r_sym, got_type));
|
2010-08-02 18:07:03 +08:00
|
|
|
got_offset += (object->local_got_offset(r_sym, got_type)
|
|
|
|
- target->got_size());
|
2008-04-12 05:24:30 +08:00
|
|
|
}
|
|
|
|
if (optimized_type == tls::TLSOPT_TO_IE)
|
|
|
|
{
|
2011-07-09 07:49:11 +08:00
|
|
|
if (tls_segment == NULL)
|
|
|
|
{
|
2011-07-09 08:47:12 +08:00
|
|
|
gold_assert(parameters->errors()->error_count() > 0
|
|
|
|
|| issue_undefined_symbol_error(gsym));
|
2011-07-09 07:49:11 +08:00
|
|
|
return;
|
|
|
|
}
|
2008-04-12 05:24:30 +08:00
|
|
|
this->tls_desc_gd_to_ie(relinfo, relnum, tls_segment, rel, r_type,
|
|
|
|
got_offset, view, view_size);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
else if (optimized_type == tls::TLSOPT_NONE)
|
|
|
|
{
|
|
|
|
if (r_type == elfcpp::R_386_TLS_GOTDESC)
|
|
|
|
{
|
|
|
|
// Relocate the field with the offset of the pair of GOT
|
|
|
|
// entries.
|
|
|
|
Relocate_functions<32, false>::rel32(view, got_offset);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2007-10-14 14:49:14 +08:00
|
|
|
gold_error_at_location(relinfo, relnum, rel.get_r_offset(),
|
|
|
|
_("unsupported reloc %u"),
|
|
|
|
r_type);
|
2006-11-04 02:26:11 +08:00
|
|
|
break;
|
|
|
|
|
2007-10-30 04:09:35 +08:00
|
|
|
case elfcpp::R_386_TLS_LDM: // Local-dynamic
|
2007-10-08 01:05:07 +08:00
|
|
|
if (this->local_dynamic_type_ == LOCAL_DYNAMIC_SUN)
|
|
|
|
{
|
2007-10-14 14:49:14 +08:00
|
|
|
gold_error_at_location(relinfo, relnum, rel.get_r_offset(),
|
|
|
|
_("both SUN and GNU model "
|
|
|
|
"TLS relocations"));
|
|
|
|
break;
|
2007-10-08 01:05:07 +08:00
|
|
|
}
|
|
|
|
this->local_dynamic_type_ = LOCAL_DYNAMIC_GNU;
|
2007-10-08 13:12:59 +08:00
|
|
|
if (optimized_type == tls::TLSOPT_TO_LE)
|
2007-10-08 01:05:07 +08:00
|
|
|
{
|
2011-07-09 07:49:11 +08:00
|
|
|
if (tls_segment == NULL)
|
|
|
|
{
|
2011-07-09 08:47:12 +08:00
|
|
|
gold_assert(parameters->errors()->error_count() > 0
|
|
|
|
|| issue_undefined_symbol_error(gsym));
|
2011-07-09 07:49:11 +08:00
|
|
|
return;
|
|
|
|
}
|
2007-10-08 01:05:07 +08:00
|
|
|
this->tls_ld_to_le(relinfo, relnum, tls_segment, rel, r_type,
|
|
|
|
value, view, view_size);
|
|
|
|
break;
|
|
|
|
}
|
2007-11-15 06:31:02 +08:00
|
|
|
else if (optimized_type == tls::TLSOPT_NONE)
|
|
|
|
{
|
|
|
|
// Relocate the field with the offset of the GOT entry for
|
|
|
|
// the module index.
|
|
|
|
unsigned int got_offset;
|
2007-12-11 12:23:05 +08:00
|
|
|
got_offset = (target->got_mod_index_entry(NULL, NULL, NULL)
|
|
|
|
- target->got_size());
|
2007-11-15 06:31:02 +08:00
|
|
|
Relocate_functions<32, false>::rel32(view, got_offset);
|
|
|
|
break;
|
|
|
|
}
|
2007-10-14 14:49:14 +08:00
|
|
|
gold_error_at_location(relinfo, relnum, rel.get_r_offset(),
|
|
|
|
_("unsupported reloc %u"),
|
|
|
|
r_type);
|
2007-10-08 01:05:07 +08:00
|
|
|
break;
|
|
|
|
|
2007-10-30 04:09:35 +08:00
|
|
|
case elfcpp::R_386_TLS_LDO_32: // Alternate local-dynamic
|
2009-10-07 05:44:11 +08:00
|
|
|
if (optimized_type == tls::TLSOPT_TO_LE)
|
2009-10-07 05:36:00 +08:00
|
|
|
{
|
2009-10-15 08:33:18 +08:00
|
|
|
// This reloc can appear in debugging sections, in which
|
|
|
|
// case we must not convert to local-exec. We decide what
|
|
|
|
// to do based on whether the section is marked as
|
|
|
|
// containing executable code. That is what the GNU linker
|
|
|
|
// does as well.
|
|
|
|
elfcpp::Shdr<32, false> shdr(relinfo->data_shdr);
|
|
|
|
if ((shdr.get_sh_flags() & elfcpp::SHF_EXECINSTR) != 0)
|
2009-10-07 05:44:11 +08:00
|
|
|
{
|
2011-07-09 07:49:11 +08:00
|
|
|
if (tls_segment == NULL)
|
|
|
|
{
|
2011-07-09 08:47:12 +08:00
|
|
|
gold_assert(parameters->errors()->error_count() > 0
|
|
|
|
|| issue_undefined_symbol_error(gsym));
|
2011-07-09 07:49:11 +08:00
|
|
|
return;
|
|
|
|
}
|
2009-10-07 05:44:11 +08:00
|
|
|
value -= tls_segment->memsz();
|
|
|
|
}
|
2009-10-07 05:36:00 +08:00
|
|
|
}
|
2007-10-08 01:05:07 +08:00
|
|
|
Relocate_functions<32, false>::rel32(view, value);
|
|
|
|
break;
|
|
|
|
|
2007-10-30 04:09:35 +08:00
|
|
|
case elfcpp::R_386_TLS_IE: // Initial-exec
|
|
|
|
case elfcpp::R_386_TLS_GOTIE:
|
|
|
|
case elfcpp::R_386_TLS_IE_32:
|
|
|
|
if (optimized_type == tls::TLSOPT_TO_LE)
|
|
|
|
{
|
2011-07-09 07:49:11 +08:00
|
|
|
if (tls_segment == NULL)
|
|
|
|
{
|
2011-07-09 08:47:12 +08:00
|
|
|
gold_assert(parameters->errors()->error_count() > 0
|
|
|
|
|| issue_undefined_symbol_error(gsym));
|
2011-07-09 07:49:11 +08:00
|
|
|
return;
|
|
|
|
}
|
2007-10-30 04:09:35 +08:00
|
|
|
Target_i386::Relocate::tls_ie_to_le(relinfo, relnum, tls_segment,
|
|
|
|
rel, r_type, value, view,
|
|
|
|
view_size);
|
|
|
|
break;
|
|
|
|
}
|
2007-11-15 06:31:02 +08:00
|
|
|
else if (optimized_type == tls::TLSOPT_NONE)
|
|
|
|
{
|
|
|
|
// Relocate the field with the offset of the GOT entry for
|
|
|
|
// the tp-relative offset of the symbol.
|
2008-04-12 05:24:30 +08:00
|
|
|
unsigned int got_type = (r_type == elfcpp::R_386_TLS_IE_32
|
|
|
|
? GOT_TYPE_TLS_OFFSET
|
|
|
|
: GOT_TYPE_TLS_NOFFSET);
|
2007-11-15 06:31:02 +08:00
|
|
|
unsigned int got_offset;
|
|
|
|
if (gsym != NULL)
|
|
|
|
{
|
2008-04-12 05:24:30 +08:00
|
|
|
gold_assert(gsym->has_got_offset(got_type));
|
|
|
|
got_offset = gsym->got_offset(got_type);
|
2007-11-15 06:31:02 +08:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
unsigned int r_sym = elfcpp::elf_r_sym<32>(rel.get_r_info());
|
2008-04-12 05:24:30 +08:00
|
|
|
gold_assert(object->local_has_got_offset(r_sym, got_type));
|
|
|
|
got_offset = object->local_got_offset(r_sym, got_type);
|
2007-11-15 06:31:02 +08:00
|
|
|
}
|
|
|
|
// For the R_386_TLS_IE relocation, we need to apply the
|
|
|
|
// absolute address of the GOT entry.
|
|
|
|
if (r_type == elfcpp::R_386_TLS_IE)
|
|
|
|
got_offset += target->got_plt_section()->address();
|
|
|
|
// All GOT offsets are relative to the end of the GOT.
|
|
|
|
got_offset -= target->got_size();
|
|
|
|
Relocate_functions<32, false>::rel32(view, got_offset);
|
|
|
|
break;
|
|
|
|
}
|
2007-10-14 14:49:14 +08:00
|
|
|
gold_error_at_location(relinfo, relnum, rel.get_r_offset(),
|
|
|
|
_("unsupported reloc %u"),
|
|
|
|
r_type);
|
2006-10-21 04:40:49 +08:00
|
|
|
break;
|
|
|
|
|
2007-10-30 04:09:35 +08:00
|
|
|
case elfcpp::R_386_TLS_LE: // Local-exec
|
2007-12-06 13:55:50 +08:00
|
|
|
// If we're creating a shared library, a dynamic relocation will
|
|
|
|
// have been created for this location, so do not apply it now.
|
2008-02-28 08:18:24 +08:00
|
|
|
if (!parameters->options().shared())
|
2007-12-06 13:55:50 +08:00
|
|
|
{
|
2011-07-09 07:49:11 +08:00
|
|
|
if (tls_segment == NULL)
|
|
|
|
{
|
2011-07-09 08:47:12 +08:00
|
|
|
gold_assert(parameters->errors()->error_count() > 0
|
|
|
|
|| issue_undefined_symbol_error(gsym));
|
2011-07-09 07:49:11 +08:00
|
|
|
return;
|
|
|
|
}
|
2007-12-06 13:55:50 +08:00
|
|
|
value -= tls_segment->memsz();
|
|
|
|
Relocate_functions<32, false>::rel32(view, value);
|
|
|
|
}
|
2007-10-30 04:09:35 +08:00
|
|
|
break;
|
2006-10-21 04:40:49 +08:00
|
|
|
|
2007-10-30 04:09:35 +08:00
|
|
|
case elfcpp::R_386_TLS_LE_32:
|
2007-12-06 13:55:50 +08:00
|
|
|
// If we're creating a shared library, a dynamic relocation will
|
|
|
|
// have been created for this location, so do not apply it now.
|
2008-02-28 08:18:24 +08:00
|
|
|
if (!parameters->options().shared())
|
2007-12-06 13:55:50 +08:00
|
|
|
{
|
2011-07-09 07:49:11 +08:00
|
|
|
if (tls_segment == NULL)
|
|
|
|
{
|
2011-07-09 08:47:12 +08:00
|
|
|
gold_assert(parameters->errors()->error_count() > 0
|
|
|
|
|| issue_undefined_symbol_error(gsym));
|
2011-07-09 07:49:11 +08:00
|
|
|
return;
|
|
|
|
}
|
2007-12-06 13:55:50 +08:00
|
|
|
value = tls_segment->memsz() - value;
|
|
|
|
Relocate_functions<32, false>::rel32(view, value);
|
|
|
|
}
|
2007-10-30 04:09:35 +08:00
|
|
|
break;
|
2006-10-21 04:40:49 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-10-13 08:15:07 +08:00
|
|
|
// Do a relocation in which we convert a TLS General-Dynamic to a
|
2006-11-04 02:26:11 +08:00
|
|
|
// Local-Exec.
|
|
|
|
|
|
|
|
inline void
|
|
|
|
Target_i386::Relocate::tls_gd_to_le(const Relocate_info<32, false>* relinfo,
|
|
|
|
size_t relnum,
|
|
|
|
Output_segment* tls_segment,
|
|
|
|
const elfcpp::Rel<32, false>& rel,
|
|
|
|
unsigned int,
|
|
|
|
elfcpp::Elf_types<32>::Elf_Addr value,
|
|
|
|
unsigned char* view,
|
2007-12-21 05:21:24 +08:00
|
|
|
section_size_type view_size)
|
2006-11-04 02:26:11 +08:00
|
|
|
{
|
|
|
|
// leal foo(,%reg,1),%eax; call ___tls_get_addr
|
2007-10-08 01:05:07 +08:00
|
|
|
// ==> movl %gs:0,%eax; subl $foo@tpoff,%eax
|
2006-11-04 02:26:11 +08:00
|
|
|
// leal foo(%reg),%eax; call ___tls_get_addr
|
|
|
|
// ==> movl %gs:0,%eax; subl $foo@tpoff,%eax
|
|
|
|
|
2007-10-08 13:12:59 +08:00
|
|
|
tls::check_range(relinfo, relnum, rel.get_r_offset(), view_size, -2);
|
|
|
|
tls::check_range(relinfo, relnum, rel.get_r_offset(), view_size, 9);
|
2006-11-04 02:26:11 +08:00
|
|
|
|
|
|
|
unsigned char op1 = view[-1];
|
|
|
|
unsigned char op2 = view[-2];
|
|
|
|
|
2007-10-08 13:12:59 +08:00
|
|
|
tls::check_tls(relinfo, relnum, rel.get_r_offset(),
|
|
|
|
op2 == 0x8d || op2 == 0x04);
|
|
|
|
tls::check_tls(relinfo, relnum, rel.get_r_offset(), view[4] == 0xe8);
|
2006-11-04 02:26:11 +08:00
|
|
|
|
|
|
|
int roff = 5;
|
|
|
|
|
|
|
|
if (op2 == 0x04)
|
|
|
|
{
|
2007-10-08 13:12:59 +08:00
|
|
|
tls::check_range(relinfo, relnum, rel.get_r_offset(), view_size, -3);
|
|
|
|
tls::check_tls(relinfo, relnum, rel.get_r_offset(), view[-3] == 0x8d);
|
|
|
|
tls::check_tls(relinfo, relnum, rel.get_r_offset(),
|
|
|
|
((op1 & 0xc7) == 0x05 && op1 != (4 << 3)));
|
2006-11-04 02:26:11 +08:00
|
|
|
memcpy(view - 3, "\x65\xa1\0\0\0\0\x81\xe8\0\0\0", 12);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2007-10-08 13:12:59 +08:00
|
|
|
tls::check_tls(relinfo, relnum, rel.get_r_offset(),
|
|
|
|
(op1 & 0xf8) == 0x80 && (op1 & 7) != 4);
|
2007-12-21 05:21:24 +08:00
|
|
|
if (rel.get_r_offset() + 9 < view_size
|
2007-10-05 06:28:36 +08:00
|
|
|
&& view[9] == 0x90)
|
2006-11-04 02:26:11 +08:00
|
|
|
{
|
|
|
|
// There is a trailing nop. Use the size byte subl.
|
|
|
|
memcpy(view - 2, "\x65\xa1\0\0\0\0\x81\xe8\0\0\0", 12);
|
|
|
|
roff = 6;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// Use the five byte subl.
|
|
|
|
memcpy(view - 2, "\x65\xa1\0\0\0\0\x2d\0\0\0", 11);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-12-06 13:55:50 +08:00
|
|
|
value = tls_segment->memsz() - value;
|
2006-11-04 02:26:11 +08:00
|
|
|
Relocate_functions<32, false>::rel32(view + roff, value);
|
|
|
|
|
|
|
|
// The next reloc should be a PLT32 reloc against __tls_get_addr.
|
|
|
|
// We can skip it.
|
|
|
|
this->skip_call_tls_get_addr_ = true;
|
|
|
|
}
|
|
|
|
|
2007-12-06 13:55:50 +08:00
|
|
|
// Do a relocation in which we convert a TLS General-Dynamic to an
|
2007-11-15 06:31:02 +08:00
|
|
|
// Initial-Exec.
|
|
|
|
|
|
|
|
inline void
|
|
|
|
Target_i386::Relocate::tls_gd_to_ie(const Relocate_info<32, false>* relinfo,
|
|
|
|
size_t relnum,
|
2008-04-12 05:24:30 +08:00
|
|
|
Output_segment*,
|
2007-11-15 06:31:02 +08:00
|
|
|
const elfcpp::Rel<32, false>& rel,
|
|
|
|
unsigned int,
|
|
|
|
elfcpp::Elf_types<32>::Elf_Addr value,
|
|
|
|
unsigned char* view,
|
2007-12-21 05:21:24 +08:00
|
|
|
section_size_type view_size)
|
2007-11-15 06:31:02 +08:00
|
|
|
{
|
|
|
|
// leal foo(,%ebx,1),%eax; call ___tls_get_addr
|
|
|
|
// ==> movl %gs:0,%eax; addl foo@gotntpoff(%ebx),%eax
|
|
|
|
|
|
|
|
tls::check_range(relinfo, relnum, rel.get_r_offset(), view_size, -2);
|
|
|
|
tls::check_range(relinfo, relnum, rel.get_r_offset(), view_size, 9);
|
|
|
|
|
|
|
|
unsigned char op1 = view[-1];
|
|
|
|
unsigned char op2 = view[-2];
|
|
|
|
|
|
|
|
tls::check_tls(relinfo, relnum, rel.get_r_offset(),
|
|
|
|
op2 == 0x8d || op2 == 0x04);
|
|
|
|
tls::check_tls(relinfo, relnum, rel.get_r_offset(), view[4] == 0xe8);
|
|
|
|
|
|
|
|
int roff = 5;
|
|
|
|
|
2008-04-12 05:24:30 +08:00
|
|
|
// FIXME: For now, support only the first (SIB) form.
|
|
|
|
tls::check_tls(relinfo, relnum, rel.get_r_offset(), op2 == 0x04);
|
2007-11-15 06:31:02 +08:00
|
|
|
|
|
|
|
if (op2 == 0x04)
|
|
|
|
{
|
|
|
|
tls::check_range(relinfo, relnum, rel.get_r_offset(), view_size, -3);
|
|
|
|
tls::check_tls(relinfo, relnum, rel.get_r_offset(), view[-3] == 0x8d);
|
|
|
|
tls::check_tls(relinfo, relnum, rel.get_r_offset(),
|
|
|
|
((op1 & 0xc7) == 0x05 && op1 != (4 << 3)));
|
|
|
|
memcpy(view - 3, "\x65\xa1\0\0\0\0\x03\x83\0\0\0", 12);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
tls::check_tls(relinfo, relnum, rel.get_r_offset(),
|
|
|
|
(op1 & 0xf8) == 0x80 && (op1 & 7) != 4);
|
2007-12-21 05:21:24 +08:00
|
|
|
if (rel.get_r_offset() + 9 < view_size
|
2007-11-15 06:31:02 +08:00
|
|
|
&& view[9] == 0x90)
|
|
|
|
{
|
|
|
|
// FIXME: This is not the right instruction sequence.
|
|
|
|
// There is a trailing nop. Use the size byte subl.
|
|
|
|
memcpy(view - 2, "\x65\xa1\0\0\0\0\x81\xe8\0\0\0", 12);
|
|
|
|
roff = 6;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// FIXME: This is not the right instruction sequence.
|
|
|
|
// Use the five byte subl.
|
|
|
|
memcpy(view - 2, "\x65\xa1\0\0\0\0\x2d\0\0\0", 11);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
Relocate_functions<32, false>::rel32(view + roff, value);
|
|
|
|
|
|
|
|
// The next reloc should be a PLT32 reloc against __tls_get_addr.
|
|
|
|
// We can skip it.
|
|
|
|
this->skip_call_tls_get_addr_ = true;
|
|
|
|
}
|
|
|
|
|
2008-04-12 05:24:30 +08:00
|
|
|
// Do a relocation in which we convert a TLS_GOTDESC or TLS_DESC_CALL
|
|
|
|
// General-Dynamic to a Local-Exec.
|
|
|
|
|
|
|
|
inline void
|
|
|
|
Target_i386::Relocate::tls_desc_gd_to_le(
|
|
|
|
const Relocate_info<32, false>* relinfo,
|
|
|
|
size_t relnum,
|
|
|
|
Output_segment* tls_segment,
|
|
|
|
const elfcpp::Rel<32, false>& rel,
|
|
|
|
unsigned int r_type,
|
|
|
|
elfcpp::Elf_types<32>::Elf_Addr value,
|
|
|
|
unsigned char* view,
|
|
|
|
section_size_type view_size)
|
|
|
|
{
|
|
|
|
if (r_type == elfcpp::R_386_TLS_GOTDESC)
|
|
|
|
{
|
|
|
|
// leal foo@TLSDESC(%ebx), %eax
|
|
|
|
// ==> leal foo@NTPOFF, %eax
|
|
|
|
tls::check_range(relinfo, relnum, rel.get_r_offset(), view_size, -2);
|
|
|
|
tls::check_range(relinfo, relnum, rel.get_r_offset(), view_size, 4);
|
|
|
|
tls::check_tls(relinfo, relnum, rel.get_r_offset(),
|
|
|
|
view[-2] == 0x8d && view[-1] == 0x83);
|
|
|
|
view[-1] = 0x05;
|
|
|
|
value -= tls_segment->memsz();
|
|
|
|
Relocate_functions<32, false>::rel32(view, value);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// call *foo@TLSCALL(%eax)
|
|
|
|
// ==> nop; nop
|
|
|
|
gold_assert(r_type == elfcpp::R_386_TLS_DESC_CALL);
|
|
|
|
tls::check_range(relinfo, relnum, rel.get_r_offset(), view_size, 2);
|
|
|
|
tls::check_tls(relinfo, relnum, rel.get_r_offset(),
|
|
|
|
view[0] == 0xff && view[1] == 0x10);
|
|
|
|
view[0] = 0x66;
|
|
|
|
view[1] = 0x90;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Do a relocation in which we convert a TLS_GOTDESC or TLS_DESC_CALL
|
|
|
|
// General-Dynamic to an Initial-Exec.
|
|
|
|
|
|
|
|
inline void
|
|
|
|
Target_i386::Relocate::tls_desc_gd_to_ie(
|
|
|
|
const Relocate_info<32, false>* relinfo,
|
|
|
|
size_t relnum,
|
|
|
|
Output_segment*,
|
|
|
|
const elfcpp::Rel<32, false>& rel,
|
|
|
|
unsigned int r_type,
|
|
|
|
elfcpp::Elf_types<32>::Elf_Addr value,
|
|
|
|
unsigned char* view,
|
|
|
|
section_size_type view_size)
|
|
|
|
{
|
|
|
|
if (r_type == elfcpp::R_386_TLS_GOTDESC)
|
|
|
|
{
|
|
|
|
// leal foo@TLSDESC(%ebx), %eax
|
|
|
|
// ==> movl foo@GOTNTPOFF(%ebx), %eax
|
|
|
|
tls::check_range(relinfo, relnum, rel.get_r_offset(), view_size, -2);
|
|
|
|
tls::check_range(relinfo, relnum, rel.get_r_offset(), view_size, 4);
|
|
|
|
tls::check_tls(relinfo, relnum, rel.get_r_offset(),
|
|
|
|
view[-2] == 0x8d && view[-1] == 0x83);
|
|
|
|
view[-2] = 0x8b;
|
|
|
|
Relocate_functions<32, false>::rel32(view, value);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// call *foo@TLSCALL(%eax)
|
|
|
|
// ==> nop; nop
|
|
|
|
gold_assert(r_type == elfcpp::R_386_TLS_DESC_CALL);
|
|
|
|
tls::check_range(relinfo, relnum, rel.get_r_offset(), view_size, 2);
|
|
|
|
tls::check_tls(relinfo, relnum, rel.get_r_offset(),
|
|
|
|
view[0] == 0xff && view[1] == 0x10);
|
|
|
|
view[0] = 0x66;
|
|
|
|
view[1] = 0x90;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-10-08 01:05:07 +08:00
|
|
|
// Do a relocation in which we convert a TLS Local-Dynamic to a
|
|
|
|
// Local-Exec.
|
|
|
|
|
|
|
|
inline void
|
|
|
|
Target_i386::Relocate::tls_ld_to_le(const Relocate_info<32, false>* relinfo,
|
|
|
|
size_t relnum,
|
|
|
|
Output_segment*,
|
|
|
|
const elfcpp::Rel<32, false>& rel,
|
|
|
|
unsigned int,
|
|
|
|
elfcpp::Elf_types<32>::Elf_Addr,
|
|
|
|
unsigned char* view,
|
2007-12-21 05:21:24 +08:00
|
|
|
section_size_type view_size)
|
2007-10-08 01:05:07 +08:00
|
|
|
{
|
|
|
|
// leal foo(%reg), %eax; call ___tls_get_addr
|
|
|
|
// ==> movl %gs:0,%eax; nop; leal 0(%esi,1),%esi
|
|
|
|
|
2007-10-08 13:12:59 +08:00
|
|
|
tls::check_range(relinfo, relnum, rel.get_r_offset(), view_size, -2);
|
|
|
|
tls::check_range(relinfo, relnum, rel.get_r_offset(), view_size, 9);
|
2007-10-08 01:05:07 +08:00
|
|
|
|
|
|
|
// FIXME: Does this test really always pass?
|
2007-10-08 13:12:59 +08:00
|
|
|
tls::check_tls(relinfo, relnum, rel.get_r_offset(),
|
|
|
|
view[-2] == 0x8d && view[-1] == 0x83);
|
2007-10-08 01:05:07 +08:00
|
|
|
|
2007-10-08 13:12:59 +08:00
|
|
|
tls::check_tls(relinfo, relnum, rel.get_r_offset(), view[4] == 0xe8);
|
2007-10-08 01:05:07 +08:00
|
|
|
|
|
|
|
memcpy(view - 2, "\x65\xa1\0\0\0\0\x90\x8d\x74\x26\0", 11);
|
|
|
|
|
|
|
|
// The next reloc should be a PLT32 reloc against __tls_get_addr.
|
|
|
|
// We can skip it.
|
|
|
|
this->skip_call_tls_get_addr_ = true;
|
|
|
|
}
|
|
|
|
|
2007-10-30 04:09:35 +08:00
|
|
|
// Do a relocation in which we convert a TLS Initial-Exec to a
|
|
|
|
// Local-Exec.
|
|
|
|
|
|
|
|
inline void
|
|
|
|
Target_i386::Relocate::tls_ie_to_le(const Relocate_info<32, false>* relinfo,
|
|
|
|
size_t relnum,
|
|
|
|
Output_segment* tls_segment,
|
|
|
|
const elfcpp::Rel<32, false>& rel,
|
|
|
|
unsigned int r_type,
|
|
|
|
elfcpp::Elf_types<32>::Elf_Addr value,
|
|
|
|
unsigned char* view,
|
2007-12-21 05:21:24 +08:00
|
|
|
section_size_type view_size)
|
2007-10-30 04:09:35 +08:00
|
|
|
{
|
|
|
|
// We have to actually change the instructions, which means that we
|
|
|
|
// need to examine the opcodes to figure out which instruction we
|
|
|
|
// are looking at.
|
|
|
|
if (r_type == elfcpp::R_386_TLS_IE)
|
|
|
|
{
|
|
|
|
// movl %gs:XX,%eax ==> movl $YY,%eax
|
|
|
|
// movl %gs:XX,%reg ==> movl $YY,%reg
|
|
|
|
// addl %gs:XX,%reg ==> addl $YY,%reg
|
|
|
|
tls::check_range(relinfo, relnum, rel.get_r_offset(), view_size, -1);
|
|
|
|
tls::check_range(relinfo, relnum, rel.get_r_offset(), view_size, 4);
|
|
|
|
|
|
|
|
unsigned char op1 = view[-1];
|
|
|
|
if (op1 == 0xa1)
|
|
|
|
{
|
|
|
|
// movl XX,%eax ==> movl $YY,%eax
|
|
|
|
view[-1] = 0xb8;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
tls::check_range(relinfo, relnum, rel.get_r_offset(), view_size, -2);
|
|
|
|
|
|
|
|
unsigned char op2 = view[-2];
|
|
|
|
if (op2 == 0x8b)
|
|
|
|
{
|
|
|
|
// movl XX,%reg ==> movl $YY,%reg
|
|
|
|
tls::check_tls(relinfo, relnum, rel.get_r_offset(),
|
|
|
|
(op1 & 0xc7) == 0x05);
|
|
|
|
view[-2] = 0xc7;
|
|
|
|
view[-1] = 0xc0 | ((op1 >> 3) & 7);
|
|
|
|
}
|
|
|
|
else if (op2 == 0x03)
|
|
|
|
{
|
|
|
|
// addl XX,%reg ==> addl $YY,%reg
|
|
|
|
tls::check_tls(relinfo, relnum, rel.get_r_offset(),
|
|
|
|
(op1 & 0xc7) == 0x05);
|
|
|
|
view[-2] = 0x81;
|
|
|
|
view[-1] = 0xc0 | ((op1 >> 3) & 7);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
tls::check_tls(relinfo, relnum, rel.get_r_offset(), 0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// subl %gs:XX(%reg1),%reg2 ==> subl $YY,%reg2
|
|
|
|
// movl %gs:XX(%reg1),%reg2 ==> movl $YY,%reg2
|
|
|
|
// addl %gs:XX(%reg1),%reg2 ==> addl $YY,$reg2
|
|
|
|
tls::check_range(relinfo, relnum, rel.get_r_offset(), view_size, -2);
|
|
|
|
tls::check_range(relinfo, relnum, rel.get_r_offset(), view_size, 4);
|
|
|
|
|
|
|
|
unsigned char op1 = view[-1];
|
|
|
|
unsigned char op2 = view[-2];
|
|
|
|
tls::check_tls(relinfo, relnum, rel.get_r_offset(),
|
|
|
|
(op1 & 0xc0) == 0x80 && (op1 & 7) != 4);
|
|
|
|
if (op2 == 0x8b)
|
|
|
|
{
|
|
|
|
// movl %gs:XX(%reg1),%reg2 ==> movl $YY,%reg2
|
|
|
|
view[-2] = 0xc7;
|
|
|
|
view[-1] = 0xc0 | ((op1 >> 3) & 7);
|
|
|
|
}
|
|
|
|
else if (op2 == 0x2b)
|
|
|
|
{
|
|
|
|
// subl %gs:XX(%reg1),%reg2 ==> subl $YY,%reg2
|
|
|
|
view[-2] = 0x81;
|
|
|
|
view[-1] = 0xe8 | ((op1 >> 3) & 7);
|
|
|
|
}
|
|
|
|
else if (op2 == 0x03)
|
|
|
|
{
|
|
|
|
// addl %gs:XX(%reg1),%reg2 ==> addl $YY,$reg2
|
|
|
|
view[-2] = 0x81;
|
|
|
|
view[-1] = 0xc0 | ((op1 >> 3) & 7);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
tls::check_tls(relinfo, relnum, rel.get_r_offset(), 0);
|
|
|
|
}
|
|
|
|
|
2007-12-06 13:55:50 +08:00
|
|
|
value = tls_segment->memsz() - value;
|
2007-10-30 04:09:35 +08:00
|
|
|
if (r_type == elfcpp::R_386_TLS_IE || r_type == elfcpp::R_386_TLS_GOTIE)
|
|
|
|
value = - value;
|
|
|
|
|
|
|
|
Relocate_functions<32, false>::rel32(view, value);
|
|
|
|
}
|
|
|
|
|
2006-09-30 03:58:17 +08:00
|
|
|
// Relocate section data.
|
|
|
|
|
|
|
|
void
|
2006-10-21 04:40:49 +08:00
|
|
|
Target_i386::relocate_section(const Relocate_info<32, false>* relinfo,
|
2006-09-30 03:58:17 +08:00
|
|
|
unsigned int sh_type,
|
|
|
|
const unsigned char* prelocs,
|
|
|
|
size_t reloc_count,
|
2007-11-09 15:00:15 +08:00
|
|
|
Output_section* output_section,
|
|
|
|
bool needs_special_offset_handling,
|
2006-09-30 03:58:17 +08:00
|
|
|
unsigned char* view,
|
|
|
|
elfcpp::Elf_types<32>::Elf_Addr address,
|
2009-10-07 06:58:27 +08:00
|
|
|
section_size_type view_size,
|
|
|
|
const Reloc_symbol_changes* reloc_symbol_changes)
|
2006-09-30 03:58:17 +08:00
|
|
|
{
|
2006-11-30 01:56:40 +08:00
|
|
|
gold_assert(sh_type == elfcpp::SHT_REL);
|
2006-09-30 03:58:17 +08:00
|
|
|
|
2006-11-04 02:26:11 +08:00
|
|
|
gold::relocate_section<32, false, Target_i386, elfcpp::SHT_REL,
|
|
|
|
Target_i386::Relocate>(
|
2006-10-21 04:40:49 +08:00
|
|
|
relinfo,
|
2006-11-04 02:26:11 +08:00
|
|
|
this,
|
2006-09-30 03:58:17 +08:00
|
|
|
prelocs,
|
|
|
|
reloc_count,
|
2007-11-09 15:00:15 +08:00
|
|
|
output_section,
|
|
|
|
needs_special_offset_handling,
|
2006-09-30 03:58:17 +08:00
|
|
|
view,
|
|
|
|
address,
|
2009-10-07 06:58:27 +08:00
|
|
|
view_size,
|
|
|
|
reloc_symbol_changes);
|
2006-09-30 03:58:17 +08:00
|
|
|
}
|
|
|
|
|
2008-02-06 16:13:50 +08:00
|
|
|
// Return the size of a relocation while scanning during a relocatable
|
|
|
|
// link.
|
|
|
|
|
|
|
|
unsigned int
|
|
|
|
Target_i386::Relocatable_size_for_reloc::get_size_for_reloc(
|
|
|
|
unsigned int r_type,
|
|
|
|
Relobj* object)
|
|
|
|
{
|
|
|
|
switch (r_type)
|
|
|
|
{
|
|
|
|
case elfcpp::R_386_NONE:
|
|
|
|
case elfcpp::R_386_GNU_VTINHERIT:
|
|
|
|
case elfcpp::R_386_GNU_VTENTRY:
|
|
|
|
case elfcpp::R_386_TLS_GD: // Global-dynamic
|
|
|
|
case elfcpp::R_386_TLS_GOTDESC: // Global-dynamic (from ~oliva url)
|
|
|
|
case elfcpp::R_386_TLS_DESC_CALL:
|
|
|
|
case elfcpp::R_386_TLS_LDM: // Local-dynamic
|
|
|
|
case elfcpp::R_386_TLS_LDO_32: // Alternate local-dynamic
|
|
|
|
case elfcpp::R_386_TLS_IE: // Initial-exec
|
|
|
|
case elfcpp::R_386_TLS_IE_32:
|
|
|
|
case elfcpp::R_386_TLS_GOTIE:
|
|
|
|
case elfcpp::R_386_TLS_LE: // Local-exec
|
|
|
|
case elfcpp::R_386_TLS_LE_32:
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
case elfcpp::R_386_32:
|
|
|
|
case elfcpp::R_386_PC32:
|
|
|
|
case elfcpp::R_386_GOT32:
|
|
|
|
case elfcpp::R_386_PLT32:
|
|
|
|
case elfcpp::R_386_GOTOFF:
|
|
|
|
case elfcpp::R_386_GOTPC:
|
|
|
|
return 4;
|
|
|
|
|
|
|
|
case elfcpp::R_386_16:
|
|
|
|
case elfcpp::R_386_PC16:
|
|
|
|
return 2;
|
|
|
|
|
|
|
|
case elfcpp::R_386_8:
|
|
|
|
case elfcpp::R_386_PC8:
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
// These are relocations which should only be seen by the
|
|
|
|
// dynamic linker, and should never be seen here.
|
|
|
|
case elfcpp::R_386_COPY:
|
|
|
|
case elfcpp::R_386_GLOB_DAT:
|
|
|
|
case elfcpp::R_386_JUMP_SLOT:
|
|
|
|
case elfcpp::R_386_RELATIVE:
|
2010-08-20 06:50:16 +08:00
|
|
|
case elfcpp::R_386_IRELATIVE:
|
2008-02-06 16:13:50 +08:00
|
|
|
case elfcpp::R_386_TLS_TPOFF:
|
|
|
|
case elfcpp::R_386_TLS_DTPMOD32:
|
|
|
|
case elfcpp::R_386_TLS_DTPOFF32:
|
|
|
|
case elfcpp::R_386_TLS_TPOFF32:
|
|
|
|
case elfcpp::R_386_TLS_DESC:
|
|
|
|
object->error(_("unexpected reloc %u in object file"), r_type);
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
case elfcpp::R_386_32PLT:
|
|
|
|
case elfcpp::R_386_TLS_GD_32:
|
|
|
|
case elfcpp::R_386_TLS_GD_PUSH:
|
|
|
|
case elfcpp::R_386_TLS_GD_CALL:
|
|
|
|
case elfcpp::R_386_TLS_GD_POP:
|
|
|
|
case elfcpp::R_386_TLS_LDM_32:
|
|
|
|
case elfcpp::R_386_TLS_LDM_PUSH:
|
|
|
|
case elfcpp::R_386_TLS_LDM_CALL:
|
|
|
|
case elfcpp::R_386_TLS_LDM_POP:
|
|
|
|
case elfcpp::R_386_USED_BY_INTEL_200:
|
|
|
|
default:
|
|
|
|
object->error(_("unsupported reloc %u in object file"), r_type);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Scan the relocs during a relocatable link.
|
|
|
|
|
|
|
|
void
|
* object.h (class Relobj): Drop options parameter from
gc_process_relocs, scan_relocs, relocate, do_gc_process_relocs,
do_scan_relocs, do_relocate. Change all callers.
(class Sized_relobj): Drop options parameters from
do_gc_process_relocs, do_scan_relocs, do_relocate,
do_relocate_sections, relocate_sections, emit_relocs_scan,
emit_relocs_scan_reltype. Change all callers.
(struct Relocate_info): Remove options field and all references to
it.
* reloc.h (class Read_relocs): Remove options constructor
parameter and options_ field. Change all callers.
(class Gc_process_relocs, class Scan_relocs): Likewise.
(class Relocate_task): Likewise.
* target-reloc.h (scan_relocs): Remove options parameter. Change
all callers.
(scan_relocatable_relocs): Likewise.
* target.h (class Sized_target): Remove options parameter from
gc_process_relocs, scan_relocs, scan_relocatable_relocs. Change
all callers.
* gc.h (gc_process_relocs): Remove options parameter. Change all
callers.
* arm.cc: Update functions to remove options parameters.
* i386.cc: Likewise.
* powerpc.cc: Likewise.
* sparc.cc: Likewise.
* x86_64.cc: Likewise.
* testsuite/testfile.cc: Likewise.
2009-10-29 13:16:23 +08:00
|
|
|
Target_i386::scan_relocatable_relocs(Symbol_table* symtab,
|
2008-02-06 16:13:50 +08:00
|
|
|
Layout* layout,
|
2011-05-25 05:41:10 +08:00
|
|
|
Sized_relobj_file<32, false>* object,
|
2008-02-06 16:13:50 +08:00
|
|
|
unsigned int data_shndx,
|
|
|
|
unsigned int sh_type,
|
|
|
|
const unsigned char* prelocs,
|
|
|
|
size_t reloc_count,
|
|
|
|
Output_section* output_section,
|
|
|
|
bool needs_special_offset_handling,
|
|
|
|
size_t local_symbol_count,
|
|
|
|
const unsigned char* plocal_symbols,
|
|
|
|
Relocatable_relocs* rr)
|
|
|
|
{
|
|
|
|
gold_assert(sh_type == elfcpp::SHT_REL);
|
|
|
|
|
|
|
|
typedef gold::Default_scan_relocatable_relocs<elfcpp::SHT_REL,
|
|
|
|
Relocatable_size_for_reloc> Scan_relocatable_relocs;
|
|
|
|
|
2008-02-28 06:38:18 +08:00
|
|
|
gold::scan_relocatable_relocs<32, false, elfcpp::SHT_REL,
|
2008-02-06 16:13:50 +08:00
|
|
|
Scan_relocatable_relocs>(
|
|
|
|
symtab,
|
|
|
|
layout,
|
|
|
|
object,
|
|
|
|
data_shndx,
|
|
|
|
prelocs,
|
|
|
|
reloc_count,
|
|
|
|
output_section,
|
|
|
|
needs_special_offset_handling,
|
|
|
|
local_symbol_count,
|
|
|
|
plocal_symbols,
|
|
|
|
rr);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Relocate a section during a relocatable link.
|
|
|
|
|
|
|
|
void
|
|
|
|
Target_i386::relocate_for_relocatable(
|
|
|
|
const Relocate_info<32, false>* relinfo,
|
|
|
|
unsigned int sh_type,
|
|
|
|
const unsigned char* prelocs,
|
|
|
|
size_t reloc_count,
|
|
|
|
Output_section* output_section,
|
|
|
|
off_t offset_in_output_section,
|
|
|
|
const Relocatable_relocs* rr,
|
|
|
|
unsigned char* view,
|
|
|
|
elfcpp::Elf_types<32>::Elf_Addr view_address,
|
|
|
|
section_size_type view_size,
|
|
|
|
unsigned char* reloc_view,
|
|
|
|
section_size_type reloc_view_size)
|
|
|
|
{
|
|
|
|
gold_assert(sh_type == elfcpp::SHT_REL);
|
|
|
|
|
2008-02-28 06:38:18 +08:00
|
|
|
gold::relocate_for_relocatable<32, false, elfcpp::SHT_REL>(
|
2008-02-06 16:13:50 +08:00
|
|
|
relinfo,
|
|
|
|
prelocs,
|
|
|
|
reloc_count,
|
|
|
|
output_section,
|
|
|
|
offset_in_output_section,
|
|
|
|
rr,
|
|
|
|
view,
|
|
|
|
view_address,
|
|
|
|
view_size,
|
|
|
|
reloc_view,
|
|
|
|
reloc_view_size);
|
|
|
|
}
|
|
|
|
|
2007-09-23 13:31:48 +08:00
|
|
|
// Return the value to use for a dynamic which requires special
|
|
|
|
// treatment. This is how we support equality comparisons of function
|
|
|
|
// pointers across shared library boundaries, as described in the
|
|
|
|
// processor specific ABI supplement.
|
|
|
|
|
|
|
|
uint64_t
|
|
|
|
Target_i386::do_dynsym_value(const Symbol* gsym) const
|
|
|
|
{
|
|
|
|
gold_assert(gsym->is_from_dynobj() && gsym->has_plt_offset());
|
PR gold/12372
* target.h (Target::plt_address_for_global): New function.
(Target::plt_address_for_local): New function.
(Target::plt_section_for_global): Remove.
(Target::plt_section_for_local): Remove.
(Target::do_plt_address_for_global): New virtual function.
(Target::do_plt_address_for_local): New virtual function.
(Target::do_plt_section_for_global): Remove.
(Target::do_plt_section_for_local): Remove.
(Target::register_global_plt_entry): Add Symbol_table and Layout
parameters.
* output.cc (Output_data_got::Got_entry::write): Use
plt_address_for_global and plt_address_for_local.
* layout.cc (Layout::add_target_dynamic_tags): Use size and
address of output section.
* i386.cc (class Output_data_plt_i386): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_i386::has_irelative_section): New function.
(Output_data_plt_i386::entry_count): Add irelative_count_.
(Output_data_plt_i386::set_final_data_size): Likewise.
(class Target_i386): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_i386::Target_i386): Initialize new fields.
(Target_i386::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_i386::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_i386::got_section): Create got_irelative_.
(Target_i386::rel_irelative_section): New function.
(Output_data_plt_i386::Output_data_plt_i386): Initialize new
fields. Don't define __rel_iplt_{start,end}.
(Output_data_plt_i386::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_i386::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_i386::rel_tls_desc): Fix formatting.
(Output_data_plt_i386::rel_irelative): New function.
(Output_data_plt_i386::address_for_global): New function.
(Output_data_plt_i386::address_for_local): New function.
(Output_data_plt_i386::do_write): Write out IRELATIVE area. Use
IRELATIVE GOT when changing IFUNC GOT entries.
(Target_i386::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_i386::do_finalize_sections): Create the __rel_iplt symbols
if we didn't create an IRELATIVE GOT.
(Target_i386::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_i386::do_dynsym_value): Use plt_address_for_global.
* x86_64.cc (class Output_data_plt_x86_64): Add irelative_rel_,
got_irelative_, and irelative_count_ fields. Update
declarations.
(Output_data_plt_x86_64::Output_data_plt_x86_64) [both versions]:
Initialize new fields. Remove symtab parameter. Change all
callers.
(Output_data_plt_x86_64::get_tlsdesc_plt_offset): Add
irelative_count_.
(Output_data_plt_x86_64::has_irelative_section): New function.
(Output_data_plt_x86_64::entry_count): Add irelative_count_.
(class Target_x86_64): Add got_irelative_ and rel_irelative_
fields. Update declarations.
(Target_x86_64::Target_x86_64): Initialize new fields.
(Target_x86_64::do_plt_address_for_global): New function replacing
do_plt_section_for_global.
(Target_x86_64::do_plt_address_for_local): New function replacing
do_plt_section_for_local.
(Target_x86_64::got_section): Create got_irelative_.
(Target_x86_64::rela_irelative_section): New function.
(Output_data_plt_x86_64::init): Remove symtab parameter. Change
all callers. Don't create __rel_iplt_{start,end}.
(Output_data_plt_x86_64::add_entry): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::add_local_ifunc_entry): Add symtab and
layout parameters. Change all callers. Use different PLT and
GOT.
(Output_data_plt_x86_64::add_relocation): Add symtab and layout
parameters. Change all callers. Use different PLT and GOT for
IFUNC symbols.
(Output_data_plt_x86_64::rela_tlsdesc): Fix formatting.
(Output_data_plt_x86_64::rela_irelative): New function.
(Output_data_plt_x86_64::address_for_global): New function.
(Output_data_plt_x86_64::address_for_local): New function.
(Output_data_plt_x86_64::set_final_data_size): Likewise.
(Output_data_plt_x86_64::do_write): Write out IRELATIVE area.
(Target_x86_64::init_got_plt_for_update): Create got_irelative_.
(Target_x86_64::register_global_plt_entry): Add symtab and layout
parameters.
(Target_x86_64::Scan::global): Use IRELATIVE GOT for IRELATIVE
reloc.
(Target_x86_64::do_finalize_sections): Create the __rela_iplt
symbols if we didn't create an IRELATIVE GOT.
(Target_x86_64::Relocate::relocate): Use plt_address_for_global and
plt_address_for_local.
(Target_x86_64::do_dynsym_value): Use plt_address_for_global.
* testsuite/ifuncvar1.c: New test file.
* testsuite/ifuncvar2.c: New test file.
* testsuite/ifuncvar3.c: New test file.
* testsuite/Makefile.am (check_PROGRAMS): Add ifuncvar.
(ifuncvar1_pic.o, ifuncvar2_pic.o, ifuncvar.so): New targets.
(ifuncvar_SOURCES, ifuncvar_DEPENDENCIES): New variables.
(ifuncvar_LDFLAGS, ifuncvar_LDADD): New variables.
* testsuite/Makefile.in: Rebuild.
2011-07-09 06:48:08 +08:00
|
|
|
return this->plt_address_for_global(gsym) + gsym->plt_offset();
|
2007-09-23 13:31:48 +08:00
|
|
|
}
|
|
|
|
|
2007-09-21 13:31:19 +08:00
|
|
|
// Return a string used to fill a code section with nops to take up
|
|
|
|
// the specified length.
|
|
|
|
|
|
|
|
std::string
|
2008-02-28 08:18:24 +08:00
|
|
|
Target_i386::do_code_fill(section_size_type length) const
|
2007-09-21 13:31:19 +08:00
|
|
|
{
|
|
|
|
if (length >= 16)
|
|
|
|
{
|
|
|
|
// Build a jmp instruction to skip over the bytes.
|
|
|
|
unsigned char jmp[5];
|
|
|
|
jmp[0] = 0xe9;
|
|
|
|
elfcpp::Swap_unaligned<32, false>::writeval(jmp + 1, length - 5);
|
|
|
|
return (std::string(reinterpret_cast<char*>(&jmp[0]), 5)
|
|
|
|
+ std::string(length - 5, '\0'));
|
|
|
|
}
|
|
|
|
|
|
|
|
// Nop sequences of various lengths.
|
|
|
|
const char nop1[1] = { 0x90 }; // nop
|
|
|
|
const char nop2[2] = { 0x66, 0x90 }; // xchg %ax %ax
|
|
|
|
const char nop3[3] = { 0x8d, 0x76, 0x00 }; // leal 0(%esi),%esi
|
|
|
|
const char nop4[4] = { 0x8d, 0x74, 0x26, 0x00}; // leal 0(%esi,1),%esi
|
|
|
|
const char nop5[5] = { 0x90, 0x8d, 0x74, 0x26, // nop
|
|
|
|
0x00 }; // leal 0(%esi,1),%esi
|
|
|
|
const char nop6[6] = { 0x8d, 0xb6, 0x00, 0x00, // leal 0L(%esi),%esi
|
|
|
|
0x00, 0x00 };
|
|
|
|
const char nop7[7] = { 0x8d, 0xb4, 0x26, 0x00, // leal 0L(%esi,1),%esi
|
|
|
|
0x00, 0x00, 0x00 };
|
|
|
|
const char nop8[8] = { 0x90, 0x8d, 0xb4, 0x26, // nop
|
|
|
|
0x00, 0x00, 0x00, 0x00 }; // leal 0L(%esi,1),%esi
|
|
|
|
const char nop9[9] = { 0x89, 0xf6, 0x8d, 0xbc, // movl %esi,%esi
|
|
|
|
0x27, 0x00, 0x00, 0x00, // leal 0L(%edi,1),%edi
|
|
|
|
0x00 };
|
|
|
|
const char nop10[10] = { 0x8d, 0x76, 0x00, 0x8d, // leal 0(%esi),%esi
|
|
|
|
0xbc, 0x27, 0x00, 0x00, // leal 0L(%edi,1),%edi
|
|
|
|
0x00, 0x00 };
|
|
|
|
const char nop11[11] = { 0x8d, 0x74, 0x26, 0x00, // leal 0(%esi,1),%esi
|
|
|
|
0x8d, 0xbc, 0x27, 0x00, // leal 0L(%edi,1),%edi
|
|
|
|
0x00, 0x00, 0x00 };
|
|
|
|
const char nop12[12] = { 0x8d, 0xb6, 0x00, 0x00, // leal 0L(%esi),%esi
|
|
|
|
0x00, 0x00, 0x8d, 0xbf, // leal 0L(%edi),%edi
|
|
|
|
0x00, 0x00, 0x00, 0x00 };
|
|
|
|
const char nop13[13] = { 0x8d, 0xb6, 0x00, 0x00, // leal 0L(%esi),%esi
|
|
|
|
0x00, 0x00, 0x8d, 0xbc, // leal 0L(%edi,1),%edi
|
|
|
|
0x27, 0x00, 0x00, 0x00,
|
|
|
|
0x00 };
|
|
|
|
const char nop14[14] = { 0x8d, 0xb4, 0x26, 0x00, // leal 0L(%esi,1),%esi
|
|
|
|
0x00, 0x00, 0x00, 0x8d, // leal 0L(%edi,1),%edi
|
|
|
|
0xbc, 0x27, 0x00, 0x00,
|
|
|
|
0x00, 0x00 };
|
|
|
|
const char nop15[15] = { 0xeb, 0x0d, 0x90, 0x90, // jmp .+15
|
|
|
|
0x90, 0x90, 0x90, 0x90, // nop,nop,nop,...
|
|
|
|
0x90, 0x90, 0x90, 0x90,
|
|
|
|
0x90, 0x90, 0x90 };
|
|
|
|
|
|
|
|
const char* nops[16] = {
|
|
|
|
NULL,
|
|
|
|
nop1, nop2, nop3, nop4, nop5, nop6, nop7,
|
|
|
|
nop8, nop9, nop10, nop11, nop12, nop13, nop14, nop15
|
|
|
|
};
|
|
|
|
|
|
|
|
return std::string(nops[length], length);
|
|
|
|
}
|
|
|
|
|
2011-07-02 08:03:25 +08:00
|
|
|
// Return the value to use for the base of a DW_EH_PE_datarel offset
|
|
|
|
// in an FDE. Solaris and SVR4 use DW_EH_PE_datarel because their
|
|
|
|
// assembler can not write out the difference between two labels in
|
|
|
|
// different sections, so instead of using a pc-relative value they
|
|
|
|
// use an offset from the GOT.
|
|
|
|
|
|
|
|
uint64_t
|
|
|
|
Target_i386::do_ehframe_datarel_base() const
|
|
|
|
{
|
|
|
|
gold_assert(this->global_offset_table_ != NULL);
|
|
|
|
Symbol* sym = this->global_offset_table_;
|
|
|
|
Sized_symbol<32>* ssym = static_cast<Sized_symbol<32>*>(sym);
|
|
|
|
return ssym->value();
|
|
|
|
}
|
|
|
|
|
2010-03-11 09:10:53 +08:00
|
|
|
// Return whether SYM should be treated as a call to a non-split
|
|
|
|
// function. We don't want that to be true of a call to a
|
|
|
|
// get_pc_thunk function.
|
|
|
|
|
|
|
|
bool
|
|
|
|
Target_i386::do_is_call_to_non_split(const Symbol* sym, unsigned int) const
|
|
|
|
{
|
|
|
|
return (sym->type() == elfcpp::STT_FUNC
|
|
|
|
&& !is_prefix_of("__i686.get_pc_thunk.", sym->name()));
|
|
|
|
}
|
|
|
|
|
2009-10-07 06:58:27 +08:00
|
|
|
// FNOFFSET in section SHNDX in OBJECT is the start of a function
|
2010-12-15 03:03:30 +08:00
|
|
|
// compiled with -fsplit-stack. The function calls non-split-stack
|
2009-10-07 06:58:27 +08:00
|
|
|
// code. We have to change the function so that it always ensures
|
|
|
|
// that it has enough stack space to run some random function.
|
|
|
|
|
|
|
|
void
|
|
|
|
Target_i386::do_calls_non_split(Relobj* object, unsigned int shndx,
|
|
|
|
section_offset_type fnoffset,
|
|
|
|
section_size_type fnsize,
|
|
|
|
unsigned char* view,
|
|
|
|
section_size_type view_size,
|
|
|
|
std::string* from,
|
|
|
|
std::string* to) const
|
|
|
|
{
|
|
|
|
// The function starts with a comparison of the stack pointer and a
|
|
|
|
// field in the TCB. This is followed by a jump.
|
|
|
|
|
|
|
|
// cmp %gs:NN,%esp
|
|
|
|
if (this->match_view(view, view_size, fnoffset, "\x65\x3b\x25", 3)
|
|
|
|
&& fnsize > 7)
|
|
|
|
{
|
|
|
|
// We will call __morestack if the carry flag is set after this
|
|
|
|
// comparison. We turn the comparison into an stc instruction
|
|
|
|
// and some nops.
|
|
|
|
view[fnoffset] = '\xf9';
|
|
|
|
this->set_view_to_nop(view, view_size, fnoffset + 1, 6);
|
|
|
|
}
|
|
|
|
// lea NN(%esp),%ecx
|
2009-12-24 07:53:43 +08:00
|
|
|
// lea NN(%esp),%edx
|
|
|
|
else if ((this->match_view(view, view_size, fnoffset, "\x8d\x8c\x24", 3)
|
|
|
|
|| this->match_view(view, view_size, fnoffset, "\x8d\x94\x24", 3))
|
2009-10-07 06:58:27 +08:00
|
|
|
&& fnsize > 7)
|
|
|
|
{
|
|
|
|
// This is loading an offset from the stack pointer for a
|
|
|
|
// comparison. The offset is negative, so we decrease the
|
|
|
|
// offset by the amount of space we need for the stack. This
|
|
|
|
// means we will avoid calling __morestack if there happens to
|
|
|
|
// be plenty of space on the stack already.
|
|
|
|
unsigned char* pval = view + fnoffset + 3;
|
|
|
|
uint32_t val = elfcpp::Swap_unaligned<32, false>::readval(pval);
|
|
|
|
val -= parameters->options().split_stack_adjust_size();
|
|
|
|
elfcpp::Swap_unaligned<32, false>::writeval(pval, val);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (!object->has_no_split_stack())
|
|
|
|
object->error(_("failed to match split-stack sequence at "
|
|
|
|
"section %u offset %0zx"),
|
2009-11-10 07:07:30 +08:00
|
|
|
shndx, static_cast<size_t>(fnoffset));
|
2009-10-07 06:58:27 +08:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
// We have to change the function so that it calls
|
|
|
|
// __morestack_non_split instead of __morestack. The former will
|
|
|
|
// allocate additional stack space.
|
|
|
|
*from = "__morestack";
|
|
|
|
*to = "__morestack_non_split";
|
|
|
|
}
|
|
|
|
|
2006-08-19 06:29:20 +08:00
|
|
|
// The selector for i386 object files.
|
|
|
|
|
2009-03-24 08:31:29 +08:00
|
|
|
class Target_selector_i386 : public Target_selector_freebsd
|
2006-08-19 06:29:20 +08:00
|
|
|
{
|
|
|
|
public:
|
|
|
|
Target_selector_i386()
|
2009-03-24 08:31:29 +08:00
|
|
|
: Target_selector_freebsd(elfcpp::EM_386, 32, false,
|
2011-06-29 07:12:31 +08:00
|
|
|
"elf32-i386", "elf32-i386-freebsd",
|
|
|
|
"elf_i386")
|
2006-08-19 06:29:20 +08:00
|
|
|
{ }
|
|
|
|
|
|
|
|
Target*
|
2008-03-26 05:39:01 +08:00
|
|
|
do_instantiate_target()
|
|
|
|
{ return new Target_i386(); }
|
2006-08-19 06:29:20 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
Target_selector_i386 target_selector_i386;
|
|
|
|
|
|
|
|
} // End anonymous namespace.
|