diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2024-01-28 01:07:27 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2024-01-28 01:07:27 +0000 |
| commit | 6d46e9a79b62d5b4a9673a0674479e20603dfd91 (patch) | |
| tree | d0fe1d2261182287d856c9f972726abb31057ad7 /sys/arch/alpha | |
| parent | e0ff2ce2f18a6798f463b7fc0258f7bfcd7beead (diff) | |
Force -fno-stack-protector on "boot block" that absolutely can't have
a stack protector (probably not even a -fstack-protector-strong) because
the bloat would render them unuseable. This also means the system
compiler can now take on any more it wants, and all the pieces which
can't use the stack protector are properly marked.
ok kettenis
Diffstat (limited to 'sys/arch/alpha')
| -rw-r--r-- | sys/arch/alpha/stand/Makefile.inc | 4 | ||||
| -rw-r--r-- | sys/arch/alpha/stand/boot/Makefile | 4 | ||||
| -rw-r--r-- | sys/arch/alpha/stand/nboot/Makefile | 5 | ||||
| -rw-r--r-- | sys/arch/alpha/stand/netboot/Makefile | 4 |
4 files changed, 9 insertions, 8 deletions
diff --git a/sys/arch/alpha/stand/Makefile.inc b/sys/arch/alpha/stand/Makefile.inc index 9a068939d77..8555471c40a 100644 --- a/sys/arch/alpha/stand/Makefile.inc +++ b/sys/arch/alpha/stand/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.16 2023/03/11 20:49:33 miod Exp $ +# $OpenBSD: Makefile.inc,v 1.17 2024/01/28 01:07:26 deraadt Exp $ # $NetBSD: Makefile.inc,v 1.8 1997/04/06 08:39:38 cgd Exp $ BINDIR= /usr/mdec @@ -23,7 +23,7 @@ EXTRACFLAGS+= -DHEAP_LIMIT="0x${HEAP_LIMIT}" CFLAGS+= -fno-stack-protector -fno-builtin-printf \ -fno-builtin-vprintf -fno-builtin-putchar \ - -fno-builtin-puts -fno-builtin-exit + -fno-builtin-puts -fno-builtin-exit -fno-stack-protector OBJCOPY?= objcopy STRIP?= strip diff --git a/sys/arch/alpha/stand/boot/Makefile b/sys/arch/alpha/stand/boot/Makefile index f31702acf61..df99e0c850c 100644 --- a/sys/arch/alpha/stand/boot/Makefile +++ b/sys/arch/alpha/stand/boot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.26 2023/03/11 20:49:33 miod Exp $ +# $OpenBSD: Makefile,v 1.27 2024/01/28 01:07:26 deraadt Exp $ # $NetBSD: Makefile,v 1.17 1997/04/17 07:27:46 thorpej Exp $ S= ${.CURDIR}/../../../.. @@ -29,7 +29,7 @@ DEFNS= -DCOMPAT_UFS AFLAGS += -DASSEMBLER ${DEFNS} -fno-pie CPPFLAGS += -I${.CURDIR}/../.. -I${S} ${DEFNS} CFLAGS = -Oz -Werror -mno-fp-regs -fno-pie \ - -msmall-data -msmall-text + -msmall-data -msmall-text -fno-stack-protector ${PROG}.nosym: ${PROG}.sym cp ${PROG}.sym ${PROG}.nosym diff --git a/sys/arch/alpha/stand/nboot/Makefile b/sys/arch/alpha/stand/nboot/Makefile index 71c94b9fa2d..b291a970f83 100644 --- a/sys/arch/alpha/stand/nboot/Makefile +++ b/sys/arch/alpha/stand/nboot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2023/03/13 20:20:13 miod Exp $ +# $OpenBSD: Makefile,v 1.3 2024/01/28 01:07:26 deraadt Exp $ # $NetBSD: Makefile,v 1.17 1997/04/17 07:27:46 thorpej Exp $ MAN?= boot.8 @@ -39,7 +39,8 @@ DEFNS= -DCOMPAT_UFS AFLAGS += -DASSEMBLER ${DEFNS} -fno-pie CPPFLAGS += -I${.CURDIR}/../.. -I${.CURDIR} -I${S} ${DEFNS} -CFLAGS = -Oz -Werror -mno-fp-regs -fno-pie -msmall-data -msmall-text +CFLAGS = -Oz -Werror -mno-fp-regs -fno-pie -msmall-data -msmall-text \ + -fno-stack-protector ${PROG}.nosym: ${PROG}.sym cp ${PROG}.sym ${PROG}.nosym diff --git a/sys/arch/alpha/stand/netboot/Makefile b/sys/arch/alpha/stand/netboot/Makefile index 751ee044478..c5d70c78ed0 100644 --- a/sys/arch/alpha/stand/netboot/Makefile +++ b/sys/arch/alpha/stand/netboot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.19 2023/03/11 20:49:33 miod Exp $ +# $OpenBSD: Makefile,v 1.20 2024/01/28 01:07:26 deraadt Exp $ # $NetBSD: Makefile,v 1.11 1997/04/17 07:27:50 thorpej Exp $ S= ${.CURDIR}/../../../.. @@ -30,7 +30,7 @@ DEFNS= -DPRIMARY_BOOTBLOCK -DSUN_BOOTPARAMS AFLAGS += -DASSEMBLER ${DEFNS} -fno-pie CPPFLAGS += -I${.CURDIR}/../.. -I${S} ${DEFNS} -CFLAGS = -Werror -mno-fp-regs -fno-pie +CFLAGS = -Werror -mno-fp-regs -fno-pie -fno-stack-protector ${PROG}.nosym: ${PROG}.sym cp ${PROG}.sym ${PROG}.nosym |