From 6ca166beb3e8dea0987b13631f16656079241a83 Mon Sep 17 00:00:00 2001
From: christos <christos@NetBSD.org>
Date: Sat, 1 Oct 2016 13:57:44 +0000
Subject: [PATCH] deal with PIE and SSP

---
 sys/arch/sparc/stand/Makefile.buildboot |  7 +++++--
 sys/arch/sparc/stand/Makefile.inc       | 11 ++++-------
 sys/arch/sparc/stand/bootblk/Makefile   |  4 +++-
 sys/arch/sparc/stand/ofwboot/Makefile   |  4 +++-
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/sys/arch/sparc/stand/Makefile.buildboot b/sys/arch/sparc/stand/Makefile.buildboot
index fc9d049f9dd4..09a67c136d00 100644
--- a/sys/arch/sparc/stand/Makefile.buildboot
+++ b/sys/arch/sparc/stand/Makefile.buildboot
@@ -1,8 +1,12 @@
-#	$NetBSD: Makefile.buildboot,v 1.31 2016/03/10 09:00:24 martin Exp $
+#	$NetBSD: Makefile.buildboot,v 1.32 2016/10/01 13:57:44 christos Exp $
 #
 # This file is for the sparc `boot' and `bootxx' only; it does not
 # currently play well on a 64-bit system.
 
+NOSSP=		# defined
+NOPIE=		# defined
+NOMAN=		# defined
+
 S=	${.CURDIR}/../../../..
 
 .PATH: ${.CURDIR}/../common ${.CURDIR}/../../sparc
@@ -10,7 +14,6 @@ S=	${.CURDIR}/../../../..
 COMMONSOURCE=	srt0.S promdev.c dvma.c promlib.c isfloppy.c
 
 SRCS=		${COMMONSOURCE} ${PROGSOURCE}
-NOMAN=		# defined
 BINMODE=	444
 
 .include <bsd.own.mk>
diff --git a/sys/arch/sparc/stand/Makefile.inc b/sys/arch/sparc/stand/Makefile.inc
index 8598e51e6024..325f2afe10dd 100644
--- a/sys/arch/sparc/stand/Makefile.inc
+++ b/sys/arch/sparc/stand/Makefile.inc
@@ -1,9 +1,8 @@
-#	$NetBSD: Makefile.inc,v 1.13 2016/05/19 15:41:18 christos Exp $
+#	$NetBSD: Makefile.inc,v 1.14 2016/10/01 13:57:44 christos Exp $
 
-.ifndef __INCLUDED_STAND_MAKEFILE_INC
-__INCLUDED_STAND_MAKEFILE_INC=
-
-.include <bsd.own.mk>
+NOSSP=		# defined
+NOPIE=		# defined
+NOMAN=		# defined
 
 BINDIR=		/usr/mdec
 NOPIE=		yes
@@ -14,5 +13,3 @@ CFLAGS+=	-ffreestanding ${${ACTIVE_CC} == "gcc":? -msoft-float :}
 .if ${MACHINE} == "sparc64"
 CPPFLAGS+=	-DSUN4U
 .endif
-
-.endif
diff --git a/sys/arch/sparc/stand/bootblk/Makefile b/sys/arch/sparc/stand/bootblk/Makefile
index fb3c031ccdf8..acaa5cc29b61 100644
--- a/sys/arch/sparc/stand/bootblk/Makefile
+++ b/sys/arch/sparc/stand/bootblk/Makefile
@@ -1,4 +1,6 @@
-#	$NetBSD: Makefile,v 1.15 2014/03/04 17:57:56 joerg Exp $
+#	$NetBSD: Makefile,v 1.16 2016/10/01 13:57:44 christos Exp $
+
+.include	<bsd.init.mk>
 
 CURDIR=	${.CURDIR}
 S=	${CURDIR}/../../../..
diff --git a/sys/arch/sparc/stand/ofwboot/Makefile b/sys/arch/sparc/stand/ofwboot/Makefile
index 5196c131044b..0d99841645e9 100644
--- a/sys/arch/sparc/stand/ofwboot/Makefile
+++ b/sys/arch/sparc/stand/ofwboot/Makefile
@@ -1,4 +1,6 @@
-#	$NetBSD: Makefile,v 1.36 2015/10/26 07:11:33 mrg Exp $
+#	$NetBSD: Makefile,v 1.37 2016/10/01 13:57:44 christos Exp $
+
+.include <bsd.init.mk>
 
 CURDIR=	${.CURDIR}
 S=	${CURDIR}/../../../..