Added prescott to the subarches for x86.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1275 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index 0f5ac4d2a8656c531de6032e473aa33c4bdeac24..f18ddd238eedc6aef2d100754fc235e1c74af393 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,15 +1,18 @@
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  06 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org> arch/x86.py:
+  Added prescott to the subarches for x86.
+
   06 Feb 2008; Andrew Gaffney <agaffney@gentoo.org>
   modules/netboot2_target.py, targets/support/kmerge.sh:
   Add patch to enabled netboot2/linuxrc and automatically add path for
   initramfs overlay to genkernel commandline. Thanks to Justin Bronder
-  <jsbronder@gentoo.org> in bug 208106
+  <jsbronder@gentoo.org> in bug #208106
 
   06 Feb 2008; Andrew Gaffney <agaffney@gentoo.org>
   modules/netboot2_target.py:
-  Allow root_overlay in netboot2 target for bug 208106.
+  Allow root_overlay in netboot2 target for bug #208106.
 
   04 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org>
   modules/generic_stage_target.py, modules/livecd_stage1_target.py,

diff --git a/arch/x86.py b/arch/x86.py
index 66fe9c52a3ad1808627caeaabd5c208e2d8d53d2..166d03b7c48f076d668eaff9600c030b5bd20959 100644 (file)
--- a/arch/x86.py
+++ b/arch/x86.py
@@ -59,13 +59,20 @@ class arch_athlon(generic_x86):
                self.settings["HOSTUSE"]=["mmx","3dnow"]
 
 class arch_athlon_xp(generic_x86):
-       #this handles XP and MP processors
+       # 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_pentium3(generic_x86):
+       def __init__(self,myspec):
+               generic_x86.__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)
@@ -73,16 +80,30 @@ class arch_pentium4(generic_x86):
                self.settings["CHOST"]="i686-pc-linux-gnu"
                self.settings["HOSTUSE"]=["mmx","sse"]
 
-class arch_pentium3(generic_x86):
+class arch_prescott(generic_x86):
        def __init__(self,myspec):
                generic_x86.__init__(self,myspec)
-               self.settings["CFLAGS"]="-O2 -march=pentium3 -pipe"
+               self.settings["CFLAGS"]="-O2 -march=prescott -pipe"
                self.settings["CHOST"]="i686-pc-linux-gnu"
-               self.settings["HOSTUSE"]=["mmx","sse"]
+               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},
+       "athlon-xp":arch_athlon_xp,"athlon-mp":arch_athlon_xp,"pentium3":arch_pentium3,"pentium-mmx":arch_pentium_mmx,"prescott":arch_prescott},
        ('i386', 'i486', 'i586', 'i686'))