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 274b97c9b8ca0732df9e85aa5eefd9da8163767d..2d4400afb4b5a377a1be4f6927e7042c9f7ebb95 100644 (file)
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -15,9 +15,9 @@ choice
                select GCC_VERSION_4_8_LINARO
                bool "gcc 4.8.x with Linaro enhancements"
 
-       config GCC_USE_VERSION_4_9_LINARO
-               select GCC_VERSION_4_9_LINARO
-               bool "gcc 4.9.x with Linaro enhancements"
+       config GCC_USE_VERSION_5
+               select GCC_VERSION_5
+               bool "gcc 5.x"
 
 endchoice
 
@@ -41,7 +41,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