From owner-svn-src-projects@FreeBSD.ORG  Wed Feb  3 21:41:42 2010
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 DC19B1065692;
	Wed,  3 Feb 2010 21:41:42 +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 CCBBB8FC19;
	Wed,  3 Feb 2010 21:41:42 +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 o13LfgPb016135;
	Wed, 3 Feb 2010 21:41:42 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o13LfgVG016133;
	Wed, 3 Feb 2010 21:41:42 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <201002032141.o13LfgVG016133@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Wed, 3 Feb 2010 21:41:42 +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: r203448 - 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: Wed, 03 Feb 2010 21:41:42 -0000

Author: rwatson
Date: Wed Feb  3 21:41:42 2010
New Revision: 203448
URL: http://svn.freebsd.org/changeset/base/203448

Log:
  Merge c172968 from the p4 TrustdBSD Capabilities branch to capabilities8:
  
    Merge changes in rtld-elf's makefile into our local rtld-elf-cap.

Modified:
  projects/capabilities8/libexec/rtld-elf-cap/Makefile

Modified: projects/capabilities8/libexec/rtld-elf-cap/Makefile
==============================================================================
--- projects/capabilities8/libexec/rtld-elf-cap/Makefile	Wed Feb  3 21:29:50 2010	(r203447)
+++ projects/capabilities8/libexec/rtld-elf-cap/Makefile	Wed Feb  3 21:41:42 2010	(r203448)
@@ -1,9 +1,8 @@
 # $FreeBSD$
 # $P4: //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/Makefile#21 $
 
-WITHOUT_SSP=
-
 .include <bsd.own.mk>
+MK_SSP=		no
 
 PROG?=		ld-elf-cap.so.1
 SRCS=		rtld_start.S \
@@ -15,6 +14,7 @@ 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
+WARNS?=		2
 INSTALLFLAGS=	-C -b
 PRECIOUSPROG=
 BINDIR=		/libexec
@@ -23,7 +23,7 @@ MLINKS=		rtld-elf-cap.1 ld-elf-cap.so.1.
 CFLAGS+=	-fpic -DPIC
 LDFLAGS+=	-shared -Wl,-Bsymbolic
 DPADD=		${LIBC_PIC}
-LDADD=		-lc_pic
+LDADD=		-lc_pic -lssp_nonshared
 
 .if ${MACHINE_ARCH} != "ia64"
 .if ${MK_SYMVER} == "yes"