X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=toolchain%2Fgcc%2FConfig.in;h=97c74dec4d1b8918f4320923861cc74c56a29d33;hb=a22846267123c31f3717f42d0bce7da2043be0b0;hp=e8ca941108f336685f17d380137f953cd8ec2354;hpb=99392df05aa0d9268fa18ad3227a92f247d4ec95;p=15.05%2Fopenwrt.git

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index e8ca941108..97c74dec4d 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -2,8 +2,9 @@
 
 choice
 	prompt "GCC compiler Version" if TOOLCHAINOPTS
-	default GCC_USE_VERSION_4_4_7 if GCC_DEFAULT_VERSION_4_4_7
-	default GCC_USE_VERSION_4_6_LINARO
+	default GCC_USE_VERSION_4_4_7 if avr32
+	default GCC_USE_VERSION_4_6_LINARO if octeon
+	default GCC_USE_VERSION_4_8_LINARO
 	help
 	  Select the version of gcc you wish to use.
 
@@ -12,25 +13,17 @@ choice
 		bool "gcc 4.4.7"
 		depends on avr32
 
-	config GCC_USE_VERSION_4_6_3
-		select GCC_VERSION_4_6_3
-		bool "gcc 4.6.3"
-
-	config GCC_USE_VERSION_4_7_2
-		select GCC_VERSION_4_7_2
-		bool "gcc 4.7.2"
+	config GCC_USE_VERSION_4_8_0
+		select GCC_VERSION_4_8_0
+		bool "gcc 4.8.0"
 
 	config GCC_USE_VERSION_4_6_LINARO
 		select GCC_VERSION_4_6_LINARO
 		bool "gcc 4.6.x with Linaro enhancements"
 
-	config GCC_USE_VERSION_4_7_LINARO
-		select GCC_VERSION_4_7_LINARO
-		bool "gcc 4.7.x with Linaro enhancements"
-
-	config GCC_USE_VERSION_4_8_0
-		select GCC_VERSION_4_8_0
-		bool "gcc 4.8.0"
+	config GCC_USE_VERSION_4_8_LINARO
+		select GCC_VERSION_4_8_LINARO
+		bool "gcc 4.8.x with Linaro enhancements"
 
 endchoice
 
@@ -67,13 +60,6 @@ config SJLJ_EXCEPTIONS
 	    frame unwinding exceptions handling routines.  Warning: increases
 	    code size and runtime memory usage.
 
-config INSTALL_LIBSTDCPP
-	bool
-	prompt "Build/install c++ compiler and libstdc++?" if TOOLCHAINOPTS
-	default y if !USE_MUSL
-	help
-	    Build/install c++ compiler and libstdc++?
-
 config INSTALL_LIBGCJ
 	bool
 	prompt "Build/install java compiler and GNU classpath ?" if TOOLCHAINOPTS