* layout.cc (Layout::set_segment_offsets): Set p_align to
abi_pagesize, not common_pagesize. (Layout::relaxation_loop_body): Similarly use abi_pagesize to determine whether file header can go in segment.
This commit is contained in:
parent
703d02da76
commit
a1373b60b3
2 changed files with 9 additions and 2 deletions
|
@ -1,3 +1,10 @@
|
||||||
|
2012-08-30 Alan Modra <amodra@gmail.com>
|
||||||
|
|
||||||
|
* layout.cc (Layout::set_segment_offsets): Set p_align to
|
||||||
|
abi_pagesize, not common_pagesize.
|
||||||
|
(Layout::relaxation_loop_body): Similarly use abi_pagesize
|
||||||
|
to determine whether file header can go in segment.
|
||||||
|
|
||||||
2012-08-30 Alan Modra <amodra@gmail.com>
|
2012-08-30 Alan Modra <amodra@gmail.com>
|
||||||
|
|
||||||
* output.h (Output_reloc::Output_reloc <output section>): Add
|
* output.h (Output_reloc::Output_reloc <output section>): Add
|
||||||
|
|
|
@ -2318,7 +2318,7 @@ Layout::relaxation_loop_body(
|
||||||
// compatible with putting the segment headers and file headers into
|
// compatible with putting the segment headers and file headers into
|
||||||
// that segment.
|
// that segment.
|
||||||
if (parameters->options().user_set_Ttext()
|
if (parameters->options().user_set_Ttext()
|
||||||
&& parameters->options().Ttext() % target->common_pagesize() != 0)
|
&& parameters->options().Ttext() % target->abi_pagesize() != 0)
|
||||||
{
|
{
|
||||||
load_seg = NULL;
|
load_seg = NULL;
|
||||||
phdr_seg = NULL;
|
phdr_seg = NULL;
|
||||||
|
@ -3330,7 +3330,7 @@ Layout::set_segment_offsets(const Target* target, Output_segment* load_seg,
|
||||||
|
|
||||||
if (!parameters->options().nmagic()
|
if (!parameters->options().nmagic()
|
||||||
&& !parameters->options().omagic())
|
&& !parameters->options().omagic())
|
||||||
(*p)->set_minimum_p_align(common_pagesize);
|
(*p)->set_minimum_p_align(abi_pagesize);
|
||||||
|
|
||||||
if (!are_addresses_set)
|
if (!are_addresses_set)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue