PR ld/6833

	* ldexp.c (fold_binary <DATA_SEGMENT_ALIGN>): Do not align
	EXPLD.DATASEG.MIN_BASE.
	* ldlang.c (lang_size_sections): New variable OLD_BASE.  Rename
	OLD_MIN_BASE to MIN_BASE with the former alignment from `ldexp.c'.
	Use OLD_BASE now for the minimal base check after the base decrease by
	the maximum alignment found.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 213b5f026d15b88ff261e15240072aaeabbf0cbc..a030e26ca47c427d672b0756f7e15941b08aa85c 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,13 @@
+2008-08-21  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+       PR ld/6833
+       * ldexp.c (fold_binary <DATA_SEGMENT_ALIGN>): Do not align
+       EXPLD.DATASEG.MIN_BASE.
+       * ldlang.c (lang_size_sections): New variable OLD_BASE.  Rename
+       OLD_MIN_BASE to MIN_BASE with the former alignment from `ldexp.c'.
+       Use OLD_BASE now for the minimal base check after the base decrease by
+       the maximum alignment found.
+
 2008-08-17  Alan Modra  <amodra@bigpond.net.au>
 
        PR 6478

diff --git a/ld/ldexp.c b/ld/ldexp.c
index 3c6ad0c350cc26eb0bd42a051d1c2992dd19fcf1..08664e629e6514ee31c05da6517d056b9141fbe2 100644 (file)
--- a/ld/ldexp.c
+++ b/ld/ldexp.c
@@ -415,7 +415,7 @@ fold_binary (etree_type *tree)
                      if (expld.phase == lang_allocating_phase_enum)
                        {
                          expld.dataseg.phase = exp_dataseg_align_seen;
-                         expld.dataseg.min_base = align_n (expld.dot, maxpage);
+                         expld.dataseg.min_base = expld.dot;
                          expld.dataseg.base = expld.result.value;
                          expld.dataseg.pagesize = commonpage;
                          expld.dataseg.maxpagesize = maxpage;

diff --git a/ld/ldlang.c b/ld/ldlang.c
index e9916467d959b68c0bfb8c1fd5a840fe575b905a..8d95254564f8a75bff9f7427f7456bc9f4d63d66 100644 (file)
--- a/ld/ldlang.c
+++ b/ld/ldlang.c
@@ -5056,17 +5056,23 @@ lang_size_sections (bfd_boolean *relax, bfd_boolean check_regions)
     {
       /* If DATA_SEGMENT_ALIGN DATA_SEGMENT_RELRO_END pair was seen, try
         to put expld.dataseg.relro on a (common) page boundary.  */
-      bfd_vma old_min_base, relro_end, maxpage;
+      bfd_vma min_base, old_base, relro_end, maxpage;
 
       expld.dataseg.phase = exp_dataseg_relro_adjust;
-      old_min_base = expld.dataseg.min_base;
       maxpage = expld.dataseg.maxpagesize;
+      /* MIN_BASE is the absolute minimum address we are allowed to start the
+        read-write segment (byte before will be mapped read-only).  */
+      min_base = (expld.dataseg.min_base + maxpage - 1) & ~(maxpage - 1);
+      /* OLD_BASE is the address for a feasible minimum address which will
+        still not cause a data overlap inside MAXPAGE causing file offset skip
+        by MAXPAGE.  */
+      old_base = expld.dataseg.base;
       expld.dataseg.base += (-expld.dataseg.relro_end
                             & (expld.dataseg.pagesize - 1));
       /* Compute the expected PT_GNU_RELRO segment end.  */
       relro_end = ((expld.dataseg.relro_end + expld.dataseg.pagesize - 1)
                   & ~(expld.dataseg.pagesize - 1));
-      if (old_min_base + maxpage < expld.dataseg.base)
+      if (min_base + maxpage < expld.dataseg.base)
        {
          expld.dataseg.base -= maxpage;
          relro_end -= maxpage;
@@ -5077,7 +5083,8 @@ lang_size_sections (bfd_boolean *relax, bfd_boolean check_regions)
        {
          /* The alignment of sections between DATA_SEGMENT_ALIGN
             and DATA_SEGMENT_RELRO_END caused huge padding to be
-            inserted at DATA_SEGMENT_RELRO_END.  Try some other base.  */
+            inserted at DATA_SEGMENT_RELRO_END.  Try to start a bit lower so
+            that the section alignments will fit in.  */
          asection *sec;
          unsigned int max_alignment_power = 0;
 
@@ -5091,8 +5098,7 @@ lang_size_sections (bfd_boolean *relax, bfd_boolean check_regions)
 
          if (((bfd_vma) 1 << max_alignment_power) < expld.dataseg.pagesize)
            {
-             if (expld.dataseg.base - (1 << max_alignment_power)
-                 < old_min_base)
+             if (expld.dataseg.base - (1 << max_alignment_power) < old_base)
                expld.dataseg.base += expld.dataseg.pagesize;
              expld.dataseg.base -= (1 << max_alignment_power);
              lang_reset_memory_regions ();