From owner-svn-src-projects@FreeBSD.ORG  Thu Jan 13 21:17:59 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 5D202106566C;
	Thu, 13 Jan 2011 21:17:59 +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 4C56B8FC15;
	Thu, 13 Jan 2011 21:17:59 +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 p0DLHxHN063855;
	Thu, 13 Jan 2011 21:17:59 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0DLHxSu063853;
	Thu, 13 Jan 2011 21:17:59 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201101132117.p0DLHxSu063853@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Thu, 13 Jan 2011 21:17:59 +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: r217377 -
	projects/binutils-2.17/contrib/binutils/ld/emultempl
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: Thu, 13 Jan 2011 21:17:59 -0000

Author: dim
Date: Thu Jan 13 21:17:59 2011
New Revision: 217377
URL: http://svn.freebsd.org/changeset/base/217377

Log:
  Remove temporary kludge from r217260, as the .note.ABI-tag sections in
  crt1.o, gcrt1.o and Scrt1.o will now have the correct type, due to the
  changes in r217375.

Modified:
  projects/binutils-2.17/contrib/binutils/ld/emultempl/elf32.em

Modified: projects/binutils-2.17/contrib/binutils/ld/emultempl/elf32.em
==============================================================================
--- projects/binutils-2.17/contrib/binutils/ld/emultempl/elf32.em	Thu Jan 13 21:06:30 2011	(r217376)
+++ projects/binutils-2.17/contrib/binutils/ld/emultempl/elf32.em	Thu Jan 13 21:17:59 2011	(r217377)
@@ -1540,7 +1540,8 @@ gld${EMULATION_NAME}_place_orphan (asect
   if ((s->flags & SEC_ALLOC) == 0)
     ;
   else if ((s->flags & SEC_LOAD) != 0
-	   && CONST_STRNEQ (secname, ".note"))
+	   && ((iself && sh_type == SHT_NOTE)
+	       || (!iself && CONST_STRNEQ (secname, ".note"))))
     place = &hold[orphan_interp];
   else if ((s->flags & (SEC_LOAD | SEC_HAS_CONTENTS)) == 0)
     place = &hold[orphan_bss];