summaryrefslogtreecommitdiff
path: root/sys/arch/i386
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/i386')
-rw-r--r--sys/arch/i386/stand/Makefile.inc3
-rw-r--r--sys/arch/i386/stand/biosboot/Makefile8
-rw-r--r--sys/arch/i386/stand/boot/Makefile9
-rw-r--r--sys/arch/i386/stand/cdboot/Makefile8
-rw-r--r--sys/arch/i386/stand/cdbr/Makefile6
-rw-r--r--sys/arch/i386/stand/etc/Makefile4
-rw-r--r--sys/arch/i386/stand/libsa/Makefile5
-rw-r--r--sys/arch/i386/stand/libz/Makefile4
-rw-r--r--sys/arch/i386/stand/mbr/Makefile6
-rw-r--r--sys/arch/i386/stand/pxeboot/Makefile9
10 files changed, 28 insertions, 34 deletions
diff --git a/sys/arch/i386/stand/Makefile.inc b/sys/arch/i386/stand/Makefile.inc
index 76b01abcfcc..474c4d2ab5c 100644
--- a/sys/arch/i386/stand/Makefile.inc
+++ b/sys/arch/i386/stand/Makefile.inc
@@ -1,8 +1,7 @@
-# $OpenBSD: Makefile.inc,v 1.41 2012/08/21 14:46:18 pascal Exp $
+# $OpenBSD: Makefile.inc,v 1.42 2012/08/29 22:23:07 pascal Exp $
CFLAGS=${DEBUG} ${COPTS} -Os -Wall -Werror
CFLAGS+= -fno-stack-protector
-CFLAGS+= ${NOPIE_FLAGS}
CPPFLAGS+=-I${S} -I${SADIR}/libsa -I. -I${.CURDIR}
SACFLAGS=-D_STANDALONE
DEBUGLIBS=no
diff --git a/sys/arch/i386/stand/biosboot/Makefile b/sys/arch/i386/stand/biosboot/Makefile
index 82a08d90348..ea9d155dab9 100644
--- a/sys/arch/i386/stand/biosboot/Makefile
+++ b/sys/arch/i386/stand/biosboot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2012/08/21 14:46:18 pascal Exp $
+# $OpenBSD: Makefile,v 1.23 2012/08/29 22:23:07 pascal Exp $
MAN= biosboot.8
@@ -6,7 +6,7 @@ MAN= biosboot.8
PROG= biosboot
SRCS= biosboot.S
LD=ld
-LDFLAGS=-nostdlib -Ttext 0 -N -x -Bstatic
+LDFLAGS=-nostdlib -Ttext 0 -N -x -Bstatic -nopie
INSTALL_STRIP=
SADIR= ${.CURDIR}/..
@@ -17,9 +17,9 @@ ${PROG}: $(OBJS) $(DPADD)
CPPFLAGS+=-DLOADADDR=$(LOADADDR) -DLINKADDR=$(LINKADDR) -DBOOTMAGIC=$(BOOTMAGIC)
CPPFLAGS+=${DEBUGFLAGS}
-CFLAGS+=${NOPIE_FLAGS}
+CFLAGS+=-fno-pie
#AFLAGS+=-Wa,-a
-AFLAGS+=${NOPIE_FLAGS}
+AFLAGS+=-fno-pie
.else
NOPROG=
.endif
diff --git a/sys/arch/i386/stand/boot/Makefile b/sys/arch/i386/stand/boot/Makefile
index cafad2f16c9..2ae36be8f06 100644
--- a/sys/arch/i386/stand/boot/Makefile
+++ b/sys/arch/i386/stand/boot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.37 2012/08/21 14:46:18 pascal Exp $
+# $OpenBSD: Makefile,v 1.38 2012/08/29 22:23:07 pascal Exp $
.include "${.CURDIR}/../Makefile.inc"
@@ -12,7 +12,7 @@ SADIR= ${.CURDIR}/..
PROG= boot
LD?= ld
SIZE?= size
-LDFLAGS+=-nostdlib -Bstatic
+LDFLAGS+=-nostdlib -Bstatic -nopie
.if defined(DEBUGFLAGS) && !empty(DEBUGFLAGS:M-D_TEST)
CLEANFILES+= srt0.o
@@ -66,8 +66,7 @@ NOPROG=
CPPFLAGS+=-DBOOTMAGIC=$(BOOTMAGIC) ${DEBUGFLAGS} -DLINKADDR=${LINKADDR}
CPPFLAGS+=-DSLOW -DSMALL -DNOBYFOUR -DNO_GZIP -DDYNAMIC_CRC_TABLE
CPPFLAGS+=-DHEAP_LIMIT=${HEAP_LIMIT} -I${S}/stand/boot #-DCOMPAT_UFS
-CFLAGS+=-m32 $(SACFLAGS) -D__INTERNAL_LIBSA_CREAD
-CFLAGS+=${NOPIE_FLAGS}
+CFLAGS+=-m32 $(SACFLAGS) -D__INTERNAL_LIBSA_CREAD -fno-pie
AFLAGS+=-m32 # -Wa,-R
# AFLAGS+=-Wa,-a
-AFLAGS+=${NOPIE_FLAGS}
+AFLAGS+=-fno-pie
diff --git a/sys/arch/i386/stand/cdboot/Makefile b/sys/arch/i386/stand/cdboot/Makefile
index 94b663c40ae..4bbabc7b17c 100644
--- a/sys/arch/i386/stand/cdboot/Makefile
+++ b/sys/arch/i386/stand/cdboot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2012/08/21 14:46:18 pascal Exp $
+# $OpenBSD: Makefile,v 1.10 2012/08/29 22:23:08 pascal Exp $
.include "${.CURDIR}/../Makefile.inc"
@@ -11,7 +11,7 @@ SIZE?= size
LDFLAGS+=-nostdlib -Bstatic
INSTALL_STRIP=
-LDFLAGS+=-Ttext $(LINKADDR) -N -x -noinhibit-exec
+LDFLAGS+=-Ttext $(LINKADDR) -N -x -noinhibit-exec -nopie
CLEANFILES+= crt0.o ${PROG}.whole
SRCS= srt0.S
@@ -48,7 +48,7 @@ CPPFLAGS+=-DLINKADDR=${LINKADDR}
CFLAGS+=${SACFLAGS} -D__INTERNAL_LIBSA_CREAD
CFLAGS+=-DOSREV=\"${OSREV}\" -DMACHINE=\"${MACHINE}\"
CFLAGS+=-DKERNEL=\"/${OSREV}/${MACHINE}/bsd.rd\"
-CFLAGS+=${NOPIE_FLAGS}
+CFLAGS+=-fno-pie
#AFLAGS+=-Wa,-R
# AFLAGS+=-Wa,-a
-AFLAGS+=${NOPIE_FLAGS}
+AFLAGS+=-fno-pie
diff --git a/sys/arch/i386/stand/cdbr/Makefile b/sys/arch/i386/stand/cdbr/Makefile
index ae0757e2e32..0dbd52b606c 100644
--- a/sys/arch/i386/stand/cdbr/Makefile
+++ b/sys/arch/i386/stand/cdbr/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2012/08/21 14:46:18 pascal Exp $
+# $OpenBSD: Makefile,v 1.4 2012/08/29 22:23:08 pascal Exp $
#
PROG= cdbr
@@ -6,10 +6,10 @@ SRCS= cdbr.S
AFLAGS+=-I${.CURDIR} -I${.CURDIR}/../../.. #-Wa,-a
AFLAGS+=-DOSREV=\"${OSREV}\"
AFLAGS+=-DMACH=\"${MACHINE}\" -DMACH_U=\"${MACHINE:U}\"
-AFLAGS+=${NOPIE_FLAGS}
+AFLAGS+=-fno-pie
LD=ld
ORG= 0x0000
-LDFLAGS=-nostdlib -Ttext ${ORG} -x -N -s -Bstatic -e start
+LDFLAGS=-nostdlib -Ttext ${ORG} -x -N -s -Bstatic -e start -nopie
NOMAN=
#MAN+= cdbr.8
diff --git a/sys/arch/i386/stand/etc/Makefile b/sys/arch/i386/stand/etc/Makefile
index 444592b8477..e3bb5fe428c 100644
--- a/sys/arch/i386/stand/etc/Makefile
+++ b/sys/arch/i386/stand/etc/Makefile
@@ -1,10 +1,8 @@
-# $OpenBSD: Makefile,v 1.10 2012/08/21 14:46:18 pascal Exp $
+# $OpenBSD: Makefile,v 1.11 2012/08/29 22:23:08 pascal Exp $
S= ${.CURDIR}/../../../..
I386= ${.CURDIR}/../..
-NOPIE=
-
all depend:: assym.h
assym.h: $S/kern/genassym.sh ${.CURDIR}/genassym.cf
diff --git a/sys/arch/i386/stand/libsa/Makefile b/sys/arch/i386/stand/libsa/Makefile
index ec1d45d794a..0b8305ba8e7 100644
--- a/sys/arch/i386/stand/libsa/Makefile
+++ b/sys/arch/i386/stand/libsa/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.48 2012/08/21 14:46:18 pascal Exp $
+# $OpenBSD: Makefile,v 1.49 2012/08/29 22:23:08 pascal Exp $
.include "${.CURDIR}/../Makefile.inc"
@@ -47,7 +47,6 @@ SRCS+= debug.c
NOPROFILE=noprofile
NOPIC=nopic
-NOPIE=
.PATH: $S/lib/libsa
@@ -59,7 +58,7 @@ install:
CPPFLAGS+=-DLINKADDR=${LINKADDR} -DHEAP_LIMIT=${HEAP_LIMIT} ${DEBUGFLAGS}
CPPFLAGS+=-I${S}/stand/boot #-DCOMPAT_UFS
-CFLAGS+=${SACFLAGS} -D__INTERNAL_LIBSA_CREAD
+CFLAGS+=${SACFLAGS} -D__INTERNAL_LIBSA_CREAD -fno-pie
#AS=cat ;
#AS+= -R
#AS+= -a
diff --git a/sys/arch/i386/stand/libz/Makefile b/sys/arch/i386/stand/libz/Makefile
index 2503a62a549..a2f048999a5 100644
--- a/sys/arch/i386/stand/libz/Makefile
+++ b/sys/arch/i386/stand/libz/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2012/08/21 14:46:18 pascal Exp $
+# $OpenBSD: Makefile,v 1.13 2012/08/29 22:23:08 pascal Exp $
# $NetBSD: Makefile,v 1.2 1997/01/22 01:36:30 cgd Exp $
S=${.CURDIR}/../../../..
@@ -10,4 +10,4 @@ NOPIE=
.PATH: ${S}/lib/libz
.include "${S}/lib/libz/Makefile"
-CFLAGS+=${SACFLAGS} -I${S}/lib/libsa ${DEBUGFLAGS}
+CFLAGS+=${SACFLAGS} -I${S}/lib/libsa ${DEBUGFLAGS} -fno-pie
diff --git a/sys/arch/i386/stand/mbr/Makefile b/sys/arch/i386/stand/mbr/Makefile
index 60ec96c73aa..11f28b15130 100644
--- a/sys/arch/i386/stand/mbr/Makefile
+++ b/sys/arch/i386/stand/mbr/Makefile
@@ -1,12 +1,12 @@
-# $OpenBSD: Makefile,v 1.15 2012/08/21 14:46:18 pascal Exp $
+# $OpenBSD: Makefile,v 1.16 2012/08/29 22:23:08 pascal Exp $
#
PROG= mbr
SRCS= mbr.S
AFLAGS+=-I${.CURDIR} -I${.CURDIR}/../../.. #-Wa,-a
-AFLAGS+=${NOPIE_FLAGS}
+AFLAGS+=-fno-pie
LD=ld
-LDFLAGS=-nostdlib -Ttext 0 -x -N -s -Bstatic -e start
+LDFLAGS=-nostdlib -Ttext 0 -x -N -s -Bstatic -e start -nopie
NOMAN=
#MAN+= mbr.8
diff --git a/sys/arch/i386/stand/pxeboot/Makefile b/sys/arch/i386/stand/pxeboot/Makefile
index db948d380eb..3c6f42b368e 100644
--- a/sys/arch/i386/stand/pxeboot/Makefile
+++ b/sys/arch/i386/stand/pxeboot/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/29 22:23:08 pascal Exp $
.include "${.CURDIR}/../Makefile.inc"
@@ -8,7 +8,7 @@ MAN= pxeboot.8
PROG= pxeboot
LD?= ld
SIZE?= size
-LDFLAGS+=-nostdlib -Bstatic
+LDFLAGS+=-nostdlib -Bstatic -nopie
INSTALL_STRIP=
LDFLAGS+=-Ttext $(LINKADDR) -N -x -noinhibit-exec
@@ -45,8 +45,7 @@ NOPROG=
CPPFLAGS+=-DBOOTMAGIC=$(BOOTMAGIC) ${DEBUGFLAGS}
CPPFLAGS+=-DLINKADDR=${LINKADDR}
-CFLAGS+=${SACFLAGS} -D__INTERNAL_LIBSA_CREAD
-CFLAGS+=${NOPIE_FLAGS}
+CFLAGS+=${SACFLAGS} -D__INTERNAL_LIBSA_CREAD -fno-pie
#AFLAGS+=-Wa,-R
# AFLAGS+=-Wa,-a
-AFLAGS+=${NOPIE_FLAGS}
+AFLAGS+=-fno-pie
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 19:55:29 +0000