gcc/musl: rework SSP-support

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

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index e94bcc973889f5035a1517c4cd1f3e36cb423051..025ea2453d741e3eab4bc75d07d868b00b4bb5dc 100644 (file)
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -2,35 +2,34 @@
 
 choice
        prompt "GCC compiler Version" if TOOLCHAINOPTS
-       default GCC_VERSION_4_4_6 if GCC_DEFAULT_VERSION_4_4_6
-       default GCC_VERSION_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_6
-               bool "gcc 4.4.6"
+       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_6_1
-               bool "gcc 4.6.1"
+       config GCC_USE_VERSION_4_8_LINARO
+               select GCC_VERSION_4_8_LINARO
+               bool "gcc 4.8.x with Linaro enhancements"
 
-       config GCC_VERSION_LINARO
-               bool "gcc 4.5.x with Linaro enhancements"
-
-       config GCC_VERSION_LLVM
-               bool "llvm-gcc 4.2"
-               depends BROKEN
+       config GCC_USE_VERSION_4_9_LINARO
+               select GCC_VERSION_4_9_LINARO
+               bool "gcc 4.9.x with Linaro enhancements"
+               depends on BROKEN
 
 endchoice
 
 config GCC_USE_GRAPHITE
        bool
        prompt "Compile in support for the new Graphite framework in GCC 4.4+" if TOOLCHAINOPTS
-       depends !GCC_VERSION_LLVM
 
 config GCC_USE_SYSTEM_PPL_CLOOG
        bool
        prompt "Use the system versions of PPL and CLooG"
-       depends GCC_USE_GRAPHITE
+       depends on GCC_USE_GRAPHITE
        default n
 
 config EXTRA_GCC_CONFIG_OPTIONS
@@ -43,17 +42,11 @@ 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
 
-config TLS_SUPPORT
-       bool
-       prompt "Enable Thread-local storage (TLS) support" if TOOLCHAINOPTS
-       default n
-       help
-           Enable Thread-local storage support
-
 config SJLJ_EXCEPTIONS
        bool
        prompt "Use setjump()/longjump() exceptions" if TOOLCHAINOPTS
@@ -63,16 +56,8 @@ 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
-       help
-           Build/install c++ compiler and libstdc++?
-
 config INSTALL_LIBGCJ
        bool
-       depends on !GCC_VERSION_LLVM
        prompt "Build/install java compiler and GNU classpath ?" if TOOLCHAINOPTS
        default n
        help