X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=toolchain%2Fgcc%2FConfig.in;h=47425338c3c10f629d9e9e50588c987ea690b93c;hb=445604a915e8ed4669b3ef3c622259c7ca0081c1;hp=0621641e7859eb8bfc361f316e7f2bf2663ee091;hpb=8a22f31c2528226926cef72d6507e7f20957def5;p=openwrt%2Fopenwrt.git

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 0621641e78..47425338c3 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -2,32 +2,24 @@
 
 choice
 	prompt "GCC compiler Version" if TOOLCHAINOPTS
-	default GCC_USE_VERSION_5 if TARGET_octeon
 	default GCC_USE_VERSION_4_8_ARC if arc
-	default GCC_USE_VERSION_4_8_LINARO
+	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"
-		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_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
 
+	config GCC_USE_VERSION_6
+		bool "gcc 6.x"
+		depends on !arc
+
 endchoice
 
 config GCC_USE_GRAPHITE
@@ -37,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