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

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 6b79fdda7..f0fb18476 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -3,50 +3,67 @@
 choice
 	prompt "GCC compiler Version" if TOOLCHAINOPTS
 	default GCC_VERSION_3_4_6 if LINUX_2_4
-	default GCC_VERSION_4_1_1
+	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_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.
 
-
-	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_3_4_6_nonmips
-		bool "gcc 3.4.6-nonmips"
+if !LINUX_2_4
+	config GCC_VERSION_4_1_2
+		bool "gcc 4.1.2"
+
+	config GCC_VERSION_4_2_4
+		bool "gcc 4.2.4"
 
-	config GCC_VERSION_4_0_2
-		bool "gcc 4.0.2"
+	config GCC_VERSION_4_3_3
+		bool "gcc 4.3.3"
 
-	config GCC_VERSION_4_0_3
-		bool "gcc 4.0.3"
+	config GCC_VERSION_4_3_4
+		bool "gcc 4.3.4"
 
-	config GCC_VERSION_4_1_0
-		bool "gcc 4.1.0"
+	config GCC_VERSION_4_4_0
+		bool "gcc 4.4.0"
 
-	config GCC_VERSION_4_1_1
-		bool "gcc 4.1.1"
+	config GCC_VERSION_4_4_1
+		bool "gcc 4.4.1"
 
-	config GCC_VERSION_4_1_2
-		bool "gcc 4.1.2"
+	config GCC_VERSION_LLVM
+		bool "llvm-gcc 4.2"
 
-	config GCC_VERSION_4_2
-		bool "gcc 4.2 (20060709)"
+	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....
 
+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
@@ -54,4 +71,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 ?