From: Nitin A Kamble <[email protected]> Setting ABIEXTENSION for various x86_abis, It changes TARGET_OS to abi specific like "linux-gnux32" and TARGET to "x86_64-linux-gnux32"
Correspondingly changed siteinfo.bbclass to use new names of TARGET_OS & TARGET, and use correct siteinfo for various ABIs of x86_64. Signed-off-by: Nitin A Kamble <[email protected]> --- meta/classes/siteinfo.bbclass | 14 +++++++++++++- meta/conf/machine/include/ia32/arch-ia32.inc | 3 +++ 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/meta/classes/siteinfo.bbclass b/meta/classes/siteinfo.bbclass index c5308b3..854120f 100644 --- a/meta/classes/siteinfo.bbclass +++ b/meta/classes/siteinfo.bbclass @@ -42,12 +42,15 @@ def siteinfo_data(d): "sh4": "endian-little bit-32 sh-common", "sparc": "endian-big bit-32", "viac3": "endian-little bit-32 ix86-common", - "x86_64": "endian-little bit-64", + "x86_64": "endian-little", # bitinfo specified in targetinfo } osinfo = { "darwin": "common-darwin", "darwin9": "common-darwin", "linux": "common-linux common-glibc", + "linux-gnu32": "common-linux common-glibc", + "linux-gnux32": "common-linux common-glibc", + "linux-gnu64": "common-linux common-glibc", "linux-gnueabi": "common-linux common-glibc", "linux-gnuspe": "common-linux common-glibc", "linux-uclibc": "common-linux common-uclibc", @@ -64,6 +67,15 @@ def siteinfo_data(d): "armeb-linux-uclibceabi": "armeb-linux-uclibc", "powerpc-linux-gnuspe": "powerpc-linux", "powerpc-linux-uclibcspe": "powerpc-linux-uclibc", + "x86_64-cygwin": "bit-64", + "x86_64-darvin": "bit-64", + "x86_64-darvin9": "bit-64", + "x86_64-linux": "bit-64", + "x86_64-linux-uclibc": "bit-64", + "x86_64-linux-gnu32": "bit-32 ix86-common", + "x86_64-linux-gnux32": "bit-32 ix86-common", + "x86_64-linux-gnu64": "bit-64 x86_64-linux", + "x86_64-mingw32": "bit-64", } hostarch = d.getVar("HOST_ARCH", True) diff --git a/meta/conf/machine/include/ia32/arch-ia32.inc b/meta/conf/machine/include/ia32/arch-ia32.inc index 45bf738..ad16332 100644 --- a/meta/conf/machine/include/ia32/arch-ia32.inc +++ b/meta/conf/machine/include/ia32/arch-ia32.inc @@ -10,12 +10,14 @@ TUNE_PKGARCH ?= "${@bb.utils.contains("TUNE_FEATURES", "m32", "x86", "x86_64", d TUNEVALID[m32] = "IA32 ELF32 standard ABI" TUNECONFLICTS[m32] = "m64 mx32" TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", "m32", "i586", "" ,d)}" +ABIEXTENSION .= "${@bb.utils.contains("TUNE_FEATURES", "m32", "32", "" ,d)}" TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "m32", "-m32", "", d)}" # x32 ABI TUNEVALID[mx32] = "IA32 ELF32 standard ABI" TUNECONFLICTS[mx32] = "m64 m32" TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", "mx32", "x86_64", "" ,d)}" +ABIEXTENSION .= "${@bb.utils.contains("TUNE_FEATURES", "mx32", "x32", "" ,d)}" TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "mx32", "-mx32", "", d)}" TUNE_LDARGS += "${@bb.utils.contains("TUNE_FEATURES", "mx32", "-m elf32_x86_64", "", d)}" TUNE_ASARGS += "${@bb.utils.contains("TUNE_FEATURES", "mx32", "-x32", "", d)}" @@ -24,6 +26,7 @@ TUNE_ASARGS += "${@bb.utils.contains("TUNE_FEATURES", "mx32", "-x32", "", d)}" TUNEVALID[m64] = "IA32e (x86_64) ELF64 standard ABI" TUNECONFLICT[m64] = "m32 mx32" TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", "m64", "x86_64", "" ,d)}" +ABIEXTENSION .= "${@bb.utils.contains("TUNE_FEATURES", "m64", "64", "" ,d)}" TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "m64", "-m64", "", d)}" # Default Tune configurations -- 1.7.6 _______________________________________________ Openembedded-core mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
