From owner-svn-src-stable-9@FreeBSD.ORG  Mon Sep  1 05:35:56 2014
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 8CB2F535;
 Mon,  1 Sep 2014 05:35:56 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 77F131527;
 Mon,  1 Sep 2014 05:35:56 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s815Zu0Y008125;
 Mon, 1 Sep 2014 05:35:56 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s815Zujs008123;
 Mon, 1 Sep 2014 05:35:56 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201409010535.s815Zujs008123@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org
 using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Mon, 1 Sep 2014 05:35:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r270916 - in stable/9: lib/libc share/mk
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
 <svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9/>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Sep 2014 05:35:56 -0000

Author: ngie
Date: Mon Sep  1 05:35:55 2014
New Revision: 270916
URL: http://svnweb.freebsd.org/changeset/base/270916

Log:
  MFC r270519:
  
    Fix "make checkdpadd" for lib/libc when MK_SSP != no
  
    Add LIBSSP_NONSHARED to bsd.libnames.mk and append LIBSSP_NONSHARED to DPADD in
    lib/libc when MK_SSP != no
  
    Approved by: rpaulo (mentor)
    Phabric: D675 (as part of a larger diff)
    PR: 192728

Modified:
  stable/9/lib/libc/Makefile
  stable/9/share/mk/bsd.libnames.mk
Directory Properties:
  stable/9/   (props changed)
  stable/9/lib/   (props changed)
  stable/9/lib/libc/   (props changed)
  stable/9/share/   (props changed)
  stable/9/share/mk/   (props changed)

Modified: stable/9/lib/libc/Makefile
==============================================================================
--- stable/9/lib/libc/Makefile	Mon Sep  1 05:26:53 2014	(r270915)
+++ stable/9/lib/libc/Makefile	Mon Sep  1 05:35:55 2014	(r270916)
@@ -39,7 +39,7 @@ CFLAGS+=${CANCELPOINTS_CFLAGS}
 #
 # Only link with static libgcc.a (no libgcc_eh.a).
 #
-DPADD+=	${LIBGCC}
+DPADD+=	${LIBGCC} ${LIBSSP_NONSHARED}
 LDFLAGS+= -nodefaultlibs
 LDADD+= -lgcc -lssp_nonshared
 

Modified: stable/9/share/mk/bsd.libnames.mk
==============================================================================
--- stable/9/share/mk/bsd.libnames.mk	Mon Sep  1 05:26:53 2014	(r270915)
+++ stable/9/share/mk/bsd.libnames.mk	Mon Sep  1 05:35:55 2014	(r270916)
@@ -148,6 +148,7 @@ LIBSDP?=	${DESTDIR}${LIBDIR}/libsdp.a
 LIBSMB?=	${DESTDIR}${LIBDIR}/libsmb.a
 LIBSSH?=	${DESTDIR}${LIBPRIVATEDIR}/libssh.a
 LIBSSL?=	${DESTDIR}${LIBDIR}/libssl.a
+LIBSSP_NONSHARED?=	${DESTDIR}${LIBDIR}/libssp_nonshared.a
 LIBSTAND?=	${DESTDIR}${LIBDIR}/libstand.a
 LIBSTDCPLUSPLUS?= ${DESTDIR}${LIBDIR}/libstdc++.a
 LIBTACPLUS?=	${DESTDIR}${LIBDIR}/libtacplus.a