X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/744a720a8f408dbab064bb1369c78b601fcb8dfb..f3aa8f589504f7a700039d8287658936953bafbb:/toolchain/gcc/Config.in

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 599bfddb5..ebacf6982 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -1,72 +1,47 @@
 # Choose gcc version.
-# WARNING -- 2.95 currently only builds for i386, arm, mips*, and powerpc.
-# WARNING -- 2.95 does not currently build natively for the target.
-
-if CONFIG_DEVEL
-	comment "Gcc Options"
-endif
-
-
-config BR2_GCC_3_4
-	bool
-	default n
-	depends BR2_GCC_VERSION_3_4_4 || BR2_GCC_VERSION_3_4_5 || BR2_GCC_VERSION_4_0_2 || BR2_GCC_VERSION_4_1_0
 
 choice
-	prompt "GCC compiler Version" if CONFIG_DEVEL
-	default BR2_GCC_VERSION_4_0_2 if BR2_LINUX_2_6_ARUBA
-	default BR2_GCC_VERSION_3_4_4 if BR2_LINUX_2_4_BRCM
-	default BR2_GCC_VERSION_3_4_5
+	prompt "GCC compiler Version" if TOOLCHAINOPTS
+	default GCC_VERSION_3_4_6 if LINUX_2_4
+	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 BR2_GCC_VERSION_3_4_4
-		bool "gcc 3.4.4"
-		select BR2_GCC_3_4
-
-	config BR2_GCC_VERSION_3_4_5
-		bool "gcc 3.4.5"
-		select BR2_GCC_3_4
+	config GCC_VERSION_3_4_6
+		bool "gcc 3.4.6"
 
-	config BR2_GCC_VERSION_4_0_2
-		bool "gcc 4.0.2"
-		select BR2_GCC_3_4
-		select BR2_PACKAGE_LIBGCC
-		
-	config BR2_GCC_VERSION_4_1_0
-		bool "gcc 4.1.0"
-		select BR2_GCC_3_4
-		select BR2_PACKAGE_LIBGCC
-
-endchoice
+	config GCC_VERSION_4_1_2
+		depends !LINUX_2_4
+		bool "gcc 4.1.2"
 
-config BR2_GCC_VERSION
-	string
-	default "3.4.4"     if BR2_GCC_VERSION_3_4_4
-	default "3.4.5"     if BR2_GCC_VERSION_3_4_5 || !CONFIG_DEVEL
-	default "4.0.2"     if BR2_GCC_VERSION_4_0_2
-	default "4.1.0"     if BR2_GCC_VERSION_4_1_0
+	config GCC_VERSION_4_2_0
+		depends !LINUX_2_4
+		bool "gcc 4.2.0"
 
+	config GCC_VERSION_4_2_1
+		depends !LINUX_2_4
+		bool "gcc 4.2.1"
 
-config BR2_GCC_USE_SJLJ_EXCEPTIONS
-	string
-#	default "--enable-sjlj-exceptions"
-	default ""
-	help
-	    Currently the unwind stuff seems to work for staticly linked apps
-	    but not dynamic.  So use setjmp/longjmp exceptions by default.
+endchoice
 
-config BR2_EXTRA_GCC_CONFIG_OPTIONS
+config EXTRA_GCC_CONFIG_OPTIONS
 	string
-	prompt "Additional gcc options" if CONFIG_DEVEL
+	prompt "Additional gcc options" if TOOLCHAINOPTS
 	default ""
 	help
 	    Any additional gcc options you may want to include....
 
-config BR2_INSTALL_LIBSTDCPP
+config INSTALL_LIBSTDCPP
 	bool
-	prompt "Build/install c++ compiler and libstdc++?" if CONFIG_DEVEL
+	prompt "Build/install c++ compiler and libstdc++?" if TOOLCHAINOPTS
 	default y
 	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 ?