This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
gold patch committed: Set size of _GLOBAL_OFFSET_TABLE_
- From: Ian Lance Taylor <iant at google dot com>
- To: binutils at sourceware dot org
- Date: Tue, 29 Dec 2009 23:23:13 -0800
- Subject: gold patch committed: Set size of _GLOBAL_OFFSET_TABLE_
Another patch to quiet elflint. elflint thinks that the size of the
_GLOBAL_OFFSET_TABLE_ symbol should be the size of the section with
which it is associated. This is not in the ABI, but seems harmless.
I committed this patch to implement this for 386 and x86_64.
Ian
2009-12-29 Ian Lance Taylor <iant@google.com>
PR 10450
* i386.cc (class Target_i386): Initialize global_offset_table_ in
constructor. Add global_offset_table_ field.
(Target_i386::got_section): Set global_offset_table_.
(Target_i386::do_finalize_sections): Set global_offset_table_
size.
* x86_64.cc (class Target_x86_64): Initialize global_offset_table_
in constructor. Add global_offset_table_ field.
(Target_x86_64::got_section): Set global_offset_table_.
(Target_x86_64::do_finalize_sections): Set global_offset_table_
size.
Index: i386.cc
===================================================================
RCS file: /cvs/src/src/gold/i386.cc,v
retrieving revision 1.108
diff -p -u -r1.108 i386.cc
--- i386.cc 30 Dec 2009 06:57:17 -0000 1.108
+++ i386.cc 30 Dec 2009 07:19:47 -0000
@@ -59,8 +59,8 @@ class Target_i386 : public Target_freebs
Target_i386()
: Target_freebsd<32, false>(&i386_info),
- got_(NULL), plt_(NULL), got_plt_(NULL), rel_dyn_(NULL),
- copy_relocs_(elfcpp::R_386_COPY), dynbss_(NULL),
+ got_(NULL), plt_(NULL), got_plt_(NULL), global_offset_table_(NULL),
+ rel_dyn_(NULL), copy_relocs_(elfcpp::R_386_COPY), dynbss_(NULL),
got_mod_index_offset_(-1U), tls_base_symbol_defined_(false)
{ }
@@ -412,6 +412,8 @@ class Target_i386 : public Target_freebs
Output_data_plt_i386* plt_;
// The GOT PLT section.
Output_data_space* got_plt_;
+ // The _GLOBAL_OFFSET_TABLE_ symbol.
+ Symbol* global_offset_table_;
// The dynamic reloc section.
Reloc_section* rel_dyn_;
// Relocs saved to avoid a COPY reloc.
@@ -478,13 +480,14 @@ Target_i386::got_section(Symbol_table* s
layout->increase_relro(3 * 4);
// Define _GLOBAL_OFFSET_TABLE_ at the start of the PLT.
- 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);
+ 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);
}
return this->got_;
@@ -1560,7 +1563,7 @@ void
Target_i386::do_finalize_sections(
Layout* layout,
const Input_objects*,
- Symbol_table*)
+ Symbol_table* symtab)
{
// Fill in some more dynamic tags.
Output_data_dynamic* const odyn = layout->dynamic_data();
@@ -1601,6 +1604,15 @@ Target_i386::do_finalize_sections(
// relocs.
if (this->copy_relocs_.any_saved_relocs())
this->copy_relocs_.emit(this->rel_dyn_section(layout));
+
+ // 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);
+ }
}
// Return whether a direct absolute static relocation needs to be applied.
Index: x86_64.cc
===================================================================
RCS file: /cvs/src/src/gold/x86_64.cc,v
retrieving revision 1.101
diff -p -u -r1.101 x86_64.cc
--- x86_64.cc 30 Dec 2009 06:57:17 -0000 1.101
+++ x86_64.cc 30 Dec 2009 07:19:48 -0000
@@ -63,8 +63,8 @@ class Target_x86_64 : public Target_free
Target_x86_64()
: Target_freebsd<64, false>(&x86_64_info),
- got_(NULL), plt_(NULL), got_plt_(NULL), rela_dyn_(NULL),
- copy_relocs_(elfcpp::R_X86_64_COPY), dynbss_(NULL),
+ got_(NULL), plt_(NULL), got_plt_(NULL), global_offset_table_(NULL),
+ rela_dyn_(NULL), copy_relocs_(elfcpp::R_X86_64_COPY), dynbss_(NULL),
got_mod_index_offset_(-1U), tls_base_symbol_defined_(false)
{ }
@@ -410,6 +410,8 @@ class Target_x86_64 : public Target_free
Output_data_plt_x86_64* plt_;
// The GOT PLT section.
Output_data_space* got_plt_;
+ // The _GLOBAL_OFFSET_TABLE_ symbol.
+ Symbol* global_offset_table_;
// The dynamic reloc section.
Reloc_section* rela_dyn_;
// Relocs saved to avoid a COPY reloc.
@@ -486,13 +488,14 @@ Target_x86_64::got_section(Symbol_table*
layout->increase_relro(3 * 8);
// Define _GLOBAL_OFFSET_TABLE_ at the start of the PLT.
- 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);
+ 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);
}
return this->got_;
@@ -1650,7 +1653,7 @@ void
Target_x86_64::do_finalize_sections(
Layout* layout,
const Input_objects*,
- Symbol_table*)
+ Symbol_table* symtab)
{
// Fill in some more dynamic tags.
Output_data_dynamic* const odyn = layout->dynamic_data();
@@ -1701,6 +1704,15 @@ Target_x86_64::do_finalize_sections(
// relocs.
if (this->copy_relocs_.any_saved_relocs())
this->copy_relocs_.emit(this->rela_dyn_section(layout));
+
+ // 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)
+ {
+ uint64_t data_size = this->got_plt_->current_data_size();
+ symtab->get_sized_symbol<64>(sym)->set_symsize(data_size);
+ }
}
// Perform a relocation.