diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/amd64/stand/boot/Makefile | 4 | ||||
| -rw-r--r-- | sys/arch/amd64/stand/cdboot/Makefile | 4 | ||||
| -rw-r--r-- | sys/arch/amd64/stand/pxeboot/Makefile | 4 | ||||
| -rw-r--r-- | sys/arch/i386/stand/boot/Makefile | 4 | ||||
| -rw-r--r-- | sys/arch/i386/stand/cdboot/Makefile | 4 | ||||
| -rw-r--r-- | sys/arch/i386/stand/pxeboot/Makefile | 4 |
6 files changed, 12 insertions, 12 deletions
diff --git a/sys/arch/amd64/stand/boot/Makefile b/sys/arch/amd64/stand/boot/Makefile index d6aec91d035..178883e8244 100644 --- a/sys/arch/amd64/stand/boot/Makefile +++ b/sys/arch/amd64/stand/boot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.11 2012/09/25 09:01:03 pascal Exp $ +# $OpenBSD: Makefile,v 1.12 2012/10/09 11:43:22 jsing Exp $ .include "${.CURDIR}/../Makefile.inc" @@ -13,7 +13,7 @@ PROG= boot SRCS= srt0.S conf.c LD?= ld SIZE?= size -LDFLAGS+=-nostdlib -Bstatic -Ttext $(LINKADDR) -N -x -noinhibit-exec -nopie +LDFLAGS+=-nostdlib -Bstatic -Ttext $(LINKADDR) -N -x -nopie LDFLAGS+=-melf_i386 -L/usr/libdata .PATH: ${SADIR}/libsa diff --git a/sys/arch/amd64/stand/cdboot/Makefile b/sys/arch/amd64/stand/cdboot/Makefile index 3b9857cd3e2..5cb2bc02c01 100644 --- a/sys/arch/amd64/stand/cdboot/Makefile +++ b/sys/arch/amd64/stand/cdboot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.14 2012/09/25 09:01:03 pascal Exp $ +# $OpenBSD: Makefile,v 1.15 2012/10/09 11:43:22 jsing Exp $ .include "${.CURDIR}/../Makefile.inc" @@ -12,7 +12,7 @@ PROG= cdboot SRCS= srt0.S boot.c conf.c LD?= ld SIZE?= size -LDFLAGS+=-nostdlib -Bstatic -Ttext $(LINKADDR) -N -x -noinhibit-exec -nopie +LDFLAGS+=-nostdlib -Bstatic -Ttext $(LINKADDR) -N -x -nopie LDFLAGS+=-melf_i386 -L/usr/libdata INSTALL_STRIP= diff --git a/sys/arch/amd64/stand/pxeboot/Makefile b/sys/arch/amd64/stand/pxeboot/Makefile index b9d7ac538b0..2f3f81ebc01 100644 --- a/sys/arch/amd64/stand/pxeboot/Makefile +++ b/sys/arch/amd64/stand/pxeboot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.11 2012/09/25 09:01:03 pascal Exp $ +# $OpenBSD: Makefile,v 1.12 2012/10/09 11:43:22 jsing Exp $ .include "${.CURDIR}/../Makefile.inc" @@ -12,7 +12,7 @@ PROG= pxeboot SRCS= srt0.S conf.c devopen.c net.c open.c LD?= ld SIZE?= size -LDFLAGS+=-nostdlib -Bstatic -Ttext $(LINKADDR) -N -x -noinhibit-exec -nopie +LDFLAGS+=-nostdlib -Bstatic -Ttext $(LINKADDR) -N -x -nopie LDFLAGS+=-melf_i386 -L/usr/libdata INSTALL_STRIP= diff --git a/sys/arch/i386/stand/boot/Makefile b/sys/arch/i386/stand/boot/Makefile index ed97ba30cb6..9edd352e28a 100644 --- a/sys/arch/i386/stand/boot/Makefile +++ b/sys/arch/i386/stand/boot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.39 2012/09/25 09:01:03 pascal Exp $ +# $OpenBSD: Makefile,v 1.40 2012/10/09 11:43:22 jsing Exp $ .include "${.CURDIR}/../Makefile.inc" @@ -18,7 +18,7 @@ LDFLAGS+=-nostdlib -Bstatic -nopie CLEANFILES+= srt0.o SRCS= crt0.c .else -LDFLAGS+=-Ttext $(LINKADDR) -Z -x -noinhibit-exec +LDFLAGS+=-Ttext $(LINKADDR) -Z -x CLEANFILES+= crt0.o SRCS= srt0.S .endif diff --git a/sys/arch/i386/stand/cdboot/Makefile b/sys/arch/i386/stand/cdboot/Makefile index e3e72201560..a15517d16ae 100644 --- a/sys/arch/i386/stand/cdboot/Makefile +++ b/sys/arch/i386/stand/cdboot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.11 2012/09/25 09:01:03 pascal Exp $ +# $OpenBSD: Makefile,v 1.12 2012/10/09 11:43:22 jsing Exp $ .include "${.CURDIR}/../Makefile.inc" @@ -12,7 +12,7 @@ PROG= cdboot SRCS= srt0.S LD?= ld SIZE?= size -LDFLAGS+=-nostdlib -Bstatic -Ttext $(LINKADDR) -N -x -noinhibit-exec -nopie +LDFLAGS+=-nostdlib -Bstatic -Ttext $(LINKADDR) -N -x -nopie INSTALL_STRIP= CLEANFILES+= crt0.o ${PROG}.whole diff --git a/sys/arch/i386/stand/pxeboot/Makefile b/sys/arch/i386/stand/pxeboot/Makefile index 2455d65205d..edf36d24369 100644 --- a/sys/arch/i386/stand/pxeboot/Makefile +++ b/sys/arch/i386/stand/pxeboot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2012/09/25 09:01:03 pascal Exp $ +# $OpenBSD: Makefile,v 1.9 2012/10/09 11:43:22 jsing Exp $ .include "${.CURDIR}/../Makefile.inc" @@ -11,7 +11,7 @@ SADIR= ${.CURDIR}/.. PROG= pxeboot LD?= ld SIZE?= size -LDFLAGS+=-nostdlib -Bstatic -Ttext $(LINKADDR) -N -x -noinhibit-exec -nopie +LDFLAGS+=-nostdlib -Bstatic -Ttext $(LINKADDR) -N -x -nopie INSTALL_STRIP= CLEANFILES+= crt0.o ${PROG}.whole |