X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fstaging%2Fchunkeey.git;a=blobdiff_plain;f=toolchain%2Fgcc%2FConfig.in;h=025ea2453d741e3eab4bc75d07d868b00b4bb5dc;hp=defb1b1b0e0bf5b3e68b2eb0d5be06bb5b505ec8;hb=1877bc9d8f2be143fbe530347a945850d0ecd234;hpb=2430e9a4f5f809d9164edf64dd3eb87f9a14a5fc

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index defb1b1b0e..025ea2453d 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -2,40 +2,24 @@
 
 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_6_LINARO if TARGET_octeon
+	default GCC_USE_VERSION_4_8_LINARO
 	help
 	  Select the version of gcc you wish to use.
 
-	config GCC_USE_VERSION_4_4_7
-		select GCC_VERSION_4_4_7
-		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_LINARO
 		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"
+		depends on BROKEN
+
 endchoice
 
 config GCC_USE_GRAPHITE
@@ -58,7 +42,8 @@ config EXTRA_GCC_CONFIG_OPTIONS
 config SSP_SUPPORT
 	bool
 	prompt "Enable Stack-Smashing Protection support" if TOOLCHAINOPTS
-	default n
+	depends on !USE_MUSL
+	default y if !USE_MUSL
 	help
 	    Enable Stack-Smashing Protection support