X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fstaging%2Fwigyori.git;a=blobdiff_plain;f=toolchain%2Fgcc%2FConfig.in;h=41ea61cb8a06f2e1f3240ae996a213939b9c8790;hp=025ea2453d741e3eab4bc75d07d868b00b4bb5dc;hb=720b99215da295a2e7b4acdef30b58bec6acedc2;hpb=1877bc9d8f2be143fbe530347a945850d0ecd234

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 025ea2453d..41ea61cb8a 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -2,23 +2,23 @@
 
 choice
 	prompt "GCC compiler Version" if TOOLCHAINOPTS
-	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_6_LINARO
-		select GCC_VERSION_4_6_LINARO
-		bool "gcc 4.6.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_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
 
-	config GCC_USE_VERSION_4_9_LINARO
-		select GCC_VERSION_4_9_LINARO
-		bool "gcc 4.9.x with Linaro enhancements"
-		depends on BROKEN
+	config GCC_USE_VERSION_6
+		bool "gcc 6.x"
+		depends on !arc
 
 endchoice
 
@@ -29,7 +29,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
@@ -70,3 +70,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 !GCC_VERSION_4_8 && (USE_GLIBC || BROKEN)
+	default n
+	help
+	    Build/install GNU gccgo compiler ?