summaryrefslogtreecommitdiff
path: root/toolchain
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2013-04-18 12:04:40 +0000
committerFelix Fietkau <nbd@openwrt.org>2013-04-18 12:04:40 +0000
commit39463bf1464b7b687a2acfeebe0cf8b3bbec7c43 (patch)
tree0a10440a996e1a5a808c25afba7fd982df940e66 /toolchain
parentdf10e201eb26edcdbfe75d8e1757f29db49126a2 (diff)
downloadmtk-20170518-39463bf1464b7b687a2acfeebe0cf8b3bbec7c43.zip
mtk-20170518-39463bf1464b7b687a2acfeebe0cf8b3bbec7c43.tar.gz
mtk-20170518-39463bf1464b7b687a2acfeebe0cf8b3bbec7c43.tar.bz2
toolchain: get rid of gcc kconfig symbol overloading
SVN-Revision: 36355
Diffstat (limited to 'toolchain')
-rw-r--r--toolchain/gcc/Config.in22
-rw-r--r--toolchain/gcc/Config.version30
2 files changed, 27 insertions, 25 deletions
diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 7becaa8..e8ca941 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -2,28 +2,34 @@
choice
prompt "GCC compiler Version" if TOOLCHAINOPTS
- default GCC_VERSION_4_4_7 if GCC_DEFAULT_VERSION_4_4_7
- default GCC_VERSION_4_6_LINARO
+ default GCC_USE_VERSION_4_4_7 if GCC_DEFAULT_VERSION_4_4_7
+ default GCC_USE_VERSION_4_6_LINARO
help
Select the version of gcc you wish to use.
- config GCC_VERSION_4_4_7
+ config GCC_USE_VERSION_4_4_7
+ select GCC_VERSION_4_4_7
bool "gcc 4.4.7"
depends on avr32
- config GCC_VERSION_4_6_3
+ config GCC_USE_VERSION_4_6_3
+ select GCC_VERSION_4_6_3
bool "gcc 4.6.3"
- config GCC_VERSION_4_7_2
+ config GCC_USE_VERSION_4_7_2
+ select GCC_VERSION_4_7_2
bool "gcc 4.7.2"
- config GCC_VERSION_4_6_LINARO
+ config GCC_USE_VERSION_4_6_LINARO
+ select GCC_VERSION_4_6_LINARO
bool "gcc 4.6.x with Linaro enhancements"
- config GCC_VERSION_4_7_LINARO
+ config GCC_USE_VERSION_4_7_LINARO
+ select GCC_VERSION_4_7_LINARO
bool "gcc 4.7.x with Linaro enhancements"
- config GCC_VERSION_4_8_0
+ config GCC_USE_VERSION_4_8_0
+ select GCC_VERSION_4_8_0
bool "gcc 4.8.0"
endchoice
diff --git a/toolchain/gcc/Config.version b/toolchain/gcc/Config.version
index c4e646e..bf8b3e4 100644
--- a/toolchain/gcc/Config.version
+++ b/toolchain/gcc/Config.version
@@ -1,15 +1,22 @@
-config GCC_DEFAULT_VERSION
+config GCC_VERSION_4_4_7
+ default y if (!TOOLCHAINOPTS && avr32)
bool
-config GCC_DEFAULT_VERSION_4_4_7
- select GCC_DEFAULT_VERSION
- default y if avr32
+config GCC_VERSION_4_6_3
bool
-config GCC_DEFAULT_VERSION_4_6_LINARO
- default y if !(GCC_DEFAULT_VERSION)
+config GCC_VERSION_4_7_2
bool
+config GCC_VERSION_4_6_LINARO
+ default y if (!TOOLCHAINOPTS && !avr32)
+ bool
+
+config GCC_VERSION_4_7_LINARO
+ bool
+
+config GCC_VERSION_4_8_0
+ bool
config GCC_VERSION
string
@@ -37,14 +44,3 @@ config GCC_VERSION_4_8
bool
default y if GCC_VERSION_4_8_0
-if !TOOLCHAINOPTS
-
- config GCC_VERSION_4_4_7
- default y if GCC_DEFAULT_VERSION_4_4_7
- bool
-
- config GCC_VERSION_4_6_LINARO
- default y if GCC_DEFAULT_VERSION_4_6_LINARO
- bool
-
-endif