diff options
| author | Pascal Stumpf <pascal@cvs.openbsd.org> | 2012-08-31 16:14:00 +0000 |
|---|---|---|
| committer | Pascal Stumpf <pascal@cvs.openbsd.org> | 2012-08-31 16:14:00 +0000 |
| commit | cddd383ba1a1488b3f8cb945f59c821821d57626 (patch) | |
| tree | 7edd33711adb659b92dd8539d2e8b4a4ecd04380 /sys/arch/loongson | |
| parent | b343c46c6eeb2d927f2ef96d3e3f628eb0741c91 (diff) | |
Kill NOPIE and NOPIE_FLAGS in loongson/stand.
ok deraadt@
Diffstat (limited to 'sys/arch/loongson')
| -rw-r--r-- | sys/arch/loongson/stand/Makefile.inc | 4 | ||||
| -rw-r--r-- | sys/arch/loongson/stand/boot/Makefile | 5 | ||||
| -rw-r--r-- | sys/arch/loongson/stand/libsa/Makefile | 3 |
3 files changed, 7 insertions, 5 deletions
diff --git a/sys/arch/loongson/stand/Makefile.inc b/sys/arch/loongson/stand/Makefile.inc index 356fd77c289..aae5d2a51ef 100644 --- a/sys/arch/loongson/stand/Makefile.inc +++ b/sys/arch/loongson/stand/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.3 2012/08/23 17:06:36 pascal Exp $ +# $OpenBSD: Makefile.inc,v 1.4 2012/08/31 16:13:59 pascal Exp $ BINDIR= /usr/mdec @@ -17,8 +17,6 @@ CFLAGS+= -fno-builtin-memset CFLAGS+= -fno-builtin-strncpy CFLAGS+= -fno-builtin-strncmp CFLAGS+= -Wa,-mfix-loongson2f-btb -CFLAGS+= ${NOPIE_FLAGS} -AFLAGS+= ${NOPIE_FLAGS} SAABI= -mips3 -mno-abicalls -G 0 -fno-pic -fno-common AS?= as LD?= ld diff --git a/sys/arch/loongson/stand/boot/Makefile b/sys/arch/loongson/stand/boot/Makefile index 0dbc764a1d6..4d79852d7d1 100644 --- a/sys/arch/loongson/stand/boot/Makefile +++ b/sys/arch/loongson/stand/boot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2010/02/17 19:51:30 miod Exp $ +# $OpenBSD: Makefile,v 1.3 2012/08/31 16:13:59 pascal Exp $ NOMAN= #MAN= boot.8 @@ -9,5 +9,8 @@ PROG= boot .else NOPROG= .endif +CFLAGS+=-fno-pie +AFLAGS+=-fno-pie +LDFLAGS+=-nopie .include <bsd.prog.mk> diff --git a/sys/arch/loongson/stand/libsa/Makefile b/sys/arch/loongson/stand/libsa/Makefile index 266deb53437..303c8df403a 100644 --- a/sys/arch/loongson/stand/libsa/Makefile +++ b/sys/arch/loongson/stand/libsa/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2012/08/02 13:38:39 okan Exp $ +# $OpenBSD: Makefile,v 1.3 2012/08/31 16:13:59 pascal Exp $ .include "${.CURDIR}/../Makefile.inc" @@ -9,6 +9,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 \ |