[OE-core] [PATCH 01/15] x86: Replace ia32 with x86 when referring to the generic architecture

[Darren Hart]

On Tue, 2014-01-21 at 23:55 +0100, Martin Jansa wrote:
> On Tue, Jan 21, 2014 at 02:39:47PM -0800, Darren Hart wrote:
> > ia32 implies 32bit, while these files provide descriptions for IA32,
> > X86_64, and X32 architectures. The term "x86" fits this used better
> > without resorting to using the term "Intel" which isn't quite right as
> > it excludes things like the tune-c3 file describing a Via CPU.
> > 
> > Signed-off-by: Darren Hart <dvhart at linux.intel.com>
> > Cc: Richard Purdie <richard.purdie at intel.com>
> > Cc: Paul Eggleton <paul.eggleton at intel.com>
> > Cc: Tom Zanussi <tom.zanussi at intel.com>
> > Cc: Nitin Kamble <nitin.a.kamble at intel.com>
> > Cc: Mark Hatle <mark.hatle at windriver.com>
> > Cc: Bruce Ashfield <bruce.ashfield at windriver.com>
> > ---
> >  meta/conf/machine/include/tune-c3.inc              |    2 +-
> >  meta/conf/machine/include/tune-i586.inc            |    2 +-
> >  meta/conf/machine/include/tune-x86_64.inc          |    2 +-
> >  .../include/{ia32-base.inc => x86-base.inc}        |   16 ++++++++--------
> >  meta/conf/machine/include/{ia32 => x86}/README     |    6 +++---
> >  .../{ia32/arch-ia32.inc => x86/arch-x86.inc}       |    2 +-
> >  6 files changed, 15 insertions(+), 15 deletions(-)
> >  rename meta/conf/machine/include/{ia32-base.inc => x86-base.inc} (75%)
> >  rename meta/conf/machine/include/{ia32 => x86}/README (81%)
> >  rename meta/conf/machine/include/{ia32/arch-ia32.inc => x86/arch-x86.inc} (97%)
> > 
> > diff --git a/meta/conf/machine/include/tune-c3.inc b/meta/conf/machine/include/tune-c3.inc
> > index 18865b7..fafc28a 100644
> > --- a/meta/conf/machine/include/tune-c3.inc
> > +++ b/meta/conf/machine/include/tune-c3.inc
> > @@ -1,4 +1,4 @@
> > -require conf/machine/include/ia32/arch-ia32.inc
> > +require conf/machine/include/x86/arch-x86.inc
> >  
> >  TUNEVALID[c3] = "VIA Cyrix III or VIA C3 specific optimizations"
> >  TUNECONFLICTS[c3] = "m64 mx32"
> > diff --git a/meta/conf/machine/include/tune-i586.inc b/meta/conf/machine/include/tune-i586.inc
> > index 4542b9b..a315b35 100644
> > --- a/meta/conf/machine/include/tune-i586.inc
> > +++ b/meta/conf/machine/include/tune-i586.inc
> > @@ -1,6 +1,6 @@
> >  DEFAULTTUNE ?= "i586"
> >  
> > -require conf/machine/include/ia32/arch-ia32.inc
> > +require conf/machine/include/x86/arch-x86.inc
> >  
> >  # Extra tune features
> >  TUNEVALID[i586] = "Enable i586 specific processor optimizations"
> > diff --git a/meta/conf/machine/include/tune-x86_64.inc b/meta/conf/machine/include/tune-x86_64.inc
> > index 31e06da..ae48124 100644
> > --- a/meta/conf/machine/include/tune-x86_64.inc
> > +++ b/meta/conf/machine/include/tune-x86_64.inc
> > @@ -1,4 +1,4 @@
> >  DEFAULTTUNE ?= "x86-64"
> >  
> > -require conf/machine/include/ia32/arch-ia32.inc
> > +require conf/machine/include/x86/arch-x86.inc
> >  
> > diff --git a/meta/conf/machine/include/ia32-base.inc b/meta/conf/machine/include/x86-base.inc
> > similarity index 75%
> > rename from meta/conf/machine/include/ia32-base.inc
> > rename to meta/conf/machine/include/x86-base.inc
> > index e15f927..421bdee 100644
> > --- a/meta/conf/machine/include/ia32-base.inc
> > +++ b/meta/conf/machine/include/x86-base.inc
> > @@ -1,5 +1,5 @@
> >  #
> > -# base machine settings for ia32-architecture BSPs
> > +# Base machine settings for Intel architecture BSPs
> 
> does it apply for AMD, Cyrix as well?

Blarg, yes it does. Apologies. I had originally done some of this in
meta-intel and was persuaded it was better to do this in oe-core. I
missed removing some of the intel-isms. Thanks for catching this.

Replacing INTEL with X86 for everything that isn't a specific recipe
name (xf86-video-intel). Thanks Martin.

Will include in the inevitable v2.

-- 
Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 473 bytes
Desc: This is a digitally signed message part
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20140121/b42f10c5/attachment-0002.sig>