Module Name: src
Committed By: tron
Date: Wed Nov 25 17:08:09 UTC 2009
Modified Files:
src/sys/arch/amd64/conf: Makefile.amd64
src/sys/arch/amd64/include: Makefile.inc
src/sys/arch/i386/conf: GENERIC_PS2TINY GENERIC_TINY INSTALL_TINY
Makefile.i386
src/sys/arch/xen/conf: Makefile.xen
Added Files:
src/sys/arch/i386/include: Makefile.inc
Log Message:
Enable SSP (Stack Smash Protection) in x86 kernels by default (except
in i386 *TINY kernels). The NetBSD/i386 "ALL" kernel is unconditionally
compiled with SSP enabled.
Change approved by the core team.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/amd64/conf/Makefile.amd64
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/amd64/include/Makefile.inc
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/i386/conf/GENERIC_PS2TINY
cvs rdiff -u -r1.118 -r1.119 src/sys/arch/i386/conf/GENERIC_TINY
cvs rdiff -u -r1.124 -r1.125 src/sys/arch/i386/conf/INSTALL_TINY
cvs rdiff -u -r1.165 -r1.166 src/sys/arch/i386/conf/Makefile.i386
cvs rdiff -u -r0 -r1.1 src/sys/arch/i386/include/Makefile.inc
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/xen/conf/Makefile.xen
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/amd64/conf/Makefile.amd64
diff -u src/sys/arch/amd64/conf/Makefile.amd64:1.28 src/sys/arch/amd64/conf/Makefile.amd64:1.29
--- src/sys/arch/amd64/conf/Makefile.amd64:1.28 Fri Oct 2 10:14:20 2009
+++ src/sys/arch/amd64/conf/Makefile.amd64 Wed Nov 25 17:08:08 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.amd64,v 1.28 2009/10/02 10:14:20 skrll Exp $
+# $NetBSD: Makefile.amd64,v 1.29 2009/11/25 17:08:08 tron Exp $
# Makefile for NetBSD
#
@@ -22,6 +22,8 @@
NEED_OWN_INSTALL_TARGET?=no
.include <bsd.own.mk>
+USE_SSP?= yes
+
##
## (1) port identification
##
Index: src/sys/arch/amd64/include/Makefile.inc
diff -u src/sys/arch/amd64/include/Makefile.inc:1.1 src/sys/arch/amd64/include/Makefile.inc:1.2
--- src/sys/arch/amd64/include/Makefile.inc:1.1 Wed Nov 11 23:53:38 2009
+++ src/sys/arch/amd64/include/Makefile.inc Wed Nov 25 17:08:08 2009
@@ -1,3 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.1 2009/11/11 23:53:38 haad Exp $
+# $NetBSD: Makefile.inc,v 1.2 2009/11/25 17:08:08 tron Exp $
-CFLAGS+=-mno-red-zone
+CFLAGS+= -mno-red-zone
+USE_SSP?= yes
Index: src/sys/arch/i386/conf/GENERIC_PS2TINY
diff -u src/sys/arch/i386/conf/GENERIC_PS2TINY:1.55 src/sys/arch/i386/conf/GENERIC_PS2TINY:1.56
--- src/sys/arch/i386/conf/GENERIC_PS2TINY:1.55 Mon Nov 24 11:41:12 2008
+++ src/sys/arch/i386/conf/GENERIC_PS2TINY Wed Nov 25 17:08:08 2009
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC_PS2TINY,v 1.55 2008/11/24 11:41:12 ad Exp $
+# $NetBSD: GENERIC_PS2TINY,v 1.56 2009/11/25 17:08:08 tron Exp $
#
# GENERIC-style kernel config for IBM PS/2 with MCA bus. It only contains
# IBM PS/2 related stuff and has been generally trimmed down somewhat,
@@ -67,6 +67,7 @@
#options KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600
#makeoptions DEBUG="-g" # compile full symbol table
makeoptions COPTS="-Os" # generates smaller code than -O2, -O1
+makeoptions USE_SSP="no"
# File systems
file-system FFS # UFS
Index: src/sys/arch/i386/conf/GENERIC_TINY
diff -u src/sys/arch/i386/conf/GENERIC_TINY:1.118 src/sys/arch/i386/conf/GENERIC_TINY:1.119
--- src/sys/arch/i386/conf/GENERIC_TINY:1.118 Fri Mar 6 20:31:49 2009
+++ src/sys/arch/i386/conf/GENERIC_TINY Wed Nov 25 17:08:08 2009
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC_TINY,v 1.118 2009/03/06 20:31:49 joerg Exp $
+# $NetBSD: GENERIC_TINY,v 1.119 2009/11/25 17:08:08 tron Exp $
#
# GENERIC_TINY -- suitable default for 4M machines
# No EISA, PCI, or SCSI.
@@ -9,6 +9,7 @@
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
makeoptions COPTS="-Os"
+makeoptions USE_SSP="no"
maxusers 8 # estimated number of users
Index: src/sys/arch/i386/conf/INSTALL_TINY
diff -u src/sys/arch/i386/conf/INSTALL_TINY:1.124 src/sys/arch/i386/conf/INSTALL_TINY:1.125
--- src/sys/arch/i386/conf/INSTALL_TINY:1.124 Fri Mar 6 20:31:49 2009
+++ src/sys/arch/i386/conf/INSTALL_TINY Wed Nov 25 17:08:08 2009
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL_TINY,v 1.124 2009/03/06 20:31:49 joerg Exp $
+# $NetBSD: INSTALL_TINY,v 1.125 2009/11/25 17:08:08 tron Exp $
#
# This kernel should be derived from INSTALL (which is derived
# from GENERIC) with some features commented out.
@@ -13,6 +13,7 @@
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
makeoptions COPTS="-Os" # Optimise for space. Implies -O2
+makeoptions USE_SSP="no"
# Enable the hooks used for initializing the root memory-disk.
options MEMORY_DISK_HOOKS
Index: src/sys/arch/i386/conf/Makefile.i386
diff -u src/sys/arch/i386/conf/Makefile.i386:1.165 src/sys/arch/i386/conf/Makefile.i386:1.166
--- src/sys/arch/i386/conf/Makefile.i386:1.165 Sun Mar 15 05:45:32 2009
+++ src/sys/arch/i386/conf/Makefile.i386 Wed Nov 25 17:08:08 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.i386,v 1.165 2009/03/15 05:45:32 tsutsui Exp $
+# $NetBSD: Makefile.i386,v 1.166 2009/11/25 17:08:08 tron Exp $
# Makefile for NetBSD
#
@@ -22,6 +22,8 @@
NEED_OWN_INSTALL_TARGET?=no
.include <bsd.own.mk>
+USE_SSP?= yes
+
##
## (1) port identification
##
Index: src/sys/arch/xen/conf/Makefile.xen
diff -u src/sys/arch/xen/conf/Makefile.xen:1.28 src/sys/arch/xen/conf/Makefile.xen:1.29
--- src/sys/arch/xen/conf/Makefile.xen:1.28 Thu Dec 11 05:27:42 2008
+++ src/sys/arch/xen/conf/Makefile.xen Wed Nov 25 17:08:09 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xen,v 1.28 2008/12/11 05:27:42 alc Exp $
+# $NetBSD: Makefile.xen,v 1.29 2009/11/25 17:08:09 tron Exp $
# NetBSD: Makefile.i386,v 1.132 2003/07/05 16:56:10 simonb Exp
# Makefile for NetBSD
@@ -23,6 +23,8 @@
NEED_OWN_INSTALL_TARGET?=no
.include <bsd.own.mk>
+USE_SSP?= yes
+
##
## (1) port identification
##
Added files:
Index: src/sys/arch/i386/include/Makefile.inc
diff -u /dev/null src/sys/arch/i386/include/Makefile.inc:1.1
--- /dev/null Wed Nov 25 17:08:09 2009
+++ src/sys/arch/i386/include/Makefile.inc Wed Nov 25 17:08:09 2009
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile.inc,v 1.1 2009/11/25 17:08:09 tron Exp $
+
+USE_SSP?= yes
