From owner-svn-src-projects@FreeBSD.ORG  Tue Jan 11 11:01:29 2011
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 643761065670;
	Tue, 11 Jan 2011 11:01:29 +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 536B28FC08;
	Tue, 11 Jan 2011 11:01:29 +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 p0BB1ToV018253;
	Tue, 11 Jan 2011 11:01:29 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0BB1TP4018251;
	Tue, 11 Jan 2011 11:01:29 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201101111101.p0BB1TP4018251@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Tue, 11 Jan 2011 11:01:29 +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: r217261 - projects/binutils-2.17/contrib/binutils/bfd
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: Tue, 11 Jan 2011 11:01:29 -0000

Author: dim
Date: Tue Jan 11 11:01:29 2011
New Revision: 217261
URL: http://svn.freebsd.org/changeset/base/217261

Log:
  Make sure PT_NOTE sections always get the correct type (SHT_NOTE).

Modified:
  projects/binutils-2.17/contrib/binutils/bfd/elf.c

Modified: projects/binutils-2.17/contrib/binutils/bfd/elf.c
==============================================================================
--- projects/binutils-2.17/contrib/binutils/bfd/elf.c	Tue Jan 11 10:48:50 2011	(r217260)
+++ projects/binutils-2.17/contrib/binutils/bfd/elf.c	Tue Jan 11 11:01:29 2011	(r217261)
@@ -4403,7 +4403,12 @@ assign_file_positions_for_load_sections 
 
       no_contents = FALSE;
       off_adjust = 0;
-      if (p->p_type == PT_LOAD
+      if (p->p_type == PT_NOTE)
+	{
+	  for (i = 0; i < m->count; i++)
+	    elf_section_type (m->sections[i]) = SHT_NOTE;
+	}
+      else if (p->p_type == PT_LOAD
 	  && m->count > 0)
 	{
 	  bfd_size_type align;