X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=toolchain%2Fgcc%2FConfig.in;h=10b7a9d0baa2c9435a34e6f14eada78180f4db31;hp=ebacf6982e4240927977968f6081ea92f77f6ce0;hb=56ee39a59bcda76b2597ec56d6a64804bcb27a03;hpb=14568b9a315bc71337ab4c14958b080bb2dae14e

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index ebacf6982e..10b7a9d0ba 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -3,7 +3,16 @@
 choice
 	prompt "GCC compiler Version" if TOOLCHAINOPTS
 	default GCC_VERSION_3_4_6 if LINUX_2_4
-	default GCC_VERSION_4_2_0 if LINUX_2_6_MAGICBOX
+	default GCC_VERSION_4_2_4 if avr32
+	default GCC_VERSION_4_3_3 if powerpc64
+	default GCC_VERSION_4_3_3 if TARGET_coldfire
+	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_3 if (TARGET_octeon || TARGET_sibyte)
 	default GCC_VERSION_4_1_2
 	help
 	  Select the version of gcc you wish to use.
@@ -11,27 +20,84 @@ choice
 	config GCC_VERSION_3_4_6
 		bool "gcc 3.4.6"
 
+if !LINUX_2_4
 	config GCC_VERSION_4_1_2
-		depends !LINUX_2_4
 		bool "gcc 4.1.2"
 
-	config GCC_VERSION_4_2_0
-		depends !LINUX_2_4
-		bool "gcc 4.2.0"
+	config GCC_VERSION_4_2_4
+		bool "gcc 4.2.4"
 
-	config GCC_VERSION_4_2_1
-		depends !LINUX_2_4
-		bool "gcc 4.2.1"
+	config GCC_VERSION_4_3_3
+		bool "gcc 4.3.3"
+
+	config GCC_VERSION_4_3_4
+		bool "gcc 4.3.4"
+
+	config GCC_VERSION_4_4_1
+		bool "gcc 4.4.1"
+
+	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_5_0
+		bool "gcc 4.5.0"
+
+	config GCC_VERSION_LLVM
+		bool "llvm-gcc 4.2"
+		depends BROKEN
+
+	config GCC_VERSION_4_3_3_CS
+		bool "gcc 4.3.3 with CodeSourcery enhancements"
+
+	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
+
+endif
 
 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 options" if TOOLCHAINOPTS
+	prompt "Additional gcc configure options" if TOOLCHAINOPTS
 	default ""
 	help
 	    Any additional gcc options you may want to include....
 
+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 !GCC_VERSION_3_4_6 && 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