X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=toolchain%2Fgcc%2FConfig.in;h=f5f27c6907942633f15e485d1a79c2a0abfa1510;hb=498cebec28f2dcd38f85510571b960bd3b15818b;hp=d29e47541c91665fcbd0fb02ba140d17c4e5d4c2;hpb=c7fef9bac242519e2d3d087751f71503d0682734;p=openwrt-10.03%2F.git

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index d29e47541..f5f27c690 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -1,63 +1,51 @@
 # 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_4_0_1 || BR2_GCC_VERSION_4_0_2
 
 choice
-	prompt "GCC compiler Version" if CONFIG_DEVEL
-	default BR2_GCC_VERSION_3_4_4
+	prompt "GCC compiler Version" if TOOLCHAINOPTS
+	default GCC_VERSION_4_1_1 if LINUX_2_6_ARUBA
+	default GCC_VERSION_3_4_6
 	help
 	  Select the version of gcc you wish to use.
 
-	config BR2_GCC_VERSION_3_4_4
+
+	config GCC_VERSION_3_4_4
 		bool "gcc 3.4.4"
-		select BR2_GCC_3_4
 
-	config BR2_GCC_VERSION_4_0_1
-		bool "gcc 4.0.1"
-		select BR2_GCC_3_4
-		
-	config BR2_GCC_VERSION_4_0_2
-		bool "gcc 4.0.1"
-		select BR2_GCC_3_4
+	config GCC_VERSION_3_4_5
+		bool "gcc 3.4.5"
 
-endchoice
+	config GCC_VERSION_3_4_6
+		bool "gcc 3.4.6"
 
-config BR2_GCC_VERSION
-	string
-	default "3.4.4"     if BR2_GCC_VERSION_3_4_4 || !CONFIG_DEVEL
-	default "4.0.1"     if BR2_GCC_VERSION_4_0_1
-	default "4.0.2"     if BR2_GCC_VERSION_4_0_2
+	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 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.
+	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_1_1
+		bool "gcc 4.1.1"
 
-config BR2_EXTRA_GCC_CONFIG_OPTIONS
+endchoice
+
+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++?
 
+