From 7d1726872032004915cd16e53cc781af2adb2873 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Fri, 15 Jul 2011 15:31:54 +0000 Subject: * i386.cc (class Output_data_plt_i386): Add layout_ field. (Output_data_plt_i386::Output_data_plt_i386): Initialize layout_. (Output_data_plt_i386::do_write): Write address of .dynamic section to first entry in .got.plt section. * x86_64.cc (class Output_data_plt_x86_64): Add layout_ field. (Output_data_plt_x86_64::Output_data_plt_x86_64) [both versions]: Initialize layout_. (Output_data_plt_x86_64::do_write): Write address of .dynamic section to first entry in .got.plt section. * layout.h (Layout::dynamic_section): New function. --- gold/i386.cc | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) (limited to 'gold/i386.cc') diff --git a/gold/i386.cc b/gold/i386.cc index 7e982d5..445bc68 100644 --- a/gold/i386.cc +++ b/gold/i386.cc @@ -166,6 +166,9 @@ class Output_data_plt_i386 : public Output_section_data unsigned int got_offset; }; + // A pointer to the Layout class, so that we can find the .dynamic + // section when we write out the GOT PLT section. + Layout* layout_; // The reloc section. Reloc_section* rel_; // The TLS_DESC relocations, if necessary. These must follow the @@ -822,9 +825,9 @@ Target_i386::rel_irelative_section(Layout* layout) 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_() + : Output_section_data(16), layout_(layout), tls_desc_rel_(NULL), + irelative_rel_(NULL), got_plt_(got_plt), got_irelative_(got_irelative), + count_(0), irelative_count_(0), global_ifuncs_(), local_ifuncs_() { this->rel_ = new Reloc_section(false); layout->add_output_section_data(".rel.plt", elfcpp::SHT_REL, @@ -1138,8 +1141,16 @@ Output_data_plt_i386::do_write(Output_file* of) unsigned char* got_pov = got_view; - memset(got_pov, 0, 12); - got_pov += 12; + // The first entry in the GOT is the address of the .dynamic section + // aka the PT_DYNAMIC segment. The next two entries are reserved. + // We saved space for them when we created the section in + // Target_i386::got_section. + Output_section* dynamic = this->layout_->dynamic_section(); + uint32_t dynamic_addr = dynamic == NULL ? 0 : dynamic->address(); + elfcpp::Swap<32, false>::writeval(got_pov, dynamic_addr); + got_pov += 4; + memset(got_pov, 0, 8); + got_pov += 8; const int rel_size = elfcpp::Elf_sizes<32>::rel_size; -- cgit v1.1