|| parameters->target().may_relax()
|| parameters->options().section_ordering_file())
{
- Input_section isecn(object, shndx, shdr.get_sh_size(), addralign);
+ Input_section isecn(object, shndx, input_section_size, addralign);
if (parameters->options().section_ordering_file())
{
unsigned int section_order_index =
uint64_t
Output_segment::set_section_addresses(const Layout* layout, bool reset,
uint64_t addr,
- unsigned int increase_relro,
+ unsigned int* increase_relro,
bool* has_relro,
off_t* poff,
unsigned int* pshndx)
if (p != pdl->end())
break;
}
- relro_size += increase_relro;
+ relro_size += *increase_relro;
// Pad the total relro size to a multiple of the maximum
// section alignment seen.
uint64_t aligned_size = align_address(relro_size, max_align);
{
*poff += last_relro_pad;
addr += last_relro_pad;
+ if (this->output_lists_[i].empty())
+ {
+ // If there is nothing in the ORDER_RELRO_LAST list,
+ // the padding will occur at the end of the relro
+ // segment, and we need to add it to *INCREASE_RELRO.
+ *increase_relro += last_relro_pad;
+ }
}
addr = this->set_section_list_addresses(layout, reset,
&this->output_lists_[i],
this->filesz_ += increase;
this->memsz_ += increase;
+ // If this is a RELRO segment, verify that the segment ends at a
+ // page boundary.
+ if (this->type_ == elfcpp::PT_GNU_RELRO)
+ {
+ uint64_t page_align = parameters->target().common_pagesize();
+ uint64_t segment_end = this->vaddr_ + this->memsz_;
+ gold_assert(segment_end == align_address(segment_end, page_align));
+ }
+
// If this is a TLS segment, align the memory size. The code in
// set_section_list ensures that the section after the TLS segment
// is aligned to give us room.