diff options
| author | Cary Coutant <ccoutant@google.com> | 2010-11-16 19:18:31 +0000 |
|---|---|---|
| committer | Cary Coutant <ccoutant@google.com> | 2010-11-16 19:18:31 +0000 |
| commit | fd064a5b9922e1058c109d6b5a8ee6e2ae15f529 (patch) | |
| tree | 376cf26f153601f1ba0fa218d34e45bca30fedfd /gold/output.cc | |
| parent | 6ab5626b08f37bc5b84c67d0f25e363e0ab0180e (diff) | |
| download | gdb-fd064a5b9922e1058c109d6b5a8ee6e2ae15f529.zip gdb-fd064a5b9922e1058c109d6b5a8ee6e2ae15f529.tar.gz gdb-fd064a5b9922e1058c109d6b5a8ee6e2ae15f529.tar.bz2 | |
* output.h (Output_segment::set_section_addresses): Pass increase_relro
by reference; adjust all callers.
* output.cc (Output_segment::set_section_addresses): Adjust references
to increase_relro. Add padding to *increase_relro when ORDER_RELRO_LAST
list is empty.
(Output_segment::set_offset): Assert if PT_GNU_RELRO segment does not
end at page boundary.
Diffstat (limited to 'gold/output.cc')
| -rw-r--r-- | gold/output.cc | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/gold/output.cc b/gold/output.cc index 766e0ff..1158a77 100644 --- a/gold/output.cc +++ b/gold/output.cc @@ -3692,7 +3692,7 @@ Output_segment::has_dynamic_reloc_list(const Output_data_list* pdl) const 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) @@ -3752,7 +3752,7 @@ Output_segment::set_section_addresses(const Layout* layout, bool reset, 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); @@ -3795,6 +3795,13 @@ Output_segment::set_section_addresses(const Layout* layout, bool reset, { *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], @@ -4014,6 +4021,15 @@ Output_segment::set_offset(unsigned int increase) 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. |