From e42bc47ef80ae56a2de7b918a7e06cbda30cab10 Mon Sep 17 00:00:00 2001 From: Matthew McClintock Date: Thu, 23 Feb 2012 00:21:49 -0600 Subject: tune-ppce5500: consolidate ppce5500 and ppc64e5500 into one tune file We don't need two files for this. Also this fixes some mutlilib build issues where we were not able to select the multilib arch to be ppce5500 or ppc64e5500. Changes recently made to meta-fsl-ppc layer depend on this change as well (From OE-Core rev: 4fbb72a359fea2e0922f472f48f186bbd1ca2b36) Signed-off-by: Matthew McClintock Signed-off-by: Richard Purdie --- meta/conf/machine/include/tune-ppce5500-32b.inc | 15 --------------- meta/conf/machine/include/tune-ppce5500-64b.inc | 15 --------------- meta/conf/machine/include/tune-ppce5500.inc | 20 ++++++++++++++++++++ 3 files changed, 20 insertions(+), 30 deletions(-) delete mode 100644 meta/conf/machine/include/tune-ppce5500-32b.inc delete mode 100644 meta/conf/machine/include/tune-ppce5500-64b.inc create mode 100644 meta/conf/machine/include/tune-ppce5500.inc diff --git a/meta/conf/machine/include/tune-ppce5500-32b.inc b/meta/conf/machine/include/tune-ppce5500-32b.inc deleted file mode 100644 index 7a9e533f2d..0000000000 --- a/meta/conf/machine/include/tune-ppce5500-32b.inc +++ /dev/null @@ -1,15 +0,0 @@ -DEFAULTTUNE ?= "ppce5500" - -require conf/machine/include/powerpc/arch-powerpc64.inc - -TUNEVALID[ppce5500] = "Enable ppce5500 specific processor optimizations" -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "ppce5500", "-mcpu=e5500", "", d)}" -TUNE_PKGARCH = "${@bb.utils.contains("TUNE_FEATURES", "ppce5500", "ppce5500", "${PPCPKGARCH}", d)}" - -AVAILTUNES = "ppce5500" -TUNE_FEATURES_tune-ppce5500 = "m32 ppce5500" -PACKAGE_EXTRA_ARCHS_tune-ppce5500 = "powerpc ppce5500" -BASE_LIB_tune-ppce5500 = "lib" - -# glibc configure options to get e5500 specific library (for sqrt) -GLIBC_EXTRA_OECONF += "${@bb.utils.contains("TUNE_FEATURES", "ppce5500", "--with-cpu=e5500", "", d)}" diff --git a/meta/conf/machine/include/tune-ppce5500-64b.inc b/meta/conf/machine/include/tune-ppce5500-64b.inc deleted file mode 100644 index 683d25f9f3..0000000000 --- a/meta/conf/machine/include/tune-ppce5500-64b.inc +++ /dev/null @@ -1,15 +0,0 @@ -DEFAULTTUNE ?= "ppc64e5500" - -require conf/machine/include/powerpc/arch-powerpc64.inc - -TUNEVALID[ppc64e5500] = "Enable ppc64e5500 specific processor optimizations" -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "ppc64e5500", "-mcpu=e5500", "", d)}" -TUNE_PKGARCH = "${@bb.utils.contains("TUNE_FEATURES", "ppc64e5500", "ppc64e5500", "${PPCPKGARCH}", d)}" - -AVAILTUNES = "ppc64e5500" -TUNE_FEATURES_tune-ppc64e5500 = "m64 ppc64e5500" -PACKAGE_EXTRA_ARCHS_tune-ppc64e5500 = "powerpc64 ppc64e5500" -BASE_LIB_tune-ppc64e5500 = "lib64" - -# glibc configure options to get e5500 specific library (for sqrt) -GLIBC_EXTRA_OECONF += "${@bb.utils.contains("TUNE_FEATURES", "ppc64e5500", "--with-cpu=e5500", "", d)}" diff --git a/meta/conf/machine/include/tune-ppce5500.inc b/meta/conf/machine/include/tune-ppce5500.inc new file mode 100644 index 0000000000..fe8d79d51d --- /dev/null +++ b/meta/conf/machine/include/tune-ppce5500.inc @@ -0,0 +1,20 @@ +DEFAULTTUNE ?= "ppce5500" + +require conf/machine/include/powerpc/arch-powerpc64.inc + +TUNEVALID[e5500] = "Enable Freescale e5500 specific processor optimizations" +TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "e5500", "-mcpu=e5500", "", d)}" + +AVAILTUNES += "ppce5500 ppc64e5500" +TUNE_FEATURES_tune-ppce5500 = "m32 fpu-hard e5500" +PACKAGE_EXTRA_ARCHS_tune-ppce5500 = "${PACKAGE_EXTRA_ARCHS_tune-powerpc} ppce5500" +BASE_LIB_tune-ppce5500 = "lib" +TUNE_PKGARCH_tune-ppce5500 = "ppce5500" + +TUNE_FEATURES_tune-ppc64e5500 = "m64 fpu-hard e5500" +PACKAGE_EXTRA_ARCHS_tune-ppc64e5500 = "${PACKAGE_EXTRA_ARCHS_tune-powerpc64} ppc64e5500" +BASE_LIB_tune-ppc64e5500 = "lib64" +TUNE_PKGARCH_tune-ppc64e5500 = "ppc64e5500" + +# glibc configure options to get e5500 specific library (for sqrt) +GLIBC_EXTRA_OECONF += "${@bb.utils.contains("TUNE_FEATURES", "e5500", "--with-cpu=e5500", "", d)}" -- cgit v1.2.3-54-g00ecf