From 7223e9ca5a5ab5eecd2d14328ceade93bcb43f3d Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Thu, 19 Aug 2010 22:50:16 +0000 Subject: PR 10893 * i386.cc (class Output_data_plt_i386): Update declarations. Define Global_ifunc and Local_ifunc types. Add global_ifuncs_ and local_ifuncs_ fields. (Target_i386::do_plt_section_for_global): New function. (Target_i386::do_plt_section_for_local): New function. (Output_data_plt_i386::Output_data_plt_i386): Add symtab parameter; change all callers. Initialize global_ifuncs_ and local_ifuncs_. If doing a static link define __rel_iplt_start and __rel_iplt_end. (Output_data_plt_i386::add_entry): Handle IFUNC symbols. (Output_data_plt_i386::add_local_ifunc_entry): New function. (Output_data_plt_i386::do_write): Fix GOT entries for IFUNC symbols. (Target_i386::make_plt_section): New function, broken out of make_plt_entry. Set sh_info field of .rel.plt to point to .plt. (Target_i386::make_plt_entry): Call make_plt_section. (Target_i386::make_local_ifunc_plt_entry): New function. (Target_i386::Scan::reloc_needs_iplt_for_ifunc): New function. (Target_i386::Scan::local): Handle IFUNC symbols. Add R_386_IRELATIVE to switch. (Target_i386::Scan::global): Likewise. (Target_i386::Relocate::relocate): Likewise. (Target_i386::Relocatable_size_for_reloc): Add R_386_IRELATIVE to switch. * x86_64.cc (class Output_data_plt_x86_64): Update declarations. (Target_x86_64::do_plt_section_for_global): New function. (Target_x86_64::do_plt_section_for_local): New function. (Output_data_plt_x86_64::Output_data_plt_x86_64): Add symtab parameter; change all callers. If doing a static link define __rela_iplt_start and __rela_iplt_end. (Output_data_plt_x86_64::add_entry): Handle IFUNC symbols. (Output_data_plt_x86_64::add_local_ifunc_entry): New function. (Target_x86_64::make_plt_section): Set sh_info field of .rel.plt to point to .plt. (Target_x86_64::make_local_ifunc_plt_entry): New function. (Target_x86_64::Scan::check_non_pic): Add R_X86_64_IRELATIVE to switch. (Target_x86_64::Scan::reloc_needs_iplt_for_ifunc): New function. (Target_x86_64::Scan::local): Handle IFUNC symbols. Add R_X86_64_IRELATIVE to switch. (Target_x86_64::Scan::global): Likewise. (Target_x86_64::Relocate::relocate): Likewise. (Target_x86_64::Relocatable_size_for_reloc): Add R_X86_64_IRELATIVE to switch. * target.h (class Target): Add plt_section_for_global and plt_section_for_local functions. Add do_plt_section_for_global and do_plt_section_for_local virtual functions. * symtab.h (Symbol::needs_plt_entry): Handle IFUNC symbol. Add clarifying comments. (Symbol::use_plt_offset): Handle IFUNC symbol. * object.cc (Sized_relobj::Sized_relobj): Initialize local_plt_offsets_. (Sized_relobj::local_has_plt_offset): New function. (Sized_relobj::local_plt_offset): New function. (Sized_relobj::set_local_plt_offset): New function. (Sized_relobj::do_count): Handle IFUNC symbol. * object.h (class Symbol_value): Add is_ifunc_symbol_ field. Take a bit away from input_shndx_ field. Add set_is_func_symbol and is_ifunc_symbol functions. (class Sized_relobj): Update declarations. Remove Tls_got_entry and Local_tls_got_offsets. Define Local_plt_offsets. Add local_plt_offsets_ field. (Sized_relobj::clear_local_symbols): Clear local_plt_offsets_. * output.h (class Output_section_data): Add non-const output_section function. (class Output_data_got): Update declarations. (class Output_data_got::Got_entry): Add use_plt_offset_ field. Add use_plt_offset parameter to global and local constructors. Change all callers. Change local_sym_index_ field to 31 bits. Change GSYM_CODE and CONSTANT_CODE accordingly. * output.cc (Output_data_reloc_base::do_adjust_output_section): If doing a static link don't set sh_link field. (Output_data_got::Got_entry::write): Use PLT offset if appropriate. (Output_data_got::add_global_plt): New function. (Output_data_got::add_local_plt): New function. * target-reloc.h (relocate_section): Handle IFUNC symbol. * defstd.cc (in_section): Remove entries for __rel_iplt_start, __rel_iplt_end, __rela_iplt_start, and __rela_iplt_end. * configure.ac: Set IFUNC automake conditional for glibc >= 2.11. * testsuite/Makefile.am: Add a bunch of IFUNC tests, all within IFUNC conditional. * testsuite/ifunc-sel.h: New file. * testsuite/ifuncmain1.c: New file. * testsuite/ifuncmain1vis.c: New file. * testsuite/ifuncmod1.c: New file. * testsuite/ifuncdep2.c: New file. * testsuite/ifuncmain2.c: New file. * testsuite/ifuncmain3.c: New file. * testsuite/ifuncmod3.c: New file. * testsuite/ifuncmain4.c: New file. * testsuite/ifuncmain5.c: New file. * testsuite/ifuncmod5.c: New file. * testsuite/ifuncmain6pie.c: New file. * testsuite/ifuncmod6.c: New file. * testsuite/ifuncmain7.c: New file. * configure, testsuite/Makefile.in: Rebuild. --- gold/output.cc | 89 +++++++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 73 insertions(+), 16 deletions(-) (limited to 'gold/output.cc') diff --git a/gold/output.cc b/gold/output.cc index 55080a1..5cb63fb 100644 --- a/gold/output.cc +++ b/gold/output.cc @@ -1,6 +1,6 @@ // output.cc -- manage the output file for gold -// Copyright 2006, 2007, 2008, 2009 Free Software Foundation, Inc. +// Copyright 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. // Written by Ian Lance Taylor . // This file is part of gold. @@ -1133,10 +1133,17 @@ Output_data_reloc_base os->set_entsize(elfcpp::Elf_sizes::rela_size); else gold_unreachable(); - if (dynamic) - os->set_should_link_to_dynsym(); - else + + // A STT_GNU_IFUNC symbol may require a IRELATIVE reloc when doing a + // static link. The backends will generate a dynamic reloc section + // to hold this. In that case we don't want to link to the dynsym + // section, because there isn't one. + if (!dynamic) os->set_should_link_to_symtab(); + else if (parameters->doing_static_link()) + ; + else + os->set_should_link_to_dynsym(); } // Write out relocation data. @@ -1262,12 +1269,18 @@ Output_data_got::Got_entry::write(unsigned char* pov) const // link-time value, which will be relocated dynamically by a // RELATIVE relocation. Symbol* gsym = this->u_.gsym; - Sized_symbol* sgsym; - // This cast is a bit ugly. We don't want to put a - // virtual method in Symbol, because we want Symbol to be - // as small as possible. - sgsym = static_cast*>(gsym); - val = sgsym->value(); + if (this->use_plt_offset_ && gsym->has_plt_offset()) + val = (parameters->target().plt_section_for_global(gsym)->address() + + gsym->plt_offset()); + else + { + Sized_symbol* sgsym; + // This cast is a bit ugly. We don't want to put a + // virtual method in Symbol, because we want Symbol to be + // as small as possible. + sgsym = static_cast*>(gsym); + val = sgsym->value(); + } } break; @@ -1277,9 +1290,17 @@ Output_data_got::Got_entry::write(unsigned char* pov) const default: { + const Sized_relobj* object = this->u_.object; const unsigned int lsi = this->local_sym_index_; - const Symbol_value* symval = this->u_.object->local_symbol(lsi); - val = symval->value(this->u_.object, 0); + const Symbol_value* symval = object->local_symbol(lsi); + if (!this->use_plt_offset_) + val = symval->value(this->u_.object, 0); + else + { + const Output_data* plt = + parameters->target().plt_section_for_local(object, lsi); + val = plt->address() + object->local_plt_offset(lsi); + } } break; } @@ -1302,7 +1323,23 @@ Output_data_got::add_global( if (gsym->has_got_offset(got_type)) return false; - this->entries_.push_back(Got_entry(gsym)); + this->entries_.push_back(Got_entry(gsym, false)); + this->set_got_size(); + gsym->set_got_offset(got_type, this->last_got_offset()); + return true; +} + +// Like add_global, but use the PLT offset. + +template +bool +Output_data_got::add_global_plt(Symbol* gsym, + unsigned int got_type) +{ + if (gsym->has_got_offset(got_type)) + return false; + + this->entries_.push_back(Got_entry(gsym, true)); this->set_got_size(); gsym->set_got_offset(got_type, this->last_got_offset()); return true; @@ -1310,6 +1347,7 @@ Output_data_got::add_global( // Add an entry for a global symbol to the GOT, and add a dynamic // relocation of type R_TYPE for the GOT entry. + template void Output_data_got::add_global_with_rel( @@ -1417,7 +1455,25 @@ Output_data_got::add_local( if (object->local_has_got_offset(symndx, got_type)) return false; - this->entries_.push_back(Got_entry(object, symndx)); + this->entries_.push_back(Got_entry(object, symndx, false)); + this->set_got_size(); + object->set_local_got_offset(symndx, got_type, this->last_got_offset()); + return true; +} + +// Like add_local, but use the PLT offset. + +template +bool +Output_data_got::add_local_plt( + Sized_relobj* object, + unsigned int symndx, + unsigned int got_type) +{ + if (object->local_has_got_offset(symndx, got_type)) + return false; + + this->entries_.push_back(Got_entry(object, symndx, true)); this->set_got_size(); object->set_local_got_offset(symndx, got_type, this->last_got_offset()); return true; @@ -1425,6 +1481,7 @@ Output_data_got::add_local( // Add an entry for a local symbol to the GOT, and add a dynamic // relocation of type R_TYPE for the GOT entry. + template void Output_data_got::add_local_with_rel( @@ -1486,7 +1543,7 @@ Output_data_got::add_local_pair_with_rel( Output_section* os = object->output_section(shndx); rel_dyn->add_output_section(os, r_type_1, this, got_offset); - this->entries_.push_back(Got_entry(object, symndx)); + this->entries_.push_back(Got_entry(object, symndx, false)); if (r_type_2 != 0) { got_offset = this->last_got_offset(); @@ -1516,7 +1573,7 @@ Output_data_got::add_local_pair_with_rela( Output_section* os = object->output_section(shndx); rela_dyn->add_output_section(os, r_type_1, this, got_offset, 0); - this->entries_.push_back(Got_entry(object, symndx)); + this->entries_.push_back(Got_entry(object, symndx, false)); if (r_type_2 != 0) { got_offset = this->last_got_offset(); -- cgit v1.1