From owner-svn-src-projects@FreeBSD.ORG  Mon Oct 25 19:33:45 2010
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6897C106566C;
	Mon, 25 Oct 2010 19:33:45 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 57ECA8FC1D;
	Mon, 25 Oct 2010 19:33:45 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o9PJXjuY075225;
	Mon, 25 Oct 2010 19:33:45 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9PJXjpL075223;
	Mon, 25 Oct 2010 19:33:45 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201010251933.o9PJXjpL075223@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Mon, 25 Oct 2010 19:33:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r214354 - projects/binutils-2.17/contrib/binutils/ld
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 25 Oct 2010 19:33:45 -0000

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@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