Added several subarches for mips so we can dump the mips subarch profiles from my...

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

diff --git a/ChangeLog b/ChangeLog
index fca0dac3787c6286b37cd26bd6f10be129a9da4c..8941b09e16330622844dab4f76ee9ee12083d9a8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  07 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org> arch/mips.py,
+  catalyst:
+  Added several subarches for mips so we can dump the mips subarch profiles
+  from my shiny new multi-parent profile structure. This is 2.0.6_pre1 for
+  testing.
+
   07 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org>
   targets/livecd-stage2/livecd-stage2-controller.sh:
   Changed the code for copying the MOTD files so it's fewer lines and makes

diff --git a/arch/mips.py b/arch/mips.py
index d2bb80bf23485a5be46fee97c61ec94216c3e3f4..bca6351e8d156d18b2d6eea3354a77a342ae6276 100644 (file)
--- a/arch/mips.py
+++ b/arch/mips.py
@@ -16,6 +16,56 @@ class generic_mipsel(builder.generic):
                self.settings["CHROOT"]="chroot"
                self.settings["CHOST"]="mipsel-unknown-linux-gnu"
 
+class arch_cobalt(generic_mipsel):
+       "Builder class for all cobalt [Little-endian]"
+       def __init__(self,myspec):
+               generic_mipsel.__init__(self,myspec)
+               self.settings["CFLAGS"]="-O2 -march=r5000 -mabi=32 -pipe"
+               self.settings["CHOST"]="mipsel-unknown-linux-gnu"
+               self.settings["HOSTUSE"]=["cobalt"]
+
+class arch_cobalt_n32(generic_mipsel):
+       "Builder class for all cobalt [Little-endian N32]"
+       def __init__(self,myspec):
+               arch_cobalt.__init__(self,myspec)
+               self.settings["CFLAGS"]="-O2 -march=r5000 -mabi=n32 -pipe"
+               self.settings["HOSTUSE"]=["cobalt","n32"]
+
+class arch_ip27(generic_mipsel):
+       "Builder class for all IP27 [Big-endian]"
+       def __init__(self,myspec):
+               arch_mips4.__init__(self,myspec)
+               self.settings["HOSTUSE"]=["ip27"]
+
+class arch_ip27_n32(generic_mipsel):
+       "Builder class for all IP27 [Big-endian N32]"
+       def __init__(self,myspec):
+               arch_mips4_n32.__init__(self,myspec)
+               self.settings["HOSTUSE"]=["ip27","n32"]
+
+class arch_ip28(generic_mipsel):
+       "Builder class for all IP28 [Big-endian]"
+       def __init__(self,myspec):
+               arch_mips4.__init__(self,myspec)
+               self.settings["HOSTUSE"]=["ip28"]
+
+class arch_ip28_n32(generic_mipsel):
+       "Builder class for all IP28 [Big-endian N32]"
+       def __init__(self,myspec):
+               arch_mips4_n32.__init__(self,myspec)
+               self.settings["HOSTUSE"]=["ip28","n32"]
+
+class arch_ip30(generic_mipsel):
+       "Builder class for all IP30 [Big-endian]"
+       def __init__(self,myspec):
+               arch_mips4.__init__(self,myspec)
+               self.settings["HOSTUSE"]=["ip30"]
+
+class arch_ip30_n32(generic_mipsel):
+       "Builder class for all IP30 [Big-endian N32]"
+       def __init__(self,myspec):
+               arch_mips4_n32.__init__(self,myspec)
+               self.settings["HOSTUSE"]=["ip30","n32"]
 class arch_mips1(generic_mips):
        "Builder class for MIPS I [Big-endian]"
        def __init__(self,myspec):
@@ -34,18 +84,43 @@ class arch_mips3(generic_mips):
                generic_mips.__init__(self,myspec)
                self.settings["CFLAGS"]="-O2 -mips3 -mabi=32 -pipe"
 
+class arch_mips3_n32(generic_mips):
+       "Builder class for MIPS III [Big-endian N32]"
+       def __init__(self,myspec):
+               generic_mips.__init__(self,myspec)
+               self.settings["CFLAGS"]="-O2 -mips3 -mabi=n32 -pipe"
+               self.settings["CHOST"]="mips64-unknown-linux-gnu"
+               self.settings["HOSTUSE"]=["n32"]
+
+class arch_mips3_n64(generic_mips):
+       "Builder class for MIPS III [Big-endian N64]"
+       def __init__(self,myspec):
+               generic_mips.__init__(self,myspec)
+               self.settings["CFLAGS"]="-O2 -mips3 -mabi=64 -pipe"
+               self.settings["CHOST"]="mips64-unknown-linux-gnu"
+               self.settings["HOSTUSE"]=["n64"]
+
 class arch_mips4(generic_mips):
        "Builder class for MIPS IV [Big-endian]"
        def __init__(self,myspec):
                generic_mips.__init__(self,myspec)
                self.settings["CFLAGS"]="-O2 -mips4 -mabi=32 -pipe"
 
-class arch_mips4n32(generic_mips):
+class arch_mips4_n32(generic_mips):
        "Builder class for MIPS IV [Big-endian N32]"
        def __init__(self,myspec):
                generic_mips.__init__(self,myspec)
                self.settings["CFLAGS"]="-O2 -mips4 -mabi=n32 -pipe"
                self.settings["CHOST"]="mips64-unknown-linux-gnu"
+               self.settings["HOSTUSE"]=["n32"]
+
+class arch_mips4_n64(generic_mips):
+       "Builder class for MIPS IV [Big-endian N64]"
+       def __init__(self,myspec):
+               generic_mips.__init__(self,myspec)
+               self.settings["CFLAGS"]="-O2 -mips4 -mabi=64 -pipe"
+               self.settings["CHOST"]="mips64-unknown-linux-gnu"
+               self.settings["HOSTUSE"]=["n64"]
 
 class arch_mipsel1(generic_mipsel):
        "Builder class for all MIPS I [Little-endian]"
@@ -65,12 +140,13 @@ class arch_mipsel3(generic_mipsel):
                generic_mipsel.__init__(self,myspec)
                self.settings["CFLAGS"]="-O2 -mips3 -mabi=32 -pipe"
 
-class arch_mipsel3n32(generic_mipsel):
+class arch_mipsel3_n32(generic_mipsel):
        "Builder class for all MIPS III [Little-endian N32]"
        def __init__(self,myspec):
                generic_mipsel.__init__(self,myspec)
                self.settings["CFLAGS"]="-O2 -mips3 -mabi=n32 -pipe"
                self.settings["CHOST"]="mips64el-unknown-linux-gnu"
+               self.settings["HOSTUSE"]=["n32"]
 
 class arch_mipsel4(generic_mipsel):
        "Builder class for all MIPS IV [Little-endian]"
@@ -78,34 +154,56 @@ class arch_mipsel4(generic_mipsel):
                generic_mipsel.__init__(self,myspec)
                self.settings["CFLAGS"]="-O2 -mips4 -mabi=32 -pipe"
 
-class arch_mipsel4n32(generic_mipsel):
+class arch_mipsel4_n32(generic_mipsel):
        "Builder class for all MIPS IV [Little-endian N32]"
        def __init__(self,myspec):
                generic_mipsel.__init__(self,myspec)
                self.settings["CFLAGS"]="-O2 -mips4 -mabi=n32 -pipe"
                self.settings["CHOST"]="mips64el-unknown-linux-gnu"
+               self.settings["HOSTUSE"]=["n32"]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
 def register():
        "Inform main catalyst program of the contents of this plugin."
        return ({ 
-                       "mips"          :arch_mips1,
-                       "mips1"         :arch_mips1,
-                       "mips2"         :arch_mips2,
-                       "mips3"         :arch_mips3,
-                       "mips4"         :arch_mips4,
-                       "mips4n32"      :arch_mips4n32,
-                       "mipsel"        :arch_mipsel1,
-                       "mipsel1"       :arch_mipsel1,
-                       "mipsel2"       :arch_mipsel2,
-                       "mipsel3"       :arch_mipsel3,
-                       "mipsel3n32"    :arch_mipsel3n32,
-                       "mipsel4"       :arch_mipsel4,
-                       "mipsel4n32"    :arch_mipsel4n32,
-                       "sgir4k"        :arch_mips3, 
-                       "sgir5k"        :arch_mips4,
-                       "sgir10kplus"   :arch_mips4,
-                       "loongson"      :arch_mipsel3,
-                       "cobalt"        :arch_mipsel4
+                       "cobalt"                : arch_cobalt,
+                       "cobalt_n32"    : arch_cobalt_n32,
+                       "ip27"                  : arch_ip27,
+                       "ip27_n32"              : arch_ip27_n32,
+                       "ip28"                  : arch_ip28,
+                       "ip28_n32"              : arch_ip28_n32,
+                       "ip30"                  : arch_ip30,
+                       "ip30_n32"              : arch_ip30_n32,
+                       "mips"                  : arch_mips1,
+                       "mips1"                 : arch_mips1,
+                       "mips2"                 : arch_mips2,
+                       "mips3"                 : arch_mips3,
+                       "mips3_n32"             : arch_mips3_n32,
+                       "mips3_n64"             : arch_mips3_n64,
+                       "mips4"                 : arch_mips4,
+                       "mips4_n32"             : arch_mips4_n32,
+                       "mipsel"                : arch_mipsel1,
+                       "mipsel1"               : arch_mipsel1,
+                       "mipsel2"               : arch_mipsel2,
+                       "mipsel3"               : arch_mipsel3,
+                       "mipsel3_n32"   : arch_mipsel3_n32,
+                       "mipsel4"               : arch_mipsel4,
+                       "mipsel4_n32"   : arch_mipsel4_n32,
+                       "loongson"              : arch_mipsel3,
        }, ("mips","mips64"))

diff --git a/catalyst b/catalyst
index 8bac838d9c4756903769ba3f7f4559ef0ced819b..99efdd51c3de1e42044d7693984987a65f3b1b41 100755 (executable)
--- a/catalyst
+++ b/catalyst
@@ -9,7 +9,7 @@ import os,sys,imp,string,getopt
 import pdb
 
 __maintainer__="Chris Gianelloni <wolf31o2@gentoo.org>"
-__version__="2.0.5"
+__version__="2.0.6_pre1"
 
 conf_values={}