X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=toolchain%2Fgcc%2FConfig.in;h=6df266173777876d889421943666da32ce88fc31;hb=ce9ea905c1ffa6a2a5d74b587d89856dea472df1;hp=accf06aee462078f1d452a5664f1b883c93efe52;hpb=b693945d4fa1bc234c3332cf7fa04c67586197d3;p=openwrt%2Fopenwrt.git

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index accf06aee4..6df2661737 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -6,7 +6,13 @@ choice
 	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 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
+	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,27 +20,39 @@ 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"
 
-endchoice
+	config GCC_VERSION_4_3_3
+		bool "gcc 4.3.3"
 
-config EABI_SUPPORT
-	bool
-	depends arm||armeb
-	prompt "Enable EABI support" if TOOLCHAINOPTS
-	default n
-	help
-	  Enable ARM EABI support
+	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 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....
@@ -42,10 +60,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