#include "libiberty.h"
+#include "dwarf.h"
#include "parameters.h"
#include "object.h"
#include "symtab.h"
#include "reloc.h"
#include "merge.h"
#include "descriptors.h"
+#include "layout.h"
#include "output.h"
// For systems without mmap support.
}
}
-// Write out the file header with appropriate size and endianess.
+// Write out the file header with appropriate size and endianness.
template<int size, bool big_endian>
void
bool is_symbolless)
: address_(address), local_sym_index_(GSYM_CODE), type_(type),
is_relative_(is_relative), is_symbolless_(is_symbolless),
- is_section_symbol_(false), shndx_(INVALID_CODE)
+ is_section_symbol_(false), use_plt_offset_(false), shndx_(INVALID_CODE)
{
// this->type_ is a bitfield; make sure TYPE fits.
gold_assert(this->type_ == type);
bool is_symbolless)
: address_(address), local_sym_index_(GSYM_CODE), type_(type),
is_relative_(is_relative), is_symbolless_(is_symbolless),
- is_section_symbol_(false), shndx_(shndx)
+ is_section_symbol_(false), use_plt_offset_(false), shndx_(shndx)
{
gold_assert(shndx != INVALID_CODE);
// this->type_ is a bitfield; make sure TYPE fits.
Address address,
bool is_relative,
bool is_symbolless,
- bool is_section_symbol)
+ bool is_section_symbol,
+ bool use_plt_offset)
: address_(address), local_sym_index_(local_sym_index), type_(type),
is_relative_(is_relative), is_symbolless_(is_symbolless),
- is_section_symbol_(is_section_symbol), shndx_(INVALID_CODE)
+ is_section_symbol_(is_section_symbol), use_plt_offset_(use_plt_offset),
+ shndx_(INVALID_CODE)
{
gold_assert(local_sym_index != GSYM_CODE
&& local_sym_index != INVALID_CODE);
Address address,
bool is_relative,
bool is_symbolless,
- bool is_section_symbol)
+ bool is_section_symbol,
+ bool use_plt_offset)
: address_(address), local_sym_index_(local_sym_index), type_(type),
is_relative_(is_relative), is_symbolless_(is_symbolless),
- is_section_symbol_(is_section_symbol), shndx_(shndx)
+ is_section_symbol_(is_section_symbol), use_plt_offset_(use_plt_offset),
+ shndx_(shndx)
{
gold_assert(local_sym_index != GSYM_CODE
&& local_sym_index != INVALID_CODE);
Address address)
: address_(address), local_sym_index_(SECTION_CODE), type_(type),
is_relative_(false), is_symbolless_(false),
- is_section_symbol_(true), shndx_(INVALID_CODE)
+ is_section_symbol_(true), use_plt_offset_(false), shndx_(INVALID_CODE)
{
// this->type_ is a bitfield; make sure TYPE fits.
gold_assert(this->type_ == type);
Address address)
: address_(address), local_sym_index_(SECTION_CODE), type_(type),
is_relative_(false), is_symbolless_(false),
- is_section_symbol_(true), shndx_(shndx)
+ is_section_symbol_(true), use_plt_offset_(false), shndx_(shndx)
{
gold_assert(shndx != INVALID_CODE);
// this->type_ is a bitfield; make sure TYPE fits.
Address address)
: address_(address), local_sym_index_(0), type_(type),
is_relative_(false), is_symbolless_(false),
- is_section_symbol_(false), shndx_(INVALID_CODE)
+ is_section_symbol_(false), use_plt_offset_(false), shndx_(INVALID_CODE)
{
// this->type_ is a bitfield; make sure TYPE fits.
gold_assert(this->type_ == type);
Address address)
: address_(address), local_sym_index_(0), type_(type),
is_relative_(false), is_symbolless_(false),
- is_section_symbol_(false), shndx_(shndx)
+ is_section_symbol_(false), use_plt_offset_(false), shndx_(shndx)
{
gold_assert(shndx != INVALID_CODE);
// this->type_ is a bitfield; make sure TYPE fits.
Address address)
: address_(address), local_sym_index_(TARGET_CODE), type_(type),
is_relative_(false), is_symbolless_(false),
- is_section_symbol_(false), shndx_(INVALID_CODE)
+ is_section_symbol_(false), use_plt_offset_(false), shndx_(INVALID_CODE)
{
// this->type_ is a bitfield; make sure TYPE fits.
gold_assert(this->type_ == type);
Address address)
: address_(address), local_sym_index_(TARGET_CODE), type_(type),
is_relative_(false), is_symbolless_(false),
- is_section_symbol_(false), shndx_(shndx)
+ is_section_symbol_(false), use_plt_offset_(false), shndx_(shndx)
{
gold_assert(shndx != INVALID_CODE);
// this->type_ is a bitfield; make sure TYPE fits.
Sized_relobj_file<size, big_endian>* relobj =
this->u1_.relobj->sized_relobj();
gold_assert(relobj != NULL);
+ if (this->use_plt_offset_)
+ {
+ uint64_t plt_address =
+ parameters->target().plt_address_for_local(relobj, lsi);
+ return plt_address + relobj->local_plt_offset(lsi);
+ }
const Symbol_value<size>* symval = relobj->local_symbol(lsi);
return symval->value(relobj, addend);
}
// RELATIVE relocation.
Symbol* gsym = this->u_.gsym;
if (this->use_plt_offset_ && gsym->has_plt_offset())
- val = (parameters->target().plt_section_for_global(gsym)->address()
+ val = (parameters->target().plt_address_for_global(gsym)
+ gsym->plt_offset());
else
{
val = symval->value(this->u_.object, 0);
else
{
- const Output_data* plt =
- parameters->target().plt_section_for_local(object, lsi);
- val = plt->address() + object->local_plt_offset(lsi);
+ uint64_t plt_address =
+ parameters->target().plt_address_for_local(object, lsi);
+ val = plt_address + object->local_plt_offset(lsi);
}
}
break;
// For an incremental update, find an available slot.
off_t got_offset = this->free_list_.allocate(size / 8, size / 8, 0);
if (got_offset == -1)
- gold_fatal(_("out of patch space (GOT);"
- " relink with --incremental-full"));
+ gold_fallback(_("out of patch space (GOT);"
+ " relink with --incremental-full"));
unsigned int got_index = got_offset / (size / 8);
gold_assert(got_index < this->entries_.size());
this->entries_[got_index] = got_entry;
// For an incremental update, find an available pair of slots.
off_t got_offset = this->free_list_.allocate(2 * size / 8, size / 8, 0);
if (got_offset == -1)
- gold_fatal(_("out of patch space (GOT);"
- " relink with --incremental-full"));
+ gold_fallback(_("out of patch space (GOT);"
+ " relink with --incremental-full"));
unsigned int got_index = got_offset / (size / 8);
gold_assert(got_index < this->entries_.size());
this->entries_[got_index] = got_entry_1;
}
}
+// Output_fill_debug_info methods.
+
+// Return the minimum size needed for a dummy compilation unit header.
+
+size_t
+Output_fill_debug_info::do_minimum_hole_size() const
+{
+ // Compile unit header fields: unit_length, version, debug_abbrev_offset,
+ // address_size.
+ const size_t len = 4 + 2 + 4 + 1;
+ // For type units, add type_signature, type_offset.
+ if (this->is_debug_types_)
+ return len + 8 + 4;
+ return len;
+}
+
+// Write a dummy compilation unit header to fill a hole in the
+// .debug_info or .debug_types section.
+
+void
+Output_fill_debug_info::do_write(Output_file* of, off_t off, size_t len) const
+{
+ gold_debug(DEBUG_INCREMENTAL, "fill_debug_info(%08lx, %08lx)",
+ static_cast<long>(off), static_cast<long>(len));
+
+ gold_assert(len >= this->do_minimum_hole_size());
+
+ unsigned char* const oview = of->get_output_view(off, len);
+ unsigned char* pov = oview;
+
+ // Write header fields: unit_length, version, debug_abbrev_offset,
+ // address_size.
+ if (this->is_big_endian())
+ {
+ elfcpp::Swap_unaligned<32, true>::writeval(pov, len - 4);
+ elfcpp::Swap_unaligned<16, true>::writeval(pov + 4, this->version);
+ elfcpp::Swap_unaligned<32, true>::writeval(pov + 6, 0);
+ }
+ else
+ {
+ elfcpp::Swap_unaligned<32, false>::writeval(pov, len - 4);
+ elfcpp::Swap_unaligned<16, false>::writeval(pov + 4, this->version);
+ elfcpp::Swap_unaligned<32, false>::writeval(pov + 6, 0);
+ }
+ pov += 4 + 2 + 4;
+ *pov++ = 4;
+
+ // For type units, the additional header fields -- type_signature,
+ // type_offset -- can be filled with zeroes.
+
+ // Fill the remainder of the free space with zeroes. The first
+ // zero should tell the consumer there are no DIEs to read in this
+ // compilation unit.
+ if (pov < oview + len)
+ memset(pov, 0, oview + len - pov);
+
+ of->write_output_view(off, len, oview);
+}
+
+// Output_fill_debug_line methods.
+
+// Return the minimum size needed for a dummy line number program header.
+
+size_t
+Output_fill_debug_line::do_minimum_hole_size() const
+{
+ // Line number program header fields: unit_length, version, header_length,
+ // minimum_instruction_length, default_is_stmt, line_base, line_range,
+ // opcode_base, standard_opcode_lengths[], include_directories, filenames.
+ const size_t len = 4 + 2 + 4 + this->header_length;
+ return len;
+}
+
+// Write a dummy line number program header to fill a hole in the
+// .debug_line section.
+
+void
+Output_fill_debug_line::do_write(Output_file* of, off_t off, size_t len) const
+{
+ gold_debug(DEBUG_INCREMENTAL, "fill_debug_line(%08lx, %08lx)",
+ static_cast<long>(off), static_cast<long>(len));
+
+ gold_assert(len >= this->do_minimum_hole_size());
+
+ unsigned char* const oview = of->get_output_view(off, len);
+ unsigned char* pov = oview;
+
+ // Write header fields: unit_length, version, header_length,
+ // minimum_instruction_length, default_is_stmt, line_base, line_range,
+ // opcode_base, standard_opcode_lengths[], include_directories, filenames.
+ // We set the header_length field to cover the entire hole, so the
+ // line number program is empty.
+ if (this->is_big_endian())
+ {
+ elfcpp::Swap_unaligned<32, true>::writeval(pov, len - 4);
+ elfcpp::Swap_unaligned<16, true>::writeval(pov + 4, this->version);
+ elfcpp::Swap_unaligned<32, true>::writeval(pov + 6, len - (4 + 2 + 4));
+ }
+ else
+ {
+ elfcpp::Swap_unaligned<32, false>::writeval(pov, len - 4);
+ elfcpp::Swap_unaligned<16, false>::writeval(pov + 4, this->version);
+ elfcpp::Swap_unaligned<32, false>::writeval(pov + 6, len - (4 + 2 + 4));
+ }
+ pov += 4 + 2 + 4;
+ *pov++ = 1; // minimum_instruction_length
+ *pov++ = 0; // default_is_stmt
+ *pov++ = 0; // line_base
+ *pov++ = 5; // line_range
+ *pov++ = 13; // opcode_base
+ *pov++ = 0; // standard_opcode_lengths[1]
+ *pov++ = 1; // standard_opcode_lengths[2]
+ *pov++ = 1; // standard_opcode_lengths[3]
+ *pov++ = 1; // standard_opcode_lengths[4]
+ *pov++ = 1; // standard_opcode_lengths[5]
+ *pov++ = 0; // standard_opcode_lengths[6]
+ *pov++ = 0; // standard_opcode_lengths[7]
+ *pov++ = 0; // standard_opcode_lengths[8]
+ *pov++ = 1; // standard_opcode_lengths[9]
+ *pov++ = 0; // standard_opcode_lengths[10]
+ *pov++ = 0; // standard_opcode_lengths[11]
+ *pov++ = 1; // standard_opcode_lengths[12]
+ *pov++ = 0; // include_directories (empty)
+ *pov++ = 0; // filenames (empty)
+
+ // Some consumers don't check the header_length field, and simply
+ // start reading the line number program immediately following the
+ // header. For those consumers, we fill the remainder of the free
+ // space with DW_LNS_set_basic_block opcodes. These are effectively
+ // no-ops: the resulting line table program will not create any rows.
+ if (pov < oview + len)
+ memset(pov, elfcpp::DW_LNS_set_basic_block, oview + len - pov);
+
+ of->write_output_view(off, len, oview);
+}
+
// Output_section::Input_section methods.
// Return the current data size. For an input section we store the size here.
is_noload_(false),
always_keeps_input_sections_(false),
has_fixed_layout_(false),
+ is_patch_space_allowed_(false),
tls_offset_(0),
checkpoint_(NULL),
lookup_maps_(new Output_section_lookup_maps),
- free_list_()
+ free_list_(),
+ free_space_fill_(NULL),
+ patch_space_(0)
{
// An unallocated section has no address. Forcing this means that
// we don't need special treatment for symbols defined in debug
offset_in_section = this->free_list_.allocate(input_section_size,
addralign, 0);
if (offset_in_section == -1)
- gold_fatal(_("out of patch space; relink with --incremental-full"));
+ gold_fallback(_("out of patch space in section %s; "
+ "relink with --incremental-full"),
+ this->name());
aligned_offset_in_section = offset_in_section;
}
else
&& (sh_flags & elfcpp::SHF_EXECINSTR) != 0
&& parameters->target().has_code_fill()
&& (parameters->target().may_relax()
- || parameters->options().section_ordering_file()))
+ || layout->is_section_ordering_specified()))
{
gold_assert(this->fills_.empty());
this->generate_code_fills_at_write_ = true;
|| this->must_sort_attached_input_sections()
|| parameters->options().user_set_Map()
|| parameters->target().may_relax()
- || parameters->options().section_ordering_file())
+ || layout->is_section_ordering_specified())
{
Input_section isecn(object, shndx, input_section_size, addralign);
+ /* If section ordering is requested by specifying a ordering file,
+ using --section-ordering-file, match the section name with
+ a pattern. */
if (parameters->options().section_ordering_file())
{
unsigned int section_order_index =
offset_in_section = this->free_list_.allocate(posd->data_size(),
posd->addralign(), 0);
if (offset_in_section == -1)
- gold_fatal(_("out of patch space; relink with --incremental-full"));
+ gold_fallback(_("out of patch space in section %s; "
+ "relink with --incremental-full"),
+ this->name());
// Finalize the address and offset now.
uint64_t addr = this->address();
off_t offset = this->offset();
// If the --section-ordering-file option is used to specify the order of
// sections, we need to keep track of sections.
- if (parameters->options().section_ordering_file())
+ if (layout->is_section_ordering_specified())
{
unsigned int section_order_index =
layout->find_section_order_index(name);
void
Output_section::set_final_data_size()
{
+ off_t data_size;
+
if (this->input_sections_.empty())
+ data_size = this->current_data_size_for_child();
+ else
{
- this->set_data_size(this->current_data_size_for_child());
- return;
- }
+ if (this->must_sort_attached_input_sections()
+ || this->input_section_order_specified())
+ this->sort_attached_input_sections();
- if (this->must_sort_attached_input_sections()
- || this->input_section_order_specified())
- this->sort_attached_input_sections();
+ uint64_t address = this->address();
+ off_t startoff = this->offset();
+ off_t off = startoff + this->first_input_offset_;
+ for (Input_section_list::iterator p = this->input_sections_.begin();
+ p != this->input_sections_.end();
+ ++p)
+ {
+ off = align_address(off, p->addralign());
+ p->set_address_and_file_offset(address + (off - startoff), off,
+ startoff);
+ off += p->data_size();
+ }
+ data_size = off - startoff;
+ }
- uint64_t address = this->address();
- off_t startoff = this->offset();
- off_t off = startoff + this->first_input_offset_;
- for (Input_section_list::iterator p = this->input_sections_.begin();
- p != this->input_sections_.end();
- ++p)
+ // For full incremental links, we want to allocate some patch space
+ // in most sections for subsequent incremental updates.
+ if (this->is_patch_space_allowed_ && parameters->incremental_full())
{
- off = align_address(off, p->addralign());
- p->set_address_and_file_offset(address + (off - startoff), off,
- startoff);
- off += p->data_size();
+ double pct = parameters->options().incremental_patch();
+ size_t extra = static_cast<size_t>(data_size * pct);
+ if (this->free_space_fill_ != NULL
+ && this->free_space_fill_->minimum_hole_size() > extra)
+ extra = this->free_space_fill_->minimum_hole_size();
+ off_t new_size = align_address(data_size + extra, this->addralign());
+ this->patch_space_ = new_size - data_size;
+ gold_debug(DEBUG_INCREMENTAL,
+ "set_final_data_size: %08lx + %08lx: section %s",
+ static_cast<long>(data_size),
+ static_cast<long>(this->patch_space_),
+ this->name());
+ data_size = new_size;
}
- this->set_data_size(off - startoff);
+ this->set_data_size(data_size);
}
// Reset the address and file offset.
p != this->input_sections_.end();
++p)
p->reset_address_and_file_offset();
+
+ // Remove any patch space that was added in set_final_data_size.
+ if (this->patch_space_ > 0)
+ {
+ this->set_current_data_size_for_child(this->current_data_size_for_child()
+ - this->patch_space_);
+ this->patch_space_ = 0;
+ }
}
-
+
// Return true if address and file offset have the values after reset.
bool
// priority ordering implemented by the GNU linker, in which the
// priority becomes part of the section name and the sections are
// sorted by name. We only do this for an output section if we see an
-// attached input section matching ".ctor.*", ".dtor.*",
+// attached input section matching ".ctors.*", ".dtors.*",
// ".init_array.*" or ".fini_array.*".
class Output_section::Input_section_sort_entry
return this->section_name_.find('.', 1) != std::string::npos;
}
+ // Return the priority. Believe it or not, gcc encodes the priority
+ // differently for .ctors/.dtors and .init_array/.fini_array
+ // sections.
+ unsigned int
+ get_priority() const
+ {
+ gold_assert(this->section_has_name_);
+ bool is_ctors;
+ if (is_prefix_of(".ctors.", this->section_name_.c_str())
+ || is_prefix_of(".dtors.", this->section_name_.c_str()))
+ is_ctors = true;
+ else if (is_prefix_of(".init_array.", this->section_name_.c_str())
+ || is_prefix_of(".fini_array.", this->section_name_.c_str()))
+ is_ctors = false;
+ else
+ return 0;
+ char* end;
+ unsigned long prio = strtoul((this->section_name_.c_str()
+ + (is_ctors ? 7 : 12)),
+ &end, 10);
+ if (*end != '\0')
+ return 0;
+ else if (is_ctors)
+ return 65535 - prio;
+ else
+ return prio;
+ }
+
// Return true if this an input file whose base name matches
// FILE_NAME. The base name must have an extension of ".o", and
// must be exactly FILE_NAME.o or FILE_NAME, one character, ".o".
// file name this way is a dreadful hack, but the GNU linker does it
// in order to better support gcc, and we need to be compatible.
bool
- match_file_name(const char* match_file_name) const
- {
- const std::string& file_name(this->input_section_.relobj()->name());
- const char* base_name = lbasename(file_name.c_str());
- size_t match_len = strlen(match_file_name);
- if (strncmp(base_name, match_file_name, match_len) != 0)
- return false;
- size_t base_len = strlen(base_name);
- if (base_len != match_len + 2 && base_len != match_len + 3)
- return false;
- return memcmp(base_name + base_len - 2, ".o", 2) == 0;
- }
+ match_file_name(const char* file_name) const
+ { return Layout::match_file_name(this->input_section_.relobj(), file_name); }
// Returns 1 if THIS should appear before S in section order, -1 if S
// appears before THIS and 0 if they are not comparable.
if (!s1_has_priority && s2_has_priority)
return false;
+ // .ctors and .dtors sections without priority come after
+ // .init_array and .fini_array sections without priority.
+ if (!s1_has_priority
+ && (s1.section_name() == ".ctors" || s1.section_name() == ".dtors")
+ && s1.section_name() != s2.section_name())
+ return false;
+ if (!s2_has_priority
+ && (s2.section_name() == ".ctors" || s2.section_name() == ".dtors")
+ && s2.section_name() != s1.section_name())
+ return true;
+
+ // Sort by priority if we can.
+ if (s1_has_priority)
+ {
+ unsigned int s1_prio = s1.get_priority();
+ unsigned int s2_prio = s2.get_priority();
+ if (s1_prio < s2_prio)
+ return true;
+ else if (s1_prio > s2_prio)
+ return false;
+ }
+
// Check if a section order exists for these sections through a section
// ordering file. If sequence_num is 0, an order does not exist.
int sequence_num = s1.compare_section_ordering(s2);
return s1_secn_index < s2_secn_index;
}
+// This updates the section order index of input sections according to the
+// the order specified in the mapping from Section id to order index.
+
+void
+Output_section::update_section_layout(
+ const Section_layout_order* order_map)
+{
+ for (Input_section_list::iterator p = this->input_sections_.begin();
+ p != this->input_sections_.end();
+ ++p)
+ {
+ if (p->is_input_section()
+ || p->is_relaxed_input_section())
+ {
+ Object* obj = (p->is_input_section()
+ ? p->relobj()
+ : p->relaxed_input_section()->relobj());
+ unsigned int shndx = p->shndx();
+ Section_layout_order::const_iterator it
+ = order_map->find(Section_id(obj, shndx));
+ if (it == order_map->end())
+ continue;
+ unsigned int section_order_index = it->second;
+ if (section_order_index != 0)
+ {
+ p->set_section_order_index(section_order_index);
+ this->set_input_section_order_specified();
+ }
+ }
+ }
+}
+
// Sort the input sections attached to an output section.
void
}
else
{
- gold_assert(parameters->options().section_ordering_file());
+ gold_assert(this->input_section_order_specified());
std::sort(sort_list.begin(), sort_list.end(),
Input_section_sort_section_order_index_compare());
}
if (this->link_section_ != NULL)
oshdr->put_sh_link(this->link_section_->out_shndx());
else if (this->should_link_to_symtab_)
- oshdr->put_sh_link(layout->symtab_section()->out_shndx());
+ oshdr->put_sh_link(layout->symtab_section_shndx());
else if (this->should_link_to_dynsym_)
oshdr->put_sh_link(layout->dynsym_section()->out_shndx());
else
p->write(of);
off = aligned_off + p->data_size();
}
+
+ // For incremental links, fill in unused chunks in debug sections
+ // with dummy compilation unit headers.
+ if (this->free_space_fill_ != NULL)
+ {
+ for (Free_list::Const_iterator p = this->free_list_.begin();
+ p != this->free_list_.end();
+ ++p)
+ {
+ off_t off = p->start_;
+ size_t len = p->end_ - off;
+ this->free_space_fill_->write(of, this->offset() + off, len);
+ }
+ if (this->patch_space_ > 0)
+ {
+ off_t off = this->current_data_size_for_child() - this->patch_space_;
+ this->free_space_fill_->write(of, this->offset() + off,
+ this->patch_space_);
+ }
+ }
}
// If a section requires postprocessing, create the buffer to use.
// Reserve space within the fixed layout for the section. Used for
// incremental update links.
+
void
Output_section::reserve(uint64_t sh_offset, uint64_t sh_size)
{
this->free_list_.remove(sh_offset, sh_offset + sh_size);
}
+// Allocate space from the free list for the section. Used for
+// incremental update links.
+
+off_t
+Output_section::allocate(off_t len, uint64_t addralign)
+{
+ return this->free_list_.allocate(len, addralign, 0);
+}
+
// Output segment methods.
Output_segment::Output_segment(elfcpp::Elf_Word type, elfcpp::Elf_Word flags)
}
}
- // FIXME: Need to handle TLS and .bss with incremental update.
- if (!parameters->incremental_update()
- || (*p)->is_section_flag_set(elfcpp::SHF_TLS)
- || (*p)->is_section_type(elfcpp::SHT_NOBITS))
+ if (!parameters->incremental_update())
{
off = align_address(off, align);
(*p)->set_address_and_file_offset(addr + (off - startoff), off);
if (off == -1)
{
gold_assert((*p)->output_section() != NULL);
- gold_fatal(_("out of patch space for section %s; "
- "relink with --incremental-full"),
- (*p)->output_section()->name());
+ gold_fallback(_("out of patch space for section %s; "
+ "relink with --incremental-full"),
+ (*p)->output_section()->name());
}
(*p)->set_address_and_file_offset(addr + (off - startoff), off);
if ((*p)->data_size() > current_size)
{
gold_assert((*p)->output_section() != NULL);
- gold_fatal(_("%s: section changed size; "
- "relink with --incremental-full"),
- (*p)->output_section()->name());
+ gold_fallback(_("%s: section changed size; "
+ "relink with --incremental-full"),
+ (*p)->output_section()->name());
}
}
}
(*p)->finalize_data_size();
}
- gold_debug(DEBUG_INCREMENTAL,
- "set_section_list_addresses: %08lx %08lx %s",
- static_cast<long>(off),
- static_cast<long>((*p)->data_size()),
- ((*p)->output_section() != NULL
- ? (*p)->output_section()->name() : "(special)"));
-
- // We want to ignore the size of a SHF_TLS or SHT_NOBITS
+ if (parameters->incremental_update())
+ gold_debug(DEBUG_INCREMENTAL,
+ "set_section_list_addresses: %08lx %08lx %s",
+ static_cast<long>(off),
+ static_cast<long>((*p)->data_size()),
+ ((*p)->output_section() != NULL
+ ? (*p)->output_section()->name() : "(special)"));
+
+ // We want to ignore the size of a SHF_TLS SHT_NOBITS
// section. Such a section does not affect the size of a
// PT_LOAD segment.
if (!(*p)->is_section_flag_set(elfcpp::SHF_TLS)
if (use_base_file)
{
this->open(s.st_size);
- ssize_t len = ::read(o, this->base_, s.st_size);
- if (len < 0)
- {
- gold_info(_("%s: read failed: %s"), base_name, strerror(errno));
- return false;
- }
- if (len < s.st_size)
- {
- gold_info(_("%s: file too short"), base_name);
- return false;
- }
+ ssize_t bytes_to_read = s.st_size;
+ unsigned char* p = this->base_;
+ while (bytes_to_read > 0)
+ {
+ ssize_t len = ::read(o, p, bytes_to_read);
+ if (len < 0)
+ {
+ gold_info(_("%s: read failed: %s"), base_name, strerror(errno));
+ return false;
+ }
+ if (len == 0)
+ {
+ gold_info(_("%s: file too short: read only %lld of %lld bytes"),
+ base_name,
+ static_cast<long long>(s.st_size - bytes_to_read),
+ static_cast<long long>(s.st_size));
+ return false;
+ }
+ p += len;
+ bytes_to_read -= len;
+ }
::close(o);
return true;
}