X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/e5dbe0d2390c04f84c95ea0897301292e3e562b1..4784f4c2bf048b55011c8dd82357d0d4b272597f:/toolchain/gcc/Config.in?ds=inline

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 506287a3f..e712d5934 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -2,44 +2,49 @@
 
 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_0 if TARGET_magicbox
+	default GCC_VERSION_4_2_3 if TARGET_avr32
+	default GCC_VERSION_4_1_2
 	help
 	  Select the version of gcc you wish to use.
 
+	config GCC_VERSION_3_4_6
+		bool "gcc 3.4.6"
 
-	config GCC_VERSION_3_4_4
-		bool "gcc 3.4.4"
+	config GCC_VERSION_4_1_2
+		depends !LINUX_2_4
+		bool "gcc 4.1.2"
 
-	config GCC_VERSION_3_4_5
-		bool "gcc 3.4.5"
+	config GCC_VERSION_4_2_0
+		depends !LINUX_2_4
+		bool "gcc 4.2.0"
 
-	config GCC_VERSION_3_4_6
-		bool "gcc 3.4.6"
+	config GCC_VERSION_4_2_1
+		depends !LINUX_2_4
+		bool "gcc 4.2.1"
 
-	config GCC_VERSION_4_0_2
-		bool "gcc 4.0.2"
+	config GCC_VERSION_4_2_2
+		depends !LINUX_2_4
+		bool "gcc 4.2.2"
 
-	config GCC_VERSION_4_0_3
-		bool "gcc 4.0.3"
-		
-	config GCC_VERSION_4_1_0
-		bool "gcc 4.1.0"
+	config GCC_VERSION_4_2_3
+		depends !LINUX_2_4
+		bool "gcc 4.2.3"
 
-endchoice
+	config GCC_VERSION_4_2_4
+		depends !LINUX_2_4
+		bool "gcc 4.2.4"
 
-config GCC_VERSION
-	string
-	prompt "GCC compiler Version" if (TOOLCHAINOPTS && NULL)
-	default "3.4.4"     if GCC_VERSION_3_4_4 || LINUX_2_4_BRCM
-	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 || LINUX_2_6_ARUBA
-	default "4.1.0"     if GCC_VERSION_4_1_0
-	default "3.4.6"
+endchoice
 
+config EABI_SUPPORT
+	bool
+	depends arm||armeb
+	prompt "Enable EABI support" if TOOLCHAINOPTS
+	default n
+	help
+	  Enable ARM EABI support
 
 config EXTRA_GCC_CONFIG_OPTIONS
 	string
@@ -55,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 ?