Module Name: src
Committed By: mrg
Date: Sun Apr 8 00:52:38 UTC 2018
Modified Files:
src/sys/arch/amd64/conf: ALL GENERIC
src/sys/arch/i386/conf: ALL GENERIC
Log Message:
turn on GCC spectre v2 mitigation options.
XXX: amd64 ALL doesn't build for me right now
To generate a diff of this commit:
cvs rdiff -u -r1.84 -r1.85 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.488 -r1.489 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.436 -r1.437 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.1176 -r1.1177 src/sys/arch/i386/conf/GENERIC
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/ALL
diff -u src/sys/arch/amd64/conf/ALL:1.84 src/sys/arch/amd64/conf/ALL:1.85
--- src/sys/arch/amd64/conf/ALL:1.84 Thu Mar 29 18:54:48 2018
+++ src/sys/arch/amd64/conf/ALL Sun Apr 8 00:52:38 2018
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.84 2018/03/29 18:54:48 maxv Exp $
+# $NetBSD: ALL,v 1.85 2018/04/08 00:52:38 mrg Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.84 $"
+#ident "ALL-$Revision: 1.85 $"
maxusers 64 # estimated number of users
@@ -27,6 +27,8 @@ makeoptions USE_SSP=yes
#options USER_LDT # user-settable LDT; used by WINE
options X86EMU # 386 Real Mode emulator
#options PAE # PAE mode (36 bits physical addressing)
+makeoptions SPECTRE_V2_GCC_MITIGATION=1 # GCC Spectre variant 2
+ # migitation
# CPU features
acpicpu* at cpu? # ACPI CPU (including frequency scaling)
Index: src/sys/arch/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.488 src/sys/arch/amd64/conf/GENERIC:1.489
--- src/sys/arch/amd64/conf/GENERIC:1.488 Sat Apr 7 19:39:19 2018
+++ src/sys/arch/amd64/conf/GENERIC Sun Apr 8 00:52:38 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.488 2018/04/07 19:39:19 mrg Exp $
+# $NetBSD: GENERIC,v 1.489 2018/04/08 00:52:38 mrg Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.488 $"
+#ident "GENERIC-$Revision: 1.489 $"
maxusers 64 # estimated number of users
@@ -76,7 +76,7 @@ options SYSCTL_INCLUDE_DESCR # Include
# CPU-related options
#options USER_LDT # user-settable LDT; used by WINE
options SVS # Separate Virtual Space
-#makeoptions SPECTRE_V2_GCC_MITIGATION=1 # GCC Spectre variant 2
+makeoptions SPECTRE_V2_GCC_MITIGATION=1 # GCC Spectre variant 2
# migitation
# CPU features
Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.436 src/sys/arch/i386/conf/ALL:1.437
--- src/sys/arch/i386/conf/ALL:1.436 Thu Mar 29 18:54:48 2018
+++ src/sys/arch/i386/conf/ALL Sun Apr 8 00:52:38 2018
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.436 2018/03/29 18:54:48 maxv Exp $
+# $NetBSD: ALL,v 1.437 2018/04/08 00:52:38 mrg Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.436 $"
+#ident "ALL-$Revision: 1.437 $"
maxusers 64 # estimated number of users
@@ -27,6 +27,8 @@ makeoptions USE_SSP=yes
options USER_LDT # user-settable LDT; used by WINE
options X86EMU # 386 Real Mode emulator
options PAE # PAE mode (36 bits physical addressing)
+makeoptions SPECTRE_V2_GCC_MITIGATION=1 # GCC Spectre variant 2
+ # migitation
# CPU features
acpicpu* at cpu? # ACPI CPU (including frequency scaling)
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1176 src/sys/arch/i386/conf/GENERIC:1.1177
--- src/sys/arch/i386/conf/GENERIC:1.1176 Sat Apr 7 19:39:19 2018
+++ src/sys/arch/i386/conf/GENERIC Sun Apr 8 00:52:38 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1176 2018/04/07 19:39:19 mrg Exp $
+# $NetBSD: GENERIC,v 1.1177 2018/04/08 00:52:38 mrg Exp $
#
# GENERIC machine description file
#
@@ -22,14 +22,14 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.1176 $"
+#ident "GENERIC-$Revision: 1.1177 $"
maxusers 64 # estimated number of users
# CPU-related options.
options USER_LDT # user-settable LDT; used by WINE
#options PAE # PAE mode (36 bits physical addressing)
-#makeoptions SPECTRE_V2_GCC_MITIGATION=1 # GCC Spectre variant 2
+makeoptions SPECTRE_V2_GCC_MITIGATION=1 # GCC Spectre variant 2
# migitation
# CPU features
