X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fstaging%2Fwigyori.git;a=blobdiff_plain;f=toolchain%2Fgcc%2FConfig.in;h=f83f83c5c5ba97cbda65bc627ec5aeef91d2a63c;hp=e94bcc973889f5035a1517c4cd1f3e36cb423051;hb=a85019072fea12ce396fa740ad8fd0db061669a2;hpb=9a560e48dd6e85a967dc3412458fc019ff5c95da

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index e94bcc9738..f83f83c5c5 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -2,20 +2,30 @@
 
 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_4_7 if GCC_DEFAULT_VERSION_4_4_7
+	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"
+	config GCC_VERSION_4_4_7
+		bool "gcc 4.4.7"
+		depends avr32
 
-	config GCC_VERSION_4_6_1
-		bool "gcc 4.6.1"
+	config GCC_VERSION_4_6_3
+		bool "gcc 4.6.3"
 
-	config GCC_VERSION_LINARO
+	config GCC_VERSION_4_7_2
+		bool "gcc 4.7.2"
+
+	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_4_7_LINARO
+		bool "gcc 4.7.x with Linaro enhancements"
+
 	config GCC_VERSION_LLVM
 		bool "llvm-gcc 4.2"
 		depends BROKEN
@@ -66,7 +76,7 @@ config SJLJ_EXCEPTIONS
 config INSTALL_LIBSTDCPP
 	bool
 	prompt "Build/install c++ compiler and libstdc++?" if TOOLCHAINOPTS
-	default y
+	default y if !USE_MUSL
 	help
 	    Build/install c++ compiler and libstdc++?