diff options
| author | Pascal Stumpf <pascal@cvs.openbsd.org> | 2012-08-21 14:46:21 +0000 |
|---|---|---|
| committer | Pascal Stumpf <pascal@cvs.openbsd.org> | 2012-08-21 14:46:21 +0000 |
| commit | 9333c875627ad69d46ab3793263036ff3b45cc49 (patch) | |
| tree | 697841a9433248956f025a7d1b3cd8019dfef64c /sys/arch/socppc | |
| parent | 1caaeac6aae64a980b30cd0f00e3d491be174c97 (diff) | |
Add NOPIE= bits for sys/arch/*/stand to ensure that bootblocks will always be
built with -fno-pie. This gets the hairiest part of PIE out of the way ...
ok deraadt@
Diffstat (limited to 'sys/arch/socppc')
| -rw-r--r-- | sys/arch/socppc/stand/boot/Makefile | 3 | ||||
| -rw-r--r-- | sys/arch/socppc/stand/mkboot/Makefile | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/sys/arch/socppc/stand/boot/Makefile b/sys/arch/socppc/stand/boot/Makefile index 6799370bc3d..098bf5e951a 100644 --- a/sys/arch/socppc/stand/boot/Makefile +++ b/sys/arch/socppc/stand/boot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.11 2011/07/10 16:23:50 deraadt Exp $ +# $OpenBSD: Makefile,v 1.12 2012/08/21 14:46:19 pascal Exp $ .include "${.CURDIR}/../Makefile.inc" @@ -45,6 +45,7 @@ STANDIR= ${.CURDIR}/.. RELOC= 0x100000 LDFLAGS= -Ttext ${RELOC} +NOPIE= OBJCOPY?= objcopy ${PROG}: ${OBJS} ${LIBSA} ${LIBZ} diff --git a/sys/arch/socppc/stand/mkboot/Makefile b/sys/arch/socppc/stand/mkboot/Makefile index c3e4e1b8e11..dd2a00f7c5f 100644 --- a/sys/arch/socppc/stand/mkboot/Makefile +++ b/sys/arch/socppc/stand/mkboot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2008/06/09 15:01:56 deraadt Exp $ +# $OpenBSD: Makefile,v 1.3 2012/08/21 14:46:19 pascal Exp $ .include "${.CURDIR}/../Makefile.inc" @@ -8,6 +8,7 @@ MAN= mkboot.8 PROG= mkboot DPADD= ${LIBZ} LDADD= -lz +NOPIE= .else NOPROG= .endif |