X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/7411e91e3f8a34bf3d34584936fc1ec4435c1669..ba16e1040b970499eb2822a26d90f759daf4436d:/toolchain/gcc/Config.in diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in index 8cd2894b6..204219e7e 100644 --- a/toolchain/gcc/Config.in +++ b/toolchain/gcc/Config.in @@ -2,55 +2,24 @@ choice prompt "GCC compiler Version" if TOOLCHAINOPTS - default GCC_VERSION_4_2_4 if avr32 - default GCC_VERSION_4_3_3 if powerpc64 - default GCC_VERSION_4_3_3 if TARGET_coldfire - default GCC_VERSION_4_3_3 if TARGET_etrax - default GCC_VERSION_4_3_3_CS if (arm || armeb) && !TARGET_gemini - default GCC_VERSION_4_3_3_CS if (mips || mipsel) && !(TARGET_octeon || TARGET_sibyte) - default GCC_VERSION_4_3_4 if TARGET_gemini - default GCC_VERSION_4_4_1 if ubicom32 - default GCC_VERSION_4_4_3 if powerpc - default GCC_VERSION_4_4_4 if (TARGET_octeon || TARGET_sibyte) - default GCC_VERSION_4_1_2 + 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 help Select the version of gcc you wish to use. - config GCC_VERSION_4_1_2 - bool "gcc 4.1.2" - - config GCC_VERSION_4_2_4 - bool "gcc 4.2.4" - - config GCC_VERSION_4_3_3 - bool "gcc 4.3.3" - - config GCC_VERSION_4_3_4 - bool "gcc 4.3.4" - config GCC_VERSION_4_3_5 bool "gcc 4.3.5" - config GCC_VERSION_4_4_1 - bool "gcc 4.4.1" - - config GCC_VERSION_4_4_2 - bool "gcc 4.4.2" - - config GCC_VERSION_4_4_3 - bool "gcc 4.4.3" - - config GCC_VERSION_4_4_4 - bool "gcc 4.4.4" - config GCC_VERSION_4_4_5 bool "gcc 4.4.5" - config GCC_VERSION_4_5_0 - bool "gcc 4.5.0" + config GCC_VERSION_4_5_2 + bool "gcc 4.5.2" - config GCC_VERSION_4_5_1 - bool "gcc 4.5.1" + config GCC_VERSION_LINARO + bool "gcc 4.5.2 with Linaro enhancements" config GCC_VERSION_LLVM bool "llvm-gcc 4.2" @@ -62,10 +31,6 @@ choice config GCC_VERSION_4_4_1_CS bool "gcc 4.4.1 with CodeSourcery enhancements" - config GCC_VERSION_4_4_3_CS - bool "gcc 4.4.3 with CodeSourcery enhancements" - depends BROKEN - endchoice config GCC_USE_GRAPHITE @@ -110,7 +75,7 @@ config INSTALL_LIBSTDCPP config INSTALL_LIBGCJ bool - depends on !(GCC_VERSION_4_1||GCC_VERSION_4_2) + depends on !GCC_VERSION_LLVM prompt "Build/install java compiler and GNU classpath ?" if TOOLCHAINOPTS default n help