From: Imre Kaloz <kaloz@openwrt.org>
Date: Fri, 29 Oct 2010 10:55:54 +0000 (+0000)
Subject: remove unneeded config options, too
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=387c2adead9e0820dfb7c79e0cedde280f877732;p=openwrt%2Fstaging%2Frmilecki.git

remove unneeded config options, too

SVN-Revision: 23706
---

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 943b62563f6..08c69de2d65 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -19,33 +19,12 @@ choice
 	config GCC_VERSION_4_2_4
 		bool "gcc 4.2.4"
 
-	config GCC_VERSION_4_3_3
-		bool "gcc 4.3.3"
-
-	config GCC_VERSION_4_3_4
-		bool "gcc 4.3.4"
-
 	config GCC_VERSION_4_3_5
 		bool "gcc 4.3.5"
 
-	config GCC_VERSION_4_4_1
-		bool "gcc 4.4.1"
-
-	config GCC_VERSION_4_4_2
-		bool "gcc 4.4.2"
-
-	config GCC_VERSION_4_4_3
-		bool "gcc 4.4.3"
-
-	config GCC_VERSION_4_4_4
-		bool "gcc 4.4.4"
-
 	config GCC_VERSION_4_4_5
 		bool "gcc 4.4.5"
 
-	config GCC_VERSION_4_5_0
-		bool "gcc 4.5.0"
-
 	config GCC_VERSION_4_5_1
 		bool "gcc 4.5.1"
 
@@ -62,10 +41,6 @@ choice
 	config GCC_VERSION_4_4_1_CS
 		bool "gcc 4.4.1 with CodeSourcery enhancements"
 
-	config GCC_VERSION_4_4_3_CS
-		bool "gcc 4.4.3 with CodeSourcery enhancements"
-		depends BROKEN
-
 endchoice
 
 config GCC_USE_GRAPHITE
diff --git a/toolchain/gcc/Config.version b/toolchain/gcc/Config.version
index ecae8df1234..731e247893a 100644
--- a/toolchain/gcc/Config.version
+++ b/toolchain/gcc/Config.version
@@ -2,20 +2,12 @@ config GCC_VERSION
 	string
 	default "4.1.2"     if GCC_VERSION_4_1_2
 	default "4.2.4"     if GCC_VERSION_4_2_4
-	default "4.3.3"     if GCC_VERSION_4_3_3
 	default "4.3.3+cs"  if GCC_VERSION_4_3_3_CS
-	default "4.3.4"     if GCC_VERSION_4_3_4
 	default "4.3.5"     if GCC_VERSION_4_3_5
-	default "4.4.1"	    if GCC_VERSION_4_4_1
 	default "4.4.1+cs"  if GCC_VERSION_4_4_1_CS
-	default "4.4.2"	    if GCC_VERSION_4_4_2
-	default "4.4.3"	    if GCC_VERSION_4_4_3
-	default "4.4.4"	    if GCC_VERSION_4_4_4
 	default "4.4.5"	    if GCC_VERSION_4_4_5
-	default "4.5.0"	    if GCC_VERSION_4_5_0
 	default "4.5.1"	    if GCC_VERSION_4_5_1
 	default "4.5.1+l"   if GCC_VERSION_4_5_1_LINARO
-	default "4.4.3+cs"  if GCC_VERSION_4_4_3_CS
 	default "llvm"	    if GCC_VERSION_LLVM
 	default "4.1.2"
 
@@ -38,24 +30,16 @@ config GCC_VERSION_4_2
 
 config GCC_VERSION_4_3
 	bool
-	default y	if GCC_VERSION_4_3_3
 	default y	if GCC_VERSION_4_3_3_CS
-	default y	if GCC_VERSION_4_3_4
 	default y	if GCC_VERSION_4_3_5
 
 config GCC_VERSION_4_4
 	bool
-	default y	if GCC_VERSION_4_4_1
 	default y	if GCC_VERSION_4_4_1_CS
-	default y	if GCC_VERSION_4_4_2
-	default y	if GCC_VERSION_4_4_3
-	default y	if GCC_VERSION_4_4_3_CS
-	default y	if GCC_VERSION_4_4_4
 	default y	if GCC_VERSION_4_4_5
 
 config GCC_VERSION_4_5
 	bool
-	default y       if GCC_VERSION_4_5_0
 	default y       if GCC_VERSION_4_5_1
 	default y       if GCC_VERSION_4_5_1_LINARO