X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/2c8df114186cfc92f53ef3aed0d4f57189fa7b76..d8c14cad1031af274a143787b0dafc3f9e7befbc:/toolchain/gcc/Config.in

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 24b86081c..41943c8cc 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -3,8 +3,13 @@
 choice
 	prompt "GCC compiler Version" if TOOLCHAINOPTS
 	default GCC_VERSION_3_4_6 if LINUX_2_4
-	default GCC_VERSION_4_2_0 if TARGET_magicbox
-	default GCC_VERSION_4_2_3 if TARGET_avr32
+	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_3_3 if TARGET_ps3_petitboot
+	default GCC_VERSION_4_3_3 if TARGET_pxcab
+	default GCC_VERSION_4_3_3 if TARGET_etrax
+	default GCC_VERSION_4_3_3 if TARGET_coldfire
 	default GCC_VERSION_4_1_2
 	help
 	  Select the version of gcc you wish to use.
@@ -12,29 +17,25 @@ 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_2_2
-		depends !LINUX_2_4
-		bool "gcc 4.2.2"
+	config GCC_VERSION_4_3_4
+		bool "gcc 4.3.4"
 
-	config GCC_VERSION_4_2_3
-		depends !LINUX_2_4
-		bool "gcc 4.2.3"
+	config GCC_VERSION_4_4_0
+		bool "gcc 4.4.0"
 
-	config GCC_VERSION_4_2_4
-		depends !LINUX_2_4
-		bool "gcc 4.2.4"
+	config GCC_VERSION_4_4_1
+		bool "gcc 4.4.1"
+endif
 
 endchoice
 
@@ -42,7 +43,8 @@ config EABI_SUPPORT
 	bool
 	depends arm||armeb
 	prompt "Enable EABI support" if TOOLCHAINOPTS
-	default n
+	default n if TARGET_gemini
+	default y
 	help
 	  Enable ARM EABI support
 
@@ -55,6 +57,7 @@ config EXTRA_GCC_CONFIG_OPTIONS
 
 config SSP_SUPPORT
 	bool
+	depends !GCC_VERSION_3_4_6
 	prompt "Enable Smash Stacking Protection support" if TOOLCHAINOPTS
 	default n
 	help