diff options
| author | Cary Coutant <ccoutant@google.com> | 2010-10-16 00:37:25 +0000 |
|---|---|---|
| committer | Cary Coutant <ccoutant@google.com> | 2010-10-16 00:37:25 +0000 |
| commit | fc497986a30ad75ecb056a9b8a92a157529046c3 (patch) | |
| tree | bcef1c6ca8c27640ab38e58791aa618792466f20 /gold/output.h | |
| parent | 591c89577742f555137a31e24e1138c17182aab6 (diff) | |
| download | binutils-fc497986a30ad75ecb056a9b8a92a157529046c3.zip binutils-fc497986a30ad75ecb056a9b8a92a157529046c3.tar.gz binutils-fc497986a30ad75ecb056a9b8a92a157529046c3.tar.bz2 | |
* layout.cc (Layout::set_segment_offsets): Don't try to realign data
segment that has been aligned for relro.
* output.cc (Output_segment::set_section_addresses): Change signature;
adjust all callers. Account for alignment when totalling
size of relro sections.
* output.h (Output_segment::set_section_addresses): Change signature.
* testsuite/Makefile.am (relro_test.sh, relro_test.stdout): New
targets.
* testsuite/Makefile.in: Regenerate.
* testsuite/relro_test.cc: Add alignment attributes to test proper
alignment of relro sections when padding is necessary.
* testsuite/relro_test.sh: New script.
Diffstat (limited to 'gold/output.h')
| -rw-r--r-- | gold/output.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gold/output.h b/gold/output.h index 40d8d3f..52c69e9 100644 --- a/gold/output.h +++ b/gold/output.h @@ -3908,8 +3908,8 @@ class Output_segment // *PSHNDX. This should only be called for a PT_LOAD segment. uint64_t set_section_addresses(const Layout*, bool reset, uint64_t addr, - unsigned int increase_relro, off_t* poff, - unsigned int* pshndx); + unsigned int* pincrease_relro, bool* has_relro, + off_t* poff, unsigned int* pshndx); // Set the minimum alignment of this segment. This may be adjusted // upward based on the section alignments. |