X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=openwrt%2Ftoolchain%2Fgcc%2FConfig.in;h=ed39142b447b327359370740f1f12356b4a8fda0;hp=c23cb39da69abb43c32c04006f1c7962a4b17c2d;hb=aacbbde071385bf6b4d08e6e44e244828746e755;hpb=d1935fcf8ed04eb130a02b8bb983e3c79c9ae07a

diff --git a/openwrt/toolchain/gcc/Config.in b/openwrt/toolchain/gcc/Config.in
index c23cb39da6..ed39142b44 100644
--- a/openwrt/toolchain/gcc/Config.in
+++ b/openwrt/toolchain/gcc/Config.in
@@ -2,75 +2,65 @@
 # WARNING -- 2.95 currently only builds for i386, arm, mips*, and powerpc.
 # WARNING -- 2.95 does not currently build natively for the target.
 
-comment "Gcc Options"
+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
 
 choice
-	prompt "GCC compiler Version"
-	default BR2_GCC_VERSION_3_3_5
+	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
 	help
 	  Select the version of gcc you wish to use.
 
-	config BR2_GCC_VERSION_2_95
-		bool "gcc 2.95"
-		depends on BR2_arm || BR2_i386 || BR2_mips || BR2_powerpc
-
-	config BR2_GCC_VERSION_3_3_3
-		bool "gcc 3.3.3"
-
-	config BR2_GCC_VERSION_3_3_4
-		bool "gcc 3.3.4"
-
-	config BR2_GCC_VERSION_3_3_5
-		bool "gcc 3.3.5"
-
-	config BR2_GCC_VERSION_3_4_0
-		bool "gcc 3.4.0"
+	config BR2_GCC_VERSION_3_4_4
+		bool "gcc 3.4.4"
+		select BR2_GCC_3_4
 
-	config BR2_GCC_VERSION_3_4_1
-		bool "gcc 3.4.1"
+	config BR2_GCC_VERSION_3_4_5
+		bool "gcc 3.4.5"
+		select BR2_GCC_3_4
 
-	config BR2_GCC_VERSION_3_4_2
-		bool "gcc 3.4.2"
-
-	config BR2_GCC_VERSION_3_4_3
-		bool "gcc 3.4.3"
+	config BR2_GCC_VERSION_4_0_2
+		bool "gcc 4.0.2"
+		select BR2_GCC_3_4
+		select BR2_PACKAGE_LIBGCC
 
 endchoice
 
 config BR2_GCC_VERSION
 	string
-	default "2.95"      if BR2_GCC_VERSION_2_95
-	default "3.3.3"     if BR2_GCC_VERSION_3_3_3
-	default "3.3.4"     if BR2_GCC_VERSION_3_3_4
-	default "3.3.5"     if BR2_GCC_VERSION_3_3_5
-	default "3.4.0"     if BR2_GCC_VERSION_3_4_0
-	default "3.4.1"     if BR2_GCC_VERSION_3_4_1
-	default "3.4.2"     if BR2_GCC_VERSION_3_4_2
-	default "3.4.3"     if BR2_GCC_VERSION_3_4_3
+	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
 
 
 config BR2_GCC_USE_SJLJ_EXCEPTIONS
 	string
-	default "--enable-sjlj-exceptions"
+#	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 BR2_EXTRA_GCC_CONFIG_OPTIONS
-	string "Additional gcc options"
+	string
+	prompt "Additional gcc options" if CONFIG_DEVEL
 	default ""
 	help
 	    Any additional gcc options you may want to include....
 
 config BR2_INSTALL_LIBSTDCPP
-	bool "Build/install c++ compiler and libstdc++?"
-	default n
+	bool
+	prompt "Build/install c++ compiler and libstdc++?" if CONFIG_DEVEL
+	default y
 	help
 	    Build/install c++ compiler and libstdc++?
 
-config BR2_INSTALL_LIBGCJ
-	bool "Build/install java compiler and libgcj?"
-	default n
-	depends on BR2_INSTALL_LIBSTDCPP
-	help
-	    Build/install java compiler and libgcj?