From: Alan Modra <amodra@gmail.com>
Date: Thu, 30 Aug 2012 05:57:05 +0000 (+0000)
Subject: 	* layout.cc (Layout::set_segment_offsets): Set p_align to
X-Git-Tag: sid-snapshot-20120901~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a1373b60b3e7ea73cfcbebc924cad329ff4de5dd;p=thirdparty%2Fbinutils-gdb.git

	* 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.
---

diff --git a/gold/ChangeLog b/gold/ChangeLog
index 85d503442f2..8fa41adb29b 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -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>
 
 	* output.h (Output_reloc::Output_reloc <output section>): Add
diff --git a/gold/layout.cc b/gold/layout.cc
index cadac877e06..808dd944328 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)
 	    {