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/macppc | |
| 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/macppc')
| -rw-r--r-- | sys/arch/macppc/stand/boot.mac/Makefile | 3 | ||||
| -rw-r--r-- | sys/arch/macppc/stand/mbr/Makefile | 3 | ||||
| -rw-r--r-- | sys/arch/macppc/stand/ofwboot/Makefile | 3 | ||||
| -rw-r--r-- | sys/arch/macppc/stand/tbxidata/Makefile | 3 |
4 files changed, 8 insertions, 4 deletions
diff --git a/sys/arch/macppc/stand/boot.mac/Makefile b/sys/arch/macppc/stand/boot.mac/Makefile index 1028decc9e0..87067f83b2b 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.5 2011/07/08 08:49:53 drahn Exp $ +# $OpenBSD: Makefile,v 1.6 2012/08/21 14:46:19 pascal Exp $ # $NetBSD: Makefile,v 1.1 1996/09/30 16:35:05 ws Exp $ S= ${.CURDIR}/../../../.. @@ -16,6 +16,7 @@ BINDIR= /usr/mdec OBJCOPY?= objcopy OBJCOPY_ARGS= -O aixcoff-rs6000 -R .comment -R .note LDFLAGS= -X -Ttext ${RELOC} -e $(ENTRY) -T ${.CURDIR}/elf32_powerpc_merge.x -Bstatic +NOPIE= .PATH: ${S}/stand/boot .PATH: ${S}/lib/libsa diff --git a/sys/arch/macppc/stand/mbr/Makefile b/sys/arch/macppc/stand/mbr/Makefile index 6e2dd07950d..8fbe60b288c 100644 --- a/sys/arch/macppc/stand/mbr/Makefile +++ b/sys/arch/macppc/stand/mbr/Makefile @@ -1,6 +1,7 @@ -# $OpenBSD: Makefile,v 1.1 2001/09/01 15:35:00 drahn Exp $ +# $OpenBSD: Makefile,v 1.2 2012/08/21 14:46:19 pascal Exp $ CLEANFILES= mbr msdos1mb.gz +NOPIE= all: mbr msdos1mb.gz diff --git a/sys/arch/macppc/stand/ofwboot/Makefile b/sys/arch/macppc/stand/ofwboot/Makefile index f477d654a0d..5aed69e93e0 100644 --- a/sys/arch/macppc/stand/ofwboot/Makefile +++ b/sys/arch/macppc/stand/ofwboot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2011/07/08 08:49:53 drahn Exp $ +# $OpenBSD: Makefile,v 1.7 2012/08/21 14:46:19 pascal Exp $ # $NetBSD: Makefile,v 1.2 1997/04/17 07:46:24 thorpej Exp $ S= ${.CURDIR}/../../../.. @@ -11,6 +11,7 @@ SRCS+= boot.c conf.c cmd.c vars.c ctime.c strtol.c SRCS+= ofwmagic.S #CFLAGS+= -DDEBUG -DNETIF_DEBUG NOMAN= +NOPIE= STRIPFLAG= BINMODE= 444 OBJCOPY?= objcopy diff --git a/sys/arch/macppc/stand/tbxidata/Makefile b/sys/arch/macppc/stand/tbxidata/Makefile index f966360d394..b87e3ffc007 100644 --- a/sys/arch/macppc/stand/tbxidata/Makefile +++ b/sys/arch/macppc/stand/tbxidata/Makefile @@ -1,8 +1,9 @@ -# $OpenBSD: Makefile,v 1.1 2001/10/03 17:10:06 drahn Exp $ +# $OpenBSD: Makefile,v 1.2 2012/08/21 14:46:19 pascal Exp $ NOMACHINE= FILES= bsd.tbxi NOOBJ= noobj +NOPIE= install: ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${FILES} \ |