From owner-svn-src-projects@FreeBSD.ORG  Tue Jan 11 10:48:50 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 C8EC0106566C;
	Tue, 11 Jan 2011 10:48:50 +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 B8AC38FC0A;
	Tue, 11 Jan 2011 10:48:50 +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 p0BAmo0P017939;
	Tue, 11 Jan 2011 10:48:50 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0BAmowJ017937;
	Tue, 11 Jan 2011 10:48:50 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201101111048.p0BAmowJ017937@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Tue, 11 Jan 2011 10:48:50 +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: r217260 -
	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: Tue, 11 Jan 2011 10:48:50 -0000

Author: dim
Date: Tue Jan 11 10:48:50 2011
New Revision: 217260
URL: http://svn.freebsd.org/changeset/base/217260

Log:
  Put in a temporary kludge to force ld to put .note sections just after
  .interp sections.  This seems to have been broken by binutils commit
  7f55fa5745fbe04b91e1fbd668d102f3166e03d8, but the specific reasons are
  still unclear.
  
  For now, this fix is needed to make sure .note.ABI-tag sections always
  end up in the first page of the resulting executable.

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	Tue Jan 11 06:07:36 2011	(r217259)
+++ projects/binutils-2.17/contrib/binutils/ld/emultempl/elf32.em	Tue Jan 11 10:48:50 2011	(r217260)
@@ -1540,8 +1540,7 @@ gld${EMULATION_NAME}_place_orphan (asect
   if ((s->flags & SEC_ALLOC) == 0)
     ;
   else if ((s->flags & SEC_LOAD) != 0
-	   && ((iself && sh_type == SHT_NOTE)
-	       || (!iself && CONST_STRNEQ (secname, ".note"))))
+	   && CONST_STRNEQ (secname, ".note"))
     place = &hold[orphan_interp];
   else if ((s->flags & (SEC_LOAD | SEC_HAS_CONTENTS)) == 0)
     place = &hold[orphan_bss];