binutils: rename config option

Rename the binutils configuration option to match that one used by gcc
where the patchlevel is explicitly left out.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Gustavo Zacarias 2015-07-28 10:48:21 -03:00 committed by Thomas Petazzoni
parent 927748ecbb
commit f84cc202aa
3 changed files with 35 additions and 8 deletions

View File

@ -107,6 +107,33 @@ endif
###############################################################################
comment "Legacy options removed in 2015.08"
config BR2_BINUTILS_VERSION_2_23_2
bool "binutils 2.23 option renamed"
select BR2_LEGACY
select BR2_BINUTILS_VERSION_2_23_X
help
The binutils version option has been renamed to match the
same patchlevel logic used by gcc. The new option is now
BR2_BINUTILS_VERSION_2_23_X.
config BR2_BINUTILS_VERSION_2_24
bool "binutils 2.24 option renamed"
select BR2_LEGACY
select BR2_BINUTILS_VERSION_2_24_X
help
The binutils version option has been renamed to match the
same patchlevel logic used by gcc. The new option is now
BR2_BINUTILS_VERSION_2_24_X.
config BR2_BINUTILS_VERSION_2_25
bool "binutils 2.25 option renamed"
select BR2_LEGACY
select BR2_BINUTILS_VERSION_2_25_X
help
The binutils version option has been renamed to match the
same patchlevel logic used by gcc. The new option is now
BR2_BINUTILS_VERSION_2_25_X.
config BR2_PACKAGE_PERF
bool "perf option has been renamed"
select BR2_LEGACY

View File

@ -3,21 +3,21 @@ comment "Binutils Options"
choice
prompt "Binutils Version"
depends on !BR2_arc
default BR2_BINUTILS_VERSION_2_24
default BR2_BINUTILS_VERSION_2_24_X
help
Select the version of binutils you wish to use.
config BR2_BINUTILS_VERSION_2_23_2
config BR2_BINUTILS_VERSION_2_23_X
depends on !BR2_aarch64 && !BR2_microblaze && \
!BR2_powerpc64le && !BR2_nios2
bool "binutils 2.23.2"
config BR2_BINUTILS_VERSION_2_24
config BR2_BINUTILS_VERSION_2_24_X
# supported, but broken on Nios-II and powerpc64le
depends on !BR2_nios2 && !BR2_powerpc64le
bool "binutils 2.24"
config BR2_BINUTILS_VERSION_2_25
config BR2_BINUTILS_VERSION_2_25_X
bool "binutils 2.25"
endchoice
@ -25,9 +25,9 @@ endchoice
config BR2_BINUTILS_VERSION
string
default "arc-2015.06" if BR2_arc
default "2.23.2" if BR2_BINUTILS_VERSION_2_23_2
default "2.24" if BR2_BINUTILS_VERSION_2_24
default "2.25" if BR2_BINUTILS_VERSION_2_25
default "2.23.2" if BR2_BINUTILS_VERSION_2_23_X
default "2.24" if BR2_BINUTILS_VERSION_2_24_X
default "2.25" if BR2_BINUTILS_VERSION_2_25_X
config BR2_BINUTILS_ENABLE_LTO
bool

View File

@ -61,7 +61,7 @@ choice
# Broken or unsupported PPC cores
depends on !BR2_powerpc_power8
# gcc-4.8.x + binutils-2.25 is broken for MIPS
depends on !((BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el) && BR2_BINUTILS_VERSION_2_25)
depends on !((BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el) && BR2_BINUTILS_VERSION_2_25_X)
select BR2_GCC_NEEDS_MPC
select BR2_GCC_SUPPORTS_GRAPHITE