From owner-svn-src-all@FreeBSD.ORG  Thu Nov 11 22:53:55 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A38931065674;
	Thu, 11 Nov 2010 22:53:55 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 939928FC17;
	Thu, 11 Nov 2010 22:53:55 +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 oABMrtUU087323;
	Thu, 11 Nov 2010 22:53:55 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oABMrtn8087321;
	Thu, 11 Nov 2010 22:53:55 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201011112253.oABMrtn8087321@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Thu, 11 Nov 2010 22:53:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r215148 - head/libexec/rtld-elf
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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: <http://lists.freebsd.org/mailman/listinfo/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: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 11 Nov 2010 22:53:55 -0000

Author: dim
Date: Thu Nov 11 22:53:55 2010
New Revision: 215148
URL: http://svn.freebsd.org/changeset/base/215148

Log:
  Use -fPIC to build libexec/rtld-elf on sparc64, so it will also be able
  to link with newer binutils, without overflowing the GOT.
  
  Obtained from:	projects/binutils-2.17

Modified:
  head/libexec/rtld-elf/Makefile

Modified: head/libexec/rtld-elf/Makefile
==============================================================================
--- head/libexec/rtld-elf/Makefile	Thu Nov 11 22:35:42 2010	(r215147)
+++ head/libexec/rtld-elf/Makefile	Thu Nov 11 22:53:55 2010	(r215148)
@@ -29,7 +29,12 @@ SYMLINKS=	${BINDIR}/${PROG} /usr/libexec
 MLINKS=		rtld.1 ld-elf.so.1.1 \
 		rtld.1 ld.so.1
 
-CFLAGS+=	-fpic -DPIC
+.if ${MACHINE_CPUARCH} == "sparc64"
+CFLAGS+=	-fPIC
+.else
+CFLAGS+=	-fpic
+.endif
+CFLAGS+=	-DPIC
 LDFLAGS+=	-shared -Wl,-Bsymbolic
 DPADD=		${LIBC_PIC}
 LDADD=		-lc_pic -lssp_nonshared