X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=toolchain%2Fgcc%2FConfig.in;h=ecd7c2602bff560ad55fec36aaa9366ab9fa9706;hb=2e15b9579916cac13d0a5e4343413e65b4056d4c;hp=737164a9c93a4689255cb82515f9a4c580f72312;hpb=258b2cf7aab886f39d21ca35e7cd7cab5d00f60a;p=openwrt%2Fopenwrt.git

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 737164a9c9..ecd7c2602b 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -3,7 +3,8 @@
 choice
 	prompt "GCC compiler Version" if TOOLCHAINOPTS
 	default GCC_USE_VERSION_4_4_7 if avr32
-	default GCC_USE_VERSION_4_6_LINARO
+	default GCC_USE_VERSION_4_6_LINARO if TARGET_octeon
+	default GCC_USE_VERSION_4_8_LINARO
 	help
 	  Select the version of gcc you wish to use.
 
@@ -12,10 +13,6 @@ choice
 		bool "gcc 4.4.7"
 		depends on avr32
 
-	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"
@@ -24,6 +21,10 @@ choice
 		select GCC_VERSION_4_8_LINARO
 		bool "gcc 4.8.x with Linaro enhancements"
 
+	config GCC_USE_VERSION_4_9_LINARO
+		select GCC_VERSION_4_9_LINARO
+		bool "gcc 4.9.x with Linaro enhancements"
+
 endchoice
 
 config GCC_USE_GRAPHITE