From patchwork Tue Mar 13 07:58:45 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [CONSOLIDATED, PULL, 11/23] arch-powerpc.inc: use default value of TUNE_PKGARCH Date: Tue, 13 Mar 2012 07:58:45 -0000 From: Saul Wold X-Patchwork-Id: 23137 Message-Id: To: openembedded-core@lists.openembedded.org From: Matthew McClintock We can use the default value for TUNE_PKGARCH, and now we just append "-nf" if TARGET_FPU is fpu-soft Signed-off-by: Matthew McClintock --- meta/conf/machine/include/powerpc/arch-powerpc.inc | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/meta/conf/machine/include/powerpc/arch-powerpc.inc b/meta/conf/machine/include/powerpc/arch-powerpc.inc index c9b2829..9f588e8 100644 --- a/meta/conf/machine/include/powerpc/arch-powerpc.inc +++ b/meta/conf/machine/include/powerpc/arch-powerpc.inc @@ -18,10 +18,8 @@ TARGET_FPU .= "${@bb.utils.contains("TUNE_FEATURES", "fpu-soft", "soft", "", d)} ABIEXTENSION = "${@['','spe'][d.getVar('TARGET_FPU', True) in ['ppc-efd', 'ppc-efs']]}" -PPCPKGSFX_FPU = "${@bb.utils.contains("TUNE_FEATURES", "fpu-hard" , "", "-nf", d)}" - -PPCPKGARCH = "${TUNE_ARCH}${PPCPKGSFX_FPU}" -TUNE_PKGARCH ?= "${PPCPKGARCH}" +PPCPKGSFX_FPU = "${@['', '-nf'][d.getVar('TARGET_FPU',d,1) in ['fpu-soft']]}" +TUNE_PKGARCH_append = "${PPCPKGSFX_FPU}" # Basic tune definitions AVAILTUNES += "powerpc powerpc-nf"