From owner-svn-src-head@freebsd.org  Thu Jul 21 15:26:22 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 65BDCB9FAA6;
 Thu, 21 Jul 2016 15:26:22 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 36E9F1C00;
 Thu, 21 Jul 2016 15:26:22 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6LFQLCx012189;
 Thu, 21 Jul 2016 15:26:21 GMT (envelope-from pfg@FreeBSD.org)
Received: (from pfg@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6LFQLkB012188;
 Thu, 21 Jul 2016 15:26:21 GMT (envelope-from pfg@FreeBSD.org)
Message-Id: <201607211526.u6LFQLkB012188@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org
 using -f
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Thu, 21 Jul 2016 15:26:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r303147 - head/contrib/binutils/bfd
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 21 Jul 2016 15:26:22 -0000

Author: pfg
Date: Thu Jul 21 15:26:21 2016
New Revision: 303147
URL: https://svnweb.freebsd.org/changeset/base/303147

Log:
  binutils: fix "Bad value" error in bfd for MIPS when using -Bsymbolic.
  
  From OpenBSD's log:
  
  Inspired by https://sourceware.org/ml/binutils/2010-08/msg00333.html,
  but expressed differently so there are no GPLv3 issues.
  
  Obtained from:	OpenBSD (CVS rev. 1.7)
  MFC after:	1 month

Modified:
  head/contrib/binutils/bfd/elfxx-mips.c

Modified: head/contrib/binutils/bfd/elfxx-mips.c
==============================================================================
--- head/contrib/binutils/bfd/elfxx-mips.c	Thu Jul 21 14:17:36 2016	(r303146)
+++ head/contrib/binutils/bfd/elfxx-mips.c	Thu Jul 21 15:26:21 2016	(r303147)
@@ -4801,7 +4801,7 @@ mips_elf_create_dynamic_relocation (bfd 
   /* We must now calculate the dynamic symbol table index to use
      in the relocation.  */
   if (h != NULL
-      && (!h->root.def_regular
+      && (sec == NULL || !h->root.def_regular
 	  || (info->shared && !info->symbolic && !h->root.forced_local)))
     {
       indx = h->root.dynindx;