From owner-p4-projects@FreeBSD.ORG  Mon Oct 17 23:23:39 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 051F816A429; Mon, 17 Oct 2005 23:23:39 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id B92F616A427
	for <perforce@freebsd.org>; Mon, 17 Oct 2005 23:23:38 +0000 (GMT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8684043D46
	for <perforce@freebsd.org>; Mon, 17 Oct 2005 23:23:38 +0000 (GMT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9HNNc9x013742
	for <perforce@freebsd.org>; Mon, 17 Oct 2005 23:23:38 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9HNNcQR013739
	for perforce@freebsd.org; Mon, 17 Oct 2005 23:23:38 GMT
	(envelope-from peter@freebsd.org)
Date: Mon, 17 Oct 2005 23:23:38 GMT
Message-Id: <200510172323.j9HNNcQR013739@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 85472 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 17 Oct 2005 23:23:39 -0000

http://perforce.freebsd.org/chv.cgi?CH=85472

Change 85472 by peter@peter_melody on 2005/10/17 23:23:20

	Add a bugfix/workaround to binutils to enable -shared modules without
	-fpic.

Affected files ...

.. //depot/projects/hammer/contrib/binutils/bfd/elf64-x86-64.c#6 edit

Differences ...

==== //depot/projects/hammer/contrib/binutils/bfd/elf64-x86-64.c#6 (text+ko) ====

@@ -784,7 +784,8 @@
 	     non-constant sections.  */
 	  if (info->shared
 	      && (sec->flags & SEC_ALLOC) != 0
-	      && (sec->flags & SEC_READONLY) != 0)
+	      && (sec->flags & SEC_READONLY) != 0
+	      && getenv("BFD_STFU") == NULL)
 	    {
 	      (*_bfd_error_handler)
 		(_("%s: relocation %s can not be used when making a shared object; recompile with -fPIC"),
@@ -1938,6 +1939,11 @@
 	  unresolved_reloc = FALSE;
 	  break;
 
+	case R_X86_64_32S:
+	  if (getenv("BFD_STFU") == NULL) {
+	    break;
+	  }
+	  /* Fall Through */
 	case R_X86_64_PC8:
 	case R_X86_64_PC16:
 	case R_X86_64_PC32:
@@ -2045,7 +2051,10 @@
 			}
 
 		      outrel.r_info = ELF64_R_INFO (sindx, r_type);
-		      outrel.r_addend = relocation + rel->r_addend;
+		      if (r_type == R_X86_64_32S && getenv("BFD_STFU") != NULL)
+			outrel.r_addend = rel->r_addend;
+		      else
+			outrel.r_addend = relocation + rel->r_addend;
 		    }
 		}