X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=toolchain%2Fgcc%2FConfig.in;h=f14356b1798586253a22dd31e3cab366649c2a4c;hb=8b5d644bb36846660e1fa20d38361fec12a14b28;hp=d8141815fb802d075fb0ff542ce19206445aafc4;hpb=fc2bd072607fbe53ce14af3ac1867784f2c9a81d;p=openwrt%2Fstaging%2Fdedeckeh.git

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index d8141815fb..f14356b179 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -3,6 +3,7 @@
 choice
 	prompt "GCC compiler Version" if TOOLCHAINOPTS
 	default GCC_USE_VERSION_4_6_LINARO if TARGET_octeon
+	default GCC_USE_VERSION_4_8_ARC if arc
 	default GCC_USE_VERSION_4_8_LINARO
 	help
 	  Select the version of gcc you wish to use.
@@ -10,14 +11,22 @@ choice
 	config GCC_USE_VERSION_4_6_LINARO
 		select GCC_VERSION_4_6_LINARO
 		bool "gcc 4.6.x with Linaro enhancements"
+		depends on !arc
 
 	config GCC_USE_VERSION_4_8_LINARO
 		select GCC_VERSION_4_8_LINARO
 		bool "gcc 4.8.x with Linaro enhancements"
+		depends on !arc
 
-	config GCC_USE_VERSION_4_9_LINARO
-		select GCC_VERSION_4_9_LINARO
-		bool "gcc 4.9.x with Linaro enhancements"
+	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_5
+		select GCC_VERSION_5
+		bool "gcc 5.x"
+		depends on !arc
 
 endchoice
 
@@ -41,7 +50,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