Skip to content

Commit

Permalink
Merge pull request #612 from stilor/linaro-4-5
Browse files Browse the repository at this point in the history
Linaro also has new 4.9 and 5.4 releases
  • Loading branch information
stilor committed Feb 21, 2017
2 parents 6b86ef9 + ab6f238 commit 21cde94
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions config/cc/gcc.in
Expand Up @@ -84,21 +84,21 @@ config CC_GCC_V_6_3_0
prompt "6.3.0"
select CC_GCC_6

config CC_GCC_V_5_4_0
config CC_GCC_V_linaro_5_4
bool
prompt "5.4.0"
prompt "linaro-5.4-2017.01 (OBSOLETE)"
depends on CC_GCC_SHOW_LINARO
depends on OBSOLETE
select CC_GCC_5

config CC_GCC_V_linaro_5_3
config CC_GCC_V_5_4_0
bool
prompt "linaro-5.3-2016.05 (OBSOLETE)"
depends on CC_GCC_SHOW_LINARO
depends on OBSOLETE
prompt "5.4.0"
select CC_GCC_5

config CC_GCC_V_linaro_4_9
bool
prompt "linaro-4.9-2016.02 (OBSOLETE)"
prompt "linaro-4.9-2017.01 (OBSOLETE)"
depends on CC_GCC_SHOW_LINARO
depends on OBSOLETE
select CC_GCC_4_9
Expand Down Expand Up @@ -190,9 +190,9 @@ config CC_GCC_VERSION
# CT_INSERT_VERSION_STRING_BELOW
default "linaro-6.3-2017.02" if CC_GCC_V_linaro_6_3
default "6.3.0" if CC_GCC_V_6_3_0
default "linaro-5.4-2017.01" if CC_GCC_V_linaro_5_4
default "5.4.0" if CC_GCC_V_5_4_0
default "linaro-5.3-2016.05" if CC_GCC_V_linaro_5_3
default "linaro-4.9-2016.02" if CC_GCC_V_linaro_4_9
default "linaro-4.9-2017.01" if CC_GCC_V_linaro_4_9
default "4.9.4" if CC_GCC_V_4_9_4
default "linaro-4.8-2015.06" if CC_GCC_V_linaro_4_8
default "4.8.5" if CC_GCC_V_4_8_5
Expand Down

0 comments on commit 21cde94

Please sign in to comment.