X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/7188f2daaf10264c4020622353aac12780946a90..feaf88f721ae706a43e144f7b7975d915aad4d7e:/toolchain/gcc/Config.in

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 9b284209a..308054c2b 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -2,25 +2,20 @@
 
 choice
 	prompt "GCC compiler Version" if TOOLCHAINOPTS
-	default GCC_VERSION_3_4_6 if LINUX_2_4
-	default GCC_VERSION_4_2_4 if TARGET_avr32
-	default GCC_VERSION_4_2_4 if TARGET_ppc40x
-	default GCC_VERSION_4_2_4 if TARGET_ppc44x
+	default GCC_VERSION_4_2_4 if avr32
 	default GCC_VERSION_4_3_3 if powerpc64
-	default GCC_VERSION_4_3_3 if TARGET_etrax
 	default GCC_VERSION_4_3_3 if TARGET_coldfire
-	default GCC_VERSION_4_4_0 if ubicom32
-	default GCC_VERSION_4_4_1 if TARGET_octeon
-	default GCC_VERSION_4_3_3_CS if mips || mipsel
-	default GCC_VERSION_4_3_3_CS if arm || armeb
+	default GCC_VERSION_4_3_3 if TARGET_etrax
+	default GCC_VERSION_4_3_3_CS if (arm || armeb) && !TARGET_gemini
+	default GCC_VERSION_4_3_3_CS if (mips || mipsel) && !(TARGET_octeon || TARGET_sibyte)
+	default GCC_VERSION_4_3_4 if TARGET_gemini
+	default GCC_VERSION_4_4_1 if ubicom32
+	default GCC_VERSION_4_4_3 if powerpc
+	default GCC_VERSION_4_4_4 if (TARGET_octeon || TARGET_sibyte)
 	default GCC_VERSION_4_1_2
 	help
 	  Select the version of gcc you wish to use.
 
-	config GCC_VERSION_3_4_6
-		bool "gcc 3.4.6"
-
-if !LINUX_2_4
 	config GCC_VERSION_4_1_2
 		bool "gcc 4.1.2"
 
@@ -33,8 +28,8 @@ if !LINUX_2_4
 	config GCC_VERSION_4_3_4
 		bool "gcc 4.3.4"
 
-	config GCC_VERSION_4_4_0
-		bool "gcc 4.4.0"
+	config GCC_VERSION_4_3_5
+		bool "gcc 4.3.5"
 
 	config GCC_VERSION_4_4_1
 		bool "gcc 4.4.1"
@@ -42,6 +37,18 @@ if !LINUX_2_4
 	config GCC_VERSION_4_4_2
 		bool "gcc 4.4.2"
 
+	config GCC_VERSION_4_4_3
+		bool "gcc 4.4.3"
+
+	config GCC_VERSION_4_4_4
+		bool "gcc 4.4.4"
+
+	config GCC_VERSION_4_5_0
+		bool "gcc 4.5.0"
+
+	config GCC_VERSION_4_5_1
+		bool "gcc 4.5.1"
+
 	config GCC_VERSION_LLVM
 		bool "llvm-gcc 4.2"
 		depends BROKEN
@@ -49,10 +56,27 @@ if !LINUX_2_4
 	config GCC_VERSION_4_3_3_CS
 		bool "gcc 4.3.3 with CodeSourcery enhancements"
 
-endif
+	config GCC_VERSION_4_4_1_CS
+		bool "gcc 4.4.1 with CodeSourcery enhancements"
+		depends BROKEN
+
+	config GCC_VERSION_4_4_3_CS
+		bool "gcc 4.4.3 with CodeSourcery enhancements"
+		depends 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_4_4 || GCC_VERSION_4_5
+
+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
 	prompt "Additional gcc configure options" if TOOLCHAINOPTS
@@ -62,12 +86,19 @@ config EXTRA_GCC_CONFIG_OPTIONS
 
 config SSP_SUPPORT
 	bool
-	depends !GCC_VERSION_3_4_6
 	prompt "Enable Stack-Smashing Protection support" if TOOLCHAINOPTS
 	default n
 	help
 	    Enable Stack-Smashing Protection support
 
+config TLS_SUPPORT
+	bool
+	depends UCLIBC_VERSION_NPTL
+	prompt "Enable Thread-local storage (TLS) support" if TOOLCHAINOPTS
+	default n
+	help
+	    Enable Thread-local storage support
+
 config INSTALL_LIBSTDCPP
 	bool
 	prompt "Build/install c++ compiler and libstdc++?" if TOOLCHAINOPTS
@@ -77,6 +108,7 @@ config INSTALL_LIBSTDCPP
 
 config INSTALL_LIBGCJ
 	bool
+	depends on !(GCC_VERSION_4_1||GCC_VERSION_4_2)
 	prompt "Build/install java compiler and GNU classpath ?" if TOOLCHAINOPTS
 	default n
 	help