X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/aa7be8c16488bbdd079d402a6f15f81bc575c2f7..edf4ec42fabd19cf92766af05efc94292255dc07:/toolchain/gcc/Config.in

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 13b5238bf..07f050aad 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -3,8 +3,14 @@
 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 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_1_2
 	help
 	  Select the version of gcc you wish to use.
@@ -12,44 +18,43 @@ 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"
 
-endchoice
+	config GCC_VERSION_4_4_1
+		bool "gcc 4.4.1"
+endif
 
-config EABI_SUPPORT
-	bool
-	depends arm||armeb
-	depends BROKEN
-	prompt "Enable EABI support" if TOOLCHAINOPTS
-	default n
-	help
-	  Enable ARM EABI support
+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....
 
+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 INSTALL_LIBSTDCPP
 	bool
 	prompt "Build/install c++ compiler and libstdc++?" if TOOLCHAINOPTS