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/aviion | |
| 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/aviion')
| -rw-r--r-- | sys/arch/aviion/stand/a2coff/Makefile | 3 | ||||
| -rw-r--r-- | sys/arch/aviion/stand/libprom/Makefile | 3 | ||||
| -rw-r--r-- | sys/arch/aviion/stand/libsa/Makefile | 3 | ||||
| -rw-r--r-- | sys/arch/aviion/stand/netboot/Makefile | 3 |
4 files changed, 8 insertions, 4 deletions
diff --git a/sys/arch/aviion/stand/a2coff/Makefile b/sys/arch/aviion/stand/a2coff/Makefile index a2c242bfb7e..ff24f946b21 100644 --- a/sys/arch/aviion/stand/a2coff/Makefile +++ b/sys/arch/aviion/stand/a2coff/Makefile @@ -1,10 +1,11 @@ -# $OpenBSD: Makefile,v 1.1 2006/05/09 19:32:43 miod Exp $ +# $OpenBSD: Makefile,v 1.2 2012/08/21 14:46:18 pascal Exp $ MAN= a2coff.8 MANSUBDIR=aviion .if ${MACHINE} == "aviion" PROG= a2coff BINDIR=/usr/mdec +NOPIE= .else NOPROG= .endif diff --git a/sys/arch/aviion/stand/libprom/Makefile b/sys/arch/aviion/stand/libprom/Makefile index acc02a5ad2b..410407c8cce 100644 --- a/sys/arch/aviion/stand/libprom/Makefile +++ b/sys/arch/aviion/stand/libprom/Makefile @@ -1,9 +1,10 @@ -# $OpenBSD: Makefile,v 1.1 2006/05/16 22:48:18 miod Exp $ +# $OpenBSD: Makefile,v 1.2 2012/08/21 14:46:18 pascal Exp $ LIB=prom NOPIC= NOPROFILE= +NOPIE= S=${.CURDIR}/../../../.. DIR_SA=$S/lib/libsa diff --git a/sys/arch/aviion/stand/libsa/Makefile b/sys/arch/aviion/stand/libsa/Makefile index 2dc4e5d7d53..532035513c1 100644 --- a/sys/arch/aviion/stand/libsa/Makefile +++ b/sys/arch/aviion/stand/libsa/Makefile @@ -1,9 +1,10 @@ -# $OpenBSD: Makefile,v 1.2 2007/11/26 10:01:42 deraadt Exp $ +# $OpenBSD: Makefile,v 1.3 2012/08/21 14:46:18 pascal Exp $ LIB=sa NOPIC=nopic NOPROFILE=noprofile +NOPIE= # Logically src/sys S=${.CURDIR}/../../../.. diff --git a/sys/arch/aviion/stand/netboot/Makefile b/sys/arch/aviion/stand/netboot/Makefile index d7442fa4387..7fdf0d3f929 100644 --- a/sys/arch/aviion/stand/netboot/Makefile +++ b/sys/arch/aviion/stand/netboot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1 2006/05/16 22:48:18 miod Exp $ +# $OpenBSD: Makefile,v 1.2 2012/08/21 14:46:18 pascal Exp $ SIZE?= size @@ -20,6 +20,7 @@ SRCS= crt.c boot.c conf.c devopen.c dev_net.c if_le.c version.c OBJS= ${SRCS:S/.c/.o/g} LIBS= ${LIBSA} ${LIBPROM} ${LIBZ} LDFLAGS+= -N -T ${STAGE2_RELOC} +NOPIE= all: netboot.aout |