mr/openwrt
2
0
Fork 1
Code Issues 7 Pull Requests Releases Wiki Activity

gcc: rename linaro to 4.5-linaro

Browse Source 
SVN-Revision: 28038
This commit is contained in:
Hauke Mehrtens 2011-08-18 12:06:17 +00:00
parent 86827f4c88
commit a0c5616090
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
toolchain/gcc/Config.in
View File

@ -3,7 +3,7 @@
choice choice
prompt "GCC compiler Version" if TOOLCHAINOPTS prompt "GCC compiler Version" if TOOLCHAINOPTS
default GCC_VERSION_4_4_6 if GCC_DEFAULT_VERSION_4_4_6 default GCC_VERSION_4_4_6 if GCC_DEFAULT_VERSION_4_4_6
default GCC_VERSION_LINARO default GCC_VERSION_4_5_LINARO
help help
Select the version of gcc you wish to use. Select the version of gcc you wish to use.
@ -14,7 +14,7 @@ choice
config GCC_VERSION_4_6_1 config GCC_VERSION_4_6_1
bool "gcc 4.6.1" bool "gcc 4.6.1"
config GCC_VERSION_LINARO config GCC_VERSION_4_5_LINARO
bool "gcc 4.5.x with Linaro enhancements" bool "gcc 4.5.x with Linaro enhancements"
config GCC_VERSION_LLVM config GCC_VERSION_LLVM

12
toolchain/gcc/Config.version
View File

@ -6,7 +6,7 @@ config GCC_DEFAULT_VERSION_4_4_6
default y if (avr32 || ubicom32) default y if (avr32 || ubicom32)
bool bool
config GCC_DEFAULT_VERSION_LINARO config GCC_DEFAULT_VERSION_4_5_LINARO
default y if !(GCC_DEFAULT_VERSION) default y if !(GCC_DEFAULT_VERSION)
bool bool
@ -15,9 +15,9 @@ config GCC_VERSION
string string
default "4.4.6" if GCC_VERSION_4_4_6 default "4.4.6" if GCC_VERSION_4_4_6
default "4.6.1" if GCC_VERSION_4_6_1 default "4.6.1" if GCC_VERSION_4_6_1
default "linaro" if GCC_VERSION_LINARO default "4.5-linaro" if GCC_VERSION_4_5_LINARO
default "llvm" if GCC_VERSION_LLVM default "llvm" if GCC_VERSION_LLVM
default "linaro" default "4.5-linaro"
config GCC_VERSION_4_4 config GCC_VERSION_4_4
bool bool
@ -25,7 +25,7 @@ config GCC_VERSION_4_4
config GCC_VERSION_4_5 config GCC_VERSION_4_5
bool bool
default y if GCC_VERSION_LINARO default y if GCC_VERSION_4_5_LINARO
config GCC_VERSION_4_6 config GCC_VERSION_4_6
bool bool
@ -37,8 +37,8 @@ if !TOOLCHAINOPTS
default y if GCC_DEFAULT_VERSION_4_4_6 default y if GCC_DEFAULT_VERSION_4_4_6
bool bool
config GCC_VERSION_LINARO config GCC_VERSION_4_5_LINARO
default y if GCC_DEFAULT_VERSION_LINARO default y if GCC_DEFAULT_VERSION_4_5_LINARO
bool bool
endif endif

2
toolchain/gcc/common.mk
View File

@ -36,7 +36,7 @@ ifdef CONFIG_GCC_VERSION_LLVM
PKG_SOURCE_SUBDIR:=$(GCC_DIR) PKG_SOURCE_SUBDIR:=$(GCC_DIR)
HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/$(GCC_DIR) HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/$(GCC_DIR)
else else
ifeq ($(CONFIG_GCC_VERSION),"linaro") ifeq ($(CONFIG_GCC_VERSION),"4.5-linaro")
PKG_REV:=4.5-2011.06-0 PKG_REV:=4.5-2011.06-0
PKG_VERSION:=4.5.4 PKG_VERSION:=4.5.4
PKG_SOURCE_URL:=http://launchpad.net/gcc-linaro/4.5/$(PKG_REV)/+download/ PKG_SOURCE_URL:=http://launchpad.net/gcc-linaro/4.5/$(PKG_REV)/+download/