summaryrefslogtreecommitdiff
path: root/sys/arch/amd64
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/amd64')
-rw-r--r--sys/arch/amd64/stand/boot/Makefile4
-rw-r--r--sys/arch/amd64/stand/cdboot/Makefile4
-rw-r--r--sys/arch/amd64/stand/pxeboot/Makefile4
3 files changed, 6 insertions, 6 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=