Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/sparc/stand deal with PIE and SSP



details:   https://anonhg.NetBSD.org/src/rev/77d006734003
branches:  trunk
changeset: 818173:77d006734003
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Oct 01 13:57:44 2016 +0000

description:
deal with PIE and SSP

diffstat:

 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(-)

diffs (70 lines):

diff -r 22fd28ea2324 -r 77d006734003 sys/arch/sparc/stand/Makefile.buildboot
--- a/sys/arch/sparc/stand/Makefile.buildboot   Sat Oct 01 13:46:52 2016 +0000
+++ b/sys/arch/sparc/stand/Makefile.buildboot   Sat Oct 01 13:57:44 2016 +0000
@@ -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 @@
 COMMONSOURCE=  srt0.S promdev.c dvma.c promlib.c isfloppy.c
 
 SRCS=          ${COMMONSOURCE} ${PROGSOURCE}
-NOMAN=         # defined
 BINMODE=       444
 
 .include <bsd.own.mk>
diff -r 22fd28ea2324 -r 77d006734003 sys/arch/sparc/stand/Makefile.inc
--- a/sys/arch/sparc/stand/Makefile.inc Sat Oct 01 13:46:52 2016 +0000
+++ b/sys/arch/sparc/stand/Makefile.inc Sat Oct 01 13:57:44 2016 +0000
@@ -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 @@
 .if ${MACHINE} == "sparc64"
 CPPFLAGS+=     -DSUN4U
 .endif
-
-.endif
diff -r 22fd28ea2324 -r 77d006734003 sys/arch/sparc/stand/bootblk/Makefile
--- a/sys/arch/sparc/stand/bootblk/Makefile     Sat Oct 01 13:46:52 2016 +0000
+++ b/sys/arch/sparc/stand/bootblk/Makefile     Sat Oct 01 13:57:44 2016 +0000
@@ -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 -r 22fd28ea2324 -r 77d006734003 sys/arch/sparc/stand/ofwboot/Makefile
--- a/sys/arch/sparc/stand/ofwboot/Makefile     Sat Oct 01 13:46:52 2016 +0000
+++ b/sys/arch/sparc/stand/ofwboot/Makefile     Sat Oct 01 13:57:44 2016 +0000
@@ -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}/../../../..



Home | Main Index | Thread Index | Old Index