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/layout.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/layout.cc')
| -rw-r--r-- | gold/layout.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gold/layout.cc b/gold/layout.cc index f5784fb..52120cc 100644 --- a/gold/layout.cc +++ b/gold/layout.cc @@ -2679,7 +2679,7 @@ Layout::set_segment_offsets(const Target* target, Output_segment* load_seg, unsigned int shndx_hold = *pshndx; bool has_relro = false; uint64_t new_addr = (*p)->set_section_addresses(this, false, addr, - increase_relro, + &increase_relro, &has_relro, &off, pshndx); @@ -2709,7 +2709,7 @@ Layout::set_segment_offsets(const Target* target, Output_segment* load_seg, off = orig_off + ((addr - orig_addr) & (abi_pagesize - 1)); off = align_file_offset(off, addr, abi_pagesize); new_addr = (*p)->set_section_addresses(this, true, addr, - increase_relro, + &increase_relro, &has_relro, &off, pshndx); } |