Module Name: src
Committed By: christos
Date: Sat Oct 1 13:57:44 UTC 2016
Modified Files:
src/sys/arch/sparc/stand: Makefile.buildboot Makefile.inc
src/sys/arch/sparc/stand/bootblk: Makefile
src/sys/arch/sparc/stand/ofwboot: Makefile
Log Message:
deal with PIE and SSP
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/sparc/stand/Makefile.buildboot
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/sparc/stand/Makefile.inc
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/sparc/stand/bootblk/Makefile
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/sparc/stand/ofwboot/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/sparc/stand/Makefile.buildboot
diff -u src/sys/arch/sparc/stand/Makefile.buildboot:1.31 src/sys/arch/sparc/stand/Makefile.buildboot:1.32
--- src/sys/arch/sparc/stand/Makefile.buildboot:1.31 Thu Mar 10 04:00:24 2016
+++ src/sys/arch/sparc/stand/Makefile.buildboot Sat Oct 1 09:57:44 2016
@@ -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>
Index: src/sys/arch/sparc/stand/Makefile.inc
diff -u src/sys/arch/sparc/stand/Makefile.inc:1.13 src/sys/arch/sparc/stand/Makefile.inc:1.14
--- src/sys/arch/sparc/stand/Makefile.inc:1.13 Thu May 19 11:41:18 2016
+++ src/sys/arch/sparc/stand/Makefile.inc Sat Oct 1 09:57:44 2016
@@ -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} =
.if ${MACHINE} == "sparc64"
CPPFLAGS+= -DSUN4U
.endif
-
-.endif
Index: src/sys/arch/sparc/stand/bootblk/Makefile
diff -u src/sys/arch/sparc/stand/bootblk/Makefile:1.15 src/sys/arch/sparc/stand/bootblk/Makefile:1.16
--- src/sys/arch/sparc/stand/bootblk/Makefile:1.15 Tue Mar 4 12:57:56 2014
+++ src/sys/arch/sparc/stand/bootblk/Makefile Sat Oct 1 09:57:44 2016
@@ -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}/../../../..
Index: src/sys/arch/sparc/stand/ofwboot/Makefile
diff -u src/sys/arch/sparc/stand/ofwboot/Makefile:1.36 src/sys/arch/sparc/stand/ofwboot/Makefile:1.37
--- src/sys/arch/sparc/stand/ofwboot/Makefile:1.36 Mon Oct 26 03:11:33 2015
+++ src/sys/arch/sparc/stand/ofwboot/Makefile Sat Oct 1 09:57:44 2016
@@ -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}/../../../..
