EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

gcc: remove arch default duplication, fix version selection for !TOOLCHAINOPTS

Browse Source 
SVN-Revision: 25633
This commit is contained in:
Felix Fietkau 2011-02-20 22:09:51 +00:00
parent 3a12229c1d
commit ad6c7066a6
2 changed files with 38 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
toolchain/gcc/Config.in
View File

@ -2,12 +2,9 @@
choice choice
prompt "GCC compiler Version" if TOOLCHAINOPTS prompt "GCC compiler Version" if TOOLCHAINOPTS
default GCC_VERSION_4_3_5 if (avr32 || powerpc64) default GCC_VERSION_4_3_3_CS if GCC_DEFAULT_VERSION_4_3_3_CS
default GCC_VERSION_4_3_5 if (TARGET_coldfire || TARGET_etrax || TARGET_gemini || TARGET_cns21xx) default GCC_VERSION_4_3_5 if GCC_DEFAULT_VERSION_4_3_5
default GCC_VERSION_4_3_3_CS if (arm || armeb) && !(TARGET_gemini || TARGET_cns21xx || TARGET_omap35xx) default GCC_VERSION_4_4_5 if GCC_DEFAULT_VERSION_4_4_5
default GCC_VERSION_4_3_3_CS if (mips || mipsel) && !(TARGET_octeon || TARGET_sibyte)
default GCC_VERSION_4_4_5 if (powerpc || ubicom32)
default GCC_VERSION_4_4_5 if (TARGET_omap35xx || TARGET_octeon || TARGET_sibyte)
default GCC_VERSION_LINARO default GCC_VERSION_LINARO
help help
Select the version of gcc you wish to use. Select the version of gcc you wish to use.

46
toolchain/gcc/Config.version
View File

@ -1,3 +1,27 @@
config GCC_DEFAULT_VERSION
bool
config GCC_DEFAULT_VERSION_4_3_3_CS
default y if (arm || armeb) && !(TARGET_gemini || TARGET_cns21xx || TARGET_omap35xx)
default y if (mips || mipsel) && !(TARGET_octeon || TARGET_sibyte)
select GCC_DEFAULT_VERSION
bool
config GCC_DEFAULT_VERSION_4_3_5
select GCC_DEFAULT_VERSION
default y if (avr32 || powerpc64 || TARGET_coldfire || TARGET_etrax || TARGET_gemini || TARGET_cns21xx)
bool
config GCC_DEFAULT_VERSION_4_4_5
select GCC_DEFAULT_VERSION
default y if (powerpc || ubicom32 || TARGET_omap35xx || TARGET_octeon || TARGET_sibyte)
bool
config GCC_DEFAULT_VERSION_LINARO
default y if !(GCC_DEFAULT_VERSION)
bool
config GCC_VERSION config GCC_VERSION
string string
default "4.3.3+cs" if GCC_VERSION_4_3_3_CS default "4.3.3+cs" if GCC_VERSION_4_3_3_CS
@ -27,20 +51,20 @@ config GCC_VERSION_4_5
if !TOOLCHAINOPTS if !TOOLCHAINOPTS
config GCC_VERSION_4_3_3_CS config GCC_VERSION_4_3_3_CS
default y if (mips || mipsel) && !(TARGET_octeon || TARGET_sibyte) default y if GCC_DEFAULT_VERSION_4_3_3_CS
default y if (arm || armeb) && !(TARGET_gemini || TARGET_cns21xx || TARGET_omap35xx) bool
config GCC_VERSION_4_3_5 config GCC_VERSION_4_3_5
default y if avr32 default y if GCC_DEFAULT_VERSION_4_3_5
default y if powerpc64 bool
default y if TARGET_etrax
default y if TARGET_coldfire
default y if TARGET_gemini
default y if TARGET_cns21xx
config GCC_VERSION_4_4_5 config GCC_VERSION_4_4_5
default y if (TARGET_octeon || TARGET_sibyte || TARGET_omap35xx) default y if GCC_DEFAULT_VERSION_4_4_5
default y if powerpc bool
default y if ubicom32
config GCC_VERSION_LINARO
default y if GCC_DEFAULT_VERSION_LINARO
bool
endif endif