X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=toolchain%2Fgcc%2FConfig.in;h=7cb6d379be794676b0164541cdf76a1ffc432d38;hp=defb1b1b0e0bf5b3e68b2eb0d5be06bb5b505ec8;hb=a4e90e2cac9d0afb41842b8a197b3acee903b9ad;hpb=2430e9a4f5f809d9164edf64dd3eb87f9a14a5fc

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index defb1b1b0e..7cb6d379be 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -2,39 +2,19 @@
 
 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_8_ARC if arc
+	default GCC_USE_VERSION_5
 	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_8_ARC
+		select GCC_VERSION_4_8_ARC
+		bool "gcc 4.8.x with support of ARC cores"
+		depends on arc
 
-	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_5
+		bool "gcc 5.x"
+		depends on !arc
 
 endchoice
 
@@ -45,7 +25,7 @@ config GCC_USE_GRAPHITE
 config GCC_USE_SYSTEM_PPL_CLOOG
 	bool
 	prompt "Use the system versions of PPL and CLooG"
-	depends on GCC_USE_GRAPHITE
+	depends on GCC_USE_GRAPHITE && GCC_VERSION_4_8
 	default n
 
 config EXTRA_GCC_CONFIG_OPTIONS
@@ -58,7 +38,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