X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=toolchain%2Fgcc%2FConfig.in;h=a8c39d6a09cc0d6994b8369818ec7af643b6bbe9;hb=124b8a6dd668399bd3d636ed6c8888c2ff74b188;hp=b3fd5d665e26e9938fb1a3752c5b1219d10cb210;hpb=6b4f3344df04ed6dafca9a1987aff0838e385dfd;p=openwrt%2Fstaging%2Fdedeckeh.git

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index b3fd5d665e..a8c39d6a09 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -2,39 +2,25 @@
 
 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_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"
+		depends on !arc
+
+	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
 
@@ -45,7 +31,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 +44,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
 
@@ -71,13 +58,6 @@ config SJLJ_EXCEPTIONS
 	    frame unwinding exceptions handling routines.  Warning: increases
 	    code size and runtime memory usage.
 
-config INSTALL_LIBSTDCPP
-	bool
-	prompt "Build/install c++ compiler and libstdc++?" if TOOLCHAINOPTS
-	default y if !USE_MUSL
-	help
-	    Build/install c++ compiler and libstdc++?
-
 config INSTALL_LIBGCJ
 	bool
 	prompt "Build/install java compiler and GNU classpath ?" if TOOLCHAINOPTS