[src/trunk]: src/sys/arch/i386/stand - Disable MKSANITIZER

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e342c506f709
branches:  trunk
changeset: 832924:e342c506f709
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Jun 02 14:30:06 2018 +0000

description:
- Disable MKSANITIZER
- Redo using NOPIE
- Add NORELRO

diffstat:

 sys/arch/i386/stand/Makefile.booters         |   3 ++-
 sys/arch/i386/stand/Makefile.inc             |   6 +++++-
 sys/arch/i386/stand/boot/Makefile.boot       |  10 ++++------
 sys/arch/i386/stand/bootxx/Makefile.bootxx   |   9 ++++-----
 sys/arch/i386/stand/cdboot/Makefile          |   9 ++-------
 sys/arch/i386/stand/dosboot/Makefile         |   9 ++-------
 sys/arch/i386/stand/efiboot/Makefile.efiboot |  11 +++++------
 sys/arch/i386/stand/fatboot/Makefile.fat     |  10 ++++------
 sys/arch/i386/stand/pxeboot/Makefile         |   9 ++-------
 9 files changed, 30 insertions(+), 46 deletions(-)

diffs (217 lines):

diff -r aefcaff7f901 -r e342c506f709 sys/arch/i386/stand/Makefile.booters
--- a/sys/arch/i386/stand/Makefile.booters      Sat Jun 02 13:30:32 2018 +0000
+++ b/sys/arch/i386/stand/Makefile.booters      Sat Jun 02 14:30:06 2018 +0000
@@ -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=
diff -r aefcaff7f901 -r e342c506f709 sys/arch/i386/stand/Makefile.inc
--- a/sys/arch/i386/stand/Makefile.inc  Sat Jun 02 13:30:32 2018 +0000
+++ b/sys/arch/i386/stand/Makefile.inc  Sat Jun 02 14:30:06 2018 +0000
@@ -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>
 
diff -r aefcaff7f901 -r e342c506f709 sys/arch/i386/stand/boot/Makefile.boot
--- a/sys/arch/i386/stand/boot/Makefile.boot    Sat Jun 02 13:30:32 2018 +0000
+++ b/sys/arch/i386/stand/boot/Makefile.boot    Sat Jun 02 14:30:06 2018 +0000
@@ -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 @@
 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
 
diff -r aefcaff7f901 -r e342c506f709 sys/arch/i386/stand/bootxx/Makefile.bootxx
--- a/sys/arch/i386/stand/bootxx/Makefile.bootxx        Sat Jun 02 13:30:32 2018 +0000
+++ b/sys/arch/i386/stand/bootxx/Makefile.bootxx        Sat Jun 02 14:30:06 2018 +0000
@@ -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 @@
 
 SRCS= pbr.S label.S bootxx.S boot1.c
 
-.include <bsd.own.mk>
+.include <bsd.init.mk>
 
 STRIPFLAG=     # nothing
 
diff -r aefcaff7f901 -r e342c506f709 sys/arch/i386/stand/cdboot/Makefile
--- a/sys/arch/i386/stand/cdboot/Makefile       Sat Jun 02 13:30:32 2018 +0000
+++ b/sys/arch/i386/stand/cdboot/Makefile       Sat Jun 02 14:30:06 2018 +0000
@@ -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
 
diff -r aefcaff7f901 -r e342c506f709 sys/arch/i386/stand/dosboot/Makefile
--- a/sys/arch/i386/stand/dosboot/Makefile      Sat Jun 02 13:30:32 2018 +0000
+++ b/sys/arch/i386/stand/dosboot/Makefile      Sat Jun 02 14:30:06 2018 +0000
@@ -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 @@
 
 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 \
diff -r aefcaff7f901 -r e342c506f709 sys/arch/i386/stand/efiboot/Makefile.efiboot
--- a/sys/arch/i386/stand/efiboot/Makefile.efiboot      Sat Jun 02 13:30:32 2018 +0000
+++ b/sys/arch/i386/stand/efiboot/Makefile.efiboot      Sat Jun 02 14:30:06 2018 +0000
@@ -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+= 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
 
diff -r aefcaff7f901 -r e342c506f709 sys/arch/i386/stand/fatboot/Makefile.fat
--- a/sys/arch/i386/stand/fatboot/Makefile.fat  Sat Jun 02 13:30:32 2018 +0000
+++ b/sys/arch/i386/stand/fatboot/Makefile.fat  Sat Jun 02 14:30:06 2018 +0000
@@ -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 @@
 
 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
 
diff -r aefcaff7f901 -r e342c506f709 sys/arch/i386/stand/pxeboot/Makefile
--- a/sys/arch/i386/stand/pxeboot/Makefile      Sat Jun 02 13:30:32 2018 +0000
+++ b/sys/arch/i386/stand/pxeboot/Makefile      Sat Jun 02 14:30:06 2018 +0000
@@ -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 @@
 .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