From 5f9fdd5c6ca3381f4afe02e2196bc63f839232ae Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Wed, 6 Feb 2008 22:57:55 +0000 Subject: [PATCH] Did a little cleanup on the x86.py to remove some redundant entries and added nocona and core2 to amd64.py, though they're currently commented out. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1279 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 5 +++++ arch/amd64.py | 12 +++++++++++ arch/x86.py | 59 ++++++++++++++++++++++++++------------------------- 3 files changed, 47 insertions(+), 29 deletions(-) diff --git a/ChangeLog b/ChangeLog index 69b5211a..ac488a2e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,11 @@ # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ + 06 Feb 2008; Chris Gianelloni arch/amd64.py, + arch/x86.py: + Did a little cleanup on the x86.py to remove some redundant entries and + added nocona and core2 to amd64.py, though they're currently commented out. + 06 Feb 2008; Chris Gianelloni modules/generic_stage_target.py: Write out HOSTUSE settings from arch/*.py to make.conf as well as any USE diff --git a/arch/amd64.py b/arch/amd64.py index 9801370d..a62b9751 100644 --- a/arch/amd64.py +++ b/arch/amd64.py @@ -14,6 +14,18 @@ class arch_amd64(generic_amd64): self.settings["CFLAGS"]="-O2 -pipe" self.settings["CHOST"]="x86_64-pc-linux-gnu" +#class arch_nocona(generic_x86): +# def __init__(self,myspec): +# generic_amd64.__init__(self,myspec) +# self.settings["CFLAGS"]="-O2 -march=nocona -pipe" +# self.settings["HOSTUSE"]=["mmx","sse","sse2"] + +#class arch_core2(generic_x86): +# def __init__(self,myspec): +# generic_amd64.__init__(self,myspec) +# self.settings["CFLAGS"]="-O2 -march=core2 -pipe" +# self.settings["HOSTUSE"]=["mmx","sse","sse2"] + def register(): "Inform main catalyst program of the contents of this plugin." return ({"amd64":arch_amd64}, ("x86_64", )) diff --git a/arch/x86.py b/arch/x86.py index 166d03b7..6592f9eb 100644 --- a/arch/x86.py +++ b/arch/x86.py @@ -39,12 +39,6 @@ class arch_i586(generic_x86): self.settings["CFLAGS"]="-O2 -march=i586 -pipe" self.settings["CHOST"]="i586-pc-linux-gnu" -class arch_pentium_mmx(arch_i586): - def __init__(self,myspec): - arch_i586.__init__(self,myspec) - self.settings["CFLAGS"]="-O2 -march=pentium-mmx -pipe" - self.settings["HOSTUSE"]=["mmx"] - class arch_i686(generic_x86): def __init__(self,myspec): generic_x86.__init__(self,myspec) @@ -59,51 +53,58 @@ class arch_athlon(generic_x86): self.settings["HOSTUSE"]=["mmx","3dnow"] class arch_athlon_xp(generic_x86): - # This handles XP and MP processors def __init__(self,myspec): generic_x86.__init__(self,myspec) self.settings["CFLAGS"]="-O2 -march=athlon-xp -pipe" self.settings["CHOST"]="i686-pc-linux-gnu" self.settings["HOSTUSE"]=["mmx","3dnow","sse"] +class arch_pentium_mmx(arch_i586): + def __init__(self,myspec): + arch_i586.__init__(self,myspec) + self.settings["CFLAGS"]="-O2 -march=pentium-mmx -pipe" + self.settings["HOSTUSE"]=["mmx"] + +class arch_pentium2(generic_x86): + def __init__(self,myspec): + arch_i686.__init__(self,myspec) + self.settings["CFLAGS"]="-O2 -march=pentium2 -pipe" + self.settings["HOSTUSE"]=["mmx"] + class arch_pentium3(generic_x86): def __init__(self,myspec): - generic_x86.__init__(self,myspec) + arch_i686.__init__(self,myspec) self.settings["CFLAGS"]="-O2 -march=pentium3 -pipe" - self.settings["CHOST"]="i686-pc-linux-gnu" self.settings["HOSTUSE"]=["mmx","sse"] class arch_pentium4(generic_x86): def __init__(self,myspec): - generic_x86.__init__(self,myspec) + arch_i686.__init__(self,myspec) self.settings["CFLAGS"]="-O2 -march=pentium4 -pipe" - self.settings["CHOST"]="i686-pc-linux-gnu" self.settings["HOSTUSE"]=["mmx","sse"] class arch_prescott(generic_x86): def __init__(self,myspec): - generic_x86.__init__(self,myspec) + arch_i686.__init__(self,myspec) self.settings["CFLAGS"]="-O2 -march=prescott -pipe" - self.settings["CHOST"]="i686-pc-linux-gnu" self.settings["HOSTUSE"]=["mmx","sse","sse2"] -#class arch_nocona(generic_x86): -# def __init__(self,myspec): -# generic_x86.__init__(self,myspec) -# self.settings["CFLAGS"]="-O2 -march=nocona -pipe" -# self.settings["CHOST"]="i686-pc-linux-gnu" -# self.settings["HOSTUSE"]=["mmx","sse","sse2"] - -#class arch_core2(generic_x86): -# def __init__(self,myspec): -# generic_x86.__init__(self,myspec) -# self.settings["CFLAGS"]="-O2 -march=core2 -pipe" -# self.settings["CHOST"]="i686-pc-linux-gnu" -# self.settings["HOSTUSE"]=["mmx","sse","sse2"] - def register(): "Inform main catalyst program of the contents of this plugin." - return ({"pentium4":arch_pentium4,"x86":arch_x86,"i386":arch_i386,"i486":arch_i486,"i586":arch_i586,"i686":arch_i686,"athlon":arch_athlon, - "athlon-xp":arch_athlon_xp,"athlon-mp":arch_athlon_xp,"pentium3":arch_pentium3,"pentium-mmx":arch_pentium_mmx,"prescott":arch_prescott}, + return ({ + "x86" : arch_x86, + "i386" : arch_i386, + "i486" : arch_i486, + "i586" : arch_i586, + "i686" : arch_i686, + "athlon" : arch_athlon, + "athlon-xp" : arch_athlon_xp, + "athlon-mp" : arch_athlon_xp, + "pentium-mmx" : arch_pentium_mmx, + "pentium2" : arch_pentium2, + "pentium3" : arch_pentium3, + "pentium4" : arch_pentium4, + "prescott" : arch_prescott + }, ('i386', 'i486', 'i586', 'i686')) -- 2.26.2