From: Nicolas Thill <nico@openwrt.org>
Date: Wed, 18 Aug 2010 11:04:45 +0000 (+0000)
Subject: toolchain/gcc: remove remaining references to gcc-3.4.6
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=4bd5e0e62e1b930c54093d606cd51234f93cd99d;p=openwrt%2Fstaging%2Fzorun.git

toolchain/gcc: remove remaining references to gcc-3.4.6

SVN-Revision: 22694
---

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 661da9412b..fe34613e96 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -86,7 +86,6 @@ config EXTRA_GCC_CONFIG_OPTIONS
 
 config SSP_SUPPORT
 	bool
-	depends !GCC_VERSION_3_4_6
 	prompt "Enable Stack-Smashing Protection support" if TOOLCHAINOPTS
 	default n
 	help
@@ -94,7 +93,7 @@ config SSP_SUPPORT
 
 config TLS_SUPPORT
 	bool
-	depends !GCC_VERSION_3_4_6 && UCLIBC_VERSION_NPTL
+	depends UCLIBC_VERSION_NPTL
 	prompt "Enable Thread-local storage (TLS) support" if TOOLCHAINOPTS
 	default n
 	help
diff --git a/toolchain/gcc/Config.version b/toolchain/gcc/Config.version
index f3827320f8..c4137d6af3 100644
--- a/toolchain/gcc/Config.version
+++ b/toolchain/gcc/Config.version
@@ -1,6 +1,5 @@
 config GCC_VERSION
 	string
-	default "3.4.6"     if GCC_VERSION_3_4_6
 	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
@@ -18,14 +17,6 @@ config GCC_VERSION
 	default "llvm"	    if GCC_VERSION_LLVM
 	default "4.1.2"
 
-config GCC_VERSION_3
-	bool
-	default y	if GCC_VERSION_3_4_6
-
-config GCC_VERSION_3_4
-	bool
-	default y	if GCC_VERSION_3_4_6
-
 config GCC_VERSION_4
 	bool
 	default y	if GCC_VERSION_4_1