From d66483680eee668e4cd038fe7139b15a0618621a Mon Sep 17 00:00:00 2001 From: Fahad Arslan Date: Mon, 23 Jan 2017 21:39:27 +0500 Subject: [PATCH 1/2] sourcery-tuning.inc: make assembler flags e6500-64b specific -a64 and -me6500 are PowerPC architecture-specific assembler flags only intended for 64bit mode of e6500 core. -a64 - generates ELF64 or XCOFF64. -me6500 - generates code for Freescale e6500 core complex. Jira ID: http://jira.alm.mentorg.com:8080/browse/SIEJIR-3452 Signed-off-by: Fahad Arslan --- conf/distro/include/sourcery-tuning.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/include/sourcery-tuning.inc b/conf/distro/include/sourcery-tuning.inc index d1c28ba..74c9893 100644 --- a/conf/distro/include/sourcery-tuning.inc +++ b/conf/distro/include/sourcery-tuning.inc @@ -16,6 +16,6 @@ TUNE_CCARGS_append = "${@bb.utils.contains('TUNE_FEATURES', 'ppce500mc', ' ' + d PPCE6500_CCARG = "${@'-te6500' if d.getVar('SOURCERY_GXX_IS_PRO', True) == '1' else '-mcpu=e6500'}" TUNE_CCARGS_append = " ${@bb.utils.contains("TUNE_FEATURES", "e6500", ' ' + d.getVar('PPCE6500_CCARG', True), '', d)}" -TUNE_ASARGS += "${@bb.utils.contains("TUNE_FEATURES", "m64", "-a64 -me6500", "", d)}" +TUNE_ASARGS_e6500-64b += "${@bb.utils.contains("TUNE_FEATURES", "m64", "-a64 -me6500", "", d)}" TUNE_CCARGS_remove_t4240rdb-64b = "-mcpu=e6500" From 95c616770edd5d9461b8f7bcf417d29be1df23fa Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Fri, 27 Jan 2017 10:36:57 -0700 Subject: [PATCH 2/2] tcmode: use SOURCERY_TOOLCHAIN_VERSION for the build cfg summary This makes it clear that this refers to the toolchain, not the CodeBench IDE. JIRA: SB-8699 Signed-off-by: Christopher Larson --- conf/distro/include/tcmode-external-sourcery.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/conf/distro/include/tcmode-external-sourcery.inc b/conf/distro/include/tcmode-external-sourcery.inc index d0c6dfc..acbd221 100644 --- a/conf/distro/include/tcmode-external-sourcery.inc +++ b/conf/distro/include/tcmode-external-sourcery.inc @@ -330,7 +330,10 @@ SOURCERY_VERSION[vardepvalue] = "${SOURCERY_VERSION}" EXTERNAL_PV_SUFFIX ?= "-${SOURCERY_VERSION}" EXTERNAL_PV_SUFFIX_allarch = "" -BUILDCFG_VARS += "EXTERNAL_TOOLCHAIN EXTERNAL_TARGET_SYS SOURCERY_VERSION GCC_VERSION" +# Make it clear that this version is the toolchain, not the CodeBench IDE +SOURCERY_TOOLCHAIN_VERSION = "${SOURCERY_VERSION}" + +BUILDCFG_VARS += "EXTERNAL_TOOLCHAIN EXTERNAL_TARGET_SYS SOURCERY_TOOLCHAIN_VERSION GCC_VERSION" # Adjust tunings to ensure we're using Sourcery G++ multilibs require conf/distro/include/sourcery-tuning.inc