X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gold%2Foutput.h;h=77b6697e06724d34f0371b3530c0c894d2e64fb4;hb=ddf5db90a175756b3a5c39ee87d549d9f9d09d28;hp=6631aa1e8495f856a73b4e48aa462385fa2402a7;hpb=3aec4f9c2fe16765755d252ffe05aff9eb10bf8b;p=deliverable%2Fbinutils-gdb.git diff --git a/gold/output.h b/gold/output.h index 6631aa1e84..77b6697e06 100644 --- a/gold/output.h +++ b/gold/output.h @@ -1,6 +1,6 @@ // output.h -- manage the output file for gold -*- C++ -*- -// Copyright 2006, 2007, 2008, 2009 Free Software Foundation, Inc. +// Copyright (C) 2006-2020 Free Software Foundation, Inc. // Written by Ian Lance Taylor . // This file is part of gold. @@ -23,6 +23,7 @@ #ifndef GOLD_OUTPUT_H #define GOLD_OUTPUT_H +#include #include #include @@ -37,7 +38,6 @@ namespace gold class General_options; class Object; class Symbol; -class Output_file; class Output_merge_base; class Output_section; class Relocatable_relocs; @@ -46,61 +46,132 @@ template class Sized_target; template class Sized_relobj; +template +class Sized_relobj_file; -// This class specifies an input section. It is used as a key type -// for maps. +// This class represents the output file. -class Input_section_specifier +class Output_file { public: - Input_section_specifier(const Relobj* relobj, unsigned int shndx) - : relobj_(relobj), shndx_(shndx) - { } - - // Return Relobj of this. - const Relobj* - relobj() const - { return this->relobj_; } + Output_file(const char* name); - // Return section index of this. - unsigned int - shndx() const - { return this->shndx_; } + // Indicate that this is a temporary file which should not be + // output. + void + set_is_temporary() + { this->is_temporary_ = true; } - // Whether this equals to another specifier ISS. + // Try to open an existing file. Returns false if the file doesn't + // exist, has a size of 0 or can't be mmaped. This method is + // thread-unsafe. If BASE_NAME is not NULL, use the contents of + // that file as the base for incremental linking. bool - eq(const Input_section_specifier& iss) const - { return this->relobj_ == iss.relobj_ && this->shndx_ == iss.shndx_; } + open_base_file(const char* base_name, bool writable); - // Compute a hash value of this. - size_t - hash_value() const - { - return (gold::string_hash(this->relobj_->name().c_str()) - ^ this->shndx_); - } + // Open the output file. FILE_SIZE is the final size of the file. + // If the file already exists, it is deleted/truncated. This method + // is thread-unsafe. + void + open(off_t file_size); - // Functors for containers. - struct equal_to - { - bool - operator()(const Input_section_specifier& iss1, - const Input_section_specifier& iss2) const - { return iss1.eq(iss2); } - }; - - struct hash + // Resize the output file. This method is thread-unsafe. + void + resize(off_t file_size); + + // Close the output file (flushing all buffered data) and make sure + // there are no errors. This method is thread-unsafe. + void + close(); + + // Return the size of this file. + off_t + filesize() + { return this->file_size_; } + + // Return the name of this file. + const char* + filename() + { return this->name_; } + + // We currently always use mmap which makes the view handling quite + // simple. In the future we may support other approaches. + + // Write data to the output file. + void + write(off_t offset, const void* data, size_t len) + { memcpy(this->base_ + offset, data, len); } + + // Get a buffer to use to write to the file, given the offset into + // the file and the size. + unsigned char* + get_output_view(off_t start, size_t size) { - size_t - operator()(const Input_section_specifier& iss) const - { return iss.hash_value(); } - }; + gold_assert(start >= 0 + && start + static_cast(size) <= this->file_size_); + return this->base_ + start; + } + + // VIEW must have been returned by get_output_view. Write the + // buffer to the file, passing in the offset and the size. + void + write_output_view(off_t, size_t, unsigned char*) + { } + + // Get a read/write buffer. This is used when we want to write part + // of the file, read it in, and write it again. + unsigned char* + get_input_output_view(off_t start, size_t size) + { return this->get_output_view(start, size); } + + // Write a read/write buffer back to the file. + void + write_input_output_view(off_t, size_t, unsigned char*) + { } + + // Get a read buffer. This is used when we just want to read part + // of the file back it in. + const unsigned char* + get_input_view(off_t start, size_t size) + { return this->get_output_view(start, size); } + + // Release a read bfufer. + void + free_input_view(off_t, size_t, const unsigned char*) + { } private: - // An object. - const Relobj* relobj_; - // A section index. - unsigned int shndx_; + // Map the file into memory or, if that fails, allocate anonymous + // memory. + void + map(); + + // Allocate anonymous memory for the file. + bool + map_anonymous(); + + // Map the file into memory. + bool + map_no_anonymous(bool); + + // Unmap the file from memory (and flush to disk buffers). + void + unmap(); + + // File name. + const char* name_; + // File descriptor. + int o_; + // File size. + off_t file_size_; + // Base of file mapped into memory. + unsigned char* base_; + // True iff base_ points to a memory buffer rather than an output file. + bool map_is_anonymous_; + // True if base_ was allocated using new rather than mmap. + bool map_is_allocated_; + // True if this is a temporary file which should not be output. + bool is_temporary_; }; // An abtract class for data which has to go into the output file. @@ -112,7 +183,7 @@ class Output_data : address_(0), data_size_(0), offset_(-1), is_address_valid_(false), is_data_size_valid_(false), is_offset_valid_(false), is_data_size_fixed_(false), - dynamic_reloc_count_(0) + has_dynamic_reloc_(false) { } virtual @@ -137,11 +208,16 @@ class Output_data return this->data_size_; } + // Get the current data size. + off_t + current_data_size() const + { return this->current_data_size_for_child(); } + // Return true if data size is fixed. bool is_data_size_fixed() const { return this->is_data_size_fixed_; } - + // Return the file offset. This is only valid after // Layout::finalize is finished. For some non-allocated sections, // it may not be valid until near the end of the link. @@ -152,8 +228,8 @@ class Output_data return this->offset_; } - // Reset the address and file offset. This essentially disables the - // sanity testing about duplicate and unknown settings. + // Reset the address, file offset and data size. This essentially + // disables the sanity testing about duplicate and unknown settings. void reset_address_and_file_offset() { @@ -164,6 +240,14 @@ class Output_data this->do_reset_address_and_file_offset(); } + // As above, but just for data size. + void + reset_data_size() + { + if (!this->is_data_size_fixed_) + this->is_data_size_valid_ = false; + } + // Return true if address and file offset already have reset values. In // other words, calling reset_address_and_file_offset will not change them. bool @@ -206,6 +290,10 @@ class Output_data output_section() { return this->do_output_section(); } + const Output_section* + output_section() const + { return this->do_output_section(); } + // Return the output section index, if there is an output section. unsigned int out_shndx() const @@ -245,6 +333,17 @@ class Output_data this->is_offset_valid_ = true; } + // Update the data size without finalizing it. + void + pre_finalize_data_size() + { + if (!this->is_data_size_valid_) + { + // Tell the child class to update the data size. + this->update_data_size(); + } + } + // Finalize the data size. void finalize_data_size() @@ -285,15 +384,15 @@ class Output_data is_layout_complete() { return Output_data::allocated_sizes_are_fixed; } - // Count the number of dynamic relocations applied to this section. + // Note that a dynamic reloc has been applied to this data. void add_dynamic_reloc() - { ++this->dynamic_reloc_count_; } + { this->has_dynamic_reloc_ = true; } - // Return the number of dynamic relocations applied to this section. - unsigned int - dynamic_reloc_count() const - { return this->dynamic_reloc_count_; } + // Return whether a dynamic reloc has been applied. + bool + has_dynamic_reloc() const + { return this->has_dynamic_reloc_; } // Whether the address is valid. bool @@ -358,6 +457,10 @@ class Output_data do_output_section() { return NULL; } + virtual const Output_section* + do_output_section() const + { return NULL; } + // Return the output section index, if there is an output section. virtual unsigned int do_out_shndx() const @@ -368,6 +471,17 @@ class Output_data do_set_out_shndx(unsigned int) { gold_unreachable(); } + // This is a hook for derived classes to set the preliminary data size. + // This is called by pre_finalize_data_size, normally called during + // Layout::finalize, before the section address is set, and is used + // during an incremental update, when we need to know the size of a + // section before allocating space in the output file. For classes + // where the current data size is up to date, this default version of + // the method can be inherited. + virtual void + update_data_size() + { } + // This is a hook for derived classes to set the data size. This is // called by finalize_data_size, normally called during // Layout::finalize, when the section address is set. @@ -425,7 +539,7 @@ class Output_data } // Fix the data size. Once it is fixed, it cannot be changed - // and the data size remains always valid. + // and the data size remains always valid. void fix_data_size() { @@ -472,15 +586,15 @@ class Output_data // File offset of contents in output file. off_t offset_; // Whether address_ is valid. - bool is_address_valid_; + bool is_address_valid_ : 1; // Whether data_size_ is valid. - bool is_data_size_valid_; + bool is_data_size_valid_ : 1; // Whether offset_ is valid. - bool is_offset_valid_; + bool is_offset_valid_ : 1; // Whether data size is fixed. - bool is_data_size_fixed_; - // Count of dynamic relocations applied to this section. - unsigned int dynamic_reloc_count_; + bool is_data_size_fixed_ : 1; + // Whether any dynamic relocs have been applied to this section. + bool has_dynamic_reloc_ : 1; }; // Output the section headers. @@ -510,6 +624,11 @@ class Output_section_headers : public Output_data do_print_to_mapfile(Mapfile* mapfile) const { mapfile->print_output_data(this, _("** section headers")); } + // Update the data size. + void + update_data_size() + { this->set_data_size(this->do_size()); } + // Set final data size. void set_final_data_size() @@ -578,10 +697,9 @@ class Output_segment_headers : public Output_data class Output_file_header : public Output_data { public: - Output_file_header(const Target*, + Output_file_header(Target*, const Symbol_table*, - const Output_segment_headers*, - const char* entry); + const Output_segment_headers*); // Add information about the section headers. We lay out the ELF // file header before we create the section headers. @@ -623,12 +741,11 @@ class Output_file_header : public Output_data off_t do_size() const; - const Target* target_; + Target* target_; const Symbol_table* symtab_; const Output_segment_headers* segment_header_; const Output_section_headers* section_header_; const Output_section* shstrtab_; - const char* entry_; }; // Output sections are mainly comprised of input sections. However, @@ -653,6 +770,10 @@ class Output_section_data : public Output_data { } // Return the output section. + Output_section* + output_section() + { return this->output_section_; } + const Output_section* output_section() const { return this->output_section_; } @@ -676,16 +797,9 @@ class Output_section_data : public Output_data bool output_offset(const Relobj* object, unsigned int shndx, section_offset_type offset, - section_offset_type *poutput) const + section_offset_type* poutput) const { return this->do_output_offset(object, shndx, offset, poutput); } - // Return whether this is the merge section for the input section - // SHNDX in OBJECT. This should return true when output_offset - // would return true for some values of OFFSET. - bool - is_merge_section_for(const Relobj* object, unsigned int shndx) const - { return this->do_is_merge_section_for(object, shndx); } - // Write the contents to a buffer. This is used for sections which // require postprocessing, such as compression. void @@ -719,11 +833,6 @@ class Output_section_data : public Output_data section_offset_type*) const { return false; } - // The child class may implement is_merge_section_for. - virtual bool - do_is_merge_section_for(const Relobj*, unsigned int) const - { return false; } - // The child class may implement write_to_buffer. Most child // classes can not appear in a compressed section, and they do not // implement this. @@ -746,6 +855,10 @@ class Output_section_data : public Output_data do_output_section() { return this->output_section_; } + const Output_section* + do_output_section() const + { return this->output_section_; } + // Return the section index of the output section. unsigned int do_out_shndx() const; @@ -772,10 +885,9 @@ class Output_section_data_build : public Output_section_data : Output_section_data(addralign) { } - // Get the current data size. - off_t - current_data_size() const - { return this->current_data_size_for_child(); } + Output_section_data_build(off_t data_size, uint64_t addralign) + : Output_section_data(data_size, addralign, false) + { } // Set the current data size. void @@ -903,6 +1015,12 @@ class Output_data_space : public Output_section_data_build map_name_(map_name) { } + explicit Output_data_space(off_t data_size, uint64_t addralign, + const char* map_name) + : Output_section_data_build(data_size, addralign), + map_name_(map_name) + { } + // Set the alignment. void set_space_alignment(uint64_t align) @@ -958,6 +1076,12 @@ class Output_data_strtab : public Output_section_data { } protected: + // This is called to update the section size prior to assigning + // the address and file offset. + void + update_data_size() + { this->set_final_data_size(); } + // This is called to set the address and file offset. Here we make // sure that the Stringpool is finalized. void @@ -1018,46 +1142,95 @@ class Output_reloc // A reloc against a global symbol. Output_reloc(Symbol* gsym, unsigned int type, Output_data* od, - Address address, bool is_relative); + Address address, bool is_relative, bool is_symbolless, + bool use_plt_offset); Output_reloc(Symbol* gsym, unsigned int type, - Sized_relobj* relobj, - unsigned int shndx, Address address, bool is_relative); + Sized_relobj* relobj, + unsigned int shndx, Address address, bool is_relative, + bool is_symbolless, bool use_plt_offset); // A reloc against a local symbol or local section symbol. Output_reloc(Sized_relobj* relobj, unsigned int local_sym_index, unsigned int type, Output_data* od, Address address, bool is_relative, - bool is_section_symbol); + bool is_symbolless, bool is_section_symbol, + bool use_plt_offset); Output_reloc(Sized_relobj* relobj, unsigned int local_sym_index, unsigned int type, unsigned int shndx, Address address, bool is_relative, - bool is_section_symbol); + bool is_symbolless, bool is_section_symbol, + bool use_plt_offset); // A reloc against the STT_SECTION symbol of an output section. Output_reloc(Output_section* os, unsigned int type, Output_data* od, - Address address); + Address address, bool is_relative); Output_reloc(Output_section* os, unsigned int type, - Sized_relobj* relobj, + Sized_relobj* relobj, unsigned int shndx, + Address address, bool is_relative); + + // An absolute or relative relocation with no symbol. + + Output_reloc(unsigned int type, Output_data* od, Address address, + bool is_relative); + + Output_reloc(unsigned int type, Sized_relobj* relobj, + unsigned int shndx, Address address, bool is_relative); + + // A target specific relocation. The target will be called to get + // the symbol index, passing ARG. The type and offset will be set + // as for other relocation types. + + Output_reloc(unsigned int type, void* arg, Output_data* od, + Address address); + + Output_reloc(unsigned int type, void* arg, + Sized_relobj* relobj, unsigned int shndx, Address address); - // Return TRUE if this is a RELATIVE relocation. + // Return the reloc type. + unsigned int + type() const + { return this->type_; } + + // Return whether this is a RELATIVE relocation. bool is_relative() const { return this->is_relative_; } + // Return whether this is a relocation which should not use + // a symbol, but which obtains its addend from a symbol. + bool + is_symbolless() const + { return this->is_symbolless_; } + // Return whether this is against a local section symbol. bool is_local_section_symbol() const { return (this->local_sym_index_ != GSYM_CODE - && this->local_sym_index_ != SECTION_CODE - && this->local_sym_index_ != INVALID_CODE - && this->is_section_symbol_); + && this->local_sym_index_ != SECTION_CODE + && this->local_sym_index_ != INVALID_CODE + && this->local_sym_index_ != TARGET_CODE + && this->is_section_symbol_); + } + + // Return whether this is a target specific relocation. + bool + is_target_specific() const + { return this->local_sym_index_ == TARGET_CODE; } + + // Return the argument to pass to the target for a target specific + // relocation. + void* + target_arg() const + { + gold_assert(this->local_sym_index_ == TARGET_CODE); + return this->u1_.arg; } // For a local section symbol, return the offset of the input @@ -1071,6 +1244,16 @@ class Output_reloc Address symbol_value(Addend addend) const; + // If this relocation is against an input section, return the + // relocatable object containing the input section. + Sized_relobj* + get_relobj() const + { + if (this->shndx_ == INVALID_CODE) + return NULL; + return this->u2_.relobj; + } + // Write the reloc entry to an output view. void write(unsigned char* pov) const; @@ -1092,11 +1275,6 @@ class Output_reloc r2) const { return this->compare(r2) < 0; } - private: - // Record that we need a dynamic symbol index. - void - set_needs_dynsym_index(); - // Return the symbol index. unsigned int get_symbol_index() const; @@ -1105,6 +1283,11 @@ class Output_reloc Address get_address() const; + private: + // Record that we need a dynamic symbol index. + void + set_needs_dynsym_index(); + // Codes for local_sym_index_. enum { @@ -1112,8 +1295,10 @@ class Output_reloc GSYM_CODE = -1U, // Output section. SECTION_CODE = -2U, + // Target specific. + TARGET_CODE = -3U, // Invalid uninitialized entry. - INVALID_CODE = -3U + INVALID_CODE = -4U }; union @@ -1131,6 +1316,9 @@ class Output_reloc // For a relocation against an output section // (this->local_sym_index_ == SECTION_CODE), the output section. Output_section* os; + // For a target specific relocation, an argument to pass to the + // target. + void* arg; } u1_; union { @@ -1145,18 +1333,25 @@ class Output_reloc // The address offset within the input section or the Output_data. Address address_; // This is GSYM_CODE for a global symbol, or SECTION_CODE for a - // relocation against an output section, or INVALID_CODE for an - // uninitialized value. Otherwise, for a local symbol - // (this->is_section_symbol_ is false), the local symbol index. For - // a local section symbol (this->is_section_symbol_ is true), the - // section index in the input file. + // relocation against an output section, or TARGET_CODE for a target + // specific relocation, or INVALID_CODE for an uninitialized value. + // Otherwise, for a local symbol (this->is_section_symbol_ is + // false), the local symbol index. For a local section symbol + // (this->is_section_symbol_ is true), the section index in the + // input file. unsigned int local_sym_index_; // The reloc type--a processor specific code. - unsigned int type_ : 30; + unsigned int type_ : 28; // True if the relocation is a RELATIVE relocation. bool is_relative_ : 1; + // True if the relocation is one which should not use + // a symbol, but which obtains its addend from a symbol. + bool is_symbolless_ : 1; // True if the relocation is against a section symbol. bool is_section_symbol_ : 1; + // True if the addend should be the PLT offset. + // (Used only for RELA, but stored here for space.) + bool use_plt_offset_ : 1; // If the reloc address is an input section in an object, the // section index. This is INVALID_CODE if the reloc address is // specified in some other way. @@ -1181,15 +1376,19 @@ class Output_reloc // A reloc against a global symbol. Output_reloc(Symbol* gsym, unsigned int type, Output_data* od, - Address address, Addend addend, bool is_relative) - : rel_(gsym, type, od, address, is_relative), addend_(addend) + Address address, Addend addend, bool is_relative, + bool is_symbolless, bool use_plt_offset) + : rel_(gsym, type, od, address, is_relative, is_symbolless, + use_plt_offset), + addend_(addend) { } Output_reloc(Symbol* gsym, unsigned int type, - Sized_relobj* relobj, + Sized_relobj* relobj, unsigned int shndx, Address address, Addend addend, - bool is_relative) - : rel_(gsym, type, relobj, shndx, address, is_relative), addend_(addend) + bool is_relative, bool is_symbolless, bool use_plt_offset) + : rel_(gsym, type, relobj, shndx, address, is_relative, + is_symbolless, use_plt_offset), addend_(addend) { } // A reloc against a local symbol. @@ -1197,34 +1396,84 @@ class Output_reloc Output_reloc(Sized_relobj* relobj, unsigned int local_sym_index, unsigned int type, Output_data* od, Address address, - Addend addend, bool is_relative, bool is_section_symbol) + Addend addend, bool is_relative, + bool is_symbolless, bool is_section_symbol, + bool use_plt_offset) : rel_(relobj, local_sym_index, type, od, address, is_relative, - is_section_symbol), + is_symbolless, is_section_symbol, use_plt_offset), addend_(addend) { } Output_reloc(Sized_relobj* relobj, unsigned int local_sym_index, unsigned int type, unsigned int shndx, Address address, - Addend addend, bool is_relative, bool is_section_symbol) + Addend addend, bool is_relative, + bool is_symbolless, bool is_section_symbol, + bool use_plt_offset) : rel_(relobj, local_sym_index, type, shndx, address, is_relative, - is_section_symbol), + is_symbolless, is_section_symbol, use_plt_offset), addend_(addend) { } // A reloc against the STT_SECTION symbol of an output section. Output_reloc(Output_section* os, unsigned int type, Output_data* od, - Address address, Addend addend) - : rel_(os, type, od, address), addend_(addend) + Address address, Addend addend, bool is_relative) + : rel_(os, type, od, address, is_relative), addend_(addend) { } Output_reloc(Output_section* os, unsigned int type, - Sized_relobj* relobj, + Sized_relobj* relobj, + unsigned int shndx, Address address, Addend addend, + bool is_relative) + : rel_(os, type, relobj, shndx, address, is_relative), addend_(addend) + { } + + // An absolute or relative relocation with no symbol. + + Output_reloc(unsigned int type, Output_data* od, Address address, + Addend addend, bool is_relative) + : rel_(type, od, address, is_relative), addend_(addend) + { } + + Output_reloc(unsigned int type, Sized_relobj* relobj, + unsigned int shndx, Address address, Addend addend, + bool is_relative) + : rel_(type, relobj, shndx, address, is_relative), addend_(addend) + { } + + // A target specific relocation. The target will be called to get + // the symbol index and the addend, passing ARG. The type and + // offset will be set as for other relocation types. + + Output_reloc(unsigned int type, void* arg, Output_data* od, + Address address, Addend addend) + : rel_(type, arg, od, address), addend_(addend) + { } + + Output_reloc(unsigned int type, void* arg, + Sized_relobj* relobj, unsigned int shndx, Address address, Addend addend) - : rel_(os, type, relobj, shndx, address), addend_(addend) + : rel_(type, arg, relobj, shndx, address), addend_(addend) { } + // Return whether this is a RELATIVE relocation. + bool + is_relative() const + { return this->rel_.is_relative(); } + + // Return whether this is a relocation which should not use + // a symbol, but which obtains its addend from a symbol. + bool + is_symbolless() const + { return this->rel_.is_symbolless(); } + + // If this relocation is against an input section, return the + // relocatable object containing the input section. + Sized_relobj* + get_relobj() const + { return this->rel_.get_relobj(); } + // Write the reloc entry to an output view. void write(unsigned char* pov) const; @@ -1251,26 +1500,111 @@ class Output_reloc Addend addend_; }; -// Output_data_reloc is used to manage a section containing relocs. -// SH_TYPE is either elfcpp::SHT_REL or elfcpp::SHT_RELA. DYNAMIC -// indicates whether this is a dynamic relocation or a normal -// relocation. Output_data_reloc_base is a base class. -// Output_data_reloc is the real class, which we specialize based on -// the reloc type. +// Output_data_reloc_generic is a non-template base class for +// Output_data_reloc_base. This gives the generic code a way to hold +// a pointer to a reloc section. -template -class Output_data_reloc_base : public Output_section_data_build +class Output_data_reloc_generic : public Output_section_data_build { public: - typedef Output_reloc Output_reloc_type; - typedef typename Output_reloc_type::Address Address; - static const int reloc_size = - Reloc_types::reloc_size; - - // Construct the section. - Output_data_reloc_base(bool sort_relocs) + Output_data_reloc_generic(int size, bool sort_relocs) : Output_section_data_build(Output_data::default_alignment_for_size(size)), - sort_relocs_(sort_relocs) + relative_reloc_count_(0), sort_relocs_(sort_relocs) + { } + + // Return the number of relative relocs in this section. + size_t + relative_reloc_count() const + { return this->relative_reloc_count_; } + + // Whether we should sort the relocs. + bool + sort_relocs() const + { return this->sort_relocs_; } + + // Add a reloc of type TYPE against the global symbol GSYM. The + // relocation applies to the data at offset ADDRESS within OD. + virtual void + add_global_generic(Symbol* gsym, unsigned int type, Output_data* od, + uint64_t address, uint64_t addend) = 0; + + // Add a reloc of type TYPE against the global symbol GSYM. The + // relocation applies to data at offset ADDRESS within section SHNDX + // of object file RELOBJ. OD is the associated output section. + virtual void + add_global_generic(Symbol* gsym, unsigned int type, Output_data* od, + Relobj* relobj, unsigned int shndx, uint64_t address, + uint64_t addend) = 0; + + // Add a reloc of type TYPE against the local symbol LOCAL_SYM_INDEX + // in RELOBJ. The relocation applies to the data at offset ADDRESS + // within OD. + virtual void + add_local_generic(Relobj* relobj, unsigned int local_sym_index, + unsigned int type, Output_data* od, uint64_t address, + uint64_t addend) = 0; + + // Add a reloc of type TYPE against the local symbol LOCAL_SYM_INDEX + // in RELOBJ. The relocation applies to the data at offset ADDRESS + // within section SHNDX of RELOBJ. OD is the associated output + // section. + virtual void + add_local_generic(Relobj* relobj, unsigned int local_sym_index, + unsigned int type, Output_data* od, unsigned int shndx, + uint64_t address, uint64_t addend) = 0; + + // Add a reloc of type TYPE against the STT_SECTION symbol of the + // output section OS. The relocation applies to the data at offset + // ADDRESS within OD. + virtual void + add_output_section_generic(Output_section *os, unsigned int type, + Output_data* od, uint64_t address, + uint64_t addend) = 0; + + // Add a reloc of type TYPE against the STT_SECTION symbol of the + // output section OS. The relocation applies to the data at offset + // ADDRESS within section SHNDX of RELOBJ. OD is the associated + // output section. + virtual void + add_output_section_generic(Output_section* os, unsigned int type, + Output_data* od, Relobj* relobj, + unsigned int shndx, uint64_t address, + uint64_t addend) = 0; + + protected: + // Note that we've added another relative reloc. + void + bump_relative_reloc_count() + { ++this->relative_reloc_count_; } + + private: + // The number of relative relocs added to this section. This is to + // support DT_RELCOUNT. + size_t relative_reloc_count_; + // Whether to sort the relocations when writing them out, to make + // the dynamic linker more efficient. + bool sort_relocs_; +}; + +// Output_data_reloc is used to manage a section containing relocs. +// SH_TYPE is either elfcpp::SHT_REL or elfcpp::SHT_RELA. DYNAMIC +// indicates whether this is a dynamic relocation or a normal +// relocation. Output_data_reloc_base is a base class. +// Output_data_reloc is the real class, which we specialize based on +// the reloc type. + +template +class Output_data_reloc_base : public Output_data_reloc_generic +{ + public: + typedef Output_reloc Output_reloc_type; + typedef typename Output_reloc_type::Address Address; + static const int reloc_size = + Reloc_types::reloc_size; + + // Construct the section. + Output_data_reloc_base(bool sort_relocs) + : Output_data_reloc_generic(size, sort_relocs) { } protected: @@ -1278,9 +1612,43 @@ class Output_data_reloc_base : public Output_section_data_build void do_write(Output_file*); + // Generic implementation of do_write, allowing a customized + // class for writing the output relocation (e.g., for MIPS-64). + template + void + do_write_generic(Output_file* of) + { + 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); + + if (this->sort_relocs()) + { + gold_assert(dynamic); + std::sort(this->relocs_.begin(), this->relocs_.end(), + Sort_relocs_comparison()); + } + + unsigned char* pov = oview; + for (typename Relocs::const_iterator p = this->relocs_.begin(); + p != this->relocs_.end(); + ++p) + { + Output_reloc_writer::write(p, pov); + pov += reloc_size; + } + + gold_assert(pov - oview == oview_size); + + of->write_output_view(off, oview_size, oview); + + // We no longer need the relocation entries. + this->relocs_.clear(); + } + // Set the entry size and the link. void - do_adjust_output_section(Output_section *os); + do_adjust_output_section(Output_section* os); // Write to a map file. void @@ -1294,11 +1662,17 @@ class Output_data_reloc_base : public Output_section_data_build // Add a relocation entry. void - add(Output_data *od, const Output_reloc_type& reloc) + add(Output_data* od, const Output_reloc_type& reloc) { this->relocs_.push_back(reloc); this->set_current_data_size(this->relocs_.size() * reloc_size); - od->add_dynamic_reloc(); + if (dynamic) + od->add_dynamic_reloc(); + if (reloc.is_relative()) + this->bump_relative_reloc_count(); + Sized_relobj* relobj = reloc.get_relobj(); + if (relobj != NULL) + relobj->add_dyn_reloc(this->relocs_.size() - 1); } private: @@ -1314,9 +1688,6 @@ class Output_data_reloc_base : public Output_section_data_build // The relocations in this section. Relocs relocs_; - // Whether to sort the relocations when writing them out, to make - // the dynamic linker more efficient. - bool sort_relocs_; }; // The class which callers actually create. @@ -1346,32 +1717,41 @@ class Output_data_reloc void add_global(Symbol* gsym, unsigned int type, Output_data* od, Address address) - { this->add(od, Output_reloc_type(gsym, type, od, address, false)); } + { + this->add(od, Output_reloc_type(gsym, type, od, address, + false, false, false)); + } void add_global(Symbol* gsym, unsigned int type, Output_data* od, - Sized_relobj* relobj, + Sized_relobj* relobj, unsigned int shndx, Address address) - { this->add(od, Output_reloc_type(gsym, type, relobj, shndx, address, - false)); } - - // These are to simplify the Copy_relocs class. + { + this->add(od, Output_reloc_type(gsym, type, relobj, shndx, address, + false, false, false)); + } void - add_global(Symbol* gsym, unsigned int type, Output_data* od, Address address, - Address addend) + add_global_generic(Symbol* gsym, unsigned int type, Output_data* od, + uint64_t address, uint64_t addend) { gold_assert(addend == 0); - this->add_global(gsym, type, od, address); + this->add(od, Output_reloc_type(gsym, type, od, + convert_types(address), + false, false, false)); } void - add_global(Symbol* gsym, unsigned int type, Output_data* od, - Sized_relobj* relobj, - unsigned int shndx, Address address, Address addend) + add_global_generic(Symbol* gsym, unsigned int type, Output_data* od, + Relobj* relobj, unsigned int shndx, uint64_t address, + uint64_t addend) { gold_assert(addend == 0); - this->add_global(gsym, type, od, relobj, shndx, address); + Sized_relobj* sized_relobj = + static_cast*>(relobj); + this->add(od, Output_reloc_type(gsym, type, sized_relobj, shndx, + convert_types(address), + false, false, false)); } // Add a RELATIVE reloc against a global symbol. The final relocation @@ -1379,16 +1759,40 @@ class Output_data_reloc void add_global_relative(Symbol* gsym, unsigned int type, Output_data* od, - Address address) - { this->add(od, Output_reloc_type(gsym, type, od, address, true)); } + Address address) + { + this->add(od, Output_reloc_type(gsym, type, od, address, true, true, + false)); + } void add_global_relative(Symbol* gsym, unsigned int type, Output_data* od, - Sized_relobj* relobj, - unsigned int shndx, Address address) + Sized_relobj* relobj, + unsigned int shndx, Address address) + { + this->add(od, Output_reloc_type(gsym, type, relobj, shndx, address, + true, true, false)); + } + + // Add a global relocation which does not use a symbol for the relocation, + // but which gets its addend from a symbol. + + void + add_symbolless_global_addend(Symbol* gsym, unsigned int type, + Output_data* od, Address address) + { + this->add(od, Output_reloc_type(gsym, type, od, address, false, true, + false)); + } + + void + add_symbolless_global_addend(Symbol* gsym, unsigned int type, + Output_data* od, + Sized_relobj* relobj, + unsigned int shndx, Address address) { this->add(od, Output_reloc_type(gsym, type, relobj, shndx, address, - true)); + false, true, false)); } // Add a reloc against a local symbol. @@ -1399,7 +1803,7 @@ class Output_data_reloc Output_data* od, Address address) { this->add(od, Output_reloc_type(relobj, local_sym_index, type, od, - address, false, false)); + address, false, false, false, false)); } void @@ -1408,27 +1812,86 @@ class Output_data_reloc Output_data* od, unsigned int shndx, Address address) { this->add(od, Output_reloc_type(relobj, local_sym_index, type, shndx, - address, false, false)); + address, false, false, false, false)); + } + + void + add_local_generic(Relobj* relobj, unsigned int local_sym_index, + unsigned int type, Output_data* od, uint64_t address, + uint64_t addend) + { + gold_assert(addend == 0); + Sized_relobj* sized_relobj = + static_cast *>(relobj); + this->add(od, Output_reloc_type(sized_relobj, local_sym_index, type, od, + convert_types(address), + false, false, false, false)); + } + + void + add_local_generic(Relobj* relobj, unsigned int local_sym_index, + unsigned int type, Output_data* od, unsigned int shndx, + uint64_t address, uint64_t addend) + { + gold_assert(addend == 0); + Sized_relobj* sized_relobj = + static_cast*>(relobj); + this->add(od, Output_reloc_type(sized_relobj, local_sym_index, type, shndx, + convert_types(address), + false, false, false, false)); } // Add a RELATIVE reloc against a local symbol. void add_local_relative(Sized_relobj* relobj, - unsigned int local_sym_index, unsigned int type, - Output_data* od, Address address) + unsigned int local_sym_index, unsigned int type, + Output_data* od, Address address) { this->add(od, Output_reloc_type(relobj, local_sym_index, type, od, - address, true, false)); + address, true, true, false, false)); + } + + void + add_local_relative(Sized_relobj* relobj, + unsigned int local_sym_index, unsigned int type, + Output_data* od, unsigned int shndx, Address address) + { + this->add(od, Output_reloc_type(relobj, local_sym_index, type, shndx, + address, true, true, false, false)); } void add_local_relative(Sized_relobj* relobj, - unsigned int local_sym_index, unsigned int type, - Output_data* od, unsigned int shndx, Address address) + unsigned int local_sym_index, unsigned int type, + Output_data* od, unsigned int shndx, Address address, + bool use_plt_offset) + { + this->add(od, Output_reloc_type(relobj, local_sym_index, type, shndx, + address, true, true, false, + use_plt_offset)); + } + + // Add a local relocation which does not use a symbol for the relocation, + // but which gets its addend from a symbol. + + void + add_symbolless_local_addend(Sized_relobj* relobj, + unsigned int local_sym_index, unsigned int type, + Output_data* od, Address address) + { + this->add(od, Output_reloc_type(relobj, local_sym_index, type, od, + address, false, true, false, false)); + } + + void + add_symbolless_local_addend(Sized_relobj* relobj, + unsigned int local_sym_index, unsigned int type, + Output_data* od, unsigned int shndx, + Address address) { this->add(od, Output_reloc_type(relobj, local_sym_index, type, shndx, - address, true, false)); + address, false, true, false, false)); } // Add a reloc against a local section symbol. This will be @@ -1437,20 +1900,20 @@ class Output_data_reloc void add_local_section(Sized_relobj* relobj, - unsigned int input_shndx, unsigned int type, - Output_data* od, Address address) + unsigned int input_shndx, unsigned int type, + Output_data* od, Address address) { this->add(od, Output_reloc_type(relobj, input_shndx, type, od, - address, false, true)); + address, false, false, true, false)); } void add_local_section(Sized_relobj* relobj, - unsigned int input_shndx, unsigned int type, - Output_data* od, unsigned int shndx, Address address) + unsigned int input_shndx, unsigned int type, + Output_data* od, unsigned int shndx, Address address) { this->add(od, Output_reloc_type(relobj, input_shndx, type, shndx, - address, false, true)); + address, false, false, true, false)); } // A reloc against the STT_SECTION symbol of an output section. @@ -1460,13 +1923,90 @@ class Output_data_reloc void add_output_section(Output_section* os, unsigned int type, Output_data* od, Address address) - { this->add(od, Output_reloc_type(os, type, od, address)); } + { this->add(od, Output_reloc_type(os, type, od, address, false)); } void add_output_section(Output_section* os, unsigned int type, Output_data* od, Sized_relobj* relobj, - unsigned int shndx, Address address) - { this->add(od, Output_reloc_type(os, type, relobj, shndx, address)); } + unsigned int shndx, Address address) + { this->add(od, Output_reloc_type(os, type, relobj, shndx, address, false)); } + + void + add_output_section_generic(Output_section* os, unsigned int type, + Output_data* od, uint64_t address, + uint64_t addend) + { + gold_assert(addend == 0); + this->add(od, Output_reloc_type(os, type, od, + convert_types(address), + false)); + } + + void + add_output_section_generic(Output_section* os, unsigned int type, + Output_data* od, Relobj* relobj, + unsigned int shndx, uint64_t address, + uint64_t addend) + { + gold_assert(addend == 0); + Sized_relobj* sized_relobj = + static_cast*>(relobj); + this->add(od, Output_reloc_type(os, type, sized_relobj, shndx, + convert_types(address), + false)); + } + + // As above, but the reloc TYPE is relative + + void + add_output_section_relative(Output_section* os, unsigned int type, + Output_data* od, Address address) + { this->add(od, Output_reloc_type(os, type, od, address, true)); } + + void + add_output_section_relative(Output_section* os, unsigned int type, + Output_data* od, + Sized_relobj* relobj, + unsigned int shndx, Address address) + { this->add(od, Output_reloc_type(os, type, relobj, shndx, address, true)); } + + // Add an absolute relocation. + + void + add_absolute(unsigned int type, Output_data* od, Address address) + { this->add(od, Output_reloc_type(type, od, address, false)); } + + void + add_absolute(unsigned int type, Output_data* od, + Sized_relobj* relobj, + unsigned int shndx, Address address) + { this->add(od, Output_reloc_type(type, relobj, shndx, address, false)); } + + // Add a relative relocation + + void + add_relative(unsigned int type, Output_data* od, Address address) + { this->add(od, Output_reloc_type(type, od, address, true)); } + + void + add_relative(unsigned int type, Output_data* od, + Sized_relobj* relobj, + unsigned int shndx, Address address) + { this->add(od, Output_reloc_type(type, relobj, shndx, address, true)); } + + // Add a target specific relocation. A target which calls this must + // define the reloc_symbol_index and reloc_addend virtual functions. + + void + add_target_specific(unsigned int type, void* arg, Output_data* od, + Address address) + { this->add(od, Output_reloc_type(type, arg, od, address)); } + + void + add_target_specific(unsigned int type, void* arg, Output_data* od, + Sized_relobj* relobj, + unsigned int shndx, Address address) + { this->add(od, Output_reloc_type(type, arg, relobj, shndx, address)); } }; // The SHT_RELA version of Output_data_reloc. @@ -1493,16 +2033,43 @@ class Output_data_reloc void add_global(Symbol* gsym, unsigned int type, Output_data* od, Address address, Addend addend) - { this->add(od, Output_reloc_type(gsym, type, od, address, addend, - false)); } + { + this->add(od, Output_reloc_type(gsym, type, od, address, addend, + false, false, false)); + } void add_global(Symbol* gsym, unsigned int type, Output_data* od, - Sized_relobj* relobj, + Sized_relobj* relobj, unsigned int shndx, Address address, Addend addend) - { this->add(od, Output_reloc_type(gsym, type, relobj, shndx, address, - addend, false)); } + { + this->add(od, Output_reloc_type(gsym, type, relobj, shndx, address, + addend, false, false, false)); + } + + void + add_global_generic(Symbol* gsym, unsigned int type, Output_data* od, + uint64_t address, uint64_t addend) + { + this->add(od, Output_reloc_type(gsym, type, od, + convert_types(address), + convert_types(addend), + false, false, false)); + } + + void + add_global_generic(Symbol* gsym, unsigned int type, Output_data* od, + Relobj* relobj, unsigned int shndx, uint64_t address, + uint64_t addend) + { + Sized_relobj* sized_relobj = + static_cast*>(relobj); + this->add(od, Output_reloc_type(gsym, type, sized_relobj, shndx, + convert_types(address), + convert_types(addend), + false, false, false)); + } // Add a RELATIVE reloc against a global symbol. The final output // relocation will not reference the symbol, but we must keep the symbol @@ -1511,15 +2078,43 @@ class Output_data_reloc void add_global_relative(Symbol* gsym, unsigned int type, Output_data* od, - Address address, Addend addend) - { this->add(od, Output_reloc_type(gsym, type, od, address, addend, true)); } + Address address, Addend addend, bool use_plt_offset) + { + this->add(od, Output_reloc_type(gsym, type, od, address, addend, true, + true, use_plt_offset)); + } void add_global_relative(Symbol* gsym, unsigned int type, Output_data* od, - Sized_relobj* relobj, - unsigned int shndx, Address address, Addend addend) - { this->add(od, Output_reloc_type(gsym, type, relobj, shndx, address, - addend, true)); } + Sized_relobj* relobj, + unsigned int shndx, Address address, Addend addend, + bool use_plt_offset) + { + this->add(od, Output_reloc_type(gsym, type, relobj, shndx, address, + addend, true, true, use_plt_offset)); + } + + // Add a global relocation which does not use a symbol for the relocation, + // but which gets its addend from a symbol. + + void + add_symbolless_global_addend(Symbol* gsym, unsigned int type, Output_data* od, + Address address, Addend addend) + { + this->add(od, Output_reloc_type(gsym, type, od, address, addend, + false, true, false)); + } + + void + add_symbolless_global_addend(Symbol* gsym, unsigned int type, + Output_data* od, + Sized_relobj* relobj, + unsigned int shndx, Address address, + Addend addend) + { + this->add(od, Output_reloc_type(gsym, type, relobj, shndx, address, + addend, false, true, false)); + } // Add a reloc against a local symbol. @@ -1529,7 +2124,7 @@ class Output_data_reloc Output_data* od, Address address, Addend addend) { this->add(od, Output_reloc_type(relobj, local_sym_index, type, od, address, - addend, false, false)); + addend, false, false, false, false)); } void @@ -1539,28 +2134,81 @@ class Output_data_reloc Addend addend) { this->add(od, Output_reloc_type(relobj, local_sym_index, type, shndx, - address, addend, false, false)); + address, addend, false, false, false, + false)); + } + + void + add_local_generic(Relobj* relobj, unsigned int local_sym_index, + unsigned int type, Output_data* od, uint64_t address, + uint64_t addend) + { + Sized_relobj* sized_relobj = + static_cast *>(relobj); + this->add(od, Output_reloc_type(sized_relobj, local_sym_index, type, od, + convert_types(address), + convert_types(addend), + false, false, false, false)); + } + + void + add_local_generic(Relobj* relobj, unsigned int local_sym_index, + unsigned int type, Output_data* od, unsigned int shndx, + uint64_t address, uint64_t addend) + { + Sized_relobj* sized_relobj = + static_cast*>(relobj); + this->add(od, Output_reloc_type(sized_relobj, local_sym_index, type, shndx, + convert_types(address), + convert_types(addend), + false, false, false, false)); } // Add a RELATIVE reloc against a local symbol. void add_local_relative(Sized_relobj* relobj, - unsigned int local_sym_index, unsigned int type, - Output_data* od, Address address, Addend addend) + unsigned int local_sym_index, unsigned int type, + Output_data* od, Address address, Addend addend, + bool use_plt_offset) { this->add(od, Output_reloc_type(relobj, local_sym_index, type, od, address, - addend, true, false)); + addend, true, true, false, + use_plt_offset)); } void add_local_relative(Sized_relobj* relobj, - unsigned int local_sym_index, unsigned int type, - Output_data* od, unsigned int shndx, Address address, - Addend addend) + unsigned int local_sym_index, unsigned int type, + Output_data* od, unsigned int shndx, Address address, + Addend addend, bool use_plt_offset) + { + this->add(od, Output_reloc_type(relobj, local_sym_index, type, shndx, + address, addend, true, true, false, + use_plt_offset)); + } + + // Add a local relocation which does not use a symbol for the relocation, + // but which gets it's addend from a symbol. + + void + add_symbolless_local_addend(Sized_relobj* relobj, + unsigned int local_sym_index, unsigned int type, + Output_data* od, Address address, Addend addend) + { + this->add(od, Output_reloc_type(relobj, local_sym_index, type, od, address, + addend, false, true, false, false)); + } + + void + add_symbolless_local_addend(Sized_relobj* relobj, + unsigned int local_sym_index, unsigned int type, + Output_data* od, unsigned int shndx, + Address address, Addend addend) { this->add(od, Output_reloc_type(relobj, local_sym_index, type, shndx, - address, addend, true, false)); + address, addend, false, true, false, + false)); } // Add a reloc against a local section symbol. This will be @@ -1569,21 +2217,22 @@ class Output_data_reloc void add_local_section(Sized_relobj* relobj, - unsigned int input_shndx, unsigned int type, - Output_data* od, Address address, Addend addend) + unsigned int input_shndx, unsigned int type, + Output_data* od, Address address, Addend addend) { this->add(od, Output_reloc_type(relobj, input_shndx, type, od, address, - addend, false, true)); + addend, false, false, true, false)); } void add_local_section(Sized_relobj* relobj, - unsigned int input_shndx, unsigned int type, - Output_data* od, unsigned int shndx, Address address, - Addend addend) + unsigned int input_shndx, unsigned int type, + Output_data* od, unsigned int shndx, Address address, + Addend addend) { this->add(od, Output_reloc_type(relobj, input_shndx, type, shndx, - address, addend, false, true)); + address, addend, false, false, true, + false)); } // A reloc against the STT_SECTION symbol of an output section. @@ -1591,19 +2240,113 @@ class Output_data_reloc void add_output_section(Output_section* os, unsigned int type, Output_data* od, Address address, Addend addend) - { this->add(os, Output_reloc_type(os, type, od, address, addend)); } + { this->add(od, Output_reloc_type(os, type, od, address, addend, false)); } void - add_output_section(Output_section* os, unsigned int type, - Sized_relobj* relobj, + add_output_section(Output_section* os, unsigned int type, Output_data* od, + Sized_relobj* relobj, unsigned int shndx, Address address, Addend addend) - { this->add(os, Output_reloc_type(os, type, relobj, shndx, address, - addend)); } + { + this->add(od, Output_reloc_type(os, type, relobj, shndx, address, + addend, false)); + } + + void + add_output_section_generic(Output_section* os, unsigned int type, + Output_data* od, uint64_t address, + uint64_t addend) + { + this->add(od, Output_reloc_type(os, type, od, + convert_types(address), + convert_types(addend), + false)); + } + + void + add_output_section_generic(Output_section* os, unsigned int type, + Output_data* od, Relobj* relobj, + unsigned int shndx, uint64_t address, + uint64_t addend) + { + Sized_relobj* sized_relobj = + static_cast*>(relobj); + this->add(od, Output_reloc_type(os, type, sized_relobj, shndx, + convert_types(address), + convert_types(addend), + false)); + } + + // As above, but the reloc TYPE is relative + + void + add_output_section_relative(Output_section* os, unsigned int type, + Output_data* od, Address address, Addend addend) + { this->add(od, Output_reloc_type(os, type, od, address, addend, true)); } + + void + add_output_section_relative(Output_section* os, unsigned int type, + Output_data* od, + Sized_relobj* relobj, + unsigned int shndx, Address address, + Addend addend) + { + this->add(od, Output_reloc_type(os, type, relobj, shndx, + address, addend, true)); + } + + // Add an absolute relocation. + + void + add_absolute(unsigned int type, Output_data* od, Address address, + Addend addend) + { this->add(od, Output_reloc_type(type, od, address, addend, false)); } + + void + add_absolute(unsigned int type, Output_data* od, + Sized_relobj* relobj, + unsigned int shndx, Address address, Addend addend) + { + this->add(od, Output_reloc_type(type, relobj, shndx, address, addend, + false)); + } + + // Add a relative relocation + + void + add_relative(unsigned int type, Output_data* od, Address address, + Addend addend) + { this->add(od, Output_reloc_type(type, od, address, addend, true)); } + + void + add_relative(unsigned int type, Output_data* od, + Sized_relobj* relobj, + unsigned int shndx, Address address, Addend addend) + { + this->add(od, Output_reloc_type(type, relobj, shndx, address, addend, + true)); + } + + // Add a target specific relocation. A target which calls this must + // define the reloc_symbol_index and reloc_addend virtual functions. + + void + add_target_specific(unsigned int type, void* arg, Output_data* od, + Address address, Addend addend) + { this->add(od, Output_reloc_type(type, arg, od, address, addend)); } + + void + add_target_specific(unsigned int type, void* arg, Output_data* od, + Sized_relobj* relobj, + unsigned int shndx, Address address, Addend addend) + { + this->add(od, Output_reloc_type(type, arg, relobj, shndx, address, + addend)); + } }; // Output_relocatable_relocs represents a relocation section in a // relocatable link. The actual data is written out in the target -// hook relocate_for_relocatable. This just saves space for it. +// hook relocate_relocs. This just saves space for it. template class Output_relocatable_relocs : public Output_section_data @@ -1639,7 +2382,7 @@ class Output_data_group : public Output_section_data { public: // The constructor clears *INPUT_SHNDXES. - Output_data_group(Sized_relobj* relobj, + Output_data_group(Sized_relobj_file* relobj, section_size_type entry_count, elfcpp::Elf_Word flags, std::vector* input_shndxes); @@ -1659,7 +2402,7 @@ class Output_data_group : public Output_section_data private: // The input object. - Sized_relobj* relobj_; + Sized_relobj_file* relobj_; // The group flag word. elfcpp::Elf_Word flags_; // The section indexes of the input sections in this group. @@ -1669,91 +2412,180 @@ class Output_data_group : public Output_section_data // Output_data_got is used to manage a GOT. Each entry in the GOT is // for one symbol--either a global symbol or a local symbol in an // object. The target specific code adds entries to the GOT as -// needed. +// needed. The GOT_SIZE template parameter is the size in bits of a +// GOT entry, typically 32 or 64. -template -class Output_data_got : public Output_section_data_build +class Output_data_got_base : public Output_section_data_build +{ + public: + Output_data_got_base(uint64_t align) + : Output_section_data_build(align) + { } + + Output_data_got_base(off_t data_size, uint64_t align) + : Output_section_data_build(data_size, align) + { } + + // Reserve the slot at index I in the GOT. + void + reserve_slot(unsigned int i) + { this->do_reserve_slot(i); } + + protected: + // Reserve the slot at index I in the GOT. + virtual void + do_reserve_slot(unsigned int i) = 0; +}; + +template +class Output_data_got : public Output_data_got_base { public: - typedef typename elfcpp::Elf_types::Elf_Addr Valtype; - typedef Output_data_reloc Rel_dyn; - typedef Output_data_reloc Rela_dyn; + typedef typename elfcpp::Elf_types::Elf_Addr Valtype; Output_data_got() - : Output_section_data_build(Output_data::default_alignment_for_size(size)), - entries_() + : Output_data_got_base(Output_data::default_alignment_for_size(got_size)), + entries_(), free_list_() { } + Output_data_got(off_t data_size) + : Output_data_got_base(data_size, + Output_data::default_alignment_for_size(got_size)), + entries_(), free_list_() + { + // For an incremental update, we have an existing GOT section. + // Initialize the list of entries and the free list. + this->entries_.resize(data_size / (got_size / 8)); + this->free_list_.init(data_size, false); + } + // Add an entry for a global symbol to the GOT. Return true if this // is a new GOT entry, false if the symbol was already in the GOT. bool add_global(Symbol* gsym, unsigned int got_type); + // Like add_global, but use the PLT offset of the global symbol if + // it has one. + bool + add_global_plt(Symbol* gsym, unsigned int got_type); + + // Like add_global, but for a TLS symbol where the value will be + // offset using Target::tls_offset_for_global. + bool + add_global_tls(Symbol* gsym, unsigned int got_type) + { return add_global_plt(gsym, got_type); } + // Add an entry for a global symbol to the GOT, and add a dynamic // relocation of type R_TYPE for the GOT entry. void add_global_with_rel(Symbol* gsym, unsigned int got_type, - Rel_dyn* rel_dyn, unsigned int r_type); - - void - add_global_with_rela(Symbol* gsym, unsigned int got_type, - Rela_dyn* rela_dyn, unsigned int r_type); + Output_data_reloc_generic* rel_dyn, unsigned int r_type); // 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. void 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); - - void - add_global_pair_with_rela(Symbol* gsym, unsigned int got_type, - Rela_dyn* rela_dyn, unsigned int r_type_1, - unsigned int r_type_2); + Output_data_reloc_generic* rel_dyn, + unsigned int r_type_1, unsigned int r_type_2); // 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. bool - add_local(Sized_relobj* object, unsigned int sym_index, - unsigned int got_type); + add_local(Relobj* object, unsigned int sym_index, unsigned int got_type); - // Add an entry for a local symbol to the GOT, and add a dynamic + // Add an entry for a local symbol plus ADDEND to the GOT. This returns + // true if this is a new GOT entry, false if the symbol already has a GOT + // entry. + bool + add_local(Relobj* object, unsigned int sym_index, unsigned int got_type, + uint64_t addend); + + // Like add_local, but use the PLT offset of the local symbol if it + // has one. + bool + add_local_plt(Relobj* object, unsigned int sym_index, unsigned int got_type); + + // Like add_local, but for a TLS symbol where the value will be + // offset using Target::tls_offset_for_local. + bool + add_local_tls(Relobj* object, unsigned int sym_index, unsigned int got_type) + { return add_local_plt(object, sym_index, got_type); } + + // Add an entry for a local symbol to the GOT, and add a dynamic // relocation of type R_TYPE for the GOT entry. void - add_local_with_rel(Sized_relobj* object, - unsigned int sym_index, unsigned int got_type, - Rel_dyn* rel_dyn, unsigned int r_type); + add_local_with_rel(Relobj* object, unsigned int sym_index, + unsigned int got_type, Output_data_reloc_generic* rel_dyn, + unsigned int r_type); + // Add an entry for a local symbol plus ADDEND to the GOT, and add a dynamic + // relocation of type R_TYPE for the GOT entry. void - add_local_with_rela(Sized_relobj* object, - unsigned int sym_index, unsigned int got_type, - Rela_dyn* rela_dyn, unsigned int r_type); + add_local_with_rel(Relobj* object, unsigned int sym_index, + unsigned int got_type, Output_data_reloc_generic* rel_dyn, + unsigned int r_type, uint64_t addend); // 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. - void - add_local_pair_with_rel(Sized_relobj* object, - unsigned int sym_index, unsigned int shndx, - unsigned int got_type, Rel_dyn* rel_dyn, - unsigned int r_type_1, unsigned int r_type_2); + // 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. + void + add_local_pair_with_rel(Relobj* object, unsigned int sym_index, + unsigned int shndx, unsigned int got_type, + Output_data_reloc_generic* rel_dyn, + unsigned int r_type); + + // Add a pair of entries for a local symbol plus ADDEND 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. + void + add_local_pair_with_rel(Relobj* object, unsigned int sym_index, + unsigned int shndx, unsigned int got_type, + Output_data_reloc_generic* rel_dyn, + unsigned int r_type, uint64_t addend); + // Add a pair of entries for a local symbol to the GOT, and add + // 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. void - add_local_pair_with_rela(Sized_relobj* object, - unsigned int sym_index, unsigned int shndx, - unsigned int got_type, Rela_dyn* rela_dyn, - unsigned int r_type_1, unsigned int r_type_2); + add_local_tls_pair(Relobj* object, unsigned int sym_index, + unsigned int got_type, + Output_data_reloc_generic* rel_dyn, + unsigned int r_type); // Add a constant to the GOT. This returns the offset of the new // entry from the start of the GOT. unsigned int add_constant(Valtype constant) + { return this->add_got_entry(Got_entry(constant)); } + + // Add a pair of constants to the GOT. This returns the offset of + // the new entry from the start of the GOT. + unsigned int + add_constant_pair(Valtype c1, Valtype c2) + { return this->add_got_entry_pair(Got_entry(c1), Got_entry(c2)); } + + // Replace GOT entry I with a new constant. + void + replace_constant(unsigned int i, Valtype constant) { - this->entries_.push_back(Got_entry(constant)); - this->set_got_size(); - return this->last_got_offset(); + this->replace_got_entry(i, Got_entry(constant)); } + // Reserve a slot in the GOT for a local symbol. + void + reserve_local(unsigned int i, Relobj* object, unsigned int sym_index, + unsigned int got_type); + + // Reserve a slot in the GOT for a global symbol. + void + reserve_global(unsigned int i, Symbol* gsym, unsigned int got_type); + protected: // Write out the GOT table. void @@ -1764,6 +2596,21 @@ class Output_data_got : public Output_section_data_build do_print_to_mapfile(Mapfile* mapfile) const { mapfile->print_output_data(this, _("** GOT")); } + // Reserve the slot at index I in the GOT. + virtual void + do_reserve_slot(unsigned int i) + { this->free_list_.remove(i * got_size / 8, (i + 1) * got_size / 8); } + + // Return the number of words in the GOT. + unsigned int + num_entries () const + { return this->entries_.size(); } + + // Return the offset into the GOT of GOT entry I. + unsigned int + got_offset(unsigned int i) const + { return i * (got_size / 8); } + private: // This POD class holds a single GOT entry. class Got_entry @@ -1771,45 +2618,64 @@ class Output_data_got : public Output_section_data_build public: // Create a zero entry. Got_entry() - : local_sym_index_(CONSTANT_CODE) + : local_sym_index_(RESERVED_CODE), use_plt_or_tls_offset_(false), + addend_(0) { this->u_.constant = 0; } // Create a global symbol entry. - explicit Got_entry(Symbol* gsym) - : local_sym_index_(GSYM_CODE) + Got_entry(Symbol* gsym, bool use_plt_or_tls_offset) + : local_sym_index_(GSYM_CODE), + use_plt_or_tls_offset_(use_plt_or_tls_offset), addend_(0) { this->u_.gsym = gsym; } // Create a local symbol entry. - Got_entry(Sized_relobj* object, - unsigned int local_sym_index) - : local_sym_index_(local_sym_index) + Got_entry(Relobj* object, unsigned int local_sym_index, + bool use_plt_or_tls_offset) + : local_sym_index_(local_sym_index), + use_plt_or_tls_offset_(use_plt_or_tls_offset), addend_(0) + { + gold_assert(local_sym_index != GSYM_CODE + && local_sym_index != CONSTANT_CODE + && local_sym_index != RESERVED_CODE + && local_sym_index == this->local_sym_index_); + this->u_.object = object; + } + + // Create a local symbol entry plus addend. + Got_entry(Relobj* object, unsigned int local_sym_index, + bool use_plt_or_tls_offset, uint64_t addend) + : local_sym_index_(local_sym_index), + use_plt_or_tls_offset_(use_plt_or_tls_offset), addend_(addend) { gold_assert(local_sym_index != GSYM_CODE - && local_sym_index != CONSTANT_CODE); + && local_sym_index != CONSTANT_CODE + && local_sym_index != RESERVED_CODE + && local_sym_index == this->local_sym_index_); this->u_.object = object; } // Create a constant entry. The constant is a host value--it will // be swapped, if necessary, when it is written out. explicit Got_entry(Valtype constant) - : local_sym_index_(CONSTANT_CODE) + : local_sym_index_(CONSTANT_CODE), use_plt_or_tls_offset_(false) { this->u_.constant = constant; } // Write the GOT entry to an output view. void - write(unsigned char* pov) const; + write(unsigned int got_indx, unsigned char* pov) const; private: enum { - GSYM_CODE = -1U, - CONSTANT_CODE = -2U + GSYM_CODE = 0x7fffffff, + CONSTANT_CODE = 0x7ffffffe, + RESERVED_CODE = 0x7ffffffd }; union { // For a local symbol, the object. - Sized_relobj* object; + Relobj* object; // For a global symbol, the symbol. Symbol* gsym; // For a constant, the constant. @@ -1817,28 +2683,44 @@ class Output_data_got : public Output_section_data_build } u_; // For a local symbol, the local symbol index. This is GSYM_CODE // for a global symbol, or CONSTANT_CODE for a constant. - unsigned int local_sym_index_; + unsigned int local_sym_index_ : 31; + // Whether to use the PLT offset of the symbol if it has one. + // For TLS symbols, whether to offset the symbol value. + bool use_plt_or_tls_offset_ : 1; + // The addend. + uint64_t addend_; }; typedef std::vector Got_entries; - // Return the offset into the GOT of GOT entry I. + // Create a new GOT entry and return its offset. unsigned int - got_offset(unsigned int i) const - { return i * (size / 8); } + add_got_entry(Got_entry got_entry); + + // Create a pair of new GOT entries and return the offset of the first. + unsigned int + add_got_entry_pair(Got_entry got_entry_1, Got_entry got_entry_2); + + // Replace GOT entry I with a new value. + void + replace_got_entry(unsigned int i, Got_entry got_entry); // Return the offset into the GOT of the last entry added. unsigned int last_got_offset() const - { return this->got_offset(this->entries_.size() - 1); } + { return this->got_offset(this->num_entries() - 1); } // Set the size of the section. void set_got_size() - { this->set_current_data_size(this->got_offset(this->entries_.size())); } + { this->set_current_data_size(this->got_offset(this->num_entries())); } // The list of GOT entries. Got_entries entries_; + + // List of available regions within the section, for incremental + // update links. + Free_list free_list_; }; // Output_data_dynamic is used to hold the data in SHT_DYNAMIC @@ -1866,7 +2748,7 @@ class Output_data_dynamic : public Output_section_data // plus a constant offset. void add_section_plus_offset(elfcpp::DT tag, const Output_data* od, - unsigned int offset) + unsigned int offset) { this->add_entry(Dynamic_entry(tag, od, offset)); } // Add a new dynamic entry with the size of output data. @@ -1874,6 +2756,12 @@ class Output_data_dynamic : public Output_section_data add_section_size(elfcpp::DT tag, const Output_data* od) { this->add_entry(Dynamic_entry(tag, od, true)); } + // Add a new dynamic entry with the total size of two output datas. + void + add_section_size(elfcpp::DT tag, const Output_data* od, + const Output_data* od2) + { this->add_entry(Dynamic_entry(tag, od, od2)); } + // Add a new dynamic entry with the address of a symbol. void add_symbol(elfcpp::DT tag, const Symbol* sym) @@ -1888,6 +2776,15 @@ class Output_data_dynamic : public Output_section_data add_string(elfcpp::DT tag, const std::string& str) { this->add_string(tag, str.c_str()); } + // Add a new dynamic entry with custom value. + void + add_custom(elfcpp::DT tag) + { this->add_entry(Dynamic_entry(tag)); } + + // Get a dynamic entry offset. + unsigned int + get_entry_offset(elfcpp::DT tag) const; + protected: // Adjust the output section to set the entry size. void @@ -1922,7 +2819,19 @@ class Output_data_dynamic : public Output_section_data offset_(section_size ? DYNAMIC_SECTION_SIZE : DYNAMIC_SECTION_ADDRESS) - { this->u_.od = od; } + { + this->u_.od = od; + this->od2 = NULL; + } + + // Create an entry with the size of two sections. + Dynamic_entry(elfcpp::DT tag, const Output_data* od, const Output_data* od2) + : tag_(tag), + offset_(DYNAMIC_SECTION_SIZE) + { + this->u_.od = od; + this->od2 = od2; + } // Create an entry with the address of a section plus a constant offset. Dynamic_entry(elfcpp::DT tag, const Output_data* od, unsigned int offset) @@ -1940,6 +2849,11 @@ class Output_data_dynamic : public Output_section_data : tag_(tag), offset_(DYNAMIC_STRING) { this->u_.str = str; } + // Create an entry with a custom value. + Dynamic_entry(elfcpp::DT tag) + : tag_(tag), offset_(DYNAMIC_CUSTOM) + { } + // Return the tag of this entry. elfcpp::DT tag() const @@ -1960,10 +2874,12 @@ class Output_data_dynamic : public Output_section_data DYNAMIC_NUMBER = -1U, // Section size. DYNAMIC_SECTION_SIZE = -2U, - // Symbol adress. + // Symbol address. DYNAMIC_SYMBOL = -3U, // String. - DYNAMIC_STRING = -4U + DYNAMIC_STRING = -4U, + // Custom value. + DYNAMIC_CUSTOM = -5U // Any other value indicates a section address plus OFFSET. }; @@ -1978,6 +2894,8 @@ class Output_data_dynamic : public Output_section_data // For DYNAMIC_STRING. const char* str; } u_; + // For DYNAMIC_SYMBOL with two sections. + const Output_data* od2; // The dynamic tag. elfcpp::DT tag_; // The type of entry (Classification) or offset within a section. @@ -2054,22 +2972,279 @@ class Output_relaxed_input_section : public Output_section_data_build uint64_t addralign) : Output_section_data_build(addralign), relobj_(relobj), shndx_(shndx) { } - + // Return the Relobj of this relaxed input section. Relobj* relobj() const { return this->relobj_; } - + // Return the section index of this relaxed input section. unsigned int shndx() const { return this->shndx_; } + protected: + void + set_relobj(Relobj* relobj) + { this->relobj_ = relobj; } + + void + set_shndx(unsigned int shndx) + { this->shndx_ = shndx; } + private: Relobj* relobj_; unsigned int shndx_; }; +// This class describes properties of merge data sections. It is used +// as a key type for maps. +class Merge_section_properties +{ + public: + Merge_section_properties(bool is_string, uint64_t entsize, + uint64_t addralign) + : is_string_(is_string), entsize_(entsize), addralign_(addralign) + { } + + // Whether this equals to another Merge_section_properties MSP. + bool + eq(const Merge_section_properties& msp) const + { + return ((this->is_string_ == msp.is_string_) + && (this->entsize_ == msp.entsize_) + && (this->addralign_ == msp.addralign_)); + } + + // Compute a hash value for this using 64-bit FNV-1a hash. + size_t + hash_value() const + { + uint64_t h = 14695981039346656037ULL; // FNV offset basis. + uint64_t prime = 1099511628211ULL; + h = (h ^ static_cast(this->is_string_)) * prime; + h = (h ^ static_cast(this->entsize_)) * prime; + h = (h ^ static_cast(this->addralign_)) * prime; + return h; + } + + // Functors for associative containers. + struct equal_to + { + bool + operator()(const Merge_section_properties& msp1, + const Merge_section_properties& msp2) const + { return msp1.eq(msp2); } + }; + + struct hash + { + size_t + operator()(const Merge_section_properties& msp) const + { return msp.hash_value(); } + }; + + private: + // Whether this merge data section is for strings. + bool is_string_; + // Entsize of this merge data section. + uint64_t entsize_; + // Address alignment. + uint64_t addralign_; +}; + +// This class is used to speed up look up of special input sections in an +// Output_section. + +class Output_section_lookup_maps +{ + public: + Output_section_lookup_maps() + : is_valid_(true), merge_sections_by_properties_(), + relaxed_input_sections_by_id_() + { } + + // Whether the maps are valid. + bool + is_valid() const + { return this->is_valid_; } + + // Invalidate the maps. + void + invalidate() + { this->is_valid_ = false; } + + // Clear the maps. + void + clear() + { + this->merge_sections_by_properties_.clear(); + this->relaxed_input_sections_by_id_.clear(); + // A cleared map is valid. + this->is_valid_ = true; + } + + // Find a merge section by merge section properties. Return NULL if none + // is found. + Output_merge_base* + find_merge_section(const Merge_section_properties& msp) const + { + gold_assert(this->is_valid_); + Merge_sections_by_properties::const_iterator p = + this->merge_sections_by_properties_.find(msp); + return p != this->merge_sections_by_properties_.end() ? p->second : NULL; + } + + // Add a merge section pointed by POMB with properties MSP. + void + add_merge_section(const Merge_section_properties& msp, + Output_merge_base* pomb) + { + std::pair value(msp, pomb); + std::pair result = + this->merge_sections_by_properties_.insert(value); + gold_assert(result.second); + } + + // Find a relaxed input section of OBJECT with index SHNDX. + Output_relaxed_input_section* + find_relaxed_input_section(const Relobj* object, unsigned int shndx) const + { + gold_assert(this->is_valid_); + Relaxed_input_sections_by_id::const_iterator p = + this->relaxed_input_sections_by_id_.find(Const_section_id(object, shndx)); + return p != this->relaxed_input_sections_by_id_.end() ? p->second : NULL; + } + + // Add a relaxed input section pointed by POMB and whose original input + // section is in OBJECT with index SHNDX. + void + add_relaxed_input_section(const Relobj* relobj, unsigned int shndx, + Output_relaxed_input_section* poris) + { + Const_section_id csid(relobj, shndx); + std::pair + value(csid, poris); + std::pair result = + this->relaxed_input_sections_by_id_.insert(value); + gold_assert(result.second); + } + + private: + typedef Unordered_map + Merge_sections_by_properties; + + typedef Unordered_map + Relaxed_input_sections_by_id; + + // Whether this is valid + bool is_valid_; + // Merge sections by merge section properties. + Merge_sections_by_properties merge_sections_by_properties_; + // Relaxed sections by section IDs. + Relaxed_input_sections_by_id relaxed_input_sections_by_id_; +}; + +// This abstract base class defines the interface for the +// types of methods used to fill free space left in an output +// section during an incremental link. These methods are used +// to insert dummy compilation units into debug info so that +// debug info consumers can scan the debug info serially. + +class Output_fill +{ + public: + Output_fill() + : is_big_endian_(parameters->target().is_big_endian()) + { } + + virtual + ~Output_fill() + { } + + // Return the smallest size chunk of free space that can be + // filled with a dummy compilation unit. + size_t + minimum_hole_size() const + { return this->do_minimum_hole_size(); } + + // Write a fill pattern of length LEN at offset OFF in the file. + void + write(Output_file* of, off_t off, size_t len) const + { this->do_write(of, off, len); } + + protected: + virtual size_t + do_minimum_hole_size() const = 0; + + virtual void + do_write(Output_file* of, off_t off, size_t len) const = 0; + + bool + is_big_endian() const + { return this->is_big_endian_; } + + private: + bool is_big_endian_; +}; + +// Fill method that introduces a dummy compilation unit in +// a .debug_info or .debug_types section. + +class Output_fill_debug_info : public Output_fill +{ + public: + Output_fill_debug_info(bool is_debug_types) + : is_debug_types_(is_debug_types) + { } + + protected: + virtual size_t + do_minimum_hole_size() const; + + virtual void + do_write(Output_file* of, off_t off, size_t len) const; + + private: + // Version of the header. + static const int version = 4; + // True if this is a .debug_types section. + bool is_debug_types_; +}; + +// Fill method that introduces a dummy compilation unit in +// a .debug_line section. + +class Output_fill_debug_line : public Output_fill +{ + public: + Output_fill_debug_line() + { } + + protected: + virtual size_t + do_minimum_hole_size() const; + + virtual void + do_write(Output_file* of, off_t off, size_t len) const; + + private: + // Version of the header. We write a DWARF-3 header because it's smaller + // and many tools have not yet been updated to understand the DWARF-4 header. + static const int version = 3; + // Length of the portion of the header that follows the header_length + // field. This includes the following fields: + // minimum_instruction_length, default_is_stmt, line_base, line_range, + // opcode_base, standard_opcode_lengths[], include_directories, filenames. + // The standard_opcode_lengths array is 12 bytes long, and the + // include_directories and filenames fields each contain only a single + // null byte. + static const size_t header_length = 19; +}; + // An output section. We don't expect to have too many output // sections, so we don't bother to do a template on the size. @@ -2089,8 +3264,8 @@ class Output_section : public Output_data // within the output section. template off_t - add_input_section(Sized_relobj* object, unsigned int shndx, - const char *name, + add_input_section(Layout* layout, Sized_relobj_file* object, + unsigned int shndx, const char* name, const elfcpp::Shdr& shdr, unsigned int reloc_shndx, bool have_sections_script); @@ -2098,9 +3273,12 @@ class Output_section : public Output_data void add_output_section_data(Output_section_data* posd); - // Add a relaxed input section PORIS to this output section. + // Add a relaxed input section PORIS called NAME to this output section + // with LAYOUT. void - add_relaxed_input_section(Output_relaxed_input_section* poris); + add_relaxed_input_section(Layout* layout, + Output_relaxed_input_section* poris, + const std::string& name); // Return the section name. const char* @@ -2117,10 +3295,20 @@ class Output_section : public Output_data flags() const { return this->flags_; } + typedef std::map Section_layout_order; + + void + update_section_layout(const Section_layout_order* order_map); + // Update the output section flags based on input section flags. void update_flags_for_input_section(elfcpp::Elf_Xword flags); + // Set the output section flags. + void + set_flags(elfcpp::Elf_Xword flags) + { this->flags_ = flags; } + // Return the entsize field. uint64_t entsize() const @@ -2240,6 +3428,13 @@ class Output_section : public Output_data set_addralign(uint64_t v) { this->addralign_ = v; } + void + checkpoint_set_addralign(uint64_t val) + { + if (this->checkpoint_ != NULL) + this->checkpoint_->set_addralign(val); + } + // Whether the output section index has been set. bool has_out_shndx() const @@ -2297,6 +3492,10 @@ class Output_section : public Output_data this->dynsym_index_ = index; } + // Sort the attached input sections. + void + sort_attached_input_sections(); + // Return whether the input sections sections attachd to this output // section may require sorting. This is used to handle constructor // priorities compatibly with GNU ld. @@ -2310,6 +3509,18 @@ class Output_section : public Output_data set_may_sort_attached_input_sections() { this->may_sort_attached_input_sections_ = true; } + // Returns true if input sections must be sorted according to the + // order in which their name appear in the --section-ordering-file. + bool + input_section_order_specified() + { return this->input_section_order_specified_; } + + // Record that input sections must be sorted as some of their names + // match the patterns specified through --section-ordering-file. + void + set_input_section_order_specified() + { this->input_section_order_specified_ = true; } + // Return whether the input sections attached to this output section // require sorting. This is used to handle constructor priorities // compatibly with GNU ld. @@ -2323,6 +3534,17 @@ class Output_section : public Output_data set_must_sort_attached_input_sections() { this->must_sort_attached_input_sections_ = true; } + // Get the order in which this section appears in the PT_LOAD output + // segment. + Output_section_order + order() const + { return this->order_; } + + // Set the order for this section. + void + set_order(Output_section_order order) + { this->order_ = order; } + // Return whether this section holds relro data--data which has // dynamic relocations but which may be marked read-only after the // dynamic relocations have been completed. @@ -2340,17 +3562,6 @@ class Output_section : public Output_data clear_is_relro() { this->is_relro_ = false; } - // True if this section holds relro local data--relro data for which - // the dynamic relocations are all RELATIVE relocations. - bool - is_relro_local() const - { return this->is_relro_local_; } - - // Record that this section holds relro local data. - void - set_is_relro_local() - { this->is_relro_local_ = true; } - // True if this is a small section: a section which holds small // variables. bool @@ -2378,27 +3589,6 @@ class Output_section : public Output_data is_large_data_section() { return this->is_large_section_ && this->type_ != elfcpp::SHT_NOBITS; } - // True if this is the .interp section which goes into the PT_INTERP - // segment. - bool - is_interp() const - { return this->is_interp_; } - - // Record that this is the interp section. - void - set_is_interp() - { this->is_interp_ = true; } - - // True if this is a section used by the dynamic linker. - bool - is_dynamic_linker_section() const - { return this->is_dynamic_linker_section_; } - - // Record that this is a section used by the dynamic linker. - void - set_is_dynamic_linker_section() - { this->is_dynamic_linker_section_ = true; } - // Return whether this section should be written after all the input // sections are complete. bool @@ -2417,6 +3607,28 @@ class Output_section : public Output_data requires_postprocessing() const { return this->requires_postprocessing_; } + bool + is_unique_segment() const + { return this->is_unique_segment_; } + + void + set_is_unique_segment() + { this->is_unique_segment_ = true; } + + uint64_t extra_segment_flags() const + { return this->extra_segment_flags_; } + + void + set_extra_segment_flags(uint64_t flags) + { this->extra_segment_flags_ = flags; } + + uint64_t segment_alignment() const + { return this->segment_alignment_; } + + void + set_segment_alignment(uint64_t align) + { this->segment_alignment_ = align; } + // If a section requires postprocessing, return the buffer to use. unsigned char* postprocessing_buffer() const @@ -2493,270 +3705,48 @@ class Output_section : public Output_data // The next few calls are for linker script support. - // We need to export the input sections to linker scripts. Previously - // we export a pair of Relobj pointer and section index. We now need to - // handle relaxed input sections as well. So we use this class. - class Simple_input_section + // In some cases we need to keep a list of the input sections + // associated with this output section. We only need the list if we + // might have to change the offsets of the input section within the + // output section after we add the input section. The ordinary + // input sections will be written out when we process the object + // file, and as such we don't need to track them here. We do need + // to track Output_section_data objects here. We store instances of + // this structure in a std::vector, so it must be a POD. There can + // be many instances of this structure, so we use a union to save + // some space. + class Input_section { - private: - static const unsigned int invalid_shndx = static_cast(-1); - public: - Simple_input_section(Relobj *relobj, unsigned int shndx) - : shndx_(shndx) - { - gold_assert(shndx != invalid_shndx); - this->u_.relobj = relobj; - } - - Simple_input_section(Output_relaxed_input_section* section) - : shndx_(invalid_shndx) - { this->u_.relaxed_input_section = section; } - - // Whether this is a relaxed section. - bool - is_relaxed_input_section() const - { return this->shndx_ == invalid_shndx; } - - // Return object of an input section. - Relobj* - relobj() const + Input_section() + : shndx_(0), p2align_(0) { - return ((this->shndx_ != invalid_shndx) - ? this->u_.relobj - : this->u_.relaxed_input_section->relobj()); + this->u1_.data_size = 0; + this->u2_.object = NULL; } - // Return index of an input section. - unsigned int - shndx() const + // For an ordinary input section. + Input_section(Relobj* object, unsigned int shndx, off_t data_size, + uint64_t addralign) + : shndx_(shndx), + p2align_(ffsll(static_cast(addralign))), + section_order_index_(0) { - return ((this->shndx_ != invalid_shndx) - ? this->shndx_ - : this->u_.relaxed_input_section->shndx()); + gold_assert(shndx != OUTPUT_SECTION_CODE + && shndx != MERGE_DATA_SECTION_CODE + && shndx != MERGE_STRING_SECTION_CODE + && shndx != RELAXED_INPUT_SECTION_CODE); + this->u1_.data_size = data_size; + this->u2_.object = object; } - // Return the Output_relaxed_input_section object of a relaxed section. - Output_relaxed_input_section* - relaxed_input_section() const + // For a non-merge output section. + Input_section(Output_section_data* posd) + : shndx_(OUTPUT_SECTION_CODE), p2align_(0), + section_order_index_(0) { - gold_assert(this->shndx_ == invalid_shndx); - return this->u_.relaxed_input_section; - } - - private: - // Pointer to either an Relobj or an Output_relaxed_input_section. - union - { - Relobj* relobj; - Output_relaxed_input_section* relaxed_input_section; - } u_; - // Section index for an non-relaxed section or invalid_shndx for - // a relaxed section. - unsigned int shndx_; - }; - - // Store the list of input sections for this Output_section into the - // list passed in. This removes the input sections, leaving only - // any Output_section_data elements. This returns the size of those - // Output_section_data elements. ADDRESS is the address of this - // output section. FILL is the fill value to use, in case there are - // any spaces between the remaining Output_section_data elements. - uint64_t - get_input_sections(uint64_t address, const std::string& fill, - std::list*); - - // Add an input section from a script. - void - add_input_section_for_script(const Simple_input_section& input_section, - off_t data_size, uint64_t addralign); - - // Set the current size of the output section. - void - set_current_data_size(off_t size) - { this->set_current_data_size_for_child(size); } - - // Get the current size of the output section. - off_t - current_data_size() const - { return this->current_data_size_for_child(); } - - // End of linker script support. - - // Save states before doing section layout. - // This is used for relaxation. - void - save_states(); - - // Restore states prior to section layout. - void - restore_states(); - - // Convert existing input sections to relaxed input sections. - void - convert_input_sections_to_relaxed_sections( - const std::vector& sections); - - // Find a relaxed input section to an input section in OBJECT - // with index SHNDX. Return NULL if none is found. - const Output_section_data* - find_relaxed_input_section(const Relobj* object, unsigned int shndx) const; - - // Print merge statistics to stderr. - void - print_merge_stats(); - - protected: - // Return the output section--i.e., the object itself. - Output_section* - do_output_section() - { return this; } - - // Return the section index in the output file. - unsigned int - do_out_shndx() const - { - gold_assert(this->out_shndx_ != -1U); - return this->out_shndx_; - } - - // Set the output section index. - void - do_set_out_shndx(unsigned int shndx) - { - gold_assert(this->out_shndx_ == -1U || this->out_shndx_ == shndx); - this->out_shndx_ = shndx; - } - - // Set the final data size of the Output_section. For a typical - // Output_section, there is nothing to do, but if there are any - // Output_section_data objects we need to set their final addresses - // here. - virtual void - set_final_data_size(); - - // Reset the address and file offset. - void - do_reset_address_and_file_offset(); - - // Return true if address and file offset already have reset values. In - // other words, calling reset_address_and_file_offset will not change them. - bool - do_address_and_file_offset_have_reset_values() const; - - // Write the data to the file. For a typical Output_section, this - // does nothing: the data is written out by calling Object::Relocate - // on each input object. But if there are any Output_section_data - // objects we do need to write them out here. - virtual void - do_write(Output_file*); - - // Return the address alignment--function required by parent class. - uint64_t - do_addralign() const - { return this->addralign_; } - - // Return whether there is a load address. - bool - do_has_load_address() const - { return this->has_load_address_; } - - // Return the load address. - uint64_t - do_load_address() const - { - gold_assert(this->has_load_address_); - return this->load_address_; - } - - // Return whether this is an Output_section. - bool - do_is_section() const - { return true; } - - // Return whether this is a section of the specified type. - bool - do_is_section_type(elfcpp::Elf_Word type) const - { return this->type_ == type; } - - // Return whether the specified section flag is set. - bool - do_is_section_flag_set(elfcpp::Elf_Xword flag) const - { return (this->flags_ & flag) != 0; } - - // Set the TLS offset. Called only for SHT_TLS sections. - void - do_set_tls_offset(uint64_t tls_base); - - // Return the TLS offset, relative to the base of the TLS segment. - // Valid only for SHT_TLS sections. - uint64_t - do_tls_offset() const - { return this->tls_offset_; } - - // This may be implemented by a child class. - virtual void - do_finalize_name(Layout*) - { } - - // Print to the map file. - virtual void - do_print_to_mapfile(Mapfile*) const; - - // Record that this section requires postprocessing after all - // relocations have been applied. This is called by a child class. - void - set_requires_postprocessing() - { - this->requires_postprocessing_ = true; - this->after_input_sections_ = true; - } - - // Write all the data of an Output_section into the postprocessing - // buffer. - void - write_to_postprocessing_buffer(); - - // In some cases we need to keep a list of the input sections - // associated with this output section. We only need the list if we - // might have to change the offsets of the input section within the - // output section after we add the input section. The ordinary - // input sections will be written out when we process the object - // file, and as such we don't need to track them here. We do need - // to track Output_section_data objects here. We store instances of - // this structure in a std::vector, so it must be a POD. There can - // be many instances of this structure, so we use a union to save - // some space. - class Input_section - { - public: - Input_section() - : shndx_(0), p2align_(0) - { - this->u1_.data_size = 0; - this->u2_.object = NULL; - } - - // For an ordinary input section. - Input_section(Relobj* object, unsigned int shndx, off_t data_size, - uint64_t addralign) - : shndx_(shndx), - p2align_(ffsll(static_cast(addralign))) - { - gold_assert(shndx != OUTPUT_SECTION_CODE - && shndx != MERGE_DATA_SECTION_CODE - && shndx != MERGE_STRING_SECTION_CODE - && shndx != RELAXED_INPUT_SECTION_CODE); - this->u1_.data_size = data_size; - this->u2_.object = object; - } - - // For a non-merge output section. - Input_section(Output_section_data* posd) - : shndx_(OUTPUT_SECTION_CODE), p2align_(0) - { - this->u1_.data_size = 0; - this->u2_.posd = posd; + this->u1_.data_size = 0; + this->u2_.posd = posd; } // For a merge section. @@ -2764,31 +3754,65 @@ class Output_section : public Output_data : shndx_(is_string ? MERGE_STRING_SECTION_CODE : MERGE_DATA_SECTION_CODE), - p2align_(0) + p2align_(0), + section_order_index_(0) { this->u1_.entsize = entsize; this->u2_.posd = posd; } // For a relaxed input section. - Input_section(Output_relaxed_input_section *psection) - : shndx_(RELAXED_INPUT_SECTION_CODE), p2align_(0) + Input_section(Output_relaxed_input_section* psection) + : shndx_(RELAXED_INPUT_SECTION_CODE), p2align_(0), + section_order_index_(0) { this->u1_.data_size = 0; this->u2_.poris = psection; } + unsigned int + section_order_index() const + { + return this->section_order_index_; + } + + void + set_section_order_index(unsigned int number) + { + this->section_order_index_ = number; + } + // The required alignment. uint64_t addralign() const { - if (!this->is_input_section()) + if (this->p2align_ != 0) + return static_cast(1) << (this->p2align_ - 1); + else if (!this->is_input_section()) return this->u2_.posd->addralign(); - return (this->p2align_ == 0 - ? 0 - : static_cast(1) << (this->p2align_ - 1)); + else + return 0; } + // Set the required alignment, which must be either 0 or a power of 2. + // For input sections that are sub-classes of Output_section_data, a + // alignment of zero means asking the underlying object for alignment. + void + set_addralign(uint64_t addralign) + { + if (addralign == 0) + this->p2align_ = 0; + else + { + gold_assert((addralign & (addralign - 1)) == 0); + this->p2align_ = ffsll(static_cast(addralign)); + } + } + + // Return the current required size, without finalization. + off_t + current_data_size() const; + // Return the required size. off_t data_size() const; @@ -2807,13 +3831,21 @@ class Output_section : public Output_data // parameters. bool is_merge_section(bool is_string, uint64_t entsize, - uint64_t addralign) const + uint64_t addralign) const { return (this->shndx_ == (is_string ? MERGE_STRING_SECTION_CODE : MERGE_DATA_SECTION_CODE) && this->u1_.entsize == entsize - && this->addralign() == addralign); + && this->addralign() == addralign); + } + + // Return whether this is a merge section for some input section. + bool + is_merge_section() const + { + return (this->shndx_ == MERGE_DATA_SECTION_CODE + || this->shndx_ == MERGE_STRING_SECTION_CODE); } // Return whether this is a relaxed input section. @@ -2830,27 +3862,11 @@ class Output_section : public Output_data // Return the object for an input section. Relobj* - relobj() const - { - if (this->is_input_section()) - return this->u2_.object; - else if (this->is_relaxed_input_section()) - return this->u2_.poris->relobj(); - else - gold_unreachable(); - } + relobj() const; // Return the input section index for an input section. unsigned int - shndx() const - { - if (this->is_input_section()) - return this->shndx_; - else if (this->is_relaxed_input_section()) - return this->u2_.poris->shndx(); - else - gold_unreachable(); - } + shndx() const; // For non-input-sections, return the associated Output_section_data // object. @@ -2860,7 +3876,15 @@ class Output_section : public Output_data gold_assert(!this->is_input_section()); return this->u2_.posd; } - + + // For a merge section, return the Output_merge_base pointer. + Output_merge_base* + output_merge_base() const + { + gold_assert(this->is_merge_section()); + return this->u2_.pomb; + } + // Return the Output_relaxed_input_section object. Output_relaxed_input_section* relaxed_input_section() const @@ -2874,8 +3898,8 @@ class Output_section : public Output_data set_output_section(Output_section* os) { gold_assert(!this->is_input_section()); - Output_section_data *posd = - this->is_relaxed_input_section() ? this->u2_.poris : this->u2_.posd; + Output_section_data* posd = + this->is_relaxed_input_section() ? this->u2_.poris : this->u2_.posd; posd->set_output_section(os); } @@ -2913,12 +3937,7 @@ class Output_section : public Output_data bool output_offset(const Relobj* object, unsigned int shndx, section_offset_type offset, - section_offset_type *poutput) const; - - // Return whether this is the merge section for the input section - // SHNDX in OBJECT. - bool - is_merge_section_for(const Relobj* object, unsigned int shndx) const; + section_offset_type* poutput) const; // Write out the data. This does nothing for an input section. void @@ -2959,41 +3978,308 @@ class Output_section : public Output_data RELAXED_INPUT_SECTION_CODE = -4U }; - // For an ordinary input section, this is the section index in the - // input file. For an Output_section_data, this is - // OUTPUT_SECTION_CODE or MERGE_DATA_SECTION_CODE or - // MERGE_STRING_SECTION_CODE. - unsigned int shndx_; - // The required alignment, stored as a power of 2. - unsigned int p2align_; - union - { - // For an ordinary input section, the section size. - off_t data_size; - // For OUTPUT_SECTION_CODE or RELAXED_INPUT_SECTION_CODE, this is not - // used. For MERGE_DATA_SECTION_CODE or MERGE_STRING_SECTION_CODE, the - // entity size. - uint64_t entsize; - } u1_; - union - { - // For an ordinary input section, the object which holds the - // input section. - Relobj* object; - // For OUTPUT_SECTION_CODE or MERGE_DATA_SECTION_CODE or - // MERGE_STRING_SECTION_CODE, the data. - Output_section_data* posd; - // For RELAXED_INPUT_SECTION_CODE, the data. - Output_relaxed_input_section* poris; - } u2_; - }; + // For an ordinary input section, this is the section index in the + // input file. For an Output_section_data, this is + // OUTPUT_SECTION_CODE or MERGE_DATA_SECTION_CODE or + // MERGE_STRING_SECTION_CODE. + unsigned int shndx_; + // The required alignment, stored as a power of 2. + unsigned int p2align_; + union + { + // For an ordinary input section, the section size. + off_t data_size; + // For OUTPUT_SECTION_CODE or RELAXED_INPUT_SECTION_CODE, this is not + // used. For MERGE_DATA_SECTION_CODE or MERGE_STRING_SECTION_CODE, the + // entity size. + uint64_t entsize; + } u1_; + union + { + // For an ordinary input section, the object which holds the + // input section. + Relobj* object; + // For OUTPUT_SECTION_CODE or MERGE_DATA_SECTION_CODE or + // MERGE_STRING_SECTION_CODE, the data. + Output_section_data* posd; + Output_merge_base* pomb; + // For RELAXED_INPUT_SECTION_CODE, the data. + Output_relaxed_input_section* poris; + } u2_; + // The line number of the pattern it matches in the --section-ordering-file + // file. It is 0 if does not match any pattern. + unsigned int section_order_index_; + }; + + // Store the list of input sections for this Output_section into the + // list passed in. This removes the input sections, leaving only + // any Output_section_data elements. This returns the size of those + // Output_section_data elements. ADDRESS is the address of this + // output section. FILL is the fill value to use, in case there are + // any spaces between the remaining Output_section_data elements. + uint64_t + get_input_sections(uint64_t address, const std::string& fill, + std::list*); + + // Add a script input section. A script input section can either be + // a plain input section or a sub-class of Output_section_data. + void + add_script_input_section(const Input_section& input_section); + + // Set the current size of the output section. + void + set_current_data_size(off_t size) + { this->set_current_data_size_for_child(size); } + + // End of linker script support. + + // Save states before doing section layout. + // This is used for relaxation. + void + save_states(); + + // Restore states prior to section layout. + void + restore_states(); + + // Discard states. + void + discard_states(); + + // Convert existing input sections to relaxed input sections. + void + convert_input_sections_to_relaxed_sections( + const std::vector& sections); + + // Find a relaxed input section to an input section in OBJECT + // with index SHNDX. Return NULL if none is found. + const Output_relaxed_input_section* + find_relaxed_input_section(const Relobj* object, unsigned int shndx) const; + + // Whether section offsets need adjustment due to relaxation. + bool + section_offsets_need_adjustment() const + { return this->section_offsets_need_adjustment_; } + + // Set section_offsets_need_adjustment to be true. + void + set_section_offsets_need_adjustment() + { this->section_offsets_need_adjustment_ = true; } + + // Set section_offsets_need_adjustment to be false. + void + clear_section_offsets_need_adjustment() + { this->section_offsets_need_adjustment_ = false; } + + // Adjust section offsets of input sections in this. This is + // requires if relaxation caused some input sections to change sizes. + void + adjust_section_offsets(); + + // Whether this is a NOLOAD section. + bool + is_noload() const + { return this->is_noload_; } + + // Set NOLOAD flag. + void + set_is_noload() + { this->is_noload_ = true; } + + // Print merge statistics to stderr. + void + print_merge_stats(); + + // Set a fixed layout for the section. Used for incremental update links. + void + set_fixed_layout(uint64_t sh_addr, off_t sh_offset, off_t sh_size, + uint64_t sh_addralign); + + // Return TRUE if the section has a fixed layout. + bool + has_fixed_layout() const + { return this->has_fixed_layout_; } + + // Set flag to allow patch space for this section. Used for full + // incremental links. + void + set_is_patch_space_allowed() + { this->is_patch_space_allowed_ = true; } + + // Set a fill method to use for free space left in the output section + // during incremental links. + void + set_free_space_fill(Output_fill* free_space_fill) + { + this->free_space_fill_ = free_space_fill; + this->free_list_.set_min_hole_size(free_space_fill->minimum_hole_size()); + } + + // Reserve space within the fixed layout for the section. Used for + // incremental update links. + void + reserve(uint64_t sh_offset, uint64_t sh_size); + + // Allocate space from the free list for the section. Used for + // incremental update links. + off_t + allocate(off_t len, uint64_t addralign); + + typedef std::vector Input_section_list; + + // Allow access to the input sections. + const Input_section_list& + input_sections() const + { return this->input_sections_; } + + Input_section_list& + input_sections() + { return this->input_sections_; } + + // For -r and --emit-relocs, we need to keep track of the associated + // relocation section. + Output_section* + reloc_section() const + { return this->reloc_section_; } + + void + set_reloc_section(Output_section* os) + { this->reloc_section_ = os; } + + protected: + // Return the output section--i.e., the object itself. + Output_section* + do_output_section() + { return this; } + + const Output_section* + do_output_section() const + { return this; } + + // Return the section index in the output file. + unsigned int + do_out_shndx() const + { + gold_assert(this->out_shndx_ != -1U); + return this->out_shndx_; + } + + // Set the output section index. + void + do_set_out_shndx(unsigned int shndx) + { + gold_assert(this->out_shndx_ == -1U || this->out_shndx_ == shndx); + this->out_shndx_ = shndx; + } + + // Update the data size of the Output_section. For a typical + // Output_section, there is nothing to do, but if there are any + // Output_section_data objects we need to do a trial layout + // here. + virtual void + update_data_size(); + + // Set the final data size of the Output_section. For a typical + // Output_section, there is nothing to do, but if there are any + // Output_section_data objects we need to set their final addresses + // here. + virtual void + set_final_data_size(); + + // Reset the address and file offset. + void + do_reset_address_and_file_offset(); + + // Return true if address and file offset already have reset values. In + // other words, calling reset_address_and_file_offset will not change them. + bool + do_address_and_file_offset_have_reset_values() const; + + // Write the data to the file. For a typical Output_section, this + // does nothing: the data is written out by calling Object::Relocate + // on each input object. But if there are any Output_section_data + // objects we do need to write them out here. + virtual void + do_write(Output_file*); + + // Return the address alignment--function required by parent class. + uint64_t + do_addralign() const + { return this->addralign_; } + + // Return whether there is a load address. + bool + do_has_load_address() const + { return this->has_load_address_; } + + // Return the load address. + uint64_t + do_load_address() const + { + gold_assert(this->has_load_address_); + return this->load_address_; + } + + // Return whether this is an Output_section. + bool + do_is_section() const + { return true; } + + // Return whether this is a section of the specified type. + bool + do_is_section_type(elfcpp::Elf_Word type) const + { return this->type_ == type; } + + // Return whether the specified section flag is set. + bool + do_is_section_flag_set(elfcpp::Elf_Xword flag) const + { return (this->flags_ & flag) != 0; } + + // Set the TLS offset. Called only for SHT_TLS sections. + void + do_set_tls_offset(uint64_t tls_base); + + // Return the TLS offset, relative to the base of the TLS segment. + // Valid only for SHT_TLS sections. + uint64_t + do_tls_offset() const + { return this->tls_offset_; } + + // This may be implemented by a child class. + virtual void + do_finalize_name(Layout*) + { } + + // Print to the map file. + virtual void + do_print_to_mapfile(Mapfile*) const; + + // Record that this section requires postprocessing after all + // relocations have been applied. This is called by a child class. + void + set_requires_postprocessing() + { + this->requires_postprocessing_ = true; + this->after_input_sections_ = true; + } - typedef std::vector Input_section_list; + // Write all the data of an Output_section into the postprocessing + // buffer. + void + write_to_postprocessing_buffer(); - // Allow a child class to access the input sections. - const Input_section_list& - input_sections() const - { return this->input_sections_; } + // Whether this always keeps an input section list + bool + always_keeps_input_sections() const + { return this->always_keeps_input_sections_; } + + // Always keep an input section list. + void + set_always_keeps_input_sections() + { + gold_assert(this->current_data_size_for_child() == 0); + this->always_keeps_input_sections_ = true; + } private: // We only save enough information to undo the effects of section layout. @@ -3020,6 +4306,10 @@ class Output_section : public Output_data addralign() const { return this->addralign_; } + void + set_addralign(uint64_t val) + { this->addralign_ = val; } + // Return the section flags. elfcpp::Elf_Xword flags() const @@ -3082,7 +4372,7 @@ class Output_section : public Output_data // This class is used to sort the input sections. class Input_section_sort_entry; - // This is the sort comparison function. + // This is the sort comparison function for ctors and dtors. struct Input_section_sort_compare { bool @@ -3090,6 +4380,40 @@ class Output_section : public Output_data const Input_section_sort_entry&) const; }; + // This is the sort comparison function for .init_array and .fini_array. + struct Input_section_sort_init_fini_compare + { + bool + operator()(const Input_section_sort_entry&, + const Input_section_sort_entry&) const; + }; + + // This is the sort comparison function when a section order is specified + // from an input file. + struct Input_section_sort_section_order_index_compare + { + bool + operator()(const Input_section_sort_entry&, + const Input_section_sort_entry&) const; + }; + + // This is the sort comparison function for .text to sort sections with + // prefixes .text.{unlikely,exit,startup,hot} before other sections. + struct Input_section_sort_section_prefix_special_ordering_compare + { + bool + operator()(const Input_section_sort_entry&, + const Input_section_sort_entry&) const; + }; + + // This is the sort comparison function for sorting sections by name. + struct Input_section_sort_section_name_compare + { + bool + operator()(const Input_section_sort_entry&, + const Input_section_sort_entry&) const; + }; + // Fill data. This is used to fill in data between input sections. // It is also used for data statements (BYTE, WORD, etc.) in linker // scripts. When we have to keep track of the input sections, we @@ -3122,91 +4446,22 @@ class Output_section : public Output_data typedef std::vector Fill_list; - // This class describes properties of merge data sections. It is used - // as a key type for maps. - class Merge_section_properties - { - public: - Merge_section_properties(bool is_string, uint64_t entsize, - uint64_t addralign) - : is_string_(is_string), entsize_(entsize), addralign_(addralign) - { } - - // Whether this equals to another Merge_section_properties MSP. - bool - eq(const Merge_section_properties& msp) const - { - return ((this->is_string_ == msp.is_string_) - && (this->entsize_ == msp.entsize_) - && (this->addralign_ == msp.addralign_)); - } - - // Compute a hash value for this using 64-bit FNV-1a hash. - size_t - hash_value() const - { - uint64_t h = 14695981039346656037ULL; // FNV offset basis. - uint64_t prime = 1099511628211ULL; - h = (h ^ static_cast(this->is_string_)) * prime; - h = (h ^ static_cast(this->entsize_)) * prime; - h = (h ^ static_cast(this->addralign_)) * prime; - return h; - } - - // Functors for associative containers. - struct equal_to - { - bool - operator()(const Merge_section_properties& msp1, - const Merge_section_properties& msp2) const - { return msp1.eq(msp2); } - }; - - struct hash - { - size_t - operator()(const Merge_section_properties& msp) const - { return msp.hash_value(); } - }; - - private: - // Whether this merge data section is for strings. - bool is_string_; - // Entsize of this merge data section. - uint64_t entsize_; - // Address alignment. - uint64_t addralign_; - }; - - // Map that link Merge_section_properties to Output_merge_base. - typedef Unordered_map - Merge_section_by_properties_map; - - // Map that link Input_section_specifier to Output_section_data. - typedef Unordered_map - Output_section_data_by_input_section_map; - // Map used during relaxation of existing sections. This map - // an input section specifier to an input section list index. - // We assume that Input_section_list is a vector. - typedef Unordered_map - Relaxation_map; + // a section id an input section list index. We assume that + // Input_section_list is a vector. + typedef Unordered_map Relaxation_map; // Add a new output section by Input_section. void add_output_section_data(Input_section*); // Add an SHF_MERGE input section. Returns true if the section was - // handled. + // handled. If KEEPS_INPUT_SECTIONS is true, the output merge section + // stores information about the merged input sections. bool add_merge_input_section(Relobj* object, unsigned int shndx, uint64_t flags, - uint64_t entsize, uint64_t addralign); + uint64_t entsize, uint64_t addralign, + bool keeps_input_sections); // Add an output SHF_MERGE section POSD to this output section. // IS_STRING indicates whether it is a SHF_STRINGS section, and @@ -3216,13 +4471,9 @@ class Output_section : public Output_data add_output_merge_section(Output_section_data* posd, bool is_string, uint64_t entsize); - // Sort the attached input sections. - void - sort_attached_input_sections(); - // Find the merge section into which an input section with index SHNDX in // OBJECT has been added. Return NULL if none found. - Output_section_data* + const Output_section_data* find_merge_section(const Relobj* object, unsigned int shndx) const; // Build a relaxation map. @@ -3239,6 +4490,10 @@ class Output_section : public Output_data const Relaxation_map& map, Input_section_list* input_sections); + // Build the lookup maps for merge and relaxed input sections. + void + build_lookup_maps() const; + // Most of these fields are only valid after layout. // The name of the section. This will point into a Stringpool. @@ -3269,6 +4524,8 @@ class Output_section : public Output_data const elfcpp::Elf_Word type_; // The section flags. elfcpp::Elf_Xword flags_; + // The order of this section in the output segment. + Output_section_order order_; // The section index. unsigned int out_shndx_; // If there is a STT_SECTION for this output section in the normal @@ -3322,6 +4579,9 @@ class Output_section : public Output_data // section, false if it means the symbol index of the corresponding // section symbol. bool info_uses_section_index_ : 1; + // True if input sections attached to this output section have to be + // sorted according to a specified order. + bool input_section_order_specified_ : 1; // True if the input sections attached to this output section may // need sorting. bool may_sort_attached_input_sections_ : 1; @@ -3333,34 +4593,48 @@ class Output_section : public Output_data bool attached_input_sections_are_sorted_ : 1; // True if this section holds relro data. bool is_relro_ : 1; - // True if this section holds relro local data. - bool is_relro_local_ : 1; // True if this is a small section. bool is_small_section_ : 1; // True if this is a large section. bool is_large_section_ : 1; - // True if this is the .interp section going into the PT_INTERP - // segment. - bool is_interp_ : 1; - // True if this is section is read by the dynamic linker. - bool is_dynamic_linker_section_ : 1; // Whether code-fills are generated at write. bool generate_code_fills_at_write_ : 1; + // Whether the entry size field should be zero. + bool is_entsize_zero_ : 1; + // Whether section offsets need adjustment due to relaxation. + bool section_offsets_need_adjustment_ : 1; + // Whether this is a NOLOAD section. + bool is_noload_ : 1; + // Whether this always keeps input section. + bool always_keeps_input_sections_ : 1; + // Whether this section has a fixed layout, for incremental update links. + bool has_fixed_layout_ : 1; + // True if we can add patch space to this section. + bool is_patch_space_allowed_ : 1; + // True if this output section goes into a unique segment. + bool is_unique_segment_ : 1; // For SHT_TLS sections, the offset of this section relative to the base // of the TLS segment. uint64_t tls_offset_; + // Additional segment flags, specified via linker plugin, when mapping some + // input sections to unique segments. + uint64_t extra_segment_flags_; + // Segment alignment specified via linker plugin, when mapping some + // input sections to unique segments. + uint64_t segment_alignment_; // Saved checkpoint. Checkpoint_output_section* checkpoint_; - // Map from input sections to merge sections. - Output_section_data_by_input_section_map merge_section_map_; - // Map from merge section properties to merge_sections; - Merge_section_by_properties_map merge_section_by_properties_map_; - // Map from input sections to relaxed input sections. This is mutable - // because it is updated lazily. We may need to update it in a - // const qualified method. - mutable Output_section_data_by_input_section_map relaxed_input_section_map_; - // Whether relaxed_input_section_map_ is valid. - mutable bool is_relaxed_input_section_map_valid_; + // Fast lookup maps for merged and relaxed input sections. + Output_section_lookup_maps* lookup_maps_; + // List of available regions within the section, for incremental + // update links. + Free_list free_list_; + // Method for filling chunks of free space. + Output_fill* free_space_fill_; + // Amount added as patch space for incremental linking. + off_t patch_space_; + // Associated relocation section, when emitting relocations. + Output_section* reloc_section_; }; // An output segment. PT_LOAD segments are built from collections of @@ -3425,40 +4699,63 @@ class Output_segment set_is_large_data_segment() { this->is_large_data_segment_ = true; } + bool + is_unique_segment() const + { return this->is_unique_segment_; } + + // Mark segment as unique, happens when linker plugins request that + // certain input sections be mapped to unique segments. + void + set_is_unique_segment() + { this->is_unique_segment_ = true; } + // Return the maximum alignment of the Output_data. uint64_t maximum_alignment(); - // Add the Output_section OS to this segment. SEG_FLAGS is the - // segment flags to use. DO_SORT is true if we should sort the - // placement of the input section for more efficient generated code. + // Add the Output_section OS to this PT_LOAD segment. SEG_FLAGS is + // the segment flags to use. + void + add_output_section_to_load(Layout* layout, Output_section* os, + elfcpp::Elf_Word seg_flags); + + // Add the Output_section OS to this non-PT_LOAD segment. SEG_FLAGS + // is the segment flags to use. void - add_output_section(Output_section* os, elfcpp::Elf_Word seg_flags, - bool do_sort); + add_output_section_to_nonload(Output_section* os, + elfcpp::Elf_Word seg_flags); // Remove an Output_section from this segment. It is an error if it // is not present. void remove_output_section(Output_section* os); - // Add an Output_data (which is not an Output_section) to the start - // of this segment. + // Add an Output_data (which need not be an Output_section) to the + // start of this segment. void add_initial_output_data(Output_data*); // Return true if this segment has any sections which hold actual // data, rather than being a BSS section. bool - has_any_data_sections() const - { return !this->output_data_.empty(); } + has_any_data_sections() const; - // Return the number of dynamic relocations applied to this segment. - unsigned int - dynamic_reloc_count() const; + // Whether this segment has a dynamic relocs. + bool + has_dynamic_reloc() const; + + // Return the first section. + Output_section* + first_section() const; // Return the address of the first section. uint64_t - first_section_load_address() const; + first_section_load_address() const + { + const Output_section* os = this->first_section(); + gold_assert(os != NULL); + return os->has_load_address() ? os->load_address() : os->address(); + } // Return whether the addresses have been set already. bool @@ -3474,6 +4771,17 @@ class Output_segment this->are_addresses_set_ = true; } + // Update the flags for the flags of an output section added to this + // segment. + void + update_flags_for_output_section(elfcpp::Elf_Xword flags) + { + // The ELF ABI specifies that a PT_TLS segment should always have + // PF_R as the flags. + if (this->type() != elfcpp::PT_TLS) + this->flags_ |= flags; + } + // Set the segment flags. This is only used if we have a PHDRS // clause which explicitly specifies the flags. void @@ -3488,19 +4796,30 @@ class Output_segment // address of the immediately following segment. Update *POFF and // *PSHNDX. This should only be called for a PT_LOAD segment. uint64_t - set_section_addresses(const Layout*, bool reset, uint64_t addr, off_t* poff, - unsigned int* pshndx); + set_section_addresses(const Target*, Layout*, bool reset, uint64_t addr, + unsigned int* increase_relro, bool* has_relro, + off_t* poff, unsigned int* pshndx); // Set the minimum alignment of this segment. This may be adjusted // upward based on the section alignments. void set_minimum_p_align(uint64_t align) - { this->min_p_align_ = align; } + { + if (align > this->min_p_align_) + this->min_p_align_ = align; + } + + // Set the memory size of this segment. + void + set_size(uint64_t size) + { + this->memsz_ = size; + } // Set the offset of this segment based on the section. This should // only be called for a non-PT_LOAD segment. void - set_offset(); + set_offset(unsigned int increase); // Set the TLS offsets of the sections contained in the PT_TLS segment. void @@ -3532,7 +4851,7 @@ class Output_segment print_sections_to_mapfile(Mapfile*) const; private: - typedef std::list Output_data_list; + typedef std::vector Output_data_list; // Find the maximum alignment in an Output_data_list. static uint64_t @@ -3544,17 +4863,17 @@ class Output_segment // Set the section addresses in an Output_data_list. uint64_t - set_section_list_addresses(const Layout*, bool reset, Output_data_list*, - uint64_t addr, off_t* poff, unsigned int* pshndx, - bool* in_tls, bool* in_relro); + set_section_list_addresses(Layout*, bool reset, Output_data_list*, + uint64_t addr, off_t* poff, off_t* fpoff, + unsigned int* pshndx, bool* in_tls); // Return the number of Output_sections in an Output_data_list. unsigned int output_section_count_list(const Output_data_list*) const; - // Return the number of dynamic relocs in an Output_data_list. - unsigned int - dynamic_reloc_count_list(const Output_data_list*) const; + // Return whether an Output_data_list has a dynamic reloc. + bool + has_dynamic_reloc_list(const Output_data_list*) const; // Find the section with the lowest load address in an // Output_data_list. @@ -3563,6 +4882,12 @@ class Output_segment Output_section** found, uint64_t* found_lma) const; + // Find the first and last entries by address. + void + find_first_and_last_list(const Output_data_list* pdl, + const Output_data** pfirst, + const Output_data** plast) const; + // Write the section headers in the list into V. template unsigned char* @@ -3576,11 +4901,9 @@ class Output_segment // NOTE: We want to use the copy constructor. Currently, shallow copy // works for us so we do not need to write our own copy constructor. - - // The list of output data with contents attached to this segment. - Output_data_list output_data_; - // The list of output data without contents attached to this segment. - Output_data_list output_bss_; + + // The list of output data attached to this segment. + Output_data_list output_lists_[ORDER_MAX]; // The segment virtual address. uint64_t vaddr_; // The segment physical address. @@ -3612,128 +4935,8 @@ class Output_segment bool are_addresses_set_ : 1; // Whether this segment holds large data sections. bool is_large_data_segment_ : 1; -}; - -// This class represents the output file. - -class Output_file -{ - public: - Output_file(const char* name); - - // Indicate that this is a temporary file which should not be - // output. - void - set_is_temporary() - { this->is_temporary_ = true; } - - // Try to open an existing file. Returns false if the file doesn't - // exist, has a size of 0 or can't be mmaped. This method is - // thread-unsafe. - bool - open_for_modification(); - - // Open the output file. FILE_SIZE is the final size of the file. - // If the file already exists, it is deleted/truncated. This method - // is thread-unsafe. - void - open(off_t file_size); - - // Resize the output file. This method is thread-unsafe. - void - resize(off_t file_size); - - // Close the output file (flushing all buffered data) and make sure - // there are no errors. This method is thread-unsafe. - void - close(); - - // Return the size of this file. - off_t - filesize() - { return this->file_size_; } - - // Return the name of this file. - const char* - filename() - { return this->name_; } - - // We currently always use mmap which makes the view handling quite - // simple. In the future we may support other approaches. - - // Write data to the output file. - void - write(off_t offset, const void* data, size_t len) - { memcpy(this->base_ + offset, data, len); } - - // Get a buffer to use to write to the file, given the offset into - // the file and the size. - unsigned char* - get_output_view(off_t start, size_t size) - { - gold_assert(start >= 0 - && start + static_cast(size) <= this->file_size_); - return this->base_ + start; - } - - // VIEW must have been returned by get_output_view. Write the - // buffer to the file, passing in the offset and the size. - void - write_output_view(off_t, size_t, unsigned char*) - { } - - // Get a read/write buffer. This is used when we want to write part - // of the file, read it in, and write it again. - unsigned char* - get_input_output_view(off_t start, size_t size) - { return this->get_output_view(start, size); } - - // Write a read/write buffer back to the file. - void - write_input_output_view(off_t, size_t, unsigned char*) - { } - - // Get a read buffer. This is used when we just want to read part - // of the file back it in. - const unsigned char* - get_input_view(off_t start, size_t size) - { return this->get_output_view(start, size); } - - // Release a read bfufer. - void - free_input_view(off_t, size_t, const unsigned char*) - { } - - private: - // Map the file into memory or, if that fails, allocate anonymous - // memory. - void - map(); - - // Allocate anonymous memory for the file. - bool - map_anonymous(); - - // Map the file into memory. - bool - map_no_anonymous(); - - // Unmap the file from memory (and flush to disk buffers). - void - unmap(); - - // File name. - const char* name_; - // File descriptor. - int o_; - // File size. - off_t file_size_; - // Base of file mapped into memory. - unsigned char* base_; - // True iff base_ points to a memory buffer rather than an output file. - bool map_is_anonymous_; - // True if this is a temporary file which should not be output. - bool is_temporary_; + // Whether this was marked as a unique segment via a linker plugin. + bool is_unique_segment_ : 1; }; } // End namespace gold.