diff options
| author | Felix Fietkau <nbd@nbd.name> | 2018-02-21 20:31:05 +0100 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2018-02-21 20:57:30 +0100 |
| commit | 7a97588bc6ae70a134456833d4d489148e38a5aa (patch) | |
| tree | 81fa77db80f3576055f80d55844f9faddbf798da | |
| parent | 65ae02d6024e647bafb44bcf3f73f6318c452032 (diff) | |
| download | upstream-7a97588bc6ae70a134456833d4d489148e38a5aa.tar.gz upstream-7a97588bc6ae70a134456833d4d489148e38a5aa.tar.bz2 upstream-7a97588bc6ae70a134456833d4d489148e38a5aa.zip | |
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>
| -rw-r--r-- | toolchain/gcc/Config.in | 1 | ||||
| -rw-r--r-- | toolchain/gcc/Config.version | 7 |
2 files changed, 7 insertions, 1 deletions
diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in index 30ac137873..1456985cc2 100644 --- 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 b641cfeb4e..2fc50827d2 100644 --- 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" |