summaryrefslogtreecommitdiff
path: root/gold/target.h
diff options
context:
space:
mode:
authorCary Coutant <ccoutant@gmail.com>2016-12-01 19:00:30 -0800
committerCary Coutant <ccoutant@gmail.com>2016-12-01 19:00:30 -0800
commitbe2884c1ea9b96fdb04c6d244d9e7aa1b654a47a (patch)
tree85a2f387e2bdd0d1fd36b6b2c9ce5b23882bce7f /gold/target.h
parent376c3ecd17d0636bcf4e527c2e2ca2f94822fe64 (diff)
downloadbinutils-gdb-be2884c1ea9b96fdb04c6d244d9e7aa1b654a47a.tar.gz
Fix problem causing internal error when -z max-page-size is used.
If the default starting address is less than the new ABI page size, we end up misaligning the file header, causing an internal error. gold/ PR gold/20834 * target.h (Target::default_text_segment_address): Bump default start address up to ABI page size.
Diffstat (limited to 'gold/target.h')
-rw-r--r--gold/target.h12
1 files changed, 11 insertions, 1 deletions
diff --git a/gold/target.h b/gold/target.h
index 8e801e18278..51402c20dee 100644
--- a/gold/target.h
+++ b/gold/target.h
@@ -119,9 +119,19 @@ class Target
{ return this->pti_->dynamic_linker; }
// Return the default address to use for the text segment.
+ // If a -z max-page-size argument has set the ABI page size
+ // to a value larger than the default starting address,
+ // bump the starting address up to the page size, to avoid
+ // misaligning the text segment in the file.
uint64_t
default_text_segment_address() const
- { return this->pti_->default_text_segment_address; }
+ {
+ uint64_t addr = this->pti_->default_text_segment_address;
+ uint64_t pagesize = this->abi_pagesize();
+ if (addr < pagesize)
+ addr = pagesize;
+ return addr;
+ }
// Return the ABI specified page size.
uint64_t