diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2024-01-28 00:40:23 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2024-01-28 00:40:23 +0000 |
| commit | e0ff2ce2f18a6798f463b7fc0258f7bfcd7beead (patch) | |
| tree | d2e5465b855ce6974308e951bc5b3400930ea0a0 /sys/arch/i386 | |
| parent | a0f0de8bd6a69bf6418dfe4af863a50ae3700d33 (diff) | |
set -fno-stack-protector in NORMAL_C_NOP, which is used to compile
mcount.c, in the same way that -fno-ret-protector is set (because
the default ret-protector is an "always" generator). This change
ensures there is never a stack protector prologue/epilogue in the
functions in that file, no matter what stack protector selection
algorithm is in play.
ok kettenis guenther
Diffstat (limited to 'sys/arch/i386')
| -rw-r--r-- | sys/arch/i386/conf/Makefile.i386 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/arch/i386/conf/Makefile.i386 b/sys/arch/i386/conf/Makefile.i386 index f2c1079de39..e7647347ac1 100644 --- a/sys/arch/i386/conf/Makefile.i386 +++ b/sys/arch/i386/conf/Makefile.i386 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.i386,v 1.144 2023/09/06 01:47:37 jsg Exp $ +# $OpenBSD: Makefile.i386,v 1.145 2024/01/28 00:40:22 deraadt Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -66,7 +66,7 @@ HOSTED_CPPFLAGS=${CPPFLAGS:S/^-nostdinc$//} HOSTED_CFLAGS= ${CFLAGS} HOSTED_C= ${HOSTCC} ${HOSTED_CFLAGS} ${HOSTED_CPPFLAGS} -c $< -NORMAL_C_NOP= ${CC} ${CFLAGS} ${CPPFLAGS} -c $< +NORMAL_C_NOP= ${CC} ${CFLAGS} ${CPPFLAGS} -fno-stack-protector -c $< NORMAL_C= ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $< NORMAL_S= ${CC} ${AFLAGS} ${CPPFLAGS} ${PROF} -c $< |