1 files changed, 10 insertions, 10 deletions
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"
+AVAILTUNES += "core2-32"
-TUNE_FEATURES_tune-core2 = "${TUNE_FEATURES_tune-x86} core2"
+TUNE_FEATURES_tune-core2-32 = "${TUNE_FEATURES_tune-x86} core2"
-BASE_LIB_tune-core2 = "lib"
+BASE_LIB_tune-core2-32 = "lib"
-TUNE_PKGARCH_tune-core2 = "core2"
+TUNE_PKGARCH_tune-core2-32 = "core2-32"
-PACKAGE_EXTRA_ARCHS_tune-core2 = "${PACKAGE_EXTRA_ARCHS_tune-i586} core2"
+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"
+TUNE_PKGARCH_tune-core2-64 = "core2-64"
-PACKAGE_EXTRA_ARCHS_tune-core2-64 = "${PACKAGE_EXTRA_ARCHS_tune-x86-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"
+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"
+PACKAGE_EXTRA_ARCHS_tune-core2-64-x32 = "${PACKAGE_EXTRA_ARCHS_tune-x86-64-x32} core2-64-x32"

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 @@
6	# This tune is recommended for the Intel Core 2 CPU family, including Conroe,	6	# This tune is recommended for the Intel Core 2 CPU family, including Conroe,
7	# Merom and beyond, as well as the first Atom CPUs, Diamondville, and beyond.	7	# Merom and beyond, as well as the first Atom CPUs, Diamondville, and beyond.
8	#	8	#
9	DEFAULTTUNE ?= "core2"	9	DEFAULTTUNE ?= "core2-32"
10		10
11	# Include the previous tune to pull in PACKAGE_EXTRA_ARCHS	11	# Include the previous tune to pull in PACKAGE_EXTRA_ARCHS
12	require conf/machine/include/tune-i586.inc	12	require conf/machine/include/tune-i586.inc
@@ -16,20 +16,20 @@ TUNEVALID[core2] = "Enable core2 specific processor optimizations"
16	TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "core2", " -march=core2 -mtune=core2 -msse3 -mfpmath=sse", "", d)}"	16	TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "core2", " -march=core2 -mtune=core2 -msse3 -mfpmath=sse", "", d)}"
17		17
18	# Extra tune selections	18	# Extra tune selections
19	AVAILTUNES += "core2"	19	AVAILTUNES += "core2-32"
20	TUNE_FEATURES_tune-core2 = "${TUNE_FEATURES_tune-x86} core2"	20	TUNE_FEATURES_tune-core2-32 = "${TUNE_FEATURES_tune-x86} core2"
21	BASE_LIB_tune-core2 = "lib"	21	BASE_LIB_tune-core2-32 = "lib"
22	TUNE_PKGARCH_tune-core2 = "core2"	22	TUNE_PKGARCH_tune-core2-32 = "core2-32"
23	PACKAGE_EXTRA_ARCHS_tune-core2 = "${PACKAGE_EXTRA_ARCHS_tune-i586} core2"	23	PACKAGE_EXTRA_ARCHS_tune-core2-32 = "${PACKAGE_EXTRA_ARCHS_tune-i586} core2-32"
24		24
25	AVAILTUNES += "core2-64"	25	AVAILTUNES += "core2-64"
26	TUNE_FEATURES_tune-core2-64 = "${TUNE_FEATURES_tune-x86-64} core2"	26	TUNE_FEATURES_tune-core2-64 = "${TUNE_FEATURES_tune-x86-64} core2"
27	BASE_LIB_tune-core2-64 = "lib64"	27	BASE_LIB_tune-core2-64 = "lib64"
28	TUNE_PKGARCH_tune-core2-64 = "core2_64"	28	TUNE_PKGARCH_tune-core2-64 = "core2-64"
29	PACKAGE_EXTRA_ARCHS_tune-core2-64 = "${PACKAGE_EXTRA_ARCHS_tune-x86-64} core2_64"	29	PACKAGE_EXTRA_ARCHS_tune-core2-64 = "${PACKAGE_EXTRA_ARCHS_tune-x86-64} core2-64"
30		30
31	AVAILTUNES += "core2-64-x32"	31	AVAILTUNES += "core2-64-x32"
32	TUNE_FEATURES_tune-core2-64-x32 = "${TUNE_FEATURES_tune-x86-64-x32} core2"	32	TUNE_FEATURES_tune-core2-64-x32 = "${TUNE_FEATURES_tune-x86-64-x32} core2"
33	BASE_LIB_tune-core2-64-x32 = "libx32"	33	BASE_LIB_tune-core2-64-x32 = "libx32"
34	TUNE_PKGARCH_tune-core2-64-x32 = "core2_64_x32"	34	TUNE_PKGARCH_tune-core2-64-x32 = "core2-64-x32"
35	PACKAGE_EXTRA_ARCHS_tune-core2-64-x32 = "${PACKAGE_EXTRA_ARCHS_tune-x86-64-x32} core2_64_x32"	35	PACKAGE_EXTRA_ARCHS_tune-core2-64-x32 = "${PACKAGE_EXTRA_ARCHS_tune-x86-64-x32} core2-64-x32"