gcc: now that the gpr save/restore issues are taken care of, remove the -Os/-O2 worka...

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

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 556a569..f5ea898 100644 (file)
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -3,19 +3,23 @@
 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_VERSION_4_6_LINARO
        help
          Select the version of gcc you wish to use.
 
        config GCC_VERSION_4_4_6
                bool "gcc 4.4.6"
+               depends (avr32 || ubicom32)
 
-       config GCC_VERSION_4_6_1
-               bool "gcc 4.6.1"
+       config GCC_VERSION_4_6_2
+               bool "gcc 4.6.2"
 
-       config GCC_VERSION_LINARO
+       config GCC_VERSION_4_5_LINARO
                bool "gcc 4.5.x with Linaro enhancements"
 
+       config GCC_VERSION_4_6_LINARO
+               bool "gcc 4.6.x with Linaro enhancements"
+
        config GCC_VERSION_LLVM
                bool "llvm-gcc 4.2"
                depends BROKEN
@@ -25,7 +29,7 @@ endchoice
 config GCC_USE_GRAPHITE
        bool
        prompt "Compile in support for the new Graphite framework in GCC 4.4+" if TOOLCHAINOPTS
-       depends GCC_VERSION_4_4 || GCC_VERSION_4_5 || GCC_VERSION_4_6
+       depends !GCC_VERSION_LLVM
 
 config GCC_USE_SYSTEM_PPL_CLOOG
        bool
@@ -49,7 +53,6 @@ config SSP_SUPPORT
 
 config TLS_SUPPORT
        bool
-       depends UCLIBC_VERSION_NPTL
        prompt "Enable Thread-local storage (TLS) support" if TOOLCHAINOPTS
        default n
        help