X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=toolchain%2Fgcc%2FConfig.in;h=ebacf6982e4240927977968f6081ea92f77f6ce0;hp=5ea51a8ad00e357c5b8ae5d9c1c29c7811615788;hb=81bc08344aa3cf1a4865d5645eb3a0cf259cc319;hpb=bbca8bb964c9540c6ad8bf157fc3a69cf86a3641

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 5ea51a8ad0..ebacf6982e 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -3,37 +3,25 @@
 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_0 if LINUX_2_6_MAGICBOX
+	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"
-
-	config GCC_VERSION_4_0_2
-		bool "gcc 4.0.2"
-
-	config GCC_VERSION_4_0_3
-		bool "gcc 4.0.3"
+	config GCC_VERSION_4_1_2
+		depends !LINUX_2_4
+		bool "gcc 4.1.2"
 
-	config GCC_VERSION_4_1_0
-		bool "gcc 4.1.0"
+	config GCC_VERSION_4_2_0
+		depends !LINUX_2_4
+		bool "gcc 4.2.0"
 
-	config GCC_VERSION_4_1_1
-		bool "gcc 4.1.1"
-
-	config GCC_VERSION_4_2
-		bool "gcc 4.2 (20060709)"
+	config GCC_VERSION_4_2_1
+		depends !LINUX_2_4
+		bool "gcc 4.2.1"
 
 endchoice
 
@@ -51,4 +39,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 ?