X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=toolchain%2Fgcc%2FConfig.in;h=9562a02c99c35163824a7fb26835ddb91337c587;hp=8d91ba2c5425560a3bf385e681f68649d4d196d8;hb=de87e09d3a01912425c04d60e168faf8c229071a;hpb=8f55d05579fecdc488f7eb7ef6a2518434647c50

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 8d91ba2c54..9562a02c99 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -3,10 +3,16 @@
 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 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 TARGET_ps3
+	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_1 if ubicom32
+	default GCC_VERSION_4_4_1 if TARGET_octeon
+	default GCC_VERSION_4_3_3_CS if (mips || mipsel) && !TARGET_octeon
+	default GCC_VERSION_4_3_3_CS if arm || armeb
 	default GCC_VERSION_4_1_2
 	help
 	  Select the version of gcc you wish to use.
@@ -14,35 +20,44 @@ 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_4
-		depends !LINUX_2_4
 		bool "gcc 4.2.4"
 
-	config GCC_VERSION_4_3_1
-		depends !LINUX_2_4
-		bool "gcc 4.3.1"
+	config GCC_VERSION_4_3_3
+		bool "gcc 4.3.3"
 
-	config GCC_VERSION_4_3_2
-		depends !LINUX_2_4
-		bool "gcc 4.3.2"
+	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_LLVM
+		bool "llvm-gcc 4.2"
+		depends BROKEN
+
+	config GCC_VERSION_4_3_3_CS
+		bool "gcc 4.3.3 with CodeSourcery enhancements"
+
+endif
 
 endchoice
 
-config EABI_SUPPORT
+config GCC_USE_GRAPHITE
 	bool
-	depends arm||armeb
-	prompt "Enable EABI support" if TOOLCHAINOPTS
-	default n
-	help
-	  Enable ARM EABI support
+	prompt "Compile in support for the new Graphite framework in GCC 4.4+" if TOOLCHAINOPTS
+	depends GCC_VERSION_4_4_1 || GCC_VERSION_4_4_2
 
 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....
@@ -50,10 +65,10 @@ config EXTRA_GCC_CONFIG_OPTIONS
 config SSP_SUPPORT
 	bool
 	depends !GCC_VERSION_3_4_6
-	prompt "Enable Smash Stacking Protection support" if TOOLCHAINOPTS
+	prompt "Enable Stack-Smashing Protection support" if TOOLCHAINOPTS
 	default n
 	help
-	    Enable Smash Stacking Protection support
+	    Enable Stack-Smashing Protection support
 
 config INSTALL_LIBSTDCPP
 	bool