From owner-svn-src-projects@FreeBSD.ORG  Thu Oct 22 11:38:19 2009
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 971EC1065676;
	Thu, 22 Oct 2009 11:38:19 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 864618FC1A;
	Thu, 22 Oct 2009 11:38:19 +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 n9MBcJn0028989;
	Thu, 22 Oct 2009 11:38:19 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n9MBcJv2028987;
	Thu, 22 Oct 2009 11:38:19 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <200910221138.n9MBcJv2028987@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Thu, 22 Oct 2009 11:38:19 +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: r198364 - projects/capabilities8/libexec/rtld-elf-cap
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: Thu, 22 Oct 2009 11:38:19 -0000

Author: rwatson
Date: Thu Oct 22 11:38:19 2009
New Revision: 198364
URL: http://svn.freebsd.org/changeset/base/198364

Log:
  Merge Perforce c169677 into capabilities8:
  
    Custom linker script is no longer required for rtld-elf-cap as
    the kernel now auto-places position-independent code properly.

Deleted:
  projects/capabilities8/libexec/rtld-elf-cap/rtld-elf-cap.xs
Modified:
  projects/capabilities8/libexec/rtld-elf-cap/Makefile

Modified: projects/capabilities8/libexec/rtld-elf-cap/Makefile
==============================================================================
--- projects/capabilities8/libexec/rtld-elf-cap/Makefile	Thu Oct 22 11:35:12 2009	(r198363)
+++ projects/capabilities8/libexec/rtld-elf-cap/Makefile	Thu Oct 22 11:38:19 2009	(r198364)
@@ -14,7 +14,7 @@ MAN=		rtld-elf-cap.1
 CSTD?=		gnu99
 CFLAGS+=	-Wall -DFREEBSD_ELF -DIN_RTLD -DIN_RTLD_CAP -g
 CFLAGS+=	-I${.CURDIR} -I${.CURDIR}/../rtld-elf/${MACHINE_ARCH} -I${.CURDIR}/../rtld-elf
-LDFLAGS+=	-nostdlib -Wl,-e,.rtld_start -Wl,-T,${.CURDIR}/rtld-elf-cap.xs
+LDFLAGS+=	-nostdlib -Wl,-e,.rtld_start
 INSTALLFLAGS=	-C -b
 PRECIOUSPROG=
 BINDIR=		/libexec