From owner-svn-src-all@freebsd.org  Sun Oct 18 04:07:42 2015
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3BBBBA0F6FA;
 Sun, 18 Oct 2015 04:07:42 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 08FE6B1F;
 Sun, 18 Oct 2015 04:07:41 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9I47fI6009247;
 Sun, 18 Oct 2015 04:07:41 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9I47f97009246;
 Sun, 18 Oct 2015 04:07:41 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201510180407.t9I47f97009246@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Sun, 18 Oct 2015 04:07:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r289481 - head/share/mk
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
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: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 18 Oct 2015 04:07:42 -0000

Author: ngie
Date: Sun Oct 18 04:07:40 2015
New Revision: 289481
URL: https://svnweb.freebsd.org/changeset/base/289481

Log:
  Only enable -fstack-protector-strong on gcc 4.9+ and default to -fstack-protector
  when -fstack-protector-strong is not available, like it was implicitly before
  r288669
  
  As noted by antoine@, devel/gcc (which is 4.8.5) lacks -fstack-protector-strong
  support, whereas 4.8.4i (devel/gcc48) has the support.
  
  Until a version is available which has -fstack-protector-strong support, be
  conservative and only enable support with 4.9+.
  
  Reviewed by: pfg
  X-MFC with: r288669, r289465
  Differential Revision: https://reviews.freebsd.org/D3924

Modified:
  head/share/mk/bsd.sys.mk

Modified: head/share/mk/bsd.sys.mk
==============================================================================
--- head/share/mk/bsd.sys.mk	Sun Oct 18 03:09:03 2015	(r289480)
+++ head/share/mk/bsd.sys.mk	Sun Oct 18 04:07:40 2015	(r289481)
@@ -150,11 +150,13 @@ CXXFLAGS.clang+=	 -Wno-c++11-extensions
     ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips"
 .if (${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 30500) || \
     (${COMPILER_TYPE} == "gcc" && \
-     (${COMPILER_VERSION} == 40201 || ${COMPILER_VERSION} >= 40800))
+     (${COMPILER_VERSION} == 40201 || ${COMPILER_VERSION} >= 40900))
 # Don't use -Wstack-protector as it breaks world with -Werror.
 SSP_CFLAGS?=	-fstack-protector-strong
-CFLAGS+=	${SSP_CFLAGS}
+.else
+SSP_CFLAGS?=	-fstack-protector
 .endif
+CFLAGS+=	${SSP_CFLAGS}
 .endif # SSP && !ARM && !MIPS
 
 # Allow user-specified additional warning flags, plus compiler specific flag overrides.