diff options
Diffstat (limited to 'conf/distro/include/sane-toolchain.inc')
| -rw-r--r-- | conf/distro/include/sane-toolchain.inc | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/conf/distro/include/sane-toolchain.inc b/conf/distro/include/sane-toolchain.inc index daa2deff29..de739226c0 100644 --- a/conf/distro/include/sane-toolchain.inc +++ b/conf/distro/include/sane-toolchain.inc @@ -5,23 +5,20 @@ ############################################################################# # Base line versions, good for most things -PREFERRED_GCC_VERSION ?= "4.4.2" -PREFERRED_BINUTILS ?= "2.20" +PREFERRED_GCC_VERSION ?= "4.4.4" +PREFERRED_BINUTILS ?= "2.20.1" # Prefer glibc 2.6 and uclibc 0.9.30, these have had the most testing. PREFERRED_VERSION_glibc ?= "2.10.1" PREFERRED_VERSION_glibc-initial ?= "2.10.1" -PREFERRED_VERSION_eglibc ?= "2.10" -PREFERRED_VERSION_eglibc-initial ?= "2.10" -PREFERRED_VERSION_uclibc ?= "0.9.30.1" -PREFERRED_VERSION_uclibc-initial ?= "0.9.30.1" +PREFERRED_VERSION_eglibc ?= "2.11" +PREFERRED_VERSION_eglibc-initial ?= "2.11" +PREFERRED_UCLIBC_VERSION ?= "0.9.31" # Some systems need a special gcc version PREFERRED_GCC_VERSION_486sx ?= "4.3.2" PREFERRED_GCC_VERSION_avr32 ?= "4.2.2" -PREFERRED_GCC_VERSION_armv7a ?= "4.4.1" PREFERRED_GCC_VERSION_bfin ?= "4.1.2" -PREFERRED_GCC_VERSION_ppc405 ?= "4.4.1" PREFERRED_GCC_VERSION_xilinx-ml403 ?= "4.1.1" PREFERRED_GCC_VERSION_xilinx-ml403 ?= "4.1.1" @@ -142,13 +139,13 @@ ENABLE_BINARY_LOCALE_GENERATION_armv7a = "0" #qemu has taken a dislike to armeb as well ENABLE_BINARY_LOCALE_GENERATION_armeb = "0" def detect_arm_abi (d): - import bb + import bb if bb.data.getVar('DISTRO_FEATURES',d) is None: if bb.data.getVar('TARGET_ARCH', d, 1) in [ 'arm', 'armeb' ]: return "oabi" else: return "" - if bb.data.getVar('TARGET_ARCH', d, 1) in [ 'arm', 'armeb' ]: + if bb.data.getVar('TARGET_ARCH', d, 1) in [ 'arm', 'armeb' ]: if 'eabi' in bb.data.getVar('DISTRO_FEATURES',d).split(): return "eabi" return "oabi" @@ -156,12 +153,11 @@ def detect_arm_abi (d): def compute_os_portion_of_target_triplet (d): import bb - arm_eabi_supporting_arches = "armv6 armv6-novfp \ - armv5te iwmmxt armv7a armv7 armv5teb armv4t" + arm_eabi_unsupported_arches = "armv1 armv2 armv3" ppc_spe_supporting_arches = "ppce500v2 ppce500" gnu_suffix = "" - if bb.data.getVar('LIBC', d, 1) == "uclibc": - libc_suffix = "uclibc" + if bb.data.getVar('LIBC', d, 1) == "uclibc": + libc_suffix = "uclibc" else: libc_suffix = "" @@ -171,14 +167,14 @@ def compute_os_portion_of_target_triplet (d): else: os_suffix = "uclinux" else: - os_suffix = "linux" + os_suffix = "linux" bparch = bb.data.getVar('BASE_PACKAGE_ARCH', d,1) if bb.data.getVar('DISTRO_FEATURES',d,1) is not None and \ bparch is not None: if 'eabi' in bb.data.getVar('DISTRO_FEATURES',d,1).split() and \ bb.data.getVar('TARGET_ARCH', d, 1) in [ 'arm', 'armeb' ]: - if bparch not in arm_eabi_supporting_arches.split(): + if bparch in arm_eabi_unsupported_arches.split(): bb.fatal("DISTRO requested EABI but selected machine does not support EABI") abi_suffix = "" else: |