Output_section_headers::Output_section_headers(
const Layout* layout,
const Layout::Segment_list* segment_list,
+ const Layout::Section_list* section_list,
const Layout::Section_list* unattached_section_list,
const Stringpool* secnamepool)
: layout_(layout),
segment_list_(segment_list),
+ section_list_(section_list),
unattached_section_list_(unattached_section_list),
secnamepool_(secnamepool)
{
// Count all the sections. Start with 1 for the null section.
off_t count = 1;
- for (Layout::Segment_list::const_iterator p = segment_list->begin();
- p != segment_list->end();
- ++p)
- if ((*p)->type() == elfcpp::PT_LOAD)
- count += (*p)->output_section_count();
+ if (!parameters->output_is_object())
+ {
+ for (Layout::Segment_list::const_iterator p = segment_list->begin();
+ p != segment_list->end();
+ ++p)
+ if ((*p)->type() == elfcpp::PT_LOAD)
+ count += (*p)->output_section_count();
+ }
+ else
+ {
+ for (Layout::Section_list::const_iterator p = section_list->begin();
+ p != section_list->end();
+ ++p)
+ if (((*p)->flags() & elfcpp::SHF_ALLOC) != 0)
+ ++count;
+ }
count += unattached_section_list->size();
const int size = parameters->get_size();
v += shdr_size;
- unsigned shndx = 1;
- for (Layout::Segment_list::const_iterator p = this->segment_list_->begin();
- p != this->segment_list_->end();
- ++p)
- v = (*p)->write_section_headers SELECT_SIZE_ENDIAN_NAME(size, big_endian) (
- this->layout_, this->secnamepool_, v, &shndx
- SELECT_SIZE_ENDIAN(size, big_endian));
+ unsigned int shndx = 1;
+ if (!parameters->output_is_object())
+ {
+ for (Layout::Segment_list::const_iterator p =
+ this->segment_list_->begin();
+ p != this->segment_list_->end();
+ ++p)
+ v = (*p)->write_section_headers<size, big_endian>(this->layout_,
+ this->secnamepool_,
+ v,
+ &shndx);
+ }
+ else
+ {
+ for (Layout::Section_list::const_iterator p =
+ this->section_list_->begin();
+ p != this->section_list_->end();
+ ++p)
+ {
+ // We do unallocated sections below, except that group
+ // sections have to come first.
+ if (((*p)->flags() & elfcpp::SHF_ALLOC) == 0
+ && (*p)->type() != elfcpp::SHT_GROUP)
+ continue;
+ gold_assert(shndx == (*p)->out_shndx());
+ elfcpp::Shdr_write<size, big_endian> oshdr(v);
+ (*p)->write_header(this->layout_, this->secnamepool_, &oshdr);
+ v += shdr_size;
+ ++shndx;
+ }
+ }
+
for (Layout::Section_list::const_iterator p =
this->unattached_section_list_->begin();
p != this->unattached_section_list_->end();
++p)
{
+ // For a relocatable link, we did unallocated group sections
+ // above, since they have to come first.
+ if ((*p)->type() == elfcpp::SHT_GROUP
+ && parameters->output_is_object())
+ continue;
gold_assert(shndx == (*p)->out_shndx());
elfcpp::Shdr_write<size, big_endian> oshdr(v);
(*p)->write_header(this->layout_, this->secnamepool_, &oshdr);
{
const int phdr_size = elfcpp::Elf_sizes<size>::phdr_size;
off_t all_phdrs_size = this->segment_list_.size() * phdr_size;
+ gold_assert(all_phdrs_size == this->data_size());
unsigned char* view = of->get_output_view(this->offset(),
all_phdrs_size);
unsigned char* v = view;
v += phdr_size;
}
+ gold_assert(v - view == all_phdrs_size);
+
of->write_output_view(this->offset(), all_phdrs_size, view);
}
Output_file_header::Output_file_header(const Target* target,
const Symbol_table* symtab,
- const Output_segment_headers* osh)
+ const Output_segment_headers* osh,
+ const char* entry)
: target_(target),
symtab_(symtab),
segment_header_(osh),
section_header_(NULL),
- shstrtab_(NULL)
+ shstrtab_(NULL),
+ entry_(entry)
{
const int size = parameters->get_size();
int ehdr_size;
oehdr.put_e_machine(this->target_->machine_code());
oehdr.put_e_version(elfcpp::EV_CURRENT);
- // FIXME: Need to support -e, and target specific entry symbol.
- Symbol* sym = this->symtab_->lookup("_start");
- typename Sized_symbol<size>::Value_type v;
- if (sym == NULL)
- v = 0;
+ oehdr.put_e_entry(this->entry<size>());
+
+ if (this->segment_header_ == NULL)
+ oehdr.put_e_phoff(0);
else
- {
- Sized_symbol<size>* ssym;
- ssym = this->symtab_->get_sized_symbol SELECT_SIZE_NAME(size) (
- sym SELECT_SIZE(size));
- v = ssym->value();
- }
- oehdr.put_e_entry(v);
+ oehdr.put_e_phoff(this->segment_header_->offset());
- oehdr.put_e_phoff(this->segment_header_->offset());
oehdr.put_e_shoff(this->section_header_->offset());
// FIXME: The target needs to set the flags.
oehdr.put_e_flags(0);
oehdr.put_e_ehsize(elfcpp::Elf_sizes<size>::ehdr_size);
- oehdr.put_e_phentsize(elfcpp::Elf_sizes<size>::phdr_size);
- oehdr.put_e_phnum(this->segment_header_->data_size()
- / elfcpp::Elf_sizes<size>::phdr_size);
+
+ if (this->segment_header_ == NULL)
+ {
+ oehdr.put_e_phentsize(0);
+ oehdr.put_e_phnum(0);
+ }
+ else
+ {
+ oehdr.put_e_phentsize(elfcpp::Elf_sizes<size>::phdr_size);
+ oehdr.put_e_phnum(this->segment_header_->data_size()
+ / elfcpp::Elf_sizes<size>::phdr_size);
+ }
+
oehdr.put_e_shentsize(elfcpp::Elf_sizes<size>::shdr_size);
oehdr.put_e_shnum(this->section_header_->data_size()
/ elfcpp::Elf_sizes<size>::shdr_size);
of->write_output_view(0, ehdr_size, view);
}
+// Return the value to use for the entry address. THIS->ENTRY_ is the
+// symbol specified on the command line, if any.
+
+template<int size>
+typename elfcpp::Elf_types<size>::Elf_Addr
+Output_file_header::entry()
+{
+ const bool should_issue_warning = (this->entry_ != NULL
+ && parameters->output_is_executable());
+
+ // FIXME: Need to support target specific entry symbol.
+ const char* entry = this->entry_;
+ if (entry == NULL)
+ entry = "_start";
+
+ Symbol* sym = this->symtab_->lookup(entry);
+
+ typename Sized_symbol<size>::Value_type v;
+ if (sym != NULL)
+ {
+ Sized_symbol<size>* ssym;
+ ssym = this->symtab_->get_sized_symbol<size>(sym);
+ if (!ssym->is_defined() && should_issue_warning)
+ gold_warning("entry symbol '%s' exists but is not defined", entry);
+ v = ssym->value();
+ }
+ else
+ {
+ // We couldn't find the entry symbol. See if we can parse it as
+ // a number. This supports, e.g., -e 0x1000.
+ char* endptr;
+ v = strtoull(entry, &endptr, 0);
+ if (*endptr != '\0')
+ {
+ if (should_issue_warning)
+ gold_warning("cannot find entry symbol '%s'", entry);
+ v = 0;
+ }
+ }
+
+ return v;
+}
+
// Output_data_const methods.
void
Address address,
bool is_relative)
: address_(address), local_sym_index_(GSYM_CODE), type_(type),
- is_relative_(is_relative), shndx_(INVALID_CODE)
+ is_relative_(is_relative), is_section_symbol_(false), shndx_(INVALID_CODE)
{
+ // this->type_ is a bitfield; make sure TYPE fits.
+ gold_assert(this->type_ == type);
this->u1_.gsym = gsym;
this->u2_.od = od;
- if (dynamic && !is_relative)
- gsym->set_needs_dynsym_entry();
+ if (dynamic)
+ this->set_needs_dynsym_index();
}
template<bool dynamic, int size, bool big_endian>
Address address,
bool is_relative)
: address_(address), local_sym_index_(GSYM_CODE), type_(type),
- is_relative_(is_relative), shndx_(shndx)
+ is_relative_(is_relative), is_section_symbol_(false), shndx_(shndx)
{
gold_assert(shndx != INVALID_CODE);
+ // this->type_ is a bitfield; make sure TYPE fits.
+ gold_assert(this->type_ == type);
this->u1_.gsym = gsym;
this->u2_.relobj = relobj;
- if (dynamic && !is_relative)
- gsym->set_needs_dynsym_entry();
+ if (dynamic)
+ this->set_needs_dynsym_index();
}
// A reloc against a local symbol.
unsigned int type,
Output_data* od,
Address address,
- bool is_relative)
+ bool is_relative,
+ bool is_section_symbol)
: address_(address), local_sym_index_(local_sym_index), type_(type),
- is_relative_(is_relative), shndx_(INVALID_CODE)
+ is_relative_(is_relative), is_section_symbol_(is_section_symbol),
+ shndx_(INVALID_CODE)
{
gold_assert(local_sym_index != GSYM_CODE
&& local_sym_index != INVALID_CODE);
+ // this->type_ is a bitfield; make sure TYPE fits.
+ gold_assert(this->type_ == type);
this->u1_.relobj = relobj;
this->u2_.od = od;
- if (dynamic && !is_relative)
- relobj->set_needs_output_dynsym_entry(local_sym_index);
+ if (dynamic)
+ this->set_needs_dynsym_index();
}
template<bool dynamic, int size, bool big_endian>
unsigned int type,
unsigned int shndx,
Address address,
- bool is_relative)
+ bool is_relative,
+ bool is_section_symbol)
: address_(address), local_sym_index_(local_sym_index), type_(type),
- is_relative_(is_relative), shndx_(shndx)
+ is_relative_(is_relative), is_section_symbol_(is_section_symbol),
+ shndx_(shndx)
{
gold_assert(local_sym_index != GSYM_CODE
&& local_sym_index != INVALID_CODE);
gold_assert(shndx != INVALID_CODE);
+ // this->type_ is a bitfield; make sure TYPE fits.
+ gold_assert(this->type_ == type);
this->u1_.relobj = relobj;
this->u2_.relobj = relobj;
- if (dynamic && !is_relative)
- relobj->set_needs_output_dynsym_entry(local_sym_index);
+ if (dynamic)
+ this->set_needs_dynsym_index();
}
// A reloc against the STT_SECTION symbol of an output section.
Output_data* od,
Address address)
: address_(address), local_sym_index_(SECTION_CODE), type_(type),
- is_relative_(false), shndx_(INVALID_CODE)
+ is_relative_(false), is_section_symbol_(true), shndx_(INVALID_CODE)
{
+ // this->type_ is a bitfield; make sure TYPE fits.
+ gold_assert(this->type_ == type);
this->u1_.os = os;
this->u2_.od = od;
if (dynamic)
- os->set_needs_dynsym_index();
+ this->set_needs_dynsym_index();
+ else
+ os->set_needs_symtab_index();
}
template<bool dynamic, int size, bool big_endian>
unsigned int shndx,
Address address)
: address_(address), local_sym_index_(SECTION_CODE), type_(type),
- is_relative_(false), shndx_(shndx)
+ is_relative_(false), is_section_symbol_(true), shndx_(shndx)
{
gold_assert(shndx != INVALID_CODE);
+ // this->type_ is a bitfield; make sure TYPE fits.
+ gold_assert(this->type_ == type);
this->u1_.os = os;
this->u2_.relobj = relobj;
if (dynamic)
- os->set_needs_dynsym_index();
+ this->set_needs_dynsym_index();
+ else
+ os->set_needs_symtab_index();
+}
+
+// Record that we need a dynamic symbol index for this relocation.
+
+template<bool dynamic, int size, bool big_endian>
+void
+Output_reloc<elfcpp::SHT_REL, dynamic, size, big_endian>::
+set_needs_dynsym_index()
+{
+ if (this->is_relative_)
+ return;
+ switch (this->local_sym_index_)
+ {
+ case INVALID_CODE:
+ gold_unreachable();
+
+ case GSYM_CODE:
+ this->u1_.gsym->set_needs_dynsym_entry();
+ break;
+
+ case SECTION_CODE:
+ this->u1_.os->set_needs_dynsym_index();
+ break;
+
+ case 0:
+ break;
+
+ default:
+ {
+ const unsigned int lsi = this->local_sym_index_;
+ if (!this->is_section_symbol_)
+ this->u1_.relobj->set_needs_output_dynsym_entry(lsi);
+ else
+ {
+ section_offset_type dummy;
+ Output_section* os = this->u1_.relobj->output_section(lsi, &dummy);
+ gold_assert(os != NULL);
+ os->set_needs_dynsym_index();
+ }
+ }
+ break;
+ }
}
// Get the symbol index of a relocation.
break;
default:
- if (dynamic)
- index = this->u1_.relobj->dynsym_index(this->local_sym_index_);
- else
- index = this->u1_.relobj->symtab_index(this->local_sym_index_);
+ {
+ const unsigned int lsi = this->local_sym_index_;
+ if (!this->is_section_symbol_)
+ {
+ if (dynamic)
+ index = this->u1_.relobj->dynsym_index(lsi);
+ else
+ index = this->u1_.relobj->symtab_index(lsi);
+ }
+ else
+ {
+ section_offset_type dummy;
+ Output_section* os = this->u1_.relobj->output_section(lsi, &dummy);
+ gold_assert(os != NULL);
+ if (dynamic)
+ index = os->dynsym_index();
+ else
+ index = os->symtab_index();
+ }
+ }
break;
}
gold_assert(index != -1U);
return index;
}
+// For a local section symbol, get the section offset of the input
+// section within the output section.
+
+template<bool dynamic, int size, bool big_endian>
+section_offset_type
+Output_reloc<elfcpp::SHT_REL, dynamic, size, big_endian>::
+ local_section_offset() const
+{
+ const unsigned int lsi = this->local_sym_index_;
+ section_offset_type offset;
+ Output_section* os = this->u1_.relobj->output_section(lsi, &offset);
+ gold_assert(os != NULL);
+ return offset;
+}
+
// Write out the offset and info fields of a Rel or Rela relocation
// entry.
elfcpp::Rela_write<size, big_endian> orel(pov);
this->rel_.write_rel(&orel);
Addend addend = this->addend_;
- if (rel_.is_relative())
- addend += rel_.symbol_value();
+ if (this->rel_.is_relative())
+ addend += this->rel_.symbol_value();
+ if (this->rel_.is_local_section_symbol())
+ addend += this->rel_.local_section_offset();
orel.put_r_addend(addend);
}
this->relocs_.clear();
}
+// Class Output_relocatable_relocs.
+
+template<int sh_type, int size, bool big_endian>
+void
+Output_relocatable_relocs<sh_type, size, big_endian>::set_final_data_size()
+{
+ this->set_data_size(this->rr_->output_reloc_count()
+ * Reloc_types<sh_type, size, big_endian>::reloc_size);
+}
+
+// class Output_data_group.
+
+template<int size, bool big_endian>
+Output_data_group<size, big_endian>::Output_data_group(
+ Sized_relobj<size, big_endian>* relobj,
+ section_size_type entry_count,
+ const elfcpp::Elf_Word* contents)
+ : Output_section_data(entry_count * 4, 4),
+ relobj_(relobj)
+{
+ this->flags_ = elfcpp::Swap<32, big_endian>::readval(contents);
+ for (section_size_type i = 1; i < entry_count; ++i)
+ {
+ unsigned int shndx = elfcpp::Swap<32, big_endian>::readval(contents + i);
+ this->input_sections_.push_back(shndx);
+ }
+}
+
+// Write out the section group, which means translating the section
+// indexes to apply to the output file.
+
+template<int size, bool big_endian>
+void
+Output_data_group<size, big_endian>::do_write(Output_file* of)
+{
+ const off_t off = this->offset();
+ const section_size_type oview_size =
+ convert_to_section_size_type(this->data_size());
+ unsigned char* const oview = of->get_output_view(off, oview_size);
+
+ elfcpp::Elf_Word* contents = reinterpret_cast<elfcpp::Elf_Word*>(oview);
+ elfcpp::Swap<32, big_endian>::writeval(contents, this->flags_);
+ ++contents;
+
+ for (std::vector<unsigned int>::const_iterator p =
+ this->input_sections_.begin();
+ p != this->input_sections_.end();
+ ++p, ++contents)
+ {
+ section_offset_type dummy;
+ Output_section* os = this->relobj_->output_section(*p, &dummy);
+
+ unsigned int output_shndx;
+ if (os != NULL)
+ output_shndx = os->out_shndx();
+ else
+ {
+ this->relobj_->error(_("section group retained but "
+ "group element discarded"));
+ output_shndx = 0;
+ }
+
+ elfcpp::Swap<32, big_endian>::writeval(contents, output_shndx);
+ }
+
+ size_t wrote = reinterpret_cast<unsigned char*>(contents) - oview;
+ gold_assert(wrote == oview_size);
+
+ of->write_output_view(off, oview_size, oview);
+
+ // We no longer need this information.
+ this->input_sections_.clear();
+}
+
// Output_data_got::Got_entry methods.
// Write out the entry.
this->u2_.posd->set_address_and_file_offset(address, file_offset);
}
+// Reset the address and file offset.
+
+void
+Output_section::Input_section::reset_address_and_file_offset()
+{
+ if (!this->is_input_section())
+ this->u2_.posd->reset_address_and_file_offset();
+}
+
// Finalize the data size.
void
: name_(name),
addralign_(0),
entsize_(0),
+ load_address_(0),
link_section_(NULL),
link_(0),
info_section_(NULL),
+ info_symndx_(NULL),
info_(0),
type_(type),
flags_(flags),
should_link_to_dynsym_(false),
after_input_sections_(false),
requires_postprocessing_(false),
+ found_in_sections_clause_(false),
+ has_load_address_(false),
+ info_uses_section_index_(false),
tls_offset_(0)
{
// An unallocated section has no address. Forcing this means that
// receive special handling. In the normal case we don't always keep
// track of input sections for an Output_section. Instead, each
// Object keeps track of the Output_section for each of its input
-// sections.
+// sections. However, if HAVE_SECTIONS_SCRIPT is true, we do keep
+// track of input sections here; this is used when SECTIONS appears in
+// a linker script.
template<int size, bool big_endian>
off_t
unsigned int shndx,
const char* secname,
const elfcpp::Shdr<size, big_endian>& shdr,
- unsigned int reloc_shndx)
+ unsigned int reloc_shndx,
+ bool have_sections_script)
{
elfcpp::Elf_Xword addralign = shdr.get_sh_addralign();
if ((addralign & (addralign - 1)) != 0)
this->addralign_ = addralign;
typename elfcpp::Elf_types<size>::Elf_WXword sh_flags = shdr.get_sh_flags();
+ this->flags_ |= (sh_flags
+ & (elfcpp::SHF_WRITE
+ | elfcpp::SHF_ALLOC
+ | elfcpp::SHF_EXECINSTR));
+
uint64_t entsize = shdr.get_sh_entsize();
// .debug_str is a mergeable string section, but is not always so
addralign);
if (aligned_offset_in_section > offset_in_section
+ && !have_sections_script
&& (sh_flags & elfcpp::SHF_EXECINSTR) != 0
&& object->target()->has_code_fill())
{
// We need to keep track of this section if we are already keeping
// track of sections, or if we are relaxing. FIXME: Add test for
// relaxing.
- if (!this->input_sections_.empty())
+ if (have_sections_script || !this->input_sections_.empty())
this->input_sections_.push_back(Input_section(object, shndx,
shdr.get_sh_size(),
addralign));
{
Input_section inp(posd);
this->add_output_section_data(&inp);
+
+ if (posd->is_data_size_valid())
+ {
+ off_t offset_in_section = this->current_data_size_for_child();
+ off_t aligned_offset_in_section = align_address(offset_in_section,
+ posd->addralign());
+ this->set_current_data_size_for_child(aligned_offset_in_section
+ + posd->data_size());
+ }
}
// Add arbitrary data to an output section by Input_section.
off_t offset) const
{
gold_assert(object->is_section_specially_mapped(shndx));
- // This can only be called meaningfully when layout is complete.
- gold_assert(Output_data::is_layout_complete());
uint64_t addr = this->address() + this->first_input_offset_;
for (Input_section_list::const_iterator p = this->input_sections_.begin();
this->set_data_size(off - startoff);
}
+// Reset the address and file offset.
+
+void
+Output_section::do_reset_address_and_file_offset()
+{
+ for (Input_section_list::iterator p = this->input_sections_.begin();
+ p != this->input_sections_.end();
+ ++p)
+ p->reset_address_and_file_offset();
+}
+
// Set the TLS offset. Called only for SHT_TLS sections.
void
{
oshdr->put_sh_name(secnamepool->get_offset(this->name_));
oshdr->put_sh_type(this->type_);
- oshdr->put_sh_flags(this->flags_);
+
+ elfcpp::Elf_Xword flags = this->flags_;
+ if (this->info_section_ != NULL && this->info_uses_section_index_)
+ flags |= elfcpp::SHF_INFO_LINK;
+ oshdr->put_sh_flags(flags);
+
oshdr->put_sh_addr(this->address());
oshdr->put_sh_offset(this->offset());
oshdr->put_sh_size(this->data_size());
oshdr->put_sh_link(layout->dynsym_section()->out_shndx());
else
oshdr->put_sh_link(this->link_);
+
+ elfcpp::Elf_Word info;
if (this->info_section_ != NULL)
- oshdr->put_sh_info(this->info_section_->out_shndx());
+ {
+ if (this->info_uses_section_index_)
+ info = this->info_section_->out_shndx();
+ else
+ info = this->info_section_->symtab_index();
+ }
+ else if (this->info_symndx_ != NULL)
+ info = this->info_symndx_->symtab_index();
else
- oshdr->put_sh_info(this->info_);
+ info = this->info_;
+ oshdr->put_sh_info(info);
+
oshdr->put_sh_addralign(this->addralign_);
oshdr->put_sh_entsize(this->entsize_);
}
p != this->fills_.end();
++p)
{
- std::string fill_data(of->target()->code_fill(p->length()));
+ std::string fill_data(parameters->target()->code_fill(p->length()));
of->write(output_section_file_offset + p->section_offset(),
- fill_data.data(), fill_data.size());
+ fill_data.data(), fill_data.size());
}
for (Input_section_list::iterator p = this->input_sections_.begin();
Output_section::create_postprocessing_buffer()
{
gold_assert(this->requires_postprocessing());
- gold_assert(this->postprocessing_buffer_ == NULL);
+
+ if (this->postprocessing_buffer_ != NULL)
+ return;
if (!this->input_sections_.empty())
{
++p)
{
std::string fill_data(target->code_fill(p->length()));
- memcpy(buffer + p->section_offset(), fill_data.data(), fill_data.size());
+ memcpy(buffer + p->section_offset(), fill_data.data(),
+ fill_data.size());
}
off_t off = this->first_input_offset_;
}
}
+// Get the input sections for linker script processing. We leave
+// behind the Output_section_data entries. Note that this may be
+// slightly incorrect for merge sections. We will leave them behind,
+// but it is possible that the script says that they should follow
+// some other input sections, as in:
+// .rodata { *(.rodata) *(.rodata.cst*) }
+// For that matter, we don't handle this correctly:
+// .rodata { foo.o(.rodata.cst*) *(.rodata.cst*) }
+// With luck this will never matter.
+
+uint64_t
+Output_section::get_input_sections(
+ uint64_t address,
+ const std::string& fill,
+ std::list<std::pair<Relobj*, unsigned int> >* input_sections)
+{
+ uint64_t orig_address = address;
+
+ address = align_address(address, this->addralign());
+
+ Input_section_list remaining;
+ for (Input_section_list::iterator p = this->input_sections_.begin();
+ p != this->input_sections_.end();
+ ++p)
+ {
+ if (p->is_input_section())
+ input_sections->push_back(std::make_pair(p->relobj(), p->shndx()));
+ else
+ {
+ uint64_t aligned_address = align_address(address, p->addralign());
+ if (aligned_address != address && !fill.empty())
+ {
+ section_size_type length =
+ convert_to_section_size_type(aligned_address - address);
+ std::string this_fill;
+ this_fill.reserve(length);
+ while (this_fill.length() + fill.length() <= length)
+ this_fill += fill;
+ if (this_fill.length() < length)
+ this_fill.append(fill, 0, length - this_fill.length());
+
+ Output_section_data* posd = new Output_data_const(this_fill, 0);
+ remaining.push_back(Input_section(posd));
+ }
+ address = aligned_address;
+
+ remaining.push_back(*p);
+
+ p->finalize_data_size();
+ address += p->data_size();
+ }
+ }
+
+ this->input_sections_.swap(remaining);
+ this->first_input_offset_ = 0;
+
+ uint64_t data_size = address - orig_address;
+ this->set_current_data_size_for_child(data_size);
+ return data_size;
+}
+
+// Add an input section from a script.
+
+void
+Output_section::add_input_section_for_script(Relobj* object,
+ unsigned int shndx,
+ off_t data_size,
+ uint64_t addralign)
+{
+ if (addralign > this->addralign_)
+ this->addralign_ = addralign;
+
+ off_t offset_in_section = this->current_data_size_for_child();
+ off_t aligned_offset_in_section = align_address(offset_in_section,
+ addralign);
+
+ this->set_current_data_size_for_child(aligned_offset_in_section
+ + data_size);
+
+ this->input_sections_.push_back(Input_section(object, shndx,
+ data_size, addralign));
+}
+
// Print stats for merge sections to stderr.
void
vaddr_(0),
paddr_(0),
memsz_(0),
- align_(0),
+ max_align_(0),
+ min_p_align_(0),
offset_(0),
filesz_(0),
type_(type),
flags_(flags),
- is_align_known_(false)
+ is_max_align_known_(false),
+ are_addresses_set_(false)
{
}
bool front)
{
gold_assert((os->flags() & elfcpp::SHF_ALLOC) != 0);
- gold_assert(!this->is_align_known_);
+ gold_assert(!this->is_max_align_known_);
// Update the segment flags.
this->flags_ |= seg_flags;
void
Output_segment::add_initial_output_data(Output_data* od)
{
- gold_assert(!this->is_align_known_);
+ gold_assert(!this->is_max_align_known_);
this->output_data_.push_front(od);
}
// Return the maximum alignment of the Output_data in Output_segment.
-// Once we compute this, we prohibit new sections from being added.
uint64_t
-Output_segment::addralign()
+Output_segment::maximum_alignment()
{
- if (!this->is_align_known_)
+ if (!this->is_max_align_known_)
{
uint64_t addralign;
- addralign = Output_segment::maximum_alignment(&this->output_data_);
- if (addralign > this->align_)
- this->align_ = addralign;
+ addralign = Output_segment::maximum_alignment_list(&this->output_data_);
+ if (addralign > this->max_align_)
+ this->max_align_ = addralign;
- addralign = Output_segment::maximum_alignment(&this->output_bss_);
- if (addralign > this->align_)
- this->align_ = addralign;
+ addralign = Output_segment::maximum_alignment_list(&this->output_bss_);
+ if (addralign > this->max_align_)
+ this->max_align_ = addralign;
- this->is_align_known_ = true;
+ this->is_max_align_known_ = true;
}
- return this->align_;
+ return this->max_align_;
}
// Return the maximum alignment of a list of Output_data.
uint64_t
-Output_segment::maximum_alignment(const Output_data_list* pdl)
+Output_segment::maximum_alignment_list(const Output_data_list* pdl)
{
uint64_t ret = 0;
for (Output_data_list::const_iterator p = pdl->begin();
return count;
}
-// Set the section addresses for an Output_segment. ADDR is the
-// address and *POFF is the file offset. Set the section indexes
-// starting with *PSHNDX. Return the address of the immediately
-// following segment. Update *POFF and *PSHNDX.
+// Set the section addresses for an Output_segment. If RESET is true,
+// reset the addresses first. ADDR is the address and *POFF is the
+// file offset. Set the section indexes starting with *PSHNDX.
+// Return the address of the immediately following segment. Update
+// *POFF and *PSHNDX.
uint64_t
-Output_segment::set_section_addresses(uint64_t addr, off_t* poff,
+Output_segment::set_section_addresses(bool reset, uint64_t addr, off_t* poff,
unsigned int* pshndx)
{
gold_assert(this->type_ == elfcpp::PT_LOAD);
- this->vaddr_ = addr;
- this->paddr_ = addr;
+ if (!reset && this->are_addresses_set_)
+ {
+ gold_assert(this->paddr_ == addr);
+ addr = this->vaddr_;
+ }
+ else
+ {
+ this->vaddr_ = addr;
+ this->paddr_ = addr;
+ this->are_addresses_set_ = true;
+ }
off_t orig_off = *poff;
this->offset_ = orig_off;
- *poff = align_address(*poff, this->addralign());
-
- addr = this->set_section_list_addresses(&this->output_data_, addr, poff,
- pshndx);
+ addr = this->set_section_list_addresses(reset, &this->output_data_,
+ addr, poff, pshndx);
this->filesz_ = *poff - orig_off;
off_t off = *poff;
- uint64_t ret = this->set_section_list_addresses(&this->output_bss_, addr,
- poff, pshndx);
+ uint64_t ret = this->set_section_list_addresses(reset, &this->output_bss_,
+ addr, poff, pshndx);
this->memsz_ = *poff - orig_off;
// Ignore the file offset adjustments made by the BSS Output_data
// structures.
uint64_t
-Output_segment::set_section_list_addresses(Output_data_list* pdl,
+Output_segment::set_section_list_addresses(bool reset, Output_data_list* pdl,
uint64_t addr, off_t* poff,
unsigned int* pshndx)
{
p != pdl->end();
++p)
{
- off = align_address(off, (*p)->addralign());
- (*p)->set_address_and_file_offset(addr + (off - startoff), off);
+ if (reset)
+ (*p)->reset_address_and_file_offset();
+
+ // When using a linker script the section will most likely
+ // already have an address.
+ if (!(*p)->is_address_valid())
+ {
+ off = align_address(off, (*p)->addralign());
+ (*p)->set_address_and_file_offset(addr + (off - startoff), off);
+ }
+ else
+ {
+ // The script may have inserted a skip forward, but it
+ // better not have moved backward.
+ gold_assert((*p)->address() >= addr + (off - startoff));
+ off += (*p)->address() - (addr + (off - startoff));
+ (*p)->set_file_offset(off);
+ (*p)->finalize_data_size();
+ }
// Unless this is a PT_TLS segment, we want to ignore the size
// of a SHF_TLS/SHT_NOBITS section. Such a section does not
{
gold_assert(this->type_ != elfcpp::PT_LOAD);
+ gold_assert(!this->are_addresses_set_);
+
if (this->output_data_.empty() && this->output_bss_.empty())
{
this->vaddr_ = 0;
this->paddr_ = 0;
+ this->are_addresses_set_ = true;
this->memsz_ = 0;
- this->align_ = 0;
+ this->min_p_align_ = 0;
this->offset_ = 0;
this->filesz_ = 0;
return;
else
first = this->output_data_.front();
this->vaddr_ = first->address();
- this->paddr_ = this->vaddr_;
+ this->paddr_ = (first->has_load_address()
+ ? first->load_address()
+ : this->vaddr_);
+ this->are_addresses_set_ = true;
this->offset_ = first->offset();
if (this->output_data_.empty())
(*p)->set_tls_offset(this->vaddr_);
}
+// Return the address of the first section.
+
+uint64_t
+Output_segment::first_section_load_address() const
+{
+ for (Output_data_list::const_iterator p = this->output_data_.begin();
+ p != this->output_data_.end();
+ ++p)
+ if ((*p)->is_section())
+ return (*p)->has_load_address() ? (*p)->load_address() : (*p)->address();
+
+ for (Output_data_list::const_iterator p = this->output_bss_.begin();
+ p != this->output_bss_.end();
+ ++p)
+ if ((*p)->is_section())
+ return (*p)->has_load_address() ? (*p)->load_address() : (*p)->address();
+
+ gold_unreachable();
+}
+
// Return the number of Output_sections in an Output_segment.
unsigned int
return count;
}
+// Return the section attached to the list segment with the lowest
+// load address. This is used when handling a PHDRS clause in a
+// linker script.
+
+Output_section*
+Output_segment::section_with_lowest_load_address() const
+{
+ Output_section* found = NULL;
+ uint64_t found_lma = 0;
+ this->lowest_load_address_in_list(&this->output_data_, &found, &found_lma);
+
+ Output_section* found_data = found;
+ this->lowest_load_address_in_list(&this->output_bss_, &found, &found_lma);
+ if (found != found_data && found_data != NULL)
+ {
+ gold_error(_("nobits section %s may not precede progbits section %s "
+ "in same segment"),
+ found->name(), found_data->name());
+ return NULL;
+ }
+
+ return found;
+}
+
+// Look through a list for a section with a lower load address.
+
+void
+Output_segment::lowest_load_address_in_list(const Output_data_list* pdl,
+ Output_section** found,
+ uint64_t* found_lma) const
+{
+ for (Output_data_list::const_iterator p = pdl->begin();
+ p != pdl->end();
+ ++p)
+ {
+ if (!(*p)->is_section())
+ continue;
+ Output_section* os = static_cast<Output_section*>(*p);
+ uint64_t lma = (os->has_load_address()
+ ? os->load_address()
+ : os->address());
+ if (*found == NULL || lma < *found_lma)
+ {
+ *found = os;
+ *found_lma = lma;
+ }
+ }
+}
+
// Write the segment data into *OPHDR.
template<int size, bool big_endian>
ophdr->put_p_filesz(this->filesz_);
ophdr->put_p_memsz(this->memsz_);
ophdr->put_p_flags(this->flags_);
- ophdr->put_p_align(this->addralign());
+ ophdr->put_p_align(std::max(this->min_p_align_, this->maximum_alignment()));
}
// Write the section headers into V.
// Output_file methods.
-Output_file::Output_file(const General_options& options, Target* target)
- : options_(options),
- target_(target),
- name_(options.output_file_name()),
+Output_file::Output_file(const char* name)
+ : name_(name),
o_(-1),
file_size_(0),
base_(NULL),
- map_is_anonymous_(false)
+ map_is_anonymous_(false),
+ is_temporary_(false)
{
}
// to improve the odds for open().
// We let the name "-" mean "stdout"
- if (strcmp(this->name_, "-") == 0)
- this->o_ = STDOUT_FILENO;
- else
+ if (!this->is_temporary_)
{
- struct stat s;
- if (::stat(this->name_, &s) == 0 && s.st_size != 0)
- unlink_if_ordinary(this->name_);
-
- int mode = parameters->output_is_object() ? 0666 : 0777;
- int o = ::open(this->name_, O_RDWR | O_CREAT | O_TRUNC, mode);
- if (o < 0)
- gold_fatal(_("%s: open: %s"), this->name_, strerror(errno));
- this->o_ = o;
+ if (strcmp(this->name_, "-") == 0)
+ this->o_ = STDOUT_FILENO;
+ else
+ {
+ struct stat s;
+ if (::stat(this->name_, &s) == 0 && s.st_size != 0)
+ unlink_if_ordinary(this->name_);
+
+ int mode = parameters->output_is_object() ? 0666 : 0777;
+ int o = ::open(this->name_, O_RDWR | O_CREAT | O_TRUNC, mode);
+ if (o < 0)
+ gold_fatal(_("%s: open: %s"), this->name_, strerror(errno));
+ this->o_ = o;
+ }
}
this->map();
struct stat statbuf;
if (o == STDOUT_FILENO || o == STDERR_FILENO
|| ::fstat(o, &statbuf) != 0
- || !S_ISREG(statbuf.st_mode))
+ || !S_ISREG(statbuf.st_mode)
+ || this->is_temporary_)
{
this->map_is_anonymous_ = true;
base = ::mmap(NULL, this->file_size_, PROT_READ | PROT_WRITE,
Output_file::close()
{
// If the map isn't file-backed, we need to write it now.
- if (this->map_is_anonymous_)
+ if (this->map_is_anonymous_ && !this->is_temporary_)
{
size_t bytes_to_write = this->file_size_;
while (bytes_to_write > 0)
this->unmap();
// We don't close stdout or stderr
- if (this->o_ != STDOUT_FILENO && this->o_ != STDERR_FILENO)
+ if (this->o_ != STDOUT_FILENO
+ && this->o_ != STDERR_FILENO
+ && !this->is_temporary_)
if (::close(this->o_) < 0)
gold_error(_("%s: close: %s"), this->name_, strerror(errno));
this->o_ = -1;
unsigned int shndx,
const char* secname,
const elfcpp::Shdr<32, false>& shdr,
- unsigned int reloc_shndx);
+ unsigned int reloc_shndx,
+ bool have_sections_script);
#endif
#ifdef HAVE_TARGET_32_BIG
unsigned int shndx,
const char* secname,
const elfcpp::Shdr<32, true>& shdr,
- unsigned int reloc_shndx);
+ unsigned int reloc_shndx,
+ bool have_sections_script);
#endif
#ifdef HAVE_TARGET_64_LITTLE
unsigned int shndx,
const char* secname,
const elfcpp::Shdr<64, false>& shdr,
- unsigned int reloc_shndx);
+ unsigned int reloc_shndx,
+ bool have_sections_script);
#endif
#ifdef HAVE_TARGET_64_BIG
unsigned int shndx,
const char* secname,
const elfcpp::Shdr<64, true>& shdr,
- unsigned int reloc_shndx);
+ unsigned int reloc_shndx,
+ bool have_sections_script);
#endif
#ifdef HAVE_TARGET_32_LITTLE
class Output_data_reloc<elfcpp::SHT_RELA, true, 64, true>;
#endif
+#ifdef HAVE_TARGET_32_LITTLE
+template
+class Output_relocatable_relocs<elfcpp::SHT_REL, 32, false>;
+#endif
+
+#ifdef HAVE_TARGET_32_BIG
+template
+class Output_relocatable_relocs<elfcpp::SHT_REL, 32, true>;
+#endif
+
+#ifdef HAVE_TARGET_64_LITTLE
+template
+class Output_relocatable_relocs<elfcpp::SHT_REL, 64, false>;
+#endif
+
+#ifdef HAVE_TARGET_64_BIG
+template
+class Output_relocatable_relocs<elfcpp::SHT_REL, 64, true>;
+#endif
+
+#ifdef HAVE_TARGET_32_LITTLE
+template
+class Output_relocatable_relocs<elfcpp::SHT_RELA, 32, false>;
+#endif
+
+#ifdef HAVE_TARGET_32_BIG
+template
+class Output_relocatable_relocs<elfcpp::SHT_RELA, 32, true>;
+#endif
+
+#ifdef HAVE_TARGET_64_LITTLE
+template
+class Output_relocatable_relocs<elfcpp::SHT_RELA, 64, false>;
+#endif
+
+#ifdef HAVE_TARGET_64_BIG
+template
+class Output_relocatable_relocs<elfcpp::SHT_RELA, 64, true>;
+#endif
+
+#ifdef HAVE_TARGET_32_LITTLE
+template
+class Output_data_group<32, false>;
+#endif
+
+#ifdef HAVE_TARGET_32_BIG
+template
+class Output_data_group<32, true>;
+#endif
+
+#ifdef HAVE_TARGET_64_LITTLE
+template
+class Output_data_group<64, false>;
+#endif
+
+#ifdef HAVE_TARGET_64_BIG
+template
+class Output_data_group<64, true>;
+#endif
+
#ifdef HAVE_TARGET_32_LITTLE
template
class Output_data_got<32, false>;
projects / deliverable / binutils-gdb.git / blobdiff