Module Name: src
Committed By: christos
Date: Sat Jun 2 14:30:07 UTC 2018
Modified Files:
src/sys/arch/i386/stand: Makefile.booters Makefile.inc
src/sys/arch/i386/stand/boot: Makefile.boot
src/sys/arch/i386/stand/bootxx: Makefile.bootxx
src/sys/arch/i386/stand/cdboot: Makefile
src/sys/arch/i386/stand/dosboot: Makefile
src/sys/arch/i386/stand/efiboot: Makefile.efiboot
src/sys/arch/i386/stand/fatboot: Makefile.fat
src/sys/arch/i386/stand/pxeboot: Makefile
Log Message:
- Disable MKSANITIZER
- Redo using NOPIE
- Add NORELRO
To generate a diff of this commit:
cvs rdiff -u -r1.91 -r1.92 src/sys/arch/i386/stand/Makefile.booters
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/i386/stand/Makefile.inc
cvs rdiff -u -r1.70 -r1.71 src/sys/arch/i386/stand/boot/Makefile.boot
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/i386/stand/bootxx/Makefile.bootxx
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/i386/stand/cdboot/Makefile
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/i386/stand/dosboot/Makefile
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/i386/stand/efiboot/Makefile.efiboot
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/i386/stand/fatboot/Makefile.fat
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/i386/stand/pxeboot/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/stand/Makefile.booters
diff -u src/sys/arch/i386/stand/Makefile.booters:1.91 src/sys/arch/i386/stand/Makefile.booters:1.92
--- src/sys/arch/i386/stand/Makefile.booters:1.91 Sat Apr 8 15:53:21 2017
+++ src/sys/arch/i386/stand/Makefile.booters Sat Jun 2 10:30:06 2018
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile.booters,v 1.91 2017/04/08 19:53:21 christos Exp $
+# $NetBSD: Makefile.booters,v 1.92 2018/06/02 14:30:06 christos Exp $
+NOSANITIZER=
.include <bsd.own.mk>
STRIPFLAG=
Index: src/sys/arch/i386/stand/Makefile.inc
diff -u src/sys/arch/i386/stand/Makefile.inc:1.14 src/sys/arch/i386/stand/Makefile.inc:1.15
--- src/sys/arch/i386/stand/Makefile.inc:1.14 Wed Feb 21 20:37:04 2018
+++ src/sys/arch/i386/stand/Makefile.inc Sat Jun 2 10:30:06 2018
@@ -1,4 +1,8 @@
-# $NetBSD: Makefile.inc,v 1.14 2018/02/22 01:37:04 christos Exp $
+# $NetBSD: Makefile.inc,v 1.15 2018/06/02 14:30:06 christos Exp $
+
+NOSANITIZER=
+NOPIE=
+NOMAN=
.include <bsd.own.mk>
Index: src/sys/arch/i386/stand/boot/Makefile.boot
diff -u src/sys/arch/i386/stand/boot/Makefile.boot:1.70 src/sys/arch/i386/stand/boot/Makefile.boot:1.71
--- src/sys/arch/i386/stand/boot/Makefile.boot:1.70 Sat Apr 8 15:53:21 2017
+++ src/sys/arch/i386/stand/boot/Makefile.boot Sat Jun 2 10:30:06 2018
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile.boot,v 1.70 2017/04/08 19:53:21 christos Exp $
+# $NetBSD: Makefile.boot,v 1.71 2018/06/02 14:30:06 christos Exp $
S= ${.CURDIR}/../../../../..
NOMAN=
+NOSANITIZER=
+NOPIE=
PROG?= boot
NEWVERSWHAT?= "BIOS Boot"
@@ -11,11 +13,7 @@ AFLAGS.biosboot.S= ${${ACTIVE_CC} == "cl
SOURCES?= biosboot.S boot2.c conf.c devopen.c exec.c
SRCS= ${SOURCES}
-PIE_CFLAGS=
-PIE_AFLAGS=
-PIE_LDFLAGS=
-
-.include <bsd.own.mk>
+.include <bsd.init.mk>
STRIPFLAG= # nothing
Index: src/sys/arch/i386/stand/bootxx/Makefile.bootxx
diff -u src/sys/arch/i386/stand/bootxx/Makefile.bootxx:1.49 src/sys/arch/i386/stand/bootxx/Makefile.bootxx:1.50
--- src/sys/arch/i386/stand/bootxx/Makefile.bootxx:1.49 Thu Aug 20 07:38:27 2015
+++ src/sys/arch/i386/stand/bootxx/Makefile.bootxx Sat Jun 2 10:30:07 2018
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile.bootxx,v 1.49 2015/08/20 11:38:27 uebayasi Exp $
+# $NetBSD: Makefile.bootxx,v 1.50 2018/06/02 14:30:07 christos Exp $
S= ${.CURDIR}/../../../../..
AFLAGS.bootxx.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
AFLAGS.pbr.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
-PIE_CFLAGS=
-PIE_LDFLAGS=
-PIE_AFLAGS=
+NOPIE=
NOMAN=
+NOSANITIZER=
PROG?= bootxx_${FS}
BINDIR= /usr/mdec
BINMODE= 0444
@@ -23,7 +22,7 @@ BOOTXX_MAXSIZE?= $$(( ${BOOTXX_SECTORS}
SRCS= pbr.S label.S bootxx.S boot1.c
-.include <bsd.own.mk>
+.include <bsd.init.mk>
STRIPFLAG= # nothing
Index: src/sys/arch/i386/stand/cdboot/Makefile
diff -u src/sys/arch/i386/stand/cdboot/Makefile:1.14 src/sys/arch/i386/stand/cdboot/Makefile:1.15
--- src/sys/arch/i386/stand/cdboot/Makefile:1.14 Sun Jan 12 10:26:29 2014
+++ src/sys/arch/i386/stand/cdboot/Makefile Sat Jun 2 10:30:07 2018
@@ -1,15 +1,10 @@
-# $NetBSD: Makefile,v 1.14 2014/01/12 15:26:29 tsutsui Exp $
+# $NetBSD: Makefile,v 1.15 2018/06/02 14:30:07 christos Exp $
S= ${.CURDIR}/../../../..
AFLAGS.cdboot.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
-PIE_CFLAGS=
-PIE_LDFLAGS=
-PIE_AFLAGS=
-
-NOMAN= # defined
-.include <bsd.own.mk>
+.include <bsd.init.mk>
STRIPFLAG= # nothing
Index: src/sys/arch/i386/stand/dosboot/Makefile
diff -u src/sys/arch/i386/stand/dosboot/Makefile:1.30 src/sys/arch/i386/stand/dosboot/Makefile:1.31
--- src/sys/arch/i386/stand/dosboot/Makefile:1.30 Sat Jan 23 17:29:29 2016
+++ src/sys/arch/i386/stand/dosboot/Makefile Sat Jun 2 10:30:07 2018
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.30 2016/01/23 22:29:29 christos Exp $
+# $NetBSD: Makefile,v 1.31 2018/06/02 14:30:07 christos Exp $
S= ${.CURDIR}/../../../..
BASE= dosboot
PROG= ${BASE}.com
-NOMAN= # defined
NEWVERSWHAT= "DOS Boot"
STARTFILE= ${DOSSTART}
RELOC= 0x100
@@ -33,11 +32,7 @@ I386MISCMAKEFLAGS= I386_INCLUDE_DOS=yes
VERSIONFILE= ${.CURDIR}/version
-PIE_CFLAGS=
-PIE_LDFLAGS=
-PIE_AFLAGS=
-
-.include <bsd.own.mk>
+.include <bsd.init.mk>
release: check_RELEASEDIR
${HOST_INSTALL_FILE} -m ${BINMODE} dosboot.com \
Index: src/sys/arch/i386/stand/efiboot/Makefile.efiboot
diff -u src/sys/arch/i386/stand/efiboot/Makefile.efiboot:1.12 src/sys/arch/i386/stand/efiboot/Makefile.efiboot:1.13
--- src/sys/arch/i386/stand/efiboot/Makefile.efiboot:1.12 Wed Apr 11 06:32:09 2018
+++ src/sys/arch/i386/stand/efiboot/Makefile.efiboot Sat Jun 2 10:30:07 2018
@@ -1,8 +1,11 @@
-# $NetBSD: Makefile.efiboot,v 1.12 2018/04/11 10:32:09 nonaka Exp $
+# $NetBSD: Makefile.efiboot,v 1.13 2018/06/02 14:30:07 christos Exp $
S= ${.CURDIR}/../../../../..
NOMAN= # defined
+NOPIE= # defined
+NOSANITIZER= # defined
+NORELRO= # defined
PROG?= boot.efi
NEWVERSWHAT?= "EFI Boot"
@@ -16,11 +19,7 @@ LIBI386SRCS= biosdisk.c bootinfo.c booti
LIBI386SRCS+= diskbuf.c exec.c menuutils.c parseutils.c pread.c
SRCS= ${SOURCES} ${EXTRA_SOURCES} ${LIBI386SRCS}
-PIE_CFLAGS=
-PIE_LDFLAGS=
-PIE_AFLAGS=
-
-.include <bsd.own.mk>
+.include <bsd.init.mk>
STRIPFLAG= # nothing
Index: src/sys/arch/i386/stand/fatboot/Makefile.fat
diff -u src/sys/arch/i386/stand/fatboot/Makefile.fat:1.7 src/sys/arch/i386/stand/fatboot/Makefile.fat:1.8
--- src/sys/arch/i386/stand/fatboot/Makefile.fat:1.7 Sun Jan 12 10:26:29 2014
+++ src/sys/arch/i386/stand/fatboot/Makefile.fat Sat Jun 2 10:30:07 2018
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile.fat,v 1.7 2014/01/12 15:26:29 tsutsui Exp $
+# $NetBSD: Makefile.fat,v 1.8 2018/06/02 14:30:07 christos Exp $
S= ${.CURDIR}/../../../../..
PROG?= fatboot
NOMAN= # defined
+NOPIE= # defined
+NOSANITIZER= # defined
LIBCRT0= # nothing
LIBCRTI= # nothing
@@ -13,11 +15,7 @@ LIBC= # nothing
AFLAGS.fatboot.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
-PIE_CFLAGS=
-PIE_LDFLAGS=
-PIE_AFLAGS=
-
-.include <bsd.own.mk>
+.include <bsd.init.mk>
STRIPFLAG= # override
Index: src/sys/arch/i386/stand/pxeboot/Makefile
diff -u src/sys/arch/i386/stand/pxeboot/Makefile:1.24 src/sys/arch/i386/stand/pxeboot/Makefile:1.25
--- src/sys/arch/i386/stand/pxeboot/Makefile:1.24 Sat Jan 23 17:29:29 2016
+++ src/sys/arch/i386/stand/pxeboot/Makefile Sat Jun 2 10:30:07 2018
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.24 2016/01/23 22:29:29 christos Exp $
+# $NetBSD: Makefile,v 1.25 2018/06/02 14:30:07 christos Exp $
S= ${.CURDIR}/../../../..
BASE?= pxeboot_ia32
PROG= ${BASE}.bin
-NOMAN= # defined
NEWVERSWHAT= "PXE Boot"
STARTFILE= ${PXESTART}
RELOC= 0x0
@@ -19,11 +18,7 @@ SRCS= main.c dev_net.c devopen.c conf.c
.PATH: ${.CURDIR}/../libsa
SRCS+= nfs.c
-PIE_CFLAGS=
-PIE_AFLAGS=
-PIE_LDFLAGS=
-
-.include <bsd.own.mk>
+.include <bsd.init.mk>
.if ${MACHINE_ARCH} == "x86_64"
LDFLAGS+= -Wl,-m,elf_i386
