X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/362585143d362b5ffe9a140abd210cdea62d012c..744486a9adf509bf04bbaf7d43e694e003ecd656:/toolchain/gcc/Config.in?ds=sidebyside

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 7d70d0691..bce2e995d 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -6,49 +6,47 @@ if CONFIG_DEVEL
 	comment "Gcc Options"
 endif
 
+
+config BR2_GCC_3_4
+	bool
+	default n
+	depends BR2_GCC_VERSION_3_4_3 || BR2_GCC_VERSION_3_4_4 || BR2_GCC_VERSION_4_0_0
+
 choice
 	prompt "GCC compiler Version" if CONFIG_DEVEL
-	default BR2_GCC_VERSION_3_3_5
+	default BR2_GCC_VERSION_3_4_3
 	help
 	  Select the version of gcc you wish to use.
 
-	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_1
-		bool "gcc 3.4.1"
-
-	config BR2_GCC_VERSION_3_4_2
-		bool "gcc 3.4.2"
-
 	config BR2_GCC_VERSION_3_4_3
 		bool "gcc 3.4.3"
+		select BR2_GCC_3_4
+
+	config BR2_GCC_VERSION_3_4_4
+		bool "gcc 3.4.4"
+		select BR2_GCC_3_4
+
+	config BR2_GCC_VERSION_4_0_0
+		bool "gcc 4.0.0"
+		select BR2_GCC_3_4
 
 endchoice
 
 config BR2_GCC_VERSION
 	string
-	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 || !CONFIG_DEVEL
-	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.3.5"     if BR2_GCC_VERSION_3_3_5 
+	default "3.4.3"     if BR2_GCC_VERSION_3_4_3 || !CONFIG_DEVEL
+	default "3.4.4"     if BR2_GCC_VERSION_3_4_4
+	default "4.0.0"     if BR2_GCC_VERSION_4_0_0
 
 
 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.
@@ -63,7 +61,7 @@ config BR2_EXTRA_GCC_CONFIG_OPTIONS
 config BR2_INSTALL_LIBSTDCPP
 	bool
 	prompt "Build/install c++ compiler and libstdc++?" if CONFIG_DEVEL
-	default n
+	default y
 	help
 	    Build/install c++ compiler and libstdc++?