X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=toolchain%2Fgcc%2FConfig.in;h=5cb4d23e169f4265541561364fe034c6e41297c9;hp=90c262db5d62b33df24574d6e08a050c694ac927;hb=3a237d638e3be6b5614ca2a9f713c6b2fc247070;hpb=626e1717642e933af0f15a387caadb16178c0254

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 90c262db5d..5cb4d23e16 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -2,42 +2,34 @@
 
 choice
 	prompt "GCC compiler Version" if TOOLCHAINOPTS
-	default GCC_VERSION_4_4_6 if GCC_DEFAULT_VERSION_4_4_6
-	default GCC_VERSION_4_6_LINARO
+	default GCC_USE_VERSION_4_6_LINARO if TARGET_octeon
+	default GCC_USE_VERSION_4_8_LINARO
 	help
 	  Select the version of gcc you wish to use.
 
-	config GCC_VERSION_4_4_6
-		bool "gcc 4.4.6"
-		depends (avr32 || ubicom32)
-
-	config GCC_VERSION_4_6_2
-		bool "gcc 4.6.2"
-
-	config GCC_VERSION_4_7_0
-		bool "gcc 4.7.0"
-
-	config GCC_VERSION_4_5_LINARO
-		bool "gcc 4.5.x with Linaro enhancements"
-
-	config GCC_VERSION_4_6_LINARO
+	config GCC_USE_VERSION_4_6_LINARO
+		select GCC_VERSION_4_6_LINARO
 		bool "gcc 4.6.x with Linaro enhancements"
 
-	config GCC_VERSION_LLVM
-		bool "llvm-gcc 4.2"
-		depends BROKEN
+	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"
+		depends on BROKEN
 
 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
+	depends on GCC_USE_GRAPHITE
 	default n
 
 config EXTRA_GCC_CONFIG_OPTIONS
@@ -50,17 +42,10 @@ config EXTRA_GCC_CONFIG_OPTIONS
 config SSP_SUPPORT
 	bool
 	prompt "Enable Stack-Smashing Protection support" if TOOLCHAINOPTS
-	default n
+	default y
 	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
@@ -70,16 +55,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
-	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