X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gold%2Foutput.cc;h=b47ad4da7dc9ebfc190118746dde5f995ec02bc5;hb=50ed5eb142b3246bd16be9626f0cf9565f44d8f9;hp=739e00eac19af67fea8ef33da54f223b66451e4b;hpb=4cf7a849ef1691b4bfbd468fb7e3beb5cd5590bc;p=external%2Fbinutils.git diff --git a/gold/output.cc b/gold/output.cc index 739e00e..b47ad4d 100644 --- a/gold/output.cc +++ b/gold/output.cc @@ -1,6 +1,7 @@ // output.cc -- manage the output file for gold -// Copyright 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +// Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012 +// Free Software Foundation, Inc. // Written by Ian Lance Taylor . // This file is part of gold. @@ -27,39 +28,119 @@ #include #include #include -#include #include #include + +#ifdef HAVE_SYS_MMAN_H +#include +#endif + #include "libiberty.h" +#include "dwarf.h" #include "parameters.h" #include "object.h" #include "symtab.h" #include "reloc.h" #include "merge.h" #include "descriptors.h" +#include "layout.h" #include "output.h" +// For systems without mmap support. +#ifndef HAVE_MMAP +# define mmap gold_mmap +# define munmap gold_munmap +# define mremap gold_mremap +# ifndef MAP_FAILED +# define MAP_FAILED (reinterpret_cast(-1)) +# endif +# ifndef PROT_READ +# define PROT_READ 0 +# endif +# ifndef PROT_WRITE +# define PROT_WRITE 0 +# endif +# ifndef MAP_PRIVATE +# define MAP_PRIVATE 0 +# endif +# ifndef MAP_ANONYMOUS +# define MAP_ANONYMOUS 0 +# endif +# ifndef MAP_SHARED +# define MAP_SHARED 0 +# endif + +# ifndef ENOSYS +# define ENOSYS EINVAL +# endif + +static void * +gold_mmap(void *, size_t, int, int, int, off_t) +{ + errno = ENOSYS; + return MAP_FAILED; +} + +static int +gold_munmap(void *, size_t) +{ + errno = ENOSYS; + return -1; +} + +static void * +gold_mremap(void *, size_t, size_t, int) +{ + errno = ENOSYS; + return MAP_FAILED; +} + +#endif + +#if defined(HAVE_MMAP) && !defined(HAVE_MREMAP) +# define mremap gold_mremap +extern "C" void *gold_mremap(void *, size_t, size_t, int); +#endif + // Some BSD systems still use MAP_ANON instead of MAP_ANONYMOUS #ifndef MAP_ANONYMOUS # define MAP_ANONYMOUS MAP_ANON #endif -#ifndef HAVE_POSIX_FALLOCATE -// A dummy, non general, version of posix_fallocate. Here we just set -// the file size and hope that there is enough disk space. FIXME: We -// could allocate disk space by walking block by block and writing a -// zero byte into each block. -static int -posix_fallocate(int o, off_t offset, off_t len) -{ - return ftruncate(o, offset + len); -} -#endif // !defined(HAVE_POSIX_FALLOCATE) +#ifndef MREMAP_MAYMOVE +# define MREMAP_MAYMOVE 1 +#endif + +// Mingw does not have S_ISLNK. +#ifndef S_ISLNK +# define S_ISLNK(mode) 0 +#endif namespace gold { +// A wrapper around posix_fallocate. If we don't have posix_fallocate, +// or the --no-posix-fallocate option is set, we try the fallocate +// system call directly. If that fails, we use ftruncate to set +// the file size and hope that there is enough disk space. + +static int +gold_fallocate(int o, off_t offset, off_t len) +{ +#ifdef HAVE_POSIX_FALLOCATE + if (parameters->options().posix_fallocate()) + return ::posix_fallocate(o, offset, len); +#endif // defined(HAVE_POSIX_FALLOCATE) +#ifdef HAVE_FALLOCATE + if (::fallocate(o, 0, offset, len) == 0) + return 0; +#endif // defined(HAVE_FALLOCATE) + if (::ftruncate(o, offset + len) < 0) + return errno; + return 0; +} + // Output_data variables. bool Output_data::allocated_sizes_are_fixed; @@ -280,6 +361,7 @@ Output_segment_headers::Output_segment_headers( const Layout::Segment_list& segment_list) : segment_list_(segment_list) { + this->set_current_data_size_for_child(this->do_size()); } void @@ -355,14 +437,12 @@ Output_segment_headers::do_size() const Output_file_header::Output_file_header(const Target* target, const Symbol_table* symtab, - const Output_segment_headers* osh, - const char* entry) + const Output_segment_headers* osh) : target_(target), symtab_(symtab), segment_header_(osh), section_header_(NULL), - shstrtab_(NULL), - entry_(entry) + shstrtab_(NULL) { this->set_data_size(this->do_size()); } @@ -411,7 +491,7 @@ Output_file_header::do_write(Output_file* of) } } -// Write out the file header with appropriate size and endianess. +// Write out the file header with appropriate size and endianness. template void @@ -502,22 +582,16 @@ Output_file_header::do_sized_write(Output_file* of) of->write_output_view(0, ehdr_size, view); } -// Return the value to use for the entry address. THIS->ENTRY_ is the -// symbol specified on the command line, if any. +// Return the value to use for the entry address. template typename elfcpp::Elf_types::Elf_Addr Output_file_header::entry() { - const bool should_issue_warning = (this->entry_ != NULL + const bool should_issue_warning = (parameters->options().entry() != NULL && !parameters->options().relocatable() && !parameters->options().shared()); - - // FIXME: Need to support target specific entry symbol. - const char* entry = this->entry_; - if (entry == NULL) - entry = "_start"; - + const char* entry = parameters->entry(); Symbol* sym = this->symtab_->lookup(entry); typename Sized_symbol::Value_type v; @@ -639,10 +713,11 @@ Output_reloc::Output_reloc( Output_data* od, Address address, bool is_relative, - bool is_symbolless) + bool is_symbolless, + bool use_plt_offset) : address_(address), local_sym_index_(GSYM_CODE), type_(type), is_relative_(is_relative), is_symbolless_(is_symbolless), - is_section_symbol_(false), shndx_(INVALID_CODE) + is_section_symbol_(false), use_plt_offset_(use_plt_offset), shndx_(INVALID_CODE) { // this->type_ is a bitfield; make sure TYPE fits. gold_assert(this->type_ == type); @@ -660,10 +735,11 @@ Output_reloc::Output_reloc( unsigned int shndx, Address address, bool is_relative, - bool is_symbolless) + bool is_symbolless, + bool use_plt_offset) : address_(address), local_sym_index_(GSYM_CODE), type_(type), is_relative_(is_relative), is_symbolless_(is_symbolless), - is_section_symbol_(false), shndx_(shndx) + is_section_symbol_(false), use_plt_offset_(use_plt_offset), shndx_(shndx) { gold_assert(shndx != INVALID_CODE); // this->type_ is a bitfield; make sure TYPE fits. @@ -685,10 +761,12 @@ Output_reloc::Output_reloc( Address address, bool is_relative, bool is_symbolless, - bool is_section_symbol) + bool is_section_symbol, + bool use_plt_offset) : address_(address), local_sym_index_(local_sym_index), type_(type), is_relative_(is_relative), is_symbolless_(is_symbolless), - is_section_symbol_(is_section_symbol), shndx_(INVALID_CODE) + is_section_symbol_(is_section_symbol), use_plt_offset_(use_plt_offset), + shndx_(INVALID_CODE) { gold_assert(local_sym_index != GSYM_CODE && local_sym_index != INVALID_CODE); @@ -709,10 +787,12 @@ Output_reloc::Output_reloc( Address address, bool is_relative, bool is_symbolless, - bool is_section_symbol) + bool is_section_symbol, + bool use_plt_offset) : address_(address), local_sym_index_(local_sym_index), type_(type), is_relative_(is_relative), is_symbolless_(is_symbolless), - is_section_symbol_(is_section_symbol), shndx_(shndx) + is_section_symbol_(is_section_symbol), use_plt_offset_(use_plt_offset), + shndx_(shndx) { gold_assert(local_sym_index != GSYM_CODE && local_sym_index != INVALID_CODE); @@ -732,10 +812,11 @@ Output_reloc::Output_reloc( Output_section* os, unsigned int type, Output_data* od, - Address address) + Address address, + bool is_relative) : address_(address), local_sym_index_(SECTION_CODE), type_(type), - is_relative_(false), is_symbolless_(false), - is_section_symbol_(true), shndx_(INVALID_CODE) + is_relative_(is_relative), is_symbolless_(is_relative), + is_section_symbol_(true), use_plt_offset_(false), shndx_(INVALID_CODE) { // this->type_ is a bitfield; make sure TYPE fits. gold_assert(this->type_ == type); @@ -753,10 +834,11 @@ Output_reloc::Output_reloc( unsigned int type, Sized_relobj* relobj, unsigned int shndx, - Address address) + Address address, + bool is_relative) : address_(address), local_sym_index_(SECTION_CODE), type_(type), - is_relative_(false), is_symbolless_(false), - is_section_symbol_(true), shndx_(shndx) + is_relative_(is_relative), is_symbolless_(is_relative), + is_section_symbol_(true), use_plt_offset_(false), shndx_(shndx) { gold_assert(shndx != INVALID_CODE); // this->type_ is a bitfield; make sure TYPE fits. @@ -778,7 +860,7 @@ Output_reloc::Output_reloc( Address address) : address_(address), local_sym_index_(0), type_(type), is_relative_(false), is_symbolless_(false), - is_section_symbol_(false), shndx_(INVALID_CODE) + is_section_symbol_(false), use_plt_offset_(false), shndx_(INVALID_CODE) { // this->type_ is a bitfield; make sure TYPE fits. gold_assert(this->type_ == type); @@ -794,7 +876,7 @@ Output_reloc::Output_reloc( Address address) : address_(address), local_sym_index_(0), type_(type), is_relative_(false), is_symbolless_(false), - is_section_symbol_(false), shndx_(shndx) + is_section_symbol_(false), use_plt_offset_(false), shndx_(shndx) { gold_assert(shndx != INVALID_CODE); // this->type_ is a bitfield; make sure TYPE fits. @@ -813,7 +895,7 @@ Output_reloc::Output_reloc( Address address) : address_(address), local_sym_index_(TARGET_CODE), type_(type), is_relative_(false), is_symbolless_(false), - is_section_symbol_(false), shndx_(INVALID_CODE) + is_section_symbol_(false), use_plt_offset_(false), shndx_(INVALID_CODE) { // this->type_ is a bitfield; make sure TYPE fits. gold_assert(this->type_ == type); @@ -830,7 +912,7 @@ Output_reloc::Output_reloc( Address address) : address_(address), local_sym_index_(TARGET_CODE), type_(type), is_relative_(false), is_symbolless_(false), - is_section_symbol_(false), shndx_(shndx) + is_section_symbol_(false), use_plt_offset_(false), shndx_(shndx) { gold_assert(shndx != INVALID_CODE); // this->type_ is a bitfield; make sure TYPE fits. @@ -871,10 +953,13 @@ set_needs_dynsym_index() default: { const unsigned int lsi = this->local_sym_index_; + Sized_relobj_file* relobj = + this->u1_.relobj->sized_relobj(); + gold_assert(relobj != NULL); if (!this->is_section_symbol_) - this->u1_.relobj->set_needs_output_dynsym_entry(lsi); + relobj->set_needs_output_dynsym_entry(lsi); else - this->u1_.relobj->output_section(lsi)->set_needs_dynsym_index(); + relobj->output_section(lsi)->set_needs_dynsym_index(); } break; } @@ -924,16 +1009,19 @@ Output_reloc::get_symbol_index() default: { const unsigned int lsi = this->local_sym_index_; + Sized_relobj_file* relobj = + this->u1_.relobj->sized_relobj(); + gold_assert(relobj != NULL); if (!this->is_section_symbol_) { if (dynamic) - index = this->u1_.relobj->dynsym_index(lsi); + index = relobj->dynsym_index(lsi); else - index = this->u1_.relobj->symtab_index(lsi); + index = relobj->symtab_index(lsi); } else { - Output_section* os = this->u1_.relobj->output_section(lsi); + Output_section* os = relobj->output_section(lsi); gold_assert(os != NULL); if (dynamic) index = os->dynsym_index(); @@ -968,7 +1056,10 @@ Output_reloc:: if (offset != invalid_address) return offset + addend; // This is a merge section. - offset = os->output_address(this->u1_.relobj, lsi, addend); + Sized_relobj_file* relobj = + this->u1_.relobj->sized_relobj(); + gold_assert(relobj != NULL); + offset = os->output_address(relobj, lsi, addend); gold_assert(offset != invalid_address); return offset; } @@ -989,8 +1080,10 @@ Output_reloc::get_address() const address += os->address() + off; else { - address = os->output_address(this->u2_.relobj, this->shndx_, - address); + Sized_relobj_file* relobj = + this->u2_.relobj->sized_relobj(); + gold_assert(relobj != NULL); + address = os->output_address(relobj, this->shndx_, address); gold_assert(address != invalid_address); } } @@ -1035,16 +1128,28 @@ Output_reloc::symbol_value( { const Sized_symbol* sym; sym = static_cast*>(this->u1_.gsym); - return sym->value() + addend; + if (this->use_plt_offset_ && sym->has_plt_offset()) + return parameters->target().plt_address_for_global(sym); + else + return sym->value() + addend; } - gold_assert(this->local_sym_index_ != SECTION_CODE - && this->local_sym_index_ != TARGET_CODE + if (this->local_sym_index_ == SECTION_CODE) + { + gold_assert(!this->use_plt_offset_); + return this->u1_.os->address() + addend; + } + gold_assert(this->local_sym_index_ != TARGET_CODE && this->local_sym_index_ != INVALID_CODE && this->local_sym_index_ != 0 && !this->is_section_symbol_); const unsigned int lsi = this->local_sym_index_; - const Symbol_value* symval = this->u1_.relobj->local_symbol(lsi); - return symval->value(this->u1_.relobj, addend); + Sized_relobj_file* relobj = + this->u1_.relobj->sized_relobj(); + gold_assert(relobj != NULL); + if (this->use_plt_offset_) + return parameters->target().plt_address_for_local(relobj, lsi); + const Symbol_value* symval = relobj->local_symbol(lsi); + return symval->value(relobj, addend); } // Reloc comparison. This function sorts the dynamic relocs for the @@ -1195,7 +1300,7 @@ Output_relocatable_relocs::set_final_data_size() template Output_data_group::Output_data_group( - Sized_relobj* relobj, + Sized_relobj_file* relobj, section_size_type entry_count, elfcpp::Elf_Word flags, std::vector* input_shndxes) @@ -1255,9 +1360,11 @@ Output_data_group::do_write(Output_file* of) // Write out the entry. -template +template void -Output_data_got::Got_entry::write(unsigned char* pov) const +Output_data_got::Got_entry::write( + unsigned int got_indx, + unsigned char* pov) const { Valtype val = 0; @@ -1269,17 +1376,42 @@ 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; - if (this->use_plt_offset_ && gsym->has_plt_offset()) - val = (parameters->target().plt_section_for_global(gsym)->address() - + gsym->plt_offset()); + if (this->use_plt_or_tls_offset_ && gsym->has_plt_offset()) + val = parameters->target().plt_address_for_global(gsym); 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(); + switch (parameters->size_and_endianness()) + { +#if defined(HAVE_TARGET_32_LITTLE) || defined(HAVE_TARGET_32_BIG) + case Parameters::TARGET_32_LITTLE: + case Parameters::TARGET_32_BIG: + { + // This cast is ugly. We don't want to put a + // virtual method in Symbol, because we want Symbol + // to be as small as possible. + Sized_symbol<32>::Value_type v; + v = static_cast*>(gsym)->value(); + val = convert_types::Value_type>(v); + } + break; +#endif +#if defined(HAVE_TARGET_64_LITTLE) || defined(HAVE_TARGET_64_BIG) + case Parameters::TARGET_64_LITTLE: + case Parameters::TARGET_64_BIG: + { + Sized_symbol<64>::Value_type v; + v = static_cast*>(gsym)->value(); + val = convert_types::Value_type>(v); + } + break; +#endif + default: + gold_unreachable(); + } + if (this->use_plt_or_tls_offset_ + && gsym->type() == elfcpp::STT_TLS) + val += parameters->target().tls_offset_for_global(gsym, + got_indx); } } break; @@ -1288,24 +1420,33 @@ Output_data_got::Got_entry::write(unsigned char* pov) const val = this->u_.constant; break; + case RESERVED_CODE: + // If we're doing an incremental update, don't touch this GOT entry. + if (parameters->incremental_update()) + return; + val = this->u_.constant; + break; + default: { - const Sized_relobj* object = this->u_.object; + const Relobj* object = this->u_.object; const unsigned int lsi = this->local_sym_index_; - const Symbol_value* symval = object->local_symbol(lsi); - if (!this->use_plt_offset_) - val = symval->value(this->u_.object, 0); + bool is_tls = object->local_is_tls(lsi); + if (this->use_plt_or_tls_offset_ && !is_tls) + val = parameters->target().plt_address_for_local(object, lsi); else { - const Output_data* plt = - parameters->target().plt_section_for_local(object, lsi); - val = plt->address() + object->local_plt_offset(lsi); + uint64_t lval = object->local_symbol_value(lsi, 0); + val = convert_types(lval); + if (this->use_plt_or_tls_offset_ && is_tls) + val += parameters->target().tls_offset_for_local(object, lsi, + got_indx); } } break; } - elfcpp::Swap::writeval(pov, val); + elfcpp::Swap::writeval(pov, val); } // Output_data_got methods. @@ -1314,293 +1455,228 @@ Output_data_got::Got_entry::write(unsigned char* pov) const // this is a new GOT entry, false if the symbol already had a GOT // entry. -template +template bool -Output_data_got::add_global( +Output_data_got::add_global( Symbol* gsym, unsigned int got_type) { if (gsym->has_got_offset(got_type)) return false; - this->entries_.push_back(Got_entry(gsym, false)); - this->set_got_size(); - gsym->set_got_offset(got_type, this->last_got_offset()); + unsigned int got_offset = this->add_got_entry(Got_entry(gsym, false)); + gsym->set_got_offset(got_type, got_offset); return true; } // Like add_global, but use the PLT offset. -template +template bool -Output_data_got::add_global_plt(Symbol* gsym, - unsigned int got_type) +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()); + unsigned int got_offset = this->add_got_entry(Got_entry(gsym, true)); + gsym->set_got_offset(got_type, got_offset); return true; } // Add an entry for a global symbol to the GOT, and add a dynamic // relocation of type R_TYPE for the GOT entry. -template +template void -Output_data_got::add_global_with_rel( +Output_data_got::add_global_with_rel( Symbol* gsym, unsigned int got_type, - Rel_dyn* rel_dyn, + Output_data_reloc_generic* rel_dyn, unsigned int r_type) { if (gsym->has_got_offset(got_type)) return; - this->entries_.push_back(Got_entry()); - this->set_got_size(); - unsigned int got_offset = this->last_got_offset(); + unsigned int got_offset = this->add_got_entry(Got_entry()); gsym->set_got_offset(got_type, got_offset); - rel_dyn->add_global(gsym, r_type, this, got_offset); -} - -template -void -Output_data_got::add_global_with_rela( - Symbol* gsym, - unsigned int got_type, - Rela_dyn* rela_dyn, - unsigned int r_type) -{ - if (gsym->has_got_offset(got_type)) - return; - - this->entries_.push_back(Got_entry()); - this->set_got_size(); - unsigned int got_offset = this->last_got_offset(); - gsym->set_got_offset(got_type, got_offset); - rela_dyn->add_global(gsym, r_type, this, got_offset, 0); + rel_dyn->add_global_generic(gsym, r_type, this, got_offset, 0); } // Add a pair of entries for a global symbol to the GOT, and add // dynamic relocations of type R_TYPE_1 and R_TYPE_2, respectively. // If R_TYPE_2 == 0, add the second entry with no relocation. -template -void -Output_data_got::add_global_pair_with_rel( - Symbol* gsym, - unsigned int got_type, - Rel_dyn* rel_dyn, - unsigned int r_type_1, - unsigned int r_type_2) -{ - if (gsym->has_got_offset(got_type)) - return; - - this->entries_.push_back(Got_entry()); - unsigned int got_offset = this->last_got_offset(); - gsym->set_got_offset(got_type, got_offset); - rel_dyn->add_global(gsym, r_type_1, this, got_offset); - - this->entries_.push_back(Got_entry()); - if (r_type_2 != 0) - { - got_offset = this->last_got_offset(); - rel_dyn->add_global(gsym, r_type_2, this, got_offset); - } - - this->set_got_size(); -} - -template +template void -Output_data_got::add_global_pair_with_rela( +Output_data_got::add_global_pair_with_rel( Symbol* gsym, unsigned int got_type, - Rela_dyn* rela_dyn, + Output_data_reloc_generic* rel_dyn, unsigned int r_type_1, unsigned int r_type_2) { if (gsym->has_got_offset(got_type)) return; - this->entries_.push_back(Got_entry()); - unsigned int got_offset = this->last_got_offset(); + unsigned int got_offset = this->add_got_entry_pair(Got_entry(), Got_entry()); gsym->set_got_offset(got_type, got_offset); - rela_dyn->add_global(gsym, r_type_1, this, got_offset, 0); + rel_dyn->add_global_generic(gsym, r_type_1, this, got_offset, 0); - this->entries_.push_back(Got_entry()); if (r_type_2 != 0) - { - got_offset = this->last_got_offset(); - rela_dyn->add_global(gsym, r_type_2, this, got_offset, 0); - } - - this->set_got_size(); + rel_dyn->add_global_generic(gsym, r_type_2, this, + got_offset + got_size / 8, 0); } // Add an entry for a local symbol to the GOT. This returns true if // this is a new GOT entry, false if the symbol already has a GOT // entry. -template +template bool -Output_data_got::add_local( - Sized_relobj* object, +Output_data_got::add_local( + 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, false)); - this->set_got_size(); - object->set_local_got_offset(symndx, got_type, this->last_got_offset()); + unsigned int got_offset = this->add_got_entry(Got_entry(object, symndx, + false)); + object->set_local_got_offset(symndx, got_type, got_offset); return true; } // Like add_local, but use the PLT offset. -template +template bool -Output_data_got::add_local_plt( - Sized_relobj* object, +Output_data_got::add_local_plt( + 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()); + unsigned int got_offset = this->add_got_entry(Got_entry(object, symndx, + true)); + object->set_local_got_offset(symndx, got_type, got_offset); return true; } // Add an entry for a local symbol to the GOT, and add a dynamic // relocation of type R_TYPE for the GOT entry. -template +template void -Output_data_got::add_local_with_rel( - Sized_relobj* object, +Output_data_got::add_local_with_rel( + Relobj* object, unsigned int symndx, unsigned int got_type, - Rel_dyn* rel_dyn, + Output_data_reloc_generic* rel_dyn, unsigned int r_type) { if (object->local_has_got_offset(symndx, got_type)) return; - this->entries_.push_back(Got_entry()); - this->set_got_size(); - unsigned int got_offset = this->last_got_offset(); + unsigned int got_offset = this->add_got_entry(Got_entry()); object->set_local_got_offset(symndx, got_type, got_offset); - rel_dyn->add_local(object, symndx, r_type, this, got_offset); + rel_dyn->add_local_generic(object, symndx, r_type, this, got_offset, 0); } -template +// Add a pair of entries for a local symbol to the GOT, and add +// a dynamic relocation of type R_TYPE using the section symbol of +// the output section to which input section SHNDX maps, on the first. +// The first got entry will have a value of zero, the second the +// value of the local symbol. +template void -Output_data_got::add_local_with_rela( - Sized_relobj* object, +Output_data_got::add_local_pair_with_rel( + Relobj* object, unsigned int symndx, + unsigned int shndx, unsigned int got_type, - Rela_dyn* rela_dyn, + Output_data_reloc_generic* rel_dyn, unsigned int r_type) { if (object->local_has_got_offset(symndx, got_type)) return; - this->entries_.push_back(Got_entry()); - this->set_got_size(); - unsigned int got_offset = this->last_got_offset(); + unsigned int got_offset = + this->add_got_entry_pair(Got_entry(), + Got_entry(object, symndx, false)); object->set_local_got_offset(symndx, got_type, got_offset); - rela_dyn->add_local(object, symndx, r_type, this, got_offset, 0); + Output_section* os = object->output_section(shndx); + rel_dyn->add_output_section_generic(os, r_type, this, got_offset, 0); } // Add a pair of entries for a local symbol to the GOT, and add -// dynamic relocations of type R_TYPE_1 and R_TYPE_2, respectively. -// If R_TYPE_2 == 0, add the second entry with no relocation. -template +// a dynamic relocation of type R_TYPE using STN_UNDEF on the first. +// The first got entry will have a value of zero, the second the +// value of the local symbol offset by Target::tls_offset_for_local. +template void -Output_data_got::add_local_pair_with_rel( - Sized_relobj* object, +Output_data_got::add_local_tls_pair( + Relobj* object, unsigned int symndx, - unsigned int shndx, unsigned int got_type, - Rel_dyn* rel_dyn, - unsigned int r_type_1, - unsigned int r_type_2) + Output_data_reloc_generic* rel_dyn, + unsigned int r_type) { if (object->local_has_got_offset(symndx, got_type)) return; - this->entries_.push_back(Got_entry()); - unsigned int got_offset = this->last_got_offset(); + unsigned int got_offset + = this->add_got_entry_pair(Got_entry(), + Got_entry(object, symndx, true)); object->set_local_got_offset(symndx, got_type, got_offset); - 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, false)); - if (r_type_2 != 0) - { - got_offset = this->last_got_offset(); - rel_dyn->add_output_section(os, r_type_2, this, got_offset); - } - - this->set_got_size(); + rel_dyn->add_local_generic(object, 0, r_type, this, got_offset, 0); } -template +// Reserve a slot in the GOT for a local symbol or the second slot of a pair. + +template void -Output_data_got::add_local_pair_with_rela( - Sized_relobj* object, - unsigned int symndx, - unsigned int shndx, - unsigned int got_type, - Rela_dyn* rela_dyn, - unsigned int r_type_1, - unsigned int r_type_2) +Output_data_got::reserve_local( + unsigned int i, + Relobj* object, + unsigned int sym_index, + unsigned int got_type) { - if (object->local_has_got_offset(symndx, got_type)) - return; - - this->entries_.push_back(Got_entry()); - unsigned int got_offset = this->last_got_offset(); - object->set_local_got_offset(symndx, got_type, got_offset); - Output_section* os = object->output_section(shndx); - rela_dyn->add_output_section(os, r_type_1, this, got_offset, 0); + this->do_reserve_slot(i); + object->set_local_got_offset(sym_index, got_type, this->got_offset(i)); +} - this->entries_.push_back(Got_entry(object, symndx, false)); - if (r_type_2 != 0) - { - got_offset = this->last_got_offset(); - rela_dyn->add_output_section(os, r_type_2, this, got_offset, 0); - } +// Reserve a slot in the GOT for a global symbol. - this->set_got_size(); +template +void +Output_data_got::reserve_global( + unsigned int i, + Symbol* gsym, + unsigned int got_type) +{ + this->do_reserve_slot(i); + gsym->set_got_offset(got_type, this->got_offset(i)); } // Write out the GOT. -template +template void -Output_data_got::do_write(Output_file* of) +Output_data_got::do_write(Output_file* of) { - const int add = size / 8; + const int add = got_size / 8; const off_t off = this->offset(); const off_t oview_size = this->data_size(); unsigned char* const oview = of->get_output_view(off, oview_size); unsigned char* pov = oview; - for (typename Got_entries::const_iterator p = this->entries_.begin(); - p != this->entries_.end(); - ++p) + for (unsigned int i = 0; i < this->entries_.size(); ++i) { - p->write(pov); + this->entries_[i].write(i, pov); pov += add; } @@ -1612,6 +1688,78 @@ Output_data_got::do_write(Output_file* of) this->entries_.clear(); } +// Create a new GOT entry and return its offset. + +template +unsigned int +Output_data_got::add_got_entry(Got_entry got_entry) +{ + if (!this->is_data_size_valid()) + { + this->entries_.push_back(got_entry); + this->set_got_size(); + return this->last_got_offset(); + } + else + { + // For an incremental update, find an available slot. + off_t got_offset = this->free_list_.allocate(got_size / 8, + got_size / 8, 0); + if (got_offset == -1) + gold_fallback(_("out of patch space (GOT);" + " relink with --incremental-full")); + unsigned int got_index = got_offset / (got_size / 8); + gold_assert(got_index < this->entries_.size()); + this->entries_[got_index] = got_entry; + return static_cast(got_offset); + } +} + +// Create a pair of new GOT entries and return the offset of the first. + +template +unsigned int +Output_data_got::add_got_entry_pair( + Got_entry got_entry_1, + Got_entry got_entry_2) +{ + if (!this->is_data_size_valid()) + { + unsigned int got_offset; + this->entries_.push_back(got_entry_1); + got_offset = this->last_got_offset(); + this->entries_.push_back(got_entry_2); + this->set_got_size(); + return got_offset; + } + else + { + // For an incremental update, find an available pair of slots. + off_t got_offset = this->free_list_.allocate(2 * got_size / 8, + got_size / 8, 0); + if (got_offset == -1) + gold_fallback(_("out of patch space (GOT);" + " relink with --incremental-full")); + unsigned int got_index = got_offset / (got_size / 8); + gold_assert(got_index < this->entries_.size()); + this->entries_[got_index] = got_entry_1; + this->entries_[got_index + 1] = got_entry_2; + return static_cast(got_offset); + } +} + +// Replace GOT entry I with a new value. + +template +void +Output_data_got::replace_got_entry( + unsigned int i, + Got_entry got_entry) +{ + gold_assert(i < this->entries_.size()); + this->entries_[i] = got_entry; +} + // Output_data_dynamic::Dynamic_entry methods. // Write out the entry. @@ -1787,13 +1935,164 @@ Output_symtab_xindex::endian_do_write(unsigned char* const oview) ++p) { unsigned int symndx = p->first; - gold_assert(symndx * 4 < this->data_size()); + gold_assert(static_cast(symndx) * 4 < this->data_size()); elfcpp::Swap<32, big_endian>::writeval(oview + symndx * 4, p->second); } } +// Output_fill_debug_info methods. + +// Return the minimum size needed for a dummy compilation unit header. + +size_t +Output_fill_debug_info::do_minimum_hole_size() const +{ + // Compile unit header fields: unit_length, version, debug_abbrev_offset, + // address_size. + const size_t len = 4 + 2 + 4 + 1; + // For type units, add type_signature, type_offset. + if (this->is_debug_types_) + return len + 8 + 4; + return len; +} + +// Write a dummy compilation unit header to fill a hole in the +// .debug_info or .debug_types section. + +void +Output_fill_debug_info::do_write(Output_file* of, off_t off, size_t len) const +{ + gold_debug(DEBUG_INCREMENTAL, "fill_debug_info(%08lx, %08lx)", + static_cast(off), static_cast(len)); + + gold_assert(len >= this->do_minimum_hole_size()); + + unsigned char* const oview = of->get_output_view(off, len); + unsigned char* pov = oview; + + // Write header fields: unit_length, version, debug_abbrev_offset, + // address_size. + if (this->is_big_endian()) + { + elfcpp::Swap_unaligned<32, true>::writeval(pov, len - 4); + elfcpp::Swap_unaligned<16, true>::writeval(pov + 4, this->version); + elfcpp::Swap_unaligned<32, true>::writeval(pov + 6, 0); + } + else + { + elfcpp::Swap_unaligned<32, false>::writeval(pov, len - 4); + elfcpp::Swap_unaligned<16, false>::writeval(pov + 4, this->version); + elfcpp::Swap_unaligned<32, false>::writeval(pov + 6, 0); + } + pov += 4 + 2 + 4; + *pov++ = 4; + + // For type units, the additional header fields -- type_signature, + // type_offset -- can be filled with zeroes. + + // Fill the remainder of the free space with zeroes. The first + // zero should tell the consumer there are no DIEs to read in this + // compilation unit. + if (pov < oview + len) + memset(pov, 0, oview + len - pov); + + of->write_output_view(off, len, oview); +} + +// Output_fill_debug_line methods. + +// Return the minimum size needed for a dummy line number program header. + +size_t +Output_fill_debug_line::do_minimum_hole_size() const +{ + // Line number program header fields: unit_length, version, header_length, + // minimum_instruction_length, default_is_stmt, line_base, line_range, + // opcode_base, standard_opcode_lengths[], include_directories, filenames. + const size_t len = 4 + 2 + 4 + this->header_length; + return len; +} + +// Write a dummy line number program header to fill a hole in the +// .debug_line section. + +void +Output_fill_debug_line::do_write(Output_file* of, off_t off, size_t len) const +{ + gold_debug(DEBUG_INCREMENTAL, "fill_debug_line(%08lx, %08lx)", + static_cast(off), static_cast(len)); + + gold_assert(len >= this->do_minimum_hole_size()); + + unsigned char* const oview = of->get_output_view(off, len); + unsigned char* pov = oview; + + // Write header fields: unit_length, version, header_length, + // minimum_instruction_length, default_is_stmt, line_base, line_range, + // opcode_base, standard_opcode_lengths[], include_directories, filenames. + // We set the header_length field to cover the entire hole, so the + // line number program is empty. + if (this->is_big_endian()) + { + elfcpp::Swap_unaligned<32, true>::writeval(pov, len - 4); + elfcpp::Swap_unaligned<16, true>::writeval(pov + 4, this->version); + elfcpp::Swap_unaligned<32, true>::writeval(pov + 6, len - (4 + 2 + 4)); + } + else + { + elfcpp::Swap_unaligned<32, false>::writeval(pov, len - 4); + elfcpp::Swap_unaligned<16, false>::writeval(pov + 4, this->version); + elfcpp::Swap_unaligned<32, false>::writeval(pov + 6, len - (4 + 2 + 4)); + } + pov += 4 + 2 + 4; + *pov++ = 1; // minimum_instruction_length + *pov++ = 0; // default_is_stmt + *pov++ = 0; // line_base + *pov++ = 5; // line_range + *pov++ = 13; // opcode_base + *pov++ = 0; // standard_opcode_lengths[1] + *pov++ = 1; // standard_opcode_lengths[2] + *pov++ = 1; // standard_opcode_lengths[3] + *pov++ = 1; // standard_opcode_lengths[4] + *pov++ = 1; // standard_opcode_lengths[5] + *pov++ = 0; // standard_opcode_lengths[6] + *pov++ = 0; // standard_opcode_lengths[7] + *pov++ = 0; // standard_opcode_lengths[8] + *pov++ = 1; // standard_opcode_lengths[9] + *pov++ = 0; // standard_opcode_lengths[10] + *pov++ = 0; // standard_opcode_lengths[11] + *pov++ = 1; // standard_opcode_lengths[12] + *pov++ = 0; // include_directories (empty) + *pov++ = 0; // filenames (empty) + + // Some consumers don't check the header_length field, and simply + // start reading the line number program immediately following the + // header. For those consumers, we fill the remainder of the free + // space with DW_LNS_set_basic_block opcodes. These are effectively + // no-ops: the resulting line table program will not create any rows. + if (pov < oview + len) + memset(pov, elfcpp::DW_LNS_set_basic_block, oview + len - pov); + + of->write_output_view(off, len, oview); +} + // Output_section::Input_section methods. +// Return the current data size. For an input section we store the size here. +// For an Output_section_data, we have to ask it for the size. + +off_t +Output_section::Input_section::current_data_size() const +{ + if (this->is_input_section()) + return this->u1_.data_size; + else + { + this->u2_.posd->pre_finalize_data_size(); + return this->u2_.posd->current_data_size(); + } +} + // Return the data size. For an input section we store the size here. // For an Output_section_data, we have to ask it for the size. @@ -2003,9 +2302,17 @@ Output_section::Output_section(const char* name, elfcpp::Elf_Word type, section_offsets_need_adjustment_(false), is_noload_(false), always_keeps_input_sections_(false), + has_fixed_layout_(false), + is_patch_space_allowed_(false), + is_unique_segment_(false), tls_offset_(0), + extra_segment_flags_(0), + segment_alignment_(0), checkpoint_(NULL), - lookup_maps_(new Output_section_lookup_maps) + lookup_maps_(new Output_section_lookup_maps), + free_list_(), + free_space_fill_(NULL), + patch_space_(0) { // An unallocated section has no address. Forcing this means that // we don't need special treatment for symbols defined in debug @@ -2050,7 +2357,7 @@ Output_section::set_entsize(uint64_t v) template off_t Output_section::add_input_section(Layout* layout, - Sized_relobj* object, + Sized_relobj_file* object, unsigned int shndx, const char* secname, const elfcpp::Shdr& shdr, @@ -2086,9 +2393,11 @@ Output_section::add_input_section(Layout* layout, // a Output_data_merge. We don't try to handle relocations for such // a section. We don't try to handle empty merge sections--they // mess up the mappings, and are useless anyhow. + // FIXME: Need to handle merge sections during incremental update. if ((sh_flags & elfcpp::SHF_MERGE) != 0 && reloc_shndx == 0 - && shdr.get_sh_size() > 0) + && shdr.get_sh_size() > 0 + && !parameters->incremental()) { // Keep information about merged input sections for rebuilding fast // lookup maps if we have sections-script or we do relaxation. @@ -2105,9 +2414,32 @@ Output_section::add_input_section(Layout* layout, } } - off_t offset_in_section = this->current_data_size_for_child(); - off_t aligned_offset_in_section = align_address(offset_in_section, - addralign); + section_size_type input_section_size = shdr.get_sh_size(); + section_size_type uncompressed_size; + if (object->section_is_compressed(shndx, &uncompressed_size)) + input_section_size = uncompressed_size; + + off_t offset_in_section; + off_t aligned_offset_in_section; + if (this->has_fixed_layout()) + { + // For incremental updates, find a chunk of unused space in the section. + offset_in_section = this->free_list_.allocate(input_section_size, + addralign, 0); + if (offset_in_section == -1) + gold_fallback(_("out of patch space in section %s; " + "relink with --incremental-full"), + this->name()); + aligned_offset_in_section = offset_in_section; + } + else + { + offset_in_section = this->current_data_size_for_child(); + aligned_offset_in_section = align_address(offset_in_section, + addralign); + this->set_current_data_size_for_child(aligned_offset_in_section + + input_section_size); + } // Determine if we want to delay code-fill generation until the output // section is written. When the target is relaxing, we want to delay fill @@ -2118,7 +2450,7 @@ Output_section::add_input_section(Layout* layout, && (sh_flags & elfcpp::SHF_EXECINSTR) != 0 && parameters->target().has_code_fill() && (parameters->target().may_relax() - || parameters->options().section_ordering_file())) + || layout->is_section_ordering_specified())) { gold_assert(this->fills_.empty()); this->generate_code_fills_at_write_ = true; @@ -2144,14 +2476,6 @@ Output_section::add_input_section(Layout* layout, } } - section_size_type input_section_size = shdr.get_sh_size(); - section_size_type uncompressed_size; - if (object->section_is_compressed(shndx, &uncompressed_size)) - input_section_size = uncompressed_size; - - this->set_current_data_size_for_child(aligned_offset_in_section - + input_section_size); - // We need to keep track of this section if we are already keeping // track of sections, or if we are relaxing. Also, if this is a // section which requires sorting, or which may require sorting in @@ -2165,9 +2489,12 @@ Output_section::add_input_section(Layout* layout, || this->must_sort_attached_input_sections() || parameters->options().user_set_Map() || parameters->target().may_relax() - || parameters->options().section_ordering_file()) + || layout->is_section_ordering_specified()) { Input_section isecn(object, shndx, input_section_size, addralign); + /* If section ordering is requested by specifying a ordering file, + using --section-ordering-file, match the section name with + a pattern. */ if (parameters->options().section_ordering_file()) { unsigned int section_order_index = @@ -2178,6 +2505,14 @@ Output_section::add_input_section(Layout* layout, this->set_input_section_order_specified(); } } + if (this->has_fixed_layout()) + { + // For incremental updates, finalize the address and offset now. + uint64_t addr = this->address(); + isecn.set_address_and_file_offset(addr + aligned_offset_in_section, + aligned_offset_in_section, + this->offset()); + } this->input_sections_.push_back(isecn); } @@ -2194,11 +2529,41 @@ Output_section::add_output_section_data(Output_section_data* posd) if (posd->is_data_size_valid()) { - off_t offset_in_section = this->current_data_size_for_child(); - off_t aligned_offset_in_section = align_address(offset_in_section, - posd->addralign()); - this->set_current_data_size_for_child(aligned_offset_in_section - + posd->data_size()); + off_t offset_in_section; + if (this->has_fixed_layout()) + { + // For incremental updates, find a chunk of unused space. + offset_in_section = this->free_list_.allocate(posd->data_size(), + posd->addralign(), 0); + if (offset_in_section == -1) + gold_fallback(_("out of patch space in section %s; " + "relink with --incremental-full"), + this->name()); + // Finalize the address and offset now. + uint64_t addr = this->address(); + off_t offset = this->offset(); + posd->set_address_and_file_offset(addr + offset_in_section, + offset + offset_in_section); + } + else + { + offset_in_section = this->current_data_size_for_child(); + off_t aligned_offset_in_section = align_address(offset_in_section, + posd->addralign()); + this->set_current_data_size_for_child(aligned_offset_in_section + + posd->data_size()); + } + } + else if (this->has_fixed_layout()) + { + // For incremental updates, arrange for the data to have a fixed layout. + // This will mean that additions to the data must be allocated from + // free space within the containing output section. + uint64_t addr = this->address(); + posd->set_address(addr); + posd->set_file_offset(0); + // FIXME: This should eventually be unreachable. + // gold_unreachable(); } } @@ -2213,7 +2578,7 @@ Output_section::add_relaxed_input_section(Layout* layout, // If the --section-ordering-file option is used to specify the order of // sections, we need to keep track of sections. - if (parameters->options().section_ordering_file()) + if (layout->is_section_ordering_specified()) { unsigned int section_order_index = layout->find_section_order_index(name); @@ -2231,9 +2596,9 @@ Output_section::add_relaxed_input_section(Layout* layout, // For a relaxed section, we use the current data size. Linker scripts // get all the input sections, including relaxed one from an output - // section and add them back to them same output section to compute the + // section and add them back to the same output section to compute the // output section size. If we do not account for sizes of relaxed input - // sections, an output section would be incorrectly sized. + // sections, an output section would be incorrectly sized. off_t offset_in_section = this->current_data_size_for_child(); off_t aligned_offset_in_section = align_address(offset_in_section, poris->addralign()); @@ -2400,7 +2765,7 @@ Output_section::convert_input_sections_in_list_to_relaxed_sections( (*input_sections)[p->second].set_section_order_index(soi); } } - + // Convert regular input sections into relaxed input sections. RELAXED_SECTIONS // is a vector of pointers to Output_relaxed_input_section or its derived // classes. The relaxed sections must correspond to existing input sections. @@ -2415,7 +2780,7 @@ Output_section::convert_input_sections_to_relaxed_sections( // this. If there is no checkpoint active, just search the current // input section list and replace the sections there. If there is // a checkpoint, also replace the sections there. - + // By default, we look at the whole list. size_t limit = this->input_sections_.size(); @@ -2528,13 +2893,13 @@ Output_section::build_lookup_maps() const for (Output_merge_base::Input_sections::const_iterator is = pomb->input_sections_begin(); is != pomb->input_sections_end(); - ++is) + ++is) { const Const_section_id& csid = *is; this->lookup_maps_->add_merge_input_section(csid.first, csid.second, pomb); } - + } else if (p->is_relaxed_input_section()) { @@ -2576,7 +2941,7 @@ Output_section::is_input_address_mapped(const Relobj* object, { section_offset_type output_offset; bool found = posd->output_offset(object, shndx, offset, &output_offset); - gold_assert(found); + gold_assert(found); return output_offset != -1; } @@ -2611,13 +2976,13 @@ Output_section::output_offset(const Relobj* object, unsigned int shndx, // Look at the Output_section_data_maps first. const Output_section_data* posd = this->find_merge_section(object, shndx); - if (posd == NULL) + if (posd == NULL) posd = this->find_relaxed_input_section(object, shndx); if (posd != NULL) { section_offset_type output_offset; bool found = posd->output_offset(object, shndx, offset, &output_offset); - gold_assert(found); + gold_assert(found); return output_offset; } @@ -2644,7 +3009,7 @@ Output_section::output_address(const Relobj* object, unsigned int shndx, // Look at the Output_section_data_maps first. const Output_section_data* posd = this->find_merge_section(object, shndx); - if (posd == NULL) + if (posd == NULL) posd = this->find_relaxed_input_section(object, shndx); if (posd != NULL && posd->is_address_valid()) { @@ -2713,36 +3078,81 @@ Output_section::find_starting_output_address(const Relobj* object, return false; } -// Set the data size of an Output_section. This is where we handle -// setting the addresses of any Output_section_data objects. +// Update the data size of an Output_section. void -Output_section::set_final_data_size() +Output_section::update_data_size() { if (this->input_sections_.empty()) - { - this->set_data_size(this->current_data_size_for_child()); return; - } if (this->must_sort_attached_input_sections() || this->input_section_order_specified()) this->sort_attached_input_sections(); - uint64_t address = this->address(); - off_t startoff = this->offset(); - off_t off = startoff + this->first_input_offset_; + off_t off = this->first_input_offset_; for (Input_section_list::iterator p = this->input_sections_.begin(); p != this->input_sections_.end(); ++p) { off = align_address(off, p->addralign()); - p->set_address_and_file_offset(address + (off - startoff), off, - startoff); - off += p->data_size(); + off += p->current_data_size(); } - this->set_data_size(off - startoff); + this->set_current_data_size_for_child(off); +} + +// Set the data size of an Output_section. This is where we handle +// setting the addresses of any Output_section_data objects. + +void +Output_section::set_final_data_size() +{ + off_t data_size; + + if (this->input_sections_.empty()) + data_size = this->current_data_size_for_child(); + else + { + if (this->must_sort_attached_input_sections() + || this->input_section_order_specified()) + this->sort_attached_input_sections(); + + uint64_t address = this->address(); + off_t startoff = this->offset(); + off_t off = startoff + this->first_input_offset_; + for (Input_section_list::iterator p = this->input_sections_.begin(); + p != this->input_sections_.end(); + ++p) + { + off = align_address(off, p->addralign()); + p->set_address_and_file_offset(address + (off - startoff), off, + startoff); + off += p->data_size(); + } + data_size = off - startoff; + } + + // For full incremental links, we want to allocate some patch space + // in most sections for subsequent incremental updates. + if (this->is_patch_space_allowed_ && parameters->incremental_full()) + { + double pct = parameters->options().incremental_patch(); + size_t extra = static_cast(data_size * pct); + if (this->free_space_fill_ != NULL + && this->free_space_fill_->minimum_hole_size() > extra) + extra = this->free_space_fill_->minimum_hole_size(); + off_t new_size = align_address(data_size + extra, this->addralign()); + this->patch_space_ = new_size - data_size; + gold_debug(DEBUG_INCREMENTAL, + "set_final_data_size: %08lx + %08lx: section %s", + static_cast(data_size), + static_cast(this->patch_space_), + this->name()); + data_size = new_size; + } + + this->set_data_size(data_size); } // Reset the address and file offset. @@ -2761,8 +3171,16 @@ Output_section::do_reset_address_and_file_offset() p != this->input_sections_.end(); ++p) p->reset_address_and_file_offset(); + + // Remove any patch space that was added in set_final_data_size. + if (this->patch_space_ > 0) + { + this->set_current_data_size_for_child(this->current_data_size_for_child() + - this->patch_space_); + this->patch_space_ = 0; + } } - + // Return true if address and file offset have the values after reset. bool @@ -2791,7 +3209,7 @@ Output_section::do_set_tls_offset(uint64_t tls_base) // priority ordering implemented by the GNU linker, in which the // priority becomes part of the section name and the sections are // sorted by name. We only do this for an output section if we see an -// attached input section matching ".ctor.*", ".dtor.*", +// attached input section matching ".ctors.*", ".dtors.*", // ".init_array.*" or ".fini_array.*". class Output_section::Input_section_sort_entry @@ -2866,6 +3284,34 @@ class Output_section::Input_section_sort_entry return this->section_name_.find('.', 1) != std::string::npos; } + // Return the priority. Believe it or not, gcc encodes the priority + // differently for .ctors/.dtors and .init_array/.fini_array + // sections. + unsigned int + get_priority() const + { + gold_assert(this->section_has_name_); + bool is_ctors; + if (is_prefix_of(".ctors.", this->section_name_.c_str()) + || is_prefix_of(".dtors.", this->section_name_.c_str())) + is_ctors = true; + else if (is_prefix_of(".init_array.", this->section_name_.c_str()) + || is_prefix_of(".fini_array.", this->section_name_.c_str())) + is_ctors = false; + else + return 0; + char* end; + unsigned long prio = strtoul((this->section_name_.c_str() + + (is_ctors ? 7 : 12)), + &end, 10); + if (*end != '\0') + return 0; + else if (is_ctors) + return 65535 - prio; + else + return prio; + } + // Return true if this an input file whose base name matches // FILE_NAME. The base name must have an extension of ".o", and // must be exactly FILE_NAME.o or FILE_NAME, one character, ".o". @@ -2874,18 +3320,8 @@ class Output_section::Input_section_sort_entry // file name this way is a dreadful hack, but the GNU linker does it // in order to better support gcc, and we need to be compatible. bool - match_file_name(const char* match_file_name) const - { - const std::string& file_name(this->input_section_.relobj()->name()); - const char* base_name = lbasename(file_name.c_str()); - size_t match_len = strlen(match_file_name); - if (strncmp(base_name, match_file_name, match_len) != 0) - return false; - size_t base_len = strlen(base_name); - if (base_len != match_len + 2 && base_len != match_len + 3) - return false; - return memcmp(base_name + base_len - 2, ".o", 2) == 0; - } + match_file_name(const char* file_name) const + { return Layout::match_file_name(this->input_section_.relobj(), file_name); } // Returns 1 if THIS should appear before S in section order, -1 if S // appears before THIS and 0 if they are not comparable. @@ -3007,6 +3443,28 @@ Output_section::Input_section_sort_init_fini_compare::operator()( if (!s1_has_priority && s2_has_priority) return false; + // .ctors and .dtors sections without priority come after + // .init_array and .fini_array sections without priority. + if (!s1_has_priority + && (s1.section_name() == ".ctors" || s1.section_name() == ".dtors") + && s1.section_name() != s2.section_name()) + return false; + if (!s2_has_priority + && (s2.section_name() == ".ctors" || s2.section_name() == ".dtors") + && s2.section_name() != s1.section_name()) + return true; + + // Sort by priority if we can. + if (s1_has_priority) + { + unsigned int s1_prio = s1.get_priority(); + unsigned int s2_prio = s2.get_priority(); + if (s1_prio < s2_prio) + return true; + else if (s1_prio > s2_prio) + return false; + } + // Check if a section order exists for these sections through a section // ordering file. If sequence_num is 0, an order does not exist. int sequence_num = s1.compare_section_ordering(s2); @@ -3037,10 +3495,42 @@ Output_section::Input_section_sort_section_order_index_compare::operator()( // Keep input order if section ordering cannot determine order. if (s1_secn_index == s2_secn_index) return s1.index() < s2.index(); - + return s1_secn_index < s2_secn_index; } +// This updates the section order index of input sections according to the +// the order specified in the mapping from Section id to order index. + +void +Output_section::update_section_layout( + const Section_layout_order* order_map) +{ + for (Input_section_list::iterator p = this->input_sections_.begin(); + p != this->input_sections_.end(); + ++p) + { + if (p->is_input_section() + || p->is_relaxed_input_section()) + { + Object* obj = (p->is_input_section() + ? p->relobj() + : p->relaxed_input_section()->relobj()); + unsigned int shndx = p->shndx(); + Section_layout_order::const_iterator it + = order_map->find(Section_id(obj, shndx)); + if (it == order_map->end()) + continue; + unsigned int section_order_index = it->second; + if (section_order_index != 0) + { + p->set_section_order_index(section_order_index); + this->set_input_section_order_specified(); + } + } + } +} + // Sort the input sections attached to an output section. void @@ -3083,7 +3573,7 @@ Output_section::sort_attached_input_sections() } else { - gold_assert(parameters->options().section_ordering_file()); + gold_assert(this->input_section_order_specified()); std::sort(sort_list.begin(), sort_list.end(), Input_section_sort_section_order_index_compare()); } @@ -3123,7 +3613,7 @@ Output_section::write_header(const Layout* layout, if (this->link_section_ != NULL) oshdr->put_sh_link(this->link_section_->out_shndx()); else if (this->should_link_to_symtab_) - oshdr->put_sh_link(layout->symtab_section()->out_shndx()); + oshdr->put_sh_link(layout->symtab_section_shndx()); else if (this->should_link_to_dynsym_) oshdr->put_sh_link(layout->dynsym_section()->out_shndx()); else @@ -3185,6 +3675,26 @@ Output_section::do_write(Output_file* of) p->write(of); off = aligned_off + p->data_size(); } + + // For incremental links, fill in unused chunks in debug sections + // with dummy compilation unit headers. + if (this->free_space_fill_ != NULL) + { + for (Free_list::Const_iterator p = this->free_list_.begin(); + p != this->free_list_.end(); + ++p) + { + off_t off = p->start_; + size_t len = p->end_ - off; + this->free_space_fill_->write(of, this->offset() + off, len); + } + if (this->patch_space_ > 0) + { + off_t off = this->current_data_size_for_child() - this->patch_space_; + this->free_space_fill_->write(of, this->offset() + off, + this->patch_space_); + } + } } // If a section requires postprocessing, create the buffer to use. @@ -3348,7 +3858,7 @@ Output_section::add_script_input_section(const Input_section& sis) this->input_sections_.push_back(sis); - // Update fast lookup maps if necessary. + // Update fast lookup maps if necessary. if (this->lookup_maps_->is_valid()) { if (sis.is_merge_section()) @@ -3483,6 +3993,40 @@ Output_section::print_merge_stats() p->print_merge_stats(this->name_); } +// Set a fixed layout for the section. Used for incremental update links. + +void +Output_section::set_fixed_layout(uint64_t sh_addr, off_t sh_offset, + off_t sh_size, uint64_t sh_addralign) +{ + this->addralign_ = sh_addralign; + this->set_current_data_size(sh_size); + if ((this->flags_ & elfcpp::SHF_ALLOC) != 0) + this->set_address(sh_addr); + this->set_file_offset(sh_offset); + this->finalize_data_size(); + this->free_list_.init(sh_size, false); + this->has_fixed_layout_ = true; +} + +// Reserve space within the fixed layout for the section. Used for +// incremental update links. + +void +Output_section::reserve(uint64_t sh_offset, uint64_t sh_size) +{ + this->free_list_.remove(sh_offset, sh_offset + sh_size); +} + +// Allocate space from the free list for the section. Used for +// incremental update links. + +off_t +Output_section::allocate(off_t len, uint64_t addralign) +{ + return this->free_list_.allocate(len, addralign, 0); +} + // Output segment methods. Output_segment::Output_segment(elfcpp::Elf_Word type, elfcpp::Elf_Word flags) @@ -3497,7 +4041,8 @@ Output_segment::Output_segment(elfcpp::Elf_Word type, elfcpp::Elf_Word flags) flags_(flags), is_max_align_known_(false), are_addresses_set_(false), - is_large_data_segment_(false) + is_large_data_segment_(false), + is_unique_segment_(false) { // The ELF ABI specifies that a PT_TLS segment always has PF_R as // the flags. @@ -3628,7 +4173,7 @@ Output_segment::maximum_alignment() if (!this->is_max_align_known_) { for (int i = 0; i < static_cast(ORDER_MAX); ++i) - { + { const Output_data_list* pdl = &this->output_lists_[i]; uint64_t addralign = Output_segment::maximum_alignment_list(pdl); if (addralign > this->max_align_) @@ -3692,7 +4237,7 @@ Output_segment::has_dynamic_reloc_list(const Output_data_list* pdl) const // and *PSHNDX. uint64_t -Output_segment::set_section_addresses(const Layout* layout, bool reset, +Output_segment::set_section_addresses(Layout* layout, bool reset, uint64_t addr, unsigned int* increase_relro, bool* has_relro, @@ -3707,7 +4252,7 @@ Output_segment::set_section_addresses(const Layout* layout, bool reset, bool in_tls = false; // If we have relro sections, we need to pad forward now so that the - // relro sections plus INCREASE_RELRO end on a common page boundary. + // relro sections plus INCREASE_RELRO end on an abi page boundary. if (parameters->options().relro() && this->is_first_section_relro() && (!this->are_addresses_set_ || reset)) @@ -3762,7 +4307,7 @@ Output_segment::set_section_addresses(const Layout* layout, bool reset, last_relro_pad = aligned_size - relro_size; *has_relro = true; - uint64_t page_align = parameters->target().common_pagesize(); + uint64_t page_align = parameters->target().abi_pagesize(); // Align to offset N such that (N + RELRO_SIZE) % PAGE_ALIGN == 0. uint64_t desired_align = page_align - (aligned_size % page_align); @@ -3839,13 +4384,16 @@ Output_segment::set_section_addresses(const Layout* layout, bool reset, // structures. uint64_t -Output_segment::set_section_list_addresses(const Layout* layout, bool reset, +Output_segment::set_section_list_addresses(Layout* layout, bool reset, Output_data_list* pdl, uint64_t addr, off_t* poff, unsigned int* pshndx, bool* in_tls) { off_t startoff = *poff; + // For incremental updates, we may allocate non-fixed sections from + // free space in the file. This keeps track of the high-water mark. + off_t maxoff = startoff; off_t off = startoff; for (Output_data_list::iterator p = pdl->begin(); @@ -3855,8 +4403,8 @@ Output_segment::set_section_list_addresses(const Layout* layout, bool reset, if (reset) (*p)->reset_address_and_file_offset(); - // When using a linker script the section will most likely - // already have an address. + // When doing an incremental update or when using a linker script, + // the section will most likely already have an address. if (!(*p)->is_address_valid()) { uint64_t align = (*p)->addralign(); @@ -3894,9 +4442,40 @@ Output_segment::set_section_list_addresses(const Layout* layout, bool reset, } } - off = align_address(off, align); - (*p)->set_address_and_file_offset(addr + (off - startoff), off); + if (!parameters->incremental_update()) + { + off = align_address(off, align); + (*p)->set_address_and_file_offset(addr + (off - startoff), off); + } + else + { + // Incremental update: allocate file space from free list. + (*p)->pre_finalize_data_size(); + off_t current_size = (*p)->current_data_size(); + off = layout->allocate(current_size, align, startoff); + if (off == -1) + { + gold_assert((*p)->output_section() != NULL); + gold_fallback(_("out of patch space for section %s; " + "relink with --incremental-full"), + (*p)->output_section()->name()); + } + (*p)->set_address_and_file_offset(addr + (off - startoff), off); + if ((*p)->data_size() > current_size) + { + gold_assert((*p)->output_section() != NULL); + gold_fallback(_("%s: section changed size; " + "relink with --incremental-full"), + (*p)->output_section()->name()); + } + } } + else if (parameters->incremental_update()) + { + // For incremental updates, use the fixed offset for the + // high-water mark computation. + off = (*p)->offset(); + } else { // The script may have inserted a skip forward, but it @@ -3930,13 +4509,24 @@ Output_segment::set_section_list_addresses(const Layout* layout, bool reset, (*p)->finalize_data_size(); } - // We want to ignore the size of a SHF_TLS or SHT_NOBITS + if (parameters->incremental_update()) + gold_debug(DEBUG_INCREMENTAL, + "set_section_list_addresses: %08lx %08lx %s", + static_cast(off), + static_cast((*p)->data_size()), + ((*p)->output_section() != NULL + ? (*p)->output_section()->name() : "(special)")); + + // We want to ignore the size of a SHF_TLS SHT_NOBITS // section. Such a section does not affect the size of a // PT_LOAD segment. if (!(*p)->is_section_flag_set(elfcpp::SHF_TLS) || !(*p)->is_section_type(elfcpp::SHT_NOBITS)) off += (*p)->data_size(); + if (off > maxoff) + maxoff = off; + if ((*p)->is_section()) { (*p)->set_out_shndx(*pshndx); @@ -3944,8 +4534,8 @@ Output_segment::set_section_list_addresses(const Layout* layout, bool reset, } } - *poff = off; - return addr + (off - startoff); + *poff = maxoff; + return addr + (maxoff - startoff); } // For a non-PT_LOAD segment, set the offset from the sections, if @@ -4027,9 +4617,17 @@ Output_segment::set_offset(unsigned int increase) // page boundary. if (this->type_ == elfcpp::PT_GNU_RELRO) { - uint64_t page_align = parameters->target().common_pagesize(); + uint64_t page_align = parameters->target().abi_pagesize(); uint64_t segment_end = this->vaddr_ + this->memsz_; - gold_assert(segment_end == align_address(segment_end, page_align)); + if (parameters->incremental_update()) + { + // The INCREASE_RELRO calculation is bypassed for an incremental + // update, so we need to adjust the segment size manually here. + segment_end = align_address(segment_end, page_align); + this->memsz_ = segment_end - this->vaddr_; + } + else + gold_assert(segment_end == align_address(segment_end, page_align)); } // If this is a TLS segment, align the memory size. The code in @@ -4056,10 +4654,10 @@ Output_segment::set_tls_offsets() (*p)->set_tls_offset(this->vaddr_); } -// Return the load address of the first section. +// Return the first section. -uint64_t -Output_segment::first_section_load_address() const +Output_section* +Output_segment::first_section() const { for (int i = 0; i < static_cast(ORDER_MAX); ++i) { @@ -4069,9 +4667,7 @@ Output_segment::first_section_load_address() const ++p) { if ((*p)->is_section()) - return ((*p)->has_load_address() - ? (*p)->load_address() - : (*p)->address()); + return (*p)->output_section(); } } gold_unreachable(); @@ -4244,36 +4840,93 @@ Output_file::Output_file(const char* name) file_size_(0), base_(NULL), map_is_anonymous_(false), + map_is_allocated_(false), is_temporary_(false) { } // Try to open an existing file. Returns false if the file doesn't -// exist, has a size of 0 or can't be mmapped. +// exist, has a size of 0 or can't be mmapped. If BASE_NAME is not +// NULL, open that file as the base for incremental linking, and +// copy its contents to the new output file. This routine can +// be called for incremental updates, in which case WRITABLE should +// be true, or by the incremental-dump utility, in which case +// WRITABLE should be false. bool -Output_file::open_for_modification() +Output_file::open_base_file(const char* base_name, bool writable) { // The name "-" means "stdout". if (strcmp(this->name_, "-") == 0) return false; + bool use_base_file = base_name != NULL; + if (!use_base_file) + base_name = this->name_; + else if (strcmp(base_name, this->name_) == 0) + gold_fatal(_("%s: incremental base and output file name are the same"), + base_name); + // Don't bother opening files with a size of zero. struct stat s; - if (::stat(this->name_, &s) != 0 || s.st_size == 0) - return false; + if (::stat(base_name, &s) != 0) + { + gold_info(_("%s: stat: %s"), base_name, strerror(errno)); + return false; + } + if (s.st_size == 0) + { + gold_info(_("%s: incremental base file is empty"), base_name); + return false; + } - int o = open_descriptor(-1, this->name_, O_RDWR, 0); + // If we're using a base file, we want to open it read-only. + if (use_base_file) + writable = false; + + int oflags = writable ? O_RDWR : O_RDONLY; + int o = open_descriptor(-1, base_name, oflags, 0); if (o < 0) - gold_fatal(_("%s: open: %s"), this->name_, strerror(errno)); + { + gold_info(_("%s: open: %s"), base_name, strerror(errno)); + return false; + } + + // If the base file and the output file are different, open a + // new output file and read the contents from the base file into + // the newly-mapped region. + if (use_base_file) + { + this->open(s.st_size); + ssize_t bytes_to_read = s.st_size; + unsigned char* p = this->base_; + while (bytes_to_read > 0) + { + ssize_t len = ::read(o, p, bytes_to_read); + if (len < 0) + { + gold_info(_("%s: read failed: %s"), base_name, strerror(errno)); + return false; + } + if (len == 0) + { + gold_info(_("%s: file too short: read only %lld of %lld bytes"), + base_name, + static_cast(s.st_size - bytes_to_read), + static_cast(s.st_size)); + return false; + } + p += len; + bytes_to_read -= len; + } + ::close(o); + return true; + } + this->o_ = o; this->file_size_ = s.st_size; - // If the file can't be mmapped, copying the content to an anonymous - // map will probably negate the performance benefits of incremental - // linking. This could be helped by using views and loading only - // the necessary parts, but this is not supported as of now. - if (!this->map_no_anonymous()) + if (!this->map_no_anonymous(writable)) { release_descriptor(o, true); this->o_ = -1; @@ -4351,10 +5004,23 @@ Output_file::resize(off_t file_size) // to unmap to flush to the file, then remap after growing the file. if (this->map_is_anonymous_) { - void* base = ::mremap(this->base_, this->file_size_, file_size, - MREMAP_MAYMOVE); - if (base == MAP_FAILED) - gold_fatal(_("%s: mremap: %s"), this->name_, strerror(errno)); + void* base; + if (!this->map_is_allocated_) + { + base = ::mremap(this->base_, this->file_size_, file_size, + MREMAP_MAYMOVE); + if (base == MAP_FAILED) + gold_fatal(_("%s: mremap: %s"), this->name_, strerror(errno)); + } + else + { + base = realloc(this->base_, file_size); + if (base == NULL) + gold_nomem(); + if (file_size > this->file_size_) + memset(static_cast(base) + this->file_size_, 0, + file_size - this->file_size_); + } this->base_ = static_cast(base); this->file_size_ = file_size; } @@ -4362,7 +5028,7 @@ Output_file::resize(off_t file_size) { this->unmap(); this->file_size_ = file_size; - if (!this->map_no_anonymous()) + if (!this->map_no_anonymous(true)) gold_fatal(_("%s: mmap: %s"), this->name_, strerror(errno)); } } @@ -4375,19 +5041,24 @@ Output_file::map_anonymous() { void* base = ::mmap(NULL, this->file_size_, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); - if (base != MAP_FAILED) + if (base == MAP_FAILED) { - this->map_is_anonymous_ = true; - this->base_ = static_cast(base); - return true; + base = malloc(this->file_size_); + if (base == NULL) + return false; + memset(base, 0, this->file_size_); + this->map_is_allocated_ = true; } - return false; + this->base_ = static_cast(base); + this->map_is_anonymous_ = true; + return true; } // Map the file into memory. Return whether the mapping succeeded. +// If WRITABLE is true, map with write access. bool -Output_file::map_no_anonymous() +Output_file::map_no_anonymous(bool writable) { const int o = this->o_; @@ -4409,12 +5080,18 @@ Output_file::map_no_anonymous() // output file will wind up incomplete, but we will have already // exited. The alternative to fallocate would be to use fdatasync, // but that would be a more significant performance hit. - if (::posix_fallocate(o, 0, this->file_size_) < 0) - gold_fatal(_("%s: %s"), this->name_, strerror(errno)); + if (writable) + { + int err = gold_fallocate(o, 0, this->file_size_); + if (err != 0) + gold_fatal(_("%s: %s"), this->name_, strerror(err)); + } // Map the file into memory. - base = ::mmap(NULL, this->file_size_, PROT_READ | PROT_WRITE, - MAP_SHARED, o, 0); + int prot = PROT_READ; + if (writable) + prot |= PROT_WRITE; + base = ::mmap(NULL, this->file_size_, prot, MAP_SHARED, o, 0); // The mmap call might fail because of file system issues: the file // system might not support mmap at all, or it might not support @@ -4432,7 +5109,8 @@ Output_file::map_no_anonymous() void Output_file::map() { - if (this->map_no_anonymous()) + if (parameters->options().mmap_output_file() + && this->map_no_anonymous(true)) return; // The mmap call might fail because of file system issues: the file @@ -4453,8 +5131,16 @@ Output_file::map() void Output_file::unmap() { - if (::munmap(this->base_, this->file_size_) < 0) - gold_error(_("%s: munmap: %s"), this->name_, strerror(errno)); + if (this->map_is_anonymous_) + { + // We've already written out the data, so there is no reason to + // waste time unmapping or freeing the memory. + } + else + { + if (::munmap(this->base_, this->file_size_) < 0) + gold_error(_("%s: munmap: %s"), this->name_, strerror(errno)); + } this->base_ = NULL; } @@ -4502,7 +5188,7 @@ template off_t Output_section::add_input_section<32, false>( Layout* layout, - Sized_relobj<32, false>* object, + Sized_relobj_file<32, false>* object, unsigned int shndx, const char* secname, const elfcpp::Shdr<32, false>& shdr, @@ -4515,7 +5201,7 @@ template off_t Output_section::add_input_section<32, true>( Layout* layout, - Sized_relobj<32, true>* object, + Sized_relobj_file<32, true>* object, unsigned int shndx, const char* secname, const elfcpp::Shdr<32, true>& shdr, @@ -4528,7 +5214,7 @@ template off_t Output_section::add_input_section<64, false>( Layout* layout, - Sized_relobj<64, false>* object, + Sized_relobj_file<64, false>* object, unsigned int shndx, const char* secname, const elfcpp::Shdr<64, false>& shdr, @@ -4541,7 +5227,7 @@ template off_t Output_section::add_input_section<64, true>( Layout* layout, - Sized_relobj<64, true>* object, + Sized_relobj_file<64, true>* object, unsigned int shndx, const char* secname, const elfcpp::Shdr<64, true>& shdr, @@ -4769,24 +5455,16 @@ template class Output_data_group<64, true>; #endif -#ifdef HAVE_TARGET_32_LITTLE template class Output_data_got<32, false>; -#endif -#ifdef HAVE_TARGET_32_BIG template class Output_data_got<32, true>; -#endif -#ifdef HAVE_TARGET_64_LITTLE template class Output_data_got<64, false>; -#endif -#ifdef HAVE_TARGET_64_BIG template class Output_data_got<64, true>; -#endif } // End namespace gold.