diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-04-18 12:04:40 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-04-18 12:04:40 +0000 |
| commit | fe05c23c0e0de6c498d37c5f133cd26c4d08d289 (patch) | |
| tree | 467f452cc7e342ec3a166b0f5489c8a596900cbd /toolchain/gcc | |
| parent | 1b8a3e5cdcfb8c6354528bb3ae8dc33f6af04267 (diff) | |
toolchain: get rid of gcc kconfig symbol overloading
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36355 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'toolchain/gcc')
| -rw-r--r-- | toolchain/gcc/Config.in | 22 | ||||
| -rw-r--r-- | toolchain/gcc/Config.version | 30 |
2 files changed, 27 insertions, 25 deletions
diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in index 7becaa8a3..e8ca94110 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 c4e646ee6..bf8b3e441 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 |