diff options
| author | Philip Guenther <guenther@cvs.openbsd.org> | 2016-07-30 03:25:50 +0000 |
|---|---|---|
| committer | Philip Guenther <guenther@cvs.openbsd.org> | 2016-07-30 03:25:50 +0000 |
| commit | 504cca6cdb1359a366237bb2195be0c746cabb21 (patch) | |
| tree | c9af0b76bebfd27ed2e6c58db5108cda5eb32460 /sys/arch/macppc/stand | |
| parent | eaca4810148e3d8b20ad9aa2d209b3e04c30e0f3 (diff) | |
Prep for relro: make sure it's off for any non-PIE stand/ program
ok millert@ kettenis@
Diffstat (limited to 'sys/arch/macppc/stand')
| -rw-r--r-- | sys/arch/macppc/stand/boot.mac/Makefile | 4 | ||||
| -rw-r--r-- | sys/arch/macppc/stand/ofwboot/Makefile | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/macppc/stand/boot.mac/Makefile b/sys/arch/macppc/stand/boot.mac/Makefile index 602ba54701a..77367c7e347 100644 --- a/sys/arch/macppc/stand/boot.mac/Makefile +++ b/sys/arch/macppc/stand/boot.mac/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.13 2015/09/11 17:46:59 miod Exp $ +# $OpenBSD: Makefile,v 1.14 2016/07/30 03:25:49 guenther Exp $ # $NetBSD: Makefile,v 1.1 1996/09/30 16:35:05 ws Exp $ S= ${.CURDIR}/../../../.. @@ -17,7 +17,7 @@ INSTALL_STRIP= BINDIR= /usr/mdec OBJCOPY?= objcopy OBJCOPY_ARGS= -O aixcoff-rs6000 -R .comment -R .note -LDFLAGS= -nopie -X -Ttext ${RELOC} -e $(ENTRY) +LDFLAGS= -nopie -znorelro -X -Ttext ${RELOC} -e $(ENTRY) LDFLAGS+= -T ${.CURDIR}/elf32_powerpc_merge.x -Bstatic .PATH: ${S}/stand/boot diff --git a/sys/arch/macppc/stand/ofwboot/Makefile b/sys/arch/macppc/stand/ofwboot/Makefile index f2e89e59f01..176e32f7aa6 100644 --- a/sys/arch/macppc/stand/ofwboot/Makefile +++ b/sys/arch/macppc/stand/ofwboot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.14 2015/09/11 17:46:59 miod Exp $ +# $OpenBSD: Makefile,v 1.15 2016/07/30 03:25:49 guenther Exp $ # $NetBSD: Makefile,v 1.2 1997/04/17 07:46:24 thorpej Exp $ S= ${.CURDIR}/../../../.. @@ -41,7 +41,7 @@ CPPFLAGS+= -DRELOC=0x${RELOC} -DCONSPEED=57600 LIBS!= cd $(.CURDIR)/$(R); $(MAKE) libdep ${PROG}: ${OBJS} ${LIBSA} ${LIBZ} - ${LD} -nopie -N -X -Ttext ${RELOC} -e ${ENTRY} -o ${PROG} \ + ${LD} -nopie -znorelro -N -X -Ttext ${RELOC} -e ${ENTRY} -o ${PROG} \ ${OBJS} ${LIBS} .include <bsd.prog.mk> |