X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/3dd2665c70d2d36ae1e43121678d8fa39f901876..512318e058ca1cdae2b5ce7c0f8f8f4b44679249:/toolchain/gcc/Config.in

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 491290734..38b1bcf5d 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -1,58 +1,42 @@
 # Choose gcc version.
 
-if !TOOLCHAINOPTS
-	config GCC_VERSION_3_4_4
-		default y if LINUX_2_4_BRCM
-		
-	config GCC_VERSION_4_0_3
-		default y if LINUX_2_6_ARUBA
-
-endif
-
 choice
 	prompt "GCC compiler Version" if TOOLCHAINOPTS
-	default GCC_VERSION_4_0_3 if LINUX_2_6_ARUBA
-	default GCC_VERSION_3_4_4 if LINUX_2_4_BRCM
-	default GCC_VERSION_3_4_6
+	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 TARGET_ppc40x
+	default GCC_VERSION_4_2_4 if TARGET_ppc44x
+	default GCC_VERSION_4_3_2 if TARGET_ps3
+	default GCC_VERSION_4_1_2
 	help
 	  Select the version of gcc you wish to use.
 
-
-	config GCC_VERSION_3_4_4
-		bool "gcc 3.4.4"
-
-	config GCC_VERSION_3_4_5
-		bool "gcc 3.4.5"
-
 	config GCC_VERSION_3_4_6
 		bool "gcc 3.4.6"
 
-	config GCC_VERSION_4_0_2
-		bool "gcc 4.0.2"
+if !LINUX_2_4
+	config GCC_VERSION_4_1_2
+		bool "gcc 4.1.2"
 
-	config GCC_VERSION_4_0_3
-		bool "gcc 4.0.3"
+	config GCC_VERSION_4_2_4
+		bool "gcc 4.2.4"
 
-	config GCC_VERSION_4_1_0
-		bool "gcc 4.1.0"
+	config GCC_VERSION_4_3_2
+		bool "gcc 4.3.2"
 
-	config GCC_VERSION_4_1_1
-		bool "gcc 4.1.1"
+	config GCC_VERSION_4_3_3
+		bool "gcc 4.3.3"
+endif
 
 endchoice
 
-config GCC_VERSION
-	string
-	prompt "GCC compiler Version" if (TOOLCHAINOPTS && NULL)
-	default "3.4.4"     if GCC_VERSION_3_4_4
-	default "3.4.5"     if GCC_VERSION_3_4_5
-	default "3.4.6"     if GCC_VERSION_3_4_6
-	default "4.0.2"     if GCC_VERSION_4_0_2
-	default "4.0.3"     if GCC_VERSION_4_0_3
-	default "4.1.0"     if GCC_VERSION_4_1_0
-	default "4.1.1"     if GCC_VERSION_4_1_1
-	default "3.4.6"
-
+config EABI_SUPPORT
+	bool
+	depends arm||armeb
+	prompt "Enable EABI support" if TOOLCHAINOPTS
+	default y
+	help
+	  Enable ARM EABI support
 
 config EXTRA_GCC_CONFIG_OPTIONS
 	string
@@ -61,6 +45,14 @@ config EXTRA_GCC_CONFIG_OPTIONS
 	help
 	    Any additional gcc options you may want to include....
 
+config SSP_SUPPORT
+	bool
+	depends !GCC_VERSION_3_4_6
+	prompt "Enable Smash Stacking Protection support" if TOOLCHAINOPTS
+	default n
+	help
+	    Enable Smash Stacking Protection support
+
 config INSTALL_LIBSTDCPP
 	bool
 	prompt "Build/install c++ compiler and libstdc++?" if TOOLCHAINOPTS
@@ -68,3 +60,9 @@ config INSTALL_LIBSTDCPP
 	help
 	    Build/install c++ compiler and libstdc++?
 
+config INSTALL_LIBGCJ
+	bool
+	prompt "Build/install java compiler and GNU classpath ?" if TOOLCHAINOPTS
+	default n
+	help
+	    Build/install java compiler and GNU classpath ?