From 4b3a2b703b20583bd107f00a297d972e9bfb514a Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Wed, 21 Jan 2015 22:45:28 -0600 Subject: 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. Signed-off-by: Mark Hatle --- meta/conf/bitbake.conf | 2 ++ meta/conf/machine/include/mips/arch-mips.inc | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'meta/conf') 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" LINKER_HASH_STYLE_mipsel = "sysv" LINKER_HASH_STYLE_mips64 = "sysv" LINKER_HASH_STYLE_mips64el = "sysv" +LINKER_HASH_STYLE_mips64n32 = "sysv" +LINKER_HASH_STYLE_mips64eln32 = "sysv" TARGET_LINK_HASH_STYLE ?= "${@['-Wl,--hash-style=gnu',''][d.getVar('LINKER_HASH_STYLE', True) != 'gnu']}" export 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" MIPSPKGSFX_VARIANT_tune-mips64el-nf = "${TUNE_ARCH}" PACKAGE_EXTRA_ARCHS_tune-mips64el-nf = "mips64el-nf" -TRANSLATED_TARGET_ARCH_append = "${ABIEXTENSION}" +# On mips we need to redefine this to include the ABIEXTENSION +# we can avoid the python bit as there are no _ or - to translate +TRANSLATED_TARGET_ARCH = "${TARGET_ARCH}${ABIEXTENSION}" -- cgit 1.2.3-korg