From 32daaae72c4bea6711020b6b7a68acbaf0af386e Mon Sep 17 00:00:00 2001
From: Jan Beich <jbeich@FreeBSD.org>
Date: Wed, 24 Apr 2019 19:15:05 +0000
Subject: Switch to -fstack-protector-strong and enable on more architectures

PR:		237273
Exp-run by:	antoine
Approved by:	portmgr (antoine)
Differential Revision:	https://reviews.freebsd.org/D19907
---
 Mk/bsd.ssp.mk | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'Mk/bsd.ssp.mk')

diff --git a/Mk/bsd.ssp.mk b/Mk/bsd.ssp.mk
index 4f0058fe38da..0bc5819bcd6f 100644
--- a/Mk/bsd.ssp.mk
+++ b/Mk/bsd.ssp.mk
@@ -4,14 +4,9 @@
 SSP_Include_MAINTAINER=	portmgr@FreeBSD.org
 
 .if !defined(SSP_UNSAFE) && \
-    (${ARCH} == i386 || ${ARCH} == amd64)
+    (${MACHINE} != "mips")
 # Overridable as a user may want to use -fstack-protector-all
-SSP_CFLAGS?=	-fstack-protector
+SSP_CFLAGS?=	-fstack-protector-strong
 CFLAGS+=	${SSP_CFLAGS}
-LDFLAGS+=	-fstack-protector
-# -lssp_nonshared is needed on i386 where /usr/lib/libc.so is not an ldscript
-# This is currently unused XXX
-.	if defined(SSP_NEED_NONSHARED)
-LDFLAGS+=	-lssp_nonshared
-.	endif
+LDFLAGS+=	${SSP_CFLAGS}
 .endif
-- 
cgit v1.2.3