X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=toolchain%2Fgcc%2FConfig.in;h=585017586acae4a6f01bb85a1b65a161417bff05;hp=b027953c1f43c65127f3da79917f33d804e56d3e;hb=463b80c3d158c34724d2789321c86c4ae7d4253a;hpb=909abe499921709e37cefbed4bd9932d803c36b0

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index b027953c1f..585017586a 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -2,34 +2,35 @@
 
 choice
 	prompt "GCC compiler Version" if TOOLCHAINOPTS
-	default GCC_VERSION_4_4_6 if GCC_DEFAULT_VERSION_4_4_6
+	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"
-		depends (avr32 || ubicom32)
+	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_4_5_LINARO
-		bool "gcc 4.5.x with Linaro enhancements"
+	config GCC_VERSION_4_7_2
+		bool "gcc 4.7.2"
 
 	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_4_7_LINARO
+		bool "gcc 4.7.x with Linaro enhancements"
+
+	config GCC_VERSION_4_8_0
+		bool "gcc 4.8.0"
 
 endchoice
 
 config GCC_USE_GRAPHITE
 	bool
 	prompt "Compile in support for the new Graphite framework in GCC 4.4+" if TOOLCHAINOPTS
-	depends !GCC_VERSION_LLVM
 
 config GCC_USE_SYSTEM_PPL_CLOOG
 	bool
@@ -70,13 +71,12 @@ 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++?
 
 config INSTALL_LIBGCJ
 	bool
-	depends on !GCC_VERSION_LLVM
 	prompt "Build/install java compiler and GNU classpath ?" if TOOLCHAINOPTS
 	default n
 	help