hak5
/
openwrt
mirror of https://github.com/hak5/openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

toolchain: get rid of gcc kconfig symbol overloading 

SVN-Revision: 36355
lede-17.01
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 choice
prompt "GCC compiler Version" if TOOLCHAINOPTS prompt "GCC compiler Version" if TOOLCHAINOPTS
default GCC_VERSION_4_4_7 if GCC_DEFAULT_VERSION_4_4_7 default GCC_USE_VERSION_4_4_7 if GCC_DEFAULT_VERSION_4_4_7
default GCC_VERSION_4_6_LINARO default GCC_USE_VERSION_4_6_LINARO
help help
Select the version of gcc you wish to use. 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" bool "gcc 4.4.7"
depends on avr32 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" 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" 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" 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" 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" bool "gcc 4.8.0"
endchoice 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 bool
config GCC_DEFAULT_VERSION_4_4_7 config GCC_VERSION_4_6_3
select GCC_DEFAULT_VERSION
default y if avr32
bool bool
config GCC_DEFAULT_VERSION_4_6_LINARO config GCC_VERSION_4_7_2
default y if !(GCC_DEFAULT_VERSION)
bool 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 config GCC_VERSION
string string
@ -37,14 +44,3 @@ config GCC_VERSION_4_8
bool bool
default y if GCC_VERSION_4_8_0 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