From 504cca6cdb1359a366237bb2195be0c746cabb21 Mon Sep 17 00:00:00 2001 From: Philip Guenther Date: Sat, 30 Jul 2016 03:25:50 +0000 Subject: Prep for relro: make sure it's off for any non-PIE stand/ program ok millert@ kettenis@ --- sys/arch/alpha/stand/boot/Makefile | 6 +++--- sys/arch/alpha/stand/bootxx/Makefile | 5 +++-- sys/arch/alpha/stand/netboot/Makefile | 6 +++--- 3 files changed, 9 insertions(+), 8 deletions(-) (limited to 'sys/arch/alpha/stand') diff --git a/sys/arch/alpha/stand/boot/Makefile b/sys/arch/alpha/stand/boot/Makefile index 5ba99b7ba28..2dd645160e6 100644 --- a/sys/arch/alpha/stand/boot/Makefile +++ b/sys/arch/alpha/stand/boot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.20 2015/10/22 18:54:41 miod Exp $ +# $OpenBSD: Makefile,v 1.21 2016/07/30 03:25:48 guenther Exp $ # $NetBSD: Makefile,v 1.17 1997/04/17 07:27:46 thorpej Exp $ S= ${.CURDIR}/../../../.. @@ -60,6 +60,6 @@ LIBSA= ${SALIB} ${PROG}.sym: ${OBJS} ${LIBSA} ${LIBZ} sh ${.CURDIR}/newvers.sh ${.CURDIR}/version ${COMPILE.c} vers.c - ${LD} -nopie -Ttext ${BOOT_RELOC} -N -e start -o ${PROG}.sym \ - ${OBJS} vers.o ${LIBSA} ${LIBZ} ${LIBSA} + ${LD} -nopie -znorelro -Ttext ${BOOT_RELOC} -N -e start \ + -o ${PROG}.sym ${OBJS} vers.o ${LIBSA} ${LIBZ} ${LIBSA} size ${PROG}.sym diff --git a/sys/arch/alpha/stand/bootxx/Makefile b/sys/arch/alpha/stand/bootxx/Makefile index b57041cd64e..b3118c1ffbf 100644 --- a/sys/arch/alpha/stand/bootxx/Makefile +++ b/sys/arch/alpha/stand/bootxx/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.15 2015/10/22 18:54:41 miod Exp $ +# $OpenBSD: Makefile,v 1.16 2016/07/30 03:25:48 guenther Exp $ # $NetBSD: Makefile,v 1.12 1997/04/17 07:27:49 thorpej Exp $ S= ${.CURDIR}/../../../.. @@ -40,5 +40,6 @@ lint: .include ${PROG}.sym: ${OBJS} - ${LD} -nopie -Ttext ${BOOT_RELOC} -N -e start -o ${PROG}.sym ${OBJS} + ${LD} -nopie -znorelro -Ttext ${BOOT_RELOC} -N -e start \ + -o ${PROG}.sym ${OBJS} size ${PROG}.sym diff --git a/sys/arch/alpha/stand/netboot/Makefile b/sys/arch/alpha/stand/netboot/Makefile index 34e6ed29dce..c8f5958eca2 100644 --- a/sys/arch/alpha/stand/netboot/Makefile +++ b/sys/arch/alpha/stand/netboot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.13 2014/12/13 14:45:34 miod Exp $ +# $OpenBSD: Makefile,v 1.14 2016/07/30 03:25:48 guenther Exp $ # $NetBSD: Makefile,v 1.11 1997/04/17 07:27:50 thorpej Exp $ S= ${.CURDIR}/../../../.. @@ -70,6 +70,6 @@ LIBSA= ${SALIB} ${PROG}.sym: ${OBJS} ${LIBSA} ${LIBZ} sh ${.CURDIR}/newvers.sh ${.CURDIR}/version ${COMPILE.c} vers.c - ${LD} -nopie -Ttext ${BOOT_RELOC} -N -e start -o ${PROG}.sym \ - ${OBJS} vers.o ${LIBSA} ${LIBZ} ${LIBSA} + ${LD} -nopie -znorelro -Ttext ${BOOT_RELOC} -N -e start \ + -o ${PROG}.sym ${OBJS} vers.o ${LIBSA} ${LIBZ} ${LIBSA} size ${PROG}.sym -- cgit v1.2.3