diff options
Diffstat (limited to 'sys/conf')
| -rw-r--r-- | sys/conf/files | 2 | ||||
| -rw-r--r-- | sys/conf/kern.mk | 7 | ||||
| -rw-r--r-- | sys/conf/kern.pre.mk | 5 |
3 files changed, 10 insertions, 4 deletions
diff --git a/sys/conf/files b/sys/conf/files index d558abd..9261e2e 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1608,6 +1608,8 @@ kern/posix4_mib.c standard kern/sched_4bsd.c optional sched_4bsd kern/sched_ule.c optional sched_ule kern/serdev_if.m standard +kern/stack_protector.c standard \ + compile-with "${NORMAL_C:N-fstack-protector*}" kern/subr_acl_posix1e.c standard kern/subr_autoconf.c standard kern/subr_blist.c standard diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk index 9583f69..3741906 100644 --- a/sys/conf/kern.mk +++ b/sys/conf/kern.mk @@ -106,3 +106,10 @@ CFLAGS+= -ffreestanding .if ${CC} == "icc" CFLAGS+= -restrict .endif + +# +# GCC SSP support. +# +.if ${MK_SSP} != "no" && ${CC} != "icc" && ${MACHINE_ARCH} != "ia64" +CFLAGS+= -fstack-protector +.endif diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk index edfcb08..770f3ca 100644 --- a/sys/conf/kern.pre.mk +++ b/sys/conf/kern.pre.mk @@ -3,10 +3,7 @@ # Part of a unified Makefile for building kernels. This part contains all # of the definitions that need to be before %BEFORE_DEPEND. -SRCCONF?= /etc/src.conf -.if exists(${SRCCONF}) -.include "${SRCCONF}" -.endif +.include <bsd.own.mk> # Can be overridden by makeoptions or /etc/make.conf KERNEL_KO?= kernel |
