aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Modra <amodra@gmail.com>2012-08-30 05:57:05 +0000
committerAlan Modra <amodra@gmail.com>2012-08-30 05:57:05 +0000
commita1373b60b3e7ea73cfcbebc924cad329ff4de5dd (patch)
tree305e754c06eb1c28a4d10c7229d06b85147e57f7
parent703d02da7640f756751a5cd94961127d68efcd22 (diff)
downloadgdb-a1373b60b3e7ea73cfcbebc924cad329ff4de5dd.zip
gdb-a1373b60b3e7ea73cfcbebc924cad329ff4de5dd.tar.gz
gdb-a1373b60b3e7ea73cfcbebc924cad329ff4de5dd.tar.bz2
* 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.
-rw-r--r--gold/ChangeLog7
-rw-r--r--gold/layout.cc4
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 <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
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)
{