From patchwork Wed Feb 22 06:37:48 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [05/10] arch-powerpc*.inc: rearrange for gcc-multilib Date: Wed, 22 Feb 2012 06:37:48 -0000 From: Nitin A Kamble X-Patchwork-Id: 21547 Message-Id: <9d10e663fef4fccce83fdc1ed2021f1e37402fc6.1329892604.git.nitin.a.kamble@intel.com> To: openembedded-core@lists.openembedded.org From: Nitin A Kamble make tune_feature names ppc specific no functional change here this helps gcc multilib code get tune parameter for any tune. Signed-off-by: Nitin A Kamble --- meta/conf/machine/include/powerpc/arch-powerpc.inc | 24 ++++++++++--------- .../machine/include/powerpc/arch-powerpc64.inc | 11 +++++---- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/meta/conf/machine/include/powerpc/arch-powerpc.inc b/meta/conf/machine/include/powerpc/arch-powerpc.inc index 8347f86..70f7a18 100644 --- a/meta/conf/machine/include/powerpc/arch-powerpc.inc +++ b/meta/conf/machine/include/powerpc/arch-powerpc.inc @@ -5,30 +5,32 @@ DEFAULTTUNE ?= "powerpc" -TUNEVALID[m32] = "Power ELF32 standard ABI" -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "m32", "-m32", "", d)}" -TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", "m32", "powerpc", "", d)}" +TUNEVALID[ppc-m32] = "Power ELF32 standard ABI" +TUNE_FEATURE_CCARGS-ppc-m32 ?= "-m32" +TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "ppc-m32", "${TUNE_FEATURE_CCARGS-ppc-m32}", "", d)}" +TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", "ppc-m32", "powerpc", "", d)}" -TUNEVALID[fpu-hard] = "Use hardware FPU." -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "fpu-hard", "-mhard-float", "", d)}" +TUNEVALID[ppc-fpu-hard] = "Use hardware FPU." +TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "ppc-fpu-hard", "-mhard-float", "", d)}" -TUNEVALID[fpu-soft] = "Use software FPU." -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "fpu-soft", "-msoft-float", "", d)}" -TARGET_FPU .= "${@bb.utils.contains("TUNE_FEATURES", "fpu-soft", "soft", "", d)}" +TUNEVALID[ppc-fpu-soft] = "Use software FPU." +TUNE_FEATURE_CCARGS-ppc-fpu-soft ?= "-msoft-float" +TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "ppc-fpu-soft", "${TUNE_FEATURE_CCARGS-ppc-fpu-soft}", "", d)}" +TARGET_FPU .= "${@bb.utils.contains("TUNE_FEATURES", "ppc-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)}" +PPCPKGSFX_FPU = "${@bb.utils.contains("TUNE_FEATURES", "ppc-fpu-hard" , "", "-nf", d)}" PPCPKGARCH = "${TUNE_ARCH}${PPCPKGSFX_FPU}" TUNE_PKGARCH ?= "${PPCPKGARCH}" # Basic tune definitions AVAILTUNES += "powerpc powerpc-nf" -TUNE_FEATURES_tune-powerpc-nf ?= "m32 fpu-soft" +TUNE_FEATURES_tune-powerpc-nf ?= "ppc-m32 ppc-fpu-soft" BASE_LIB_tune-powerpc-nf = "lib" PACKAGE_EXTRA_ARCHS_tune-powerpc-nf = "powerpc-nf" -TUNE_FEATURES_tune-powerpc ?= "m32 fpu-hard" +TUNE_FEATURES_tune-powerpc ?= "ppc-m32 ppc-fpu-hard" BASE_LIB_tune-powerpc = "lib" PACKAGE_EXTRA_ARCHS_tune-powerpc = "${PACKAGE_EXTRA_ARCHS_tune-powerpc-nf} powerpc" diff --git a/meta/conf/machine/include/powerpc/arch-powerpc64.inc b/meta/conf/machine/include/powerpc/arch-powerpc64.inc index 7ef8ddc..edbc07c 100644 --- a/meta/conf/machine/include/powerpc/arch-powerpc64.inc +++ b/meta/conf/machine/include/powerpc/arch-powerpc64.inc @@ -2,11 +2,12 @@ DEFAULTTUNE ?= "powerpc64" require conf/machine/include/powerpc/arch-powerpc.inc -TUNEVALID[m64] = "Power ELF64 standard ABI" -TUNE_CONFLICTS[m64] = "m32 nf" -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "m64", "-m64", "", d)}" -TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", [ "m64" ], "powerpc64", "", d)}" +TUNEVALID[ppc-m64] = "Power ELF64 standard ABI" +TUNE_CONFLICTS[ppc-m64] = "ppc-m32 ppc-nf" +TUNE_FEATURE_CCARGS-ppc-m64 ?= "-m64" +TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "ppc-m64", "${TUNE_FEATURE_CCARGS-ppc-m64}", "", d)}" +TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", [ "ppc-m64" ], "powerpc64", "", d)}" AVAILTUNES += "powerpc64" -TUNE_FEATURES_tune-powerpc64 ?= "m64 fpu-hard" +TUNE_FEATURES_tune-powerpc64 ?= "ppc-m64 ppc-fpu-hard" BASE_LIB_tune-powerpc64 = "lib64"