Revert "musl: fix termios struct c_ispeed/c_ospeed field names" (accidental commit)

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

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index e279bf2cf445cf79d16def5752e68d65aa532462..2d4400afb4b5a377a1be4f6927e7042c9f7ebb95 100644 (file)
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -2,20 +2,11 @@
 
 choice
        prompt "GCC compiler Version" if TOOLCHAINOPTS
-       default GCC_USE_VERSION_4_4_7 if avr32
+       default GCC_USE_VERSION_4_6_LINARO if TARGET_octeon
        default GCC_USE_VERSION_4_8_LINARO
        help
          Select the version of gcc you wish to use.
 
-       config GCC_USE_VERSION_4_4_7
-               select GCC_VERSION_4_4_7
-               bool "gcc 4.4.7"
-               depends on avr32
-
-       config GCC_USE_VERSION_4_8_0
-               select GCC_VERSION_4_8_0
-               bool "gcc 4.8.0"
-
        config GCC_USE_VERSION_4_6_LINARO
                select GCC_VERSION_4_6_LINARO
                bool "gcc 4.6.x with Linaro enhancements"
@@ -24,6 +15,10 @@ choice
                select GCC_VERSION_4_8_LINARO
                bool "gcc 4.8.x with Linaro enhancements"
 
+       config GCC_USE_VERSION_5
+               select GCC_VERSION_5
+               bool "gcc 5.x"
+
 endchoice
 
 config GCC_USE_GRAPHITE
@@ -46,7 +41,8 @@ config EXTRA_GCC_CONFIG_OPTIONS
 config SSP_SUPPORT
        bool
        prompt "Enable Stack-Smashing Protection support" if TOOLCHAINOPTS
-       default n
+       depends on !USE_MUSL
+       default y if !USE_MUSL
        help
            Enable Stack-Smashing Protection support