summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/bitbake.conf30
-rw-r--r--meta/conf/distro/defaultsetup.conf2
-rw-r--r--meta/conf/distro/include/tclibc-glibc.inc6
-rw-r--r--meta/conf/machine/include/arm/arch-arm.inc2
-rw-r--r--meta/conf/machine/include/arm/arch-arm64.inc2
-rw-r--r--meta/conf/machine/include/arm/feature-arm-thumb.inc10
-rw-r--r--meta/conf/machine/include/arm/feature-arm-vfp.inc10
-rw-r--r--meta/conf/machine/include/mips/feature-mips-mips16e.inc6
-rw-r--r--meta/conf/multilib.conf2
9 files changed, 35 insertions, 35 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 1472e8f847..aee9919bad 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -123,7 +123,7 @@ SDKUSE_NLS ??= "yes"
123TARGET_ARCH = "${TUNE_ARCH}" 123TARGET_ARCH = "${TUNE_ARCH}"
124TARGET_OS = "linux${LIBCEXTENSION}${ABIEXTENSION}" 124TARGET_OS = "linux${LIBCEXTENSION}${ABIEXTENSION}"
125TARGET_VENDOR = "-oe" 125TARGET_VENDOR = "-oe"
126TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}${@['-' + d.getVar('TARGET_OS', True), ''][d.getVar('TARGET_OS', True) == ('' or 'custom')]}" 126TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}${@['-' + d.getVar('TARGET_OS'), ''][d.getVar('TARGET_OS') == ('' or 'custom')]}"
127TARGET_PREFIX = "${TARGET_SYS}-" 127TARGET_PREFIX = "${TARGET_SYS}-"
128TARGET_CC_ARCH = "${TUNE_CCARGS}" 128TARGET_CC_ARCH = "${TUNE_CCARGS}"
129TARGET_LD_ARCH = "${TUNE_LDARGS}" 129TARGET_LD_ARCH = "${TUNE_LDARGS}"
@@ -132,7 +132,7 @@ TARGET_AS_ARCH = "${TUNE_ASARGS}"
132SDKMACHINE ??= "x86_64" 132SDKMACHINE ??= "x86_64"
133SDK_OS = "${BUILD_OS}" 133SDK_OS = "${BUILD_OS}"
134SDK_VENDOR = "-oesdk" 134SDK_VENDOR = "-oesdk"
135SDK_SYS = "${SDK_ARCH}${SDK_VENDOR}${@['-' + d.getVar('SDK_OS', True), ''][d.getVar('SDK_OS', True) == ('' or 'custom')]}" 135SDK_SYS = "${SDK_ARCH}${SDK_VENDOR}${@['-' + d.getVar('SDK_OS'), ''][d.getVar('SDK_OS') == ('' or 'custom')]}"
136SDK_PREFIX = "${SDK_SYS}-" 136SDK_PREFIX = "${SDK_SYS}-"
137SDK_CC_ARCH = "${BUILD_CC_ARCH}" 137SDK_CC_ARCH = "${BUILD_CC_ARCH}"
138SDKPKGSUFFIX = "nativesdk" 138SDKPKGSUFFIX = "nativesdk"
@@ -142,7 +142,7 @@ SDK_AS_ARCH = "${BUILD_AS_ARCH}"
142 142
143TUNE_PKGARCH ??= "" 143TUNE_PKGARCH ??= ""
144PACKAGE_ARCH ??= "${TUNE_PKGARCH}" 144PACKAGE_ARCH ??= "${TUNE_PKGARCH}"
145MACHINE_ARCH = "${@[d.getVar('TUNE_PKGARCH', True), d.getVar('MACHINE', True)][bool(d.getVar('MACHINE', True))].replace('-', '_')}" 145MACHINE_ARCH = "${@[d.getVar('TUNE_PKGARCH'), d.getVar('MACHINE')][bool(d.getVar('MACHINE'))].replace('-', '_')}"
146PACKAGE_EXTRA_ARCHS ??= "${PACKAGE_EXTRA_ARCHS_tune-${DEFAULTTUNE}}" 146PACKAGE_EXTRA_ARCHS ??= "${PACKAGE_EXTRA_ARCHS_tune-${DEFAULTTUNE}}"
147PACKAGE_ARCHS = "all any noarch ${PACKAGE_EXTRA_ARCHS} ${MACHINE_ARCH}" 147PACKAGE_ARCHS = "all any noarch ${PACKAGE_EXTRA_ARCHS} ${MACHINE_ARCH}"
148# MACHINE_ARCH shouldn't be included here as a variable dependency 148# MACHINE_ARCH shouldn't be included here as a variable dependency
@@ -197,24 +197,24 @@ PV = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE', False),d)[1] or '1.0
197PR = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE', False),d)[2] or 'r0'}" 197PR = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE', False),d)[2] or 'r0'}"
198PE = "" 198PE = ""
199PF = "${PN}-${EXTENDPE}${PV}-${PR}" 199PF = "${PN}-${EXTENDPE}${PV}-${PR}"
200EXTENDPE = "${@['','${PE}_'][int(d.getVar('PE', True) or 0) > 0]}" 200EXTENDPE = "${@['','${PE}_'][int(d.getVar('PE') or 0) > 0]}"
201P = "${PN}-${PV}" 201P = "${PN}-${PV}"
202 202
203PRAUTO = "" 203PRAUTO = ""
204EXTENDPRAUTO = "${@['.${PRAUTO}', ''][not d.getVar('PRAUTO', True)]}" 204EXTENDPRAUTO = "${@['.${PRAUTO}', ''][not d.getVar('PRAUTO')]}"
205PRAUTOINX = "${PF}" 205PRAUTOINX = "${PF}"
206 206
207PKGV ?= "${PV}" 207PKGV ?= "${PV}"
208PKGR ?= "${PR}${EXTENDPRAUTO}" 208PKGR ?= "${PR}${EXTENDPRAUTO}"
209PKGE ?= "${@['','${PE}'][int(d.getVar('PE', True) or 0) > 0]}" 209PKGE ?= "${@['','${PE}'][int(d.getVar('PE') or 0) > 0]}"
210EXTENDPKGEVER = "${@['','${PKGE}:'][d.getVar('PKGE', True).strip() != '']}" 210EXTENDPKGEVER = "${@['','${PKGE}:'][d.getVar('PKGE').strip() != '']}"
211EXTENDPKGV ?= "${EXTENDPKGEVER}${PKGV}-${PKGR}" 211EXTENDPKGV ?= "${EXTENDPKGEVER}${PKGV}-${PKGR}"
212 212
213# Base package name 213# Base package name
214# Automatically derives "foo" from "foo-native", "foo-cross" or "foo-initial" 214# Automatically derives "foo" from "foo-native", "foo-cross" or "foo-initial"
215# otherwise it is the same as PN and P 215# otherwise it is the same as PN and P
216SPECIAL_PKGSUFFIX = "-native -cross -initial -intermediate -crosssdk -cross-canadian" 216SPECIAL_PKGSUFFIX = "-native -cross -initial -intermediate -crosssdk -cross-canadian"
217BPN = "${@base_prune_suffix(d.getVar('PN', True), d.getVar('SPECIAL_PKGSUFFIX', True).split(), d)}" 217BPN = "${@base_prune_suffix(d.getVar('PN'), d.getVar('SPECIAL_PKGSUFFIX').split(), d)}"
218BP = "${BPN}-${PV}" 218BP = "${BPN}-${PV}"
219 219
220# Package info. 220# Package info.
@@ -330,7 +330,7 @@ FILESEXTRAPATHS ?= "__default:"
330################################################################## 330##################################################################
331 331
332TMPDIR ?= "${TOPDIR}/tmp" 332TMPDIR ?= "${TOPDIR}/tmp"
333CACHE = "${TMPDIR}/cache${@['', '/' + str(d.getVar('MACHINE', True))][bool(d.getVar('MACHINE', True))]}${@['', '/' + str(d.getVar('SDKMACHINE', True))][bool(d.getVar('SDKMACHINE', True))]}" 333CACHE = "${TMPDIR}/cache${@['', '/' + str(d.getVar('MACHINE'))][bool(d.getVar('MACHINE'))]}${@['', '/' + str(d.getVar('SDKMACHINE'))][bool(d.getVar('SDKMACHINE'))]}"
334# The persistent cache should be shared by all builds 334# The persistent cache should be shared by all builds
335PERSISTENT_DIR = "${TOPDIR}/cache" 335PERSISTENT_DIR = "${TOPDIR}/cache"
336LOG_DIR = "${TMPDIR}/log" 336LOG_DIR = "${TMPDIR}/log"
@@ -455,7 +455,7 @@ export PATH
455CCACHE ??= "" 455CCACHE ??= ""
456# Disable ccache explicitly if CCACHE is null since gcc may be a symlink 456# Disable ccache explicitly if CCACHE is null since gcc may be a symlink
457# of ccache some distributions (e.g., Fedora 17). 457# of ccache some distributions (e.g., Fedora 17).
458export CCACHE_DISABLE ??= "${@[0,1][d.getVar('CCACHE', True) == '']}" 458export CCACHE_DISABLE ??= "${@[0,1][d.getVar('CCACHE') == '']}"
459# ccache < 3.1.10 will create CCACHE_DIR on startup even if disabled, and 459# ccache < 3.1.10 will create CCACHE_DIR on startup even if disabled, and
460# autogen sets HOME=/dev/null so in certain situations builds can fail. 460# autogen sets HOME=/dev/null so in certain situations builds can fail.
461# Explicitly export CCACHE_DIR until we can assume ccache >3.1.10 on the host. 461# Explicitly export CCACHE_DIR until we can assume ccache >3.1.10 on the host.
@@ -535,7 +535,7 @@ LINKER_HASH_STYLE ??= "gnu"
535# mips does not support GNU hash style therefore we override 535# mips does not support GNU hash style therefore we override
536LINKER_HASH_STYLE_mipsarch = "sysv" 536LINKER_HASH_STYLE_mipsarch = "sysv"
537 537
538TARGET_LINK_HASH_STYLE ?= "${@['-Wl,--hash-style=gnu',''][d.getVar('LINKER_HASH_STYLE', True) != 'gnu']}" 538TARGET_LINK_HASH_STYLE ?= "${@['-Wl,--hash-style=gnu',''][d.getVar('LINKER_HASH_STYLE') != 'gnu']}"
539 539
540export LDFLAGS = "${TARGET_LDFLAGS}" 540export LDFLAGS = "${TARGET_LDFLAGS}"
541export TARGET_LDFLAGS = "-Wl,-O1 ${TARGET_LINK_HASH_STYLE}" 541export TARGET_LDFLAGS = "-Wl,-O1 ${TARGET_LINK_HASH_STYLE}"
@@ -561,7 +561,7 @@ DEBUG_FLAGS ?= "-g -feliminate-unused-debug-types ${DEBUG_PREFIX_MAP}"
561# Disabled until the option works properly -feliminate-dwarf2-dups 561# Disabled until the option works properly -feliminate-dwarf2-dups
562FULL_OPTIMIZATION = "-O2 -pipe ${DEBUG_FLAGS}" 562FULL_OPTIMIZATION = "-O2 -pipe ${DEBUG_FLAGS}"
563DEBUG_OPTIMIZATION = "-O -fno-omit-frame-pointer ${DEBUG_FLAGS} -pipe" 563DEBUG_OPTIMIZATION = "-O -fno-omit-frame-pointer ${DEBUG_FLAGS} -pipe"
564SELECTED_OPTIMIZATION = "${@d.getVar(['FULL_OPTIMIZATION', 'DEBUG_OPTIMIZATION'][d.getVar('DEBUG_BUILD', True) == '1'], True)}" 564SELECTED_OPTIMIZATION = "${@d.getVar(['FULL_OPTIMIZATION', 'DEBUG_OPTIMIZATION'][d.getVar('DEBUG_BUILD') == '1'], True)}"
565SELECTED_OPTIMIZATION[vardeps] += "FULL_OPTIMIZATION DEBUG_OPTIMIZATION" 565SELECTED_OPTIMIZATION[vardeps] += "FULL_OPTIMIZATION DEBUG_OPTIMIZATION"
566BUILD_OPTIMIZATION = "-O2 -pipe" 566BUILD_OPTIMIZATION = "-O2 -pipe"
567 567
@@ -687,7 +687,7 @@ DISTRO_NAME ??= "OpenEmbedded"
687OVERRIDES = "${TARGET_OS}:${TRANSLATED_TARGET_ARCH}:build-${BUILD_OS}:pn-${PN}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:${CLASSOVERRIDE}:forcevariable" 687OVERRIDES = "${TARGET_OS}:${TRANSLATED_TARGET_ARCH}:build-${BUILD_OS}:pn-${PN}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:${CLASSOVERRIDE}:forcevariable"
688OVERRIDES[vardepsexclude] = "MACHINEOVERRIDES" 688OVERRIDES[vardepsexclude] = "MACHINEOVERRIDES"
689CLASSOVERRIDE ?= "class-target" 689CLASSOVERRIDE ?= "class-target"
690DISTROOVERRIDES ?= "${@d.getVar('DISTRO', True) or ''}" 690DISTROOVERRIDES ?= "${@d.getVar('DISTRO') or ''}"
691MACHINEOVERRIDES ?= "${MACHINE}" 691MACHINEOVERRIDES ?= "${MACHINE}"
692MACHINEOVERRIDES[vardepsexclude] = "MACHINE" 692MACHINEOVERRIDES[vardepsexclude] = "MACHINE"
693 693
@@ -773,7 +773,7 @@ COMBINED_FEATURES = "${@oe.utils.set_intersect('DISTRO_FEATURES', 'MACHINE_FEATU
773COMBINED_FEATURES[vardeps] += "DISTRO_FEATURES MACHINE_FEATURES" 773COMBINED_FEATURES[vardeps] += "DISTRO_FEATURES MACHINE_FEATURES"
774 774
775SERIAL_CONSOLE ??= "" 775SERIAL_CONSOLE ??= ""
776SERIAL_CONSOLES ??= "${@d.getVar('SERIAL_CONSOLE', True).replace(' ', ';')}" 776SERIAL_CONSOLES ??= "${@d.getVar('SERIAL_CONSOLE').replace(' ', ';')}"
777 777
778NO_RECOMMENDATIONS ?= "" 778NO_RECOMMENDATIONS ?= ""
779BAD_RECOMMENDATIONS ?= "" 779BAD_RECOMMENDATIONS ?= ""
@@ -797,7 +797,7 @@ DISTRO[unexport] = "1"
797SHELL[unexport] = "1" 797SHELL[unexport] = "1"
798 798
799# Used by canadian-cross to handle string conversions on TARGET_ARCH where needed 799# Used by canadian-cross to handle string conversions on TARGET_ARCH where needed
800TRANSLATED_TARGET_ARCH ??= "${@d.getVar('TARGET_ARCH', True).replace("_", "-")}" 800TRANSLATED_TARGET_ARCH ??= "${@d.getVar('TARGET_ARCH').replace("_", "-")}"
801 801
802# Complete output from bitbake 802# Complete output from bitbake
803BB_CONSOLELOG ?= "${LOG_DIR}/cooker/${MACHINE}/${DATETIME}.log" 803BB_CONSOLELOG ?= "${LOG_DIR}/cooker/${MACHINE}/${DATETIME}.log"
diff --git a/meta/conf/distro/defaultsetup.conf b/meta/conf/distro/defaultsetup.conf
index aa21345a1c..1055b9bb93 100644
--- a/meta/conf/distro/defaultsetup.conf
+++ b/meta/conf/distro/defaultsetup.conf
@@ -15,7 +15,7 @@ require conf/distro/include/uninative-flags.inc
15TCLIBCAPPEND ?= "-${TCLIBC}" 15TCLIBCAPPEND ?= "-${TCLIBC}"
16TMPDIR .= "${TCLIBCAPPEND}" 16TMPDIR .= "${TCLIBCAPPEND}"
17 17
18CACHE = "${TMPDIR}/cache/${TCMODE}-${TCLIBC}${@['', '/' + str(d.getVar('MACHINE', True))][bool(d.getVar('MACHINE', True))]}${@['', '/' + str(d.getVar('SDKMACHINE', True))][bool(d.getVar('SDKMACHINE', True))]}" 18CACHE = "${TMPDIR}/cache/${TCMODE}-${TCLIBC}${@['', '/' + str(d.getVar('MACHINE'))][bool(d.getVar('MACHINE'))]}${@['', '/' + str(d.getVar('SDKMACHINE'))][bool(d.getVar('SDKMACHINE'))]}"
19 19
20USER_CLASSES ?= "" 20USER_CLASSES ?= ""
21PACKAGE_CLASSES ?= "package_ipk" 21PACKAGE_CLASSES ?= "package_ipk"
diff --git a/meta/conf/distro/include/tclibc-glibc.inc b/meta/conf/distro/include/tclibc-glibc.inc
index 649918fd2b..ad8000f5de 100644
--- a/meta/conf/distro/include/tclibc-glibc.inc
+++ b/meta/conf/distro/include/tclibc-glibc.inc
@@ -2,7 +2,7 @@
2# glibc specific configuration 2# glibc specific configuration
3# 3#
4 4
5LIBCEXTENSION = "${@['', '-gnu'][(d.getVar('ABIEXTENSION', True) or '') != '']}" 5LIBCEXTENSION = "${@['', '-gnu'][(d.getVar('ABIEXTENSION') or '') != '']}"
6 6
7# Add glibc overrides to the overrides for glibc. 7# Add glibc overrides to the overrides for glibc.
8LIBCOVERRIDE = ":libc-glibc" 8LIBCOVERRIDE = ":libc-glibc"
@@ -34,7 +34,7 @@ LIBC_LOCALE_DEPENDENCIES = "\
34 glibc-gconv-iso8859-15" 34 glibc-gconv-iso8859-15"
35 35
36def get_libc_locales_dependencies(d): 36def get_libc_locales_dependencies(d):
37 if 'libc-locales' in (d.getVar('DISTRO_FEATURES', True) or '').split() : 37 if 'libc-locales' in (d.getVar('DISTRO_FEATURES') or '').split() :
38 return d.getVar('LIBC_LOCALE_DEPENDENCIES', True) or '' 38 return d.getVar('LIBC_LOCALE_DEPENDENCIES') or ''
39 else: 39 else:
40 return '' 40 return ''
diff --git a/meta/conf/machine/include/arm/arch-arm.inc b/meta/conf/machine/include/arm/arch-arm.inc
index 2e3127c799..99625d8417 100644
--- a/meta/conf/machine/include/arm/arch-arm.inc
+++ b/meta/conf/machine/include/arm/arch-arm.inc
@@ -13,4 +13,4 @@ TUNE_PKGARCH = "${ARMPKGARCH}${ARMPKGSFX_THUMB}${ARMPKGSFX_DSP}${ARMPKGSFX_EABI}
13 13
14ABIEXTENSION = "eabi" 14ABIEXTENSION = "eabi"
15 15
16TARGET_FPU = "${@d.getVar('TUNE_CCARGS_MFLOAT', True) or 'soft'}" 16TARGET_FPU = "${@d.getVar('TUNE_CCARGS_MFLOAT') or 'soft'}"
diff --git a/meta/conf/machine/include/arm/arch-arm64.inc b/meta/conf/machine/include/arm/arch-arm64.inc
index 9eeffac812..5f90763f7f 100644
--- a/meta/conf/machine/include/arm/arch-arm64.inc
+++ b/meta/conf/machine/include/arm/arch-arm64.inc
@@ -28,7 +28,7 @@ TARGET_FPU_64 = ""
28TUNE_ARCH_32 = "${@bb.utils.contains('TUNE_FEATURES', 'bigendian', 'armeb', 'arm', d)}" 28TUNE_ARCH_32 = "${@bb.utils.contains('TUNE_FEATURES', 'bigendian', 'armeb', 'arm', d)}"
29TUNE_PKGARCH_32 = "${ARMPKGARCH}${ARMPKGSFX_THUMB}${ARMPKGSFX_DSP}${ARMPKGSFX_EABI}${ARMPKGSFX_ENDIAN}${ARMPKGSFX_FPU}" 29TUNE_PKGARCH_32 = "${ARMPKGARCH}${ARMPKGSFX_THUMB}${ARMPKGSFX_DSP}${ARMPKGSFX_EABI}${ARMPKGSFX_ENDIAN}${ARMPKGSFX_FPU}"
30ABIEXTENSION_32 = "eabi" 30ABIEXTENSION_32 = "eabi"
31TARGET_FPU_32 = "${@d.getVar('TUNE_CCARGS_MFLOAT', True) or 'soft'}" 31TARGET_FPU_32 = "${@d.getVar('TUNE_CCARGS_MFLOAT') or 'soft'}"
32 32
33TUNE_ARCH = "${@bb.utils.contains('TUNE_FEATURES', 'aarch64', '${TUNE_ARCH_64}', '${TUNE_ARCH_32}' ,d)}" 33TUNE_ARCH = "${@bb.utils.contains('TUNE_FEATURES', 'aarch64', '${TUNE_ARCH_64}', '${TUNE_ARCH_32}' ,d)}"
34TUNE_PKGARCH = "${@bb.utils.contains('TUNE_FEATURES', 'aarch64', '${TUNE_PKGARCH_64}', '${TUNE_PKGARCH_32}' ,d)}" 34TUNE_PKGARCH = "${@bb.utils.contains('TUNE_FEATURES', 'aarch64', '${TUNE_PKGARCH_64}', '${TUNE_PKGARCH_32}' ,d)}"
diff --git a/meta/conf/machine/include/arm/feature-arm-thumb.inc b/meta/conf/machine/include/arm/feature-arm-thumb.inc
index 1faebf7c26..6d4747b21a 100644
--- a/meta/conf/machine/include/arm/feature-arm-thumb.inc
+++ b/meta/conf/machine/include/arm/feature-arm-thumb.inc
@@ -1,5 +1,5 @@
1TUNEVALID[thumb] = "Use thumb instructions instead of ARM" 1TUNEVALID[thumb] = "Use thumb instructions instead of ARM"
2ARM_THUMB_OPT = "${@['arm', 'thumb'][d.getVar('ARM_INSTRUCTION_SET', True) == 'thumb']}" 2ARM_THUMB_OPT = "${@['arm', 'thumb'][d.getVar('ARM_INSTRUCTION_SET') == 'thumb']}"
3ARM_THUMB_SUFFIX .= "${@bb.utils.contains('TUNE_FEATURES', 'armv4', 't', '', d)}" 3ARM_THUMB_SUFFIX .= "${@bb.utils.contains('TUNE_FEATURES', 'armv4', 't', '', d)}"
4ARM_THUMB_SUFFIX .= "${@bb.utils.contains('TUNE_FEATURES', 'armv5', 't', '', d)}" 4ARM_THUMB_SUFFIX .= "${@bb.utils.contains('TUNE_FEATURES', 'armv5', 't', '', d)}"
5ARM_THUMB_SUFFIX .= "${@bb.utils.contains('TUNE_FEATURES', 'armv6', 't', '', d)}" 5ARM_THUMB_SUFFIX .= "${@bb.utils.contains('TUNE_FEATURES', 'armv6', 't', '', d)}"
@@ -15,19 +15,19 @@ ARM_M_OPT = "${@bb.utils.contains('TUNE_FEATURES', 'arm', '${ARM_THUMB_OPT}', 't
15python () { 15python () {
16 if bb.utils.contains('TUNE_FEATURES', 'thumb', False, True, d): 16 if bb.utils.contains('TUNE_FEATURES', 'thumb', False, True, d):
17 return 17 return
18 selected = d.getVar('ARM_INSTRUCTION_SET', True) 18 selected = d.getVar('ARM_INSTRUCTION_SET')
19 if selected == None: 19 if selected == None:
20 return 20 return
21 used = d.getVar('ARM_M_OPT', True) 21 used = d.getVar('ARM_M_OPT')
22 if selected != used: 22 if selected != used:
23 pn = d.getVar('PN', True) 23 pn = d.getVar('PN')
24 bb.warn("Recipe '%s' selects ARM_INSTRUCTION_SET to be '%s', but tune configuration overrides it to '%s'" % (pn, selected, used)) 24 bb.warn("Recipe '%s' selects ARM_INSTRUCTION_SET to be '%s', but tune configuration overrides it to '%s'" % (pn, selected, used))
25} 25}
26 26
27TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'thumb', ' -m${ARM_M_OPT}', '', d)}" 27TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'thumb', ' -m${ARM_M_OPT}', '', d)}"
28 28
29# Add suffix from ARM_THUMB_SUFFIX only if after all this we still set ARM_M_OPT to thumb 29# Add suffix from ARM_THUMB_SUFFIX only if after all this we still set ARM_M_OPT to thumb
30ARMPKGSFX_THUMB .= "${@bb.utils.contains('TUNE_FEATURES', 'thumb', '${ARM_THUMB_SUFFIX}', '', d) if d.getVar('ARM_M_OPT', True) == 'thumb' else ''}" 30ARMPKGSFX_THUMB .= "${@bb.utils.contains('TUNE_FEATURES', 'thumb', '${ARM_THUMB_SUFFIX}', '', d) if d.getVar('ARM_M_OPT') == 'thumb' else ''}"
31 31
32# what about armv7m devices which don't support -marm (e.g. Cortex-M3)? 32# what about armv7m devices which don't support -marm (e.g. Cortex-M3)?
33TARGET_CC_KERNEL_ARCH += "${@bb.utils.contains('TUNE_FEATURES', 'thumb', '-mno-thumb-interwork -marm', '', d)}" 33TARGET_CC_KERNEL_ARCH += "${@bb.utils.contains('TUNE_FEATURES', 'thumb', '-mno-thumb-interwork -marm', '', d)}"
diff --git a/meta/conf/machine/include/arm/feature-arm-vfp.inc b/meta/conf/machine/include/arm/feature-arm-vfp.inc
index 9ef31e70e2..667b60910a 100644
--- a/meta/conf/machine/include/arm/feature-arm-vfp.inc
+++ b/meta/conf/machine/include/arm/feature-arm-vfp.inc
@@ -5,10 +5,10 @@
5TUNEVALID[vfp] = "Enable Vector Floating Point (vfp) unit." 5TUNEVALID[vfp] = "Enable Vector Floating Point (vfp) unit."
6TUNE_CCARGS_MFPU .= "${@bb.utils.contains('TUNE_FEATURES', 'vfp', ' vfp', '', d)}" 6TUNE_CCARGS_MFPU .= "${@bb.utils.contains('TUNE_FEATURES', 'vfp', ' vfp', '', d)}"
7 7
8TUNE_CCARGS .= "${@ (' -mfpu=%s ' % d.getVar('TUNE_CCARGS_MFPU', True).split()[-1]) if (d.getVar('TUNE_CCARGS_MFPU', True) != '') else ''}" 8TUNE_CCARGS .= "${@ (' -mfpu=%s ' % d.getVar('TUNE_CCARGS_MFPU').split()[-1]) if (d.getVar('TUNE_CCARGS_MFPU') != '') else ''}"
9ARMPKGSFX_FPU = "${@ ('-%s' % d.getVar('TUNE_CCARGS_MFPU', True).split()[-1].replace('vfpv3-d16', 'vfpv3d16')) if (d.getVar('TUNE_CCARGS_MFPU', True) != '') else ''}" 9ARMPKGSFX_FPU = "${@ ('-%s' % d.getVar('TUNE_CCARGS_MFPU').split()[-1].replace('vfpv3-d16', 'vfpv3d16')) if (d.getVar('TUNE_CCARGS_MFPU') != '') else ''}"
10 10
11TUNEVALID[callconvention-hard] = "Enable EABI hard float call convention, requires VFP." 11TUNEVALID[callconvention-hard] = "Enable EABI hard float call convention, requires VFP."
12TUNE_CCARGS_MFLOAT = "${@ bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', 'hard', 'softfp', d) if (d.getVar('TUNE_CCARGS_MFPU', True) != '') else '' }" 12TUNE_CCARGS_MFLOAT = "${@ bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', 'hard', 'softfp', d) if (d.getVar('TUNE_CCARGS_MFPU') != '') else '' }"
13TUNE_CCARGS .= "${@ ' -mfloat-abi=${TUNE_CCARGS_MFLOAT}' if (d.getVar('TUNE_CCARGS_MFLOAT', True) != '') else ''}" 13TUNE_CCARGS .= "${@ ' -mfloat-abi=${TUNE_CCARGS_MFLOAT}' if (d.getVar('TUNE_CCARGS_MFLOAT') != '') else ''}"
14ARMPKGSFX_EABI = "${@ 'hf' if (d.getVar('TUNE_CCARGS_MFLOAT', True) == 'hard') else ''}" 14ARMPKGSFX_EABI = "${@ 'hf' if (d.getVar('TUNE_CCARGS_MFLOAT') == 'hard') else ''}"
diff --git a/meta/conf/machine/include/mips/feature-mips-mips16e.inc b/meta/conf/machine/include/mips/feature-mips-mips16e.inc
index 05011dec41..101d5331bc 100644
--- a/meta/conf/machine/include/mips/feature-mips-mips16e.inc
+++ b/meta/conf/machine/include/mips/feature-mips-mips16e.inc
@@ -1,8 +1,8 @@
1TUNEVALID[mips16e] = "Build target packages with MIPS16e ASE instructions" 1TUNEVALID[mips16e] = "Build target packages with MIPS16e ASE instructions"
2MIPS_MIPS16E_OPT = "${@['mno-mips16', 'mips16'][d.getVar('MIPS_INSTRUCTION_SET', True) == 'mips16e']}" 2MIPS_MIPS16E_OPT = "${@['mno-mips16', 'mips16'][d.getVar('MIPS_INSTRUCTION_SET') == 'mips16e']}"
3TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'mips16e', ' -${MIPS_MIPS16E_OPT}', '', d)}" 3TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'mips16e', ' -${MIPS_MIPS16E_OPT}', '', d)}"
4 4
5MIPSPKGSFX_MIPS16E .= "${@bb.utils.contains('TUNE_FEATURES', 'mips16e', '-m16', '', d) if d.getVar('MIPS_MIPS16E_OPT', True) == 'mips16' else ''}" 5MIPSPKGSFX_MIPS16E .= "${@bb.utils.contains('TUNE_FEATURES', 'mips16e', '-m16', '', d) if d.getVar('MIPS_MIPS16E_OPT') == 'mips16' else ''}"
6 6
7# Whether to compile with code to allow interworking between the two 7# Whether to compile with code to allow interworking between the two
8# instruction sets. This allows mips16e code to be executed on a primarily 8# instruction sets. This allows mips16e code to be executed on a primarily
@@ -14,4 +14,4 @@ TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'mips16e', ' ${MIPS16_TUNE
14OVERRIDES .= "${@bb.utils.contains('TUNE_FEATURES', 'mips16e', ':mips16e', '', d)}" 14OVERRIDES .= "${@bb.utils.contains('TUNE_FEATURES', 'mips16e', ':mips16e', '', d)}"
15 15
16# show status (if compiling in MIPS16e mode) 16# show status (if compiling in MIPS16e mode)
17BUILDCFG_VARS += "${@['', 'MIPS_INSTRUCTION_SET'][d.getVar('MIPS_INSTRUCTION_SET', True) == 'mips16e']}" 17BUILDCFG_VARS += "${@['', 'MIPS_INSTRUCTION_SET'][d.getVar('MIPS_INSTRUCTION_SET') == 'mips16e']}"
diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
index 1403a034a6..ce97d5d014 100644
--- a/meta/conf/multilib.conf
+++ b/meta/conf/multilib.conf
@@ -1,5 +1,5 @@
1 1
2baselib = "${@d.getVar('BASE_LIB_tune-' + (d.getVar('DEFAULTTUNE', True) or 'INVALID'), True) or d.getVar('BASELIB', True)}" 2baselib = "${@d.getVar('BASE_LIB_tune-' + (d.getVar('DEFAULTTUNE') or 'INVALID'), True) or d.getVar('BASELIB')}"
3 3
4MULTILIB_VARIANTS = "${@extend_variants(d,'MULTILIBS','multilib')}" 4MULTILIB_VARIANTS = "${@extend_variants(d,'MULTILIBS','multilib')}"
5MULTILIB_SAVE_VARNAME = "DEFAULTTUNE TARGET_ARCH TARGET_SYS TARGET_VENDOR" 5MULTILIB_SAVE_VARNAME = "DEFAULTTUNE TARGET_ARCH TARGET_SYS TARGET_VENDOR"