toolchain/gcc: use version 7.x for x86 by default

This is needed for retpoline support, which mitigates the spectre
attacks.

Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 30ac1378737c26e8849c0c6c547ce34a597e747d..1456985cc2c099148026f8782d80dde9372bd801 100644 (file)
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -3,6 +3,7 @@
 choice
        prompt "GCC compiler Version" if TOOLCHAINOPTS
        default GCC_USE_VERSION_7_1_ARC if arc
+       default GCC_USE_VERSION_7 if x86_64 || i386
        default GCC_USE_VERSION_5
        help
          Select the version of gcc you wish to use.

diff --git a/toolchain/gcc/Config.version b/toolchain/gcc/Config.version
index b641cfeb4e89589e405295dced458b8db6daf5c9..2fc50827d26b975a2768b1abe3758fffaeb001f6 100644 (file)
--- a/toolchain/gcc/Config.version
+++ b/toolchain/gcc/Config.version
@@ -2,9 +2,14 @@ config GCC_VERSION_7_1_ARC
        default y if (!TOOLCHAINOPTS && arc)
        bool
 
+config GCC_VERSION_7
+       default y if GCC_USE_VERSION_7
+       default y if x86_64 || i386
+       bool
+
 config GCC_VERSION
        string
        default "arc-2017.09-release"   if GCC_VERSION_7_1_ARC
        default "6.3.0"         if GCC_USE_VERSION_6
-       default "7.3.0"         if GCC_USE_VERSION_7
+       default "7.3.0"         if GCC_VERSION_7
        default "5.5.0"