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/sparc64 | |
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/sparc64')
-rw-r--r-- | sys/arch/sparc64/stand/bootblk/Makefile | 3 | ||||
-rw-r--r-- | sys/arch/sparc64/stand/libsa/Makefile | 3 | ||||
-rw-r--r-- | sys/arch/sparc64/stand/libz/Makefile | 3 | ||||
-rw-r--r-- | sys/arch/sparc64/stand/ofwboot.net/Makefile | 3 | ||||
-rw-r--r-- | sys/arch/sparc64/stand/ofwboot/Makefile | 3 |
5 files changed, 10 insertions, 5 deletions
diff --git a/sys/arch/sparc64/stand/bootblk/Makefile b/sys/arch/sparc64/stand/bootblk/Makefile index f0a8c095059..a0471a6f448 100644 --- a/sys/arch/sparc64/stand/bootblk/Makefile +++ b/sys/arch/sparc64/stand/bootblk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2007/11/26 10:26:03 deraadt Exp $ +# $OpenBSD: Makefile,v 1.8 2012/08/21 14:46:19 pascal Exp $ # $NetBSD: Makefile,v 1.1 2000/08/20 14:58:45 mrg Exp $ CURDIR= ${.CURDIR} @@ -26,6 +26,7 @@ SVR4=-U__SVR4 -U__svr4__ -D__NetBSD__ INCLUDES= -I. -I$S/arch -I$S -nostdinc CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_LKM ${SVR4} +NOPIE= .if !make(libdep) && !make(sadep) && !make(salibdir) && !make(obj) .BEGIN: diff --git a/sys/arch/sparc64/stand/libsa/Makefile b/sys/arch/sparc64/stand/libsa/Makefile index a0a196a9cb8..2ad82959460 100644 --- a/sys/arch/sparc64/stand/libsa/Makefile +++ b/sys/arch/sparc64/stand/libsa/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2007/11/26 10:26:03 deraadt Exp $ +# $OpenBSD: Makefile,v 1.7 2012/08/21 14:46:20 pascal Exp $ LIB= sa @@ -35,6 +35,7 @@ ${OBJS}: ${.CURDIR}/../Makefile.inc NOPROFILE= NOPIC= +NOPIE= .if !make(libdep) && !make(sadep) && !make(salibdir) && !make(obj) .BEGIN: diff --git a/sys/arch/sparc64/stand/libz/Makefile b/sys/arch/sparc64/stand/libz/Makefile index 497064d1634..efb19f2559e 100644 --- a/sys/arch/sparc64/stand/libz/Makefile +++ b/sys/arch/sparc64/stand/libz/Makefile @@ -1,7 +1,8 @@ -# $OpenBSD: Makefile,v 1.6 2003/12/17 05:17:07 millert Exp $ +# $OpenBSD: Makefile,v 1.7 2012/08/21 14:46:20 pascal Exp $ S=${.CURDIR}/../../../.. ZDST=${.OBJDIR} +NOPIE= .PATH: ${S}/lib/libz diff --git a/sys/arch/sparc64/stand/ofwboot.net/Makefile b/sys/arch/sparc64/stand/ofwboot.net/Makefile index d2199beee95..748bae7e080 100644 --- a/sys/arch/sparc64/stand/ofwboot.net/Makefile +++ b/sys/arch/sparc64/stand/ofwboot.net/Makefile @@ -1,7 +1,8 @@ -# $OpenBSD: Makefile,v 1.1 2001/08/18 16:31:53 jason Exp $ +# $OpenBSD: Makefile,v 1.2 2012/08/21 14:46:20 pascal Exp $ CPPFLAGS+= -DNETBOOT PROG= ofwboot.net +NOPIE= .include "../ofwboot/Makefile" .PATH: ${.CURDIR}/../ofwboot diff --git a/sys/arch/sparc64/stand/ofwboot/Makefile b/sys/arch/sparc64/stand/ofwboot/Makefile index 16212eee795..1cd420bc382 100644 --- a/sys/arch/sparc64/stand/ofwboot/Makefile +++ b/sys/arch/sparc64/stand/ofwboot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.16 2010/08/25 12:53:38 jsing Exp $ +# $OpenBSD: Makefile,v 1.17 2012/08/21 14:46:20 pascal Exp $ # $NetBSD: Makefile,v 1.2 2001/03/04 14:50:05 mrg Exp $ CURDIR= ${.CURDIR} @@ -26,6 +26,7 @@ AFLAGS+= -x assembler-with-cpp -D_LOCORE -D__ELF__ CFLAGS+= ${COPTS} CPPFLAGS+= -D_STANDALONE -DSUN4U -nostdinc #CPPFLAGS+= -DNETIF_DEBUG +NOPIE= BINMODE= 444 |