gcc: use version 5.x for octeon instead of 4.6 - it has been tested with glibc

[openwrt/openwrt.git] / toolchain / gcc / Config.in

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 5cb4d23e169f4265541561364fe034c6e41297c9..0621641e7859eb8bfc361f316e7f2bf2663ee091 100644 (file)
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -2,7 +2,8 @@
 
 choice
        prompt "GCC compiler Version" if TOOLCHAINOPTS
-       default GCC_USE_VERSION_4_6_LINARO if TARGET_octeon
+       default GCC_USE_VERSION_5 if TARGET_octeon
+       default GCC_USE_VERSION_4_8_ARC if arc
        default GCC_USE_VERSION_4_8_LINARO
        help
          Select the version of gcc you wish to use.
@@ -10,15 +11,22 @@ choice
        config GCC_USE_VERSION_4_6_LINARO
                select GCC_VERSION_4_6_LINARO
                bool "gcc 4.6.x with Linaro enhancements"
+               depends on !arc
 
        config GCC_USE_VERSION_4_8_LINARO
                select GCC_VERSION_4_8_LINARO
                bool "gcc 4.8.x with Linaro enhancements"
+               depends on !arc
 
-       config GCC_USE_VERSION_4_9_LINARO
-               select GCC_VERSION_4_9_LINARO
-               bool "gcc 4.9.x with Linaro enhancements"
-               depends on BROKEN
+       config GCC_USE_VERSION_4_8_ARC
+               select GCC_VERSION_4_8_ARC
+               bool "gcc 4.8.x with support of ARC cores"
+               depends on arc
+
+       config GCC_USE_VERSION_5
+               select GCC_VERSION_5
+               bool "gcc 5.x"
+               depends on !arc
 
 endchoice
 
@@ -42,7 +50,8 @@ config EXTRA_GCC_CONFIG_OPTIONS
 config SSP_SUPPORT
        bool
        prompt "Enable Stack-Smashing Protection support" if TOOLCHAINOPTS
-       default y
+       depends on !USE_MUSL
+       default y if !USE_MUSL
        help
            Enable Stack-Smashing Protection support