X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=toolchain%2Fgcc%2FConfig.in;h=b8de2d4fb881c1f478eda7612eed907bb79fafa1;hb=34e83930197410e1d7ff306792f7426b7dce9195;hp=ecd7c2602bff560ad55fec36aaa9366ab9fa9706;hpb=b6fb77ebfe3255f5515127614eefdcb78650efe2;p=openwrt%2Fstaging%2Fflorian.git

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index ecd7c2602b..b8de2d4fb8 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -2,28 +2,23 @@
 
 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_6_2_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_6_2_ARC
+		select GCC_VERSION_6_2_ARC
+		bool "gcc 6.2.x with support of ARC cores"
+		depends on arc
 
-	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_5
+		bool "gcc 5.x"
+		depends on !arc
 
-	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"
+	config GCC_USE_VERSION_6
+		bool "gcc 6.x"
+		depends on !arc
 
 endchoice
 
@@ -31,12 +26,6 @@ config GCC_USE_GRAPHITE
 	bool
 	prompt "Compile in support for the new Graphite framework in GCC 4.4+" if TOOLCHAINOPTS
 
-config GCC_USE_SYSTEM_PPL_CLOOG
-	bool
-	prompt "Use the system versions of PPL and CLooG"
-	depends on GCC_USE_GRAPHITE
-	default n
-
 config EXTRA_GCC_CONFIG_OPTIONS
 	string
 	prompt "Additional gcc configure options" if TOOLCHAINOPTS
@@ -47,7 +36,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
 
@@ -74,3 +64,11 @@ config INSTALL_GFORTRAN
 	default n
 	help
 	    Build/install GNU fortran compiler ?
+
+config INSTALL_GCCGO
+	bool
+	prompt "Build/install Go compiler?" if TOOLCHAINOPTS
+	depends on USE_GLIBC || BROKEN
+	default n
+	help
+	    Build/install GNU gccgo compiler ?