From patchwork Wed Feb 22 06:37:45 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [02/10] arch-ia32.inc: restructure TUNE_ARCH definition Date: Wed, 22 Feb 2012 06:37:45 -0000 From: Nitin A Kamble X-Patchwork-Id: 21537 Message-Id: <2ce8c1a52068514d9021a30e30ed380fc22accb3.1329892604.git.nitin.a.kamble@intel.com> To: openembedded-core@lists.openembedded.org From: Nitin A Kamble So that multilib code can find out TUNE_ARCH for any tune. Signed-off-by: Nitin A Kamble --- meta/conf/machine/include/ia32/arch-ia32.inc | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/meta/conf/machine/include/ia32/arch-ia32.inc b/meta/conf/machine/include/ia32/arch-ia32.inc index ced9dbe..aff3b88 100644 --- a/meta/conf/machine/include/ia32/arch-ia32.inc +++ b/meta/conf/machine/include/ia32/arch-ia32.inc @@ -4,13 +4,12 @@ DEFAULTTUNE ?= "x86" TARGET_FPU ?= "" -X86ARCH32 ?= "i586" -X86ARCH64 ?= "x86_64" # ELF32 ABI TUNEVALID[x86-m32] = "IA32 ELF32 standard ABI" TUNECONFLICTS[x86-m32] = "x86-64-m64 x86-64-mx32" -TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", "x86-m32", "${X86ARCH32}", "" ,d)}" +TUNE_FEATURE_ARCH-x86-m32 = "i586" +TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", "x86-m32", "${TUNE_FEATURE_ARCH-x86-m32}", "" ,d)}" TUNE_FEATURE_CCARGS-x86-m32 ?= "-m32" TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "x86-m32", "${TUNE_FEATURE_CCARGS-x86-m32}", "", d)}" MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "x86-m32", ":x86", "" ,d)}" @@ -18,7 +17,8 @@ MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "x86-m32", ":x86", "" # x32 ABI TUNEVALID[x86-64-mx32] = "IA32e (x86_64) ELF32 standard ABI" TUNECONFLICTS[x86-64-mx32] = "x86-64-m64 x86-m32" -TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", "x86-64-mx32", "${X86ARCH64}", "" ,d)}" +TUNE_FEATURE_ARCH-x86-64-mx32 = "x86_64" +TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", "x86-64-mx32", "${TUNE_FEATURE_ARCH-x86-64-mx32}", "" ,d)}" ABIEXTENSION .= "${@bb.utils.contains("TUNE_FEATURES", "x86-64-mx32", "x32", "" ,d)}" TUNE_FEATURE_CCARGS-x86-64-mx32 ?= "-mx32" TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "x86-64-mx32", "${TUNE_FEATURE_CCARGS-x86-64-mx32}", "", d)}" @@ -28,7 +28,8 @@ TUNE_ASARGS += "${@bb.utils.contains("TUNE_FEATURES", "x86-64-mx32", "-x32", "", # ELF64 ABI TUNEVALID[x86-64-m64] = "IA32e (x86_64) ELF64 standard ABI" TUNECONFLICT[x86-64-m64] = "x86-m32 x86-64-mx32" -TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", "x86-64-m64", "${X86ARCH64}", "" ,d)}" +TUNE_FEATURE_ARCH-x86-64-m64 = "x86_64" +TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", "x86-64-m64", "${TUNE_FEATURE_ARCH-x86-64-m64}", "" ,d)}" TUNE_FEATURE_CCARGS-x86-64-m64 ?= "-m64" TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "x86-64-m64", "${TUNE_FEATURE_CCARGS-x86-64-m64}", "", d)}"