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 7becaa8a307ae039043a48ede7a71b32c0eb7249..2d4400afb4b5a377a1be4f6927e7042c9f7ebb95 100644 (file)
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -2,29 +2,22 @@
 
 choice
        prompt "GCC compiler Version" if TOOLCHAINOPTS
-       default GCC_VERSION_4_4_7 if GCC_DEFAULT_VERSION_4_4_7
-       default GCC_VERSION_4_6_LINARO
+       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_VERSION_4_4_7
-               bool "gcc 4.4.7"
-               depends on avr32
-
-       config GCC_VERSION_4_6_3
-               bool "gcc 4.6.3"
-
-       config GCC_VERSION_4_7_2
-               bool "gcc 4.7.2"
-
-       config GCC_VERSION_4_6_LINARO
+       config GCC_USE_VERSION_4_6_LINARO
+               select GCC_VERSION_4_6_LINARO
                bool "gcc 4.6.x with Linaro enhancements"
 
-       config GCC_VERSION_4_7_LINARO
-               bool "gcc 4.7.x with Linaro enhancements"
+       config GCC_USE_VERSION_4_8_LINARO
+               select GCC_VERSION_4_8_LINARO
+               bool "gcc 4.8.x with Linaro enhancements"
 
-       config GCC_VERSION_4_8_0
-               bool "gcc 4.8.0"
+       config GCC_USE_VERSION_5
+               select GCC_VERSION_5
+               bool "gcc 5.x"
 
 endchoice
 
@@ -48,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
 
@@ -61,13 +55,6 @@ config SJLJ_EXCEPTIONS
            frame unwinding exceptions handling routines.  Warning: increases
            code size and runtime memory usage.
 
-config INSTALL_LIBSTDCPP
-       bool
-       prompt "Build/install c++ compiler and libstdc++?" if TOOLCHAINOPTS
-       default y if !USE_MUSL
-       help
-           Build/install c++ compiler and libstdc++?
-
 config INSTALL_LIBGCJ
        bool
        prompt "Build/install java compiler and GNU classpath ?" if TOOLCHAINOPTS