svn commit: r214354 - projects/binutils-2.17/contrib/binutils/ld

[Dimitry Andric]

Author: dim
Date: Mon Oct 25 19:33:45 2010
New Revision: 214354
URL: http://svn.freebsd.org/changeset/base/214354

Log:
  Apply commit d3a5e914c6ff07c426b026b0cda8d044fd1cdabe from upstream
  (still under GPLv2 at that time):
  
  Author: Nick Clifton <nickc at redhat.com>
  Date:   Thu Aug 24 14:59:24 2006 +0000
  
  * ldlang.c (lang_size_sections_1, lang_assignment_statement_enum):
    Adjust the current address of DEFAULT_MEMORY_REGION even when dot
    hasn't changed.
  
  This is a prerequisite for the fix coming just after this.

Modified:
  projects/binutils-2.17/contrib/binutils/ld/ldlang.c

Modified: projects/binutils-2.17/contrib/binutils/ld/ldlang.c
==============================================================================
--- projects/binutils-2.17/contrib/binutils/ld/ldlang.c	Mon Oct 25 17:05:14 2010	(r214353)
+++ projects/binutils-2.17/contrib/binutils/ld/ldlang.c	Mon Oct 25 19:33:45 2010	(r214354)
@@ -4447,7 +4447,7 @@ lang_size_sections_1
 			   output_section_statement->bfd_section,
 			   &newdot);
 
-	    if (newdot != dot && !output_section_statement->ignored)
+	    if (!output_section_statement->ignored)
 	      {
 		if (output_section_statement == abs_output_section)
 		  {
@@ -4456,7 +4456,7 @@ lang_size_sections_1
 		    lang_memory_region_lookup (DEFAULT_MEMORY_REGION,
 					       FALSE)->current = newdot;
 		  }
-		else
+		else if (newdot != dot)
 		  {
 		    /* Insert a pad after this statement.  We can't
 		       put the pad before when relaxing, in case the