summaryrefslogtreecommitdiffstats
path: root/sys/conf
diff options
context:
space:
mode:
authorcognet <cognet@FreeBSD.org>2008-07-22 09:38:12 +0000
committercognet <cognet@FreeBSD.org>2008-07-22 09:38:12 +0000
commitc79e409a88995679f94d46c13e8ecc9c0fc69f88 (patch)
tree4bd6c36a71e753c6ff7a7f4e71705cc8aea245d5 /sys/conf
parent944512f80539e63b6bb689569017386187829652 (diff)
downloadFreeBSD-src-c79e409a88995679f94d46c13e8ecc9c0fc69f88.zip
FreeBSD-src-c79e409a88995679f94d46c13e8ecc9c0fc69f88.tar.gz
Disable SSP for the kernel on arm as well (see rev 180605).
I overlooked this because a SSP kernel booted for me. Apologises to: ticso
Diffstat (limited to 'sys/conf')
-rw-r--r--sys/conf/kern.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk
index 3741906..53f811f 100644
--- a/sys/conf/kern.mk
+++ b/sys/conf/kern.mk
@@ -110,6 +110,7 @@ CFLAGS+= -restrict
#
# GCC SSP support.
#
-.if ${MK_SSP} != "no" && ${CC} != "icc" && ${MACHINE_ARCH} != "ia64"
+.if ${MK_SSP} != "no" && ${CC} != "icc" && ${MACHINE_ARCH} != "ia64" && \
+ ${MACHINE_ARCH} != "arm"
CFLAGS+= -fstack-protector
.endif
OpenPOWER on IntegriCloud