KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

toolchain: get rid of gcc kconfig symbol overloading

Browse source 
SVN-Revision: 36355
This commit is contained in:
Felix Fietkau 2013-04-18 12:04:40 +00:00
parent df10e201eb
commit 39463bf146
2 changed files with 27 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
toolchain/gcc/Config.in
View file

@ -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

30
toolchain/gcc/Config.version
View file

@ -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