From 69e6395b8d11e2940892a6293ecbbe645c2a478b Mon Sep 17 00:00:00 2001 From: Darren Hart Date: Tue, 21 Jan 2014 17:51:59 +0000 Subject: tune: Make 32b or 64b explicit in tune name for core2 Core2 has both a 32b and a 64b variant. Currently, core2 implies 32b, while core2_64 is the 64b version. This implicit 32b mode will become confusing in later architectures, such as corei7, where it would be natural for people to assume "corei7" meant 64 bit. Rather than carrying forward an implicit 32b mode and rather than changing the naming scheme part way through the architecture hiearchy, make the 32b and 64b variant explicit in the tune name by changing core2 to core2-32. This patch also standardises on using '-' in the names. Signed-off-by: Darren Hart Cc: Richard Purdie Cc: Paul Eggleton Cc: Tom Zanussi Cc: Nitin Kamble Cc: Mark Hatle Cc: Bruce Ashfield Cc: Martin Jansa Signed-off-by: Richard Purdie --- meta/conf/machine/include/tune-core2.inc | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'meta/conf/machine/include') diff --git a/meta/conf/machine/include/tune-core2.inc b/meta/conf/machine/include/tune-core2.inc index 2500a748b0..078e22d192 100644 --- a/meta/conf/machine/include/tune-core2.inc +++ b/meta/conf/machine/include/tune-core2.inc @@ -6,7 +6,7 @@ # This tune is recommended for the Intel Core 2 CPU family, including Conroe, # Merom and beyond, as well as the first Atom CPUs, Diamondville, and beyond. # -DEFAULTTUNE ?= "core2" +DEFAULTTUNE ?= "core2-32" # Include the previous tune to pull in PACKAGE_EXTRA_ARCHS require conf/machine/include/tune-i586.inc @@ -16,20 +16,20 @@ TUNEVALID[core2] = "Enable core2 specific processor optimizations" TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "core2", " -march=core2 -mtune=core2 -msse3 -mfpmath=sse", "", d)}" # Extra tune selections -AVAILTUNES += "core2" -TUNE_FEATURES_tune-core2 = "${TUNE_FEATURES_tune-x86} core2" -BASE_LIB_tune-core2 = "lib" -TUNE_PKGARCH_tune-core2 = "core2" -PACKAGE_EXTRA_ARCHS_tune-core2 = "${PACKAGE_EXTRA_ARCHS_tune-i586} core2" +AVAILTUNES += "core2-32" +TUNE_FEATURES_tune-core2-32 = "${TUNE_FEATURES_tune-x86} core2" +BASE_LIB_tune-core2-32 = "lib" +TUNE_PKGARCH_tune-core2-32 = "core2-32" +PACKAGE_EXTRA_ARCHS_tune-core2-32 = "${PACKAGE_EXTRA_ARCHS_tune-i586} core2-32" AVAILTUNES += "core2-64" TUNE_FEATURES_tune-core2-64 = "${TUNE_FEATURES_tune-x86-64} core2" BASE_LIB_tune-core2-64 = "lib64" -TUNE_PKGARCH_tune-core2-64 = "core2_64" -PACKAGE_EXTRA_ARCHS_tune-core2-64 = "${PACKAGE_EXTRA_ARCHS_tune-x86-64} core2_64" +TUNE_PKGARCH_tune-core2-64 = "core2-64" +PACKAGE_EXTRA_ARCHS_tune-core2-64 = "${PACKAGE_EXTRA_ARCHS_tune-x86-64} core2-64" AVAILTUNES += "core2-64-x32" TUNE_FEATURES_tune-core2-64-x32 = "${TUNE_FEATURES_tune-x86-64-x32} core2" BASE_LIB_tune-core2-64-x32 = "libx32" -TUNE_PKGARCH_tune-core2-64-x32 = "core2_64_x32" -PACKAGE_EXTRA_ARCHS_tune-core2-64-x32 = "${PACKAGE_EXTRA_ARCHS_tune-x86-64-x32} core2_64_x32" +TUNE_PKGARCH_tune-core2-64-x32 = "core2-64-x32" +PACKAGE_EXTRA_ARCHS_tune-core2-64-x32 = "${PACKAGE_EXTRA_ARCHS_tune-x86-64-x32} core2-64-x32" -- cgit v1.2.3