[src/trunk]: src/sys/arch turn on GCC spectre v2 mitigation options.

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b767267843b9
branches:  trunk
changeset: 321856:b767267843b9
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sun Apr 08 00:52:38 2018 +0000

description:
turn on GCC spectre v2 mitigation options.

XXX: amd64 ALL doesn't build for me right now

diffstat:

 sys/arch/amd64/conf/ALL     |  6 ++++--
 sys/arch/amd64/conf/GENERIC |  6 +++---
 sys/arch/i386/conf/ALL      |  6 ++++--
 sys/arch/i386/conf/GENERIC  |  6 +++---
 4 files changed, 14 insertions(+), 10 deletions(-)

diffs (107 lines):

diff -r 42c600b6392d -r b767267843b9 sys/arch/amd64/conf/ALL
--- a/sys/arch/amd64/conf/ALL   Sat Apr 07 22:41:55 2018 +0000
+++ b/sys/arch/amd64/conf/ALL   Sun Apr 08 00:52:38 2018 +0000
@@ -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 @@
 
 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 @@
 #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)
diff -r 42c600b6392d -r b767267843b9 sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC       Sat Apr 07 22:41:55 2018 +0000
+++ b/sys/arch/amd64/conf/GENERIC       Sun Apr 08 00:52:38 2018 +0000
@@ -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 @@
 
 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 @@
 # 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
diff -r 42c600b6392d -r b767267843b9 sys/arch/i386/conf/ALL
--- a/sys/arch/i386/conf/ALL    Sat Apr 07 22:41:55 2018 +0000
+++ b/sys/arch/i386/conf/ALL    Sun Apr 08 00:52:38 2018 +0000
@@ -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 @@
 
 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 @@
 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)
diff -r 42c600b6392d -r b767267843b9 sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC        Sat Apr 07 22:41:55 2018 +0000
+++ b/sys/arch/i386/conf/GENERIC        Sun Apr 08 00:52:38 2018 +0000
@@ -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 @@
 
 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