From 05eabde3e49845ef3f527f35c98d55c2fb5b522d Mon Sep 17 00:00:00 2001 From: Ilya Yanok Date: Wed, 7 Sep 2011 17:38:36 +0200 Subject: arch-powerpc: set PACKAGE_EXTRA_ARCHS Set PACKAGE_EXTRA_ARCHS for the generic tunes ("powerpc" and "powerpc-nf") thus allowing to use them instead of tuning to the specific CPU. (From OE-Core rev: 5eafbe2d8684ee1c45477bfd69b579af47adccd9) Signed-off-by: Ilya Yanok Signed-off-by: Richard Purdie --- meta/conf/machine/include/powerpc/arch-powerpc.inc | 6 ++++-- meta/conf/machine/include/tune-ppc603e.inc | 2 +- meta/conf/machine/include/tune-ppce300c2.inc | 2 +- meta/conf/machine/include/tune-ppce500mc.inc | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) (limited to 'meta/conf/machine/include') diff --git a/meta/conf/machine/include/powerpc/arch-powerpc.inc b/meta/conf/machine/include/powerpc/arch-powerpc.inc index da1a1d6da2..8347f86620 100644 --- a/meta/conf/machine/include/powerpc/arch-powerpc.inc +++ b/meta/conf/machine/include/powerpc/arch-powerpc.inc @@ -25,9 +25,11 @@ TUNE_PKGARCH ?= "${PPCPKGARCH}" # Basic tune definitions AVAILTUNES += "powerpc powerpc-nf" -TUNE_FEATURES_tune-powerpc ?= "m32 fpu-hard" -BASE_LIB_tune-powerpc = "lib" TUNE_FEATURES_tune-powerpc-nf ?= "m32 fpu-soft" BASE_LIB_tune-powerpc-nf = "lib" +PACKAGE_EXTRA_ARCHS_tune-powerpc-nf = "powerpc-nf" +TUNE_FEATURES_tune-powerpc ?= "m32 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/tune-ppc603e.inc b/meta/conf/machine/include/tune-ppc603e.inc index c743dde96e..663f2208be 100644 --- a/meta/conf/machine/include/tune-ppc603e.inc +++ b/meta/conf/machine/include/tune-ppc603e.inc @@ -8,7 +8,7 @@ TUNE_PKGARCH = "${@bb.utils.contains('TUNE_FEATURES', 'ppc603e', 'ppc603e', '${P AVAILTUNES = "ppc603e" TUNE_FEATURES_tune-ppc603e = "m32 fpu-hard ppc603e" -PACKAGE_EXTRA_ARCHS_tune-ppc603e = "powerpc ppc603e" +PACKAGE_EXTRA_ARCHS_tune-ppc603e = "${PACKAGE_EXTRA_ARCHS_tune-powerpc} ppc603e" # glibc configure options to get 603e specific library (for sqrt) GLIBC_EXTRA_OECONF += "${@bb.utils.contains("TUNE_FEATURES", "ppc603e", "-with-cpu=603e", "", d)}" diff --git a/meta/conf/machine/include/tune-ppce300c2.inc b/meta/conf/machine/include/tune-ppce300c2.inc index 5eea4a6a97..bdca1aa910 100644 --- a/meta/conf/machine/include/tune-ppce300c2.inc +++ b/meta/conf/machine/include/tune-ppce300c2.inc @@ -8,4 +8,4 @@ TUNE_PKGARCH = "${@bb.utils.contains("TUNE_FEATURES", "ppce300c2", "ppce300c2", AVAILTUNES += "ppce300c2" TUNE_FEATURES_tune-ppce300c2 = "m32 fpu-soft ppce300c2" -PACKAGE_EXTRA_ARCHS_tune-ppce300c2 = "powerpc-nf ppce300c2" +PACKAGE_EXTRA_ARCHS_tune-ppce300c2 = "${PACKAGE_EXTRA_ARCHS_tune-powerpc-nf} ppce300c2" diff --git a/meta/conf/machine/include/tune-ppce500mc.inc b/meta/conf/machine/include/tune-ppce500mc.inc index 33820ef0e8..950c46d6b5 100644 --- a/meta/conf/machine/include/tune-ppce500mc.inc +++ b/meta/conf/machine/include/tune-ppce500mc.inc @@ -8,7 +8,7 @@ TUNE_PKGARCH = "${@bb.utils.contains("TUNE_FEATURES", "ppce500mc", "ppce500mc", AVAILTUNES = "ppce500mc" TUNE_FEATURES_tune-ppce500mc = "m32 fpu-hard ppce500mc" -PACKAGE_EXTRA_ARCHS_tune-ppce500mc = "powerpc ppce500mc" +PACKAGE_EXTRA_ARCHS_tune-ppce500mc = "${PACKAGE_EXTRA_ARCHS_tune-powerpc} ppce500mc" # glibc configure options to get e500mc specific library (for sqrt) GLIBC_EXTRA_OECONF += "${@bb.utils.contains("TUNE_FEATURES", "ppce500mc", "-with-cpu=e500mc", "", d)}" -- cgit v1.2.3-54-g00ecf