From owner-svn-src-projects@FreeBSD.ORG  Wed Jan  5 19:53:48 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 E1364106564A;
	Wed,  5 Jan 2011 19:53:48 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id CFECB8FC1D;
	Wed,  5 Jan 2011 19:53:48 +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 p05JrmmH089282;
	Wed, 5 Jan 2011 19:53:48 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p05Jrm0A089280;
	Wed, 5 Jan 2011 19:53:48 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201101051953.p05Jrm0A089280@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Wed, 5 Jan 2011 19:53:48 +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: r217024 - 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: Wed, 05 Jan 2011 19:53:49 -0000

Author: nwhitehorn
Date: Wed Jan  5 19:53:48 2011
New Revision: 217024
URL: http://svn.freebsd.org/changeset/base/217024

Log:
  Fix a bug involving hidden PLT symbols on powerpc64 systems by importing
  the 64-bit section of the change in binutils PR 11088.

Modified:
  projects/binutils-2.17/contrib/binutils/bfd/elf64-ppc.c

Modified: projects/binutils-2.17/contrib/binutils/bfd/elf64-ppc.c
==============================================================================
--- projects/binutils-2.17/contrib/binutils/bfd/elf64-ppc.c	Wed Jan  5 19:35:35 2011	(r217023)
+++ projects/binutils-2.17/contrib/binutils/bfd/elf64-ppc.c	Wed Jan  5 19:53:48 2011	(r217024)
@@ -5365,9 +5365,7 @@ ppc64_elf_gc_sweep_hook (bfd *abfd, stru
 	      for (ent = h->plt.plist; ent != NULL; ent = ent->next)
 		if (ent->addend == rel->r_addend)
 		  break;
-	      if (ent == NULL)
-		abort ();
-	      if (ent->plt.refcount > 0)
+	      if (ent != NULL && ent->plt.refcount > 0)
 		ent->plt.refcount -= 1;
 	    }
 	  break;