diff options
| author |   pascal <pascal@openbsd.org> | 2012-08-31 08:14:08 +0000 |
|---|---|---|
| committer | pascal <pascal@openbsd.org> | 2012-08-31 08:14:08 +0000 |
| commit | 2fd889062593802e3d92be0b147648ebbbd52375 (patch) | |
| tree | 0d651d594df4c7fc017ee126e19f9300d8fd9298 | |
| parent | Nuke a bunch of annoying "/* Send a packet. */" comments above (diff) | |
| download | wireguard-openbsd-2fd889062593802e3d92be0b147648ebbbd52375.tar.xz wireguard-openbsd-2fd889062593802e3d92be0b147648ebbbd52375.zip | |
Move sgi/stand to plain -fno-pie -nopie. Binaries are the same.
tested by and ok deraadt@
| -rw-r--r-- | sys/arch/sgi/stand/Makefile.inc | 7 | ||||
| -rw-r--r-- | sys/arch/sgi/stand/boot/Makefile | 6 | ||||
| -rw-r--r-- | sys/arch/sgi/stand/libsa/Makefile | 4 | ||||
| -rw-r--r-- | sys/arch/sgi/stand/libz/Makefile | 6 |
4 files changed, 8 insertions, 15 deletions
diff --git a/sys/arch/sgi/stand/Makefile.inc b/sys/arch/sgi/stand/Makefile.inc index feb3616b0a9..4b1eb631c6b 100644 --- a/sys/arch/sgi/stand/Makefile.inc +++ b/sys/arch/sgi/stand/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.8 2012/08/21 14:46:19 pascal Exp $ +# $OpenBSD: Makefile.inc,v 1.9 2012/08/31 08:14:08 pascal Exp $ # $NetBSD: Makefile.inc,v 1.7 2000/08/20 14:57:16 mrg Exp $ .ifndef __INCLUDED_STAND_MAKEFILE_INC @@ -19,13 +19,8 @@ SAABI?= -mips3 -mno-abicalls -G 0 -fno-pic -fno-common AS?= as LD?= ld LIBSA_CPPFLAGS?= -DNEEDS_HEAP_H -.else -AFLAGS+= ${NOPIE_FLAGS} -CFLAGS+= ${NOPIE_FLAGS} .endif -CFLAGS+= ${NOPIE_FLAGS} - ### Figure out what to use for libsa LIBSADIR?= ${.CURDIR}/../libsa diff --git a/sys/arch/sgi/stand/boot/Makefile b/sys/arch/sgi/stand/boot/Makefile index 32be11981f7..c57e3d7d35c 100644 --- a/sys/arch/sgi/stand/boot/Makefile +++ b/sys/arch/sgi/stand/boot/Makefile @@ -1,13 +1,13 @@ -# $OpenBSD: Makefile,v 1.14 2012/08/21 14:46:19 pascal Exp $ +# $OpenBSD: Makefile,v 1.15 2012/08/31 08:14:08 pascal Exp $ NOMAN= noman -NOPIE= CFLAGS+= ${SAABI} -mno-abicalls -D_NO_ABICALLS -nostdinc -D__sgi__ \ -I${.CURDIR}/../include -I${.CURDIR}/../../../.. \ -I${.CURDIR}/../../../../lib/libsa \ -I${.OBJDIR} -CFLAGS+= -D__INTERNAL_LIBSA_CREAD ${STANDALONE} +CFLAGS+= -D__INTERNAL_LIBSA_CREAD ${STANDALONE} -fno-pie +LDFLAGS+= -nopie AFLAGS+= ${SAABI} diff --git a/sys/arch/sgi/stand/libsa/Makefile b/sys/arch/sgi/stand/libsa/Makefile index dc04b0cb3dc..4555a0142a4 100644 --- a/sys/arch/sgi/stand/libsa/Makefile +++ b/sys/arch/sgi/stand/libsa/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2012/08/21 14:46:19 pascal Exp $ +# $OpenBSD: Makefile,v 1.7 2012/08/31 08:14:08 pascal Exp $ LIB= sa @@ -7,6 +7,7 @@ LIB= sa CLEANFILES += machine mips64 CFLAGS+= ${CEXTRAFLAGS} ${SAABI} -nostdinc -mno-abicalls -D_NO_ABICALLS \ + -fno-pie \ -I${.CURDIR} -I${.CURDIR}/../include -I${.CURDIR}/../.. \ -I${.CURDIR}/../../.. -I${.CURDIR}/../../../.. \ -I${.CURDIR}/../../../../lib/libsa \ @@ -30,7 +31,6 @@ ${OBJS}: ${.CURDIR}/../Makefile.inc NOPROFILE= NOPIC= -NOPIE= .if !make(libdep) && !make(sadep) && !make(salibdir) && !make(obj) .BEGIN: diff --git a/sys/arch/sgi/stand/libz/Makefile b/sys/arch/sgi/stand/libz/Makefile index 93de210f64b..c6911a3fadc 100644 --- a/sys/arch/sgi/stand/libz/Makefile +++ b/sys/arch/sgi/stand/libz/Makefile @@ -1,12 +1,10 @@ -# $OpenBSD: Makefile,v 1.4 2012/08/21 14:46:19 pascal Exp $ +# $OpenBSD: Makefile,v 1.5 2012/08/31 08:14:08 pascal Exp $ S=${.CURDIR}/../../../.. ZDST=${.OBJDIR} -NOPIE= - .PATH: ${S}/lib/libz .include "${S}/lib/libz/Makefile" CFLAGS+= ${CEXTRAFLAGS} ${SAABI} -mno-abicalls -D_NO_ABICALLS \ - ${AFLAGS} -I${S} + ${AFLAGS} -fno-pie -I${S} |