From owner-svn-src-stable@FreeBSD.ORG  Mon Dec 31 14:21:32 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id EF1FAD27;
 Mon, 31 Dec 2012 14:21:31 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id D2F0C8FC15;
 Mon, 31 Dec 2012 14:21:31 +0000 (UTC)
Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBVELVPG049006;
 Mon, 31 Dec 2012 14:21:31 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBVELVN9049003;
 Mon, 31 Dec 2012 14:21:31 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201212311421.qBVELVN9049003@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Mon, 31 Dec 2012 14:21:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r244904 - stable/9/contrib/binutils/bfd
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 31 Dec 2012 14:21:32 -0000

Author: dim
Date: Mon Dec 31 14:21:31 2012
New Revision: 244904
URL: http://svnweb.freebsd.org/changeset/base/244904

Log:
  MFC r244600:
  
  Fix a bug in ld --gc-sections: it strips out .note sections, while it
  should never do so.  This can cause global constructors and destructors
  to not be executed at run-time, resulting in crashes and other strange
  behaviour.
  
  Reported by:	rene

Modified:
  stable/9/contrib/binutils/bfd/elflink.c
Directory Properties:
  stable/9/contrib/binutils/   (props changed)

Modified: stable/9/contrib/binutils/bfd/elflink.c
==============================================================================
--- stable/9/contrib/binutils/bfd/elflink.c	Mon Dec 31 12:11:14 2012	(r244903)
+++ stable/9/contrib/binutils/bfd/elflink.c	Mon Dec 31 14:21:31 2012	(r244904)
@@ -10584,6 +10584,7 @@ elf_gc_sweep (bfd *abfd, struct bfd_link
 	{
 	  /* Keep debug and special sections.  */
 	  if ((o->flags & (SEC_DEBUGGING | SEC_LINKER_CREATED)) != 0
+	      || elf_section_data (o)->this_hdr.sh_type == SHT_NOTE
 	      || (o->flags & (SEC_ALLOC | SEC_LOAD | SEC_RELOC)) == 0)
 	    o->gc_mark = 1;