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

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 5526b4be79..b8de2d4fb8 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -2,49 +2,29 @@
 
 choice
 	prompt "GCC compiler Version" if TOOLCHAINOPTS
-	default GCC_VERSION_4_4_7 if GCC_DEFAULT_VERSION_4_4_7
-	default GCC_VERSION_4_6_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_VERSION_4_4_7
-		bool "gcc 4.4.7"
-		depends (avr32 || ubicom32)
+	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_VERSION_4_6_2
-		bool "gcc 4.6.2"
+	config GCC_USE_VERSION_5
+		bool "gcc 5.x"
+		depends on !arc
 
-	config GCC_VERSION_4_6_3
-		bool "gcc 4.6.3"
-
-	config GCC_VERSION_4_7_2
-		bool "gcc 4.7.2"
-
-	config GCC_VERSION_4_5_LINARO
-		bool "gcc 4.5.x with Linaro enhancements"
-
-	config GCC_VERSION_4_6_LINARO
-		bool "gcc 4.6.x with Linaro enhancements"
-
-	config GCC_VERSION_4_7_LINARO
-		bool "gcc 4.7.x with Linaro enhancements"
-
-	config GCC_VERSION_LLVM
-		bool "llvm-gcc 4.2"
-		depends BROKEN
+	config GCC_USE_VERSION_6
+		bool "gcc 6.x"
+		depends on !arc
 
 endchoice
 
 config GCC_USE_GRAPHITE
 	bool
 	prompt "Compile in support for the new Graphite framework in GCC 4.4+" if TOOLCHAINOPTS
-	depends !GCC_VERSION_LLVM
-
-config GCC_USE_SYSTEM_PPL_CLOOG
-	bool
-	prompt "Use the system versions of PPL and CLooG"
-	depends GCC_USE_GRAPHITE
-	default n
 
 config EXTRA_GCC_CONFIG_OPTIONS
 	string
@@ -56,17 +36,11 @@ 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
 
-config TLS_SUPPORT
-	bool
-	prompt "Enable Thread-local storage (TLS) support" if TOOLCHAINOPTS
-	default n
-	help
-	    Enable Thread-local storage support
-
 config SJLJ_EXCEPTIONS
 	bool
 	prompt "Use setjump()/longjump() exceptions" if TOOLCHAINOPTS
@@ -76,16 +50,8 @@ 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
-	depends on !GCC_VERSION_LLVM
 	prompt "Build/install java compiler and GNU classpath ?" if TOOLCHAINOPTS
 	default n
 	help
@@ -98,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 ?