X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fstaging%2Fchunkeey.git;a=blobdiff_plain;f=toolchain%2Fgcc%2FConfig.in;h=def296f01e72e8f2410047854aebd4b9ed2db861;hp=1ec6503097c2ce1238d6bc6c3c1097a42ce8694b;hb=7b821a5ae882cb0c70fd9d09ec9d5952985951dc;hpb=96a4d6fb54001f2c4bc8afa3ead5e662918531fd

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 1ec6503097..def296f01e 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -2,28 +2,20 @@
 
 choice
 	prompt "GCC compiler Version" if TOOLCHAINOPTS
-	default GCC_USE_VERSION_4_4_7 if avr32
-	default GCC_USE_VERSION_4_6_LINARO if TARGET_octeon
-	default GCC_USE_VERSION_4_8_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_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_8_LINARO
-		select GCC_VERSION_4_8_LINARO
-		bool "gcc 4.8.x with Linaro enhancements"
+	config GCC_USE_VERSION_5
+		select GCC_VERSION_5
+		bool "gcc 5.x"
+		depends on !arc
 
 endchoice
 
@@ -34,7 +26,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
@@ -47,7 +39,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