From owner-svn-src-all@freebsd.org  Sat Aug 20 02:18:45 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 B02EBBC052C;
 Sat, 20 Aug 2016 02:18:45 +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 7416F1D54;
 Sat, 20 Aug 2016 02:18:45 +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 u7K2IiC1018028;
 Sat, 20 Aug 2016 02:18:44 GMT (envelope-from pfg@FreeBSD.org)
Received: (from pfg@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7K2Ii20018027;
 Sat, 20 Aug 2016 02:18:44 GMT (envelope-from pfg@FreeBSD.org)
Message-Id: <201608200218.u7K2Ii20018027@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: Sat, 20 Aug 2016 02:18:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r304517 - stable/10/contrib/binutils/bfd
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 20 Aug 2016 02:18:45 -0000

Author: pfg
Date: Sat Aug 20 02:18:44 2016
New Revision: 304517
URL: https://svnweb.freebsd.org/changeset/base/304517

Log:
  MFC r303147
  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)

Modified:
  stable/10/contrib/binutils/bfd/elfxx-mips.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/contrib/binutils/bfd/elfxx-mips.c
==============================================================================
--- stable/10/contrib/binutils/bfd/elfxx-mips.c	Sat Aug 20 02:14:14 2016	(r304516)
+++ stable/10/contrib/binutils/bfd/elfxx-mips.c	Sat Aug 20 02:18:44 2016	(r304517)
@@ -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;