[base system & package/block-extroot] Fixed duplicated content in file in commit...

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

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 661da94..8fab0df 100644 (file)
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -58,7 +58,6 @@ choice
 
        config GCC_VERSION_4_4_1_CS
                bool "gcc 4.4.1 with CodeSourcery enhancements"
 
        config GCC_VERSION_4_4_1_CS
                bool "gcc 4.4.1 with CodeSourcery enhancements"

-               depends BROKEN

 
        config GCC_VERSION_4_4_3_CS
                bool "gcc 4.4.3 with CodeSourcery enhancements"
 
        config GCC_VERSION_4_4_3_CS
                bool "gcc 4.4.3 with CodeSourcery enhancements"


@@ -86,7 +85,6 @@ config EXTRA_GCC_CONFIG_OPTIONS
 
 config SSP_SUPPORT
        bool
 
 config SSP_SUPPORT
        bool

-       depends !GCC_VERSION_3_4_6

        prompt "Enable Stack-Smashing Protection support" if TOOLCHAINOPTS
        default n
        help
        prompt "Enable Stack-Smashing Protection support" if TOOLCHAINOPTS
        default n
        help


@@ -94,7 +92,7 @@ config SSP_SUPPORT
 
 config TLS_SUPPORT
        bool
 
 config TLS_SUPPORT
        bool

-       depends !GCC_VERSION_3_4_6 && UCLIBC_VERSION_NPTL
+       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


@@ -109,6 +107,7 @@ config INSTALL_LIBSTDCPP
 
 config INSTALL_LIBGCJ
        bool
 
 config INSTALL_LIBGCJ
        bool

+       depends on !(GCC_VERSION_4_1||GCC_VERSION_4_2)

        prompt "Build/install java compiler and GNU classpath ?" if TOOLCHAINOPTS
        default n
        help
        prompt "Build/install java compiler and GNU classpath ?" if TOOLCHAINOPTS
        default n
        help