ar71xx: remove AP81 defconfig, it is the same as the generic config

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

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 9e6d0ed..09d3813 100644 (file)
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -2,41 +2,34 @@
 
 choice
        prompt "GCC compiler Version" if TOOLCHAINOPTS
 
 choice
        prompt "GCC compiler Version" if TOOLCHAINOPTS

-       default GCC_VERSION_4_3_3_CS if GCC_DEFAULT_VERSION_4_3_3_CS
-       default GCC_VERSION_4_3_5 if GCC_DEFAULT_VERSION_4_3_5
-       default GCC_VERSION_4_4_5 if GCC_DEFAULT_VERSION_4_4_5
-       default GCC_VERSION_LINARO
+       default GCC_VERSION_4_4_6 if GCC_DEFAULT_VERSION_4_4_6
+       default GCC_VERSION_4_5_LINARO

        help
          Select the version of gcc you wish to use.
 
        help
          Select the version of gcc you wish to use.
 

-       config GCC_VERSION_4_3_5
-               bool "gcc 4.3.5"
-
-       config GCC_VERSION_4_4_5
-               bool "gcc 4.4.5"
+       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_1
                bool "gcc 4.6.1"
 

-       config GCC_VERSION_LINARO
+       config GCC_VERSION_4_5_LINARO

                bool "gcc 4.5.x with Linaro enhancements"
 
                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
 
        config GCC_VERSION_LLVM
                bool "llvm-gcc 4.2"
                depends BROKEN
 

-       config GCC_VERSION_4_3_3_CS
-               bool "gcc 4.3.3 with CodeSourcery enhancements"
-
-       config GCC_VERSION_4_4_1_CS
-               bool "gcc 4.4.1 with CodeSourcery enhancements"
-

 endchoice
 
 config GCC_USE_GRAPHITE
        bool
        prompt "Compile in support for the new Graphite framework in GCC 4.4+" if TOOLCHAINOPTS
 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
 
 config GCC_USE_SYSTEM_PPL_CLOOG
        bool


@@ -60,7 +53,6 @@ config SSP_SUPPORT
 
 config TLS_SUPPORT
        bool
 
 config TLS_SUPPORT
        bool

-       depends UCLIBC_VERSION_NPTL

        prompt "Enable Thread-local storage (TLS) support" if TOOLCHAINOPTS
        default n
        help
        prompt "Enable Thread-local storage (TLS) support" if TOOLCHAINOPTS
        default n
        help