[OE-core] [PATCH 09/10] x86 tune inc files: add x32 abi tune parameters

Kamble, Nitin A nitin.a.kamble at intel.com
Fri Aug 5 18:07:59 UTC 2011



> -----Original Message-----
> From: openembedded-core-bounces at lists.openembedded.org
> [mailto:openembedded-core-bounces at lists.openembedded.org] On Behalf Of
> Richard Purdie
> Sent: Friday, August 05, 2011 9:04 AM
> To: Patches and discussions about the oe-core layer
> Subject: Re: [OE-core] [PATCH 09/10] x86 tune inc files: add x32 abi
> tune parameters
> 
> On Thu, 2011-08-04 at 08:01 -0700, nitin.a.kamble at intel.com wrote:
> > From: Nitin A Kamble <nitin.a.kamble at intel.com>
> >
> > Signed-off-by: Nitin A Kamble <nitin.a.kamble at intel.com>
> > ---
> >  meta/conf/machine/include/ia32/arch-ia32.inc |   23
> ++++++++++++++++++++---
> >  meta/conf/machine/include/tune-core2.inc     |    4 ++++
> >  meta/conf/machine/include/tune-x86_64.inc    |    2 +-
> >  3 files changed, 25 insertions(+), 4 deletions(-)
> >
> > diff --git a/meta/conf/machine/include/ia32/arch-ia32.inc
> b/meta/conf/machine/include/ia32/arch-ia32.inc
> > index 2709440..fb527da 100644
> > --- a/meta/conf/machine/include/ia32/arch-ia32.inc
> > +++ b/meta/conf/machine/include/ia32/arch-ia32.inc
> > @@ -6,17 +6,29 @@ DEFAULTTUNE ?= "x86"
> >  TARGET_FPU ?= ""
> >  X86ARCH32 ?= "i586"
> >  X86ARCH64 ?= "x86_64"
> > +X86ARCHX32 ?= "x86_64"
> >
> >  # ELF32 ABI
> >  TUNEVALID[m32] = "IA32 ELF32 standard ABI"
> > -TUNECONFLICTS[m32] = "m64"
> > +TUNECONFLICTS[m32] = "m64 mx32"
> >  TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", "m32",
> "${X86ARCH32}", "" ,d)}"
> > +ABIEXTENSION .= "${@bb.utils.contains("TUNE_FEATURES", "m32", "32",
> "" ,d)}"
> 
> Please drop the above line. There is no need to change that.
> 
> >  TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "m32", "-m32",
> "", d)}"
> >
> > +# x32 ABI
> > +TUNEVALID[mx32] = "IA32e (x86_64) ELF32 standard ABI"
> > +TUNECONFLICTS[mx32] = "m64 m32"
> > +TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", "mx32",
> "${X86ARCHX32}", "" ,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)}"
> > +
> 
> These are fine.
> 
> >  # ELF64 ABI
> >  TUNEVALID[m64] = "IA32e (x86_64) ELF64 standard ABI"
> > -TUNECONFLICT[m64] = "m32"
> > +TUNECONFLICT[m64] = "m32 mx32"
> >  TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", "m64",
> "${X86ARCH64}", "" ,d)}"
> > +ABIEXTENSION .= "${@bb.utils.contains("TUNE_FEATURES", "m64", "64",
> "" ,d)}"
> 
> Again, please drop the above line.
> 
> >  TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "m64", "-m64",
> "", d)}"
> >
> >  TUNE_PKGARCH ?= "${@bb.utils.contains("TUNE_FEATURES", "m32", "x86",
> "x86_64", d)}"
> > @@ -30,4 +42,9 @@ PACKAGE_EXTRA_ARCHS_tune-x86 = "x86"
> >  AVAILTUNES += "x86-64"
> >  TUNE_FEATURES_tune-x86-64 ?= "m64"
> >  BASE_LIB_tune-x86-64 ?= "lib64"
> > -PACKAGE_EXTRA_ARCHS_tune-x86-64 = "x86_64"
> > +PACKAGE_EXTRA_ARCHS_tune-x86-64 = "x86-64"
> 
> That is likely wrong, please drop this piece.
> 
> > +
> > +AVAILTUNES += "x86-64-x32"
> > +TUNE_FEATURES_tune-x86-64-x32 ?= "mx32"
> > +BASE_LIB_tune-x86-64-x32 ?= "lib"
> > +PACKAGE_EXTRA_ARCHS_tune-x86-64-x32 = "x86-64-x32"
> 
> And this is wrong too.
> 
> You really want:
> 
> TUNE_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "mx32", "-x32",
> "", d)}"
> PACKAGE_EXTRA_ARCHS_tune-x86-64-x32 = "x86_64-x32"
> 
> > diff --git a/meta/conf/machine/include/tune-core2.inc
> b/meta/conf/machine/include/tune-core2.inc
> > index 25c2226..8a4de3e 100644
> > --- a/meta/conf/machine/include/tune-core2.inc
> > +++ b/meta/conf/machine/include/tune-core2.inc
> > @@ -18,3 +18,7 @@ TUNE_FEATURES_tune-core2-64 ?=
> "${TUNE_FEATURES_tune-x86-64} core2"
> >  BASE_LIB_tune-core2-64 ?= "lib64"
> >  PACKAGE_EXTRA_ARCHS_tune-core2-64 = "${PACKAGE_EXTRA_ARCHS_tune-x86-
> 64} core2-64"
> >
> > +AVAILTUNES += "core2-x32"
> > +TUNE_FEATURES_tune-core2-x32 ?= "${TUNE_FEATURES_tune-x86-64-x32}
> core2"
> > +BASE_LIB_tune-core2-x32 ?= "lib"
> > +PACKAGE_EXTRA_ARCHS_tune-core2-x32 = "${PACKAGE_EXTRA_ARCHS_tune-
> x86-64-x32} core2-x32"
> 
> PACKAGE_EXTRA_ARCHS_tune-core2-x32 = "${PACKAGE_EXTRA_ARCHS_tune-x86-
> 64-x32} core2-64-x32"
> 
> Cheers,
> 
> Richard
> 
> 

Richard,
  Changed the commits according to the comments, please pull/cherry-pick again.

Thanks,
Nitin






More information about the Openembedded-core mailing list