X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=toolchain%2Fgcc%2FConfig.in;h=81b795edd0e98f9fd144a2a92cc929f028a5e5f1;hb=f17e56eff5b9b4b92b18e6a0b6d4f7a3ccfdc3ae;hp=09d3813839b3d3f28c6399084807abd76f6adefe;hpb=fdb4676b62cc83746e2131011b142ea05b5ed1f8;p=openwrt.git

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 09d3813839..81b795edd0 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -2,39 +2,37 @@
 
 choice
 	prompt "GCC compiler Version" if TOOLCHAINOPTS
-	default GCC_VERSION_4_4_6 if GCC_DEFAULT_VERSION_4_4_6
-	default GCC_VERSION_4_5_LINARO
+	default GCC_USE_VERSION_5 if TARGET_octeon
+	default GCC_USE_VERSION_4_8_ARC if arc
+	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_USE_VERSION_4_8_LINARO
+		select GCC_VERSION_4_8_LINARO
+		bool "gcc 4.8.x with Linaro enhancements"
+		depends on !arc
 
-	config GCC_VERSION_4_6_1
-		bool "gcc 4.6.1"
+	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_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_LLVM
-		bool "llvm-gcc 4.2"
-		depends BROKEN
+	config GCC_USE_VERSION_5
+		select GCC_VERSION_5
+		bool "gcc 5.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
+	depends on GCC_USE_GRAPHITE
 	default n
 
 config EXTRA_GCC_CONFIG_OPTIONS
@@ -47,17 +45,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
@@ -67,16 +59,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