summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2015-01-21 22:45:28 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-01-29 15:36:49 +0000
commit3bf5b6de3edb0d6589155fc1e2cd284c05532c52 (patch)
treed23916356c995f2e36a5aaffa953c6fa710c4d33 /meta/conf
parente558e5489da890ff28a1360e279726b51edb1a73 (diff)
downloadpoky-3bf5b6de3edb0d6589155fc1e2cd284c05532c52.tar.gz
arch-mips.inc: Change definition of TRANSLATED_TARGET_ARCH
[YOCTO #7230] In certain system configurations TRANSLATED_TARGET_ARCH will not expand in the right order for gcc-cross-candian-mips64n32 to be generated properly. This will cause SDKs to fail to generate properly. Changing the global definition of TRANSLATED_TARGET_ARCH always expands the ABIEXTENSION, which causes the OVERRIDES to pick it up as well. This effectively defines a new class of overrides for the 'n32'. The side effect is that we need to duplicate some mips64 overrides, and redefine others that were previously 'n32' or 'mips64' exclusive to have the correct semantics. (From OE-Core rev: 4b3a2b703b20583bd107f00a297d972e9bfb514a) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/bitbake.conf2
-rw-r--r--meta/conf/machine/include/mips/arch-mips.inc4
2 files changed, 5 insertions, 1 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index d22e9e8efe..ba6113d588 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -520,6 +520,8 @@ LINKER_HASH_STYLE_mips = "sysv"
520LINKER_HASH_STYLE_mipsel = "sysv" 520LINKER_HASH_STYLE_mipsel = "sysv"
521LINKER_HASH_STYLE_mips64 = "sysv" 521LINKER_HASH_STYLE_mips64 = "sysv"
522LINKER_HASH_STYLE_mips64el = "sysv" 522LINKER_HASH_STYLE_mips64el = "sysv"
523LINKER_HASH_STYLE_mips64n32 = "sysv"
524LINKER_HASH_STYLE_mips64eln32 = "sysv"
523TARGET_LINK_HASH_STYLE ?= "${@['-Wl,--hash-style=gnu',''][d.getVar('LINKER_HASH_STYLE', True) != 'gnu']}" 525TARGET_LINK_HASH_STYLE ?= "${@['-Wl,--hash-style=gnu',''][d.getVar('LINKER_HASH_STYLE', True) != 'gnu']}"
524 526
525export LDFLAGS = "${TARGET_LDFLAGS}" 527export LDFLAGS = "${TARGET_LDFLAGS}"
diff --git a/meta/conf/machine/include/mips/arch-mips.inc b/meta/conf/machine/include/mips/arch-mips.inc
index 08d8fdc76f..c41fa5e864 100644
--- a/meta/conf/machine/include/mips/arch-mips.inc
+++ b/meta/conf/machine/include/mips/arch-mips.inc
@@ -101,4 +101,6 @@ BASE_LIB_tune-mips64el-nf = "lib64"
101MIPSPKGSFX_VARIANT_tune-mips64el-nf = "${TUNE_ARCH}" 101MIPSPKGSFX_VARIANT_tune-mips64el-nf = "${TUNE_ARCH}"
102PACKAGE_EXTRA_ARCHS_tune-mips64el-nf = "mips64el-nf" 102PACKAGE_EXTRA_ARCHS_tune-mips64el-nf = "mips64el-nf"
103 103
104TRANSLATED_TARGET_ARCH_append = "${ABIEXTENSION}" 104# On mips we need to redefine this to include the ABIEXTENSION
105# we can avoid the python bit as there are no _ or - to translate
106TRANSLATED_TARGET_ARCH = "${TARGET_ARCH}${ABIEXTENSION}"