From a1373b60b3e7ea73cfcbebc924cad329ff4de5dd Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Thu, 30 Aug 2012 05:57:05 +0000 Subject: [PATCH] * 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. --- gold/ChangeLog | 7 +++++++ gold/layout.cc | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/gold/ChangeLog b/gold/ChangeLog index 85d5034..8fa41ad 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,5 +1,12 @@ 2012-08-30 Alan Modra + * 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 + * output.h (Output_reloc::Output_reloc ): Add is_relative param. Adjust calls. (Output_reloc::add_output_section_relative): New functions. diff --git a/gold/layout.cc b/gold/layout.cc index cadac87..808dd94 100644 --- a/gold/layout.cc +++ b/gold/layout.cc @@ -2318,7 +2318,7 @@ Layout::relaxation_loop_body( // compatible with putting the segment headers and file headers into // that segment. if (parameters->options().user_set_Ttext() - && parameters->options().Ttext() % target->common_pagesize() != 0) + && parameters->options().Ttext() % target->abi_pagesize() != 0) { load_seg = NULL; phdr_seg = NULL; @@ -3330,7 +3330,7 @@ Layout::set_segment_offsets(const Target* target, Output_segment* load_seg, if (!parameters->options().nmagic() && !parameters->options().omagic()) - (*p)->set_minimum_p_align(common_pagesize); + (*p)->set_minimum_p_align(abi_pagesize); if (!are_addresses_set) { -- 2.7.4